January 2011 - Wine-Commits

Michael Stefaniuc : d3dx9_36: COM cleanup for the ID3DXMatrixStack iface.
by Alexandre Julliard Jan. 27, 2011

Jan. 27, 2011

Module: wine Branch: master Commit: a9065082da03cda554a9e57c2840e13f7586747b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9065082da03cda554a9e57c2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 27 00:32:20 2011 +0100 d3dx9_36: COM cleanup for the ID3DXMatrixStack iface. --- dlls/d3dx9_36/d3dx9_36_private.h | 13 --------- dlls/d3dx9_36/math.c | 56 ++++++++++++++++++++++++------------- 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index f19a2fe..5632ae1 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -50,19 +50,6 @@ HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, const PixelFormatDesc *get_format_info(D3DFORMAT format); const PixelFormatDesc *get_format_info_idx(int idx); -/* ID3DXMatrixStack */ -typedef struct ID3DXMatrixStackImpl -{ - /* IUnknown fields */ - const ID3DXMatrixStackVtbl *lpVtbl; - LONG ref; - - /* ID3DXMatrixStack fields */ - unsigned int current; - unsigned int stack_size; - D3DXMATRIX *stack; -} ID3DXMatrixStackImpl; - /* ID3DXMesh */ typedef struct ID3DXMeshImpl { diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index eb29573..fdb5f92 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -35,6 +35,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); static const ID3DXMatrixStackVtbl ID3DXMatrixStack_Vtbl; +typedef struct ID3DXMatrixStackImpl +{ + ID3DXMatrixStack ID3DXMatrixStack_iface; + LONG ref; + + unsigned int current; + unsigned int stack_size; + D3DXMATRIX *stack; +} ID3DXMatrixStackImpl; + + /*_________________D3DXColor____________________*/ D3DXCOLOR* WINAPI D3DXColorAdjustContrast(D3DXCOLOR *pout, CONST D3DXCOLOR *pc, FLOAT s) @@ -762,7 +773,7 @@ HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack) *ppstack = NULL; return E_OUTOFMEMORY; } - object->lpVtbl = &ID3DXMatrixStack_Vtbl; + object->ID3DXMatrixStack_iface.lpVtbl = &ID3DXMatrixStack_Vtbl; object->ref = 1; object->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_STACK_SIZE * sizeof(D3DXMATRIX)); @@ -779,13 +790,18 @@ HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack) TRACE("Created matrix stack %p\n", object); - *ppstack = (LPD3DXMATRIXSTACK)object; + *ppstack = &object->ID3DXMatrixStack_iface; return D3D_OK; } +static inline ID3DXMatrixStackImpl *impl_from_ID3DXMatrixStack(ID3DXMatrixStack *iface) +{ + return CONTAINING_RECORD(iface, ID3DXMatrixStackImpl, ID3DXMatrixStack_iface); +} + static HRESULT WINAPI ID3DXMatrixStackImpl_QueryInterface(ID3DXMatrixStack *iface, REFIID riid, void **ppobj) { - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXMatrixStack)) { ID3DXMatrixStack_AddRef(iface); @@ -799,7 +815,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_QueryInterface(ID3DXMatrixStack *ifac static ULONG WINAPI ID3DXMatrixStackImpl_AddRef(ID3DXMatrixStack *iface) { - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) : AddRef from %d\n", This, ref - 1); return ref; @@ -807,7 +823,7 @@ static ULONG WINAPI ID3DXMatrixStackImpl_AddRef(ID3DXMatrixStack *iface) static ULONG WINAPI ID3DXMatrixStackImpl_Release(ID3DXMatrixStack* iface) { - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); ULONG ref = InterlockedDecrement(&This->ref); if (!ref) { @@ -820,7 +836,7 @@ static ULONG WINAPI ID3DXMatrixStackImpl_Release(ID3DXMatrixStack* iface) static D3DXMATRIX* WINAPI ID3DXMatrixStackImpl_GetTop(ID3DXMatrixStack *iface) { - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -829,7 +845,7 @@ static D3DXMATRIX* WINAPI ID3DXMatrixStackImpl_GetTop(ID3DXMatrixStack *iface) static HRESULT WINAPI ID3DXMatrixStackImpl_LoadIdentity(ID3DXMatrixStack *iface) { - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -840,7 +856,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_LoadIdentity(ID3DXMatrixStack *iface) static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm) { - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -851,7 +867,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_LoadMatrix(ID3DXMatrixStack *iface, C static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm) { - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -862,7 +878,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrix(ID3DXMatrixStack *iface, C static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *iface, CONST D3DXMATRIX *pm) { - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -873,7 +889,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_MultMatrixLocal(ID3DXMatrixStack *ifa static HRESULT WINAPI ID3DXMatrixStackImpl_Pop(ID3DXMatrixStack *iface) { - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -901,7 +917,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Pop(ID3DXMatrixStack *iface) static HRESULT WINAPI ID3DXMatrixStackImpl_Push(ID3DXMatrixStack *iface) { - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -929,7 +945,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Push(ID3DXMatrixStack *iface) static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxis(ID3DXMatrixStack *iface, CONST D3DXVECTOR3 *pv, FLOAT angle) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -942,7 +958,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxis(ID3DXMatrixStack *iface, C static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxisLocal(ID3DXMatrixStack *iface, CONST D3DXVECTOR3 *pv, FLOAT angle) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -955,7 +971,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateAxisLocal(ID3DXMatrixStack *ifa static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRoll(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -968,7 +984,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRoll(ID3DXMatrixStack * static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRollLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -981,7 +997,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_RotateYawPitchRollLocal(ID3DXMatrixSt static HRESULT WINAPI ID3DXMatrixStackImpl_Scale(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -994,7 +1010,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Scale(ID3DXMatrixStack *iface, FLOAT static HRESULT WINAPI ID3DXMatrixStackImpl_ScaleLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1007,7 +1023,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_ScaleLocal(ID3DXMatrixStack *iface, F static HRESULT WINAPI ID3DXMatrixStackImpl_Translate(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface); @@ -1020,7 +1036,7 @@ static HRESULT WINAPI ID3DXMatrixStackImpl_Translate(ID3DXMatrixStack *iface, FL static HRESULT WINAPI ID3DXMatrixStackImpl_TranslateLocal(ID3DXMatrixStack *iface, FLOAT x, FLOAT y, FLOAT z) { D3DXMATRIX temp; - ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; + ID3DXMatrixStackImpl *This = impl_from_ID3DXMatrixStack(iface); TRACE("iface %p\n", iface);

1 0

Nikolay Sivov : msvcrt: Implement _wsopen_s.
by Alexandre Julliard Jan. 27, 2011

Jan. 27, 2011

Module: wine Branch: master Commit: 8d09b40835b92dc19c4e5f253fd3990c42597b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d09b40835b92dc19c4e5f253… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 27 01:56:30 2011 +0300 msvcrt: Implement _wsopen_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 35 ++++++++++++++++++++++++- dlls/msvcrt/file.c | 57 ++++++++++++++++++++++++++++++----------- dlls/msvcrt/msvcrt.spec | 4 +- 6 files changed, 79 insertions(+), 23 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a601f23..d079728 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1382,7 +1382,7 @@ @ cdecl _wsearchenv_s(wstr wstr ptr long) msvcrt._wsearchenv_s @ cdecl _wsetlocale(long wstr) msvcrt._wsetlocale @ varargs _wsopen(wstr long long) msvcrt._wsopen -@ stub _wsopen_s +@ cdecl _wsopen_s(ptr wstr long long long) msvcrt._wsopen_s @ varargs _wspawnl(long wstr wstr) msvcrt._wspawnl @ varargs _wspawnle(long wstr wstr) msvcrt._wspawnle @ varargs _wspawnlp(long wstr wstr) msvcrt._wspawnlp diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b4787ad..3ece44c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1238,7 +1238,7 @@ @ cdecl _wsearchenv_s(wstr wstr ptr long) msvcrt._wsearchenv_s @ cdecl _wsetlocale(long wstr) msvcrt._wsetlocale @ varargs _wsopen(wstr long long) msvcrt._wsopen -@ stub _wsopen_s +@ cdecl _wsopen_s(ptr wstr long long long) msvcrt._wsopen_s @ varargs _wspawnl(long wstr wstr) msvcrt._wspawnl @ varargs _wspawnle(long wstr wstr) msvcrt._wspawnle @ varargs _wspawnlp(long wstr wstr) msvcrt._wspawnlp diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 809265b..38cf0fb 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1222,7 +1222,7 @@ @ cdecl _wsearchenv_s(wstr wstr ptr long) msvcrt._wsearchenv_s @ cdecl _wsetlocale(long wstr) msvcrt._wsetlocale @ varargs _wsopen(wstr long long) msvcrt._wsopen -@ stub _wsopen_s +@ cdecl _wsopen_s(ptr wstr long long long) msvcrt._wsopen_s @ varargs _wspawnl(long wstr wstr) msvcrt._wspawnl @ varargs _wspawnle(long wstr wstr) msvcrt._wspawnle @ varargs _wspawnlp(long wstr wstr) msvcrt._wspawnlp diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 35995f4..eeb8842 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -74,6 +74,7 @@ static int (__cdecl *p_controlfp_s)(unsigned int *, unsigned int, unsigned int); static int (__cdecl *p_atoflt)(_CRT_FLOAT *, char *); static unsigned int (__cdecl *p_set_abort_behavior)(unsigned int, unsigned int); static int (__cdecl *p_sopen_s)(int*, const char*, int, int, int); +static int (__cdecl *p_wsopen_s)(int*, const wchar_t*, int, int, int); static void* (WINAPI *pEncodePointer)(void *); @@ -709,10 +710,16 @@ static void test__set_abort_behavior(void) p_set_abort_behavior(_WRITE_ABORT_MSG | _CALL_REPORTFAULT, 0xffffffff); } -static void test_sopen_s(void) +static void test__sopen_s(void) { int ret, fd; + if(!p_sopen_s) + { + win_skip("_sopen_s not found\n"); + return; + } + SET_EXPECT(invalid_parameter_handler); ret = p_sopen_s(NULL, "test", _O_RDONLY, _SH_DENYNO, _S_IREAD); ok(ret == EINVAL, "got %d, expected EINVAL\n", ret); @@ -724,6 +731,28 @@ static void test_sopen_s(void) ok(fd == -1, "got %d\n", fd); } +static void test__wsopen_s(void) +{ + wchar_t testW[] = {'t','e','s','t',0}; + int ret, fd; + + if(!p_wsopen_s) + { + win_skip("_wsopen_s not found\n"); + return; + } + + SET_EXPECT(invalid_parameter_handler); + ret = p_wsopen_s(NULL, testW, _O_RDONLY, _SH_DENYNO, _S_IREAD); + ok(ret == EINVAL, "got %d, expected EINVAL\n", ret); + CHECK_CALLED(invalid_parameter_handler); + + fd = 0xdead; + ret = p_wsopen_s(&fd, testW, _O_RDONLY, _SH_DENYNO, _S_IREAD); + ok(ret == ENOENT, "got %d, expected ENOENT\n", ret); + ok(fd == -1, "got %d\n", fd); +} + START_TEST(msvcr90) { HMODULE hcrt; @@ -758,6 +787,7 @@ START_TEST(msvcr90) p_atoflt = (void* )GetProcAddress(hcrt, "_atoflt"); p_set_abort_behavior = (void *) GetProcAddress(hcrt, "_set_abort_behavior"); p_sopen_s = (void*) GetProcAddress(hcrt, "_sopen_s"); + p_wsopen_s = (void*) GetProcAddress(hcrt, "_wsopen_s"); hkernel32 = GetModuleHandleA("kernel32.dll"); pEncodePointer = (void *) GetProcAddress(hkernel32, "EncodePointer"); @@ -772,5 +802,6 @@ START_TEST(msvcr90) test_controlfp_s(); test__atoflt(); test__set_abort_behavior(); - test_sopen_s(); + test__sopen_s(); + test__wsopen_s(); } diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index d56700b..b8077d2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1632,22 +1632,27 @@ int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... ) } /********************************************************************* - * _wsopen (MSVCRT.@) + * _wsopen_s (MSVCRT.@) */ -int CDECL MSVCRT__wsopen( const MSVCRT_wchar_t* path, int oflags, int shflags, ... ) +int CDECL MSVCRT__wsopen_s( int *fd, const MSVCRT_wchar_t* path, int oflags, int shflags, int pmode ) { - __ms_va_list ap; - int pmode; DWORD access = 0, creation = 0, attrib; + SECURITY_ATTRIBUTES sa; DWORD sharing; - int wxflag = 0, fd; + int wxflag; HANDLE hand; - SECURITY_ATTRIBUTES sa; + TRACE("fd*: %p :file (%s) oflags: 0x%04x shflags: 0x%04x pmode: 0x%04x\n", + fd, debugstr_w(path), oflags, shflags, pmode); - TRACE(":file (%s) oflags: 0x%04x shflags: 0x%04x\n", - debugstr_w(path), oflags, shflags); + if (!fd) + { + MSVCRT_INVALID_PMT("null out fd pointer"); + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + *fd = -1; wxflag = split_oflags(oflags); switch (oflags & (MSVCRT__O_RDONLY | MSVCRT__O_WRONLY | MSVCRT__O_RDWR)) { @@ -1658,10 +1663,6 @@ int CDECL MSVCRT__wsopen( const MSVCRT_wchar_t* path, int oflags, int shflags, . if (oflags & MSVCRT__O_CREAT) { - __ms_va_start(ap, shflags); - pmode = va_arg(ap, int); - __ms_va_end(ap); - if(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE)) FIXME(": pmode 0x%04x ignored\n", pmode); else @@ -1698,7 +1699,7 @@ int CDECL MSVCRT__wsopen( const MSVCRT_wchar_t* path, int oflags, int shflags, . break; default: ERR( "Unhandled shflags 0x%x\n", shflags ); - return -1; + return MSVCRT_EINVAL; } attrib = FILE_ATTRIBUTE_NORMAL; @@ -1718,12 +1719,36 @@ int CDECL MSVCRT__wsopen( const MSVCRT_wchar_t* path, int oflags, int shflags, . if (hand == INVALID_HANDLE_VALUE) { WARN(":failed-last error (%d)\n",GetLastError()); msvcrt_set_errno(GetLastError()); - return -1; + msvcrt_set_errno(GetLastError()); + return *MSVCRT__errno(); } - fd = msvcrt_alloc_fd(hand, wxflag); + *fd = msvcrt_alloc_fd(hand, wxflag); + + TRACE(":fd (%d) handle (%p)\n", *fd, hand); + return 0; +} + +/********************************************************************* + * _wsopen (MSVCRT.@) + */ +int CDECL MSVCRT__wsopen( const MSVCRT_wchar_t *path, int oflags, int shflags, ... ) +{ + int pmode; + int fd; + + if (oflags & MSVCRT__O_CREAT) + { + __ms_va_list ap; + + __ms_va_start(ap, shflags); + pmode = va_arg(ap, int); + __ms_va_end(ap); + } + else + pmode = 0; - TRACE(":fd (%d) handle (%p)\n",fd, hand); + MSVCRT__wsopen_s(&fd, path, oflags, shflags, pmode); return fd; } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5582e63..37d2425 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1159,8 +1159,8 @@ @ cdecl _wsearchenv(wstr wstr ptr) @ cdecl _wsearchenv_s(wstr wstr ptr long) @ cdecl _wsetlocale(long wstr) MSVCRT__wsetlocale -@ varargs _wsopen (wstr long long) MSVCRT__wsopen -# stub _wsopen_s +@ varargs _wsopen(wstr long long) MSVCRT__wsopen +@ cdecl _wsopen_s(ptr wstr long long long) MSVCRT__wsopen_s @ varargs _wspawnl(long wstr wstr) @ varargs _wspawnle(long wstr wstr) @ varargs _wspawnlp(long wstr wstr)

1 0

Michael Stefaniuc : d3dx9_36: COM cleanup for the ID3DXEffect iface.
by Alexandre Julliard Jan. 27, 2011

Jan. 27, 2011

Module: wine Branch: master Commit: 03321ad0fb17a2b3891c6cdb10b0c8828655109c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03321ad0fb17a2b3891c6cdb1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 27 00:17:42 2011 +0100 d3dx9_36: COM cleanup for the ID3DXEffect iface. --- dlls/d3dx9_36/effect.c | 171 +++++++++++++++++++++++++----------------------- 1 files changed, 88 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03321ad0fb17a2b3891c6…

1 0

Michael Stefaniuc : d3dx9_36: COM cleanup for the ID3DXFont iface.
by Alexandre Julliard Jan. 27, 2011

Jan. 27, 2011

Module: wine Branch: master Commit: 7342f34ef7936dce488adc832476877f48fb8540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7342f34ef7936dce488adc832… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 27 00:28:41 2011 +0100 d3dx9_36: COM cleanup for the ID3DXFont iface. --- dlls/d3dx9_36/d3dx9_36_private.h | 15 ------ dlls/d3dx9_36/font.c | 96 +++++++++++++++++++++++--------------- 2 files changed, 58 insertions(+), 53 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 4b2e78d..f19a2fe 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -50,21 +50,6 @@ HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, const PixelFormatDesc *get_format_info(D3DFORMAT format); const PixelFormatDesc *get_format_info_idx(int idx); -/* ID3DXFont */ -typedef struct ID3DXFontImpl -{ - /* IUnknown fields */ - const ID3DXFontVtbl *lpVtbl; - LONG ref; - - /* ID3DXFont fields */ - IDirect3DDevice9 *device; - D3DXFONT_DESCW desc; - - HDC hdc; - HFONT hfont; -} ID3DXFontImpl; - /* ID3DXMatrixStack */ typedef struct ID3DXMatrixStackImpl { diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 1113060..a27f80a 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -26,9 +26,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -static HRESULT WINAPI ID3DXFontImpl_QueryInterface(LPD3DXFONT iface, REFIID riid, LPVOID *object) +typedef struct ID3DXFontImpl { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFont ID3DXFont_iface; + LONG ref; + + IDirect3DDevice9 *device; + D3DXFONT_DESCW desc; + + HDC hdc; + HFONT hfont; +} ID3DXFontImpl; + +static inline ID3DXFontImpl *impl_from_ID3DXFont(ID3DXFont *iface) +{ + return CONTAINING_RECORD(iface, ID3DXFontImpl, ID3DXFont_iface); +} + +static HRESULT WINAPI ID3DXFontImpl_QueryInterface(ID3DXFont *iface, REFIID riid, void **object) +{ + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); TRACE("(%p): QueryInterface from %s\n", This, debugstr_guid(riid)); if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXFont)) { @@ -40,17 +57,17 @@ static HRESULT WINAPI ID3DXFontImpl_QueryInterface(LPD3DXFONT iface, REFIID riid return E_NOINTERFACE; } -static ULONG WINAPI ID3DXFontImpl_AddRef(LPD3DXFONT iface) +static ULONG WINAPI ID3DXFontImpl_AddRef(ID3DXFont *iface) { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); ULONG ref=InterlockedIncrement(&This->ref); TRACE("(%p)->(): AddRef from %d\n", This, ref-1); return ref; } -static ULONG WINAPI ID3DXFontImpl_Release(LPD3DXFONT iface) +static ULONG WINAPI ID3DXFontImpl_Release(ID3DXFont *iface) { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); ULONG ref=InterlockedDecrement(&This->ref); TRACE("(%p)->(): ReleaseRef to %d\n", This, ref); @@ -64,9 +81,9 @@ static ULONG WINAPI ID3DXFontImpl_Release(LPD3DXFONT iface) return ref; } -static HRESULT WINAPI ID3DXFontImpl_GetDevice(LPD3DXFONT iface, LPDIRECT3DDEVICE9 *device) +static HRESULT WINAPI ID3DXFontImpl_GetDevice(ID3DXFont *iface, LPDIRECT3DDEVICE9 *device) { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); TRACE("(%p)->(%p)\n", This, device); @@ -77,9 +94,9 @@ static HRESULT WINAPI ID3DXFontImpl_GetDevice(LPD3DXFONT iface, LPDIRECT3DDEVICE return D3D_OK; } -static HRESULT WINAPI ID3DXFontImpl_GetDescA(LPD3DXFONT iface, D3DXFONT_DESCA *desc) +static HRESULT WINAPI ID3DXFontImpl_GetDescA(ID3DXFont *iface, D3DXFONT_DESCA *desc) { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); TRACE("(%p)->(%p)\n", This, desc); @@ -90,9 +107,9 @@ static HRESULT WINAPI ID3DXFontImpl_GetDescA(LPD3DXFONT iface, D3DXFONT_DESCA *d return D3D_OK; } -static HRESULT WINAPI ID3DXFontImpl_GetDescW(LPD3DXFONT iface, D3DXFONT_DESCW *desc) +static HRESULT WINAPI ID3DXFontImpl_GetDescW(ID3DXFont *iface, D3DXFONT_DESCW *desc) { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); TRACE("(%p)->(%p)\n", This, desc); @@ -102,86 +119,89 @@ static HRESULT WINAPI ID3DXFontImpl_GetDescW(LPD3DXFONT iface, D3DXFONT_DESCW *d return D3D_OK; } -static BOOL WINAPI ID3DXFontImpl_GetTextMetricsA(LPD3DXFONT iface, TEXTMETRICA *metrics) +static BOOL WINAPI ID3DXFontImpl_GetTextMetricsA(ID3DXFont *iface, TEXTMETRICA *metrics) { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); TRACE("(%p)->(%p)\n", This, metrics); return GetTextMetricsA(This->hdc, metrics); } -static BOOL WINAPI ID3DXFontImpl_GetTextMetricsW(LPD3DXFONT iface, TEXTMETRICW *metrics) +static BOOL WINAPI ID3DXFontImpl_GetTextMetricsW(ID3DXFont *iface, TEXTMETRICW *metrics) { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); TRACE("(%p)->(%p)\n", This, metrics); return GetTextMetricsW(This->hdc, metrics); } -static HDC WINAPI ID3DXFontImpl_GetDC(LPD3DXFONT iface) +static HDC WINAPI ID3DXFontImpl_GetDC(ID3DXFont *iface) { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); TRACE("(%p)->()\n", This); return This->hdc; } -static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(LPD3DXFONT iface, UINT glyph, LPDIRECT3DTEXTURE9 *texture, RECT *blackbox, POINT *cellinc) +static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(ID3DXFont *iface, UINT glyph, + LPDIRECT3DTEXTURE9 *texture, RECT *blackbox, POINT *cellinc) { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); FIXME("(%p)->(%u, %p, %p, %p): stub\n", This, glyph, texture, blackbox, cellinc); return D3D_OK; } -static HRESULT WINAPI ID3DXFontImpl_PreloadCharacters(LPD3DXFONT iface, UINT first, UINT last) +static HRESULT WINAPI ID3DXFontImpl_PreloadCharacters(ID3DXFont *iface, UINT first, UINT last) { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); FIXME("(%p)->(%u, %u): stub\n", This, first, last); return D3D_OK; } -static HRESULT WINAPI ID3DXFontImpl_PreloadGlyphs(LPD3DXFONT iface, UINT first, UINT last) +static HRESULT WINAPI ID3DXFontImpl_PreloadGlyphs(ID3DXFont *iface, UINT first, UINT last) { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); FIXME("(%p)->(%u, %u): stub\n", This, first, last); return D3D_OK; } -static HRESULT WINAPI ID3DXFontImpl_PreloadTextA(LPD3DXFONT iface, LPCSTR string, INT count) +static HRESULT WINAPI ID3DXFontImpl_PreloadTextA(ID3DXFont *iface, LPCSTR string, INT count) { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); FIXME("(%p)->(%s, %d): stub\n", This, string, count); return D3D_OK; } -static HRESULT WINAPI ID3DXFontImpl_PreloadTextW(LPD3DXFONT iface, LPCWSTR string, INT count) +static HRESULT WINAPI ID3DXFontImpl_PreloadTextW(ID3DXFont *iface, LPCWSTR string, INT count) { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); FIXME("(%p)->(%s, %d): stub\n", This, debugstr_w(string), count); return D3D_OK; } -static INT WINAPI ID3DXFontImpl_DrawTextA(LPD3DXFONT iface, LPD3DXSPRITE sprite, LPCSTR string, INT count, LPRECT rect, DWORD format, D3DCOLOR color) +static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, LPD3DXSPRITE sprite, LPCSTR string, + INT count, LPRECT rect, DWORD format, D3DCOLOR color) { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); FIXME("(%p)->(%p, %s, %d, %p, %d, %#x): stub\n", This, sprite, string, count, rect, format, color); return 1; } -static INT WINAPI ID3DXFontImpl_DrawTextW(LPD3DXFONT iface, LPD3DXSPRITE sprite, LPCWSTR string, INT count, LPRECT rect, DWORD format, D3DCOLOR color) +static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, LPD3DXSPRITE sprite, LPCWSTR string, + INT count, LPRECT rect, DWORD format, D3DCOLOR color) { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); FIXME("(%p)->(%p, %s, %d, %p, %d, %#x): stub\n", This, sprite, debugstr_w(string), count, rect, format, color); return 1; } -static HRESULT WINAPI ID3DXFontImpl_OnLostDevice(LPD3DXFONT iface) +static HRESULT WINAPI ID3DXFontImpl_OnLostDevice(ID3DXFont *iface) { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); FIXME("(%p)->(): stub\n", This); return D3D_OK; } -static HRESULT WINAPI ID3DXFontImpl_OnResetDevice(LPD3DXFONT iface) +static HRESULT WINAPI ID3DXFontImpl_OnResetDevice(ID3DXFont *iface) { - ID3DXFontImpl *This=(ID3DXFontImpl*)iface; + ID3DXFontImpl *This=impl_from_ID3DXFont(iface); FIXME("(%p)->(): stub\n", This); return D3D_OK; } @@ -302,7 +322,7 @@ HRESULT WINAPI D3DXCreateFontIndirectW(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_ *font=NULL; return E_OUTOFMEMORY; } - object->lpVtbl=&D3DXFont_Vtbl; + object->ID3DXFont_iface.lpVtbl = &D3DXFont_Vtbl; object->ref=1; object->device=device; object->desc=*desc; @@ -323,7 +343,7 @@ HRESULT WINAPI D3DXCreateFontIndirectW(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_ SelectObject(object->hdc, object->hfont); IDirect3DDevice9_AddRef(device); - *font=(LPD3DXFONT)object; + *font=&object->ID3DXFont_iface; return D3D_OK; }

1 0

Michael Stefaniuc : d3dx9_36: COM cleanup for the ID3DXInclude iface.
by Alexandre Julliard Jan. 27, 2011

Jan. 27, 2011

Module: wine Branch: master Commit: c84b8dbd3e5006a6cb2d2ca076bb0eab18bf710d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84b8dbd3e5006a6cb2d2ca07… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 27 00:21:38 2011 +0100 d3dx9_36: COM cleanup for the ID3DXInclude iface. --- dlls/d3dx9_36/shader.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 41feecf..b8a6909 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -266,7 +266,7 @@ static const struct ID3DXIncludeVtbl D3DXInclude_Vtbl = { }; struct D3DXIncludeImpl { - const ID3DXIncludeVtbl *lpVtbl; + ID3DXInclude ID3DXInclude_iface; }; HRESULT WINAPI D3DXAssembleShaderFromFileA(LPCSTR filename, @@ -310,8 +310,8 @@ HRESULT WINAPI D3DXAssembleShaderFromFileW(LPCWSTR filename, if(!include) { - includefromfile.lpVtbl = &D3DXInclude_Vtbl; - include = (LPD3DXINCLUDE)&includefromfile; + includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl; + include = &includefromfile.ID3DXInclude_iface; } hr = D3DXAssembleShader(buffer, len, defines, include, flags, @@ -433,8 +433,8 @@ HRESULT WINAPI D3DXCompileShaderFromFileW(LPCWSTR filename, if (!include) { - includefromfile.lpVtbl = &D3DXInclude_Vtbl; - include = (LPD3DXINCLUDE)&includefromfile; + includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl; + include = &includefromfile.ID3DXInclude_iface; } filename_len = WideCharToMultiByte(CP_ACP, 0, filename, -1, NULL, 0, NULL, NULL); @@ -557,8 +557,8 @@ HRESULT WINAPI D3DXPreprocessShaderFromFileW(LPCWSTR filename, if (!include) { - includefromfile.lpVtbl = &D3DXInclude_Vtbl; - include = (LPD3DXINCLUDE)&includefromfile; + includefromfile.ID3DXInclude_iface.lpVtbl = &D3DXInclude_Vtbl; + include = &includefromfile.ID3DXInclude_iface; } hr = D3DPreprocess(buffer, len, NULL,

1 0

Michael Stefaniuc : d3dx9_36: COM cleanup for the ID3DXBuffer iface.
by Alexandre Julliard Jan. 27, 2011

Jan. 27, 2011

Module: wine Branch: master Commit: 766052633791c1196ddd64258f105754ae015305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=766052633791c1196ddd64258… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 27 00:27:21 2011 +0100 d3dx9_36: COM cleanup for the ID3DXBuffer iface. --- dlls/d3dx9_36/core.c | 40 ++++++++++++++++++++++++------------- dlls/d3dx9_36/d3dx9_36_private.h | 15 -------------- 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/dlls/d3dx9_36/core.c b/dlls/d3dx9_36/core.c index 3b63e9e..6990fbd 100644 --- a/dlls/d3dx9_36/core.c +++ b/dlls/d3dx9_36/core.c @@ -30,10 +30,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -/* ID3DXBuffer IUnknown parts follow: */ -static HRESULT WINAPI ID3DXBufferImpl_QueryInterface(LPD3DXBUFFER iface, REFIID riid, LPVOID* ppobj) +typedef struct ID3DXBufferImpl { - ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; + ID3DXBuffer ID3DXBuffer_iface; + LONG ref; + + DWORD *buffer; + DWORD bufferSize; +} ID3DXBufferImpl; + +static inline ID3DXBufferImpl *impl_from_ID3DXBuffer(ID3DXBuffer *iface) +{ + return CONTAINING_RECORD(iface, ID3DXBufferImpl, ID3DXBuffer_iface); +} + +static HRESULT WINAPI ID3DXBufferImpl_QueryInterface(ID3DXBuffer *iface, REFIID riid, void **ppobj) +{ + ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXBuffer)) @@ -47,9 +60,9 @@ static HRESULT WINAPI ID3DXBufferImpl_QueryInterface(LPD3DXBUFFER iface, REFIID return E_NOINTERFACE; } -static ULONG WINAPI ID3DXBufferImpl_AddRef(LPD3DXBUFFER iface) +static ULONG WINAPI ID3DXBufferImpl_AddRef(ID3DXBuffer *iface) { - ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; + ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) : AddRef from %d\n", This, ref - 1); @@ -57,9 +70,9 @@ static ULONG WINAPI ID3DXBufferImpl_AddRef(LPD3DXBUFFER iface) return ref; } -static ULONG WINAPI ID3DXBufferImpl_Release(LPD3DXBUFFER iface) +static ULONG WINAPI ID3DXBufferImpl_Release(ID3DXBuffer *iface) { - ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; + ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) : ReleaseRef to %d\n", This, ref); @@ -72,16 +85,15 @@ static ULONG WINAPI ID3DXBufferImpl_Release(LPD3DXBUFFER iface) return ref; } -/* ID3DXBuffer Interface follow: */ -static LPVOID WINAPI ID3DXBufferImpl_GetBufferPointer(LPD3DXBUFFER iface) +static LPVOID WINAPI ID3DXBufferImpl_GetBufferPointer(ID3DXBuffer *iface) { - ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; + ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); return This->buffer; } -static DWORD WINAPI ID3DXBufferImpl_GetBufferSize(LPD3DXBUFFER iface) +static DWORD WINAPI ID3DXBufferImpl_GetBufferSize(ID3DXBuffer *iface) { - ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; + ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); return This->bufferSize; } @@ -104,7 +116,7 @@ HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) *ppBuffer = NULL; return E_OUTOFMEMORY; } - object->lpVtbl = &D3DXBuffer_Vtbl; + object->ID3DXBuffer_iface.lpVtbl = &D3DXBuffer_Vtbl; object->ref = 1; object->bufferSize = NumBytes; object->buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, NumBytes); @@ -115,6 +127,6 @@ HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) return E_OUTOFMEMORY; } - *ppBuffer = (LPD3DXBUFFER)object; + *ppBuffer = &object->ID3DXBuffer_iface; return D3D_OK; } diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index b452a8f..4b2e78d 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -50,21 +50,6 @@ HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, LPVOID *buffer, const PixelFormatDesc *get_format_info(D3DFORMAT format); const PixelFormatDesc *get_format_info_idx(int idx); -extern const ID3DXBufferVtbl D3DXBuffer_Vtbl; - -/* ID3DXBUFFER */ -typedef struct ID3DXBufferImpl -{ - /* IUnknown fields */ - const ID3DXBufferVtbl *lpVtbl; - LONG ref; - - /* ID3DXBuffer fields */ - DWORD *buffer; - DWORD bufferSize; -} ID3DXBufferImpl; - - /* ID3DXFont */ typedef struct ID3DXFontImpl {

1 0

Michael Stefaniuc : d3dx9_36: COM cleanup for the ID3DXEffectPool iface.
by Alexandre Julliard Jan. 27, 2011

Jan. 27, 2011

Module: wine Branch: master Commit: b88e09e2215855af570a6ac47121777ae53c582a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b88e09e2215855af570a6ac47… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 27 00:20:28 2011 +0100 d3dx9_36: COM cleanup for the ID3DXEffectPool iface. --- dlls/d3dx9_36/effect.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d1c6094..8c3c756 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -926,21 +926,26 @@ HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata, static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl; typedef struct ID3DXEffectPoolImpl { - const ID3DXEffectPoolVtbl *lpVtbl; + ID3DXEffectPool ID3DXEffectPool_iface; LONG ref; } ID3DXEffectPoolImpl; +static inline ID3DXEffectPoolImpl *impl_from_ID3DXEffectPool(ID3DXEffectPool *iface) +{ + return CONTAINING_RECORD(iface, ID3DXEffectPoolImpl, ID3DXEffectPool_iface); +} + /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool* iface, REFIID riid, void** object) { - ID3DXEffectPoolImpl *This = (ID3DXEffectPoolImpl *)iface; + ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXEffectPool)) { - This->lpVtbl->AddRef(iface); + This->ID3DXEffectPool_iface.lpVtbl->AddRef(iface); *object = This; return S_OK; } @@ -952,7 +957,7 @@ static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool* iface, static ULONG WINAPI ID3DXEffectPoolImpl_AddRef(ID3DXEffectPool* iface) { - ID3DXEffectPoolImpl *This = (ID3DXEffectPoolImpl *)iface; + ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); TRACE("(%p)->(): AddRef from %u\n", This, This->ref); @@ -961,7 +966,7 @@ static ULONG WINAPI ID3DXEffectPoolImpl_AddRef(ID3DXEffectPool* iface) static ULONG WINAPI ID3DXEffectPoolImpl_Release(ID3DXEffectPool* iface) { - ID3DXEffectPoolImpl *This = (ID3DXEffectPoolImpl *)iface; + ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->(): Release from %u\n", This, ref + 1); @@ -996,10 +1001,10 @@ HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL* pool) return E_OUTOFMEMORY; } - object->lpVtbl = &ID3DXEffectPool_Vtbl; + object->ID3DXEffectPool_iface.lpVtbl = &ID3DXEffectPool_Vtbl; object->ref = 1; - *pool = (LPD3DXEFFECTPOOL)object; + *pool = &object->ID3DXEffectPool_iface; return S_OK; }

1 0

Henri Verbeet : wined3d: Add support for the NULL format.
by Alexandre Julliard Jan. 27, 2011

Jan. 27, 2011

Module: wine Branch: master Commit: c964134a59d50ce46d25cd98ca82e0b8c3522f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c964134a59d50ce46d25cd98c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 26 19:45:03 2011 +0100 wined3d: Add support for the NULL format. --- dlls/wined3d/context.c | 7 ++++--- dlls/wined3d/directx.c | 5 +++++ dlls/wined3d/utils.c | 7 +++++++ include/wine/wined3d.idl | 1 + 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d9bb5d8..b7abc0f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -271,7 +271,7 @@ static void context_attach_surface_fbo(const struct wined3d_context *context, TRACE("Attach surface %p to %u\n", surface, idx); - if (surface) + if (surface && surface->resource.format->id != WINED3DFMT_NULL) { switch (location) { @@ -1932,7 +1932,7 @@ static void context_apply_draw_buffers(struct wined3d_context *context, UINT rt_ for (i = 0; i < gl_info->limits.buffers; ++i) { - if (i < rt_count && rts[i]) + if (i < rt_count && rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) context->draw_buffers[i] = GL_COLOR_ATTACHMENT0 + i; else context->draw_buffers[i] = GL_NONE; @@ -2062,7 +2062,8 @@ static BOOL context_validate_rt_config(UINT rt_count, for (i = 0; i < rt_count; ++i) { - if (rts[i]) return TRUE; + if (rts[i] && rts[i]->resource.format->id != WINED3DFMT_NULL) + return TRUE; } WARN("Invalid render target config, need at least one attachment.\n"); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e39bd3a..85d50ec 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3470,6 +3470,11 @@ static BOOL CheckTextureCapability(struct wined3d_adapter *adapter, const struct TRACE_(d3d_caps)("[FAILED]\n"); return FALSE; + case WINED3DFMT_NULL: + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) + return TRUE; + return FALSE; + case WINED3DFMT_UNKNOWN: return FALSE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c114f10..6a529ea 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -133,6 +133,7 @@ static const struct StaticPixelFormatDesc formats[] = {WINED3DFMT_INTZ, 0x0, 0x0, 0x0, 0x0, 4, 24, 8}, {WINED3DFMT_NVHU, 0x0, 0x0, 0x0, 0x0, 2, 0, 0}, {WINED3DFMT_NVHS, 0x0, 0x0, 0x0, 0x0, 2, 0, 0}, + {WINED3DFMT_NULL, 0xff000000, 0x000000ff, 0x0000ff00, 0x00ff0000, 4, 0, 0}, }; struct wined3d_format_base_flags @@ -158,6 +159,7 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_G8R8_G8B8, WINED3DFMT_FLAG_FOURCC}, {WINED3DFMT_R8G8_B8G8, WINED3DFMT_FLAG_FOURCC}, {WINED3DFMT_INTZ, WINED3DFMT_FLAG_FOURCC}, + {WINED3DFMT_NULL, WINED3DFMT_FLAG_FOURCC}, {WINED3DFMT_P8_UINT, WINED3DFMT_FLAG_GETDC}, {WINED3DFMT_B8G8R8_UNORM, WINED3DFMT_FLAG_GETDC}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_FLAG_GETDC}, @@ -868,6 +870,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL, ARB_FRAMEBUFFER_OBJECT, NULL}, + {WINED3DFMT_NULL, GL_RGBA8, GL_RGBA8, 0, + GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, + WINED3DFMT_FLAG_RENDERTARGET, + ARB_FRAMEBUFFER_OBJECT, NULL}, }; static inline int getFmtIdx(enum wined3d_format_id format_id) @@ -1740,6 +1746,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_B8G8R8A8_UNORM); FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM); FMT_TO_STR(WINED3DFMT_INTZ); + FMT_TO_STR(WINED3DFMT_NULL); #undef FMT_TO_STR default: { diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 523d7fc..90d0a79 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -275,6 +275,7 @@ enum wined3d_format_id WINED3DFMT_NVHU = WINEMAKEFOURCC('N','V','H','U'), WINED3DFMT_NVHS = WINEMAKEFOURCC('N','V','H','S'), WINED3DFMT_INTZ = WINEMAKEFOURCC('I','N','T','Z'), + WINED3DFMT_NULL = WINEMAKEFOURCC('N','U','L','L'), WINED3DFMT_FORCE_DWORD = 0xffffffff };

1 0

Henri Verbeet : d3d9/tests: Add a test for the NULL format.
by Alexandre Julliard Jan. 27, 2011

Jan. 27, 2011

Module: wine Branch: master Commit: 34bd603b9e85d57527d24626c0fd6cb5bc7e1a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34bd603b9e85d57527d24626c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 26 19:45:05 2011 +0100 d3d9/tests: Add a test for the NULL format. --- dlls/d3d9/tests/surface.c | 86 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 86 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index 7fcf6e4..8353b81 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -53,6 +53,8 @@ static IDirect3DDevice9 *init_d3d9(HMODULE d3d9_handle) present_parameters.Windowed = TRUE; present_parameters.hDeviceWindow = create_window(); present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); @@ -505,6 +507,89 @@ static void test_surface_dimensions(IDirect3DDevice9 *device) if (SUCCEEDED(hr)) IDirect3DSurface9_Release(surface); } +static void test_surface_format_null(IDirect3DDevice9 *device) +{ + static const D3DFORMAT D3DFMT_NULL = MAKEFOURCC('N','U','L','L'); + IDirect3DTexture9 *texture; + IDirect3DSurface9 *surface; + IDirect3DSurface9 *rt, *ds; + D3DLOCKED_RECT locked_rect; + D3DSURFACE_DESC desc; + IDirect3D9 *d3d; + HRESULT hr; + + IDirect3DDevice9_GetDirect3D(device, &d3d); + + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, D3DFMT_NULL); + if (hr != D3D_OK) + { + skip("No D3DFMT_NULL support, skipping test.\n"); + IDirect3D9_Release(d3d); + return; + } + + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, D3DFMT_NULL); + ok(hr == D3D_OK, "D3DFMT_NULL should be supported for render target textures, hr %#x.\n", hr); + + hr = IDirect3D9_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DFMT_NULL, D3DFMT_D24S8); + ok(SUCCEEDED(hr), "Depth stencil match failed for D3DFMT_NULL, hr %#x.\n", hr); + + IDirect3D9_Release(d3d); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 128, 128, D3DFMT_NULL, 0, 0, TRUE, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt); + ok(SUCCEEDED(hr), "Failed to get original render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &ds); + ok(SUCCEEDED(hr), "Failed to get original depth/stencil, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, NULL); + ok(FAILED(hr), "Succeeded in setting render target 0 to NULL, should fail.\n"); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, surface); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, NULL); + ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00000000, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(SUCCEEDED(hr), "Failed to set depth/stencil, hr %#x.\n", hr); + + IDirect3DSurface9_Release(rt); + IDirect3DSurface9_Release(ds); + + hr = IDirect3DSurface9_GetDesc(surface, &desc); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(desc.Width == 128, "Expected width 128, got %u.\n", desc.Width); + ok(desc.Height == 128, "Expected height 128, got %u.\n", desc.Height); + + hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + ok(locked_rect.Pitch, "Expected non-zero pitch, got %u.\n", locked_rect.Pitch); + ok(!!locked_rect.pBits, "Expected non-NULL pBits, got %p.\n", locked_rect.pBits); + + hr = IDirect3DSurface9_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + IDirect3DSurface9_Release(surface); + + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 0, D3DUSAGE_RENDERTARGET, + D3DFMT_NULL, D3DPOOL_DEFAULT, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + IDirect3DTexture9_Release(texture); +} + START_TEST(surface) { HMODULE d3d9_handle; @@ -528,6 +613,7 @@ START_TEST(surface) test_private_data(device_ptr); test_getdc(device_ptr); test_surface_dimensions(device_ptr); + test_surface_format_null(device_ptr); refcount = IDirect3DDevice9_Release(device_ptr); ok(!refcount, "Device has %u references left\n", refcount);

1 0

Henri Verbeet : d3d8/tests: Add a test for the NULL format.
by Alexandre Julliard Jan. 27, 2011

Jan. 27, 2011

Module: wine Branch: master Commit: 71b46689bcb38de2cec952ebe0c45b868a714219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71b46689bcb38de2cec952ebe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 26 19:45:04 2011 +0100 d3d8/tests: Add a test for the NULL format. --- dlls/d3d8/tests/surface.c | 78 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 78 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/surface.c b/dlls/d3d8/tests/surface.c index f75c15b..c3890d6 100644 --- a/dlls/d3d8/tests/surface.c +++ b/dlls/d3d8/tests/surface.c @@ -56,6 +56,8 @@ static IDirect3DDevice8 *init_d3d8(HMODULE d3d8_handle) present_parameters.hDeviceWindow = create_window(); present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; present_parameters.BackBufferFormat = d3ddm.Format; + present_parameters.EnableAutoDepthStencil = TRUE; + present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; hr = IDirect3D8_CreateDevice(d3d8_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); @@ -334,6 +336,81 @@ static void test_surface_dimensions(IDirect3DDevice8 *device) if (SUCCEEDED(hr)) IDirect3DSurface8_Release(surface); } +static void test_surface_format_null(IDirect3DDevice8 *device) +{ + static const D3DFORMAT D3DFMT_NULL = MAKEFOURCC('N','U','L','L'); + IDirect3DTexture8 *texture; + IDirect3DSurface8 *surface; + IDirect3DSurface8 *rt, *ds; + D3DLOCKED_RECT locked_rect; + D3DSURFACE_DESC desc; + IDirect3D8 *d3d; + HRESULT hr; + + IDirect3DDevice8_GetDirect3D(device, &d3d); + + hr = IDirect3D8_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, D3DFMT_NULL); + if (hr != D3D_OK) + { + skip("No D3DFMT_NULL support, skipping test.\n"); + IDirect3D8_Release(d3d); + return; + } + + hr = IDirect3D8_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, D3DFMT_NULL); + ok(hr == D3D_OK, "D3DFMT_NULL should be supported for render target textures, hr %#x.\n", hr); + + hr = IDirect3D8_CheckDepthStencilMatch(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DFMT_NULL, D3DFMT_D24S8); + ok(SUCCEEDED(hr), "Depth stencil match failed for D3DFMT_NULL, hr %#x.\n", hr); + + IDirect3D8_Release(d3d); + + hr = IDirect3DDevice8_CreateRenderTarget(device, 128, 128, D3DFMT_NULL, + D3DMULTISAMPLE_NONE, TRUE, &surface); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get original render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &ds); + ok(SUCCEEDED(hr), "Failed to get original depth/stencil, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, surface, NULL); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00000000, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds); + ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); + + IDirect3DSurface8_Release(rt); + IDirect3DSurface8_Release(ds); + + hr = IDirect3DSurface8_GetDesc(surface, &desc); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + ok(desc.Width == 128, "Expected width 128, got %u.\n", desc.Width); + ok(desc.Height == 128, "Expected height 128, got %u.\n", desc.Height); + + hr = IDirect3DSurface8_LockRect(surface, &locked_rect, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + ok(locked_rect.Pitch, "Expected non-zero pitch, got %u.\n", locked_rect.Pitch); + ok(!!locked_rect.pBits, "Expected non-NULL pBits, got %p.\n", locked_rect.pBits); + + hr = IDirect3DSurface8_UnlockRect(surface); + ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + + IDirect3DSurface8_Release(surface); + + hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 0, D3DUSAGE_RENDERTARGET, + D3DFMT_NULL, D3DPOOL_DEFAULT, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + IDirect3DTexture8_Release(texture); +} + START_TEST(surface) { HMODULE d3d8_handle; @@ -355,6 +432,7 @@ START_TEST(surface) test_lockrect_invalid(device_ptr); test_private_data(device_ptr); test_surface_dimensions(device_ptr); + test_surface_format_null(device_ptr); refcount = IDirect3DDevice8_Release(device_ptr); ok(!refcount, "Device has %u references left\n", refcount);

1 0