Changeset 797 for trunk/src/shell32/new/shellord.cpp

Timestamp:

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

Author:

phaller

Message:

.

File:

• trunk/src/shell32/new/shellord.cpp (modified) (14 diffs)

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);
+}
+