[ros-diffs] [gedmurphy] 51890: [SHELL32_NEW] - Merge 48254, 48371, 48463, 48501 - Don't worry about trying to build this dll, it needs the new PSDK interfaces which won't be committed until the very end as the...

Author: gedmurphy
Date: Tue May 24 18:14:47 2011
New Revision: 51890

URL: http://svn.reactos.org/svn/reactos?rev=51890&view=rev
Log:
[SHELL32_NEW]
- Merge 48254, 48371, 48463, 48501
- Don't worry about trying to build this dll, it needs the new PSDK interfaces which
won't be committed until the very end as they'll break the existing shell32. It
make take a day or two as everything has to be merged by hand.

Modified:
    trunk/reactos/dll/win32/shell32_new/iconcache.cpp
    trunk/reactos/dll/win32/shell32_new/lang/uk-UA.rc
    trunk/reactos/dll/win32/shell32_new/shell32.rbuild
    trunk/reactos/dll/win32/shell32_new/shlfileop.cpp

Modified: trunk/reactos/dll/win32/shell32_new/iconcache.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/icon…
==============================================================================
--- trunk/reactos/dll/win32/shell32_new/iconcache.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32_new/iconcache.cpp [iso-8859-1] Tue May 24 18:14:47
2011
@@ -174,26 +174,20 @@
 	  goto fail;
 	}
 
-	/* Copy the source xor bitmap to the target and clear out part of it by using
-	   the shortcut mask */
+	/* Copy the source color bitmap to the target */
 	if (! BitBlt(TargetDC, 0, 0, SourceBitmapInfo.bmWidth, SourceBitmapInfo.bmHeight,
-	             SourceDC, 0, 0, SRCCOPY) ||
-	    ! BitBlt(TargetDC, 0, SourceBitmapInfo.bmHeight - ShortcutBitmapInfo.bmHeight,
-	             ShortcutBitmapInfo.bmWidth, ShortcutBitmapInfo.bmHeight,
-	             ShortcutDC, 0, 0, SRCAND))
-	{
-	  goto fail;
-	}
-
-	if (NULL == SelectObject(ShortcutDC, ShortcutIconInfo.hbmColor)) goto fail;
-
-	/* Now put in the shortcut xor mask */
-	if (! BitBlt(TargetDC, 0, SourceBitmapInfo.bmHeight - ShortcutBitmapInfo.bmHeight,
-	             ShortcutBitmapInfo.bmWidth, ShortcutBitmapInfo.bmHeight,
-	             ShortcutDC, 0, 0, SRCINVERT))
-	{
-	  goto fail;
-	}
+	             SourceDC, 0, 0, SRCCOPY)) goto fail;
+
+    /* Copy the source xor bitmap to the target and clear out part of it by using
+       the shortcut mask */
+    if (NULL == SelectObject(ShortcutDC, ShortcutIconInfo.hbmColor)) goto fail;
+    if (!MaskBlt(TargetDC, 0, SourceBitmapInfo.bmHeight - ShortcutBitmapInfo.bmHeight,
+                 ShortcutBitmapInfo.bmWidth, ShortcutBitmapInfo.bmHeight,
+                 ShortcutDC, 0, 0, ShortcutIconInfo.hbmMask, 0, 0, 
+                 MAKEROP4(SRCCOPY, 0xAA0000)))
+    {
+        goto fail;
+    }
 
 	/* Clean up, we're not goto'ing to 'fail' after this so we can be lazy
and not set
 	   handles to NULL */
@@ -442,7 +436,7 @@
                                         100);
     if (ShellSmallIconList)
     {
-         /* Load the document icon, which is used as the default if an icon isn't
found. */
+        /* Load the document icon, which is used as the default if an icon isn't
found. */
         hSm = (HICON)LoadImageW(shell32_hInstance,
                                 MAKEINTRESOURCEW(IDI_SHELL_DOCUMENT),
                                 IMAGE_ICON,

Modified: trunk/reactos/dll/win32/shell32_new/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/lang…
==============================================================================
--- trunk/reactos/dll/win32/shell32_new/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32_new/lang/uk-UA.rc [iso-8859-1] Tue May 24 18:14:47
2011
@@ -156,7 +156,7 @@
 BEGIN
 	ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE
 	LTEXT "Ââåä³òü ³ì'ÿ ïðîãðàìè, òåêè, äîêóìåíòà àáî ðåñóðñó ²íòåðíåòó, ³ ReactOS
â³äêðèº ¿õ.", 12289, 36, 11, 182, 18
-	LTEXT "&³äêðèòè:", 12305, 3, 39, 29, 10
+	LTEXT "&³äêðèòè:", 12305, 3, 39, 32, 10
 	CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL |
WS_VISIBLE |  CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100
 	DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP
 	PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP

Modified: trunk/reactos/dll/win32/shell32_new/shell32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shel…
==============================================================================
--- trunk/reactos/dll/win32/shell32_new/shell32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32_new/shell32.rbuild [iso-8859-1] Tue May 24 18:14:47
2011
@@ -1,5 +1,5 @@
 <group>
-<module name="shell32" type="win32dll"
baseaddress="${BASEADDRESS_SHELL32}" installbase="system32"
installname="shell32.dll" crt="msvcrt">
+<module name="shell32_new" type="win32dll"
baseaddress="${BASEADDRESS_SHELL32}" installbase="system32"
installname="shell32_new.dll" allowwarnings="true"
crt="msvcrt">
 	<autoregister infsection="OleControlDlls" type="Both" />
 	<importlibrary definition="shell32.spec" />
 	<include base="shell32">.</include>

Modified: trunk/reactos/dll/win32/shell32_new/shlfileop.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32_new/shlf…
==============================================================================
--- trunk/reactos/dll/win32/shell32_new/shlfileop.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32_new/shlfileop.cpp [iso-8859-1] Tue May 24 18:14:47
2011
@@ -550,7 +550,7 @@
 	return GetLastError();
 }
 
-static WINAPI DWORD SHOperationProgressRoutine(LARGE_INTEGER TotalFileSize, LARGE_INTEGER
TotalBytesTransferred, LARGE_INTEGER StreamSize, LARGE_INTEGER StreamBytesTransferred,
DWORD dwStreamNumber, DWORD dwCallbackReason, HANDLE hSourceFile, HANDLE hDestinationFile,
LPVOID lpData)
+static DWORD WINAPI SHOperationProgressRoutine(LARGE_INTEGER TotalFileSize, LARGE_INTEGER
TotalBytesTransferred, LARGE_INTEGER StreamSize, LARGE_INTEGER StreamBytesTransferred,
DWORD dwStreamNumber, DWORD dwCallbackReason, HANDLE hSourceFile, HANDLE hDestinationFile,
LPVOID lpData)
 {
     FILE_OPERATION_CONTEXT * Context;
     LARGE_INTEGER Progress;