wine-commits August 2007

wine-commits@winehq.org

3 participants
1085 discussions

Chris Robinson : winex11: Don' t add spaces to the beginning of the wglExtensions list.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 7959be38503abe9b25740419482d3b3900cddef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7959be38503abe9b257404194… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Thu Aug 9 18:18:48 2007 -0700 winex11: Don't add spaces to the beginning of the wglExtensions list. --- dlls/winex11.drv/opengl.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 0881198..7ee99b1 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3003,7 +3003,8 @@ static BOOL glxRequireExtension(const char *requiredExtension) static void register_extension_string(const char *ext) { - strcat(WineGLInfo.wglExtensions, " "); + if (WineGLInfo.wglExtensions[0]) + strcat(WineGLInfo.wglExtensions, " "); strcat(WineGLInfo.wglExtensions, ext); TRACE("'%s'\n", ext); @@ -3016,10 +3017,7 @@ static BOOL register_extension(const WineGLExtension * ext) assert( WineGLExtensionListSize < MAX_EXTENSIONS ); WineGLExtensionList[WineGLExtensionListSize++] = ext; - strcat(WineGLInfo.wglExtensions, " "); - strcat(WineGLInfo.wglExtensions, ext->extName); - - TRACE("'%s'\n", ext->extName); + register_extension_string(ext->extName); for (i = 0; ext->extEntryPoints[i].funcName; ++i) TRACE(" - '%s'\n", ext->extEntryPoints[i].funcName);

1 0

Jason Edmeades : advpack: Show fixme when advpack fails to prompt user for directory.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: ccaddb8a34eadd8c69d14fbf5e1f2265f2e531db URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccaddb8a34eadd8c69d14fbf5… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Thu Aug 9 23:56:17 2007 +0100 advpack: Show fixme when advpack fails to prompt user for directory. --- dlls/advpack/advpack.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index ee3a87e..157413f 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -116,6 +116,7 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) do { LPWSTR value, ptr, key, key_copy = NULL; + DWORD flags = 0; SetupGetLineTextW(&context, NULL, NULL, NULL, line, MAX_FIELD_LENGTH, &size); @@ -141,10 +142,12 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) while (*value == ' ') value++; - /* FIXME: need to check the query option */ + /* Extract the flags */ ptr = strchrW(value, ','); - if (ptr) + if (ptr) { *ptr = '\0'; + flags = atolW(ptr+1); + } /* set dest to pszWorkingDir if key is SourceDir */ if (pszWorkingDir && !lstrcmpiW(value, source_dir)) @@ -152,6 +155,10 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) else get_dest_dir(hInf, value, dest, MAX_PATH); + /* If prompting required, provide dialog to request path */ + if (flags & 0x04) + FIXME("Need to support changing paths - default will be used\n"); + /* set all ldids to dest */ while ((ptr = get_parameter(&key, ','))) {

1 0

Jason Edmeades : setupapi: Add test to show setupapi does not handle single quotes.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: ac6343cd5a78eccd3657f5fc71a89f18634f3e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac6343cd5a78eccd3657f5fc7… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Thu Aug 9 23:56:16 2007 +0100 setupapi: Add test to show setupapi does not handle single quotes. --- dlls/setupapi/tests/parser.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 4c1043e..858c889 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -41,7 +41,7 @@ static void init_function_pointers(void) pSetupGetField = (void *)GetProcAddress(hSetupAPI, "pSetupGetField"); } -static const char tmpfile[] = ".\\tmp.inf"; +static const char tmpfilename[] = ".\\tmp.inf"; /* some large strings */ #define A255 "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" \ @@ -66,12 +66,12 @@ static const char tmpfile[] = ".\\tmp.inf"; static HINF test_file_contents( const char *data, UINT *err_line ) { DWORD res; - HANDLE handle = CreateFileA( tmpfile, GENERIC_READ|GENERIC_WRITE, + HANDLE handle = CreateFileA( tmpfilename, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, 0 ); if (handle == INVALID_HANDLE_VALUE) return 0; if (!WriteFile( handle, data, strlen(data), &res, NULL )) trace( "write error\n" ); CloseHandle( handle ); - return SetupOpenInfFileA( tmpfile, 0, INF_STYLE_WIN4, err_line ); + return SetupOpenInfFileA( tmpfilename, 0, INF_STYLE_WIN4, err_line ); } static const char *get_string_field( INFCONTEXT *context, DWORD index ) @@ -284,6 +284,8 @@ static const struct { "ab=cd\",\"ef", "ab", { "cd,ef" } }, { "ab=cd\",ef", "ab", { "cd,ef" } }, { "ab=cd\",ef\\\nab", "ab", { "cd,ef\\" } }, + /* single quotes (unhandled)*/ + { "HKLM,A,B,'C',D", NULL, { "HKLM", "A","B","'C'","D" } }, /* spaces */ { " a b = c , d \n", "a b", { "c", "d" } }, { " a b = c ,\" d\" \n", "a b", { "c", " d" } }, @@ -474,5 +476,5 @@ START_TEST(parser) test_key_names(); test_close_inf_file(); test_pSetupGetField(); - DeleteFileA( tmpfile ); + DeleteFileA( tmpfilename ); }

1 0

Jason Edmeades : cmd.exe: Wait when launching GUI pgms in batch.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 09969e8de1d970ef923a0e6d19f191850b13fdae URL: http://source.winehq.org/git/wine.git/?a=commit;h=09969e8de1d970ef923a0e6d1… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Thu Aug 9 23:56:15 2007 +0100 cmd.exe: Wait when launching GUI pgms in batch. --- programs/cmd/wcmdmain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 708686c..775a553 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1090,7 +1090,8 @@ void WCMD_run_program (WCHAR *command, int called) { if (!assumeInternal && !console) errorlevel = 0; else { - if (assumeInternal || !HIWORD(console)) WaitForSingleObject (pe.hProcess, INFINITE); + /* Always wait when called in a batch program context */ + if (assumeInternal || context || !HIWORD(console)) WaitForSingleObject (pe.hProcess, INFINITE); GetExitCodeProcess (pe.hProcess, &errorlevel); if (errorlevel == STILL_ACTIVE) errorlevel = 0; }

1 0

Chris Robinson : wined3d: Use a safer, more compliant method to parse extension strings.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: c8b6b2b1d83c2c44940562f02a1f6690637b4142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8b6b2b1d83c2c44940562f02… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Aug 8 09:57:39 2007 -0700 wined3d: Use a safer, more compliant method to parse extension strings. --- dlls/wined3d/directx.c | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e8613c3..75951ea 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -627,14 +627,22 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { ERR(" GL_Extensions returns NULL\n"); } else { while (*GL_Extensions != 0x00) { - const char *Start = GL_Extensions; + const char *Start; char ThisExtn[256]; + size_t len; - memset(ThisExtn, 0x00, sizeof(ThisExtn)); - while (*GL_Extensions != ' ' && *GL_Extensions != 0x00) { + while (isspace(*GL_Extensions)) GL_Extensions++; + Start = GL_Extensions; + while (!isspace(*GL_Extensions) && *GL_Extensions != 0x00) { GL_Extensions++; } - memcpy(ThisExtn, Start, (GL_Extensions - Start)); + + len = GL_Extensions - Start; + if (len == 0 || len >= sizeof(ThisExtn)) + continue; + + memcpy(ThisExtn, Start, len); + ThisExtn[len] = '\0'; TRACE_(d3d_caps)("- %s\n", ThisExtn); for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) { @@ -644,8 +652,6 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { break; } } - - if (*GL_Extensions == ' ') GL_Extensions++; } if (gl_info->supported[APPLE_FENCE]) { @@ -998,22 +1004,28 @@ BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { ERR(" WGL_Extensions returns NULL\n"); } else { while (*WGL_Extensions != 0x00) { - const char *Start = WGL_Extensions; + const char *Start; char ThisExtn[256]; + size_t len; - memset(ThisExtn, 0x00, sizeof(ThisExtn)); - while (*WGL_Extensions != ' ' && *WGL_Extensions != 0x00) { + while (isspace(*WGL_Extensions)) WGL_Extensions++; + Start = WGL_Extensions; + while (!isspace(*WGL_Extensions) && *WGL_Extensions != 0x00) { WGL_Extensions++; } - memcpy(ThisExtn, Start, (WGL_Extensions - Start)); + + len = WGL_Extensions - Start; + if (len == 0 || len >= sizeof(ThisExtn)) + continue; + + memcpy(ThisExtn, Start, len); + ThisExtn[len] = '\0'; TRACE_(d3d_caps)("- %s\n", ThisExtn); - if (strstr(ThisExtn, "WGL_ARB_pbuffer")) { + if (!strcmp(ThisExtn, "WGL_ARB_pbuffer")) { gl_info->supported[WGL_ARB_PBUFFER] = TRUE; TRACE_(d3d_caps)("FOUND: WGL_ARB_pbuffer support\n"); } - - if (*WGL_Extensions == ' ') WGL_Extensions++; } } }

1 0

Roderick Colenbrander : wined3d: Add better pixelformat selection code for pbuffers.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 7818cbda4a01037a2214405bc4c0af9cadbad1c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7818cbda4a01037a2214405bc… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Aug 9 14:12:42 2007 +0200 wined3d: Add better pixelformat selection code for pbuffers. --- dlls/wined3d/context.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 93317f2..eef4bd9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -132,7 +132,57 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar if(create_pbuffer) { HDC hdc_parent = GetDC(win_handle); - int iPixelFormat = 1; /* We only have a single useful format in Wine's OpenGL32, so use this for now. It should be fixed. */ + int iPixelFormat = 0; + short red, green, blue, alphaBits, colorBits; + short depthBits, stencilBits; + + IWineD3DSurface *StencilSurface = This->stencilBufferTarget; + WINED3DFORMAT StencilBufferFormat = (NULL != StencilSurface) ? ((IWineD3DSurfaceImpl *) StencilSurface)->resource.format : 0; + + int attribs[256]; + int nAttribs = 0; + unsigned int nFormats; + +#define PUSH1(att) attribs[nAttribs++] = (att); +#define PUSH2(att,value) attribs[nAttribs++] = (att); attribs[nAttribs++] = (value); + + /* Retrieve the specifications for the pixelformat from the backbuffer / stencilbuffer */ + getColorBits(target->resource.format, &red, &green, &blue, &alphaBits, &colorBits); + getDepthStencilBits(StencilBufferFormat, &depthBits, &stencilBits); + PUSH2(WGL_DRAW_TO_PBUFFER_ARB, 1); /* We need pbuffer support; doublebuffering isn't needed */ + PUSH2(WGL_PIXEL_TYPE_ARB, WGL_TYPE_RGBA_ARB); /* Make sure we don't get a float or color index format */ + PUSH2(WGL_COLOR_BITS_ARB, colorBits); + PUSH2(WGL_ALPHA_BITS_ARB, alphaBits); + PUSH2(WGL_DEPTH_BITS_ARB, depthBits); + PUSH2(WGL_STENCIL_BITS_ARB, stencilBits); + PUSH1(0); /* end the list */ + +#undef PUSH1 +#undef PUSH2 + + /* Try to find a pixelformat that matches exactly. If that fails let ChoosePixelFormat try to find a close match */ + if(!GL_EXTCALL(wglChoosePixelFormatARB(hdc_parent, (const int*)&attribs, NULL, 1, &iPixelFormat, &nFormats))) + { + PIXELFORMATDESCRIPTOR pfd; + + TRACE("Falling back to ChoosePixelFormat as wglChoosePixelFormatARB failed\n"); + + ZeroMemory(&pfd, sizeof(pfd)); + pfd.nSize = sizeof(pfd); + pfd.nVersion = 1; + pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER_DONTCARE | PFD_DRAW_TO_WINDOW; + pfd.iPixelType = PFD_TYPE_RGBA; + pfd.cColorBits = colorBits; + pfd.cDepthBits = depthBits; + pfd.cStencilBits = stencilBits; + pfd.iLayerType = PFD_MAIN_PLANE; + + iPixelFormat = ChoosePixelFormat(hdc_parent, &pfd); + if(!iPixelFormat) { + /* If this happens something is very wrong as ChoosePixelFormat barely fails */ + ERR("Can't find a suitable iPixelFormat for the pbuffer\n"); + } + } TRACE("Creating a pBuffer drawable for the new context\n"); pbuffer = GL_EXTCALL(wglCreatePbufferARB(hdc_parent, iPixelFormat, target->currentDesc.Width, target->currentDesc.Height, 0));

1 0

Juan Lang : crypt32: Add stub for I_CryptGetAsn1Decoder.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 0c4c1985b0e5e5a818ae1ccae634f5735cfe4a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4c1985b0e5e5a818ae1ccae… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 9 13:20:00 2007 -0700 crypt32: Add stub for I_CryptGetAsn1Decoder. --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/main.c | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index c7c3c8d..8fbaecd 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -196,6 +196,7 @@ @ stdcall I_CryptFlushLruCache(ptr long long) @ stdcall I_CryptFreeLruCache(ptr long long) @ stdcall I_CryptFreeTls(long long) +@ stdcall I_CryptGetAsn1Decoder(long) @ stdcall I_CryptGetDefaultCryptProv(long) @ stub I_CryptGetDefaultCryptProvForEncrypt @ stdcall I_CryptGetOssGlobal(long) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index c311ce9..72bdfac 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -206,6 +206,12 @@ BOOL WINAPI I_CryptUninstallAsn1Module(void *x) return TRUE; } +void *WINAPI I_CryptGetAsn1Decoder(long x) +{ + FIXME("%08lx\n", x); + return NULL; +} + BOOL WINAPI CryptFormatObject(DWORD dwCertEncodingType, DWORD dwFormatType, DWORD dwFormatStrType, void *pFormatStruct, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, void *pbFormat, DWORD *pcbFormat)

1 0

Juan Lang : crypt32: Trace more return values.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 84a54b5a1f44b029617eaf2b7d92a2643fbeff51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a54b5a1f44b029617eaf2b7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 9 13:19:33 2007 -0700 crypt32: Trace more return values. --- dlls/crypt32/cert.c | 11 +++++++++-- dlls/crypt32/sip.c | 5 +++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 1cadac1..e2c0fc2 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -707,11 +707,15 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, BOOL WINAPI CertCompareCertificate(DWORD dwCertEncodingType, PCERT_INFO pCertId1, PCERT_INFO pCertId2) { + BOOL ret; + TRACE("(%08x, %p, %p)\n", dwCertEncodingType, pCertId1, pCertId2); - return CertCompareCertificateName(dwCertEncodingType, &pCertId1->Issuer, + ret = CertCompareCertificateName(dwCertEncodingType, &pCertId1->Issuer, &pCertId2->Issuer) && CertCompareIntegerBlob(&pCertId1->SerialNumber, &pCertId2->SerialNumber); + TRACE("returning %d\n", ret); + return ret; } BOOL WINAPI CertCompareCertificateName(DWORD dwCertEncodingType, @@ -731,6 +735,7 @@ BOOL WINAPI CertCompareCertificateName(DWORD dwCertEncodingType, } else ret = FALSE; + TRACE("returning %d\n", ret); return ret; } @@ -773,6 +778,7 @@ BOOL WINAPI CertCompareIntegerBlob(PCRYPT_INTEGER_BLOB pInt1, } else ret = FALSE; + TRACE("returning %d\n", ret); return ret; } @@ -1134,6 +1140,7 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, SetLastError(CRYPT_E_NOT_FOUND); ret = NULL; } + TRACE("returning %p\n", ret); return ret; } @@ -1220,7 +1227,7 @@ PCCERT_CONTEXT WINAPI CertGetIssuerCertificateFromStore(HCERTSTORE hCertStore, ret = NULL; } } - + TRACE("returning %p\n", ret); return ret; } diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index 34668e5..0ec212a 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -575,6 +575,7 @@ BOOL WINAPI CryptSIPCreateIndirectData(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pcb if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType))) ret = sip->info.pfCreate(pSubjectInfo, pcbIndirectData, pIndirectData); + TRACE("returning %d\n", ret); return ret; } @@ -593,6 +594,7 @@ BOOL WINAPI CryptSIPGetSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD* pdwEn if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType))) ret = sip->info.pfGet(pSubjectInfo, pdwEncodingType, dwIndex, pcbSignedDataMsg, pbSignedDataMsg); + TRACE("returning %d\n", ret); return ret; } @@ -611,6 +613,7 @@ BOOL WINAPI CryptSIPPutSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, DWORD pdwEnc if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType))) ret = sip->info.pfPut(pSubjectInfo, pdwEncodingType, pdwIndex, cbSignedDataMsg, pbSignedDataMsg); + TRACE("returning %d\n", ret); return ret; } @@ -627,6 +630,7 @@ BOOL WINAPI CryptSIPRemoveSignedDataMsg(SIP_SUBJECTINFO* pSubjectInfo, if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType))) ret = sip->info.pfRemove(pSubjectInfo, dwIndex); + TRACE("returning %d\n", ret); return ret; } @@ -643,5 +647,6 @@ BOOL WINAPI CryptSIPVerifyIndirectData(SIP_SUBJECTINFO* pSubjectInfo, if ((sip = CRYPT_GetCachedSIP(pSubjectInfo->pgSubjectType))) ret = sip->info.pfVerify(pSubjectInfo, pIndirectData); + TRACE("returning %d\n", ret); return ret; }

1 0

Juan Lang : crypt32: Use real certificates to test finding subject certificates, and correct finding them.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 9da1baa130bf3f414a94f4fa44f097e5e61c20ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da1baa130bf3f414a94f4fa4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 9 13:18:51 2007 -0700 crypt32: Use real certificates to test finding subject certificates, and correct finding them. --- dlls/crypt32/cert.c | 12 ++- dlls/crypt32/tests/cert.c | 400 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 399 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9da1baa130bf3f414a94f…

1 0

Juan Lang : crypt32: Correct loading OID functions from the registry.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 8778b9f506d511c96860f10f9c3f6f37e4dcdd33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8778b9f506d511c96860f10f9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 9 13:18:05 2007 -0700 crypt32: Correct loading OID functions from the registry. --- dlls/crypt32/oid.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 4b51a70..98ced9e 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -177,7 +177,8 @@ static char *CRYPT_GetKeyName(DWORD dwEncodingType, LPCSTR pszFuncName, len = sizeof(szEncodingTypeFmt) + lstrlenA(pszFuncName) + lstrlenA(oid); szKey = CryptMemAlloc(len); if (szKey) - sprintf(szKey, szEncodingTypeFmt, dwEncodingType, pszFuncName, oid); + sprintf(szKey, szEncodingTypeFmt, + GET_CERT_ENCODING_TYPE(dwEncodingType), pszFuncName, oid); return szKey; } @@ -250,7 +251,7 @@ BOOL WINAPI CryptInstallOIDFunctionAddress(HMODULE hModule, func = CryptMemAlloc(sizeof(struct OIDFunction)); if (func) { - func->encoding = dwEncodingType; + func->encoding = GET_CERT_ENCODING_TYPE(dwEncodingType); if (HIWORD(rgFuncEntry[i].pszOID)) { LPSTR oid; @@ -290,7 +291,7 @@ static BOOL CRYPT_GetFuncFromReg(DWORD dwEncodingType, LPCSTR pszOID, DWORD type, size = 0; rc = RegQueryValueExA(key, "FuncName", NULL, &type, NULL, &size); - if (rc == ERROR_MORE_DATA && type == REG_SZ) + if ((!rc || rc == ERROR_MORE_DATA) && type == REG_SZ) { funcName = CryptMemAlloc(size); rc = RegQueryValueExA(key, "FuncName", NULL, &type, @@ -299,7 +300,7 @@ static BOOL CRYPT_GetFuncFromReg(DWORD dwEncodingType, LPCSTR pszOID, else funcName = szFuncName; rc = RegQueryValueExW(key, DllW, NULL, &type, NULL, &size); - if (rc == ERROR_MORE_DATA && type == REG_SZ) + if ((!rc || rc == ERROR_MORE_DATA) && type == REG_SZ) { LPWSTR dllName = CryptMemAlloc(size); @@ -318,7 +319,7 @@ static BOOL CRYPT_GetFuncFromReg(DWORD dwEncodingType, LPCSTR pszOID, lib = LoadLibraryW(dllName); if (lib) { - *ppvFuncAddr = GetProcAddress(lib, szFuncName); + *ppvFuncAddr = GetProcAddress(lib, funcName); if (*ppvFuncAddr) { *phFuncAddr = (HCRYPTOIDFUNCADDR)lib; @@ -368,7 +369,7 @@ BOOL WINAPI CryptGetOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet, EnterCriticalSection(&set->cs); LIST_FOR_EACH_ENTRY(function, &set->functions, struct OIDFunction, next) { - if (function->encoding == dwEncodingType) + if (function->encoding == GET_CERT_ENCODING_TYPE(dwEncodingType)) { if (HIWORD(pszOID)) { @@ -395,6 +396,7 @@ BOOL WINAPI CryptGetOIDFunctionAddress(HCRYPTOIDFUNCSET hFuncSet, if (!*ppvFuncAddr) ret = CRYPT_GetFuncFromReg(dwEncodingType, pszOID, set->name, ppvFuncAddr, phFuncAddr); + TRACE("returning %d\n", ret); return ret; }

1 0

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 August 2007