March 2008 - Wine-commits - list.winehq.org

Andrew Talbot : winecoreaudio.drv: Assign to structs instead of using memcpy.
by Alexandre Julliard 26 Mar '08

26 Mar '08

Module: wine Branch: master Commit: 11f198df0bb54fbf918d025a4dcadb91602a2a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f198df0bb54fbf918d025a4… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 25 22:22:16 2008 +0000 winecoreaudio.drv: Assign to structs instead of using memcpy. --- dlls/winecoreaudio.drv/audio.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 33a5c4f..90d664f 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -855,12 +855,12 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) } wwo->state = WINE_WS_STOPPED; - + wwo->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - - memcpy(&wwo->waveDesc, lpDesc, sizeof(WAVEOPENDESC)); + + wwo->waveDesc = *lpDesc; memcpy(&wwo->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT)); - + if (wwo->format.wBitsPerSample == 0) { WARN("Resetting zeroed wBitsPerSample\n"); wwo->format.wBitsPerSample = 8 * @@ -1450,7 +1450,7 @@ static DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc) * DirectSound clients. However, it only does this if we respond * successfully to the DRV_QUERYDSOUNDDESC message. It's enough to fill in * the driver and device names of the description output parameter. */ - memcpy(desc, &(WOutDev[wDevID].cadev->ds_desc), sizeof(DSDRIVERDESC)); + *desc = WOutDev[wDevID].cadev->ds_desc; return MMSYSERR_NOERROR; } @@ -1837,7 +1837,7 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwi->state = WINE_WS_STOPPED; wwi->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - memcpy(&wwi->waveDesc, lpDesc, sizeof(WAVEOPENDESC)); + wwi->waveDesc = *lpDesc; memcpy(&wwi->format, lpDesc->lpFormat, sizeof(PCMWAVEFORMAT)); if (wwi->format.wBitsPerSample == 0)

1 0

Michael Stefaniuc : mshtml: Update the German translation.
by Alexandre Julliard 26 Mar '08

26 Mar '08

Module: wine Branch: master Commit: 8f82f98299e66f1288bb2837c7f93bec0e16253e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f82f98299e66f1288bb2837c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 26 00:15:27 2008 +0100 mshtml: Update the German translation. --- dlls/mshtml/De.rc | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/De.rc b/dlls/mshtml/De.rc index 5c15b90..f9b5514 100644 --- a/dlls/mshtml/De.rc +++ b/dlls/mshtml/De.rc @@ -42,3 +42,17 @@ FONT 8, "MS Shell Dlg" DEFPUSHBUTTON "&Installieren", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Abbrechen", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP } + +IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Hyperlink" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Hyperlink Informationen", IDC_STATIC, 5, 5, 190, 55 + LTEXT "&Typ:", IDC_STATIC, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&URL:", IDC_STATIC, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +}

1 0

Michael Stefaniuc : shell32: Update the German Translation.
by Alexandre Julliard 26 Mar '08

26 Mar '08

Module: wine Branch: master Commit: 0aeb2f5988a709a7833aff45412afa1e139c400a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aeb2f5988a709a7833aff454… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 26 00:16:59 2008 +0100 shell32: Update the German Translation. --- dlls/shell32/shell32_De.rc | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index 1368d5e..de1e191 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -106,6 +106,24 @@ FONT 8, "MS Shell Dlg" 4, 40, 180, 120 } +SHNEWBRSFORFOLDER_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 218, 196 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK +CAPTION "Verzeichnis ausw�hlen" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDD_TITLE, 10, 8, 198, 24 + LTEXT "", IDD_STATUS, 10, 25, 198, 12 + LTEXT "Verzeichnis:", IDD_FOLDER, 10, 156, 40, 12 + CONTROL "", IDD_TREEVIEW, "SysTreeView32", + TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | + WS_BORDER | WS_TABSTOP, + 12, 38, 194, 105 + EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Neues Verzeichnis erstellen", IDD_MAKENEWFOLDER, 12, 174, 95, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 112, 174, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Abbrechen", IDCANCEL, 161, 174, 45, 14, WS_GROUP | WS_TABSTOP +} + SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Meldung"

1 0

Juan Lang : crypt32: Keep track of state in each message type' s update function rather than in CryptMsgUpdate.
by Alexandre Julliard 26 Mar '08

26 Mar '08

Module: wine Branch: master Commit: 856270972feb000633f8611166d8d4820c81d0ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=856270972feb000633f861116… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 25 11:15:08 2008 -0700 crypt32: Keep track of state in each message type's update function rather than in CryptMsgUpdate. --- dlls/crypt32/msg.c | 40 ++++++++++++++++++++++++---------------- 1 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index f06b8ea..5607f18 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -188,7 +188,9 @@ static BOOL CDataEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, CDataEncodeMsg *msg = (CDataEncodeMsg *)hCryptMsg; BOOL ret = FALSE; - if (msg->base.streamed) + if (msg->base.state == MsgStateFinalized) + SetLastError(CRYPT_E_MSG_ERROR); + else if (msg->base.streamed) { __TRY { @@ -225,11 +227,15 @@ static BOOL CDataEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, } } if (!fFinal) + { ret = msg->base.stream_info.pfnStreamOutput( msg->base.stream_info.pvArg, (BYTE *)pbData, cbData, FALSE); + msg->base.state = MsgStateUpdated; + } else { + msg->base.state = MsgStateFinalized; if (msg->base.stream_info.cbContent == 0xffffffff) { BYTE indefinite_trailer[6] = { 0 }; @@ -265,6 +271,7 @@ static BOOL CDataEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, } else { + msg->base.state = MsgStateFinalized; if (!cbData) SetLastError(E_INVALIDARG); else @@ -504,12 +511,15 @@ static BOOL CHashEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, TRACE("(%p, %p, %d, %d)\n", hCryptMsg, pbData, cbData, fFinal); - if (msg->base.streamed || (msg->base.open_flags & CMSG_DETACHED_FLAG)) + if (msg->base.state == MsgStateFinalized) + SetLastError(CRYPT_E_MSG_ERROR); + else if (msg->base.streamed || (msg->base.open_flags & CMSG_DETACHED_FLAG)) { /* Doesn't do much, as stream output is never called, and you * can't get the content. */ ret = CryptHashData(msg->hash, pbData, cbData, 0); + msg->base.state = fFinal ? MsgStateFinalized : MsgStateUpdated; } else { @@ -529,6 +539,7 @@ static BOOL CHashEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, else ret = FALSE; } + msg->base.state = MsgStateFinalized; } } return ret; @@ -1183,12 +1194,15 @@ static BOOL CSignedEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, CSignedEncodeMsg *msg = (CSignedEncodeMsg *)hCryptMsg; BOOL ret = FALSE; - if (msg->base.streamed || (msg->base.open_flags & CMSG_DETACHED_FLAG)) + if (msg->base.state == MsgStateFinalized) + SetLastError(CRYPT_E_MSG_ERROR); + else if (msg->base.streamed || (msg->base.open_flags & CMSG_DETACHED_FLAG)) { ret = CSignedMsgData_Update(&msg->msg_data, pbData, cbData, fFinal, Sign); if (msg->base.streamed) FIXME("streamed partial stub\n"); + msg->base.state = fFinal ? MsgStateFinalized : MsgStateUpdated; } else { @@ -1211,6 +1225,7 @@ static BOOL CSignedEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, if (ret) ret = CSignedMsgData_Update(&msg->msg_data, pbData, cbData, fFinal, Sign); + msg->base.state = MsgStateFinalized; } } return ret; @@ -1644,11 +1659,14 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, TRACE("(%p, %p, %d, %d)\n", hCryptMsg, pbData, cbData, fFinal); - if (msg->base.streamed) + if (msg->base.state == MsgStateFinalized) + SetLastError(CRYPT_E_MSG_ERROR); + else if (msg->base.streamed) { ret = CDecodeMsg_CopyData(msg, pbData, cbData); FIXME("(%p, %p, %d, %d): streamed update stub\n", hCryptMsg, pbData, cbData, fFinal); + msg->base.state = fFinal ? MsgStateFinalized : MsgStateUpdated; } else { @@ -1659,7 +1677,7 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, ret = CDecodeMsg_CopyData(msg, pbData, cbData); if (ret) ret = CDecodeMsg_DecodeContent(msg, &msg->msg_data, msg->type); - + msg->base.state = MsgStateFinalized; } } return ret; @@ -2360,20 +2378,10 @@ BOOL WINAPI CryptMsgUpdate(HCRYPTMSG hCryptMsg, const BYTE *pbData, DWORD cbData, BOOL fFinal) { CryptMsgBase *msg = (CryptMsgBase *)hCryptMsg; - BOOL ret = FALSE; TRACE("(%p, %p, %d, %d)\n", hCryptMsg, pbData, cbData, fFinal); - if (msg->state == MsgStateFinalized) - SetLastError(CRYPT_E_MSG_ERROR); - else - { - ret = msg->update(hCryptMsg, pbData, cbData, fFinal); - msg->state = MsgStateUpdated; - if (fFinal) - msg->state = MsgStateFinalized; - } - return ret; + return msg->update(hCryptMsg, pbData, cbData, fFinal); } BOOL WINAPI CryptMsgGetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType,

1 0

Juan Lang : crypt32: Allow one update to a decode message after the final update if it' s a detached message.
by Alexandre Julliard 26 Mar '08

26 Mar '08

Module: wine Branch: master Commit: 44f2517335074e61997ddeb595b99c49395ffef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f2517335074e61997ddeb59… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 25 11:44:54 2008 -0700 crypt32: Allow one update to a decode message after the final update if it's a detached message. --- dlls/crypt32/msg.c | 47 ++++++++++++++++++++++++++++++++++++++++----- dlls/crypt32/tests/msg.c | 1 - 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 5607f18..056c698 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -52,6 +52,7 @@ BOOL CRYPT_DefaultMsgControl(HCRYPTMSG hCryptMsg, DWORD dwFlags, typedef enum _CryptMsgState { MsgStateInit, MsgStateUpdated, + MsgStateDataFinalized, MsgStateFinalized } CryptMsgState; @@ -1663,10 +1664,30 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, SetLastError(CRYPT_E_MSG_ERROR); else if (msg->base.streamed) { - ret = CDecodeMsg_CopyData(msg, pbData, cbData); FIXME("(%p, %p, %d, %d): streamed update stub\n", hCryptMsg, pbData, cbData, fFinal); - msg->base.state = fFinal ? MsgStateFinalized : MsgStateUpdated; + if (fFinal) + { + if (msg->base.open_flags & CMSG_DETACHED_FLAG && + msg->base.state != MsgStateDataFinalized) + { + ret = CDecodeMsg_CopyData(msg, pbData, cbData); + msg->base.state = MsgStateDataFinalized; + } + else + { + FIXME("(%p, %p, %d, %d): detached update stub\n", hCryptMsg, + pbData, cbData, fFinal); + ret = TRUE; + msg->base.state = MsgStateFinalized; + } + } + else + { + ret = CDecodeMsg_CopyData(msg, pbData, cbData); + if (msg->base.state == MsgStateInit) + msg->base.state = MsgStateUpdated; + } } else { @@ -1674,10 +1695,24 @@ static BOOL CDecodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData, SetLastError(CRYPT_E_MSG_ERROR); else { - ret = CDecodeMsg_CopyData(msg, pbData, cbData); - if (ret) - ret = CDecodeMsg_DecodeContent(msg, &msg->msg_data, msg->type); - msg->base.state = MsgStateFinalized; + if (msg->base.state == MsgStateInit) + { + ret = CDecodeMsg_CopyData(msg, pbData, cbData); + if (ret) + ret = CDecodeMsg_DecodeContent(msg, &msg->msg_data, + msg->type); + if (msg->base.open_flags & CMSG_DETACHED_FLAG) + msg->base.state = MsgStateDataFinalized; + else + msg->base.state = MsgStateFinalized; + } + else if (msg->base.state == MsgStateDataFinalized) + { + FIXME("(%p, %p, %d, %d): detached update stub\n", hCryptMsg, + pbData, cbData, fFinal); + ret = TRUE; + msg->base.state = MsgStateFinalized; + } } } return ret; diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index fb71540..e88d382 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2062,7 +2062,6 @@ static void test_decode_msg_update(void) /* as does a second (probably to update the detached portion).. */ ret = CryptMsgUpdate(msg, detachedSignedContent, sizeof(detachedSignedContent), TRUE); - todo_wine ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); /* while a third fails. */ ret = CryptMsgUpdate(msg, detachedSignedContent,

1 0

Lei Zhang : msxml3: Fix compiles for systems without libxml2.
by Alexandre Julliard 26 Mar '08

26 Mar '08

Module: wine Branch: master Commit: 724d4b1fad2a213044937f9b658065a35ad7d9c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=724d4b1fad2a213044937f9b6… Author: Lei Zhang <thestig(a)google.com> Date: Tue Mar 25 13:59:46 2008 -0700 msxml3: Fix compiles for systems without libxml2. --- dlls/msxml3/saxreader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index fa4074f..d3bbbd9 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -38,12 +38,12 @@ #include "msxml_private.h" -#include <libxml/SAX2.h> - WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 +#include <libxml/SAX2.h> + typedef struct _saxreader { const struct IVBSAXXMLReaderVtbl *lpVtbl;

1 0

Juan Lang : crypt32: Test updates after the final update to a detached message.
by Alexandre Julliard 26 Mar '08

26 Mar '08

Module: wine Branch: master Commit: 3617819bf6d6ed0f7564f5546e705504ac534f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3617819bf6d6ed0f7564f5546… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 25 11:01:12 2008 -0700 crypt32: Test updates after the final update to a detached message. --- dlls/crypt32/tests/msg.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index ab35b3a..fb71540 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2052,6 +2052,24 @@ static void test_decode_msg_update(void) sizeof(signedWithCertAndCrlBareContent), TRUE); ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); CryptMsgClose(msg); + + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, CMSG_DETACHED_FLAG, 0, 0, + NULL, NULL); + /* The first update succeeds.. */ + ret = CryptMsgUpdate(msg, detachedSignedContent, + sizeof(detachedSignedContent), TRUE); + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + /* as does a second (probably to update the detached portion).. */ + ret = CryptMsgUpdate(msg, detachedSignedContent, + sizeof(detachedSignedContent), TRUE); + todo_wine + ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); + /* while a third fails. */ + ret = CryptMsgUpdate(msg, detachedSignedContent, + sizeof(detachedSignedContent), TRUE); + ok(!ret && GetLastError() == CRYPT_E_MSG_ERROR, + "expected CRYPT_E_MSG_ERROR, got %08x\n", GetLastError()); + CryptMsgClose(msg); } static const BYTE hashParam[] = { 0x08,0xd6,0xc0,0x5a,0x21,0x51,0x2a,0x79,0xa1,

1 0

Lei Zhang : comdlg32: Avoid double free in PRINTDLG_PaperSizeA/W.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 19ed9729db3a73f0860ab621047cafc0a6b41c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19ed9729db3a73f0860ab6210… Author: Lei Zhang <thestig(a)google.com> Date: Tue Mar 25 11:38:07 2008 -0700 comdlg32: Avoid double free in PRINTDLG_PaperSizeA/W. --- dlls/comdlg32/printdlg.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index f2d67b5..5169d1b 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -497,7 +497,6 @@ static BOOL PRINTDLG_PaperSizeA( for (i=0;i<NrOfEntries;i++) if (Words[i] == PaperSize) break; - HeapFree(GetProcessHeap(),0,Words); if (i == NrOfEntries) { FIXME("Papersize %d not found in list?\n",PaperSize); goto out; @@ -555,7 +554,6 @@ static BOOL PRINTDLG_PaperSizeW( for (i=0;i<NrOfEntries;i++) if (!lstrcmpW(PaperSize,Names+(64*i))) break; - HeapFree(GetProcessHeap(),0,Names); if (i==NrOfEntries) { FIXME("Papersize %s not found in list?\n",debugstr_w(PaperSize)); goto out;

1 0

Juan Lang : advapi32: Create MachineGuid value if it doesn't exist.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 9ea9eaaa81dbd852962aedaf341a48634cfe6ae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea9eaaa81dbd852962aedaf3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 25 10:39:22 2008 -0700 advapi32: Create MachineGuid value if it doesn't exist. --- dlls/advapi32/crypt.c | 52 +++++++++++++++++++++++++++++++++++++++++++ dlls/advapi32/tests/crypt.c | 2 - 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 601d095..0fadc78 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -44,6 +44,7 @@ #include "crypt.h" #include "winnls.h" #include "winreg.h" +#include "rpc.h" #include "wine/debug.h" #include "wine/unicode.h" #include "winternl.h" @@ -266,6 +267,54 @@ error: #undef CRYPT_GetProvFuncOpt +static void CRYPT_CreateMachineGuid(void) +{ + static const WCHAR cryptographyW[] = { + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'C','r','y','p','t','o','g','r','a','p','h','y',0 }; + static const WCHAR machineGuidW[] = { + 'M','a','c','h','i','n','e','G','u','i','d',0 }; + LONG r; + HKEY key; + + r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, cryptographyW, 0, KEY_ALL_ACCESS, + &key); + if (!r) + { + DWORD size; + + r = RegQueryValueExW(key, machineGuidW, NULL, NULL, NULL, &size); + if (r == ERROR_FILE_NOT_FOUND) + { + static const WCHAR rpcrt4[] = { + 'r','p','c','r','t','4',0 }; + HMODULE lib = LoadLibraryW(rpcrt4); + + if (lib) + { + RPC_STATUS (RPC_ENTRY *pUuidCreate)(UUID *); + RPC_STATUS (RPC_ENTRY *pUuidToString)(UUID *, WCHAR **); + RPC_STATUS (RPC_ENTRY *pRpcStringFree)(WCHAR **); + UUID uuid; + WCHAR *uuidStr; + + pUuidCreate = GetProcAddress(lib, "UuidCreate"); + pUuidToString = GetProcAddress(lib, "UuidToStringW"); + pRpcStringFree = GetProcAddress(lib, "RpcStringFreeW"); + pUuidCreate(&uuid); + pUuidToString(&uuid, &uuidStr); + RegSetValueExW(key, machineGuidW, 0, REG_SZ, + (const BYTE *)uuidStr, + (lstrlenW(uuidStr)+1)*sizeof(WCHAR)); + pRpcStringFree(&uuidStr); + FreeLibrary(lib); + } + } + RegCloseKey(key); + } +} + /****************************************************************************** * CryptAcquireContextW (ADVAPI32.@) * @@ -309,6 +358,9 @@ BOOL WINAPI CryptAcquireContextW (HCRYPTPROV *phProv, LPCWSTR pszContainer, return FALSE; } + /* Make sure the MachineGuid value exists */ + CRYPT_CreateMachineGuid(); + if (!pszProvider || !*pszProvider) { /* No CSP name specified so try the user default CSP first diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 1832ca1..63163dd 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -907,10 +907,8 @@ static void test_machine_guid(void) /* Check that MachineGuid was created */ size = sizeof(guid); r = RegQueryValueExA(key, "MachineGuid", NULL, NULL, (BYTE *)guid, &size); - todo_wine ok(!r, "expected to find MachineGuid: %d\n", r); r = RegDeleteValueA(key, "MachineGuid"); - todo_wine ok(!r, "RegDeleteValueA failed: %d\n", r); if (restoreGuid) RegSetValueExA(key, "MachineGuid", 0, REG_SZ, (const BYTE *)originalGuid,

1 0

Juan Lang : advapi32: Test the MachineGuid value.
by Alexandre Julliard 25 Mar '08

25 Mar '08

Module: wine Branch: master Commit: 4c984e089a892a49e234bc09a62a2fe3d2178324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c984e089a892a49e234bc09a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 25 10:38:30 2008 -0700 advapi32: Test the MachineGuid value. --- dlls/advapi32/tests/crypt.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index d6453d4..1832ca1 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -871,6 +871,53 @@ static void test_set_provider_ex(void) LocalFree(pszProvName); } +static void test_machine_guid(void) +{ + char originalGuid[40], guid[40]; + LONG r; + HKEY key; + DWORD size; + HCRYPTPROV hCryptProv; + BOOL restoreGuid = FALSE, ret; + + r = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Cryptography", + 0, KEY_ALL_ACCESS, &key); + if (r != ERROR_SUCCESS) + { + skip("couldn't open HKLM\\Software\\Microsoft\\Cryptography\n"); + return; + } + /* Cache existing MachineGuid, and delete it */ + size = sizeof(originalGuid); + r = RegQueryValueExA(key, "MachineGuid", NULL, NULL, (BYTE *)originalGuid, + &size); + if (r == ERROR_SUCCESS) + { + restoreGuid = TRUE; + r = RegDeleteValueA(key, "MachineGuid"); + ok(!r, "RegDeleteValueA failed: %d\n", r); + } + else + ok(r == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", + r); + /* Create and release a provider */ + ret = pCryptAcquireContextA(&hCryptProv, szKeySet, NULL, PROV_RSA_FULL, 0); + ok(ret, "CryptAcquireContextA failed: %08x\n", GetLastError()); + CryptReleaseContext(hCryptProv, 0); + /* Check that MachineGuid was created */ + size = sizeof(guid); + r = RegQueryValueExA(key, "MachineGuid", NULL, NULL, (BYTE *)guid, &size); + todo_wine + ok(!r, "expected to find MachineGuid: %d\n", r); + r = RegDeleteValueA(key, "MachineGuid"); + todo_wine + ok(!r, "RegDeleteValueA failed: %d\n", r); + if (restoreGuid) + RegSetValueExA(key, "MachineGuid", 0, REG_SZ, (const BYTE *)originalGuid, + strlen(originalGuid)+1); + RegCloseKey(key); +} + START_TEST(crypt) { init_function_pointers(); @@ -879,6 +926,7 @@ START_TEST(crypt) test_acquire_context(); test_incorrect_api_usage(); test_verify_sig(); + test_machine_guid(); clean_up_environment(); }

1 0