Changeset 797 for trunk/src

Timestamp:

Sep 2, 1999, 8:18:59 PM (26 years ago)

Author:

phaller

Message:

.

Location:

trunk/src/shell32/new

Files:

• shell.cpp (modified) (1 diff)
• shell32_main.cpp (modified) (1 diff)
• shellord.cpp (modified) (14 diffs)
• shellpath.cpp (modified) (26 diffs)

trunk/src/shell32/new/shell.cpp

@@ -33 +33 @@
 #include "imagelist.h"
 
+#include <heapstring.h>
 #include <misc.h>
 

trunk/src/shell32/new/shell32_main.cpp

@@ -32 +32 @@
 #include "wine/undocshell.h"
 
+#include <heapstring.h>
 #include <misc.h>
 

trunk/src/shell32/new/shellord.cpp

@@ -24 +24 @@
 #include "wine/undocshell.h"
 
+#include <heapstring.h>
 #include <misc.h>
 
@@ -227 +228 @@
 {
         if (VERSION_OsIsUnicode())
-          return OleStrToStrNW (lpOut, nOut, lpIn, nIn);
-        return OleStrToStrNA (lpOut, nOut, lpIn, nIn);
+          return OleStrToStrNW ((LPWSTR)lpOut, nOut, (LPCWSTR)lpIn, nIn);
+        return OleStrToStrNA ((LPSTR)lpOut, nOut, (LPCWSTR)lpIn, nIn);
 }
 
@@ -254 +255 @@
 {
         if (VERSION_OsIsUnicode())
-          return StrToOleStrNW (lpWide, nWide, lpStr, nStr);
-        return StrToOleStrNA (lpWide, nWide, lpStr, nStr);
+          return StrToOleStrNW (lpWide, nWide, (LPWSTR)lpStr, nStr);
+        return StrToOleStrNA (lpWide, nWide, (LPSTR)lpStr, nStr);
 }
 
@@ -300 +301 @@
           pszText = (LPWSTR)idText;
 
-        FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY ,szText,0,0,szTemp,256,args);
+        FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY,
+                szText,
+                0,
+                0,
+                szTemp,
+                256,
+                (LPDWORD)args);
         return MessageBoxW(hwnd,szTemp,szTitle,uType);
 }
@@ -325 +332 @@
           pszText = (LPSTR)idText;
 
-        FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY ,pszText,0,0,szTemp,256,args);
+        FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY ,pszText,0,0,szTemp,256,(LPDWORD)args);
         return MessageBoxA(hwnd,szTemp,pszTitle,uType);
 }
@@ -432 +439 @@
 
 #ifdef MEM_DEBUG
-        ret = (LPVOID) HeapAlloc(GetProcessHeap(),0,len+6);
+        ret = (LPBYTE) HeapAlloc(GetProcessHeap(),0,len+6);
 #else
-        ret = (LPVOID) HeapAlloc(GetProcessHeap(),0,len);
+        ret = (LPBYTE) HeapAlloc(GetProcessHeap(),0,len);
 #endif
 
@@ -651 +658 @@
 BOOL WINAPI ShellExecuteExAW (LPVOID sei)
 {       if (VERSION_OsIsUnicode())
-          return ShellExecuteExW (sei);
-        return ShellExecuteExA (sei);
+          return ShellExecuteExW ((LPSHELLEXECUTEINFOW)sei);
+        return ShellExecuteExA ((LPSHELLEXECUTEINFOA)sei);
 }
 /*************************************************************************
@@ -691 +698 @@
         /* process the IDList */
         if ( (sei->fMask & SEE_MASK_INVOKEIDLIST) == SEE_MASK_INVOKEIDLIST) /*0x0c*/
-        { SHGetPathFromIDListA (sei->lpIDList,szApplicationName);
+        { SHGetPathFromIDListA ((LPCITEMIDLIST)sei->lpIDList,szApplicationName);
           TRACE("-- idlist=%p (%s)\n", sei->lpIDList, szApplicationName);
         }
@@ -699 +706 @@
             pos = strstr(szCommandline, "%I");
             if (pos)
-            { HGLOBAL hmem = SHAllocShared ( sei->lpIDList, ILGetSize(sei->lpIDList), 0);
+            { HGLOBAL hmem = SHAllocShared ( sei->lpIDList, ILGetSize((LPCITEMIDLIST)sei->lpIDList), 0);
               sprintf(szPidl,":%li",(DWORD)SHLockShared(hmem,0) );
               SHUnlockShared(hmem);
@@ -879 +886 @@
 {       WARN("0x%04x %s %p %p semi-stub\n",
                 hkey, debugstr_w(lpszSubKey), lpszData, lpcbData);
-        return RegQueryValueW( hkey, lpszSubKey, lpszData, lpcbData );
+        return RegQueryValueW( hkey, lpszSubKey, lpszData, (LPLONG)lpcbData );
 }
 
@@ -894 +901 @@
         WARN("0x%04x %s %p %p %p %p semi-stub\n",
                 hkey, debugstr_w(pszValue), pdwReserved, pdwType, pvData, pcbData);
-        ret = RegQueryValueExW ( hkey, pszValue, pdwReserved, pdwType, pvData, pcbData);
+        ret = RegQueryValueExW ( hkey, pszValue, pdwReserved, pdwType, (LPBYTE)pvData, pcbData);
         return ret;
 }
@@ -996 +1003 @@
             if (pidl)
             {
-              lstrcpynAtoW((LPWSTR)dest, ((LPCSTR)&pidl->mkid)+src->u.uOffset, len);
+              lstrcpynAtoW((LPWSTR)dest, ((LPSTR)&pidl->mkid)+src->u.uOffset, len);
             }
             break;
@@ -1290 +1297 @@
 {
         if (VERSION_OsIsUnicode())
-          return StrToOleStrW (lpWideCharStr, lpString);
-        return StrToOleStrA (lpWideCharStr, lpString);
+          return StrToOleStrW (lpWideCharStr, (LPCWSTR)lpString);
+        return StrToOleStrA (lpWideCharStr, (LPCSTR)lpString);
 }
 
@@ -1323 +1330 @@
 {
         if (VERSION_OsIsUnicode())
-          return DoEnvironmentSubstW(x, y);
-        return DoEnvironmentSubstA(x, y);
-}
-
+          return DoEnvironmentSubstW((LPWSTR)x, (LPWSTR)y);
+        return DoEnvironmentSubstA((LPSTR)x, (LPSTR)y);
+}
+

trunk/src/shell32/new/shellpath.cpp

@@ -21 +21 @@
 #include "shell32_main.h"
 
+#include <heapstring.h>
 #include <misc.h>
 
@@ -66 +67 @@
 BOOL WINAPI PathIsRootAW(LPCVOID x)
 {       if (VERSION_OsIsUnicode())
-          return PathIsRootW(x);
-        return PathIsRootA(x);
+          return PathIsRootW((LPWSTR)x);
+        return PathIsRootA((LPSTR)x);
 
 }
@@ -112 +113 @@
 LPCVOID WINAPI PathFindExtensionAW(LPCVOID path)
 {       if (VERSION_OsIsUnicode())
-          return PathFindExtensionW(path);
-        return PathFindExtensionA(path);
+          return PathFindExtensionW((LPWSTR)path);
+        return PathFindExtensionA((LPSTR)path);
 
 }
@@ -139 +140 @@
         TRACE("%p->%s\n",path,debugstr_w(path));
 
-        len = CRTDLL_wcslen(path);
+        len = lstrlenW(path);
         if (len && path[len-1]!=(WCHAR)'\\')
         { path[len]  = (WCHAR)'\\';
@@ -149 +150 @@
 LPVOID WINAPI PathAddBackslashAW(LPVOID path)
 {       if(VERSION_OsIsUnicode())
-          return PathAddBackslashW(path);
-        return PathAddBackslashA(path);
+          return PathAddBackslashW((LPWSTR)path);
+        return PathAddBackslashA((LPSTR)path);
 }
 
@@ -179 +180 @@
         while (*x==' ') x++;
         if (x!=str)
-          CRTDLL_wcscpy(str,x);
+          lstrcpyW(str,x);
         if (!*str)
           return str;
-        x=str+CRTDLL_wcslen(str)-1;
+        x=str+lstrlenW(str)-1;
         while (*x==' ')
           x--;
@@ -191 +192 @@
 LPVOID WINAPI PathRemoveBlanksAW(LPVOID str)
 {       if(VERSION_OsIsUnicode())
-          return PathRemoveBlanksW(str);
-        return PathRemoveBlanksA(str);
+          return PathRemoveBlanksW((LPWSTR)str);
+        return PathRemoveBlanksA((LPSTR)str);
 }
 
@@ -231 +232 @@
 {
         if(VERSION_OsIsUnicode())
-          return PathFindFilenameW(fn);
-        return PathFindFilenameA(fn);
+          return PathFindFilenameW((LPWSTR)fn);
+        return PathFindFilenameA((LPSTR)fn);
 }
 
@@ -328 +329 @@
         
         if (!lpszFile || !lpszFile[0] || (lpszFile[0]==(WCHAR)'.' && !lpszFile[1]) )
-        { CRTDLL_wcscpy(szDest,lpszDir);
+        { lstrcpyW(szDest,lpszDir);
           return szDest;
         }
@@ -334 +335 @@
         /*  if lpszFile is a complete path don't care about lpszDir */
         if (PathIsRootW(lpszFile))
-        { CRTDLL_wcscpy(szDest,lpszFile);
+        { lstrcpyW(szDest,lpszFile);
         }
         else
-        { CRTDLL_wcscpy(sTemp,lpszDir);
+        { lstrcpyW(sTemp,lpszDir);
           PathAddBackslashW(sTemp);
-          CRTDLL_wcscat(sTemp,lpszFile);
-          CRTDLL_wcscpy(szDest,sTemp);
+          lstrcatW(sTemp,lpszFile);
+          lstrcpyW(szDest,sTemp);
         }
         return szDest;
@@ -346 +347 @@
 LPVOID WINAPI PathCombineAW(LPVOID szDest, LPCVOID lpszDir, LPCVOID lpszFile)
 {       if (VERSION_OsIsUnicode())
-          return PathCombineW( szDest, lpszDir, lpszFile );
-        return PathCombineA( szDest, lpszDir, lpszFile );
+          return PathCombineW( (LPWSTR)szDest, (LPWSTR)lpszDir, (LPWSTR)lpszFile );
+        return PathCombineA( (LPSTR)szDest, (LPSTR)lpszDir, (LPSTR)lpszFile );
 }
 
@@ -372 +373 @@
 BOOL WINAPI PathIsUNCAW (LPCVOID path)
 {       if (VERSION_OsIsUnicode())
-          return PathIsUNCW( path );
-        return PathIsUNCA( path );
+          return PathIsUNCW( (LPWSTR)path );
+        return PathIsUNCA( (LPSTR)path );
 }
 /*************************************************************************
@@ -395 +396 @@
 BOOL WINAPI PathIsRelativeAW (LPCVOID path)
 {       if (VERSION_OsIsUnicode())
-          return PathIsRelativeW( path );
-        return PathIsRelativeA( path );
+          return PathIsRelativeW( (LPWSTR)path );
+        return PathIsRelativeA( (LPSTR)path );
 }
 /*************************************************************************
@@ -412 +413 @@
 BOOL WINAPI PathIsExeAW (LPCVOID path)
 {       if (VERSION_OsIsUnicode())
-          return PathIsExeW (path);
-        return PathIsExeA(path);
+          return PathIsExeW ((LPWSTR)path);
+        return PathIsExeA((LPSTR)path);
 }
 
@@ -504 +505 @@
 BOOL WINAPI PathMatchSpecAW(LPVOID name, LPVOID mask)
 {       if (VERSION_OsIsUnicode())
-          return PathMatchSpecW( name, mask );
-        return PathMatchSpecA( name, mask );
+          return PathMatchSpecW( (LPWSTR)name, (LPWSTR)mask );
+        return PathMatchSpecA( (LPSTR)name, (LPSTR)mask );
 }
 /*************************************************************************
@@ -523 +524 @@
 BOOL WINAPI PathSetDlgItemPathAW(HWND hDlg, int id, LPCVOID pszPath)
 {       if (VERSION_OsIsUnicode())
-          return PathSetDlgItemPathW(hDlg, id, pszPath);
-        return PathSetDlgItemPathA(hDlg, id, pszPath);
+          return PathSetDlgItemPathW(hDlg, id, (LPWSTR)pszPath);
+        return PathSetDlgItemPathA(hDlg, id, (LPSTR)pszPath);
 }
 
@@ -541 +542 @@
 BOOL WINAPI PathQualifyAW(LPCVOID pszPath)
 {       if (VERSION_OsIsUnicode())
-          return PathQualifyW(pszPath);
-        return PathQualifyA(pszPath);
+          return PathQualifyW((LPWSTR)pszPath);
+        return PathQualifyA((LPSTR)pszPath);
 }
 
@@ -591 +592 @@
 LPCVOID WINAPI PathGetArgsAW(LPVOID cmdline)
 {       if (VERSION_OsIsUnicode())
-          return PathGetArgsW(cmdline);
-        return PathGetArgsA(cmdline);
+          return PathGetArgsW((LPWSTR)cmdline);
+        return PathGetArgsA((LPSTR)cmdline);
 }
 /*************************************************************************
@@ -611 +612 @@
 LPVOID WINAPI PathQuoteSpacesAW (LPCVOID fn)
 {       if(VERSION_OsIsUnicode())
-          return PathQuoteSpacesW(fn);
-        return PathQuoteSpacesA(fn);
+          return PathQuoteSpacesW((LPWSTR)fn);
+        return PathQuoteSpacesA((LPSTR)fn);
 }
 
@@ -634 +635 @@
 }
 VOID WINAPI PathUnquoteSpacesW(LPWSTR str)
-{       DWORD len = CRTDLL_wcslen(str);
+{       DWORD len = lstrlenW(str);
 
         TRACE("%s\n",debugstr_w(str));
@@ -643 +644 @@
           return;
         str[len-1]='\0';
-        CRTDLL_wcscpy(str,str+1);
+        lstrcpyW(str,str+1);
         return;
 }
 VOID WINAPI PathUnquoteSpacesAW(LPVOID str)
 {       if(VERSION_OsIsUnicode())
-          PathUnquoteSpacesW(str);
-        PathUnquoteSpacesA(str);
+          PathUnquoteSpacesW((LPWSTR)str);
+        PathUnquoteSpacesA((LPSTR)str);
 }
 
@@ -699 +700 @@
 BOOL WINAPI PathFindOnPathAW(LPVOID sFile, LPCVOID sOtherDirs)
 {       if (VERSION_OsIsUnicode())
-          return PathFindOnPathW(sFile, sOtherDirs);
-        return PathFindOnPathA(sFile, sOtherDirs);
+          return PathFindOnPathW((LPWSTR)sFile, (LPWSTR)sOtherDirs);
+        return PathFindOnPathA((LPSTR)sFile, (LPSTR)sOtherDirs);
 }
 
@@ -721 +722 @@
 LPCVOID WINAPI PathGetExtensionAW(LPCVOID path,DWORD y,DWORD z)
 {       if (VERSION_OsIsUnicode())
-          return PathGetExtensionW(path,y,z);
-        return PathGetExtensionA(path,y,z);
+          return PathGetExtensionW((LPWSTR)path,y,z);
+        return PathGetExtensionA((LPSTR)path,y,z);
 }
 
@@ -744 +745 @@
 {
         if (VERSION_OsIsUnicode())
-          return PathCleanupSpecW(x,y);
-        return PathCleanupSpecA(x,y);
+          return PathCleanupSpecW((LPWSTR)x,(LPWSTR)y);
+        return PathCleanupSpecA((LPSTR)x,(LPSTR)y);
 }
 
@@ -786 +787 @@
 {
         if (VERSION_OsIsUnicode())
-          return PathProcessCommandW(lpCommand, v, w, x);
-        return PathProcessCommandA(lpCommand, v, w, x);
+          return PathProcessCommandW((LPWSTR)lpCommand, v, w, x);
+        return PathProcessCommandA((LPSTR)lpCommand, v, w, x);
 }
 
@@ -994 +995 @@
 {
         if (VERSION_OsIsUnicode())
-          return SHGetSpecialFolderPathW (hwndOwner, szPath, csidl, bCreate);
-        return SHGetSpecialFolderPathA (hwndOwner, szPath, csidl, bCreate);
-}
+          return SHGetSpecialFolderPathW (hwndOwner, (LPWSTR)szPath, csidl, bCreate);
+        return SHGetSpecialFolderPathA (hwndOwner, (LPSTR)szPath, csidl, bCreate);
+}