September 2021 - Wine-commits

Zhiyi Zhang : comctl32: Use OpenThemeDataForDpi() to create a theme handle not associated to a window.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: 7be103bba9f9569409c5131b6dd96ff0ec2c2365 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7be103bba9f9569409c5131b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 1 14:37:46 2021 +0800 comctl32: Use OpenThemeDataForDpi() to create a theme handle not associated to a window. If a window is not passed to OpenThemeData(), OpenThemeData() assumes the DPI is 96 according to tests. And GetThemePartSize() should select theme parts according to the DPI stored in theme handles rather than using GDI device contexts. Thus, OpenThemeDataForDpi() should be used in place of OpenThemeData() when DPI is not 96 and theme handles shouldn't be associated with a window. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 2 +- dlls/comctl32/hotkey.c | 2 +- dlls/comctl32/toolbar.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index ac5268f146c..f8827d4e26c 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1317,7 +1317,7 @@ static LRESULT DATETIME_NCPaint (HWND hwnd, HRGN region) RECT r; HDC dc; - theme = OpenThemeData(NULL, WC_EDITW); + theme = OpenThemeDataForDpi(NULL, WC_EDITW, GetDpiForWindow(hwnd)); if (!theme) return DefWindowProcW(hwnd, WM_NCPAINT, (WPARAM)region, 0); diff --git a/dlls/comctl32/hotkey.c b/dlls/comctl32/hotkey.c index 7421ff6ef65..7808660e7f5 100644 --- a/dlls/comctl32/hotkey.c +++ b/dlls/comctl32/hotkey.c @@ -434,7 +434,7 @@ HOTKEY_NCPaint (HWND hwnd, HRGN region) RECT r; HDC dc; - theme = OpenThemeData(NULL, WC_EDITW); + theme = OpenThemeDataForDpi(NULL, WC_EDITW, GetDpiForWindow(hwnd)); if (!theme) return DefWindowProcW(hwnd, WM_NCPAINT, (WPARAM)region, 0); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index cf1dc42449b..2ae70ad4f3e 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5313,7 +5313,7 @@ TOOLBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) SystemParametersInfoW (SPI_GETICONTITLELOGFONT, 0, &logFont, 0); infoPtr->hFont = infoPtr->hDefaultFont = CreateFontIndirectW (&logFont); - infoPtr->hTheme = OpenThemeData (NULL, themeClass); + infoPtr->hTheme = OpenThemeDataForDpi (NULL, themeClass, GetDpiForWindow (hwnd)); TOOLBAR_CheckStyle (infoPtr); @@ -6550,7 +6550,7 @@ TOOLBAR_SysColorChange (void) static LRESULT theme_changed (TOOLBAR_INFO *infoPtr) { CloseThemeData (infoPtr->hTheme); - infoPtr->hTheme = OpenThemeData (NULL, themeClass); + infoPtr->hTheme = OpenThemeDataForDpi (NULL, themeClass, GetDpiForWindow (infoPtr->hwndSelf)); InvalidateRect (infoPtr->hwndSelf, NULL, TRUE); return 0; }

1 0

Zhiyi Zhang : uxtheme: Use OpenThemeDataForDpi() to create a theme handle not associated to a window.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: 8aed2ec3b9eccdbdd77aef669acb6f445d178214 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8aed2ec3b9eccdbdd77aef66… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 1 14:37:54 2021 +0800 uxtheme: Use OpenThemeDataForDpi() to create a theme handle not associated to a window. If a window is not passed to OpenThemeData(), OpenThemeData() assumes the DPI is 96 according to tests. And GetThemePartSize() should select theme parts according to the DPI stored in theme handles rather than using GDI device contexts. Thus, OpenThemeDataForDpi() should be used in place of OpenThemeData() when DPI is not 96 and theme handles shouldn't be associated with a window. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/scrollbar.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c index a9d5a83f2bb..0e42de7d77f 100644 --- a/dlls/uxtheme/scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -41,7 +41,11 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES HTHEME theme; DWORD style; - theme = bar == SB_CTL ? GetWindowTheme(hwnd) : OpenThemeData(NULL, WC_SCROLLBARW); + if (bar == SB_CTL) + theme = GetWindowTheme(hwnd); + else + theme = OpenThemeDataForDpi(NULL, WC_SCROLLBARW, GetDpiForWindow(hwnd)); + if (!theme) { user_api.pScrollBarDraw(hwnd, dc, bar, hit_test, tracking_info, draw_arrows, draw_interior,

1 0

Zhiyi Zhang : winecfg: Use OpenThemeDataForDpi() to create a theme handle not associated to a window.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: 53a0d57aff628c73e8da2dbaba0d3c59b0424987 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53a0d57aff628c73e8da2dba… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 1 14:38:03 2021 +0800 winecfg: Use OpenThemeDataForDpi() to create a theme handle not associated to a window. If a window is not passed to OpenThemeData(), OpenThemeData() assumes the DPI is 96 according to tests. And GetThemePartSize() should select theme parts according to the DPI stored in theme handles rather than using GDI device contexts. Thus, OpenThemeDataForDpi() should be used in place of OpenThemeData() when DPI is not 96 and theme handles shouldn't be associated with a window. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/theme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index e204a911516..b3a3eeed3ba 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1090,7 +1090,7 @@ static void on_draw_item(HWND hDlg, WPARAM wParam, LPARAM lParam) HTHEME theme; RECT buttonrect; - theme = OpenThemeData(NULL, WC_BUTTONW); + theme = OpenThemeDataForDpi(NULL, WC_BUTTONW, GetDpiForWindow(hDlg)); if (theme) { MARGINS margins;

1 0

Zhiyi Zhang : uxtheme: Get DPI from theme class.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: f8bc5d762708cc588ed55414eca55918e6679857 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8bc5d762708cc588ed55414… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 1 14:38:10 2021 +0800 uxtheme: Get DPI from theme class. Fix Command Link glyphs not scaled according to DPI because a NULL device context handle was passed to GetThemePartSize() and GetThemePartSize() was using a device context to get DPI. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 36 ++++++++++++++++++------------------ dlls/uxtheme/msstyles.c | 10 ++++++++++ dlls/uxtheme/msstyles.h | 1 + dlls/uxtheme/tests/system.c | 1 - 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 4394f4943b7..a03217b65cf 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -172,7 +172,7 @@ static int imagefile_index_to_property(int index) * * Select the image to use */ -static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, +static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, int iPartId, int iStateId, const RECT *pRect, BOOL glyph, int *imageDpi) { PTHEME_PROPERTY tp; @@ -193,14 +193,15 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, if(imageselecttype == IST_DPI) { int reqdpi = 0; - int screendpi = GetDeviceCaps(hdc, LOGPIXELSX); + int dpi = MSSTYLES_GetThemeDPI(hTheme); for (i = 7; i >= 1; i--) { reqdpi = 0; if (SUCCEEDED(GetThemeInt(hTheme, iPartId, iStateId, mindpi_index_to_property(i), &reqdpi))) { - if(reqdpi != 0 && screendpi >= reqdpi) { + if (reqdpi != 0 && dpi >= reqdpi) + { TRACE("Using %d DPI, image %d\n", reqdpi, imagefile_index_to_property(i)); if (imageDpi) @@ -269,9 +270,9 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, HDC hdc, int iPartId, * * Load image for part/state */ -static HRESULT UXTHEME_LoadImage(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, - const RECT *pRect, BOOL glyph, HBITMAP *hBmp, RECT *bmpRect, - BOOL *hasImageAlpha, int *imageDpi) +static HRESULT UXTHEME_LoadImage(HTHEME hTheme, int iPartId, int iStateId, const RECT *pRect, + BOOL glyph, HBITMAP *hBmp, RECT *bmpRect, BOOL *hasImageAlpha, + int *imageDpi) { int imagelayout = IL_HORIZONTAL; int imagecount = 1; @@ -280,7 +281,7 @@ static HRESULT UXTHEME_LoadImage(HTHEME hTheme, HDC hdc, int iPartId, int iState WCHAR szPath[MAX_PATH]; PTHEME_PROPERTY tp; - tp = UXTHEME_SelectImage(hTheme, hdc, iPartId, iStateId, pRect, glyph, imageDpi); + tp = UXTHEME_SelectImage(hTheme, iPartId, iStateId, pRect, glyph, imageDpi); if(!tp) { FIXME("Couldn't determine image for part/state %d/%d, invalid theme?\n", iPartId, iStateId); return E_PROP_ID_UNSUPPORTED; @@ -528,7 +529,7 @@ static HRESULT UXTHEME_DrawImageGlyph(HTHEME hTheme, HDC hdc, int iPartId, POINT topleft; BOOL hasAlpha; - hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, TRUE, &bmpSrc, &rcSrc, &hasAlpha, + hr = UXTHEME_LoadImage(hTheme, iPartId, iStateId, pRect, TRUE, &bmpSrc, &rcSrc, &hasAlpha, NULL); if(FAILED(hr)) return hr; hdcSrc = CreateCompatibleDC(hdc); @@ -594,9 +595,8 @@ static HRESULT UXTHEME_DrawGlyph(HTHEME hTheme, HDC hdc, int iPartId, * * Used by GetThemePartSize and UXTHEME_DrawImageBackground */ -static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, - int iStateId, RECT *prc, THEMESIZE eSize, - POINT *psz) +static HRESULT get_image_part_size(HTHEME hTheme, int iPartId, int iStateId, RECT *prc, + THEMESIZE eSize, POINT *psz) { int imageDpi, dstDpi; HRESULT hr = S_OK; @@ -604,7 +604,7 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, RECT rcSrc; BOOL hasAlpha; - hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, prc, FALSE, &bmpSrc, &rcSrc, &hasAlpha, + hr = UXTHEME_LoadImage(hTheme, iPartId, iStateId, prc, FALSE, &bmpSrc, &rcSrc, &hasAlpha, &imageDpi); if (FAILED(hr)) return hr; @@ -627,8 +627,8 @@ static HRESULT get_image_part_size (HTHEME hTheme, HDC hdc, int iPartId, { /* Scale to DPI only if the destination DPI exceeds the source DPI by * stretchMark percent */ - dstDpi = GetDeviceCaps(hdc, LOGPIXELSY); - if (dstDpi && dstDpi != imageDpi && MulDiv(100, dstDpi, imageDpi) >= stretchMark + 100) + dstDpi = MSSTYLES_GetThemeDPI(hTheme); + if (dstDpi != imageDpi && MulDiv(100, dstDpi, imageDpi) >= stretchMark + 100) { srcSize.x = MulDiv(srcSize.x, dstDpi, imageDpi); srcSize.y = MulDiv(srcSize.y, dstDpi, imageDpi); @@ -707,7 +707,7 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, COLORREF transparentcolor = 0; BOOL hasAlpha; - hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, FALSE, &bmpSrc, &rcSrc, &hasAlpha, + hr = UXTHEME_LoadImage(hTheme, iPartId, iStateId, pRect, FALSE, &bmpSrc, &rcSrc, &hasAlpha, NULL); if(FAILED(hr)) return hr; hdcSrc = CreateCompatibleDC(hdc); @@ -731,7 +731,7 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, if(sizingtype == ST_TRUESIZE) { int valign = VA_CENTER, halign = HA_CENTER; - get_image_part_size (hTheme, hdc, iPartId, iStateId, pRect, TS_DRAW, &drawSize); + get_image_part_size(hTheme, iPartId, iStateId, pRect, TS_DRAW, &drawSize); GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_VALIGN, &valign); GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_HALIGN, &halign); @@ -2072,7 +2072,7 @@ HRESULT WINAPI GetThemePartSize(HTHEME hTheme, HDC hdc, int iPartId, if (bgtype == BT_NONE) /* do nothing */; else if(bgtype == BT_IMAGEFILE) - hr = get_image_part_size (hTheme, hdc, iPartId, iStateId, prc, eSize, &size); + hr = get_image_part_size(hTheme, iPartId, iStateId, prc, eSize, &size); else if(bgtype == BT_BORDERFILL) hr = get_border_background_size (hTheme, iPartId, iStateId, eSize, &size); else { @@ -2183,7 +2183,7 @@ BOOL WINAPI IsThemeBackgroundPartiallyTransparent(HTHEME hTheme, int iPartId, if (bgtype != BT_IMAGEFILE) return FALSE; - if (FAILED(UXTHEME_LoadImage(hTheme, 0, iPartId, iStateId, &rect, FALSE, &bmpSrc, &rcSrc, + if (FAILED(UXTHEME_LoadImage(hTheme, iPartId, iStateId, &rect, FALSE, &bmpSrc, &rcSrc, &hasAlpha, NULL))) return FALSE; diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 99eda64233c..efabd06f7c0 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -247,6 +247,16 @@ PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf) return UXINI_LoadINI(tf->hTheme, L"themes_ini"); } +/*********************************************************************** + * MSSTYLES_GetThemeDPI + * + * Retrieves the DPI from a theme handle when it was opened + */ +UINT MSSTYLES_GetThemeDPI(PTHEME_CLASS tc) +{ + return tc->dpi; +} + /*********************************************************************** * MSSTYLES_GetActiveThemeIni * diff --git a/dlls/uxtheme/msstyles.h b/dlls/uxtheme/msstyles.h index 1cb27b93ab3..12292cefae4 100644 --- a/dlls/uxtheme/msstyles.h +++ b/dlls/uxtheme/msstyles.h @@ -94,6 +94,7 @@ BOOL MSSTYLES_LookupProperty(LPCWSTR pszPropertyName, int *dwPrimitive, int *dwI BOOL MSSTYLES_LookupEnum(LPCWSTR pszValueName, int dwEnum, int *dwValue) DECLSPEC_HIDDEN; BOOL MSSTYLES_LookupPartState(LPCWSTR pszClass, LPCWSTR pszPart, LPCWSTR pszState, int *iPartId, int *iStateId) DECLSPEC_HIDDEN; PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf) DECLSPEC_HIDDEN; +UINT MSSTYLES_GetThemeDPI(PTHEME_CLASS tc) DECLSPEC_HIDDEN; PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; PTHEME_PROPERTY MSSTYLES_FindMetric(int iPropertyPrimitive, int iPropertyId) DECLSPEC_HIDDEN; diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 584a71a82b4..f9bf371e6bf 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1030,7 +1030,6 @@ static void test_GetThemePartSize(void) ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); hr = GetThemePartSize(htheme, NULL, BP_CHECKBOX, CBS_CHECKEDNORMAL, NULL, TS_DRAW, &size2); ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); - todo_wine ok(size2.cx == size.cx && size2.cy == size.cy, "Expected size %dx%d, got %dx%d.\n", size.cx, size.cy, size2.cx, size2.cy); ReleaseDC(hwnd, hdc);

1 0

Francois Gouget : advapi32/tests: Fix some Perflib subkey tests.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: ab6edd0932c5f43abf9a6df1b55c67ab423a6353 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab6edd0932c5f43abf9a6df1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Sep 1 08:52:19 2021 +0200 advapi32/tests: Fix some Perflib subkey tests. Some languages don't have a subkey (e.g. German), and for others the subkey is the full language id rather than the primary language id (e.g. Portuguese). Furthermore there should be a CurrentLanguage key with localized values. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 64 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 5ed220095bb..b6f906fd689 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -3929,10 +3929,11 @@ static void test_perflib_key(void) HKEY perflib_key, key, key2; OBJECT_ATTRIBUTES attr; UNICODE_STRING string; - char lang_name[4]; + char lang_name[5]; + const char *knames[2] = {"009", "CurrentLanguage"}; char *buffer; DWORD size; - LONG ret; + LONG ret, l; ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion\\Perflib", 0, KEY_READ, &perflib_key); @@ -4027,21 +4028,70 @@ static void test_perflib_key(void) else ok(!ret, "got %#x\n", ret); - /* multilingual support was not really completely thought through */ + for (l = 0; l < ARRAY_SIZE(knames); l++) + { + winetest_push_context("%d", l); + todo_wine_if(l == 1) { + ret = RegOpenKeyExA(perflib_key, knames[l], 0, KEY_READ, &key); + ok(!ret, "got %u\n", ret); + if (is_special_key(key)) + { + size = buffer_size; + ret = RegQueryValueExA(key, "counter", NULL, NULL, (BYTE *)buffer, &size); + ok(!ret, "got %u\n", ret); + if (!ret) + { + char *str; + int c = 0; + for (str = buffer; *str; str += strlen(str) + 1) + c++; + /* Note that the two keys may not have the same number of + * entries if they are in different languages. + */ + ok(c >= 2 && (c % 2) == 0, "%d is not a valid number of entries in %s\n", c, knames[l]); + trace("%s has %d entries\n", knames[l], c); + } + } + else + { + /* Windows 7 does not always return a special key for 009 + * when running without elevated privileges. + */ + ok(broken(l == 0), "expected a special handle, got %p\n", key); + } + + ret = RegCloseKey(key); + ok(!ret, "got %u\n", ret); + } + winetest_pop_context(); + } - sprintf(lang_name, "%03x", primary_lang); - if (primary_lang != LANG_ENGLISH) + /* multilingual support was not really completely thought through */ + switch (primary_lang) + { + case LANG_PORTUGUESE: + case LANG_CHINESE: + sprintf(lang_name, "%04x", GetUserDefaultLangID()); + break; + default: + sprintf(lang_name, "%03x", primary_lang); + break; + } + if (primary_lang != LANG_ENGLISH && + !RegOpenKeyExA(perflib_key, lang_name, 0, KEY_READ, &key)) { - ret = RegOpenKeyExA(perflib_key, lang_name, 0, KEY_READ, &key); - todo_wine ok(!ret, "got %u\n", ret); ok(!is_special_key(key), "expected a normal handle, got %p\n", key); + size = buffer_size; ret = RegQueryValueExA(key, "counter", NULL, NULL, (BYTE *)buffer, &size); todo_wine ok(ret == ERROR_FILE_NOT_FOUND, "got %u\n", ret); ret = RegCloseKey(key); todo_wine ok(!ret, "got %u\n", ret); } + /* else some languages don't have their own key. The keys are not really + * usable anyway so assume it does not really matter. + */ ret = RegCloseKey(perflib_key); ok(!ret, "got %u\n", ret);

1 0

Gabriel Ivăncescu : user32: Add a helper to retrieve the work rect.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: d8252025d1c6bf9e16406cb430f0531477da76bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8252025d1c6bf9e16406cb4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 1 08:30:50 2021 +0100 user32: Add a helper to retrieve the work rect. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6e96a4b5964..bc8c35afc58 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -675,6 +675,33 @@ BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy, } +/******************************************************************* + * get_work_rect + * + * Get the work area that a maximized window can cover, depending on style. + */ +static BOOL get_work_rect( HWND hwnd, RECT *rect ) +{ + HMONITOR monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ); + MONITORINFO mon_info; + DWORD style; + + if (!monitor) return FALSE; + + mon_info.cbSize = sizeof(mon_info); + GetMonitorInfoW( monitor, &mon_info ); + *rect = mon_info.rcMonitor; + + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (style & WS_MAXIMIZEBOX) + { + if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) + *rect = mon_info.rcWork; + } + return TRUE; +} + + /******************************************************************* * WINPOS_GetMinMaxInfo * @@ -683,8 +710,8 @@ BOOL WINAPI MoveWindow( HWND hwnd, INT x, INT y, INT cx, INT cy, MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) { DPI_AWARENESS_CONTEXT context; + RECT rc_work, rc_primary; MINMAXINFO MinMax; - HMONITOR monitor; INT xinc, yinc; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); LONG adjustedStyle; @@ -738,22 +765,8 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) /* if the app didn't change the values, adapt them for the current monitor */ - if ((monitor = MonitorFromWindow( hwnd, MONITOR_DEFAULTTOPRIMARY ))) + if (get_work_rect( hwnd, &rc_work )) { - RECT rc_work, rc_primary; - MONITORINFO mon_info; - - mon_info.cbSize = sizeof(mon_info); - GetMonitorInfoW( monitor, &mon_info ); - - rc_work = mon_info.rcMonitor; - - if (style & WS_MAXIMIZEBOX) - { - if ((style & WS_CAPTION) == WS_CAPTION || !(style & (WS_CHILD | WS_POPUP))) - rc_work = mon_info.rcWork; - } - rc_primary = get_primary_monitor_rect(); if (MinMax.ptMaxSize.x == (rc_primary.right - rc_primary.left) + 2 * xinc && MinMax.ptMaxSize.y == (rc_primary.bottom - rc_primary.top) + 2 * yinc)

1 0

Gabriel Ivăncescu : user32: Don't save maximized pos of top-level wnds covering whole work rect.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: 54eea6f072a8fed65bef713dfbc492bac285568b URL: https://source.winehq.org/git/wine.git/?a=commit;h=54eea6f072a8fed65bef713d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 1 08:30:51 2021 +0100 user32: Don't save maximized pos of top-level wnds covering whole work rect. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51672 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 54 ++++++++++++++++++++++++++++++++++++++----------- dlls/user32/winpos.c | 50 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 13 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54eea6f072a8fed65bef…

1 0

Francois Gouget : msi: Remove CDECL on static functions where not needed.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: b60e4064508e79ca6fdb2937ca8cfd3f58423f79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b60e4064508e79ca6fdb2937… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 31 15:14:09 2021 +0200 msi: Remove CDECL on static functions where not needed. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 41c82af1b59..cc4648481ba 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -271,7 +271,7 @@ static LONG CDECL cabinet_seek_stream( INT_PTR hf, LONG dist, int seektype ) return -1; } -static UINT CDECL msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi) +static UINT msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi) { MSIRECORD *row;

1 0

Francois Gouget : shell32: Fix a couple of ASCII / ANSI mixups in comments.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: wine Branch: master Commit: c10d9d102c21a4c01f47afb5e8748a85338bdae4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c10d9d102c21a4c01f47afb5… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 1 09:30:08 2021 +0200 shell32: Fix a couple of ASCII / ANSI mixups in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 2 +- dlls/shell32/shellord.c | 2 +- dlls/shell32/shlfileop.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 2353ac3e56e..1a8eca3abe4 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -680,7 +680,7 @@ static HRESULT Stream_LoadLocation( IStream *stm, * * 0 Length of the block (4 bytes, usually 0x314) * 4 tag (dword) - * 8 string data in ASCII + * 8 string data in ANSI * 8+0x104 string data in UNICODE * * In the original Win32 implementation the buffers are not initialized diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index e1262accdd8..639576ca50d 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -1,6 +1,6 @@ /* * The parameters of many functions changes between different OS versions - * (NT uses Unicode strings, 95 uses ASCII strings) + * (NT uses Unicode strings, 95 uses ANSI strings) * * Copyright 1997 Marcus Meissner * 1998 Jürgen Schmied diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 3726c61dfaa..ed66a1a555c 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -819,9 +819,9 @@ static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly) * * SHNameTranslate HelperFunction for SHFileOperationA * - * Translates a list of 0 terminated ASCII strings into Unicode. If *wString + * Translates a list of 0 terminated ANSI strings into Unicode. If *wString * is NULL, only the necessary size of the string is determined and returned, - * otherwise the ASCII strings are copied into it and the buffer is increased + * otherwise the ANSI strings are copied into it and the buffer is increased * to point to the location after the final 0 termination char. */ static DWORD SHNameTranslate(LPWSTR* wString, LPCWSTR* pWToFrom, BOOL more)

1 0

Francois Gouget : testbot/WineRunTask: Extract the tests to a WineTest.exe subdirectory.
by Alexandre Julliard 01 Sep '21

01 Sep '21

Module: tools Branch: master Commit: cabd5ab6f4f57b422dcfdfc9da8799d578be3e2f URL: https://source.winehq.org/git/tools.git/?a=commit;h=cabd5ab6f4f57b422dcfdfc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 31 14:35:14 2021 +0200 testbot/WineRunTask: Extract the tests to a WineTest.exe subdirectory. This simplifies shielding all the test executables from anti-virus tools like Microsoft Defender by excluding the directory WineTest is in. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index db274b4..ac9091d 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -478,7 +478,7 @@ elsif ($Step->Type eq "suite") $Info .= $VM->Details; } # Escape the arguments for cmd's command interpreter - $Script .= "-q -o $RptFileName -t $Tag -m ". BatchQuote($AdminEMail) ." -i ". BatchQuote($Info) ."\r\n"; + $Script .= "-q -d tests -o $RptFileName -t $Tag -m ". BatchQuote($AdminEMail) ." -i ". BatchQuote($Info) ."\r\n"; $Script .= "$FileName -q -s $RptFileName\r\n" if (!$Mission->{nosubmit}); } Debug(Elapsed($Start), " Sending the script: [$Script]\n");

1 0