April 2022 - Wine-Commits - list.winehq.org

Ismael Luceno : server: Fix missing include for uid_t.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: oldstable Commit: 4517c49ade025cc4b0c27b4967ce19738ad7ca47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4517c49ade025cc4b0c27b49… Author: Ismael Luceno <ismael(a)iodev.co.uk> Date: Fri Nov 12 19:39:35 2021 +0100 server: Fix missing include for uid_t. Explicitly include <sys/types.h> to make uid_t available to users of server/security.h. This is a problem on musl, and possibly other non-glibc systems. Signed-off-by: Ismael Luceno <ismael(a)iodev.co.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c35df50c307789a177d07e6c74b0be830dc59f1a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/security.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/security.h b/server/security.h index 08bdb8de805..3b00553d199 100644 --- a/server/security.h +++ b/server/security.h @@ -21,6 +21,8 @@ #ifndef __WINE_SERVER_SECURITY_H #define __WINE_SERVER_SECURITY_H +#include <sys/types.h> + extern const LUID SeIncreaseQuotaPrivilege; extern const LUID SeSecurityPrivilege; extern const LUID SeTakeOwnershipPrivilege;

1 0

Tag wine-6.0.4 : Alexandre Julliard : Release 6.0.4
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: refs/tags/wine-6.0.4 Tag: a9c10ea65bb2c9f869e17a7367725a4288a2c9fb URL: https://source.winehq.org/git/wine.git/?a=tag;h=a9c10ea65bb2c9f869e17a73677… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 12 20:36:27 2022 +0200 Release 6.0.4

1 0

Michael Stefaniuc : Release 6.0.4.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: oldstable Commit: 270803bad7c7a584a1a71307e8d07df0d01e9110 URL: https://source.winehq.org/git/wine.git/?a=commit;h=270803bad7c7a584a1a71307… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Apr 3 23:26:59 2022 +0200 Release 6.0.4. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 340 +++++++++++++++++++++++++------------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 ++-- 4 files changed, 149 insertions(+), 215 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=270803bad7c7a584a1a7…

1 0

Nikolay Sivov : include: Add WbemErrorEnum error codes.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: oldstable Commit: 461abf501ab824a730c463de23a6489bb7375aa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=461abf501ab824a730c463de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 11 15:26:55 2022 +0300 include: Add WbemErrorEnum error codes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52378 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9dd1654c84adfe3344419243ee6955248b14e797) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wbemdisp.idl | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/include/wbemdisp.idl b/include/wbemdisp.idl index 8ccdd0ca5e2..78e386ed059 100644 --- a/include/wbemdisp.idl +++ b/include/wbemdisp.idl @@ -760,6 +760,143 @@ enum WbemCimtypeEnum wbemCimtypeChar16 = 103 } WbemCimtypeEnum; +typedef +[ + v1_enum, + uuid(4a249b7c-fc9a-11d1-8b1e-00600806d9b6), +] +enum WbemErrorEnum +{ + wbemNoErr = 0, + wbemErrFailed = 0x80041001, + wbemErrNotFound = 0x80041002, + wbemErrAccessDenied = 0x80041003, + wbemErrProviderFailure = 0x80041004, + wbemErrTypeMismatch = 0x80041005, + wbemErrOutOfMemory = 0x80041006, + wbemErrInvalidContext = 0x80041007, + wbemErrInvalidParameter = 0x80041008, + wbemErrNotAvailable = 0x80041009, + wbemErrCriticalError = 0x8004100a, + wbemErrInvalidStream = 0x8004100b, + wbemErrNotSupported = 0x8004100c, + wbemErrInvalidSuperclass = 0x8004100d, + wbemErrInvalidNamespace = 0x8004100e, + wbemErrInvalidObject = 0x8004100f, + wbemErrInvalidClass = 0x80041010, + wbemErrProviderNotFound = 0x80041011, + wbemErrInvalidProviderRegistration = 0x80041012, + wbemErrProviderLoadFailure = 0x80041013, + wbemErrInitializationFailure = 0x80041014, + wbemErrTransportFailure = 0x80041015, + wbemErrInvalidOperation = 0x80041016, + wbemErrInvalidQuery = 0x80041017, + wbemErrInvalidQueryType = 0x80041018, + wbemErrAlreadyExists = 0x80041019, + wbemErrOverrideNotAllowed = 0x8004101a, + wbemErrPropagatedQualifier = 0x8004101b, + wbemErrPropagatedProperty = 0x8004101c, + wbemErrUnexpected = 0x8004101d, + wbemErrIllegalOperation = 0x8004101e, + wbemErrCannotBeKey = 0x8004101f, + wbemErrIncompleteClass = 0x80041020, + wbemErrInvalidSyntax = 0x80041021, + wbemErrNondecoratedObject = 0x80041022, + wbemErrReadOnly = 0x80041023, + wbemErrProviderNotCapable = 0x80041024, + wbemErrClassHasChildren = 0x80041025, + wbemErrClassHasInstances = 0x80041026, + wbemErrQueryNotImplemented = 0x80041027, + wbemErrIllegalNull = 0x80041028, + wbemErrInvalidQualifierType = 0x80041029, + wbemErrInvalidPropertyType = 0x8004102a, + wbemErrValueOutOfRange = 0x8004102b, + wbemErrCannotBeSingleton = 0x8004102c, + wbemErrInvalidCimType = 0x8004102d, + wbemErrInvalidMethod = 0x8004102e, + wbemErrInvalidMethodParameters = 0x8004102f, + wbemErrSystemProperty = 0x80041030, + wbemErrInvalidProperty = 0x80041031, + wbemErrCallCancelled = 0x80041032, + wbemErrShuttingDown = 0x80041033, + wbemErrPropagatedMethod = 0x80041034, + wbemErrUnsupportedParameter = 0x80041035, + wbemErrMissingParameter = 0x80041036, + wbemErrInvalidParameterId = 0x80041037, + wbemErrNonConsecutiveParameterIds = 0x80041038, + wbemErrParameterIdOnRetval = 0x80041039, + wbemErrInvalidObjectPath = 0x8004103a, + wbemErrOutOfDiskSpace = 0x8004103b, + wbemErrBufferTooSmall = 0x8004103c, + wbemErrUnsupportedPutExtension = 0x8004103d, + wbemErrUnknownObjectType = 0x8004103e, + wbemErrUnknownPacketType = 0x8004103f, + wbemErrMarshalVersionMismatch = 0x80041040, + wbemErrMarshalInvalidSignature = 0x80041041, + wbemErrInvalidQualifier = 0x80041042, + wbemErrInvalidDuplicateParameter = 0x80041043, + wbemErrTooMuchData = 0x80041044, + wbemErrServerTooBusy = 0x80041045, + wbemErrInvalidFlavor = 0x80041046, + wbemErrCircularReference = 0x80041047, + wbemErrUnsupportedClassUpdate = 0x80041048, + wbemErrCannotChangeKeyInheritance = 0x80041049, + wbemErrCannotChangeIndexInheritance = 0x80041050, + wbemErrTooManyProperties = 0x80041051, + wbemErrUpdateTypeMismatch = 0x80041052, + wbemErrUpdateOverrideNotAllowed = 0x80041053, + wbemErrUpdatePropagatedMethod = 0x80041054, + wbemErrMethodNotImplemented = 0x80041055, + wbemErrMethodDisabled = 0x80041056, + wbemErrRefresherBusy = 0x80041057, + wbemErrUnparsableQuery = 0x80041058, + wbemErrNotEventClass = 0x80041059, + wbemErrMissingGroupWithin = 0x8004105a, + wbemErrMissingAggregationList = 0x8004105b, + wbemErrPropertyNotAnObject = 0x8004105c, + wbemErrAggregatingByObject = 0x8004105d, + wbemErrUninterpretableProviderQuery = 0x8004105f, + wbemErrBackupRestoreWinmgmtRunning = 0x80041060, + wbemErrQueueOverflow = 0x80041061, + wbemErrPrivilegeNotHeld = 0x80041062, + wbemErrInvalidOperator = 0x80041063, + wbemErrLocalCredentials = 0x80041064, + wbemErrCannotBeAbstract = 0x80041065, + wbemErrAmendedObject = 0x80041066, + wbemErrClientTooSlow = 0x80041067, + wbemErrNullSecurityDescriptor = 0x80041068, + wbemErrTimeout = 0x80041069, + wbemErrInvalidAssociation = 0x8004106a, + wbemErrAmbiguousOperation = 0x8004106b, + wbemErrQuotaViolation = 0x8004106c, + wbemErrTransactionConflict = 0x8004106d, + wbemErrForcedRollback = 0x8004106e, + wbemErrUnsupportedLocale = 0x8004106f, + wbemErrHandleOutOfDate = 0x80041070, + wbemErrConnectionFailed = 0x80041071, + wbemErrInvalidHandleRequest = 0x80041072, + wbemErrPropertyNameTooWide = 0x80041073, + wbemErrClassNameTooWide = 0x80041074, + wbemErrMethodNameTooWide = 0x80041075, + wbemErrQualifierNameTooWide = 0x80041076, + wbemErrRerunCommand = 0x80041077, + wbemErrDatabaseVerMismatch = 0x80041078, + wbemErrVetoPut = 0x80041079, + wbemErrVetoDelete = 0x8004107a, + wbemErrInvalidLocale = 0x80041080, + wbemErrProviderSuspended = 0x80041081, + wbemErrSynchronizationRequired = 0x80041082, + wbemErrNoSchema = 0x80041083, + wbemErrProviderAlreadyRegistered = 0x80041084, + wbemErrProviderNotRegistered = 0x80041085, + wbemErrFatalTransportError = 0x80041086, + wbemErrEncryptedConnectionRequired = 0x80041087, + wbemErrRegistrationTooBroad = 0x80042001, + wbemErrRegistrationTooPrecise = 0x80042002, + wbemErrTimedout = 0x80043001, + wbemErrResetToDefault = 0x80043002 +} WbemErrorEnum; + [ object, local,

1 0

Louis Lenders : ole32: Add stub for OleConvertIStorageToOLESTREAMEx.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: oldstable Commit: 1a508ae2bf9a90acefada0a508f3690b37d58fa5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a508ae2bf9a90acefada0a5… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Jan 21 10:06:59 2022 +0100 ole32: Add stub for OleConvertIStorageToOLESTREAMEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52298 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 18e331fd63173b3f3fe00e930e3e09aad94493a0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/ole32.spec | 2 +- dlls/ole32/storage32.c | 11 +++++++++++ include/ole2.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 8e73fdd16b4..08e15fd3d8b 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -187,7 +187,7 @@ @ stdcall Ole32DllGetClassObject(ptr ptr ptr) @ stdcall OleBuildVersion() @ stdcall OleConvertIStorageToOLESTREAM(ptr ptr) -@ stub OleConvertIStorageToOLESTREAMEx +@ stdcall OleConvertIStorageToOLESTREAMEx(ptr long long long long ptr ptr) @ stdcall OleConvertOLESTREAMToIStorage(ptr ptr ptr) @ stub OleConvertOLESTREAMToIStorageEx @ stdcall OleCreate(ptr ptr long ptr ptr ptr ptr) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3d372af83f5..706655ebd17 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -10595,6 +10595,17 @@ enum stream_1ole_flags { OleStream_Convert = 0x00000004 }; +/************************************************************************* + * OleConvertIStorageToOLESTREAMEx [OLE32.@] + */ +HRESULT WINAPI OleConvertIStorageToOLESTREAMEx ( LPSTORAGE stg, CLIPFORMAT cf, LONG width, LONG height, + DWORD size, LPSTGMEDIUM medium, LPOLESTREAM olestream ) +{ + FIXME("%p %x %d %d %d %p %p stub\n", stg, cf, width, height, size, medium, olestream); + + return E_NOTIMPL; +} + /*********************************************************************** * GetConvertStg (OLE32.@) */ diff --git a/include/ole2.h b/include/ole2.h index 05c1b5502c7..628bebae137 100644 --- a/include/ole2.h +++ b/include/ole2.h @@ -161,6 +161,8 @@ typedef struct _OLESTREAM { HRESULT WINAPI OleConvertOLESTREAMToIStorage( LPOLESTREAM lpolestream, LPSTORAGE pstg, const DVTARGETDEVICE* ptd); HRESULT WINAPI OleConvertIStorageToOLESTREAM( LPSTORAGE pstg, LPOLESTREAM lpolestream); +HRESULT WINAPI OleConvertIStorageToOLESTREAMEx( LPSTORAGE stg, CLIPFORMAT cf, LONG width, LONG height, + DWORD size, LPSTGMEDIUM medium, LPOLESTREAM olestream ); HRESULT WINAPI OleDoAutoConvert( LPSTORAGE pStg, LPCLSID pClsidNew ); HRESULT WINAPI OleGetAutoConvert( REFCLSID clsidOld, LPCLSID pClsidNew );

1 0

Alex Henrie : explorer: Only try to destroy the IShellWindows object if it exists.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: oldstable Commit: c7ae2d5d227f1232db9054ff20e1b9a1f848c4da URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7ae2d5d227f1232db9054ff… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 30 19:25:07 2022 -0700 explorer: Only try to destroy the IShellWindows object if it exists. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52494 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit adda27cdb82fd40ef71e554b8ba17244cb871710) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/explorer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 43bd4ef13a8..3c32a228a1c 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -671,8 +671,11 @@ static LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, L switch(uMsg) { case WM_DESTROY: - IShellWindows_Revoke(info->sw, info->sw_cookie); - IShellWindows_Release(info->sw); + if(info->sw) + { + IShellWindows_Revoke(info->sw, info->sw_cookie); + IShellWindows_Release(info->sw); + } IExplorerBrowser_Unadvise(browser,info->advise_cookie); IExplorerBrowser_Destroy(browser);

1 0

Olivier F. R. Dierick : taskschd: Set count to zero in regtasks_get_Count stub.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: oldstable Commit: 134789d517546c9fc4c21e7e9af53dbde10928ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=134789d517546c9fc4c21e7e… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Fri Jan 7 00:58:03 2022 +0100 taskschd: Set count to zero in regtasks_get_Count stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52349 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bbd9b9bfee41ae2274e9579f418b0b741e29e6cb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/taskschd/regtask.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index 0b4b5717657..094f34d8f79 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -465,6 +465,7 @@ static HRESULT WINAPI regtasks_Invoke(IRegisteredTaskCollection *iface, DISPID d static HRESULT WINAPI regtasks_get_Count(IRegisteredTaskCollection *iface, LONG *count) { FIXME("%p,%p: stub\n", iface, count); + if (count) *count = 0; return E_NOTIMPL; }

1 0

Piotr Caban : ucrtbase: Add support for r-value demangling in unDName.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: oldstable Commit: 9c0dfffe3f94ebb15b0c92e6383f8fe5203add58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c0dfffe3f94ebb15b0c92e6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 7 17:44:46 2022 +0100 ucrtbase: Add support for r-value demangling in unDName. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44202 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a656a8b64459845dd68ea4aa43639b06f452193b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/undname.c | 6 ++++++ dlls/ucrtbase/tests/cpp.c | 21 ++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index a8e2ef2bd08..e06c4c47656 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -450,6 +450,7 @@ static BOOL get_modified_type(struct datatype_t *ct, struct parsed_symbol* sym, case 'R': str_modif = str_printf(sym, " *%s volatile", ptr_modif); break; case 'S': str_modif = str_printf(sym, " *%s const volatile", ptr_modif); break; case '?': str_modif = ""; break; + case '$': str_modif = str_printf(sym, " &&%s", ptr_modif); break; default: return FALSE; } @@ -1028,6 +1029,11 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, if (!demangle_datatype(sym, ct, pmt_ref, in_args)) goto done; ct->left = str_printf(sym, "%s %s", ct->left, ptr); } + else if (*sym->current == 'Q') + { + sym->current++; + if (!get_modified_type(ct, sym, pmt_ref, '$', in_args)) goto done; + } break; } break; diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c index 163e1968069..77b06e7cd42 100644 --- a/dlls/ucrtbase/tests/cpp.c +++ b/dlls/ucrtbase/tests/cpp.c @@ -52,7 +52,7 @@ static int (CDECL *p___std_type_info_compare)(const type_info140*, const type_in static const char* (CDECL *p___std_type_info_name)(type_info140*, SLIST_HEADER*); static void (CDECL *p___std_type_info_destroy_list)(SLIST_HEADER*); static size_t (CDECL *p___std_type_info_hash)(type_info140*); - +static char* (__cdecl *p___unDName)(char*,const char*,int,void*,void*,unsigned short int); static BOOL init(void) { @@ -72,6 +72,7 @@ static BOOL init(void) p___std_type_info_name = (void*)GetProcAddress(module, "__std_type_info_name"); p___std_type_info_destroy_list = (void*)GetProcAddress(module, "__std_type_info_destroy_list"); p___std_type_info_hash = (void*)GetProcAddress(module, "__std_type_info_hash"); + p___unDName = (void*)GetProcAddress(module, "__unDName"); return TRUE; } @@ -189,9 +190,27 @@ static void test___std_type_info(void) ok(hash1 != hash2, "hash1 == hash2 for different strings\n"); } +static void test___unDName(void) +{ + char *name; + + name = p___unDName(0, "??4QDnsDomainNameRecord@@QAEAAV0@$$QAV0@@Z", 0, malloc, free, 0); + ok(!strcmp(name, "public: class QDnsDomainNameRecord & __thiscall " + "QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord &&)"), + "unDName returned %s\n", wine_dbgstr_a(name)); + free(name); + + name = p___unDName(0, "??4QDnsDomainNameRecord@@QAEAAV0@$$QEAV0@@Z", 0, malloc, free, 0); + ok(!strcmp(name, "public: class QDnsDomainNameRecord & __thiscall " + "QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord && __ptr64)"), + "unDName returned %s\n", wine_dbgstr_a(name)); + free(name); +} + START_TEST(cpp) { if (!init()) return; test___std_exception(); test___std_type_info(); + test___unDName(); }

1 0

Alexandre Julliard : user.exe: Make sure that the thunk selector doesn't get freed.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: oldstable Commit: dadacb9fb805934609cd0fbed856287cf281ce4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dadacb9fb805934609cd0fbe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 20 11:07:20 2022 +0100 user.exe: Make sure that the thunk selector doesn't get freed. Spotted by Fabian Maurer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12732 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 879ccd33572170e9bcb00d5a45cf65b2ca675439) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user.exe16/message.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 93e2cc018bf..b98ab84ae5f 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -155,6 +155,7 @@ static WNDPROC16 alloc_win16_thunk( WNDPROC handle ) if (!(thunk_selector = GlobalAlloc16( GMEM_FIXED | GMEM_ZEROINIT, MAX_WINPROCS16 * sizeof(WINPROC_THUNK) ))) return NULL; + FarSetOwner16( thunk_selector, 0 ); PrestoChangoSelector16( thunk_selector, thunk_selector ); thunk_array = GlobalLock16( thunk_selector ); relay = GetProcAddress16( GetModuleHandle16("user"), "__wine_call_wndproc" );

1 0

Louis Lenders : wbemprox: Add some properties of SoftwareLicensingProduct class.
by Alexandre Julliard April 12, 2022

April 12, 2022

Module: wine Branch: oldstable Commit: 188c86e5f3bf449cad69f2d9d1b16b6596675d9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=188c86e5f3bf449cad69f2d9… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Jan 19 12:43:07 2022 +0100 wbemprox: Add some properties of SoftwareLicensingProduct class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51163 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> (cherry picked from commit a9826b48e4c385ddce1d7913c41cdc652b8fbf06) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/builtin.c | 16 ++++++++++++++++ dlls/wbemprox/tests/query.c | 26 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d5e935063ad..387ec442a67 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -378,6 +378,11 @@ static const struct column col_sid[] = { L"SID", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { L"SidLength", CIM_UINT32 }, }; +static const struct column col_softwarelicensingproduct[] = +{ + { L"LicenseIsAddon", CIM_BOOLEAN }, + { L"LicenseStatus", CIM_UINT32 }, +}; static const struct column col_sounddevice[] = { { L"DeviceID", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -788,6 +793,11 @@ struct record_sid const WCHAR *sid; UINT32 sidlength; }; +struct record_softwarelicensingproduct +{ + int license_is_addon; + UINT32 license_status; +}; struct record_sounddevice { const WCHAR *deviceid; @@ -930,6 +940,11 @@ static const struct record_quickfixengineering data_quickfixengineering[] = { L"http://winehq.org", L"KB1234567" }, }; +static const struct record_softwarelicensingproduct data_softwarelicensingproduct[] = +{ + { 0, 1 }, +}; + static const struct record_stdregprov data_stdregprov[] = { { reg_create_key, reg_enum_key, reg_enum_values, reg_get_stringvalue } @@ -4043,6 +4058,7 @@ static struct table builtin_classes[] = { L"CIM_DataFile", C(col_datafile), 0, 0, NULL, fill_datafile }, { L"CIM_LogicalDisk", C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, { L"CIM_Processor", C(col_processor), 0, 0, NULL, fill_processor }, + { L"SoftwareLicensingProduct", C(col_softwarelicensingproduct), D(data_softwarelicensingproduct) }, { L"StdRegProv", C(col_stdregprov), D(data_stdregprov) }, { L"SystemRestore", C(col_sysrestore), D(data_sysrestore) }, { L"Win32_BIOS", C(col_bios), 0, 0, NULL, fill_bios }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 8d2ccc34efd..03e6a9904e7 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1706,6 +1706,31 @@ static void test_Win32_WinSAT( IWbemServices *services ) SysFreeString( wql ); } +static void test_SoftwareLicensingProduct( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM SoftwareLicensingProduct" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK , "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + check_property( obj, L"LicenseIsAddon", VT_BOOL, CIM_BOOLEAN ); + check_property( obj, L"LicenseStatus", VT_I4, CIM_UINT32 ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_DesktopMonitor( IWbemServices *services ) { BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_DesktopMonitor" ); @@ -1959,6 +1984,7 @@ START_TEST(query) test_select( services ); /* classes */ + test_SoftwareLicensingProduct( services ); test_StdRegProv( services ); test_SystemSecurity( services ); test_Win32_Baseboard( services );

1 0