October 2011 - Wine-commits

Andrew Eikum : dsound: Fix type conversion problems.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: c60583ab8b53a87ac41e16cb563e15261d9cbd74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c60583ab8b53a87ac41e16cb5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 17 14:52:03 2011 -0500 dsound: Fix type conversion problems. --- dlls/dsound/mixer.c | 4 ++-- dlls/dsound/primary.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index b1925d5..df6da13 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -859,8 +859,8 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) return; } - pos_bytes = ceil(clock_pos * device->pwfx->nBlockAlign * - (clock_freq / (double)device->pwfx->nSamplesPerSec)); + pos_bytes = (clock_pos * device->pwfx->nBlockAlign * clock_freq) / + device->pwfx->nSamplesPerSec; delta_frags = (pos_bytes - device->last_pos_bytes) / device->fraglen; if(delta_frags > 0){ diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 9155634..c170358 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -115,7 +115,8 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) } prebuf_frames = device->prebuf * DSOUND_fraglen(device->pwfx->nSamplesPerSec, device->pwfx->nBlockAlign) / device->pwfx->nBlockAlign; - prebuf_rt = (prebuf_frames / (double)device->pwfx->nSamplesPerSec) * 10000000; + prebuf_rt = (10000000 * (UINT64)prebuf_frames) / device->pwfx->nSamplesPerSec; + hres = IAudioClient_Initialize(device->client, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_NOPERSIST, prebuf_rt, 50000, device->pwfx, NULL);

1 0

Andrew Eikum : dsound: Don' t make the capture buffer object address public until it is prepared.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 6a7c2f66e0569d2419eb9619e78716a9a5f94966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7c2f66e0569d2419eb9619e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 17 14:52:23 2011 -0500 dsound: Don't make the capture buffer object address public until it is prepared. --- dlls/dsound/capture.c | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 92dc24f..9e289f3 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -680,6 +680,7 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( LPCDSCBUFFERDESC lpcDSCBufferDesc) { LPWAVEFORMATEX wfex; + IDirectSoundCaptureBufferImpl *This; TRACE( "(%p,%p,%p)\n", device, ppobj, lpcDSCBufferDesc); if (ppobj == NULL) { @@ -687,15 +688,15 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( return DSERR_INVALIDPARAM; } + *ppobj = NULL; + if (!device) { WARN("not initialized\n"); - *ppobj = NULL; return DSERR_UNINITIALIZED; } if (lpcDSCBufferDesc == NULL) { WARN("invalid parameter: lpcDSCBufferDesc == NULL\n"); - *ppobj = NULL; return DSERR_INVALIDPARAM; } @@ -704,7 +705,6 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( (lpcDSCBufferDesc->dwBufferBytes == 0) || (lpcDSCBufferDesc->lpwfxFormat == NULL) ) { /* FIXME: DSERR_BADFORMAT ? */ WARN("invalid lpcDSCBufferDesc\n"); - *ppobj = NULL; return DSERR_INVALIDPARAM; } @@ -717,23 +717,19 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( wfex->wBitsPerSample, wfex->cbSize); device->pwfx = DSOUND_CopyFormat(wfex); - if ( device->pwfx == NULL ) { - *ppobj = NULL; + if ( device->pwfx == NULL ) return DSERR_OUTOFMEMORY; - } - *ppobj = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, sizeof(IDirectSoundCaptureBufferImpl)); - if ( *ppobj == NULL ) { + if ( This == NULL ) { WARN("out of memory\n"); - *ppobj = NULL; return DSERR_OUTOFMEMORY; } else { HRESULT err = DS_OK; LPBYTE newbuf; DWORD buflen; - IDirectSoundCaptureBufferImpl *This = *ppobj; This->ref = 1; This->device = device; @@ -749,7 +745,6 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( WARN("no memory\n"); This->device->capture_buffer = 0; HeapFree( GetProcessHeap(), 0, This ); - *ppobj = NULL; return DSERR_OUTOFMEMORY; } @@ -762,7 +757,6 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( HeapFree(GetProcessHeap(), 0, This->pdscbd); This->device->capture_buffer = 0; HeapFree( GetProcessHeap(), 0, This ); - *ppobj = NULL; return err; } @@ -776,7 +770,6 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( HeapFree(GetProcessHeap(), 0, This->pdscbd); This->device->capture_buffer = 0; HeapFree( GetProcessHeap(), 0, This ); - *ppobj = NULL; return err; } @@ -789,7 +782,6 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( HeapFree(GetProcessHeap(), 0, This->pdscbd); This->device->capture_buffer = 0; HeapFree( GetProcessHeap(), 0, This ); - *ppobj = NULL; return err; } @@ -807,13 +799,14 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( HeapFree(GetProcessHeap(), 0, This->pdscbd); This->device->capture_buffer = 0; HeapFree( GetProcessHeap(), 0, This ); - *ppobj = NULL; return DSERR_OUTOFMEMORY; } device->buffer = newbuf; device->buflen = buflen; } + *ppobj = This; + TRACE("returning DS_OK\n"); return DS_OK; }

1 0

Aric Stewart : usp10: Properly adjust LogClust when composing indic consonants.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: db03d6452d38150eb76aee1dc50d28e015d53a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=db03d6452d38150eb76aee1dc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 17 20:47:13 2011 -0500 usp10: Properly adjust LogClust when composing indic consonants. --- dlls/usp10/shape.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 499829f..4951c22 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1803,9 +1803,10 @@ static void DecomposeVowels(HDC hdc, WCHAR *pwOutChars, INT *pcChars, const Vowe } } -static void ComposeConsonants(HDC hdc, WCHAR *pwOutChars, INT *pcChars, const ConsonantComponents consonants[]) +static void ComposeConsonants(HDC hdc, WCHAR *pwOutChars, INT *pcChars, const ConsonantComponents consonants[], WORD* pwLogClust) { int i; + int offset = 0; int cWalk; for (cWalk = 0; cWalk < *pcChars; cWalk++) @@ -1825,6 +1826,11 @@ static void ComposeConsonants(HDC hdc, WCHAR *pwOutChars, INT *pcChars, const Co for(k = cWalk+1; k < *pcChars - j; k++) pwOutChars[k] = pwOutChars[k+j]; *pcChars = *pcChars - j; + for (k = j ; k > 0; k--) + pwLogClust[cWalk + k + offset] = pwLogClust[cWalk + offset]; + offset += j; + for (k = cWalk + j + offset; k < *pcChars + offset; k++) + pwLogClust[k]--; break; } } @@ -2464,7 +2470,7 @@ static void ContextualShape_Devanagari(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI memcpy(input, pwcChars, cChars * sizeof(WCHAR)); /* Step 1: Compose Consonant and Nukta */ - ComposeConsonants(hdc, input, &cCount, Devanagari_consonants); + ComposeConsonants(hdc, input, &cCount, Devanagari_consonants, pwLogClust); TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); /* Step 2: Reorder within Syllables */ @@ -2521,7 +2527,7 @@ static void ContextualShape_Bengali(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * /* Step 1: Decompose Vowels and Compose Consonents */ DecomposeVowels(hdc, input, &cCount, Bengali_vowels); - ComposeConsonants(hdc, input, &cCount, Bengali_consonants); + ComposeConsonants(hdc, input, &cCount, Bengali_consonants, pwLogClust); TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); /* Step 2: Reorder within Syllables */ @@ -2582,7 +2588,7 @@ static void ContextualShape_Gurmukhi(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS memcpy(input, pwcChars, cChars * sizeof(WCHAR)); /* Step 1: Compose Consonents */ - ComposeConsonants(hdc, input, &cCount, Gurmukhi_consonants); + ComposeConsonants(hdc, input, &cCount, Gurmukhi_consonants, pwLogClust); TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); /* Step 2: Reorder within Syllables */ @@ -2678,7 +2684,7 @@ static void ContextualShape_Oriya(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps /* Step 1: Decompose Vowels and Compose Consonents */ DecomposeVowels(hdc, input, &cCount, Oriya_vowels); - ComposeConsonants(hdc, input, &cCount, Oriya_consonants); + ComposeConsonants(hdc, input, &cCount, Oriya_consonants, pwLogClust); TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); /* Step 2: Reorder within Syllables */ @@ -2728,7 +2734,7 @@ static void ContextualShape_Tamil(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps /* Step 1: Decompose Vowels and Compose Consonents */ DecomposeVowels(hdc, input, &cCount, Tamil_vowels); - ComposeConsonants(hdc, input, &cCount, Tamil_consonants); + ComposeConsonants(hdc, input, &cCount, Tamil_consonants, pwLogClust); TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); /* Step 2: Reorder within Syllables */

1 0

Aric Stewart : usp10: Properly adjust LogClust when decomposing indic vowels.
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: 61e82e2c8ccf86e198520577b0000d0bcef4c0b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61e82e2c8ccf86e198520577b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Oct 17 20:47:23 2011 -0500 usp10: Properly adjust LogClust when decomposing indic vowels. --- dlls/usp10/shape.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 4951c22..0b1af46 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1783,10 +1783,11 @@ static void ReplaceInsertChars(HDC hdc, INT cWalk, INT* pcChars, WCHAR *pwOutCha } } -static void DecomposeVowels(HDC hdc, WCHAR *pwOutChars, INT *pcChars, const VowelComponents vowels[]) +static void DecomposeVowels(HDC hdc, WCHAR *pwOutChars, INT *pcChars, const VowelComponents vowels[], WORD* pwLogClust) { int i; int cWalk; + int offset = 0; for (cWalk = 0; cWalk < *pcChars; cWalk++) { @@ -1794,9 +1795,14 @@ static void DecomposeVowels(HDC hdc, WCHAR *pwOutChars, INT *pcChars, const Vowe { if (pwOutChars[cWalk] == vowels[i].base) { + int j; + int o = 1; ReplaceInsertChars(hdc, cWalk, pcChars, pwOutChars, vowels[i].parts); - if (vowels[i].parts[1]) cWalk++; - if (vowels[i].parts[2]) cWalk++; + if (vowels[i].parts[1]) { cWalk++; o++; } + if (vowels[i].parts[2]) { cWalk++; o++; } + offset += o; + for (j = (cWalk - offset) + 1; j < *pcChars - offset; j ++) + pwLogClust[j]+=o; break; } } @@ -2404,7 +2410,7 @@ static void ContextualShape_Sinhala(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * memcpy(input, pwcChars, cChars * sizeof(WCHAR)); /* Step 1: Decompose multi part vowels */ - DecomposeVowels(hdc, input, &cCount, Sinhala_vowels); + DecomposeVowels(hdc, input, &cCount, Sinhala_vowels, pwLogClust); TRACE("New double vowel expanded string %s (%i)\n",debugstr_wn(input,cCount),cCount); @@ -2526,7 +2532,7 @@ static void ContextualShape_Bengali(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * memcpy(input, pwcChars, cChars * sizeof(WCHAR)); /* Step 1: Decompose Vowels and Compose Consonents */ - DecomposeVowels(hdc, input, &cCount, Bengali_vowels); + DecomposeVowels(hdc, input, &cCount, Bengali_vowels, pwLogClust); ComposeConsonants(hdc, input, &cCount, Bengali_consonants, pwLogClust); TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); @@ -2683,7 +2689,7 @@ static void ContextualShape_Oriya(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps memcpy(input, pwcChars, cChars * sizeof(WCHAR)); /* Step 1: Decompose Vowels and Compose Consonents */ - DecomposeVowels(hdc, input, &cCount, Oriya_vowels); + DecomposeVowels(hdc, input, &cCount, Oriya_vowels, pwLogClust); ComposeConsonants(hdc, input, &cCount, Oriya_consonants, pwLogClust); TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); @@ -2733,7 +2739,7 @@ static void ContextualShape_Tamil(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps memcpy(input, pwcChars, cChars * sizeof(WCHAR)); /* Step 1: Decompose Vowels and Compose Consonents */ - DecomposeVowels(hdc, input, &cCount, Tamil_vowels); + DecomposeVowels(hdc, input, &cCount, Tamil_vowels, pwLogClust); ComposeConsonants(hdc, input, &cCount, Tamil_consonants, pwLogClust); TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); @@ -2783,7 +2789,7 @@ static void ContextualShape_Telugu(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *p memcpy(input, pwcChars, cChars * sizeof(WCHAR)); /* Step 1: Decompose Vowels */ - DecomposeVowels(hdc, input, &cCount, Telugu_vowels); + DecomposeVowels(hdc, input, &cCount, Telugu_vowels, pwLogClust); TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); /* Step 2: Reorder within Syllables */ @@ -2835,7 +2841,7 @@ static void ContextualShape_Kannada(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * memcpy(input, pwcChars, cChars * sizeof(WCHAR)); /* Step 1: Decompose Vowels */ - DecomposeVowels(hdc, input, &cCount, Kannada_vowels); + DecomposeVowels(hdc, input, &cCount, Kannada_vowels, pwLogClust); TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); /* Step 2: Reorder within Syllables */ @@ -2880,7 +2886,7 @@ static void ContextualShape_Malayalam(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS memcpy(input, pwcChars, cChars * sizeof(WCHAR)); /* Step 1: Decompose Vowels */ - DecomposeVowels(hdc, input, &cCount, Malayalam_vowels); + DecomposeVowels(hdc, input, &cCount, Malayalam_vowels, pwLogClust); TRACE("New composed string %s (%i)\n",debugstr_wn(input,cCount),cCount); /* Step 2: Reorder within Syllables */

1 0

Nikolay Sivov : comctl32/monthcal: Update pointer after reallocation ( Valgrind).
by Alexandre Julliard 18 Oct '11

18 Oct '11

Module: wine Branch: master Commit: ea96417f83fad63b696f0a7132aca89ada11b8ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea96417f83fad63b696f0a713… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 16 10:19:52 2011 -0500 comctl32/monthcal: Update pointer after reallocation (Valgrind). --- dlls/comctl32/monthcal.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 0c51075..83adf60 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2543,6 +2543,11 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) infoPtr->monthdayState = ReAlloc(infoPtr->monthdayState, MONTHCAL_GetMonthRange(infoPtr, GMR_DAYSTATE, 0)*sizeof(MONTHDAYSTATE)); MONTHCAL_NotifyDayState(infoPtr); + + /* update pointers that we'll need */ + title = &infoPtr->calendars[0].title; + wdays = &infoPtr->calendars[0].wdays; + days = &infoPtr->calendars[0].days; } for (i = 1; i < MONTHCAL_GetCalCount(infoPtr); i++)

1 0

Ričardas Barkauskas : ddraw: Rename device_from_device1 to impl_from_IDirect3DDevice.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: a0c9ab7894c6c68f4b2e99663b0ff755e4a85d61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c9ab7894c6c68f4b2e99663… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:57:00 2011 +0300 ddraw: Rename device_from_device1 to impl_from_IDirect3DDevice. --- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/device.c | 43 ++++++++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0c9ab7894c6c68f4b2e9…

1 0

Ričardas Barkauskas : ddraw: COM cleanup for IDirect3DDevice interface.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: d5912c533fe7f7ed426b3279eee3bf921e081c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5912c533fe7f7ed426b3279e… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:57:11 2011 +0300 ddraw: COM cleanup for IDirect3DDevice interface. --- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/device.c | 8 ++++---- dlls/ddraw/surface.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 635465f..39b103b 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -280,7 +280,7 @@ struct IDirect3DDeviceImpl const IDirect3DDevice7Vtbl *lpVtbl; const IDirect3DDevice3Vtbl *IDirect3DDevice3_vtbl; const IDirect3DDevice2Vtbl *IDirect3DDevice2_vtbl; - const IDirect3DDeviceVtbl *IDirect3DDevice_vtbl; + IDirect3DDevice IDirect3DDevice_iface; LONG ref; /* Other object connections */ @@ -327,7 +327,7 @@ WINED3DZBUFFERTYPE IDirect3DDeviceImpl_UpdateDepthStencil(IDirect3DDeviceImpl *T static inline IDirect3DDeviceImpl *impl_from_IDirect3DDevice(IDirect3DDevice *iface) { - return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice_vtbl); + return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice_iface); } static inline IDirect3DDeviceImpl *device_from_device2(IDirect3DDevice2 *iface) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 10a61d7..37a778b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -163,7 +163,7 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface, /* Direct3DDevice */ else if ( IsEqualGUID( &IID_IDirect3DDevice , refiid ) ) { - *obj = &This->IDirect3DDevice_vtbl; + *obj = &This->IDirect3DDevice_iface; TRACE("(%p) Returning IDirect3DDevice interface at %p\n", This, *obj); } else if ( IsEqualGUID( &IID_IDirect3DDevice2 , refiid ) ) { @@ -329,7 +329,7 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface) { /* No FIXME here because this might happen because of sloppy applications. */ WARN("Leftover matrix handle %#x (%p), deleting.\n", i + 1, entry->object); - IDirect3DDevice_DeleteMatrix((IDirect3DDevice *)&This->IDirect3DDevice_vtbl, i + 1); + IDirect3DDevice_DeleteMatrix(&This->IDirect3DDevice_iface, i + 1); break; } @@ -6741,7 +6741,7 @@ IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) { if (!iface) return NULL; assert(iface->lpVtbl == &d3d_device1_vtbl); - return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice_vtbl); + return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice_iface); } /***************************************************************************** @@ -6788,7 +6788,7 @@ HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, IDi device->IDirect3DDevice3_vtbl = &d3d_device3_vtbl; device->IDirect3DDevice2_vtbl = &d3d_device2_vtbl; - device->IDirect3DDevice_vtbl = &d3d_device1_vtbl; + device->IDirect3DDevice_iface.lpVtbl = &d3d_device1_vtbl; device->ref = 1; device->ddraw = ddraw; device->target = target; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index f14374a..beb759f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -134,7 +134,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, if (d3d) { - *obj = (IDirect3DDevice *)&((IDirect3DDeviceImpl *)d3d)->IDirect3DDevice_vtbl; + *obj = &((IDirect3DDeviceImpl *)d3d)->IDirect3DDevice_iface; TRACE("(%p) Returning IDirect3DDevice interface at %p\n", This, *obj); return S_OK; }

1 0

Ričardas Barkauskas : ddraw: Use unsafe_impl_from_IDirect3DDevice2 for application provided interfaces.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: a870753dba5e14191cbbaeb585cc3909ce25dd62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a870753dba5e14191cbbaeb58… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:57:19 2011 +0300 ddraw: Use unsafe_impl_from_IDirect3DDevice2 for application provided interfaces. --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 7 +++++++ dlls/ddraw/material.c | 9 +++++---- dlls/ddraw/surface.c | 3 ++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 39b103b..c8553c2 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -341,6 +341,7 @@ static inline IDirect3DDeviceImpl *device_from_device3(IDirect3DDevice3 *iface) } IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) DECLSPEC_HIDDEN; +IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectDrawClipper implementation structure diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 37a778b..4d109e4 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6737,6 +6737,13 @@ static const struct IDirect3DDeviceVtbl d3d_device1_vtbl = IDirect3DDeviceImpl_1_GetDirect3D }; +IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface) +{ + if (!iface) return NULL; + assert(iface->lpVtbl == &d3d_device2_vtbl); + return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice2_vtbl); +} + IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) { if (!iface) return NULL; diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index f873726..236b647 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -324,14 +324,15 @@ static HRESULT WINAPI IDirect3DMaterialImpl_GetHandle(IDirect3DMaterial3 *iface, } static HRESULT WINAPI IDirect3DMaterialImpl_2_GetHandle(IDirect3DMaterial2 *iface, - IDirect3DDevice2 *lpDirect3DDevice2, D3DMATERIALHANDLE *lpHandle) + IDirect3DDevice2 *device, D3DMATERIALHANDLE *handle) { IDirect3DMaterialImpl *This = impl_from_IDirect3DMaterial2(iface); + IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice2(device); - TRACE("iface %p, device %p, handle %p.\n", iface, lpDirect3DDevice2, lpHandle); + TRACE("iface %p, device %p, handle %p.\n", iface, device, handle); - return IDirect3DMaterial3_GetHandle(&This->IDirect3DMaterial3_iface, lpDirect3DDevice2 ? - (IDirect3DDevice3 *)&device_from_device2(lpDirect3DDevice2)->IDirect3DDevice3_vtbl : NULL, lpHandle); + return IDirect3DMaterial3_GetHandle(&This->IDirect3DMaterial3_iface, device_impl ? + (IDirect3DDevice3 *)&device_impl->IDirect3DDevice3_vtbl : NULL, handle); } static HRESULT WINAPI IDirect3DMaterialImpl_1_GetHandle(IDirect3DMaterial *iface, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index beb759f..9ef33b3 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4521,6 +4521,7 @@ static HRESULT WINAPI d3d_texture2_GetHandle(IDirect3DTexture2 *iface, IDirect3DDevice2 *device, D3DTEXTUREHANDLE *handle) { IDirectDrawSurfaceImpl *surface = impl_from_IDirect3DTexture2(iface); + IDirect3DDeviceImpl *device_impl = unsafe_impl_from_IDirect3DDevice2(device); TRACE("iface %p, device %p, handle %p.\n", iface, device, handle); @@ -4528,7 +4529,7 @@ static HRESULT WINAPI d3d_texture2_GetHandle(IDirect3DTexture2 *iface, if (!surface->Handle) { - DWORD h = ddraw_allocate_handle(&device_from_device2(device)->handle_table, surface, DDRAW_HANDLE_SURFACE); + DWORD h = ddraw_allocate_handle(&device_impl->handle_table, surface, DDRAW_HANDLE_SURFACE); if (h == DDRAW_INVALID_HANDLE) { ERR("Failed to allocate a texture handle.\n");

1 0

Ričardas Barkauskas : ddraw: Rename device_from_device2 to impl_from_IDirect3DDevice2.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: 1c045cbb28155dfc74fda1076f7d99b9ed227d9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c045cbb28155dfc74fda1076… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:57:34 2011 +0300 ddraw: Rename device_from_device2 to impl_from_IDirect3DDevice2. --- dlls/ddraw/ddraw_private.h | 4 +- dlls/ddraw/device.c | 75 ++++++++++++++++++++++++------------------- 2 files changed, 44 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c045cbb28155dfc74fda…

1 0

Ričardas Barkauskas : ddraw: COM cleanup for IDirect3DDevice2 interface.
by Alexandre Julliard 17 Oct '11

17 Oct '11

Module: wine Branch: master Commit: d32df839ac0dbe7b812e20e1781cbabf1b9edac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d32df839ac0dbe7b812e20e17… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Oct 17 16:57:46 2011 +0300 ddraw: COM cleanup for IDirect3DDevice2 interface. --- dlls/ddraw/ddraw.c | 11 ++++++++--- dlls/ddraw/ddraw_private.h | 4 ++-- dlls/ddraw/device.c | 10 +++++----- dlls/ddraw/executebuffer.c | 2 +- dlls/ddraw/surface.c | 2 +- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 831ee85..75a4546 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4359,15 +4359,20 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, { IDirectDrawImpl *This = impl_from_IDirect3D2(iface); IDirectDrawSurfaceImpl *surface_impl = unsafe_impl_from_IDirectDrawSurface(surface); + IDirect3DDevice7 *device7; + IDirect3DDeviceImpl *device_impl; HRESULT hr; TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device); hr = d3d7_CreateDevice(&This->IDirect3D7_iface, riid, - surface_impl ? &surface_impl->IDirectDrawSurface7_iface : NULL, - (IDirect3DDevice7 **)device); - if (*device) *device = (IDirect3DDevice2 *)&((IDirect3DDeviceImpl *)*device)->IDirect3DDevice2_vtbl; + surface_impl ? &surface_impl->IDirectDrawSurface7_iface : NULL, device ? &device7 : NULL); + if (SUCCEEDED(hr)) + { + device_impl = (IDirect3DDeviceImpl *)device7; + *device = &device_impl->IDirect3DDevice2_iface; + } return hr; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 6009a51..1072f67 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -279,7 +279,7 @@ struct IDirect3DDeviceImpl /* IUnknown */ const IDirect3DDevice7Vtbl *lpVtbl; const IDirect3DDevice3Vtbl *IDirect3DDevice3_vtbl; - const IDirect3DDevice2Vtbl *IDirect3DDevice2_vtbl; + IDirect3DDevice2 IDirect3DDevice2_iface; IDirect3DDevice IDirect3DDevice_iface; LONG ref; @@ -332,7 +332,7 @@ static inline IDirect3DDeviceImpl *impl_from_IDirect3DDevice(IDirect3DDevice *if static inline IDirect3DDeviceImpl *impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface) { - return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice2_vtbl); + return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice2_iface); } static inline IDirect3DDeviceImpl *device_from_device3(IDirect3DDevice3 *iface) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index cbf2aae..dcc6475 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -167,7 +167,7 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface, TRACE("(%p) Returning IDirect3DDevice interface at %p\n", This, *obj); } else if ( IsEqualGUID( &IID_IDirect3DDevice2 , refiid ) ) { - *obj = &This->IDirect3DDevice2_vtbl; + *obj = &This->IDirect3DDevice2_iface; TRACE("(%p) Returning IDirect3DDevice2 interface at %p\n", This, *obj); } else if ( IsEqualGUID( &IID_IDirect3DDevice3 , refiid ) ) { @@ -581,7 +581,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_SwapTextureHandles(IDirect3DDevice * TRACE("iface %p, tex1 %p, tex2 %p.\n", iface, D3DTex1, D3DTex2); - return IDirect3DDevice2_SwapTextureHandles((IDirect3DDevice2 *)&This->IDirect3DDevice2_vtbl, t1, t2); + return IDirect3DDevice2_SwapTextureHandles(&This->IDirect3DDevice2_iface, t1, t2); } /***************************************************************************** @@ -1274,7 +1274,7 @@ static HRESULT WINAPI IDirect3DDeviceImpl_1_EnumTextureFormats(IDirect3DDevice * TRACE("iface %p, callback %p, context %p.\n", iface, Callback, Arg); - return IDirect3DDevice2_EnumTextureFormats((IDirect3DDevice2 *)&This->IDirect3DDevice2_vtbl, Callback, Arg); + return IDirect3DDevice2_EnumTextureFormats(&This->IDirect3DDevice2_iface, Callback, Arg); } /***************************************************************************** @@ -6750,7 +6750,7 @@ IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice2(IDirect3DDevice2 *iface) { if (!iface) return NULL; assert(iface->lpVtbl == &d3d_device2_vtbl); - return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice2_vtbl); + return CONTAINING_RECORD(iface, IDirect3DDeviceImpl, IDirect3DDevice2_iface); } IDirect3DDeviceImpl *unsafe_impl_from_IDirect3DDevice(IDirect3DDevice *iface) @@ -6803,7 +6803,7 @@ HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, IDi device->lpVtbl = &d3d_device7_fpu_setup_vtbl; device->IDirect3DDevice3_vtbl = &d3d_device3_vtbl; - device->IDirect3DDevice2_vtbl = &d3d_device2_vtbl; + device->IDirect3DDevice2_iface.lpVtbl = &d3d_device2_vtbl; device->IDirect3DDevice_iface.lpVtbl = &d3d_device1_vtbl; device->ref = 1; device->ddraw = ddraw; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 379862a..75687f6 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -292,7 +292,7 @@ HRESULT d3d_execute_buffer_execute(IDirect3DExecuteBufferImpl *This, case D3DOP_STATERENDER: { int i; - IDirect3DDevice2 *d3d_device2 = (IDirect3DDevice2 *)&lpDevice->IDirect3DDevice2_vtbl; + IDirect3DDevice2 *d3d_device2 = &lpDevice->IDirect3DDevice2_iface; TRACE("STATERENDER (%d)\n", count); for (i = 0; i < count; i++) { diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 9ef33b3..7febc5e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4557,7 +4557,7 @@ static HRESULT WINAPI d3d_texture1_GetHandle(IDirect3DTexture *iface, TRACE("iface %p, device %p, handle %p.\n", iface, device, handle); return d3d_texture2_GetHandle(&This->IDirect3DTexture2_iface, - device_impl ? (IDirect3DDevice2 *)&device_impl->IDirect3DDevice2_vtbl : NULL, handle); + device_impl ? &device_impl->IDirect3DDevice2_iface : NULL, handle); } /*****************************************************************************

1 0