wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Michael Stefaniuc : dxdiagn/tests: Use wide-char string literals.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 4f5b3353bbed111cbb87e21d83a132bad36891a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f5b3353bbed111cbb87e21d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sat Oct 3 20:28:13 2020 +0200 dxdiagn/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 521f954d3cf1be2dd41e6cc2eeb4e11c510c10b7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dxdiagn/tests/container.c | 205 ++++++++++++++--------------------------- 1 file changed, 67 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f5b3353bbed111cbb87…

1 0

Michael Müller : dxdiagn: Enumerate DirectSound devices and add some basic properties.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 24ec21b0954f707d0a107ab648a0d1a331cd51cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=24ec21b0954f707d0a107ab6… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Nov 12 17:37:48 2020 +0100 dxdiagn: Enumerate DirectSound devices and add some basic properties. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=32613 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b1eedc7b6f7f5f22315e3c9dc23ebd2e65e77c58) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dxdiagn/Makefile.in | 2 +- dlls/dxdiagn/provider.c | 79 ++++++++++++++++++++++++++++++ dlls/dxdiagn/tests/container.c | 106 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 186 insertions(+), 1 deletion(-) diff --git a/dlls/dxdiagn/Makefile.in b/dlls/dxdiagn/Makefile.in index fa4b611f245..5099f01461a 100644 --- a/dlls/dxdiagn/Makefile.in +++ b/dlls/dxdiagn/Makefile.in @@ -1,5 +1,5 @@ MODULE = dxdiagn.dll -IMPORTS = strmiids dxguid uuid d3d9 ddraw version ole32 oleaut32 user32 advapi32 +IMPORTS = strmiids dxguid uuid d3d9 ddraw dsound version ole32 oleaut32 user32 advapi32 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 6b6f4e640cc..7515f72002d 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -36,6 +36,7 @@ #include "wine/fil_data.h" #include "psapi.h" #include "wbemcli.h" +#include "dsound.h" #include "wine/debug.h" @@ -1364,11 +1365,73 @@ static HRESULT build_displaydevices_tree(IDxDiagContainerImpl_Container *node) return fill_display_information_fallback(node); } +struct enum_context +{ + IDxDiagContainerImpl_Container *cont; + HRESULT hr; + int index; +}; + +static LPWSTR guid_to_string(LPWSTR lpwstr, REFGUID lpcguid) +{ + wsprintfW(lpwstr, L"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", lpcguid->Data1, lpcguid->Data2, + lpcguid->Data3, lpcguid->Data4[0], lpcguid->Data4[1], lpcguid->Data4[2], lpcguid->Data4[3], lpcguid->Data4[4], + lpcguid->Data4[5], lpcguid->Data4[6], lpcguid->Data4[7]); + + return lpwstr; +} + +BOOL CALLBACK dsound_enum(LPGUID guid, LPCWSTR desc, LPCWSTR module, LPVOID context) +{ + struct enum_context *enum_ctx = context; + IDxDiagContainerImpl_Container *device; + WCHAR buffer[256]; + const WCHAR *p, *name; + + /* the default device is enumerated twice, one time without GUID */ + if (!guid) return TRUE; + + swprintf(buffer, ARRAY_SIZE(buffer), L"%u", enum_ctx->index); + device = allocate_information_node(buffer); + if (!device) + { + enum_ctx->hr = E_OUTOFMEMORY; + return FALSE; + } + + add_subcontainer(enum_ctx->cont, device); + + guid_to_string(buffer, guid); + enum_ctx->hr = add_bstr_property(device, L"szGuidDeviceID", buffer); + if (FAILED(enum_ctx->hr)) + return FALSE; + + enum_ctx->hr = add_bstr_property(device, szDescription, desc); + if (FAILED(enum_ctx->hr)) + return FALSE; + + enum_ctx->hr = add_bstr_property(device, L"szDriverPath", module); + if (FAILED(enum_ctx->hr)) + return FALSE; + + name = module; + if ((p = wcsrchr(name, '\\'))) name = p + 1; + if ((p = wcsrchr(name, '/'))) name = p + 1; + + enum_ctx->hr = add_bstr_property(device, szDriverName, name); + if (FAILED(enum_ctx->hr)) + return FALSE; + + enum_ctx->index++; + return TRUE; +} + static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node) { static const WCHAR DxDiag_SoundDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','D','e','v','i','c','e','s',0}; static const WCHAR DxDiag_SoundCaptureDevices[] = {'D','x','D','i','a','g','_','S','o','u','n','d','C','a','p','t','u','r','e','D','e','v','i','c','e','s',0}; + struct enum_context enum_ctx; IDxDiagContainerImpl_Container *cont; cont = allocate_information_node(DxDiag_SoundDevices); @@ -1377,12 +1440,28 @@ static HRESULT build_directsound_tree(IDxDiagContainerImpl_Container *node) add_subcontainer(node, cont); + enum_ctx.cont = cont; + enum_ctx.hr = S_OK; + enum_ctx.index = 0; + + DirectSoundEnumerateW(dsound_enum, &enum_ctx); + if (FAILED(enum_ctx.hr)) + return enum_ctx.hr; + cont = allocate_information_node(DxDiag_SoundCaptureDevices); if (!cont) return E_OUTOFMEMORY; add_subcontainer(node, cont); + enum_ctx.cont = cont; + enum_ctx.hr = S_OK; + enum_ctx.index = 0; + + DirectSoundCaptureEnumerateW(dsound_enum, &enum_ctx); + if (FAILED(enum_ctx.hr)) + return enum_ctx.hr; + return S_OK; } diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index 90287ad0e74..e55998827c0 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -993,6 +993,110 @@ cleanup: IDxDiagProvider_Release(pddp); } +static void test_DxDiag_SoundDevices(void) +{ + static const struct property_test property_tests[] = + { + {L"szDescription", VT_BSTR}, + {L"szGuidDeviceID", VT_BSTR}, + {L"szDriverName", VT_BSTR}, + {L"szDriverPath", VT_BSTR}, + }; + + IDxDiagContainer *sound_cont = NULL; + DWORD count, i; + HRESULT hr; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + hr = IDxDiagContainer_GetChildContainer(pddc, L"DxDiag_DirectSound.DxDiag_SoundDevices", &sound_cont); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetNumberOfProps(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfProps to return S_OK, got 0x%08x\n", hr); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + hr = IDxDiagContainer_GetNumberOfChildContainers(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr); + + for (i = 0; i < count; i++) + { + WCHAR child_container[256]; + IDxDiagContainer *child; + + hr = IDxDiagContainer_EnumChildContainerNames(sound_cont, i, child_container, ARRAY_SIZE(child_container)); + ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetChildContainer(sound_cont, child_container, &child); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + trace("Testing container %s\n", wine_dbgstr_w(child_container)); + test_container_properties(child, property_tests, ARRAY_SIZE(property_tests)); + + IDxDiagContainer_Release(child); + } + + IDxDiagContainer_Release(sound_cont); + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + +static void test_DxDiag_SoundCaptureDevices(void) +{ + static const struct property_test property_tests[] = + { + {L"szDescription", VT_BSTR}, + {L"szGuidDeviceID", VT_BSTR}, + {L"szDriverName", VT_BSTR}, + {L"szDriverPath", VT_BSTR}, + }; + + IDxDiagContainer *sound_cont = NULL; + DWORD count, i; + HRESULT hr; + + if (!create_root_IDxDiagContainer()) + { + skip("Unable to create the root IDxDiagContainer\n"); + return; + } + + hr = IDxDiagContainer_GetChildContainer(pddc, L"DxDiag_DirectSound.DxDiag_SoundCaptureDevices", &sound_cont); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetNumberOfProps(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfProps to return S_OK, got 0x%08x\n", hr); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + hr = IDxDiagContainer_GetNumberOfChildContainers(sound_cont, &count); + ok(hr == S_OK, "Expected IDxDiagContainer::GetNumberOfChildContainers to return S_OK, got 0x%08x\n", hr); + + for (i = 0; i < count; i++) + { + WCHAR child_container[256]; + IDxDiagContainer *child; + + hr = IDxDiagContainer_EnumChildContainerNames(sound_cont, i, child_container, ARRAY_SIZE(child_container)); + ok(hr == S_OK, "Expected IDxDiagContainer::EnumChildContainerNames to return S_OK, got 0x%08x\n", hr); + + hr = IDxDiagContainer_GetChildContainer(sound_cont, child_container, &child); + ok(hr == S_OK, "Expected IDxDiagContainer::GetChildContainer to return S_OK, got 0x%08x\n", hr); + + trace("Testing container %s\n", wine_dbgstr_w(child_container)); + test_container_properties(child, property_tests, ARRAY_SIZE(property_tests)); + + IDxDiagContainer_Release(child); + } + + IDxDiagContainer_Release(sound_cont); + IDxDiagContainer_Release(pddc); + IDxDiagProvider_Release(pddp); +} + START_TEST(container) { CoInitialize(NULL); @@ -1007,5 +1111,7 @@ START_TEST(container) test_root_children(); test_DxDiag_SystemInfo(); test_DxDiag_DisplayDevices(); + test_DxDiag_SoundDevices(); + test_DxDiag_SoundCaptureDevices(); CoUninitialize(); }

1 0

Jan Sikorski : dbghelp: Avoid forwarded exports.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 2360f56f695391c62a7b858f6b038b6cfd8a3143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2360f56f695391c62a7b858f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Oct 19 13:03:14 2020 +0200 dbghelp: Avoid forwarded exports. Fallout 76 does not handle forwarded exports of these functions. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fd4b700ad559b512b150acacd3fae3016180c8bd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 6ffa82da926..b17c7b18655 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -19,9 +19,9 @@ @ stdcall GetTimestampForLoadedLibrary(long) @ stdcall ImageDirectoryEntryToData(ptr long long ptr) @ stdcall ImageDirectoryEntryToDataEx(ptr long long ptr ptr) -@ stdcall ImageNtHeader(ptr) ntdll.RtlImageNtHeader -@ stdcall ImageRvaToSection(ptr ptr long) ntdll.RtlImageRvaToSection -@ stdcall ImageRvaToVa(ptr ptr long ptr) ntdll.RtlImageRvaToVa +@ stdcall -import ImageNtHeader(ptr) RtlImageNtHeader +@ stdcall -import ImageRvaToSection(ptr ptr long) RtlImageRvaToSection +@ stdcall -import ImageRvaToVa(ptr ptr long ptr) RtlImageRvaToVa @ stdcall ImagehlpApiVersion() @ stdcall ImagehlpApiVersionEx(ptr) @ stdcall MakeSureDirectoryPathExists(str)

1 0

Hans Leidekker : wbemprox: Also return system properties from IWbemClassObject::GetNames.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 8f18677406cf17b41cadf2af4ce73b7c89128023 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f18677406cf17b41cadf2af… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 22 21:25:49 2020 +0200 wbemprox: Also return system properties from IWbemClassObject::GetNames. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50038 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b1ceb7853cf0d7abe99fd917e65a22507795f7de) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/query.c | 61 ++++++++++++++++++++++++++++++--------------- dlls/wbemprox/tests/query.c | 17 +++++++++++++ 2 files changed, 58 insertions(+), 20 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index f46dcd922f9..7778d12b759 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1397,40 +1397,61 @@ HRESULT put_propval( const struct view *view, UINT index, const WCHAR *name, VAR HRESULT get_properties( const struct view *view, UINT index, LONG flags, SAFEARRAY **props ) { + static const WCHAR * const system_props[] = + { L"__GENUS", L"__CLASS", L"__RELPATH", L"__PROPERTY_COUNT", L"__SERVER", L"__NAMESPACE", L"__PATH" }; SAFEARRAY *sa; BSTR str; - UINT i, table_index, result_index, num_props; + UINT i, table_index, result_index, count = 0; struct table *table; HRESULT hr; - LONG j; + LONG j = 0; if ((hr = map_view_index( view, index, &table_index, &result_index )) != S_OK) return hr; - - num_props = count_result_properties( view, table_index ); - if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, num_props ))) return E_OUTOFMEMORY; - table = view->table[table_index]; - for (i = 0, j = 0; i < table->num_cols; i++) - { - BOOL is_system; - if (is_method( table, i )) continue; - if (!is_result_prop( view, table->columns[i].name )) continue; + if (!(flags & WBEM_FLAG_NONSYSTEM_ONLY)) count += ARRAY_SIZE(system_props); + if (!(flags & WBEM_FLAG_SYSTEM_ONLY)) + { + for (i = 0; i < table->num_cols; i++) + { + if (!is_method( table, i ) && is_result_prop( view, table->columns[i].name )) count++; + } + } - is_system = is_system_prop( table->columns[i].name ); - if ((flags & WBEM_FLAG_NONSYSTEM_ONLY) && is_system) continue; - else if ((flags & WBEM_FLAG_SYSTEM_ONLY) && !is_system) continue; + if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, count ))) return E_OUTOFMEMORY; - str = SysAllocString( table->columns[i].name ); - if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) + if (!(flags & WBEM_FLAG_NONSYSTEM_ONLY)) + { + for (j = 0; j < ARRAY_SIZE(system_props); j++) + { + str = SysAllocString( system_props[j] ); + if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) + { + SysFreeString( str ); + SafeArrayDestroy( sa ); + return E_OUTOFMEMORY; + } + SysFreeString( str ); + } + } + if (!(flags & WBEM_FLAG_SYSTEM_ONLY)) + { + for (i = 0; i < table->num_cols; i++) { + if (is_method( table, i ) || !is_result_prop( view, table->columns[i].name )) continue; + + str = SysAllocString( table->columns[i].name ); + if (!str || SafeArrayPutElement( sa, &j, str ) != S_OK) + { + SysFreeString( str ); + SafeArrayDestroy( sa ); + return E_OUTOFMEMORY; + } SysFreeString( str ); - SafeArrayDestroy( sa ); - return E_OUTOFMEMORY; + j++; } - SysFreeString( str ); - j++; } + *props = sa; return S_OK; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 31cf93b4ac9..b254837afd2 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -494,6 +494,8 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) IWbemClassObject *process, *sig_in, *out; IWbemQualifierSet *qualifiers; VARIANT retval, val; + SAFEARRAY *names; + LONG bound, i; DWORD full_path_len = 0; LONG flavor; CIMTYPE type; @@ -518,6 +520,21 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) win_skip( "Win32_Process not available\n" ); return; } + names = NULL; + hr = IWbemClassObject_GetNames( process, NULL, 0, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( names != NULL, "names not set\n" ); + hr = SafeArrayGetUBound( names, 1, &bound ); + ok( hr == S_OK, "got %08x\n", hr ); + for (i = 0; i <= bound; i++) + { + BSTR str; + hr = SafeArrayGetElement( names, &i, &str ); + ok( hr == S_OK, "%d: got %08x\n", i, hr ); + SysFreeString( str ); + } + SafeArrayDestroy( names ); + sig_in = (void*)0xdeadbeef; hr = IWbemClassObject_GetMethod( process, getownerW, 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get GetOwner method %08x\n", hr );

1 0

Vijay Kiran Kamuju : hnetcfg: Return S_OK in get_StaticPortMappingCollection.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: faa67872f71c69eb96803e4cd2c2803dd5467eff URL: https://source.winehq.org/git/wine.git/?a=commit;h=faa67872f71c69eb96803e4c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Oct 10 12:44:44 2020 +0200 hnetcfg: Return S_OK in get_StaticPortMappingCollection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49449 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5160c30fa75b631354586b528e3be2851a1909c4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hnetcfg/port.c | 2 +- dlls/hnetcfg/tests/policy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index b0821d4b68c..fd4ac4977d3 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -720,7 +720,7 @@ static HRESULT WINAPI upnpnat_get_StaticPortMappingCollection(IUPnPNAT *iface, I FIXME("%p, %p\n", This, collection); if(collection) *collection = NULL; - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI upnpnat_get_DynamicPortMappingCollection(IUPnPNAT *iface, IDynamicPortMappingCollection **collection) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 8701455841b..416049c0093 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -180,7 +180,7 @@ static void test_IUPnPNAT(void) ok(hr == E_NOINTERFACE, "got: %08x\n", hr); hr = IUPnPNAT_get_StaticPortMappingCollection(nat, &static_ports); - todo_wine ok(hr == S_OK, "got: %08x\n", hr); + ok(hr == S_OK, "got: %08x\n", hr); if(hr == S_OK && static_ports) IStaticPortMappingCollection_Release(static_ports);

1 0

Huw Davies : user32: Use a default name for winstations created or opened with no name.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 2c81dedb37b8e22ae1180af4a8d90b067b30eddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c81dedb37b8e22ae1180af4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 23 12:56:39 2020 +0100 user32: Use a default name for winstations created or opened with no name. The default is of the form "Service-0x<luid high>-<luid low>$" where the luid in question is the logon session luid. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6e69e512d8bdca853adb6f58411ac7261dd7aaef) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/tests/winstation.c | 24 +++++++++++++++++++----- dlls/user32/winstation.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 4aa5565b96c..d239ead6e98 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -118,9 +118,10 @@ static void test_handles(void) HANDLE hthread; DWORD id, flags, le; ATOM atom; - char buffer[20]; + char buffer[29], default_name[29] = ""; DWORD size; BOOL ret; + TOKEN_STATISTICS token_stats; /* win stations */ @@ -215,7 +216,6 @@ static void test_handles(void) SetLastError( 0xdeadbeef ); w2 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS ); ok( !w2, "open station succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); @@ -225,16 +225,30 @@ static void test_handles(void) memset( buffer, 0, sizeof(buffer) ); ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size ); ok( ret, "GetUserObjectInformationA failed with error %u\n", GetLastError() ); - todo_wine ok( !memcmp(buffer, "Service-0x0-", 12), "unexpected window station name '%s'\n", buffer ); - todo_wine ok( buffer[strlen(buffer) - 1] == '$', "unexpected window station name '%s'\n", buffer ); + /* Get the logon session LUID */ + ret = GetTokenInformation( GetCurrentProcessToken(), TokenStatistics, &token_stats, sizeof(token_stats), NULL ); + if (ret) + sprintf( default_name, "Service-0x%x-%x$", token_stats.AuthenticationId.HighPart, + token_stats.AuthenticationId.LowPart ); + if (*default_name) + ok( !strcmp( buffer, default_name ), "unexpected window station name '%s' expected '%s'\n", buffer, default_name ); SetLastError( 0xdeadbeef ); w3 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS ); - todo_wine ok( w3 != 0, "open station failed err %u\n", GetLastError() ); CloseWindowStation( w3 ); CloseWindowStation( w2 ); + w2 = CreateWindowStationA( NULL, 0, WINSTA_ALL_ACCESS, NULL ); + ok( w2 != 0, "create station failed err %u\n", GetLastError() ); + + memset( buffer, 0, sizeof(buffer) ); + ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size ); + ok( ret, "GetUserObjectInformationA failed with error %u\n", GetLastError() ); + if (*default_name) + ok( !strcmp( buffer, default_name ), "unexpected window station name '%s' expected '%s'\n", buffer, default_name ); + CloseWindowStation( w2 ); + SetLastError( 0xdeadbeef ); w2 = CreateWindowStationA( "foo\\bar", 0, WINSTA_ALL_ACCESS, NULL ); ok( !w2, "create station succeeded\n" ); diff --git a/dlls/user32/winstation.c b/dlls/user32/winstation.c index 4f53b43bd6c..b5d5a372faf 100644 --- a/dlls/user32/winstation.c +++ b/dlls/user32/winstation.c @@ -80,6 +80,30 @@ static HANDLE get_winstations_dir_handle(void) return handle; } +static BOOL WINAPI winstation_default_name_once( INIT_ONCE *once, void *param, void **context ) +{ + static const WCHAR fmt[] = {'S','e','r','v','i','c','e','-','0','x','%','x','-','%','x','$',0}; + WCHAR *name = (WCHAR *)param; + TOKEN_STATISTICS stats; + BOOL ret; + + ret = GetTokenInformation( GetCurrentProcessToken(), TokenStatistics, &stats, sizeof(stats), NULL ); + if (ret) + sprintfW( name, fmt, stats.AuthenticationId.HighPart, stats.AuthenticationId.LowPart ); + + return ret; +} + +static const WCHAR *get_winstation_default_name( void ) +{ + static INIT_ONCE once = INIT_ONCE_STATIC_INIT; + static WCHAR name[29]; + BOOL ret; + + ret = InitOnceExecuteOnce( &once, winstation_default_name_once, name, NULL ); + return ret ? name : NULL; +} + /*********************************************************************** * CreateWindowStationA (USER32.@) */ @@ -113,6 +137,11 @@ HWINSTA WINAPI CreateWindowStationW( LPCWSTR name, DWORD flags, ACCESS_MASK acce SetLastError( ERROR_FILENAME_EXCED_RANGE ); return 0; } + if (!len) + { + name = get_winstation_default_name(); + len = strlenW( name ); + } SERVER_START_REQ( create_winstation ) { req->flags = 0; @@ -160,6 +189,11 @@ HWINSTA WINAPI OpenWindowStationW( LPCWSTR name, BOOL inherit, ACCESS_MASK acces SetLastError( ERROR_FILENAME_EXCED_RANGE ); return 0; } + if (!len) + { + name = get_winstation_default_name(); + len = strlenW( name ); + } SERVER_START_REQ( open_winstation ) { req->access = access;

1 0

Zebediah Figura : wine.inf: IsInstalled is a DWORD value.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 743822a944a46445761558324c8948b1cd061cf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=743822a944a4644576155832… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Oct 17 10:01:30 2020 -0500 wine.inf: IsInstalled is a DWORD value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50016 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cb8d58598b3b95f21ebc1d4f325cced930fedceb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.inf.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 65e69b021bf..bcccd3a9ca0 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -748,19 +748,19 @@ HKCU,Software\Microsoft\Protected Storage System Provider,,16 ; Some apps requires at least four subkeys of Active Setup\Installed Components HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},,2,"DirectDrawEx" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"ComponentID",2,"DirectDrawEx" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"IsInstalled",2,1 +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"IsInstalled",0x10003,1 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{44BBA855-CC51-11CF-AAFA-00AA00B6015F},"Version",2,"4,71,1113,0" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},,2,"HTML Help" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"ComponentID",2,"HTMLHelp" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"IsInstalled",2,1 +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"IsInstalled",0x10003,1 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9},"Version",2,"4,74,9273,0" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},,2,"Windows Media Player" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"ComponentID",2,"wmp" -HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"IsInstalled",2,1 +HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"IsInstalled",0x10003,1 HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Locale",2,"*" HKLM,SOFTWARE\Microsoft\Active Setup\Installed Components\{6BF52A52-394A-11d3-B153-00C04F79FAA6},"Version",2,"12,0,7601,18840"

1 0

Aaron Hill : cmd: Set errorlevel to 0 when 'call' is invoked with an empty string.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 93980eeab58d281f6da6e629e807b477f3713c88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93980eeab58d281f6da6e629… Author: Aaron Hill <aa1ronham(a)gmail.com> Date: Mon Oct 12 17:36:05 2020 -0400 cmd: Set errorlevel to 0 when 'call' is invoked with an empty string. Previously, invoking 'call' with an empty string would leave errorlevel unchanged. Reset errorlevel to 0 to match the behavior of the Windows 'cmd.exe'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49982 Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8e54cad6a15b3901a748fa228d1a7e456911b9ca) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/tests/test_builtins.cmd | 3 +++ programs/cmd/wcmdmain.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 4bf37a35bb8..8e3cde8b114 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -3142,6 +3142,9 @@ echo %ErrorLevel% should be 7 if errorlevel 7 echo setting var worked too well, bad call :setError 3 echo %ErrorLevel% should still be 7 +rem Verify that (call ) sets errorlevel to 0 +(call ) +if errorlevel 1 echo errorlevel should have been 0 echo ------------ Testing GOTO ------------ if a==a goto dest1 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 609c6f8bd25..bf3a627d35b 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1055,6 +1055,11 @@ void WCMD_run_program (WCHAR *command, BOOL called) firstParam = WCMD_parameter(command, 0, NULL, FALSE, TRUE); if (!firstParam) return; + if (!firstParam[0]) { + errorlevel = 0; + return; + } + /* Calculate the search path and stem to search for */ if (wcspbrk (firstParam, delims) == NULL) { /* No explicit path given, search path */ static const WCHAR curDir[] = {'.',';','\0'};

1 0

Alistair Leslie-Hughes : msado15: Implement _Command get/putref ActiveConnection.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 15b017e53a4293c98f71ffaeae10660dfdc97579 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15b017e53a4293c98f71ffae… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 9 18:57:15 2020 +1100 msado15: Implement _Command get/putref ActiveConnection. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aff59389658461630206c3683d84bd754555bc30) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msado15/command.c | 20 ++++++++++++++++---- dlls/msado15/tests/msado15.c | 9 +++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index eb7b3a035eb..d19108a1a25 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -35,6 +35,7 @@ struct command LONG ref; CommandTypeEnum type; BSTR text; + _Connection *connection; }; static inline struct command *impl_from_Command( _Command *iface ) @@ -80,6 +81,7 @@ static ULONG WINAPI command_Release( _Command *iface ) if (!ref) { TRACE( "destroying %p\n", command ); + if (command->connection) _Connection_Release(command->connection); heap_free( command->text ); heap_free( command ); } @@ -121,14 +123,23 @@ static HRESULT WINAPI command_get_Properties( _Command *iface, Properties **prop static HRESULT WINAPI command_get_ActiveConnection( _Command *iface, _Connection **connection ) { - FIXME( "%p, %p\n", iface, connection ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + TRACE( "%p, %p\n", iface, connection ); + + *connection = command->connection; + if (command->connection) _Connection_AddRef(command->connection); + return S_OK; } static HRESULT WINAPI command_putref_ActiveConnection( _Command *iface, _Connection *connection ) { - FIXME( "%p, %p\n", iface, connection ); - return E_NOTIMPL; + struct command *command = impl_from_Command( iface ); + TRACE( "%p, %p\n", iface, connection ); + + if (command->connection) _Connection_Release(command->connection); + command->connection = connection; + if (command->connection) _Connection_AddRef(command->connection); + return S_OK; } static HRESULT WINAPI command_put_ActiveConnection( _Command *iface, VARIANT connection ) @@ -343,6 +354,7 @@ HRESULT Command_create( void **obj ) command->Command_iface.lpVtbl = &command_vtbl; command->type = adCmdUnknown; command->text = NULL; + command->connection = NULL; command->ref = 1; *obj = &command->Command_iface; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 27e917ce626..b2ef3183dfb 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -744,6 +744,7 @@ static void test_Command(void) Command25 *command25; CommandTypeEnum cmd_type = adCmdUnspecified; BSTR cmd_text = (BSTR)"test"; + _Connection *connection; hr = CoCreateInstance( &CLSID_Command, NULL, CLSCTX_INPROC_SERVER, &IID__Command, (void **)&command ); ok( hr == S_OK, "got %08x\n", hr ); @@ -797,6 +798,14 @@ static void test_Command(void) ok( hr == S_OK, "got %08x\n", hr ); ok( !wcscmp( L"test", cmd_text ), "got %p\n", wine_dbgstr_w( cmd_text ) ); + connection = (_Connection*)0xdeadbeef; + hr = _Command_get_ActiveConnection( command, &connection ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( connection == NULL, "got %p\n", connection ); + + hr = _Command_putref_ActiveConnection( command, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + _Command_Release( command ); }

1 0

Akihiro Sagawa : kernelbase: Fix copy and paste error.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 86247d35d9b8bed9557e5926e5cdb4219a40b62d URL: https://source.winehq.org/git/wine.git/?a=commit;h=86247d35d9b8bed9557e5926… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Sep 30 23:18:13 2020 +0900 kernelbase: Fix copy and paste error. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 80acf7e4ae399ecbfc372e23a18a45fd3885997b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index f3121648f15..db59639ba2e 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3637,7 +3637,7 @@ INT WINAPI DECLSPEC_HOTPATCH GetCalendarInfoEx( const WCHAR *locale, CALID calen static CRITICAL_SECTION tzname_section; static CRITICAL_SECTION_DEBUG tzname_section_debug = { - 0, 0, &locale_section, + 0, 0, &tzname_section, { &tzname_section_debug.ProcessLocksList, &tzname_section_debug.ProcessLocksList }, 0, 0, { (DWORD_PTR)(__FILE__ ": tzname_section") } };

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 March 2021