May 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : kernelbase: Implement SetEnvironmentStrings().
by Alexandre Julliard May 7, 2020

May 7, 2020

Module: wine Branch: master Commit: 877bf2a7a09b9fb21f1aeb7a576a033bf5910f16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=877bf2a7a09b9fb21f1aeb7a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 6 09:40:28 2020 -0500 kernelbase: Implement SetEnvironmentStrings(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48308 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processenvironment-l1-1-0.spec | 2 +- .../api-ms-win-core-processenvironment-l1-2-0.spec | 2 +- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/tests/environ.c | 86 ++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 3 +- dlls/kernelbase/process.c | 66 +++++++++++++++++ include/winbase.h | 3 + 7 files changed, 161 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=877bf2a7a09b9fb21f1a…

1 0

Zebediah Figura : ntdll/tests: Add tests for RtlSetCurrentEnvironment().
by Alexandre Julliard May 7, 2020

May 7, 2020

Module: wine Branch: master Commit: d98b87a317bf5b38cfc0c14e9369c9c2c20ebb17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d98b87a317bf5b38cfc0c14e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 6 09:40:26 2020 -0500 ntdll/tests: Add tests for RtlSetCurrentEnvironment(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/env.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/ntdll/tests/env.c b/dlls/ntdll/tests/env.c index 48c9ed809e..98a9f7bb56 100644 --- a/dlls/ntdll/tests/env.c +++ b/dlls/ntdll/tests/env.c @@ -515,6 +515,72 @@ static void test_process_params(void) } } +static NTSTATUS set_env_var(WCHAR **env, const WCHAR *var, const WCHAR *value) +{ + UNICODE_STRING var_string, value_string; + RtlInitUnicodeString(&var_string, var); + RtlInitUnicodeString(&value_string, value); + return RtlSetEnvironmentVariable(env, &var_string, &value_string); +} + +static void check_env_var_(int line, const char *var, const char *value) +{ + char buffer[20]; + DWORD size = GetEnvironmentVariableA(var, buffer, sizeof(buffer)); + if (value) + { + ok_(__FILE__, line)(size == strlen(value), "wrong size %u\n", size); + ok_(__FILE__, line)(!strcmp(buffer, value), "wrong value %s\n", debugstr_a(buffer)); + } + else + { + ok_(__FILE__, line)(!size, "wrong size %u\n", size); + ok_(__FILE__, line)(GetLastError() == ERROR_ENVVAR_NOT_FOUND, "got error %u\n", GetLastError()); + } +} +#define check_env_var(a, b) check_env_var_(__LINE__, a, b) + +static void test_RtlSetCurrentEnvironment(void) +{ + NTSTATUS status; + WCHAR *old_env, *env, *prev; + BOOL ret; + + status = RtlCreateEnvironment(FALSE, &env); + ok(!status, "got %#x\n", status); + + ret = SetEnvironmentVariableA("testenv1", "heis"); + ok(ret, "got error %u\n", GetLastError()); + ret = SetEnvironmentVariableA("testenv2", "dyo"); + ok(ret, "got error %u\n", GetLastError()); + + status = set_env_var(&env, L"testenv1", L"unus"); + ok(!status, "got %#x\n", status); + status = set_env_var(&env, L"testenv3", L"tres"); + ok(!status, "got %#x\n", status); + + old_env = NtCurrentTeb()->Peb->ProcessParameters->Environment; + + RtlSetCurrentEnvironment(env, &prev); + ok(prev == old_env, "got wrong previous env %p\n", prev); + ok(NtCurrentTeb()->Peb->ProcessParameters->Environment == env, "got wrong current env\n"); + + check_env_var("testenv1", "unus"); + check_env_var("testenv2", NULL); + check_env_var("testenv3", "tres"); + check_env_var("PATH", NULL); + + RtlSetCurrentEnvironment(old_env, NULL); + ok(NtCurrentTeb()->Peb->ProcessParameters->Environment == old_env, "got wrong current env\n"); + + check_env_var("testenv1", "heis"); + check_env_var("testenv2", "dyo"); + check_env_var("testenv3", NULL); + + SetEnvironmentVariableA("testenv1", NULL); + SetEnvironmentVariableA("testenv2", NULL); +} + START_TEST(env) { HMODULE mod = GetModuleHandleA("ntdll.dll"); @@ -535,4 +601,5 @@ START_TEST(env) testSet(); testExpand(); test_process_params(); + test_RtlSetCurrentEnvironment(); }

1 0

Brendan Shanks : user32/tests: Test success for QueryDisplayConfig() and DisplayConfigGetDeviceInfo().
by Alexandre Julliard May 6, 2020

May 6, 2020

Module: wine Branch: master Commit: 148fc1adb53aa1d78a67b2a0ee5ea8058d92589a URL: https://source.winehq.org/git/wine.git/?a=commit;h=148fc1adb53aa1d78a67b2a0… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed May 6 10:17:30 2020 -0700 user32/tests: Test success for QueryDisplayConfig() and DisplayConfigGetDeviceInfo(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 111 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 110 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index c3c43d6f60..205df1c293 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1268,6 +1268,98 @@ static void test_EnumDisplayMonitors(void) } } +static void test_QueryDisplayConfig_result(UINT32 paths, const DISPLAYCONFIG_PATH_INFO *pi, UINT32 modes, const DISPLAYCONFIG_MODE_INFO *mi) +{ + UINT32 i; + LONG ret; + DISPLAYCONFIG_SOURCE_DEVICE_NAME source_name; + DISPLAYCONFIG_TARGET_DEVICE_NAME target_name; + DISPLAYCONFIG_TARGET_PREFERRED_MODE preferred_mode; + DISPLAYCONFIG_ADAPTER_NAME adapter_name; + + for (i = 0; i < paths; i++) + { + source_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_SOURCE_NAME; + source_name.header.size = sizeof(source_name); + source_name.header.adapterId = pi[i].sourceInfo.adapterId; + source_name.header.id = pi[i].sourceInfo.id; + source_name.viewGdiDeviceName[0] = '\0'; + ret = pDisplayConfigGetDeviceInfo(&source_name.header); + ok(!ret, "Expected 0, got %d\n", ret); + ok(source_name.viewGdiDeviceName[0] != '\0', "Expected GDI device name, got empty string\n"); + + target_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME; + target_name.header.size = sizeof(target_name); + target_name.header.adapterId = pi[i].targetInfo.adapterId; + target_name.header.id = pi[i].targetInfo.id; + target_name.monitorDevicePath[0] = '\0'; + ret = pDisplayConfigGetDeviceInfo(&target_name.header); + ok(!ret, "Expected 0, got %d\n", ret); + ok(target_name.monitorDevicePath[0] != '\0', "Expected monitor device path, got empty string\n"); + + preferred_mode.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE; + preferred_mode.header.size = sizeof(preferred_mode); + preferred_mode.header.adapterId = pi[i].targetInfo.adapterId; + preferred_mode.header.id = pi[i].targetInfo.id; + preferred_mode.width = preferred_mode.height = 0; + ret = pDisplayConfigGetDeviceInfo(&preferred_mode.header); + ok(!ret, "Expected 0, got %d\n", ret); + ok(preferred_mode.width > 0 && preferred_mode.height > 0, "Expected non-zero height/width, got %ux%u\n", + preferred_mode.width, preferred_mode.height); + + adapter_name.header.type = DISPLAYCONFIG_DEVICE_INFO_GET_ADAPTER_NAME; + adapter_name.header.size = sizeof(adapter_name); + adapter_name.header.adapterId = pi[i].sourceInfo.adapterId; + adapter_name.adapterDevicePath[0] = '\0'; + ret = pDisplayConfigGetDeviceInfo(&adapter_name.header); + ok(!ret, "Expected 0, got %d\n", ret); + ok(adapter_name.adapterDevicePath[0] != '\0', "Expected adapter device path, got empty string\n"); + + /* Check corresponding modes */ + if (pi[i].sourceInfo.modeInfoIdx == DISPLAYCONFIG_PATH_MODE_IDX_INVALID) + { + skip("Path doesn't contain source modeInfoIdx"); + continue; + } + ok(pi[i].sourceInfo.modeInfoIdx < modes, "Expected index <%d, got %d\n", modes, pi[i].sourceInfo.modeInfoIdx); + if (pi[i].sourceInfo.modeInfoIdx >= modes) + continue; + + ok(mi[pi[i].sourceInfo.modeInfoIdx].infoType == DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE, "Expected infoType %d, got %d\n", + DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE, mi[pi[i].sourceInfo.modeInfoIdx].infoType); + ok(pi[i].sourceInfo.id == mi[pi[i].sourceInfo.modeInfoIdx].id, "Expected id %u, got %u\n", + pi[i].sourceInfo.id, mi[pi[i].sourceInfo.modeInfoIdx].id); + ok(pi[i].sourceInfo.adapterId.HighPart == mi[pi[i].sourceInfo.modeInfoIdx].adapterId.HighPart && + pi[i].sourceInfo.adapterId.LowPart == mi[pi[i].sourceInfo.modeInfoIdx].adapterId.LowPart, + "Expected LUID %08x:%08x, got %08x:%08x\n", + pi[i].sourceInfo.adapterId.HighPart, pi[i].sourceInfo.adapterId.LowPart, + mi[pi[i].sourceInfo.modeInfoIdx].adapterId.HighPart, mi[pi[i].sourceInfo.modeInfoIdx].adapterId.LowPart); + ok(mi[pi[i].sourceInfo.modeInfoIdx].sourceMode.width > 0 && mi[pi[i].sourceInfo.modeInfoIdx].sourceMode.height > 0, + "Expected non-zero height/width, got %ux%u\n", + mi[pi[i].sourceInfo.modeInfoIdx].sourceMode.width, mi[pi[i].sourceInfo.modeInfoIdx].sourceMode.height); + + + if (pi[i].targetInfo.modeInfoIdx == DISPLAYCONFIG_PATH_MODE_IDX_INVALID) + { + skip("Path doesn't contain target modeInfoIdx"); + continue; + } + ok(pi[i].targetInfo.modeInfoIdx < modes, "Expected index <%d, got %d\n", modes, pi[i].targetInfo.modeInfoIdx); + if (pi[i].targetInfo.modeInfoIdx >= modes) + continue; + + ok(mi[pi[i].targetInfo.modeInfoIdx].infoType == DISPLAYCONFIG_MODE_INFO_TYPE_TARGET, "Expected infoType %d, got %d\n", + DISPLAYCONFIG_MODE_INFO_TYPE_SOURCE, mi[pi[i].targetInfo.modeInfoIdx].infoType); + ok(pi[i].targetInfo.id == mi[pi[i].targetInfo.modeInfoIdx].id, "Expected id %u, got %u\n", + pi[i].targetInfo.id, mi[pi[i].targetInfo.modeInfoIdx].id); + ok(pi[i].targetInfo.adapterId.HighPart == mi[pi[i].targetInfo.modeInfoIdx].adapterId.HighPart && + pi[i].targetInfo.adapterId.LowPart == mi[pi[i].targetInfo.modeInfoIdx].adapterId.LowPart, + "Expected LUID %08x:%08x, got %08x:%08x\n", + pi[i].targetInfo.adapterId.HighPart, pi[i].targetInfo.adapterId.LowPart, + mi[pi[i].targetInfo.modeInfoIdx].adapterId.HighPart, mi[pi[i].targetInfo.modeInfoIdx].adapterId.LowPart); + } +} + static void test_QueryDisplayConfig(void) { UINT32 paths, modes; @@ -1315,13 +1407,30 @@ static void test_QueryDisplayConfig(void) ret = pQueryDisplayConfig(0, &paths, pi, &modes, mi, NULL); ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); + /* Below this point, test functionality that requires a WDDM driver on Windows */ paths = modes = 1; memset(pi, 0xFF, sizeof(pi[0])); memset(mi, 0xFF, sizeof(mi[0])); ret = pQueryDisplayConfig(QDC_ALL_PATHS, &paths, pi, &modes, mi, NULL); - ok(ret == ERROR_INSUFFICIENT_BUFFER || ret == ERROR_NOT_SUPPORTED, "got %d\n", ret); + if (ret == ERROR_NOT_SUPPORTED) + { + todo_wine + win_skip("QueryDisplayConfig() functionality is unsupported\n"); + return; + } + ok(ret == ERROR_INSUFFICIENT_BUFFER, "got %d\n", ret); ok (paths == 1, "got %u\n", paths); ok (modes == 1, "got %u\n", modes); + + paths = ARRAY_SIZE(pi); + modes = ARRAY_SIZE(mi); + memset(pi, 0xFF, sizeof(pi)); + memset(mi, 0xFF, sizeof(mi)); + ret = pQueryDisplayConfig(QDC_ONLY_ACTIVE_PATHS, &paths, pi, &modes, mi, NULL); + ok(!ret, "got %d\n", ret); + ok(paths > 0 && modes > 0, "got %u, %u\n", paths, modes); + if (!ret && paths > 0 && modes > 0) + test_QueryDisplayConfig_result(paths, pi, modes, mi); } static void test_DisplayConfigGetDeviceInfo(void)

1 0

Brendan Shanks : user32/tests: Rename DisplayConfig test functions to match style.
by Alexandre Julliard May 6, 2020

May 6, 2020

Module: wine Branch: master Commit: c95adb32b8795b78565c9a67e46d0a680b4f2841 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c95adb32b8795b78565c9a67… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed May 6 10:17:29 2020 -0700 user32/tests: Rename DisplayConfig test functions to match style. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index fb5e331c25..c3c43d6f60 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -1107,7 +1107,7 @@ static void test_work_area(void) DestroyWindow(hwnd); } -static void test_get_display_config_buffer_sizes(void) +static void test_GetDisplayConfigBufferSizes(void) { UINT32 paths, modes; LONG ret; @@ -1268,7 +1268,7 @@ static void test_EnumDisplayMonitors(void) } } -static void test_query_display_config(void) +static void test_QueryDisplayConfig(void) { UINT32 paths, modes; DISPLAYCONFIG_PATH_INFO pi[10]; @@ -1324,7 +1324,7 @@ static void test_query_display_config(void) ok (modes == 1, "got %u\n", modes); } -static void test_display_config_get_device_info(void) +static void test_DisplayConfigGetDeviceInfo(void) { LONG ret; DISPLAYCONFIG_SOURCE_DEVICE_NAME source_name; @@ -1422,9 +1422,9 @@ static void test_display_config(void) return; } - test_get_display_config_buffer_sizes(); - test_query_display_config(); - test_display_config_get_device_info(); + test_GetDisplayConfigBufferSizes(); + test_QueryDisplayConfig(); + test_DisplayConfigGetDeviceInfo(); } START_TEST(monitor)

1 0

Brendan Shanks : include: Add additional DISPLAYCONFIG defines.
by Alexandre Julliard May 6, 2020

May 6, 2020

Module: wine Branch: master Commit: d6dd7d0b058092ab0319fa278ecc209409e54485 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6dd7d0b058092ab0319fa27… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed May 6 10:17:28 2020 -0700 include: Add additional DISPLAYCONFIG defines. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wingdi.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/wingdi.h b/include/wingdi.h index de028f5212..d989fb6f71 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3637,10 +3637,30 @@ typedef struct DISPLAYCONFIG_SDR_WHITE_LEVEL { ULONG SDRWhiteLevel; } DISPLAYCONFIG_SDR_WHITE_LEVEL; +#define DISPLAYCONFIG_PATH_MODE_IDX_INVALID 0xffffffff +#define DISPLAYCONFIG_PATH_TARGET_MODE_IDX_INVALID 0xffff +#define DISPLAYCONFIG_PATH_DESKTOP_IMAGE_IDX_INVALID 0xffff +#define DISPLAYCONFIG_PATH_SOURCE_MODE_IDX_INVALID 0xffff +#define DISPLAYCONFIG_PATH_CLONE_GROUP_INVALID 0xffff + +#define DISPLAYCONFIG_SOURCE_IN_USE 0x00000001 + +#define DISPLAYCONFIG_TARGET_IN_USE 0x00000001 +#define DISPLAYCONFIG_TARGET_FORCIBLE 0x00000002 +#define DISPLAYCONFIG_TARGET_FORCED_AVAILABILITY_BOOT 0x00000004 +#define DISPLAYCONFIG_TARGET_FORCED_AVAILABILITY_PATH 0x00000008 +#define DISPLAYCONFIG_TARGET_FORCED_AVAILABILITY_SYSTEM 0x00000010 +#define DISPLAYCONFIG_TARGET_IS_HMD 0x00000020 + +#define DISPLAYCONFIG_PATH_ACTIVE 0x00000001 +#define DISPLAYCONFIG_PATH_SUPPORT_VIRTUAL_MODE 0x00000008 + /* For GetDisplayConfigBufferSizes */ #define QDC_ALL_PATHS 0x00000001 #define QDC_ONLY_ACTIVE_PATHS 0x00000002 #define QDC_DATABASE_CURRENT 0x00000004 +#define QDC_VIRTUAL_MODE_AWARE 0x00000010 +#define QDC_INCLUDE_HMD 0x00000020 #define GDI_ERROR (~0u) #define HGDI_ERROR ((HANDLE)~(ULONG_PTR)0)

1 0

Zebediah Figura : ntoskrnl.exe: Broadcast device notifications to registered handlers.
by Alexandre Julliard May 6, 2020

May 6, 2020

Module: wine Branch: master Commit: d80101f17a10f490f669bf72f2e5e4e3f18c2711 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d80101f17a10f490f669bf72… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 5 11:25:39 2020 -0500 ntoskrnl.exe: Broadcast device notifications to registered handlers. Based on a patch by Micah N Gorrell. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/Makefile.in | 5 ++++- dlls/ntoskrnl.exe/plugplay.idl | 2 ++ dlls/ntoskrnl.exe/pnp.c | 50 +++++++++++++++++++++++++++++++++++++++--- include/wine/plugplay.idl | 1 + programs/plugplay/main.c | 28 +++++++++++++++++++++++ 5 files changed, 82 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index 67afa8f9d8..85bc1ce698 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -1,7 +1,7 @@ MODULE = ntoskrnl.exe IMPORTLIB = ntoskrnl IMPORTS = advapi32 hal msvcrt -DELAYIMPORTS = setupapi user32 +DELAYIMPORTS = rpcrt4 setupapi user32 EXTRADLLFLAGS = -mno-cygwin @@ -12,3 +12,6 @@ C_SRCS = \ sync.c RC_SRCS = ntoskrnl.rc + +IDL_SRCS = \ + plugplay.idl diff --git a/dlls/ntoskrnl.exe/plugplay.idl b/dlls/ntoskrnl.exe/plugplay.idl new file mode 100644 index 0000000000..05e040388e --- /dev/null +++ b/dlls/ntoskrnl.exe/plugplay.idl @@ -0,0 +1,2 @@ +#pragma makedep client +#include "wine/plugplay.idl" diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 9e4c2c1416..470e2368fb 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -39,10 +39,12 @@ #include "ddk/wdm.h" #include "ddk/ntifs.h" #include "wine/debug.h" +#include "wine/exception.h" #include "wine/heap.h" #include "wine/rbtree.h" #include "ntoskrnl_private.h" +#include "plugplay.h" #include "initguid.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -651,6 +653,35 @@ static NTSTATUS create_device_symlink( DEVICE_OBJECT *device, UNICODE_STRING *sy return ret; } +void __RPC_FAR * __RPC_USER MIDL_user_allocate( SIZE_T len ) +{ + return heap_alloc( len ); +} + +void __RPC_USER MIDL_user_free( void __RPC_FAR *ptr ) +{ + heap_free( ptr ); +} + +static LONG WINAPI rpc_filter( EXCEPTION_POINTERS *eptr ) +{ + return I_RpcExceptionFilter( eptr->ExceptionRecord->ExceptionCode ); +} + +static void send_devicechange( DWORD code, void *data, unsigned int size ) +{ + BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, code, (LPARAM)data ); + __TRY + { + plugplay_send_event( code, data, size ); + } + __EXCEPT(rpc_filter) + { + WARN("Failed to send event, exception %#x.\n", GetExceptionCode()); + } + __ENDTRY +} + /*********************************************************************** * IoSetDeviceInterfaceState (NTOSKRNL.EXE.@) */ @@ -756,9 +787,7 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable broadcast->dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; broadcast->dbcc_classguid = iface->interface_class; lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 ); - BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, - enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, (LPARAM)broadcast ); - + send_devicechange( enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, broadcast, len ); heap_free( broadcast ); } return ret; @@ -1002,12 +1031,26 @@ static NTSTATUS WINAPI pnp_manager_driver_entry( DRIVER_OBJECT *driver, UNICODE_ 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"; UNICODE_STRING driver_nameU; + RPC_WSTR binding_str; NTSTATUS status; + RPC_STATUS err; RtlInitUnicodeString( &driver_nameU, driver_nameW ); if ((status = IoCreateDriver( &driver_nameU, pnp_manager_driver_entry ))) ERR("Failed to create PnP manager driver, status %#x.\n", status); + + if ((err = RpcStringBindingComposeW( NULL, protseq, NULL, endpoint, NULL, &binding_str ))) + { + ERR("RpcStringBindingCompose() failed, error %#x\n", err); + return; + } + err = RpcBindingFromStringBindingW( binding_str, &plugplay_binding_handle ); + RpcStringFreeW( &binding_str ); + if (err) + ERR("RpcBindingFromStringBinding() failed, error %#x\n", err); } static void destroy_root_pnp_device( struct wine_rb_entry *entry, void *context ) @@ -1020,6 +1063,7 @@ void pnp_manager_stop(void) { wine_rb_destroy( &root_pnp_devices, destroy_root_pnp_device, NULL ); IoDeleteDriver( pnp_manager ); + RpcBindingFree( &plugplay_binding_handle ); } void pnp_manager_enumerate_root_devices( const WCHAR *driver_name ) diff --git a/include/wine/plugplay.idl b/include/wine/plugplay.idl index 7cc5919124..8123b733ad 100644 --- a/include/wine/plugplay.idl +++ b/include/wine/plugplay.idl @@ -29,4 +29,5 @@ interface plugplay plugplay_rpc_handle plugplay_register_listener(); DWORD plugplay_get_event([in] plugplay_rpc_handle handle, [out, size_is(,*size)] BYTE **data, [out] unsigned int *size); void plugplay_unregister_listener([in] plugplay_rpc_handle handle); + void plugplay_send_event([in] DWORD event_code, [in, size_is(size)] const BYTE *data, [in] unsigned int size); } diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c index 59561dca50..00af2b0adf 100644 --- a/programs/plugplay/main.c +++ b/programs/plugplay/main.c @@ -136,6 +136,34 @@ void __cdecl plugplay_unregister_listener( plugplay_rpc_handle handle ) destroy_listener( handle ); } +void __cdecl plugplay_send_event( DWORD code, const BYTE *data, unsigned int size ) +{ + struct listener *listener; + struct event *event; + + EnterCriticalSection( &plugplay_cs ); + + LIST_FOR_EACH_ENTRY(listener, &listener_list, struct listener, entry) + { + if (!(event = malloc( sizeof(*event) ))) + break; + + if (!(event->data = malloc( size ))) + { + free( event ); + break; + } + + event->code = code; + memcpy( event->data, data, size ); + event->size = size; + list_add_tail( &listener->events, &event->entry ); + WakeConditionVariable( &listener->cv ); + } + + LeaveCriticalSection( &plugplay_cs ); +} + static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) { SERVICE_STATUS status;

1 0

Zebediah Figura : sechost: Implement I_ScRegisterDeviceNotification().
by Alexandre Julliard May 6, 2020

May 6, 2020

Module: wine Branch: master Commit: 6cf777ebd5f33e25743563eec49fa810a3080ee4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cf777ebd5f33e25743563ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 5 11:25:38 2020 -0500 sechost: Implement I_ScRegisterDeviceNotification(). Based on a patch by Micah N Gorrell. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sechost/Makefile.in | 1 + dlls/sechost/plugplay.idl | 2 + dlls/sechost/sechost.spec | 4 +- dlls/sechost/service.c | 148 +++++++++++++++++++++++++++++++++++++++++ include/wine/plugplay.idl | 32 +++++++++ programs/plugplay/Makefile.in | 5 +- programs/plugplay/main.c | 130 ++++++++++++++++++++++++++++++++++++ programs/plugplay/plugplay.idl | 2 + 8 files changed, 321 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6cf777ebd5f33e257435…

1 0

Zhiyi Zhang : comctl32/tests: Test button styles.
by Alexandre Julliard May 6, 2020

May 6, 2020

Module: wine Branch: master Commit: 01fbe206174c0113f947ba24129e88365de7d643 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01fbe206174c0113f947ba24… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 6 16:47:47 2020 +0800 comctl32/tests: Test button styles. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 14071b2ecd..933db6e982 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -2276,6 +2276,41 @@ static void test_bcm_get_ideal_size(void) DeleteObject(hfont); } +static void test_style(void) +{ + DWORD type, expected_type; + HWND button; + LRESULT ret; + DWORD i, j; + + for (i = BS_PUSHBUTTON; i <= BS_DEFCOMMANDLINK; ++i) + { + button = CreateWindowA(WC_BUTTONA, "test", i, 0, 0, 50, 50, NULL, 0, 0, NULL); + ok(button != NULL, "Expected button not null.\n"); + + type = GetWindowLongW(button, GWL_STYLE) & BS_TYPEMASK; + expected_type = (i == BS_USERBUTTON ? BS_PUSHBUTTON : i); + ok(type == expected_type, "Expected type %#x, got %#x.\n", expected_type, type); + + for (j = BS_PUSHBUTTON; j <= BS_DEFCOMMANDLINK; ++j) + { + ret = SendMessageA(button, BM_SETSTYLE, j, FALSE); + ok(ret == 0, "Expected %#x, got %#lx.\n", 0, ret); + + type = GetWindowLongW(button, GWL_STYLE) & BS_TYPEMASK; + if (i >= BS_SPLITBUTTON && j <= BS_DEFPUSHBUTTON) + expected_type = (i & ~BS_DEFPUSHBUTTON) | j; + else + expected_type = j; + + todo_wine_if(i >= BS_SPLITBUTTON && j <= BS_DEFPUSHBUTTON) + ok(type == expected_type || broken(type == j), /* XP */ + "Original type %#x, expected new type %#x, got %#x.\n", i, expected_type, type); + } + DestroyWindow(button); + } +} + START_TEST(button) { ULONG_PTR ctx_cookie; @@ -2298,6 +2333,7 @@ START_TEST(button) test_get_set_textmargin(); test_state(); test_bcm_get_ideal_size(); + test_style(); unload_v6_module(ctx_cookie, hCtx); }

1 0

Nikolay Sivov : dwrite: Enable global directional substitution features.
by Alexandre Julliard May 6, 2020

May 6, 2020

Module: wine Branch: master Commit: 1f90b33daf1051800ca96af9db8d3b6f7868b2fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f90b33daf1051800ca96af9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 6 15:44:45 2020 +0300 dwrite: Enable global directional substitution features. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/shape.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index e7693b58ae..0372d739b5 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -301,6 +301,17 @@ HRESULT shape_get_glyphs(struct scriptshaping_context *context, const unsigned i struct shaping_features features = { 0 }; unsigned int i; + if (!context->is_sideways) + { + if (context->is_rtl) + shape_add_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('r','t','l','a')); + else + { + shape_add_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('l','t','r','a')); + shape_add_feature(&features, DWRITE_MAKE_OPENTYPE_TAG('l','t','r','m')); + } + } + for (i = 0; i < ARRAY_SIZE(common_features); ++i) shape_add_feature(&features, common_features[i]);

1 0

Gabriel Ivăncescu : cmd.exe: Don't treat explicit paths as a PATH search list.
by Alexandre Julliard May 6, 2020

May 6, 2020

Module: wine Branch: master Commit: a19a770f96ca1b09c4bef449c082b7da38964dca URL: https://source.winehq.org/git/wine.git/?a=commit;h=a19a770f96ca1b09c4bef449… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue May 5 16:10:37 2020 +0300 cmd.exe: Don't treat explicit paths as a PATH search list. For example, the explicit path "C:\some;path" is currently treated as if the PATH environment variable is "C:\some;path" which is obviously wrong, and searches for the directories "C:\some" and "path". Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 63 +++++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 16843e4087..4026f3e6be 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1045,6 +1045,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) WCHAR pathext[MAXSTRING]; WCHAR *firstParam; BOOL extensionsupplied = FALSE; + BOOL explicit_path = FALSE; BOOL status; DWORD len; static const WCHAR envPath[] = {'P','A','T','H','\0'}; @@ -1084,6 +1085,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Reduce pathtosearch to a path with trailing '\' to support c:\a.bat and c:\windows\a.bat syntax */ if (lastSlash) *(lastSlash + 1) = 0x00; + explicit_path = TRUE; } /* Now extract PATHEXT */ @@ -1103,37 +1105,48 @@ void WCMD_run_program (WCHAR *command, BOOL called) BOOL found = FALSE; BOOL inside_quotes = FALSE; - /* Work on the first directory on the search path */ - pos = pathposn; - while ((inside_quotes || *pos != ';') && *pos != 0) + if (explicit_path) { - if (*pos == '"') - inside_quotes = !inside_quotes; - pos++; + lstrcpyW(thisDir, pathposn); + pathposn = NULL; } + else + { + /* Work on the next directory on the search path */ + pos = pathposn; + while ((inside_quotes || *pos != ';') && *pos != 0) + { + if (*pos == '"') + inside_quotes = !inside_quotes; + pos++; + } - if (*pos) { /* Reached semicolon */ - memcpy(thisDir, pathposn, (pos-pathposn) * sizeof(WCHAR)); - thisDir[(pos-pathposn)] = 0x00; - pathposn = pos+1; - } else { /* Reached string end */ - lstrcpyW(thisDir, pathposn); - pathposn = NULL; - } + if (*pos) /* Reached semicolon */ + { + memcpy(thisDir, pathposn, (pos-pathposn) * sizeof(WCHAR)); + thisDir[(pos-pathposn)] = 0x00; + pathposn = pos+1; + } + else /* Reached string end */ + { + lstrcpyW(thisDir, pathposn); + pathposn = NULL; + } - /* Remove quotes */ - length = lstrlenW(thisDir); - if (thisDir[length - 1] == '"') - thisDir[length - 1] = 0; + /* Remove quotes */ + length = lstrlenW(thisDir); + if (thisDir[length - 1] == '"') + thisDir[length - 1] = 0; - if (*thisDir != '"') - lstrcpyW(temp, thisDir); - else - lstrcpyW(temp, thisDir + 1); + if (*thisDir != '"') + lstrcpyW(temp, thisDir); + else + lstrcpyW(temp, thisDir + 1); - /* Since you can have eg. ..\.. on the path, need to expand - to full information */ - GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); + /* Since you can have eg. ..\.. on the path, need to expand + to full information */ + GetFullPathNameW(temp, MAX_PATH, thisDir, NULL); + } /* 1. If extension supplied, see if that file exists */ lstrcatW(thisDir, slashW);

1 0