[ros-diffs] [cwittich] 44186: partial shell32 sync

[cwittich at svn.reactos.org]

Author: cwittich
Date: Mon Nov 16 00:19:33 2009
New Revision: 44186

URL: http://svn.reactos.org/svn/reactos?rev=44186&view=rev
Log:
partial shell32 sync

Modified:
    trunk/reactos/dll/win32/shell32/dde.c
    trunk/reactos/dll/win32/shell32/shellord.c

Modified: trunk/reactos/dll/win32/shell32/dde.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dde.c?rev=44186&r1=44185&r2=44186&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/dde.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/dde.c [iso-8859-1] Mon Nov 16 00:19:33 2009
@@ -104,7 +104,7 @@
     case XTYP_WILDCONNECT:
         return (HDDEDATA)(DWORD_PTR)Dde_OnWildConnect(hsz1, hsz2);
     case XTYP_REQUEST:
-        return (HDDEDATA)Dde_OnRequest(uFmt, hconv, hsz1, hsz2);
+        return Dde_OnRequest(uFmt, hconv, hsz1, hsz2);
     case XTYP_EXECUTE:
         return (HDDEDATA)(DWORD_PTR)Dde_OnExecute(hconv, hsz1, hdata);
     case XTYP_DISCONNECT:

Modified: trunk/reactos/dll/win32/shell32/shellord.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord.c?rev=44186&r1=44185&r2=44186&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/shellord.c [iso-8859-1] Mon Nov 16 00:19:33 2009
@@ -383,7 +383,7 @@
 	va_end(args);
 
 	ret = MessageBoxW(hWnd,pszTemp,pszTitle,uType);
-	LocalFree((HLOCAL)pszTemp);
+        LocalFree(pszTemp);
 	return ret;
 }
 
@@ -441,16 +441,18 @@
 	va_end(args);
 
 	ret = MessageBoxA(hWnd,pszTemp,pszTitle,uType);
-	LocalFree((HLOCAL)pszTemp);
+        LocalFree(pszTemp);
 	return ret;
 }
 
 /*************************************************************************
  * SHRegisterDragDrop				[SHELL32.86]
  *
- * Probably equivalent to RegisterDragDrop but under Windows 9x it could use the
+ * Probably equivalent to RegisterDragDrop but under Windows 95 it could use the
  * shell32 built-in "mini-COM" without the need to load ole32.dll - see SHLoadOLE
- * for details
+ * for details. Under Windows 98 this function initializes the true OLE when called
+ * the first time, on XP always returns E_OUTOFMEMORY and it got removed from Vista.
+ *
  *
  * NOTES
  *     exported by ordinal
@@ -471,7 +473,7 @@
  *
  * Probably equivalent to RevokeDragDrop but under Windows 9x it could use the
  * shell32 built-in "mini-COM" without the need to load ole32.dll - see SHLoadOLE
- * for details
+ * for details. Function removed from Windows Vista.
  *
  * NOTES
  *     exported by ordinal
@@ -648,7 +650,7 @@
 
     /* Add the new entry into the MRU list
      */
-    return AddMRUData(mruhandle, (LPCVOID)buffer, *len);
+    return AddMRUData(mruhandle, buffer, *len);
 }
 
 /*************************************************************************
@@ -704,7 +706,7 @@
     /* See if we need to do anything.
      */
     datalen = 64;
-    ret=SHADD_get_policy( "NoRecentDocsHistory", &type, &data, &datalen);
+    ret=SHADD_get_policy( "NoRecentDocsHistory", &type, data, &datalen);
     if ((ret > 0) && (ret != ERROR_FILE_NOT_FOUND)) {
 	ERR("Error %d getting policy \"NoRecentDocsHistory\"\n", ret);
 	return;
@@ -799,15 +801,15 @@
     switch (uFlags)
     {
     case SHARD_PIDL:
-	SHGetPathFromIDListA((LPCITEMIDLIST) pv, doc_name);
+        SHGetPathFromIDListA(pv, doc_name);
         break;
 
     case SHARD_PATHA:
-        lstrcpynA(doc_name, (LPCSTR)pv, MAX_PATH);
+        lstrcpynA(doc_name, pv, MAX_PATH);
         break;
 
     case SHARD_PATHW:
-        WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)pv, -1, doc_name, MAX_PATH, NULL, NULL);
+        WideCharToMultiByte(CP_ACP, 0, pv, -1, doc_name, MAX_PATH, NULL, NULL);
         break;
 
     default:
@@ -955,9 +957,9 @@
 
 	    /* Set the document path or pidl */
 	    if (uFlags == SHARD_PIDL) {
-		hres = IShellLinkA_SetIDList(psl, (LPCITEMIDLIST) pv);
+                hres = IShellLinkA_SetIDList(psl, pv);
 	    } else {
-		hres = IShellLinkA_SetPath(psl, (LPCSTR) pv);
+                hres = IShellLinkA_SetPath(psl, pv);
 	    }
 	    if(FAILED(hres)) {
 		/* bombed */
@@ -1277,7 +1279,7 @@
  * RETURNS
  *     Success: TRUE
  *     Failure: FALSE
-  */
+ */
 BOOL WINAPI IsUserAnAdmin(VOID)
 {
     SID_IDENTIFIER_AUTHORITY Authority = {SECURITY_NT_AUTHORITY};
@@ -1289,7 +1291,6 @@
     BOOL bResult = FALSE;
 
     TRACE("\n");
-
     if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken))
     {
         return FALSE;
@@ -1706,7 +1707,7 @@
     if (lRet == ERROR_SUCCESS)
     {
         /* Create and initialize the Property Sheet Extensions Array */
-        psxa = (PPSXA)LocalAlloc(LMEM_FIXED, FIELD_OFFSET(PSXA, pspsx[max_iface]));
+        psxa = LocalAlloc(LMEM_FIXED, FIELD_OFFSET(PSXA, pspsx[max_iface]));
         if (psxa)
         {
             ZeroMemory(psxa, FIELD_OFFSET(PSXA, pspsx[max_iface]));
@@ -1836,7 +1837,7 @@
             psxa->pspsx[i]->lpVtbl->Release(psxa->pspsx[i]);
         }
 
-        LocalFree((HLOCAL)psxa);
+        LocalFree(psxa);
     }
 }