September 2006 - Wine-Commits

Jan Zerebecki : wininet: Fix fd leak on failure case.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 91bbec013bc449ff3343a3bfee1710b4145d414a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=91bbec013bc449ff3343a3b… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Wed Sep 6 10:46:10 2006 +0200 wininet: Fix fd leak on failure case. --- dlls/wininet/ftp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 62f60c1..8fd48ce 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2420,6 +2420,7 @@ static BOOL FTP_DoPassive(LPWININETFTPSE if (connect(nsocket, (struct sockaddr *)&dataSocketAddress, sizeof(dataSocketAddress))) { ERR("can't connect passive FTP data port.\n"); + closesocket(nsocket); goto lend; } lpwfs->pasvSocket = nsocket;

1 0

Jan Zerebecki : wineoss: Remove "please report" from a trace.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 1ee1d819f90fc8d77974ee22757eca9ecd7f9707 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1ee1d819f90fc8d77974ee2… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Wed Sep 6 10:45:46 2006 +0200 wineoss: Remove "please report" from a trace. --- dlls/winmm/wineoss/midi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c index aab1438..9ea61c6 100644 --- a/dlls/winmm/wineoss/midi.c +++ b/dlls/winmm/wineoss/midi.c @@ -260,7 +260,7 @@ LRESULT OSS_MidiInit(void) */ if (sinfo.capabilities & SYNTH_CAP_INPUT) { - FIXME("Synthesizer support MIDI in. Not supported yet (please report)\n"); + FIXME("Synthesizer supports MIDI in. Not yet supported.\n"); } TRACE("SynthOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%ld\n"

1 0

Jan Zerebecki : winefile: Fix the display of free disk space in the statusbar.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 66e0e06b98a570950ecf3164183f3e32a76d03be URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=66e0e06b98a570950ecf316… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Wed Sep 6 10:45:02 2006 +0200 winefile: Fix the display of free disk space in the statusbar. --- programs/winefile/winefile.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 8b03f1e..3ec614e 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2941,11 +2941,11 @@ static void format_bytes(LPTSTR buffer, float fBytes = (float)bytes; if (bytes >= 1073741824) /* 1 GB */ - wsprintf(buffer, sFmtGB, fBytes/1073741824.f+.5f); + _stprintf(buffer, sFmtGB, fBytes/1073741824.f+.5f); else if (bytes >= 1048576) /* 1 MB */ - wsprintf(buffer, sFmtMB, fBytes/1048576.f+.5f); + _stprintf(buffer, sFmtMB, fBytes/1048576.f+.5f); else if (bytes >= 1024) /* 1 kB */ - wsprintf(buffer, sFmtkB, fBytes/1024.f+.5f); + _stprintf(buffer, sFmtkB, fBytes/1024.f+.5f); else _stprintf(buffer, sLongNumFmt, bytes); }

1 0

Hippocrates Sendoukas : riched20: WM_CONTEXTMENU fix for custom context menus.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 0ad5638bf14677b7ec0b5a7497c85262d116c8f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0ad5638bf14677b7ec0b5a7… Author: Hippocrates Sendoukas <hsendoukas(a)hotmail.com> Date: Sat Sep 2 20:08:46 2006 -0700 riched20: WM_CONTEXTMENU fix for custom context menus. --- dlls/riched20/editor.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index fa43e1f..4ea6cc0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1077,13 +1077,13 @@ ME_KeyDown(ME_TextEditor *editor, WORD n return FALSE; } -static void ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) +static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) { CHARRANGE selrange; HMENU menu; int seltype = 0; if(!editor->lpOleCallback) - return; + return FALSE; ME_GetSelection(editor, (int *)&selrange.cpMin, (int *)&selrange.cpMax); if(selrange.cpMin == selrange.cpMax) seltype |= SEL_EMPTY; @@ -1099,6 +1099,7 @@ static void ME_ShowContextMenu(ME_TextEd TrackPopupMenu(menu, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, GetParent(editor->hWnd), NULL); DestroyMenu(menu); } + return TRUE; } ME_TextEditor *ME_MakeEditor(HWND hWnd) { @@ -2335,7 +2336,8 @@ LRESULT WINAPI RichEditANSIWndProc(HWND ME_SelectWord(editor); break; case WM_CONTEXTMENU: - ME_ShowContextMenu(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); + if (!ME_ShowContextMenu(editor, (short)LOWORD(lParam), (short)HIWORD(lParam))) + goto do_default; break; case WM_PAINT: if (editor->bRedraw)

1 0

Jan Zerebecki : regedit: Also refresh the listview.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 2a42379a8e956619001f7b4ac557ef618ccdd8ac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a42379a8e956619001f7b4… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Wed Sep 6 10:44:33 2006 +0200 regedit: Also refresh the listview. --- programs/regedit/framewnd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 9dd73fd..a04b0c0 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -795,7 +795,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT } case ID_VIEW_REFRESH: RefreshTreeView(g_pChildWnd->hTreeWnd); - /*RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, NULL); */ + RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath, NULL); break; /*case ID_OPTIONS_TOOLBAR:*/ /* toggle_child(hWnd, LOWORD(wParam), hToolBar);*/

1 0

Jan Zerebecki : winmm: Prevent NULL dereference in MCI_Close and add testcase for it.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 6698e9e0b0ede4aed2b5e333feb79ab0a62d2539 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6698e9e0b0ede4aed2b5e33… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Wed Sep 6 10:43:24 2006 +0200 winmm: Prevent NULL dereference in MCI_Close and add testcase for it. --- dlls/winmm/mci.c | 5 ++-- dlls/winmm/tests/Makefile.in | 1 + dlls/winmm/tests/mci.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 dlls/winmm/tests/mci.c diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index b981ab0..7b44966 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1797,8 +1797,9 @@ static DWORD MCI_Close(UINT16 wDevID, DW MCI_UnLoadMciDriver(wmd); if (dwParam & MCI_NOTIFY) - mciDriverNotify((HWND)lpParms->dwCallback, wDevID, - (dwRet == 0) ? MCI_NOTIFY_SUCCESSFUL : MCI_NOTIFY_FAILURE); + mciDriverNotify(lpParms ? (HWND)lpParms->dwCallback : 0, + wDevID, + dwRet ? MCI_NOTIFY_FAILURE : MCI_NOTIFY_SUCCESSFUL); return dwRet; } diff --git a/dlls/winmm/tests/Makefile.in b/dlls/winmm/tests/Makefile.in index e002f37..2865116 100644 --- a/dlls/winmm/tests/Makefile.in +++ b/dlls/winmm/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = winmm user32 kernel32 CTESTS = \ capture.c \ + mci.c \ mixer.c \ mmio.c \ timer.c \ diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c new file mode 100644 index 0000000..4b608a7 --- /dev/null +++ b/dlls/winmm/tests/mci.c @@ -0,0 +1,51 @@ +/* + * Test winmm mci + * + * Copyright 2006 Jan Zerebecki + * + * 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 + */ + +#include "wine/test.h" +#include "winuser.h" +#include "mmsystem.h" + +START_TEST(mci) +{ + int err; + const char command_open[] = "open new type waveaudio alias mysound"; + const char command_close_my[] = "close mysound notify"; + const char command_close_all[] = "close all notify"; + MSG msg; + + err = mciSendString(command_open, NULL, 0, NULL); + ok(!err,"mciSendString(%s, NULL, 0 , NULL) returned error: %d\n", command_open, err); + + err = mciSendString(command_close_my, NULL, 0, NULL); + ok(!err,"mciSendString(%s, NULL, 0 , NULL) returned error: %d\n", command_close_my, err); + + ok(PeekMessageW( &msg, (HWND)-1, 0, 0, PM_REMOVE ), "PeekMessage should succeed\n"); + ok(msg.hwnd == NULL, "got %p instead of NULL\n", msg.hwnd); + ok(msg.message == MM_MCINOTIFY, "got %04x instead of MM_MCINOTIFY\n", msg.message); + ok(msg.wParam == MCI_NOTIFY_SUCCESSFUL, "got %08x instead of MCI_NOTIFY_SUCCESSFUL\n", msg.wParam); + + err = mciSendString(command_close_all, NULL, 0, NULL); + todo_wine ok(!err,"mciSendString(%s, NULL, 0 , NULL) returned error: %d\n", command_close_all, err); + + err = mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, 0); + todo_wine ok(err == MCIERR_INVALID_DEVICE_ID, + "mciSendCommand(MCI_ALL_DEVICE_ID, MCI_CLOSE, MCI_NOTIFY, NULL) returned %d instead of %d\n", + err, MCIERR_INVALID_DEVICE_ID); +}

1 0

Hippocrates Sendoukas : riched20: ME_SetSelection -1 to -1 behavior fix.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 0134e8f7d01d9d73fa63fa3eadfdf7b95801eda9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0134e8f7d01d9d73fa63fa3… Author: Hippocrates Sendoukas <hsendoukas(a)hotmail.com> Date: Sat Sep 2 20:12:06 2006 -0700 riched20: ME_SetSelection -1 to -1 behavior fix. --- dlls/riched20/caret.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index bdab179..725172d 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -90,6 +90,14 @@ void ME_SetSelection(ME_TextEditor *edit ME_ClearTempStyle(editor); return; } + if (from == -1 && to == -1) /*-1,-1 means put the selection at the end of the text */ + { + editor->pCursors[1].pRun = editor->pCursors[0].pRun = ME_FindItemBack(editor->pBuffer->pLast, diRun); + editor->pCursors[1].nOffset = editor->pCursors[0].nOffset = 0; + ME_InvalidateSelection(editor); + ME_ClearTempStyle(editor); + return; + } if (from == -1) { editor->pCursors[1] = editor->pCursors[0];

1 0

James Hawkins : msi: Store the CustomActionData for deferred custom actions .
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 0405e9d2d438878ab52bf6c0c52f522410163f0b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0405e9d2d438878ab52bf6c… Author: James Hawkins <truiken(a)gmail.com> Date: Sun Sep 3 20:13:46 2006 -0700 msi: Store the CustomActionData for deferred custom actions. --- dlls/msi/custom.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 4c824bf..dad67a2 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -117,6 +117,31 @@ static BOOL check_execution_scheduling_o return TRUE; } +/* stores the CustomActionData before the action: + * [CustomActionData]Action + */ +LPWSTR msi_get_deferred_action(LPCWSTR action, LPWSTR actiondata) +{ + LPWSTR deferred; + DWORD len; + + static const WCHAR begin[] = {'[',0}; + static const WCHAR end[] = {']',0}; + + if (!actiondata) + return strdupW(action); + + len = lstrlenW(action) + lstrlenW(actiondata) + 3; + deferred = msi_alloc(len * sizeof(WCHAR)); + + lstrcpyW(deferred, begin); + lstrcatW(deferred, actiondata); + lstrcatW(deferred, end); + lstrcatW(deferred, action); + + return deferred; +} + UINT ACTION_CustomAction(MSIPACKAGE *package,LPCWSTR action, BOOL execute) { UINT rc = ERROR_SUCCESS; @@ -128,8 +153,18 @@ UINT ACTION_CustomAction(MSIPACKAGE *pac '=',' ','\'','%','s','\'',0}; UINT type; LPCWSTR source, target; + LPWSTR ptr, deferred_data = NULL; + LPWSTR action_copy = strdupW(action); WCHAR *deformated=NULL; + /* deferred action: [CustomActionData]Action */ + if ((ptr = strchrW(action_copy, ']'))) + { + deferred_data = action_copy + 1; + *ptr = '\0'; + action = ptr + 1; + } + row = MSI_QueryGetRecord( package->db, ExecSeqQuery, action ); if (!row) return ERROR_CALL_NOT_IMPLEMENTED; @@ -160,18 +195,22 @@ UINT ACTION_CustomAction(MSIPACKAGE *pac } if (!execute) { + LPWSTR actiondata = msi_dup_property(package, action); + LPWSTR deferred = msi_get_deferred_action(action, actiondata); + if (type & msidbCustomActionTypeCommit) { TRACE("Deferring Commit Action!\n"); - schedule_action(package, COMMIT_SCRIPT, action); + schedule_action(package, COMMIT_SCRIPT, deferred); } else { TRACE("Deferring Action!\n"); - schedule_action(package, INSTALL_SCRIPT, action); + schedule_action(package, INSTALL_SCRIPT, deferred); } rc = ERROR_SUCCESS; + msi_free(deferred); goto end; } else @@ -182,7 +221,9 @@ UINT ACTION_CustomAction(MSIPACKAGE *pac 'C','u','s','t','o','m','A','c','t','i','o','n','D','a','t','a',0}; static const WCHAR szBlank[] = {0}; LPWSTR actiondata = msi_dup_property( package, action ); - if (actiondata) + if (deferred_data) + MSI_SetPropertyW(package,szActionData,deferred_data); + else if (actiondata) MSI_SetPropertyW(package,szActionData,actiondata); else MSI_SetPropertyW(package,szActionData,szBlank); @@ -235,6 +276,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *pac } end: + msi_free(action_copy); msiobj_release(&row->hdr); return rc; }

1 0

James Hawkins : crypt32: Simplify CRYPT_AsnDecodeUnicodeNameValueInternal, getting rid of a warning.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: 382d06794b40391b0cf7961dec89260735897dde URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=382d06794b40391b0cf7961… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Aug 30 14:08:38 2006 -0700 crypt32: Simplify CRYPT_AsnDecodeUnicodeNameValueInternal, getting rid of a warning. --- dlls/crypt32/decode.c | 104 ++++++++++++++++++++++++------------------------- 1 files changed, 51 insertions(+), 53 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index d1e4006..4e20de4 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1511,67 +1511,65 @@ static BOOL WINAPI CRYPT_AsnDecodeUnicod break; default: SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + + if (!value) + *pcbStructInfo = bytesNeeded; + else if (*pcbStructInfo < bytesNeeded) + { + *pcbStructInfo = bytesNeeded; + SetLastError(ERROR_MORE_DATA); ret = FALSE; } - if (ret) + else { - if (!value) - *pcbStructInfo = bytesNeeded; - else if (*pcbStructInfo < bytesNeeded) - { - *pcbStructInfo = bytesNeeded; - SetLastError(ERROR_MORE_DATA); - ret = FALSE; - } - else + *pcbStructInfo = bytesNeeded; + value->dwValueType = valueType; + if (dataLen) { - *pcbStructInfo = bytesNeeded; - value->dwValueType = valueType; - if (dataLen) - { - DWORD i; - LPWSTR str = (LPWSTR)value->Value.pbData; + DWORD i; + LPWSTR str = (LPWSTR)value->Value.pbData; - assert(value->Value.pbData); - switch (pbEncoded[0]) - { - case ASN_NUMERICSTRING: - case ASN_PRINTABLESTRING: - case ASN_IA5STRING: - case ASN_T61STRING: - case ASN_VIDEOTEXSTRING: - case ASN_GRAPHICSTRING: - case ASN_VISIBLESTRING: - case ASN_GENERALSTRING: - value->Value.cbData = dataLen * 2; - for (i = 0; i < dataLen; i++) - str[i] = pbEncoded[1 + lenBytes + i]; - break; - case ASN_UNIVERSALSTRING: - value->Value.cbData = dataLen / 2; - for (i = 0; i < dataLen / 4; i++) - str[i] = (pbEncoded[1 + lenBytes + 2 * i + 2] << 8) - | pbEncoded[1 + lenBytes + 2 * i + 3]; - break; - case ASN_BMPSTRING: - value->Value.cbData = dataLen; - for (i = 0; i < dataLen / 2; i++) - str[i] = (pbEncoded[1 + lenBytes + 2 * i] << 8) | - pbEncoded[1 + lenBytes + 2 * i + 1]; - break; - case ASN_UTF8STRING: - value->Value.cbData = MultiByteToWideChar(CP_UTF8, 0, - (LPSTR)pbEncoded + 1 + lenBytes, dataLen, - str, bytesNeeded - sizeof(CERT_NAME_VALUE)) * 2; - break; - } - } - else + assert(value->Value.pbData); + switch (pbEncoded[0]) { - value->Value.cbData = 0; - value->Value.pbData = NULL; + case ASN_NUMERICSTRING: + case ASN_PRINTABLESTRING: + case ASN_IA5STRING: + case ASN_T61STRING: + case ASN_VIDEOTEXSTRING: + case ASN_GRAPHICSTRING: + case ASN_VISIBLESTRING: + case ASN_GENERALSTRING: + value->Value.cbData = dataLen * 2; + for (i = 0; i < dataLen; i++) + str[i] = pbEncoded[1 + lenBytes + i]; + break; + case ASN_UNIVERSALSTRING: + value->Value.cbData = dataLen / 2; + for (i = 0; i < dataLen / 4; i++) + str[i] = (pbEncoded[1 + lenBytes + 2 * i + 2] << 8) + | pbEncoded[1 + lenBytes + 2 * i + 3]; + break; + case ASN_BMPSTRING: + value->Value.cbData = dataLen; + for (i = 0; i < dataLen / 2; i++) + str[i] = (pbEncoded[1 + lenBytes + 2 * i] << 8) | + pbEncoded[1 + lenBytes + 2 * i + 1]; + break; + case ASN_UTF8STRING: + value->Value.cbData = MultiByteToWideChar(CP_UTF8, 0, + (LPSTR)pbEncoded + 1 + lenBytes, dataLen, + str, bytesNeeded - sizeof(CERT_NAME_VALUE)) * 2; + break; } } + else + { + value->Value.cbData = 0; + value->Value.pbData = NULL; + } } } return ret;

1 0

James Hawkins : crypt32: Simplify CRYPT_AsnDecodeNameValueInternal, getting rid of a warning.
by Alexandre Julliard Sept. 7, 2006

Sept. 7, 2006

Module: wine Branch: master Commit: a9670e371e8d582147980a743c0073e95e5ac8ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a9670e371e8d582147980a7… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Aug 30 14:08:32 2006 -0700 crypt32: Simplify CRYPT_AsnDecodeNameValueInternal, getting rid of a warning. --- dlls/crypt32/decode.c | 117 ++++++++++++++++++++++++------------------------- 1 files changed, 57 insertions(+), 60 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 04e2df2..d1e4006 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1324,8 +1324,7 @@ static BOOL WINAPI CRYPT_AsnDecodeNameVa case ASN_UNIVERSALSTRING: FIXME("ASN_UNIVERSALSTRING: unimplemented\n"); SetLastError(CRYPT_E_ASN1_BADTAG); - ret = FALSE; - break; + return FALSE; case ASN_BMPSTRING: valueType = CERT_RDN_BMP_STRING; bytesNeeded += dataLen; @@ -1337,75 +1336,73 @@ static BOOL WINAPI CRYPT_AsnDecodeNameVa break; default: SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + + if (!value) + *pcbStructInfo = bytesNeeded; + else if (*pcbStructInfo < bytesNeeded) + { + *pcbStructInfo = bytesNeeded; + SetLastError(ERROR_MORE_DATA); ret = FALSE; } - if (ret) + else { - if (!value) - *pcbStructInfo = bytesNeeded; - else if (*pcbStructInfo < bytesNeeded) - { - *pcbStructInfo = bytesNeeded; - SetLastError(ERROR_MORE_DATA); - ret = FALSE; - } - else + *pcbStructInfo = bytesNeeded; + value->dwValueType = valueType; + if (dataLen) { - *pcbStructInfo = bytesNeeded; - value->dwValueType = valueType; - if (dataLen) - { - DWORD i; + DWORD i; - assert(value->Value.pbData); - switch (pbEncoded[0]) - { - case ASN_OCTETSTRING: - case ASN_NUMERICSTRING: - case ASN_PRINTABLESTRING: - case ASN_IA5STRING: - case ASN_T61STRING: - case ASN_VIDEOTEXSTRING: - case ASN_GRAPHICSTRING: - case ASN_VISIBLESTRING: - case ASN_GENERALSTRING: - value->Value.cbData = dataLen; - if (dataLen) - { - if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) - memcpy(value->Value.pbData, - pbEncoded + 1 + lenBytes, dataLen); - else - value->Value.pbData = (LPBYTE)pbEncoded + 1 + - lenBytes; - } - break; - case ASN_BMPSTRING: + assert(value->Value.pbData); + switch (pbEncoded[0]) + { + case ASN_OCTETSTRING: + case ASN_NUMERICSTRING: + case ASN_PRINTABLESTRING: + case ASN_IA5STRING: + case ASN_T61STRING: + case ASN_VIDEOTEXSTRING: + case ASN_GRAPHICSTRING: + case ASN_VISIBLESTRING: + case ASN_GENERALSTRING: + value->Value.cbData = dataLen; + if (dataLen) { - LPWSTR str = (LPWSTR)value->Value.pbData; - - value->Value.cbData = dataLen; - for (i = 0; i < dataLen / 2; i++) - str[i] = (pbEncoded[1 + lenBytes + 2 * i] << 8) | - pbEncoded[1 + lenBytes + 2 * i + 1]; - break; + if (!(dwFlags & CRYPT_DECODE_NOCOPY_FLAG)) + memcpy(value->Value.pbData, + pbEncoded + 1 + lenBytes, dataLen); + else + value->Value.pbData = (LPBYTE)pbEncoded + 1 + + lenBytes; } - case ASN_UTF8STRING: - { - LPWSTR str = (LPWSTR)value->Value.pbData; + break; + case ASN_BMPSTRING: + { + LPWSTR str = (LPWSTR)value->Value.pbData; - value->Value.cbData = MultiByteToWideChar(CP_UTF8, 0, - (LPSTR)pbEncoded + 1 + lenBytes, dataLen, - str, bytesNeeded - sizeof(CERT_NAME_VALUE)) * 2; - break; - } - } + value->Value.cbData = dataLen; + for (i = 0; i < dataLen / 2; i++) + str[i] = (pbEncoded[1 + lenBytes + 2 * i] << 8) | + pbEncoded[1 + lenBytes + 2 * i + 1]; + break; } - else + case ASN_UTF8STRING: { - value->Value.cbData = 0; - value->Value.pbData = NULL; + LPWSTR str = (LPWSTR)value->Value.pbData; + + value->Value.cbData = MultiByteToWideChar(CP_UTF8, 0, + (LPSTR)pbEncoded + 1 + lenBytes, dataLen, + str, bytesNeeded - sizeof(CERT_NAME_VALUE)) * 2; + break; } + } + } + else + { + value->Value.cbData = 0; + value->Value.pbData = NULL; } } }

1 0