wine-commits November 2022

wine-commits@winehq.org

1 participants
1171 discussions

Zebediah Figura : ws2_32: Always fill the WSADATA structure in WSAStartup().
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 2df966efba17814a418865f0d111cb2bf1b5df42 URL: https://gitlab.winehq.org/wine/wine/-/commit/2df966efba17814a418865f0d111cb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 00:20:47 2022 -0600 ws2_32: Always fill the WSADATA structure in WSAStartup(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 864bef4f8d3faadcc83f94b213e7fae4e564c217) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 33 ++++++++++++++++----------------- dlls/ws2_32/tests/protocol.c | 9 +++------ 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fe7e4fb3464..23140529b24 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -572,29 +572,28 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) /*********************************************************************** * WSAStartup (WS2_32.115) */ -int WINAPI WSAStartup(WORD wVersionRequested, LPWSADATA lpWSAData) +int WINAPI WSAStartup( WORD version, WSADATA *data ) { - TRACE("verReq=%x\n", wVersionRequested); + TRACE( "version %#x\n", version ); - if (LOBYTE(wVersionRequested) < 1) + if (data) + { + data->wVersion = version; + data->wHighVersion = MAKEWORD(2, 2); + strcpy( data->szDescription, "WinSock 2.0" ); + strcpy( data->szSystemStatus, "Running" ); + data->iMaxSockets = MAX_SOCKETS_PER_PROCESS; + data->iMaxUdpDg = MAX_UDP_DATAGRAM; + /* don't fill lpVendorInfo */ + } + + if (!LOBYTE(version)) return WSAVERNOTSUPPORTED; - if (!lpWSAData) return WSAEINVAL; + if (!data) return WSAEINVAL; num_startup++; - - /* that's the whole of the negotiation for now */ - lpWSAData->wVersion = wVersionRequested; - /* return winsock information */ - lpWSAData->wHighVersion = 0x0202; - strcpy(lpWSAData->szDescription, "WinSock 2.0" ); - strcpy(lpWSAData->szSystemStatus, "Running" ); - lpWSAData->iMaxSockets = MAX_SOCKETS_PER_PROCESS; - lpWSAData->iMaxUdpDg = MAX_UDP_DATAGRAM; - /* don't do anything with lpWSAData->lpVendorInfo */ - /* (some apps don't allocate the space for this field) */ - - TRACE("succeeded starts: %d\n", num_startup); + TRACE( "increasing startup count to %d\n", num_startup ); return 0; } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index c7ba014a0bf..6ac0eb96521 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2869,12 +2869,9 @@ static void test_startup(void) todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); } ok(data.lpVendorInfo == (void *)0xdeadbeef, "got vendor info %p\n", data.lpVendorInfo); - todo_wine_if (ret) - { - ok(data.wHighVersion == 0x202, "got maximum version %#x\n", data.wHighVersion); - ok(!strcmp(data.szDescription, "WinSock 2.0"), "got description %s\n", debugstr_a(data.szDescription)); - ok(!strcmp(data.szSystemStatus, "Running"), "got status %s\n", debugstr_a(data.szSystemStatus)); - } + ok(data.wHighVersion == 0x202, "got maximum version %#x\n", data.wHighVersion); + ok(!strcmp(data.szDescription, "WinSock 2.0"), "got description %s\n", debugstr_a(data.szDescription)); + ok(!strcmp(data.szSystemStatus, "Running"), "got status %s\n", debugstr_a(data.szSystemStatus)); todo_wine ok(data.iMaxSockets == (LOBYTE(tests[i].version) == 1 ? 32767 : 0), "got maximum sockets %u\n", data.iMaxSockets); todo_wine ok(data.iMaxUdpDg == (LOBYTE(tests[i].version) == 1 ? 65467 : 0), "got maximum datagram size %u\n", data.iMaxUdpDg);

1 0

Zebediah Figura : ws2_32/tests: Add tests for WSAStartup().
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: f524c2cd178570f8ab34c8d44c93e2576a943e05 URL: https://gitlab.winehq.org/wine/wine/-/commit/f524c2cd178570f8ab34c8d44c93e2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 00:20:46 2022 -0600 ws2_32/tests: Add tests for WSAStartup(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 155449c5d1d8c12114b2cdda2855e28c158e271f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 99 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 881e3a388fd..c7ba014a0bf 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2815,10 +2815,86 @@ static void test_WSCGetProviderPath(void) ok(len == 256, "Got unexpected len %d.\n", len); } +static void test_startup(void) +{ + unsigned int i; + WSADATA data; + int ret; + + static const struct + { + WORD version; + WORD ret_version; + } + tests[] = + { + {MAKEWORD(0, 0), MAKEWORD(2, 2)}, + {MAKEWORD(0, 1), MAKEWORD(2, 2)}, + {MAKEWORD(1, 0), MAKEWORD(1, 0)}, + {MAKEWORD(1, 1), MAKEWORD(1, 1)}, + {MAKEWORD(1, 2), MAKEWORD(1, 1)}, + {MAKEWORD(1, 0xff), MAKEWORD(1, 1)}, + {MAKEWORD(2, 0), MAKEWORD(2, 0)}, + {MAKEWORD(2, 1), MAKEWORD(2, 1)}, + {MAKEWORD(2, 2), MAKEWORD(2, 2)}, + {MAKEWORD(2, 3), MAKEWORD(2, 2)}, + {MAKEWORD(2, 0xff), MAKEWORD(2, 2)}, + {MAKEWORD(3, 0), MAKEWORD(2, 2)}, + {MAKEWORD(0xff, 0), MAKEWORD(2, 2)}, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("Version %#x", tests[i].version); + + memset(&data, 0xcc, sizeof(data)); + data.lpVendorInfo = (void *)0xdeadbeef; + ret = WSAStartup(tests[i].version, &data); + ok(ret == (LOBYTE(tests[i].version) ? 0 : WSAVERNOTSUPPORTED), "got %d\n", ret); + todo_wine_if (tests[i].version != tests[i].ret_version) + ok(data.wVersion == tests[i].ret_version, "got version %#x\n", data.wVersion); + if (!ret) + { + ret = WSAStartup(tests[i].version, &data); + ok(!ret, "got %d\n", ret); + + WSASetLastError(0xdeadbeef); + ret = WSACleanup(); + ok(!ret, "got %d\n", ret); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = WSACleanup(); + ok(!ret, "got %d\n", ret); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + } + ok(data.lpVendorInfo == (void *)0xdeadbeef, "got vendor info %p\n", data.lpVendorInfo); + todo_wine_if (ret) + { + ok(data.wHighVersion == 0x202, "got maximum version %#x\n", data.wHighVersion); + ok(!strcmp(data.szDescription, "WinSock 2.0"), "got description %s\n", debugstr_a(data.szDescription)); + ok(!strcmp(data.szSystemStatus, "Running"), "got status %s\n", debugstr_a(data.szSystemStatus)); + } + todo_wine ok(data.iMaxSockets == (LOBYTE(tests[i].version) == 1 ? 32767 : 0), "got maximum sockets %u\n", data.iMaxSockets); + todo_wine ok(data.iMaxUdpDg == (LOBYTE(tests[i].version) == 1 ? 65467 : 0), "got maximum datagram size %u\n", data.iMaxUdpDg); + + WSASetLastError(0xdeadbeef); + ret = WSACleanup(); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSANOTINITIALISED, "got error %u\n", WSAGetLastError()); + + ret = WSAStartup(tests[i].version, NULL); + todo_wine_if (LOBYTE(tests[i].version)) + ok(ret == (LOBYTE(tests[i].version) ? WSAEFAULT : WSAVERNOTSUPPORTED), "got %d\n", ret); + + winetest_pop_context(); + } +} + START_TEST( protocol ) { WSADATA data; - WORD version = MAKEWORD( 2, 2 ); + int ret; pFreeAddrInfoExW = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "FreeAddrInfoExW"); pGetAddrInfoExOverlappedResult = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "GetAddrInfoExOverlappedResult"); @@ -2830,7 +2906,8 @@ START_TEST( protocol ) pInetPtonW = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "InetPtonW"); pWSCGetProviderInfo = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "WSCGetProviderInfo"); - if (WSAStartup( version, &data )) return; + ret = WSAStartup(0x202, &data); + ok(!ret, "got %d\n", ret); test_WSAEnumProtocolsA(); test_WSAEnumProtocolsW(); @@ -2839,8 +2916,6 @@ START_TEST( protocol ) test_getservbyname(); test_WSALookupService(); - test_WSAAsyncGetServByPort(); - test_WSAAsyncGetServByName(); test_inet_ntoa(); test_inet_pton(); @@ -2862,4 +2937,20 @@ START_TEST( protocol ) test_WSAEnumNameSpaceProvidersW(); test_WSCGetProviderInfo(); test_WSCGetProviderPath(); + + WSACleanup(); + + /* These tests are finnicky. If WSAStartup() is ever called with a + * version below 2.2, it causes getaddrinfo() to behave differently. */ + + test_startup(); + + /* And if WSAAsyncGetServBy*() is ever called, it somehow causes + * WSAStartup() to succeed with 0.1 instead of failing. */ + + ret = WSAStartup(0x202, &data); + ok(!ret, "got %d\n", ret); + + test_WSAAsyncGetServByPort(); + test_WSAAsyncGetServByName(); }

1 0

Piotr Caban : ucrtbase: Add support for r-value demangling in unDName.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: e61cba4644e8d4f0c01cbaad52b49d3e8dcfb14a URL: https://gitlab.winehq.org/wine/wine/-/commit/e61cba4644e8d4f0c01cbaad52b49d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 7 17:44:46 2022 +0100 ucrtbase: Add support for r-value demangling in unDName. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44202 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a656a8b64459845dd68ea4aa43639b06f452193b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/undname.c | 6 ++++++ dlls/ucrtbase/tests/cpp.c | 21 ++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 88782158bf4..c7016a11b51 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -450,6 +450,7 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, case 'R': str_modif = str_printf(sym, " *%s volatile", ptr_modif); break; case 'S': str_modif = str_printf(sym, " *%s const volatile", ptr_modif); break; case '?': str_modif = ""; break; + case '$': str_modif = str_printf(sym, " &&%s", ptr_modif); break; default: return FALSE; } @@ -1028,6 +1029,11 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (!demangle_datatype(sym, ct, pmt_ref, in_args)) goto done; ct->left = str_printf(sym, "%s %s", ct->left, ptr); } + else if (*sym->current == 'Q') + { + sym->current++; + if (!get_modified_type(ct, sym, pmt_ref, '$', in_args)) goto done; + } break; } break; diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c index 163e1968069..77b06e7cd42 100644 --- a/dlls/ucrtbase/tests/cpp.c +++ b/dlls/ucrtbase/tests/cpp.c @@ -52,7 +52,7 @@ static int (CDECL *p___std_type_info_compare)(const type_info140*, const type_in static const char* (CDECL *p___std_type_info_name)(type_info140*, SLIST_HEADER*); static void (CDECL *p___std_type_info_destroy_list)(SLIST_HEADER*); static size_t (CDECL *p___std_type_info_hash)(type_info140*); - +static char* (__cdecl *p___unDName)(char*,const char*,int,void*,void*,unsigned short int); static BOOL init(void) { @@ -72,6 +72,7 @@ static BOOL init(void) p___std_type_info_name = (void*)GetProcAddress(module, "__std_type_info_name"); p___std_type_info_destroy_list = (void*)GetProcAddress(module, "__std_type_info_destroy_list"); p___std_type_info_hash = (void*)GetProcAddress(module, "__std_type_info_hash"); + p___unDName = (void*)GetProcAddress(module, "__unDName"); return TRUE; } @@ -189,9 +190,27 @@ static void test___std_type_info(void) ok(hash1 != hash2, "hash1 == hash2 for different strings\n"); } +static void test___unDName(void) +{ + char *name; + + name = p___unDName(0, "??4QDnsDomainNameRecord@@QAEAAV0@$$QAV0@@Z", 0, malloc, free, 0); + ok(!strcmp(name, "public: class QDnsDomainNameRecord & __thiscall " + "QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord &&)"), + "unDName returned %s\n", wine_dbgstr_a(name)); + free(name); + + name = p___unDName(0, "??4QDnsDomainNameRecord@@QAEAAV0@$$QEAV0@@Z", 0, malloc, free, 0); + ok(!strcmp(name, "public: class QDnsDomainNameRecord & __thiscall " + "QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord && __ptr64)"), + "unDName returned %s\n", wine_dbgstr_a(name)); + free(name); +} + START_TEST(cpp) { if (!init()) return; test___std_exception(); test___std_type_info(); + test___unDName(); }

1 0

Alexandre Julliard : user.exe: Make sure that the thunk selector doesn't get freed.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 6b092f97a3a5948851021ad14b8cae4237d4af17 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b092f97a3a5948851021ad14b8cae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 20 11:07:20 2022 +0100 user.exe: Make sure that the thunk selector doesn't get freed. Spotted by Fabian Maurer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12732 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 879ccd33572170e9bcb00d5a45cf65b2ca675439) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user.exe16/message.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 1b4bf9afbd8..5d388a55312 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -161,6 +161,7 @@ static WNDPROC16 alloc_win16_thunk( WNDPROC handle ) if (!(thunk_selector = GlobalAlloc16( GMEM_FIXED | GMEM_ZEROINIT, MAX_WINPROCS16 * sizeof(WINPROC_THUNK) ))) return NULL; + FarSetOwner16( thunk_selector, 0 ); PrestoChangoSelector16( thunk_selector, thunk_selector ); thunk_array = GlobalLock16( thunk_selector ); relay = GetProcAddress16( GetModuleHandle16("user"), "__wine_call_wndproc" );

1 0

Ben Shefte : ntdll: Use case insensitive comparison in is_import_dll_system().
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: cfee3368d6f2b7f1ba80a8120bd93ad2739f2200 URL: https://gitlab.winehq.org/wine/wine/-/commit/cfee3368d6f2b7f1ba80a8120bd93a… Author: Ben Shefte <shefben(a)gmail.com> Date: Tue Jan 25 15:20:24 2022 +0300 ntdll: Use case insensitive comparison in is_import_dll_system(). Fixes a regression introduced by commit 250c113169217933b1fffa8024fa958f71b8aee7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52446 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9d1ac957b4e4e399b49f9b7f443336806482707e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 362e1c66be5..b50b9e61bbc 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -628,7 +628,7 @@ static BOOL is_import_dll_system( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_IMPORT_ { const char *name = get_rva( mod->DllBase, import->Name ); - return !strcmp( name, "ntdll.dll" ) || !strcmp( name, "kernel32.dll" ); + return !_stricmp( name, "ntdll.dll" ) || !_stricmp( name, "kernel32.dll" ); } /**********************************************************************

1 0

Piotr Kleski : bcrypt: Return BCryptSignHash len when only output is NULL.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 07c75ef8af3eabf70132be9e4c7eefb9d33e9af5 URL: https://gitlab.winehq.org/wine/wine/-/commit/07c75ef8af3eabf70132be9e4c7eef… Author: Piotr Kleski <piotr.kleski(a)mobica.com> Date: Thu Jan 20 15:18:45 2022 +0100 bcrypt: Return BCryptSignHash len when only output is NULL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52426 Signed-off-by: Piotr Kleski <piotr.kleski(a)mobica.com> Signed-off-by: Michal Janiszewski <michal.janiszewski(a)mobica.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f32a9d1e208930d453304aaf715415542445db1a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/bcrypt/gnutls.c | 2 +- dlls/bcrypt/tests/bcrypt.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index c880c9c1d46..26da55ee758 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1707,7 +1707,7 @@ static NTSTATUS key_asymmetric_sign( void *args ) return STATUS_NOT_IMPLEMENTED; } - if (!params->input) + if (!params->output) { *params->ret_len = key->u.a.bitlen / 8; return STATUS_SUCCESS; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 3b32ea0349b..0f9456fee07 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2496,6 +2496,11 @@ static void test_BCryptSignHash(void) ok(!ret, "got %08x\n", ret); ok(len == 256, "got %u\n", len); + /* test len return when only output is NULL, as described in BCryptSignHash doc */ + ret = BCryptSignHash(key, &pad, hash, sizeof(hash), NULL, 0, &len, BCRYPT_PAD_PKCS1); + ok(!ret, "got %08x\n", ret); + ok(len == 256, "got %u\n", len); + len = 0; ret = BCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); ok(ret == STATUS_INVALID_PARAMETER || broken(ret == STATUS_INTERNAL_ERROR) /* < win7 */, "got %08x\n", ret);

1 0

Louis Lenders : ole32: Add stub for OleConvertIStorageToOLESTREAMEx.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 2caa376e19066830489006d904162c1a7f96cbaf URL: https://gitlab.winehq.org/wine/wine/-/commit/2caa376e19066830489006d904162c… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Jan 21 10:06:59 2022 +0100 ole32: Add stub for OleConvertIStorageToOLESTREAMEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52298 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 18e331fd63173b3f3fe00e930e3e09aad94493a0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/ole32.spec | 2 +- dlls/ole32/storage32.c | 11 +++++++++++ include/ole2.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index d9ffd63585c..e9982036eeb 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -187,7 +187,7 @@ @ stdcall Ole32DllGetClassObject(ptr ptr ptr) @ stdcall OleBuildVersion() @ stdcall OleConvertIStorageToOLESTREAM(ptr ptr) -@ stub OleConvertIStorageToOLESTREAMEx +@ stdcall OleConvertIStorageToOLESTREAMEx(ptr long long long long ptr ptr) @ stdcall OleConvertOLESTREAMToIStorage(ptr ptr ptr) @ stub OleConvertOLESTREAMToIStorageEx @ stdcall OleCreate(ptr ptr long ptr ptr ptr ptr) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 1bc8455cc6b..06766a28fe7 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -10570,6 +10570,17 @@ enum stream_1ole_flags { OleStream_Convert = 0x00000004 }; +/************************************************************************* + * OleConvertIStorageToOLESTREAMEx [OLE32.@] + */ +HRESULT WINAPI OleConvertIStorageToOLESTREAMEx ( LPSTORAGE stg, CLIPFORMAT cf, LONG width, LONG height, + DWORD size, LPSTGMEDIUM medium, LPOLESTREAM olestream ) +{ + FIXME("%p %x %d %d %d %p %p stub\n", stg, cf, width, height, size, medium, olestream); + + return E_NOTIMPL; +} + /*********************************************************************** * GetConvertStg (OLE32.@) */ diff --git a/include/ole2.h b/include/ole2.h index 05c1b5502c7..628bebae137 100644 --- a/include/ole2.h +++ b/include/ole2.h @@ -161,6 +161,8 @@ typedef struct _OLESTREAM { HRESULT WINAPI OleConvertOLESTREAMToIStorage( LPOLESTREAM lpolestream, LPSTORAGE pstg, const DVTARGETDEVICE* ptd); HRESULT WINAPI OleConvertIStorageToOLESTREAM( LPSTORAGE pstg, LPOLESTREAM lpolestream); +HRESULT WINAPI OleConvertIStorageToOLESTREAMEx( LPSTORAGE stg, CLIPFORMAT cf, LONG width, LONG height, + DWORD size, LPSTGMEDIUM medium, LPOLESTREAM olestream ); HRESULT WINAPI OleDoAutoConvert( LPSTORAGE pStg, LPCLSID pClsidNew ); HRESULT WINAPI OleGetAutoConvert( REFCLSID clsidOld, LPCLSID pClsidNew );

1 0

Robert Wilhelm : scrrun: Generate temp name with tmp suffix.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 5b66b6a890bb4ed590d2cd03e3c4c550208abff9 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b66b6a890bb4ed590d2cd03e3c4c5… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Jan 24 21:41:20 2022 +0100 scrrun: Generate temp name with tmp suffix. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52163 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f4d40a7379133e355004c731e2a397e888196db1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/scrrun/filesystem.c | 4 ++-- dlls/scrrun/tests/filesystem.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 7b0b2e110a6..5d7d42850ab 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3318,12 +3318,12 @@ static HRESULT WINAPI filesys_GetTempName(IFileSystem3 *iface, BSTR *result) if (!result) return E_POINTER; - if (!(*result = SysAllocStringLen(NULL, 12))) + if (!(*result = SysAllocStringLen(NULL, 13))) return E_OUTOFMEMORY; if(!RtlGenRandom(&random, sizeof(random))) return E_FAIL; - swprintf(*result, 12, L"rad%05X.txt", random & 0xfffff); + swprintf(*result, 13, L"rad%05X.tmp", random & 0xfffff); return S_OK; } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 1886c52d009..da1ca316382 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -482,7 +482,7 @@ static void test_GetTempName(void) result = (BSTR)0xdeadbeef; hr = IFileSystem3_GetTempName(fs3, &result); ok(hr == S_OK, "GetTempName returned %x, expected S_OK\n", hr); - todo_wine ok(!!wcsstr( result,L".tmp"), "GetTempName returned %s, expected .tmp suffix\n", debugstr_w(result)); + ok(!!wcsstr( result,L".tmp"), "GetTempName returned %s, expected .tmp suffix\n", debugstr_w(result)); SysFreeString(result); }

1 0

Robert Wilhelm : scrrun: Add test for GetTempName.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: ed6e6233c2da54669f5a26c37af4f529925b9f20 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed6e6233c2da54669f5a26c37af4f5… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Mon Jan 24 21:41:13 2022 +0100 scrrun: Add test for GetTempName. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a893207c719f78532c18d7c741c8bd74b46dbc9e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/scrrun/tests/filesystem.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 8b06dbb883d..1886c52d009 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -472,6 +472,20 @@ static void test_GetFileName(void) } } +static void test_GetTempName(void) +{ + BSTR result; + HRESULT hr; + + hr = IFileSystem3_GetTempName(fs3, NULL); + ok(hr == E_POINTER, "GetTempName returned %x, expected E_POINTER\n", hr); + result = (BSTR)0xdeadbeef; + hr = IFileSystem3_GetTempName(fs3, &result); + ok(hr == S_OK, "GetTempName returned %x, expected S_OK\n", hr); + todo_wine ok(!!wcsstr( result,L".tmp"), "GetTempName returned %s, expected .tmp suffix\n", debugstr_w(result)); + SysFreeString(result); +} + static void test_GetBaseName(void) { static const struct @@ -2598,6 +2612,7 @@ START_TEST(filesystem) test_GetBaseName(); test_GetAbsolutePathName(); test_GetFile(); + test_GetTempName(); test_CopyFolder(); test_BuildPath(); test_GetFolder();

1 0

Zhiyi Zhang : user32: Draw standard scroll bars in hovered state only when they were previously painted by DefWinProc().
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: fa035fde207c1d75611279b7cd89c621c7213643 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa035fde207c1d75611279b7cd89c6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jan 25 15:58:59 2022 +0800 user32: Draw standard scroll bars in hovered state only when they were previously painted by DefWinProc(). When an application handles WM_NCPAINT by itself, standard scroll bars are not drawn even if WS_HSCROLL or WS_VSCROLL is used. In this case, when handling WM_NCMOUSEMOVE, DefWinProc() shouldn't repaint standard scroll bars to reflect hovered state, otherwise, DefWinProc() draws over the custom non-client area painted by the application. This is also the behavior on XP. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51900 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 78ac7ae24d9abf4aa6ae44a50636cc963691e8f9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/painting.c | 13 ++++++++++++- dlls/user32/scroll.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/user32/tests/win.c | 1 - dlls/user32/user_private.h | 1 + 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 41c0bb3c6e1..63a8e840998 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -639,6 +639,7 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) { HRGN whole_rgn = get_update_region( hwnd, flags, child ); HRGN client_rgn = 0; + DWORD style; if (child) hwnd = *child; @@ -678,7 +679,17 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) if (whole_rgn) /* NOTE: WM_NCPAINT allows wParam to be 1 */ { - if (*flags & UPDATE_NONCLIENT) SendMessageW( hwnd, WM_NCPAINT, (WPARAM)whole_rgn, 0 ); + if (*flags & UPDATE_NONCLIENT) + { + /* Mark standard scroll bars as not painted before sending WM_NCPAINT */ + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (style & WS_HSCROLL) + SCROLL_SetStandardScrollPainted( hwnd, SB_HORZ, FALSE ); + if (style & WS_VSCROLL) + SCROLL_SetStandardScrollPainted( hwnd, SB_VERT, FALSE ); + + SendMessageW( hwnd, WM_NCPAINT, (WPARAM)whole_rgn, 0 ); + } if (whole_rgn > (HRGN)1) DeleteObject( whole_rgn ); } SetThreadDpiAwarenessContext( context ); diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index a17495d9ff0..a3f0becbbd6 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -39,6 +39,7 @@ typedef struct INT maxVal; /* Maximum scroll-bar value */ INT page; /* Page size of scroll bar (Win32) */ UINT flags; /* EnableScrollBar flags */ + BOOL painted; /* Whether the scroll bar is painted by DefWinProc() */ } SCROLLBAR_INFO, *LPSCROLLBAR_INFO; /* data for window that has (one or two) scroll bars */ @@ -643,6 +644,29 @@ void WINAPI USER_ScrollBarDraw( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTES } } +void SCROLL_SetStandardScrollPainted( HWND hwnd, INT bar, BOOL painted ) +{ + LPSCROLLBAR_INFO info; + + if (bar != SB_HORZ && bar != SB_VERT) + return; + + info = SCROLL_GetInternalInfo( hwnd, bar, FALSE ); + if (info) + info->painted = painted; +} + +static BOOL SCROLL_IsStandardScrollPainted( HWND hwnd, INT bar ) +{ + LPSCROLLBAR_INFO info; + + if (bar != SB_HORZ && bar != SB_VERT) + return FALSE; + + info = SCROLL_GetInternalInfo( hwnd, bar, FALSE ); + return info ? info->painted : FALSE; +} + /*********************************************************************** * SCROLL_DrawScrollBar * @@ -653,9 +677,9 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT bar, enum SCROLL_HITTEST hit_ BOOL draw_interior ) { INT arrow_size, thumb_size, thumb_pos; + RECT rect, clip_box, intersect; BOOL vertical; DWORD style; - RECT rect; if (!(hwnd = WIN_GetFullHandle( hwnd ))) return; @@ -682,6 +706,13 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT bar, enum SCROLL_HITTEST hit_ GetCapture()); user_api->pScrollBarDraw( hwnd, hdc, bar, hit_test, tracking_info, draw_arrows, draw_interior, &rect, arrow_size, thumb_pos, thumb_size, vertical ); + + if (bar == SB_HORZ || bar == SB_VERT) + { + GetClipBox( hdc, &clip_box ); + if (IntersectRect(&intersect, &rect, &clip_box)) + SCROLL_SetStandardScrollPainted( hwnd, bar, TRUE ); + } } void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) @@ -899,7 +930,13 @@ void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt ) switch (g_tracking_info.hit_test) { case SCROLL_NOWHERE: /* No tracking in progress */ - if (msg == WM_MOUSEMOVE || msg == WM_MOUSELEAVE || msg == WM_NCMOUSEMOVE || msg == WM_NCMOUSELEAVE) + /* For standard scroll bars, hovered state gets painted only when the scroll bar was + * previously painted by DefWinProc(). If an application handles WM_NCPAINT by itself, then + * the scrollbar shouldn't be repainted here to avoid overwriting the application painted + * content */ + if (msg == WM_MOUSEMOVE || msg == WM_MOUSELEAVE + || ((msg == WM_NCMOUSEMOVE || msg == WM_NCMOUSELEAVE) + && SCROLL_IsStandardScrollPainted( hwnd, nBar))) SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, &g_tracking_info, TRUE, TRUE ); break; diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ed90c5fbe5f..cb6b61e59c0 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1269,7 +1269,6 @@ static void test_nonclient_area(HWND hwnd) RedrawWindow(child, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME); color = GetPixel(hdc, 50 - GetSystemMetrics(SM_CXVSCROLL) / 2, 50 - GetSystemMetrics(SM_CYHSCROLL) / 2); - todo_wine ok(color == old_color, "Expected color %#x, got %#x.\n", old_color, color); ReleaseDC(parent, hdc); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 6923ddb2906..decfc66ef8e 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -307,5 +307,6 @@ LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HID void WINAPI USER_ScrollBarDraw(HWND, HDC, INT, enum SCROLL_HITTEST, const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, INT, BOOL) DECLSPEC_HIDDEN; +void SCROLL_SetStandardScrollPainted(HWND hwnd, INT bar, BOOL visible); #endif /* __WINE_USER_PRIVATE_H */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2022