January 2020 - Wine-Commits

Nikolay Sivov : gdi32/tests: Remove workarounds for SetLayout().
by Alexandre Julliard Jan. 8, 2020

Jan. 8, 2020

Module: wine Branch: master Commit: 8ab39efe0af13cad2c898fa68ee98c93bf3b6663 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ab39efe0af13cad2c898fa6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 11:50:13 2020 +0300 gdi32/tests: Remove workarounds for SetLayout(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/bitmap.c | 39 ++++++++++++++------------------------- dlls/gdi32/tests/dc.c | 40 +++++++++++++++++----------------------- dlls/gdi32/tests/mapping.c | 18 ++++++++---------- 3 files changed, 39 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 8f0f6601b3..fe3482671b 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -40,7 +40,6 @@ static NTSTATUS (WINAPI *pD3DKMTCreateDCFromMemory)( D3DKMT_CREATEDCFROMMEMORY * static NTSTATUS (WINAPI *pD3DKMTDestroyDCFromMemory)( const D3DKMT_DESTROYDCFROMMEMORY *desc ); static BOOL (WINAPI *pGdiAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION); static BOOL (WINAPI *pGdiGradientFill)(HDC,TRIVERTEX*,ULONG,void*,ULONG,ULONG); -static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); static inline int get_bitmap_stride( int width, int bpp ) { @@ -4216,15 +4215,9 @@ static void test_GetSetDIBits_rtl(void) int ret; DWORD bits_1[8 * 8], bits_2[8 * 8]; - if(!pSetLayout) - { - win_skip("Don't have SetLayout\n"); - return; - } - hdc = GetDC( NULL ); hdc_mem = CreateCompatibleDC( hdc ); - pSetLayout( hdc_mem, LAYOUT_LTR ); + SetLayout( hdc_mem, LAYOUT_LTR ); bitmap = CreateCompatibleBitmap( hdc, 8, 8 ); orig_bitmap = SelectObject( hdc_mem, bitmap ); @@ -4244,7 +4237,7 @@ static void test_GetSetDIBits_rtl(void) ok(ret == 8, "got %d\n", ret); ok(bits_1[56] == 0xff0000, "got %08x\n", bits_1[56]); /* check we have a red pixel */ - pSetLayout( hdc_mem, LAYOUT_RTL ); + SetLayout( hdc_mem, LAYOUT_RTL ); ret = GetDIBits( hdc_mem, bitmap, 0, 8, bits_2, &info, DIB_RGB_COLORS ); ok(ret == 8, "got %d\n", ret); @@ -4254,7 +4247,7 @@ static void test_GetSetDIBits_rtl(void) /* Now to show that SetDIBits also ignores the mode, we perform a SetDIBits followed by a GetDIBits and show that the bits remain unchanged. */ - pSetLayout( hdc_mem, LAYOUT_LTR ); + SetLayout( hdc_mem, LAYOUT_LTR ); ret = SetDIBits( hdc_mem, bitmap, 0, 8, bits_1, &info, DIB_RGB_COLORS ); ok(ret == 8, "got %d\n", ret); @@ -4262,7 +4255,7 @@ static void test_GetSetDIBits_rtl(void) ok(ret == 8, "got %d\n", ret); ok(!memcmp( bits_1, bits_2, sizeof(bits_1) ), "bits differ\n"); - pSetLayout( hdc_mem, LAYOUT_RTL ); + SetLayout( hdc_mem, LAYOUT_RTL ); ret = SetDIBits( hdc_mem, bitmap, 0, 8, bits_1, &info, DIB_RGB_COLORS ); ok(ret == 8, "got %d\n", ret); @@ -5165,19 +5158,16 @@ static void test_SetDIBitsToDevice(void) memset( dib_bits, 0xaa, 64 * 4 ); SetMapMode( hdc, MM_TEXT ); - if (pSetLayout) - { - pSetLayout( hdc, LAYOUT_RTL ); - ret = SetDIBitsToDevice( hdc, 1, 2, 3, 2, 1, 2, 1, 5, data, info, DIB_RGB_COLORS ); - ok( ret == 3, "got %d\n", ret ); - for (i = 0; i < 64; i++) - if (i == 36 || i == 37 || i == 38 || i == 44 || i == 45 || i == 46) - ok( dib_bits[i] == data[i - 27], "%d: got %08x\n", i, dib_bits[i] ); - else - ok( dib_bits[i] == 0xaaaaaaaa, "%d: got %08x\n", i, dib_bits[i] ); - memset( dib_bits, 0xaa, 64 * 4 ); - pSetLayout( hdc, LAYOUT_LTR ); - } + SetLayout( hdc, LAYOUT_RTL ); + ret = SetDIBitsToDevice( hdc, 1, 2, 3, 2, 1, 2, 1, 5, data, info, DIB_RGB_COLORS ); + ok( ret == 3, "got %d\n", ret ); + for (i = 0; i < 64; i++) + if (i == 36 || i == 37 || i == 38 || i == 44 || i == 45 || i == 46) + ok( dib_bits[i] == data[i - 27], "%d: got %08x\n", i, dib_bits[i] ); + else + ok( dib_bits[i] == 0xaaaaaaaa, "%d: got %08x\n", i, dib_bits[i] ); + memset( dib_bits, 0xaa, 64 * 4 ); + SetLayout( hdc, LAYOUT_LTR ); /* t-d -> b-u */ info->bmiHeader.biHeight = -8; @@ -5954,7 +5944,6 @@ START_TEST(bitmap) pD3DKMTDestroyDCFromMemory = (void *)GetProcAddress( hdll, "D3DKMTDestroyDCFromMemory" ); pGdiAlphaBlend = (void *)GetProcAddress( hdll, "GdiAlphaBlend" ); pGdiGradientFill = (void *)GetProcAddress( hdll, "GdiGradientFill" ); - pSetLayout = (void *)GetProcAddress( hdll, "SetLayout" ); test_createdibitmap(); test_dibsections(); diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 4f53e433b4..c8a903e56b 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -38,8 +38,6 @@ #define LAYOUT_LTR 0 #endif -static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); - static void test_dc_values(void) { HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); @@ -1002,27 +1000,24 @@ static void test_boundsrect(void) SetRect(&expect, 40, 70, 100, 130); ok(EqualRect(&rect, &expect), "Got %s\n", wine_dbgstr_rect(&rect)); - if (pSetLayout) - { - pSetLayout( hdc, LAYOUT_RTL ); - ret = GetBoundsRect(hdc, &rect, 0); - ok(ret == DCB_SET, "GetBoundsRect returned %x\n", ret); - SetRect(&expect, 159, 70, 99, 130); - ok(EqualRect(&rect, &expect), "Got %s\n", wine_dbgstr_rect(&rect)); - SetRect(&set_rect, 50, 25, 30, 35); - ret = SetBoundsRect(hdc, &set_rect, DCB_SET); - ok(ret == (DCB_SET | DCB_DISABLE), "SetBoundsRect returned %x\n", ret); - ret = GetBoundsRect(hdc, &rect, 0); - ok(ret == DCB_SET, "GetBoundsRect returned %x\n", ret); - SetRect(&expect, 50, 25, 30, 35); - ok(EqualRect(&rect, &expect), "Got %s\n", wine_dbgstr_rect(&rect)); + SetLayout( hdc, LAYOUT_RTL ); + ret = GetBoundsRect(hdc, &rect, 0); + ok(ret == DCB_SET, "GetBoundsRect returned %x\n", ret); + SetRect(&expect, 159, 70, 99, 130); + ok(EqualRect(&rect, &expect), "Got %s\n", wine_dbgstr_rect(&rect)); + SetRect(&set_rect, 50, 25, 30, 35); + ret = SetBoundsRect(hdc, &set_rect, DCB_SET); + ok(ret == (DCB_SET | DCB_DISABLE), "SetBoundsRect returned %x\n", ret); + ret = GetBoundsRect(hdc, &rect, 0); + ok(ret == DCB_SET, "GetBoundsRect returned %x\n", ret); + SetRect(&expect, 50, 25, 30, 35); + ok(EqualRect(&rect, &expect), "Got %s\n", wine_dbgstr_rect(&rect)); - pSetLayout( hdc, LAYOUT_LTR ); - ret = GetBoundsRect(hdc, &rect, 0); - ok(ret == DCB_SET, "GetBoundsRect returned %x\n", ret); - SetRect(&expect, 149, 25, 169, 35); - ok(EqualRect(&rect, &expect), "Got %s\n", wine_dbgstr_rect(&rect)); - } + SetLayout( hdc, LAYOUT_LTR ); + ret = GetBoundsRect(hdc, &rect, 0); + ok(ret == DCB_SET, "GetBoundsRect returned %x\n", ret); + SetRect(&expect, 149, 25, 169, 35); + ok(EqualRect(&rect, &expect), "Got %s\n", wine_dbgstr_rect(&rect)); /* empty rect resets, except on nt4 */ SetRect(&expect, 20, 20, 10, 10); @@ -1642,7 +1637,6 @@ static void test_clip_box(void) START_TEST(dc) { - pSetLayout = (void *)GetProcAddress( GetModuleHandleA("gdi32.dll"), "SetLayout"); test_dc_values(); test_savedc(); test_savedc_2(); diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 6635a72c18..ea6b7ac2cc 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -28,7 +28,6 @@ #include "winuser.h" #include "winerror.h" -static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); static DWORD (WINAPI *pGetLayout)(HDC hdc); static INT (WINAPI *pGetRandomRgn)(HDC hDC, HRGN hRgn, INT iCode); static BOOL (WINAPI *pGetTransform)(HDC, DWORD, XFORM *); @@ -247,9 +246,9 @@ static void test_dc_layout(void) HDC hdc; HRGN hrgn; - if (!pGetLayout || !pSetLayout) + if (!pGetLayout) { - win_skip( "Don't have SetLayout\n" ); + win_skip( "Don't have GetLayout\n" ); return; } @@ -271,7 +270,7 @@ static void test_dc_layout(void) expect_world_transform(hdc, 1.0, 1.0); expect_LPtoDP(hdc, 1000, 1000); - pSetLayout( hdc, LAYOUT_RTL ); + SetLayout( hdc, LAYOUT_RTL ); if (!pGetLayout( hdc )) { win_skip( "SetLayout not supported\n" ); @@ -310,7 +309,7 @@ static void test_dc_layout(void) GetClipRgn( hdc, hrgn ); GetRgnBox( hrgn, &ret_rc ); ok( EqualRect( &rc, &ret_rc ), "wrong clip box %s\n", wine_dbgstr_rect( &ret_rc )); - pSetLayout( hdc, LAYOUT_LTR ); + SetLayout( hdc, LAYOUT_LTR ); SetRect( &rc, 80, 10, 90, 20 ); GetClipRgn( hdc, hrgn ); GetRgnBox( hrgn, &ret_rc ); @@ -318,7 +317,7 @@ static void test_dc_layout(void) GetClipBox( hdc, &ret_rc ); ok( EqualRect( &rc, &ret_rc ), "wrong clip box %s\n", wine_dbgstr_rect( &ret_rc )); IntersectClipRect( hdc, 80, 10, 85, 20 ); - pSetLayout( hdc, LAYOUT_RTL ); + SetLayout( hdc, LAYOUT_RTL ); SetRect( &rc, 15, 10, 20, 20 ); GetClipRgn( hdc, hrgn ); GetRgnBox( hrgn, &ret_rc ); @@ -326,9 +325,9 @@ static void test_dc_layout(void) GetClipBox( hdc, &ret_rc ); ok( EqualRect( &rc, &ret_rc ), "wrong clip box %s\n", wine_dbgstr_rect( &ret_rc )); SetRectRgn( hrgn, 60, 10, 80, 20 ); - pSetLayout( hdc, LAYOUT_LTR ); + SetLayout( hdc, LAYOUT_LTR ); ExtSelectClipRgn( hdc, hrgn, RGN_OR ); - pSetLayout( hdc, LAYOUT_RTL ); + SetLayout( hdc, LAYOUT_RTL ); SetRect( &rc, 15, 10, 40, 20 ); GetClipRgn( hdc, hrgn ); GetRgnBox( hrgn, &ret_rc ); @@ -370,7 +369,7 @@ static void test_dc_layout(void) SetMapMode(hdc, MM_TEXT); ret = GetMapMode( hdc ); ok(ret == MM_ANISOTROPIC, "expected MM_ANISOTROPIC, got %d\n", ret); - pSetLayout( hdc, LAYOUT_LTR ); + SetLayout( hdc, LAYOUT_LTR ); ret = GetMapMode( hdc ); ok(ret == MM_ANISOTROPIC, "expected MM_ANISOTROPIC, got %d\n", ret); SetMapMode(hdc, MM_TEXT); @@ -715,7 +714,6 @@ START_TEST(mapping) { HMODULE mod = GetModuleHandleA("gdi32.dll"); pGetLayout = (void *)GetProcAddress( mod, "GetLayout" ); - pSetLayout = (void *)GetProcAddress( mod, "SetLayout" ); pGetRandomRgn = (void *)GetProcAddress( mod, "GetRandomRgn" ); pGetTransform = (void *)GetProcAddress( mod, "GetTransform" ); pSetVirtualResolution = (void *)GetProcAddress( mod, "SetVirtualResolution" );

1 0

Nikolay Sivov : gdi32/tests: Remove some workarounds in font tests.
by Alexandre Julliard Jan. 8, 2020

Jan. 8, 2020

Module: wine Branch: master Commit: 9db0d763225b6067b3cafb9d220c436860e4ac42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9db0d763225b6067b3cafb9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 11:41:38 2020 +0300 gdi32/tests: Remove some workarounds in font tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 91 ++++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9db0d763225b6067b3ca…

1 0

Nikolay Sivov : shell32/tests: Remove some more workarounds from shelllink tests.
by Alexandre Julliard Jan. 8, 2020

Jan. 8, 2020

Module: wine Branch: master Commit: 464bbdcfb10f2a76015dafbee6b1aad9c37c3230 URL: https://source.winehq.org/git/wine.git/?a=commit;h=464bbdcfb10f2a76015dafbe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 11:24:10 2020 +0300 shell32/tests: Remove some more workarounds from shelllink tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelllink.c | 59 +++++++++--------------------------------- 1 file changed, 12 insertions(+), 47 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 7828f0edf2..e4f176237f 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -34,23 +34,12 @@ #include "shell32_test.h" -#ifndef SLDF_HAS_LOGO3ID -# define SLDF_HAS_LOGO3ID 0x00000800 /* not available in the Vista SDK */ -#endif - static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); static HRESULT (WINAPI *pSHGetFolderLocation)(HWND,INT,HANDLE,DWORD,PIDLIST_ABSOLUTE*); -static HRESULT (WINAPI *pSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT); static HRESULT (WINAPI *pSHGetStockIconInfo)(SHSTOCKICONID, UINT, SHSTOCKICONINFO *); static UINT (WINAPI *pSHExtractIconsW)(LPCWSTR, int, int, int, HICON *, UINT *, UINT, UINT); static BOOL (WINAPI *pIsProcessDPIAware)(void); -static const GUID _IID_IShellLinkDataList = { - 0x45e2b4ae, 0xb1c3, 0x11d0, - { 0xb9, 0x2f, 0x00, 0xa0, 0xc9, 0x03, 0x12, 0xe1 } -}; - - /* For some reason SHILCreateFromPath does not work on Win98 and * SHSimpleIDListFromPathA does not work on NT4. But if we call both we * get what we want on all platforms. @@ -136,7 +125,7 @@ static void test_get_set(void) strcpy(buffer,"garbage"); r = IShellLinkA_GetDescription(sl, buffer, sizeof(buffer)); ok(r == S_OK, "GetDescription failed (0x%08x)\n", r); - ok(*buffer=='\0' || broken(strcmp(buffer,str)==0), "GetDescription returned '%s'\n", buffer); /* NT4 */ + ok(!*buffer, "GetDescription returned '%s'\n", buffer); /* Test Getting / Setting the work directory */ strcpy(buffer,"garbage"); @@ -156,14 +145,14 @@ static void test_get_set(void) /* Test Getting / Setting the path */ strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); - ok(r == S_FALSE || broken(r == S_OK) /* NT4/W2K */, "GetPath failed (0x%08x)\n", r); - ok(*buffer=='\0', "GetPath returned '%s'\n", buffer); + ok(r == S_FALSE, "GetPath failed (0x%08x)\n", r); + ok(!*buffer, "GetPath returned '%s'\n", buffer); strcpy(buffer,"garbage"); memset(&finddata, 0xaa, sizeof(finddata)); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), &finddata, SLGP_RAWPATH); - ok(r == S_FALSE || broken(r == S_OK) /* NT4/W2K */, "GetPath failed (0x%08x)\n", r); - ok(*buffer=='\0', "GetPath returned '%s'\n", buffer); + ok(r == S_FALSE, "GetPath failed (0x%08x)\n", r); + ok(!*buffer, "GetPath returned '%s'\n", buffer); ok(finddata.dwFileAttributes == 0, "unexpected attributes %x\n", finddata.dwFileAttributes); ok(finddata.cFileName[0] == 0, "unexpected filename '%s'\n", finddata.cFileName); @@ -293,8 +282,7 @@ static void test_get_set(void) strcpy(buffer,"garbage"); r = IShellLinkA_GetPath(sl, buffer, sizeof(buffer), NULL, SLGP_RAWPATH); ok(r==S_OK, "GetPath failed (0x%08x)\n", r); - todo_wine ok(!strcmp(buffer, "C:\\nonexistent\\file") || - broken(!strcmp(buffer, "C:\\\"c:\\nonexistent\\file\"")), /* NT4 */ + todo_wine ok(!strcmp(buffer, "C:\\nonexistent\\file"), "case doesn't match\n"); r = IShellLinkA_SetPath(sl, "\"c:\\foo"); @@ -849,26 +837,10 @@ static void test_datalink(void) r = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&sl ); - ok( r == S_OK || - broken(r == E_NOINTERFACE), /* Win9x */ - "CoCreateInstance failed (0x%08x)\n", r); - if (!sl) - { - win_skip("no shelllink\n"); - return; - } - - r = IShellLinkW_QueryInterface( sl, &_IID_IShellLinkDataList, (LPVOID*) &dl ); - ok( r == S_OK || - broken(r == E_NOINTERFACE), /* NT4 */ - "IShellLinkW_QueryInterface failed (0x%08x)\n", r); + ok( r == S_OK, "Failed to create shelllink object, hr %#x.\n", r); - if (!dl) - { - win_skip("no datalink interface\n"); - IShellLinkW_Release( sl ); - return; - } + r = IShellLinkW_QueryInterface( sl, &IID_IShellLinkDataList, (void **)&dl ); + ok( r == S_OK, "Failed to get interface, hr %#x.\n", r); flags = 0; r = IShellLinkDataList_GetFlags( dl, &flags ); @@ -917,13 +889,7 @@ static void test_shdefextracticon(void) HICON hiconlarge=NULL, hiconsmall=NULL; HRESULT res; - if (!pSHDefExtractIconA) - { - win_skip("SHDefExtractIconA is unavailable\n"); - return; - } - - res = pSHDefExtractIconA("shell32.dll", 0, 0, &hiconlarge, &hiconsmall, MAKELONG(16,24)); + res = SHDefExtractIconA("shell32.dll", 0, 0, &hiconlarge, &hiconsmall, MAKELONG(16,24)); ok(SUCCEEDED(res), "SHDefExtractIconA failed, res=%x\n", res); ok(hiconlarge != NULL, "got null hiconlarge\n"); ok(hiconsmall != NULL, "got null hiconsmall\n"); @@ -931,12 +897,12 @@ static void test_shdefextracticon(void) DestroyIcon(hiconsmall); hiconsmall = NULL; - res = pSHDefExtractIconA("shell32.dll", 0, 0, NULL, &hiconsmall, MAKELONG(16,24)); + res = SHDefExtractIconA("shell32.dll", 0, 0, NULL, &hiconsmall, MAKELONG(16,24)); ok(SUCCEEDED(res), "SHDefExtractIconA failed, res=%x\n", res); ok(hiconsmall != NULL, "got null hiconsmall\n"); DestroyIcon(hiconsmall); - res = pSHDefExtractIconA("shell32.dll", 0, 0, NULL, NULL, MAKELONG(16,24)); + res = SHDefExtractIconA("shell32.dll", 0, 0, NULL, NULL, MAKELONG(16,24)); ok(SUCCEEDED(res), "SHDefExtractIconA failed, res=%x\n", res); } @@ -1454,7 +1420,6 @@ START_TEST(shelllink) pSHILCreateFromPath = (void *)GetProcAddress(hmod, (LPSTR)28); pSHGetFolderLocation = (void *)GetProcAddress(hmod, "SHGetFolderLocation"); - pSHDefExtractIconA = (void *)GetProcAddress(hmod, "SHDefExtractIconA"); pSHGetStockIconInfo = (void *)GetProcAddress(hmod, "SHGetStockIconInfo"); pSHExtractIconsW = (void *)GetProcAddress(hmod, "SHExtractIconsW"); pIsProcessDPIAware = (void *)GetProcAddress(huser32, "IsProcessDPIAware");

1 0

Zebediah Figura : user32/tests: Fix some test failures on Windows 10.
by Alexandre Julliard Jan. 8, 2020

Jan. 8, 2020

Module: wine Branch: master Commit: 657aecc283f3ced82b2ad48410b16323f5217d28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=657aecc283f3ced82b2ad484… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 8 00:44:26 2020 -0600 user32/tests: Fix some test failures on Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 46784cec43..4e9de6c8bf 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -192,7 +192,8 @@ static BOOL ignore_message( UINT message ) message == WM_TIMER || message == WM_SYSTIMER || message == WM_TIMECHANGE || - message == WM_DEVICECHANGE); + message == WM_DEVICECHANGE || + message == 0x0060 /* undocumented, used by Win10 1709+ */); } static BOOL CALLBACK EnumChildProc( HWND hwndChild, LPARAM lParam) @@ -1117,7 +1118,7 @@ static void wine_AdjustWindowRectExForDpi( RECT *rect, LONG style, BOOL menu, LO int adjust = 0; ncm.cbSize = sizeof(ncm); - pSystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0, dpi ); + pSystemParametersInfoForDpi( SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0, dpi ); if ((exStyle & (WS_EX_STATICEDGE|WS_EX_DLGMODALFRAME)) == WS_EX_STATICEDGE) adjust = 1; /* for the outer frame always present */ @@ -2541,6 +2542,8 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ok( rect.left == 90 && rect.top == 90 && rect.right == 110 && rect.bottom == 110, "invalid client rect %s\n", wine_dbgstr_rect(&rect)); + flush_events( TRUE ); /* needed by Win10 1709+ */ + ret = SetWindowPos(hwnd, 0, 200, 200, 0, 0, SWP_NOZORDER|SWP_FRAMECHANGED); ok(ret, "Got %d\n", ret); GetWindowRect( hwnd, &rect ); @@ -3180,8 +3183,10 @@ static void test_SetActiveWindow(HWND hwnd) ShowWindow(hwnd, SW_SHOW); check_wnd_state(hwnd, hwnd, hwnd, 0); + SetLastError(0xdeadbeef); ret = SetActiveWindow(0); - ok(ret == hwnd, "SetActiveWindow returned %p instead of %p\n", ret, hwnd); + ok(ret == hwnd || broken(!ret) /* Win10 1809 */, "expected %p, got %p\n", hwnd, ret); + if (!ret) ok(GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError()); if (!GetActiveWindow()) /* doesn't always work on vista */ { check_wnd_state(0, 0, 0, 0); @@ -3238,8 +3243,10 @@ static void test_SetActiveWindow(HWND hwnd) ret = SetActiveWindow(hwnd2); ok(ret == hwnd, "expected %p, got %p\n", hwnd, ret); check_wnd_state(hwnd, hwnd, hwnd, 0); + SetLastError(0xdeadbeef); ret = SetActiveWindow(0); - ok(ret == hwnd, "expected %p, got %p\n", hwnd, ret); + ok(ret == hwnd || broken(!ret) /* Win10 1809 */, "expected %p, got %p\n", hwnd, ret); + if (!ret) ok(GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError()); if (!GetActiveWindow()) { ret = SetActiveWindow(hwnd2); @@ -3294,8 +3301,10 @@ static void test_SetForegroundWindow(HWND hwnd) ShowWindow(hwnd, SW_SHOW); check_wnd_state(hwnd, hwnd, hwnd, 0); + SetLastError(0xdeadbeef); hwnd2 = SetActiveWindow(0); - ok(hwnd2 == hwnd, "SetActiveWindow(0) returned %p instead of %p\n", hwnd2, hwnd); + ok(hwnd2 == hwnd || broken(!hwnd2) /* Win10 1809 */, "expected %p, got %p\n", hwnd, hwnd2); + if (!hwnd2) ok(GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError()); if (GetActiveWindow() == hwnd) /* doesn't always work on vista */ check_wnd_state(hwnd, hwnd, hwnd, 0); else @@ -3963,13 +3972,12 @@ static void test_mouse_input(HWND hwnd) ret = wait_for_message( &msg ); ok(ret, "no message available\n"); -todo_wine - ok(msg.hwnd == child && msg.message == WM_NCMOUSEMOVE, "hwnd %p/%p message %04x\n", - msg.hwnd, child, msg.message); - - if (msg.message == WM_NCMOUSEMOVE) + if (msg.message == WM_NCMOUSEMOVE) /* not sent by Win10 1709+ */ + { + ok(msg.hwnd == child, "expected %p, got %p\n", child, msg.hwnd); ret = wait_for_message( &msg ); - ok(ret, "no message available\n"); + ok(ret, "no message available\n"); + } ok(msg.hwnd == child && msg.message == WM_NCLBUTTONDOWN, "hwnd %p/%p message %04x\n", msg.hwnd, child, msg.message); ok(msg.wParam == HTSYSMENU, "wparam %ld\n", msg.wParam);

1 0

Derek Lesho : bcrypt/tests: Add tests for BCRYPT_KDF_HASH.
by Alexandre Julliard Jan. 8, 2020

Jan. 8, 2020

Module: wine Branch: master Commit: c2840dce7f9e4e86f33e06ebb4ddf9efd6f448b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2840dce7f9e4e86f33e06eb… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Jan 7 14:22:48 2020 -0600 bcrypt/tests: Add tests for BCRYPT_KDF_HASH. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 60 ++++++++++++++++++++++++++++++++++++++++++++-- include/bcrypt.h | 6 +++++ 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 47bb58d3d1..d26150f469 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1951,6 +1951,28 @@ static BYTE ecdh_secret[] = 0x9b, 0x69, 0xaf, 0xd1, 0xaf, 0x1f, 0xc2, 0xd7, 0x83, 0x0a, 0xb7, 0xf8, 0x4f, 0x24, 0x32, 0x8e, }; +BCryptBuffer hash_param_buffers[] = +{ +{ + sizeof(BCRYPT_SHA1_ALGORITHM), + KDF_HASH_ALGORITHM, + (void *)BCRYPT_SHA1_ALGORITHM, +} +}; + +BCryptBufferDesc hash_params = +{ + BCRYPTBUFFER_VERSION, + ARRAY_SIZE(hash_param_buffers), + hash_param_buffers, +}; + +static BYTE hashed_secret[] = +{ + 0x1b, 0xe7, 0xbf, 0x0f, 0x65, 0x1e, 0xd0, 0x07, 0xf9, 0xf4, 0x77, 0x48, 0x48, 0x39, 0xd0, 0xf8, + 0xf3, 0xce, 0xfc, 0x89 +}; + static void test_ECDH(void) { BYTE *buf; @@ -2045,14 +2067,14 @@ static void test_ECDH(void) if (status == STATUS_NOT_SUPPORTED) { win_skip("BCRYPT_KDF_RAW_SECRET not supported\n"); - goto derive_end; + goto raw_secret_end; } todo_wine ok(status == STATUS_SUCCESS, "got %08x\n", status); if (status != STATUS_SUCCESS) { - goto derive_end; + goto raw_secret_end; } ok(size == 32, "size of secret key incorrect, got %u, expected 32\n", size); @@ -2062,6 +2084,40 @@ static void test_ECDH(void) ok(!(memcmp(ecdh_secret, buf, size)), "wrong data\n"); HeapFree(GetProcessHeap(), 0, buf); + raw_secret_end: + + status = pBCryptDeriveKey(secret, BCRYPT_KDF_HASH, &hash_params, NULL, 0, &size, 0); + todo_wine ok (status == STATUS_SUCCESS, "got %08x\n", status); + + if (status != STATUS_SUCCESS) + { + goto derive_end; + } + + ok (size == 20, "got %u\n", size); + buf = HeapAlloc(GetProcessHeap(), 0, size); + status = pBCryptDeriveKey(secret, BCRYPT_KDF_HASH, &hash_params, buf, size, &size, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(!(memcmp(hashed_secret, buf, size)), "wrong data\n"); + HeapFree(GetProcessHeap(), 0, buf); + + /* ulVersion is not verified */ + hash_params.ulVersion = 0xdeadbeef; + status = pBCryptDeriveKey(secret, BCRYPT_KDF_HASH, &hash_params, NULL, 0, &size, 0); + ok (status == STATUS_SUCCESS, "got %08x\n", status); + + hash_params.ulVersion = BCRYPTBUFFER_VERSION; + hash_param_buffers[0].pvBuffer = (void*) L"INVALID"; + hash_param_buffers[0].cbBuffer = sizeof(L"INVALID"); + + status = pBCryptDeriveKey(secret, BCRYPT_KDF_HASH, &hash_params, NULL, 0, &size, 0); + ok (status == STATUS_NOT_SUPPORTED || broken (status == STATUS_NOT_FOUND) /* < win8 */, "got %08x\n", status); + + hash_param_buffers[0].pvBuffer = (void*) BCRYPT_RNG_ALGORITHM; + hash_param_buffers[0].cbBuffer = sizeof(BCRYPT_RNG_ALGORITHM); + status = pBCryptDeriveKey(secret, BCRYPT_KDF_HASH, &hash_params, NULL, 0, &size, 0); + ok (status == STATUS_NOT_SUPPORTED, "got %08x\n", status); + derive_end: pBCryptDestroySecret(secret); diff --git a/include/bcrypt.h b/include/bcrypt.h index f393dc6e5c..0bc4dea910 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -286,6 +286,10 @@ typedef struct _BCRYPT_KEY_DATA_BLOB_HEADER ULONG cbKeyData; } BCRYPT_KEY_DATA_BLOB_HEADER, *PBCRYPT_KEY_DATA_BLOB_HEADER; +#define KDF_HASH_ALGORITHM 0x00000000 +#define KDF_SECRET_PREPEND 0x00000001 +#define KDF_SECRET_APPEND 0x00000002 + typedef struct _BCryptBuffer { ULONG cbBuffer; @@ -293,6 +297,8 @@ typedef struct _BCryptBuffer void *pvBuffer; } BCryptBuffer, *PBCryptBuffer; +#define BCRYPTBUFFER_VERSION 0 + typedef struct _BCryptBufferDesc { ULONG ulVersion;

1 0

Derek Lesho : bcrypt/tests: Add test for BCryptSecretAgreement.
by Alexandre Julliard Jan. 8, 2020

Jan. 8, 2020

Module: wine Branch: master Commit: 044d58515163b2ea1f74be90af70c6c7b31fe8b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=044d58515163b2ea1f74be90… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Tue Jan 7 14:22:47 2020 -0600 bcrypt/tests: Add test for BCryptSecretAgreement. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/tests/bcrypt.c | 75 +++++++++++++++++++++++++++++++++++++++++----- include/bcrypt.h | 12 ++++++++ 2 files changed, 80 insertions(+), 7 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 198acbf721..47bb58d3d1 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -62,6 +62,9 @@ static NTSTATUS (WINAPI *pBCryptOpenAlgorithmProvider)(BCRYPT_ALG_HANDLE *, LPCW static NTSTATUS (WINAPI *pBCryptSetProperty)(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptSignHash)(BCRYPT_KEY_HANDLE, void *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG *, ULONG); static NTSTATUS (WINAPI *pBCryptVerifySignature)(BCRYPT_KEY_HANDLE, VOID *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG); +static NTSTATUS (WINAPI *pBCryptSecretAgreement)(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE, BCRYPT_SECRET_HANDLE *, ULONG); +static NTSTATUS (WINAPI *pBCryptDestroySecret)(BCRYPT_SECRET_HANDLE); +static NTSTATUS (WINAPI *pBCryptDeriveKey)(BCRYPT_SECRET_HANDLE, LPCWSTR, BCryptBufferDesc *, PUCHAR, ULONG, ULONG *, ULONG); static void test_BCryptGenRandom(void) { @@ -1923,13 +1926,29 @@ static void test_RSA_SIGN(void) static BYTE eccprivkey[] = { - 0x45, 0x43, 0x4b, 0x32, 0x20, 0x00, 0x00, 0x00, 0xfb, 0xbd, 0x3d, 0x20, 0x1b, 0x6d, 0x66, 0xb3, - 0x7c, 0x9f, 0x89, 0xf3, 0xe4, 0x41, 0x16, 0xa5, 0x68, 0x52, 0x77, 0xac, 0xab, 0x55, 0xb2, 0x6c, - 0xb0, 0x23, 0x55, 0xcb, 0x96, 0x14, 0xfd, 0x0b, 0x1c, 0xef, 0xdf, 0x07, 0x6d, 0x31, 0xaf, 0x39, - 0xce, 0x8c, 0x8f, 0x9d, 0x75, 0xd0, 0x7b, 0xea, 0x81, 0xdc, 0x40, 0x21, 0x1f, 0x58, 0x22, 0x5f, - 0x72, 0x55, 0xfc, 0x58, 0x8a, 0xeb, 0x88, 0x5d, 0x02, 0x09, 0x90, 0xd2, 0xe3, 0x36, 0xac, 0xfe, - 0x83, 0x13, 0x6c, 0x88, 0x1a, 0xab, 0x9b, 0xdd, 0xaa, 0x8a, 0xee, 0x69, 0x9a, 0x6a, 0x62, 0x86, - 0x6a, 0x13, 0x69, 0x88, 0xb7, 0xd5, 0xa3, 0xcd + 0x45, 0x43, 0x4b, 0x32, 0x20, 0x00, 0x00, 0x00, + 0xfb, 0xbd, 0x3d, 0x20, 0x1b, 0x6d, 0x66, 0xb3, 0x7c, 0x9f, 0x89, 0xf3, 0xe4, 0x41, 0x16, 0xa5, + 0x68, 0x52, 0x77, 0xac, 0xab, 0x55, 0xb2, 0x6c, 0xb0, 0x23, 0x55, 0xcb, 0x96, 0x14, 0xfd, 0x0b, + 0x1c, 0xef, 0xdf, 0x07, 0x6d, 0x31, 0xaf, 0x39, 0xce, 0x8c, 0x8f, 0x9d, 0x75, 0xd0, 0x7b, 0xea, + 0x81, 0xdc, 0x40, 0x21, 0x1f, 0x58, 0x22, 0x5f, 0x72, 0x55, 0xfc, 0x58, 0x8a, 0xeb, 0x88, 0x5d, + 0x02, 0x09, 0x90, 0xd2, 0xe3, 0x36, 0xac, 0xfe, 0x83, 0x13, 0x6c, 0x88, 0x1a, 0xab, 0x9b, 0xdd, + 0xaa, 0x8a, 0xee, 0x69, 0x9a, 0x6a, 0x62, 0x86, 0x6a, 0x13, 0x69, 0x88, 0xb7, 0xd5, 0xa3, 0xcd +}; + +static BYTE ecdh_pubkey[] = +{ + 0x45, 0x43, 0x4b, 0x31, 0x20, 0x00, 0x00, 0x00, + 0x07, 0x61, 0x9d, 0x49, 0x63, 0x6b, 0x96, 0x94, 0xd1, 0x8f, 0xd1, 0x48, 0xcc, 0xcf, 0x72, 0x4d, + 0xff, 0x43, 0xf4, 0x97, 0x0f, 0xa3, 0x8a, 0x72, 0xe9, 0xe0, 0xba, 0x87, 0x6d, 0xc3, 0x62, 0x15, + 0xae, 0x65, 0xdd, 0x31, 0x51, 0xfc, 0x3b, 0xc9, 0x59, 0xa1, 0x0a, 0x92, 0x17, 0x2b, 0x64, 0x55, + 0x03, 0x3e, 0x62, 0x1d, 0xac, 0x3e, 0x37, 0x40, 0x6a, 0x4c, 0xb6, 0x21, 0x3f, 0x73, 0x5c, 0xf5 +}; + +/* little endian */ +static BYTE ecdh_secret[] = +{ + 0x48, 0xb0, 0x11, 0xdb, 0x69, 0x4e, 0xb4, 0xf4, 0xf5, 0x3e, 0xe1, 0x9b, 0xca, 0x00, 0x04, 0xc8, + 0x9b, 0x69, 0xaf, 0xd1, 0xaf, 0x1f, 0xc2, 0xd7, 0x83, 0x0a, 0xb7, 0xf8, 0x4f, 0x24, 0x32, 0x8e, }; static void test_ECDH(void) @@ -1938,6 +1957,7 @@ static void test_ECDH(void) BCRYPT_ECCKEY_BLOB *ecckey; BCRYPT_ALG_HANDLE alg; BCRYPT_KEY_HANDLE key, privkey, pubkey; + BCRYPT_SECRET_HANDLE secret; NTSTATUS status; ULONG size; @@ -2008,6 +2028,44 @@ static void test_ECDH(void) ok(!memcmp(buf, eccprivkey, size), "wrong data\n"); HeapFree(GetProcessHeap(), 0, buf); + status = pBCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &pubkey, ecdh_pubkey, sizeof(ecdh_pubkey), 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + + status = pBCryptSecretAgreement(privkey, pubkey, &secret, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + + if (status != STATUS_SUCCESS) + { + goto derive_end; + } + + /* verify result on windows 10 */ + status = pBCryptDeriveKey(secret, BCRYPT_KDF_RAW_SECRET, NULL, NULL, 0, &size, 0); + + if (status == STATUS_NOT_SUPPORTED) + { + win_skip("BCRYPT_KDF_RAW_SECRET not supported\n"); + goto derive_end; + } + + todo_wine ok(status == STATUS_SUCCESS, "got %08x\n", status); + + if (status != STATUS_SUCCESS) + { + goto derive_end; + } + + ok(size == 32, "size of secret key incorrect, got %u, expected 32\n", size); + buf = HeapAlloc(GetProcessHeap(), 0, size); + status = pBCryptDeriveKey(secret, BCRYPT_KDF_RAW_SECRET, NULL, buf, size, &size, 0); + ok(status == STATUS_SUCCESS, "got %08x\n", status); + ok(!(memcmp(ecdh_secret, buf, size)), "wrong data\n"); + HeapFree(GetProcessHeap(), 0, buf); + + derive_end: + + pBCryptDestroySecret(secret); + pBCryptDestroyKey(pubkey); pBCryptDestroyKey(privkey); pBCryptCloseAlgorithmProvider(alg, 0); } @@ -2284,6 +2342,9 @@ START_TEST(bcrypt) pBCryptSetProperty = (void *)GetProcAddress(module, "BCryptSetProperty"); pBCryptSignHash = (void *)GetProcAddress(module, "BCryptSignHash"); pBCryptVerifySignature = (void *)GetProcAddress(module, "BCryptVerifySignature"); + pBCryptSecretAgreement = (void *)GetProcAddress(module, "BCryptSecretAgreement"); + pBCryptDestroySecret = (void *)GetProcAddress(module, "BCryptDestroySecret"); + pBCryptDeriveKey = (void *)GetProcAddress(module, "BCryptDeriveKey"); test_BCryptGenRandom(); test_BCryptGetFipsAlgorithmMode(); diff --git a/include/bcrypt.h b/include/bcrypt.h index 4546aea394..f393dc6e5c 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -92,6 +92,12 @@ typedef LONG NTSTATUS; #define BCRYPT_CHAIN_MODE_CFB L"ChainingModeCFB" #define BCRYPT_CHAIN_MODE_CCM L"ChainingModeCCM" #define BCRYPT_CHAIN_MODE_GCM L"ChainingModeGCM" + +#define BCRYPT_KDF_HASH L"HASH" +#define BCRYPT_KDF_HMAC L"HMAC" +#define BCRYPT_KDF_TLS_PRF L"TLS_PRF" +#define BCRYPT_KDF_SP80056A_CONCAT L"SP800_56A_CONCAT" +#define BCRYPT_KDF_RAW_SECRET L"TRUNCATE" #else static const WCHAR BCRYPT_ALGORITHM_NAME[] = {'A','l','g','o','r','i','t','h','m','N','a','m','e',0}; static const WCHAR BCRYPT_AUTH_TAG_LENGTH[] = {'A','u','t','h','T','a','g','L','e','n','g','t','h',0}; @@ -146,6 +152,12 @@ static const WCHAR BCRYPT_CHAIN_MODE_ECB[] = {'C','h','a','i','n','i','n','g','M static const WCHAR BCRYPT_CHAIN_MODE_CFB[] = {'C','h','a','i','n','i','n','g','M','o','d','e','C','F','B',0}; static const WCHAR BCRYPT_CHAIN_MODE_CCM[] = {'C','h','a','i','n','i','n','g','M','o','d','e','C','C','M',0}; static const WCHAR BCRYPT_CHAIN_MODE_GCM[] = {'C','h','a','i','n','i','n','g','M','o','d','e','G','C','M',0}; + +static const WCHAR BCRYPT_KDF_HASH[] = {'H','A','S','H',0}; +static const WCHAR BCRYPT_KDF_HMAC[] = {'H','M','A','C',0}; +static const WCHAR BCRYPT_KDF_TLS_PRF[] = {'T','L','S','_','P','R','F',0}; +static const WCHAR BCRYPT_KDF_SP80056A_CONCAT[] = {'S','P','8','0','0','_','5','6','A','_','C','O','N','C','A','T',0}; +static const WCHAR BCRYPT_KDF_RAW_SECRET[] = {'T','R','U','N','C','A','T','E',0}; #endif #define BCRYPT_ECDSA_PUBLIC_P256_MAGIC 0x31534345

1 0

Nikolay Sivov : oleaut32/tests: Remove some workarounds for functions that are assumed to be available.
by Alexandre Julliard Jan. 8, 2020

Jan. 8, 2020

Module: wine Branch: master Commit: de388bbec951c01386caab662fab7452db602c26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de388bbec951c01386caab66… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 12:03:54 2020 +0300 oleaut32/tests: Remove some workarounds for functions that are assumed to be available. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/safearray.c | 140 +++++++++++++++++---------------------- dlls/oleaut32/tests/usrmarshal.c | 15 ++--- dlls/oleaut32/tests/varformat.c | 38 +++++------ 3 files changed, 81 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de388bbec951c01386ca…

1 0

Nikolay Sivov : user32/tests: Add some more SetScrollInfo() tests.
by Alexandre Julliard Jan. 8, 2020

Jan. 8, 2020

Module: wine Branch: master Commit: 04643b789cb1810f0cd464677f7b7c55a8a763a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04643b789cb1810f0cd46467… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 16:30:10 2020 +0300 user32/tests: Add some more SetScrollInfo() tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/scroll.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index fbc94a6d68..9c892ed484 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -561,6 +561,8 @@ static void test_SetScrollInfo(void) ret = IsWindowEnabled(hScroll); ok(!ret, "scroll bar enabled\n"); + ret = IsWindowVisible(hScroll); + ok(!ret, "Unexpected visible state.\n"); memset(&si, 0, sizeof(si)); si.cbSize = sizeof(si); @@ -581,6 +583,8 @@ static void test_SetScrollInfo(void) SetScrollInfo(hScroll, SB_CTL, &si, TRUE); ret = IsWindowEnabled(hScroll); ok(!ret, "scroll bar enabled\n"); + ret = IsWindowVisible(hScroll); + ok(!ret, "Unexpected visible state.\n"); si.fMask = 0xf; ret = GetScrollInfo(hScroll, SB_CTL, &si); @@ -588,6 +592,8 @@ static void test_SetScrollInfo(void) EnableScrollBar(hScroll, SB_CTL, ESB_ENABLE_BOTH); ok(IsWindowEnabled(hScroll), "expected enabled scrollbar\n"); + ret = IsWindowVisible(hScroll); + ok(!ret, "Unexpected visible state.\n"); si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; si.nMax = 10; @@ -597,6 +603,76 @@ static void test_SetScrollInfo(void) SetScrollInfo(hScroll, SB_CTL, &si, TRUE); ret = IsWindowEnabled(hScroll); ok(ret, "scroll bar disabled\n"); + ret = IsWindowVisible(hScroll); + ok(!ret, "Unexpected visible state.\n"); + + /* With visible window. */ + ShowWindow(mainwnd, SW_SHOW); + + ret = IsWindowVisible(hScroll); + ok(ret, "Unexpected visible state.\n"); + + EnableScrollBar(hScroll, SB_CTL, ESB_DISABLE_BOTH); + ret = IsWindowEnabled(hScroll); + ok(!ret, "Unexpected enabled state.\n"); + + /* Enabled state is changed only for visible windows, and only with redraw flag. */ + si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; + si.nMax = 100; + si.nMin = 10; + si.nPos = 0; + si.nPage = 50; + SetScrollInfo(hScroll, SB_CTL, &si, FALSE); + ret = IsWindowEnabled(hScroll); + ok(!ret, "Unexpected enabled state.\n"); + + /* State changes when called with same arguments too. */ + si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; + si.nMax = 100; + si.nMin = 10; + si.nPos = 0; + si.nPage = 50; + SetScrollInfo(hScroll, SB_CTL, &si, TRUE); + ret = IsWindowEnabled(hScroll); +todo_wine + ok(ret, "Unexpected enabled state.\n"); + + si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; + si.nMax = 100; + si.nMin = 10; + si.nPos = 0; + si.nPage = 100; + SetScrollInfo(hScroll, SB_CTL, &si, TRUE); + ret = IsWindowEnabled(hScroll); + ok(!ret, "Unexpected enabled state.\n"); + + EnableScrollBar(hScroll, SB_CTL, ESB_ENABLE_BOTH); + ret = IsWindowEnabled(hScroll); + ok(ret, "Unexpected enabled state.\n"); + + si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; + si.nMax = 100; + si.nMin = 10; + si.nPos = 0; + si.nPage = 100; + SetScrollInfo(hScroll, SB_CTL, &si, TRUE); + ret = IsWindowEnabled(hScroll); +todo_wine + ok(!ret, "Unexpected enabled state.\n"); + + EnableScrollBar(hScroll, SB_CTL, ESB_DISABLE_BOTH); + ret = IsWindowEnabled(hScroll); + ok(!ret, "Unexpected enabled state.\n"); + + si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; + si.nMax = 41; + si.nMin = 0; + si.nPos = 0; + si.nPage = 41; + SetScrollInfo(hScroll, SB_CTL, &si, TRUE); + ret = IsWindowEnabled(hScroll); +todo_wine + ok(ret, "Unexpected enabled state.\n"); DestroyWindow(hScroll); DestroyWindow(mainwnd);

1 0

Nikolay Sivov : shell32/tests: Use ILIsEqual() directly.
by Alexandre Julliard Jan. 8, 2020

Jan. 8, 2020

Module: wine Branch: master Commit: b9349d135e655d9a25fc4f77e9dc115757402067 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9349d135e655d9a25fc4f77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 8 11:24:09 2020 +0300 shell32/tests: Use ILIsEqual() directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelllink.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 2c2ee94c17..7828f0edf2 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -38,7 +38,6 @@ # define SLDF_HAS_LOGO3ID 0x00000800 /* not available in the Vista SDK */ #endif -static BOOL (WINAPI *pILIsEqual)(LPCITEMIDLIST, LPCITEMIDLIST); static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); static HRESULT (WINAPI *pSHGetFolderLocation)(HWND,INT,HANDLE,DWORD,PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT); @@ -234,12 +233,12 @@ static void test_get_set(void) tmp_pidl=NULL; r = IShellLinkA_GetIDList(sl, &tmp_pidl); ok(r == S_OK, "GetIDList failed (0x%08x)\n", r); - ok(tmp_pidl && pILIsEqual(pidl, tmp_pidl), + ok(tmp_pidl && ILIsEqual(pidl, tmp_pidl), "GetIDList returned an incorrect pidl\n"); r = IShellLinkA_GetIDList(sl, &second_pidl); ok(r == S_OK, "GetIDList failed (0x%08x)\n", r); - ok(second_pidl && pILIsEqual(pidl, second_pidl), + ok(second_pidl && ILIsEqual(pidl, second_pidl), "GetIDList returned an incorrect pidl\n"); ok(second_pidl != tmp_pidl, "pidls are the same\n"); @@ -583,7 +582,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo) r = IShellLinkA_GetIDList(sl, &pidl); lok(r == S_OK, "GetIDList failed (0x%08x)\n", r); todo_wine_if ((todo & 0x8) != 0) - lok(pILIsEqual(pidl, desc->pidl), "GetIDList returned an incorrect pidl\n"); + lok(ILIsEqual(pidl, desc->pidl), "GetIDList returned an incorrect pidl\n"); } if (desc->showcmd) { @@ -1453,7 +1452,6 @@ START_TEST(shelllink) HMODULE hmod = GetModuleHandleA("shell32.dll"); HMODULE huser32 = GetModuleHandleA("user32.dll"); - pILIsEqual = (void *)GetProcAddress(hmod, (LPSTR)21); pSHILCreateFromPath = (void *)GetProcAddress(hmod, (LPSTR)28); pSHGetFolderLocation = (void *)GetProcAddress(hmod, "SHGetFolderLocation"); pSHDefExtractIconA = (void *)GetProcAddress(hmod, "SHDefExtractIconA");

1 0

André Hentschel : comctl32: Fix Str_SetPtr[AW] spec file entries.
by Alexandre Julliard Jan. 8, 2020

Jan. 8, 2020

Module: wine Branch: master Commit: 570ad8e7875fa8c633839746937d3a7fe0ce9bb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=570ad8e7875fa8c633839746… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 8 21:21:42 2020 +0100 comctl32: Fix Str_SetPtr[AW] spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comctl32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 34d9e7650d..e84eff4b8a 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -35,9 +35,9 @@ 167 stdcall -noname AddMRUData(long ptr long) 169 stdcall -noname FindMRUData(long ptr long ptr) 233 stdcall -noname Str_GetPtrA(str str long) -234 stdcall -noname Str_SetPtrA(str str) +234 stdcall -noname Str_SetPtrA(ptr str) 235 stdcall -noname Str_GetPtrW(wstr wstr long) -236 stdcall -noname Str_SetPtrW(wstr wstr) +236 stdcall -noname Str_SetPtrW(ptr wstr) 320 stdcall -ordinal DSA_Create(long long) 321 stdcall -ordinal DSA_Destroy(ptr) 322 stdcall -ordinal DSA_GetItem(ptr long ptr)

1 0