January 2009 - Wine-Commits

Alasdair Sinclair : kernel32/tests: Fix missing void in empty parameter list.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: 116886cf0a52962380ed55f03d0bf089c1b70521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=116886cf0a52962380ed55f03… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Tue Jan 27 23:35:55 2009 +0000 kernel32/tests: Fix missing void in empty parameter list. --- dlls/kernel32/tests/profile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 3cd8af1..b07bfc8 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -355,7 +355,7 @@ static void test_profile_existing(void) ok( DeleteFile(testfile2), "delete failed\n" ); } -static void test_profile_delete_on_close() +static void test_profile_delete_on_close(void) { static CHAR testfile[] = ".\\testwine5.ini"; HANDLE h;

1 0

Alasdair Sinclair : dwmapi: Fix missing void in empty parameter list.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: d7804483ae3c907a010af4dab4c6e6cb7ceed66e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7804483ae3c907a010af4dab… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Tue Jan 27 23:35:48 2009 +0000 dwmapi: Fix missing void in empty parameter list. --- dlls/dwmapi/dwmapi_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 4961c0b..d7d6f5b 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -93,7 +93,7 @@ HRESULT WINAPI DwmGetColorizationColor(DWORD *colorization, BOOL opaque_blend) /********************************************************************** * DwmFlush (DWMAPI.@) */ -HRESULT WINAPI DwmFlush() +HRESULT WINAPI DwmFlush(void) { FIXME("() stub\n");

1 0

Alasdair Sinclair : ddraw/tests: Fix missing void in empty parameter list.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: 8a46be6cee0eadd08fa71d99fca87b6295765865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a46be6cee0eadd08fa71d99f… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Tue Jan 27 23:35:40 2009 +0000 ddraw/tests: Fix missing void in empty parameter list. --- dlls/ddraw/tests/d3d.c | 2 +- dlls/ddraw/tests/visual.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 6cd9e56..aeae559 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1635,7 +1635,7 @@ static void D3D7_OldRenderStateTest(void) #define IS_VALUE_NEAR(a, b) ( ((a) == (b)) || ((a) == (b) - 1) || ((a) == (b) + 1) ) #define MIN(a, b) ((a) < (b) ? (a) : (b)) -static void DeviceLoadTest() +static void DeviceLoadTest(void) { DDSURFACEDESC2 ddsd; IDirectDrawSurface7 *texture_levels[2][8]; diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 7820e5e..1bac1b7 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -2167,7 +2167,7 @@ static BOOL colortables_check_equality(PALETTEENTRY table1[256], RGBQUAD table2[ return TRUE; } -static void p8_primary_test() +static void p8_primary_test(void) { /* Test 8bit mode used by games like StarCraft, C&C Red Alert I etc */ DDSURFACEDESC ddsd;

1 0

Alasdair Sinclair : d3d9/tests: Fix missing void in empty parameter list.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: f95b0209ab7417e059079e2eeb8f04017eddd892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f95b0209ab7417e059079e2ee… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Tue Jan 27 23:35:31 2009 +0000 d3d9/tests: Fix missing void in empty parameter list. --- dlls/d3d9/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 135ceba..702b776 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1973,7 +1973,7 @@ struct formats x8r8g8b8_format_list[] = { 0, 0, 0} }; -static void test_display_formats() +static void test_display_formats(void) { /* Direct3D9 offers 4 display formats R5G6B5, X1R5G5B5, X8R8G8B8 and A2R10G10B10. * Next to these there are 6 different backbuffer formats. Only a fixed number of

1 0

Anders Jonsson : wineconsole: Fix typos in Swedish resources.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: cbeff91bd0c4008b5b05dbc4fe3691318e6c0036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbeff91bd0c4008b5b05dbc4f… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Jan 28 00:16:11 2009 +0100 wineconsole: Fix typos in Swedish resources. --- programs/wineconsole/wineconsole_Sv.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/wineconsole_Sv.rc b/programs/wineconsole/wineconsole_Sv.rc index f7291c0..e80719e 100644 --- a/programs/wineconsole/wineconsole_Sv.rc +++ b/programs/wineconsole/wineconsole_Sv.rc @@ -22,7 +22,7 @@ STRINGTABLE BEGIN IDS_EDIT, "R&edigera" IDS_DEFAULT, "St�ll in s&tandardv�rden" -IDS_PROPERTIES, "&Egenskaper" +IDS_PROPERTIES, "E&genskaper" IDS_MARK, "&Markera" IDS_COPY, "&Kopiera" IDS_PASTE, "Klistra &in" @@ -48,7 +48,7 @@ IDS_USAGE_HEADER "\nAnv IDS_USAGE_BACKEND " --backend={user|curses} V�lj user f�r att starta ett nytt f�nster,\n"\ " curses f�r att ange aktuell terminal som en Wine-konsoll\n" IDS_USAGE_COMMAND " <kommando> Wine-program att starta i konsollen\n" -IDS_USAGE_FOOTER "\nExempel:\n wineconsole kmd\nStartar Wines kommandoprompt i en Wine-konsoll\n\n" +IDS_USAGE_FOOTER "\nExempel:\n wineconsole cmd\nStartar Wines kommandoprompt i en Wine-konsoll\n\n" END

1 0

Anders Jonsson : view: Add Swedish translation.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: 7243f4863a57df4f35cf786685fe5048a0b4e30e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7243f4863a57df4f35cf78668… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Tue Jan 27 23:48:47 2009 +0100 view: Add Swedish translation. --- programs/view/Sv.rc | 70 +++++++++++++++++++++++++++++++++++++++++++++++ programs/view/viewrc.rc | 1 + 2 files changed, 71 insertions(+), 0 deletions(-) diff --git a/programs/view/Sv.rc b/programs/view/Sv.rc new file mode 100644 index 0000000..b1bb50d --- /dev/null +++ b/programs/view/Sv.rc @@ -0,0 +1,70 @@ +/* + * View + * Swedish Language Support + * + * Copyright 2009 Anders Jonsson + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +/* + * + * Menu + * + */ + +VIEW MENU +BEGIN + POPUP "&Arkiv" + BEGIN + MENUITEM "&�ppna", IDM_OPEN + MENUITEM "&Avsluta", IDM_EXIT + END + POPUP "&Panorera" + BEGIN + MENUITEM "&Skala till f�nster", IDM_SET_EXT_TO_WIN + MENUITEM SEPARATOR + MENUITEM "&V�nster", IDM_LEFT + MENUITEM "&H�ger", IDM_RIGHT + MENUITEM "&Upp", IDM_UP + MENUITEM "&Ner", IDM_DOWN + END +END + + +/* + * + * Accelerator + * + */ + +VIEW ACCELERATORS +BEGIN + "Q", IDM_EXIT, VIRTKEY, CONTROL +END + + +/* + * + * String Table + * + */ + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Regular Metafile viewer" +END diff --git a/programs/view/viewrc.rc b/programs/view/viewrc.rc index 18354fb..7b104fa 100644 --- a/programs/view/viewrc.rc +++ b/programs/view/viewrc.rc @@ -37,6 +37,7 @@ #include "Ro.rc" #include "Ru.rc" #include "Si.rc" +#include "Sv.rc" #include "Tr.rc" #include "Zh.rc"

1 0

Mikołaj Zalewski : comctl32: toolbar: Make sure all TBUTTON_INFO fields are initialized when a button is added in the middle .
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: d31828b500f3146caa35315e8cffc4a3c2ad20ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31828b500f3146caa35315e8… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Jan 27 21:30:40 2009 +0100 comctl32: toolbar: Make sure all TBUTTON_INFO fields are initialized when a button is added in the middle. --- dlls/comctl32/toolbar.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 1ca9c8f..df5b19d 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3789,6 +3789,7 @@ TOOLBAR_InsertButtonT(HWND hwnd, WPARAM wParam, LPARAM lParam, BOOL fUnicode) (infoPtr->nNumButtons - nIndex - 1) * sizeof(TBUTTON_INFO)); /* insert new button */ + ZeroMemory(&infoPtr->buttons[nIndex], sizeof(infoPtr->buttons[nIndex])); infoPtr->buttons[nIndex].iBitmap = lpTbb->iBitmap; infoPtr->buttons[nIndex].idCommand = lpTbb->idCommand; infoPtr->buttons[nIndex].fsState = lpTbb->fsState;

1 0

Marcus Meissner : d3d9: Initialize hr (Coverity).
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: ace65a527fe330e065265c9cb52f6f79b3040459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ace65a527fe330e065265c9cb… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Jan 26 22:16:21 2009 +0100 d3d9: Initialize hr (Coverity). --- dlls/d3d9/device.c | 2 +- dlls/d3d9/tests/visual.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index aff0643..9c5290d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1338,7 +1338,7 @@ static IDirect3DVertexDeclaration9 *getConvertedDecl(IDirect3DDevice9Impl *This, static HRESULT WINAPI IDirect3DDevice9Impl_SetFVF(LPDIRECT3DDEVICE9EX iface, DWORD FVF) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - HRESULT hr; + HRESULT hr = S_OK; TRACE("(%p) Relay\n" , This); EnterCriticalSection(&d3d9_cs); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d87f3e1..f7e41e0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -292,6 +292,9 @@ static void lighting_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed with %08x\n", hr); + hr = IDirect3DDevice9_SetFVF(device, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %08x\n", hr); + hr = IDirect3DDevice9_SetFVF(device, fvf); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF returned %08x\n", hr);

1 0

Juan Lang : crypt32: Implement CryptFindCertificateKeyProvInfo.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: 1352f6d316da3a95b73ca3f31eb44190a20adca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1352f6d316da3a95b73ca3f31… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jan 27 09:01:06 2009 -0800 crypt32: Implement CryptFindCertificateKeyProvInfo. --- dlls/crypt32/cert.c | 213 +++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/crypt32.spec | 1 + 2 files changed, 214 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 5c2c786..c677556 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -27,6 +27,7 @@ #include "winnls.h" #include "rpc.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -718,6 +719,218 @@ BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT pCert, return ret; } +static BOOL key_prov_info_matches_cert(PCCERT_CONTEXT pCert, + const CRYPT_KEY_PROV_INFO *keyProvInfo) +{ + HCRYPTPROV csp; + BOOL matches = FALSE; + + if (CryptAcquireContextW(&csp, keyProvInfo->pwszContainerName, + keyProvInfo->pwszProvName, keyProvInfo->dwProvType, keyProvInfo->dwFlags)) + { + DWORD size; + + /* Need to sign something to verify the sig. What to sign? Why not + * the certificate itself? + */ + if (CryptSignAndEncodeCertificate(csp, AT_SIGNATURE, + pCert->dwCertEncodingType, X509_CERT_TO_BE_SIGNED, pCert->pCertInfo, + &pCert->pCertInfo->SignatureAlgorithm, NULL, NULL, &size)) + { + BYTE *certEncoded = CryptMemAlloc(size); + + if (certEncoded) + { + if (CryptSignAndEncodeCertificate(csp, AT_SIGNATURE, + pCert->dwCertEncodingType, X509_CERT_TO_BE_SIGNED, + pCert->pCertInfo, &pCert->pCertInfo->SignatureAlgorithm, + NULL, certEncoded, &size)) + { + if (size == pCert->cbCertEncoded && + !memcmp(certEncoded, pCert->pbCertEncoded, size)) + matches = TRUE; + } + CryptMemFree(certEncoded); + } + } + CryptReleaseContext(csp, 0); + } + return matches; +} + +static BOOL container_matches_cert(PCCERT_CONTEXT pCert, LPCSTR container, + CRYPT_KEY_PROV_INFO *keyProvInfo) +{ + CRYPT_KEY_PROV_INFO copy; + WCHAR containerW[MAX_PATH]; + BOOL matches = FALSE; + + MultiByteToWideChar(CP_ACP, 0, container, -1, + containerW, sizeof(containerW) / sizeof(containerW[0])); + /* We make a copy of the CRYPT_KEY_PROV_INFO because the caller expects + * keyProvInfo->pwszContainerName to be NULL or a heap-allocated container + * name. + */ + memcpy(&copy, keyProvInfo, sizeof(copy)); + copy.pwszContainerName = containerW; + matches = key_prov_info_matches_cert(pCert, &copy); + if (matches) + { + keyProvInfo->pwszContainerName = + CryptMemAlloc((strlenW(containerW) + 1) * sizeof(WCHAR)); + if (keyProvInfo->pwszContainerName) + { + strcpyW(keyProvInfo->pwszContainerName, containerW); + keyProvInfo->dwKeySpec = AT_SIGNATURE; + } + else + matches = FALSE; + } + return matches; +} + +/* Searches the provider named keyProvInfo.pwszProvName for a container whose + * private key matches pCert's public key. Upon success, updates keyProvInfo + * with the matching container's info (free keyProvInfo.pwszContainerName upon + * success.) + * Returns TRUE if found, FALSE if not. + */ +static BOOL find_key_prov_info_in_provider(PCCERT_CONTEXT pCert, + CRYPT_KEY_PROV_INFO *keyProvInfo) +{ + HCRYPTPROV defProvider; + BOOL ret, found = FALSE; + char containerA[MAX_PATH]; + + assert(keyProvInfo->pwszContainerName == NULL); + if ((ret = CryptAcquireContextW(&defProvider, NULL, + keyProvInfo->pwszProvName, keyProvInfo->dwProvType, + keyProvInfo->dwFlags | CRYPT_VERIFYCONTEXT))) + { + DWORD enumFlags = keyProvInfo->dwFlags | CRYPT_FIRST; + + while (ret && !found) + { + DWORD size = sizeof(containerA); + + ret = CryptGetProvParam(defProvider, PP_ENUMCONTAINERS, + (BYTE *)containerA, &size, enumFlags); + if (ret) + found = container_matches_cert(pCert, containerA, keyProvInfo); + if (enumFlags & CRYPT_FIRST) + { + enumFlags &= ~CRYPT_FIRST; + enumFlags |= CRYPT_NEXT; + } + } + CryptReleaseContext(defProvider, 0); + } + return found; +} + +static BOOL find_matching_provider(PCCERT_CONTEXT pCert, DWORD dwFlags) +{ + BOOL found = FALSE, ret = TRUE; + DWORD index = 0, cbProvName = 0; + CRYPT_KEY_PROV_INFO keyProvInfo; + + TRACE("(%p, %08x)\n", pCert, dwFlags); + + memset(&keyProvInfo, 0, sizeof(keyProvInfo)); + while (ret && !found) + { + DWORD size = 0; + + ret = CryptEnumProvidersW(index, NULL, 0, &keyProvInfo.dwProvType, + NULL, &size); + if (ret) + { + if (size <= cbProvName) + ret = CryptEnumProvidersW(index, NULL, 0, + &keyProvInfo.dwProvType, keyProvInfo.pwszProvName, &size); + else + { + CryptMemFree(keyProvInfo.pwszProvName); + keyProvInfo.pwszProvName = CryptMemAlloc(size); + if (keyProvInfo.pwszProvName) + { + cbProvName = size; + ret = CryptEnumProvidersW(index, NULL, 0, + &keyProvInfo.dwProvType, keyProvInfo.pwszProvName, &size); + if (ret) + { + if (dwFlags & CRYPT_FIND_SILENT_KEYSET_FLAG) + keyProvInfo.dwFlags |= CRYPT_SILENT; + if (dwFlags & CRYPT_FIND_USER_KEYSET_FLAG || + !(dwFlags & (CRYPT_FIND_USER_KEYSET_FLAG | + CRYPT_FIND_MACHINE_KEYSET_FLAG))) + { + keyProvInfo.dwFlags |= CRYPT_USER_KEYSET; + found = find_key_prov_info_in_provider(pCert, + &keyProvInfo); + } + if (!found) + { + if (dwFlags & CRYPT_FIND_MACHINE_KEYSET_FLAG || + !(dwFlags & (CRYPT_FIND_USER_KEYSET_FLAG | + CRYPT_FIND_MACHINE_KEYSET_FLAG))) + { + keyProvInfo.dwFlags &= ~CRYPT_USER_KEYSET; + keyProvInfo.dwFlags |= CRYPT_MACHINE_KEYSET; + found = find_key_prov_info_in_provider(pCert, + &keyProvInfo); + } + } + } + } + else + ret = FALSE; + } + index++; + } + } + if (found) + CertSetCertificateContextProperty(pCert, CERT_KEY_PROV_INFO_PROP_ID, + 0, &keyProvInfo); + CryptMemFree(keyProvInfo.pwszProvName); + CryptMemFree(keyProvInfo.pwszContainerName); + return found; +} + +static BOOL cert_prov_info_matches_cert(PCCERT_CONTEXT pCert) +{ + BOOL matches = FALSE; + DWORD size; + + if (CertGetCertificateContextProperty(pCert, CERT_KEY_PROV_INFO_PROP_ID, + NULL, &size)) + { + CRYPT_KEY_PROV_INFO *keyProvInfo = CryptMemAlloc(size); + + if (keyProvInfo) + { + if (CertGetCertificateContextProperty(pCert, + CERT_KEY_PROV_INFO_PROP_ID, keyProvInfo, &size)) + matches = key_prov_info_matches_cert(pCert, keyProvInfo); + CryptMemFree(keyProvInfo); + } + } + return matches; +} + +BOOL WINAPI CryptFindCertificateKeyProvInfo(PCCERT_CONTEXT pCert, + DWORD dwFlags, void *pvReserved) +{ + BOOL matches = FALSE; + + TRACE("(%p, %08x, %p)\n", pCert, dwFlags, pvReserved); + + matches = cert_prov_info_matches_cert(pCert); + if (!matches) + matches = find_matching_provider(pCert, dwFlags); + return matches; +} + BOOL WINAPI CertCompareCertificate(DWORD dwCertEncodingType, PCERT_INFO pCertId1, PCERT_INFO pCertId2) { diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index ea2b6fa..3591d17 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -118,6 +118,7 @@ @ stub CryptExportPKCS8 @ stdcall CryptExportPublicKeyInfo(long long long ptr ptr) @ stdcall CryptExportPublicKeyInfoEx(long long long str long ptr ptr ptr) +@ stdcall CryptFindCertificateKeyProvInfo(ptr long ptr) @ stdcall CryptFindLocalizedName(wstr) @ stdcall CryptFindOIDInfo(long ptr long) @ stdcall CryptFormatObject(long long long ptr str ptr long ptr ptr)

1 0

Juan Lang : crypt32: Implement CertFindCertificateInStore for CERT_FIND_PUBLIC_KEY.
by Alexandre Julliard Jan. 28, 2009

Jan. 28, 2009

Module: wine Branch: master Commit: bf0406cf3a2f9450983e4b48537dfe9f12fdf707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf0406cf3a2f9450983e4b485… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jan 27 09:00:40 2009 -0800 crypt32: Implement CertFindCertificateInStore for CERT_FIND_PUBLIC_KEY. --- dlls/crypt32/cert.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 3d2b3de..5c2c786 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -966,6 +966,17 @@ static BOOL compare_cert_by_name(PCCERT_CONTEXT pCertContext, DWORD dwType, return ret; } +static BOOL compare_cert_by_public_key(PCCERT_CONTEXT pCertContext, + DWORD dwType, DWORD dwFlags, const void *pvPara) +{ + CERT_PUBLIC_KEY_INFO *publicKey = (CERT_PUBLIC_KEY_INFO *)pvPara; + BOOL ret; + + ret = CertComparePublicKeyInfo(pCertContext->dwCertEncodingType, + &pCertContext->pCertInfo->SubjectPublicKeyInfo, publicKey); + return ret; +} + static BOOL compare_cert_by_subject_cert(PCCERT_CONTEXT pCertContext, DWORD dwType, DWORD dwFlags, const void *pvPara) { @@ -1201,6 +1212,9 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, case CERT_COMPARE_NAME: compare = compare_cert_by_name; break; + case CERT_COMPARE_PUBLIC_KEY: + compare = compare_cert_by_public_key; + break; case CERT_COMPARE_SUBJECT_CERT: compare = compare_cert_by_subject_cert; break;

1 0