March 2010 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Use the same order of operations for depth clears as for stencil clears.
by Alexandre Julliard March 25, 2010

March 25, 2010

Module: wine Branch: master Commit: 9eb5ba435ed9f57cfe5cecda2d94ea5701134acd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb5ba435ed9f57cfe5cecda2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 09:32:37 2010 +0100 wined3d: Use the same order of operations for depth clears as for stencil clears. --- dlls/wined3d/device.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fab9e65..3acbc30 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4404,16 +4404,17 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac glMask = glMask | GL_STENCIL_BUFFER_BIT; } - if (Flags & WINED3DCLEAR_ZBUFFER) { + if (Flags & WINED3DCLEAR_ZBUFFER) + { DWORD location = context->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; + if (!(depth_stencil->Flags & location) && !is_full_clear(depth_stencil, vp, scissor_rect, clear_rect)) + surface_load_ds_location(This->stencilBufferTarget, context, location); + glDepthMask(GL_TRUE); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); glClearDepth(Z); checkGLcall("glClearDepth"); glMask = glMask | GL_DEPTH_BUFFER_BIT; - IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); - - if (!(depth_stencil->Flags & location) && !is_full_clear(depth_stencil, vp, scissor_rect, clear_rect)) - surface_load_ds_location(This->stencilBufferTarget, context, location); } if (Flags & WINED3DCLEAR_TARGET) {

1 0

Henri Verbeet : d3d8/tests: Add some message processing to test_wndproc().
by Alexandre Julliard March 25, 2010

March 25, 2010

Module: wine Branch: master Commit: d11185a8906ac4bf0dc581e54b0f827abe5618f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11185a8906ac4bf0dc581e54… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 09:32:40 2010 +0100 d3d8/tests: Add some message processing to test_wndproc(). Disabled testing the focus and foreground windows after creating the device for the moment. --- dlls/d3d8/tests/device.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c0e1985..cd2df9a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1525,8 +1525,19 @@ static DWORD WINAPI wndproc_thread(void *param) ret = SetEvent(p->window_created); ok(ret, "SetEvent failed, last error %#x.\n", GetLastError()); - res = WaitForSingleObject(p->test_finished, INFINITE); - ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); + for (;;) + { + MSG msg; + + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + res = WaitForSingleObject(p->test_finished, 100); + if (res == WAIT_OBJECT_0) break; + if (res != WAIT_TIMEOUT) + { + ok(0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); + break; + } + } DestroyWindow(p->dummy_window); @@ -1544,6 +1555,7 @@ static void test_wndproc(void) LONG_PTR proc; ULONG ref; DWORD res, tid; + MSG msg; if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) { @@ -1589,6 +1601,8 @@ static void test_wndproc(void) expect_message.window = focus_window; expect_message.message = WM_SETFOCUS; + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + device = create_device(d3d8, device_window, focus_window, FALSE); if (!device) { @@ -1598,10 +1612,13 @@ static void test_wndproc(void) ok(!expect_message.message, "Expected message %#x for window %p, but didn't receive it.\n", expect_message.message, expect_message.window); - tmp = GetFocus(); - todo_wine ok(tmp == focus_window, "Expected focus %p, got %p.\n", focus_window, tmp); - tmp = GetForegroundWindow(); - todo_wine ok(tmp == focus_window, "Expected foreground window %p, got %p.\n", focus_window, tmp); + if (0) /* Disabled until we can make this work in a reliable way on Wine. */ + { + tmp = GetFocus(); + ok(tmp == focus_window, "Expected focus %p, got %p.\n", focus_window, tmp); + tmp = GetForegroundWindow(); + ok(tmp == focus_window, "Expected foreground window %p, got %p.\n", focus_window, tmp); + } SetForegroundWindow(focus_window); filter_messages = focus_window;

1 0

Henri Verbeet : wined3d: Just mark the stencil write mask dirty in IWineD3DDeviceImpl_ClearSurface( ).
by Alexandre Julliard March 25, 2010

March 25, 2010

Module: wine Branch: master Commit: 2e7e118899fc097a40227fd3f50d5269cfc4a08d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e7e118899fc097a40227fd3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 09:32:36 2010 +0100 wined3d: Just mark the stencil write mask dirty in IWineD3DDeviceImpl_ClearSurface(). --- dlls/wined3d/device.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b25c4ec..fab9e65 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4397,10 +4397,11 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac glDisable(GL_STENCIL_TEST_TWO_SIDE_EXT); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_TWOSIDEDSTENCILMODE)); } + glStencilMask(~0U); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_STENCILWRITEMASK)); glClearStencil(Stencil); checkGLcall("glClearStencil"); glMask = glMask | GL_STENCIL_BUFFER_BIT; - glStencilMask(0xFFFFFFFF); } if (Flags & WINED3DCLEAR_ZBUFFER) { @@ -4484,10 +4485,6 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac } } - /* Restore the old values (why..?) */ - if (Flags & WINED3DCLEAR_STENCIL) { - glStencilMask(This->stateBlock->renderState[WINED3DRS_STENCILWRITEMASK]); - } if (Flags & WINED3DCLEAR_TARGET) { DWORD mask = This->stateBlock->renderState[WINED3DRS_COLORWRITEENABLE]; glColorMask(mask & WINED3DCOLORWRITEENABLE_RED ? GL_TRUE : GL_FALSE,

1 0

Henri Verbeet : d3d9/tests: Add some message processing to test_wndproc().
by Alexandre Julliard March 25, 2010

March 25, 2010

Module: wine Branch: master Commit: ab4bf7600ae15186d9f614f71a64456390f6b226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4bf7600ae15186d9f614f71… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 09:32:39 2010 +0100 d3d9/tests: Add some message processing to test_wndproc(). For some reason Windows XP allows device creation to be blocked by the lack of message processing in wndproc_thread(). Thanks to Wylda for helping debug this. Disabled testing the focus and foreground windows after creating the device for the moment. --- dlls/d3d9/tests/device.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index eb424e2..0004715 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2370,8 +2370,19 @@ static DWORD WINAPI wndproc_thread(void *param) ret = SetEvent(p->window_created); ok(ret, "SetEvent failed, last error %#x.\n", GetLastError()); - res = WaitForSingleObject(p->test_finished, INFINITE); - ok(res == WAIT_OBJECT_0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); + for (;;) + { + MSG msg; + + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + res = WaitForSingleObject(p->test_finished, 100); + if (res == WAIT_OBJECT_0) break; + if (res != WAIT_TIMEOUT) + { + ok(0, "Wait failed (%#x), last error %#x.\n", res, GetLastError()); + break; + } + } DestroyWindow(p->dummy_window); @@ -2389,6 +2400,7 @@ static void test_wndproc(void) LONG_PTR proc; ULONG ref; DWORD res, tid; + MSG msg; if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) { @@ -2434,6 +2446,8 @@ static void test_wndproc(void) expect_message.window = focus_window; expect_message.message = WM_SETFOCUS; + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + device = create_device(d3d9, device_window, focus_window, FALSE); if (!device) { @@ -2443,10 +2457,13 @@ static void test_wndproc(void) ok(!expect_message.message, "Expected message %#x for window %p, but didn't receive it.\n", expect_message.message, expect_message.window); - tmp = GetFocus(); - todo_wine ok(tmp == focus_window, "Expected focus %p, got %p.\n", focus_window, tmp); - tmp = GetForegroundWindow(); - todo_wine ok(tmp == focus_window, "Expected foreground window %p, got %p.\n", focus_window, tmp); + if (0) /* Disabled until we can make this work in a reliable way on Wine. */ + { + tmp = GetFocus(); + ok(tmp == focus_window, "Expected focus %p, got %p.\n", focus_window, tmp); + tmp = GetForegroundWindow(); + ok(tmp == focus_window, "Expected foreground window %p, got %p.\n", focus_window, tmp); + } SetForegroundWindow(focus_window); filter_messages = focus_window;

1 0

Henri Verbeet : wined3d: Just mark the color write mask dirty in IWineD3DDeviceImpl_ClearSurface().
by Alexandre Julliard March 25, 2010

March 25, 2010

Module: wine Branch: master Commit: 9866125e23e76048a2b613dca2002195587b204e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9866125e23e76048a2b613dca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 25 09:32:38 2010 +0100 wined3d: Just mark the color write mask dirty in IWineD3DDeviceImpl_ClearSurface(). --- dlls/wined3d/device.c | 26 +++++++------------------- 1 files changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3acbc30..a6ba6a3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4417,16 +4417,12 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac glMask = glMask | GL_DEPTH_BUFFER_BIT; } - if (Flags & WINED3DCLEAR_TARGET) { - TRACE("Clearing screen with glClear to color %x\n", Color); - glClearColor(D3DCOLOR_R(Color), - D3DCOLOR_G(Color), - D3DCOLOR_B(Color), - D3DCOLOR_A(Color)); - checkGLcall("glClearColor"); - - /* Clear ALL colors! */ + if (Flags & WINED3DCLEAR_TARGET) + { glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_COLORWRITEENABLE)); + glClearColor(D3DCOLOR_R(Color), D3DCOLOR_G(Color), D3DCOLOR_B(Color), D3DCOLOR_A(Color)); + checkGLcall("glClearColor"); glMask = glMask | GL_COLOR_BUFFER_BIT; } @@ -4486,16 +4482,8 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac } } - if (Flags & WINED3DCLEAR_TARGET) { - DWORD mask = This->stateBlock->renderState[WINED3DRS_COLORWRITEENABLE]; - glColorMask(mask & WINED3DCOLORWRITEENABLE_RED ? GL_TRUE : GL_FALSE, - mask & WINED3DCOLORWRITEENABLE_GREEN ? GL_TRUE : GL_FALSE, - mask & WINED3DCOLORWRITEENABLE_BLUE ? GL_TRUE : GL_FALSE, - mask & WINED3DCOLORWRITEENABLE_ALPHA ? GL_TRUE : GL_FALSE); - - /* Dirtify the target surface for now. If the surface is locked regularly, and an up to date sysmem copy exists, - * it is most likely more efficient to perform a clear on the sysmem copy too instead of downloading it - */ + if (Flags & WINED3DCLEAR_TARGET) + { IWineD3DSurface_ModifyLocation((IWineD3DSurface *)target, SFLAG_INDRAWABLE, TRUE); } if (Flags & WINED3DCLEAR_ZBUFFER) {

1 0

Christian Costa : d3dx9_36: Implement D3DXCreateEffectEx and make D3DXCreateEffect use it.
by Alexandre Julliard March 25, 2010

March 25, 2010

Module: wine Branch: master Commit: 39b60870ffc4f35fbbac08a7dd32f208b5b6cd40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b60870ffc4f35fbbac08a7d… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Mar 25 08:41:18 2010 +0100 d3dx9_36: Implement D3DXCreateEffectEx and make D3DXCreateEffect use it. --- dlls/d3dx9_36/effect.c | 39 ++++++++++++++++++++++++++++----------- include/d3dx9effect.h | 11 +++++++++++ 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ec775e4..4633d88 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -848,20 +848,21 @@ static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl = ID3DXEffectImpl_SetRawValue }; -HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, - LPCVOID srcdata, - UINT srcdatalen, - CONST D3DXMACRO* defines, - LPD3DXINCLUDE include, - DWORD flags, - LPD3DXEFFECTPOOL pool, - LPD3DXEFFECT* effect, - LPD3DXBUFFER* compilation_errors) +HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device, + LPCVOID srcdata, + UINT srcdatalen, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + LPCSTR skip_constants, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT* effect, + LPD3DXBUFFER* compilation_errors) { ID3DXEffectImpl* object; - FIXME("(%p, %p, %u, %p, %p, %#x, %p, %p, %p): semi-stub\n", device, srcdata, srcdatalen, defines, include, flags, - pool, effect, compilation_errors); + FIXME("(%p, %p, %u, %p, %p, %p, %#x, %p, %p, %p): semi-stub\n", device, srcdata, srcdatalen, defines, include, + skip_constants, flags, pool, effect, compilation_errors); if (!device || !srcdata) return D3DERR_INVALIDCALL; @@ -888,6 +889,22 @@ HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, return D3D_OK; } +HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, + LPCVOID srcdata, + UINT srcdatalen, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT* effect, + LPD3DXBUFFER* compilation_errors) +{ + TRACE("(%p, %p, %u, %p, %p, %#x, %p, %p, %p): Forwarded to D3DXCreateEffectEx\n", device, srcdata, srcdatalen, defines, + include, flags, pool, effect, compilation_errors); + + return D3DXCreateEffectEx(device, srcdata, srcdatalen, defines, include, NULL, flags, pool, effect, compilation_errors); +} + HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata, UINT srcdatalen, CONST D3DXMACRO* defines, diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 9f06c2a..3bb2878 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -368,6 +368,17 @@ HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, LPD3DXEFFECT* effect, LPD3DXBUFFER* compilation_errors); +HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device, + LPCVOID srcdata, + UINT srcdatalen, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + LPCSTR skip_constants, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT* effect, + LPD3DXBUFFER* compilation_errors); + HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata, UINT srcdatalen, CONST D3DXMACRO* defines,

1 0

Christian Costa : d3dx9_36: Add stub for D3DXCreateEffectCompiler.
by Alexandre Julliard March 25, 2010

March 25, 2010

Module: wine Branch: master Commit: 947fe3a56471ca22969c038a8a3dcc1718145f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=947fe3a56471ca22969c038a8… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Mar 25 08:41:12 2010 +0100 d3dx9_36: Add stub for D3DXCreateEffectCompiler. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/effect.c | 13 ++++++ include/d3dx9effect.h | 86 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index e4d49e8..3e64218 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -47,7 +47,7 @@ @ stub D3DXCreateCubeTextureFromResourceW @ stub D3DXCreateCylinder @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) -@ stub D3DXCreateEffectCompiler +@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @ stub D3DXCreateEffectCompilerFromFileA @ stub D3DXCreateEffectCompilerFromFileW @ stub D3DXCreateEffectCompilerFromResourceA diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7a26f64..ec775e4 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -888,6 +888,19 @@ HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, return D3D_OK; } +HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata, + UINT srcdatalen, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTCOMPILER* compiler, + LPD3DXBUFFER* parse_errors) +{ + FIXME("(%p, %u, %p, %p, %#x, %p, %p): stub\n", srcdata, srcdatalen, defines, include, flags, compiler, parse_errors); + + return E_NOTIMPL; +} + static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl; typedef struct ID3DXEffectPoolImpl { diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index eb8a9a8..9f06c2a 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -274,6 +274,84 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) STDMETHOD(SetRawValue)(THIS_ D3DXHANDLE parameter, LPCVOID data, UINT byte_offset, UINT bytes) PURE; }; +typedef struct ID3DXEffectCompiler *LPD3DXEFFECTCOMPILER; + +DEFINE_GUID(IID_ID3DXEffectCompiler, 0x51b8a949, 0x1a31, 0x47e6, 0xbe, 0xa0, 0x4b, 0x30, 0xdb, 0x53, 0xf1, 0xe0); + +#undef INTERFACE +#define INTERFACE ID3DXEffectCompiler + +DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** ID3DXBaseEffect methods ***/ + STDMETHOD(GetDesc)(THIS_ D3DXEFFECT_DESC* desc) PURE; + STDMETHOD(GetParameterDesc)(THIS_ D3DXHANDLE parameter, D3DXPARAMETER_DESC* desc) PURE; + STDMETHOD(GetTechniqueDesc)(THIS_ D3DXHANDLE technique, D3DXTECHNIQUE_DESC* desc) PURE; + STDMETHOD(GetPassDesc)(THIS_ D3DXHANDLE pass, D3DXPASS_DESC* desc) PURE; + STDMETHOD(GetFunctionDesc)(THIS_ D3DXHANDLE shader, D3DXFUNCTION_DESC* desc) PURE; + STDMETHOD_(D3DXHANDLE, GetParameter)(THIS_ D3DXHANDLE parameter, UINT index) PURE; + STDMETHOD_(D3DXHANDLE, GetParameterByName)(THIS_ D3DXHANDLE parameter, LPCSTR name) PURE; + STDMETHOD_(D3DXHANDLE, GetParameterBySemantic)(THIS_ D3DXHANDLE parameter, LPCSTR semantic) PURE; + STDMETHOD_(D3DXHANDLE, GetParameterElement)(THIS_ D3DXHANDLE parameter, UINT index) PURE; + STDMETHOD_(D3DXHANDLE, GetTechnique)(THIS_ UINT index) PURE; + STDMETHOD_(D3DXHANDLE, GetTechniqueByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(D3DXHANDLE, GetPass)(THIS_ D3DXHANDLE technique, UINT index) PURE; + STDMETHOD_(D3DXHANDLE, GetPassByName)(THIS_ D3DXHANDLE technique, LPCSTR name) PURE; + STDMETHOD_(D3DXHANDLE, GetFunction)(THIS_ UINT index); + STDMETHOD_(D3DXHANDLE, GetFunctionByName)(THIS_ LPCSTR name); + STDMETHOD_(D3DXHANDLE, GetAnnotation)(THIS_ D3DXHANDLE object, UINT index) PURE; + STDMETHOD_(D3DXHANDLE, GetAnnotationByName)(THIS_ D3DXHANDLE object, LPCSTR name) PURE; + STDMETHOD(SetValue)(THIS_ D3DXHANDLE parameter, LPCVOID data, UINT bytes) PURE; + STDMETHOD(GetValue)(THIS_ D3DXHANDLE parameter, LPVOID data, UINT bytes) PURE; + STDMETHOD(SetBool)(THIS_ D3DXHANDLE parameter, BOOL b) PURE; + STDMETHOD(GetBool)(THIS_ D3DXHANDLE parameter, BOOL* b) PURE; + STDMETHOD(SetBoolArray)(THIS_ D3DXHANDLE parameter, CONST BOOL* b, UINT count) PURE; + STDMETHOD(GetBoolArray)(THIS_ D3DXHANDLE parameter, BOOL* b, UINT count) PURE; + STDMETHOD(SetInt)(THIS_ D3DXHANDLE parameter, INT n) PURE; + STDMETHOD(GetInt)(THIS_ D3DXHANDLE parameter, INT* n) PURE; + STDMETHOD(SetIntArray)(THIS_ D3DXHANDLE parameter, CONST INT* n, UINT count) PURE; + STDMETHOD(GetIntArray)(THIS_ D3DXHANDLE parameter, INT* n, UINT count) PURE; + STDMETHOD(SetFloat)(THIS_ D3DXHANDLE parameter, FLOAT f) PURE; + STDMETHOD(GetFloat)(THIS_ D3DXHANDLE parameter, FLOAT* f) PURE; + STDMETHOD(SetFloatArray)(THIS_ D3DXHANDLE parameter, CONST FLOAT* f, UINT count) PURE; + STDMETHOD(GetFloatArray)(THIS_ D3DXHANDLE parameter, FLOAT* f, UINT count) PURE; + STDMETHOD(SetVector)(THIS_ D3DXHANDLE parameter, CONST D3DXVECTOR4* vector) PURE; + STDMETHOD(GetVector)(THIS_ D3DXHANDLE parameter, D3DXVECTOR4* vector) PURE; + STDMETHOD(SetVectorArray)(THIS_ D3DXHANDLE parameter, CONST D3DXVECTOR4* vector, UINT count) PURE; + STDMETHOD(GetVectorArray)(THIS_ D3DXHANDLE parameter, D3DXVECTOR4* vector, UINT count) PURE; + STDMETHOD(SetMatrix)(THIS_ D3DXHANDLE parameter, CONST D3DXMATRIX* matrix) PURE; + STDMETHOD(GetMatrix)(THIS_ D3DXHANDLE parameter, D3DXMATRIX* matrix) PURE; + STDMETHOD(SetMatrixArray)(THIS_ D3DXHANDLE parameter, CONST D3DXMATRIX* matrix, UINT count) PURE; + STDMETHOD(GetMatrixArray)(THIS_ D3DXHANDLE parameter, D3DXMATRIX* matrix, UINT count) PURE; + STDMETHOD(SetMatrixPointerArray)(THIS_ D3DXHANDLE parameter, CONST D3DXMATRIX** matrix, UINT count) PURE; + STDMETHOD(GetMatrixPointerArray)(THIS_ D3DXHANDLE parameter, D3DXMATRIX** matrix, UINT count) PURE; + STDMETHOD(SetMatrixTranspose)(THIS_ D3DXHANDLE parameter, CONST D3DXMATRIX* matrix) PURE; + STDMETHOD(GetMatrixTranspose)(THIS_ D3DXHANDLE parameter, D3DXMATRIX* matrix) PURE; + STDMETHOD(SetMatrixTransposeArray)(THIS_ D3DXHANDLE parameter, CONST D3DXMATRIX* matrix, UINT count) PURE; + STDMETHOD(GetMatrixTransposeArray)(THIS_ D3DXHANDLE parameter, D3DXMATRIX* matrix, UINT count) PURE; + STDMETHOD(SetMatrixTransposePointerArray)(THIS_ D3DXHANDLE parameter, CONST D3DXMATRIX** matrix, UINT count) PURE; + STDMETHOD(GetMatrixTransposePointerArray)(THIS_ D3DXHANDLE parameter, D3DXMATRIX** matrix, UINT count) PURE; + STDMETHOD(SetString)(THIS_ D3DXHANDLE parameter, LPCSTR string) PURE; + STDMETHOD(GetString)(THIS_ D3DXHANDLE parameter, LPCSTR* string) PURE; + STDMETHOD(SetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) PURE; + STDMETHOD(GetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9* texture) PURE; + STDMETHOD(SetPixelShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9 pshader) PURE; + STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9* pshader) PURE; + STDMETHOD(SetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 vshader) PURE; + STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; + STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; + /*** ID3DXEffectCompiler methods ***/ + STDMETHOD(SetLiteral)(THIS_ D3DXHANDLE parameter, BOOL literal) PURE; + STDMETHOD(GetLiteral)(THIS_ D3DXHANDLE parameter, BOOL* literal) PURE; + STDMETHOD(CompileEffect)(THIS_ DWORD flags, LPD3DXBUFFER* effect, LPD3DXBUFFER* error_msgs) PURE; + STDMETHOD(CompileShader)(THIS_ D3DXHANDLE function, LPCSTR target, DWORD flags, LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_msgs, LPD3DXCONSTANTTABLE* constant_table) PURE; +}; + #ifdef __cplusplus extern "C" { #endif @@ -290,6 +368,14 @@ HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, LPD3DXEFFECT* effect, LPD3DXBUFFER* compilation_errors); +HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata, + UINT srcdatalen, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTCOMPILER* compiler, + LPD3DXBUFFER* parse_errors); + #ifdef __cplusplus } #endif

1 0

Piotr Caban : msvcrt: Added strnlen implementation.
by Alexandre Julliard March 25, 2010

March 25, 2010

Module: wine Branch: master Commit: c7aba97338445a230a8c3ef5878c132a78490264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7aba97338445a230a8c3ef58… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 24 22:39:28 2010 +0100 msvcrt: Added strnlen implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 13 +++++++++++++ dlls/msvcrt/tests/string.c | 23 +++++++++++++++++++++++ 5 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ed283d9..7c1e100 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1389,7 +1389,7 @@ @ cdecl strncmp(str str long) msvcrt.strncmp @ cdecl strncpy(ptr str long) msvcrt.strncpy @ stub strncpy_s -@ stub strnlen +@ cdecl strnlen(str long) msvcrt.strnlen @ cdecl strpbrk(str str) msvcrt.strpbrk @ cdecl strrchr(str long) msvcrt.strrchr @ cdecl strspn(str str) msvcrt.strspn diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index cbfc6e2..f95f92b 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1373,7 +1373,7 @@ @ cdecl strncmp(str str long) msvcrt.strncmp @ cdecl strncpy(ptr str long) msvcrt.strncpy @ stub strncpy_s -@ stub strnlen +@ cdecl strnlen(str long) msvcrt.strnlen @ cdecl strpbrk(str str) msvcrt.strpbrk @ cdecl strrchr(str long) msvcrt.strrchr @ cdecl strspn(str str) msvcrt.strspn diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 058b9ae..988d48e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1327,7 +1327,7 @@ @ cdecl strncmp(str str long) ntdll.strncmp @ cdecl strncpy(ptr str long) ntdll.strncpy # stub strncpy_s -# stub strnlen +@ cdecl strnlen(str long) MSVCRT_strnlen @ cdecl strpbrk(str str) ntdll.strpbrk @ cdecl strrchr(str long) ntdll.strrchr @ cdecl strspn(str str) ntdll.strspn diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index a5f9a19..2a7c9af 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -314,3 +314,16 @@ MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) return ret; } + +/****************************************************************** + * strnlen (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_strnlen(const char *s, MSVCRT_size_t maxlen) +{ + MSVCRT_size_t i; + + for(i=0; i<maxlen; i++) + if(!s[i]) break; + + return i; +} diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index a7b3404..6fd64d9 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -52,6 +52,7 @@ static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); static int (__cdecl *p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); static int (__cdecl *p_wcscpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc); static int (__cdecl *p_wcsupr_s)(wchar_t *str, size_t size); +static size_t (__cdecl *p_strnlen)(const char *, size_t); static int *p__mb_cur_max; static unsigned char *p_mbctype; @@ -911,6 +912,26 @@ static void test_strtol(void) ok(errno == ERANGE, "wrong errno %d\n", errno); } +static void test_strnlen(void) +{ + static const char str[] = "string"; + size_t res; + + if(!p_strnlen) { + win_skip("strnlen not found\n"); + return; + } + + res = p_strnlen(str, 20); + ok(res == 6, "Returned length = %d\n", (int)res); + + res = p_strnlen(str, 3); + ok(res == 3, "Returned length = %d\n", (int)res); + + res = p_strnlen(NULL, 0); + ok(res == 0, "Returned length = %d\n", (int)res); +} + START_TEST(string) { char mem[100]; @@ -930,6 +951,7 @@ START_TEST(string) p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" ); p_wcscpy_s = (void *)GetProcAddress( hMsvcrt,"wcscpy_s" ); p_wcsupr_s = (void *)GetProcAddress( hMsvcrt,"_wcsupr_s" ); + p_strnlen = (void *)GetProcAddress( hMsvcrt,"strnlen" ); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -959,4 +981,5 @@ START_TEST(string) test_wcscpy_s(); test__wcsupr_s(); test_strtol(); + test_strnlen(); }

1 0

Eric Pouech : dbghelp: Enhanced x86_64 stack unwinding with PE' s function table data.
by Alexandre Julliard March 25, 2010

March 25, 2010

Module: wine Branch: master Commit: 51e9951a5f32ba581d15b9b3c11d1d3d09fee931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e9951a5f32ba581d15b9b3c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Mar 24 22:03:53 2010 +0100 dbghelp: Enhanced x86_64 stack unwinding with PE's function table data. --- dlls/dbghelp/cpu_i386.c | 2 +- dlls/dbghelp/cpu_ppc.c | 2 +- dlls/dbghelp/cpu_x86_64.c | 452 ++++++++++++++++++++++++++++++++++++++-- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/stack.c | 4 +- 5 files changed, 444 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51e9951a5f32ba581d15b…

1 0

Mikhail Maroukhine : comctl32/tests: Remove superfluous casts.
by Alexandre Julliard March 25, 2010

March 25, 2010

Module: wine Branch: master Commit: ad68792a14f1226cade9d01019ad872512e5a800 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad68792a14f1226cade9d0101… Author: Mikhail Maroukhine <mikolg(a)yandex.ru> Date: Thu Mar 25 01:46:25 2010 +0600 comctl32/tests: Remove superfluous casts. --- dlls/comctl32/tests/listview.c | 2 +- dlls/comctl32/tests/monthcal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5441cfc..aa3db80 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3293,7 +3293,7 @@ static void test_getitemrect(void) expect(18, rect.left); expect(50, rect.right); - r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)NULL); + r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, 0); ok(r != 0, "should return current list handle\n"); r = SendMessage(hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)himl); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index ea10b9f..d1fa8de 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -968,7 +968,7 @@ static void test_monthcal_hittest(void) expect(-1, res); expect(0, mchit.uHit); /* test with invalid pointer */ - res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM)NULL); + res = SendMessage(hwnd, MCM_HITTEST, 0, 0); expect(-1, res); /* resize control to display single Calendar */

1 0