From ba266670d14b3c87c4b70cbf5da70ed5f9cc29cb Mon Sep 17 00:00:00 2001 From: Ged Murphy Date: Tue, 24 May 2011 18:14:47 +0000 Subject: [PATCH] [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. svn path=/trunk/; revision=51890 --- reactos/dll/win32/shell32_new/iconcache.cpp | 32 ++++++++------------ reactos/dll/win32/shell32_new/lang/uk-UA.rc | 2 +- reactos/dll/win32/shell32_new/shell32.rbuild | 2 +- reactos/dll/win32/shell32_new/shlfileop.cpp | 2 +- 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/reactos/dll/win32/shell32_new/iconcache.cpp b/reactos/dll/win32/shell32_new/iconcache.cpp index c48925ad5c7..1d7de4f59ec 100644 --- a/reactos/dll/win32/shell32_new/iconcache.cpp +++ b/reactos/dll/win32/shell32_new/iconcache.cpp @@ -174,26 +174,20 @@ static HICON SIC_OverlayShortcutImage(HICON SourceIcon, BOOL large) 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; - } + SourceDC, 0, 0, SRCCOPY)) 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; - } + /* 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 @@ BOOL SIC_Initialize(void) 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, diff --git a/reactos/dll/win32/shell32_new/lang/uk-UA.rc b/reactos/dll/win32/shell32_new/lang/uk-UA.rc index 571581510bf..b65aea75945 100644 --- a/reactos/dll/win32/shell32_new/lang/uk-UA.rc +++ b/reactos/dll/win32/shell32_new/lang/uk-UA.rc @@ -156,7 +156,7 @@ FONT 8, "MS Shell Dlg" 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 diff --git a/reactos/dll/win32/shell32_new/shell32.rbuild b/reactos/dll/win32/shell32_new/shell32.rbuild index c3c83da7432..45057fe08f7 100644 --- a/reactos/dll/win32/shell32_new/shell32.rbuild +++ b/reactos/dll/win32/shell32_new/shell32.rbuild @@ -1,5 +1,5 @@ - + . diff --git a/reactos/dll/win32/shell32_new/shlfileop.cpp b/reactos/dll/win32/shell32_new/shlfileop.cpp index d5a90a239d6..b0d97c64ad9 100644 --- a/reactos/dll/win32/shell32_new/shlfileop.cpp +++ b/reactos/dll/win32/shell32_new/shlfileop.cpp @@ -550,7 +550,7 @@ static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest) 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;