January 2020 - Wine-commits

Nikolay Sivov : shell32/tests: Use ILIsEqual() directly.
by Alexandre Julliard 08 Jan '20

08 Jan '20

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

Nikolay Sivov : shell32/tests: Remove some more workarounds from shelllink tests.
by Alexandre Julliard 08 Jan '20

08 Jan '20

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

Nikolay Sivov : gdi32/tests: Remove some workarounds in font tests.
by Alexandre Julliard 08 Jan '20

08 Jan '20

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 : gdi32/tests: Remove workarounds for SetLayout().
by Alexandre Julliard 08 Jan '20

08 Jan '20

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 : oleaut32/tests: Remove some workarounds for functions that are assumed to be available.
by Alexandre Julliard 08 Jan '20

08 Jan '20

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 08 Jan '20

08 Jan '20

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

Thomas Faber : setupapi/tests: Remove an unused variable.
by Alexandre Julliard 08 Jan '20

08 Jan '20

Module: wine Branch: master Commit: dc968dae42e3b3162e2767ed32b0f91ae9b23ad3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc968dae42e3b3162e2767ed… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Wed Jan 8 20:05:41 2020 +0100 setupapi/tests: Remove an unused variable. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 68478b5d80..a02752d2de 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1446,7 +1446,7 @@ static void test_register_device_iface(void) 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'E','n','u','m','\\','R','o','o','t','\\', 'L','E','G','A','C','Y','_','B','O','G','U','S',0}; - SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}, ret_iface = {sizeof(ret_iface)}; + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; SP_DEVINFO_DATA device = {sizeof(device)}; HDEVINFO set, set2; BOOL ret;

1 0

André Hentschel : comctl32: Fix Str_SetPtr[AW] spec file entries.
by Alexandre Julliard 08 Jan '20

08 Jan '20

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

André Hentschel : dbghelp: Fix MiniDumpWriteDump spec file entry.
by Alexandre Julliard 08 Jan '20

08 Jan '20

Module: wine Branch: master Commit: 7a567d1bb00ea2cdac0e972220b1985800ab445e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a567d1bb00ea2cdac0e9722… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 8 21:21:51 2020 +0100 dbghelp: Fix MiniDumpWriteDump spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 4c06f87d12..6ffa82da92 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -27,7 +27,7 @@ @ stdcall MakeSureDirectoryPathExists(str) @ stdcall MapDebugInformation(long str str long) @ stdcall MiniDumpReadDumpStream(ptr long ptr ptr ptr) -@ stdcall MiniDumpWriteDump(ptr long ptr long long long long) +@ stdcall MiniDumpWriteDump(ptr long ptr long ptr ptr ptr) @ stdcall SearchTreeForFile(str str ptr) @ stdcall SearchTreeForFileW(wstr wstr ptr) @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr)

1 0

André Hentschel : gdiplus: Fix some spec file entries.
by Alexandre Julliard 08 Jan '20

08 Jan '20

Module: wine Branch: master Commit: 76fea3a99069ea237acbd9b66fd269e032ae54af URL: https://source.winehq.org/git/wine.git/?a=commit;h=76fea3a99069ea237acbd9b6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 8 21:22:03 2020 +0100 gdiplus: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ee28b0ea4a..11866633b3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -100,7 +100,7 @@ 100 stdcall GdipCreateMatrix3I(ptr ptr ptr) 101 stdcall GdipCreateMatrix(ptr) 102 stdcall GdipCreateMetafileFromEmf(ptr long ptr) -103 stdcall GdipCreateMetafileFromFile(ptr ptr) +103 stdcall GdipCreateMetafileFromFile(wstr ptr) 104 stdcall GdipCreateMetafileFromStream(ptr ptr) 105 stdcall GdipCreateMetafileFromWmf(ptr long ptr ptr) 106 stdcall GdipCreateMetafileFromWmfFile(wstr ptr ptr) @@ -506,7 +506,7 @@ 506 stdcall GdipSetImageAttributesGamma(ptr long long float) 507 stdcall GdipSetImageAttributesNoOp(ptr long long) 508 stdcall GdipSetImageAttributesOutputChannel(ptr long long long) -509 stdcall GdipSetImageAttributesOutputChannelColorProfile(ptr long long ptr) +509 stdcall GdipSetImageAttributesOutputChannelColorProfile(ptr long long wstr) 510 stdcall GdipSetImageAttributesRemapTable(ptr long long long ptr) 511 stdcall GdipSetImageAttributesThreshold(ptr long long float) 512 stdcall GdipSetImageAttributesToIdentity(ptr long) @@ -624,7 +624,7 @@ 624 stdcall GdipImageSetAbort(ptr ptr) 625 stdcall GdipGraphicsSetAbort(ptr ptr) 626 stub GdipDrawImageFX -627 stdcall GdipConvertToEmfPlus(ptr ptr ptr long ptr ptr) -628 stdcall GdipConvertToEmfPlusToFile(ptr ptr ptr ptr long ptr ptr) +627 stdcall GdipConvertToEmfPlus(ptr ptr ptr long wstr ptr) +628 stdcall GdipConvertToEmfPlusToFile(ptr ptr ptr wstr long wstr ptr) 629 stub GdipConvertToEmfPlusToStream 630 stub GdipPlayTSClientRecord

1 0