wine-commits February 2014

wine-commits@winehq.org

2 participants
503 discussions

Frédéric Delanoy : atl/tests: Use BOOL type where appropriate.
by Alexandre Julliard 24 Feb '14

24 Feb '14

Module: wine Branch: master Commit: 10197d3173fe24c397994fa0e9dfb6ae2b0122c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10197d3173fe24c397994fa0e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Feb 23 19:23:19 2014 +0100 atl/tests: Use BOOL type where appropriate. --- dlls/atl/tests/registrar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c index b9b62e7..c05b672 100644 --- a/dlls/atl/tests/registrar.c +++ b/dlls/atl/tests/registrar.c @@ -114,7 +114,7 @@ static void test_registrar(void) hr = IRegistrar_StringRegister(registrar, textW); if (FAILED(hr)) { - int is_limited = is_process_limited(); + BOOL is_limited = is_process_limited(); ok(hr == DISP_E_EXCEPTION && is_limited, "IRegistrar_StringRegister failed, hr = 0x%08X, is_limited=%d\n", hr, is_limited); skip("Skipping registrar tests\n");

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.13
by Jeremy Newman 24 Feb '14

24 Feb '14

Module: website Branch: master Commit: 34163205768e3160560ac9ff76880bdd822081a0 URL: http://source.winehq.org/git/website.git/?a=commit;h=34163205768e3160560ac9… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Feb 23 06:43:51 2014 +0100 Polish translation for release 1.7.13 --- news/pl/2014022001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2014022001.xml b/news/pl/2014022001.xml new file mode 100644 index 0000000..fe502c9 --- /dev/null +++ b/news/pl/2014022001.xml @@ -0,0 +1,17 @@ +<news> +<date>Luty 20, 2014</date> +<title>Wydano Wine 1.7.13</title> +<body> + Wydanie rozwojowe Wine 1.7.13 jest już dostępne. + <a href="{$root}/announce/1.7.13">Co nowego</a> w tym wydaniu: +<ul> + <li>Szersza obsługa Harmonogramu zadań.</li> + <li>Kilka więcej interfejsów Direct3D 10.</li> + <li>Więcej zalążków funkcji Windows Media Player.</li> + <li>Ulepszenia w generowaniu kodu ARM.</li> + <li>Lepsze zgłaszanie pamięci na Mac OS X.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.13.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

André Hentschel : Ausgabe 363
by Jeremy Newman 24 Feb '14

24 Feb '14

Module: website Branch: master Commit: 8cdbd0c638edb30ee92730280e07079be111ce45 URL: http://source.winehq.org/git/website.git/?a=commit;h=8cdbd0c638edb30ee92730… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 21 22:50:45 2014 +0100 Ausgabe 363 --- news/de/2014021401.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/de/2014021401.xml b/news/de/2014021401.xml new file mode 100644 index 0000000..8bf3d28 --- /dev/null +++ b/news/de/2014021401.xml @@ -0,0 +1,13 @@ +<news> + <date>14. Februar 2014</date> + <title>World Wine News Ausgabe 363</title> + <body> +<a href="{$root}/wwn/363">WWN Ausgabe 363 (en)</a> wurde heute veröffentlicht. +<ul> +<li><a href="{$root}/wwn/363#WWN revived?">WWN wiederbelebt?</a></li> +<li><a href="{$root}/wwn/363#Wine at LinuxTag in Berlin">Wine auf dem LinuxTag in Berlin</a></li> +<li><a href="{$root}/wwn/363#FOSDEM 2014">FOSDEM 2014</a></li> +<li><a href="{$root}/wwn/363#AppDB/Bugzilla Status Changes">AppDB/Bugzilla Statusänderungen</a></li> +</ul> + </body> +</news>

1 0

André Hentschel : Wine 1.7.13 freigegeben
by Jeremy Newman 24 Feb '14

24 Feb '14

Module: website Branch: master Commit: 29ce42893bac7bfd99e6cabe7206a0998b220831 URL: http://source.winehq.org/git/website.git/?a=commit;h=29ce42893bac7bfd99e6ca… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 21 22:50:42 2014 +0100 Wine 1.7.13 freigegeben --- news/de/2014020701.xml | 2 +- news/de/2014022001.xml | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/news/de/2014020701.xml b/news/de/2014020701.xml index 12d800d..a013e6c 100644 --- a/news/de/2014020701.xml +++ b/news/de/2014020701.xml @@ -6,7 +6,7 @@ <a href="{$root}/announce/1.7.12">Neuerungen (en)</a> in dieser Version: <ul> <li>Anfängliche Unterstützung der Window Media Player Schnittstellen.</li> - <li>Verbessere Task Scheduler Unterstützung.</li> + <li>Verbesserte Task Scheduler Unterstützung.</li> <li>Verschiedene C++ Laufzeit Fehlerbehebungen.</li> <li>Mehr Dlls mit hässlichen Namen für Windows 8 API Unterstützung.</li> <li>Verschiedene Fehlerbehebungen.</li> diff --git a/news/de/2014022001.xml b/news/de/2014022001.xml new file mode 100644 index 0000000..13beac6 --- /dev/null +++ b/news/de/2014022001.xml @@ -0,0 +1,17 @@ +<news> +<date>20. Februar 2014</date> +<title>Wine 1.7.13 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.13 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.13">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Verbesserte Task Scheduler Unterstützung.</li> + <li>Ein paar neue Direct3D 10 Schnittstellen.</li> + <li>Mehr Windows Media Player Stubs.</li> + <li>Verbesserte ARM Code Generierung.</li> + <li>Verbesserte Angabe der Speichergröße unter Mac OS X.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.13.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Nikolay Sivov : oleaut32: Fix VariantCopy() for VT_RECORD variants.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: e610713012cb02648202a9568fc0d3febb5f5307 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e610713012cb02648202a9568… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 20 19:12:57 2014 +0400 oleaut32: Fix VariantCopy() for VT_RECORD variants. --- dlls/oleaut32/tests/vartest.c | 50 ++++++++++++++++++++++---- dlls/oleaut32/variant.c | 77 +++++++++++++++++++---------------------- 2 files changed, 79 insertions(+), 48 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 2658025..2f82d9b 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -102,6 +102,8 @@ typedef struct IRecordInfoImpl IRecordInfo IRecordInfo_iface; LONG ref; unsigned int recordclear; + unsigned int getsize; + unsigned int recordcopy; struct __tagBRECORD *rec; } IRecordInfoImpl; @@ -152,15 +154,16 @@ static HRESULT WINAPI RecordInfo_RecordClear(IRecordInfo *iface, void *data) { IRecordInfoImpl* This = impl_from_IRecordInfo(iface); This->recordclear++; - ok(data == (void*)0xdeadbeef, "got %p\n", data); This->rec->pvRecord = NULL; return S_OK; } -static HRESULT WINAPI RecordInfo_RecordCopy(IRecordInfo *iface, void *pvExisting, void *pvNew) +static HRESULT WINAPI RecordInfo_RecordCopy(IRecordInfo *iface, void *src, void *dest) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); + This->recordcopy++; + ok(src == (void*)0xdeadbeef, "wrong src pointer %p\n", src); + return S_OK; } static HRESULT WINAPI RecordInfo_GetGuid(IRecordInfo *iface, GUID *pguid) @@ -177,8 +180,10 @@ static HRESULT WINAPI RecordInfo_GetName(IRecordInfo *iface, BSTR *pbstrName) static HRESULT WINAPI RecordInfo_GetSize(IRecordInfo *iface, ULONG* size) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); + This->getsize++; + *size = 0; + return S_OK; } static HRESULT WINAPI RecordInfo_GetTypeInfo(IRecordInfo *iface, ITypeInfo **ppTypeInfo) @@ -277,6 +282,10 @@ static IRecordInfoImpl *get_test_recordinfo(void) rec = HeapAlloc(GetProcessHeap(), 0, sizeof(IRecordInfoImpl)); rec->IRecordInfo_iface.lpVtbl = &RecordInfoVtbl; rec->ref = 1; + rec->recordclear = 0; + rec->getsize = 0; + rec->recordcopy = 0; + return rec; } @@ -765,6 +774,8 @@ static void test_VariantClear(void) static void test_VariantCopy(void) { + struct __tagBRECORD *rec; + IRecordInfoImpl *recinfo; VARIANTARG vSrc, vDst; VARTYPE vt; size_t i; @@ -880,6 +891,33 @@ static void test_VariantCopy(void) } VariantClear(&vDst); } + + /* copy RECORD */ + recinfo = get_test_recordinfo(); + + memset(&vDst, 0, sizeof(vDst)); + V_VT(&vDst) = VT_EMPTY; + + V_VT(&vSrc) = VT_RECORD; + rec = &V_UNION(&vSrc, brecVal); + rec->pRecInfo = &recinfo->IRecordInfo_iface; + rec->pvRecord = (void*)0xdeadbeef; + + recinfo->recordclear = 0; + recinfo->recordcopy = 0; + recinfo->getsize = 0; + recinfo->rec = rec; + hres = VariantCopy(&vDst, &vSrc); + ok(hres == S_OK, "ret %08x\n", hres); + + rec = &V_UNION(&vDst, brecVal); + ok(rec->pvRecord != (void*)0xdeadbeef && rec->pvRecord != NULL, "got %p\n", rec->pvRecord); + ok(rec->pRecInfo == &recinfo->IRecordInfo_iface, "got %p\n", rec->pRecInfo); + ok(recinfo->getsize == 1, "got %d\n", recinfo->recordclear); + ok(recinfo->recordcopy == 1, "got %d\n", recinfo->recordclear); + + VariantClear(&vDst); + VariantClear(&vSrc); } /* Determine if a vt is valid for VariantCopyInd() */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index d4c6f6c..92cf01b 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -694,34 +694,32 @@ HRESULT WINAPI VariantClear(VARIANTARG* pVarg) /****************************************************************************** * Copy an IRecordInfo object contained in a variant. */ -static HRESULT VARIANT_CopyIRecordInfo(struct __tagBRECORD* pBr) +static HRESULT VARIANT_CopyIRecordInfo(VARIANT *dest, VARIANT *src) { - HRESULT hres = S_OK; + struct __tagBRECORD *dest_rec = &V_UNION(dest, brecVal); + struct __tagBRECORD *src_rec = &V_UNION(src, brecVal); + HRESULT hr = S_OK; + ULONG size; - if (pBr->pRecInfo) + if (!src_rec->pRecInfo) { - ULONG ulSize; + if (src_rec->pvRecord) return E_INVALIDARG; + return S_OK; + } - hres = IRecordInfo_GetSize(pBr->pRecInfo, &ulSize); - if (SUCCEEDED(hres)) - { - PVOID pvRecord = HeapAlloc(GetProcessHeap(), 0, ulSize); - if (!pvRecord) - hres = E_OUTOFMEMORY; - else - { - memcpy(pvRecord, pBr->pvRecord, ulSize); - pBr->pvRecord = pvRecord; + hr = IRecordInfo_GetSize(src_rec->pRecInfo, &size); + if (FAILED(hr)) return hr; - hres = IRecordInfo_RecordCopy(pBr->pRecInfo, pvRecord, pvRecord); - if (SUCCEEDED(hres)) - IRecordInfo_AddRef(pBr->pRecInfo); - } - } - } - else if (pBr->pvRecord) - hres = E_INVALIDARG; - return hres; + /* This could look cleaner if only RecordCreate() was used, but native doesn't use it. + Memory should be allocated in a same way as RecordCreate() does, so RecordDestroy() + could free it later. */ + dest_rec->pvRecord = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if (!dest_rec->pvRecord) return E_OUTOFMEMORY; + + dest_rec->pRecInfo = src_rec->pRecInfo; + IRecordInfo_AddRef(src_rec->pRecInfo); + + return IRecordInfo_RecordCopy(src_rec->pRecInfo, src_rec->pvRecord, dest_rec->pvRecord); } /****************************************************************************** @@ -771,29 +769,25 @@ HRESULT WINAPI VariantCopy(VARIANTARG* pvargDest, VARIANTARG* pvargSrc) if (!V_ISBYREF(pvargSrc)) { - if (V_ISARRAY(pvargSrc)) - { - if (V_ARRAY(pvargSrc)) - hres = SafeArrayCopy(V_ARRAY(pvargSrc), &V_ARRAY(pvargDest)); - } - else if (V_VT(pvargSrc) == VT_BSTR) + switch (V_VT(pvargSrc)) { + case VT_BSTR: V_BSTR(pvargDest) = SysAllocStringByteLen((char*)V_BSTR(pvargSrc), SysStringByteLen(V_BSTR(pvargSrc))); if (!V_BSTR(pvargDest)) - { - TRACE("!V_BSTR(pvargDest), SysAllocStringByteLen() failed to allocate %d bytes\n", SysStringByteLen(V_BSTR(pvargSrc))); hres = E_OUTOFMEMORY; - } - } - else if (V_VT(pvargSrc) == VT_RECORD) - { - hres = VARIANT_CopyIRecordInfo(&V_UNION(pvargDest,brecVal)); - } - else if (V_VT(pvargSrc) == VT_DISPATCH || - V_VT(pvargSrc) == VT_UNKNOWN) - { + break; + case VT_RECORD: + hres = VARIANT_CopyIRecordInfo(pvargDest, pvargSrc); + break; + case VT_DISPATCH: + case VT_UNKNOWN: + V_UNKNOWN(pvargDest) = V_UNKNOWN(pvargSrc); if (V_UNKNOWN(pvargSrc)) IUnknown_AddRef(V_UNKNOWN(pvargSrc)); + break; + default: + if (V_ISARRAY(pvargSrc)) + hres = SafeArrayCopy(V_ARRAY(pvargSrc), &V_ARRAY(pvargDest)); } } } @@ -912,8 +906,7 @@ HRESULT WINAPI VariantCopyInd(VARIANT* pvargDest, VARIANTARG* pvargSrc) } else if (V_VT(pSrc) == (VT_RECORD|VT_BYREF)) { - V_UNION(pvargDest,brecVal) = V_UNION(pvargSrc,brecVal); - hres = VARIANT_CopyIRecordInfo(&V_UNION(pvargDest,brecVal)); + hres = VARIANT_CopyIRecordInfo(pvargDest, pvargSrc); } else if (V_VT(pSrc) == (VT_DISPATCH|VT_BYREF) || V_VT(pSrc) == (VT_UNKNOWN|VT_BYREF))

1 0

Nikolay Sivov : oleaut32/tests: Test for VariantClear() on VT_RECORD variant.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: 52a70451c4e7dd41dac17cbcf054007ac1e79a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a70451c4e7dd41dac17cbcf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 20 19:12:34 2014 +0400 oleaut32/tests: Test for VariantClear() on VT_RECORD variant. --- dlls/oleaut32/tests/safearray.c | 2 +- dlls/oleaut32/tests/vartest.c | 202 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 915d0ca..1af2cab 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -123,7 +123,7 @@ static ULONG WINAPI RecordInfo_Release(IRecordInfo *iface) static HRESULT WINAPI RecordInfo_RecordInit(IRecordInfo *iface, PVOID pvNew) { - ok(0, "enexpected call\n"); + ok(0, "unexpected call\n"); return E_NOTIMPL; } diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 9ca541f..2658025 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -24,6 +24,7 @@ #include <math.h> #include <float.h> +#define COBJMACROS #define CONST_VTABLE #include "windef.h" @@ -96,6 +97,189 @@ static BOOL has_i8; #define R8_MAX DBL_MAX #define R8_MIN DBL_MIN +typedef struct IRecordInfoImpl +{ + IRecordInfo IRecordInfo_iface; + LONG ref; + unsigned int recordclear; + struct __tagBRECORD *rec; +} IRecordInfoImpl; + +static inline IRecordInfoImpl *impl_from_IRecordInfo(IRecordInfo *iface) +{ + return CONTAINING_RECORD(iface, IRecordInfoImpl, IRecordInfo_iface); +} + +static HRESULT WINAPI RecordInfo_QueryInterface(IRecordInfo *iface, REFIID riid, void **obj) +{ + *obj = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IRecordInfo)) + { + *obj = iface; + IRecordInfo_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI RecordInfo_AddRef(IRecordInfo *iface) +{ + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI RecordInfo_Release(IRecordInfo *iface) +{ + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI RecordInfo_RecordInit(IRecordInfo *iface, PVOID pvNew) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_RecordClear(IRecordInfo *iface, void *data) +{ + IRecordInfoImpl* This = impl_from_IRecordInfo(iface); + This->recordclear++; + ok(data == (void*)0xdeadbeef, "got %p\n", data); + This->rec->pvRecord = NULL; + return S_OK; +} + +static HRESULT WINAPI RecordInfo_RecordCopy(IRecordInfo *iface, void *pvExisting, void *pvNew) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_GetGuid(IRecordInfo *iface, GUID *pguid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_GetName(IRecordInfo *iface, BSTR *pbstrName) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_GetSize(IRecordInfo *iface, ULONG* size) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_GetTypeInfo(IRecordInfo *iface, ITypeInfo **ppTypeInfo) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_GetField(IRecordInfo *iface, PVOID pvData, + LPCOLESTR szFieldName, VARIANT *pvarField) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_GetFieldNoCopy(IRecordInfo *iface, PVOID pvData, + LPCOLESTR szFieldName, VARIANT *pvarField, PVOID *ppvDataCArray) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_PutField(IRecordInfo *iface, ULONG wFlags, PVOID pvData, + LPCOLESTR szFieldName, VARIANT *pvarField) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_PutFieldNoCopy(IRecordInfo *iface, ULONG wFlags, + PVOID pvData, LPCOLESTR szFieldName, VARIANT *pvarField) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_GetFieldNames(IRecordInfo *iface, ULONG *pcNames, + BSTR *rgBstrNames) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static BOOL WINAPI RecordInfo_IsMatchingType(IRecordInfo *iface, IRecordInfo *info2) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static PVOID WINAPI RecordInfo_RecordCreate(IRecordInfo *iface) +{ + ok(0, "unexpected call\n"); + return NULL; +} + +static HRESULT WINAPI RecordInfo_RecordCreateCopy(IRecordInfo *iface, PVOID pvSource, + PVOID *ppvDest) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI RecordInfo_RecordDestroy(IRecordInfo *iface, PVOID pvRecord) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IRecordInfoVtbl RecordInfoVtbl = +{ + RecordInfo_QueryInterface, + RecordInfo_AddRef, + RecordInfo_Release, + RecordInfo_RecordInit, + RecordInfo_RecordClear, + RecordInfo_RecordCopy, + RecordInfo_GetGuid, + RecordInfo_GetName, + RecordInfo_GetSize, + RecordInfo_GetTypeInfo, + RecordInfo_GetField, + RecordInfo_GetFieldNoCopy, + RecordInfo_PutField, + RecordInfo_PutFieldNoCopy, + RecordInfo_GetFieldNames, + RecordInfo_IsMatchingType, + RecordInfo_RecordCreate, + RecordInfo_RecordCreateCopy, + RecordInfo_RecordDestroy +}; + +static IRecordInfoImpl *get_test_recordinfo(void) +{ + IRecordInfoImpl *rec; + + rec = HeapAlloc(GetProcessHeap(), 0, sizeof(IRecordInfoImpl)); + rec->IRecordInfo_iface.lpVtbl = &RecordInfoVtbl; + rec->ref = 1; + return rec; +} + static void init(void) { BSTR bstr; @@ -441,6 +625,8 @@ static test_VariantClearImpl test_myVariantClearImpl = {{&test_VariantClear_vtbl static void test_VariantClear(void) { + struct __tagBRECORD *rec; + IRecordInfoImpl *recinfo; HRESULT hres; VARIANTARG v; VARIANT v2; @@ -559,6 +745,22 @@ static void test_VariantClear(void) ok(V_DISPATCHREF(&v) == (IDispatch**)&punk, "dispatch ref %p\n", V_DISPATCHREF(&v)); /* Check that nothing got called */ ok(test_myVariantClearImpl.events == 0, "Unexpected call. events %08x\n", test_myVariantClearImpl.events); + + /* RECORD */ + recinfo = get_test_recordinfo(); + V_VT(&v) = VT_RECORD; + rec = &V_UNION(&v, brecVal); + rec->pRecInfo = &recinfo->IRecordInfo_iface; + rec->pvRecord = (void*)0xdeadbeef; + recinfo->recordclear = 0; + recinfo->ref = 2; + recinfo->rec = rec; + hres = VariantClear(&v); + ok(hres == S_OK, "ret %08x\n", hres); + ok(rec->pvRecord == NULL, "got %p\n", rec->pvRecord); + ok(recinfo->recordclear == 1, "got %d\n", recinfo->recordclear); + ok(recinfo->ref == 1, "got %d\n", recinfo->ref); + IRecordInfo_Release(&recinfo->IRecordInfo_iface); } static void test_VariantCopy(void)

1 0

Ken Thomases : ddraw/tests: Test that DirectDraw doesn' t modify the pixel format of the window it targets.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: b3acbfc8788deb36d7414b8778d7da9204b5ec1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3acbfc8788deb36d7414b877… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 19 16:15:33 2014 -0600 ddraw/tests: Test that DirectDraw doesn't modify the pixel format of the window it targets. --- dlls/ddraw/tests/ddraw1.c | 159 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 159 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 159 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 159 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 636 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b3acbfc8788deb36d7414…

1 0

Ken Thomases : d3d8/tests: Test that Direct3D8 doesn' t modify the pixel format of the window it targets.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: 7366709d60f42ae09a37548e41c030c5e82fef6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7366709d60f42ae09a37548e4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 19 16:15:20 2014 -0600 d3d8/tests: Test that Direct3D8 doesn't modify the pixel format of the window it targets. --- dlls/d3d8/tests/Makefile.in | 2 +- dlls/d3d8/tests/device.c | 144 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 145 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/Makefile.in b/dlls/d3d8/tests/Makefile.in index 552f0e7..9b288b9 100644 --- a/dlls/d3d8/tests/Makefile.in +++ b/dlls/d3d8/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3d8.dll -IMPORTS = d3d8 user32 +IMPORTS = d3d8 user32 gdi32 C_SRCS = \ device.c \ diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c7493c7..29214c1 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -5873,6 +5873,149 @@ static void test_lockbox_invalid(void) DestroyWindow(window); } +static void test_pixel_format(void) +{ + HWND hwnd, hwnd2 = NULL; + HDC hdc, hdc2 = NULL; + HMODULE gl = NULL; + int format, test_format; + PIXELFORMATDESCRIPTOR pfd; + IDirect3D8 *d3d8 = NULL; + IDirect3DDevice8 *device = NULL; + HRESULT hr; + static const float point[3] = {0.0, 0.0, 0.0}; + + hwnd = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 100, 100, 160, 160, NULL, NULL, NULL, NULL); + if (!hwnd) + { + skip("Failed to create window\n"); + return; + } + + hwnd2 = CreateWindowA("d3d8_test_wc", "d3d8_test", WS_OVERLAPPEDWINDOW, + 100, 100, 160, 160, NULL, NULL, NULL, NULL); + + hdc = GetDC(hwnd); + if (!hdc) + { + skip("Failed to get DC\n"); + goto cleanup; + } + + if (hwnd2) + hdc2 = GetDC(hwnd2); + + gl = LoadLibraryA("opengl32.dll"); + ok(!!gl, "failed to load opengl32.dll; SetPixelFormat()/GetPixelFormat() may not work right\n"); + + format = GetPixelFormat(hdc); + ok(format == 0, "new window has pixel format %d\n", format); + + ZeroMemory(&pfd, sizeof(pfd)); + pfd.nSize = sizeof(pfd); + pfd.nVersion = 1; + pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL; + pfd.iPixelType = PFD_TYPE_RGBA; + pfd.iLayerType = PFD_MAIN_PLANE; + format = ChoosePixelFormat(hdc, &pfd); + if (format <= 0) + { + skip("no pixel format available\n"); + goto cleanup; + } + + if (!SetPixelFormat(hdc, format, &pfd) || GetPixelFormat(hdc) != format) + { + skip("failed to set pixel format\n"); + goto cleanup; + } + + if (!hdc2 || !SetPixelFormat(hdc2, format, &pfd) || GetPixelFormat(hdc2) != format) + { + skip("failed to set pixel format on second window\n"); + if (hdc2) + { + ReleaseDC(hwnd2, hdc2); + hdc2 = NULL; + } + } + + d3d8 = Direct3DCreate8(D3D_SDK_VERSION); + if (!d3d8) + { + skip("Failed to create IDirect3D8 object\n"); + goto cleanup; + } + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + if (!(device = create_device(d3d8, hwnd, hwnd, TRUE))) + { + skip("Failed to create device\n"); + goto cleanup; + } + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed %#x\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, point, 3 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed %#x\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed %#x\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + if (hdc2) + { + hr = IDirect3DDevice8_Present(device, NULL, NULL, hwnd2, NULL); + ok(SUCCEEDED(hr), "Present failed %#x\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + test_format = GetPixelFormat(hdc2); + ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format); + } + +cleanup: + if (device) + { + UINT refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (d3d8) IDirect3D8_Release(d3d8); + if (gl) FreeLibrary(gl); + if (hdc) ReleaseDC(hwnd, hdc); + if (hdc2) ReleaseDC(hwnd2, hdc2); + if (hwnd) DestroyWindow(hwnd); + if (hwnd2) DestroyWindow(hwnd2); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -5952,6 +6095,7 @@ START_TEST(device) test_create_rt_ds_fail(); test_volume_blocks(); test_lockbox_invalid(); + test_pixel_format(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Ken Thomases : d3d9/tests: Test that Direct3D9 doesn' t modify the pixel format of the window it targets. (try 4, resend).
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: 995be892fa1fe5374f95054d277d591215f5b670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=995be892fa1fe5374f95054d2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 19 16:15:11 2014 -0600 d3d9/tests: Test that Direct3D9 doesn't modify the pixel format of the window it targets. (try 4, resend). --- dlls/d3d9/tests/device.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index b046099..07b1c39 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7429,6 +7429,149 @@ static void test_shared_handle(void) DestroyWindow(window); } +static void test_pixel_format(void) +{ + HWND hwnd, hwnd2 = NULL; + HDC hdc, hdc2 = NULL; + HMODULE gl = NULL; + int format, test_format; + PIXELFORMATDESCRIPTOR pfd; + IDirect3D9 *d3d9 = NULL; + IDirect3DDevice9 *device = NULL; + HRESULT hr; + static const float point[3] = {0.0, 0.0, 0.0}; + + hwnd = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 100, 100, 160, 160, NULL, NULL, NULL, NULL); + if (!hwnd) + { + skip("Failed to create window\n"); + return; + } + + hwnd2 = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_OVERLAPPEDWINDOW, + 100, 100, 160, 160, NULL, NULL, NULL, NULL); + + hdc = GetDC(hwnd); + if (!hdc) + { + skip("Failed to get DC\n"); + goto cleanup; + } + + if (hwnd2) + hdc2 = GetDC(hwnd2); + + gl = LoadLibraryA("opengl32.dll"); + ok(!!gl, "failed to load opengl32.dll; SetPixelFormat()/GetPixelFormat() may not work right\n"); + + format = GetPixelFormat(hdc); + ok(format == 0, "new window has pixel format %d\n", format); + + ZeroMemory(&pfd, sizeof(pfd)); + pfd.nSize = sizeof(pfd); + pfd.nVersion = 1; + pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL; + pfd.iPixelType = PFD_TYPE_RGBA; + pfd.iLayerType = PFD_MAIN_PLANE; + format = ChoosePixelFormat(hdc, &pfd); + if (format <= 0) + { + skip("no pixel format available\n"); + goto cleanup; + } + + if (!SetPixelFormat(hdc, format, &pfd) || GetPixelFormat(hdc) != format) + { + skip("failed to set pixel format\n"); + goto cleanup; + } + + if (!hdc2 || !SetPixelFormat(hdc2, format, &pfd) || GetPixelFormat(hdc2) != format) + { + skip("failed to set pixel format on second window\n"); + if (hdc2) + { + ReleaseDC(hwnd2, hdc2); + hdc2 = NULL; + } + } + + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + if (!d3d9) + { + skip("Failed to create IDirect3D9 object\n"); + goto cleanup; + } + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + if (!(device = create_device(d3d9, hwnd, hwnd, TRUE))) + { + skip("Failed to create device\n"); + goto cleanup; + } + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed %#x\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_POINTLIST, 1, point, 3 * sizeof(float)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed %#x\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed %#x\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + if (hdc2) + { + hr = IDirect3DDevice9_Present(device, NULL, NULL, hwnd2, NULL); + ok(SUCCEEDED(hr), "Present failed %#x\n", hr); + + test_format = GetPixelFormat(hdc); + ok(test_format == format, "window has pixel format %d, expected %d\n", test_format, format); + + test_format = GetPixelFormat(hdc2); + ok(test_format == format, "second window has pixel format %d, expected %d\n", test_format, format); + } + +cleanup: + if (device) + { + UINT refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + if (d3d9) IDirect3D9_Release(d3d9); + if (gl) FreeLibrary(gl); + if (hdc) ReleaseDC(hwnd, hdc); + if (hdc2) ReleaseDC(hwnd2, hdc2); + if (hwnd) DestroyWindow(hwnd); + if (hwnd2) DestroyWindow(hwnd2); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -7513,6 +7656,7 @@ START_TEST(device) test_volume_blocks(); test_lockbox_invalid(); test_shared_handle(); + test_pixel_format(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Ken Thomases : wined3d: Restore the pixel format of the window whose pixel format was actually changed.
by Alexandre Julliard 22 Feb '14

22 Feb '14

Module: wine Branch: master Commit: 4c4552c5a1910a9d5adf8eccff0ac62d89ffe376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4552c5a1910a9d5adf8eccf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 19 16:14:53 2014 -0600 wined3d: Restore the pixel format of the window whose pixel format was actually changed. --- dlls/wined3d/context.c | 87 ++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 66 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 13eb415..56673c7 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -719,8 +719,38 @@ void context_surface_update(struct wined3d_context *context, const struct wined3 } } -static BOOL context_set_pixel_format(const struct wined3d_gl_info *gl_info, HDC dc, int format) +static void context_restore_pixel_format(struct wined3d_context *ctx) { + const struct wined3d_gl_info *gl_info = ctx->gl_info; + + if (ctx->restore_pf && IsWindow(ctx->restore_pf_win)) + { + if (ctx->gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) + { + HDC dc = GetDC(ctx->restore_pf_win); + if (dc) + { + if (!GL_EXTCALL(wglSetPixelFormatWINE(dc, ctx->restore_pf))) + { + ERR("wglSetPixelFormatWINE failed to restore pixel format %d on window %p.\n", + ctx->restore_pf, ctx->restore_pf_win); + } + ReleaseDC(ctx->restore_pf_win, dc); + } + } + else + { + ERR("can't restore pixel format %d on window %p\n", ctx->restore_pf, ctx->restore_pf_win); + } + } + + ctx->restore_pf = 0; + ctx->restore_pf_win = NULL; +} + +static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, int format) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; int current = GetPixelFormat(dc); if (current == format) return TRUE; @@ -734,6 +764,9 @@ static BOOL context_set_pixel_format(const struct wined3d_gl_info *gl_info, HDC format, dc, GetLastError()); return FALSE; } + + context->restore_pf = 0; + context->restore_pf_win = WindowFromDC(dc); return TRUE; } @@ -743,12 +776,24 @@ static BOOL context_set_pixel_format(const struct wined3d_gl_info *gl_info, HDC * when really needed. */ if (gl_info->supported[WGL_WINE_PIXEL_FORMAT_PASSTHROUGH]) { + HWND win; + if (!GL_EXTCALL(wglSetPixelFormatWINE(dc, format))) { ERR("wglSetPixelFormatWINE failed to set pixel format %d on device context %p.\n", format, dc); return FALSE; } + + win = WindowFromDC(dc); + if (win != context->restore_pf_win) + { + context_restore_pixel_format(context); + + context->restore_pf = current; + context->restore_pf_win = win; + } + return TRUE; } @@ -766,7 +811,7 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) struct wined3d_swapchain *swapchain = ctx->swapchain; BOOL backup = FALSE; - if (!context_set_pixel_format(ctx->gl_info, ctx->hdc, ctx->pixel_format)) + if (!context_set_pixel_format(ctx, ctx->hdc, ctx->pixel_format)) { WARN("Failed to set pixel format %d on device context %p.\n", ctx->pixel_format, ctx->hdc); @@ -799,7 +844,7 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) return FALSE; } - if (!context_set_pixel_format(ctx->gl_info, dc, ctx->pixel_format)) + if (!context_set_pixel_format(ctx, dc, ctx->pixel_format)) { ERR("Failed to set pixel format %d on device context %p.\n", ctx->pixel_format, dc); @@ -821,15 +866,8 @@ static BOOL context_set_gl_context(struct wined3d_context *ctx) return TRUE; } -static void context_restore_gl_context(const struct wined3d_gl_info *gl_info, HDC dc, HGLRC gl_ctx, int pf) +static void context_restore_gl_context(const struct wined3d_gl_info *gl_info, HDC dc, HGLRC gl_ctx) { - if (!context_set_pixel_format(gl_info, dc, pf)) - { - ERR("Failed to restore pixel format %d on device context %p.\n", pf, dc); - context_set_current(NULL); - return; - } - if (!wglMakeCurrent(dc, gl_ctx)) { ERR("Failed to restore GL context %p on device context %p, last error %#x.\n", @@ -875,11 +913,9 @@ static void context_destroy_gl_resources(struct wined3d_context *context) HGLRC restore_ctx; HDC restore_dc; unsigned int i; - int restore_pf; restore_ctx = wglGetCurrentContext(); restore_dc = wglGetCurrentDC(); - restore_pf = GetPixelFormat(restore_dc); if (restore_ctx == context->glCtx) restore_ctx = NULL; @@ -957,9 +993,10 @@ static void context_destroy_gl_resources(struct wined3d_context *context) HeapFree(GetProcessHeap(), 0, context->free_occlusion_queries); HeapFree(GetProcessHeap(), 0, context->free_event_queries); + context_restore_pixel_format(context); if (restore_ctx) { - context_restore_gl_context(gl_info, restore_dc, restore_ctx, restore_pf); + context_restore_gl_context(gl_info, restore_dc, restore_ctx); } else if (wglGetCurrentContext() && !wglMakeCurrent(NULL, NULL)) { @@ -1055,12 +1092,16 @@ void context_release(struct wined3d_context *context) WARN("Context %p is not the current context.\n", context); } - if (!--context->level && context->restore_ctx) + if (!--context->level) { - TRACE("Restoring GL context %p on device context %p.\n", context->restore_ctx, context->restore_dc); - context_restore_gl_context(context->gl_info, context->restore_dc, context->restore_ctx, context->restore_pf); - context->restore_ctx = NULL; - context->restore_dc = NULL; + context_restore_pixel_format(context); + if (context->restore_ctx) + { + TRACE("Restoring GL context %p on device context %p.\n", context->restore_ctx, context->restore_dc); + context_restore_gl_context(context->gl_info, context->restore_dc, context->restore_ctx); + context->restore_ctx = NULL; + context->restore_dc = NULL; + } } } @@ -1079,9 +1120,10 @@ static void context_enter(struct wined3d_context *context) current_gl, wglGetCurrentDC()); context->restore_ctx = current_gl; context->restore_dc = wglGetCurrentDC(); - context->restore_pf = GetPixelFormat(context->restore_dc); context->needs_set = 1; } + else if (context->pixel_format != GetPixelFormat(context->hdc)) + context->needs_set = 1; } } @@ -1398,7 +1440,9 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, context_enter(ret); - if (!context_set_pixel_format(gl_info, hdc, pixel_format)) + ret->gl_info = gl_info; + + if (!context_set_pixel_format(ret, hdc, pixel_format)) { ERR("Failed to set pixel format %d on device context %p.\n", pixel_format, hdc); context_release(ret); @@ -1453,7 +1497,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; } - ret->gl_info = gl_info; ret->d3d_info = &device->adapter->d3d_info; ret->state_table = device->StateTable; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 29a76e2..0ceb6f1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1104,6 +1104,7 @@ struct wined3d_context HGLRC restore_ctx; HDC restore_dc; int restore_pf; + HWND restore_pf_win; HGLRC glCtx; HWND win_handle; HDC hdc;

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
51
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 February 2014