Ros-diffs September 2017

ros-diffs@reactos.org

17 participants
284 discussions

[akhaldi] 75870: [FUSION_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 12:34:03 2017 New Revision: 75870 URL: http://svn.reactos.org/svn/reactos?rev=75870&view=rev Log: [FUSION_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/fusion/asmenum.c trunk/rostests/winetests/fusion/asmname.c Modified: trunk/rostests/winetests/fusion/asmenum.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/asmenum.… ============================================================================== --- trunk/rostests/winetests/fusion/asmenum.c [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/asmenum.c [iso-8859-1] Sun Sep 17 12:34:03 2017 @@ -225,79 +225,80 @@ typedef struct _tagASMNAME { struct list entry; - LPSTR data; + char data[1]; } ASMNAME; -static BOOL enum_gac_assemblies(struct list *assemblies, int depth, LPSTR path) -{ +static void enum_gac_assembly_dirs(struct list *assemblies, const char *parent, char path[MAX_PATH]) +{ + static const char format[] = "%s, Version=%s, Culture=%s, PublicKeyToken=%s"; WIN32_FIND_DATAA ffd; - CHAR buf[MAX_PATH]; - CHAR disp[MAX_PATH]; ASMNAME *name; HANDLE hfind; - LPSTR ptr; - - static CHAR parent[MAX_PATH]; - - sprintf(buf, "%s\\*", path); - hfind = FindFirstFileA(buf, &ffd); - if (hfind == INVALID_HANDLE_VALUE) - return FALSE; + int len; + char *ptr, *end = path + strlen( path ); + + lstrcpynA( end, "\\*", path + MAX_PATH - end ); + hfind = FindFirstFileA(path, &ffd); + if (hfind == INVALID_HANDLE_VALUE) return; + end++; do { - if (!lstrcmpA(ffd.cFileName, ".") || !lstrcmpA(ffd.cFileName, "..")) - continue; - - if (depth == 0) + char culture[MAX_PATH]; + + if (!strcmp(ffd.cFileName, ".") || !strcmp(ffd.cFileName, "..")) continue; + + *end = 0; + /* Directories with no dll or exe will not be enumerated */ + snprintf(end, path + MAX_PATH - end, "%s\\%s.dll", ffd.cFileName, parent); + if (GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES) { - lstrcpyA(parent, ffd.cFileName); + snprintf(end, path + MAX_PATH - end, "%s\\%s.exe", ffd.cFileName, parent); + if (GetFileAttributesA(path) == INVALID_FILE_ATTRIBUTES) continue; } - else if (depth == 1) + + if (!(ptr = strchr(ffd.cFileName, '_'))) continue; + *ptr++ = 0; + + if (*ptr != '_') { - char culture[MAX_PATH]; - char dll[MAX_PATH], exe[MAX_PATH]; - - /* Directories with no dll or exe will not be enumerated */ - sprintf(dll, "%s\\%s\\%s.dll", path, ffd.cFileName, parent); - sprintf(exe, "%s\\%s\\%s.exe", path, ffd.cFileName, parent); - if (GetFileAttributesA(dll) == INVALID_FILE_ATTRIBUTES && - GetFileAttributesA(exe) == INVALID_FILE_ATTRIBUTES) - continue; - - ptr = strstr(ffd.cFileName, "_"); - *ptr = '\0'; - ptr++; - - if (*ptr != '_') - { - lstrcpyA(culture, ptr); - *strstr(culture, "_") = '\0'; - } - else - lstrcpyA(culture, "neutral"); - - ptr = strchr(ptr, '_'); - ptr++; - sprintf(buf, ", Version=%s, Culture=%s, PublicKeyToken=%s", - ffd.cFileName, culture, ptr); - lstrcpyA(disp, parent); - lstrcatA(disp, buf); - - name = HeapAlloc(GetProcessHeap(), 0, sizeof(ASMNAME)); - name->data = HeapAlloc(GetProcessHeap(), 0, lstrlenA(disp) + 1); - lstrcpyA(name->data, disp); - list_add_tail(assemblies, &name->entry); - - continue; + lstrcpyA(culture, ptr); + *strchr(culture, '_') = 0; } - - sprintf(buf, "%s\\%s", path, ffd.cFileName); - enum_gac_assemblies(assemblies, depth + 1, buf); + else + lstrcpyA(culture, "neutral"); + + ptr = strchr(ptr, '_'); + ptr++; + len = sizeof(format) + strlen(parent) + strlen(ffd.cFileName) + strlen(culture) + strlen(ptr); + + name = HeapAlloc(GetProcessHeap(), 0, offsetof( ASMNAME, data[len] )); + sprintf( name->data, format, parent, ffd.cFileName, culture, ptr); + list_add_tail(assemblies, &name->entry); } while (FindNextFileA(hfind, &ffd) != 0); FindClose(hfind); - return TRUE; +} + +static void enum_gac_assemblies(struct list *assemblies, char path[MAX_PATH]) +{ + WIN32_FIND_DATAA ffd; + HANDLE hfind; + char *end = path + strlen( path ); + + lstrcpynA( end, "\\*", path + MAX_PATH - end ); + hfind = FindFirstFileA(path, &ffd); + if (hfind == INVALID_HANDLE_VALUE) return; + end++; + + do + { + if (!strcmp(ffd.cFileName, ".") || !strcmp(ffd.cFileName, "..")) continue; + lstrcpynA( end, ffd.cFileName, path + MAX_PATH - end ); + enum_gac_assembly_dirs( assemblies, ffd.cFileName, path ); + } while (FindNextFileA(hfind, &ffd) != 0); + + FindClose(hfind); } static void test_enumerate(void) @@ -319,18 +320,18 @@ to_multibyte(path, buf); lstrcatA(path, "_32"); - enum_gac_assemblies(&assemblies, 0, path); + enum_gac_assemblies(&assemblies, path); to_multibyte(path, buf); lstrcatA(path, "_64"); - enum_gac_assemblies(&assemblies, 0, path); + enum_gac_assemblies(&assemblies, path); to_multibyte(path, buf); lstrcatA(path, "_MSIL"); - enum_gac_assemblies(&assemblies, 0, path); + enum_gac_assemblies(&assemblies, path); to_multibyte(path, buf); - enum_gac_assemblies(&assemblies, 0, path); + enum_gac_assemblies(&assemblies, path); asmenum = NULL; hr = pCreateAssemblyEnum(&asmenum, NULL, NULL, ASM_CACHE_GAC, NULL); @@ -353,7 +354,6 @@ found = TRUE; list_remove(&asmname->entry); - HeapFree(GetProcessHeap(), 0, asmname->data); HeapFree(GetProcessHeap(), 0, asmname); break; } @@ -377,7 +377,6 @@ ok(FALSE, "Assembly not enumerated: %s\n", asmname->data); list_remove(&asmname->entry); - HeapFree(GetProcessHeap(), 0, asmname->data); HeapFree(GetProcessHeap(), 0, asmname); } Modified: trunk/rostests/winetests/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/fusion/asmname.… ============================================================================== --- trunk/rostests/winetests/fusion/asmname.c [iso-8859-1] (original) +++ trunk/rostests/winetests/fusion/asmname.c [iso-8859-1] Sun Sep 17 12:34:03 2017 @@ -360,16 +360,14 @@ DWORD i, size; WCHAR expect[MAX_PATH]; WCHAR str[MAX_PATH]; - CHAR val[MAX_PATH]; for (i = 0; i < ASM_NAME_MAX_PARAMS; i++) { to_widechar(expect, vals[i].val); size = MAX_PATH; - ZeroMemory(str, MAX_PATH); + memset( str, 0xcc, sizeof(str) ); hr = IAssemblyName_GetProperty(name, i, str, &size); - to_multibyte(val, str); ok(hr == vals[i].hr || broken(i >= ASM_NAME_CONFIG_MASK && hr == E_INVALIDARG) || /* .NET 1.1 */ @@ -377,11 +375,15 @@ "%d: prop %d: Expected %08x, got %08x\n", line, i, vals[i].hr, hr); if (hr != E_INVALIDARG) { - if (i == ASM_NAME_PUBLIC_KEY_TOKEN) - ok(!memcmp(vals[i].val, str, size), "Expected a correct ASM_NAME_PUBLIC_KEY_TOKEN\n"); - else - ok(!lstrcmpA(vals[i].val, val), "%d: prop %d: Expected \"%s\", got \"%s\"\n", line, i, vals[i].val, val); ok(size == vals[i].size, "%d: prop %d: Expected %d, got %d\n", line, i, vals[i].size, size); + if (size && size != MAX_PATH) + { + if (i != ASM_NAME_NAME && i != ASM_NAME_CULTURE) + ok( !memcmp( vals[i].val, str, size ), "%d: prop %d: wrong value\n", line, i ); + else + ok( !lstrcmpW( expect, str ), "%d: prop %d: Expected %s, got %s\n", + line, i, wine_dbgstr_w(expect), wine_dbgstr_w(str) ); + } } } }

7 years, 3 months

[akhaldi] 75869: [FUSION] Sync with Wine Staging 2.16. CORE-13762 da03b46 fusion: Use standard wine_dbgstr_longlong.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 12:33:57 2017 New Revision: 75869 URL: http://svn.reactos.org/svn/reactos?rev=75869&view=rev Log: [FUSION] Sync with Wine Staging 2.16. CORE-13762 da03b46 fusion: Use standard wine_dbgstr_longlong. Modified: trunk/reactos/dll/win32/fusion/asmname.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/fusion/asmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/asmname.c… ============================================================================== --- trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fusion/asmname.c [iso-8859-1] Sun Sep 17 12:33:57 2017 @@ -345,9 +345,9 @@ DWORD cbReserved, LPVOID *ppReserved) { - TRACE("(%p, %s, %p, %p, %s, %x%08x, %p, %d, %p)\n", iface, + TRACE("(%p, %s, %p, %p, %s, %s, %p, %d, %p)\n", iface, debugstr_guid(refIID), pUnkReserved1, pUnkReserved2, - debugstr_w(szReserved), (DWORD)(llReserved >> 32), (DWORD)llReserved, + debugstr_w(szReserved), wine_dbgstr_longlong(llReserved), pvReserved, cbReserved, ppReserved); return E_NOTIMPL; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 17 12:33:57 2017 @@ -67,7 +67,7 @@ reactos/dll/win32/dciman32 # Synced to WineStaging-2.9 reactos/dll/win32/faultrep # Synced to WineStaging-2.9 reactos/dll/win32/fontsub # Synced to WineStaging-2.9 -reactos/dll/win32/fusion # Synced to WineStaging-2.9 +reactos/dll/win32/fusion # Synced to WineStaging-2.16 reactos/dll/win32/gdiplus # Synced to WineStaging-2.9 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-2.9 reactos/dll/win32/hlink # Synced to WineStaging-2.9

7 years, 3 months

[akhaldi] 75868: [DBGHELP] Sync with Wine Staging 2.16. CORE-13762 00e27186 dbghelp: Silence a noisy FIXME.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 12:33:49 2017 New Revision: 75868 URL: http://svn.reactos.org/svn/reactos?rev=75868&view=rev Log: [DBGHELP] Sync with Wine Staging 2.16. CORE-13762 00e27186 dbghelp: Silence a noisy FIXME. Modified: trunk/reactos/dll/win32/dbghelp/cpu_arm.c trunk/reactos/dll/win32/dbghelp/dwarf.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/dbghelp/cpu_arm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/cpu_arm.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/cpu_arm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/cpu_arm.c [iso-8859-1] Sun Sep 17 12:33:49 2017 @@ -33,7 +33,11 @@ #ifdef __arm__ case cpu_addr_pc: addr->Offset = ctx->Pc; return TRUE; case cpu_addr_stack: addr->Offset = ctx->Sp; return TRUE; +#ifdef __REACTOS__ case cpu_addr_frame: addr->Offset = ctx->R11; return TRUE; +#else + case cpu_addr_frame: addr->Offset = ctx->Fp; return TRUE; +#endif #endif default: addr->Mode = -1; return FALSE; @@ -116,7 +120,11 @@ /* set frame information */ frame->AddrStack.Offset = context->Sp; frame->AddrReturn.Offset = context->Lr; +#ifdef __REACTOS__ frame->AddrFrame.Offset = context->R11; +#else + frame->AddrFrame.Offset = context->Fp; +#endif frame->AddrPC.Offset = context->Pc; frame->Far = TRUE; @@ -169,8 +177,13 @@ case CV_ARM_R0 + 8: *size = sizeof(ctx->R8); return &ctx->R8; case CV_ARM_R0 + 9: *size = sizeof(ctx->R9); return &ctx->R9; case CV_ARM_R0 + 10: *size = sizeof(ctx->R10); return &ctx->R10; +#ifdef __REACTOS__ case CV_ARM_R0 + 11: *size = sizeof(ctx->R11); return &ctx->R11; case CV_ARM_R0 + 12: *size = sizeof(ctx->R12); return &ctx->R12; +#else + case CV_ARM_R0 + 11: *size = sizeof(ctx->Fp); return &ctx->Fp; + case CV_ARM_R0 + 12: *size = sizeof(ctx->Ip); return &ctx->Ip; +#endif case CV_ARM_SP: *size = sizeof(ctx->Sp); return &ctx->Sp; case CV_ARM_LR: *size = sizeof(ctx->Lr); return &ctx->Lr; Modified: trunk/reactos/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dwarf.c?… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dwarf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/dwarf.c [iso-8859-1] Sun Sep 17 12:33:49 2017 @@ -1790,7 +1790,7 @@ if (!dwarf2_read_range(subpgm->ctx, di, &low_pc, &high_pc)) { - FIXME("no range\n"); + WARN("no range\n"); return; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 17 12:33:49 2017 @@ -63,7 +63,7 @@ reactos/dll/win32/cryptdll # Synced to WineStaging-2.9 reactos/dll/win32/cryptnet # Synced to WineStaging-2.9 reactos/dll/win32/cryptui # Synced to WineStaging-2.16 -reactos/dll/win32/dbghelp # Synced to WineStaging-2.9 +reactos/dll/win32/dbghelp # Synced to WineStaging-2.16 reactos/dll/win32/dciman32 # Synced to WineStaging-2.9 reactos/dll/win32/faultrep # Synced to WineStaging-2.9 reactos/dll/win32/fontsub # Synced to WineStaging-2.9

7 years, 3 months

[akhaldi] 75867: [CRYPTUI] Sync with Wine Staging 2.16. CORE-13762 8dcc4ed cryptui: Use proper size for combobox controls.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 12:33:43 2017 New Revision: 75867 URL: http://svn.reactos.org/svn/reactos?rev=75867&view=rev Log: [CRYPTUI] Sync with Wine Staging 2.16. CORE-13762 8dcc4ed cryptui: Use proper size for combobox controls. Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_De.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_En.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Fr.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_He.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_It.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Ko.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Lt.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Nl.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_No.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Pl.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Pt.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Ro.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Ru.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Sq.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Uk.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Zh.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_De.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_De.rc [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -195,7 +195,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Anzeigen:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -341,7 +341,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Geplanter Zweck:", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "&Importieren...", IDC_MGR_IMPORT, 7,172,65,14 Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_En.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_En.rc [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -195,7 +195,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Show:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -342,7 +342,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "I&ntended purpose:", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "&Import...", IDC_MGR_IMPORT, 7,172,65,14 Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_Fr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_Fr.rc [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -195,7 +195,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&AfficherÂ :", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -342,7 +342,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&RÃ´le prÃ©vuÂ :", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "&Importer...", IDC_MGR_IMPORT, 7,172,65,14 Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_He.rc [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -107,7 +107,7 @@ IDS_WARN_REMOVE_MY "You will no longer be able to decrypt messages with this certificate, or sign messages with it.\nAre you sure you want to remove this certificate?" IDS_WARN_REMOVE_PLURAL_MY "You will no longer be able to decrypt messages with these certificates, or sign messages with them.\nAre you sure you want to remove these certificates?" IDS_WARN_REMOVE_ADDRESSBOOK "You will no longer be able to encrypt messages with this certificate, or verify messages signed with it.\nAre you sure you want to remove this certificate?" - IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "You will no longer be able to encrypt messages with these certificates, or verify messages signed with it.\nAre you sure you want to remove these certificates?" + IDS_WARN_REMOVE_PLURAL_ADDRESSBOOK "You will no longer be able to encrypt messages with these certificates, or verify messages signed with them.\nAre you sure you want to remove these certificates?" IDS_WARN_REMOVE_CA "Certificates issued by this certification authority will no longer be trusted.\nAre you sure you want to remove this certificate?" IDS_WARN_REMOVE_PLURAL_CA "Certificates issued by these certification authorities will no longer be trusted.\nAre you sure you want to remove these certificates?" IDS_WARN_REMOVE_ROOT "Certificates issued by this root certification authority, or any certification authorities it issued, will no longer be trusted.\nAre you sure you want to remove this trusted root certificate?" @@ -195,7 +195,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Show:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -342,7 +342,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "I&ntended purpose:", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "&Import...", IDC_MGR_IMPORT, 7,172,65,14 Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_It.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_It.rc [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -195,7 +195,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Mostra:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -342,7 +342,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Soggetto inteso:", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "&Importa...", IDC_MGR_IMPORT, 7,172,65,14 Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_Ko.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_Ko.rc [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -195,7 +195,7 @@ FONT 9, "MS Shell Dlg" BEGIN LTEXT "íì(&S):", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -342,7 +342,7 @@ FONT 9, "MS Shell Dlg" BEGIN LTEXT "ì§ì ë ì©ë(&N):", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "ë¶ë¬ì¤ê¸°(&I)...", IDC_MGR_IMPORT, 7,172,65,14 Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_Lt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_Lt.rc [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -195,7 +195,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Rodyti:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -342,7 +342,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Numatytos paskirtys:", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "&Importuoti...", IDC_MGR_IMPORT, 7,172,65,14 Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_Nl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_Nl.rc [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -195,7 +195,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Toon:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -341,7 +341,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Doeleinden:", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "&Importeer...", IDC_MGR_IMPORT, 7,172,65,14 Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_No.rc [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -195,7 +195,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Vi&s:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -340,7 +340,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Tilte&nkt formÃ¥l:", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "&ImportÃ©r...", IDC_MGR_IMPORT, 7,172,65,14 Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_Pl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_Pl.rc [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -195,7 +195,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&PokaÅ¼:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -342,7 +342,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Zamierzone cele:", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "&Importuj...", IDC_MGR_IMPORT, 7,172,65,14 Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_Pt.rc [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -195,7 +195,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Mostrar:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -340,7 +340,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Com o propÃ³sito:", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "&Importar...", IDC_MGR_IMPORT, 7,172,65,14 Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_Ro.rc [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -198,7 +198,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&AfiÈeazÄ:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -345,7 +345,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Rolul intenÈionat:", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "I&mportareâ¦", IDC_MGR_IMPORT, 7,172,65,14 Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_Ru.rc [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -197,7 +197,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -344,7 +344,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&ÐÐ°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ:", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "&ÐÐ¼Ð¿Ð¾ÑÑ...", IDC_MGR_IMPORT, 7,172,65,14 Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_Sq.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_Sq.rc [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -196,7 +196,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Shfaq:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -343,7 +343,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Arsyeja e QÃ«llimit:", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "&Importo...", IDC_MGR_IMPORT, 7,172,65,14 Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -195,7 +195,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&GÃ¶ster:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -342,7 +342,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&KullanÄ±m AmacÄ±:", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "&Al...", IDC_MGR_IMPORT, 7,172,65,14 Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_Uk.rc [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -195,7 +195,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&ÐÐ¾ÐºÐ°Ð·Ð°ÑÐ¸:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -340,7 +340,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&ÐÑÐ¸Ð·Ð½Ð°ÑÐµÐ½Ð° ÑÑÐ»Ñ:", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "&ÐÐ¼Ð¿Ð¾ÑÑ...", IDC_MGR_IMPORT, 7,172,65,14 Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… ============================================================================== --- trunk/reactos/dll/win32/cryptui/lang/cryptui_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptui/lang/cryptui_Zh.rc [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -199,7 +199,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "æ¾ç¤º:(&S)", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 48,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_DETAIL_SELECT, 48,10,100,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 @@ -346,7 +346,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "é¢æçç®ç:(&N)", -1, 7,9,100,12 - COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP + COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,60, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 PUSHBUTTON "å¯¼å¥...(&I)", IDC_MGR_IMPORT, 7,172,65,14 Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 17 12:33:43 2017 @@ -62,7 +62,7 @@ reactos/dll/win32/cryptdlg # Synced to WineStaging-2.9 reactos/dll/win32/cryptdll # Synced to WineStaging-2.9 reactos/dll/win32/cryptnet # Synced to WineStaging-2.9 -reactos/dll/win32/cryptui # Synced to WineStaging-2.9 +reactos/dll/win32/cryptui # Synced to WineStaging-2.16 reactos/dll/win32/dbghelp # Synced to WineStaging-2.9 reactos/dll/win32/dciman32 # Synced to WineStaging-2.9 reactos/dll/win32/faultrep # Synced to WineStaging-2.9

7 years, 3 months

[akhaldi] 75866: [CRYPT32_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 12:33:34 2017 New Revision: 75866 URL: http://svn.reactos.org/svn/reactos?rev=75866&view=rev Log: [CRYPT32_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/crypt32/encode.c Modified: trunk/rostests/winetests/crypt32/encode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/crypt32/encode.… ============================================================================== --- trunk/rostests/winetests/crypt32/encode.c [iso-8859-1] (original) +++ trunk/rostests/winetests/crypt32/encode.c [iso-8859-1] Sun Sep 17 12:33:34 2017 @@ -476,7 +476,7 @@ static const char *printSystemTime(const SYSTEMTIME *st) { - static char buf[25]; + static char buf[64]; sprintf(buf, "%02d-%02d-%04d %02d:%02d:%02d.%03d", st->wMonth, st->wDay, st->wYear, st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); @@ -485,7 +485,7 @@ static const char *printFileTime(const FILETIME *ft) { - static char buf[25]; + static char buf[64]; SYSTEMTIME st; FileTimeToSystemTime(ft, &st);

7 years, 3 months

[akhaldi] 75865: [CRYPT32] Sync with Wine Staging 2.16. CORE-13762 8738b03 crypt32: Increase buffer size to silence a gcc warning.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 12:33:29 2017 New Revision: 75865 URL: http://svn.reactos.org/svn/reactos?rev=75865&view=rev Log: [CRYPT32] Sync with Wine Staging 2.16. CORE-13762 8738b03 crypt32: Increase buffer size to silence a gcc warning. Modified: trunk/reactos/dll/win32/crypt32/encode.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/crypt32/encode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/encode.c… ============================================================================== --- trunk/reactos/dll/win32/crypt32/encode.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crypt32/encode.c [iso-8859-1] Sun Sep 17 12:33:29 2017 @@ -3517,11 +3517,11 @@ __TRY { SYSTEMTIME sysTime; - /* sorry, magic number: enough for tag, len, YYMMDDHHMMSSZ\0. I use a + /* sorry, magic number: enough for tag, len, YYMMDDHHMMSSZ. I use a * temporary buffer because the output buffer is not NULL-terminated. */ - char buf[16]; - static const DWORD bytesNeeded = sizeof(buf) - 1; + static const DWORD bytesNeeded = 15; + char buf[40]; if (!pbEncoded) { @@ -3574,11 +3574,11 @@ __TRY { SYSTEMTIME sysTime; - /* sorry, magic number: enough for tag, len, YYYYMMDDHHMMSSZ\0. I use a + /* sorry, magic number: enough for tag, len, YYYYMMDDHHMMSSZ. I use a * temporary buffer because the output buffer is not NULL-terminated. */ - char buf[18]; - static const DWORD bytesNeeded = sizeof(buf) - 1; + static const DWORD bytesNeeded = 17; + char buf[40]; if (!pbEncoded) { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 17 12:33:29 2017 @@ -58,7 +58,7 @@ reactos/dll/win32/comdlg32 # Synced to WineStaging-2.16 reactos/dll/win32/compstui # Synced to WineStaging-2.9 reactos/dll/win32/credui # Synced to WineStaging-2.9 -reactos/dll/win32/crypt32 # Synced to WineStaging-2.9 +reactos/dll/win32/crypt32 # Synced to WineStaging-2.16 reactos/dll/win32/cryptdlg # Synced to WineStaging-2.9 reactos/dll/win32/cryptdll # Synced to WineStaging-2.9 reactos/dll/win32/cryptnet # Synced to WineStaging-2.9

7 years, 3 months

[akhaldi] 75864: [COMDLG32] Sync with Wine Staging 2.16. CORE-13762 823c4b1 comdlg32: Use proper size for combobox controls. 1c1db33 comdlg32: Improve tracing messages. c4b133e comdlg32: Simplify n...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 12:33:21 2017 New Revision: 75864 URL: http://svn.reactos.org/svn/reactos?rev=75864&view=rev Log: [COMDLG32] Sync with Wine Staging 2.16. CORE-13762 823c4b1 comdlg32: Use proper size for combobox controls. 1c1db33 comdlg32: Improve tracing messages. c4b133e comdlg32: Simplify notification helper. Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sq.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… Modified: trunk/reactos/dll/win32/comdlg32/filedlgbrowser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ca.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_El.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Th.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

7 years, 3 months

[akhaldi] 75863: [COMCTL32_WINETEST] Sync with Wine Staging 2.16. CORE-13762

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 12:33:06 2017 New Revision: 75863 URL: http://svn.reactos.org/svn/reactos?rev=75863&view=rev Log: [COMCTL32_WINETEST] Sync with Wine Staging 2.16. CORE-13762 Modified: trunk/rostests/winetests/comctl32/rsrc.rc trunk/rostests/winetests/comctl32/taskdialog.c trunk/rostests/winetests/comctl32/toolbar.c Modified: trunk/rostests/winetests/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/rsrc.r… ============================================================================== --- trunk/rostests/winetests/comctl32/rsrc.rc [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/rsrc.rc [iso-8859-1] Sun Sep 17 12:33:06 2017 @@ -98,6 +98,6 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" { - COMBOBOX IDC_PS_COMBO1, 16, 68, 140, 14, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PS_COMBO1, 16, 68, 140, 60, CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Add", IDC_PS_PUSHBUTTON1, 164, 68, 40, 13 } Modified: trunk/rostests/winetests/comctl32/taskdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/taskdi… ============================================================================== --- trunk/rostests/winetests/comctl32/taskdialog.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/taskdialog.c [iso-8859-1] Sun Sep 17 12:33:06 2017 @@ -28,6 +28,8 @@ #include "v6util.h" static HRESULT (WINAPI *pTaskDialogIndirect)(const TASKDIALOGCONFIG *, int *, int *, BOOL *); +static HRESULT (WINAPI *pTaskDialog)(HWND, HINSTANCE, const WCHAR *, const WCHAR *, const WCHAR *, + TASKDIALOG_COMMON_BUTTON_FLAGS, const WCHAR *, int *); START_TEST(taskdialog) { @@ -50,6 +52,12 @@ return; } + pTaskDialog = (void *)GetProcAddress(hinst, "TaskDialog"); + + ptr_ordinal = GetProcAddress(hinst, (const char *)344); + ok(pTaskDialog == ptr_ordinal, "got wrong pointer for ordinal 344, %p expected %p\n", + ptr_ordinal, pTaskDialog); + ptr_ordinal = GetProcAddress(hinst, (const char *)345); ok(pTaskDialogIndirect == ptr_ordinal, "got wrong pointer for ordinal 345, %p expected %p\n", ptr_ordinal, pTaskDialogIndirect); Modified: trunk/rostests/winetests/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolba… ============================================================================== --- trunk/rostests/winetests/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/toolbar.c [iso-8859-1] Sun Sep 17 12:33:06 2017 @@ -490,13 +490,81 @@ static void test_add_bitmap(void) { + TBADDBITMAP stdsmall, std; HWND hToolbar = NULL; TBADDBITMAP bmp128; TBADDBITMAP bmp80; - TBADDBITMAP stdsmall; TBADDBITMAP addbmp; HIMAGELIST himl; - INT ret; + INT ret, id; + + /* Test default bitmaps range */ + for (id = IDB_STD_SMALL_COLOR; id < IDB_HIST_LARGE_COLOR; id++) + { + HIMAGELIST himl; + int cx, cy, count; + + rebuild_toolbar(&hToolbar); + + std.hInst = HINST_COMMCTRL; + std.nID = id; + + ret = SendMessageA(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&std); + ok(ret == 0, "Got %d\n", ret); + + himl = (HIMAGELIST)SendMessageA(hToolbar, TB_GETIMAGELIST, 0, 0); + ok(himl != NULL, "Got %p\n", himl); + + ret = ImageList_GetIconSize(himl, &cx, &cy); + ok(ret, "Got %d\n", ret); + ok(cx == cy, "Got %d x %d\n", cx, cy); + + count = ImageList_GetImageCount(himl); + + /* Image count */ + switch (id) + { + case IDB_STD_SMALL_COLOR: + case IDB_STD_LARGE_COLOR: + case 2: + case 3: + ok(count == 15, "got count %d\n", count); + break; + case IDB_VIEW_SMALL_COLOR: + case IDB_VIEW_LARGE_COLOR: + case 6: + case 7: + ok(count == 12, "got count %d\n", count); + break; + case IDB_HIST_SMALL_COLOR: + case IDB_HIST_LARGE_COLOR: + ok(count == 5, "got count %d\n", count); + break; + default: + ok(0, "id %d, count %d\n", id, count); + } + + /* Image sizes */ + switch (id) + { + case IDB_STD_SMALL_COLOR: + case 2: + case IDB_VIEW_SMALL_COLOR: + case 6: + case IDB_HIST_SMALL_COLOR: + ok(cx == 16, "got size %d\n", cx); + break; + case IDB_STD_LARGE_COLOR: + case 3: + case IDB_VIEW_LARGE_COLOR: + case 7: + case IDB_HIST_LARGE_COLOR: + ok(cx == 24, "got size %d\n", cx); + break; + default: + ok(0, "id %d, size %d\n", id, cx); + } + } /* empty 128x15 bitmap */ bmp128.hInst = GetModuleHandleA(NULL); @@ -2409,6 +2477,26 @@ DestroyWindow(hwnd); } +static void test_imagelist(void) +{ + HIMAGELIST imagelist; + HWND hwnd = NULL; + int ret; + + rebuild_toolbar(&hwnd); + + imagelist = (HIMAGELIST)SendMessageA(hwnd, TB_GETIMAGELIST, 0, 0); + ok(imagelist == NULL, "got %p\n", imagelist); + + ret = SendMessageA(hwnd, TB_SETBITMAPSIZE, 0, MAKELONG(16, 16)); + ok(ret, "got %d\n", ret); + + imagelist = (HIMAGELIST)SendMessageA(hwnd, TB_GETIMAGELIST, 0, 0); + ok(imagelist == NULL, "got %p\n", imagelist); + + DestroyWindow(hwnd); +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -2454,6 +2542,7 @@ test_noresize(); test_save(); test_drawtext_flags(); + test_imagelist(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) {

7 years, 3 months

[akhaldi] 75862: [COMCTL32] Sync with Wine Staging 2.16. CORE-13762 d505c2d comctl32/monthcal: Make sure set focus date is valid before using it (Valgrind). a56f49c comctl32/monthcal: Make sure set...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 17 12:33:00 2017 New Revision: 75862 URL: http://svn.reactos.org/svn/reactos?rev=75862&view=rev Log: [COMCTL32] Sync with Wine Staging 2.16. CORE-13762 d505c2d comctl32/monthcal: Make sure set focus date is valid before using it (Valgrind). a56f49c comctl32/monthcal: Make sure set today date is valid before using it (Valgrind). 9231452 comctl32/monthcal: Initialize day field before setting final hit test result (Valgrind). 1d45250 comctl32/listview: Invalidate the focus rectangle when the control gets or loses focus. d6fdbae comctl32: New high resolution cursors generated from SVG. 11c557b comctl32: Don't FIXME on handled cases. 5b06498 comctl32/taskdialog: Added support for custom buttons. 9e3ebed comctl32/taskdialog: Added TaskDialog() export. d93ae6f comctl32/toolbar: Support undocumented IDs for standard bitmap lists. ece34a1 comctl32/toolbar: Don't add NULL imagelist entries. e558858 comctl32: Change some overly exciting tracing messages. Modified: trunk/reactos/dll/win32/comctl32/animate.c trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/dpa.c trunk/reactos/dll/win32/comctl32/header.c trunk/reactos/dll/win32/comctl32/listview.c trunk/reactos/dll/win32/comctl32/monthcal.c trunk/reactos/dll/win32/comctl32/taskdialog.c trunk/reactos/dll/win32/comctl32/toolbar.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/comctl32/animate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/animate… ============================================================================== --- trunk/reactos/dll/win32/comctl32/animate.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/animate.c [iso-8859-1] Sun Sep 17 12:33:00 2017 @@ -695,7 +695,7 @@ if (!lpszName) { - TRACE("Closing avi!\n"); + TRACE("Closing avi.\n"); /* installer of thebat! v1.62 requires FALSE here */ return (infoPtr->hMMio != 0); } @@ -709,10 +709,10 @@ { if (!ANIMATE_LoadResW(infoPtr, hInstance, lpszName)) { - TRACE("No AVI resource found!\n"); + TRACE("No AVI resource found.\n"); if (!ANIMATE_LoadFileW(infoPtr, lpszName)) { - WARN("No AVI file found!\n"); + WARN("No AVI file found.\n"); return FALSE; } } @@ -721,7 +721,7 @@ { if (!ANIMATE_LoadResW(infoPtr, hInstance, lpszName)) { - WARN("No AVI resource found!\n"); + WARN("No AVI resource found.\n"); return FALSE; } } Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] Sun Sep 17 12:33:00 2017 @@ -1,7 +1,17 @@ diff -pudN e:\wine\dlls\comctl32/comctl32.h e:\reactos\dll\win32\comctl32/comctl32.h ---- e:\wine\dlls\comctl32/comctl32.h 2016-11-16 17:28:41 +0100 -+++ e:\reactos\dll\win32\comctl32/comctl32.h 2014-03-05 11:47:40 +0100 -@@ -53,67 +53,6 @@ +--- e:\wine\dlls\comctl32/comctl32.h 2017-09-07 12:58:14 +0100 ++++ e:\reactos\dll\win32\comctl32/comctl32.h 2017-06-15 11:36:56 +0100 +@@ -45,83 +45,15 @@ + #include <uxtheme.h> + #include <vssym32.h> + +-#include <wine/unicode.h> + #include <wine/debug.h> ++#include <wine/list.h> ++#include <wine/unicode.h> + + #include "resource.h" + extern HMODULE COMCTL32_hModule DECLSPEC_HIDDEN; extern HBRUSH COMCTL32_hPattern55AABrush DECLSPEC_HIDDEN; @@ -66,10 +76,40 @@ -#define IDI_TT_WARN_SM 25 -#define IDI_TT_ERROR_SM 28 - +-/* Taskdialog strings */ +-#define IDS_BUTTON_YES 3000 +-#define IDS_BUTTON_NO 3001 +-#define IDS_BUTTON_RETRY 3002 +-#define IDS_BUTTON_OK 3003 +-#define IDS_BUTTON_CANCEL 3004 +-#define IDS_BUTTON_CLOSE 3005 +- typedef struct { COLORREF clrBtnHighlight; /* COLOR_BTNHIGHLIGHT */ -@@ -149,8 +88,6 @@ INT Str_GetPtrAtoW (LPCSTR lpSrc, LPWST +@@ -145,6 +77,21 @@ typedef struct + + extern COMCTL32_SysColor comctl32_color DECLSPEC_HIDDEN; + ++typedef struct _BUTTON_DATA { ++ LONG state; ++ HFONT font; ++ LONG_PTR image; ++ DWORD ui_state; ++ ++ RECT rcTextMargin; ++ BUTTON_IMAGELIST imlData; ++} BUTTON_DATA, *PBUTTON_DATA; ++ ++static inline PBUTTON_DATA _GetButtonData(HWND hwnd) ++{ ++ return (PBUTTON_DATA)GetWindowLongPtrW( hwnd, 0 ); ++} ++ + /* Internal function */ + HWND COMCTL32_CreateToolTip (HWND) DECLSPEC_HIDDEN; + VOID COMCTL32_RefreshSysColors(void) DECLSPEC_HIDDEN; +@@ -157,8 +104,6 @@ INT Str_GetPtrAtoW (LPCSTR lpSrc, LPWST BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN; BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN; @@ -78,14 +118,49 @@ /* Our internal stack structure of the window procedures to subclass */ typedef struct _SUBCLASSPROCS { SUBCLASSPROC subproc; +@@ -230,13 +175,18 @@ extern void TREEVIEW_Register(void) DECL + extern void TREEVIEW_Unregister(void) DECLSPEC_HIDDEN; + extern void UPDOWN_Register(void) DECLSPEC_HIDDEN; + extern void UPDOWN_Unregister(void) DECLSPEC_HIDDEN; +- ++extern void BUTTON_Register(); ++extern void BUTTON_Unregister(); ++#ifdef __REACTOS__ ++extern void TOOLBARv6_Register(void) DECLSPEC_HIDDEN; ++extern void TOOLBARv6_Unregister(void) DECLSPEC_HIDDEN; ++#endif + + int MONTHCAL_MonthLength(int month, int year) DECLSPEC_HIDDEN; + int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace) DECLSPEC_HIDDEN; + LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME *second) DECLSPEC_HIDDEN; + +-extern void THEMING_Initialize(void) DECLSPEC_HIDDEN; ++extern void THEMING_Initialize(HANDLE hActCtx5, HANDLE hActCtx6) DECLSPEC_HIDDEN; + extern void THEMING_Uninitialize(void) DECLSPEC_HIDDEN; + extern LRESULT THEMING_CallOriginalClass(HWND, UINT, WPARAM, LPARAM) DECLSPEC_HIDDEN; + extern void THEMING_SetSubclassData(HWND, ULONG_PTR) DECLSPEC_HIDDEN; diff -pudN e:\wine\dlls\comctl32/commctrl.c e:\reactos\dll\win32\comctl32/commctrl.c ---- e:\wine\dlls\comctl32/commctrl.c 2016-11-16 17:28:41 +0100 -+++ e:\reactos\dll\win32\comctl32/commctrl.c 2016-02-26 11:19:35 +0100 -@@ -60,6 +60,19 @@ - - WINE_DEFAULT_DEBUG_CHANNEL(commctrl); - +--- e:\wine\dlls\comctl32/commctrl.c 2017-09-07 12:58:14 +0100 ++++ e:\reactos\dll\win32\comctl32/commctrl.c 2017-08-17 11:24:56 +0100 +@@ -3,7 +3,7 @@ + * + * Copyright 1997 Dimitrie O. Paun + * Copyright 1998,2000 Eric Kohl +- * Copyright 2014-2015 Michael MÃ¼ller ++ * Copyright 2014-2015 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -81,6 +81,259 @@ static const WCHAR strCC32SubclassInfo[] + 'C','C','3','2','S','u','b','c','l','a','s','s','I','n','f','o',0 + }; + ++#ifdef __REACTOS__ ++ ++#include <strsafe.h> ++ +#define NAME L"microsoft.windows.common-controls" ++#define VERSION_V5 L"5.82.2600.2982" +#define VERSION L"6.0.2600.2982" +#define PUBLIC_KEY L"6595b64144ccf1df" + @@ -98,24 +173,51 @@ +#endif + +static const WCHAR manifest_filename[] = ARCH L"_" NAME L"_" PUBLIC_KEY L"_" VERSION L"_none_deadbeef.manifest"; - - static LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - -@@ -81,6 +94,67 @@ static const WCHAR strCC32SubclassInfo[] - 'C','C','3','2','S','u','b','c','l','a','s','s','I','n','f','o',0 - }; - -+static BOOL create_manifest(BOOL install) ++static const WCHAR manifest_filename_v5[] = ARCH L"_" NAME L"_" PUBLIC_KEY L"_" VERSION_V5 L"_none_deadbeef.manifest"; ++ ++static WCHAR* GetManifestPath(BOOL create, BOOL bV6) ++{ ++ WCHAR *pwszBuf; ++ HRESULT hres; ++ ++ pwszBuf = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); ++ if (!pwszBuf) ++ return NULL; ++ ++ GetWindowsDirectoryW(pwszBuf, MAX_PATH); ++ hres = StringCchCatW(pwszBuf, MAX_PATH, L"\\winsxs"); ++ if (FAILED(hres)) ++ return NULL; ++ if (create) ++ CreateDirectoryW(pwszBuf, NULL); ++ hres = StringCchCatW(pwszBuf, MAX_PATH, L"\\manifests\\"); ++ if (FAILED(hres)) ++ return NULL; ++ if (create) ++ CreateDirectoryW(pwszBuf, NULL); ++ ++ hres = StringCchCatW(pwszBuf, MAX_PATH, bV6 ? manifest_filename : manifest_filename_v5); ++ if (FAILED(hres)) ++ return NULL; ++ ++ return pwszBuf; ++} ++ ++static BOOL create_manifest(BOOL install, BOOL bV6) +{ + WCHAR *pwszBuf; + HRSRC hResInfo; + HGLOBAL hResData; + PVOID pManifest; -+ DWORD cchBuf, cbManifest, cbWritten; ++ DWORD cbManifest, cbWritten; + HANDLE hFile; + BOOL bRet = FALSE; + -+ hResInfo = FindResourceW(COMCTL32_hModule, L"WINE_MANIFEST", (LPWSTR)RT_MANIFEST); ++ if (bV6) ++ hResInfo = FindResourceW(COMCTL32_hModule, L"WINE_MANIFEST", (LPWSTR)RT_MANIFEST); ++ else ++ hResInfo = FindResourceW(COMCTL32_hModule, L"WINE_MANIFESTV5", (LPWSTR)RT_MANIFEST); ++ + if (!hResInfo) + return FALSE; + @@ -131,17 +233,10 @@ + if (!pManifest) + return FALSE; + -+ cchBuf = GetWindowsDirectoryW(NULL, 0) * sizeof(WCHAR) + sizeof(L"\\winsxs\\manifests\\") + sizeof(manifest_filename); -+ pwszBuf = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, cchBuf * sizeof(WCHAR)); ++ pwszBuf = GetManifestPath(TRUE, bV6); + if (!pwszBuf) + return FALSE; + -+ GetWindowsDirectoryW(pwszBuf, cchBuf); -+ lstrcatW(pwszBuf, L"\\winsxs"); -+ CreateDirectoryW(pwszBuf, NULL); -+ lstrcatW(pwszBuf, L"\\manifests\\"); -+ CreateDirectoryW(pwszBuf, NULL); -+ lstrcatW(pwszBuf, manifest_filename); + if (install) + { + hFile = CreateFileW(pwszBuf, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); @@ -166,23 +261,215 @@ + return bRet; +} + ++static HANDLE CreateComctl32ActCtx(BOOL bV6) ++{ ++ HANDLE ret; ++ WCHAR* pwstrSource; ++ ACTCTXW ActCtx = {sizeof(ACTCTX)}; ++ ++ pwstrSource = GetManifestPath(FALSE, bV6); ++ if (!pwstrSource) ++ { ++ ERR("GetManifestPath failed! bV6=%d\n", bV6); ++ return INVALID_HANDLE_VALUE; ++ } ++ ActCtx.lpSource = pwstrSource; ++ ret = CreateActCtxW(&ActCtx); ++ HeapFree(GetProcessHeap(), 0, pwstrSource); ++ if (ret == INVALID_HANDLE_VALUE) ++ ERR("CreateActCtxW failed! bV6=%d\n", bV6); ++ return ret; ++} ++ ++static void RegisterControls(BOOL bV6) ++{ ++ ANIMATE_Register (); ++ COMBOEX_Register (); ++ DATETIME_Register (); ++ FLATSB_Register (); ++ HEADER_Register (); ++ HOTKEY_Register (); ++ IPADDRESS_Register (); ++ LISTVIEW_Register (); ++ MONTHCAL_Register (); ++ NATIVEFONT_Register (); ++ PAGER_Register (); ++ PROGRESS_Register (); ++ REBAR_Register (); ++ STATUS_Register (); ++ SYSLINK_Register (); ++ TAB_Register (); ++ TOOLTIPS_Register (); ++ TRACKBAR_Register (); ++ TREEVIEW_Register (); ++ UPDOWN_Register (); ++ ++ if (!bV6) ++ { ++ TOOLBAR_Register (); ++ } ++ else ++ { ++ BUTTON_Register(); ++ TOOLBARv6_Register(); ++ } ++} ++ ++static void UnregisterControls(BOOL bV6) ++{ ++ ANIMATE_Unregister (); ++ COMBOEX_Unregister (); ++ DATETIME_Unregister (); ++ FLATSB_Unregister (); ++ HEADER_Unregister (); ++ HOTKEY_Unregister (); ++ IPADDRESS_Unregister (); ++ LISTVIEW_Unregister (); ++ MONTHCAL_Unregister (); ++ NATIVEFONT_Unregister (); ++ PAGER_Unregister (); ++ PROGRESS_Unregister (); ++ REBAR_Unregister (); ++ STATUS_Unregister (); ++ SYSLINK_Unregister (); ++ TAB_Unregister (); ++ TOOLTIPS_Unregister (); ++ TRACKBAR_Unregister (); ++ TREEVIEW_Unregister (); ++ UPDOWN_Unregister (); ++ ++ if (!bV6) ++ { ++ TOOLBAR_Unregister (); ++ } ++ else ++ { ++ BUTTON_Unregister(); ++ TOOLBARv6_Unregister (); ++ } ++ ++} ++ ++static void InitializeClasses() ++{ ++ HANDLE hActCtx5, hActCtx6; ++ BOOL activated; ++ ULONG_PTR ulCookie; ++ ++ /* like comctl32 5.82+ register all the common control classes */ ++ /* Register the classes once no matter what */ ++ hActCtx5 = CreateComctl32ActCtx(FALSE); ++ activated = (hActCtx5 != INVALID_HANDLE_VALUE ? ActivateActCtx(hActCtx5, &ulCookie) : FALSE); ++ RegisterControls(FALSE); /* Register the classes pretending to be v5 */ ++ if (activated) DeactivateActCtx(0, ulCookie); ++ ++ hActCtx6 = CreateComctl32ActCtx(TRUE); ++ if (hActCtx6 != INVALID_HANDLE_VALUE) ++ { ++ activated = ActivateActCtx(hActCtx6, &ulCookie); ++ RegisterControls(TRUE); /* Register the classes pretending to be v6 */ ++ if (activated) DeactivateActCtx(0, ulCookie); ++ ++ /* Initialize the themed controls only when the v6 manifest is present */ ++ THEMING_Initialize (hActCtx5, hActCtx6); ++ } ++} ++ ++static void UninitializeClasses() ++{ ++ HANDLE hActCtx5, hActCtx6; ++ BOOL activated; ++ ULONG_PTR ulCookie; ++ ++ hActCtx5 = CreateComctl32ActCtx(FALSE); ++ activated = (hActCtx5 != INVALID_HANDLE_VALUE ? ActivateActCtx(hActCtx5, &ulCookie) : FALSE); ++ UnregisterControls(FALSE); ++ if (activated) DeactivateActCtx(0, ulCookie); ++ ++ hActCtx6 = CreateComctl32ActCtx(TRUE); ++ if (hActCtx6 != INVALID_HANDLE_VALUE) ++ { ++ activated = ActivateActCtx(hActCtx6, &ulCookie); ++ THEMING_Uninitialize(); ++ UnregisterControls(TRUE); ++ if (activated) DeactivateActCtx(0, ulCookie); ++ } ++} ++ ++/*********************************************************************** ++ * RegisterClassNameW [COMCTL32.@] ++ * ++ * Register window class again while using as SxS module. ++ */ ++BOOLEAN WINAPI RegisterClassNameW(LPCWSTR className) ++{ ++ InitializeClasses(); ++ return TRUE; ++} ++ ++#endif /*********************************************************************** * DllMain [Internal] -@@ -917,6 +991,12 @@ HRESULT WINAPI DllGetVersion (DLLVERSION +@@ -118,6 +371,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, + /* Get all the colors at DLL load */ + COMCTL32_RefreshSysColors(); + ++#ifndef __REACTOS__ + /* like comctl32 5.82+ register all the common control classes */ + ANIMATE_Register (); + COMBOEX_Register (); +@@ -143,10 +397,15 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, + + /* subclass user32 controls */ + THEMING_Initialize (); ++#else ++ InitializeClasses(); ++#endif ++ + break; + + case DLL_PROCESS_DETACH: + if (lpvReserved) break; ++#ifndef __REACTOS__ + /* clean up subclassing */ + THEMING_Uninitialize(); + +@@ -172,7 +431,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, + TRACKBAR_Unregister (); + TREEVIEW_Unregister (); + UPDOWN_Unregister (); +- ++#else ++ UninitializeClasses(); ++#endif + /* delete local pattern brush */ + DeleteObject (COMCTL32_hPattern55AABrush); + DeleteObject (COMCTL32_hPattern55AABitmap); +@@ -917,6 +1178,22 @@ HRESULT WINAPI DllGetVersion (DLLVERSION HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) { TRACE("(%u, %s): stub\n", bInstall, debugstr_w(cmdline)); -+ if (!create_manifest(bInstall)) -+ { -+ ERR("create_manifest failed!\n"); ++ ++#ifdef __REACTOS__ ++ ++ if (!create_manifest(bInstall, TRUE)) ++ { ++ ERR("Failed to install comctl32 v6 manifest!\n"); + return HRESULT_FROM_WIN32(GetLastError()); + } + ++ if (!create_manifest(bInstall, FALSE)) ++ { ++ ERR("Failed to install comctl32 v5 manifest!\n"); ++ return HRESULT_FROM_WIN32(GetLastError()); ++ } ++#endif ++ return S_OK; } -@@ -1580,33 +1660,114 @@ LRESULT WINAPI SetPathWordBreakProc(HWND +@@ -1580,33 +1857,113 @@ LRESULT WINAPI SetPathWordBreakProc(HWND * * Draw text with shadow. */ @@ -229,6 +516,7 @@ + { + ERR("CreateCompatibleDC failed\n"); + DeleteObject(hbm); + + return 0; + } @@ -298,8 +586,7 @@ + bf.BlendFlags = 0; + bf.SourceConstantAlpha = 255; + bf.AlphaFormat = AC_SRC_ALPHA; -+ if (!GdiAlphaBlend(hdc, prc->left + ixOffset, prc->top + iyOffset, bi.bmiHeader.biWidth, bi.bmiHeader.biHeight, hdcMem, 0, 0, bi.bmiHeader.biWidth, bi.bmiHeader.biHeight, bf)) -+ ERR("GdiAlphaBlend failed: %lu\n", GetLastError()); ++ GdiAlphaBlend(hdc, prc->left + ixOffset, prc->top + iyOffset, bi.bmiHeader.biWidth, bi.bmiHeader.biHeight, hdcMem, 0, 0, bi.bmiHeader.biWidth, bi.bmiHeader.biHeight, bf); + + /* Delete the helper bitmap */ + SelectObject(hdcMem, hbmOld); @@ -316,25 +603,9 @@ } /*********************************************************************** -@@ -1695,3 +1856,15 @@ HRESULT WINAPI LoadIconMetric(HINSTANCE - - return LoadIconWithScaleDown(hinst, name, cx, cy, icon); - } -+ -+/*********************************************************************** -+ * RegisterClassNameW [COMCTL32.@] -+ * -+ * Register window class again while using as SxS module. -+ */ -+BOOLEAN WINAPI RegisterClassNameW(LPCWSTR className) -+{ -+ /* FIXME: actually register redirected user32 class, -+ comctl32 classes are registered by this module anyway */ -+ return TRUE; -+} diff -pudN e:\wine\dlls\comctl32/imagelist.c e:\reactos\dll\win32\comctl32/imagelist.c ---- e:\wine\dlls\comctl32/imagelist.c 2016-11-16 17:28:41 +0100 -+++ e:\reactos\dll\win32\comctl32/imagelist.c 2016-08-15 16:07:59 +0100 +--- e:\wine\dlls\comctl32/imagelist.c 2017-09-07 12:58:14 +0100 ++++ e:\reactos\dll\win32\comctl32/imagelist.c 2017-05-07 14:47:57 +0100 @@ -33,7 +33,7 @@ * * TODO: @@ -344,7 +615,7 @@ * - Thread-safe locking */ -@@ -1229,8 +1229,11 @@ ImageList_DrawEx (HIMAGELIST himl, INT i +@@ -1243,8 +1243,11 @@ ImageList_DrawEx (HIMAGELIST himl, INT i return ImageList_DrawIndirect (&imldp); } @@ -357,7 +628,7 @@ int src_x, int src_y, int cx, int cy, BLENDFUNCTION func, UINT style, COLORREF blend_col ) { -@@ -1255,9 +1258,17 @@ static BOOL alpha_blend_image( HIMAGELIS +@@ -1269,9 +1272,17 @@ static BOOL alpha_blend_image( HIMAGELIS info->bmiHeader.biYPelsPerMeter = 0; info->bmiHeader.biClrUsed = 0; info->bmiHeader.biClrImportant = 0; @@ -375,7 +646,7 @@ if (blend_col != CLR_NONE) { -@@ -1330,6 +1341,68 @@ done: +@@ -1344,6 +1355,68 @@ done: return ret; } @@ -444,7 +715,17 @@ /************************************************************************* * ImageList_DrawIndirect [COMCTL32.@] * -@@ -1406,6 +1479,23 @@ ImageList_DrawIndirect (IMAGELISTDRAWPAR +@@ -1371,6 +1444,9 @@ ImageList_DrawIndirect (IMAGELISTDRAWPAR + HBRUSH hOldBrush; + POINT pt; + BOOL has_alpha; ++#ifdef __REACTOS__ ++ HDC hdcSaturated = NULL; ++#endif + + if (!pimldp || !(himl = pimldp->himl)) return FALSE; + if (!is_valid(himl)) return FALSE; +@@ -1420,6 +1496,24 @@ ImageList_DrawIndirect (IMAGELISTDRAWPAR oldImageFg = SetTextColor( hImageDC, RGB( 0, 0, 0 ) ); oldImageBk = SetBkColor( hImageDC, RGB( 0xff, 0xff, 0xff ) ); @@ -455,9 +736,10 @@ + */ + if (fState & ILS_SATURATE) + { -+ hImageListDC = saturate_image(himl, pimldp->hdcDst, pimldp->x, pimldp->y, ++ hdcSaturated = saturate_image(himl, pimldp->hdcDst, pimldp->x, pimldp->y, + pt.x, pt.y, cx, cy, pimldp->rgbFg); + ++ hImageListDC = hdcSaturated; + /* shitty way of getting subroutines to blit at the right place (top left corner), + as our modified imagelist only contains a single image for performance reasons */ + pt.x = 0; @@ -468,7 +750,7 @@ has_alpha = (himl->has_alpha && himl->has_alpha[pimldp->i]); if (!bMask && (has_alpha || (fState & ILS_ALPHA))) { -@@ -1426,7 +1516,11 @@ ImageList_DrawIndirect (IMAGELISTDRAWPAR +@@ -1440,7 +1534,11 @@ ImageList_DrawIndirect (IMAGELISTDRAWPAR if (bIsTransparent) { @@ -480,7 +762,7 @@ pt.x, pt.y, cx, cy, func, fStyle, blend_col ); goto end; } -@@ -1436,7 +1530,11 @@ ImageList_DrawIndirect (IMAGELISTDRAWPAR +@@ -1450,7 +1548,11 @@ ImageList_DrawIndirect (IMAGELISTDRAWPAR hOldBrush = SelectObject (hImageDC, CreateSolidBrush (colour)); PatBlt( hImageDC, 0, 0, cx, cy, PATCOPY ); @@ -492,7 +774,7 @@ DeleteObject (SelectObject (hImageDC, hOldBrush)); bResult = BitBlt( pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy, hImageDC, 0, 0, SRCCOPY ); goto end; -@@ -1530,7 +1628,9 @@ ImageList_DrawIndirect (IMAGELISTDRAWPAR +@@ -1544,7 +1646,9 @@ ImageList_DrawIndirect (IMAGELISTDRAWPAR } } @@ -502,11 +784,22 @@ if (fState & ILS_GLOW) FIXME("ILS_GLOW: unimplemented!\n"); if (fState & ILS_SHADOW) FIXME("ILS_SHADOW: unimplemented!\n"); +@@ -1572,6 +1676,10 @@ end: + SetTextColor(hImageDC, oldImageFg); + SelectObject(hImageDC, hOldImageBmp); + cleanup: ++#ifdef __REACTOS__ ++ if (hdcSaturated) ++ DeleteDC(hdcSaturated); ++#endif + DeleteObject(hBlendMaskBmp); + DeleteObject(hImageBmp); + DeleteDC(hImageDC); Common subdirectories: e:\wine\dlls\comctl32/lang and e:\reactos\dll\win32\comctl32/lang diff -pudN e:\wine\dlls\comctl32/listview.c e:\reactos\dll\win32\comctl32/listview.c ---- e:\wine\dlls\comctl32/listview.c 2016-11-16 17:28:41 +0100 -+++ e:\reactos\dll\win32\comctl32/listview.c 2016-08-15 16:09:30 +0100 -@@ -287,6 +287,9 @@ typedef struct tagLISTVIEW_INFO +--- e:\wine\dlls\comctl32/listview.c 2017-09-07 12:58:14 +0100 ++++ e:\reactos\dll\win32\comctl32/listview.c 2017-08-04 10:38:09 +0100 +@@ -286,6 +286,9 @@ typedef struct tagLISTVIEW_INFO COLORREF clrBk; COLORREF clrText; COLORREF clrTextBk; @@ -516,7 +809,7 @@ /* font */ HFONT hDefaultFont; -@@ -1696,8 +1699,24 @@ static inline BOOL LISTVIEW_GetItemW(con +@@ -1695,8 +1698,24 @@ static inline BOOL LISTVIEW_GetItemW(con /* used to handle collapse main item column case */ static inline BOOL LISTVIEW_DrawFocusRect(const LISTVIEW_INFO *infoPtr, HDC hdc) { @@ -541,7 +834,19 @@ } /* Listview invalidation functions: use _only_ these functions to invalidate */ -@@ -4688,7 +4707,12 @@ static void LISTVIEW_DrawItemPart(LISTVI +@@ -2202,8 +2221,9 @@ static void LISTVIEW_ShowFocusRect(const + SelectObject(hdc, hOldFont); + } + else +- LISTVIEW_InvalidateItem(infoPtr, infoPtr->nFocusedItem); +- ++ { ++ LISTVIEW_DrawFocusRect(infoPtr, hdc); ++ } + done: + ReleaseDC(infoPtr->hwndSelf, hdc); + } +@@ -4707,7 +4727,12 @@ static void LISTVIEW_DrawItemPart(LISTVI if (infoPtr->uView == LV_VIEW_DETAILS && infoPtr->dwLvExStyle & LVS_EX_GRIDLINES) rcLabel.bottom--; @@ -555,7 +860,7 @@ } /*** -@@ -5232,7 +5256,11 @@ enddraw: +@@ -5251,7 +5276,11 @@ enddraw: /* Draw marquee rectangle if appropriate */ if (infoPtr->bMarqueeSelect) @@ -567,7 +872,7 @@ if (cdmode & CDRF_NOTIFYPOSTPAINT) notify_postpaint(infoPtr, &nmlvcd); -@@ -8035,6 +8063,9 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW +@@ -8056,6 +8085,9 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW { TRACE("(color=%x)\n", color); @@ -577,7 +882,7 @@ if(infoPtr->clrBk != color) { if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); infoPtr->clrBk = color; -@@ -8710,7 +8741,7 @@ static DWORD LISTVIEW_SetIconSpacing(LIS +@@ -8731,7 +8763,7 @@ static DWORD LISTVIEW_SetIconSpacing(LIS return oldspacing; } @@ -586,7 +891,7 @@ { INT cx, cy; -@@ -8721,8 +8752,8 @@ static inline void set_icon_size(SIZE *s +@@ -8742,8 +8774,8 @@ static inline void set_icon_size(SIZE *s } else { @@ -597,7 +902,7 @@ } } -@@ -9458,6 +9489,9 @@ static LRESULT LISTVIEW_NCCreate(HWND hw +@@ -9477,6 +9509,9 @@ static LRESULT LISTVIEW_NCCreate(HWND hw infoPtr->clrText = CLR_DEFAULT; infoPtr->clrTextBk = CLR_DEFAULT; LISTVIEW_SetBkColor(infoPtr, comctl32_color.clrWindow); @@ -607,7 +912,23 @@ /* set default values */ infoPtr->nFocusedItem = -1; -@@ -11741,6 +11775,14 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg +@@ -10622,8 +10657,15 @@ static BOOL LISTVIEW_NCPaint(const LISTV + CombineRgn (cliprgn, cliprgn, region, RGN_AND); + OffsetRect(&r, -r.left, -r.top); + ++#ifdef __REACTOS__ /* r73789 */ ++ dc = GetWindowDC(infoPtr->hwndSelf); ++ /* Exclude client part */ ++ ExcludeClipRect(dc, r.left + cxEdge, r.top + cyEdge, ++ r.right - cxEdge, r.bottom -cyEdge); ++#else + dc = GetDCEx(infoPtr->hwndSelf, region, DCX_WINDOW|DCX_INTERSECTRGN); + OffsetRect(&r, -r.left, -r.top); ++#endif + + if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) + DrawThemeParentBackground(infoPtr->hwndSelf, dc, &r); +@@ -11761,6 +11803,14 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors(); @@ -623,8 +944,8 @@ /* case WM_TIMER: */ diff -pudN e:\wine\dlls\comctl32/monthcal.c e:\reactos\dll\win32\comctl32/monthcal.c ---- e:\wine\dlls\comctl32/monthcal.c 2016-11-16 17:28:41 +0100 -+++ e:\reactos\dll\win32\comctl32/monthcal.c 2016-08-17 13:29:31 +0100 +--- e:\wine\dlls\comctl32/monthcal.c 2017-09-07 12:58:14 +0100 ++++ e:\reactos\dll\win32\comctl32/monthcal.c 2017-09-07 13:07:02 +0100 @@ -43,6 +43,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(monthcal); @@ -636,9 +957,23 @@ #define MC_SEL_LBUTDOWN 2 /* Left button pressed in calendar */ #define MC_PREVPRESSED 4 /* Prev month button pressed */ diff -pudN e:\wine\dlls\comctl32/propsheet.c e:\reactos\dll\win32\comctl32/propsheet.c ---- e:\wine\dlls\comctl32/propsheet.c 2016-11-16 17:28:41 +0100 -+++ e:\reactos\dll\win32\comctl32/propsheet.c 2016-08-15 16:10:02 +0100 -@@ -2355,12 +2355,19 @@ static void PROPSHEET_SetWizButtons(HWND +--- e:\wine\dlls\comctl32/propsheet.c 2017-09-07 12:58:14 +0100 ++++ e:\reactos\dll\win32\comctl32/propsheet.c 2017-05-21 20:32:06 +0100 +@@ -1176,8 +1176,13 @@ PROPSHEET_WizardSubclassProc(HWND hwnd, + return TRUE; + + case WM_CTLCOLORSTATIC: ++#ifdef __REACTOS__ ++ SetBkMode((HDC)wParam, TRANSPARENT); ++ return (INT_PTR)GetStockObject(HOLLOW_BRUSH); ++#else + SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW)); + return (INT_PTR)GetSysColorBrush(COLOR_WINDOW); ++#endif + } + + return DefSubclassProc(hwnd, uMsg, wParam, lParam); +@@ -2440,12 +2445,19 @@ static void PROPSHEET_SetWizButtons(HWND HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON); BOOL enable_finish = ((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH); @@ -658,7 +993,7 @@ /* set the default pushbutton to an enabled button */ if (enable_finish) SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); -@@ -2370,6 +2377,7 @@ static void PROPSHEET_SetWizButtons(HWND +@@ -2455,6 +2467,7 @@ static void PROPSHEET_SetWizButtons(HWND SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); else SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); @@ -666,7 +1001,7 @@ if (!psInfo->hasFinish) { -@@ -2389,6 +2397,25 @@ static void PROPSHEET_SetWizButtons(HWND +@@ -2474,6 +2487,25 @@ static void PROPSHEET_SetWizButtons(HWND ShowWindow(hwndNext, SW_SHOW); } } @@ -692,9 +1027,46 @@ } /****************************************************************************** +@@ -3282,7 +3314,11 @@ static LRESULT PROPSHEET_Paint(HWND hwnd + + hOldFont = SelectObject(hdc, psInfo->hFontBold); + ++#ifdef __REACTOS__ ++ if (psInfo->ppshheader.u5.hbmHeader) ++#else + if (psInfo->ppshheader.dwFlags & PSH_USEHBMHEADER) ++#endif + { + hbmp = SelectObject(hdcSrc, psInfo->ppshheader.u5.hbmHeader); + +@@ -3357,7 +3393,11 @@ static LRESULT PROPSHEET_Paint(HWND hwnd + if (ppshpage->dwFlags & PSP_USEHEADERSUBTITLE) { + SelectObject(hdc, psInfo->hFont); + SetRect(&r, 40, 25, rzone.right - 69, rzone.bottom); ++#ifdef __REACTOS__ ++ if (!IS_INTRESOURCE(ppshpage->pszHeaderSubTitle)) ++#else + if (!IS_INTRESOURCE(ppshpage->pszHeaderTitle)) ++#endif + DrawTextW(hdc, ppshpage->pszHeaderSubTitle, -1, &r, DT_LEFT | DT_WORDBREAK); + else + { +@@ -3379,7 +3419,12 @@ static LRESULT PROPSHEET_Paint(HWND hwnd + + if ( (ppshpage && (ppshpage->dwFlags & PSP_HIDEHEADER)) && + (psInfo->ppshheader.dwFlags & (PSH_WIZARD97_OLD | PSH_WIZARD97_NEW)) && ++#ifdef __REACTOS__ ++ (psInfo->ppshheader.dwFlags & PSH_WATERMARK) && ++ (psInfo->ppshheader.u4.hbmWatermark) ) ++#else + (psInfo->ppshheader.dwFlags & PSH_WATERMARK) ) ++#endif + { + HWND hwndLine = GetDlgItem(hwnd, IDC_SUNKEN_LINE); + diff -pudN e:\wine\dlls\comctl32/rebar.c e:\reactos\dll\win32\comctl32/rebar.c ---- e:\wine\dlls\comctl32/rebar.c 2016-11-16 17:28:41 +0100 -+++ e:\reactos\dll\win32\comctl32/rebar.c 2016-08-15 16:11:05 +0100 +--- e:\wine\dlls\comctl32/rebar.c 2017-09-07 12:58:14 +0100 ++++ e:\reactos\dll\win32\comctl32/rebar.c 2017-05-07 14:47:57 +0100 @@ -50,7 +50,6 @@ * - WM_QUERYNEWPALETTE * - WM_RBUTTONDOWN @@ -816,8 +1188,8 @@ + HBRUSH hbrush = CreateSolidBrush(new); + FillRgn(hdc, hrgn, hbrush); + DeleteObject(hbrush); -+ DeleteObject(hrgn); -+ } ++ } ++ DeleteObject(hrgn); +#endif return TRUE; } @@ -907,9 +1279,530 @@ return 0; /* case WM_VKEYTOITEM: supported according to ControlSpy */ +diff -pudN e:\wine\dlls\comctl32/syslink.c e:\reactos\dll\win32\comctl32/syslink.c +--- e:\wine\dlls\comctl32/syslink.c 2017-09-07 12:58:14 +0100 ++++ e:\reactos\dll\win32\comctl32/syslink.c 2017-05-27 17:00:22 +0100 +@@ -29,8 +29,6 @@ + + #include "comctl32.h" + +-#include <wine/list.h> +- + WINE_DEFAULT_DEBUG_CHANNEL(syslink); + + typedef struct +diff -pudN e:\wine\dlls\comctl32/theme_button.c e:\reactos\dll\win32\comctl32/theme_button.c +--- e:\wine\dlls\comctl32/theme_button.c 2017-09-07 12:58:14 +0100 ++++ e:\reactos\dll\win32\comctl32/theme_button.c 2017-08-11 22:11:08 +0100 +@@ -34,7 +34,30 @@ typedef enum + STATE_DEFAULTED + } ButtonState; + ++#ifdef __REACTOS__ /* r73885 */ ++typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc, ButtonState drawState, UINT dtFlags, BOOL focused, LPARAM prfFlag); ++#else + typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc, ButtonState drawState, UINT dtFlags, BOOL focused); ++#endif ++ ++#ifdef __REACTOS__ /* r73885 & r73907 */ ++static inline LONG get_button_state( HWND hwnd ) ++{ ++ return _GetButtonData(hwnd)->state; ++} ++ ++static inline HFONT get_button_font( HWND hwnd ) ++{ ++ return (HFONT)_GetButtonData(hwnd)->font; ++} ++ ++static inline LONG_PTR get_button_image(HWND hwnd) ++{ ++ return _GetButtonData(hwnd)->image; ++} ++ ++BOOL BUTTON_DrawIml(HDC hdc, BUTTON_IMAGELIST *pimlData, RECT *prc, BOOL bOnlyCalc); ++#endif + + static UINT get_drawtext_flags(DWORD style, DWORD ex_style) + { +@@ -87,22 +110,56 @@ static inline WCHAR *get_button_text(HWN + return text; + } + ++#ifdef __REACTOS__ /* r73885 */ ++static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused, LPARAM prfFlag) ++#else + static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) ++#endif + { + static const int states[] = { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_DEFAULTED }; + + RECT bgRect, textRect; ++#ifdef __REACTOS__ /* r73885 */ ++ HFONT font = get_button_font(hwnd); ++#else + HFONT font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); ++#endif + HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; + int state = states[ drawState ]; + WCHAR *text = get_button_text(hwnd); ++#ifdef __REACTOS__ /* r74012 & r74406 */ ++ PBUTTON_DATA pdata = _GetButtonData(hwnd); ++ HWND parent; ++ HBRUSH hBrush; ++#endif + + GetClientRect(hwnd, &bgRect); + GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); + ++#ifdef __REACTOS__ /* r73885 & r74149 */ ++ if (prfFlag == 0) ++ { ++ if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) ++ DrawThemeParentBackground(hwnd, hDC, NULL); ++ } ++#else + if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) + DrawThemeParentBackground(hwnd, hDC, NULL); ++#endif ++ ++#ifdef __REACTOS__ /* r74406 */ ++ parent = GetParent(hwnd); ++ if (!parent) parent = hwnd; ++ hBrush = (HBRUSH)SendMessageW( parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)hwnd ); ++ FillRect( hDC, &bgRect, hBrush ); ++#endif ++ + DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &bgRect, NULL); ++ ++#ifdef __REACTOS__ /* r74012 */ ++ BUTTON_DrawIml(hDC, &pdata->imlData, &textRect, FALSE); ++#endif ++ + if (text) + { + DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &textRect); +@@ -127,7 +184,11 @@ static void PB_draw(HTHEME theme, HWND h + if (hPrevFont) SelectObject(hDC, hPrevFont); + } + ++#ifdef __REACTOS__ /* r73885 */ ++static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused, LPARAM prfFlag) ++#else + static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) ++#endif + { + static const int cb_states[3][5] = + { +@@ -145,7 +206,11 @@ static void CB_draw(HTHEME theme, HWND h + SIZE sz; + RECT bgRect, textRect; + HFONT font, hPrevFont = NULL; ++#ifdef __REACTOS__ /* r73885 */ ++ LRESULT checkState = get_button_state(hwnd) & 3; ++#else + LRESULT checkState = SendMessageW(hwnd, BM_GETCHECK, 0, 0); ++#endif + DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); + int part = ((dwStyle & BUTTON_TYPE) == BS_RADIOBUTTON) || ((dwStyle & BUTTON_TYPE) == BS_AUTORADIOBUTTON) + ? BP_RADIOBUTTON +@@ -156,6 +221,10 @@ static void CB_draw(HTHEME theme, HWND h + WCHAR *text = get_button_text(hwnd); + LOGFONTW lf; + BOOL created_font = FALSE; ++#ifdef __REACTOS__ /* r74406 */ ++ HWND parent; ++ HBRUSH hBrush; ++#endif + + HRESULT hr = GetThemeFont(theme, hDC, part, state, TMT_FONT, &lf); + if (SUCCEEDED(hr)) { +@@ -168,7 +237,11 @@ static void CB_draw(HTHEME theme, HWND h + created_font = TRUE; + } + } else { ++#ifdef __REACTOS__ /* r73885 */ ++ font = get_button_font(hwnd); ++#else + font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); ++#endif + hPrevFont = SelectObject(hDC, font); + } + +@@ -176,6 +249,23 @@ static void CB_draw(HTHEME theme, HWND h + sz.cx = sz.cy = 13; + + GetClientRect(hwnd, &bgRect); ++ ++#ifdef __REACTOS__ /* r73885, r74149 and r74406 */ ++ if (prfFlag == 0) ++ { ++ DrawThemeParentBackground(hwnd, hDC, NULL); ++ } ++ ++ parent = GetParent(hwnd); ++ if (!parent) parent = hwnd; ++ hBrush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, ++ (WPARAM)hDC, (LPARAM)hwnd); ++ if (!hBrush) /* did the app forget to call defwindowproc ? */ ++ hBrush = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, ++ (WPARAM)hDC, (LPARAM)hwnd ); ++ FillRect( hDC, &bgRect, hBrush ); ++#endif ++ + GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &textRect); + + if (dtFlags & DT_SINGLELINE) /* Center the checkbox / radio button to the text. */ +@@ -186,7 +276,9 @@ static void CB_draw(HTHEME theme, HWND h + bgRect.right = bgRect.left + sz.cx; + textRect.left = bgRect.right + 6; + ++#ifndef __REACTOS__ /* r74406 */ + DrawThemeParentBackground(hwnd, hDC, NULL); ++#endif + + DrawThemeBackground(theme, hDC, part, state, &bgRect, NULL); + if (text) +@@ -214,7 +306,11 @@ static void CB_draw(HTHEME theme, HWND h + if (hPrevFont) SelectObject(hDC, hPrevFont); + } + ++#ifdef __REACTOS__ /* r73885 */ ++static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused, LPARAM prfFlag) ++#else + static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) ++#endif + { + static const int states[] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; + +@@ -224,6 +320,11 @@ static void GB_draw(HTHEME theme, HWND h + LOGFONTW lf; + HFONT font, hPrevFont = NULL; + BOOL created_font = FALSE; ++#ifdef __REACTOS__ /* r74406 */ ++ HWND parent; ++ HBRUSH hBrush; ++ RECT clientRect; ++#endif + + HRESULT hr = GetThemeFont(theme, hDC, BP_GROUPBOX, state, TMT_FONT, &lf); + if (SUCCEEDED(hr)) { +@@ -235,7 +336,11 @@ static void GB_draw(HTHEME theme, HWND h + created_font = TRUE; + } + } else { ++#ifdef __REACTOS__ /* r73885 */ ++ font = get_button_font(hwnd); ++#else + font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); ++#endif + hPrevFont = SelectObject(hDC, font); + } + +@@ -257,8 +362,29 @@ static void GB_draw(HTHEME theme, HWND h + GetThemeBackgroundContentRect(theme, hDC, BP_GROUPBOX, state, &bgRect, &contentRect); + ExcludeClipRect(hDC, contentRect.left, contentRect.top, contentRect.right, contentRect.bottom); + ++#ifdef __REACTOS__ /* r73885 & r74149 */ ++ if (prfFlag == 0) ++ { ++ if (IsThemeBackgroundPartiallyTransparent(theme, BP_GROUPBOX, state)) ++ DrawThemeParentBackground(hwnd, hDC, NULL); ++ } ++#else + if (IsThemeBackgroundPartiallyTransparent(theme, BP_GROUPBOX, state)) + DrawThemeParentBackground(hwnd, hDC, NULL); ++#endif ++ ++#ifdef __REACTOS__ /* r74406 */ ++ parent = GetParent(hwnd); ++ if (!parent) parent = hwnd; ++ hBrush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, ++ (WPARAM)hDC, (LPARAM)hwnd); ++ if (!hBrush) /* did the app forget to call defwindowproc ? */ ++ hBrush = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, ++ (WPARAM)hDC, (LPARAM)hwnd ); ++ GetClientRect(hwnd, &clientRect); ++ FillRect( hDC, &clientRect, hBrush ); ++#endif ++ + DrawThemeBackground(theme, hDC, BP_GROUPBOX, state, &bgRect, NULL); + + SelectClipRgn(hDC, NULL); +@@ -294,32 +420,84 @@ static const pfThemedPaint btnThemedPain + NULL, /* Not defined */ + }; + ++#ifdef __REACTOS__ /* r73873 */ ++BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC, LPARAM prfFlag) ++#else + static BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC) ++#endif + { ++#ifdef __REACTOS__ /* r73873, r73897 and r74120 */ ++ DWORD dwStyle; ++ DWORD dwStyleEx; ++ DWORD type; ++ UINT dtFlags; ++ int state; ++#else + PAINTSTRUCT ps; + HDC hDC; + DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); + DWORD dwStyleEx = GetWindowLongW(hwnd, GWL_EXSTYLE); + UINT dtFlags = get_drawtext_flags(dwStyle, dwStyleEx); + int state = (int)SendMessageW(hwnd, BM_GETSTATE, 0, 0); ++#endif + ButtonState drawState; ++#ifdef __REACTOS__ /* r73873, r73897, r73907 and r74120 */ ++ pfThemedPaint paint; ++ ++ dwStyle = GetWindowLongW(hwnd, GWL_STYLE); ++ type = dwStyle & BUTTON_TYPE; ++ ++ if (type != BS_PUSHBUTTON && type != BS_DEFPUSHBUTTON && (dwStyle & BS_PUSHLIKE)) ++ type = BS_PUSHBUTTON; ++ ++ paint = btnThemedPaintFunc[type]; ++ if (!paint) ++ return FALSE; ++ ++ if (get_button_image(hwnd) != 0) ++ return FALSE; ++ ++ dwStyleEx = GetWindowLongW(hwnd, GWL_EXSTYLE); ++ dtFlags = get_drawtext_flags(dwStyle, dwStyleEx); ++ state = get_button_state(hwnd); ++#else + pfThemedPaint paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; ++#endif + + if(IsWindowEnabled(hwnd)) + { +- if(state & BST_PUSHED) drawState = STATE_PRESSED; +- else if(state & BST_HOT) drawState = STATE_HOT; +- else if(state & BST_FOCUS) drawState = STATE_DEFAULTED; +- else drawState = STATE_NORMAL; ++ if(state & BST_PUSHED) ++ drawState = STATE_PRESSED; ++ else if ((dwStyle & BS_PUSHLIKE) && (state & (BST_CHECKED|BST_INDETERMINATE))) ++ drawState = STATE_PRESSED; ++ else if(state & BST_HOT) ++ drawState = STATE_HOT; ++ else if(state & BST_FOCUS) ++ drawState = STATE_DEFAULTED; ++ else ++ drawState = STATE_NORMAL; + } +- else drawState = STATE_DISABLED; ++ else ++ drawState = STATE_DISABLED; + ++#ifndef __REACTOS__ /* r73873 */ + hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); + if (paint) paint(theme, hwnd, hDC, drawState, dtFlags, state & BST_FOCUS); + if (!hParamDC) EndPaint(hwnd, &ps); ++#endif ++ ++#ifdef __REACTOS__ /* r74074 & r74120 */ ++ if (drawState == STATE_NORMAL && type == BS_DEFPUSHBUTTON) ++ { ++ drawState = STATE_DEFAULTED; ++ } ++#endif ++ ++ paint(theme, hwnd, hParamDC, drawState, dtFlags, state & BST_FOCUS, prfFlag); + return TRUE; + } + ++#ifndef __REACTOS__ /* r73873 */ + /********************************************************************** + * The button control subclass window proc. + */ +@@ -416,3 +594,4 @@ LRESULT CALLBACK THEMING_ButtonSubclassP + } + return 0; + } ++#endif /* !__REACTOS__ */ +diff -pudN e:\wine\dlls\comctl32/theme_edit.c e:\reactos\dll\win32\comctl32/theme_edit.c +--- e:\wine\dlls\comctl32/theme_edit.c 2017-09-07 12:58:14 +0100 ++++ e:\reactos\dll\win32\comctl32/theme_edit.c 2017-05-21 20:36:43 +0100 +@@ -52,8 +52,15 @@ static void nc_paint (HTHEME theme, HWND + CombineRgn (cliprgn, cliprgn, region, RGN_AND); + OffsetRect(&r, -r.left, -r.top); + ++#ifdef __REACTOS__ /* r73789 */ ++ dc = GetWindowDC(hwnd); ++ /* Exclude client part */ ++ ExcludeClipRect(dc, r.left + cxEdge, r.top + cyEdge, ++ r.right - cxEdge, r.bottom -cyEdge); ++#else + dc = GetDCEx(hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN); + OffsetRect(&r, -r.left, -r.top); ++#endif + + if (IsThemeBackgroundPartiallyTransparent (theme, part, state)) + DrawThemeParentBackground(hwnd, dc, &r); +diff -pudN e:\wine\dlls\comctl32/theme_listbox.c e:\reactos\dll\win32\comctl32/theme_listbox.c +--- e:\wine\dlls\comctl32/theme_listbox.c 2017-09-07 12:58:14 +0100 ++++ e:\reactos\dll\win32\comctl32/theme_listbox.c 2017-05-21 20:37:26 +0100 +@@ -42,8 +42,15 @@ static void nc_paint (HTHEME theme, HWND + CombineRgn (cliprgn, cliprgn, region, RGN_AND); + OffsetRect(&r, -r.left, -r.top); + ++#ifdef __REACTOS__ /* r73789 */ ++ dc = GetWindowDC(hwnd); ++ /* Exclude client part */ ++ ExcludeClipRect(dc, r.left + cxEdge, r.top + cyEdge, ++ r.right - cxEdge, r.bottom -cyEdge); ++#else + dc = GetDCEx(hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN); + OffsetRect(&r, -r.left, -r.top); ++#endif + + if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) + DrawThemeParentBackground(hwnd, dc, &r); +diff -pudN e:\wine\dlls\comctl32/theming.c e:\reactos\dll\win32\comctl32/theming.c +--- e:\wine\dlls\comctl32/theming.c 2017-09-07 12:58:14 +0100 ++++ e:\reactos\dll\win32\comctl32/theming.c 2017-05-21 20:45:56 +0100 +@@ -26,12 +26,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(theming); + typedef LRESULT (CALLBACK* THEMING_SUBCLASSPROC)(HWND, UINT, WPARAM, LPARAM, + ULONG_PTR); + ++#ifndef __REACTOS__ /* r73871 */ + extern LRESULT CALLBACK THEMING_ButtonSubclassProc (HWND, UINT, WPARAM, LPARAM, + ULONG_PTR) DECLSPEC_HIDDEN; ++#endif + extern LRESULT CALLBACK THEMING_ComboSubclassProc (HWND, UINT, WPARAM, LPARAM, + ULONG_PTR) DECLSPEC_HIDDEN; ++#ifndef __REACTOS__ /* r73803 */ + extern LRESULT CALLBACK THEMING_DialogSubclassProc (HWND, UINT, WPARAM, LPARAM, + ULONG_PTR) DECLSPEC_HIDDEN; ++#endif + extern LRESULT CALLBACK THEMING_EditSubclassProc (HWND, UINT, WPARAM, LPARAM, + ULONG_PTR) DECLSPEC_HIDDEN; + extern LRESULT CALLBACK THEMING_ListBoxSubclassProc (HWND, UINT, WPARAM, LPARAM, +@@ -48,8 +52,10 @@ static const struct ThemingSubclass + THEMING_SUBCLASSPROC subclassProc; + } subclasses[] = { + /* Note: list must be sorted by class name */ ++#ifndef __REACTOS__ /* r73803 & r73871 */ + {dialogClass, THEMING_DialogSubclassProc}, + {WC_BUTTONW, THEMING_ButtonSubclassProc}, ++#endif + {WC_COMBOBOXW, THEMING_ComboSubclassProc}, + {comboLboxClass, THEMING_ListBoxSubclassProc}, + {WC_EDITW, THEMING_EditSubclassProc}, +@@ -89,17 +95,23 @@ MAKE_SUBCLASS_PROC(1) + MAKE_SUBCLASS_PROC(2) + MAKE_SUBCLASS_PROC(3) + MAKE_SUBCLASS_PROC(4) ++#ifndef __REACTOS__ /* r73803 & r73871 */ + MAKE_SUBCLASS_PROC(5) + MAKE_SUBCLASS_PROC(6) ++#endif + + static const WNDPROC subclassProcs[NUM_SUBCLASSES] = { + subclass_proc0, + subclass_proc1, + subclass_proc2, + subclass_proc3, ++#ifdef __REACTOS__ /* r73871 */ ++ subclass_proc4 ++#else + subclass_proc4, + subclass_proc5, + subclass_proc6 ++#endif + }; + + /*********************************************************************** +@@ -108,15 +120,23 @@ static const WNDPROC subclassProcs[NUM_S + * Register classes for standard controls that will shadow the system + * classes. + */ ++#ifdef __REACTOS__ /* r73803 */ ++void THEMING_Initialize(HANDLE hActCtx5, HANDLE hActCtx6) ++#else + void THEMING_Initialize (void) ++#endif + { + unsigned int i; + static const WCHAR subclassPropName[] = + { 'C','C','3','2','T','h','e','m','i','n','g','S','u','b','C','l',0 }; + static const WCHAR refDataPropName[] = + { 'C','C','3','2','T','h','e','m','i','n','g','D','a','t','a',0 }; +- ++#ifdef __REACTOS__ /* r73803 */ ++ ULONG_PTR ulCookie; ++ BOOL ret, bActivated; ++#else + if (!IsThemeActive()) return; ++#endif + + atSubclassProp = GlobalAddAtomW (subclassPropName); + atRefDataProp = GlobalAddAtomW (refDataPropName); +@@ -126,7 +146,17 @@ void THEMING_Initialize (void) + WNDCLASSEXW class; + + class.cbSize = sizeof(class); ++ ++#ifdef __REACTOS__ /* r73803 */ ++ bActivated = ActivateActCtx(hActCtx5, &ulCookie); ++ ret = GetClassInfoExW (NULL, subclasses[i].className, &class); ++ if (bActivated) ++ DeactivateActCtx(0, ulCookie); ++ ++ if (!ret) ++#else + if (!GetClassInfoExW (NULL, subclasses[i].className, &class)) ++#endif + { + ERR("Could not retrieve information for class %s\n", + debugstr_w (subclasses[i].className)); +@@ -134,6 +164,10 @@ void THEMING_Initialize (void) + } + originalProcs[i] = class.lpfnWndProc; + class.lpfnWndProc = subclassProcs[i]; ++#ifdef __REACTOS__ /* r73803 */ ++ class.style |= CS_GLOBALCLASS; ++ class.hInstance = COMCTL32_hModule; ++#endif + + if (!class.lpfnWndProc) + { +@@ -142,9 +176,16 @@ void THEMING_Initialize (void) + continue; + } + ++#ifdef __REACTOS__ /* r73803 */ ++ bActivated = ActivateActCtx(hActCtx6, &ulCookie); ++#endif + if (!RegisterClassExW (&class)) + { ++#ifdef __REACTOS__ /* r73803 */ ++ WARN("Could not re-register class %s: %x\n", ++#else + ERR("Could not re-register class %s: %x\n", ++#endif + debugstr_w (subclasses[i].className), GetLastError ()); + } + else +@@ -152,6 +193,11 @@ void THEMING_Initialize (void) + TRACE("Re-registered class %s\n", + debugstr_w (subclasses[i].className)); + } ++ ++#ifdef __REACTOS__ /* r73803 */ ++ if (bActivated) ++ DeactivateActCtx(0, ulCookie); ++#endif + } + } + diff -pudN e:\wine\dlls\comctl32/toolbar.c e:\reactos\dll\win32\comctl32/toolbar.c ---- e:\wine\dlls\comctl32/toolbar.c 2016-11-16 17:28:41 +0100 -+++ e:\reactos\dll\win32\comctl32/toolbar.c 2016-08-15 16:13:17 +0100 +--- e:\wine\dlls\comctl32/toolbar.c 2017-09-07 12:58:14 +0100 ++++ e:\reactos\dll\win32\comctl32/toolbar.c 2017-08-04 10:44:05 +0100 @@ -33,11 +33,9 @@ * - TBSTYLE_REGISTERDROP * - TBSTYLE_EX_DOUBLEBUFFER @@ -922,18 +1815,19 @@ * - WM_WININICHANGE * - Notifications: * - NM_CHAR -@@ -125,6 +123,10 @@ typedef struct +@@ -125,6 +123,11 @@ typedef struct INT nOldHit; INT nHotItem; /* index of the "hot" item */ SIZE szPadding; /* padding values around button */ +#ifdef __REACTOS__ + SIZE szBarPadding; /* padding values around the toolbar (NOT USED BUT STORED) */ + SIZE szSpacing; /* spacing values between buttons */ ++ MARGINS themeMargins; +#endif INT iTopMargin; /* the top margin */ INT iListGap; /* default gap between text and image for toolbar with list style */ HFONT hDefaultFont; -@@ -190,12 +192,24 @@ typedef enum +@@ -190,12 +193,24 @@ typedef enum #define ARROW_HEIGHT 3 #define INSERTMARK_WIDTH 2 @@ -958,20 +1852,54 @@ /* how wide to treat the bitmap if it isn't present */ #define NONLIST_NOTEXT_OFFSET 2 -@@ -239,7 +253,12 @@ static LRESULT TOOLBAR_SetButtonInfo(TOO +@@ -239,6 +254,10 @@ static LRESULT TOOLBAR_SetButtonInfo(TOO static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) { -+#ifndef __REACTOS__ ++#ifdef __REACTOS__ ++ if (infoPtr->iVersion == 6) ++ return 0; ++#endif return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); -+#else /* r65766 */ -+ /* This is the behaviour in comctl32 v6 */ -+ return 0; -+#endif - } - - static inline BOOL TOOLBAR_HasDropDownArrows(DWORD exStyle) -@@ -723,10 +742,14 @@ TOOLBAR_DrawImage(const TOOLBAR_INFO *in + } + +@@ -598,6 +617,9 @@ TOOLBAR_DrawString (const TOOLBAR_INFO * + COLORREF clrOldBk = 0; + int oldBkMode = 0; + UINT state = tbcd->nmcd.uItemState; ++#ifdef __REACTOS__ ++ HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); ++#endif + + /* draw text */ + if (lpText && infoPtr->nMaxTextRows > 0) { +@@ -627,6 +649,25 @@ TOOLBAR_DrawString (const TOOLBAR_INFO * + clrOld = SetTextColor (hdc, tbcd->clrText); + } + ++#ifdef __REACTOS__ ++ if (theme) ++ { ++ int partId = TP_BUTTON; ++ int stateId = TS_NORMAL; ++ ++ if (state & CDIS_DISABLED) ++ stateId = TS_DISABLED; ++ else if (state & CDIS_SELECTED) ++ stateId = TS_PRESSED; ++ else if (state & CDIS_CHECKED) ++ stateId = (state & CDIS_HOT) ? TS_HOTCHECKED : TS_HOT; ++ else if (state & CDIS_HOT) ++ stateId = TS_HOT; ++ ++ DrawThemeText(theme, hdc, partId, stateId, lpText, -1, infoPtr->dwDTFlags, 0, rcText); ++ } ++ else ++#endif + DrawTextW (hdc, lpText, -1, rcText, infoPtr->dwDTFlags); + SetTextColor (hdc, clrOld); + if ((state & CDIS_MARKED) && !(dwItemCDFlag & TBCDRF_NOMARK)) +@@ -723,10 +764,14 @@ TOOLBAR_DrawImage(const TOOLBAR_INFO *in const NMTBCUSTOMDRAW *tbcd, DWORD dwItemCDFlag) { HIMAGELIST himl = NULL; @@ -987,7 +1915,7 @@ if (tbcd->nmcd.uItemState & (CDIS_DISABLED | CDIS_INDETERMINATE)) { -@@ -734,7 +757,22 @@ TOOLBAR_DrawImage(const TOOLBAR_INFO *in +@@ -734,7 +779,22 @@ TOOLBAR_DrawImage(const TOOLBAR_INFO *in if (!himl) { himl = TOOLBAR_GetImageListForDrawing(infoPtr, btnPtr, IMAGE_LIST_DEFAULT, &index); @@ -1010,7 +1938,7 @@ } } else if (tbcd->nmcd.uItemState & CDIS_CHECKED || -@@ -765,9 +803,34 @@ TOOLBAR_DrawImage(const TOOLBAR_INFO *in +@@ -765,9 +825,34 @@ TOOLBAR_DrawImage(const TOOLBAR_INFO *in index, himl, left, top, offset); if (draw_masked) @@ -1045,7 +1973,7 @@ } /* draws a blank frame for a toolbar button */ -@@ -884,14 +947,15 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO * +@@ -884,14 +969,15 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO * InflateRect(&rcsep, -infoPtr->szPadding.cx, -infoPtr->szPadding.cy); TOOLBAR_DrawFlatHorizontalSeparator (&rcsep, hdc, infoPtr); } @@ -1061,6 +1989,7 @@ + TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr); + } + } + + else if (btnPtr->fsStyle != BTNS_SEP) { + FIXME("Draw some kind of separator: fsStyle=%x\n", + btnPtr->fsStyle); @@ -1069,7 +1998,17 @@ } /* get a pointer to the text */ -@@ -1027,7 +1091,11 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO * +@@ -933,6 +1019,9 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO * + rcBitmap.left += ((rc.right - rc.left) - infoPtr->nBitmapWidth) / 2; + + rcBitmap.top += infoPtr->szPadding.cy / 2; ++#ifdef __REACTOS__ ++ rcBitmap.top += infoPtr->themeMargins.cyTopHeight; ++#endif + + TRACE("iBitmap=%d, start=(%d,%d) w=%d, h=%d\n", + btnPtr->iBitmap, rcBitmap.left, rcBitmap.top, +@@ -1027,7 +1116,11 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO * } } @@ -1081,7 +2020,7 @@ { int partId = drawSepDropDownArrow ? TP_SPLITBUTTON : TP_BUTTON; int stateId = TS_NORMAL; -@@ -1044,7 +1112,12 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO * +@@ -1044,7 +1137,12 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO * DrawThemeBackground (theme, hdc, partId, stateId, &rc, NULL); } @@ -1094,7 +2033,7 @@ TOOLBAR_DrawFrame(infoPtr, &tbcd, &rc, dwItemCDFlag); if (drawSepDropDownArrow) -@@ -1570,9 +1643,14 @@ static inline SIZE TOOLBAR_MeasureButton +@@ -1570,9 +1668,14 @@ static inline SIZE TOOLBAR_MeasureButton /* ... add on the necessary padding */ if (bValidImageList) { @@ -1109,7 +2048,7 @@ sizeButton.cy += LISTPAD_CY; } else -@@ -1589,7 +1667,11 @@ static inline SIZE TOOLBAR_MeasureButton +@@ -1589,7 +1692,11 @@ static inline SIZE TOOLBAR_MeasureButton { if (bHasBitmap) { @@ -1121,7 +2060,20 @@ if (sizeString.cy > 0) sizeButton.cy += 1 + sizeString.cy; sizeButton.cx = infoPtr->szPadding.cx + -@@ -1694,7 +1776,14 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *info +@@ -1603,6 +1710,12 @@ static inline SIZE TOOLBAR_MeasureButton + max(2*GetSystemMetrics(SM_CXEDGE) + sizeString.cx, infoPtr->nBitmapWidth); + } + } ++ ++#ifdef __REACTOS__ ++ sizeButton.cx += infoPtr->themeMargins.cxLeftWidth + infoPtr->themeMargins.cxRightWidth; ++ sizeButton.cy += infoPtr->themeMargins.cyTopHeight + infoPtr->themeMargins.cyBottomHeight; ++#endif ++ + return sizeButton; + } + +@@ -1695,7 +1808,14 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *info { if (btnPtr->cx) cx = btnPtr->cx; @@ -1136,25 +2088,33 @@ { SIZE sz; HDC hdc; -@@ -1953,6 +2042,17 @@ TOOLBAR_RelayEvent (HWND hwndTip, HWND h - SendMessageW (hwndTip, TTM_RELAYEVENT, 0, (LPARAM)&msg); - } - -+#ifdef __REACTOS__ -+static LRESULT -+TOOLBAR_ThemeChanged(HWND hwnd) -+{ -+ HTHEME theme = GetWindowTheme(hwnd); -+ CloseThemeData(theme); -+ OpenThemeData(hwnd, themeClass); -+ return 0; -+} -+#endif -+ - static void - TOOLBAR_TooltipAddTool(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *button) - { -@@ -3534,6 +3634,36 @@ TOOLBAR_GetMaxSize (const TOOLBAR_INFO * +@@ -1747,14 +1867,14 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *info + if( bWrap ) + { + if ( !(btnPtr->fsStyle & BTNS_SEP) ) +- y += cy; ++ y += cy + infoPtr->szSpacing.cy; + else + { + if ( !(infoPtr->dwStyle & CCS_VERT)) + y += cy + ( (btnPtr->cx > 0 ) ? + btnPtr->cx : SEPARATOR_WIDTH) * 2 /3; + else +- y += cy; ++ y += cy + infoPtr->szSpacing.cy; + + /* nSepRows is used to calculate the extra height following */ + /* the last row. */ +@@ -1768,7 +1888,7 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *info + nRows++; + } + else +- x += cx; ++ x += cx + infoPtr->szSpacing.cx; + } + + /* infoPtr->nRows is the number of rows on the toolbar */ +@@ -3540,6 +3660,34 @@ TOOLBAR_GetMaxSize (const TOOLBAR_INFO * return TRUE; } @@ -1162,10 +2122,8 @@ +static LRESULT +TOOLBAR_GetMetrics(const TOOLBAR_INFO *infoPtr, TBMETRICS *pMetrics) +{ -+ if (pMetrics == NULL) -+ return FALSE; -+ -+ /* TODO: check if cbSize is a valid value */ ++ if (pMetrics == NULL || pMetrics->cbSize != sizeof(TBMETRICS)) ++ return 0; + + if (pMetrics->dwMask & TBMF_PAD) + { @@ -1185,13 +2143,36 @@ + pMetrics->cyButtonSpacing = infoPtr->szSpacing.cy; + } + -+ return TRUE; ++ return 0; +} +#endif /* << TOOLBAR_GetObject >> */ -@@ -4789,6 +4919,44 @@ TOOLBAR_SetMaxTextRows (TOOLBAR_INFO *in +@@ -4337,7 +4485,7 @@ TOOLBAR_SetBitmapSize (TOOLBAR_INFO *inf + short width = (short)LOWORD(lParam); + short height = (short)HIWORD(lParam); + +- TRACE("hwnd=%p, wParam=%ld, size %d x %d\n", infoPtr->hwndSelf, wParam, width, height); ++ TRACE("hwnd=%p, wParam=%ld, lParam=%ld\n", infoPtr->hwndSelf, wParam, lParam); + + if (wParam != 0) + FIXME("wParam is %ld. Perhaps image list index?\n", wParam); +@@ -4455,8 +4603,13 @@ TOOLBAR_SetButtonSize (TOOLBAR_INFO *inf + if (cx == 0) cx = 24; + if (cy == 0) cy = 22; + ++#ifdef __REACTOS__ ++ cx = max(cx, infoPtr->szPadding.cx + infoPtr->nBitmapWidth + infoPtr->themeMargins.cxLeftWidth + infoPtr->themeMargins.cxRightWidth); ++ cy = max(cy, infoPtr->szPadding.cy + infoPtr->nBitmapHeight + infoPtr->themeMargins.cyTopHeight + infoPtr->themeMargins.cyBottomHeight); ++#else + cx = max(cx, infoPtr->szPadding.cx + infoPtr->nBitmapWidth); + cy = max(cy, infoPtr->szPadding.cy + infoPtr->nBitmapHeight); ++#endif + + if (cx != infoPtr->nButtonWidth || cy != infoPtr->nButtonHeight || + top != infoPtr->iTopMargin) +@@ -4794,6 +4947,44 @@ TOOLBAR_SetMaxTextRows (TOOLBAR_INFO *in return TRUE; } @@ -1199,6 +2180,7 @@ +static LRESULT +TOOLBAR_SetMetrics(TOOLBAR_INFO *infoPtr, TBMETRICS *pMetrics) +{ + + BOOL changed = FALSE; + + if (!pMetrics) @@ -1236,27 +2218,101 @@ /* MSDN gives slightly wrong info on padding. * 1. It is not only used on buttons with the BTNS_AUTOSIZE style -@@ -6029,6 +6197,10 @@ TOOLBAR_NCCreate (HWND hwnd, WPARAM wPar +@@ -5083,6 +5274,16 @@ TOOLBAR_SetVersion (TOOLBAR_INFO *infoPt + { + INT iOldVersion = infoPtr->iVersion; + ++#ifdef __REACTOS__ ++ /* The v6 control doesn't support changing its version */ ++ if (iOldVersion == 6) ++ return iOldVersion; ++ ++ /* And a control that is not v6 can't be set to be a v6 one */ ++ if (iVersion >= 6) ++ return -1; ++#endif ++ + infoPtr->iVersion = iVersion; + + if (infoPtr->iVersion >= 5) +@@ -5269,8 +5470,16 @@ TOOLBAR_Create (HWND hwnd, const CREATES + + SystemParametersInfoW (SPI_GETICONTITLELOGFONT, 0, &logFont, 0); + infoPtr->hFont = infoPtr->hDefaultFont = CreateFontIndirectW (&logFont); +- ++ ++#ifdef __REACTOS__ ++ { ++ HTHEME theme = OpenThemeData (hwnd, themeClass); ++ if (theme) ++ GetThemeMargins(theme, NULL, TP_BUTTON, TS_NORMAL, TMT_CONTENTMARGINS, NULL, &infoPtr->themeMargins); ++ } ++#else + OpenThemeData (hwnd, themeClass); ++#endif + + TOOLBAR_CheckStyle (infoPtr); + +@@ -5993,7 +6202,11 @@ TOOLBAR_NCCalcSize (HWND hwnd, WPARAM wP + + + static LRESULT ++#ifdef __REACTOS__ ++TOOLBAR_NCCreate (HWND hwnd, WPARAM wParam, const CREATESTRUCTW *lpcs, int iVersion) ++#else + TOOLBAR_NCCreate (HWND hwnd, WPARAM wParam, const CREATESTRUCTW *lpcs) ++#endif + { + TOOLBAR_INFO *infoPtr; + DWORD styleadd = 0; +@@ -6027,13 +6240,22 @@ TOOLBAR_NCCreate (HWND hwnd, WPARAM wPar + infoPtr->dwDTFlags = (lpcs->style & TBSTYLE_LIST) ? DT_LEFT | DT_VCENTER | DT_SINGLELINE | DT_END_ELLIPSIS: DT_CENTER | DT_END_ELLIPSIS; + infoPtr->bAnchor = FALSE; /* no anchor highlighting */ + infoPtr->bDragOutSent = FALSE; ++#ifdef __REACTOS__ ++ infoPtr->iVersion = iVersion; ++#else + infoPtr->iVersion = 0; ++#endif + infoPtr->hwndSelf = hwnd; + infoPtr->bDoRedraw = TRUE; + infoPtr->clrBtnHighlight = CLR_DEFAULT; infoPtr->clrBtnShadow = CLR_DEFAULT; infoPtr->szPadding.cx = DEFPAD_CX; infoPtr->szPadding.cy = DEFPAD_CY; +#ifdef __REACTOS__ -+ infoPtr->szSpacing.cx = DEFSPACE_CX; -+ infoPtr->szSpacing.cy = DEFSPACE_CY; ++ infoPtr->szSpacing.cx = 0; ++ infoPtr->szSpacing.cy = 0; ++ memset(&infoPtr->themeMargins, 0 , sizeof(infoPtr->themeMargins)); +#endif infoPtr->iListGap = DEFLISTGAP; infoPtr->iTopMargin = default_top_margin(infoPtr); infoPtr->dwStyle = lpcs->style; -@@ -6438,7 +6610,7 @@ TOOLBAR_SysColorChange (void) +@@ -6443,8 +6665,22 @@ TOOLBAR_SysColorChange (void) return 0; } - -+#ifndef __REACTOS__ ++#ifdef __REACTOS__ /* update theme after a WM_THEMECHANGED message */ ++static LRESULT theme_changed (TOOLBAR_INFO *infoPtr) ++{ ++ HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); ++ CloseThemeData (theme); ++ OpenThemeData (infoPtr->hwndSelf, themeClass); ++ theme = GetWindowTheme (infoPtr->hwndSelf); ++ if (theme) ++ GetThemeMargins(theme, NULL, TP_BUTTON, TS_NORMAL, TMT_CONTENTMARGINS, NULL, &infoPtr->themeMargins); ++ else ++ memset(&infoPtr->themeMargins, 0 ,sizeof(infoPtr->themeMargins)); ++ ++ return 0; ++} ++#else static LRESULT theme_changed (HWND hwnd) { -@@ -6447,7 +6619,7 @@ static LRESULT theme_changed (HWND hwnd) + HTHEME theme = GetWindowTheme (hwnd); +@@ -6452,7 +6688,7 @@ static LRESULT theme_changed (HWND hwnd) OpenThemeData (hwnd, themeClass); return 0; } @@ -1265,7 +2321,7 @@ static LRESULT WINAPI ToolbarWindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -@@ -6552,6 +6724,10 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, +@@ -6557,6 +6793,10 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, case TB_GETMAXSIZE: return TOOLBAR_GetMaxSize (infoPtr, (LPSIZE)lParam); @@ -1276,7 +2332,7 @@ /* case TB_GETOBJECT: */ /* 4.71 */ -@@ -6693,6 +6869,11 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, +@@ -6698,6 +6938,11 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, case TB_SETMAXTEXTROWS: return TOOLBAR_SetMaxTextRows (infoPtr, wParam); @@ -1288,21 +2344,77 @@ case TB_SETPADDING: return TOOLBAR_SetPadding (infoPtr, lParam); -@@ -6834,7 +7015,11 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, +@@ -6805,7 +7050,11 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, + return TOOLBAR_NCCalcSize (hwnd, wParam, lParam); + + case WM_NCCREATE: ++#ifdef __REACTOS__ ++ return TOOLBAR_NCCreate (hwnd, wParam, (CREATESTRUCTW*)lParam, 0); ++#else + return TOOLBAR_NCCreate (hwnd, wParam, (CREATESTRUCTW*)lParam); ++#endif + + case WM_NCPAINT: + return TOOLBAR_NCPaint (hwnd, wParam, lParam); +@@ -6837,9 +7086,12 @@ ToolbarWindowProc (HWND hwnd, UINT uMsg, + + case WM_SYSCOLORCHANGE: return TOOLBAR_SysColorChange (); - - case WM_THEMECHANGED: -+#ifdef __REACTOS__ -+ return TOOLBAR_ThemeChanged(hwnd); +- +- case WM_THEMECHANGED: ++ case WM_THEMECHANGED: ++#ifdef __REACTOS__ ++ return theme_changed (infoPtr); +#else return theme_changed (hwnd); +#endif /* case WM_WININICHANGE: */ +@@ -6887,6 +7139,40 @@ TOOLBAR_Unregister (void) + UnregisterClassW (TOOLBARCLASSNAMEW, NULL); + } + ++#ifdef __REACTOS__ ++static LRESULT WINAPI ++ToolbarV6WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ++{ ++ if (uMsg == WM_NCCREATE) ++ return TOOLBAR_NCCreate (hwnd, wParam, (CREATESTRUCTW*)lParam, 6); ++ else ++ return ToolbarWindowProc(hwnd, uMsg, wParam, lParam); ++} ++ ++VOID ++TOOLBARv6_Register (void) ++{ ++ WNDCLASSW wndClass; ++ ++ ZeroMemory (&wndClass, sizeof(WNDCLASSW)); ++ wndClass.style = CS_GLOBALCLASS | CS_DBLCLKS; ++ wndClass.lpfnWndProc = ToolbarV6WindowProc; ++ wndClass.cbClsExtra = 0; ++ wndClass.cbWndExtra = sizeof(TOOLBAR_INFO *); ++ wndClass.hCursor = LoadCursorW (0, (LPWSTR)IDC_ARROW); ++ wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); ++ wndClass.lpszClassName = TOOLBARCLASSNAMEW; ++ ++ RegisterClassW (&wndClass); ++} ++ ++VOID ++TOOLBARv6_Unregister (void) ++{ ++ UnregisterClassW (TOOLBARCLASSNAMEW, NULL); ++} ++#endif ++ + static HIMAGELIST TOOLBAR_InsertImageList(PIMLENTRY **pies, INT *cies, HIMAGELIST himl, INT id) + { + HIMAGELIST himlold; diff -pudN e:\wine\dlls\comctl32/tooltips.c e:\reactos\dll\win32\comctl32/tooltips.c ---- e:\wine\dlls\comctl32/tooltips.c 2016-11-16 17:28:41 +0100 -+++ e:\reactos\dll\win32\comctl32/tooltips.c 2016-08-15 16:13:43 +0100 +--- e:\wine\dlls\comctl32/tooltips.c 2017-09-07 12:58:14 +0100 ++++ e:\reactos\dll\win32\comctl32/tooltips.c 2017-02-13 10:18:27 +0100 @@ -2009,7 +2009,36 @@ TOOLTIPS_NCHitTest (const TOOLTIPS_INFO static LRESULT TOOLTIPS_NotifyFormat (TOOLTIPS_INFO *infoPtr, WPARAM wParam, LPARAM lParam) @@ -1340,10 +2452,25 @@ return 0; } +diff -pudN e:\wine\dlls\comctl32/trackbar.c e:\reactos\dll\win32\comctl32/trackbar.c +--- e:\wine\dlls\comctl32/trackbar.c 2017-09-07 12:58:14 +0100 ++++ e:\reactos\dll\win32\comctl32/trackbar.c 2017-05-07 14:47:57 +0100 +@@ -938,7 +938,11 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr + if (GetWindowTheme (infoPtr->hwndSelf)) { + DrawThemeParentBackground (infoPtr->hwndSelf, hdc, 0); + } ++#ifndef __REACTOS__ + else { ++#else ++ { ++#endif + HBRUSH brush = (HBRUSH)SendMessageW(infoPtr->hwndNotify, WM_CTLCOLORSTATIC, + (WPARAM)hdc, (LPARAM)infoPtr->hwndSelf); + FillRect (hdc, &rcClient, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); diff -pudN e:\wine\dlls\comctl32/treeview.c e:\reactos\dll\win32\comctl32/treeview.c ---- e:\wine\dlls\comctl32/treeview.c 2016-11-16 17:28:42 +0100 -+++ e:\reactos\dll\win32\comctl32/treeview.c 2016-11-16 18:29:47 +0100 -@@ -2909,7 +2909,14 @@ TREEVIEW_Refresh(TREEVIEW_INFO *infoPtr, +--- e:\wine\dlls\comctl32/treeview.c 2017-09-07 12:58:14 +0100 ++++ e:\reactos\dll\win32\comctl32/treeview.c 2017-05-21 20:35:33 +0100 +@@ -2911,7 +2911,14 @@ TREEVIEW_Refresh(TREEVIEW_INFO *infoPtr, } } @@ -1358,3 +2485,19 @@ if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) infoPtr->cdmode = +@@ -5439,8 +5446,15 @@ static BOOL TREEVIEW_NCPaint (const TREE + CombineRgn (cliprgn, cliprgn, region, RGN_AND); + OffsetRect(&r, -r.left, -r.top); + ++#ifdef __REACTOS__ /* r73789 */ ++ dc = GetWindowDC(infoPtr->hwnd); ++ /* Exclude client part */ ++ ExcludeClipRect(dc, r.left + cxEdge, r.top + cyEdge, ++ r.right - cxEdge, r.bottom -cyEdge); ++#else + dc = GetDCEx(infoPtr->hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN); + OffsetRect(&r, -r.left, -r.top); ++#endif + + if (IsThemeBackgroundPartiallyTransparent (theme, 0, 0)) + DrawThemeParentBackground(infoPtr->hwnd, dc, &r); Modified: trunk/reactos/dll/win32/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/dpa.c?r… ============================================================================== --- trunk/reactos/dll/win32/comctl32/dpa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/dpa.c [iso-8859-1] Sun Sep 17 12:33:00 2017 @@ -275,13 +275,13 @@ return FALSE; if (!(dwFlags & DPAM_SORTED)) { - TRACE("sorting dpa's!\n"); + TRACE("sorting dpa's.\n"); if (hdpa1->nItemCount > 0) DPA_Sort (hdpa1, pfnCompare, lParam); - TRACE ("dpa 1 sorted!\n"); + TRACE ("dpa 1 sorted.\n"); if (hdpa2->nItemCount > 0) DPA_Sort (hdpa2, pfnCompare, lParam); - TRACE ("dpa 2 sorted!\n"); + TRACE ("dpa 2 sorted.\n"); } if (hdpa2->nItemCount < 1) Modified: trunk/reactos/dll/win32/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/header.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/header.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/header.c [iso-8859-1] Sun Sep 17 12:33:00 2017 @@ -1698,7 +1698,7 @@ HEADER_RefreshItem (infoPtr, nItem); ReleaseDC (infoPtr->hwndSelf, hdc); - TRACE("Pressed item %d!\n", nItem); + TRACE("Pressed item %d.\n", nItem); } else if ((flags == HHT_ONDIVIDER) || (flags == HHT_ONDIVOPEN)) { INT iCurrWidth = infoPtr->items[nItem].cxy; @@ -1717,7 +1717,7 @@ ReleaseDC (infoPtr->hwndSelf, hdc); } - TRACE("Begin tracking item %d!\n", nItem); + TRACE("Begin tracking item %d.\n", nItem); } } @@ -1783,14 +1783,14 @@ HEADER_SendNotifyWithHDItemT(infoPtr, HDN_ITEMCLICKW, infoPtr->iMoveItem, NULL); } - TRACE("Released item %d!\n", infoPtr->iMoveItem); + TRACE("Released item %d.\n", infoPtr->iMoveItem); infoPtr->bPressed = FALSE; } else if (infoPtr->bTracking) { INT iNewWidth = pt.x - infoPtr->items[infoPtr->iMoveItem].rect.left + infoPtr->xTrackOffset; if (iNewWidth < 0) iNewWidth = 0; - TRACE("End tracking item %d!\n", infoPtr->iMoveItem); + TRACE("End tracking item %d.\n", infoPtr->iMoveItem); infoPtr->bTracking = FALSE; HEADER_SendNotifyWithIntFieldT(infoPtr, HDN_ENDTRACKW, infoPtr->iMoveItem, HDI_WIDTH, iNewWidth); @@ -1920,7 +1920,7 @@ ReleaseDC (infoPtr->hwndSelf, hdc); } - TRACE("Moving pressed item %d!\n", infoPtr->iMoveItem); + TRACE("Moving pressed item %d.\n", infoPtr->iMoveItem); } else if (infoPtr->bTracking) { if (infoPtr->dwStyle & HDS_FULLDRAG) { @@ -1960,7 +1960,7 @@ HEADER_SendNotifyWithIntFieldT(infoPtr, HDN_TRACKW, infoPtr->iMoveItem, HDI_WIDTH, iTrackWidth); } - TRACE("Tracking item %d!\n", infoPtr->iMoveItem); + TRACE("Tracking item %d.\n", infoPtr->iMoveItem); } } Modified: trunk/reactos/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/listvie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/listview.c [iso-8859-1] Sun Sep 17 12:33:00 2017 @@ -10776,10 +10776,11 @@ */ static LRESULT LISTVIEW_PrintClient(LISTVIEW_INFO *infoPtr, HDC hdc, DWORD options) { - FIXME("Partial Stub: (hdc=%p options=0x%08x)\n", hdc, options); - if ((options & PRF_CHECKVISIBLE) && !IsWindowVisible(infoPtr->hwndSelf)) return 0; + + if (options & ~(PRF_ERASEBKGND|PRF_CLIENT)) + FIXME("(hdc=%p options=0x%08x) partial stub\n", hdc, options); if (options & PRF_ERASEBKGND) LISTVIEW_EraseBkgnd(infoPtr, hdc); Modified: trunk/reactos/dll/win32/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/monthca… ============================================================================== --- trunk/reactos/dll/win32/comctl32/monthcal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/monthcal.c [iso-8859-1] Sun Sep 17 12:33:00 2017 @@ -244,10 +244,12 @@ /* make sure that date fields are valid */ static BOOL MONTHCAL_ValidateDate(const SYSTEMTIME *time) { - if(time->wMonth < 1 || time->wMonth > 12 ) return FALSE; - if(time->wDay > MONTHCAL_MonthLength(time->wMonth, time->wYear)) return FALSE; - - return TRUE; + if (time->wMonth < 1 || time->wMonth > 12 ) + return FALSE; + if (time->wDay == 0 || time->wDay > MONTHCAL_MonthLength(time->wMonth, time->wYear)) + return FALSE; + + return TRUE; } /* Copies timestamp part only. @@ -626,10 +628,15 @@ * * NOTE: when calendar index is unknown pass -1 */ -static inline void MONTHCAL_GetDayRect(const MONTHCAL_INFO *infoPtr, const SYSTEMTIME *date, - RECT *r, INT calIdx) +static BOOL MONTHCAL_GetDayRect(const MONTHCAL_INFO *infoPtr, const SYSTEMTIME *date, RECT *r, INT calIdx) { INT col, row; + + if (!MONTHCAL_ValidateDate(date)) + { + SetRectEmpty(r); + return FALSE; + } if (calIdx == -1) { @@ -653,6 +660,8 @@ MONTHCAL_GetDayPos(infoPtr, date, &col, &row, calIdx); MONTHCAL_GetDayRectI(infoPtr, r, col, row, calIdx); + + return TRUE; } static LRESULT @@ -724,19 +733,18 @@ if(MONTHCAL_IsDateEqual(&infoPtr->focusedSel, st)) return FALSE; /* invalidate old focused day */ - MONTHCAL_GetDayRect(infoPtr, &infoPtr->focusedSel, &r, -1); + if (MONTHCAL_GetDayRect(infoPtr, &infoPtr->focusedSel, &r, -1)) + InvalidateRect(infoPtr->hwndSelf, &r, FALSE); + + infoPtr->focusedSel = *st; + } + + /* On set invalidates new day, on reset clears previous focused day. */ + if (MONTHCAL_GetDayRect(infoPtr, &infoPtr->focusedSel, &r, -1)) InvalidateRect(infoPtr->hwndSelf, &r, FALSE); - - infoPtr->focusedSel = *st; - } - - MONTHCAL_GetDayRect(infoPtr, &infoPtr->focusedSel, &r, -1); if(!st && MONTHCAL_ValidateDate(&infoPtr->focusedSel)) infoPtr->focusedSel = st_null; - - /* on set invalidates new day, on reset clears previous focused day */ - InvalidateRect(infoPtr->hwndSelf, &r, FALSE); return TRUE; } @@ -1725,21 +1733,22 @@ static BOOL MONTHCAL_UpdateToday(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *today) { - RECT new_r, old_r; - - if(MONTHCAL_IsDateEqual(today, &infoPtr->todaysDate)) return FALSE; - - MONTHCAL_GetDayRect(infoPtr, &infoPtr->todaysDate, &old_r, -1); - MONTHCAL_GetDayRect(infoPtr, today, &new_r, -1); - - infoPtr->todaysDate = *today; - - /* only two days need redrawing */ - InvalidateRect(infoPtr->hwndSelf, &old_r, FALSE); - InvalidateRect(infoPtr->hwndSelf, &new_r, FALSE); - /* and today label */ - InvalidateRect(infoPtr->hwndSelf, &infoPtr->todayrect, FALSE); - return TRUE; + RECT rect; + + if (MONTHCAL_IsDateEqual(today, &infoPtr->todaysDate)) + return FALSE; + + /* Invalidate old and new today day rectangle, and today label. */ + if (MONTHCAL_GetDayRect(infoPtr, &infoPtr->todaysDate, &rect, -1)) + InvalidateRect(infoPtr->hwndSelf, &rect, FALSE); + + if (MONTHCAL_GetDayRect(infoPtr, today, &rect, -1)) + InvalidateRect(infoPtr->hwndSelf, &rect, FALSE); + + infoPtr->todaysDate = *today; + + InvalidateRect(infoPtr->hwndSelf, &infoPtr->todayrect, FALSE); + return TRUE; } /* MCM_SETTODAT handler */ @@ -1894,6 +1903,7 @@ else if(PtInRect(&infoPtr->calendars[calIdx].days, lpht->pt)) { htinfo.iOffset = calIdx; + htinfo.st.wDay = ht_month->wDay; htinfo.st.wYear = ht_month->wYear; htinfo.st.wMonth = ht_month->wMonth; /* previous month only valid for first calendar */ Modified: trunk/reactos/dll/win32/comctl32/taskdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/taskdia… ============================================================================== --- trunk/reactos/dll/win32/comctl32/taskdialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/taskdialog.c [iso-8859-1] Sun Sep 17 12:33:00 2017 @@ -28,7 +28,7 @@ #define ALIGN_LENGTH(_Len, _Align) _Len = ALIGNED_LENGTH(_Len, _Align) #define ALIGN_POINTER(_Ptr, _Align) _Ptr = ALIGNED_POINTER(_Ptr, _Align) -static const UINT DIALOG_MIN_WIDTH = 180; +static const UINT DIALOG_MIN_WIDTH = 240; static const UINT DIALOG_SPACING = 5; static const UINT DIALOG_BUTTON_WIDTH = 50; static const UINT DIALOG_BUTTON_HEIGHT = 14; @@ -55,6 +55,15 @@ HFONT font; }; +struct taskdialog_button_desc +{ + int id; + const WCHAR *text; + unsigned int width; + unsigned int line; + HINSTANCE hinst; +}; + static void pixels_to_dialogunits(const struct taskdialog_template_desc *desc, LONG *width, LONG *height) { if (width) @@ -75,6 +84,47 @@ { memcpy(*ptr, src, size); *ptr += size; +} + +/* used to calculate size for the controls */ +static void taskdialog_get_text_extent(const struct taskdialog_template_desc *desc, const WCHAR *text, + BOOL user_resource, SIZE *sz) +{ + RECT rect = { 0, 0, desc->dialog_width - DIALOG_SPACING * 2, 0}; /* padding left and right of the control */ + const WCHAR *textW = NULL; + static const WCHAR nulW; + unsigned int length; + HFONT oldfont; + HDC hdc; + + if (IS_INTRESOURCE(text)) + { + if (!(length = LoadStringW(user_resource ? desc->taskconfig->hInstance : COMCTL32_hModule, + (UINT_PTR)text, (WCHAR *)&textW, 0))) + { + WARN("Failed to load text\n"); + textW = &nulW; + length = 0; + } + } + else + { + textW = text; + length = strlenW(textW); + } + + hdc = GetDC(0); + oldfont = SelectObject(hdc, desc->font); + + dialogunits_to_pixels(desc, &rect.right, NULL); + DrawTextW(hdc, textW, length, &rect, DT_LEFT | DT_EXPANDTABS | DT_CALCRECT | DT_WORDBREAK); + pixels_to_dialogunits(desc, &rect.right, &rect.bottom); + + SelectObject(hdc, oldfont); + ReleaseDC(0, hdc); + + sz->cx = rect.right - rect.left; + sz->cy = rect.bottom - rect.top; } static unsigned int taskdialog_add_control(struct taskdialog_template_desc *desc, WORD id, const WCHAR *class, @@ -124,43 +174,18 @@ static unsigned int taskdialog_add_static_label(struct taskdialog_template_desc *desc, WORD id, const WCHAR *str) { - RECT rect = { 0, 0, desc->dialog_width - DIALOG_SPACING * 2, 0}; /* padding left and right of the control */ - const WCHAR *textW = NULL; - unsigned int size, length; - HFONT oldfont; - HDC hdc; + unsigned int size; + SIZE sz; if (!str) return 0; - if (IS_INTRESOURCE(str)) - { - if (!(length = LoadStringW(desc->taskconfig->hInstance, (UINT_PTR)str, (WCHAR *)&textW, 0))) - { - WARN("Failed to load static text %s, id %#x\n", debugstr_w(str), id); - return 0; - } - } - else - { - textW = str; - length = strlenW(textW); - } - - hdc = GetDC(0); - oldfont = SelectObject(hdc, desc->font); - - dialogunits_to_pixels(desc, &rect.right, NULL); - DrawTextW(hdc, textW, length, &rect, DT_LEFT | DT_EXPANDTABS | DT_CALCRECT | DT_WORDBREAK); - pixels_to_dialogunits(desc, &rect.right, &rect.bottom); - - SelectObject(hdc, oldfont); - ReleaseDC(0, hdc); + taskdialog_get_text_extent(desc, str, TRUE, &sz); desc->dialog_height += DIALOG_SPACING; size = taskdialog_add_control(desc, id, WC_STATICW, desc->taskconfig->hInstance, str, DIALOG_SPACING, - desc->dialog_height, rect.right, rect.bottom); - desc->dialog_height += rect.bottom; + desc->dialog_height, sz.cx, sz.cy); + desc->dialog_height += sz.cy + DIALOG_SPACING; return size; } @@ -174,37 +199,146 @@ return taskdialog_add_static_label(desc, ID_CONTENT, desc->taskconfig->pszContent); } -static unsigned int taskdialog_add_common_buttons(struct taskdialog_template_desc *desc) -{ - short button_x = desc->dialog_width - DIALOG_BUTTON_WIDTH - DIALOG_SPACING; +static void taskdialog_init_button(struct taskdialog_button_desc *button, struct taskdialog_template_desc *desc, + int id, const WCHAR *text, BOOL custom_button) +{ + SIZE sz; + + taskdialog_get_text_extent(desc, text, custom_button, &sz); + + button->id = id; + button->text = text; + button->width = max(DIALOG_BUTTON_WIDTH, sz.cx + DIALOG_SPACING * 2); + button->line = 0; + button->hinst = custom_button ? desc->taskconfig->hInstance : COMCTL32_hModule; +} + +static void taskdialog_init_common_buttons(struct taskdialog_template_desc *desc, struct taskdialog_button_desc *buttons, + unsigned int *button_count) +{ DWORD flags = desc->taskconfig->dwCommonButtons; - unsigned int size = 0; - -#define TASKDIALOG_ADD_COMMON_BUTTON(id) \ + +#define TASKDIALOG_INIT_COMMON_BUTTON(id) \ do { \ - size += taskdialog_add_control(desc, ID##id, WC_BUTTONW, COMCTL32_hModule, MAKEINTRESOURCEW(IDS_BUTTON_##id), \ - button_x, desc->dialog_height + DIALOG_SPACING, DIALOG_BUTTON_WIDTH, DIALOG_BUTTON_HEIGHT); \ - button_x -= DIALOG_BUTTON_WIDTH + DIALOG_SPACING; \ + taskdialog_init_button(&buttons[(*button_count)++], desc, ID##id, MAKEINTRESOURCEW(IDS_BUTTON_##id), FALSE); \ } while(0) + + if (flags & TDCBF_OK_BUTTON) + TASKDIALOG_INIT_COMMON_BUTTON(OK); + if (flags & TDCBF_YES_BUTTON) + TASKDIALOG_INIT_COMMON_BUTTON(YES); + if (flags & TDCBF_NO_BUTTON) + TASKDIALOG_INIT_COMMON_BUTTON(NO); + if (flags & TDCBF_RETRY_BUTTON) + TASKDIALOG_INIT_COMMON_BUTTON(RETRY); + if (flags & TDCBF_CANCEL_BUTTON) + TASKDIALOG_INIT_COMMON_BUTTON(CANCEL); if (flags & TDCBF_CLOSE_BUTTON) - TASKDIALOG_ADD_COMMON_BUTTON(CLOSE); - if (flags & TDCBF_CANCEL_BUTTON) - TASKDIALOG_ADD_COMMON_BUTTON(CANCEL); - if (flags & TDCBF_RETRY_BUTTON) - TASKDIALOG_ADD_COMMON_BUTTON(RETRY); - if (flags & TDCBF_NO_BUTTON) - TASKDIALOG_ADD_COMMON_BUTTON(NO); - if (flags & TDCBF_YES_BUTTON) - TASKDIALOG_ADD_COMMON_BUTTON(YES); - if (flags & TDCBF_OK_BUTTON) - TASKDIALOG_ADD_COMMON_BUTTON(OK); - /* Always add OK button */ - if (list_empty(&desc->controls)) - TASKDIALOG_ADD_COMMON_BUTTON(OK); -#undef TASKDIALOG_ADD_COMMON_BUTTON - - /* make room for common buttons row */ - desc->dialog_height += DIALOG_BUTTON_HEIGHT + 2 * DIALOG_SPACING; + TASKDIALOG_INIT_COMMON_BUTTON(CLOSE); + +#undef TASKDIALOG_INIT_COMMON_BUTTON +} + +static unsigned int taskdialog_add_buttons(struct taskdialog_template_desc *desc) +{ + unsigned int count = 0, buttons_size, i, line_count, size = 0; + unsigned int location_x, *line_widths, alignment = ~0u; + const TASKDIALOGCONFIG *taskconfig = desc->taskconfig; + struct taskdialog_button_desc *buttons; + + /* Allocate enough memory for the custom and the default buttons. Maximum 6 default buttons possible. */ + buttons_size = 6; + if (taskconfig->cButtons && taskconfig->pButtons) + buttons_size += taskconfig->cButtons; + + if (!(buttons = Alloc(buttons_size * sizeof(*buttons)))) + return 0; + + /* Custom buttons */ + if (taskconfig->cButtons && taskconfig->pButtons) + for (i = 0; i < taskconfig->cButtons; i++) + taskdialog_init_button(&buttons[count++], desc, taskconfig->pButtons[i].nButtonID, + taskconfig->pButtons[i].pszButtonText, TRUE); + + /* Common buttons */ + taskdialog_init_common_buttons(desc, buttons, &count); + + /* There must be at least one button */ + if (count == 0) + taskdialog_init_button(&buttons[count++], desc, IDOK, MAKEINTRESOURCEW(IDS_BUTTON_OK), FALSE); + + /* For easy handling just allocate as many lines as buttons, the worst case. */ + line_widths = Alloc(count * sizeof(*line_widths)); + + /* Separate buttons into lines */ + location_x = DIALOG_SPACING; + for (i = 0, line_count = 0; i < count; i++) + { + if (location_x + buttons[i].width + DIALOG_SPACING > desc->dialog_width) + { + location_x = DIALOG_SPACING; + line_count++; + } + + buttons[i].line = line_count; + + location_x += buttons[i].width + DIALOG_SPACING; + line_widths[line_count] += buttons[i].width + DIALOG_SPACING; + } + line_count++; + + /* Try to balance lines so they are about the same size */ + for (i = 1; i < line_count - 1; i++) + { + int diff_now = abs(line_widths[i] - line_widths[i - 1]); + unsigned int j, last_button = 0; + int diff_changed; + + for (j = 0; j < count; j++) + if (buttons[j].line == i - 1) + last_button = j; + + /* Difference in length of both lines if we wrapped the last button from the last line into this one */ + diff_changed = abs(2 * buttons[last_button].width + line_widths[i] - line_widths[i - 1]); + + if (diff_changed < diff_now) + { + buttons[last_button].line = i; + line_widths[i] += buttons[last_button].width; + line_widths[i - 1] -= buttons[last_button].width; + } + } + + /* Calculate left alignment so all lines are as far right as possible. */ + for (i = 0; i < line_count; i++) + { + int new_alignment = desc->dialog_width - line_widths[i]; + if (new_alignment < alignment) + alignment = new_alignment; + } + + /* Now that we got them all positioned, create all buttons */ + location_x = alignment; + for (i = 0; i < count; i++) + { + if (i > 0 && buttons[i].line != buttons[i - 1].line) /* New line */ + { + location_x = alignment; + desc->dialog_height += DIALOG_BUTTON_HEIGHT + DIALOG_SPACING; + } + + size += taskdialog_add_control(desc, buttons[i].id, WC_BUTTONW, buttons[i].hinst, buttons[i].text, location_x, + desc->dialog_height, buttons[i].width, DIALOG_BUTTON_HEIGHT); + + location_x += buttons[i].width + DIALOG_SPACING; + } + + /* Add height for last row and spacing */ + desc->dialog_height += DIALOG_BUTTON_HEIGHT + DIALOG_SPACING; + + Free(line_widths); + Free(buttons); + return size; } @@ -292,7 +426,7 @@ size += taskdialog_add_main_instruction(&desc); size += taskdialog_add_content(&desc); - size += taskdialog_add_common_buttons(&desc); + size += taskdialog_add_buttons(&desc); template = Alloc(size); if (!template) @@ -371,3 +505,26 @@ return S_OK; } + +/*********************************************************************** + * TaskDialog [COMCTL32.@] + */ +HRESULT WINAPI TaskDialog(HWND owner, HINSTANCE hinst, const WCHAR *title, const WCHAR *main_instruction, + const WCHAR *content, TASKDIALOG_COMMON_BUTTON_FLAGS common_buttons, const WCHAR *icon, int *button) +{ + TASKDIALOGCONFIG taskconfig; + + TRACE("%p, %p, %s, %s, %s, %#x, %s, %p\n", owner, hinst, debugstr_w(title), debugstr_w(main_instruction), + debugstr_w(content), common_buttons, debugstr_w(icon), button); + + memset(&taskconfig, 0, sizeof(taskconfig)); + taskconfig.cbSize = sizeof(taskconfig); + taskconfig.hwndParent = owner; + taskconfig.hInstance = hinst; + taskconfig.dwCommonButtons = common_buttons; + taskconfig.pszWindowTitle = title; + taskconfig.u.pszMainIcon = icon; + taskconfig.pszMainInstruction = main_instruction; + taskconfig.pszContent = content; + return TaskDialogIndirect(&taskconfig, button, NULL, NULL); +} Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Sun Sep 17 12:33:00 2017 @@ -1377,7 +1377,7 @@ SelectObject (hdc, hOldFont); ReleaseDC (infoPtr->hwndSelf, hdc); - TRACE("max string size %d x %d!\n", lpSize->cx, lpSize->cy); + TRACE("max string size %d x %d\n", lpSize->cx, lpSize->cy); } /*********************************************************************** @@ -1914,13 +1914,13 @@ if (btnPtr->fsStyle & BTNS_SEP) { if (PtInRect (&btnPtr->rect, *lpPt)) { - TRACE(" ON SEPARATOR %d!\n", i); + TRACE(" ON SEPARATOR %d\n", i); return -i; } } else { if (PtInRect (&btnPtr->rect, *lpPt)) { - TRACE(" ON BUTTON %d!\n", i); + TRACE(" ON BUTTON %d\n", i); if (button) *button = TRUE; return i; @@ -1928,7 +1928,7 @@ } } - TRACE(" NOWHERE!\n"); + TRACE(" NOWHERE\n"); return TOOLBAR_NOWHERE; } @@ -2073,7 +2073,6 @@ SendMessageW (hwndTip, TTM_RELAYEVENT, 0, (LPARAM)&msg); } - static void TOOLBAR_TooltipAddTool(const TOOLBAR_INFO *infoPtr, const TBUTTON_INFO *button) @@ -2735,7 +2734,7 @@ btnInfo = (PCUSTOMBUTTON)SendDlgItemMessageW (hwnd, wParam, LB_GETITEMDATA, lpdis->itemID, 0); if (btnInfo == NULL) { - FIXME("btnInfo invalid!\n"); + FIXME("btnInfo invalid\n"); return TRUE; } @@ -2917,18 +2916,22 @@ switch (lpAddBmp->nID) { case IDB_STD_SMALL_COLOR: + case 2: info.nButtons = 15; info.nID = IDB_STD_SMALL; break; case IDB_STD_LARGE_COLOR: + case 3: info.nButtons = 15; info.nID = IDB_STD_LARGE; break; case IDB_VIEW_SMALL_COLOR: + case 6: info.nButtons = 12; info.nID = IDB_VIEW_SMALL; break; case IDB_VIEW_LARGE_COLOR: + case 7: info.nButtons = 12; info.nID = IDB_VIEW_LARGE; break; @@ -2941,10 +2944,11 @@ info.nID = IDB_HIST_LARGE; break; default: + WARN("unknown bitmap id, %ld\n", lpAddBmp->nID); return -1; } - TRACE ("adding %d internal bitmaps!\n", info.nButtons); + TRACE ("adding %d internal bitmaps\n", info.nButtons); /* Windows resize all the buttons to the size of a newly added standard image */ if (lpAddBmp->nID & 1) @@ -2965,7 +2969,7 @@ info.nButtons = count; info.hInst = lpAddBmp->hInst; info.nID = lpAddBmp->nID; - TRACE("adding %d bitmaps!\n", info.nButtons); + TRACE("adding %d bitmaps\n", info.nButtons); } /* check if the bitmap is already loaded and compute iSumButtons */ @@ -2980,7 +2984,7 @@ if (!infoPtr->cimlDef) { /* create new default image list */ - TRACE ("creating default image list!\n"); + TRACE ("creating default image list\n"); himlDef = ImageList_Create (infoPtr->nBitmapWidth, infoPtr->nBitmapHeight, ILC_COLOR32 | ILC_MASK, info.nButtons, 2); @@ -3013,7 +3017,7 @@ static LRESULT TOOLBAR_AddButtonsT(TOOLBAR_INFO *infoPtr, INT nAddButtons, const TBBUTTON* lpTbb, BOOL fUnicode) { - TRACE("adding %d buttons (unicode=%d)!\n", nAddButtons, fUnicode); + TRACE("adding %d buttons (unicode=%d)\n", nAddButtons, fUnicode); return TOOLBAR_InternalInsertButtonsT(infoPtr, -1, nAddButtons, lpTbb, fUnicode); } @@ -3139,7 +3143,7 @@ static LRESULT TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) { - TRACE("auto sizing, style=%x!\n", infoPtr->dwStyle); + TRACE("auto sizing, style=%#x\n", infoPtr->dwStyle); TRACE("nRows: %d, infoPtr->nButtonHeight: %d\n", infoPtr->nRows, infoPtr->nButtonHeight); if (!(infoPtr->dwStyle & CCS_NORESIZE)) @@ -3336,7 +3340,7 @@ TOOLBAR_TooltipDelTool(infoPtr, &infoPtr->buttons[nIndex]); if (infoPtr->nNumButtons == 1) { - TRACE(" simple delete!\n"); + TRACE(" simple delete\n"); free_string( infoPtr->buttons ); Free (infoPtr->buttons); infoPtr->buttons = NULL; @@ -3344,7 +3348,7 @@ } else { TBUTTON_INFO *oldButtons = infoPtr->buttons; - TRACE("complex delete! [nIndex=%d]\n", nIndex); + TRACE("complex delete [nIndex=%d]\n", nIndex); infoPtr->nNumButtons--; infoPtr->buttons = Alloc (sizeof (TBUTTON_INFO) * infoPtr->nNumButtons); @@ -4660,7 +4664,7 @@ if (infoPtr->hwndToolTip) { - FIXME("change tool tip!\n"); + FIXME("change tool tip\n"); } @@ -5343,7 +5347,7 @@ static LRESULT TOOLBAR_SetBoundingSize(HWND hwnd, WPARAM wParam, LPARAM lParam) { SIZE * pSize = (SIZE*)lParam; - FIXME("hwnd=%p, wParam=0x%08lx, size.cx=%d, size.cy=%d stub!\n", hwnd, wParam, pSize->cx, pSize->cy); + FIXME("hwnd=%p, wParam=0x%08lx, size.cx=%d, size.cy=%d stub\n", hwnd, wParam, pSize->cx, pSize->cy); return 0; } @@ -6596,7 +6600,7 @@ static LRESULT TOOLBAR_Size (TOOLBAR_INFO *infoPtr) { - TRACE("sizing toolbar!\n"); + TRACE("sizing toolbar\n"); if (infoPtr->dwExStyle & TBSTYLE_EX_HIDECLIPPEDBUTTONS) { @@ -7177,6 +7181,10 @@ /* Check if the entry already exists */ c = TOOLBAR_GetImageListEntry(*pies, *cies, id); + /* Don't add new entry for NULL imagelist */ + if (!c && !himl) + return NULL; + /* If this is a new entry we must create it and insert into the array */ if (!c) { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 17 12:33:00 2017 @@ -54,7 +54,7 @@ reactos/dll/win32/cabinet # Synced to WineStaging-2.9 reactos/dll/win32/clusapi # Synced to WineStaging-2.9 reactos/dll/win32/comcat # Synced to WineStaging-2.9 -reactos/dll/win32/comctl32 # Synced to WineStaging-2.9 +reactos/dll/win32/comctl32 # Synced to WineStaging-2.16 reactos/dll/win32/comdlg32 # Synced to WineStaging-2.9 reactos/dll/win32/compstui # Synced to WineStaging-2.9 reactos/dll/win32/credui # Synced to WineStaging-2.9

7 years, 3 months

[tfaber] 75861: [KMTESTS:KERNEL32] - Add additional file attribute tests. Based on a patch by Katayama Hirofumi MZ. CORE-13495

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Sep 17 08:08:39 2017 New Revision: 75861 URL: http://svn.reactos.org/svn/reactos?rev=75861&view=rev Log: [KMTESTS:KERNEL32] - Add additional file attribute tests. Based on a patch by Katayama Hirofumi MZ. CORE-13495 Modified: trunk/rostests/kmtests/kernel32/FileAttributes_user.c trunk/rostests/kmtests/kernel32/kernel32_drv.c Modified: trunk/rostests/kmtests/kernel32/FileAttributes_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kernel32/FileAttr… ============================================================================== --- trunk/rostests/kmtests/kernel32/FileAttributes_user.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kernel32/FileAttributes_user.c [iso-8859-1] Sun Sep 17 08:08:39 2017 @@ -1,8 +1,9 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory - * PURPOSE: Test for GetFileAttributes/SetFileAttributes - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Test for GetFileAttributes/SetFileAttributes + * COPYRIGHT: Copyright 2017 Thomas Faber <thomas.faber(a)reactos.org> + * Copyright 2017 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include <kmt_test.h> @@ -33,6 +34,11 @@ Ret = SetFileAttributesW(FileName, 0); ok(Ret == TRUE, "SetFileAttributesW returned %d, error %lu\n", Ret, GetLastError()); + /* Set invalid attributes */ + KmtSendUlongToDriver(IOCTL_EXPECT_SET_ATTRIBUTES, FILE_ATTRIBUTE_VALID_SET_FLAGS); + Ret = SetFileAttributesW(FileName, 0xFFFFFFFF); + ok(Ret == TRUE, "SetFileAttributesW returned %d, error %lu\n", Ret, GetLastError()); + /* Query read-only attribute */ KmtSendUlongToDriver(IOCTL_RETURN_QUERY_ATTRIBUTES, FILE_ATTRIBUTE_READONLY); Attributes = GetFileAttributesW(FileName); @@ -53,6 +59,47 @@ Attributes = GetFileAttributesW(FileName); ok_eq_hex(Attributes, 0); + /* Query invalid attributes */ + KmtSendUlongToDriver(IOCTL_RETURN_QUERY_ATTRIBUTES, 0xFFFFFFFF); + Attributes = GetFileAttributesW(FileName); + ok_eq_hex(Attributes, 0xFFFFFFFF); + + /** Directory attribute **/ + /* Set read-only and directory attribute */ + KmtSendUlongToDriver(IOCTL_EXPECT_SET_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_READONLY); + Ret = SetFileAttributesW(FileName, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_DIRECTORY); + ok(Ret == TRUE, "SetFileAttributesW returned %d, error %lu\n", Ret, GetLastError()); + + /* Set normal and directory attribute */ + KmtSendUlongToDriver(IOCTL_EXPECT_SET_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL); + Ret = SetFileAttributesW(FileName, FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_DIRECTORY); + ok(Ret == TRUE, "SetFileAttributesW returned %d, error %lu\n", Ret, GetLastError()); + + /* Set directory attribute */ + KmtSendUlongToDriver(IOCTL_EXPECT_SET_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL); + Ret = SetFileAttributesW(FileName, FILE_ATTRIBUTE_DIRECTORY); + ok(Ret == TRUE, "SetFileAttributesW returned %d, error %lu\n", Ret, GetLastError()); + + /* Query read-only and directory attribute */ + KmtSendUlongToDriver(IOCTL_RETURN_QUERY_ATTRIBUTES, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_DIRECTORY); + Attributes = GetFileAttributesW(FileName); + ok_eq_hex(Attributes, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_DIRECTORY); + + /* Query read-only + normal + directory attribute */ + KmtSendUlongToDriver(IOCTL_RETURN_QUERY_ATTRIBUTES, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_DIRECTORY); + Attributes = GetFileAttributesW(FileName); + ok_eq_hex(Attributes, FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_DIRECTORY); + + /* Query normal and directory attribute */ + KmtSendUlongToDriver(IOCTL_RETURN_QUERY_ATTRIBUTES, FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_DIRECTORY); + Attributes = GetFileAttributesW(FileName); + ok_eq_hex(Attributes, FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_DIRECTORY); + + /* Query directory attribute */ + KmtSendUlongToDriver(IOCTL_RETURN_QUERY_ATTRIBUTES, FILE_ATTRIBUTE_DIRECTORY); + Attributes = GetFileAttributesW(FileName); + ok_eq_hex(Attributes, FILE_ATTRIBUTE_DIRECTORY); + KmtCloseDriver(); KmtUnloadDriver(); } Modified: trunk/rostests/kmtests/kernel32/kernel32_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kernel32/kernel32… ============================================================================== --- trunk/rostests/kmtests/kernel32/kernel32_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kernel32/kernel32_drv.c [iso-8859-1] Sun Sep 17 08:08:39 2017 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory - * PURPOSE: Test driver for kernel32 filesystem tests - * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Test driver for kernel32 filesystem tests + * COPYRIGHT: Copyright 2013-2017 Thomas Faber <thomas.faber(a)reactos.org> */ #include <kmt_test.h> @@ -19,7 +19,9 @@ static UNICODE_STRING ExpectedExpression = RTL_CONSTANT_STRING(L"<not set>"); static WCHAR ExpressionBuffer[MAX_PATH]; +static BOOLEAN ExpectingSetAttributes = FALSE; static ULONG ExpectedSetAttributes = -1; +static BOOLEAN ExpectingQueryAttributes = FALSE; static ULONG ReturnQueryAttributes = -1; NTSTATUS @@ -92,6 +94,7 @@ return STATUS_INVALID_PARAMETER; ReturnQueryAttributes = *(PULONG)Buffer; + ExpectingQueryAttributes = TRUE; DPRINT("IOCTL_RETURN_QUERY_ATTRIBUTES: %lu\n", ReturnQueryAttributes); break; } @@ -102,6 +105,7 @@ return STATUS_INVALID_PARAMETER; ExpectedSetAttributes = *(PULONG)Buffer; + ExpectingSetAttributes = TRUE; DPRINT("IOCTL_EXPECT_SET_ATTRIBUTES: %lu\n", ExpectedSetAttributes); break; } @@ -168,7 +172,7 @@ ok_eq_ulong(IoStackLocation->Parameters.QueryFile.FileInformationClass, FileBasicInformation); if (IoStackLocation->Parameters.QueryFile.FileInformationClass == FileBasicInformation) { - ok(ReturnQueryAttributes != (ULONG)-1, "Unexpected QUERY_INFORMATION call\n"); + ok(ExpectingQueryAttributes, "Unexpected QUERY_INFORMATION call\n"); BasicInfo = Irp->AssociatedIrp.SystemBuffer; BasicInfo->CreationTime.QuadPart = 126011664000000000; BasicInfo->LastAccessTime.QuadPart = 130899112800000000; @@ -176,6 +180,7 @@ BasicInfo->ChangeTime.QuadPart = 130899112800000000; BasicInfo->FileAttributes = ReturnQueryAttributes; ReturnQueryAttributes = -1; + ExpectingQueryAttributes = FALSE; Status = STATUS_SUCCESS; Irp->IoStatus.Information = sizeof(*BasicInfo); } @@ -205,7 +210,7 @@ ok_eq_ulong(IoStackLocation->Parameters.SetFile.FileInformationClass, FileBasicInformation); if (IoStackLocation->Parameters.SetFile.FileInformationClass == FileBasicInformation) { - ok(ExpectedSetAttributes != (ULONG)-1, "Unexpected SET_INFORMATION call\n"); + ok(ExpectingSetAttributes, "Unexpected SET_INFORMATION call\n"); BasicInfo = Irp->AssociatedIrp.SystemBuffer; ok_eq_longlong(BasicInfo->CreationTime.QuadPart, 0LL); ok_eq_longlong(BasicInfo->LastAccessTime.QuadPart, 0LL); @@ -213,6 +218,7 @@ ok_eq_longlong(BasicInfo->ChangeTime.QuadPart, 0LL); ok_eq_ulong(BasicInfo->FileAttributes, ExpectedSetAttributes); ExpectedSetAttributes = -1; + ExpectingSetAttributes = FALSE; Status = STATUS_SUCCESS; }

7 years, 3 months

← Newer
1
...
12
13
14
15
16
17
18
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2017