November 2012 - Wine-Commits

Michael Stefaniuc : winex11.drv: The winediag debug channel is only used for HAVE_XRRGETSCREENRESOURCES.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: abf4250c726e3ec53fec79d0e4d6f695b456c798 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf4250c726e3ec53fec79d0e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 30 13:33:24 2012 +0100 winex11.drv: The winediag debug channel is only used for HAVE_XRRGETSCREENRESOURCES. --- dlls/winex11.drv/xrandr.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 5b2dede..5ec8842 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -24,7 +24,9 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xrandr); +#ifdef HAVE_XRRGETSCREENRESOURCES WINE_DECLARE_DEBUG_CHANNEL(winediag); +#endif #ifdef SONAME_LIBXRANDR

1 0

Piotr Caban : msvcrt: Added wcrtomb tests.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: d677bda97408d05a7b4781d782b6d1e5a8c2d640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d677bda97408d05a7b4781d78… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 21:49:58 2012 +0000 msvcrt: Added wcrtomb tests. --- dlls/msvcrt/tests/string.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 840c4de..d606ebb 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -85,6 +85,7 @@ static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); +static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); static size_t (__cdecl *p_mbrlen)(const char*, size_t, mbstate_t*); static size_t (__cdecl *p_mbrtowc)(wchar_t*, const char*, size_t, mbstate_t*); @@ -2301,6 +2302,44 @@ static void test_wctob(void) ret = p_wctob(0xe0); ok(ret == (int)(char)0xe0, "ret = %x\n", ret); } +static void test_wctomb(void) +{ + mbstate_t state; + unsigned char dst[10]; + size_t ret; + + if(!p_wcrtomb || !setlocale(LC_ALL, "Japanese_Japan.932")) { + win_skip("wcrtomb tests\n"); + return; + } + + ret = p_wcrtomb(NULL, 0x3042, NULL); + ok(ret == 2, "wcrtomb did not return 2\n"); + + state = 1; + dst[2] = 'a'; + ret = p_wcrtomb((char*)dst, 0x3042, &state); + ok(ret == 2, "wcrtomb did not return 2\n"); + ok(state == 0, "state != 0\n"); + ok(dst[0] == 0x82, "dst[0] = %x, expected 0x82\n", dst[0]); + ok(dst[1] == 0xa0, "dst[1] = %x, expected 0xa0\n", dst[1]); + ok(dst[2] == 'a', "dst[2] != 'a'\n"); + + ret = p_wcrtomb((char*)dst, 0x3043, NULL); + ok(ret == 2, "wcrtomb did not return 2\n"); + ok(dst[0] == 0x82, "dst[0] = %x, expected 0x82\n", dst[0]); + ok(dst[1] == 0xa1, "dst[1] = %x, expected 0xa1\n", dst[1]); + + ret = p_wcrtomb((char*)dst, 0x20, NULL); + ok(ret == 1, "wcrtomb did not return 1\n"); + ok(dst[0] == 0x20, "dst[0] = %x, expected 0x20\n", dst[0]); + + ret = p_wcrtomb((char*)dst, 0xffff, NULL); + ok(ret == -1, "wcrtomb did not return -1\n"); + ok(dst[0] == 0x3f, "dst[0] = %x, expected 0x20\n", dst[0]); + + setlocale(LC_ALL, "C"); +} static void test_tolower(void) { @@ -2376,6 +2415,7 @@ START_TEST(string) p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); + p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_tolower = (void*)GetProcAddress(hMsvcrt, "tolower"); p_mbrlen = (void*)GetProcAddress(hMsvcrt, "mbrlen"); p_mbrtowc = (void*)GetProcAddress(hMsvcrt, "mbrtowc"); @@ -2427,5 +2467,6 @@ START_TEST(string) test__mbsupr_s(); test__mbslwr_s(); test_wctob(); + test_wctomb(); test_tolower(); }

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: 1a97bba65f2a0c6316b215988ea0847acd681e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a97bba65f2a0c6316b215988… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 29 21:50:56 2012 +0000 msvcp: Sync spec files. --- dlls/msvcp60/msvcp60.spec | 8 ++++---- dlls/msvcp70/msvcp70.spec | 8 ++++---- dlls/msvcp71/msvcp71.spec | 8 ++++---- dlls/msvcr100/msvcr100.spec | 8 ++++---- dlls/msvcr80/msvcr80.spec | 8 ++++---- dlls/msvcr90/msvcr90.spec | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index 307af74..26dbbe7 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -4309,11 +4309,11 @@ # extern _Xbig @ stub __Wcrtomb_lk @ cdecl btowc(long) msvcrt.btowc -@ stub mbrlen # msvcrt.mbrlen -@ stub mbrtowc # msvcrt.mbrtowc -@ stub mbsrtowcs # msvcrt.mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen # msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc # msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs # msvcrt.mbsrtowcs @ cdecl towctrans(long long) -@ stub wcrtomb # msvcrt.wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb # msvcrt.wcrtomb @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob @ cdecl wctrans(str) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index ce079c2..c3856fb 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -5098,11 +5098,11 @@ # extern _Zero @ stub __Wcrtomb_lk @ cdecl btowc(long) msvcrt.btowc -@ stub mbrlen -@ stub mbrtowc -@ stub mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs @ cdecl towctrans(long long) msvcp90.towctrans -@ stub wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob @ cdecl wctrans(str) msvcp90.wctrans diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 58636c2..70e659f 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -5158,11 +5158,11 @@ # extern _Zero @ stub __Wcrtomb_lk @ cdecl btowc(long) msvcrt.btowc -@ stub mbrlen -@ stub mbrtowc -@ stub mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs @ cdecl towctrans(long long) -@ stub wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb @ cdecl wcsrtombs(ptr ptr long ptr) msvcrt.wcsrtombs @ cdecl wctob(long) msvcrt.wctob @ cdecl wctrans(str) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 8e2a9f4..b970fb9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1731,9 +1731,9 @@ @ cdecl -arch=i386,x86_64 longjmp(ptr long) msvcrt.longjmp @ cdecl malloc(long) msvcrt.malloc @ cdecl mblen(ptr long) msvcrt.mblen -@ stub mbrlen -@ stub mbrtowc -@ stub mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs @ stub mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) msvcrt.mbstowcs_s @@ -1841,7 +1841,7 @@ @ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s @ cdecl vwprintf(wstr ptr) msvcrt.vwprintf @ cdecl vwprintf_s(wstr ptr) msvcrt.vwprintf_s -@ stub wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb @ stub wcrtomb_s @ cdecl wcscat(wstr wstr) msvcrt.wcscat @ cdecl wcscat_s(wstr long wstr) msvcrt.wcscat_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3644345..c6341c4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1381,9 +1381,9 @@ @ cdecl -arch=i386,x86_64 longjmp(ptr long) msvcrt.longjmp @ cdecl malloc(long) msvcrt.malloc @ cdecl mblen(ptr long) msvcrt.mblen -@ stub mbrlen -@ stub mbrtowc -@ stub mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs @ stub mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) msvcrt.mbstowcs_s @@ -1483,7 +1483,7 @@ @ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s @ cdecl vwprintf(wstr ptr) msvcrt.vwprintf @ cdecl vwprintf_s(wstr ptr) msvcrt.vwprintf_s -@ stub wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb @ stub wcrtomb_s @ cdecl wcscat(wstr wstr) msvcrt.wcscat @ cdecl wcscat_s(wstr long wstr) msvcrt.wcscat_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e0cb400..3545dd1 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1384,9 +1384,9 @@ @ cdecl -arch=i386,x86_64 longjmp(ptr long) msvcrt.longjmp @ cdecl malloc(long) msvcrt.malloc @ cdecl mblen(ptr long) msvcrt.mblen -@ stub mbrlen -@ stub mbrtowc -@ stub mbsrtowcs +@ cdecl mbrlen(ptr long ptr) msvcrt.mbrlen +@ cdecl mbrtowc(ptr str long ptr) msvcrt.mbrtowc +@ cdecl mbsrtowcs(ptr ptr long ptr) msvcrt.mbsrtowcs @ stub mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcrt.mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) msvcrt.mbstowcs_s @@ -1494,7 +1494,7 @@ @ cdecl vswprintf_s(ptr long wstr ptr) msvcrt.vswprintf_s @ cdecl vwprintf(wstr ptr) msvcrt.vwprintf @ cdecl vwprintf_s(wstr ptr) msvcrt.vwprintf_s -@ stub wcrtomb +@ cdecl wcrtomb(ptr long ptr) msvcrt.wcrtomb @ stub wcrtomb_s @ cdecl wcscat(wstr wstr) msvcrt.wcscat @ cdecl wcscat_s(wstr long wstr) msvcrt.wcscat_s

1 0

Alistair Leslie-Hughes : oleaut32: Fail if we cannot find the TYPELIB resource.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: 04d3ba5b35c133852fb368caa3da998868a332e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04d3ba5b35c133852fb368caa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 30 21:11:07 2012 +1100 oleaut32: Fail if we cannot find the TYPELIB resource. --- dlls/oleaut32/typelib.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 83ea7e1..fa9b050 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2509,6 +2509,7 @@ static const IUnknownVtbl TLB_PEFile_Vtable = static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *pdwTLBLength, IUnknown **ppFile) { TLB_PEFile *This; + HRESULT hr = TYPE_E_CANTLOADLIBRARY; This = heap_alloc(sizeof(TLB_PEFile)); if (!This) @@ -2543,11 +2544,13 @@ static HRESULT TLB_PEFile_Open(LPCWSTR path, INT index, LPVOID *ppBase, DWORD *p return S_OK; } } + + hr = E_FAIL; } } TLB_PEFile_Release((IUnknown *)&This->lpvtbl); - return TYPE_E_CANTLOADLIBRARY; + return hr; } typedef struct TLB_NEFile @@ -2946,6 +2949,8 @@ static HRESULT TLB_ReadTypeLib(LPCWSTR pszFileName, LPWSTR pszPath, UINT cchPath ret = TYPE_E_CANTLOADLIBRARY; IUnknown_Release(pFile); } + else + ret = TYPE_E_CANTLOADLIBRARY; if(*ppTypeLib) { ITypeLibImpl *impl = (ITypeLibImpl*)*ppTypeLib;

1 0

Michael Stefaniuc : comctl32: Remove a superfluous function pointer cast.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: 5bade39f55487f1a53b9380006e05faac0394d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bade39f55487f1a53b938000… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Nov 30 13:48:00 2012 +0100 comctl32: Remove a superfluous function pointer cast. --- dlls/comctl32/progress.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index d331d19..aba5302 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -745,7 +745,7 @@ void PROGRESS_Register (void) ZeroMemory (&wndClass, sizeof(wndClass)); wndClass.style = CS_GLOBALCLASS | CS_VREDRAW | CS_HREDRAW; - wndClass.lpfnWndProc = (WNDPROC)ProgressWindowProc; + wndClass.lpfnWndProc = ProgressWindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof (PROGRESS_INFO *); wndClass.hCursor = LoadCursorW (0, (LPWSTR)IDC_ARROW);

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXEFFECTSTATEMANAGER.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: c109249445f2e45b918bf8c9fa565bf54cf8c023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c109249445f2e45b918bf8c9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 29 22:44:43 2012 +0100 d3dx9: Avoid LPD3DXEFFECTSTATEMANAGER. --- dlls/d3dx9_36/effect.c | 4 ++-- dlls/d3dx9_36/tests/effect.c | 4 ++-- include/d3dx9effect.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index bb1e594..ec14f98 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3609,7 +3609,7 @@ static HRESULT WINAPI ID3DXEffectImpl_OnResetDevice(ID3DXEffect* iface) return E_NOTIMPL; } -static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, LPD3DXEFFECTSTATEMANAGER manager) +static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager *manager) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); @@ -3623,7 +3623,7 @@ static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, LPD3DX return D3D_OK; } -static HRESULT WINAPI ID3DXEffectImpl_GetStateManager(ID3DXEffect *iface, LPD3DXEFFECTSTATEMANAGER *manager) +static HRESULT WINAPI ID3DXEffectImpl_GetStateManager(ID3DXEffect *iface, ID3DXEffectStateManager **manager) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 0f1cfea..8e12b74 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -140,7 +140,7 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) ID3DXBaseEffect *base; ULONG count; IDirect3DDevice9 *device2; - LPD3DXEFFECTSTATEMANAGER manager = (LPD3DXEFFECTSTATEMANAGER)0xdeadbeef; + ID3DXEffectStateManager *manager = (ID3DXEffectStateManager *)0xdeadbeef; ID3DXEffectPool *pool = (ID3DXEffectPool *)0xdeadbeef, *pool2; hr = D3DXCreateEffect(NULL, effect_desc, sizeof(effect_desc), NULL, NULL, 0, NULL, NULL, NULL); @@ -169,7 +169,7 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) ok(!manager, "GetStateManager failed, got %p\n", manager); /* this works, but it is not recommended! */ - hr = effect->lpVtbl->SetStateManager(effect, (LPD3DXEFFECTSTATEMANAGER) device); + hr = effect->lpVtbl->SetStateManager(effect, (ID3DXEffectStateManager *)device); ok(hr == D3D_OK, "SetStateManager failed, got %x, expected 0 (D3D_OK)\n", hr); hr = effect->lpVtbl->GetStateManager(effect, &manager); diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 7ff789d..5a04092 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -272,8 +272,8 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) STDMETHOD(GetDevice)(THIS_ struct IDirect3DDevice9 **device) PURE; STDMETHOD(OnLostDevice)(THIS) PURE; STDMETHOD(OnResetDevice)(THIS) PURE; - STDMETHOD(SetStateManager)(THIS_ LPD3DXEFFECTSTATEMANAGER manager) PURE; - STDMETHOD(GetStateManager)(THIS_ LPD3DXEFFECTSTATEMANAGER* manager) PURE; + STDMETHOD(SetStateManager)(THIS_ ID3DXEffectStateManager *manager) PURE; + STDMETHOD(GetStateManager)(THIS_ ID3DXEffectStateManager **manager) PURE; STDMETHOD(BeginParameterBlock)(THIS) PURE; STDMETHOD_(D3DXHANDLE, EndParameterBlock)(THIS) PURE; STDMETHOD(ApplyParameterBlock)(THIS_ D3DXHANDLE parameter_block) PURE;

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXEFFECTPOOL.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: 8678e890e69830e72c59cf2e879a4deab54c7f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8678e890e69830e72c59cf2e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 29 22:44:42 2012 +0100 d3dx9: Avoid LPD3DXEFFECTPOOL. --- dlls/d3dx9_36/effect.c | 4 ++-- include/d3dx9effect.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 48bd266..bb1e594 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3406,7 +3406,7 @@ static HRESULT WINAPI ID3DXEffectImpl_SetArrayRange(ID3DXEffect *iface, D3DXHAND } /*** ID3DXEffect methods ***/ -static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, LPD3DXEFFECTPOOL *pool) +static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, ID3DXEffectPool **pool) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); @@ -5969,7 +5969,7 @@ static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl = ID3DXEffectPoolImpl_Release }; -HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL *pool) +HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool) { struct ID3DXEffectPoolImpl *object; diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 74b80e1..7ff789d 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -258,7 +258,7 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) PURE; STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; /*** ID3DXEffect methods ***/ - STDMETHOD(GetPool)(THIS_ LPD3DXEFFECTPOOL* pool) PURE; + STDMETHOD(GetPool)(THIS_ ID3DXEffectPool **pool) PURE; STDMETHOD(SetTechnique)(THIS_ D3DXHANDLE technique) PURE; STDMETHOD_(D3DXHANDLE, GetCurrentTechnique)(THIS) PURE; STDMETHOD(ValidateTechnique)(THIS_ D3DXHANDLE technique) PURE; @@ -363,7 +363,7 @@ DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) extern "C" { #endif -HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL* pool); +HRESULT WINAPI D3DXCreateEffectPool(ID3DXEffectPool **pool); HRESULT WINAPI D3DXCreateEffect(struct IDirect3DDevice9 *device, const void *srcdata, UINT srcdatalen, const D3DXMACRO *defines, struct ID3DXInclude *include, DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors);

1 0

Frédéric Delanoy : wined3d: Add some ' fall through' comments (coverity).
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: a6db6688950deb5605d49b7e37d6ea56bec13da2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6db6688950deb5605d49b7e3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 29 17:04:32 2012 +0100 wined3d: Add some 'fall through' comments (coverity). --- dlls/wined3d/glsl_shader.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9490552..3cac7d8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5126,8 +5126,10 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct wined3d_shader_buf { case WINED3D_TOP_BUMPENVMAP_LUMINANCE: lum_map |= 1 << stage; + /* fall through */ case WINED3D_TOP_BUMPENVMAP: bump_map |= 1 << stage; + /* fall through */ case WINED3D_TOP_BLEND_TEXTURE_ALPHA: case WINED3D_TOP_BLEND_TEXTURE_ALPHA_PM: tex_map |= 1 << stage;

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXSPRITE.
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: 521c439d3011714a6a2a1e3c55a7e807e885982c URL: http://source.winehq.org/git/wine.git/?a=commit;h=521c439d3011714a6a2a1e3c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 29 22:44:44 2012 +0100 d3dx9: Avoid LPD3DXSPRITE. --- include/d3dx9core.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/d3dx9core.h b/include/d3dx9core.h index 2fb26da..252d5db 100644 --- a/include/d3dx9core.h +++ b/include/d3dx9core.h @@ -146,8 +146,10 @@ DECLARE_INTERFACE_(ID3DXFont, IUnknown) STDMETHOD(PreloadTextA)(THIS_ LPCSTR string, INT count) PURE; STDMETHOD(PreloadTextW)(THIS_ LPCWSTR string, INT count) PURE; - STDMETHOD_(INT, DrawTextA)(THIS_ LPD3DXSPRITE sprite, LPCSTR string, INT count, LPRECT rect, DWORD format, D3DCOLOR color) PURE; - STDMETHOD_(INT, DrawTextW)(THIS_ LPD3DXSPRITE sprite, LPCWSTR string, INT count, LPRECT rect, DWORD format, D3DCOLOR color) PURE; + STDMETHOD_(INT, DrawTextA)(THIS_ struct ID3DXSprite *sprite, const char *string, + INT count, RECT *rect, DWORD format, D3DCOLOR color) PURE; + STDMETHOD_(INT, DrawTextW)(THIS_ struct ID3DXSprite *sprite, const WCHAR *string, + INT count, RECT *rect, DWORD format, D3DCOLOR color) PURE; STDMETHOD(OnLostDevice)(THIS) PURE; STDMETHOD(OnResetDevice)(THIS) PURE;

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_VSSetConstantBuffers().
by Alexandre Julliard Nov. 30, 2012

Nov. 30, 2012

Module: wine Branch: master Commit: ae5e15319e10d04f8f5bb076bbfbb60cc070a27f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5e15319e10d04f8f5bb076b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 29 22:44:45 2012 +0100 d3d10core: Implement d3d10_device_VSSetConstantBuffers(). --- dlls/d3d10core/device.c | 13 ++++++++++++- dlls/wined3d/device.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/stateblock.c | 9 +++++++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d.h | 1 + 6 files changed, 64 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index dff8fd3..6c25e7b 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -117,8 +117,19 @@ static ULONG STDMETHODCALLTYPE d3d10_device_Release(ID3D10Device *iface) static void STDMETHODCALLTYPE d3d10_device_VSSetConstantBuffers(ID3D10Device *iface, UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p stub!\n", + struct d3d10_device *device = impl_from_ID3D10Device(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p.\n", iface, start_slot, buffer_count, buffers); + + for (i = 0; i < buffer_count; ++i) + { + struct d3d10_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]); + + wined3d_device_set_vs_cb(device->wined3d_device, start_slot + i, + buffer ? buffer->wined3d_buffer : NULL); + } } static void STDMETHODCALLTYPE d3d10_device_PSSetShaderResources(ID3D10Device *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c52882b..1aecff8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2532,6 +2532,45 @@ struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wine return device->stateBlock->state.vertex_shader; } +void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) +{ + struct wined3d_buffer *prev; + + TRACE("device %p, idx %u, buffer %p.\n", device, idx, buffer); + + if (idx >= MAX_CONSTANT_BUFFERS) + { + WARN("Invalid constant buffer index %u.\n", idx); + return; + } + + prev = device->updateStateBlock->state.vs_cb[idx]; + device->updateStateBlock->state.vs_cb[idx] = buffer; + + if (device->isRecordingState) + { + if (buffer) + wined3d_buffer_incref(buffer); + if (prev) + wined3d_buffer_decref(prev); + return; + } + + if (prev != buffer) + { + if (buffer) + { + InterlockedIncrement(&buffer->resource.bind_count); + wined3d_buffer_incref(buffer); + } + if (prev) + { + InterlockedDecrement(&prev->resource.bind_count); + wined3d_buffer_decref(prev); + } + } +} + HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, UINT start_register, const BOOL *constants, UINT bool_count) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 9b71486..11d8fa8 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -521,6 +521,15 @@ void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) wined3d_shader_decref(shader); } + for (i = 0; i < MAX_CONSTANT_BUFFERS; ++i) + { + if ((buffer = state->vs_cb[i])) + { + state->vs_cb[i] = NULL; + wined3d_buffer_decref(buffer); + } + } + if ((shader = state->geometry_shader)) { state->geometry_shader = NULL; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d664c76..66dc056 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -140,6 +140,7 @@ @ cdecl wined3d_device_set_vertex_declaration(ptr ptr) @ cdecl wined3d_device_set_vertex_shader(ptr ptr) @ cdecl wined3d_device_set_viewport(ptr ptr) +@ cdecl wined3d_device_set_vs_cb(ptr long ptr) @ cdecl wined3d_device_set_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_set_vs_consts_f(ptr long ptr long) @ cdecl wined3d_device_set_vs_consts_i(ptr long ptr long) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fb1a6be..3610fc3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -162,6 +162,7 @@ void wined3d_rb_free(void *ptr) DECLSPEC_HIDDEN; #define MAX_COMBINED_SAMPLERS (MAX_FRAGMENT_SAMPLERS + MAX_VERTEX_SAMPLERS) #define MAX_ACTIVE_LIGHTS 8 #define MAX_CLIPPLANES WINED3DMAXUSERCLIPPLANES +#define MAX_CONSTANT_BUFFERS 15 struct min_lookup { @@ -2299,6 +2300,7 @@ struct wined3d_state GLenum gl_primitive_type; struct wined3d_shader *vertex_shader; + struct wined3d_buffer *vs_cb[MAX_CONSTANT_BUFFERS]; BOOL vs_consts_b[MAX_CONST_B]; INT vs_consts_i[MAX_CONST_I * 4]; float *vs_consts_f; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b540991..9506f81 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2244,6 +2244,7 @@ void __cdecl wined3d_device_set_vertex_declaration(struct wined3d_device *device struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_viewport(struct wined3d_device *device, const struct wined3d_viewport *viewport); +void __cdecl wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_set_vs_consts_b(struct wined3d_device *device, UINT start_register, const BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_set_vs_consts_f(struct wined3d_device *device,

1 0