wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Henri Verbeet : wined3d: Validate some more states.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: 284e92def932243e9d75435c2eee2caf02767363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=284e92def932243e9d75435c2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 7 21:04:48 2010 +0200 wined3d: Validate some more states. --- dlls/wined3d/state.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5d6c19a..f94aac5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5670,6 +5670,20 @@ static void validate_state_table(struct StateEntry *state_table) {196, 197}, { 0, 0}, }; + static const DWORD simple_states[] = + { + STATE_MATERIAL, + STATE_VDECL, + STATE_STREAMSRC, + STATE_INDEXBUFFER, + STATE_VERTEXSHADERCONSTANT, + STATE_PIXELSHADERCONSTANT, + STATE_VSHADER, + STATE_PIXELSHADER, + STATE_VIEWPORT, + STATE_SCISSORRECT, + STATE_FRONTFACE, + }; unsigned int i, current; for (i = STATE_RENDER(1), current = 0; i <= STATE_RENDER(WINEHIGHEST_RENDER_STATE); ++i) @@ -5685,6 +5699,13 @@ static void validate_state_table(struct StateEntry *state_table) if (i == STATE_RENDER(rs_holes[current].last)) ++current; } + for (i = 0; i < sizeof(simple_states) / sizeof(*simple_states); ++i) + { + if (!state_table[simple_states[i]].representative) + ERR("State %s (%#x) should have a representative.\n", + debug_d3dstate(simple_states[i]), simple_states[i]); + } + for (i = 0; i < STATE_HIGHEST + 1; ++i) { DWORD rep = state_table[i].representative;

1 0

Henri Verbeet : wined3d: Update shader constants on viewport changes.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: e24473d53120f6edcabe9a367de5ef7fb765aefe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e24473d53120f6edcabe9a367… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 7 21:04:47 2010 +0200 wined3d: Update shader constants on viewport changes. Otherwise the vertex shader will see stale posFixup values. --- dlls/wined3d/state.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index fc6d265..5d6c19a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4682,6 +4682,8 @@ static void viewport_vertexpart(DWORD state, IWineD3DStateBlockImpl *stateblock, if(!isStateDirty(context, STATE_RENDER(WINED3DRS_POINTSCALEENABLE))) { state_pscale(STATE_RENDER(WINED3DRS_POINTSCALEENABLE), stateblock, context); } + if (!isStateDirty(context, STATE_VERTEXSHADERCONSTANT)) + shaderconstant(STATE_VERTEXSHADERCONSTANT, stateblock, context); } static void light(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context)

1 0

Henri Verbeet : wined3d: Get rid of state_nogl().
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: cece23c7c9474fb9eafd00807e13428f39565679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cece23c7c9474fb9eafd00807… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 7 21:04:46 2010 +0200 wined3d: Get rid of state_nogl(). It's unused, all states that have this as handler have a 0 representative. --- dlls/wined3d/state.c | 30 ++++++++---------------------- 1 files changed, 8 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cece23c7c9474fb9eafd0…

1 0

Henri Verbeet : wined3d: Add an extensionless STATE_INDEXBUFFER handler.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: 3f79ba301936db0e4d90f957704bc1e33f808153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f79ba301936db0e4d90f9577… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 7 21:04:45 2010 +0200 wined3d: Add an extensionless STATE_INDEXBUFFER handler. --- dlls/wined3d/state.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5d7b935..3a966d2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -60,6 +60,11 @@ static void state_undefined(DWORD state, IWineD3DStateBlockImpl *stateblock, str ERR("Undefined state.\n"); } +static void state_nop(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +{ + TRACE("%s: nop in current pipe config.\n", debug_d3dstate(state)); +} + static void state_fillmode(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { WINED3DFILLMODE Value = stateblock->renderState[WINED3DRS_FILLMODE]; @@ -4923,6 +4928,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }, WINED3D_GL_EXT_NONE }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }, ARB_VERTEX_BUFFER_OBJECT }, + { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, state_nop }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_ANTIALIAS), { STATE_RENDER(WINED3DRS_ANTIALIAS), state_antialias }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), { STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), state_perspective }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_ZENABLE), { STATE_RENDER(WINED3DRS_ZENABLE), state_zenable }, WINED3D_GL_EXT_NONE },

1 0

André Hentschel : ntdll: Use NULL for a pointer.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: 66612e26266ccc4802fafb9a75e3252bb8f23b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66612e26266ccc4802fafb9a7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 7 19:57:29 2010 +0200 ntdll: Use NULL for a pointer. --- dlls/ntdll/error.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c index 86b7492..4c7d5a7 100644 --- a/dlls/ntdll/error.c +++ b/dlls/ntdll/error.c @@ -1447,5 +1447,5 @@ static const struct error_table error_table[] = { 0xc00a0001, 0xc00a0037, table_c00a0001 }, { 0xc0130001, 0xc0130017, table_c0130001 }, { 0xc0150001, 0xc015000f, table_c0150001 }, - { 0, 0, 0 } /* last entry */ + { 0, 0, NULL } /* last entry */ };

1 0

Aric Stewart : rpcrt4/tests: Add NdrDllRegisterProxy tests.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: 75197bdfaf7a7f1f06812e5ea8ad568ca37ec375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75197bdfaf7a7f1f06812e5ea… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 7 11:53:22 2010 -0500 rpcrt4/tests: Add NdrDllRegisterProxy tests. --- dlls/rpcrt4/tests/cstub.c | 64 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 93a7fe3..c1b4b37 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -1089,6 +1089,69 @@ static void test_delegating_Invoke(IPSFactoryBuffer *ppsf) HeapFree(GetProcessHeap(), 0, msg.Buffer); IRpcStubBuffer_Release(pstub); } +static const CInterfaceProxyVtbl *cstub_ProxyVtblList2[] = +{ + NULL +}; + +static const CInterfaceStubVtbl *cstub_StubVtblList2[] = +{ + NULL +}; + +static PCInterfaceName const if_name_list2[] = +{ + NULL +}; + +static const IID *base_iid_list2[] = +{ + NULL, +}; + +static const ExtendedProxyFileInfo my_proxy_file_info2 = +{ + (const PCInterfaceProxyVtblList *) &cstub_ProxyVtblList2, + (const PCInterfaceStubVtblList *) &cstub_StubVtblList2, + (const PCInterfaceName *) &if_name_list2, + (const IID **) &base_iid_list2, + &iid_lookup, + 0, + 1, + NULL, + 0, + 0, + 0 +}; + +static const ProxyFileInfo *proxy_file_list2[] = { + &my_proxy_file_info2, + NULL +}; + +static void test_NdrDllRegisterProxy( void ) +{ + HRESULT res; + const ExtendedProxyFileInfo *pf; + HMODULE hmod = GetModuleHandleA(NULL); + + + res = NdrDllRegisterProxy(NULL, NULL, NULL); + ok(res == E_HANDLE, "Incorrect return code %x\n",res); + pf = NULL; + res = NdrDllRegisterProxy(hmod, &pf, NULL); + ok(res == E_NOINTERFACE, "Incorrect return code %x\n",res); + res = NdrDllRegisterProxy(hmod, proxy_file_list2, NULL); + ok(res == E_NOINTERFACE, "Incorrect return code %x\n",res); + /* This fails on Vista and Windows 7 due to permissions */ + res = NdrDllRegisterProxy(hmod, proxy_file_list, NULL); + ok(res == S_OK || res == E_ACCESSDENIED, "NdrDllRegisterProxy failed %x\n",res); + if (res == S_OK) + { + res = NdrDllUnregisterProxy(hmod,proxy_file_list, NULL); + ok(res == S_OK, "NdrDllUnregisterProxy failed %x\n",res); + } +} START_TEST( cstub ) { @@ -1104,6 +1167,7 @@ START_TEST( cstub ) test_Disconnect(ppsf); test_Release(ppsf); test_delegating_Invoke(ppsf); + test_NdrDllRegisterProxy(); OleUninitialize(); }

1 0

Aric Stewart : rpcrt4: Improve NdrDllRegisterProxy parameter checking.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: 0e09ade10b63ce7a5525e612b0783539dc50847a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e09ade10b63ce7a5525e612b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 7 11:53:12 2010 -0500 rpcrt4: Improve NdrDllRegisterProxy parameter checking. --- dlls/rpcrt4/cpsf.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index 6b12c01..9375c40 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -240,6 +240,10 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODULE hDll, DWORD len; TRACE("(%p,%p,%s)\n", hDll, pProxyFileList, debugstr_guid(pclsid)); + + if (!hDll) return E_HANDLE; + if (!*pProxyFileList) return E_NOINTERFACE; + if (pclsid) format_clsid( clsid, pclsid ); else if ((*pProxyFileList)->TableSize > 0)

1 0

Aric Stewart : rpcrt4: Handle NULL pclsid in NdrDllRegisterProxy and NdrDllUnregisterProxy.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: 06085817687ddff4264c9d5853c6f633fda679d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06085817687ddff4264c9d585… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 7 11:53:05 2010 -0500 rpcrt4: Handle NULL pclsid in NdrDllRegisterProxy and NdrDllUnregisterProxy. --- dlls/rpcrt4/cpsf.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index ac1eccf..6b12c01 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -240,7 +240,12 @@ HRESULT WINAPI NdrDllRegisterProxy(HMODULE hDll, DWORD len; TRACE("(%p,%p,%s)\n", hDll, pProxyFileList, debugstr_guid(pclsid)); - format_clsid( clsid, pclsid ); + if (pclsid) + format_clsid( clsid, pclsid ); + else if ((*pProxyFileList)->TableSize > 0) + format_clsid( clsid,(*pProxyFileList)->pStubVtblList[0]->header.piid); + else + return E_NOINTERFACE; /* register interfaces to point to clsid */ while (*pProxyFileList) { @@ -297,8 +302,15 @@ HRESULT WINAPI NdrDllUnregisterProxy(HMODULE hDll, static const WCHAR clsidW[] = {'C','L','S','I','D','\\',0}; static const WCHAR interfaceW[] = {'I','n','t','e','r','f','a','c','e','\\',0}; WCHAR keyname[50]; + WCHAR clsid[39]; TRACE("(%p,%p,%s)\n", hDll, pProxyFileList, debugstr_guid(pclsid)); + if (pclsid) + format_clsid( clsid, pclsid ); + else if ((*pProxyFileList)->TableSize > 0) + format_clsid( clsid,(*pProxyFileList)->pStubVtblList[0]->header.piid); + else + return E_NOINTERFACE; /* unregister interfaces */ while (*pProxyFileList) { @@ -318,7 +330,7 @@ HRESULT WINAPI NdrDllUnregisterProxy(HMODULE hDll, /* unregister clsid */ strcpyW( keyname, clsidW ); - format_clsid( keyname + strlenW(keyname), pclsid ); + strcatW( keyname, clsid ); RegDeleteTreeW(HKEY_CLASSES_ROOT, keyname); return S_OK;

1 0

Alexandre Julliard : winex11: Fix the calling convention of X11DRV_wglCreateContextAttribsARB.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: 3bc0a1099df23e7784e836cecf0b05ffea7772b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc0a1099df23e7784e836cec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 7 23:44:14 2010 +0200 winex11: Fix the calling convention of X11DRV_wglCreateContextAttribsARB. --- dlls/winex11.drv/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 859cf94..94fbb1e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2235,7 +2235,7 @@ static void WINAPI X11DRV_wglFlush(void) * * WGL_ARB_create_context: wglCreateContextAttribsARB */ -HGLRC X11DRV_wglCreateContextAttribsARB(X11DRV_PDEVICE *physDev, HGLRC hShareContext, const int* attribList) +HGLRC CDECL X11DRV_wglCreateContextAttribsARB(X11DRV_PDEVICE *physDev, HGLRC hShareContext, const int* attribList) { Wine_GLContext *ret; WineGLPixelFormat *fmt; @@ -3865,7 +3865,7 @@ HGLRC CDECL X11DRV_wglCreateContext(X11DRV_PDEVICE *physDev) { * * WGL_ARB_create_context: wglCreateContextAttribsARB */ -HGLRC X11DRV_wglCreateContextAttribsARB(X11DRV_PDEVICE *physDev, HGLRC hShareContext, const int* attribList) +HGLRC CDECL X11DRV_wglCreateContextAttribsARB(X11DRV_PDEVICE *physDev, HGLRC hShareContext, const int* attribList) { opengl_error(); return NULL;

1 0

Alexandre Julliard : crypt32: Fix computation of structure sizes in CRYPT_AsnDecodeSequence.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: 87416f5a3b079f81a62a16672e1cf355a3da477a URL: http://source.winehq.org/git/wine.git/?a=commit;h=87416f5a3b079f81a62a16672… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 7 23:07:43 2010 +0200 crypt32: Fix computation of structure sizes in CRYPT_AsnDecodeSequence. --- dlls/crypt32/decode.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index fb3d36e..655a5b2 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -523,9 +523,11 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[], for (i = 0; i < cItem; i++) { - bytesNeeded += items[i].size; + if (items[i].size > items[i].minSize) + bytesNeeded += items[i].size - items[i].minSize; structSize = max( structSize, items[i].offset + items[i].minSize ); } + bytesNeeded += structSize; if (pcbDecoded) *pcbDecoded = 1 + lenBytes + cbDecoded; if (!pvStructInfo)

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2010