January 2022 - Wine-commits

Andrew Eikum : winmm: Don't process audio data during waveOutWrite while playing.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 362e39a4a7154807c9707331cb5c707ff6c718d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=362e39a4a7154807c9707331… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 27 10:23:21 2022 -0600 winmm: Don't process audio data during waveOutWrite while playing. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 1 - dlls/winmm/waveform.c | 16 +++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 56501367190..5e46a2f46e5 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1640,7 +1640,6 @@ static void CALLBACK test_reentrant_callback_func(HWAVEOUT hwo, UINT uMsg, case WOM_DONE: /* verify that WOM_DONE is not sent during the following waveOutWrite */ - todo_wine_if(wom_done_count == 1) ok(g_tid == 0, "callback called reentrantly\n"); g_tid = GetCurrentThreadId(); diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 1159b48b483..ecffa700662 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -191,6 +191,7 @@ static LRESULT WOD_Close(HWAVEOUT hwave); static LRESULT WID_Open(WINMM_OpenInfo *info); static LRESULT WID_Close(HWAVEIN hwave); static MMRESULT WINMM_BeginPlaying(WINMM_Device *device); +static void WOD_PushData(WINMM_Device *device); void WINMM_DeleteWaveform(void) { @@ -775,8 +776,11 @@ static HRESULT reroute_mapper_device(WINMM_Device *device, BOOL is_out) HeapFree(GetProcessHeap(), 0, info.format); - if(!stopped) + if(!stopped){ + if(is_out) + WOD_PushData(device); WINMM_BeginPlaying(device); + } LeaveCriticalSection(&device->lock); @@ -1948,10 +1952,6 @@ static MMRESULT WINMM_BeginPlaying(WINMM_Device *device) TRACE("(%p)\n", device->handle); - if(device->render) - /* prebuffer data before starting */ - WOD_PushData(device); - if(device->stopped){ device->stopped = FALSE; @@ -2893,6 +2893,9 @@ UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR *header, UINT uSize) header->dwFlags &= ~WHDR_DONE; header->dwFlags |= WHDR_INQUEUE; + if(device->stopped) + WOD_PushData(device); + mr = WINMM_BeginPlaying(device); LeaveCriticalSection(&device->lock); @@ -2970,6 +2973,9 @@ UINT WINAPI waveOutRestart(HWAVEOUT hWaveOut) device->stopped = TRUE; + if(device->render) + WOD_PushData(device); + mr = WINMM_BeginPlaying(device); LeaveCriticalSection(&device->lock);

1 0

Rémi Bernon : setupapi/tests: Add possible test_need_media results for Win10.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 68b83a8a093d59d9ee085574c4c1ef64e6b28807 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68b83a8a093d59d9ee085574… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 27 13:30:04 2022 +0100 setupapi/tests: Add possible test_need_media results for Win10. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index c085b724b59..758a0761037 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -1120,7 +1120,7 @@ static void test_install_files_queue(void) ok(ret, "Failed to delete INF file, error %u.\n", GetLastError()); } -static unsigned int got_need_media, got_copy_error; +static unsigned int got_need_media, got_copy_error, got_start_copy; static unsigned int testmode; static UINT WINAPI need_media_cb(void *context, UINT message, UINT_PTR param1, UINT_PTR param2) @@ -1332,6 +1332,7 @@ static UINT WINAPI need_media_newpath_cb(void *context, UINT message, UINT_PTR p else return FILEOP_SKIP; } + else if (message == SPFILENOTIFY_STARTCOPY) got_start_copy++; return SetupDefaultQueueCallbackA(context, message, param1, param2); } @@ -1901,7 +1902,7 @@ static void test_need_media(void) ok(delete_file("dst/three.txt"), "Destination file should exist.\n"); testmode = 6; - got_need_media = got_copy_error = 0; + got_need_media = got_copy_error = got_start_copy = 0; queue = SetupOpenFileQueue(); ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError()); copy_params.QueueHandle = queue; @@ -1915,9 +1916,10 @@ static void test_need_media(void) run_queue(queue, need_media_newpath_cb); ok(got_need_media == 1, "Got %u callbacks.\n", got_need_media); ok(!got_copy_error, "Got %u copy errors.\n", got_copy_error); - ok(delete_file("dst/one.txt"), "Destination file should exist.\n"); + if (got_start_copy) ok(delete_file("dst/one.txt"), "Destination file should exist.\n"); + else ok(!file_exists("dst/one.txt"), "Destination file should not exist.\n"); - got_need_media = got_copy_error = 0; + got_need_media = got_copy_error = got_start_copy = 0; queue = SetupOpenFileQueue(); ok(queue != INVALID_HANDLE_VALUE, "Failed to open queue, error %#x.\n", GetLastError()); copy_params.LayoutInf = hinf; @@ -1928,7 +1930,8 @@ static void test_need_media(void) run_queue(queue, need_media_newpath_cb); ok(got_need_media == 1, "Got %u callbacks.\n", got_need_media); ok(!got_copy_error, "Got %u copy errors.\n", got_copy_error); - ok(delete_file("dst/one.txt"), "Destination file should exist.\n"); + if (got_start_copy) ok(delete_file("dst/one.txt"), "Destination file should exist.\n"); + else ok(!file_exists("dst/one.txt"), "Destination file should not exist.\n"); } else SetupCloseFileQueue(queue); @@ -1963,7 +1966,7 @@ static void test_close_queue(void) SetupTermDefaultQueueCallback(context); } -static unsigned int got_start_copy, start_copy_ret; +static unsigned int start_copy_ret; static UINT WINAPI start_copy_cb(void *context, UINT message, UINT_PTR param1, UINT_PTR param2) {

1 0

Rémi Bernon : setupapi/tests: Add some service installation flags tests.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 919ee014b93ba633ead2cfe44bcf475dbda55ecd URL: https://source.winehq.org/git/wine.git/?a=commit;h=919ee014b93ba633ead2cfe4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jan 27 13:30:05 2022 +0100 setupapi/tests: Add some service installation flags tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 188 +++++++++++++++++++++++++++++++++++------- 1 file changed, 157 insertions(+), 31 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 758a0761037..44b7d09d1e5 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -609,13 +609,26 @@ static void test_install_svc_from(void) /* TODO: Test the Flags */ } -static void test_driver_install(void) +static void test_service_install(const char *executable, const char *argument) { - HANDLE handle; + struct + { + const char *add_service_flags; + const char *service_type; + const char *start_type; + DWORD expect_start_error; + } tests[] = + { + {.add_service_flags = "", .service_type = "1", .start_type = "4", .expect_start_error = ERROR_SERVICE_DISABLED}, + {.add_service_flags = "", .service_type = "0x10", .start_type = "2", .expect_start_error = 0}, + {.add_service_flags = "0x800", .service_type = "0x10", .start_type = "2", .expect_start_error = ERROR_SERVICE_ALREADY_RUNNING}, + }; + SC_HANDLE scm_handle, svc_handle; + SERVICE_STATUS status; BOOL ret; char path[MAX_PATH + 9], windir[MAX_PATH], driver[MAX_PATH]; - DWORD attrs; + DWORD i, attrs; /* Minimal stuff needed */ static const char *inf = "[Version]\n" @@ -625,14 +638,15 @@ static void test_driver_install(void) "[DefaultInstall]\n" "CopyFiles=Winetest.DriverFiles\n" "[DefaultInstall.Services]\n" - "AddService=Winetest,,Winetest.Service\n" + "AddService=Winetest,%s,Winetest.Service\n" "[Winetest.Service]\n" - "ServiceBinary=%12%\\winetest.sys\n" - "ServiceType=1\n" - "StartType=4\n" + "ServiceBinary=%%12%%\\winetest.sys %s service\n" + "ServiceType=%s\n" + "StartType=%s\n" "ErrorControl=1\n" "[Winetest.DriverFiles]\n" "winetest.sys"; + char buffer[1024]; /* Bail out if we don't have enough rights */ SetLastError(0xdeadbeef); @@ -649,36 +663,70 @@ static void test_driver_install(void) lstrcpyA(driver, windir); lstrcatA(driver, "\\system32\\drivers\\winetest.sys"); - /* Create a dummy driver file */ - handle = CreateFileA("winetest.sys", GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - CloseHandle(handle); + ret = CopyFileA(executable, "winetest.sys", TRUE); + ok(ret, "CopyFileA failed, error %u\n", GetLastError()); - create_inf_file(inffile, inf); - sprintf(path, "%s\\%s", CURR_DIR, inffile); - run_cmdline("DefaultInstall", 128, path); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("%u", i); - /* Driver should have been installed */ - attrs = GetFileAttributesA(driver); - ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected driver to exist\n"); + sprintf(buffer, inf, tests[i].add_service_flags, argument, tests[i].service_type, tests[i].start_type); + create_inf_file(inffile, buffer); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + run_cmdline("DefaultInstall", 128, path); - scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); + /* Driver should have been installed */ + attrs = GetFileAttributesA(driver); + ok(attrs != INVALID_FILE_ATTRIBUTES, "Expected driver to exist\n"); - /* Open the service to see if it's really there */ - svc_handle = OpenServiceA(scm_handle, "Winetest", DELETE); - ok(svc_handle != NULL, "Service was not created\n"); + scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); - SetLastError(0xdeadbeef); - ret = DeleteService(svc_handle); - ok(ret, "Service could not be deleted : %d\n", GetLastError()); + /* Open the service to see if it's really there */ + svc_handle = OpenServiceA(scm_handle, "Winetest", SERVICE_START|SERVICE_STOP|SERVICE_QUERY_STATUS|DELETE); + ok(svc_handle != NULL, "Service was not created\n"); - CloseServiceHandle(svc_handle); - CloseServiceHandle(scm_handle); + ret = StartServiceA(svc_handle, 0, NULL); + if (!tests[i].expect_start_error) + ok(ret, "StartServiceA failed, error %u\n", GetLastError()); + else + { + ok(!ret, "StartServiceA succeeded\n"); + ok(GetLastError() == tests[i].expect_start_error, "got error %u\n", GetLastError()); + } + + ret = QueryServiceStatus(svc_handle, &status); + ok(ret, "QueryServiceStatus failed: %u\n", GetLastError()); + while (status.dwCurrentState == SERVICE_START_PENDING) + { + Sleep(100); + ret = QueryServiceStatus(svc_handle, &status); + ok(ret, "QueryServiceStatus failed: %u\n", GetLastError()); + } + + ret = ControlService(svc_handle, SERVICE_CONTROL_STOP, &status); + while (status.dwCurrentState == SERVICE_STOP_PENDING) + { + Sleep(100); + ret = QueryServiceStatus(svc_handle, &status); + ok(ret, "QueryServiceStatus failed: %u\n", GetLastError()); + } + ok(status.dwCurrentState == SERVICE_STOPPED, "expected SERVICE_STOPPED, got %d\n", status.dwCurrentState); + + SetLastError(0xdeadbeef); + ret = DeleteService(svc_handle); + ok(ret, "Service could not be deleted : %d\n", GetLastError()); + + CloseServiceHandle(svc_handle); + CloseServiceHandle(scm_handle); + + /* File cleanup */ + DeleteFileA(inffile); + DeleteFileA(driver); + + winetest_pop_context(); + } - /* File cleanup */ - DeleteFileA(inffile); DeleteFileA("winetest.sys"); - DeleteFileA(driver); } static void test_profile_items(void) @@ -2132,11 +2180,89 @@ static void test_register_dlls(void) ok(ret, "Failed to delete test DLL, error %u.\n", GetLastError()); } +static WCHAR service_name[] = L"Wine Test Service"; +static SERVICE_STATUS_HANDLE service_handle; +static HANDLE stop_event; + +static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) +{ + SERVICE_STATUS status; + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 0; + + switch(ctrl) + { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + trace( "shutting down\n" ); + status.dwCurrentState = SERVICE_STOP_PENDING; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + SetEvent( stop_event ); + return NO_ERROR; + default: + trace( "got service ctrl %x\n", ctrl ); + status.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus( service_handle, &status ); + return NO_ERROR; + } +} + +static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) +{ + SERVICE_STATUS status; + + trace( "starting service\n" ); + + stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + + service_handle = RegisterServiceCtrlHandlerExW( L"Wine Test Service", service_handler, NULL ); + if (!service_handle) + return; + + status.dwServiceType = SERVICE_WIN32; + status.dwCurrentState = SERVICE_RUNNING; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + status.dwWaitHint = 10000; + SetServiceStatus( service_handle, &status ); + + WaitForSingleObject( stop_event, INFINITE ); + + status.dwCurrentState = SERVICE_STOPPED; + status.dwControlsAccepted = 0; + SetServiceStatus( service_handle, &status ); + trace( "service stopped\n" ); +} + START_TEST(install) { - char temp_path[MAX_PATH], prev_path[MAX_PATH]; + char temp_path[MAX_PATH], prev_path[MAX_PATH], path[MAX_PATH]; + char **argv; DWORD len; + int argc; + + argc = winetest_get_mainargs(&argv); + if (argc > 2 && !strcmp( argv[2], "service" )) + { + static const SERVICE_TABLE_ENTRYW service_table[] = + { + { service_name, ServiceMain }, + { NULL, NULL } + }; + + StartServiceCtrlDispatcherW( service_table ); + return; + } + GetFullPathNameA(argv[0], ARRAY_SIZE(path), path, NULL); GetCurrentDirectoryA(MAX_PATH, prev_path); GetTempPathA(MAX_PATH, temp_path); SetCurrentDirectoryA(temp_path); @@ -2154,7 +2280,7 @@ START_TEST(install) test_registry(); test_install_from(); test_install_svc_from(); - test_driver_install(); + test_service_install(path, argv[1]); test_dirid(); test_install_files_queue(); test_need_media();

1 0

Rémi Bernon : wine.inf: Start PlugPlay service on prefix initialization.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: b0ca06efd19c4d759261e990ad0921969e0acc97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0ca06efd19c4d759261e990… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 26 10:50:17 2022 +0100 wine.inf: Start PlugPlay service on prefix initialization. Device drivers may be installed and started on prefix initialization but if PlugPlay is missing they won't be able to send plugplay notifications until the prefix is restarted. The service has StartType=2, and should start automatically. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c0251934dfc..3af8dabca64 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -178,7 +178,7 @@ AddService=RpcSs,0,RpcSsService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices -AddService=PlugPlay,0,PlugPlayService +AddService=PlugPlay,0x800,PlugPlayService AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService @@ -197,7 +197,7 @@ AddService=RpcSs,0,RpcSsService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices -AddService=PlugPlay,0,PlugPlayService +AddService=PlugPlay,0x800,PlugPlayService AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService @@ -216,7 +216,7 @@ AddService=RpcSs,0,RpcSsService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices -AddService=PlugPlay,0,PlugPlayService +AddService=PlugPlay,0x800,PlugPlayService AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService @@ -235,7 +235,7 @@ AddService=RpcSs,0,RpcSsService AddService=Spooler,0,SpoolerService AddService=StiSvc,0,StiService AddService=TermService,0,TerminalServices -AddService=PlugPlay,0,PlugPlayService +AddService=PlugPlay,0x800,PlugPlayService AddService=FontCache3.0.0.0,0,WPFFontCacheService AddService=LanmanServer,0,LanmanServerService AddService=FontCache,0,FontCacheService

1 0

Rémi Bernon : dinput/tests: Add some RegisterDeviceNotificationA and hotplug tests.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 22f9f5caead14be79751879ec117d9a2760eb4d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22f9f5caead14be79751879e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 26 10:50:18 2022 +0100 dinput/tests: Add some RegisterDeviceNotificationA and hotplug tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/dinput_test.h | 1 + dlls/dinput/tests/hid.c | 86 ++++++++++++ dlls/dinput/tests/hotplug.c | 283 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 369 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=22f9f5caead14be79751…

1 0

Rémi Bernon : wine.inf: Start EventLogService on prefix initialization.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 0c88a524401867ed0c0b72b644462805c76bf965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c88a524401867ed0c0b72b6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 26 10:50:19 2022 +0100 wine.inf: Start EventLogService on prefix initialization. The service has StartType=2, and should start automatically. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3af8dabca64..2fd4fbd22ea 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -171,7 +171,7 @@ WineFakeDlls=FakeDllsWin32 [DefaultInstall.Services] AddService=BITS,0,BITSService -AddService=EventLog,0,EventLogService +AddService=EventLog,0x800,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=RpcSs,0,RpcSsService @@ -190,7 +190,7 @@ AddService=nsiproxy,0x800,NsiProxyService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService -AddService=EventLog,0,EventLogService +AddService=EventLog,0x800,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=RpcSs,0,RpcSsService @@ -209,7 +209,7 @@ AddService=nsiproxy,0x800,NsiProxyService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService -AddService=EventLog,0,EventLogService +AddService=EventLog,0x800,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=RpcSs,0,RpcSsService @@ -228,7 +228,7 @@ AddService=nsiproxy,0x800,NsiProxyService [DefaultInstall.ntarm64.Services] AddService=BITS,0,BITSService -AddService=EventLog,0,EventLogService +AddService=EventLog,0x800,EventLogService AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=RpcSs,0,RpcSsService

1 0

Rémi Bernon : plugplay: Use ncacn_np instead of ncalrpc transport.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: baebd3c14f86c1438a5a822b7fc44ab438233d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baebd3c14f86c1438a5a822b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 26 10:50:20 2022 +0100 plugplay: Use ncacn_np instead of ncalrpc transport. The ncacn_np should be used when the endpoint is a pipe, ncalrpc should only be used with arbitrary named ports, which we translate into \\pipe\lrpc\xxx pipe names. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 2 +- dlls/sechost/service.c | 2 +- include/wine/plugplay.idl | 1 + programs/plugplay/main.c | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 6d53d79267e..8d3481b2a72 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -1084,7 +1084,7 @@ void pnp_manager_start(void) { static const WCHAR driver_nameW[] = {'\\','D','r','i','v','e','r','\\','P','n','p','M','a','n','a','g','e','r',0}; WCHAR endpoint[] = L"\\pipe\\wine_plugplay"; - WCHAR protseq[] = L"ncalrpc"; + WCHAR protseq[] = L"ncacn_np"; UNICODE_STRING driver_nameU; RPC_WSTR binding_str; NTSTATUS status; diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index e6f4eb75db0..4dfb40b4bac 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -1988,7 +1988,7 @@ struct device_notify_registration static DWORD WINAPI device_notify_proc( void *arg ) { WCHAR endpoint[] = L"\\pipe\\wine_plugplay"; - WCHAR protseq[] = L"ncalrpc"; + WCHAR protseq[] = L"ncacn_np"; RPC_WSTR binding_str; DWORD err = ERROR_SUCCESS; struct device_notify_registration *registration; diff --git a/include/wine/plugplay.idl b/include/wine/plugplay.idl index 8123b733ad1..a3e7b04bf30 100644 --- a/include/wine/plugplay.idl +++ b/include/wine/plugplay.idl @@ -20,6 +20,7 @@ import "wtypes.idl"; [ uuid(57c680ac-7bce-4f39-97fd-ffea566754d5), + endpoint("ncacn_np:[\\pipe\\wine_plugplay]"), implicit_handle(handle_t plugplay_binding_handle) ] interface plugplay diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c index 1156cb9f036..366be9c2b46 100644 --- a/programs/plugplay/main.c +++ b/programs/plugplay/main.c @@ -200,7 +200,7 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { unsigned char endpoint[] = "\\pipe\\wine_plugplay"; - unsigned char protseq[] = "ncalrpc"; + unsigned char protseq[] = "ncacn_np"; SERVICE_STATUS status; RPC_STATUS err;

1 0

Alexandre Julliard : include: Add support for defining Win32 types as 'long' where possible.
by Alexandre Julliard 27 Jan '22

27 Jan '22

1 0

Alexandre Julliard : makefiles: Force -Wformat for PE modules when using 'long' types.
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 0c0e8b576e6226cd722f328ad97f51c642f3ad53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c0e8b576e6226cd722f328a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 14:20:22 2022 +0100 makefiles: Force -Wformat for PE modules when using 'long' types. Suggested by Eric Pouech. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index 589ea7a7514..5dc0a97fdb3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3057,6 +3057,11 @@ static void output_source_default( struct makefile *make, struct incl_file *sour output_filenames( make->extlib ? extra_cross_cflags_extlib : extra_cross_cflags ); if (make->module && is_crt_module( make->module )) output_filename( "-fno-builtin" ); + /* force -Wformat when using 'long' types, until all modules have been converted + * and we can remove -Wno-format */ + if (!make->extlib && strarray_exists( &extra_cross_cflags, "-Wno-format" ) && + !strarray_exists( &defines, "-DWINE_NO_LONG_TYPES" )) + output_filename( "-Wformat" ); output_filenames( cpp_flags ); output_filename( "$(CROSSCFLAGS)" ); output( "\n" );

1 0

Paul Gofman : winhttp: Allow synchronous nonblocking send in send_socket_shutdown().
by Alexandre Julliard 27 Jan '22

27 Jan '22

Module: wine Branch: master Commit: 71ee671b65bd3895d015b54b534e3e0b64b95754 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71ee671b65bd3895d015b54b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jan 27 02:03:08 2022 +0300 winhttp: Allow synchronous nonblocking send in send_socket_shutdown(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 75 +++++++++++++++++++++++++++------------ dlls/winhttp/tests/notification.c | 2 +- dlls/winhttp/winhttp_private.h | 2 ++ 3 files changed, 55 insertions(+), 24 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a5bd828c9b7..62f53995258 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3727,6 +3727,19 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D return ret; } +static void socket_shutdown_complete( struct socket *socket, DWORD ret ) +{ + if (!ret) send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NULL, 0 ); + else + { + WINHTTP_WEB_SOCKET_ASYNC_RESULT result; + result.AsyncResult.dwResult = API_WRITE_DATA; + result.AsyncResult.dwError = ret; + result.Operation = WINHTTP_WEB_SOCKET_SHUTDOWN_OPERATION; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } +} + static void CALLBACK task_socket_shutdown( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) { struct socket_shutdown *s = ctx; @@ -3734,21 +3747,11 @@ static void CALLBACK task_socket_shutdown( TP_CALLBACK_INSTANCE *instance, void TRACE("running %p\n", work); - ret = send_frame( s->socket, SOCKET_OPCODE_CLOSE, s->status, s->reason, s->len, TRUE, NULL ); - send_io_complete( &s->socket->hdr ); + if (s->complete_async) ret = complete_send_frame( s->socket, &s->ovr, s->reason ); + else ret = send_frame( s->socket, SOCKET_OPCODE_CLOSE, s->status, s->reason, s->len, TRUE, NULL ); - if (s->send_callback) - { - if (!ret) send_callback( &s->socket->hdr, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NULL, 0 ); - else - { - WINHTTP_WEB_SOCKET_ASYNC_RESULT result; - result.AsyncResult.dwResult = API_WRITE_DATA; - result.AsyncResult.dwError = ret; - result.Operation = WINHTTP_WEB_SOCKET_SHUTDOWN_OPERATION; - send_callback( &s->socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); - } - } + send_io_complete( &s->socket->hdr ); + if (s->send_callback) socket_shutdown_complete( s->socket, ret ); release_object( &s->socket->hdr ); free( s ); } @@ -3762,22 +3765,48 @@ static DWORD send_socket_shutdown( struct socket *socket, USHORT status, const v if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { + BOOL async_send, complete_async = FALSE; struct socket_shutdown *s; if (!(s = malloc( sizeof(*s) ))) return FALSE; - s->socket = socket; - s->status = status; - memcpy( s->reason, reason, len ); - s->len = len; - s->send_callback = send_callback; - addref_object( &socket->hdr ); - InterlockedIncrement( &socket->hdr.pending_sends ); - if ((ret = queue_task( &socket->send_q, task_socket_shutdown, s ))) + async_send = InterlockedIncrement( &socket->hdr.pending_sends ) > 1 || socket->hdr.recursion_count >= 3; + if (!async_send) + { + memset( &s->ovr, 0, sizeof(s->ovr) ); + if ((ret = send_frame( socket, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE, &s->ovr )) == WSA_IO_PENDING) + { + async_send = TRUE; + complete_async = TRUE; + } + } + + if (async_send) + { + s->complete_async = complete_async; + s->socket = socket; + s->status = status; + memcpy( s->reason, reason, len ); + s->len = len; + s->send_callback = send_callback; + + addref_object( &socket->hdr ); + if ((ret = queue_task( &socket->send_q, task_socket_shutdown, s ))) + { + InterlockedDecrement( &socket->hdr.pending_sends ); + release_object( &socket->hdr ); + free( s ); + } + } + else { InterlockedDecrement( &socket->hdr.pending_sends ); - release_object( &socket->hdr ); free( s ); + if (send_callback) + { + socket_shutdown_complete( socket, ret ); + ret = ERROR_SUCCESS; + } } } else ret = send_frame( socket, SOCKET_OPCODE_CLOSE, status, reason, len, TRUE, NULL ); diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 5ec8740f66e..1ae7e1af2e7 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -677,7 +677,7 @@ static const struct notification websocket_test[] = { winhttp_websocket_complete_upgrade, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, NF_SIGNAL }, { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, - { winhttp_websocket_shutdown, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NF_SIGNAL }, + { winhttp_websocket_shutdown, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NF_MAIN_THREAD | NF_SIGNAL }, { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SAVE_BUFFER | NF_SIGNAL }, { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SAVE_BUFFER | NF_SIGNAL }, { winhttp_websocket_close, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, NF_SIGNAL }, diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index b41eb0ee676..3e4e1eb298d 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -323,6 +323,8 @@ struct socket_shutdown char reason[123]; DWORD len; BOOL send_callback; + WSAOVERLAPPED ovr; + BOOL complete_async; }; struct object_header *addref_object( struct object_header * ) DECLSPEC_HIDDEN;

1 0