April 2010 - Wine-commits - list.winehq.org

Joel Holdsworth : user32: Replace oic_sample.ico with Tango compliant icon.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: 38d4aa2b7ee4b42f1510823ba5779512b4e9c848 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d4aa2b7ee4b42f1510823ba… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Thu Apr 8 01:03:21 2010 +0100 user32: Replace oic_sample.ico with Tango compliant icon. --- dlls/user32/Makefile.in | 1 + dlls/user32/resources/oic_sample.ico | Bin 766 -> 25214 bytes dlls/user32/resources/oic_sample.svg | 67 ++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38d4aa2b7ee4b42f15108…

1 0

Alexandre Julliard : configure: Don't disable includes for the Wow64 build.
by Alexandre Julliard 08 Apr '10

08 Apr '10

Module: wine Branch: master Commit: fbc8ac470ff4cc5e04c717fc6d4e475e478b2e09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc8ac470ff4cc5e04c717fc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 7 22:54:51 2010 +0200 configure: Don't disable includes for the Wow64 build. --- configure | 1 - configure.ac | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 07f7df5..e021e48 100755 --- a/configure +++ b/configure @@ -4120,7 +4120,6 @@ then WOW64_DISABLE=\# enable_fonts=${enable_fonts:-no} - enable_include=${enable_include:-no} enable_rpcss=${enable_rpcss:-no} enable_server=${enable_server:-no} enable_tools=${enable_tools:-no} diff --git a/configure.ac b/configure.ac index 7650ffa..7d9031d 100644 --- a/configure.ac +++ b/configure.ac @@ -190,7 +190,6 @@ then fi AC_SUBST([WOW64_DISABLE],[\#]) enable_fonts=${enable_fonts:-no} - enable_include=${enable_include:-no} enable_rpcss=${enable_rpcss:-no} enable_server=${enable_server:-no} enable_tools=${enable_tools:-no}

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

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

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

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/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

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

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

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