October 2020 - Wine-commits

Michael Stefaniuc : explorer: Use the WCHAR string version of LoadLibrary.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: 27431b0f3a0383559d5dd2cc6de4f1a3770ca714 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27431b0f3a0383559d5dd2cc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 18 23:33:28 2020 +0200 explorer: Use the WCHAR string version of LoadLibrary. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/desktop.c | 2 +- programs/explorer/startmenu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 6f1ff54c143..f525c23d819 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -1041,7 +1041,7 @@ void manage_desktop( WCHAR *arg ) initialize_systray( graphics_driver, using_root, enable_shell ); if (!using_root) initialize_launchers( hwnd ); - if ((shell32 = LoadLibraryA( "shell32.dll" )) && + if ((shell32 = LoadLibraryW( L"shell32.dll" )) && (pShellDDEInit = (void *)GetProcAddress( shell32, (LPCSTR)188))) { pShellDDEInit( TRUE ); diff --git a/programs/explorer/startmenu.c b/programs/explorer/startmenu.c index f5f50bb3e72..3173ae21fc6 100644 --- a/programs/explorer/startmenu.c +++ b/programs/explorer/startmenu.c @@ -375,7 +375,7 @@ static void run_dialog(void) LPCSTR lpszTitle, LPCSTR lpszDesc, DWORD dwFlags); HMODULE hShell32; - hShell32 = LoadLibraryA("shell32"); + hShell32 = LoadLibraryW(L"shell32"); pRunFileDlg = (void*)GetProcAddress(hShell32, (LPCSTR)61); pRunFileDlg(NULL, NULL, NULL, NULL, NULL, 0);

1 0

Michael Stefaniuc : taskmgr: Shell32 is imported, no need to load it again.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: 9764b6fe37d04177f9c5cb9da2601ba97ba9b5e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9764b6fe37d04177f9c5cb9d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 18 23:33:29 2020 +0200 taskmgr: Shell32 is imported, no need to load it again. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/run.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/programs/taskmgr/run.c b/programs/taskmgr/run.c index 6d24f1c745c..177c737bb07 100644 --- a/programs/taskmgr/run.c +++ b/programs/taskmgr/run.c @@ -48,13 +48,10 @@ UINT uFlags); void TaskManager_OnFileNew(void) { - HMODULE hShell32; RUNFILEDLG RunFileDlg; OSVERSIONINFOW versionInfo; - static const WCHAR wszShell32[] = {'S','H','E','L','L','3','2','.','D','L','L',0}; - hShell32 = LoadLibraryW(wszShell32); - RunFileDlg = (void *)GetProcAddress(hShell32, (LPCSTR)61); + RunFileDlg = (void *)GetProcAddress(GetModuleHandleW(L"shell32.dll"), (LPCSTR)61); /* Show "Run..." dialog */ if (RunFileDlg) @@ -76,6 +73,4 @@ void TaskManager_OnFileNew(void) RunFileDlg(hMainWnd, hIcon, NULL, szTitle, NULL, RFF_CALCDIRECTORY); } } - - FreeLibrary(hShell32); }

1 0

Michael Stefaniuc : rpcss: Use wide-char string literals.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: d1be006f16d490e7c92112e66363a3ec1367605a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1be006f16d490e7c92112e6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 18 23:33:30 2020 +0200 rpcss: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rpcss/rpcss_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/rpcss/rpcss_main.c b/programs/rpcss/rpcss_main.c index e3859e4c3c9..7df859155e2 100644 --- a/programs/rpcss/rpcss_main.c +++ b/programs/rpcss/rpcss_main.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -static WCHAR rpcssW[] = {'R','p','c','S','s',0}; +static WCHAR rpcssW[] = L"RpcSs"; static HANDLE exit_event; static SERVICE_STATUS_HANDLE service_handle; @@ -149,10 +149,10 @@ static RPC_STATUS RPCSS_Initialize(void) { static unsigned short irot_protseq[] = IROT_PROTSEQ; static unsigned short irot_endpoint[] = IROT_ENDPOINT; - static unsigned short epm_protseq[] = {'n','c','a','c','n','_','n','p',0}; - static unsigned short epm_endpoint[] = {'\\','p','i','p','e','\\','e','p','m','a','p','p','e','r',0}; - static unsigned short epm_protseq_lrpc[] = {'n','c','a','l','r','p','c',0}; - static unsigned short epm_endpoint_lrpc[] = {'e','p','m','a','p','p','e','r',0}; + static unsigned short epm_protseq[] = L"ncacn_np"; + static unsigned short epm_endpoint[] = L"\\pipe\\epmapper"; + static unsigned short epm_protseq_lrpc[] = L"ncalrpc"; + static unsigned short epm_endpoint_lrpc[] = L"epmapper"; static unsigned short irpcss_protseq[] = IRPCSS_PROTSEQ; static unsigned short irpcss_endpoint[] = IRPCSS_ENDPOINT; static const struct protseq_map

1 0

Michael Stefaniuc : taskmgr: Use GetGuiResources() directly.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: d98cd9e82ae701e560befc44881476361ef5070a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d98cd9e82ae701e560befc44… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 18 23:33:27 2020 +0200 taskmgr: Use GetGuiResources() directly. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/perfdata.c | 9 ++------- programs/taskmgr/perfdata.h | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c index d81ab102482..67f0d934412 100644 --- a/programs/taskmgr/perfdata.c +++ b/programs/taskmgr/perfdata.c @@ -31,7 +31,6 @@ #include "perfdata.h" static PROCNTQSI pNtQuerySystemInformation = NULL; -static PROCGGR pGetGuiResources = NULL; static PROCGPIC pGetProcessIoCounters = NULL; static PROCISW64 pIsWow64Process = NULL; static CRITICAL_SECTION PerfDataCriticalSection; @@ -60,11 +59,9 @@ BOOL PerfDataInitialize(void) { LONG status; static const WCHAR wszNtdll[] = {'n','t','d','l','l','.','d','l','l',0}; - static const WCHAR wszUser32[] = {'u','s','e','r','3','2','.','d','l','l',0}; static const WCHAR wszKernel32[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; pNtQuerySystemInformation = (PROCNTQSI)GetProcAddress(GetModuleHandleW(wszNtdll), "NtQuerySystemInformation"); - pGetGuiResources = (PROCGGR)GetProcAddress(GetModuleHandleW(wszUser32), "GetGuiResources"); pGetProcessIoCounters = (PROCGPIC)GetProcAddress(GetModuleHandleW(wszKernel32), "GetProcessIoCounters"); pIsWow64Process = (PROCISW64)GetProcAddress(GetModuleHandleW(wszKernel32), "IsWow64Process"); @@ -297,10 +294,8 @@ void PerfDataRefresh(void) RevertToSelf(); CloseHandle(hProcessToken); } - if (pGetGuiResources) { - pPerfData[Idx].USERObjectCount = pGetGuiResources(hProcess, GR_USEROBJECTS); - pPerfData[Idx].GDIObjectCount = pGetGuiResources(hProcess, GR_GDIOBJECTS); - } + pPerfData[Idx].USERObjectCount = GetGuiResources(hProcess, GR_USEROBJECTS); + pPerfData[Idx].GDIObjectCount = GetGuiResources(hProcess, GR_GDIOBJECTS); if (pGetProcessIoCounters) pGetProcessIoCounters(hProcess, &pPerfData[Idx].IOCounters); if (pIsWow64Process) diff --git a/programs/taskmgr/perfdata.h b/programs/taskmgr/perfdata.h index d6a16028c4b..8b9fabbd910 100644 --- a/programs/taskmgr/perfdata.h +++ b/programs/taskmgr/perfdata.h @@ -67,7 +67,6 @@ struct _SYSTEM_PAGEFILE_INFORMATION #define GR_USEROBJECTS 1 /* Count of USER objects */ typedef LONG (WINAPI *PROCNTQSI)(UINT,PVOID,ULONG,PULONG); -typedef DWORD (WINAPI *PROCGGR)(HANDLE,DWORD); typedef BOOL (WINAPI *PROCGPIC)(HANDLE,PIO_COUNTERS); typedef BOOL (WINAPI *PROCISW64)(HANDLE,PBOOL);

1 0

Michael Stefaniuc : dsound: Use wide-char string literals.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: 716cfcb163a5fe670023155a751fcfd83cc3b28f URL: https://source.winehq.org/git/wine.git/?a=commit;h=716cfcb163a5fe670023155a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Oct 18 23:33:26 2020 +0200 dsound: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_main.c | 10 +++------- dlls/dsound/propset.c | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 3acee554ad9..ca33ba48046 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -88,7 +88,7 @@ CRITICAL_SECTION DSOUND_capturers_lock = { &DSOUND_capturers_lock_debug, -1, 0, GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; -const WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; +const WCHAR wine_vxd_drv[] = L"winemm.vxd"; /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ int ds_hel_buflen = 32768 * 2; @@ -454,10 +454,6 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, BOOL keep_going; HRESULT hr, init_hr; - static const WCHAR primary_desc[] = {'P','r','i','m','a','r','y',' ', - 'S','o','u','n','d',' ','D','r','i','v','e','r',0}; - static const WCHAR empty_drv[] = {0}; - init_hr = get_mmdevenum(&devenum); if(!devenum) return init_hr; @@ -484,8 +480,8 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, return DS_OK; } - TRACE("Calling back with NULL (%s)\n", wine_dbgstr_w(primary_desc)); - keep_going = cb(NULL, primary_desc, empty_drv, user); + TRACE("Calling back with NULL (Primary Sound Driver)\n"); + keep_going = cb(NULL, L"Primary Sound Driver", L"", user); /* always send the default device first */ if(keep_going){ diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index dcb2b871783..f1f71bef135 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); -static WCHAR wInterface[] = { 'I','n','t','e','r','f','a','c','e',0 }; +static WCHAR wInterface[] = L"Interface"; typedef struct IKsPrivatePropertySetImpl {

1 0

Louis Lenders : dwmapi: Quiet noisy fixme.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: 0c361793c3347caa06561eb3a3c6e2519e87bcec URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c361793c3347caa06561eb3… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Oct 19 10:31:29 2020 +0200 dwmapi: Quiet noisy fixme. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index eb11ecb6b7f..45c33c2169a 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -103,7 +103,9 @@ HRESULT WINAPI DwmGetColorizationColor(DWORD *colorization, BOOL opaque_blend) */ HRESULT WINAPI DwmFlush(void) { - FIXME("() stub\n"); + static BOOL once; + + if (!once++) FIXME("() stub\n"); return E_NOTIMPL; }

1 0

Zebediah Figura : ws2_32/tests: Fix an intermittent test failure on w10pro64.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: a0d386a310f78385cf7a74abf3172219bdbd2db3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0d386a310f78385cf7a74ab… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Oct 16 23:22:04 2020 -0500 ws2_32/tests: Fix an intermittent test failure on w10pro64. Much like 2aebe0b628. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5fb85bfaa60..fb580b6c8d6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3610,28 +3610,31 @@ static void test_select(void) ok(FD_ISSET(fdWrite, &readfds), "fdWrite socket is not in the set\n"); ret = recv(fdWrite, tmp_buf, sizeof(tmp_buf), 0); ok(ret == 0, "expected 0, got %d\n", ret); - - /* When a connection is attempted to a non-listening socket it will get to the except descriptor */ ret = closesocket(fdWrite); ok(ret == 0, "expected 0, got %d\n", ret); ret = closesocket(fdListen); ok(ret == 0, "expected 0, got %d\n", ret); - len = sizeof(address); - fdWrite = setup_connector_socket(&address, len, TRUE); - FD_ZERO_ALL(); - FD_SET(fdWrite, &writefds); - FD_SET(fdWrite, &exceptfds); - select_timeout.tv_sec = 2; /* requires more time to realize it will not connect */ - ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - ok(ret == 1, "expected 1, got %d\n", ret); - len = sizeof(id); - id = 0xdeadbeef; - ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); - ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); - ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); - ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); - closesocket(fdWrite); + + /* w10pro64 sometimes takes over 2 seconds for an error to be reported. */ + if (winetest_interactive) + { + len = sizeof(address); + fdWrite = setup_connector_socket(&address, len, TRUE); + FD_ZERO_ALL(); + FD_SET(fdWrite, &writefds); + FD_SET(fdWrite, &exceptfds); + select_timeout.tv_sec = 10; + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 1, "expected 1, got %d\n", ret); + len = sizeof(id); + id = 0xdeadbeef; + ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); + ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); + ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); + ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); + closesocket(fdWrite); + } /* Try select() on a closed socket after connection */ tcp_socketpair(&fdRead, &fdWrite);

1 0

Esme Povirk : windowscodecs: Add a unix library and start to use it for PNG.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: 0f61ed18ef0c3676139ba927e0d53751ec0e4491 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f61ed18ef0c3676139ba927… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:16 2020 -0500 windowscodecs: Add a unix library and start to use it for PNG. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 3 + dlls/windowscodecs/libpng.c | 97 +++++++++++++++++++++++++++++++ dlls/windowscodecs/main.c | 5 ++ dlls/windowscodecs/pngformat.c | 20 ++++++- dlls/windowscodecs/unix_iface.c | 101 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/unix_lib.c | 65 +++++++++++++++++++++ dlls/windowscodecs/wincodecs_common.h | 22 +++++++ dlls/windowscodecs/wincodecs_private.h | 35 ++++++++++++ 8 files changed, 345 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f61ed18ef0c3676139b…

1 0

Esme Povirk : windowscodecs: Start loading PNG in unix lib.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: 6aa8e179759ddba104b5682984048a61922f85f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aa8e179759ddba104b56829… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:17 2020 -0500 windowscodecs: Start loading PNG in unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 159 ++++++++++++++++++++++++++++++++- dlls/windowscodecs/main.c | 19 ++++ dlls/windowscodecs/pngformat.c | 21 ++++- dlls/windowscodecs/unix_iface.c | 14 ++- dlls/windowscodecs/unix_lib.c | 15 ++++ dlls/windowscodecs/wincodecs_common.h | 5 ++ dlls/windowscodecs/wincodecs_private.h | 20 +++++ 7 files changed, 247 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6aa8e179759ddba104b5…

1 0

Esme Povirk : windowscodecs: Get PNG frame information from unix lib.
by Alexandre Julliard 19 Oct '20

19 Oct '20

Module: wine Branch: master Commit: 8b849e814bcf28368324620c8742bad888ac55d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b849e814bcf28368324620c… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Oct 9 14:56:18 2020 -0500 windowscodecs: Get PNG frame information from unix lib. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libpng.c | 201 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/pngformat.c | 96 ++-------------- dlls/windowscodecs/unix_iface.c | 7 ++ dlls/windowscodecs/unix_lib.c | 1 + dlls/windowscodecs/wincodecs_common.h | 5 + dlls/windowscodecs/wincodecs_private.h | 13 +++ 6 files changed, 238 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b849e814bcf28368324…

1 0