ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change calls to CLSIDFromString to SHCLSIDFromStringW except in 

SHCLSIDFromStringW for the time being.
This commit is contained in:
Rolf Kalbermatter 2002-12-16 23:48:30 +00:00 committed by Alexandre Julliard
parent 866d79c11f
commit 65a3de5aa3
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/shell32/pidl.c
View File

@ -1163,12 +1163,9 @@ LPITEMIDLIST _ILCreateValue(WIN32_FIND_DATAA * stffile)
LPITEMIDLIST _ILCreateSpecial(LPCSTR szGUID) LPITEMIDLIST _ILCreateSpecial(LPCSTR szGUID)
{ {
IID iid; IID iid;
WCHAR buffer[40];
if (!MultiByteToWideChar( CP_ACP, 0, szGUID, -1, buffer, sizeof(buffer)/sizeof(WCHAR) )) if (!SUCCEEDED(SHCLSIDFromStringA(szGUID, &iid)))
return NULL; {
if (! SUCCEEDED (CLSIDFromString( buffer, &iid ))) {
ERR("%s is not a GUID\n", szGUID); ERR("%s is not a GUID\n", szGUID);
return NULL; return NULL;
} }

1
dlls/shell32/shellole.c
View File

@ -42,7 +42,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DEFAULT_DEBUG_CHANNEL(shell);
DWORD WINAPI SHCLSIDFromStringA (LPCSTR clsid, CLSID *id);
extern HRESULT WINAPI IFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); extern HRESULT WINAPI IFSFolder_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv);
const WCHAR sShell32[12] = {'S','H','E','L','L','3','2','.','D','L','L','\0'}; const WCHAR sShell32[12] = {'S','H','E','L','L','3','2','.','D','L','L','\0'};

2
dlls/shell32/shfldr_desktop.c
View File

@ -205,7 +205,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface,
if (lpszDisplayName[0] == ':' && lpszDisplayName[1] == ':') { if (lpszDisplayName[0] == ':' && lpszDisplayName[1] == ':') {
szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH);
TRACE ("-- element: %s\n", debugstr_w (szElement)); TRACE ("-- element: %s\n", debugstr_w (szElement));
CLSIDFromString (szElement + 2, &clsid); SHCLSIDFromStringW (szElement + 2, &clsid);
pidlTemp = _ILCreate (PT_MYCOMP, &clsid, sizeof (clsid)); pidlTemp = _ILCreate (PT_MYCOMP, &clsid, sizeof (clsid));
} else if (PathGetDriveNumberW (lpszDisplayName) >= 0) { } else if (PathGetDriveNumberW (lpszDisplayName) >= 0) {
/* it's a filesystem path with a drive. Let MyComputer parse it */ /* it's a filesystem path with a drive. Let MyComputer parse it */