September 2006 - Wine-commits

Paul Vriens : crypt32: Cast-qual warnings fix.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: 1059f697f05ece0251437d9ba43560e8968e82e8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1059f697f05ece0251437d9… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Sat Sep 16 16:56:18 2006 +0200 crypt32: Cast-qual warnings fix. --- dlls/crypt32/tests/str.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index 25e7749..6e273c5 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -45,18 +45,18 @@ typedef struct _CertRDNAttrEncodingW { LPCWSTR str; } CertRDNAttrEncodingW, *PCertRDNAttrEncodingW; -static const BYTE bin1[] = { 0x55, 0x53 }; -static const BYTE bin2[] = { 0x4d, 0x69, 0x6e, 0x6e, 0x65, 0x73, 0x6f, 0x74, +static BYTE bin1[] = { 0x55, 0x53 }; +static BYTE bin2[] = { 0x4d, 0x69, 0x6e, 0x6e, 0x65, 0x73, 0x6f, 0x74, 0x61 }; -static const BYTE bin3[] = { 0x4d, 0x69, 0x6e, 0x6e, 0x65, 0x61, 0x70, 0x6f, +static BYTE bin3[] = { 0x4d, 0x69, 0x6e, 0x6e, 0x65, 0x61, 0x70, 0x6f, 0x6c, 0x69, 0x73 }; -static const BYTE bin4[] = { 0x43, 0x6f, 0x64, 0x65, 0x57, 0x65, 0x61, 0x76, +static BYTE bin4[] = { 0x43, 0x6f, 0x64, 0x65, 0x57, 0x65, 0x61, 0x76, 0x65, 0x72, 0x73 }; -static const BYTE bin5[] = { 0x57, 0x69, 0x6e, 0x65, 0x20, 0x44, 0x65, 0x76, +static BYTE bin5[] = { 0x57, 0x69, 0x6e, 0x65, 0x20, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x6d, 0x65, 0x6e, 0x74 }; -static const BYTE bin6[] = { 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, +static BYTE bin6[] = { 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74 }; -static const BYTE bin7[] = { 0x61, 0x72, 0x69, 0x63, 0x40, 0x63, 0x6f, 0x64, +static BYTE bin7[] = { 0x61, 0x72, 0x69, 0x63, 0x40, 0x63, 0x6f, 0x64, 0x65, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x73, 0x2e, 0x63, 0x6f, 0x6d }; static const BYTE cert[] =

1 0

Paul Vriens : setupapi: Fixed wrong check (Coverity).
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: 270dbc9d0733481dd8db34c93b215739a3e9fb30 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=270dbc9d0733481dd8db34c… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Sun Sep 17 10:24:41 2006 +0200 setupapi: Fixed wrong check (Coverity). --- dlls/setupapi/devinst.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 778c66c..37a7302 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -351,7 +351,7 @@ BOOL WINAPI SetupDiClassGuidsFromNameExA if (ClassNameW == NULL) return FALSE; - if (MachineNameW) + if (MachineName) { MachineNameW = MultiByteToUnicode(MachineName, CP_ACP); if (MachineNameW == NULL)

1 0

Francois Gouget : wine.inf: Add the missing SecurityService keys.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: b05783b2978aa15067029ff52e678ffa37284861 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b05783b2978aa15067029ff… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Sep 17 12:08:08 2006 +0200 wine.inf: Add the missing SecurityService keys. --- tools/wine.inf | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 9a73af5..200745d 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -299,6 +299,13 @@ HKLM,%MciExtStr%,"wvx",,"MPEGVideo" [Misc] HKLM,Software\Borland\Database Engine\Settings\SYSTEM\INIT,SHAREDMEMLOCATION,,9000 HKLM,Software\Microsoft\Advanced INF Setup,,,"" +HKLM,Software\Microsoft\Rpc\SecurityService,1,2,"secur32.dll" +HKLM,Software\Microsoft\Rpc\SecurityService,10,2,"secur32.dll" +HKLM,Software\Microsoft\Rpc\SecurityService,14,2,"schannel.dll" +HKLM,Software\Microsoft\Rpc\SecurityService,16,2,"secur32.dll" +HKLM,Software\Microsoft\Rpc\SecurityService,18,2,"secur32.dll" +HKLM,Software\Microsoft\Rpc\SecurityService,68,2,"netlogon.dll" +HKLM,Software\Microsoft\Rpc\SecurityService,9,2,"secur32.dll" HKLM,System\CurrentControlSet\Control\Session Manager,,,"" HKLM,System\CurrentControlSet\Control\VMM32Files,,,"" HKLM,System\CurrentControlSet\Services\VxD\MSTCP,,,""

1 0

Detlef Riekenberg : winspool: Fix missing backslash.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: 1e2b9b7d3685527e1f6446471758c20b9c059a87 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1e2b9b7d3685527e1f64464… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Sep 18 07:57:41 2006 +0200 winspool: Fix missing backslash. --- dlls/winspool.drv/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 45f7054..d340705 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -159,7 +159,7 @@ static const WCHAR MonitorsW[] = { 'S', 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', 'P','r','i','n','t','\\', - 'M','o','n','i','t','o','r','s',0}; + 'M','o','n','i','t','o','r','s','\\',0}; static const WCHAR PrintersW[] = {'S','y','s','t','e','m','\\', 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\',

1 0

Stefan Leichter : dmloader: Print 64bit integers with wine_dbgstr_longlong.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: 0eab04289044dae35b406889e411c2b940af2d6f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0eab04289044dae35b40688… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Sep 18 22:25:31 2006 +0200 dmloader: Print 64bit integers with wine_dbgstr_longlong. --- dlls/dmloader/debug.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dmloader/debug.c b/dlls/dmloader/debug.c index 90dda5f..68b76d5 100644 --- a/dlls/dmloader/debug.c +++ b/dlls/dmloader/debug.c @@ -494,7 +494,8 @@ const char *debugstr_DMUS_OBJECTDESC (LP if (pDesc->dwValidData & DMUS_OBJ_NAME) ptr += sprintf(ptr, " - wszName = %s\n", debugstr_w(pDesc->wszName)); if (pDesc->dwValidData & DMUS_OBJ_CATEGORY) ptr += sprintf(ptr, " - wszCategory = %s\n", debugstr_w(pDesc->wszCategory)); if (pDesc->dwValidData & DMUS_OBJ_FILENAME) ptr += sprintf(ptr, " - wszFileName = %s\n", debugstr_w(pDesc->wszFileName)); - if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = %lli\n - pbMemData = %p\n", pDesc->llMemLength, pDesc->pbMemData); + if (pDesc->dwValidData & DMUS_OBJ_MEMORY) ptr += sprintf(ptr, " - llMemLength = 0x%s\n - pbMemData = %p\n", + wine_dbgstr_longlong(pDesc->llMemLength), pDesc->pbMemData); if (pDesc->dwValidData & DMUS_OBJ_STREAM) ptr += sprintf(ptr, " - pStream = %p\n", pDesc->pStream); ptr = &buffer[0];

1 0

Roderick Colenbrander : winex11.drv: Fix fbconfig regression.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: 9796aade282f26eec09887b807fd13ad41fb461d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9796aade282f26eec09887b… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Sep 15 18:22:52 2006 +0200 winex11.drv: Fix fbconfig regression. --- dlls/winex11.drv/opengl.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 8c10395..ebf34f8 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -410,17 +410,17 @@ #undef LOAD_FUNCPTR if ((!WineGLInfo.glxDirect && !strcmp("1.2", WineGLInfo.glxServerVersion)) || (WineGLInfo.glxDirect && !strcmp("1.2", WineGLInfo.glxClientVersion))) { - pglXChooseFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXChooseFBConfig"); - pglXGetFBConfigAttrib = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetFBConfigAttrib"); - pglXGetVisualFromFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetVisualFromFBConfig"); - } else { if (NULL != strstr(glx_extensions, "GLX_SGIX_fbconfig")) { pglXChooseFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXChooseFBConfigSGIX"); pglXGetFBConfigAttrib = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetFBConfigAttribSGIX"); pglXGetVisualFromFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetVisualFromFBConfigSGIX"); } else { - ERR(" glx_version as %s and GLX_SGIX_fbconfig extension is unsupported. Expect problems.\n", WineGLInfo.glxClientVersion); + ERR(" glx_version is %s and GLX_SGIX_fbconfig extension is unsupported. Expect problems.\n", WineGLInfo.glxClientVersion); } + } else { + pglXChooseFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXChooseFBConfig"); + pglXGetFBConfigAttrib = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetFBConfigAttrib"); + pglXGetVisualFromFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetVisualFromFBConfig"); } /* The mesa libGL client library seems to forward glXQueryDrawable to the Xserver, so only

1 0

Roderick Colenbrander : winex11.drv: Fix wined3d/opengl regression.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: ab00044408eb1a6eafcdb87946abcd4ff20095ba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ab00044408eb1a6eafcdb87… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Mon Sep 18 20:13:21 2006 +0200 winex11.drv: Fix wined3d/opengl regression. --- dlls/winex11.drv/opengl.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ebf34f8..8be5489 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -299,7 +299,10 @@ BOOL X11DRV_WineGL_InitOpenglInfo() wine_tsx11_unlock(); if(vis) XFree(vis); - if(ctx) pglXDestroyContext(gdi_display, ctx); + if(ctx) { + pglXMakeCurrent(gdi_display, None, NULL); + pglXDestroyContext(gdi_display, ctx); + } return TRUE; }

1 0

Paul Vriens : crypt32: Add a few functions to the spec file.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: 8edf5076627a58265c76f485a546693d2f79faf6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8edf5076627a58265c76f48… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Sep 14 16:09:28 2006 +0200 crypt32: Add a few functions to the spec file. --- dlls/crypt32/crypt32.spec | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 1a61095..ab2c947 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -154,9 +154,14 @@ @ stdcall CryptRegisterOIDFunction(long str str wstr str) @ stub CryptRegisterOIDInfo @ stdcall CryptSIPAddProvider(ptr) +@ stub CryptSIPCreateIndirectData +@ stub CryptSIPGetSignedDataMsg @ stdcall CryptSIPLoad(ptr long ptr) +@ stub CryptSIPPutSignedDataMsg @ stdcall CryptSIPRemoveProvider(ptr) +@ stub CryptSIPRemoveSignedDataMsg @ stdcall CryptSIPRetrieveSubjectGuid(wstr long ptr) +@ stub CryptSIPVerifyIndirectData @ stub CryptSetAsyncParam @ stdcall CryptSetOIDFunctionValue(long str str wstr long ptr long) @ stub CryptSetProviderU

1 0

Paul Vriens : crypt32: Move SIP related functions to their own file.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: ef860912a20bcaf2dab480c8fa9866a99c1854d7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ef860912a20bcaf2dab480c… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Sep 14 16:11:25 2006 +0200 crypt32: Move SIP related functions to their own file. --- dlls/crypt32/Makefile.in | 1 dlls/crypt32/main.c | 273 ----------------------------------------- dlls/crypt32/sip.c | 307 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 308 insertions(+), 273 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=ef860912a20bcaf2dab…

1 0

Paul Vriens : crypt32: Move SIP related tests to their own file.
by Alexandre Julliard 20 Sep '06

20 Sep '06

Module: wine Branch: master Commit: b078b5ddd333217b70db17e0fbfa47d425b3953e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b078b5ddd333217b70db17e… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Sep 15 16:46:25 2006 +0200 crypt32: Move SIP related tests to their own file. --- dlls/crypt32/tests/Makefile.in | 1 dlls/crypt32/tests/main.c | 154 --------------------------------- dlls/crypt32/tests/sip.c | 186 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 187 insertions(+), 154 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b078b5ddd333217b70d…

1 0