diff options
Diffstat (limited to 'src/windows/identity/uilib')
| -rw-r--r-- | src/windows/identity/uilib/action.c | 58 | ||||
| -rw-r--r-- | src/windows/identity/uilib/alert.c | 64 | ||||
| -rw-r--r-- | src/windows/identity/uilib/configui.c | 36 | ||||
| -rw-r--r-- | src/windows/identity/uilib/creddlg.c | 112 | ||||
| -rw-r--r-- | src/windows/identity/uilib/intalert.h | 6 | ||||
| -rw-r--r-- | src/windows/identity/uilib/khaction.h | 32 | ||||
| -rw-r--r-- | src/windows/identity/uilib/khactiondef.h | 2 | ||||
| -rw-r--r-- | src/windows/identity/uilib/khalerts.h | 62 | ||||
| -rw-r--r-- | src/windows/identity/uilib/khconfigui.h | 16 | ||||
| -rw-r--r-- | src/windows/identity/uilib/khhtlink.h | 4 | ||||
| -rw-r--r-- | src/windows/identity/uilib/khnewcred.h | 92 | ||||
| -rw-r--r-- | src/windows/identity/uilib/khprops.h | 18 | ||||
| -rw-r--r-- | src/windows/identity/uilib/khremote.h | 4 | ||||
| -rw-r--r-- | src/windows/identity/uilib/khrescache.h | 28 | ||||
| -rw-r--r-- | src/windows/identity/uilib/khtracker.h | 2 | ||||
| -rw-r--r-- | src/windows/identity/uilib/propsheet.c | 20 | ||||
| -rw-r--r-- | src/windows/identity/uilib/rescache.c | 62 | ||||
| -rw-r--r-- | src/windows/identity/uilib/trackerwnd.c | 39 | ||||
| -rw-r--r-- | src/windows/identity/uilib/uibind.c | 3 |
19 files changed, 327 insertions, 333 deletions
diff --git a/src/windows/identity/uilib/action.c b/src/windows/identity/uilib/action.c index 04fb52a84..50a72ef37 100644 --- a/src/windows/identity/uilib/action.c +++ b/src/windows/identity/uilib/action.c @@ -275,12 +275,12 @@ HWND khui_hwnd_main; /* main window, for notifying dispatching messages to the application. */ -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_init_actions(void) { InitializeCriticalSection(&cs_actions); } -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_exit_actions(void) { DeleteCriticalSection(&cs_actions); } @@ -441,7 +441,7 @@ khui_action_delete(khm_int32 action) { #define MENU_NC_ITEMS 8 -KHMEXP khui_menu_def * KHMAPI +KHMEXP khui_menu_def * KHMAPI khui_menu_create(khm_int32 action) { khui_menu_def * d; @@ -512,7 +512,7 @@ khui_action_trigger(khm_int32 action, khui_action_context * ctx) { } } -KHMEXP khui_menu_def * KHMAPI +KHMEXP khui_menu_def * KHMAPI khui_menu_dup(khui_menu_def * src) { khui_menu_def * d; @@ -541,7 +541,7 @@ khui_menu_dup(khui_menu_def * src) return d; } -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_menu_delete(khui_menu_def * d) { int i; @@ -1019,9 +1019,9 @@ khui_create_global_accel_table(void) { return ha; } -KHMEXP khm_boolean KHMAPI -khui_get_cmd_accel_string(khm_int32 cmd, - wchar_t * buf, +KHMEXP khm_boolean KHMAPI +khui_get_cmd_accel_string(khm_int32 cmd, + wchar_t * buf, khm_size bufsiz) { int i; khui_accel_def * def; @@ -1127,9 +1127,9 @@ khui_get_cmd_accel_string(khm_int32 cmd, break; default: - if((def->key >= '0' && - def->key <= '9') || - (def->key >= 'A' && + if((def->key >= '0' && + def->key <= '9') || + (def->key >= 'A' && def->key <= 'Z')) { ap = mbuf; mbuf[0] = (wchar_t) def->key; @@ -1241,13 +1241,13 @@ khuiint_copy_context(khui_action_context * ctxdest, ctxdest->headers[i].attr_id = ctxsrc->headers[i].attr_id; ctxdest->headers[i].cb_data = ctxsrc->headers[i].cb_data; if (ctxsrc->headers[i].cb_data > 0) { - ctxdest->headers[i].data = + ctxdest->headers[i].data = BYTEOFFSET(ctxdest->int_buf, ctxdest->int_cb_used); memcpy(ctxdest->headers[i].data, ctxsrc->headers[i].data, ctxsrc->headers[i].cb_data); - ctxdest->int_cb_used += + ctxdest->int_cb_used += UBOUND32(ctxsrc->headers[i].cb_data); } else { ctxdest->headers[i].data = NULL; @@ -1264,7 +1264,7 @@ khuiint_copy_context(khui_action_context * ctxdest, #endif kcdb_credset_flush(ctxdest->credset); - + kcdb_credset_extract_filtered(ctxdest->credset, ctxsrc->credset, khuiint_filter_selected, @@ -1298,7 +1298,7 @@ khuiint_copy_context(khui_action_context * ctxdest, #endif } -static void +static void khuiint_context_init(khui_action_context * ctx) { ctx->magic = KHUI_ACTION_CONTEXT_MAGIC; ctx->scope = KHUI_SCOPE_NONE; @@ -1319,8 +1319,8 @@ khuiint_context_init(khui_action_context * ctx) { khui_action_context khui_ctx = { KHUI_ACTION_CONTEXT_MAGIC, KHUI_SCOPE_NONE, - NULL, - KCDB_CREDTYPE_INVALID, + NULL, + KCDB_CREDTYPE_INVALID, NULL, { {KCDB_ATTR_INVALID,NULL,0}, @@ -1402,10 +1402,10 @@ khui_context_create(khui_action_context * ctx, khuiint_copy_context(ctx, &tctx); } -KHMEXP void KHMAPI -khui_context_set(khui_scope scope, - khm_handle identity, - khm_int32 cred_type, +KHMEXP void KHMAPI +khui_context_set(khui_scope scope, + khm_handle identity, + khm_int32 cred_type, khm_handle cred, khui_header *headers, khm_size n_headers, @@ -1422,10 +1422,10 @@ khui_context_set(khui_scope scope, 0); } -KHMEXP void KHMAPI -khui_context_set_ex(khui_scope scope, - khm_handle identity, - khm_int32 cred_type, +KHMEXP void KHMAPI +khui_context_set_ex(khui_scope scope, + khm_handle identity, + khm_int32 cred_type, khm_handle cred, khui_header *headers, khm_size n_headers, @@ -1482,7 +1482,7 @@ khui_context_set_indirect(khui_action_context * ctx) LeaveCriticalSection(&cs_actions); } -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_context_refresh(void) { khm_int32 flags; @@ -1515,7 +1515,7 @@ khui_context_refresh(void) { kmq_post_message(KMSG_ACT, KMSG_ACT_REFRESH, 0, 0); } -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_context_get(khui_action_context * ctx) { EnterCriticalSection(&cs_actions); @@ -1530,7 +1530,7 @@ khui_context_get(khui_action_context * ctx) LeaveCriticalSection(&cs_actions); } -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_context_release(khui_action_context * ctx) { #ifdef DEBUG @@ -1558,7 +1558,7 @@ khui_context_release(khui_action_context * ctx) #endif } -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_context_reset(void) { EnterCriticalSection(&cs_actions); diff --git a/src/windows/identity/uilib/alert.c b/src/windows/identity/uilib/alert.c index 02df7a1e3..62861eff9 100644 --- a/src/windows/identity/uilib/alert.c +++ b/src/windows/identity/uilib/alert.c @@ -41,19 +41,19 @@ khui_alert * kh_alerts = NULL; CRITICAL_SECTION cs_alerts; -void +void alert_init(void) { InitializeCriticalSection(&cs_alerts); } -void +void alert_exit(void) { DeleteCriticalSection(&cs_alerts); } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_alert_create_empty(khui_alert ** result) { khui_alert * a; @@ -81,10 +81,10 @@ khui_alert_create_empty(khui_alert ** result) return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI -khui_alert_create_simple(const wchar_t * title, - const wchar_t * message, - khm_int32 severity, +KHMEXP khm_int32 KHMAPI +khui_alert_create_simple(const wchar_t * title, + const wchar_t * message, + khm_int32 severity, khui_alert ** result) { khui_alert * a; @@ -99,7 +99,7 @@ khui_alert_create_simple(const wchar_t * title, return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_alert_set_title(khui_alert * alert, const wchar_t * title) { size_t cb = 0; @@ -107,8 +107,8 @@ khui_alert_set_title(khui_alert * alert, const wchar_t * title) assert(alert->magic == KHUI_ALERT_MAGIC); if(title) { - if(FAILED(StringCbLength(title, - KHUI_MAXCB_TITLE, + if(FAILED(StringCbLength(title, + KHUI_MAXCB_TITLE, &cb))) { return KHM_ERROR_INVALID_PARAM; } @@ -132,7 +132,7 @@ khui_alert_set_title(khui_alert * alert, const wchar_t * title) } KHMEXP khm_int32 KHMAPI -khui_alert_set_flags(khui_alert * alert, khm_int32 mask, khm_int32 flags) +khui_alert_set_flags(khui_alert * alert, khm_int32 mask, khm_int32 flags) { assert(alert->magic == KHUI_ALERT_MAGIC); @@ -140,7 +140,7 @@ khui_alert_set_flags(khui_alert * alert, khm_int32 mask, khm_int32 flags) return KHM_ERROR_INVALID_PARAM; EnterCriticalSection(&cs_alerts); - alert->flags = + alert->flags = (alert->flags & ~mask) | (flags & mask); LeaveCriticalSection(&cs_alerts); @@ -148,7 +148,7 @@ khui_alert_set_flags(khui_alert * alert, khm_int32 mask, khm_int32 flags) return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_alert_set_severity(khui_alert * alert, khm_int32 severity) { @@ -160,7 +160,7 @@ khui_alert_set_severity(khui_alert * alert, khm_int32 severity) return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_alert_set_suggestion(khui_alert * alert, const wchar_t * suggestion) { size_t cb = 0; @@ -168,8 +168,8 @@ khui_alert_set_suggestion(khui_alert * alert, assert(alert->magic == KHUI_ALERT_MAGIC); if(suggestion) { - if(FAILED(StringCbLength(suggestion, - KHUI_MAXCB_MESSAGE - sizeof(wchar_t), + if(FAILED(StringCbLength(suggestion, + KHUI_MAXCB_MESSAGE - sizeof(wchar_t), &cb))) { return KHM_ERROR_INVALID_PARAM; } @@ -177,7 +177,7 @@ khui_alert_set_suggestion(khui_alert * alert, } EnterCriticalSection(&cs_alerts); - if(alert->suggestion && + if(alert->suggestion && (alert->flags & KHUI_ALERT_FLAG_FREE_SUGGEST)) { PFREE(alert->suggestion); @@ -196,7 +196,7 @@ khui_alert_set_suggestion(khui_alert * alert, return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_alert_set_message(khui_alert * alert, const wchar_t * message) { size_t cb = 0; @@ -204,8 +204,8 @@ khui_alert_set_message(khui_alert * alert, const wchar_t * message) assert(alert->magic == KHUI_ALERT_MAGIC); if(message) { - if(FAILED(StringCbLength(message, - KHUI_MAXCB_MESSAGE - sizeof(wchar_t), + if(FAILED(StringCbLength(message, + KHUI_MAXCB_MESSAGE - sizeof(wchar_t), &cb))) { return KHM_ERROR_INVALID_PARAM; } @@ -213,7 +213,7 @@ khui_alert_set_message(khui_alert * alert, const wchar_t * message) } EnterCriticalSection(&cs_alerts); - if(alert->message && + if(alert->message && (alert->flags & KHUI_ALERT_FLAG_FREE_MESSAGE)) { PFREE(alert->message); @@ -232,7 +232,7 @@ khui_alert_set_message(khui_alert * alert, const wchar_t * message) return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_alert_clear_commands(khui_alert * alert) { assert(alert->magic == KHUI_ALERT_MAGIC); @@ -243,7 +243,7 @@ khui_alert_clear_commands(khui_alert * alert) return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_alert_add_command(khui_alert * alert, khm_int32 command_id) { khm_int32 rv = KHM_ERROR_SUCCESS; @@ -312,7 +312,7 @@ khui_alert_get_response(khui_alert * alert) return response; } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_alert_show(khui_alert * alert) { assert(alert->magic == KHUI_ALERT_MAGIC); @@ -349,9 +349,9 @@ khui_alert_queue(khui_alert * alert) return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI -khui_alert_show_simple(const wchar_t * title, - const wchar_t * message, +KHMEXP khm_int32 KHMAPI +khui_alert_show_simple(const wchar_t * title, + const wchar_t * message, khm_int32 severity) { khui_alert * a = NULL; @@ -369,8 +369,8 @@ khui_alert_show_simple(const wchar_t * title, return rv; } -KHMEXP khm_int32 KHMAPI -khui_alert_hold(khui_alert * alert) +KHMEXP khm_int32 KHMAPI +khui_alert_hold(khui_alert * alert) { assert(alert->magic == KHUI_ALERT_MAGIC); @@ -381,7 +381,7 @@ khui_alert_hold(khui_alert * alert) } /* called with cs_alert held */ -static void +static void free_alert(khui_alert * alert) { assert(alert->magic == KHUI_ALERT_MAGIC); @@ -416,8 +416,8 @@ free_alert(khui_alert * alert) } } -KHMEXP khm_int32 KHMAPI -khui_alert_release(khui_alert * alert) +KHMEXP khm_int32 KHMAPI +khui_alert_release(khui_alert * alert) { assert(alert->magic == KHUI_ALERT_MAGIC); diff --git a/src/windows/identity/uilib/configui.c b/src/windows/identity/uilib/configui.c index 6f4f940a8..a87ea72ca 100644 --- a/src/windows/identity/uilib/configui.c +++ b/src/windows/identity/uilib/configui.c @@ -59,7 +59,7 @@ cfgui_create_new_node(void) { } /* called with cs_cfgui held */ -static void +static void cfgui_free_node(khui_config_node_i * node) { if (!cfgui_is_valid_node(node)) return; @@ -111,7 +111,7 @@ cfgui_release_node(khui_config_node_i * node) { LeaveCriticalSection(&cs_cfgui); } -static void +static void cfgui_init_once(void) { if (init_once == 0 && InterlockedIncrement(&init_once) == 1) { @@ -431,7 +431,7 @@ khui_cfg_get_next(khui_config_node vnode, node = cfgui_node_i_from_handle(vnode); for(nxt_node = LNEXT(node); nxt_node && - ((node->reg.flags ^ nxt_node->reg.flags) & + ((node->reg.flags ^ nxt_node->reg.flags) & KHUI_CNFLAG_SUBPANEL); nxt_node = LNEXT(nxt_node)); if (nxt_node) @@ -455,7 +455,7 @@ khui_cfg_get_next_release(khui_config_node * pvnode) { khui_config_node_i * node; khui_config_node_i * nxt_node; - if (!pvnode || + if (!pvnode || !cfgui_is_valid_node_handle(*pvnode)) return KHM_ERROR_INVALID_PARAM; @@ -464,7 +464,7 @@ khui_cfg_get_next_release(khui_config_node * pvnode) { node = cfgui_node_i_from_handle(*pvnode); for(nxt_node = LNEXT(node); nxt_node && - (((node->reg.flags ^ nxt_node->reg.flags) & + (((node->reg.flags ^ nxt_node->reg.flags) & KHUI_CNFLAG_SUBPANEL) || (nxt_node->flags & KHUI_CN_FLAG_DELETED)); nxt_node = LNEXT(nxt_node)); @@ -531,7 +531,7 @@ khui_cfg_get_hwnd(khui_config_node vnode) { node = cfgui_node_i_from_handle(vnode); else if (!vnode) node = cfgui_root_config; - else + else node = NULL; if (node) @@ -559,7 +559,7 @@ khui_cfg_get_param(khui_config_node vnode) { node = cfgui_node_i_from_handle(vnode); else if (!vnode) node = cfgui_root_config; - else + else node = NULL; if (node) @@ -624,7 +624,7 @@ clear_node_data(khui_config_node_i * node) { static cfg_node_data * get_node_data(khui_config_node_i * node, - void * key, + void * key, khm_boolean create) { khm_size i; @@ -686,7 +686,7 @@ khui_cfg_get_hwnd_inst(khui_config_node vnode, node = cfgui_node_i_from_handle(vnode); else if (!vnode) node = cfgui_root_config; - else + else node = NULL; if (node) { @@ -720,7 +720,7 @@ khui_cfg_get_param_inst(khui_config_node vnode, node = cfgui_node_i_from_handle(vnode); else if (!vnode) node = cfgui_root_config; - else + else node = NULL; if (node) { @@ -737,7 +737,7 @@ khui_cfg_get_param_inst(khui_config_node vnode, } KHMEXP void KHMAPI -khui_cfg_set_hwnd_inst(khui_config_node vnode, +khui_cfg_set_hwnd_inst(khui_config_node vnode, khui_config_node noderef, HWND hwnd) { khui_config_node_i * node; @@ -754,7 +754,7 @@ khui_cfg_set_hwnd_inst(khui_config_node vnode, node = cfgui_node_i_from_handle(vnode); else if (!vnode) node = cfgui_root_config; - else + else node = NULL; if (node) { @@ -766,7 +766,7 @@ khui_cfg_set_hwnd_inst(khui_config_node vnode, } KHMEXP void KHMAPI -khui_cfg_set_param_inst(khui_config_node vnode, +khui_cfg_set_param_inst(khui_config_node vnode, khui_config_node noderef, LPARAM param) { khui_config_node_i * node; @@ -783,7 +783,7 @@ khui_cfg_set_param_inst(khui_config_node vnode, node = cfgui_node_i_from_handle(vnode); else if (!vnode) node = cfgui_root_config; - else + else node = NULL; if (node) { @@ -796,7 +796,7 @@ khui_cfg_set_param_inst(khui_config_node vnode, /* called with cs_cfgui held */ -static void +static void cfgui_clear_params(khui_config_node_i * node) { khui_config_node_i * c; @@ -830,7 +830,7 @@ khui_cfg_set_configui_handle(HWND hwnd) { } KHMEXP void KHMAPI -khui_cfg_set_flags(khui_config_node vnode, +khui_cfg_set_flags(khui_config_node vnode, khm_int32 flags, khm_int32 mask) { khui_config_node_i * node; @@ -847,7 +847,7 @@ khui_cfg_set_flags(khui_config_node vnode, node = cfgui_node_i_from_handle(vnode); - newflags = + newflags = (flags & mask) | (node->flags & ~mask); @@ -933,7 +933,7 @@ khui_cfg_set_flags_inst(khui_config_init_data * d, EnterCriticalSection(&cs_cfgui); if (cfgui_is_valid_node_handle(d->this_node)) node = cfgui_node_i_from_handle(d->this_node); - else + else node = NULL; if (node) { diff --git a/src/windows/identity/uilib/creddlg.c b/src/windows/identity/uilib/creddlg.c index e78ced68c..f975be1e3 100644 --- a/src/windows/identity/uilib/creddlg.c +++ b/src/windows/identity/uilib/creddlg.c @@ -37,7 +37,7 @@ static void cw_free_prompts(khui_new_creds * c); static void cw_free_prompt(khui_new_creds_prompt * p); -static khui_new_creds_prompt * +static khui_new_creds_prompt * cw_create_prompt( khm_size idx, khm_int32 type, @@ -45,7 +45,7 @@ cw_create_prompt( wchar_t * def, khm_int32 flags); -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_cw_create_cred_blob(khui_new_creds ** ppnc) { khui_new_creds * c; @@ -65,7 +65,7 @@ khui_cw_create_cred_blob(khui_new_creds ** ppnc) return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_cw_destroy_cred_blob(khui_new_creds *c) { khm_size i; @@ -102,14 +102,14 @@ khui_cw_destroy_cred_blob(khui_new_creds *c) return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_cw_lock_nc(khui_new_creds * c) { EnterCriticalSection(&c->cs); return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_cw_unlock_nc(khui_new_creds * c) { LeaveCriticalSection(&c->cs); @@ -118,8 +118,8 @@ khui_cw_unlock_nc(khui_new_creds * c) #define NC_N_IDENTITIES 4 -KHMEXP khm_int32 KHMAPI -khui_cw_add_identity(khui_new_creds * c, +KHMEXP khm_int32 KHMAPI +khui_cw_add_identity(khui_new_creds * c, khm_handle id) { if(id == NULL) @@ -130,17 +130,17 @@ khui_cw_add_identity(khui_new_creds * c, if(c->identities == NULL) { c->nc_identities = NC_N_IDENTITIES; - c->identities = PMALLOC(sizeof(*(c->identities)) * + c->identities = PMALLOC(sizeof(*(c->identities)) * c->nc_identities); c->n_identities = 0; } else if(c->n_identities + 1 > c->nc_identities) { khm_handle * ni; - c->nc_identities = UBOUNDSS(c->n_identities + 1, - NC_N_IDENTITIES, + c->nc_identities = UBOUNDSS(c->n_identities + 1, + NC_N_IDENTITIES, NC_N_IDENTITIES); ni = PMALLOC(sizeof(*(c->identities)) * c->nc_identities); - memcpy(ni, c->identities, + memcpy(ni, c->identities, sizeof(*(c->identities)) * c->n_identities); PFREE(c->identities); c->identities = ni; @@ -153,8 +153,8 @@ khui_cw_add_identity(khui_new_creds * c, return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI -khui_cw_set_primary_id(khui_new_creds * c, +KHMEXP khm_int32 KHMAPI +khui_cw_set_primary_id(khui_new_creds * c, khm_handle id) { khm_size i; @@ -177,14 +177,14 @@ khui_cw_set_primary_id(khui_new_creds * c, LeaveCriticalSection(&(c->cs)); rv = khui_cw_add_identity(c,id); if(c->hwnd != NULL) { - PostMessage(c->hwnd, KHUI_WM_NC_NOTIFY, + PostMessage(c->hwnd, KHUI_WM_NC_NOTIFY, MAKEWPARAM(0, WMNC_IDENTITY_CHANGE), 0); } return rv; } -KHMEXP khm_int32 KHMAPI -khui_cw_add_type(khui_new_creds * c, +KHMEXP khm_int32 KHMAPI +khui_cw_add_type(khui_new_creds * c, khui_new_creds_by_type * t) { EnterCriticalSection(&c->cs); @@ -227,8 +227,8 @@ khui_cw_add_type(khui_new_creds * c, return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI -khui_cw_del_type(khui_new_creds * c, +KHMEXP khm_int32 KHMAPI +khui_cw_del_type(khui_new_creds * c, khm_int32 type_id) { khm_size i; @@ -251,9 +251,9 @@ khui_cw_del_type(khui_new_creds * c, return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI -khui_cw_find_type(khui_new_creds * c, - khm_int32 type, +KHMEXP khm_int32 KHMAPI +khui_cw_find_type(khui_new_creds * c, + khm_int32 type, khui_new_creds_by_type **t) { khm_size i; @@ -274,7 +274,7 @@ khui_cw_find_type(khui_new_creds * c, } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_cw_enable_type(khui_new_creds * c, khm_int32 type, khm_boolean enable) @@ -301,7 +301,7 @@ khui_cw_enable_type(khui_new_creds * c, return (t)?KHM_ERROR_SUCCESS:KHM_ERROR_NOT_FOUND; } -KHMEXP khm_boolean KHMAPI +KHMEXP khm_boolean KHMAPI khui_cw_type_succeeded(khui_new_creds * c, khm_int32 type) { @@ -319,7 +319,7 @@ khui_cw_type_succeeded(khui_new_creds * c, return s; } -static khui_new_creds_prompt * +static khui_new_creds_prompt * cw_create_prompt(khm_size idx, khm_int32 type, wchar_t * prompt, @@ -360,7 +360,7 @@ cw_create_prompt(khm_size idx, return p; } -static void +static void cw_free_prompt(khui_new_creds_prompt * p) { size_t cb; @@ -385,7 +385,7 @@ cw_free_prompt(khui_new_creds_prompt * p) { PFREE(p); } -static void +static void cw_free_prompts(khui_new_creds * c) { khm_size i; @@ -416,13 +416,13 @@ cw_free_prompts(khui_new_creds * c) c->n_prompts = 0; } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_cw_clear_prompts(khui_new_creds * c) { /* the WMNC_CLEAR_PROMPT message needs to be sent before freeing the prompts, because the prompts structure still holds the window handles for the custom prompt controls. */ - SendMessage(c->hwnd, KHUI_WM_NC_NOTIFY, + SendMessage(c->hwnd, KHUI_WM_NC_NOTIFY, MAKEWPARAM(0,WMNC_CLEAR_PROMPTS), (LPARAM) c); EnterCriticalSection(&c->cs); @@ -432,15 +432,15 @@ khui_cw_clear_prompts(khui_new_creds * c) return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI -khui_cw_begin_custom_prompts(khui_new_creds * c, - khm_size n_prompts, - wchar_t * banner, +KHMEXP khm_int32 KHMAPI +khui_cw_begin_custom_prompts(khui_new_creds * c, + khm_size n_prompts, + wchar_t * banner, wchar_t * pname) { size_t cb; - PostMessage(c->hwnd, KHUI_WM_NC_NOTIFY, + PostMessage(c->hwnd, KHUI_WM_NC_NOTIFY, MAKEWPARAM(0,WMNC_CLEAR_PROMPTS), (LPARAM) c); EnterCriticalSection(&c->cs); @@ -449,7 +449,7 @@ khui_cw_begin_custom_prompts(khui_new_creds * c, #endif cw_free_prompts(c); - if(SUCCEEDED(StringCbLength(banner, KHUI_MAXCB_BANNER, &cb)) && + if(SUCCEEDED(StringCbLength(banner, KHUI_MAXCB_BANNER, &cb)) && cb > 0) { cb += sizeof(wchar_t); c->banner = PMALLOC(cb); @@ -458,7 +458,7 @@ khui_cw_begin_custom_prompts(khui_new_creds * c, c->banner = NULL; } - if(SUCCEEDED(StringCbLength(pname, KHUI_MAXCB_PNAME, &cb)) && + if(SUCCEEDED(StringCbLength(pname, KHUI_MAXCB_PNAME, &cb)) && cb > 0) { cb += sizeof(wchar_t); @@ -483,7 +483,7 @@ khui_cw_begin_custom_prompts(khui_new_creds * c, c->n_prompts = 0; c->nc_prompts = 0; - PostMessage(c->hwnd, KHUI_WM_NC_NOTIFY, + PostMessage(c->hwnd, KHUI_WM_NC_NOTIFY, MAKEWPARAM(0, WMNC_SET_PROMPTS), (LPARAM) c); } @@ -492,11 +492,11 @@ khui_cw_begin_custom_prompts(khui_new_creds * c, return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI -khui_cw_add_prompt(khui_new_creds * c, - khm_int32 type, - wchar_t * prompt, - wchar_t * def, +KHMEXP khm_int32 KHMAPI +khui_cw_add_prompt(khui_new_creds * c, + khm_int32 type, + wchar_t * prompt, + wchar_t * def, khm_int32 flags) { khui_new_creds_prompt * p; @@ -519,7 +519,7 @@ khui_cw_add_prompt(khui_new_creds * c, LeaveCriticalSection(&c->cs); if(c->n_prompts == c->nc_prompts) { - PostMessage(c->hwnd, KHUI_WM_NC_NOTIFY, + PostMessage(c->hwnd, KHUI_WM_NC_NOTIFY, MAKEWPARAM(0, WMNC_SET_PROMPTS), (LPARAM) c); /* once we are done adding prompts, switch to the auth panel */ @@ -527,8 +527,8 @@ khui_cw_add_prompt(khui_new_creds * c, /* Actually, don't. Doing so can mean an unexpected panel switch if fiddling on some other panel causes a change in custom prompts. */ - SendMessage(c->hwnd, KHUI_WM_NC_NOTIFY, - MAKEWPARAM(0, WMNC_DIALOG_SWITCH_PANEL), + SendMessage(c->hwnd, KHUI_WM_NC_NOTIFY, + MAKEWPARAM(0, WMNC_DIALOG_SWITCH_PANEL), (LPARAM) c); #endif } @@ -536,7 +536,7 @@ khui_cw_add_prompt(khui_new_creds * c, return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_cw_get_prompt_count(khui_new_creds * c, khm_size * np) { @@ -547,9 +547,9 @@ khui_cw_get_prompt_count(khui_new_creds * c, return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI -khui_cw_get_prompt(khui_new_creds * c, - khm_size idx, +KHMEXP khm_int32 KHMAPI +khui_cw_get_prompt(khui_new_creds * c, + khm_size idx, khui_new_creds_prompt ** prompt) { khm_int32 rv; @@ -599,7 +599,7 @@ khuiint_trim_str(wchar_t * s, khm_size cch) { *last_ws = L'\0'; } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_cw_sync_prompt_values(khui_new_creds * c) { khm_size i; @@ -634,10 +634,10 @@ khui_cw_sync_prompt_values(khui_new_creds * c) return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI -khui_cw_get_prompt_value(khui_new_creds * c, - khm_size idx, - wchar_t * buf, +KHMEXP khm_int32 KHMAPI +khui_cw_get_prompt_value(khui_new_creds * c, + khm_size idx, + wchar_t * buf, khm_size *cbbuf) { khui_new_creds_prompt * p; @@ -672,9 +672,9 @@ khui_cw_get_prompt_value(khui_new_creds * c, return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI -khui_cw_set_response(khui_new_creds * c, - khm_int32 type, +KHMEXP khm_int32 KHMAPI +khui_cw_set_response(khui_new_creds * c, + khm_int32 type, khm_int32 response) { khui_new_creds_by_type * t = NULL; diff --git a/src/windows/identity/uilib/intalert.h b/src/windows/identity/uilib/intalert.h index dc4fbc6ef..498c8488f 100644 --- a/src/windows/identity/uilib/intalert.h +++ b/src/windows/identity/uilib/intalert.h @@ -88,14 +88,14 @@ typedef struct tag_khui_alert { ::khui_alert_flags. Do not modify directly. */ - kherr_context * err_context; + kherr_context * err_context; /*!< If non-NULL at the time the alert window is shown, this indicates that the alert window should provide an error viewer for the given error context. */ - kherr_event * err_event; + kherr_event * err_event; /*!< If non-NULL at the time the alert window is shown, this indicates that the alert window should provide an @@ -110,7 +110,7 @@ typedef struct tag_khui_alert { khui_action_context ctx; /*!< Context to which this alert applies to. */ - khm_int32 response; + khm_int32 response; /*!< Once the alert is displayed to the user, when the user clicks one of the command buttons, the command diff --git a/src/windows/identity/uilib/khaction.h b/src/windows/identity/uilib/khaction.h index cd6ad8e5e..479e39230 100644 --- a/src/windows/identity/uilib/khaction.h +++ b/src/windows/identity/uilib/khaction.h @@ -470,7 +470,7 @@ khui_menu_get_size(khui_menu_def * d); KHMEXP khui_action_ref * khui_menu_get_action(khui_menu_def * d, khm_size idx); -/*! \brief Action scope identifiers +/*! \brief Action scope identifiers The scope identifier is a value which describes the scope of the cursor context. See documentation on individual scope identifiers @@ -485,7 +485,7 @@ khui_menu_get_action(khui_menu_def * d, khm_size idx); selected. Note that the scope typically only apply to cursor contexts and - not the selection context. Please see + not the selection context. Please see \ref khui_context "UI Contexts" for more information. \see \ref khui_context "UI Contexts" @@ -494,11 +494,11 @@ typedef enum tag_khui_scope { KHUI_SCOPE_NONE, /*!< No context. Nothing is selected. */ - KHUI_SCOPE_IDENT, + KHUI_SCOPE_IDENT, /*!< Identity. The selection is the entire identity specified in the \a identity field of the context. */ - KHUI_SCOPE_CREDTYPE, + KHUI_SCOPE_CREDTYPE, /*!< A credentials type. The selection is an entire credentials type. If \a identity is non-NULL, then the scope is all the credentials of type \a cred_type which belong to \a identity. @@ -627,10 +627,10 @@ typedef struct tag_khui_action_context { \note This function should only be called from the UI thread. */ -KHMEXP void KHMAPI -khui_context_set(khui_scope scope, - khm_handle identity, - khm_int32 cred_type, +KHMEXP void KHMAPI +khui_context_set(khui_scope scope, + khm_handle identity, + khm_int32 cred_type, khm_handle cred, khui_header *headers, khm_size n_headers, @@ -685,10 +685,10 @@ khui_context_set(khui_scope scope, \note This function should only be called from the UI thread. */ -KHMEXP void KHMAPI -khui_context_set_ex(khui_scope scope, - khm_handle identity, - khm_int32 cred_type, +KHMEXP void KHMAPI +khui_context_set_ex(khui_scope scope, + khm_handle identity, + khm_int32 cred_type, khm_handle cred, khui_header *headers, khm_size n_headers, @@ -717,7 +717,7 @@ khui_context_set_indirect(khui_action_context * ctx); \note The returned context should not be modified prior to calling khui_context_release(). */ -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_context_get(khui_action_context * ctx); /*! \brief Create a new UI context @@ -745,7 +745,7 @@ khui_context_create(khui_action_context * ctx, \note The context should not have been modified between calling khui_context_get() and khui_context_release() */ -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_context_release(khui_action_context * ctx); /*! \brief Reset the UI context @@ -753,7 +753,7 @@ khui_context_release(khui_action_context * ctx); Nullifies the current UI context and releases any holds obtained on objects related to the previous context. */ -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_context_reset(void); /*! \brief Refresh context data @@ -770,7 +770,7 @@ khui_context_reset(void); khui_context_refresh() should be called to adjust the state of the ::KHUI_ACTION_SET_DEF_ID action. */ -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_context_refresh(void); /*! \brief A filter function that filters for credentials in the cursor context diff --git a/src/windows/identity/uilib/khactiondef.h b/src/windows/identity/uilib/khactiondef.h index 33d8347eb..f159771a1 100644 --- a/src/windows/identity/uilib/khactiondef.h +++ b/src/windows/identity/uilib/khactiondef.h @@ -73,7 +73,7 @@ #define KHUI_ACTION_VIEW_ALL_IDS (KHUI_ACTION_BASE + 37) /*@}*/ -/*! \name Pseudo actions +/*! \name Pseudo actions Pseudo actions do not trigger any specific function, but acts as a signal of some generic event which will be interpreted based on diff --git a/src/windows/identity/uilib/khalerts.h b/src/windows/identity/uilib/khalerts.h index 751abce01..d4e44d8de 100644 --- a/src/windows/identity/uilib/khalerts.h +++ b/src/windows/identity/uilib/khalerts.h @@ -66,7 +66,7 @@ typedef struct tag_khui_alert khui_alert; /*! \brief Flags for an alert */ enum khui_alert_flags { - KHUI_ALERT_FLAG_FREE_STRUCT =0x00000001, + KHUI_ALERT_FLAG_FREE_STRUCT =0x00000001, /*!< Internal. Free the structure once the alert is done. */ KHUI_ALERT_FLAG_FREE_TITLE =0x00000002, @@ -144,7 +144,7 @@ typedef enum tag_khui_alert_types { The returned result is a held pointer to a ::khui_alert object. Use khui_alert_release() to release the object. */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_alert_create_empty(khui_alert ** result); /*! \brief Create a simple alert object @@ -163,33 +163,33 @@ khui_alert_create_empty(khui_alert ** result); \param[out] result Receives a held pointer to a ::khui_alert object upon successful completion. */ -KHMEXP khm_int32 KHMAPI -khui_alert_create_simple(const wchar_t * title, - const wchar_t * message, - khm_int32 severity, +KHMEXP khm_int32 KHMAPI +khui_alert_create_simple(const wchar_t * title, + const wchar_t * message, + khm_int32 severity, khui_alert ** result); /*! \brief Set the title of an alert object The title is limited by ::KHUI_MAXCCH_TITLE. */ -KHMEXP khm_int32 KHMAPI -khui_alert_set_title(khui_alert * alert, +KHMEXP khm_int32 KHMAPI +khui_alert_set_title(khui_alert * alert, const wchar_t * title); /*! \brief Set the message of an alert object The message is limited by ::KHUI_MAXCCH_MESSAGE. */ -KHMEXP khm_int32 KHMAPI -khui_alert_set_message(khui_alert * alert, +KHMEXP khm_int32 KHMAPI +khui_alert_set_message(khui_alert * alert, const wchar_t * message); -/*! \brief Set the suggestion of an alert object +/*! \brief Set the suggestion of an alert object The suggestion is limited by ::KHUI_MAXCCH_SUGGESTION */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_alert_set_suggestion(khui_alert * alert, const wchar_t * suggestion); @@ -197,8 +197,8 @@ khui_alert_set_suggestion(khui_alert * alert, The severity value is one of ::tag_kherr_severity */ -KHMEXP khm_int32 KHMAPI -khui_alert_set_severity(khui_alert * alert, +KHMEXP khm_int32 KHMAPI +khui_alert_set_severity(khui_alert * alert, khm_int32 severity); /*! \brief Sets the flags of the alert @@ -215,15 +215,15 @@ khui_alert_set_flags(khui_alert * alert, khm_int32 mask, khm_int32 flags); \see khui_alert_add_command() */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_alert_clear_commands(khui_alert * alert); /*! \brief Add a command to an alert object The command ID should be a valid registered action. */ -KHMEXP khm_int32 KHMAPI -khui_alert_add_command(khui_alert * alert, +KHMEXP khm_int32 KHMAPI +khui_alert_add_command(khui_alert * alert, khm_int32 command_id); /*! \brief Set the type of alert @@ -261,15 +261,15 @@ khui_alert_get_response(khui_alert * alert); The method used to display the alert is as follows: - - A balloon alert will be shown if one of the following is true: - - The NetIDMgr application is minimized or in the background. - - ::KHUI_ALERT_FLAG_REQUEST_BALLOON is specified in \a flags. + - A balloon alert will be shown if one of the following is true: + - The NetIDMgr application is minimized or in the background. + - ::KHUI_ALERT_FLAG_REQUEST_BALLOON is specified in \a flags. - Otherwise an alert window will be shown. If the message, title of the alert is too long to fit in a balloon prompt, there's a suggestion or if there are custom commands then a placeholder balloon prompt will be shown which when clicked on, - shows the actual alert in an alert window. + shows the actual alert in an alert window. An exception is when ::KHUI_ALERT_FLAG_DEFACTION is specified in flags. In this case instead of a placeholder balloon prompt, one @@ -312,7 +312,7 @@ khui_alert_get_response(khui_alert * alert); retrieved via a call to khui_alert_get_response(). */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_alert_show(khui_alert * alert); /*! \brief Display a modal alert @@ -341,9 +341,9 @@ khui_alert_queue(khui_alert * alert); \see khui_alert_show() */ -KHMEXP khm_int32 KHMAPI -khui_alert_show_simple(const wchar_t * title, - const wchar_t * message, +KHMEXP khm_int32 KHMAPI +khui_alert_show_simple(const wchar_t * title, + const wchar_t * message, khm_int32 severity); /*! \brief Obtain a hold on the alert @@ -353,7 +353,7 @@ khui_alert_show_simple(const wchar_t * title, Use khui_alert_release() to release the hold. */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_alert_hold(khui_alert * alert); /*! \brief Release the hold on the alert @@ -362,10 +362,10 @@ khui_alert_hold(khui_alert * alert); return a held pointer to an alert or implicitly obtains a hold on it need to be undone through a call to khui_alert_release(). */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_alert_release(khui_alert * alert); -/*! \brief Lock an alert +/*! \brief Lock an alert Locking an alert disallows any other thread from accessing the alert at the same time. NetIDMgr keeps a global list of all alert @@ -387,14 +387,14 @@ khui_alert_release(khui_alert * alert); require obtaining a lock, as they perform synchronization internally. */ -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_alert_lock(khui_alert * alert); -/*! \brief Unlock an alert +/*! \brief Unlock an alert \see khui_alert_lock() */ -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_alert_unlock(khui_alert * alert); /*!@}*/ diff --git a/src/windows/identity/uilib/khconfigui.h b/src/windows/identity/uilib/khconfigui.h index bbc712a36..16a83c024 100644 --- a/src/windows/identity/uilib/khconfigui.h +++ b/src/windows/identity/uilib/khconfigui.h @@ -204,7 +204,7 @@ typedef struct tag_khui_config_node_reg { */ #define CFGDLG_WIDTH 255 -/*! \brief Height of a configuration dialog in dialog units +/*! \brief Height of a configuration dialog in dialog units \see ::CFGDLG_WIDTH */ @@ -231,7 +231,7 @@ typedef struct tag_khui_config_node_reg { */ typedef khm_handle khui_config_node; -/*! \brief Initialization data passed in to a subpanel +/*! \brief Initialization data passed in to a subpanel When creating a subpanel, a pointer to the following strucutred will be passed in as the creation parameter for the dialog. @@ -415,7 +415,7 @@ khui_cfg_get_next(khui_config_node node, KHMEXP khm_int32 KHMAPI khui_cfg_get_next_release(khui_config_node * node); -/*! \brief Get the name of a configuration node +/*! \brief Get the name of a configuration node Gets the name (not the short description or the long description) of the given configuration node. @@ -464,7 +464,7 @@ khui_cfg_get_param_inst(khui_config_node node, This function is used internally by NetIDMgr. Do not use. */ KHMEXP void KHMAPI -khui_cfg_set_hwnd_inst(khui_config_node node, +khui_cfg_set_hwnd_inst(khui_config_node node, khui_config_node noderef, HWND hwnd); @@ -473,7 +473,7 @@ khui_cfg_set_hwnd_inst(khui_config_node node, This function is used internally by NetIDMgr. Do not use. */ KHMEXP void KHMAPI -khui_cfg_set_param_inst(khui_config_node node, +khui_cfg_set_param_inst(khui_config_node node, khui_config_node noderef, LPARAM param); @@ -581,16 +581,16 @@ khui_cfg_init_dialog_data(HWND hwnd_dlg, khui_config_init_data ** new_data, void ** extra); -/*! \brief Utility function: Retrieves dialog data +/*! \brief Utility function: Retrieves dialog data Retrieves the dialog data previoulsy stored using khui_cfg_init_dialog_data(). - \param[in] hwnd_dlg Handle to the dialog box + \param[in] hwnd_dlg Handle to the dialog box \param[out] data Receives a pointer to the ::khui_config_init_data block. - + \param[out] extra Receives a pointer to the extra memory allocated. Optional (set to NULL if this value is not needed). */ diff --git a/src/windows/identity/uilib/khhtlink.h b/src/windows/identity/uilib/khhtlink.h index be6abb21c..5cae47682 100644 --- a/src/windows/identity/uilib/khhtlink.h +++ b/src/windows/identity/uilib/khhtlink.h @@ -27,10 +27,10 @@ #ifndef __KHIMAIRA_KHHTLINK_H #define __KHIMAIRA_KHHTLINK_H -/*! \addtogroup khui +/*! \addtogroup khui @{ */ -/*! \defgroup khui_hyperlink Hyperlink +/*! \defgroup khui_hyperlink Hyperlink @{*/ /*! \brief A hyperlink diff --git a/src/windows/identity/uilib/khnewcred.h b/src/windows/identity/uilib/khnewcred.h index db70b41f8..67531c117 100644 --- a/src/windows/identity/uilib/khnewcred.h +++ b/src/windows/identity/uilib/khnewcred.h @@ -34,7 +34,7 @@ /*! \addtogroup khui @{ */ -/*! \defgroup khui_cred Credentials acquisition +/*! \defgroup khui_cred Credentials acquisition Declarations associated with credentials acquisition. @@ -68,7 +68,7 @@ window as a ::KHUI_WM_NC_NOTIFY message. */ enum khui_wm_nc_notifications { - WMNC_DIALOG_EXPAND = 1, + WMNC_DIALOG_EXPAND = 1, /*!< The dialog is switching from basic to advanced mode or vice versa. @@ -82,7 +82,7 @@ enum khui_wm_nc_notifications { WMNC_DIALOG_SETUP, /*!< Sent to the new creds window to notify it that the dialog should create all the type configuration panels. - + Until this message is issued, none of the credentials type panels exist. The credentials type panels will receive WM_INITDIALOG etc as per the normal dialog creation process. @@ -258,7 +258,7 @@ enum khui_wm_nc_notifications { /*!< Sent to the new creds window to set custom prompts. Only sent to the new credentials window. */ - + WMNC_DIALOG_PREPROCESS, /*!< The credentials acquisition process is about to start. @@ -311,7 +311,7 @@ enum khui_wm_nc_notifications { the callback. */ enum khui_wm_nc_ident_notify { - WMNC_IDENT_INIT, + WMNC_IDENT_INIT, /*!< Initialize an identity selector for a new credentials dialog. The \a lParam parameter contains a handle to the dialog window which will contain the identity selector @@ -341,7 +341,7 @@ enum khui_wm_nc_ident_notify { @{*/ /*! \brief Switch the panel - + The \a id attribute of the link specifies the ordinal of the panel to switch to. */ @@ -465,7 +465,7 @@ typedef struct tag_khui_new_creds { /*!\brief No known response */ #define KHUI_NC_RESPONSE_NONE 0 -/*!\brief It is okay to exit the dialog now +/*!\brief It is okay to exit the dialog now This is the default, which is why it has a value of zero. In order to prevent the dialog from exiting, set the @@ -691,7 +691,7 @@ typedef struct tag_khui_new_creds_by_type { /*!\name Flags for khui_new_creds_by_type Note that KHUI_NC_RESPONSE_SUCCESS, KHUI_NC_RESPONSE_FAILED, - KHUI_NC_RESPONSE_PENDING are also stored in the flags. + KHUI_NC_RESPONSE_PENDING are also stored in the flags. @{*/ #define KHUI_NCT_FLAG_PROCESSED 1024 @@ -817,7 +817,7 @@ typedef struct tag_khui_control_row { \see khui_cw_destroy_cred_blob() */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_cw_create_cred_blob(khui_new_creds ** c); /*! \brief Destroy a ::khui_new_creds object @@ -831,7 +831,7 @@ khui_cw_create_cred_blob(khui_new_creds ** c); \see khui_cw_create_cred_blob() */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_cw_destroy_cred_blob(khui_new_creds *c); /*! \brief Lock the new_creds object @@ -847,17 +847,17 @@ khui_cw_destroy_cred_blob(khui_new_creds *c); It is not necessary to lock a new credentials object when modifying it using the NetIDMgr API. */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_cw_lock_nc(khui_new_creds * c); /*! \brief Unlock a new_creds object \see khui_cw_lock_nc() */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_cw_unlock_nc(khui_new_creds * c); -/*! \brief Add a new panel to a new credentials acquisition window +/*! \brief Add a new panel to a new credentials acquisition window See the description of ::khui_new_cred_panel for information on how to populate it to describe a credentials type panel. @@ -883,16 +883,16 @@ khui_cw_unlock_nc(khui_new_creds * c); \see ::khui_new_cred_panel \see ::khui_new_creds */ -KHMEXP khm_int32 KHMAPI -khui_cw_add_type(khui_new_creds * c, +KHMEXP khm_int32 KHMAPI +khui_cw_add_type(khui_new_creds * c, khui_new_creds_by_type * t); /*! \brief Remove a panel from a new credentials acquisition window \see khui_cw_add_type() */ -KHMEXP khm_int32 KHMAPI -khui_cw_del_type(khui_new_creds * c, +KHMEXP khm_int32 KHMAPI +khui_cw_del_type(khui_new_creds * c, khm_int32 type); /*! \brief Find the panel belonging to a particular credentials type @@ -902,9 +902,9 @@ khui_cw_del_type(khui_new_creds * c, \see khui_cw_add_type() */ -KHMEXP khm_int32 KHMAPI -khui_cw_find_type(khui_new_creds * c, - khm_int32 type, +KHMEXP khm_int32 KHMAPI +khui_cw_find_type(khui_new_creds * c, + khm_int32 type, khui_new_creds_by_type **t); /*! \brief Enable/disable a particular credentials type @@ -914,7 +914,7 @@ khui_cw_find_type(khui_new_creds * c, participating in the new credentials acquisition. However, the user will be prevented from interacting with the specific panel. */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_cw_enable_type(khui_new_creds * c, khm_int32 type, khm_boolean enable); @@ -935,8 +935,8 @@ khui_cw_enable_type(khui_new_creds * c, identities associated with the new credentials acquisition dialog will also be discarded. */ -KHMEXP khm_int32 KHMAPI -khui_cw_set_primary_id(khui_new_creds * c, +KHMEXP khm_int32 KHMAPI +khui_cw_set_primary_id(khui_new_creds * c, khm_handle id); /*! \brief Add an additional identity to the new credentials acquisition @@ -949,15 +949,15 @@ khui_cw_set_primary_id(khui_new_creds * c, Calling this function with \a id of NULL does nothing. */ -KHMEXP khm_int32 KHMAPI -khui_cw_add_identity(khui_new_creds * c, +KHMEXP khm_int32 KHMAPI +khui_cw_add_identity(khui_new_creds * c, khm_handle id); /*! \brief Clear all custom prompts Removes all the custom prompts from the new credentials dialog. */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_cw_clear_prompts(khui_new_creds * c); /*! \brief Synchronize custom prompt values @@ -967,7 +967,7 @@ khui_cw_clear_prompts(khui_new_creds * c); values in the ::khui_new_creds object periodically. However, the values may lose sync intermittently. */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_cw_sync_prompt_values(khui_new_creds * c); /*! \brief Begin custom prompting @@ -982,10 +982,10 @@ khui_cw_sync_prompt_values(khui_new_creds * c); khui_cw_add_prompt(). The number of promtps that can be added will be exactly \a n_prompts. */ -KHMEXP khm_int32 KHMAPI -khui_cw_begin_custom_prompts(khui_new_creds * c, - khm_size n_prompts, - wchar_t * banner, +KHMEXP khm_int32 KHMAPI +khui_cw_begin_custom_prompts(khui_new_creds * c, + khm_size n_prompts, + wchar_t * banner, wchar_t * name); /*! \brief Add a custom prompt @@ -1016,11 +1016,11 @@ khui_cw_begin_custom_prompts(khui_new_creds * c, \param[in] flags Flags. Combination of ::KHUI_NCPROMPT_FLAG_HIDDEN */ -KHMEXP khm_int32 KHMAPI -khui_cw_add_prompt(khui_new_creds * c, - khm_int32 type, - wchar_t * prompt, - wchar_t * def, +KHMEXP khm_int32 KHMAPI +khui_cw_add_prompt(khui_new_creds * c, + khm_int32 type, + wchar_t * prompt, + wchar_t * def, khm_int32 flags); /*! \brief Retrieve a custom prompt @@ -1029,9 +1029,9 @@ khui_cw_add_prompt(khui_new_creds * c, zero-based index of the prompt to retrieve. The ordering is the same as the order in which khui_cw_add_prompt() was called. */ -KHMEXP khm_int32 KHMAPI -khui_cw_get_prompt(khui_new_creds * c, - khm_size idx, +KHMEXP khm_int32 KHMAPI +khui_cw_get_prompt(khui_new_creds * c, + khm_size idx, khui_new_creds_prompt ** prompt); /*! \brief Get the number of custom prompts @@ -1043,7 +1043,7 @@ khui_cw_get_prompt(khui_new_creds * c, be registered (i.e. the \a n_prompts parameter passed to khui_cw_begin_custom_prompts()). */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_cw_get_prompt_count(khui_new_creds * c, khm_size * np); @@ -1060,10 +1060,10 @@ khui_cw_get_prompt_count(khui_new_creds * c, starting to call khui_cw_get_prompt_value() so that the values returned are up-to-date. */ -KHMEXP khm_int32 KHMAPI -khui_cw_get_prompt_value(khui_new_creds * c, - khm_size idx, - wchar_t * buf, +KHMEXP khm_int32 KHMAPI +khui_cw_get_prompt_value(khui_new_creds * c, + khm_size idx, + wchar_t * buf, khm_size *cbbuf); /*! \brief Set the response for a plugin @@ -1082,7 +1082,7 @@ khui_cw_get_prompt_value(khui_new_creds * c, - ::KHUI_NC_RESPONSE_NOEXIT - ::KHUI_NC_RESPONSE_EXIT */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_cw_set_response(khui_new_creds * c, khm_int32 type, khm_int32 response); @@ -1099,7 +1099,7 @@ khui_cw_set_response(khui_new_creds * c, \return TRUE iff the queried type has reported that it successfully completed the credentials acquision operation. */ -KHMEXP khm_boolean KHMAPI +KHMEXP khm_boolean KHMAPI khui_cw_type_succeeded(khui_new_creds * c, khm_int32 type); diff --git a/src/windows/identity/uilib/khprops.h b/src/windows/identity/uilib/khprops.h index a00c65f7f..181183cbb 100644 --- a/src/windows/identity/uilib/khprops.h +++ b/src/windows/identity/uilib/khprops.h @@ -33,7 +33,7 @@ Property sheets **********************************************************************/ -/*! \addtogroup khui +/*! \addtogroup khui @{*/ @@ -122,7 +122,7 @@ typedef struct tag_khui_property_page { \note Only called by the NetIDMgr application. */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_ps_create_sheet(khui_property_sheet ** sheet); /*! \brief Add a page to a property sheet @@ -163,7 +163,7 @@ khui_ps_create_sheet(khui_property_sheet ** sheet); khui_ps_find_page() to retrieve a pointer to the structure later. */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_ps_add_page(khui_property_sheet * sheet, khm_int32 credtype, khm_int32 ordinal, @@ -181,26 +181,26 @@ khui_ps_find_page(khui_property_sheet * sheet, \note Only called by the NetIDMgr application */ -KHMEXP HWND KHMAPI -khui_ps_show_sheet(HWND parent, +KHMEXP HWND KHMAPI +khui_ps_show_sheet(HWND parent, khui_property_sheet * sheet); /*! \brief Check if the given message belongs to the property sheet \note Only called by the NetIDMgr application */ -KHMEXP LRESULT KHMAPI -khui_ps_check_message(khui_property_sheet * sheet, +KHMEXP LRESULT KHMAPI +khui_ps_check_message(khui_property_sheet * sheet, PMSG msg); /*! \brief Destroy a property sheet and all associated data structures. \note Only called by the NetIDMgr application. */ -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_ps_destroy_sheet(khui_property_sheet * sheet); -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_property_wnd_set_record(HWND hwnd_pwnd, khm_handle record); /*!@}*/ diff --git a/src/windows/identity/uilib/khremote.h b/src/windows/identity/uilib/khremote.h index 3a79d6555..74e71a3d1 100644 --- a/src/windows/identity/uilib/khremote.h +++ b/src/windows/identity/uilib/khremote.h @@ -44,7 +44,7 @@ #define NETID_REALM_SZ 192 #define NETID_TITLE_SZ 256 #define NETID_CCACHE_NAME_SZ 264 - + #define NETID_DLGTYPE_TGT 0 #define NETID_DLGTYPE_CHPASSWD 1 typedef struct { @@ -72,7 +72,7 @@ typedef struct { } out; // Version 1 of this structure ends here } NETID_DLGINFO, *LPNETID_DLGINFO; - + #define NETID_DLGINFO_V1_SZ (10 * sizeof(DWORD) \ + sizeof(WCHAR) * (NETID_TITLE_SZ + \ 2 * NETID_USERNAME_SZ + 2 * NETID_REALM_SZ + \ diff --git a/src/windows/identity/uilib/khrescache.h b/src/windows/identity/uilib/khrescache.h index 63baa1f72..2f0ba275b 100644 --- a/src/windows/identity/uilib/khrescache.h +++ b/src/windows/identity/uilib/khrescache.h @@ -29,16 +29,16 @@ #include<khdefs.h> -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_init_rescache(void); -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_exit_rescache(void); -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_cache_bitmap(UINT id, HBITMAP hbm); -KHMEXP HBITMAP KHMAPI +KHMEXP HBITMAP KHMAPI khui_get_cached_bitmap(UINT id); typedef struct khui_ilist_t { @@ -58,7 +58,7 @@ typedef struct khui_bitmap_t { int cy; } khui_bitmap; -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_bitmap_from_hbmp(khui_bitmap * kbm, HBITMAP hbm); KHMEXP void KHMAPI @@ -68,27 +68,27 @@ KHMEXP void KHMAPI khui_draw_bitmap(HDC hdc, int x, int y, khui_bitmap * kbm); /* image lists */ -KHMEXP khui_ilist * KHMAPI +KHMEXP khui_ilist * KHMAPI khui_create_ilist(int cx, int cy, int n, int ng, int opt); -KHMEXP BOOL KHMAPI +KHMEXP BOOL KHMAPI khui_delete_ilist(khui_ilist * il); -KHMEXP int KHMAPI +KHMEXP int KHMAPI khui_ilist_add_masked(khui_ilist * il, HBITMAP hbm, COLORREF cbkg); -KHMEXP int KHMAPI -khui_ilist_add_masked_id(khui_ilist *il, HBITMAP hbm, +KHMEXP int KHMAPI +khui_ilist_add_masked_id(khui_ilist *il, HBITMAP hbm, COLORREF cbkg, int id); -KHMEXP int KHMAPI +KHMEXP int KHMAPI khui_ilist_lookup_id(khui_ilist *il, int id); -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_ilist_draw(khui_ilist * il, int idx, HDC dc, int x, int y, int opt); -KHMEXP void KHMAPI -khui_ilist_draw_bg(khui_ilist * il, int idx, HDC dc, int x, int y, +KHMEXP void KHMAPI +khui_ilist_draw_bg(khui_ilist * il, int idx, HDC dc, int x, int y, int opt, COLORREF bgcolor); #define khui_ilist_draw_id(il, id, dc, x, y, opt) \ diff --git a/src/windows/identity/uilib/khtracker.h b/src/windows/identity/uilib/khtracker.h index 38be29a13..86adb344a 100644 --- a/src/windows/identity/uilib/khtracker.h +++ b/src/windows/identity/uilib/khtracker.h @@ -29,7 +29,7 @@ #include<time.h> -/*! \addtogroup khui +/*! \addtogroup khui @{ */ diff --git a/src/windows/identity/uilib/propsheet.c b/src/windows/identity/uilib/propsheet.c index 068bcf00c..76e74043d 100644 --- a/src/windows/identity/uilib/propsheet.c +++ b/src/windows/identity/uilib/propsheet.c @@ -44,7 +44,7 @@ ps_exit(void) { DeleteCriticalSection(&cs_props); } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_ps_create_sheet(khui_property_sheet ** sheet) { khui_property_sheet * ps; @@ -61,7 +61,7 @@ khui_ps_create_sheet(khui_property_sheet ** sheet) return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_ps_add_page(khui_property_sheet * sheet, khm_int32 credtype, khm_int32 ordinal, @@ -77,7 +77,7 @@ khui_ps_add_page(khui_property_sheet * sheet, p->ordinal = ordinal; p->p_page = ppage; - EnterCriticalSection(&cs_props); + EnterCriticalSection(&cs_props); QPUT(sheet, p); sheet->n_pages++; LeaveCriticalSection(&cs_props); @@ -88,7 +88,7 @@ khui_ps_add_page(khui_property_sheet * sheet, return KHM_ERROR_SUCCESS; } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_ps_find_page(khui_property_sheet * sheet, khm_int32 credtype, khui_property_page ** page) @@ -114,7 +114,7 @@ khui_ps_find_page(khui_property_sheet * sheet, } } -int __cdecl +int __cdecl ps_order_func(const void *l, const void * r) { khui_property_page * lp; khui_property_page * rp; @@ -128,7 +128,7 @@ ps_order_func(const void *l, const void * r) { return lp->ordinal - rp->ordinal; } -KHMEXP HWND KHMAPI +KHMEXP HWND KHMAPI khui_ps_show_sheet(HWND parent, khui_property_sheet * s) { khui_property_page * p; @@ -188,8 +188,8 @@ khui_ps_show_sheet(HWND parent, khui_property_sheet * s) return hw; } -KHMEXP LRESULT KHMAPI -khui_ps_check_message(khui_property_sheet * sheet, +KHMEXP LRESULT KHMAPI +khui_ps_check_message(khui_property_sheet * sheet, PMSG pmsg) { LRESULT lr; @@ -200,7 +200,7 @@ khui_ps_check_message(khui_property_sheet * sheet, lr = PropSheet_IsDialogMessage(sheet->hwnd, pmsg); if(lr) { sheet->hwnd_page = PropSheet_GetCurrentPageHwnd(sheet->hwnd); - if(sheet->hwnd_page == NULL && + if(sheet->hwnd_page == NULL && sheet->status == KHUI_PS_STATUS_RUNNING) sheet->status = KHUI_PS_STATUS_DONE; @@ -209,7 +209,7 @@ khui_ps_check_message(khui_property_sheet * sheet, return lr; } -KHMEXP khm_int32 KHMAPI +KHMEXP khm_int32 KHMAPI khui_ps_destroy_sheet(khui_property_sheet * sheet) { khui_property_page * p; diff --git a/src/windows/identity/uilib/rescache.c b/src/windows/identity/uilib/rescache.c index 7715cfdee..7b770b3e3 100644 --- a/src/windows/identity/uilib/rescache.c +++ b/src/windows/identity/uilib/rescache.c @@ -32,7 +32,7 @@ hashtable * h_bitmaps; -khm_int32 +khm_int32 hash_id(const void *p) { #pragma warning(push) #pragma warning(disable: 4311) @@ -40,7 +40,7 @@ hash_id(const void *p) { #pragma warning(pop) } -khm_int32 +khm_int32 comp_id(const void *p1, const void *p2) { #pragma warning(push) #pragma warning(disable: 4311) @@ -48,33 +48,33 @@ comp_id(const void *p1, const void *p2) { #pragma warning(pop) } -void +void del_ref_object(const void *k, void * data) { DeleteObject((HGDIOBJ) data); } -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_init_rescache(void) { - h_bitmaps = hash_new_hashtable(127, hash_id, comp_id, NULL, + h_bitmaps = hash_new_hashtable(127, hash_id, comp_id, NULL, del_ref_object); } -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_exit_rescache(void) { hash_del_hashtable(h_bitmaps); } -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_cache_bitmap(UINT id, HBITMAP hbm) { hash_add(h_bitmaps, (void *)(size_t) id, (void *) hbm); } -KHMEXP HBITMAP KHMAPI +KHMEXP HBITMAP KHMAPI khui_get_cached_bitmap(UINT id) { return (HBITMAP) hash_lookup(h_bitmaps, (void *)(size_t) id); } -KHMEXP khui_ilist * KHMAPI +KHMEXP khui_ilist * KHMAPI khui_create_ilist(int cx, int cy, int n, int ng, int opt) { BITMAPV5HEADER head; HDC hdc; @@ -110,7 +110,7 @@ khui_create_ilist(int cx, int cy, int n, int ng, int opt) { return il; } -KHMEXP BOOL KHMAPI +KHMEXP BOOL KHMAPI khui_delete_ilist(khui_ilist * il) { DeleteObject(il->img); DeleteObject(il->mask); @@ -120,10 +120,10 @@ khui_delete_ilist(khui_ilist * il) { return TRUE; } -KHMEXP int KHMAPI -khui_ilist_add_masked_id(khui_ilist *il, - HBITMAP hbm, - COLORREF cbkg, +KHMEXP int KHMAPI +khui_ilist_add_masked_id(khui_ilist *il, + HBITMAP hbm, + COLORREF cbkg, int id) { int idx; @@ -135,7 +135,7 @@ khui_ilist_add_masked_id(khui_ilist *il, return idx; } -KHMEXP int KHMAPI +KHMEXP int KHMAPI khui_ilist_lookup_id(khui_ilist *il, int id) { int i; @@ -147,7 +147,7 @@ khui_ilist_lookup_id(khui_ilist *il, int id) { return -1; } -KHMEXP int KHMAPI +KHMEXP int KHMAPI khui_ilist_add_masked(khui_ilist * il, HBITMAP hbm, COLORREF cbkg) { HDC dcr,dci,dct,dcb; HBITMAP hb_oldb, hb_oldi, hb_oldt; @@ -194,12 +194,12 @@ khui_ilist_add_masked(khui_ilist * il, HBITMAP hbm, COLORREF cbkg) { return i; } -KHMEXP void KHMAPI -khui_ilist_draw(khui_ilist * il, - int idx, - HDC dc, - int x, - int y, +KHMEXP void KHMAPI +khui_ilist_draw(khui_ilist * il, + int idx, + HDC dc, + int x, + int y, int opt) { HDC dci; HBITMAP hb_oldi; @@ -220,13 +220,13 @@ khui_ilist_draw(khui_ilist * il, DeleteDC(dci); } -KHMEXP void KHMAPI -khui_ilist_draw_bg(khui_ilist * il, - int idx, - HDC dc, - int x, - int y, - int opt, +KHMEXP void KHMAPI +khui_ilist_draw_bg(khui_ilist * il, + int idx, + HDC dc, + int x, + int y, + int opt, COLORREF bgcolor) { HDC dcm; HBITMAP hb_oldm, hb_mem; @@ -253,7 +253,7 @@ khui_ilist_draw_bg(khui_ilist * il, BitBlt(dc,x,y,il->cx,il->cy,dcm,0,0,SRCCOPY); SelectObject(dcm, hb_oldm); - + DeleteObject(hb_mem); DeleteObject(hbr); @@ -261,7 +261,7 @@ khui_ilist_draw_bg(khui_ilist * il, } -KHMEXP void KHMAPI +KHMEXP void KHMAPI khui_bitmap_from_hbmp(khui_bitmap * kbm, HBITMAP hbm) { HDC hdc; diff --git a/src/windows/identity/uilib/trackerwnd.c b/src/windows/identity/uilib/trackerwnd.c index cc434d95f..70c3137f7 100644 --- a/src/windows/identity/uilib/trackerwnd.c +++ b/src/windows/identity/uilib/trackerwnd.c @@ -105,8 +105,8 @@ time_t ticks_to_time_t(int ticks, time_t tmin) NOTE: Runs in the context of the UI thread */ -void -initialize_tracker(HWND hwnd, +void +initialize_tracker(HWND hwnd, khui_tracker * tc) { RECT r; @@ -142,7 +142,7 @@ initialize_tracker(HWND hwnd, NOTE: Runs in the context of the UI thread */ -LRESULT CALLBACK +LRESULT CALLBACK duration_tracker_proc(HWND hwnd, UINT uMsg, WPARAM wParam, @@ -184,7 +184,7 @@ duration_tracker_proc(HWND hwnd, SetTextAlign(hdc, TA_LEFT | TA_TOP | TA_NOUPDATECP); TextOut(hdc, tc->lbl_lx, tc->lbl_y, buf, (int) wcslen(buf)); - + TimetToFileTimeInterval(tc->max, &ft); cbbuf = sizeof(buf); FtIntervalToString(&ft, buf, &cbbuf); @@ -195,7 +195,7 @@ duration_tracker_proc(HWND hwnd, ((HFONT) SelectObject((hdc), (HGDIOBJ)(HFONT)(hfold))); ReleaseDC(hwnd, hdc); - + return lr; } break; @@ -240,9 +240,9 @@ duration_tracker_proc(HWND hwnd, /* Create the subclassed duration slider on behalf of an edit control */ -void -create_edit_sliders(HWND hwnd, - HWND hwnd_dlg, +void +create_edit_sliders(HWND hwnd, + HWND hwnd_dlg, khui_tracker * tc) { RECT r; @@ -258,19 +258,19 @@ create_edit_sliders(HWND hwnd, rs.right -= rs.left; rs.bottom -= rs.top; - tc->hw_slider = + tc->hw_slider = CreateWindowEx(WS_EX_OVERLAPPEDWINDOW, TRACKBAR_CLASS, L"NetIDMgrTimeTickerTrackbar", WS_POPUP | TBS_AUTOTICKS | TBS_BOTTOM | #if (_WIN32_IE >= 0x0501) - TBS_DOWNISLEFT | + TBS_DOWNISLEFT | #endif TBS_HORZ | WS_CLIPCHILDREN, r.left,r.bottom,rs.right,rs.bottom, hwnd, NULL, - (HINSTANCE)(DWORD_PTR) + (HINSTANCE)(DWORD_PTR) GetWindowLongPtr(hwnd, GWLP_HINSTANCE), NULL); @@ -288,7 +288,7 @@ create_edit_sliders(HWND hwnd, NOTE: Runs in the context of the UI thread */ -LRESULT CALLBACK +LRESULT CALLBACK duration_edit_proc(HWND hwnd, UINT uMsg, WPARAM wParam, @@ -425,8 +425,8 @@ khui_tracker_install(HWND hwnd_edit, khui_tracker * tc) { #pragma warning(push) #pragma warning(disable: 4244) - tc->fn_edit = (WNDPROC)(LONG_PTR) - SetWindowLongPtr(hwnd_edit, GWLP_WNDPROC, + tc->fn_edit = (WNDPROC)(LONG_PTR) + SetWindowLongPtr(hwnd_edit, GWLP_WNDPROC, (LONG_PTR) duration_edit_proc); #pragma warning(pop) } @@ -439,9 +439,9 @@ khui_tracker_reposition(khui_tracker * tc) { GetWindowRect(tc->hw_edit, &r); SetWindowPos(tc->hw_slider, NULL, - r.left, r.bottom, - 0, 0, - SWP_NOOWNERZORDER | SWP_NOSIZE | + r.left, r.bottom, + 0, 0, + SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE); } } @@ -457,7 +457,7 @@ khui_tracker_refresh(khui_tracker * tc) { return; SendMessage(tc->hw_edit, - KHUI_WM_NC_NOTIFY, + KHUI_WM_NC_NOTIFY, MAKEWPARAM(0,WMNC_DIALOG_SETUP), 0); } @@ -472,6 +472,3 @@ khui_tracker_kill_controls(khui_tracker * tc) { tc->fn_edit = NULL; tc->fn_tracker = NULL; } - - - diff --git a/src/windows/identity/uilib/uibind.c b/src/windows/identity/uilib/uibind.c index f2f44cc3e..a03b35da3 100644 --- a/src/windows/identity/uilib/uibind.c +++ b/src/windows/identity/uilib/uibind.c @@ -57,6 +57,3 @@ khui_request_UI_callback(khm_ui_callback cb, void * rock) { return cbdata.rv; } - - - |