October 2007 - Wine-commits

Alexandre Julliard : shell32: Use wine_get_dos_file_name instead of duplicating knowledge about the drive symlinks .
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 7f092818f057ce02d0f8c4628cbf7e93c1d69040 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f092818f057ce02d0f8c4628… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 18 14:11:43 2007 +0200 shell32: Use wine_get_dos_file_name instead of duplicating knowledge about the drive symlinks. --- dlls/shell32/shfldr_unixfs.c | 59 ++++++++++-------------------------------- 1 files changed, 14 insertions(+), 45 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index a4f4ade..f780037 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -369,36 +369,6 @@ static inline BOOL UNIXFS_is_pidl_of_type(LPITEMIDLIST pIDL, SHCONTF fFilter) { } /****************************************************************************** - * UNIXFS_is_dos_device [Internal] - * - * Determines if a unix directory corresponds to any dos device. - * - * PARAMS - * statPath [I] The stat struct of the directory, as returned by stat(2). - * - * RETURNS - * TRUE, if statPath corresponds to any dos drive letter - * FALSE, otherwise - */ -static BOOL UNIXFS_is_dos_device(const struct stat *statPath) { - struct stat statDrive; - char *pszDrivePath; - DWORD dwDriveMap; - WCHAR wszDosDevice[4] = { 'A', ':', '\\', 0 }; - - for (dwDriveMap = GetLogicalDrives(); dwDriveMap; dwDriveMap >>= 1, wszDosDevice[0]++) { - if (!(dwDriveMap & 0x1)) continue; - pszDrivePath = wine_get_unix_file_name(wszDosDevice); - if (pszDrivePath && !stat(pszDrivePath, &statDrive)) { - HeapFree(GetProcessHeap(), 0, pszDrivePath); - if ((statPath->st_dev == statDrive.st_dev) && (statPath->st_ino == statDrive.st_ino)) - return TRUE; - } - } - return FALSE; -} - -/****************************************************************************** * UNIXFS_get_unix_path [Internal] * * Convert an absolute dos path to an absolute unix path. @@ -733,9 +703,9 @@ static HRESULT UNIXFS_initialize_target_folder(UnixFolder *This, const char *szB { LPCITEMIDLIST current = pidlSubFolder; DWORD dwPathLen = strlen(szBasePath)+1; - struct stat statPrefix; char *pNextDir; - + WCHAR *dos_name; + /* Determine the path's length bytes */ while (current && current->mkid.cb) { dwPathLen += UNIXFS_filename_from_shitemid(current, NULL) + 1; /* For the '/' */ @@ -755,23 +725,20 @@ static HRESULT UNIXFS_initialize_target_folder(UnixFolder *This, const char *szB pNextDir += strlen(szBasePath); if (This->m_dwPathMode == PATHMODE_UNIX || IsEqualCLSID(&CLSID_MyDocuments, This->m_pCLSID)) This->m_dwAttributes |= SFGAO_FILESYSTEM; - if (!(This->m_dwAttributes & SFGAO_FILESYSTEM)) { - *pNextDir = '\0'; - if (!stat(This->m_pszPath, &statPrefix) && UNIXFS_is_dos_device(&statPrefix)) - This->m_dwAttributes |= SFGAO_FILESYSTEM; - } while (current && current->mkid.cb) { pNextDir += UNIXFS_filename_from_shitemid(current, pNextDir); - if (!(This->m_dwAttributes & SFGAO_FILESYSTEM)) { - *pNextDir = '\0'; - if (!stat(This->m_pszPath, &statPrefix) && UNIXFS_is_dos_device(&statPrefix)) - This->m_dwAttributes |= SFGAO_FILESYSTEM; - } *pNextDir++ = '/'; current = ILGetNext(current); } *pNextDir='\0'; - + + if (!(This->m_dwAttributes & SFGAO_FILESYSTEM) && + ((dos_name = wine_get_dos_file_name(This->m_pszPath)))) + { + This->m_dwAttributes |= SFGAO_FILESYSTEM; + HeapFree( GetProcessHeap(), 0, dos_name ); + } + return S_OK; } @@ -1050,11 +1017,13 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_GetAttributesOf(IShellFolder2* if pszRelativePath = szAbsolutePath + lstrlenA(szAbsolutePath); for (i=0; i<cidl; i++) { if (!(This->m_dwAttributes & SFGAO_FILESYSTEM)) { - struct stat fileStat; + WCHAR *dos_name; if (!UNIXFS_filename_from_shitemid(apidl[i], pszRelativePath)) return E_INVALIDARG; - if (stat(szAbsolutePath, &fileStat) || !UNIXFS_is_dos_device(&fileStat)) + if (!(dos_name = wine_get_dos_file_name( szAbsolutePath ))) *rgfInOut &= ~SFGAO_FILESYSTEM; + else + HeapFree( GetProcessHeap(), 0, dos_name ); } if (_ILIsFolder(apidl[i])) *rgfInOut |= SFGAO_FOLDER|SFGAO_HASSUBFOLDER|SFGAO_FILESYSANCESTOR;

1 0

Alexandre Julliard : Fix redundant uses of MAKEINTRESOURCE.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 41cf63148af21722e8b85c216b60ec4998cb2c1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=41cf63148af21722e8b85c216… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 18 14:12:05 2007 +0200 Fix redundant uses of MAKEINTRESOURCE. --- dlls/ole32/tests/ole2.c | 2 +- dlls/shell32/tests/systray.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 6732c13..4eb6be6 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1175,7 +1175,7 @@ static void test_data_cache(void) fmtetc.cfFormat = CF_METAFILEPICT; stgmedium.tymed = TYMED_MFPICT; U(stgmedium).hMetaFilePict = OleMetafilePictFromIconAndLabel( - LoadIcon(NULL, MAKEINTRESOURCE(IDI_APPLICATION)), wszPath, wszPath, 0); + LoadIcon(NULL, IDI_APPLICATION), wszPath, wszPath, 0); stgmedium.pUnkForRelease = NULL; fmtetc.dwAspect = DVASPECT_CONTENT; diff --git a/dlls/shell32/tests/systray.c b/dlls/shell32/tests/systray.c index b80b109..9c97a4e 100644 --- a/dlls/shell32/tests/systray.c +++ b/dlls/shell32/tests/systray.c @@ -83,7 +83,7 @@ START_TEST(systray) wc.cbWndExtra = 0; wc.hInstance = GetModuleHandleA(NULL); wc.hIcon = NULL; - wc.hCursor = LoadCursorA(NULL, MAKEINTRESOURCEA(IDC_IBEAM)); + wc.hCursor = LoadCursorA(NULL, IDC_IBEAM); wc.hbrBackground = GetSysColorBrush(COLOR_WINDOW); wc.lpszMenuName = NULL; wc.lpszClassName = "MyTestWnd";

1 0

EA Durbin : kernel32: Partially implement GetUserGeoID().
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 9984ac8a12e0d78ca9cfa33db7340ff1a8e60f71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9984ac8a12e0d78ca9cfa33db… Author: EA Durbin <ead1234(a)hotmail.com> Date: Tue Oct 16 21:06:46 2007 -0500 kernel32: Partially implement GetUserGeoID(). --- dlls/kernel32/locale.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 6624f81..1ecda49 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3500,8 +3500,36 @@ BOOL WINAPI InvalidateNLSCache(void) */ GEOID WINAPI GetUserGeoID( GEOCLASS GeoClass ) { - FIXME("%d\n",GeoClass); - return GEOID_NOT_AVAILABLE; + GEOID ret = GEOID_NOT_AVAILABLE; + static const WCHAR geoW[] = {'G','e','o',0}; + static const WCHAR nationW[] = {'N','a','t','i','o','n',0}; + WCHAR bufferW[40], *end; + DWORD count; + HANDLE hkey, hSubkey = 0; + UNICODE_STRING keyW; + const KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)bufferW; + RtlInitUnicodeString( &keyW, nationW ); + count = sizeof(bufferW); + + if(!(hkey = create_registry_key())) return ret; + + switch( GeoClass ){ + case GEOCLASS_NATION: + if ((hSubkey = NLS_RegOpenKey(hkey, geoW))) + { + if((NtQueryValueKey(hSubkey, &keyW, KeyValuePartialInformation, + (LPBYTE)bufferW, count, &count) == STATUS_SUCCESS ) && info->DataLength) + ret = strtolW((LPCWSTR)info->Data, &end, 10); + } + break; + case GEOCLASS_REGION: + FIXME("GEOCLASS_REGION not handled yet\n"); + break; + } + + NtClose(hkey); + if (hSubkey) NtClose(hSubkey); + return ret; } /******************************************************************************

1 0

Evan Teran : shell32: Fix typo in GlobalAlloc parameters.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 6b3c0ecf2e968621ff6b21b4fa8d11d55187cbb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b3c0ecf2e968621ff6b21b4f… Author: Evan Teran <evan.teran(a)gmail.com> Date: Thu Oct 18 02:12:34 2007 -0400 shell32: Fix typo in GlobalAlloc parameters. --- dlls/shell32/shell32_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index b974f8d..63f81f3 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -97,7 +97,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) /* Return the path to the executable */ DWORD len, size=16; - hargv=GlobalAlloc(size, 0); + hargv=GlobalAlloc(0, size); argv=GlobalLock(hargv); for (;;) {

1 0

Dmitry Timoshkov : user32: Add more listbox message tests, make them pass under Wine.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 566ce8f5edd314d31a2f76f10da51d8674a66112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=566ce8f5edd314d31a2f76f10… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 16 22:23:34 2007 +0900 user32: Add more listbox message tests, make them pass under Wine. --- dlls/user32/listbox.c | 81 +++++++++++++++++++++++++++++++----------- dlls/user32/tests/msg.c | 91 ++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 138 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=566ce8f5edd314d31a2f7…

1 0

Alex Villacís Lasso : user32: Fix EM_SETLIMITTEXT with zeroed args.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 48fd106ea17bc37aed9f7d2166d329824ed2dfb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48fd106ea17bc37aed9f7d216… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Oct 16 15:25:51 2007 -0500 user32: Fix EM_SETLIMITTEXT with zeroed args. --- dlls/user32/edit.c | 37 +++++++++++-------------------------- 1 files changed, 11 insertions(+), 26 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index b11bf10..6ea843e 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -65,9 +65,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(edit); WINE_DECLARE_DEBUG_CHANNEL(combo); WINE_DECLARE_DEBUG_CHANNEL(relay); -#define BUFLIMIT_MULTI 65534 /* maximum buffer size (not including '\0') - FIXME: BTW, new specs say 65535 (do you dare ???) */ -#define BUFLIMIT_SINGLE 32766 /* maximum buffer size (not including '\0') */ +#define BUFLIMIT_INITIAL 30000 /* initial buffer size */ #define GROWLENGTH 32 /* buffers granularity in bytes: must be power of 2 */ #define ROUND_TO_GROW(size) (((size) + (GROWLENGTH - 1)) & ~(GROWLENGTH - 1)) #define HSCROLL_FRACTION 3 /* scroll window by 1/3 width */ @@ -247,7 +245,7 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action); static void EDIT_EM_ScrollCaret(EDITSTATE *es); static void EDIT_EM_SetHandle(EDITSTATE *es, HLOCAL hloc); static void EDIT_EM_SetHandle16(EDITSTATE *es, HLOCAL16 hloc); -static void EDIT_EM_SetLimitText(EDITSTATE *es, INT limit); +static void EDIT_EM_SetLimitText(EDITSTATE *es, UINT limit); static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, WORD left, WORD right, BOOL repaint); static void EDIT_EM_SetPasswordChar(EDITSTATE *es, WCHAR c); static void EDIT_EM_SetSel(EDITSTATE *es, UINT start, UINT end, BOOL after_wrap); @@ -650,7 +648,7 @@ static LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, case EM_LIMITTEXT16: case EM_SETLIMITTEXT: - EDIT_EM_SetLimitText(es, (INT)wParam); + EDIT_EM_SetLimitText(es, wParam); break; case EM_CANUNDO16: @@ -3203,7 +3201,7 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replac /* Issue the EN_MAXTEXT notification and continue with replacing text * such that buffer limit is honored. */ - if ((honor_limit) && (es->buffer_limit > 0) && (size > es->buffer_limit)) { + if ((honor_limit) && (size > es->buffer_limit)) { EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); strl = es->buffer_limit - (tl - (e-s)); } @@ -3649,27 +3647,14 @@ static void EDIT_EM_SetHandle16(EDITSTATE *es, HLOCAL16 hloc) * * EM_SETLIMITTEXT * - * FIXME: in WinNT maxsize is 0x7FFFFFFF / 0xFFFFFFFF - * However, the windows version is not complied to yet in all of edit.c + * NOTE: this version currently implements WinNT limits * - * Additionally as the wrapper for RichEdit controls we need larger buffers - * at present -1 will represent nolimit */ -static void EDIT_EM_SetLimitText(EDITSTATE *es, INT limit) +static void EDIT_EM_SetLimitText(EDITSTATE *es, UINT limit) { - if (limit == 0xFFFFFFFF) - es->buffer_limit = -1; - else if (es->style & ES_MULTILINE) { - if (limit) - es->buffer_limit = min(limit, BUFLIMIT_MULTI); - else - es->buffer_limit = BUFLIMIT_MULTI; - } else { - if (limit) - es->buffer_limit = min(limit, BUFLIMIT_SINGLE); - else - es->buffer_limit = BUFLIMIT_SINGLE; - } + if (!limit) limit = ~0u; + if (!(es->style & ES_MULTILINE)) limit = min(limit, 0x7ffffffe); + es->buffer_limit = limit; } @@ -4792,7 +4777,7 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs, BOOL unicode) es->style &= ~ES_UPPERCASE; } if (es->style & ES_MULTILINE) { - es->buffer_limit = BUFLIMIT_MULTI; + es->buffer_limit = BUFLIMIT_INITIAL; if (es->style & WS_VSCROLL) es->style |= ES_AUTOVSCROLL; if (es->style & WS_HSCROLL) @@ -4806,7 +4791,7 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs, BOOL unicode) es->style &= ~ES_AUTOHSCROLL; } } else { - es->buffer_limit = BUFLIMIT_SINGLE; + es->buffer_limit = BUFLIMIT_INITIAL; if ((es->style & ES_RIGHT) && (es->style & ES_CENTER)) es->style &= ~ES_CENTER; es->style &= ~WS_HSCROLL;

1 0

Detlef Riekenberg : spoolss: Return a magic number as HANDLE in RevertToPrinterSelf.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: c2b52a11f4cf2c38a68e7771a6b1f30fc4a27f92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2b52a11f4cf2c38a68e7771a… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Oct 17 22:55:56 2007 +0200 spoolss: Return a magic number as HANDLE in RevertToPrinterSelf. --- dlls/spoolss/spoolss_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c index 15a86c8..2fee59e 100644 --- a/dlls/spoolss/spoolss_main.c +++ b/dlls/spoolss/spoolss_main.c @@ -175,7 +175,7 @@ BOOL WINAPI ImpersonatePrinterClient(HANDLE hToken) HANDLE WINAPI RevertToPrinterSelf(void) { FIXME("() stub\n"); - return NULL; + return (HANDLE) 0xdead0947; } /******************************************************************

1 0

Nigel Liang : wininet: Release object in HttpEndRequestW after use.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 7d2ac2039b3212b1a2b6dccdda3fc0640787a696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2ac2039b3212b1a2b6dccdd… Author: Nigel Liang <ncliang(a)gmail.com> Date: Wed Oct 17 17:07:41 2007 -0700 wininet: Release object in HttpEndRequestW after use. --- dlls/wininet/http.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 454d332..70239f7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -830,6 +830,8 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, if (NULL == lpwhr || lpwhr->hdr.htype != WH_HHTTPREQ) { INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); + if (lpwhr) + WININET_Release( &lpwhr->hdr ); return FALSE; } @@ -881,6 +883,7 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest, } } + WININET_Release( &lpwhr->hdr ); TRACE("%i <--\n",rc); return rc; }

1 0

Mikolaj Zalewski : msi: Make the WriteEnvironmentStrings handling of [~] a bit better.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: d5b620ea0bde2c60696c72e2d6d33a8b4aacd1f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b620ea0bde2c60696c72e2d… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Oct 17 18:22:16 2007 -0700 msi: Make the WriteEnvironmentStrings handling of [~] a bit better. --- dlls/msi/action.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 0b3374d..80caaac 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4757,12 +4757,13 @@ static UINT ACTION_InstallODBC( MSIPACKAGE *package ) #define check_flag_combo(x, y) ((x) & ~(y)) == (y) -static LONG env_set_flags( LPCWSTR *name, LPWSTR *value, DWORD *flags ) +static LONG env_set_flags( LPCWSTR *name, LPCWSTR *value, DWORD *flags ) { LPCWSTR cptr = *name; - LPWSTR ptr = *value; + LPCWSTR ptr = *value; static const WCHAR prefix[] = {'[','~',']',0}; + static const int prefix_len = 3; *flags = 0; while (*cptr) @@ -4790,18 +4791,18 @@ static LONG env_set_flags( LPCWSTR *name, LPWSTR *value, DWORD *flags ) return ERROR_FUNCTION_FAILED; } - if (!strncmpW(ptr, prefix, lstrlenW(prefix))) + if (!strncmpW(ptr, prefix, prefix_len)) { - *flags |= ENV_MOD_PREFIX; + *flags |= ENV_MOD_APPEND; *value += lstrlenW(prefix); } - else + else if (lstrlenW(*value) >= prefix_len) { - ptr += lstrlenW(ptr) - lstrlenW(prefix) - 1; + ptr += lstrlenW(ptr) - prefix_len; if (!lstrcmpW(ptr, prefix)) { - *flags |= ENV_MOD_APPEND; - *ptr = '\0'; + *flags |= ENV_MOD_PREFIX; + /* the "[~]" will be removed by deformat_string */; } } @@ -4823,7 +4824,7 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) MSIPACKAGE *package = param; LPCWSTR name, value, comp; LPWSTR data = NULL, newval = NULL; - LPWSTR deformatted, ptr; + LPWSTR deformatted = NULL, ptr; DWORD flags, type, size; LONG res; HKEY env = NULL, root = HKEY_CURRENT_USER; @@ -4840,14 +4841,17 @@ static UINT ITERATE_WriteEnvironmentString( MSIRECORD *rec, LPVOID param ) value = MSI_RecordGetString(rec, 3); comp = MSI_RecordGetString(rec, 4); - deformat_string(package, value, &deformatted); - if (!deformatted) - return ERROR_OUTOFMEMORY; - - res = env_set_flags(&name, &deformatted, &flags); + res = env_set_flags(&name, &value, &flags); if (res != ERROR_SUCCESS) goto done; + deformat_string(package, value, &deformatted); + if (!deformatted) + { + res = ERROR_OUTOFMEMORY; + goto done; + } + value = deformatted; if (flags & ENV_MOD_MACHINE)

1 0

Juan Lang : crypt32: Always return an empty list on failure from CryptGetDefaultOIDDllList.
by Alexandre Julliard 18 Oct '07

18 Oct '07

Module: wine Branch: master Commit: 63e1ac4eac6d8de1a829b2064f8420885febd8d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63e1ac4eac6d8de1a829b2064… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 17 09:34:14 2007 -0700 crypt32: Always return an empty list on failure from CryptGetDefaultOIDDllList. --- dlls/crypt32/oid.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index f4d254d..ccc4f68 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -208,7 +208,7 @@ BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet, else { /* No value, return an empty list */ - if (*pcchDllList) + if (pwszDllList && *pcchDllList) *pwszDllList = '\0'; *pcchDllList = 1; } @@ -216,8 +216,10 @@ BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet, } else { - SetLastError(rc); - ret = FALSE; + /* No value, return an empty list */ + if (pwszDllList && *pcchDllList) + *pwszDllList = '\0'; + *pcchDllList = 1; } CryptMemFree(keyName);

1 0