August 2020 - Wine-commits - list.winehq.org

Martin Storsjo : configure, msvcrt: Check for the finite() function just like finitef().
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 342c5da7c1332cbaa47b5eb056caa46937e9fc59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=342c5da7c1332cbaa47b5eb0… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 14 14:33:24 2020 +0300 configure, msvcrt: Check for the finite() function just like finitef(). If missing, fall back on the C99 isfinite() macro, just like the existing finitef() fallback. The finite() function is deprecated in macOS 10.9 and is removed (from the SDK) since macOS 11.0. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msvcrt/math.c | 3 +++ include/config.h.in | 3 +++ 4 files changed, 8 insertions(+) diff --git a/configure b/configure index ffe5ecca89..88b27ce62f 100755 --- a/configure +++ b/configure @@ -18037,6 +18037,7 @@ for ac_func in \ _spawnvp \ epoll_create \ ffs \ + finite \ finitef \ fnmatch \ fork \ diff --git a/configure.ac b/configure.ac index 67729e0c0a..13adf2da7e 100644 --- a/configure.ac +++ b/configure.ac @@ -2189,6 +2189,7 @@ AC_CHECK_FUNCS(\ _spawnvp \ epoll_create \ ffs \ + finite \ finitef \ fnmatch \ fork \ diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6898b38641..abb9ef0a9c 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -47,6 +47,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +#ifndef HAVE_FINITE +#define finite(x) isfinite(x) +#endif #ifndef HAVE_FINITEF #define finitef(x) isfinite(x) #endif diff --git a/include/config.h.in b/include/config.h.in index 1748a8b8d8..5a21875f66 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -168,6 +168,9 @@ /* Define to 1 if you have the `ffs' function. */ #undef HAVE_FFS +/* Define to 1 if you have the `finite' function. */ +#undef HAVE_FINITE + /* Define to 1 if you have the `finitef' function. */ #undef HAVE_FINITEF

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 4b12dbe5cdfc745d5837b265496f585e06f8bb03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b12dbe5cdfc745d5837b265… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Aug 14 13:26:49 2020 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 142 ++++++++++++++++++++++----------------------------------------- 1 file changed, 50 insertions(+), 92 deletions(-) diff --git a/po/de.po b/po/de.po index 345b1d31da..0099da09a1 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-02-10 17:39+0100\n" +"PO-Revision-Date: 2020-08-14 13:26+0200\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -3622,7 +3622,7 @@ msgstr "Gamecontroller" #: joy.rc:32 msgid "Test and configure game controllers." -msgstr "" +msgstr "Gamecontroller testen und konfigurieren." #: jscript.rc:28 msgid "Error converting object to primitive type" @@ -3637,10 +3637,8 @@ msgid "Subscript out of range" msgstr "Index außerhalb des Bereichs" #: jscript.rc:31 -#, fuzzy -#| msgid "Out of paper; " msgid "Out of stack space" -msgstr "Papierfach leer; " +msgstr "Stackspeicher voll" #: jscript.rc:32 msgid "Object required" @@ -3779,16 +3777,12 @@ msgid "JScript object expected" msgstr "JScript-Objekt erwartet" #: jscript.rc:63 -#, fuzzy -#| msgid "Array object expected" msgid "Enumerator object expected" -msgstr "Array-Objekt erwartet" +msgstr "Enumerator-Objekt erwartet" #: jscript.rc:64 -#, fuzzy -#| msgid "Boolean object expected" msgid "Regular Expression object expected" -msgstr "Boolesches Objekt erwartet" +msgstr "Regulärer-Ausdruck-Objekt erwartet" #: jscript.rc:65 msgid "Syntax error in regular expression" @@ -6877,10 +6871,8 @@ msgid "Sink has not been finalized.\n" msgstr "Ausgang wurde nicht finalisiert.\n" #: mferror.mc:732 -#, fuzzy -#| msgid "Sink was already stopped.\n" msgid "Clock was stopped\n" -msgstr "Ausgang wurde bereits gestoppt.\n" +msgstr "Zeitgeber wurde gestoppt\n" #: mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7260,10 +7252,8 @@ msgid "Clock state was already set.\n" msgstr "Zeitgeberstatus wurde bereits gesetzt.\n" #: mferror.mc:725 -#, fuzzy -#| msgid "Clock is not available.\n" msgid "Clock is not simple\n" -msgstr "Zeitgeber nicht verfügbar.\n" +msgstr "Zeitgeber ist nicht einfach\n" #: mpr.rc:35 wininet.rc:37 msgid "Enter Network Password" @@ -8363,7 +8353,8 @@ msgstr "Anbieter" #: version.rc:59 msgid "Select the data you want to connect to:" -msgstr "Wählen Sie die zu verbindenden Daten aus:" +msgstr "" +"Wählen Sie aus, zu welchen Daten Sie eine Verbindung herstellen möchten:" #: version.rc:66 msgid "Connection" @@ -8411,7 +8402,7 @@ msgstr "Kennwort &speichern" #: version.rc:85 msgid "3. Enter the &initial catalog to use:" -msgstr "3. Folgenden Initialkatalog verwenden:" +msgstr "3. Folgenden &Initialkatalog verwenden:" #: version.rc:87 msgid "&Test Connection" @@ -8422,116 +8413,97 @@ msgid "Advanced" msgstr "Fortgeschrittene" #: version.rc:95 -#, fuzzy -#| msgid "Network share" msgid "Network settings" -msgstr "Netzwerkfreigabe" +msgstr "Netzwerkeinstellungen" #: version.rc:96 -#, fuzzy -#| msgid "Bad impersonation level.\n" msgid "&Impersonation level:" -msgstr "Fehlerhafte Imitationsstufe.\n" +msgstr "&Imitationsstufe:" #: version.rc:98 msgid "P&rotection level:" -msgstr "" +msgstr "&Schutzlevel:" #: version.rc:101 -#, fuzzy -#| msgid "Connected" msgid "Connect:" -msgstr "Verbunden" +msgstr "Verbinden:" #: version.rc:103 -#, fuzzy -#| msgid "seconds" msgid "seconds." -msgstr "Sekunden" +msgstr "Sekunden." #: version.rc:104 -#, fuzzy -#| msgid "Success" msgid "A&ccess:" -msgstr "Erfolgreich" +msgstr "Zugriff:" #: version.rc:110 -#, fuzzy -#| msgid "&All" msgid "All" -msgstr "&Alles" +msgstr "Alle" #: version.rc:114 msgid "" "These are the initialization properties for this type of data. To edit a " "value, select a property, then choose Edit Value below." msgstr "" +"Dies sind die Initialisierungs-Eigenschaften für diese Art von Daten. Um " +"einen Wert zu bearbeiten, markieren Sie die entsprechende Eigenschaft und " +"klicken Sie auf \"Wert bearbeiten\"." #: version.rc:115 -#, fuzzy -#| msgid "&Edit..." msgid "&Edit Value..." -msgstr "&Bearbeiten..." +msgstr "&Wert bearbeiten..." #: version.rc:49 -#, fuzzy -#| msgid "Data Link Properties" msgid "Data Link Error" -msgstr "Eigenschaften der Datenverbindung" +msgstr "Datenverbindungsfehler" #: version.rc:50 -#, fuzzy -#| msgid "Please select a file." msgid "Please select a provider." -msgstr "Bitte wählen Sie eine Datei." +msgstr "Bitte wählen Sie einen Anbieter." #: version.rc:51 msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." msgstr "" +"Der Anbieter ist nicht länger verfügbar. Bitte stellen Sie sicher, dass der " +"Anbieter korrekt installiert wurde." #: version.rc:36 msgid "Data Link Properties" -msgstr "Eigenschaften der Datenverbindung" +msgstr "Datenverbindungseigenschaften" #: version.rc:37 msgid "OLE DB Provider(s)" msgstr "OLE DB-Anbieter" #: version.rc:41 -#, fuzzy -#| msgid "Ready" msgid "Read" -msgstr "Bereit" +msgstr "Read" #: version.rc:42 -#, fuzzy -#| msgid "Readme:" msgid "ReadWrite" -msgstr "Liesmich:" +msgstr "ReadWrite" #: version.rc:43 msgid "Share Deny None" -msgstr "" +msgstr "Share Deny None" #: version.rc:44 msgid "Share Deny Read" -msgstr "" +msgstr "Share Deny Read" #: version.rc:45 msgid "Share Deny Write" -msgstr "" +msgstr "Share Deny Write" #: version.rc:46 msgid "Share Exclusive" -msgstr "" +msgstr "Share Exclusive" #: version.rc:47 -#, fuzzy -#| msgid "I/O Writes" msgid "Write" -msgstr "E/A (Schreiben)" +msgstr "Write" #: oledlg.rc:55 msgid "Insert Object" @@ -9736,16 +9708,12 @@ msgid "Cape Verde Daylight Time" msgstr "Kap Verde Sommerzeit" #: tzres.rc:120 -#, fuzzy -#| msgid "Hawaiian Standard Time" msgid "Haiti Standard Time" -msgstr "Hawaii Normalzeit" +msgstr "Haiti Normalzeit" #: tzres.rc:121 -#, fuzzy -#| msgid "Hawaiian Daylight Time" msgid "Haiti Daylight Time" -msgstr "Hawaii Sommerzeit" +msgstr "Haiti Sommerzeit" #: tzres.rc:78 msgid "Central European Standard Time" @@ -9956,16 +9924,12 @@ msgid "Argentina Daylight Time" msgstr "Argentinien Sommerzeit" #: tzres.rc:142 -#, fuzzy -#| msgid "Mauritius Standard Time" msgid "Marquesas Standard Time" -msgstr "Mauritius Normalzeit" +msgstr "Marquesas Normalzeit" #: tzres.rc:143 -#, fuzzy -#| msgid "Mauritius Daylight Time" msgid "Marquesas Daylight Time" -msgstr "Mauritius Sommerzeit" +msgstr "Marquesas Sommerzeit" #: tzres.rc:156 msgid "Myanmar Standard Time" @@ -10340,16 +10304,12 @@ msgid "Venezuela Daylight Time" msgstr "Venezuela Sommerzeit" #: tzres.rc:60 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Bougainville Standard Time" -msgstr "Mountain Normalzeit" +msgstr "Bougainville Normalzeit" #: tzres.rc:61 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Bougainville Daylight Time" -msgstr "Mountain Sommerzeit" +msgstr "Bougainville Sommerzeit" #: tzres.rc:122 msgid "Hawaiian Standard Time" @@ -10376,16 +10336,12 @@ msgid "New Zealand Daylight Time" msgstr "Neuseeland Sommerzeit" #: tzres.rc:34 -#, fuzzy -#| msgid "Argentina Standard Time" msgid "Aleutian Standard Time" -msgstr "Argentinien Normalzeit" +msgstr "Aleutische Normalzeit" #: tzres.rc:35 -#, fuzzy -#| msgid "Argentina Daylight Time" msgid "Aleutian Daylight Time" -msgstr "Argentinien Sommerzeit" +msgstr "Aleutische Sommerzeit" #: tzres.rc:74 msgid "Central Brazilian Standard Time" @@ -10468,16 +10424,12 @@ msgid "Korea Daylight Time" msgstr "Koreanische Sommerzeit" #: tzres.rc:86 -#, fuzzy -#| msgid "Easter Island Standard Time" msgid "Chatham Islands Standard Time" -msgstr "Osterinsel Normalzeit" +msgstr "Chathaminseln Normalzeit" #: tzres.rc:87 -#, fuzzy -#| msgid "Easter Island Daylight Time" msgid "Chatham Islands Daylight Time" -msgstr "Osterinsel Sommerzeit" +msgstr "Chathaminseln Sommerzeit" #: tzres.rc:92 msgid "E. Africa Standard Time" @@ -12633,6 +12585,9 @@ msgid "" "\n" "hardlink hardlink management\n" msgstr "" +"- Unterstützte Befehle -\n" +"\n" +"hardlink Verwaltung von Hardlinks\n" #: fsutil.mc:35 msgid "" @@ -12640,10 +12595,13 @@ msgid "" "\n" "create create a hardlink\n" msgstr "" +"- Hardlink - Unterstützte Befehle -\n" +"\n" +"create Einen Hardlink anlegen\n" #: fsutil.mc:40 msgid "Syntax: fsutil hardlink create <new> <existing>\n" -msgstr "" +msgstr "Syntax: fsutil hardlink create <neu> <bestehend>\n" #: hostname.rc:30 msgid "Usage: hostname\n"

1 0

Serge Gautherie : winapi_test: Update generated.c files.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 743ed29af51f2dfa3afbe97e94b95fe71cea0de5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=743ed29af51f2dfa3afbe97e… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Fri Aug 14 01:22:56 2020 +0200 winapi_test: Update generated.c files. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/generated.c | 10 ++++++ dlls/ntdll/tests/generated.c | 16 +++++++++ dlls/rpcrt4/tests/generated.c | 2 ++ dlls/shell32/tests/generated.c | 6 ++++ dlls/winmm/tests/generated.c | 76 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 110 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=743ed29af51f2dfa3afb…

1 0

Alexandre Julliard : Release 5.15.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 019fcaa36410f5b52e9c3fb90a621b56a4f10f35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=019fcaa36410f5b52e9c3fb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 14 23:37:58 2020 +0200 Release 5.15. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 794 +++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 403 insertions(+), 411 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=019fcaa36410f5b52e9c…

1 0

Tag wine-5.15 : Alexandre Julliard : Release 5.15
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: refs/tags/wine-5.15 Tag: e53968a3c2fdf64ca67f3328197df97836ab3c99 URL: https://source.winehq.org/git/wine.git/?a=tag;h=e53968a3c2fdf64ca67f3328197… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 14 23:37:58 2020 +0200 Release 5.15

1 0

Nikolay Sivov : include: Move fundamental ORPC types to separate private header.
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: aaef46ea480cdbad08971f7f683cdbf37882f518 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaef46ea480cdbad08971f7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 14 09:16:26 2020 +0300 include: Move fundamental ORPC types to separate private header. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/dcom.idl | 151 +-------------------------------------- include/Makefile.in | 1 + include/wine/orpc.idl | 191 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 193 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aaef46ea480cdbad0897…

1 0

Nikolay Sivov : combase: Move CoGetMarshalSizeMax().
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 3aefd100d73705b4d8bbe6f7dabc631322bb3a0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aefd100d73705b4d8bbe6f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 14 09:16:27 2020 +0300 combase: Move CoGetMarshalSizeMax(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/marshal.c | 32 +++++++++++++++++++++++++++++ dlls/ole32/marshal.c | 52 ----------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 34 insertions(+), 54 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 3214f54550..8bcac10cdc 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -112,7 +112,7 @@ @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) @ stdcall CoGetMalloc(long ptr) -@ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax +@ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) @ stub CoGetModuleType @ stdcall CoGetObjectContext(ptr ptr) @ stdcall CoGetPSClsid(ptr ptr) ole32.CoGetPSClsid diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index 2b0c005812..3c577a9bff 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -24,6 +24,7 @@ #include "wine/debug.h" #include "wine/heap.h" +#include "wine/orpc.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -379,3 +380,34 @@ HRESULT WINAPI CoCreateFreeThreadedMarshaler(IUnknown *outer, IUnknown **marshal return S_OK; } + +/*********************************************************************** + * CoGetMarshalSizeMax (combase.@) + */ +HRESULT WINAPI CoGetMarshalSizeMax(ULONG *size, REFIID riid, IUnknown *unk, + DWORD dest_context, void *pvDestContext, DWORD mshlFlags) +{ + BOOL std_marshal = FALSE; + IMarshal *marshal; + HRESULT hr; + + if (!unk) + return E_POINTER; + + hr = IUnknown_QueryInterface(unk, &IID_IMarshal, (void **)&marshal); + if (hr != S_OK) + { + std_marshal = TRUE; + hr = CoGetStandardMarshal(riid, unk, dest_context, pvDestContext, mshlFlags, &marshal); + } + if (hr != S_OK) + return hr; + + hr = IMarshal_GetMarshalSizeMax(marshal, riid, unk, dest_context, pvDestContext, mshlFlags, size); + if (!std_marshal) + /* add on the size of the whole OBJREF structure like native does */ + *size += sizeof(OBJREF); + + IMarshal_Release(marshal); + return hr; +} diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index cf1e55babe..ea8432e2ee 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1777,58 +1777,6 @@ static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, return hr; } -/*********************************************************************** - * CoGetMarshalSizeMax [OLE32.@] - * - * Gets the maximum amount of data that will be needed by a marshal. - * - * PARAMS - * pulSize [O] Address where maximum marshal size will be stored. - * riid [I] Identifier of the interface to marshal. - * pUnk [I] Pointer to the object to marshal. - * dwDestContext [I] Destination. Used to enable or disable optimizations. - * pvDestContext [I] Reserved. Must be NULL. - * mshlFlags [I] Flags that affect the marshaling. See CoMarshalInterface(). - * - * RETURNS - * Success: S_OK. - * Failure: HRESULT code. - * - * SEE ALSO - * CoMarshalInterface(). - */ -HRESULT WINAPI CoGetMarshalSizeMax(ULONG *pulSize, REFIID riid, IUnknown *pUnk, - DWORD dwDestContext, void *pvDestContext, - DWORD mshlFlags) -{ - HRESULT hr; - LPMARSHAL pMarshal; - BOOL std_marshal = FALSE; - - if(!pUnk) - return E_POINTER; - - hr = IUnknown_QueryInterface(pUnk, &IID_IMarshal, (void**)&pMarshal); - if (hr != S_OK) - { - std_marshal = TRUE; - hr = CoGetStandardMarshal(riid, pUnk, dwDestContext, pvDestContext, - mshlFlags, &pMarshal); - } - if (hr != S_OK) - return hr; - - hr = IMarshal_GetMarshalSizeMax(pMarshal, riid, pUnk, dwDestContext, - pvDestContext, mshlFlags, pulSize); - if (!std_marshal) - /* add on the size of the whole OBJREF structure like native does */ - *pulSize += sizeof(OBJREF); - - IMarshal_Release(pMarshal); - return hr; -} - - static void dump_MSHLFLAGS(MSHLFLAGS flags) { if (flags & MSHLFLAGS_TABLESTRONG) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index a19264127f..772599b4cf 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -39,7 +39,7 @@ @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) combase.CoGetInstanceFromIStorage @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) combase.CoGetInterfaceAndReleaseStream @ stdcall CoGetMalloc(long ptr) combase.CoGetMalloc -@ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) +@ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) combase.CoGetMarshalSizeMax @ stdcall CoGetObject(wstr ptr ptr ptr) @ stdcall CoGetObjectContext(ptr ptr) combase.CoGetObjectContext @ stdcall CoGetPSClsid(ptr ptr)

1 0

Nikolay Sivov : combase: Move CoMarshalInterface().
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: bca780c020ba8e2ae21f6e876e78160029a46385 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bca780c020ba8e2ae21f6e87… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 14 09:16:28 2020 +0300 combase: Move CoMarshalInterface(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/combase/marshal.c | 95 +++++++++++++++++++++++++++++ dlls/ole32/marshal.c | 149 ---------------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 97 insertions(+), 151 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bca780c020ba8e2ae21f…

1 0

Nikolay Sivov : combase: Move CoInitializeSecurity().
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 561a192317de945ff60a2140c5c027775c7a72ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=561a192317de945ff60a2140… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 14 09:16:29 2020 +0300 combase: Move CoInitializeSecurity(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.c | 13 +++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 15 --------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 5752d90d5c..8d8d83005b 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -785,6 +785,19 @@ HRESULT WINAPI CoRevertToSelf(void) return hr; } +/*********************************************************************** + * CoInitializeSecurity (combase.@) + */ +HRESULT WINAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR sd, LONG cAuthSvc, + SOLE_AUTHENTICATION_SERVICE *asAuthSvc, void *reserved1, DWORD authn_level, + DWORD imp_level, void *reserved2, DWORD capabilities, void *reserved3) +{ + FIXME("%p, %d, %p, %p, %d, %d, %p, %d, %p stub\n", sd, cAuthSvc, asAuthSvc, reserved1, authn_level, + imp_level, reserved2, capabilities, reserved3); + + return S_OK; +} + /*********************************************************************** * CoGetObjectContext (combase.@) */ diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index be5ed85a8e..0f34dc6918 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -124,7 +124,7 @@ @ stdcall CoImpersonateClient() @ stdcall CoIncrementMTAUsage(ptr) ole32.CoIncrementMTAUsage @ stdcall CoInitializeEx(ptr long) ole32.CoInitializeEx -@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) ole32.CoInitializeSecurity +@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) @ stdcall CoInitializeWOW(long long) ole32.CoInitializeWOW @ stub CoInvalidateRemoteMachineBindings @ stdcall CoIsHandlerConnected(ptr) ole32.CoIsHandlerConnected diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index f983b07f20..350508ac9a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3352,21 +3352,6 @@ BOOL WINAPI IsEqualGUID( return !memcmp(rguid1,rguid2,sizeof(GUID)); } -/*********************************************************************** - * CoInitializeSecurity [OLE32.@] - */ -HRESULT WINAPI CoInitializeSecurity(PSECURITY_DESCRIPTOR pSecDesc, LONG cAuthSvc, - SOLE_AUTHENTICATION_SERVICE* asAuthSvc, - void* pReserved1, DWORD dwAuthnLevel, - DWORD dwImpLevel, void* pReserved2, - DWORD dwCapabilities, void* pReserved3) -{ - FIXME("(%p,%d,%p,%p,%d,%d,%p,%d,%p) - stub!\n", pSecDesc, cAuthSvc, - asAuthSvc, pReserved1, dwAuthnLevel, dwImpLevel, pReserved2, - dwCapabilities, pReserved3); - return S_OK; -} - /*********************************************************************** * CoSuspendClassObjects [OLE32.@] * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 7ab90e7b7a..7b2c583661 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -51,7 +51,7 @@ @ stdcall CoIncrementMTAUsage(ptr) @ stdcall CoInitialize(ptr) @ stdcall CoInitializeEx(ptr long) -@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) +@ stdcall CoInitializeSecurity(ptr long ptr ptr long long ptr long ptr) combase.CoInitializeSecurity @ stdcall CoInitializeWOW(long long) @ stdcall CoIsHandlerConnected(ptr) @ stdcall CoIsOle1Class (ptr)

1 0

Dmitry Timoshkov : mshtml: Add trace to IOleCommandTarget::Exec().
by Alexandre Julliard 14 Aug '20

14 Aug '20

Module: wine Branch: master Commit: 8975ec118c28a028b7560bd1a4fef66b625ad867 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8975ec118c28a028b7560bd1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 14 15:04:00 2020 +0800 mshtml: Add trace to IOleCommandTarget::Exec(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/olecmd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 43f9285e8f..a79f2d000e 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -917,6 +917,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID { HTMLDocument *This = impl_from_IOleCommandTarget(iface); + TRACE("(%p)->(%s %d %d %s %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, wine_dbgstr_variant(pvaIn), pvaOut); + if(!This->doc_node->browser) return E_UNEXPECTED;

1 0