February 2019 - Wine-Devel - list.winehq.org

Re: [PATCH] vbscript: Move variable declaration outside of for.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=48462 Your paranoid android. === build (build log) === error: patch failed: dlls/vbscript/tests/run.c:828 Task: Patch failed to apply === debian9 (build log) === error: patch failed: dlls/vbscript/tests/run.c:828 Task: Patch failed to apply === debian9 (build log) === error: patch failed: dlls/vbscript/tests/run.c:828 Task: Patch failed to apply

Feb. 28, 2019

[PATCH] vbscript: Move variable declaration outside of for.

by Alistair Leslie-Hughes

This stops a compile error under gcc 4.8.4. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/vbscript/tests/run.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 49066ce..6be6c7f 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -828,8 +828,9 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { "resume", DISPID_TESTOBJ_KEYWORD, NULL }, { "goto", DISPID_TESTOBJ_KEYWORD, NULL }, }; + int i; - for (int i = 0; i < ARRAY_SIZE(dispids); i++) { + for (i = 0; i < ARRAY_SIZE(dispids); i++) { if(!stricmp_wa(bstrName, dispids[i].name)) { dispid_t *d = &dispids[i]; if(d->expect) { -- 1.9.1

Feb. 28, 2019

Re: [v2 PATCH 2/2] user32: Make GetWindowLong() fail for some values on 64-bit.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=48457 Your paranoid android. === debian9 (64 bit WoW report) === user32: clipboard.c:1630: Test failed: gle 5 clipboard.c:1632: Test failed: expected moveable mem (nil) clipboard.c:1637: Test failed: expected moveable mem (nil) clipboard.c:1642: Test failed: expected moveable mem (nil) clipboard.c:1648: Test failed: expected moveable mem (nil) clipboard.c:1654: Test failed: expected bitmap (nil) clipboard.c:1655: Test failed: different bitmap (nil) / 0x5e003f clipboard.c:1658: Test failed: expected bitmap (nil) clipboard.c:1659: Test failed: different bitmap (nil) / 0xb0045 clipboard.c:1662: Test failed: expected palette (nil) clipboard.c:1663: Test failed: different palette (nil) / 0xc0041 clipboard.c:1666: Test failed: expected fixed mem (nil) clipboard.c:1668: Test failed: expected fixed mem (nil) clipboard.c:1670: Test failed: gle 1418

Feb. 28, 2019

Re: Creating the Sinhala NLS file

by Isira Seneviratne

On Thu, 28 Feb 2019, 10:46 pm Alex Henrie, <alexhenrie24(a)gmail.com> wrote: > On Wed, Feb 27, 2019 at 11:22 PM Isira Seneviratne <isirasen96(a)gmail.com> > wrote: > > I would like to know if the following statements to obtain the value of > LOCALE_FONTSIGNATURE for Sinhala are correct, or if any corrections should > be made: > > > > WCHAR s[100]; > > GetLocaleInfoEx(L"si", LOCALE_FONTSIGNATURE, s, 100); > > To be sure you're getting the correct value, I would use > LOCALE_NAME_SYSTEM_DEFAULT and run the code on a Windows machine that > was set up in the Sinhala language from the beginning. > Okay, thank you. > > + LOCALE_SSCRIPTS "Taml;" > > Are you sure this is right? > I wasn't able to get a proper value for that yet, so I didn't change it. I'll add the remaining values. I sent the patch so that I could get feedback on it. > -Alex >

Feb. 28, 2019

Re: [PATCH] msxml3: Remove redundant not-NULL check (coccinellery)

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

Feb. 28, 2019

[v2 PATCH 2/2] user32: Make GetWindowLong() fail for some values on 64-bit.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/win.c | 4 ---- dlls/user32/win.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d9a8e85d7b..639eef4c42 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6346,7 +6346,6 @@ static void test_set_window_long_size(void) /* GWLP_WNDPROC */ SetLastError(0xdeadbeef); wnd_proc = (WNDPROC)(LONG_PTR)GetWindowLongA(hwnd, GWLP_WNDPROC); -todo_wine ok(!wnd_proc && GetLastError() == ERROR_INVALID_INDEX, "Unexpected window proc.\n"); wnd_proc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC); @@ -6427,12 +6426,10 @@ todo_wine SetLastError(0xdeadbeef); ret = GetWindowLongA(hwnd, GWLP_HINSTANCE); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); SetLastError(0xdeadbeef); ret = GetWindowLongW(hwnd, GWLP_HINSTANCE); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); SetLastError(0xdeadbeef); @@ -6451,7 +6448,6 @@ todo_wine /* GWLP_HWNDPARENT */ SetLastError(0xdeadbeef); ret = GetWindowLongA(hwnd, GWLP_HWNDPARENT); -todo_wine ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret); SetLastError(0xdeadbeef); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index f5ac867d2b..0bb9fd9cba 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2690,7 +2690,19 @@ WORD WINAPI GetWindowWord( HWND hwnd, INT offset ) */ LONG WINAPI GetWindowLongA( HWND hwnd, INT offset ) { - return WIN_GetWindowLong( hwnd, offset, sizeof(LONG), FALSE ); + switch (offset) + { +#ifdef _WIN64 + case GWLP_WNDPROC: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + WARN( "Invalid offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; +#endif + default: + return WIN_GetWindowLong( hwnd, offset, sizeof(LONG), FALSE ); + } } @@ -2699,7 +2711,19 @@ LONG WINAPI GetWindowLongA( HWND hwnd, INT offset ) */ LONG WINAPI GetWindowLongW( HWND hwnd, INT offset ) { - return WIN_GetWindowLong( hwnd, offset, sizeof(LONG), TRUE ); + switch (offset) + { +#ifdef _WIN64 + case GWLP_WNDPROC: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + WARN( "Invalid offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; +#endif + default: + return WIN_GetWindowLong( hwnd, offset, sizeof(LONG), TRUE ); + } } -- 2.20.1

Feb. 28, 2019

[v2 PATCH 1/2] user32: Do not touch some of the values on 64-bit with SetWindowLong().

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: added some tests for GetWindowWord(), moved filtering. dlls/user32/tests/win.c | 230 ++++++++++++++++++++++++++++++++++++++++ dlls/user32/win.c | 31 +++++- 2 files changed, 258 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3444abaf96..d9a8e85d7b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6330,6 +6330,233 @@ static int check_error(DWORD actual, DWORD expected) return (!sets_last_error && (actual == 0xdeadbeef)) || (actual == expected); } +static void test_set_window_long_size(void) +{ +#ifdef _WIN64 + WNDPROC wnd_proc, wnd_proc_2; + LONG_PTR retval; + HWND hwnd; + LONG ret; + + /* It's not allowed to set or get 64-bit pointer values using 32-bit functions. */ + hwnd = CreateWindowExA(0, "MainWindowClass", "Child window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_CHILD | + WS_MAXIMIZEBOX | WS_VISIBLE, 100, 100, 200, 200, hwndMain, 0, GetModuleHandleA(NULL), NULL); + ok(hwnd != NULL, "Failed to create test window.\n"); + + /* GWLP_WNDPROC */ + SetLastError(0xdeadbeef); + wnd_proc = (WNDPROC)(LONG_PTR)GetWindowLongA(hwnd, GWLP_WNDPROC); +todo_wine + ok(!wnd_proc && GetLastError() == ERROR_INVALID_INDEX, "Unexpected window proc.\n"); + + wnd_proc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC); + ok(!!wnd_proc, "Unexpected window proc.\n"); + + SetLastError(0xdeadbeef); + wnd_proc_2 = (WNDPROC)(LONG_PTR)SetWindowLongA(hwnd, GWLP_WNDPROC, 0xdeadbeef); + ok(!wnd_proc_2 && GetLastError() == ERROR_INVALID_INDEX, "Unexpected window proc.\n"); + + wnd_proc_2 = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC); + ok(wnd_proc_2 == wnd_proc, "Unexpected window proc.\n"); + + SetLastError(0xdeadbeef); + ret = GetWindowWord(hwnd, GWLP_WNDPROC); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected return value.\n"); + + /* GWLP_USERDATA */ + SetWindowLongPtrA(hwnd, GWLP_USERDATA, ((LONG_PTR)1 << 32) | 123); + ret = GetWindowLongA(hwnd, GWLP_USERDATA); + ok(ret == 123, "Unexpected user data %#x.\n", ret); + retval = GetWindowLongPtrA(hwnd, GWLP_USERDATA); + ok(retval > 123, "Unexpected user data.\n"); + ret = GetWindowWord(hwnd, GWLP_USERDATA); +todo_wine + ok(ret == 123, "Unexpected user data %#x.\n", ret); + ret = SetWindowWord(hwnd, GWLP_USERDATA, 124); +todo_wine + ok(ret == 123, "Unexpected user data %#x.\n", ret); + ret = GetWindowLongA(hwnd, GWLP_USERDATA); +todo_wine + ok(ret == 124, "Unexpected user data %#x.\n", ret); + retval = GetWindowLongPtrA(hwnd, GWLP_USERDATA); +todo_wine + ok(retval == 124, "Unexpected user data.\n"); + + SetWindowLongA(hwnd, GWLP_USERDATA, (1 << 16) | 123); + ret = GetWindowLongA(hwnd, GWLP_USERDATA); + ok(ret == ((1 << 16) | 123), "Unexpected user data %#x.\n", ret); + ret = GetWindowWord(hwnd, GWLP_USERDATA); +todo_wine + ok(ret == 123, "Unexpected user data %#x.\n", ret); + + ret = SetWindowWord(hwnd, GWLP_USERDATA, 124); +todo_wine + ok(ret == 123, "Unexpected user data %#x.\n", ret); + ret = GetWindowLongA(hwnd, GWLP_USERDATA); +todo_wine + ok(ret == ((1 << 16) | 124), "Unexpected user data %#x.\n", ret); + ret = GetWindowWord(hwnd, GWLP_USERDATA); +todo_wine + ok(ret == 124, "Unexpected user data %#x.\n", ret); + + /* GWLP_ID */ + ret = SetWindowLongA(hwnd, GWLP_ID, 1); + ok(!ret, "Unexpected id %#x.\n", ret); + + ret = GetWindowLongA(hwnd, GWLP_ID); + ok(ret == 1, "Unexpected id %#x.\n", ret); + + ret = GetWindowLongW(hwnd, GWLP_ID); + ok(ret == 1, "Unexpected id %#x.\n", ret); + + SetWindowLongPtrA(hwnd, GWLP_ID, ((LONG_PTR)1 << 32) | 123); + ret = GetWindowLongA(hwnd, GWLP_ID); + ok(ret == 123, "Unexpected id %#x.\n", ret); + ret = GetWindowLongW(hwnd, GWLP_ID); + ok(ret == 123, "Unexpected id %#x.\n", ret); + retval = GetWindowLongPtrA(hwnd, GWLP_ID); + ok(retval > 123, "Unexpected id.\n"); + SetLastError(0xdeadbeef); + ret = GetWindowWord(hwnd, GWLP_ID); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#x.\n", ret); + + /* GWLP_HINSTANCE */ + retval = GetWindowLongPtrA(hwnd, GWLP_HINSTANCE); + ok(retval == (LONG_PTR)GetModuleHandleA(NULL), "Unexpected instance %#lx.\n", retval); + + SetLastError(0xdeadbeef); + ret = GetWindowLongA(hwnd, GWLP_HINSTANCE); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = GetWindowLongW(hwnd, GWLP_HINSTANCE); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = GetWindowWord(hwnd, GWLP_HINSTANCE); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = SetWindowLongA(hwnd, GWLP_HINSTANCE, 1); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = SetWindowLongW(hwnd, GWLP_HINSTANCE, 1); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + /* GWLP_HWNDPARENT */ + SetLastError(0xdeadbeef); + ret = GetWindowLongA(hwnd, GWLP_HWNDPARENT); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = SetWindowLongA(hwnd, GWLP_HWNDPARENT, 0); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = SetWindowLongW(hwnd, GWLP_HWNDPARENT, 0); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = GetWindowWord(hwnd, GWLP_HWNDPARENT); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret); + + DestroyWindow(hwnd); +#endif +} + +static void test_set_window_word_size(void) +{ + WNDPROC wnd_proc, wnd_proc_2; + LONG_PTR retval; + HWND hwnd; + LONG ret; + + /* It's not allowed to set or get 64-bit pointer values using 32-bit functions. */ + hwnd = CreateWindowExA(0, "MainWindowClass", "Child window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_CHILD | + WS_MAXIMIZEBOX | WS_VISIBLE, 100, 100, 200, 200, hwndMain, 0, GetModuleHandleA(NULL), NULL); + ok(hwnd != NULL, "Failed to create test window.\n"); + + /* GWLP_WNDPROC */ + wnd_proc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC); + ok(!!wnd_proc, "Unexpected window proc.\n"); + + SetLastError(0xdeadbeef); + ret = GetWindowWord(hwnd, GWLP_WNDPROC); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected window proc.\n"); + + SetLastError(0xdeadbeef); + ret = SetWindowWord(hwnd, GWLP_WNDPROC, 0xbeef); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected window proc.\n"); + + wnd_proc_2 = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC); + ok(wnd_proc_2 == wnd_proc, "Unexpected window proc.\n"); + + /* GWLP_USERDATA */ + ret = SetWindowLongA(hwnd, GWLP_USERDATA, (1 << 16) | 123); + ok(!ret, "Unexpected user data %#x.\n", ret); + ret = GetWindowLongA(hwnd, GWLP_USERDATA); + ok(ret > 123, "Unexpected user data %#x.\n", ret); + ret = GetWindowWord(hwnd, GWLP_USERDATA); +todo_wine + ok(ret == 123, "Unexpected user data %#x.\n", ret); + ret = SetWindowWord(hwnd, GWLP_USERDATA, 124); +todo_wine + ok(ret == 123, "Unexpected user data %#x.\n", ret); + ret = GetWindowWord(hwnd, GWLP_USERDATA); +todo_wine + ok(ret == 124, "Unexpected user data %#x.\n", ret); + ret = GetWindowLongA(hwnd, GWLP_USERDATA); +todo_wine + ok(ret == ((1 << 16) | 124), "Unexpected user data %#x.\n", ret); + + /* GWLP_ID */ + ret = SetWindowLongA(hwnd, GWLP_ID, 1); + ok(!ret, "Unexpected id %#x.\n", ret); + ret = GetWindowLongA(hwnd, GWLP_ID); + ok(ret == 1, "Unexpected id %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = GetWindowWord(hwnd, GWLP_ID); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#x.\n", ret); + SetLastError(0xdeadbeef); + ret = SetWindowWord(hwnd, GWLP_ID, 2); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected id %#x.\n", ret); + + /* GWLP_HINSTANCE */ + retval = GetWindowLongPtrA(hwnd, GWLP_HINSTANCE); + ok(retval == (LONG_PTR)GetModuleHandleA(NULL), "Unexpected instance %#lx.\n", retval); + + SetLastError(0xdeadbeef); + ret = GetWindowWord(hwnd, GWLP_HINSTANCE); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = SetWindowWord(hwnd, GWLP_HINSTANCE, 0xdead); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + /* GWLP_HWNDPARENT */ + retval = GetWindowLongPtrA(hwnd, GWLP_HWNDPARENT); + ok(!!retval, "Unexpected parent window %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = GetWindowWord(hwnd, GWLP_HWNDPARENT); +todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret); + + DestroyWindow(hwnd); +} + static void test_SetWindowLong(void) { LONG_PTR retval; @@ -6371,6 +6598,9 @@ static void test_SetWindowLong(void) /* set it back to ANSI */ SetWindowLongPtrA(hwndMain, GWLP_WNDPROC, 0); } + + test_set_window_long_size(); + test_set_window_word_size(); } static LRESULT WINAPI check_style_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 24b2a2ffd5..f5ac867d2b 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2734,7 +2734,19 @@ WORD WINAPI SetWindowWord( HWND hwnd, INT offset, WORD newval ) */ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongA( HWND hwnd, INT offset, LONG newval ) { - return WIN_SetWindowLong( hwnd, offset, sizeof(LONG), newval, FALSE ); + switch (offset) + { +#ifdef _WIN64 + case GWLP_WNDPROC: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + WARN( "Invalid offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; +#endif + default: + return WIN_SetWindowLong( hwnd, offset, sizeof(LONG), newval, FALSE ); + } } @@ -2808,8 +2820,21 @@ LONG WINAPI DECLSPEC_HOTPATCH SetWindowLongW( HWND hwnd, /* [in] window to alter */ INT offset, /* [in] offset, in bytes, of location to alter */ LONG newval /* [in] new value of location */ -) { - return WIN_SetWindowLong( hwnd, offset, sizeof(LONG), newval, TRUE ); +) +{ + switch (offset) + { +#ifdef _WIN64 + case GWLP_WNDPROC: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + WARN("Invalid offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; +#endif + default: + return WIN_SetWindowLong( hwnd, offset, sizeof(LONG), newval, TRUE ); + } } -- 2.20.1

Feb. 28, 2019

Re: [PATCH] ole32: Remove useless casts to self

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=48451 Your paranoid android. === debian9 (64 bit WoW report) === ole32: clipboard.c:1524: Test failed: gle 5 clipboard.c:1526: Test failed: gle 1418 clipboard.c:1528: Test failed: gle 1418 clipboard.c:1536: Test failed: got 800401d0 Unhandled exception: page fault on read access to 0x00000000 in 64-bit code (0x00007fa4d0caced8). Report errors: ole32:clipboard crashed (c0000005)

Feb. 28, 2019

Re: [PATCH] Add support for ast locale

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=48447 Your paranoid android. === debian9 (build log) === Makefile:233: recipe for target 'appwiz.res' failed Makefile:8662: recipe for target 'dlls/appwiz.cpl' failed Makefile:530: recipe for target 'avifil32.res' failed Makefile:8662: recipe for target 'dlls/avifil32' failed Makefile:374: recipe for target 'browseui.res' failed Makefile:8662: recipe for target 'dlls/browseui' failed Task: The win32 build failed === debian9 (build log) === Makefile:232: recipe for target 'appwiz.res' failed Makefile:8387: recipe for target 'dlls/appwiz.cpl' failed Makefile:521: recipe for target 'avifil32.res' failed Makefile:8387: recipe for target 'dlls/avifil32' failed Makefile:369: recipe for target 'browseui.res' failed Makefile:8387: recipe for target 'dlls/browseui' failed Task: The wow64 build failed

Feb. 28, 2019

[PATCH] ole32: Remove useless casts to self

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/datacache.c | 2 +- dlls/ole32/tests/compobj.c | 6 +++--- dlls/ole32/tests/marshal.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 3eff56908d..6d4bcca96a 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1003,7 +1003,7 @@ static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream meta_place_rec.bounding_box[3] = (LONGLONG)mfpict->yExt * meta_place_rec.inch / 2540; GlobalUnlock(entry->stgmedium.u.hMetaFilePict); - for (check = (WORD *)&meta_place_rec; check != (WORD *)&meta_place_rec.checksum; check++) + for (check = (WORD *)&meta_place_rec; check != &meta_place_rec.checksum; check++) meta_place_rec.checksum ^= *check; hr = IStream_Write(stream, &meta_place_rec, sizeof(struct meta_placeable), NULL); if (hr == S_OK && data_size) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b4dd83e63d..aebe9674a1 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1031,7 +1031,7 @@ static HRESULT WINAPI PSFactoryBuffer_CreateStub( { CHECK_EXPECT(CreateStub); - ok(pUnkServer == (IUnknown*)&Test_Unknown, "unexpected pUnkServer %p\n", pUnkServer); + ok(pUnkServer == &Test_Unknown, "unexpected pUnkServer %p\n", pUnkServer); if(!ps_factory_buffer) return E_NOTIMPL; @@ -3753,10 +3753,10 @@ static DWORD CALLBACK implicit_mta_proc(void *param) hr = CoRegisterMessageFilter(NULL, NULL); ok(hr == CO_E_NOT_SUPPORTED, "got %#x\n", hr); - hr = CoLockObjectExternal((IUnknown *)&Test_Unknown, TRUE, TRUE); + hr = CoLockObjectExternal(&Test_Unknown, TRUE, TRUE); ok_ole_success(hr, "CoLockObjectExternal"); - hr = CoDisconnectObject((IUnknown *)&Test_Unknown, 0); + hr = CoDisconnectObject(&Test_Unknown, 0); ok_ole_success(hr, "CoDisconnectObject"); return 0; diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index c53acf236c..33b155d474 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -329,7 +329,7 @@ static HRESULT WINAPI Test_IClassFactory_CreateInstance( LPVOID *ppvObj) { if (pUnkOuter) return CLASS_E_NOAGGREGATION; - return IUnknown_QueryInterface((IUnknown*)&Test_Unknown, riid, ppvObj); + return IUnknown_QueryInterface(&Test_Unknown, riid, ppvObj); } static HRESULT WINAPI Test_IClassFactory_LockServer( -- 2.20.1

Feb. 28, 2019