March 2022 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Return the correct length from config_list_get_value().
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: 4b3019142f7ecd1ae6af20823b784ec4996f60e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b3019142f7ecd1ae6af2082… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 28 16:17:58 2022 +0200 wined3d: Return the correct length from config_list_get_value(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 524dc7508f9..4f50e8aeb7d 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -171,7 +171,7 @@ static const char *config_list_get_value(const char *string, const char *key, si if (is_option_separator(prev_char) && *p == '=') { if ((end = strpbrk(p + 1, ",;"))) - *len = end - p + 1; + *len = end - (p + 1); else *len = strlen(p + 1); return p + 1;

1 0

Rémi Bernon : strmbase: Add a separate id for pins.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: aa9aa7390f5d689f4ca39cbec98b9c0dd7f2e1db URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa9aa7390f5d689f4ca39cbe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 25 09:42:03 2022 +0100 strmbase: Add a separate id for pins. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/strmbase.h | 1 + libs/strmbase/filter.c | 2 +- libs/strmbase/pin.c | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 3e92136b7f7..1b4cc3f7657 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -36,6 +36,7 @@ struct strmbase_pin struct strmbase_filter *filter; PIN_DIRECTION dir; WCHAR name[128]; + WCHAR id[128]; IPin *peer; AM_MEDIA_TYPE mt; diff --git a/libs/strmbase/filter.c b/libs/strmbase/filter.c index 92b4f1cb4b6..ee41611a198 100644 --- a/libs/strmbase/filter.c +++ b/libs/strmbase/filter.c @@ -436,7 +436,7 @@ static HRESULT WINAPI filter_FindPin(IBaseFilter *iface, const WCHAR *id, IPin * for (i = 0; (pin = filter->ops->filter_get_pin(filter, i)); ++i) { - if (!lstrcmpW(id, pin->name)) + if (!lstrcmpW(id, pin->id)) { IPin_AddRef(*ret = &pin->IPin_iface); return S_OK; diff --git a/libs/strmbase/pin.c b/libs/strmbase/pin.c index 1aecb7a8c98..03330837477 100644 --- a/libs/strmbase/pin.c +++ b/libs/strmbase/pin.c @@ -383,10 +383,10 @@ static HRESULT WINAPI pin_QueryId(IPin *iface, WCHAR **id) TRACE("pin %p %s:%s, id %p.\n", pin, debugstr_w(pin->filter->name), debugstr_w(pin->name), id); - if (!(*id = CoTaskMemAlloc((lstrlenW(pin->name) + 1) * sizeof(WCHAR)))) + if (!(*id = CoTaskMemAlloc((lstrlenW(pin->id) + 1) * sizeof(WCHAR)))) return E_OUTOFMEMORY; - lstrcpyW(*id, pin->name); + lstrcpyW(*id, pin->id); return S_OK; } @@ -770,6 +770,7 @@ void strmbase_source_init(struct strmbase_source *pin, struct strmbase_filter *f pin->pin.filter = filter; pin->pin.dir = PINDIR_OUTPUT; lstrcpyW(pin->pin.name, name); + lstrcpyW(pin->pin.id, name); pin->pin.ops = &func_table->base; pin->pFuncsTable = func_table; } @@ -1172,6 +1173,7 @@ void strmbase_sink_init(struct strmbase_sink *pin, struct strmbase_filter *filte pin->pin.filter = filter; pin->pin.dir = PINDIR_INPUT; lstrcpyW(pin->pin.name, name); + lstrcpyW(pin->pin.id, name); pin->pin.ops = &func_table->base; pin->pFuncsTable = func_table; pin->pAllocator = pin->preferred_allocator = allocator;

1 0

Nikolay Sivov : browseui/tests: Remove string conversion helper.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: 7f96b7b1fd9ec12565ebe6c1dbd043869942675e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f96b7b1fd9ec12565ebe6c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 28 14:04:09 2022 +0300 browseui/tests: Remove string conversion helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/browseui/tests/autocomplete.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index ff1033fc6ff..0c28a2a8cf8 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -37,14 +37,6 @@ ok(FALSE, #exp " failed: %#lx\n", res); \ } -static LPWSTR strdup_AtoW(LPCSTR str) -{ - int size = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - LPWSTR wstr = CoTaskMemAlloc((size + 1)*sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, str, -1, wstr, size+1); - return wstr; -} - typedef struct { IEnumString IEnumString_iface; @@ -54,7 +46,7 @@ typedef struct INT expcount; INT pos; INT limit; - const char **data; + const WCHAR **data; } TestACL; extern IEnumStringVtbl TestACLVtbl; @@ -70,7 +62,7 @@ static TestACL *impl_from_IACList(IACList *iface) return CONTAINING_RECORD(iface, TestACL, IACList_iface); } -static TestACL *TestACL_Constructor(int limit, const char **strings) +static TestACL *TestACL_Constructor(int limit, const WCHAR **strings) { TestACL *This = CoTaskMemAlloc(sizeof(TestACL)); ZeroMemory(This, sizeof(*This)); @@ -127,6 +119,7 @@ static HRESULT STDMETHODCALLTYPE TestACL_QueryInterface(IEnumString *iface, REFI static HRESULT STDMETHODCALLTYPE TestACL_Next(IEnumString *iface, ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched) { TestACL *This = impl_from_IEnumString(iface); + int size; ULONG i; trace("ACL(%p): read %ld item(s)\n", This, celt); @@ -134,7 +127,10 @@ static HRESULT STDMETHODCALLTYPE TestACL_Next(IEnumString *iface, ULONG celt, LP { if (This->pos >= This->limit) break; - rgelt[i] = strdup_AtoW(This->data[This->pos]); + + size = wcslen(This->data[This->pos]); + rgelt[i] = CoTaskMemAlloc((size + 1) * sizeof(WCHAR)); + wcscpy(rgelt[i], This->data[This->pos]); This->pos++; } @@ -222,8 +218,8 @@ IACListVtbl TestACL_ACListVtbl = static void test_ACLMulti(void) { - const char *strings1[] = {"a", "c", "e"}; - const char *strings2[] = {"a", "b", "d"}; + const WCHAR *strings1[] = { L"a", L"c", L"e" }; + const WCHAR *strings2[] = { L"a", L"b", L"d" }; const WCHAR exp[] = L"ABC"; IEnumString *obj; IEnumACString *unk;

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*DISPLAYNAME in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: f0db567f673b43794253fe0475f8298ad31698c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0db567f673b43794253fe04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:29:57 2022 +0200 kernelbase: Reimplement LOCALE_*DISPLAYNAME in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 2faec8136b9..2e512240b2b 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -903,7 +903,8 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return locale_return_number( val, type, buffer, len ); case LOCALE_SLOCALIZEDDISPLAYNAME: - return -1; + /* FIXME: localization */ + return locale_return_string( locale->sengdisplayname, type, buffer, len ); case LOCALE_SABBREVLANGNAME: return locale_return_string( locale->sabbrevlangname, type, buffer, len ); @@ -1161,10 +1162,10 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SENGLISHDISPLAYNAME: - return -1; + return locale_return_string( locale->sengdisplayname, type, buffer, len ); case LOCALE_SNATIVEDISPLAYNAME: - return -1; + return locale_return_string( locale->snativedisplayname, type, buffer, len ); case LOCALE_INEGATIVEPERCENT: return -1;

1 0

Alexandre Julliard : kernelbase: Reimplement LOCALE_*MONTHNAME in GetLocaleInfoW/Ex using the locale.nls data.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: ff323aeb6586ed030fa3523f1fd3d95d2ee397c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff323aeb6586ed030fa3523f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 13:27:02 2022 +0200 kernelbase: Reimplement LOCALE_*MONTHNAME in GetLocaleInfoW/Ex using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 58 ++++++++++-------------------------------------- 1 file changed, 12 insertions(+), 46 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 6e7a277ba07..4b205aed9af 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1064,7 +1064,9 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ case LOCALE_SMONTHNAME10: case LOCALE_SMONTHNAME11: case LOCALE_SMONTHNAME12: - return -1; + return locale_return_strarray( ((type & LOCALE_RETURN_GENITIVE_NAMES) && locale->sgenitivemonth) ? + locale->sgenitivemonth : locale->smonthname, + type - LOCALE_SMONTHNAME1, type, buffer, len ); case LOCALE_SABBREVMONTHNAME1: case LOCALE_SABBREVMONTHNAME2: @@ -1078,7 +1080,9 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ case LOCALE_SABBREVMONTHNAME10: case LOCALE_SABBREVMONTHNAME11: case LOCALE_SABBREVMONTHNAME12: - return -1; + return locale_return_strarray( ((type & LOCALE_RETURN_GENITIVE_NAMES) && locale->sabbrevgenitivemonth) ? + locale->sabbrevgenitivemonth : locale->sabbrevmonthname, + type - LOCALE_SABBREVMONTHNAME1, type, buffer, len ); case LOCALE_SPOSITIVESIGN: return -1; @@ -1257,10 +1261,14 @@ static int get_locale_info( const NLS_LOCALE_DATA *locale, LCID lcid, LCTYPE typ return -1; case LOCALE_SMONTHNAME13: - return -1; + return locale_return_strarray( ((type & LOCALE_RETURN_GENITIVE_NAMES) && locale->sgenitivemonth) ? + locale->sgenitivemonth : locale->smonthname, + 12, type, buffer, len ); case LOCALE_SABBREVMONTHNAME13: - return -1; + return locale_return_strarray( ((type & LOCALE_RETURN_GENITIVE_NAMES) && locale->sabbrevgenitivemonth) ? + locale->sabbrevgenitivemonth : locale->sabbrevmonthname, + 12, type, buffer, len ); case LOCALE_INEGNUMBER: return -1; @@ -1517,30 +1525,6 @@ static UINT get_lcid_codepage( LCID lcid, ULONG flags ) } -static BOOL is_genitive_name_supported( LCTYPE lctype ) -{ - switch (LOWORD(lctype)) - { - case LOCALE_SMONTHNAME1: - case LOCALE_SMONTHNAME2: - case LOCALE_SMONTHNAME3: - case LOCALE_SMONTHNAME4: - case LOCALE_SMONTHNAME5: - case LOCALE_SMONTHNAME6: - case LOCALE_SMONTHNAME7: - case LOCALE_SMONTHNAME8: - case LOCALE_SMONTHNAME9: - case LOCALE_SMONTHNAME10: - case LOCALE_SMONTHNAME11: - case LOCALE_SMONTHNAME12: - case LOCALE_SMONTHNAME13: - return TRUE; - default: - return FALSE; - } -} - - static int get_value_base_by_lctype( LCTYPE lctype ) { return lctype == LOCALE_ILANGUAGE || lctype == LOCALE_IDEFAULTLANGUAGE ? 16 : 10; @@ -4936,12 +4920,6 @@ INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoW( LCID lcid, LCTYPE lctype, WCHAR *bu ret = get_locale_info( locale, lcid, lctype, buffer, len ); if (ret != -1) return ret; - if (lctype & LOCALE_RETURN_GENITIVE_NAMES && !is_genitive_name_supported( lctype )) - { - SetLastError( ERROR_INVALID_FLAGS ); - return 0; - } - if (!len) buffer = NULL; lcid = ConvertDefaultLocale( lcid ); @@ -5000,18 +4978,6 @@ INT WINAPI DECLSPEC_HOTPATCH GetLocaleInfoW( LCID lcid, LCTYPE lctype, WCHAR *bu for (i = 0; i < (lctype & 0x0f); i++) p += *p + 1; if (lcflags & LOCALE_RETURN_NUMBER) ret = sizeof(UINT) / sizeof(WCHAR); - else if (is_genitive_name_supported( lctype ) && *p) - { - /* genitive form is stored after a null separator from a nominative */ - for (i = 1; i <= *p; i++) if (!p[i]) break; - - if (i <= *p && (lcflags & LOCALE_RETURN_GENITIVE_NAMES)) - { - ret = *p - i + 1; - p += i; - } - else ret = i; - } else ret = (lctype == LOCALE_FONTSIGNATURE) ? *p : *p + 1;

1 0

Zhiyi Zhang : uxtheme: Return correct WM_ERASEBKGND result from custom dialog procedures.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: d987c277c12bc17a77c9d79b92024d449f9a85f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d987c277c12bc17a77c9d79b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 24 17:06:07 2022 +0800 uxtheme: Return correct WM_ERASEBKGND result from custom dialog procedures. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/dialog.c | 3 ++- dlls/uxtheme/tests/system.c | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index 706d170936e..13943d753bb 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -129,9 +129,10 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, BOO case WM_ERASEBKGND: { dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 0); lr = LOWORD(CallWindowProcW(dlgproc, hwnd, msg, wp, lp)); if (lr) - return lr; + return GetWindowLongPtrW(hwnd, DWLP_MSGRESULT); brush = get_dialog_background_brush(hwnd, TRUE); if (!brush) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 1308d54264b..1f04ac879ec 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1889,8 +1889,7 @@ static void test_EnableThemeDialogTexture(void) /* Test that the dialog procedure should take precedence over DefDlgProc() for WM_ERASEBKGND */ handle_WM_ERASEBKGND = TRUE; lr = SendMessageW(dialog, WM_ERASEBKGND, (WPARAM)child_hdc, 0); - todo_wine - ok(lr == 0, "Expected 0, got %#lx.\n", lr); + ok(lr == 0, "Expected 0, got %#Ix.\n", lr); handle_WM_ERASEBKGND = FALSE; /* Test that dialog doesn't have theme handle opened for itself */

1 0

Zhiyi Zhang : uxtheme: Remove a redundant condition check.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: f9923d6bb9b800dbf9a3bec93b7aa7cbebd92e99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9923d6bb9b800dbf9a3bec9… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 24 17:06:14 2022 +0800 uxtheme: Remove a redundant condition check. The sizingtype check is redundant because it can only be ST_TRUESIZE, ST_STRETCH or ST_TILE and the check is already in the not ST_TRUESIZE branch. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 111 ++++++++++++++++++++++++++-------------------------- 1 file changed, 55 insertions(+), 56 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index d503fad3fea..3ddb9b3bf4d 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -710,6 +710,7 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, RECT *pRect, const DTBGOPTS *pOptions) { + int destCenterWidth, srcCenterWidth, destCenterHeight, srcCenterHeight; HRESULT hr = S_OK; HBITMAP bmpSrc; HGDIOBJ oldSrc; @@ -825,68 +826,66 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, goto draw_error; } - if ((sizingtype == ST_STRETCH) || (sizingtype == ST_TILE)) { - int destCenterWidth = dstSize.x - (sm.cxLeftWidth + sm.cxRightWidth); - int srcCenterWidth = srcSize.x - (sm.cxLeftWidth + sm.cxRightWidth); - int destCenterHeight = dstSize.y - (sm.cyTopHeight + sm.cyBottomHeight); - int srcCenterHeight = srcSize.y - (sm.cyTopHeight + sm.cyBottomHeight); - - if(destCenterWidth > 0) { - /* Center top */ - if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, 0, - destCenterWidth, sm.cyTopHeight, - hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top, - srcCenterWidth, sm.cyTopHeight, - sizingtype, transparent, transparentcolor)) { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto draw_error; - } - /* Center bottom */ - if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, dstSize.y-sm.cyBottomHeight, - destCenterWidth, sm.cyBottomHeight, - hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.bottom-sm.cyBottomHeight, - srcCenterWidth, sm.cyBottomHeight, - sizingtype, transparent, transparentcolor)) { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto draw_error; - } + destCenterWidth = dstSize.x - (sm.cxLeftWidth + sm.cxRightWidth); + srcCenterWidth = srcSize.x - (sm.cxLeftWidth + sm.cxRightWidth); + destCenterHeight = dstSize.y - (sm.cyTopHeight + sm.cyBottomHeight); + srcCenterHeight = srcSize.y - (sm.cyTopHeight + sm.cyBottomHeight); + + if(destCenterWidth > 0) { + /* Center top */ + if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, 0, + destCenterWidth, sm.cyTopHeight, + hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top, + srcCenterWidth, sm.cyTopHeight, + sizingtype, transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; } - if(destCenterHeight > 0) { - /* Left center */ - if(!UXTHEME_SizedBlt (hdcDst, 0, sm.cyTopHeight, - sm.cxLeftWidth, destCenterHeight, - hdcSrc, rcSrc.left, rcSrc.top+sm.cyTopHeight, - sm.cxLeftWidth, srcCenterHeight, - sizingtype, - transparent, transparentcolor)) { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto draw_error; - } - /* Right center */ - if(!UXTHEME_SizedBlt (hdcDst, dstSize.x-sm.cxRightWidth, sm.cyTopHeight, - sm.cxRightWidth, destCenterHeight, - hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top+sm.cyTopHeight, - sm.cxRightWidth, srcCenterHeight, + /* Center bottom */ + if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, dstSize.y-sm.cyBottomHeight, + destCenterWidth, sm.cyBottomHeight, + hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.bottom-sm.cyBottomHeight, + srcCenterWidth, sm.cyBottomHeight, + sizingtype, transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + } + if(destCenterHeight > 0) { + /* Left center */ + if(!UXTHEME_SizedBlt (hdcDst, 0, sm.cyTopHeight, + sm.cxLeftWidth, destCenterHeight, + hdcSrc, rcSrc.left, rcSrc.top+sm.cyTopHeight, + sm.cxLeftWidth, srcCenterHeight, + sizingtype, + transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + /* Right center */ + if(!UXTHEME_SizedBlt (hdcDst, dstSize.x-sm.cxRightWidth, sm.cyTopHeight, + sm.cxRightWidth, destCenterHeight, + hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top+sm.cyTopHeight, + sm.cxRightWidth, srcCenterHeight, + sizingtype, transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + } + if(destCenterHeight > 0 && destCenterWidth > 0) { + BOOL borderonly = FALSE; + GetThemeBool(hTheme, iPartId, iStateId, TMT_BORDERONLY, &borderonly); + if(!borderonly) { + /* Center */ + if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, sm.cyTopHeight, + destCenterWidth, destCenterHeight, + hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top+sm.cyTopHeight, + srcCenterWidth, srcCenterHeight, sizingtype, transparent, transparentcolor)) { hr = HRESULT_FROM_WIN32(GetLastError()); goto draw_error; } } - if(destCenterHeight > 0 && destCenterWidth > 0) { - BOOL borderonly = FALSE; - GetThemeBool(hTheme, iPartId, iStateId, TMT_BORDERONLY, &borderonly); - if(!borderonly) { - /* Center */ - if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, sm.cyTopHeight, - destCenterWidth, destCenterHeight, - hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top+sm.cyTopHeight, - srcCenterWidth, srcCenterHeight, - sizingtype, transparent, transparentcolor)) { - hr = HRESULT_FROM_WIN32(GetLastError()); - goto draw_error; - } - } - } } draw_error:

1 0

Santino Mazza : ncrypt/tests: Test for NCryptVerifySignature.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: c20a3d8e23ba177fc7b4cac7985905cc05eea6b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c20a3d8e23ba177fc7b4cac7… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Mon Mar 28 11:52:02 2022 +0200 ncrypt/tests: Test for NCryptVerifySignature. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/tests/ncrypt.c | 138 +++++++++++++++++++++++++++++++++++++++++++++ include/ncrypt.h | 6 ++ 2 files changed, 144 insertions(+) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index fc951fef80a..e8de441876b 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -330,6 +330,143 @@ static void test_finalize_key(void) NCryptFreeObject(key); } +static UCHAR signature_pubkey_blob[] = { + 0x52, 0x53, 0x41, 0x31, 0x00, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x01, 0xb4, 0xdb, 0x15, 0x24, 0xd0, 0x9a, 0xf4, 0xa3, 0x22, + 0x04, 0xbe, 0xbd, 0xda, 0xb4, 0x3b, 0x1f, 0x9d, 0x5f, 0x2a, 0x3e, 0xe7, + 0x42, 0xd7, 0xfa, 0xbc, 0xeb, 0x4e, 0xba, 0xcf, 0x92, 0x5d, 0x42, 0x0e, + 0xc0, 0xb0, 0x0f, 0xcc, 0xc3, 0x03, 0x69, 0x23, 0xb9, 0xc2, 0x07, 0xf7, + 0xf5, 0x19, 0xef, 0x9f, 0xb6, 0xd4, 0x6d, 0x35, 0x0d, 0x4c, 0x3a, 0x2b, + 0x37, 0x9d, 0x4d, 0x61, 0xce, 0x30, 0x33, 0x27, 0xe4, 0x9a, 0xca, 0x23, + 0xd6, 0x8f, 0x90, 0x33, 0xba, 0x5b, 0x16, 0xab, 0xa6, 0xda, 0x7a, 0x16, + 0x8e, 0xae, 0xf9, 0x6f, 0x29, 0xe2, 0xf1, 0x3d, 0xf0, 0xb6, 0xb4, 0x70, + 0xc0, 0x6d, 0xfc, 0x73, 0xf1, 0x3e, 0xdf, 0x02, 0x2c, 0xab, 0x24, 0x7a, + 0xd8, 0x8b, 0xcf, 0x63, 0xd0, 0x1a, 0x76, 0xb3, 0x11, 0x22, 0x5d, 0xf6, + 0x72, 0xb5, 0xd1, 0x6b, 0x83, 0xcd, 0x63, 0x5d, 0x3d, 0x03, 0xa2, 0xe0, + 0x36, 0xe8, 0x54, 0xe9, 0x6f, 0x04, 0xb3, 0x1a, 0xdf, 0x35, 0xd7, 0x01, + 0x57, 0xc7, 0x8d, 0x81, 0x4b, 0x39, 0x0c, 0x92, 0x71, 0x0b, 0x7d, 0x05, + 0xb4, 0xa4, 0xb4, 0xd4, 0x73, 0x55, 0x85, 0x19, 0xd5, 0x37, 0x7f, 0xcd, + 0x81, 0xd3, 0xf2, 0x62, 0x60, 0xfb, 0x6a, 0x1a, 0xda, 0xb4, 0x83, 0xfa, + 0x87, 0xac, 0x51, 0x3a, 0xb4, 0xc2, 0x03, 0xd3, 0xc6, 0xf0, 0x20, 0xca, + 0x10, 0xfd, 0xeb, 0xd8, 0x85, 0xb9, 0x74, 0x29, 0x83, 0xda, 0xa2, 0xee, + 0xcc, 0xf4, 0xf6, 0x18, 0xbc, 0x84, 0x92, 0xf5, 0xdb, 0x71, 0x14, 0xb9, + 0x62, 0x54, 0x4b, 0x64, 0x58, 0x95, 0xbc, 0x69, 0xc1, 0xcd, 0xac, 0x4b, + 0x7c, 0x1d, 0xc4, 0xe7, 0x6c, 0x44, 0x80, 0x5e, 0x88, 0x3a, 0x9c, 0xbd, + 0xd5, 0xa5, 0x2f, 0xa6, 0x73, 0x65, 0x48, 0x00, 0x5e, 0xfd, 0xe9, 0x4e, + 0xd7, 0x6c, 0x59, 0x47, 0x9b, 0xd1, 0x9d}; + +static UCHAR signature_pkcs1_sha256[] = { + 0xad, 0x3d, 0x2f, 0x31, 0x87, 0xba, 0x5b, 0xdc, 0x84, 0x95, 0x77, 0x68, + 0xf9, 0x9c, 0xd2, 0x38, 0x5b, 0x9f, 0x09, 0xc3, 0x8e, 0x9e, 0x8e, 0x8d, + 0x49, 0x56, 0x31, 0x09, 0x55, 0xc6, 0xd2, 0x1a, 0xb3, 0x00, 0x71, 0x60, + 0x84, 0x38, 0xf7, 0x1b, 0xc0, 0x43, 0x87, 0x31, 0x2d, 0xcc, 0xf2, 0x49, + 0x5f, 0x21, 0x8e, 0x77, 0x16, 0x57, 0xd7, 0xe9, 0x37, 0x3a, 0xe9, 0x91, + 0x5b, 0xc5, 0xea, 0x34, 0xb5, 0xf7, 0x4d, 0xaa, 0x65, 0x06, 0xef, 0xc6, + 0x14, 0xfa, 0xa7, 0x1e, 0xe5, 0xc6, 0x18, 0xfe, 0x06, 0x64, 0xe7, 0x6e, + 0x11, 0x83, 0x03, 0x4c, 0x91, 0x47, 0x60, 0x88, 0x12, 0x0c, 0x5e, 0xcc, + 0x3a, 0x93, 0x2f, 0x5c, 0x57, 0x5b, 0x66, 0x55, 0xa3, 0xe5, 0xf4, 0x3c, + 0x6f, 0xe9, 0xd8, 0xfd, 0xcc, 0x19, 0xc8, 0xf8, 0x13, 0x21, 0x3d, 0x29, + 0xee, 0x3c, 0xb2, 0xb4, 0x3f, 0x36, 0xd8, 0x82, 0xb1, 0xa9, 0x34, 0x89, + 0x2a, 0x7a, 0x42, 0x4a, 0x13, 0x0a, 0x0b, 0x50, 0xbe, 0x43, 0xa8, 0x2c, + 0x5a, 0x86, 0x65, 0x9f, 0xab, 0x86, 0x25, 0x44, 0xbb, 0x6b, 0xca, 0x04, + 0xca, 0xa5, 0xe7, 0x8e, 0xe2, 0x1d, 0xa8, 0x31, 0x90, 0x85, 0x6a, 0xd9, + 0xaf, 0x67, 0x8c, 0x1a, 0x13, 0xea, 0xa8, 0xfd, 0x3d, 0xc0, 0xb0, 0x3f, + 0xde, 0x6a, 0xc9, 0x65, 0xeb, 0x0a, 0xa6, 0x9b, 0xfc, 0x97, 0x0a, 0x72, + 0xaf, 0x04, 0xde, 0x3f, 0xcb, 0xac, 0x97, 0x6e, 0xfa, 0xbb, 0xd8, 0x6e, + 0xad, 0x0d, 0x10, 0xc6, 0x34, 0x18, 0x50, 0xb9, 0x12, 0xd4, 0x6b, 0xd5, + 0x3d, 0x9d, 0xfb, 0x31, 0x8d, 0x96, 0x39, 0x4d, 0x20, 0x91, 0x40, 0x06, + 0xca, 0xe6, 0x33, 0x73, 0x76, 0x2a, 0xe3, 0xab, 0xaf, 0x9d, 0xe9, 0x4e, + 0xb7, 0xe0, 0x4b, 0x45, 0x23, 0x07, 0xe9, 0xe2, 0xab, 0xdc, 0x9f, 0x5a, + 0xed, 0xbe, 0x76, 0x27}; + +static UCHAR invalid_signature[] = { + 0x4f, 0x8f, 0x88, 0x43, 0xed, 0x9e, 0xe8, 0x75, 0x0f, 0xe7, 0x32, 0xab, + 0x07, 0xcc, 0x6c, 0x8d, 0x56, 0xaa, 0x78, 0xf8, 0x43, 0x62, 0x4c, 0x0c, + 0xd5, 0x45, 0x2c, 0x3d, 0x28, 0x6f, 0xbc, 0x8b, 0xc1, 0x9f, 0xfe, 0x33, + 0x50, 0x4e, 0xd0, 0x6a, 0x83, 0xf8, 0x0e, 0xc8, 0x19, 0x59, 0xde, 0x25, + 0xf0, 0x7b, 0x4e, 0x3d, 0x9d, 0xc7, 0xbf, 0x72, 0xc3, 0x26, 0x48, 0xb6, + 0x19, 0x08, 0x3f, 0x05, 0xe8, 0x76, 0x2c, 0x11, 0x49, 0xfb, 0xa1, 0xc0, + 0xae, 0x6e, 0x30, 0xf8, 0x10, 0x61, 0x9f, 0x53, 0xc6, 0xeb, 0x7c, 0x7c, + 0x94, 0x5f, 0xca, 0xe5, 0x41, 0x40, 0xd6, 0x83, 0xa8, 0x4a, 0x45, 0x5c, + 0x77, 0x69, 0xf2, 0x89, 0xe9, 0xf7, 0x81, 0xa1, 0xae, 0x77, 0xf5, 0xec, + 0x41, 0x4b, 0xfc, 0x82, 0x7f, 0xee, 0x4e, 0x5b, 0x43, 0xdd, 0xcc, 0xe8, + 0x90, 0x12, 0xf0, 0x9a, 0xd0, 0xbc, 0x56, 0xd8, 0xeb, 0xd6, 0xfc, 0x80, + 0x48, 0x26, 0x8c, 0x63, 0x5c, 0x55, 0xd9, 0x6c, 0xb5, 0x10, 0xc1, 0xab, + 0x98, 0x3c, 0xe1, 0x25, 0x13, 0x4e, 0xc2, 0xdc, 0xd5, 0x4a, 0x25, 0xe5, + 0xc7, 0x9f, 0xfc, 0xf8, 0x53, 0x53, 0x12, 0x4c, 0xc1, 0x6c, 0x67, 0xa9, + 0x9e, 0x6e, 0x88, 0x2e, 0x93, 0xa3, 0x3f, 0x2d, 0xd3, 0xc5, 0xf4, 0x25, + 0xe2, 0x0f, 0x8f, 0xc0, 0x2b, 0x30, 0x94, 0x9d, 0xc0, 0x09, 0x31, 0x6c, + 0x19, 0xf7, 0x2e, 0x72, 0x6b, 0xb3, 0xf6, 0x78, 0x91, 0xca, 0x95, 0x28, + 0x9f, 0xf6, 0xd0, 0x77, 0x1c, 0x73, 0xff, 0x30, 0xe7, 0x02, 0xc3, 0xc8, + 0x0e, 0x95, 0x4f, 0x02, 0x96, 0xc5, 0xa9, 0x02, 0xb8, 0xaa, 0x97, 0xac, + 0x37, 0x47, 0xa9, 0x6d, 0xcb, 0x25, 0xb3, 0x8d, 0x20, 0xc5, 0xb6, 0x49, + 0xd8, 0xaf, 0x1a, 0xad, 0x62, 0x8c, 0x79, 0x60, 0x73, 0x8d, 0x46, 0x1e, + 0xe5, 0x23, 0x39, 0x44}; + +static UCHAR sha256_hash[] = { + 0x27, 0x51, 0x8b, 0xa9, 0x68, 0x30, 0x11, 0xf6, 0xb3, 0x96, 0x07, 0x2c, + 0x05, 0xf6, 0x65, 0x6d, 0x04, 0xf5, 0xfb, 0xc3, 0x78, 0x7c, 0xf9, 0x24, + 0x90, 0xec, 0x60, 0x6e, 0x50, 0x92, 0xe3, 0x26}; + +static void test_verify_signature(void) +{ + NCRYPT_PROV_HANDLE prov; + NCRYPT_KEY_HANDLE key; + BCRYPT_PKCS1_PADDING_INFO padinfo, invalid_padinfo; + SECURITY_STATUS ret; + + ret = NCryptOpenStorageProvider(&prov, NULL, 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + ret = NCryptImportKey(prov, 0, BCRYPT_PUBLIC_KEY_BLOB, NULL, &key, signature_pubkey_blob, + sizeof(signature_pubkey_blob), 0); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + padinfo.pszAlgId = BCRYPT_SHA256_ALGORITHM; + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, + sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == ERROR_SUCCESS, "got %#lx\n", ret); + + todo_wine { + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), invalid_signature, + sizeof(invalid_signature), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_BAD_SIGNATURE, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, NULL, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, + sizeof(signature_pkcs1_sha256), 0); + ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + + ret = NCryptVerifySignature(0, &padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, + sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_INVALID_HANDLE, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, NULL, sizeof(sha256_hash), signature_pkcs1_sha256, + sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER) || broken(ret == NTE_FAIL) /* win7 */, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, 4, signature_pkcs1_sha256, + sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), NULL, + sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER) || broken(ret == NTE_FAIL) /* win7 */, "got %#lx\n", ret); + + ret = NCryptVerifySignature(key, &padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, 4, + NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + + invalid_padinfo.pszAlgId = BCRYPT_MD5_ALGORITHM; + ret = NCryptVerifySignature(key, &invalid_padinfo, sha256_hash, sizeof(sha256_hash), signature_pkcs1_sha256, + sizeof(signature_pkcs1_sha256), NCRYPT_PAD_PKCS1_FLAG); + ok(ret == NTE_INVALID_PARAMETER, "got %#lx\n", ret); + } + + NCryptFreeObject(key); + NCryptFreeObject(prov); +} + START_TEST(ncrypt) { test_key_import_rsa(); @@ -338,4 +475,5 @@ START_TEST(ncrypt) test_set_property(); test_create_persisted_key(); test_finalize_key(); + test_verify_signature(); } diff --git a/include/ncrypt.h b/include/ncrypt.h index f7372b30621..c09a1ec8676 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -71,6 +71,11 @@ typedef ULONG_PTR NCRYPT_SECRET_HANDLE; #define NCRYPT_SILENT_FLAG 0x00000040 +#define NCRYPT_NO_PADDING_FLAG 0x00000001 +#define NCRYPT_PAD_PKCS1_FLAG 0x00000002 +#define NCRYPT_PAD_OAEP_FLAG 0x00000004 +#define NCRYPT_PAD_PSS_FLAG 0x00000008 + #define NCRYPT_NAME_PROPERTY L"Name" #define NCRYPT_UNIQUE_NAME_PROPERTY L"Unique Name" #define NCRYPT_ALGORITHM_PROPERTY L"Algorithm Name" @@ -116,6 +121,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE, co SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptVerifySignature(NCRYPT_KEY_HANDLE, void *, BYTE *, DWORD, BYTE *, DWORD, DWORD); #ifdef __cplusplus }

1 0

Rémi Bernon : kernel32/tests: Remove GlobalMemoryStatus loop and relax the checks.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: 4d122a26e56a8160f81aba9887eac44919c14ab5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d122a26e56a8160f81aba98… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 28 12:56:34 2022 +0200 kernel32/tests: Remove GlobalMemoryStatus loop and relax the checks. The test is a bit too strict in some case on Windows, relaxing it like it was initially is probably fine now that the counters are correct. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 6efe4da4634..752cc71ac33 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1232,21 +1232,17 @@ static void test_GlobalMemoryStatus(void) GlobalMemoryStatus( &mem ); ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); - do - { - status = NtQuerySystemInformation( SystemBasicInformation, &basic_info, sizeof(basic_info), NULL ); - ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); - status = NtQuerySystemInformation( SystemPerformanceInformation, perf_info, sizeof(buffer), NULL ); - ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); - status = NtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &vmc, sizeof(vmc), NULL ); - ok( !status, "NtQueryInformationProcess returned %#lx\n", status ); - mem.dwLength = sizeof(MEMORYSTATUS); - GlobalMemoryStatus( &mem ); - memex.dwLength = sizeof(MEMORYSTATUSEX); - ret = GlobalMemoryStatusEx( &memex ); - ok( ret, "GlobalMemoryStatusEx succeeded\n" ); - } while (memex.ullAvailPhys != (ULONGLONG)perf_info->AvailablePages * basic_info.PageSize || - mem.dwAvailPhys != min( ~(SIZE_T)0 >> 1, memex.ullAvailPhys )); + status = NtQuerySystemInformation( SystemBasicInformation, &basic_info, sizeof(basic_info), NULL ); + ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); + status = NtQuerySystemInformation( SystemPerformanceInformation, perf_info, sizeof(buffer), NULL ); + ok( !status, "NtQuerySystemInformation returned %#lx\n", status ); + status = NtQueryInformationProcess( GetCurrentProcess(), ProcessVmCounters, &vmc, sizeof(vmc), NULL ); + ok( !status, "NtQueryInformationProcess returned %#lx\n", status ); + mem.dwLength = sizeof(MEMORYSTATUS); + GlobalMemoryStatus( &mem ); + memex.dwLength = sizeof(MEMORYSTATUSEX); + ret = GlobalMemoryStatusEx( &memex ); + ok( ret, "GlobalMemoryStatusEx succeeded\n" ); ok( basic_info.PageSize, "got 0 PageSize\n" ); ok( basic_info.MmNumberOfPhysicalPages, "got 0 MmNumberOfPhysicalPages\n" ); @@ -1265,27 +1261,30 @@ static void test_GlobalMemoryStatus(void) expect.ullAvailVirtual = expect.ullTotalVirtual - (ULONGLONG)vmc.WorkingSetSize /* approximate */; expect.ullAvailExtendedVirtual = 0; +/* allow some variability, info sources are not always in sync */ +#define IS_WITHIN_RANGE(a, b) (((a) - (b) + (256 * basic_info.PageSize)) <= (512 * basic_info.PageSize)) + ok( memex.dwMemoryLoad == expect.dwMemoryLoad, "got dwMemoryLoad %lu\n", memex.dwMemoryLoad ); ok( memex.ullTotalPhys == expect.ullTotalPhys, "got ullTotalPhys %#I64x\n", memex.ullTotalPhys ); - ok( memex.ullAvailPhys == expect.ullAvailPhys, "got ullAvailPhys %#I64x\n", memex.ullAvailPhys ); + ok( IS_WITHIN_RANGE( memex.ullAvailPhys, expect.ullAvailPhys ), "got ullAvailPhys %#I64x\n", memex.ullAvailPhys ); ok( memex.ullTotalPageFile == expect.ullTotalPageFile, "got ullTotalPageFile %#I64x\n", memex.ullTotalPageFile ); - /* allow some variability, page file is not always in sync on Windows */ - ok( memex.ullAvailPageFile - expect.ullAvailPageFile + 32 * basic_info.PageSize <= 64 * basic_info.PageSize, - "got ullAvailPageFile %#I64x\n", memex.ullAvailPageFile ); + ok( IS_WITHIN_RANGE( memex.ullAvailPageFile, expect.ullAvailPageFile ), "got ullAvailPageFile %#I64x\n", memex.ullAvailPageFile ); ok( memex.ullTotalVirtual == expect.ullTotalVirtual, "got ullTotalVirtual %#I64x\n", memex.ullTotalVirtual ); ok( memex.ullAvailVirtual <= expect.ullAvailVirtual, "got ullAvailVirtual %#I64x\n", memex.ullAvailVirtual ); ok( memex.ullAvailExtendedVirtual == 0, "got ullAvailExtendedVirtual %#I64x\n", memex.ullAvailExtendedVirtual ); ok( mem.dwMemoryLoad == memex.dwMemoryLoad, "got dwMemoryLoad %lu\n", mem.dwMemoryLoad ); ok( mem.dwTotalPhys == min( ~(SIZE_T)0 >> 1, memex.ullTotalPhys ), "got dwTotalPhys %#Ix\n", mem.dwTotalPhys ); - ok( mem.dwAvailPhys == min( ~(SIZE_T)0 >> 1, memex.ullAvailPhys ), "got dwAvailPhys %#Ix\n", mem.dwAvailPhys ); + ok( IS_WITHIN_RANGE( mem.dwAvailPhys, min( ~(SIZE_T)0 >> 1, memex.ullAvailPhys ) ), "got dwAvailPhys %#Ix\n", mem.dwAvailPhys ); #ifndef _WIN64 todo_wine_if(memex.ullTotalPageFile > 0xfff7ffff) #endif ok( mem.dwTotalPageFile == min( ~(SIZE_T)0, memex.ullTotalPageFile ), "got dwTotalPageFile %#Ix\n", mem.dwTotalPageFile ); - ok( mem.dwAvailPageFile == min( ~(SIZE_T)0, memex.ullAvailPageFile ), "got dwAvailPageFile %#Ix\n", mem.dwAvailPageFile ); + ok( IS_WITHIN_RANGE( mem.dwAvailPageFile, min( ~(SIZE_T)0, memex.ullAvailPageFile ) ), "got dwAvailPageFile %#Ix\n", mem.dwAvailPageFile ); ok( mem.dwTotalVirtual == memex.ullTotalVirtual, "got dwTotalVirtual %#Ix\n", mem.dwTotalVirtual ); ok( mem.dwAvailVirtual == memex.ullAvailVirtual, "got dwAvailVirtual %#Ix\n", mem.dwAvailVirtual ); + +#undef IS_WITHIN_RANGE } START_TEST(heap)

1 0

Nikolay Sivov : browseui: Use CRT memory allocation functions.
by Alexandre Julliard March 28, 2022

March 28, 2022

Module: wine Branch: master Commit: 6b5a5c6402334eacc1f2f315906bacf14f4f00a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b5a5c6402334eacc1f2f315… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 28 14:04:08 2022 +0300 browseui: Use CRT memory allocation functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/browseui/aclmulti.c | 30 ++++++++++++------------------ dlls/browseui/aclsource.c | 13 ++----------- dlls/browseui/browseui_main.c | 5 ++--- dlls/browseui/compcatcachedaemon.c | 7 ++----- dlls/browseui/progressdlg.c | 38 +++++++++++++------------------------- 5 files changed, 31 insertions(+), 62 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index a41cb810369..47547cdd1e1 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -34,8 +34,6 @@ #include "shlguid.h" #include "shlobj.h" -#include "wine/heap.h" - #include "browseui.h" WINE_DEFAULT_DEBUG_CHANNEL(browseui); @@ -80,17 +78,6 @@ static void release_obj(struct ACLMultiSublist *obj) IACList_Release(obj->pACL); } -static void ACLMulti_Destructor(ACLMulti *This) -{ - int i; - TRACE("destroying %p\n", This); - for (i = 0; i < This->nObjs; i++) - release_obj(&This->objs[i]); - heap_free(This->objs); - heap_free(This); - BROWSEUI_refCount--; -} - static HRESULT WINAPI ACLMulti_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut) { ACLMulti *This = impl_from_IEnumString(iface); @@ -129,10 +116,18 @@ static ULONG WINAPI ACLMulti_Release(IEnumString *iface) { ACLMulti *This = impl_from_IEnumString(iface); ULONG ret; + int i; ret = InterlockedDecrement(&This->refCount); if (ret == 0) - ACLMulti_Destructor(This); + { + for (i = 0; i < This->nObjs; i++) + release_obj(&This->objs[i]); + free(This->objs); + free(This); + BROWSEUI_refCount--; + } + return ret; } @@ -224,7 +219,7 @@ static HRESULT WINAPI ACLMulti_Append(IObjMgr *iface, IUnknown *obj) if (obj == NULL) return E_FAIL; - This->objs = heap_realloc(This->objs, sizeof(This->objs[0]) * (This->nObjs+1)); + This->objs = realloc(This->objs, sizeof(This->objs[0]) * (This->nObjs+1)); This->objs[This->nObjs].punk = obj; IUnknown_AddRef(obj); if (FAILED(IUnknown_QueryInterface(obj, &IID_IEnumString, (LPVOID *)&This->objs[This->nObjs].pEnum))) @@ -247,7 +242,7 @@ static HRESULT WINAPI ACLMulti_Remove(IObjMgr *iface, IUnknown *obj) release_obj(&This->objs[i]); memmove(&This->objs[i], &This->objs[i+1], (This->nObjs-i-1)*sizeof(struct ACLMultiSublist)); This->nObjs--; - This->objs = heap_realloc(This->objs, sizeof(This->objs[0]) * This->nObjs); + This->objs = realloc(This->objs, sizeof(This->objs[0]) * This->nObjs); return S_OK; } @@ -313,8 +308,7 @@ HRESULT ACLMulti_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = heap_alloc_zero(sizeof(ACLMulti)); - if (This == NULL) + if (!(This = calloc(1, sizeof(ACLMulti)))) return E_OUTOFMEMORY; This->IEnumString_iface.lpVtbl = &ACLMultiVtbl; diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index 4412ca38003..72bf323c62e 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -34,8 +34,6 @@ #include "shlguid.h" #include "shlobj.h" -#include "wine/heap.h" - #include "browseui.h" WINE_DEFAULT_DEBUG_CHANNEL(browseui); @@ -57,12 +55,6 @@ static inline ACLShellSource *impl_from_IEnumString(IEnumString *iface) return CONTAINING_RECORD(iface, ACLShellSource, IEnumString_iface); } -static void ACLShellSource_Destructor(ACLShellSource *This) -{ - TRACE("destroying %p\n", This); - heap_free(This); -} - static HRESULT WINAPI ACLShellSource_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut) { ACLShellSource *This = impl_from_IEnumString(iface); @@ -106,7 +98,7 @@ static ULONG WINAPI ACLShellSource_Release(IEnumString *iface) TRACE("(%p)->(%lu)\n", This, ref); if (ref == 0) - ACLShellSource_Destructor(This); + free(This); return ref; } @@ -205,8 +197,7 @@ HRESULT ACLShellSource_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = heap_alloc_zero(sizeof(ACLShellSource)); - if (This == NULL) + if (!(This = calloc(1, sizeof(*This)))) return E_OUTOFMEMORY; This->IEnumString_iface.lpVtbl = &ACLShellSourceVtbl; diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index b6962b30f26..6d089725d3c 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -32,7 +32,6 @@ #include "shlguid.h" #include "rpcproxy.h" -#include "wine/heap.h" #include "browseui.h" #include "initguid.h" @@ -72,7 +71,7 @@ static inline ClassFactory *impl_from_IClassFactory(IClassFactory *iface) static void ClassFactory_Destructor(ClassFactory *This) { TRACE("Destroying class factory %p\n", This); - heap_free(This); + free(This); InterlockedDecrement(&BROWSEUI_refCount); } @@ -147,7 +146,7 @@ static const IClassFactoryVtbl ClassFactoryVtbl = { static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) { - ClassFactory *This = heap_alloc(sizeof(ClassFactory)); + ClassFactory *This = malloc(sizeof(*This)); This->IClassFactory_iface.lpVtbl = &ClassFactoryVtbl; This->ref = 1; This->ctor = ctor; diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index 6de0d87ef38..f7a5e4b449f 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -34,8 +34,6 @@ #include "shlguid.h" #include "shlobj.h" -#include "wine/heap.h" - #include "browseui.h" #include "resids.h" @@ -57,7 +55,7 @@ static void CompCatCacheDaemon_Destructor(CompCatCacheDaemon *This) TRACE("destroying %p\n", This); This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); - heap_free(This); + free(This); InterlockedDecrement(&BROWSEUI_refCount); } @@ -146,8 +144,7 @@ HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = heap_alloc(sizeof(CompCatCacheDaemon)); - if (This == NULL) + if (!(This = calloc(1, sizeof(*This)))) return E_OUTOFMEMORY; This->IRunnableTask_iface.lpVtbl = &CompCatCacheDaemonVtbl; diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index dc0fe813f68..11a973034fa 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -34,8 +34,6 @@ #include "shlguid.h" #include "shlobj.h" -#include "wine/heap.h" - #include "browseui.h" #include "resids.h" @@ -88,17 +86,8 @@ static inline ProgressDialog *impl_from_IOleWindow(IOleWindow *iface) static void set_buffer(LPWSTR *buffer, LPCWSTR string) { - IMalloc *malloc; - ULONG cb; - - if (string == NULL) - string = L""; - CoGetMalloc(MEMCTX_TASK, &malloc); - - cb = (lstrlenW(string) + 1)*sizeof(WCHAR); - if (*buffer == NULL || cb > IMalloc_GetSize(malloc, *buffer)) - *buffer = IMalloc_Realloc(malloc, *buffer, cb); - memcpy(*buffer, string, cb); + free(*buffer); + *buffer = wcsdup(string ? string : L""); } struct create_params @@ -114,7 +103,7 @@ static LPWSTR load_string(HINSTANCE hInstance, UINT uiResourceId) LPWSTR ret; LoadStringW(hInstance, uiResourceId, string, ARRAY_SIZE(string)); - ret = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(string) + 1) * sizeof(WCHAR)); + ret = malloc((lstrlenW(string) + 1) * sizeof(WCHAR)); lstrcpyW(ret, string); return ret; } @@ -277,17 +266,17 @@ static void ProgressDialog_Destructor(ProgressDialog *This) TRACE("destroying %p\n", This); if (This->hwnd) end_dialog(This); - for (i = 0; i < 3; i++) - heap_free(This->lines[i]); - heap_free(This->cancelMsg); - heap_free(This->title); - for (i = 0; i < 2; i++) - heap_free(This->remainingMsg[i]); - for (i = 0; i < 3; i++) - heap_free(This->timeMsg[i]); + for (i = 0; i < ARRAY_SIZE(This->lines); i++) + free(This->lines[i]); + free(This->cancelMsg); + free(This->title); + for (i = 0; i < ARRAY_SIZE(This->remainingMsg); i++) + free(This->remainingMsg[i]); + for (i = 0; i < ARRAY_SIZE(This->timeMsg); i++) + free(This->timeMsg[i]); This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); - heap_free(This); + free(This); InterlockedDecrement(&BROWSEUI_refCount); } @@ -635,8 +624,7 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (pUnkOuter) return CLASS_E_NOAGGREGATION; - This = heap_alloc_zero(sizeof(ProgressDialog)); - if (This == NULL) + if (!(This = calloc(1, sizeof(*This)))) return E_OUTOFMEMORY; This->IProgressDialog_iface.lpVtbl = &ProgressDialogVtbl;

1 0