wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Louis Lenders : wbemprox: Add Organization property to Win32_Operatingsystem.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: b901f9ca6c803c52b889e21705fc1a37cbbd00cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b901f9ca6c803c52b889e217… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Apr 28 12:43:21 2022 +0200 wbemprox: Add Organization property to Win32_Operatingsystem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 52 +++++++++++++++++++++++++++------------------ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5c53aae8d3b..ba3e728c8c5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -244,6 +244,7 @@ static const struct column col_operatingsystem[] = { L"Manufacturer", CIM_STRING }, { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, { L"OperatingSystemSKU", CIM_UINT32 }, + { L"Organization", CIM_STRING|COL_FLAG_DYNAMIC }, { L"OSArchitecture", CIM_STRING }, { L"OSLanguage", CIM_UINT32 }, { L"OSProductSuite", CIM_UINT32 }, @@ -677,6 +678,7 @@ struct record_operatingsystem const WCHAR *manufacturer; const WCHAR *name; UINT32 operatingsystemsku; + const WCHAR *organization; const WCHAR *osarchitecture; UINT32 oslanguage; UINT32 osproductsuite; @@ -3515,6 +3517,34 @@ static WCHAR *get_locale(void) if (ret) GetLocaleInfoW( LOCALE_SYSTEM_DEFAULT, LOCALE_ILANGUAGE, ret, 5 ); return ret; } + +static WCHAR *get_reg_str( HKEY root, const WCHAR *path, const WCHAR *value ) +{ + HKEY hkey = 0; + DWORD size, type; + WCHAR *ret = NULL; + + if (!RegOpenKeyExW( root, path, 0, KEY_READ, &hkey ) && + !RegQueryValueExW( hkey, value, NULL, &type, NULL, &size ) && type == REG_SZ && + (ret = malloc( size + sizeof(WCHAR) ))) + { + size += sizeof(WCHAR); + if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)ret, &size )) + { + free( ret ); + ret = NULL; + } + } + if (hkey) RegCloseKey( hkey ); + return ret; +} + +static WCHAR *get_organization(void) +{ + return get_reg_str( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", + L"RegisteredOrganization" ); +} + static WCHAR *get_osbuildnumber( OSVERSIONINFOEXW *ver ) { WCHAR *ret = malloc( 11 * sizeof(WCHAR) ); @@ -3574,27 +3604,6 @@ static WCHAR *get_osname( const WCHAR *caption ) return ret; } -static WCHAR *get_reg_str( HKEY root, const WCHAR *path, const WCHAR *value ) -{ - HKEY hkey = 0; - DWORD size, type; - WCHAR *ret = NULL; - - if (!RegOpenKeyExW( root, path, 0, KEY_READ, &hkey ) && - !RegQueryValueExW( hkey, value, NULL, &type, NULL, &size ) && type == REG_SZ && - (ret = malloc( size + sizeof(WCHAR) ))) - { - size += sizeof(WCHAR); - if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)ret, &size )) - { - free( ret ); - ret = NULL; - } - } - if (hkey) RegCloseKey( hkey ); - return ret; -} - static WCHAR *get_osserialnumber(void) { WCHAR *ret = get_reg_str( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", L"ProductId" ); @@ -3658,6 +3667,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->manufacturer = L"The Wine Project"; rec->name = get_osname( rec->caption ); rec->operatingsystemsku = get_operatingsystemsku(); + rec->organization = get_organization(); rec->osarchitecture = get_osarchitecture(); rec->oslanguage = GetSystemDefaultLangID(); rec->osproductsuite = 2461140; /* Windows XP Professional */ diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 7cca770ffc7..b31506a12d6 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1428,6 +1428,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) check_property( obj, L"CSName", VT_BSTR, CIM_STRING ); check_property( obj, L"CurrentTimeZone", VT_I2, CIM_SINT16 ); check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); + check_property( obj, L"Organization", VT_BSTR, CIM_STRING ); check_property( obj, L"OSType", VT_I4, CIM_UINT16 ); check_property( obj, L"ProductType", VT_I4, CIM_UINT32 ); check_property( obj, L"RegisteredUser", VT_BSTR, CIM_STRING );

1 0

Louis Lenders : wbemprox: Add RegisterdUser property to Win32_Operatingsystem.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: ef3df0e7e92ab6bc6ac5273a25de5fa760e8a74a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef3df0e7e92ab6bc6ac5273a… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Apr 28 12:43:20 2022 +0200 wbemprox: Add RegisterdUser property to Win32_Operatingsystem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 27 ++++++++++++++++++++++----- dlls/wbemprox/tests/query.c | 1 + 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 93b26c23dd3..5c53aae8d3b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -250,6 +250,7 @@ static const struct column col_operatingsystem[] = { L"OSType", CIM_UINT16 }, { L"Primary", CIM_BOOLEAN }, { L"ProductType", CIM_UINT32 }, + { L"RegisteredUser", CIM_STRING|COL_FLAG_DYNAMIC }, { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"ServicePackMajorVersion", CIM_UINT16 }, { L"ServicePackMinorVersion", CIM_UINT16 }, @@ -682,6 +683,7 @@ struct record_operatingsystem UINT16 ostype; int primary; UINT32 producttype; + const WCHAR *registereduser; const WCHAR *serialnumber; UINT16 servicepackmajor; UINT16 servicepackminor; @@ -3571,27 +3573,35 @@ static WCHAR *get_osname( const WCHAR *caption ) memcpy( ret + len, partitionW, sizeof(partitionW) ); return ret; } -static WCHAR *get_osserialnumber(void) + +static WCHAR *get_reg_str( HKEY root, const WCHAR *path, const WCHAR *value ) { HKEY hkey = 0; DWORD size, type; WCHAR *ret = NULL; - if (!RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_READ, &hkey ) && - !RegQueryValueExW( hkey, L"ProductId", NULL, &type, NULL, &size ) && type == REG_SZ && + if (!RegOpenKeyExW( root, path, 0, KEY_READ, &hkey ) && + !RegQueryValueExW( hkey, value, NULL, &type, NULL, &size ) && type == REG_SZ && (ret = malloc( size + sizeof(WCHAR) ))) { size += sizeof(WCHAR); - if (RegQueryValueExW( hkey, L"ProductId", NULL, NULL, (BYTE *)ret, &size )) + if (RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)ret, &size )) { free( ret ); ret = NULL; } } if (hkey) RegCloseKey( hkey ); - if (!ret) return wcsdup( L"12345-OEM-1234567-12345" ); return ret; } + +static WCHAR *get_osserialnumber(void) +{ + WCHAR *ret = get_reg_str( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", L"ProductId" ); + if (!ret) ret = wcsdup( L"12345-OEM-1234567-12345" ); + return ret; +} + static WCHAR *get_osversion( OSVERSIONINFOEXW *ver ) { WCHAR *ret = malloc( 33 * sizeof(WCHAR) ); @@ -3604,6 +3614,12 @@ static DWORD get_operatingsystemsku(void) GetProductInfo( 6, 0, 0, 0, &ret ); return ret; } + +static WCHAR *get_registereduser(void) +{ + return get_reg_str( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion", L"RegisteredOwner" ); +} + static INT16 get_currenttimezone(void) { TIME_ZONE_INFORMATION info; @@ -3648,6 +3664,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->ostype = 18; /* WINNT */ rec->primary = -1; rec->producttype = 1; + rec->registereduser = get_registereduser(); rec->serialnumber = get_osserialnumber(); rec->servicepackmajor = ver.wServicePackMajor; rec->servicepackminor = ver.wServicePackMinor; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 865d1b6136a..7cca770ffc7 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1430,6 +1430,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); check_property( obj, L"OSType", VT_I4, CIM_UINT16 ); check_property( obj, L"ProductType", VT_I4, CIM_UINT32 ); + check_property( obj, L"RegisteredUser", VT_BSTR, CIM_STRING ); check_property( obj, L"ServicePackMajorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"ServicePackMinorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"SuiteMask", VT_I4, CIM_UINT32 );

1 0

Louis Lenders : wbemprox: Add BuildType property to Win32_OperatingSystem.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 552ac96c6a798cc964466a1fee0c3517c4a17e54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=552ac96c6a798cc964466a1f… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Apr 28 12:43:19 2022 +0200 wbemprox: Add BuildType property to Win32_OperatingSystem. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52887 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 69d74d756f8..93b26c23dd3 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -229,6 +229,7 @@ static const struct column col_networkadapterconfig[] = static const struct column col_operatingsystem[] = { { L"BuildNumber", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"BuildType", CIM_STRING }, { L"Caption", CIM_STRING|COL_FLAG_DYNAMIC }, { L"CodeSet", CIM_STRING|COL_FLAG_DYNAMIC }, { L"CountryCode", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -660,6 +661,7 @@ struct record_networkadapterconfig struct record_operatingsystem { const WCHAR *buildnumber; + const WCHAR *buildtype; const WCHAR *caption; const WCHAR *codeset; const WCHAR *countrycode; @@ -3625,6 +3627,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec = (struct record_operatingsystem *)table->data; rec->buildnumber = get_osbuildnumber( &ver ); + rec->buildtype = L"Wine build"; rec->caption = get_oscaption( &ver ); rec->codeset = get_codeset(); rec->countrycode = get_countrycode(); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e0fe78b7fd1..865d1b6136a 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1389,6 +1389,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) ok( hr == S_OK, "got %#lx\n", hr ); check_property( obj, L"BuildNumber", VT_BSTR, CIM_STRING ); + check_property( obj, L"BuildType", VT_BSTR, CIM_STRING ); check_property( obj, L"Caption", VT_BSTR, CIM_STRING ); type = 0xdeadbeef;

1 0

Giovanni Mascellani : loader/wine.inf: Update time zone data.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 622befd2a94297ccd30399a3f7741a1ecfe6e5de URL: https://source.winehq.org/git/wine.git/?a=commit;h=622befd2a94297ccd30399a3… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 27 10:46:02 2022 +0200 loader/wine.inf: Update time zone data. New time zone data were generated from CLDR release 41 and tzdata release 2022a. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 60 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=622befd2a94297ccd303…

1 0

Drew Ronneberg : comctl32: Remove obsolete -D_COMCTL32_ from Makefile.in.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 07417f8bf118681a02f68ef456f5b7680064b78e URL: https://source.winehq.org/git/wine.git/?a=commit;h=07417f8bf118681a02f68ef4… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Tue Apr 26 19:57:19 2022 -0400 comctl32: Remove obsolete -D_COMCTL32_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index c0272f2d7d4..01e1ac6f562 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -D_COMCTL32_ MODULE = comctl32.dll IMPORTLIB = comctl32 IMPORTS = uuid user32 gdi32 advapi32 usp10 imm32 kernelbase

1 0

Drew Ronneberg : crypt32: Remove obsolete -D_CRYPT32_ from Makefile.in.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 9253ee302fe18d1572386f8b4624452a96057164 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9253ee302fe18d1572386f8b… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Wed Apr 27 07:32:47 2022 -0400 crypt32: Remove obsolete -D_CRYPT32_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/crypt32/Makefile.in b/dlls/crypt32/Makefile.in index 996044bbc37..8457a324d9e 100644 --- a/dlls/crypt32/Makefile.in +++ b/dlls/crypt32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -D_CRYPT32_ MODULE = crypt32.dll UNIXLIB = crypt32.so IMPORTLIB = crypt32

1 0

Jinoh Kang : shell32: Add stub for IShellItemImageFactory.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 0ec8a1a4563cc6b1cc6e9d8b98527193aa81c33e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ec8a1a4563cc6b1cc6e9d8b… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Apr 27 03:17:43 2022 +0900 shell32: Add stub for IShellItemImageFactory. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellitem.c | 50 ++++++++++++++++++++++++++++++++++++++++++ dlls/shell32/tests/shlfolder.c | 1 - 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index 0a3a76cbd6a..0381fa67f0d 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -39,6 +39,7 @@ typedef struct _ShellItem { LONG ref; LPITEMIDLIST pidl; IPersistIDList IPersistIDList_iface; + IShellItemImageFactory IShellItemImageFactory_iface; } ShellItem; typedef struct _CustomDestinationList { @@ -56,6 +57,11 @@ static inline ShellItem *impl_from_IPersistIDList( IPersistIDList *iface ) return CONTAINING_RECORD(iface, ShellItem, IPersistIDList_iface); } +static inline ShellItem *impl_from_IShellItemImageFactory( IShellItemImageFactory *iface ) +{ + return CONTAINING_RECORD(iface, ShellItem, IShellItemImageFactory_iface); +} + static inline CustomDestinationList *impl_from_ICustomDestinationList( ICustomDestinationList *iface ) { return CONTAINING_RECORD(iface, CustomDestinationList, ICustomDestinationList_iface); @@ -79,6 +85,10 @@ static HRESULT WINAPI ShellItem_QueryInterface(IShellItem2 *iface, REFIID riid, { *ppv = &This->IPersistIDList_iface; } + else if (IsEqualIID(&IID_IShellItemImageFactory, riid)) + { + *ppv = &This->IShellItemImageFactory_iface; + } else { FIXME("not implemented for %s\n", shdebugstr_guid(riid)); *ppv = NULL; @@ -536,6 +546,45 @@ static const IPersistIDListVtbl ShellItem_IPersistIDList_Vtbl = { ShellItem_IPersistIDList_GetIDList }; +static HRESULT WINAPI ShellItem_IShellItemImageFactory_QueryInterface(IShellItemImageFactory *iface, + REFIID riid, void **ppv) +{ + ShellItem *This = impl_from_IShellItemImageFactory(iface); + return IShellItem2_QueryInterface(&This->IShellItem2_iface, riid, ppv); +} + +static ULONG WINAPI ShellItem_IShellItemImageFactory_AddRef(IShellItemImageFactory *iface) +{ + ShellItem *This = impl_from_IShellItemImageFactory(iface); + return IShellItem2_AddRef(&This->IShellItem2_iface); +} + +static ULONG WINAPI ShellItem_IShellItemImageFactory_Release(IShellItemImageFactory *iface) +{ + ShellItem *This = impl_from_IShellItemImageFactory(iface); + return IShellItem2_Release(&This->IShellItem2_iface); +} + +static HRESULT WINAPI ShellItem_IShellItemImageFactory_GetImage(IShellItemImageFactory *iface, + SIZE size, SIIGBF flags, HBITMAP *phbm) +{ + ShellItem *This = impl_from_IShellItemImageFactory(iface); + static int once; + + if (!once++) + FIXME("%p ({%lu, %lu} %d %p): stub\n", This, size.cx, size.cy, flags, phbm); + + *phbm = NULL; + return E_NOTIMPL; +} + +static const IShellItemImageFactoryVtbl ShellItem_IShellItemImageFactory_Vtbl = { + ShellItem_IShellItemImageFactory_QueryInterface, + ShellItem_IShellItemImageFactory_AddRef, + ShellItem_IShellItemImageFactory_Release, + ShellItem_IShellItemImageFactory_GetImage, +}; + HRESULT WINAPI IShellItem_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) { @@ -553,6 +602,7 @@ HRESULT WINAPI IShellItem_Constructor(IUnknown *pUnkOuter, REFIID riid, void **p This->ref = 1; This->pidl = NULL; This->IPersistIDList_iface.lpVtbl = &ShellItem_IPersistIDList_Vtbl; + This->IShellItemImageFactory_iface.lpVtbl = &ShellItem_IShellItemImageFactory_Vtbl; ret = IShellItem2_QueryInterface(&This->IShellItem2_iface, riid, ppv); IShellItem2_Release(&This->IShellItem2_iface); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 6f4ef724b1d..da606a9e707 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4448,7 +4448,6 @@ static void test_IShellItemImageFactory(void) ret = IShellItem_QueryInterface(shellitem, &IID_IShellItemImageFactory, (void **)&siif); IShellItem_Release(shellitem); - todo_wine ok(ret == S_OK, "QueryInterface returned 0x%08lx\n", ret); if (SUCCEEDED(ret)) {

1 0

Jinoh Kang : shell32/tests: Add tests for IShellItemImageFactory.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: b1c26c454abfbcfda2392d86b123b6003281dfac URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1c26c454abfbcfda2392d86… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Apr 27 03:17:38 2022 +0900 shell32/tests: Add tests for IShellItemImageFactory. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index abf2eeae17b..6f4ef724b1d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4432,6 +4432,57 @@ static void test_contextmenu(IContextMenu *menu, BOOL background) DestroyMenu(hmenu); } +static void test_IShellItemImageFactory(void) +{ + HRESULT ret; + IShellItem *shellitem; + IShellItemImageFactory *siif; + LPITEMIDLIST pidl_desktop = NULL; + + ret = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidl_desktop); + ok(ret == S_OK, "SHGetSpecialFolderLocation returned 0x%08lx\n", ret); + + ret = pSHCreateShellItem(NULL, NULL, pidl_desktop, &shellitem); + ILFree(pidl_desktop); + ok(SUCCEEDED(ret), "SHCreateShellItem returned 0x%08lx\n", ret); + + ret = IShellItem_QueryInterface(shellitem, &IID_IShellItemImageFactory, (void **)&siif); + IShellItem_Release(shellitem); + todo_wine + ok(ret == S_OK, "QueryInterface returned 0x%08lx\n", ret); + if (SUCCEEDED(ret)) + { + HBITMAP hbm = NULL; + SIZE size = {32, 32}; + + ret = IShellItemImageFactory_GetImage(siif, size, SIIGBF_BIGGERSIZEOK, &hbm); + IShellItemImageFactory_Release(siif); + todo_wine + ok(ret == S_OK, "GetImage returned %lx\n", ret); + ok(FAILED(ret) == !hbm, "result = %lx but bitmap = %p\n", ret, hbm); + + if (SUCCEEDED(ret) && hbm) + { + DIBSECTION dib; + int infosz; + + infosz = GetObjectW(hbm, sizeof(dib), &dib); + ok(infosz == sizeof(dib), "Expected GetObjectW to return sizeof(DIBSECTION), got %d\n", infosz); + + /* Bitmap must have 32-bit pixels regardless of original image format */ + ok(dib.dsBm.bmPlanes == 1, "Expected bmPlanes to be %d, got %d\n", 1, dib.dsBm.bmPlanes); + ok(dib.dsBm.bmBitsPixel == 32, "Expected bmBitsPixel to be %d, got %d\n", 32, dib.dsBm.bmBitsPixel); + + /* DIB must be truecolor (32bppRGB/32bppARGB) regardless of original image format */ + ok(dib.dsBmih.biPlanes == 1, "Expected biPlanes to be %d, got %d\n", 1, dib.dsBmih.biPlanes); + ok(dib.dsBmih.biBitCount == 32, "Expected biBitCount to be %d, got %d\n", 32, dib.dsBmih.biBitCount); + ok(dib.dsBmih.biCompression == BI_RGB, "Expected biCompression to be BI_RGB, got %lu\n", dib.dsBmih.biCompression); + + DeleteObject(hbm); + } + } +} + static void test_GetUIObject(void) { IShellFolder *psf_desktop; @@ -5384,6 +5435,7 @@ START_TEST(shlfolder) test_SHCreateShellItemArray(); test_ShellItemArrayEnumItems(); test_desktop_IPersist(); + test_IShellItemImageFactory(); test_GetUIObject(); test_CreateViewObject_contextmenu(); test_SHSimpleIDListFromPath();

1 0

Piotr Caban : msvcp140_atomic_wait: Add __std_atomic_wait_direct implementation.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 87f3b50b2d256726e9a150f3a53798de8791b2a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87f3b50b2d256726e9a150f3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 27 20:22:25 2022 +0200 msvcp140_atomic_wait: Add __std_atomic_wait_direct implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52821 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_atomic_wait/main.c | 7 ++ .../msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- .../tests/msvcp140_atomic_wait.c | 76 ++++++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index a4ea3d619f5..bee7164e09f 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -74,3 +74,10 @@ void __stdcall __std_atomic_notify_all_direct(void *addr) TRACE("(%p)\n", addr); WakeByAddressAll(addr); } + +BOOL __stdcall __std_atomic_wait_direct(volatile void *addr, void *cmp, + SIZE_T size, DWORD timeout) +{ + TRACE("(%p %p %Id %ld)\n", addr, cmp, size, timeout); + return WaitOnAddress(addr, cmp, size, timeout); +} diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index 0c99585c057..04b5bf2c7f9 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -7,7 +7,7 @@ @ stdcall __std_atomic_notify_one_direct(ptr) @ stub __std_atomic_notify_one_indirect @ stub __std_atomic_set_api_level -@ stub __std_atomic_wait_direct +@ stdcall __std_atomic_wait_direct(ptr ptr long long) @ stub __std_atomic_wait_get_deadline @ stub __std_atomic_wait_get_remaining_timeout @ stub __std_atomic_wait_indirect diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index 42fefc4db03..c10217cf34f 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -17,6 +17,7 @@ */ #include <stdio.h> +#include <process.h> #include "windef.h" #include "winbase.h" @@ -29,6 +30,8 @@ static void (__stdcall *p___std_close_threadpool_work)(PTP_WORK); static PTP_WORK (__stdcall *p___std_create_threadpool_work)(PTP_WORK_CALLBACK, void*, PTP_CALLBACK_ENVIRON); static void (__stdcall *p___std_submit_threadpool_work)(PTP_WORK); static void (__stdcall *p___std_wait_for_threadpool_work_callbacks)(PTP_WORK, BOOL); +static BOOL (__stdcall *p___std_atomic_wait_direct)(volatile void*, void*, size_t, DWORD); +static void (__stdcall *p___std_atomic_notify_one_direct)(void*); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -46,6 +49,8 @@ static HMODULE init(void) SET(p___std_create_threadpool_work, "__std_create_threadpool_work"); SET(p___std_submit_threadpool_work, "__std_submit_threadpool_work"); SET(p___std_wait_for_threadpool_work_callbacks, "__std_wait_for_threadpool_work_callbacks"); + SET(p___std_atomic_wait_direct, "__std_atomic_wait_direct"); + SET(p___std_atomic_notify_one_direct, "__std_atomic_notify_one_direct"); return msvcp; } @@ -162,6 +167,76 @@ static void test_threadpool_work(void) ok(!work, "expected failure\n"); } +LONG64 address; +static void __cdecl atomic_wait_thread(void *arg) +{ + LONG64 compare = 0; + int r; + + r = p___std_atomic_wait_direct(&address, &compare, sizeof(address), 2000); + ok(r == 1, "r = %d\n", r); +} + +static void test___std_atomic_wait_direct(void) +{ + LONG64 compare; + HANDLE thread; + DWORD gle; + int r; + + if (!GetProcAddress(GetModuleHandleA("kernelbase"), "WaitOnAddress")) + { + win_skip("WaitOnAddress not available\n"); + return; + } + + address = compare = 0; + SetLastError(0); + r = p___std_atomic_wait_direct(&address, &compare, 5, 0); + ok(!r, "r = %d\n", r); + gle = GetLastError(); + ok(gle == ERROR_INVALID_PARAMETER, "expected %d, got %ld\n", ERROR_INVALID_PARAMETER, gle); + + SetLastError(0); + r = p___std_atomic_wait_direct(&address, &compare, 1, 0); + ok(!r, "r = %d\n", r); + gle = GetLastError(); + ok(gle == ERROR_TIMEOUT, "expected %d, got %ld\n", ERROR_TIMEOUT, gle); + r = p___std_atomic_wait_direct(&address, &compare, 2, 0); + ok(!r, "r = %d\n", r); + gle = GetLastError(); + ok(gle == ERROR_TIMEOUT, "expected %d, got %ld\n", ERROR_TIMEOUT, gle); + r = p___std_atomic_wait_direct(&address, &compare, 4, 0); + ok(!r, "r = %d\n", r); + gle = GetLastError(); + ok(gle == ERROR_TIMEOUT, "expected %d, got %ld\n", ERROR_TIMEOUT, gle); + r = p___std_atomic_wait_direct(&address, &compare, 8, 0); + ok(!r, "r = %d\n", r); + gle = GetLastError(); + ok(gle == ERROR_TIMEOUT, "expected %d, got %ld\n", ERROR_TIMEOUT, gle); + + SetLastError(0); + r = p___std_atomic_wait_direct(&address, &compare, 8, 1); + ok(!r, "r = %d\n", r); + gle = GetLastError(); + ok(gle == ERROR_TIMEOUT, "expected %d, got %ld\n", ERROR_TIMEOUT, gle); + + compare = 1; + SetLastError(0); + r = p___std_atomic_wait_direct(&address, &compare, 8, 0); + ok(r == 1, "r = %d\n", r); + gle = GetLastError(); + ok(!gle, "expected 0, got %ld\n", gle); + + thread = (HANDLE)_beginthread(atomic_wait_thread, 0, NULL); + ok(thread != INVALID_HANDLE_VALUE, "_beginthread failed\n"); + Sleep(100); + address = 1; + p___std_atomic_notify_one_direct(&address); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); +} + START_TEST(msvcp140_atomic_wait) { HMODULE msvcp; @@ -172,5 +247,6 @@ START_TEST(msvcp140_atomic_wait) } test___std_parallel_algorithms_hw_threads(); test_threadpool_work(); + test___std_atomic_wait_direct(); FreeLibrary(msvcp); }

1 0

Piotr Caban : msvcp140_atomic_wait: Add __std_atomic_notify_all_direct implementation.
by Alexandre Julliard 28 Apr '22

28 Apr '22

Module: wine Branch: master Commit: 4c26471abeb3ddc481717294d373e249e045a656 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c26471abeb3ddc481717294… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 27 20:22:20 2022 +0200 msvcp140_atomic_wait: Add __std_atomic_notify_all_direct implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index f27c1058d14..a4ea3d619f5 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -68,3 +68,9 @@ void __stdcall __std_atomic_notify_one_direct(void *addr) TRACE("(%p)\n", addr); WakeByAddressSingle(addr); } + +void __stdcall __std_atomic_notify_all_direct(void *addr) +{ + TRACE("(%p)\n", addr); + WakeByAddressAll(addr); +} diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index f28cfe9513c..0c99585c057 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -2,7 +2,7 @@ @ stub __std_atomic_compare_exchange_128 @ stub __std_atomic_get_mutex @ stub __std_atomic_has_cmpxchg16b -@ stub __std_atomic_notify_all_direct +@ stdcall __std_atomic_notify_all_direct(ptr) @ stub __std_atomic_notify_all_indirect @ stdcall __std_atomic_notify_one_direct(ptr) @ stub __std_atomic_notify_one_indirect

1 0

← Newer
1
2
3
4
5
6
7
...
103
Older →

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 April 2022