November 2020 - Wine-commits

Michael Stefaniuc : inetcpl.cpl: Trace the actual AutoConfigURL and not the value name.
by Alexandre Julliard 16 Nov '20

16 Nov '20

Module: wine Branch: master Commit: f5f95e22c61ec988c23becf0680d7c432db9dde4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5f95e22c61ec988c23becf0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 15 23:11:22 2020 +0100 inetcpl.cpl: Trace the actual AutoConfigURL and not the value name. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcpl.cpl/connections.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index c24374fd2a5..04e26ead6a7 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/dlls/inetcpl.cpl/connections.c @@ -184,7 +184,7 @@ static void connections_on_initdialog(HWND hwnd) TRACE("ProxyEnable = %x\n", enabled); TRACE("ProxyServer = %s\n", wine_dbgstr_w(address)); - TRACE("AutoConfigURL = %s\n", wine_dbgstr_w(auto_config_url)); + TRACE("AutoConfigURL = %s\n", wine_dbgstr_w(pac_url)); if(enabled) {

1 0

Rémi Bernon : gdi32: Rewrite find_face_from_filename using the rbtree.
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: ec646de3aa64ae6320a13d95a5d73efea7b366fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec646de3aa64ae6320a13d95… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 13 09:05:56 2020 +0000 gdi32: Rewrite find_face_from_filename using the rbtree. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a095bcdd27b..450d31ca82a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -618,29 +618,39 @@ static const struct list *get_family_face_list( const struct gdi_font_family *fa return family->replacement ? &family->replacement->faces : &family->faces; } +static struct gdi_font_face *family_find_face_from_filename( struct gdi_font_family *family, const WCHAR *file_name ) +{ + struct gdi_font_face *face; + const WCHAR *file; + LIST_FOR_EACH_ENTRY( face, get_family_face_list(family), struct gdi_font_face, entry ) + { + if (!face->file) continue; + file = wcsrchr(face->file, '\\'); + if (!file) file = face->file; + else file++; + if (wcsicmp( file, file_name )) continue; + face->refcount++; + return face; + } + return NULL; +} + static struct gdi_font_face *find_face_from_filename( const WCHAR *file_name, const WCHAR *family_name ) { struct gdi_font_family *family; struct gdi_font_face *face; - const WCHAR *file; TRACE( "looking for file %s name %s\n", debugstr_w(file_name), debugstr_w(family_name) ); - WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) + if (!family_name) { - if (family_name && wcsnicmp( family_name, family->family_name, LF_FACESIZE - 1 )) continue; - LIST_FOR_EACH_ENTRY( face, get_family_face_list(family), struct gdi_font_face, entry ) - { - if (!face->file) continue; - file = wcsrchr(face->file, '\\'); - if (!file) file = face->file; - else file++; - if (wcsicmp( file, file_name )) continue; - face->refcount++; - return face; - } + WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) + if ((face = family_find_face_from_filename( family, file_name ))) return face; + return NULL; } - return NULL; + + if (!(family = find_family_from_name( family_name ))) return NULL; + return family_find_face_from_filename( family, file_name ); } static BOOL add_family_replacement( const WCHAR *new_name, const WCHAR *replace )

1 0

Rémi Bernon : gdi32: Rewrite find_any_face using the rbtree.
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: c475e5b40c9cbfd38a06b75fd76154d13d273493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c475e5b40c9cbfd38a06b75f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 13 09:05:57 2020 +0000 gdi32: Rewrite find_any_face using the rbtree. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 450d31ca82a..303467af466 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1493,19 +1493,20 @@ static struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs { struct gdi_font_family *family; struct gdi_font_face *face; - WCHAR name[LF_FACESIZE]; + WCHAR name[LF_FACESIZE + 1]; int i = 0; /* first try the family fallbacks */ while (enum_fallbacks( lf->lfPitchAndFamily, i++, name )) { - WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry ) + if (want_vertical) { - if ((family->family_name[0] == '@') == !want_vertical) continue; - if (wcsicmp( family->family_name + want_vertical, name ) && - wcsicmp( family->second_name + want_vertical, name )) continue; - if ((face = find_best_matching_face( family, lf, fs, FALSE ))) return face; + memmove(name + 1, name, min(lstrlenW(name), LF_FACESIZE)); + name[0] = '@'; } + + if (!(family = find_family_from_any_name(name))) continue; + if ((face = find_best_matching_face( family, lf, fs, FALSE ))) return face; } /* otherwise try only scalable */ WINE_RB_FOR_EACH_ENTRY( family, &family_name_tree, struct gdi_font_family, name_entry )

1 0

Nikolay Sivov : wordpad: Fill font selection combobox with fully processed font list.
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: a600d7ece16845d2b16020a510669abc7d66f21f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a600d7ece16845d2b16020a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 11:16:16 2020 +0300 wordpad: Fill font selection combobox with fully processed font list. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46478 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/wordpad.c | 142 +++++++++++++++++++++++++++++++++------------ 1 file changed, 104 insertions(+), 38 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index c8e3132b343..5ba5cc857f6 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -536,36 +536,6 @@ static void on_fontlist_modified(LPWSTR wszNewFaceName) set_font(wszNewFaceName); } -static void add_font(LPCWSTR fontName, DWORD fontType, HWND hListWnd, const NEWTEXTMETRICEXW *ntmc) -{ - COMBOBOXEXITEMW cbItem; - WCHAR buffer[MAX_PATH]; - int fontHeight = 0; - - cbItem.mask = CBEIF_TEXT; - cbItem.pszText = buffer; - cbItem.cchTextMax = MAX_STRING_LEN; - cbItem.iItem = 0; - - while(SendMessageW(hListWnd, CBEM_GETITEMW, 0, (LPARAM)&cbItem)) - { - if(lstrcmpiW(cbItem.pszText, fontName) <= 0) - cbItem.iItem++; - else - break; - } - cbItem.pszText = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(fontName) + 1)*sizeof(WCHAR) ); - lstrcpyW( cbItem.pszText, fontName ); - - cbItem.mask |= CBEIF_LPARAM; - if(fontType & RASTER_FONTTYPE) - fontHeight = ntmc->ntmTm.tmHeight - ntmc->ntmTm.tmInternalLeading; - - cbItem.lParam = MAKELONG(fontType,fontHeight); - SendMessageW(hListWnd, CBEM_INSERTITEMW, 0, (LPARAM)&cbItem); - HeapFree( GetProcessHeap(), 0, cbItem.pszText ); -} - static void dialog_choose_font(void) { CHOOSEFONTW cf; @@ -614,36 +584,132 @@ static void dialog_choose_font(void) } } +struct font_desc +{ + WCHAR *name; + LPARAM lParam; +}; + +struct font_array +{ + struct font_desc *fonts; + size_t count; + size_t capacity; +}; + +static BOOL array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + new_elements = *elements ? HeapReAlloc(GetProcessHeap(), 0, *elements, new_capacity * size) : + HeapAlloc(GetProcessHeap(), 0, new_capacity * size); + if (!new_elements) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + + return TRUE; +} + +static void add_font(struct font_array *fonts, LPCWSTR fontName, DWORD fontType, const NEWTEXTMETRICEXW *ntmc) +{ + int fontHeight = 0; + size_t idx; + + if (!array_reserve((void **)&fonts->fonts, &fonts->capacity, fonts->count + 1, sizeof(*fonts->fonts))) + return; + + if (fontType & RASTER_FONTTYPE) + fontHeight = ntmc->ntmTm.tmHeight - ntmc->ntmTm.tmInternalLeading; + + idx = fonts->count; + fonts->fonts[idx].name = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(fontName) + 1)*sizeof(WCHAR) ); + lstrcpyW( fonts->fonts[idx].name, fontName ); + fonts->fonts[idx].lParam = MAKELONG(fontType, fontHeight); + + fonts->count++; +} static int CALLBACK enum_font_proc(const LOGFONTW *lpelfe, const TEXTMETRICW *lpntme, DWORD FontType, LPARAM lParam) { - HWND hListWnd = (HWND) lParam; + struct font_array *fonts = (void *)lParam; if (lpelfe->lfFaceName[0] == '@') return 1; /* ignore vertical fonts */ - if(SendMessageW(hListWnd, CB_FINDSTRINGEXACT, -1, (LPARAM)lpelfe->lfFaceName) == CB_ERR) - { - - add_font(lpelfe->lfFaceName, FontType, hListWnd, (const NEWTEXTMETRICEXW*)lpntme); - } + add_font(fonts, lpelfe->lfFaceName, FontType, (const NEWTEXTMETRICEXW *)lpntme); return 1; } +static int fonts_desc_compare(const void *a, const void *b) +{ + const struct font_desc *left = a, *right = b; + return lstrcmpiW(left->name, right->name); +} + static void populate_font_list(HWND hListWnd) { + struct font_array font_array = { 0 }; HDC hdc = GetDC(hMainWnd); LOGFONTW fontinfo; HWND hListEditWnd = (HWND)SendMessageW(hListWnd, CBEM_GETEDITCONTROL, 0, 0); CHARFORMAT2W fmt; + size_t i, j; fontinfo.lfCharSet = DEFAULT_CHARSET; *fontinfo.lfFaceName = '\0'; fontinfo.lfPitchAndFamily = 0; - EnumFontFamiliesExW(hdc, &fontinfo, enum_font_proc, - (LPARAM)hListWnd, 0); + /* Collect font names, sort, remove duplicates. */ + EnumFontFamiliesExW(hdc, &fontinfo, enum_font_proc, (LPARAM)&font_array, 0); + + qsort(font_array.fonts, font_array.count, sizeof(*font_array.fonts), fonts_desc_compare); + + for (i = 1, j = 0; i < font_array.count; ++i) + { + if (!lstrcmpiW(font_array.fonts[i].name, font_array.fonts[j].name)) + { + HeapFree(GetProcessHeap(), 0, font_array.fonts[i].name); + font_array.fonts[i].name = NULL; + } + else if (++j != i) + { + font_array.fonts[j] = font_array.fonts[i]; + font_array.fonts[i].name = NULL; + } + } + font_array.count = j + 1; + + for (i = 0; i < font_array.count; ++i) + { + COMBOBOXEXITEMW cbitem = { 0 }; + + cbitem.mask = CBEIF_TEXT | CBEIF_LPARAM; + cbitem.pszText = font_array.fonts[i].name; + cbitem.iItem = -1; + cbitem.lParam = font_array.fonts[i].lParam; + + SendMessageW(hListWnd, CBEM_INSERTITEMW, 0, (LPARAM)&cbitem); + + HeapFree(GetProcessHeap(), 0, font_array.fonts[i].name); + } + HeapFree(GetProcessHeap(), 0, font_array.fonts); ZeroMemory(&fmt, sizeof(fmt)); fmt.cbSize = sizeof(fmt);

1 0

Rémi Bernon : winemenubuilder: Only extract icons when association changed.
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: 3603478b1bf667f4185d4b8b7e8accfe7a46eca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3603478b1bf667f4185d4b8b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 13 10:30:56 2020 +0100 winemenubuilder: Only extract icons when association changed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index ee53619bb9e..0ae1383d4bf 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2657,7 +2657,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package executableW = assoc_query(ASSOCSTR_EXECUTABLE, extensionW, openW); if (executableW) - openWithIconA = extract_icon(executableW, 0, NULL, FALSE); + openWithIconA = compute_native_identifier(0, executableW); friendlyAppNameW = assoc_query(ASSOCSTR_FRIENDLYAPPNAME, extensionW, openW); if (friendlyAppNameW) @@ -2730,6 +2730,12 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package } } + if (hasChanged && openWithIconA) + { + char *outputIconA = extract_icon(executableW, 0, openWithIconA, FALSE); + HeapFree(GetProcessHeap(), 0, outputIconA); + } + end: HeapFree(GetProcessHeap(), 0, extensionA); HeapFree(GetProcessHeap(), 0, commandW);

1 0

Zhiyi Zhang : user32/tests: Pass a struct DEVMODEA pointer to expect_dm() for monitor tests.
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: 73756156f4bf978d46e96d966c94360531201edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=73756156f4bf978d46e96d96… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Nov 13 15:53:09 2020 +0800 user32/tests: Pass a struct DEVMODEA pointer to expect_dm() for monitor tests. No need to pass parameters via struct copying. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 56 ++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 009fc0d626e..c3f5d1eddcb 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -284,7 +284,7 @@ struct device_info }; #define expect_dm(a, b, c) _expect_dm(__LINE__, a, b, c) -static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD test) +static void _expect_dm(INT line, const DEVMODEA *expected, const CHAR *device, DWORD test) { DEVMODEA dm; BOOL ret; @@ -295,27 +295,27 @@ static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD te ret = EnumDisplaySettingsA(device, ENUM_CURRENT_SETTINGS, &dm); ok_(__FILE__, line)(ret, "Device %s test %d EnumDisplaySettingsA failed, error %#x\n", device, test, GetLastError()); - ok_(__FILE__, line)((dm.dmFields & expected.dmFields) == expected.dmFields, - "Device %s test %d expect dmFields to contain %#x, got %#x\n", device, test, expected.dmFields, dm.dmFields); + ok_(__FILE__, line)((dm.dmFields & expected->dmFields) == expected->dmFields, + "Device %s test %d expect dmFields to contain %#x, got %#x\n", device, test, expected->dmFields, dm.dmFields); /* Wine doesn't support changing color depth yet */ - todo_wine_if(expected.dmFields & DM_BITSPERPEL && expected.dmBitsPerPel != 32 && expected.dmBitsPerPel != 24) - ok_(__FILE__, line)(!(expected.dmFields & DM_BITSPERPEL) || dm.dmBitsPerPel == expected.dmBitsPerPel, - "Device %s test %d expect dmBitsPerPel %u, got %u\n", device, test, expected.dmBitsPerPel, dm.dmBitsPerPel); - ok_(__FILE__, line)(!(expected.dmFields & DM_PELSWIDTH) || dm.dmPelsWidth == expected.dmPelsWidth, - "Device %s test %d expect dmPelsWidth %u, got %u\n", device, test, expected.dmPelsWidth, dm.dmPelsWidth); - ok_(__FILE__, line)(!(expected.dmFields & DM_PELSHEIGHT) || dm.dmPelsHeight == expected.dmPelsHeight, - "Device %s test %d expect dmPelsHeight %u, got %u\n", device, test, expected.dmPelsHeight, dm.dmPelsHeight); - ok_(__FILE__, line)(!(expected.dmFields & DM_POSITION) || dm.dmPosition.x == expected.dmPosition.x, - "Device %s test %d expect dmPosition.x %d, got %d\n", device, test, expected.dmPosition.x, dm.dmPosition.x); - ok_(__FILE__, line)(!(expected.dmFields & DM_POSITION) || dm.dmPosition.y == expected.dmPosition.y, - "Device %s test %d expect dmPosition.y %d, got %d\n", device, test, expected.dmPosition.y, dm.dmPosition.y); - ok_(__FILE__, line)(!(expected.dmFields & DM_DISPLAYFREQUENCY) || - dm.dmDisplayFrequency == expected.dmDisplayFrequency, - "Device %s test %d expect dmDisplayFrequency %u, got %u\n", device, test, expected.dmDisplayFrequency, + todo_wine_if(expected->dmFields & DM_BITSPERPEL && expected->dmBitsPerPel != 32 && expected->dmBitsPerPel != 24) + ok_(__FILE__, line)(!(expected->dmFields & DM_BITSPERPEL) || dm.dmBitsPerPel == expected->dmBitsPerPel, + "Device %s test %d expect dmBitsPerPel %u, got %u\n", device, test, expected->dmBitsPerPel, dm.dmBitsPerPel); + ok_(__FILE__, line)(!(expected->dmFields & DM_PELSWIDTH) || dm.dmPelsWidth == expected->dmPelsWidth, + "Device %s test %d expect dmPelsWidth %u, got %u\n", device, test, expected->dmPelsWidth, dm.dmPelsWidth); + ok_(__FILE__, line)(!(expected->dmFields & DM_PELSHEIGHT) || dm.dmPelsHeight == expected->dmPelsHeight, + "Device %s test %d expect dmPelsHeight %u, got %u\n", device, test, expected->dmPelsHeight, dm.dmPelsHeight); + ok_(__FILE__, line)(!(expected->dmFields & DM_POSITION) || dm.dmPosition.x == expected->dmPosition.x, + "Device %s test %d expect dmPosition.x %d, got %d\n", device, test, expected->dmPosition.x, dm.dmPosition.x); + ok_(__FILE__, line)(!(expected->dmFields & DM_POSITION) || dm.dmPosition.y == expected->dmPosition.y, + "Device %s test %d expect dmPosition.y %d, got %d\n", device, test, expected->dmPosition.y, dm.dmPosition.y); + ok_(__FILE__, line)(!(expected->dmFields & DM_DISPLAYFREQUENCY) || + dm.dmDisplayFrequency == expected->dmDisplayFrequency, + "Device %s test %d expect dmDisplayFrequency %u, got %u\n", device, test, expected->dmDisplayFrequency, dm.dmDisplayFrequency); - ok_(__FILE__, line)(!(expected.dmFields & DM_DISPLAYORIENTATION) || - dm.dmDisplayOrientation == expected.dmDisplayOrientation, - "Device %s test %d expect dmDisplayOrientation %d, got %d\n", device, test, expected.dmDisplayOrientation, + ok_(__FILE__, line)(!(expected->dmFields & DM_DISPLAYORIENTATION) || + dm.dmDisplayOrientation == expected->dmDisplayOrientation, + "Device %s test %d expect dmDisplayOrientation %d, got %d\n", device, test, expected->dmDisplayOrientation, dm.dmDisplayOrientation); } @@ -667,7 +667,7 @@ static void test_ChangeDisplaySettingsEx(void) continue; } flush_events(); - expect_dm(dm3, devices[device].name, test); + expect_dm(&dm3, devices[device].name, test); /* Change the registry mode to the second mode */ res = ChangeDisplaySettingsExA(devices[device].name, &dm2, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); @@ -765,7 +765,7 @@ static void test_ChangeDisplaySettingsEx(void) } flush_events(); - expect_dm(dm, devices[device].name, mode); + expect_dm(&dm, devices[device].name, mode); } /* Restore settings */ @@ -838,7 +838,7 @@ static void test_ChangeDisplaySettingsEx(void) } flush_events(); - expect_dm(dm, devices[device].name, 0); + expect_dm(&dm, devices[device].name, 0); /* Test specifying only position, width and height */ memset(&dm, 0, sizeof(dm)); @@ -883,7 +883,7 @@ static void test_ChangeDisplaySettingsEx(void) ok(dm.dmBitsPerPel, "Expected dmBitsPerPel not zero.\n"); ok(dm.dmDisplayFrequency, "Expected dmDisplayFrequency not zero.\n"); - expect_dm(dm, devices[device].name, 0); + expect_dm(&dm, devices[device].name, 0); } /* Test dmPosition */ @@ -955,7 +955,7 @@ static void test_ChangeDisplaySettingsEx(void) ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s returned unexpected %d\n", devices[1].name, res); dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth; - expect_dm(dm2, devices[1].name, 0); + expect_dm(&dm2, devices[1].name, 0); /* Test placing the secondary adapter to all sides of the primary adapter */ for (test = 0; test < 8; ++test) @@ -1014,7 +1014,7 @@ static void test_ChangeDisplaySettingsEx(void) } flush_events(); - expect_dm(dm2, devices[1].name, test); + expect_dm(&dm2, devices[1].name, test); } /* Test automatic position update when other adapters change resolution */ @@ -1079,7 +1079,7 @@ static void test_ChangeDisplaySettingsEx(void) ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d.\n", devices[device].name, mode, res); flush_events(); - expect_dm(dm2, devices[device].name, mode); + expect_dm(&dm2, devices[device].name, mode); /* EnumDisplaySettingsEx without EDS_ROTATEDMODE reports modes with current orientation */ memset(&dm3, 0, sizeof(dm3)); @@ -1125,7 +1125,7 @@ static void test_ChangeDisplaySettingsEx(void) broken(res == DISP_CHANGE_FAILED), /* win8 TestBot */ "ChangeDisplaySettingsExA returned unexpected %d\n", res); for (device = 0; device < device_count; ++device) - expect_dm(devices[device].original_mode, devices[device].name, 0); + expect_dm(&devices[device].original_mode, devices[device].name, 0); heap_free(devices); }

1 0

Jacek Caban : attrib: Use CP_ACP for non-console output encoding.
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: 62c961afdfba36d53caee59e804425ab477a1356 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62c961afdfba36d53caee59e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 20:37:57 2020 +0100 attrib: Use CP_ACP for non-console output encoding. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/attrib/attrib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 53f63020973..4813443449b 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -104,7 +104,7 @@ static int WINAPIV ATTRIB_wprintf(const WCHAR *format, ...) } /* Convert to OEM, then output */ - convertedChars = WideCharToMultiByte(GetConsoleOutputCP(), 0, output_bufW, + convertedChars = WideCharToMultiByte(CP_ACP, 0, output_bufW, len, output_bufA, MAX_WRITECONSOLE_SIZE, "?", &usedDefaultChar); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), output_bufA, convertedChars,

1 0

Jacek Caban : fsutil: Use CP_ACP for non-console output encoding.
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: f24499ebffce8afdddc12d72377af2f617eafe2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f24499ebffce8afdddc12d72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 20:38:03 2020 +0100 fsutil: Use CP_ACP for non-console output encoding. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/fsutil/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/fsutil/main.c b/programs/fsutil/main.c index 0bc8817b88f..e4c036f9650 100644 --- a/programs/fsutil/main.c +++ b/programs/fsutil/main.c @@ -38,11 +38,11 @@ static void output_write(const WCHAR *str, DWORD wlen) * back to WriteFile(), assuming the console encoding is still the right * one in that case. */ - len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); + len = WideCharToMultiByte(CP_ACP, 0, str, wlen, NULL, 0, NULL, NULL); msgA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(char)); if (!msgA) return; - WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, str, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); HeapFree(GetProcessHeap(), 0, msgA); }

1 0

Jacek Caban : hostname: Use CP_ACP for non-console output encoding.
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: bf6e8815ded939c7f16559966b46f2ad1b9fa716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf6e8815ded939c7f1655996… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 12 20:38:08 2020 +0100 hostname: Use CP_ACP for non-console output encoding. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/hostname/hostname.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/hostname/hostname.c b/programs/hostname/hostname.c index e6c2ed76cd1..812703d909d 100644 --- a/programs/hostname/hostname.c +++ b/programs/hostname/hostname.c @@ -47,14 +47,13 @@ static int hostname_vprintfW(const WCHAR *msg, __ms_va_list va_args) * back to WriteFile(), assuming the console encoding is still the right * one in that case. */ - len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, + len = WideCharToMultiByte(CP_ACP, 0, msg_buffer, wlen, NULL, 0, NULL, NULL); msgA = HeapAlloc(GetProcessHeap(), 0, len); if (!msgA) return 0; - WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, msgA, len, - NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, msg_buffer, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); HeapFree(GetProcessHeap(), 0, msgA); }

1 0

Nikolay Sivov : ole32/propstorage: Handle VT_I8/VT_UI8 when serializing properties.
by Alexandre Julliard 13 Nov '20

13 Nov '20

Module: wine Branch: master Commit: c455053486e717b6518ec292444f0284ae442a2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c455053486e717b6518ec292… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 13 00:07:05 2020 +0300 ole32/propstorage: Handle VT_I8/VT_UI8 when serializing properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index adf4c2f3370..27794c739ee 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2103,6 +2103,7 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, HRESULT hr; LARGE_INTEGER seek; PROPERTYIDOFFSET propIdOffset; + ULARGE_INTEGER ularge; ULONG count; assert(var); @@ -2161,6 +2162,13 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, bytesWritten = count; break; } + case VT_I8: + case VT_UI8: + { + StorageUtl_WriteULargeInteger(&ularge, 0, &var->u.uhVal); + hr = IStream_Write(This->stm, &ularge, sizeof(ularge), &bytesWritten); + break; + } case VT_LPSTR: { if (This->codePage == CP_UNICODE)

1 0