Author: hbelusca Date: Mon Aug 28 18:35:55 2017 New Revision: 75703
URL: http://svn.reactos.org/svn/reactos?rev=75703&view=rev Log: Sync with trunk r75702.
Added: branches/setup_improvements/dll/win32/browseui/res/214.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/214.bmp branches/setup_improvements/dll/win32/browseui/res/215.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/215.bmp branches/setup_improvements/dll/win32/browseui/res/216.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/216.bmp branches/setup_improvements/dll/win32/browseui/res/217.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/217.bmp branches/setup_improvements/dll/win32/browseui/res/230.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/230.bmp branches/setup_improvements/dll/win32/browseui/res/231.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/231.bmp branches/setup_improvements/dll/win32/browseui/res/240.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/240.bmp branches/setup_improvements/dll/win32/browseui/res/241.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/241.bmp branches/setup_improvements/dll/win32/browseui/res/242.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/242.bmp branches/setup_improvements/dll/win32/browseui/res/245.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/245.bmp branches/setup_improvements/dll/win32/browseui/res/246.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/246.bmp branches/setup_improvements/dll/win32/browseui/res/247.bmp - copied unchanged from r75702, trunk/reactos/dll/win32/browseui/res/247.bmp branches/setup_improvements/media/rapps/utorrent.txt (props changed) - copied unchanged from r75702, trunk/reactos/media/rapps/utorrent.txt Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/214.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/215.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/216.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/217.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/230.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/231.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/240.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/241.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/242.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/245.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/246.bmp branches/setup_improvements/dll/win32/shell32/res/bitmaps/247.bmp Modified: branches/setup_improvements/ (props changed) branches/setup_improvements/boot/bootdata/bootcd/unattend.inf branches/setup_improvements/boot/bootdata/bootcdregtest/unattend.inf branches/setup_improvements/dll/win32/browseui/addressband.cpp branches/setup_improvements/dll/win32/browseui/addresseditbox.cpp branches/setup_improvements/dll/win32/browseui/addresseditbox.h branches/setup_improvements/dll/win32/browseui/brandband.cpp branches/setup_improvements/dll/win32/browseui/browseui.rc branches/setup_improvements/dll/win32/browseui/explorerband.cpp branches/setup_improvements/dll/win32/browseui/resource.h branches/setup_improvements/dll/win32/browseui/toolsband.cpp branches/setup_improvements/dll/win32/shell32/CIDLDataObj.cpp branches/setup_improvements/dll/win32/shell32/bitmap_res.rc branches/setup_improvements/dll/win32/shell32/folders/CRecycleBin.cpp branches/setup_improvements/dll/win32/shell32/shresdef.h branches/setup_improvements/dll/win32/userenv/lang/uk-UA.rc branches/setup_improvements/dll/win32/uxtheme/msstyles.c branches/setup_improvements/dll/win32/uxtheme/nonclient.c branches/setup_improvements/win32ss/gdi/gdi32/wine/enhmetafile.c branches/setup_improvements/win32ss/user/ntuser/msgqueue.c branches/setup_improvements/win32ss/user/user32/windows/defwnd.c
Propchange: branches/setup_improvements/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 28 18:35:55 2017 @@ -23,4 +23,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:74526-75648 +/trunk/reactos:74526-75702
Modified: branches/setup_improvements/boot/bootdata/bootcd/unattend.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/bootdata... ============================================================================== --- branches/setup_improvements/boot/bootdata/bootcd/unattend.inf [iso-8859-1] (original) +++ branches/setup_improvements/boot/bootdata/bootcd/unattend.inf [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -1,8 +1,7 @@ -; Set UnattendSetupEnabled to yes in order to get unattended setup working - [Unattend] Signature = "$ReactOS$"
+; Set UnattendSetupEnabled to yes in order to get unattended setup working ; yes - unattend setup enabled ; no - unattend setup disabled UnattendSetupEnabled = no
Modified: branches/setup_improvements/boot/bootdata/bootcdregtest/unattend.inf URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/boot/bootdata... ============================================================================== --- branches/setup_improvements/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] (original) +++ branches/setup_improvements/boot/bootdata/bootcdregtest/unattend.inf [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -1,8 +1,7 @@ -; Set UnattendSetupEnabled to yes in order to get unattended setup working - [Unattend] Signature = "$ReactOS$"
+; Set UnattendSetupEnabled to yes in order to get unattended setup working ; yes - unattend setup enabled ; no - unattend setup disabled UnattendSetupEnabled = yes
Modified: branches/setup_improvements/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/bro... ============================================================================== --- branches/setup_improvements/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/browseui/addressband.cpp [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -529,7 +529,7 @@ const TBBUTTON buttonInfo [] = { { 0, 1, TBSTATE_ENABLED, 0 } }; HINSTANCE shellInstance;
- shellInstance = GetModuleHandle(_T("shell32.dll")); + shellInstance = _AtlBaseModule.GetResourceInstance(); m_himlNormal = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_NORMAL), 20, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); m_himlHot = ImageList_LoadImageW(shellInstance, MAKEINTRESOURCE(IDB_GOBUTTON_HOT),
Modified: branches/setup_improvements/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/bro... ============================================================================== --- branches/setup_improvements/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -26,21 +26,22 @@
/* TODO: - Handle listbox dropdown message and fill contents Add drag and drop of icon in edit box Handle change notifies to update appropriately - Fix so selection in combo listbox navigates */
CAddressEditBox::CAddressEditBox() : fCombobox(NULL, this, 1), fEditWindow(NULL, this, 1), - fSite(NULL) + fSite(NULL), + pidlLastParsed(NULL) { }
CAddressEditBox::~CAddressEditBox() { + if (pidlLastParsed) + ILFree(pidlLastParsed); }
HRESULT STDMETHODCALLTYPE CAddressEditBox::SetOwner(IUnknown *pOwner) @@ -74,6 +75,7 @@ fCombobox.SubclassWindow(comboboxEx); fEditWindow.SubclassWindow(editControl); fSite = param18; + hComboBoxEx = comboboxEx;
SHAutoComplete(fEditWindow.m_hWnd, SHACF_FILESYSTEM | SHACF_URLALL | SHACF_USETAB);
@@ -258,21 +260,42 @@
switch (uMsg) { - case WM_NOTIFY: - hdr = (LPNMHDR) lParam; - if (hdr->code == CBEN_ENDEDIT) - { - NMCBEENDEDITW *endEdit = (NMCBEENDEDITW*) lParam; - if (endEdit->iWhy == CBENF_RETURN) + case WM_COMMAND: + { + if (HIWORD(wParam) == CBN_SELCHANGE) { + UINT selectedIndex = SendMessageW((HWND)lParam, CB_GETCURSEL, 0, 0); + pidlLastParsed = ILClone((LPITEMIDLIST)SendMessageW((HWND)lParam, CB_GETITEMDATA, selectedIndex, 0)); Execute(0); } - else if (endEdit->iWhy == CBENF_ESCAPE) + break; + } + case WM_NOTIFY: + { + hdr = (LPNMHDR) lParam; + if (hdr->code == CBEN_ENDEDIT) { - /* Reset the contents of the combo box */ + NMCBEENDEDITW *endEdit = (NMCBEENDEDITW*) lParam; + if (endEdit->iWhy == CBENF_RETURN) + { + Execute(0); + } + else if (endEdit->iWhy == CBENF_ESCAPE) + { + /* Reset the contents of the combo box */ + } } + else if (hdr->code == CBEN_DELETEITEM) + { + PNMCOMBOBOXEX pCBEx = (PNMCOMBOBOXEX) lParam; + LPITEMIDLIST itemPidl = (LPITEMIDLIST)pCBEx->ceItem.lParam; + if (itemPidl) + { + ILFree(itemPidl); + } + } + break; } - break; } return S_OK; } @@ -320,12 +343,8 @@ CComPtr<IBrowserService> isb; CComPtr<IShellFolder> sf; HRESULT hr; - INT indexClosed, indexOpen, itemExists, oldIndex; - DWORD result; - COMBOBOXEXITEMW item; PIDLIST_ABSOLUTE absolutePIDL; LPCITEMIDLIST pidlChild; - LPITEMIDLIST pidlPrevious; STRRET ret; WCHAR buf[4096];
@@ -336,23 +355,12 @@ { case DISPID_NAVIGATECOMPLETE2: case DISPID_DOCUMENTCOMPLETE: + + if (pidlLastParsed) + ILFree(pidlLastParsed); pidlLastParsed = NULL;
- oldIndex = fCombobox.SendMessage(CB_GETCURSEL, 0, 0); - - itemExists = FALSE; - pidlPrevious = NULL; - - ZeroMemory(&item, sizeof(item)); - item.mask = CBEIF_LPARAM; - item.iItem = 0; - if (fCombobox.SendMessage(CBEM_GETITEM, 0, reinterpret_cast<LPARAM>(&item))) - { - pidlPrevious = reinterpret_cast<LPITEMIDLIST>(item.lParam); - if (pidlPrevious) - itemExists = TRUE; - } - + /* Get the current pidl of the browser */ hr = IUnknown_QueryService(fSite, SID_STopLevelBrowser, IID_PPV_ARG(IBrowserService, &isb)); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -361,6 +369,28 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr;
+ /* Fill the combobox */ + PopulateComboBox(absolutePIDL); + + /* Find the current item in the combobox and select it */ + CComPtr<IShellFolder> psfDesktop; + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return S_OK; + + hr = psfDesktop->GetDisplayNameOf(absolutePIDL, SHGDN_FORADDRESSBAR, &ret); + if (FAILED_UNEXPECTEDLY(hr)) + return S_OK; + + hr = StrRetToBufW(&ret, absolutePIDL, buf, 4095); + if (FAILED_UNEXPECTEDLY(hr)) + return S_OK; + + int index = SendMessageW(hComboBoxEx, CB_FINDSTRINGEXACT, 0, (LPARAM)buf); + if (index != -1) + SendMessageW(hComboBoxEx, CB_SETCURSEL, index, 0); + + /* Add the item that will be visible when the combobox is not expanded */ hr = SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -373,37 +403,17 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr;
+ INT indexClosed, indexOpen; indexClosed = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen);
+ COMBOBOXEXITEMW item = {0}; item.mask = CBEIF_IMAGE | CBEIF_SELECTEDIMAGE | CBEIF_TEXT | CBEIF_LPARAM; - item.iItem = 0; + item.iItem = -1; item.iImage = indexClosed; item.iSelectedImage = indexOpen; item.pszText = buf; item.lParam = reinterpret_cast<LPARAM>(absolutePIDL); - - if (itemExists) - { - result = fCombobox.SendMessage(CBEM_SETITEM, 0, reinterpret_cast<LPARAM>(&item)); - oldIndex = 0; - - if (result) - { - ILFree(pidlPrevious); - } - } - else - { - oldIndex = fCombobox.SendMessage(CBEM_INSERTITEM, 0, reinterpret_cast<LPARAM>(&item)); - - if (oldIndex < 0) - DbgPrint("ERROR %d\n", GetLastError()); - } - - fCombobox.SendMessage(CB_SETCURSEL, -1, 0); - fCombobox.SendMessage(CB_SETCURSEL, oldIndex, 0); - - //fAddressEditBox->SetCurrentDir(index); + fCombobox.SendMessage(CBEM_SETITEM, 0, reinterpret_cast<LPARAM>(&item)); } return S_OK; } @@ -435,3 +445,150 @@ { return E_NOTIMPL; } + +void CAddressEditBox::PopulateComboBox(LPITEMIDLIST pidlCurrent) +{ + HRESULT hr; + LPITEMIDLIST pidl; + int indent = 0; + int index; + + index = SendMessageW(hComboBoxEx, CB_GETCOUNT, 0, 0); + for (int i = 0; i < index; i++) + SendMessageW(hComboBoxEx, CBEM_DELETEITEM, i, 0); + SendMessageW(hComboBoxEx, CB_RESETCONTENT, 0, 0); + + /* Calculate the indent level. No need to clone the pidl */ + pidl = pidlCurrent; + do + { + if(!pidl->mkid.cb) + break; + pidl = ILGetNext(pidl); + indent++; + } while (pidl); + index = indent; + + /* Add every id from the pidl in the combo box */ + pidl = ILClone(pidlCurrent); + do + { + AddComboBoxItem(pidl, 0, index); + ILRemoveLastID(pidl); + index--; + } while (index >= 0); + ILFree(pidl); + + /* Add the items of the desktop */ + FillOneLevel(0, 1, indent); + + /* Add the items of My Computer */ + hr = SHGetSpecialFolderLocation(0, CSIDL_DRIVES, &pidl); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + for(LPITEMIDLIST i = GetItemData(0); i; i = GetItemData(index)) + { + if (ILIsEqual(i, pidl)) + { + FillOneLevel(index, 2, indent); + break; + } + index++; + } + ILFree(pidl); +} + +void CAddressEditBox::AddComboBoxItem(LPITEMIDLIST pidl, int index, int indent) +{ + HRESULT hr; + WCHAR buf[4096]; + + LPCITEMIDLIST pidlChild; + CComPtr<IShellFolder> sf; + hr = SHBindToParent(pidl, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + STRRET strret; + hr = sf->GetDisplayNameOf(pidlChild, SHGDN_FORADDRESSBAR, &strret); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + hr = StrRetToBufW(&strret, pidlChild, buf, 4095); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + COMBOBOXEXITEMW item = {0}; + item.mask = CBEIF_LPARAM | CBEIF_INDENT | CBEIF_SELECTEDIMAGE | CBEIF_IMAGE | CBEIF_TEXT; + item.iImage = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &item.iSelectedImage); + item.pszText = buf; + item.lParam = (LPARAM)(ILClone(pidl)); + item.iIndent = indent; + item.iItem = index; + SendMessageW(hComboBoxEx, CBEM_INSERTITEMW, 0, (LPARAM)&item); +} + +void CAddressEditBox::FillOneLevel(int index, int levelIndent, int indent) +{ + HRESULT hr; + ULONG numObj; + int count; + LPITEMIDLIST pidl, pidl2, pidl3, pidl4; + + count = index + 1; + pidl = GetItemData(index); + pidl2 = GetItemData(count); + if(pidl) + { + CComPtr<IShellFolder> psfDesktop; + CComPtr<IShellFolder> psfItem; + + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + if (!pidl->mkid.cb) + { + psfItem = psfDesktop; + } + else + { + hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, &psfItem)); + if (FAILED_UNEXPECTEDLY(hr)) + return; + } + + CComPtr<IEnumIDList> pEnumIDList; + hr = psfItem->EnumObjects(0, SHCONTF_FOLDERS | SHCONTF_INCLUDEHIDDEN, &pEnumIDList); + if (FAILED_UNEXPECTEDLY(hr)) + return; + + do + { + hr = pEnumIDList->Next(1, &pidl3, &numObj); + if(hr != S_OK || !numObj) + break; + + pidl4 = ILCombine(pidl, pidl3); + if (pidl2 && ILIsEqual(pidl4, pidl2)) + count += (indent - levelIndent); + else + AddComboBoxItem(pidl4, count, levelIndent); + count++; + ILFree(pidl3); + ILFree(pidl4); + } while (true); + } +} + +LPITEMIDLIST CAddressEditBox::GetItemData(int index) +{ + COMBOBOXEXITEMW item; + + memset(&item, 0, sizeof(COMBOBOXEXITEMW)); + item.mask = CBEIF_LPARAM; + item.iItem = index; + SendMessageW(hComboBoxEx, CBEM_GETITEMW, 0, (LPARAM)&item); + return (LPITEMIDLIST)item.lParam; +}
Modified: branches/setup_improvements/dll/win32/browseui/addresseditbox.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/bro... ============================================================================== --- branches/setup_improvements/dll/win32/browseui/addresseditbox.h [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/browseui/addresseditbox.h [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -38,10 +38,15 @@ DWORD fAdviseCookie; CComPtr<IUnknown> fSite; LPITEMIDLIST pidlLastParsed; + HWND hComboBoxEx; public: CAddressEditBox(); ~CAddressEditBox(); private: + void PopulateComboBox(LPITEMIDLIST pidl); + void AddComboBoxItem(LPITEMIDLIST pidl, int index, int indent); + void FillOneLevel(int index, int levelIndent, int indent); + LPITEMIDLIST GetItemData(int index); public: // *** IShellService methods *** virtual HRESULT STDMETHODCALLTYPE SetOwner(IUnknown *);
Modified: branches/setup_improvements/dll/win32/browseui/brandband.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/bro... ============================================================================== --- branches/setup_improvements/dll/win32/browseui/brandband.cpp [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/browseui/brandband.cpp [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -85,7 +85,6 @@ int clientWidth; int clientHeight; int clientSize; - HINSTANCE shell32Instance; BITMAP bitmapInfo; int resourceID;
@@ -102,8 +101,7 @@ resourceID += 2; else if (clientSize >= gMediumImageSize) resourceID += 1; - shell32Instance = GetModuleHandle(L"shell32.dll"); - fImageBitmap = LoadBitmap(shell32Instance, MAKEINTRESOURCE(resourceID)); + fImageBitmap = LoadBitmap(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(resourceID)); GetObjectW(fImageBitmap, sizeof(bitmapInfo), &bitmapInfo); fBitmapSize = bitmapInfo.bmWidth; fMaxFrameCount = bitmapInfo.bmHeight / fBitmapSize;
Modified: branches/setup_improvements/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/bro... ============================================================================== --- branches/setup_improvements/dll/win32/browseui/browseui.rc [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/browseui/browseui.rc [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -110,3 +110,15 @@
/* Include band button bitmaps */ IDB_BANDBUTTONS BITMAP "res/barbtn.bmp" +IDB_SHELL_EXPLORER_LG BITMAP "res/214.bmp" +IDB_SHELL_EXPLORER_LG_HOT BITMAP "res/215.bmp" +IDB_SHELL_EXPLORER_SM BITMAP "res/216.bmp" +IDB_SHELL_EXPLORER_SM_HOT BITMAP "res/217.bmp" +IDB_SHELL_GO BITMAP "res/230.bmp" +IDB_SHELL_GO_HOT BITMAP "res/231.bmp" +IDB_SHELL_BRANDBAND_SM_HI BITMAP "res/240.bmp" +/*IDB_SHELL_BRANDBAND_MD_HI BITMAP "res/241.bmp" +IDB_SHELL_BRANDBAND_LG_HI BITMAP "res/242.bmp" +IDB_SHELL_BRANDBAND_SM_LO BITMAP "res/245.bmp" +IDB_SHELL_BRANDBAND_MD_LO BITMAP "res/246.bmp" +IDB_SHELL_BRANDBAND_LG_LO BITMAP "res/247.bmp"*/
Modified: branches/setup_improvements/dll/win32/browseui/explorerband.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/bro... ============================================================================== --- branches/setup_improvements/dll/win32/browseui/explorerband.cpp [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/browseui/explorerband.cpp [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -574,11 +574,14 @@
/* Get the name of the node */ WCHAR wszDisplayName[MAX_PATH]; - if (!ILGetDisplayNameEx(psfParent, pElt, wszDisplayName, ILGDN_INFOLDER)) - { - ERR("Failed to get node name\n"); + STRRET strret; + hr = psfParent->GetDisplayNameOf(pEltRelative, SHGDN_INFOLDER, &strret); + if (FAILED_UNEXPECTEDLY(hr)) return NULL; - } + + hr = StrRetToBufW(&strret, pEltRelative, wszDisplayName, MAX_PATH); + if (FAILED_UNEXPECTEDLY(hr)) + return NULL;
/* Get the icon of the node */ INT iIcon = SHMapPIDLToSystemImageListIndex(psfParent, pEltRelative, NULL);
Modified: branches/setup_improvements/dll/win32/browseui/resource.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/bro... ============================================================================== --- branches/setup_improvements/dll/win32/browseui/resource.h [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/browseui/resource.h [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -129,3 +129,15 @@ #define IDC_ICONOPTIONS 4097
#define IDB_BANDBUTTONS 545 +#define IDB_SHELL_EXPLORER_LG 214 +#define IDB_SHELL_EXPLORER_LG_HOT 215 +#define IDB_SHELL_EXPLORER_SM 216 +#define IDB_SHELL_EXPLORER_SM_HOT 217 +#define IDB_SHELL_GO 230 +#define IDB_SHELL_GO_HOT 231 +#define IDB_SHELL_BRANDBAND_SM_HI 240 +/*#define IDB_SHELL_BRANDBAND_MD_HI 241 +#define IDB_SHELL_BRANDBAND_LG_HI 242 +#define IDB_SHELL_BRANDBAND_SM_LO 245 +#define IDB_SHELL_BRANDBAND_MD_LO 246 +#define IDB_SHELL_BRANDBAND_LG_LO 247*/
Modified: branches/setup_improvements/dll/win32/browseui/toolsband.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/bro... ============================================================================== --- branches/setup_improvements/dll/win32/browseui/toolsband.cpp [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/browseui/toolsband.cpp [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -295,12 +295,13 @@ SendMessage(TB_SETMAXTEXTROWS, 1, 0); SendMessage(TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_HIDECLIPPEDBUTTONS | TBSTYLE_EX_MIXEDBUTTONS | TBSTYLE_EX_DRAWDDARROWS);
- HINSTANCE shell32Instance = GetModuleHandle(_T("shell32.dll")); - m_himlNormal = ImageList_LoadImageW(shell32Instance, MAKEINTRESOURCE(214), - 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); - - m_himlHot = ImageList_LoadImageW(shell32Instance, MAKEINTRESOURCE(215), - 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); + m_himlNormal = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), + MAKEINTRESOURCE(IDB_SHELL_EXPLORER_LG), + 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION); + + m_himlHot = ImageList_LoadImageW(_AtlBaseModule.GetResourceInstance(), + MAKEINTRESOURCE(IDB_SHELL_EXPLORER_LG_HOT), + 0, 0, RGB(255, 0, 255), IMAGE_BITMAP, LR_DEFAULTSIZE | LR_CREATEDIBSECTION);
SendMessage(TB_SETIMAGELIST, 0, (LPARAM) m_himlNormal); SendMessage(TB_SETHOTIMAGELIST, 0, (LPARAM) m_himlHot);
Modified: branches/setup_improvements/dll/win32/shell32/CIDLDataObj.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/she... ============================================================================== --- branches/setup_improvements/dll/win32/shell32/CIDLDataObj.cpp [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/shell32/CIDLDataObj.cpp [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -394,12 +394,12 @@
HRESULT WINAPI CIDLDataObj::StartOperation(IBindCtx *pbcReserved) { - FIXME("(%p)->()\n", this); + TRACE("(%p)->()\n", this); return E_NOTIMPL; } HRESULT WINAPI CIDLDataObj::EndOperation(HRESULT hResult, IBindCtx *pbcReserved, DWORD dwEffects) { - FIXME("(%p)->()\n", this); + TRACE("(%p)->()\n", this); return E_NOTIMPL; }
Modified: branches/setup_improvements/dll/win32/shell32/bitmap_res.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/she... ============================================================================== --- branches/setup_improvements/dll/win32/shell32/bitmap_res.rc [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/shell32/bitmap_res.rc [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -4,19 +4,7 @@ IDB_SHELL_IEXPLORE_LG_HOT BITMAP "res/bitmaps/205.bmp" IDB_SHELL_IEXPLORE_SM BITMAP "res/bitmaps/206.bmp" IDB_SHELL_IEXPLORE_SM_HOT BITMAP "res/bitmaps/207.bmp" -IDB_SHELL_EXPLORER_LG BITMAP "res/bitmaps/214.bmp" -IDB_SHELL_EXPLORER_LG_HOT BITMAP "res/bitmaps/215.bmp" -IDB_SHELL_EXPLORER_SM BITMAP "res/bitmaps/216.bmp" -IDB_SHELL_EXPLORER_SM_HOT BITMAP "res/bitmaps/217.bmp" IDB_SHELL_EDIT_LG BITMAP "res/bitmaps/225.bmp" IDB_SHELL_EDIT_LG_HOT BITMAP "res/bitmaps/226.bmp" IDB_SHELL_EDIT_SM BITMAP "res/bitmaps/227.bmp" IDB_SHELL_EDIT_SM_HOT BITMAP "res/bitmaps/228.bmp" -IDB_SHELL_GO BITMAP "res/bitmaps/230.bmp" -IDB_SHELL_GO_HOT BITMAP "res/bitmaps/231.bmp" -IDB_SHELL_BRANDBAND_SM_HI BITMAP "res/bitmaps/240.bmp" -/*IDB_SHELL_BRANDBAND_MD_HI BITMAP "res/bitmaps/241.bmp" -IDB_SHELL_BRANDBAND_LG_HI BITMAP "res/bitmaps/242.bmp" -IDB_SHELL_BRANDBAND_SM_LO BITMAP "res/bitmaps/245.bmp" -IDB_SHELL_BRANDBAND_MD_LO BITMAP "res/bitmaps/246.bmp" -IDB_SHELL_BRANDBAND_LG_LO BITMAP "res/bitmaps/247.bmp"*/
Modified: branches/setup_improvements/dll/win32/shell32/folders/CRecycleBin.cpp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/she... ============================================================================== --- branches/setup_improvements/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/shell32/folders/CRecycleBin.cpp [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -885,13 +885,19 @@ return FALSE; }
- if (GetDriveTypeW(wszPath) != DRIVE_FIXED) + // Only keep the base path. + WCHAR wszRootPathName[MAX_PATH]; + strcpyW(wszRootPathName, wszPath); + PathRemoveFileSpecW(wszRootPathName); + PathAddBackslashW(wszRootPathName); + + if (GetDriveTypeW(wszRootPathName) != DRIVE_FIXED) { /* no bitbucket on removable media */ return FALSE; }
- if (!GetVolumeInformationW(wszPath, NULL, 0, &VolSerialNumber, &MaxComponentLength, &FileSystemFlags, NULL, 0)) + if (!GetVolumeInformationW(wszRootPathName, NULL, 0, &VolSerialNumber, &MaxComponentLength, &FileSystemFlags, NULL, 0)) { ERR("GetVolumeInformationW failed with %u\n", GetLastError()); return FALSE;
Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/214.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/she... ============================================================================== Binary file - no diff available.
Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/215.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/she... ============================================================================== Binary file - no diff available.
Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/216.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/she... ============================================================================== Binary file - no diff available.
Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/217.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/she... ============================================================================== Binary file - no diff available.
Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/230.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/she... ============================================================================== Binary file - no diff available.
Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/231.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/she... ============================================================================== Binary file - no diff available.
Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/240.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/she... ============================================================================== Binary file - no diff available.
Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/241.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/she... ============================================================================== Binary file - no diff available.
Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/242.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/she... ============================================================================== Binary file - no diff available.
Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/245.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/she... ============================================================================== Binary file - no diff available.
Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/246.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/she... ============================================================================== Binary file - no diff available.
Removed: branches/setup_improvements/dll/win32/shell32/res/bitmaps/247.bmp URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/she... ============================================================================== Binary file - no diff available.
Modified: branches/setup_improvements/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/she... ============================================================================== --- branches/setup_improvements/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/shell32/shresdef.h [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -31,22 +31,10 @@ #define IDB_SHELL_IEXPLORE_LG_HOT 205 #define IDB_SHELL_IEXPLORE_SM 206 #define IDB_SHELL_IEXPLORE_SM_HOT 207 -#define IDB_SHELL_EXPLORER_LG 214 -#define IDB_SHELL_EXPLORER_LG_HOT 215 -#define IDB_SHELL_EXPLORER_SM 216 -#define IDB_SHELL_EXPLORER_SM_HOT 217 #define IDB_SHELL_EDIT_LG 225 #define IDB_SHELL_EDIT_LG_HOT 226 #define IDB_SHELL_EDIT_SM 227 #define IDB_SHELL_EDIT_SM_HOT 228 -#define IDB_SHELL_GO 230 -#define IDB_SHELL_GO_HOT 231 -#define IDB_SHELL_BRANDBAND_SM_HI 240 -/*#define IDB_SHELL_BRANDBAND_MD_HI 241 -#define IDB_SHELL_BRANDBAND_LG_HI 242 -#define IDB_SHELL_BRANDBAND_SM_LO 245 -#define IDB_SHELL_BRANDBAND_MD_LO 246 -#define IDB_SHELL_BRANDBAND_LG_LO 247*/
/* Strings */
Modified: branches/setup_improvements/dll/win32/userenv/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/use... ============================================================================== --- branches/setup_improvements/dll/win32/userenv/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/userenv/lang/uk-UA.rc [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -4,7 +4,7 @@ BEGIN IDS_PROFILEPATH "%SystemDrive%\Documents and Settings" IDS_APPDATA "Application Data" - IDS_DESKTOP "Desktop" + IDS_DESKTOP "РобоÑий ÑÑÑл" IDS_FAVORITES "ÐбÑане" IDS_MYDOCUMENTS "ÐÐ¾Ñ Ð´Ð¾ÐºÑменÑи" IDS_NETHOOD "NetHood"
Modified: branches/setup_improvements/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/uxt... ============================================================================== --- branches/setup_improvements/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/uxtheme/msstyles.c [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -875,7 +875,6 @@ /* nothing to do */ return TRUE;
- *hasAlpha = TRUE; p = dib.dsBm.bmBits; n = dib.dsBmih.biHeight * dib.dsBmih.biWidth; /* AlphaBlend() wants premultiplied alpha, so do that now */ @@ -886,6 +885,9 @@ p[1] = (p[1] * a) >> 8; p[2] = (p[2] * a) >> 8; p += 4; + + if (a != 256) + *hasAlpha = TRUE; }
return TRUE;
Modified: branches/setup_improvements/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/dll/win32/uxt... ============================================================================== --- branches/setup_improvements/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/setup_improvements/dll/win32/uxtheme/nonclient.c [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -217,6 +217,7 @@ INT ButtonWidth, ButtonHeight, iPartId, i; WINDOWINFO wi = {sizeof(wi)}; RECT rcCurrent; + SIZE ButtonSize;
/* First of all check if we have something to do here */ style = GetWindowLongW(hWnd, GWL_STYLE); @@ -243,36 +244,18 @@ InflateRect(&rcCurrent, -(int)wi.cyWindowBorders-BUTTON_GAP_SIZE, -(int)wi.cyWindowBorders-BUTTON_GAP_SIZE);
+ iPartId = wi.dwExStyle & WS_EX_TOOLWINDOW ? WP_SMALLCLOSEBUTTON : WP_CLOSEBUTTON; + + GetThemePartSize(htheme, NULL, iPartId, 0, NULL, TS_MIN, &ButtonSize); + + ButtonHeight = GetSystemMetrics( wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMSIZE : SM_CYSIZE); + ButtonWidth = MulDiv(ButtonSize.cx, ButtonHeight, ButtonSize.cy); + + ButtonHeight -= 4; + ButtonWidth -= 4; + for (i = CLOSEBUTTON; i <= HELPBUTTON; i++) { - SIZE ButtonSize; - - switch(i) - { - case CLOSEBUTTON: - iPartId = wi.dwExStyle & WS_EX_TOOLWINDOW ? WP_SMALLCLOSEBUTTON : WP_CLOSEBUTTON; - break; - - case MAXBUTTON: - iPartId = wi.dwStyle & WS_MAXIMIZE ? WP_RESTOREBUTTON : WP_MAXBUTTON; - break; - - case MINBUTTON: - iPartId = wi.dwStyle & WS_MINIMIZE ? WP_RESTOREBUTTON : WP_MINBUTTON; - break; - - default: - iPartId = WP_HELPBUTTON ; - } - - GetThemePartSize(htheme, NULL, iPartId, 0, NULL, TS_MIN, &ButtonSize); - - ButtonHeight = GetSystemMetrics( wi.dwExStyle & WS_EX_TOOLWINDOW ? SM_CYSMSIZE : SM_CYSIZE); - ButtonWidth = MulDiv(ButtonSize.cx, ButtonHeight, ButtonSize.cy); - - ButtonHeight -= 4; - ButtonWidth -= 4; - SetRect(&pwndData->rcCaptionButtons[i], rcCurrent.right - ButtonWidth, rcCurrent.top,
Propchange: branches/setup_improvements/media/rapps/utorrent.txt ------------------------------------------------------------------------------ svn:eol-style = CRLF
Propchange: branches/setup_improvements/media/rapps/utorrent.txt ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Aug 28 18:35:55 2017 @@ -0,0 +1,26 @@ +/branches/GSoC_2011/GSoC_Network/media/rapps/utorrent.txt:51548 +/branches/GSoC_2011/GSoC_TcpIpDriver/media/rapps/utorrent.txt:51550 +/branches/GSoC_2011/TcpIpDriver/media/rapps/utorrent.txt:51551-53074,53076-53119 +/branches/GSoC_2016/AHCI/media/rapps/utorrent.txt:71203-73603 +/branches/GSoC_2016/USB/media/rapps/utorrent.txt:72365-73604 +/branches/GSoC_Network/media/rapps/utorrent.txt:51545-51546 +/branches/cmake-bringup/media/rapps/utorrent.txt:50484,50693,50719,51544-52564 +/branches/colins-printing-for-freedom/reactos/media/rapps/utorrent.txt:67543-68405,68407-68414,68417-70595 +/branches/condrv_restructure/media/rapps/utorrent.txt:63104-65657 +/branches/header-work/media/rapps/utorrent.txt:45691-47721 +/branches/kd++/media/rapps/utorrent.txt:58883-58973 +/branches/kernel-fun/reactos/media/rapps/utorrent.txt:62291,62294,62301-62302,62304,62321-62322,62353,62531-62532,62853,64152,64173-64174,65253 +/branches/ntvdm/media/rapps/utorrent.txt:59241-63176 +/branches/reactos-yarotows/media/rapps/utorrent.txt:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos/media/rapps/utorrent.txt:49994-49995 +/branches/ros-amd64-bringup/media/rapps/utorrent.txt:36852 +/branches/ros-amd64-bringup/reactos/media/rapps/utorrent.txt:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/ros-branch-0_3_15-lt2013/media/rapps/utorrent.txt:59059 +/branches/ros-csrss/media/rapps/utorrent.txt:57561-58762 +/branches/shell-experiments/media/rapps/utorrent.txt:61927-65494 +/branches/shell32_new-bringup/media/rapps/utorrent.txt:51893-53652,53661,53700 +/branches/tcp-rewrite-branch/media/rapps/utorrent.txt:48720,48840-48841,49424-49426,49454 +/branches/usb-bringup/media/rapps/utorrent.txt:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 +/branches/usb-bringup-trunk/media/rapps/utorrent.txt:55019-55543,55548-55554,55556-55567 +/branches/wlan-bringup/media/rapps/utorrent.txt:54809-54998 +/trunk/reactos/media/rapps/utorrent.txt:74526-75648,75691-75702
Modified: branches/setup_improvements/win32ss/gdi/gdi32/wine/enhmetafile.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/gdi/g... ============================================================================== --- branches/setup_improvements/win32ss/gdi/gdi32/wine/enhmetafile.c [iso-8859-1] (original) +++ branches/setup_improvements/win32ss/gdi/gdi32/wine/enhmetafile.c [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -786,6 +786,10 @@ break; info->state.mode = pSetMapMode->iMode; EMF_SetMapMode(hdc, info); + + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); + break; } case EMR_SETBKMODE: @@ -887,12 +891,16 @@ info->state.wndOrgY = pSetWindowOrgEx->ptlOrigin.y;
TRACE("SetWindowOrgEx: %d,%d\n", info->state.wndOrgX, info->state.wndOrgY); + + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); + break; } case EMR_SETWINDOWEXTEX: { const EMRSETWINDOWEXTEX *pSetWindowExtEx = (const EMRSETWINDOWEXTEX *)mr; - + if (info->state.mode != MM_ISOTROPIC && info->state.mode != MM_ANISOTROPIC) break; info->state.wndExtX = pSetWindowExtEx->szlExtent.cx; @@ -901,6 +909,10 @@ EMF_FixIsotropic(hdc, info);
TRACE("SetWindowExtEx: %d,%d\n",info->state.wndExtX, info->state.wndExtY); + + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); + break; } case EMR_SETVIEWPORTORGEX: @@ -910,6 +922,10 @@ info->state.vportOrgX = pSetViewportOrgEx->ptlOrigin.x; info->state.vportOrgY = pSetViewportOrgEx->ptlOrigin.y; TRACE("SetViewportOrgEx: %d,%d\n", info->state.vportOrgX, info->state.vportOrgY); + + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); + break; } case EMR_SETVIEWPORTEXTEX: @@ -923,6 +939,10 @@ if (info->state.mode == MM_ISOTROPIC) EMF_FixIsotropic(hdc, info); TRACE("SetViewportExtEx: %d,%d\n", info->state.vportExtX, info->state.vportExtY); + + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); + break; } case EMR_CREATEPEN: @@ -1259,6 +1279,10 @@ { const EMRSETWORLDTRANSFORM *lpXfrm = (const EMRSETWORLDTRANSFORM *)mr; info->state.world_transform = lpXfrm->xform; + + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); + break; }
@@ -1414,6 +1438,9 @@ lpScaleViewportExtEx->xNum,lpScaleViewportExtEx->xDenom, lpScaleViewportExtEx->yNum,lpScaleViewportExtEx->yDenom);
+ if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); + break; }
@@ -1439,6 +1466,9 @@ lpScaleWindowExtEx->xNum,lpScaleWindowExtEx->xDenom, lpScaleWindowExtEx->yNum,lpScaleWindowExtEx->yDenom);
+ if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); + break; }
@@ -1451,14 +1481,20 @@ info->state.world_transform.eM11 = info->state.world_transform.eM22 = 1; info->state.world_transform.eM12 = info->state.world_transform.eM21 = 0; info->state.world_transform.eDx = info->state.world_transform.eDy = 0; + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); break; case MWT_LEFTMULTIPLY: CombineTransform(&info->state.world_transform, &lpModifyWorldTrans->xform, &info->state.world_transform); + if (!IS_WIN9X()) + ModifyWorldTransform(hdc, &lpModifyWorldTrans->xform, MWT_LEFTMULTIPLY); break; case MWT_RIGHTMULTIPLY: CombineTransform(&info->state.world_transform, &info->state.world_transform, &lpModifyWorldTrans->xform); + if (!IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); break; default: FIXME("Unknown imode %d\n", lpModifyWorldTrans->iMode); @@ -2435,11 +2471,6 @@ TRACE("Calling EnumFunc with record %s, size %d\n", get_emr_name(emr->iType), emr->nSize); ret = (*callback)(hdc, ht, emr, emh->nHandles, (LPARAM)data); offset += emr->nSize; - - /* WinNT - update the transform (win9x updates when the next graphics - output record is played). */ - if (hdc && !IS_WIN9X()) - EMF_Update_MF_Xform(hdc, info); }
if (hdc)
Modified: branches/setup_improvements/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/user/... ============================================================================== --- branches/setup_improvements/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ branches/setup_improvements/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -2216,9 +2216,7 @@ if (pti->pEThread) { BOOL Ret = TRUE; - ObReferenceObject(pti->pEThread); if (!(pti->pEThread->Tcb.SuspendCount) && !PsGetThreadFreezeCount(pti->pEThread)) Ret = FALSE; - ObDereferenceObject(pti->pEThread); return Ret; } return FALSE; @@ -2347,7 +2345,7 @@ { CurrentSentMessage->flags |= SMF_RECEIVERFREE; } - + if (!(CurrentSentMessage->flags & SMF_RECEIVERFREE)) {
@@ -2385,7 +2383,7 @@ /* cleanup posted messages */ while (!IsListEmpty(&MessageQueue->HardwareMessagesListHead)) { - CurrentEntry = MessageQueue->HardwareMessagesListHead.Flink; + CurrentEntry = MessageQueue->HardwareMessagesListHead.Flink; CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry); ERR("MQ Cleanup Post Messages %p\n",CurrentMessage); MsqDestroyMessage(CurrentMessage);
Modified: branches/setup_improvements/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/win32ss/user/... ============================================================================== --- branches/setup_improvements/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ branches/setup_improvements/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Mon Aug 28 18:35:55 2017 @@ -50,7 +50,6 @@ return gpsi->ahbrSystem[nIndex]; }
- SetLastError(ERROR_INVALID_PARAMETER); return NULL; }