September 2015 - Wine-commits

Jacek Caban : oleaut32: Ensure that we' re using the right interface in CreateStub implementation.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: af944cefdfb912eba0d17134f019b0be5b5f1729 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af944cefdfb912eba0d17134f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 4 11:49:30 2015 +0200 oleaut32: Ensure that we're using the right interface in CreateStub implementation. --- dlls/oleaut32/tmarshal.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index a2d1ea1..6608aed 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -2282,6 +2282,7 @@ PSFacBuf_CreateStub( ITypeInfo *tinfo; TMStubImpl *stub; TYPEATTR *typeattr; + IUnknown *obj; TRACE("(%s,%p,%p)\n",debugstr_guid(riid),pUnkServer,ppStub); @@ -2291,16 +2292,26 @@ PSFacBuf_CreateStub( return hres; } + /* FIXME: This is not exactly right. We should probably call QI later. */ + hres = IUnknown_QueryInterface(pUnkServer, riid, (void**)&obj); + if (FAILED(hres)) { + WARN("Could not get %s iface: %08x\n", debugstr_guid(riid), hres); + obj = pUnkServer; + IUnknown_AddRef(obj); + } + stub = CoTaskMemAlloc(sizeof(TMStubImpl)); - if (!stub) + if (!stub) { + IUnknown_Release(obj); return E_OUTOFMEMORY; + } stub->IRpcStubBuffer_iface.lpVtbl = &tmstubvtbl; stub->ref = 1; stub->tinfo = tinfo; stub->dispatch_stub = NULL; stub->dispatch_derivative = FALSE; stub->iid = *riid; - hres = IRpcStubBuffer_Connect(&stub->IRpcStubBuffer_iface,pUnkServer); + hres = IRpcStubBuffer_Connect(&stub->IRpcStubBuffer_iface, obj); *ppStub = &stub->IRpcStubBuffer_iface; TRACE("IRpcStubBuffer: %p\n", stub); if (hres) @@ -2315,6 +2326,7 @@ PSFacBuf_CreateStub( ITypeInfo_ReleaseTypeAttr(tinfo, typeattr); } + IUnknown_Release(obj); return hres; }

1 0

Jacek Caban : ole32: Use get_stub_manager_from_object in CoDisconnectObject.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: 38a9a232f7c079280a285cc50a3c18d18188e210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38a9a232f7c079280a285cc50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 4 11:50:19 2015 +0200 ole32: Use get_stub_manager_from_object in CoDisconnectObject. --- dlls/ole32/compobj.c | 8 +++++++- dlls/ole32/compobj_private.h | 1 - dlls/ole32/stubmanager.c | 25 ------------------------- 3 files changed, 7 insertions(+), 27 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 23c825a..0d0459a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2019,6 +2019,7 @@ void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) */ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) { + struct stub_manager *manager; HRESULT hr; IMarshal *marshal; APARTMENT *apt; @@ -2039,7 +2040,12 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) if (!apt) return CO_E_NOTINITIALIZED; - apartment_disconnectobject(apt, lpUnk); + manager = get_stub_manager_from_object(apt, lpUnk, FALSE); + if (manager) { + /* Release stub manager twice, to remove the apartment reference. */ + stub_manager_int_release(manager); + stub_manager_int_release(manager); + } /* Note: native is pretty broken here because it just silently * fails, without returning an appropriate error code if the object was diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 9f56d47..c63d645 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -235,7 +235,6 @@ APARTMENT *apartment_findfromoxid(OXID oxid, BOOL ref) DECLSPEC_HIDDEN; APARTMENT *apartment_findfromtid(DWORD tid) DECLSPEC_HIDDEN; DWORD apartment_release(struct apartment *apt) DECLSPEC_HIDDEN; HRESULT apartment_disconnectproxies(struct apartment *apt) DECLSPEC_HIDDEN; -void apartment_disconnectobject(struct apartment *apt, void *object) DECLSPEC_HIDDEN; static inline HRESULT apartment_getoxid(const struct apartment *apt, OXID *oxid) { *oxid = apt->oxid; diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 668d46f..30e2054 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -356,31 +356,6 @@ struct stub_manager *get_stub_manager_from_object(APARTMENT *apt, IUnknown *obj, return result; } -/* removes the apartment reference to an object, destroying it when no other - * threads have a reference to it */ -void apartment_disconnectobject(struct apartment *apt, void *object) -{ - BOOL found = FALSE; - struct stub_manager *stubmgr; - - EnterCriticalSection(&apt->cs); - LIST_FOR_EACH_ENTRY( stubmgr, &apt->stubmgrs, struct stub_manager, entry ) - { - if (stubmgr->object == object) - { - found = TRUE; - stub_manager_int_release(stubmgr); - break; - } - } - LeaveCriticalSection(&apt->cs); - - if (found) - TRACE("disconnect object %p\n", object); - else - WARN("couldn't find object %p\n", object); -} - /* gets the stub manager associated with an object id - caller must have * a reference to the apartment while a reference to the stub manager is held. * it must also call release on the stub manager when it is no longer needed */

1 0

Stefan Dösinger : wined3d: Return a texture from the swapchain resource creation callback.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: fa0041954f600ff92cf485d0cb7acd2590c0ea98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa0041954f600ff92cf485d0c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 3 20:56:26 2015 +0200 wined3d: Return a texture from the swapchain resource creation callback. --- dlls/d3d11/device.c | 19 ++++++++------- dlls/d3d8/device.c | 24 +++++++------------ dlls/d3d9/device.c | 24 +++++++------------ dlls/ddraw/ddraw.c | 23 +++++++------------ dlls/dxgi/device.c | 10 ++++---- dlls/wined3d/device.c | 39 +++++++++++++++++-------------- dlls/wined3d/swapchain.c | 60 +++++++++++++++++++++++++----------------------- include/wine/wined3d.h | 4 ++-- 8 files changed, 93 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fa0041954f600ff92cf48…

1 0

Stefan Dösinger : d3d11: Set surface and volume parents to NULL.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: b486a23bac8bd25da5dcf8d809e0ce8fabb0ca64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b486a23bac8bd25da5dcf8d80… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 3 20:56:27 2015 +0200 d3d11: Set surface and volume parents to NULL. --- dlls/d3d11/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4dd528e..dee3c57 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2885,7 +2885,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n", device_parent, container_parent, surface, parent, parent_ops); - *parent = container_parent; + *parent = NULL; *parent_ops = &d3d10_null_wined3d_parent_ops; return S_OK; @@ -2898,7 +2898,7 @@ static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent * TRACE("device_parent %p, container_parent %p, volume %p, parent %p, parent_ops %p.\n", device_parent, container_parent, volume, parent, parent_ops); - *parent = container_parent; + *parent = NULL; *parent_ops = &d3d10_null_wined3d_parent_ops; return S_OK;

1 0

Alexandre Julliard : Release 1.7.51.
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: master Commit: 253a587e471a653e1b5ed590280452f43679aa6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=253a587e471a653e1b5ed5902… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 4 21:01:51 2015 +0900 Release 1.7.51. --- ANNOUNCE | 671 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 353 insertions(+), 340 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=253a587e471a653e1b5ed…

1 0

Tag wine-1.7.51 : Alexandre Julliard : Release 1.7.51
by Alexandre Julliard 04 Sep '15

04 Sep '15

Module: wine Branch: refs/tags/wine-1.7.51 Tag: c65ea800c1efe89665aff81249a7e5145cba1f6a URL: http://source.winehq.org/git/wine.git/?a=tag;h=c65ea800c1efe89665aff81249a7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 4 21:01:52 2015 +0900 Release 1.7.51

1 0

Florian Pelz : po: German translation: Fix punctuation.
by Alexandre Julliard 03 Sep '15

03 Sep '15

Module: wine Branch: master Commit: 2fb98b2db3081c96f96c939d2455add0f0b67a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb98b2db3081c96f96c939d2… Author: Florian Pelz <pelzflorian(a)pelzflorian.de> Date: Wed Sep 2 15:40:12 2015 +0200 po: German translation: Fix punctuation. --- po/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/de.po b/po/de.po index 2be3703..4faf46e 100644 --- a/po/de.po +++ b/po/de.po @@ -10397,7 +10397,7 @@ msgstr " (Ja|Nein|Alle)" msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" msgstr "" -"'%1' konnte nicht als interner oder externer Befehl,\n" +"'%1' konnte nicht als interner oder externer Befehl\n" "oder als Batch-Skript erkannt werden.\n" #: cmd.rc:393

1 0

Florian Pelz : po: German translation: Fix hyphenation.
by Alexandre Julliard 03 Sep '15

03 Sep '15

Module: wine Branch: master Commit: 1970014d8411b8b97f5908d504fd39e2a8cd9ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1970014d8411b8b97f5908d50… Author: Florian Pelz <pelzflorian(a)pelzflorian.de> Date: Wed Sep 2 15:40:08 2015 +0200 po: German translation: Fix hyphenation. --- po/de.po | 352 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 176 insertions(+), 176 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1970014d8411b8b97f590…

1 0

Florian Pelz : po: German translation: Fix mistranslations.
by Alexandre Julliard 03 Sep '15

03 Sep '15

Module: wine Branch: master Commit: 10fcf17934b253df10533985e05f4837ea38a7b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10fcf17934b253df10533985e… Author: Florian Pelz <pelzflorian(a)pelzflorian.de> Date: Wed Sep 2 15:40:10 2015 +0200 po: German translation: Fix mistranslations. --- po/de.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index 1b2ee6d..da790ce 100644 --- a/po/de.po +++ b/po/de.po @@ -3972,15 +3972,15 @@ msgstr "Keine Prozess-Slots.\n" #: winerror.mc:376 msgid "Too many semaphores.\n" -msgstr "Zu viele Semaphoren.\n" +msgstr "Zu viele Semaphore.\n" #: winerror.mc:381 msgid "Exclusive semaphore already owned.\n" -msgstr "Exklusive Semaphore bereits zugewiesen.\n" +msgstr "Exklusiver Semaphor bereits zugewiesen.\n" #: winerror.mc:386 msgid "Semaphore is set.\n" -msgstr "Semaphore ist gesetzt.\n" +msgstr "Semaphor ist gesetzt.\n" #: winerror.mc:391 msgid "Too many semaphore requests.\n" @@ -4420,7 +4420,7 @@ msgstr "Mutex nicht im Besitz des Aufrufers.\n" #: winerror.mc:946 msgid "Too many posts to semaphore.\n" -msgstr "Zu viele Posts an Semaphore.\n" +msgstr "Zu viele Posts an Semaphor.\n" #: winerror.mc:951 msgid "Read/WriteProcessMemory partially completed.\n" @@ -7862,11 +7862,11 @@ msgstr "Runterscrollen" #: shdoclc.rc:235 msgid "Left Edge" -msgstr "Linke Ecke" +msgstr "Linker Rand" #: shdoclc.rc:236 msgid "Right Edge" -msgstr "Rechte Ecke" +msgstr "Rechter Rand" #: shdoclc.rc:238 msgid "Page Left" @@ -9860,7 +9860,7 @@ msgstr "" "unmittelbar danach), erscheint am Zeilenanfang, wenn cmd auf Eingabe\n" "wartet.\n" "\n" -"Die folgenden Zeichen haben eine besondere Bedeutung:\n" +"Die folgenden Zeichenketten haben eine besondere Bedeutung:\n" "\n" "$$ Dollarzeichen $_ Zeilenvorschub $b Pipe-Zeichen (|)\n" "$d aktuelles Datum $e Escape $g Größerzeichen (>)\n" @@ -10048,7 +10048,7 @@ msgstr "VER zeigt die aktuelle Version von CMD an.\n" #: cmd.rc:259 msgid "VOL shows the volume label of a disk device.\n" -msgstr "VOL zeigt die Datenträgernummer an.\n" +msgstr "VOL zeigt die Datenträgerbezeichnung an.\n" #: cmd.rc:263 msgid ""

1 0

Gerald Pfeifer : include: Define HIDP_STATUS constants via unsigned parameters.
by Alexandre Julliard 03 Sep '15

03 Sep '15

Module: wine Branch: master Commit: 4349b3c16d0005e00b56a94ad04bc5ec5a8df429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4349b3c16d0005e00b56a94ad… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Aug 27 23:26:46 2015 +0200 include: Define HIDP_STATUS constants via unsigned parameters. --- include/ddk/hidpi.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 527a966..4cfac61 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -151,24 +151,24 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag #define HIDP_ERROR_CODES(sev, code) ((NTSTATUS)(((sev) << 28) | (FACILITY_HID_ERROR_CODE << 16) | (code))) -#define HIDP_STATUS_SUCCESS (HIDP_ERROR_CODES(0x0,0x00)) -#define HIDP_STATUS_NULL (HIDP_ERROR_CODES(0x8,0x01)) -#define HIDP_STATUS_INVALID_PREPARSED_DATA (HIDP_ERROR_CODES(0xc,0x01)) -#define HIDP_STATUS_INVALID_REPORT_TYPE (HIDP_ERROR_CODES(0xc,0x02)) -#define HIDP_STATUS_INVALID_REPORT_LENGTH (HIDP_ERROR_CODES(0xc,0x03)) -#define HIDP_STATUS_USAGE_NOT_FOUND (HIDP_ERROR_CODES(0xc,0x04)) -#define HIDP_STATUS_VALUE_OUT_OF_RANGE (HIDP_ERROR_CODES(0xc,0x05)) -#define HIDP_STATUS_BAD_LOG_PHY_VALUES (HIDP_ERROR_CODES(0xc,0x06)) -#define HIDP_STATUS_BUFFER_TOO_SMALL (HIDP_ERROR_CODES(0xc,0x07)) -#define HIDP_STATUS_INTERNAL_ERROR (HIDP_ERROR_CODES(0xc,0x08)) -#define HIDP_STATUS_I8242_TRANS_UNKNOWN (HIDP_ERROR_CODES(0xc,0x09)) -#define HIDP_STATUS_INCOMPATIBLE_REPORT_ID (HIDP_ERROR_CODES(0xc,0x0a)) -#define HIDP_STATUS_NOT_VALUE_ARRAY (HIDP_ERROR_CODES(0xc,0x0b)) -#define HIDP_STATUS_IS_VALUE_ARRAY (HIDP_ERROR_CODES(0xc,0x0c)) -#define HIDP_STATUS_DATA_INDEX_NOT_FOUND (HIDP_ERROR_CODES(0xc,0x0d)) -#define HIDP_STATUS_DATA_INDEX_OUT_OF_RANGE (HIDP_ERROR_CODES(0xc,0x0e)) -#define HIDP_STATUS_BUTTON_NOT_PRESSED (HIDP_ERROR_CODES(0xc,0x0f)) -#define HIDP_STATUS_REPORT_DOES_NOT_EXIST (HIDP_ERROR_CODES(0xc,0x10)) -#define HIDP_STATUS_NOT_IMPLEMENTED (HIDP_ERROR_CODES(0xc,0x20)) +#define HIDP_STATUS_SUCCESS (HIDP_ERROR_CODES(0x0u,0x00)) +#define HIDP_STATUS_NULL (HIDP_ERROR_CODES(0x8u,0x01)) +#define HIDP_STATUS_INVALID_PREPARSED_DATA (HIDP_ERROR_CODES(0xcu,0x01)) +#define HIDP_STATUS_INVALID_REPORT_TYPE (HIDP_ERROR_CODES(0xcu,0x02)) +#define HIDP_STATUS_INVALID_REPORT_LENGTH (HIDP_ERROR_CODES(0xcu,0x03)) +#define HIDP_STATUS_USAGE_NOT_FOUND (HIDP_ERROR_CODES(0xcu,0x04)) +#define HIDP_STATUS_VALUE_OUT_OF_RANGE (HIDP_ERROR_CODES(0xcu,0x05)) +#define HIDP_STATUS_BAD_LOG_PHY_VALUES (HIDP_ERROR_CODES(0xcu,0x06)) +#define HIDP_STATUS_BUFFER_TOO_SMALL (HIDP_ERROR_CODES(0xcu,0x07)) +#define HIDP_STATUS_INTERNAL_ERROR (HIDP_ERROR_CODES(0xcu,0x08)) +#define HIDP_STATUS_I8242_TRANS_UNKNOWN (HIDP_ERROR_CODES(0xcu,0x09)) +#define HIDP_STATUS_INCOMPATIBLE_REPORT_ID (HIDP_ERROR_CODES(0xcu,0x0a)) +#define HIDP_STATUS_NOT_VALUE_ARRAY (HIDP_ERROR_CODES(0xcu,0x0b)) +#define HIDP_STATUS_IS_VALUE_ARRAY (HIDP_ERROR_CODES(0xcu,0x0c)) +#define HIDP_STATUS_DATA_INDEX_NOT_FOUND (HIDP_ERROR_CODES(0xcu,0x0d)) +#define HIDP_STATUS_DATA_INDEX_OUT_OF_RANGE (HIDP_ERROR_CODES(0xcu,0x0e)) +#define HIDP_STATUS_BUTTON_NOT_PRESSED (HIDP_ERROR_CODES(0xcu,0x0f)) +#define HIDP_STATUS_REPORT_DOES_NOT_EXIST (HIDP_ERROR_CODES(0xcu,0x10)) +#define HIDP_STATUS_NOT_IMPLEMENTED (HIDP_ERROR_CODES(0xcu,0x20)) #endif /* __HIDPI_H__ */

1 0