Ros-diffs August 2014

ros-diffs@reactos.org

16 participants
226 discussions

[dquintana] 63847: [BROWSEUI] * Fix usage of outdated CMergedFolder to use the proper interface.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Aug 9 15:56:05 2014 New Revision: 63847 URL: http://svn.reactos.org/svn/reactos?rev=63847&view=rev Log: [BROWSEUI] * Fix usage of outdated CMergedFolder to use the proper interface. Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp Modified: branches/shell-experiments/base/shell/rshell/CStartMenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CStartMenu.cpp [iso-8859-1] Sat Aug 9 15:56:05 2014 @@ -21,6 +21,7 @@ #include "CMergedFolder.h" +// TODO: declare these GUIDs and interfaces in the right place (whatever that may be) IID IID_IAugmentedShellFolder = { 0x91EA3F8C, 0xC99B, 0x11D0, { 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72 } }; IID IID_IAugmentedShellFolder2 = { 0x8DB3B3F4, 0x6CFE, 0x11D1, { 0x8A, 0xE9, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0 } }; CLSID CLSID_MergedFolder = { 0x26FDC864, 0xBE88, 0x46E7, { 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E } }; @@ -309,7 +310,7 @@ return hr; } -HRESULT GetStartMenuFolder(IShellFolder ** ppsfStartMenu) +static HRESULT GetStartMenuFolder(IShellFolder ** ppsfStartMenu) { HRESULT hr; LPITEMIDLIST pidlUserStartMenu; Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Sat Aug 9 15:56:05 2014 @@ -30,6 +30,22 @@ #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) #define USE_CUSTOM_MENUBAND 1 + +#if 1 +// TODO: declare these GUIDs and interfaces in the right place (whatever that may be) + +IID IID_IAugmentedShellFolder = { 0x91EA3F8C, 0xC99B, 0x11D0, { 0x98, 0x15, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72 } }; +CLSID CLSID_MergedFolder = { 0x26FDC864, 0xBE88, 0x46E7, { 0x92, 0x35, 0x03, 0x2D, 0x8E, 0xA5, 0x16, 0x2E } }; + +interface IAugmentedShellFolder : public IShellFolder +{ + virtual HRESULT STDMETHODCALLTYPE AddNameSpace(LPGUID, IShellFolder *, LPCITEMIDLIST, ULONG) = 0; + virtual HRESULT STDMETHODCALLTYPE GetNameSpaceID(LPCITEMIDLIST, LPGUID) = 0; + virtual HRESULT STDMETHODCALLTYPE QueryNameSpace(ULONG, LPGUID, IShellFolder **) = 0; + virtual HRESULT STDMETHODCALLTYPE EnumNameSpace(ULONG, PULONG) = 0; +}; + +#endif // navigation controls and menubar just send a message to parent window /* @@ -74,7 +90,11 @@ extern HRESULT CreateAddressBand(REFIID riid, void **ppv); typedef HRESULT(WINAPI * PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); -typedef HRESULT(WINAPI * PMERGEDFOLDER_CONSTRUCTOR)(IShellFolder* userLocal, IShellFolder* allUsers, REFIID riid, LPVOID *ppv); +typedef HRESULT(WINAPI * PMERGEDFOLDER_CONSTRUCTOR)(REFIID riid, void **ppv); + +HMODULE hRShell = NULL; +PMERGEDFOLDER_CONSTRUCTOR pCMergedFolder_Constructor = NULL; +PMENUBAND_CONSTRUCTOR pCMenuBand_Constructor = NULL; HRESULT IUnknown_HasFocusIO(IUnknown * punk) { @@ -392,15 +412,105 @@ { } +static HRESULT BindToDesktop(LPCITEMIDLIST pidl, IShellFolder ** ppsfResult) +{ + HRESULT hr; + CComPtr<IShellFolder> psfDesktop; + + *ppsfResult = NULL; + + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + + hr = psfDesktop->BindToObject(pidl, NULL, IID_PPV_ARG(IShellFolder, ppsfResult)); + + return hr; +} + +static HRESULT GetFavoritesFolder(IShellFolder ** ppsfFavorites, LPITEMIDLIST * ppidl) +{ + HRESULT hr; + LPITEMIDLIST pidlUserFavorites; + LPITEMIDLIST pidlCommonFavorites; + CComPtr<IShellFolder> psfUserFavorites; + CComPtr<IShellFolder> psfCommonFavorites; + CComPtr<IAugmentedShellFolder> pasf; + + *ppsfFavorites = NULL; + + hr = SHGetSpecialFolderLocation(NULL, CSIDL_FAVORITES, &pidlUserFavorites); + if (FAILED(hr)) + return hr; + + if (FAILED(SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_FAVORITES, &pidlCommonFavorites))) + { + hr = BindToDesktop(pidlUserFavorites, ppsfFavorites); + *ppidl = pidlUserFavorites; + return hr; + } + + hr = BindToDesktop(pidlUserFavorites, &psfUserFavorites); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = BindToDesktop(pidlCommonFavorites, &psfCommonFavorites); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + +#if 1 + if (!hRShell) + { + hRShell = GetModuleHandle(L"rshell.dll"); + if (!hRShell) + hRShell = LoadLibrary(L"rshell.dll"); + } + + if (!pCMergedFolder_Constructor) + pCMergedFolder_Constructor = (PMERGEDFOLDER_CONSTRUCTOR) GetProcAddress(hRShell, "CMergedFolder_Constructor"); + + if (pCMergedFolder_Constructor) + { + hr = pCMergedFolder_Constructor(IID_PPV_ARG(IAugmentedShellFolder, &pasf)); + } + else + { + hr = E_FAIL; + } +#else + hr = CoCreateInstance(CLSID_MergedFolder, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IAugmentedShellFolder, &pasf)); +#endif + if (FAILED_UNEXPECTEDLY(hr)) + { + *ppsfFavorites = psfUserFavorites.Detach(); + *ppidl = pidlUserFavorites; + ILFree(pidlCommonFavorites); + return hr; + } + + hr = pasf->AddNameSpace(NULL, psfUserFavorites, pidlUserFavorites, 0xFF00); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pasf->AddNameSpace(NULL, psfCommonFavorites, pidlCommonFavorites, 0); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = pasf->QueryInterface(IID_PPV_ARG(IShellFolder, ppsfFavorites)); + pasf.Release(); + + ILFree(pidlCommonFavorites); + ILFree(pidlUserFavorites); + + return hr; +} + HRESULT STDMETHODCALLTYPE CMenuCallback::GetObject(LPSMDATA psmd, REFIID riid, void **ppvObject) { CComPtr<IShellMenu> parentMenu; CComPtr<IShellMenu> newMenu; CComPtr<IShellFolder> favoritesFolder; LPITEMIDLIST favoritesPIDL; - CComPtr<IShellFolder> commonFavsFolder; - LPITEMIDLIST commonFavsPIDL; - CComPtr<IShellFolder> mergedFolder; HWND ownerWindow; HMENU parentHMenu; HMENU favoritesHMenu; @@ -428,12 +538,19 @@ if (favoritesHMenu == NULL) return E_FAIL; #if USE_CUSTOM_MENUBAND - HMODULE hrs = LoadLibrary(L"rshell.dll"); - - PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hrs, "CMenuBand_Constructor"); - if (func) + if (!hRShell) { - hResult = func(IID_PPV_ARG(IShellMenu, &newMenu)); + hRShell = GetModuleHandle(L"rshell.dll"); + if (!hRShell) + hRShell = LoadLibrary(L"rshell.dll"); + } + + if (!pCMenuBand_Constructor) + pCMenuBand_Constructor = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hRShell, "CMenuBand_Constructor"); + + if (pCMenuBand_Constructor) + { + hResult = pCMenuBand_Constructor(IID_PPV_ARG(IShellMenu, &newMenu)); } else { @@ -452,36 +569,15 @@ hResult = newMenu->SetMenu(favoritesHMenu, ownerWindow, SMSET_TOP | SMSET_DONTOWN); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = SHGetSpecialFolderLocation(NULL, CSIDL_FAVORITES, &favoritesPIDL); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = SHBindToFolder(favoritesPIDL, &favoritesFolder); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; + RegCreateKeyEx(HKEY_CURRENT_USER, szFavoritesKey, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &orderRegKey, &disposition); -#if 1 /*USE_MERGED_FAVORITES*/ - hResult = SHGetSpecialFolderLocation(NULL, CSIDL_COMMON_FAVORITES, &commonFavsPIDL); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - hResult = SHBindToFolder(commonFavsPIDL, &commonFavsFolder); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - ILFree(commonFavsPIDL); - - PMERGEDFOLDER_CONSTRUCTOR mfconstruct = (PMERGEDFOLDER_CONSTRUCTOR) GetProcAddress(hrs, "CMergedFolder_Constructor"); - if (mfconstruct) - { - hResult = mfconstruct(favoritesFolder, commonFavsFolder, IID_PPV_ARG(IShellFolder, &mergedFolder)); - } - else - { - mergedFolder = favoritesFolder; - } -#else - mergedFolder = favoritesFolder; -#endif - hResult = newMenu->SetShellFolder(mergedFolder, favoritesPIDL, orderRegKey, SMSET_BOTTOM | SMINIT_CACHED | SMINV_ID); + + hResult = GetFavoritesFolder(&favoritesFolder, &favoritesPIDL); + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + hResult = newMenu->SetShellFolder(favoritesFolder, favoritesPIDL, orderRegKey, SMSET_BOTTOM | SMINIT_CACHED | SMINV_ID); ILFree(favoritesPIDL); if (SUCCEEDED(hResult)) fFavoritesMenu.Attach(newMenu.Detach()); Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sat Aug 9 15:56:05 2014 @@ -26,13 +26,11 @@ extern "C" BOOL WINAPI Shell_GetImageLists( _Out_ HIMAGELIST *phiml, - _Out_ HIMAGELIST *phimlSmall - ); + _Out_ HIMAGELIST *phimlSmall); extern HRESULT IUnknown_ShowDW(IUnknown * punk, BOOL fShow); #include "newatlinterfaces.h" - /* TODO: @@ -1853,16 +1851,7 @@ { HMENU mainMenu = LoadMenu(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(IDM_CABINET_MAINMENU)); - //DbgPrint("Menu from shell32:\n"); - //DbgDumpMenu(hmenuShared); - - //DbgPrint("Menu from browseui:\n"); - //DbgDumpMenu(mainMenu); - Shell_MergeMenus(hmenuShared, mainMenu, 0, 0, FCIDM_BROWSERLAST, MM_SUBMENUSHAVEIDS); - - //DbgPrint("Merged menu:\n"); - //DbgDumpMenu(hmenuShared); int GCCU(itemCount3) = GetMenuItemCount(hmenuShared); Unused(itemCount3); @@ -1879,9 +1868,6 @@ { CComPtr<IShellMenu> shellMenu; HRESULT hResult; - - //DbgPrint("SetMenuSB:\n"); - //DbgDumpMenu(hmenuShared); if (hmenuShared && IsMenu(hmenuShared) == FALSE) return E_FAIL; @@ -3206,13 +3192,7 @@ menuIndex = 5; } - //DbgPrint("Before relay:\n"); - //DbgDumpMenu(theMenu); - LRESULT ret = RelayMsgToShellView(uMsg, wParam, menuIndex, bHandled); - - //DbgPrint("After relay:\n"); - //DbgDumpMenu(theMenu); return ret; }

10 years, 4 months

[dquintana] 63846: * Sync to trunk r63845.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Aug 9 14:15:16 2014 New Revision: 63846 URL: http://svn.reactos.org/svn/reactos?rev=63846&view=rev Log: * Sync to trunk r63845. Added: branches/shell-experiments/dll/win32/cards/COPYING - copied unchanged from r63845, trunk/reactos/dll/win32/cards/COPYING branches/shell-experiments/subsystems/ntvdm/hardware/mouse.c - copied unchanged from r63845, trunk/reactos/subsystems/ntvdm/hardware/mouse.c branches/shell-experiments/subsystems/ntvdm/hardware/mouse.h - copied unchanged from r63845, trunk/reactos/subsystems/ntvdm/hardware/mouse.h branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/dummyterm.c - copied unchanged from r63845, trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyterm.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/terminal.c - copied unchanged from r63845, trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c branches/shell-experiments/win32ss/user/winsrv/consrv/include/conio_winsrv.h - copied unchanged from r63845, trunk/reactos/win32ss/user/winsrv/consrv/include/conio_winsrv.h branches/shell-experiments/win32ss/user/winsrv/consrv/include/rect.h - copied unchanged from r63845, trunk/reactos/win32ss/user/winsrv/consrv/include/rect.h Removed: branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c Modified: branches/shell-experiments/ (props changed) branches/shell-experiments/CMakeLists.txt branches/shell-experiments/base/applications/calc/lang/tr-TR.rc branches/shell-experiments/base/applications/charmap/about.c branches/shell-experiments/base/applications/charmap/charmap.c branches/shell-experiments/base/applications/charmap/lrgcell.c branches/shell-experiments/base/applications/charmap/map.c branches/shell-experiments/base/applications/charmap/settings.c branches/shell-experiments/base/applications/games/spider/spider.cpp branches/shell-experiments/base/applications/games/spider/spider.h branches/shell-experiments/base/applications/games/spider/spigame.cpp branches/shell-experiments/base/applications/mplay32/lang/tr-TR.rc branches/shell-experiments/base/applications/mscutils/servman/lang/tr-TR.rc branches/shell-experiments/base/applications/mspaint/lang/tr-TR.rc branches/shell-experiments/base/applications/notepad/lang/tr-TR.rc branches/shell-experiments/base/applications/rapps/lang/tr-TR.rc branches/shell-experiments/base/applications/rapps/rapps/ghostscript.txt branches/shell-experiments/base/applications/rapps/rapps/ghostview.txt branches/shell-experiments/base/applications/rapps/rapps/miktex.txt branches/shell-experiments/base/applications/rapps/rapps/net20.txt branches/shell-experiments/base/applications/rapps/rapps/nirlauncher.txt branches/shell-experiments/base/applications/rapps/rapps/qmmp.txt branches/shell-experiments/base/applications/rapps/rapps/smplayer.txt branches/shell-experiments/base/applications/regedit/lang/tr-TR.rc branches/shell-experiments/base/applications/screensavers/logon/lang/tr-TR.rc branches/shell-experiments/base/applications/sndrec32/lang/tr-TR.rc branches/shell-experiments/base/applications/taskmgr/lang/tr-TR.rc branches/shell-experiments/base/applications/winhlp32/lang/Tr.rc branches/shell-experiments/base/applications/wordpad/lang/Tr.rc branches/shell-experiments/base/setup/usetup/lang/tr-TR.h branches/shell-experiments/base/shell/explorer/CMakeLists.txt branches/shell-experiments/boot/bootdata/CMakeLists.txt branches/shell-experiments/boot/bootdata/packages/CMakeLists.txt branches/shell-experiments/cmake/CMakeMacros.cmake branches/shell-experiments/dll/cpl/access/lang/tr-TR.rc branches/shell-experiments/dll/cpl/console/console.c branches/shell-experiments/dll/cpl/console/layout.c branches/shell-experiments/dll/cpl/desk/lang/tr-TR.rc branches/shell-experiments/dll/cpl/input/lang/tr-TR.rc branches/shell-experiments/dll/cpl/main/lang/tr-TR.rc branches/shell-experiments/dll/cpl/mmsys/lang/tr-TR.rc branches/shell-experiments/dll/cpl/powercfg/lang/tr-TR.rc branches/shell-experiments/dll/cpl/sysdm/lang/tr-TR.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/cs-CZ.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/de-DE.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/en-US.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/he-IL.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/pl-PL.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/ro-RO.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/sq-AL.rc branches/shell-experiments/dll/cpl/wined3dcfg/lang/tr-TR.rc branches/shell-experiments/dll/ntdll/csr/capture.c branches/shell-experiments/dll/win32/avifil32/lang/avifile_Tr.rc branches/shell-experiments/dll/win32/browseui/CMakeLists.txt branches/shell-experiments/dll/win32/browseui/precomp.h branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken1.bmp branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken11.bmp branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken12.bmp branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken3.bmp branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken4.bmp branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken6.bmp branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken8.bmp branches/shell-experiments/dll/win32/cards/res/default/Background_6.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Ace.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Eight.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Five.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Four.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Jack.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_King.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Nine.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Queen.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Seven.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Six.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Ten.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Three.bmp branches/shell-experiments/dll/win32/cards/res/default/Clubs_Two.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Ace.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Eight.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Five.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Four.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Jack.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_King.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Nine.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Queen.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Seven.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Six.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Ten.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Three.bmp branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Two.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Ace.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Eight.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Five.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Four.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Jack.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_King.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Nine.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Queen.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Seven.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Six.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Ten.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Three.bmp branches/shell-experiments/dll/win32/cards/res/default/Hearts_Two.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Ace.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Eight.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Five.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Four.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Jack.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_King.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Nine.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Queen.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Seven.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Six.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Ten.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Three.bmp branches/shell-experiments/dll/win32/cards/res/default/Spades_Two.bmp branches/shell-experiments/dll/win32/comctl32/lang/comctl_Tr.rc branches/shell-experiments/dll/win32/comctl32/rsrc.rc branches/shell-experiments/dll/win32/comdlg32/lang/cdlg_Tr.rc branches/shell-experiments/dll/win32/comdlg32/rsrc.rc branches/shell-experiments/dll/win32/credui/lang/credui_Tr.rc branches/shell-experiments/dll/win32/crypt32/lang/crypt32_Tr.rc branches/shell-experiments/dll/win32/cryptdlg/lang/cryptdlg_Tr.rc branches/shell-experiments/dll/win32/cryptui/lang/cryptui_Tr.rc branches/shell-experiments/dll/win32/devmgr/lang/tr-TR.rc branches/shell-experiments/dll/win32/getuname/getuname.rc branches/shell-experiments/dll/win32/jscript/lang/jscript_Tr.rc branches/shell-experiments/dll/win32/kernel32/client/console/alias.c branches/shell-experiments/dll/win32/kernel32/client/console/console.c branches/shell-experiments/dll/win32/kernel32/client/console/history.c branches/shell-experiments/dll/win32/kernel32/client/console/readwrite.c branches/shell-experiments/dll/win32/kernel32/client/handle.c branches/shell-experiments/dll/win32/kernel32/include/console.h branches/shell-experiments/dll/win32/kernel32/winnls/lang/tr-TR.rc branches/shell-experiments/dll/win32/localui/lang/ui_Tr.rc branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Tr.rc branches/shell-experiments/dll/win32/oledlg/lang/oledlg_Tr.rc branches/shell-experiments/dll/win32/shell32/folders.cpp branches/shell-experiments/dll/win32/shell32/iconcache.cpp branches/shell-experiments/dll/win32/shell32/shfldr.h branches/shell-experiments/dll/win32/shell32/shlfolder.cpp branches/shell-experiments/drivers/filesystems/npfs/datasup.c branches/shell-experiments/drivers/filesystems/npfs/readsup.c branches/shell-experiments/drivers/filesystems/npfs/waitsup.c branches/shell-experiments/include/ndk/mmtypes.h branches/shell-experiments/include/reactos/libs/pseh/pseh3.h branches/shell-experiments/include/reactos/subsys/csr/csr.h branches/shell-experiments/include/reactos/subsys/win/conmsg.h branches/shell-experiments/lib/pseh/i386/pseh3.c branches/shell-experiments/ntoskrnl/CMakeLists.txt branches/shell-experiments/ntoskrnl/config/i386/cmhardwr.c branches/shell-experiments/ntoskrnl/include/internal/i386/ke.h branches/shell-experiments/ntoskrnl/include/internal/mm.h branches/shell-experiments/ntoskrnl/io/iomgr/iofunc.c branches/shell-experiments/ntoskrnl/mm/ARM3/miarm.h branches/shell-experiments/ntoskrnl/mm/ARM3/pagfault.c branches/shell-experiments/ntoskrnl/mm/ARM3/pfnlist.c branches/shell-experiments/ntoskrnl/mm/ARM3/section.c branches/shell-experiments/ntoskrnl/mm/ARM3/virtual.c branches/shell-experiments/ntoskrnl/mm/balance.c branches/shell-experiments/ntoskrnl/mm/pagefile.c branches/shell-experiments/ntoskrnl/mm/section.c branches/shell-experiments/ntoskrnl/ntkrnlmp/CMakeLists.txt branches/shell-experiments/ntoskrnl/ob/oblife.c branches/shell-experiments/subsystems/ntvdm/CMakeLists.txt branches/shell-experiments/subsystems/ntvdm/hardware/ps2.c branches/shell-experiments/subsystems/ntvdm/hardware/ps2.h branches/shell-experiments/subsystems/ntvdm/hardware/vga.c branches/shell-experiments/win32ss/gdi/ntgdi/cliprgn.c branches/shell-experiments/win32ss/user/ntuser/clipboard.c branches/shell-experiments/win32ss/user/ntuser/cursoricon.c branches/shell-experiments/win32ss/user/ntuser/cursoricon_new.c branches/shell-experiments/win32ss/user/ntuser/menu.c branches/shell-experiments/win32ss/user/user32/misc/stubs.c branches/shell-experiments/win32ss/user/winsrv/consrv.cmake branches/shell-experiments/win32ss/user/winsrv/consrv/alias.c branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/coninput.c branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/conoutput.c branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/console.c branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/graphics.c branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/text.c branches/shell-experiments/win32ss/user/winsrv/consrv/coninput.c branches/shell-experiments/win32ss/user/winsrv/consrv/coninput.h branches/shell-experiments/win32ss/user/winsrv/consrv/conoutput.c branches/shell-experiments/win32ss/user/winsrv/consrv/conoutput.h branches/shell-experiments/win32ss/user/winsrv/consrv/console.c branches/shell-experiments/win32ss/user/winsrv/consrv/console.h branches/shell-experiments/win32ss/user/winsrv/consrv/consrv.h branches/shell-experiments/win32ss/user/winsrv/consrv/frontendctl.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/input.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h branches/shell-experiments/win32ss/user/winsrv/consrv/handle.c branches/shell-experiments/win32ss/user/winsrv/consrv/handle.h branches/shell-experiments/win32ss/user/winsrv/consrv/include/conio.h branches/shell-experiments/win32ss/user/winsrv/consrv/include/console.h branches/shell-experiments/win32ss/user/winsrv/consrv/include/settings.h branches/shell-experiments/win32ss/user/winsrv/consrv/include/term.h branches/shell-experiments/win32ss/user/winsrv/consrv/init.c branches/shell-experiments/win32ss/user/winsrv/consrv/lineinput.c branches/shell-experiments/win32ss/user/winsrv/consrv/lineinput.h branches/shell-experiments/win32ss/user/winsrv/consrv/procinit.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell-experiments/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/CMakeLists.tx… Modified: branches/shell-experiments/base/applications/calc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/charmap/about.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/charmap/lrgcell.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/charmap/settings.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/spider.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/spider.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/spigame.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/servman/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/ghostscript.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/ghostview.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/miktex.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/net20.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/nirlauncher.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/regedit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/screensavers/logon/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/sndrec32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/winhlp32/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/wordpad/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… Modified: branches/shell-experiments/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/boot/bootdata/packages/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/cmake/CMakeMa… Modified: branches/shell-experiments/dll/cpl/access/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/acces… Modified: branches/shell-experiments/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/conso… Modified: branches/shell-experiments/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/conso… Modified: branches/shell-experiments/dll/cpl/desk/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/desk/… Modified: branches/shell-experiments/dll/cpl/input/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/input… Modified: branches/shell-experiments/dll/cpl/main/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/main/… Modified: branches/shell-experiments/dll/cpl/mmsys/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/mmsys… Modified: branches/shell-experiments/dll/cpl/powercfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/power… Modified: branches/shell-experiments/dll/cpl/sysdm/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/sysdm… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/cpl/wined3dcfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/wined… Modified: branches/shell-experiments/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/ntdll/csr… Modified: branches/shell-experiments/dll/win32/avifil32/lang/avifile_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/avi… Modified: branches/shell-experiments/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… Modified: branches/shell-experiments/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… Modified: branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken1.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken11.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken12.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken3.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken4.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken6.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/bavarian/Ruecken8.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Background_6.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Clubs_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Diamonds_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Hearts_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/res/default/Spades_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/comctl32/lang/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/com… Modified: branches/shell-experiments/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/com… Modified: branches/shell-experiments/dll/win32/comdlg32/lang/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/com… Modified: branches/shell-experiments/dll/win32/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/com… Modified: branches/shell-experiments/dll/win32/credui/lang/credui_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/cre… Modified: branches/shell-experiments/dll/win32/crypt32/lang/crypt32_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/cry… Modified: branches/shell-experiments/dll/win32/cryptdlg/lang/cryptdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/cry… Modified: branches/shell-experiments/dll/win32/cryptui/lang/cryptui_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/cry… Modified: branches/shell-experiments/dll/win32/devmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/dev… Modified: branches/shell-experiments/dll/win32/getuname/getuname.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/get… Modified: branches/shell-experiments/dll/win32/jscript/lang/jscript_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/jsc… Modified: branches/shell-experiments/dll/win32/kernel32/client/console/alias.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/client/console/history.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/client/handle.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/include/console.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/winnls/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/localui/lang/ui_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/loc… Modified: branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msvfw32/lang/msvfw32_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/oledlg/lang/oledlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ole… Modified: branches/shell-experiments/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/drivers/filesystems/npfs/datasup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/npfs/readsup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/npfs/waitsup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/ndk/m… Modified: branches/shell-experiments/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/include/reactos/subsys/csr/csr.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/lib/pseh/i386/pseh3.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/pseh/i386… Modified: branches/shell-experiments/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/CMak… Modified: branches/shell-experiments/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/conf… Modified: branches/shell-experiments/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/incl… Modified: branches/shell-experiments/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/incl… Modified: branches/shell-experiments/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/io/i… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/A… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/A… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/A… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/A… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/A… Modified: branches/shell-experiments/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/b… Modified: branches/shell-experiments/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/p… Modified: branches/shell-experiments/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/s… Modified: branches/shell-experiments/ntoskrnl/ntkrnlmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/ntkr… Modified: branches/shell-experiments/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/ob/o… Modified: branches/shell-experiments/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/ps2.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/subsystems/nt… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Removed: branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/coninput.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/conoutput.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/console.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontendctl.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/input.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/handle.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/include/console.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/include/settings.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/include/term.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/lineinput.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/winsrv/consrv/procinit.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…

10 years, 4 months

[aandrejevic] 63845: [SHELL32] - Greatly optimize file icon retrieval by reducing the times we try to access the disk. - Store icons in a binary tree in the shell icon cache for faster retrieval. P...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Aug 9 13:40:13 2014 New Revision: 63845 URL: http://svn.reactos.org/svn/reactos?rev=63845&view=rev Log: [SHELL32] - Greatly optimize file icon retrieval by reducing the times we try to access the disk. - Store icons in a binary tree in the shell icon cache for faster retrieval. Patch by Huw Campbell committed at the request of Giannis Adamopoulos. Modified: trunk/reactos/dll/win32/shell32/folders.cpp trunk/reactos/dll/win32/shell32/iconcache.cpp trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] Sat Aug 9 13:40:13 2014 @@ -28,6 +28,7 @@ LPWSTR szIconFile, UINT cchMax, int *piIndex, UINT *pwFlags) { int icon_idx; + bool cont=TRUE; WCHAR wszPath[MAX_PATH]; WCHAR wszCLSIDValue[CHARS_IN_GUID]; static const WCHAR shellClassInfo[] = { '.', 'S', 'h', 'e', 'l', 'l', 'C', 'l', 'a', 's', 's', 'I', 'n', 'f', 'o', 0 }; @@ -36,27 +37,40 @@ static const WCHAR clsid2[] = { 'C', 'L', 'S', 'I', 'D', '2', 0 }; static const WCHAR iconIndex[] = { 'I', 'c', 'o', 'n', 'I', 'n', 'd', 'e', 'x', 0 }; - if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, iconFile, - wszPath, MAX_PATH)) - { - WCHAR wszIconIndex[10]; - SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, iconIndex, - wszIconIndex, 10); - *piIndex = _wtoi(wszIconIndex); - } - else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid, - wszCLSIDValue, CHARS_IN_GUID) && - HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) - { - *piIndex = icon_idx; - } - else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid2, - wszCLSIDValue, CHARS_IN_GUID) && - HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) - { - *piIndex = icon_idx; - } - else + /* + Optimisation. GetCustomFolderAttribute has a critical lock on it, and isn't fast. + Test the water (i.e., see if the attribute exists) before questioning it three times + when most folders don't use it at all. + */ + WCHAR wszBigToe[3]; + if (!(uFlags & GIL_DEFAULTICON) && SHELL32_GetCustomFolderAttributes(pidl, shellClassInfo, + wszBigToe, 3)) + { + if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, iconFile, + wszPath, MAX_PATH)) + { + WCHAR wszIconIndex[10]; + SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, iconIndex, + wszIconIndex, 10); + *piIndex = _wtoi(wszIconIndex); + cont=FALSE; + } + else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid, + wszCLSIDValue, CHARS_IN_GUID) && + HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) + { + *piIndex = icon_idx; + cont=FALSE; + } + else if (SHELL32_GetCustomFolderAttribute(pidl, shellClassInfo, clsid2, + wszCLSIDValue, CHARS_IN_GUID) && + HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) + { + *piIndex = icon_idx; + cont=FALSE; + } + } + if (cont) { static const WCHAR folder[] = { 'F', 'o', 'l', 'd', 'e', 'r', 0 }; @@ -322,6 +336,10 @@ &flags))) { initIcon->SetNormalIcon(wTemp, icon_idx); + // FIXME: if/when getIconLocationForFolder does something for + // GIL_FORSHORTCUT, code below should be uncommented. and + // the following line removed. + initIcon->SetShortcutIcon(wTemp, icon_idx); } if (SUCCEEDED(getIconLocationForFolder( pidl, GIL_DEFAULTICON, wTemp, MAX_PATH, @@ -330,13 +348,13 @@ { initIcon->SetDefaultIcon(wTemp, icon_idx); } - if (SUCCEEDED(getIconLocationForFolder( - pidl, GIL_FORSHORTCUT, wTemp, MAX_PATH, - &icon_idx, - &flags))) - { - initIcon->SetShortcutIcon(wTemp, icon_idx); - } + // if (SUCCEEDED(getIconLocationForFolder( + // pidl, GIL_FORSHORTCUT, wTemp, MAX_PATH, + // &icon_idx, + // &flags))) + // { + // initIcon->SetShortcutIcon(wTemp, icon_idx); + // } if (SUCCEEDED(getIconLocationForFolder( pidl, GIL_OPENICON, wTemp, MAX_PATH, &icon_idx, Modified: trunk/reactos/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/iconcach… ============================================================================== --- trunk/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/iconcache.cpp [iso-8859-1] Sat Aug 9 13:40:13 2014 @@ -64,14 +64,14 @@ * loaded from, their resource index and the fact if they have a shortcut * icon overlay or not. */ - if (e1->dwSourceIndex != e2->dwSourceIndex || /* first the faster one */ - (e1->dwFlags & GIL_FORSHORTCUT) != (e2->dwFlags & GIL_FORSHORTCUT)) - return 1; - - if (wcsicmp(e1->sSourceFile,e2->sSourceFile)) - return 1; - - return 0; + /* first the faster one */ + if (e1->dwSourceIndex != e2->dwSourceIndex) + return (e1->dwSourceIndex < e2->dwSourceIndex) ? -1 : 1; + + if ((e1->dwFlags & GIL_FORSHORTCUT) != (e2->dwFlags & GIL_FORSHORTCUT)) + return ((e1->dwFlags & GIL_FORSHORTCUT) < (e2->dwFlags & GIL_FORSHORTCUT)) ? -1 : 1; + + return wcsicmp(e1->sSourceFile,e2->sSourceFile); } /* declare SIC_LoadOverlayIcon() */ @@ -338,7 +338,8 @@ EnterCriticalSection(&SHELL32_SicCS); - indexDPA = DPA_InsertPtr(sic_hdpa, 0x7fff, lpsice); + indexDPA = DPA_Search (sic_hdpa, lpsice, 0, SIC_CompareEntries, 0, DPAS_SORTED|DPAS_INSERTAFTER); + indexDPA = DPA_InsertPtr(sic_hdpa, indexDPA, lpsice); if ( -1 == indexDPA ) { ret = INVALID_INDEX; @@ -468,7 +469,7 @@ if (NULL != DPA_GetPtr (sic_hdpa, 0)) { /* search linear from position 0*/ - index = DPA_Search (sic_hdpa, &sice, 0, SIC_CompareEntries, 0, 0); + index = DPA_Search (sic_hdpa, &sice, 0, SIC_CompareEntries, 0, DPAS_SORTED); } if ( INVALID_INDEX == index ) Modified: trunk/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr.h… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Sat Aug 9 13:40:13 2014 @@ -37,6 +37,7 @@ #define GET_SHGDN_RELATION(dwFlags) ((DWORD)dwFlags & (DWORD)0x000000FF) BOOL SHELL32_GetCustomFolderAttribute (LPCITEMIDLIST pidl, LPCWSTR pwszHeading, LPCWSTR pwszAttribute, LPWSTR pwszValue, DWORD cchValue); +BOOL SHELL32_GetCustomFolderAttributes (LPCITEMIDLIST pidl, LPCWSTR pwszHeading, LPWSTR pwszValue, DWORD cchValue); LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut); HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, LPITEMIDLIST * pidlInOut, Modified: trunk/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfolde… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Sat Aug 9 13:40:13 2014 @@ -80,6 +80,33 @@ } return FALSE; } + +BOOL SHELL32_GetCustomFolderAttributes( + LPCITEMIDLIST pidl, LPCWSTR pwszHeading, + LPWSTR pwszValue, DWORD cchValue) +{ + DWORD dwAttrib = FILE_ATTRIBUTE_SYSTEM; + WCHAR wszFolderPath[MAX_PATH]; + + /* Hack around not having system attribute on non-Windows file systems */ + if (0) + dwAttrib = _ILGetFileAttributes(pidl, NULL, 0); + + if (dwAttrib & FILE_ATTRIBUTE_SYSTEM) + { + if (!SHGetPathFromIDListW(pidl, wszFolderPath)) + return FALSE; + + static const WCHAR wszDesktopIni[] = + {'d','e','s','k','t','o','p','.','i','n','i',0}; + + PathAddBackslashW(wszFolderPath); + PathAppendW(wszFolderPath, wszDesktopIni); + return GetPrivateProfileSectionW(pwszHeading, pwszValue, cchValue, wszFolderPath); + } + return FALSE; +} + /*************************************************************************** * GetNextElement (internal function)

10 years, 4 months

[hbelusca] 63844: [NTVDM]: Add a compile-time-defined switch to be able to use the RegisterConsoleVDM API of ReactOS/Windows, or an emulated one.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Aug 9 13:22:50 2014 New Revision: 63844 URL: http://svn.reactos.org/svn/reactos?rev=63844&view=rev Log: [NTVDM]: Add a compile-time-defined switch to be able to use the RegisterConsoleVDM API of ReactOS/Windows, or an emulated one. Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Sat Aug 9 13:22:50 2014 @@ -20,6 +20,12 @@ static CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; static CONST DWORD MemoryLimit[] = { 0xAFFFF, 0xAFFFF, 0xB7FFF, 0xBFFFF }; + +/* + * Activate this line if you want to use the real + * RegisterConsoleVDM API of Windows/ReactOS. + */ +// #define USE_REAL_REGISTERCONSOLEVDM #define USE_REACTOS_COLORS // #define USE_DOSBOX_COLORS @@ -288,44 +294,12 @@ #include <ntddvdeo.h> -typedef -BOOL -(WINAPI *pRegisterConsoleVDM) -( - BOOL IsDosVDM_flag, - HANDLE EventHandle_1, - HANDLE EventHandle_2, - HANDLE EventHandle_3, - int Unused1, - PVOID returned_val_1, - PVOID *returned_val_2, - PVOID lpUnknownBuffer, - DWORD theUnknownBufferLength, - COORD theVDMBufferSize, - PCHAR *lpVDMBuffer -); - -#if 0 -BOOL -WINAPI -RegisterConsoleVDM -( - BOOL IsDosVDM_flag, - HANDLE EventHandle_1, - HANDLE EventHandle_2, - HANDLE EventHandle_3, - int Unused1, - PVOID returned_val_1, - PVOID *returned_val_2, - PVOID lpUnknownBuffer, - DWORD theUnknownBufferLength, - COORD theVDMBufferSize, - PVOID *lpVDMBuffer -); - -HMODULE hKernel32 = NULL; -pRegisterConsoleVDM RegisterConsoleVDM = NULL; -#endif +#ifdef USE_REAL_REGISTERCONSOLEVDM + +#define __RegisterConsoleVDM RegisterConsoleVDM +#define __InvalidateConsoleDIBits InvalidateConsoleDIBits + +#else /* * This private buffer, per-console, is used by @@ -340,49 +314,49 @@ BOOL WINAPI -__RegisterConsoleVDM(BOOL IsDosVDM_flag, - HANDLE EventHandle_1, - HANDLE EventHandle_2, - HANDLE EventHandle_3, - int Unused1, - PVOID returned_val_1, - PVOID *returned_val_2, - PVOID lpUnknownBuffer, - DWORD theUnknownBufferLength, - COORD theVDMBufferSize, - PCHAR *lpVDMBuffer) -{ - UNREFERENCED_PARAMETER(EventHandle_3); +__RegisterConsoleVDM(IN DWORD dwDosVDMFlag, + IN HANDLE hEventHandle1, + IN HANDLE hEventHandle2, + IN HANDLE hEventHandle3, + IN DWORD Unused1, + OUT PULONG returned_val_1, + OUT PVOID* returned_val_2, + IN PVOID lpUnknownBuffer, + IN DWORD dwUnknownBufferLength, + IN COORD dwVDMBufferSize, + OUT PVOID* lpVDMBuffer) +{ + UNREFERENCED_PARAMETER(hEventHandle3); UNREFERENCED_PARAMETER(Unused1); UNREFERENCED_PARAMETER(returned_val_1); UNREFERENCED_PARAMETER(returned_val_2); UNREFERENCED_PARAMETER(lpUnknownBuffer); - UNREFERENCED_PARAMETER(theUnknownBufferLength); + UNREFERENCED_PARAMETER(dwUnknownBufferLength); SetLastError(0); - DPRINT1("__RegisterConsoleVDM(%d)\n", IsDosVDM_flag); + DPRINT1("__RegisterConsoleVDM(%d)\n", dwDosVDMFlag); if (lpVDMBuffer == NULL) return FALSE; - if (IsDosVDM_flag) + if (dwDosVDMFlag != 0) { // if (EventHandle_1 == NULL || EventHandle_2 == NULL) return FALSE; if (VDMBuffer != NULL) return FALSE; - VDMBufferSize = theVDMBufferSize; + VDMBufferSize = dwVDMBufferSize; /* HACK: Cache -- to be removed in the real implementation */ CharBuff = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - theVDMBufferSize.X * theVDMBufferSize.Y - * sizeof(CHAR_INFO)); + VDMBufferSize.X * VDMBufferSize.Y + * sizeof(CHAR_INFO)); ASSERT(CharBuff); VDMBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - theVDMBufferSize.X * theVDMBufferSize.Y - * sizeof(CHAR_CELL)); - *lpVDMBuffer = (PCHAR)VDMBuffer; + VDMBufferSize.X * VDMBufferSize.Y + * sizeof(CHAR_CELL)); + *lpVDMBuffer = VDMBuffer; return (VDMBuffer != NULL); } else @@ -432,6 +406,8 @@ return InvalidateConsoleDIBits(hConsoleOutput, lpRect); } +#endif + /* PRIVATE FUNCTIONS **********************************************************/ static inline DWORD VgaGetAddressSize(VOID); @@ -458,6 +434,9 @@ ULONG Length = 0; PVIDEO_HARDWARE_STATE_HEADER State; +#ifdef USE_REAL_REGISTERCONSOLEVDM + PCHAR_INFO CharBuff = NULL; +#endif SHORT i, j; DWORD AddressSize, ScanlineSize; DWORD Address = 0; @@ -492,13 +471,21 @@ NULL, 0, TextResolution, - (PCHAR*)&TextFramebuffer); + (PVOID*)&TextFramebuffer); if (!Success) { DisplayMessage(L"RegisterConsoleVDM failed with error %d\n", GetLastError()); EmulatorTerminate(); return FALSE; } + +#ifdef USE_REAL_REGISTERCONSOLEVDM + CharBuff = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + TextResolution.X * TextResolution.Y + * sizeof(CHAR_INFO)); + ASSERT(CharBuff); +#endif /* * Resize the console @@ -559,6 +546,10 @@ /* Move to the next scanline */ Address += ScanlineSize; } + +#ifdef USE_REAL_REGISTERCONSOLEVDM + if (CharBuff) HeapFree(GetProcessHeap(), 0, CharBuff); +#endif VgaUpdateCursorPosition(); @@ -1950,7 +1941,7 @@ NULL, 0, dummySize, - (PCHAR*)&dummyPtr); + &dummyPtr); TextFramebuffer = NULL; @@ -2039,11 +2030,6 @@ CloseHandle(AnotherEvent); CloseHandle(EndEvent); CloseHandle(StartEvent); - -#if 0 - RegisterConsoleVDM = NULL; - FreeLibrary(hKernel32); -#endif } /* EOF */

10 years, 4 months

[hbelusca] 63843: Fix a typo.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Aug 9 10:51:22 2014 New Revision: 63843 URL: http://svn.reactos.org/svn/reactos?rev=63843&view=rev Log: Fix a typo. Modified: trunk/reactos/subsystems/ntvdm/hardware/mouse.h Modified: trunk/reactos/subsystems/ntvdm/hardware/mouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/mouse.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/mouse.h [iso-8859-1] Sat Aug 9 10:51:22 2014 @@ -49,7 +49,7 @@ #define MOUSE_SCROLL_UP 1 #define MOUSE_SCROLL_DOWN -1 #define MOUSE_SCROLL_RIGHT 2 -#define MOUSE_SCROLL_LET -2 +#define MOUSE_SCROLL_LEFT -2 typedef enum _MOUSE_MODE {

10 years, 4 months

[aandrejevic] 63842: [NTVDM] Start implementing mouse support.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Aug 9 01:39:28 2014 New Revision: 63842 URL: http://svn.reactos.org/svn/reactos?rev=63842&view=rev Log: [NTVDM] Start implementing mouse support. Added: trunk/reactos/subsystems/ntvdm/hardware/mouse.c (with props) trunk/reactos/subsystems/ntvdm/hardware/mouse.h (with props) Modified: trunk/reactos/subsystems/ntvdm/CMakeLists.txt trunk/reactos/subsystems/ntvdm/hardware/ps2.c trunk/reactos/subsystems/ntvdm/hardware/ps2.h Modified: trunk/reactos/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/CMakeList… ============================================================================== --- trunk/reactos/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Sat Aug 9 01:39:28 2014 @@ -19,6 +19,7 @@ hardware/speaker.c hardware/timer.c hardware/vga.c + hardware/mouse.c dos/dos32krnl/bios.c dos/dos32krnl/dos.c dos/dos32krnl/dosfiles.c Added: trunk/reactos/subsystems/ntvdm/hardware/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/mouse.c (added) +++ trunk/reactos/subsystems/ntvdm/hardware/mouse.c [iso-8859-1] Sat Aug 9 01:39:28 2014 @@ -0,0 +1,329 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: mouse.c + * PURPOSE: Mouse emulation + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +/* INCLUDES *******************************************************************/ + +#define NDEBUG + +#include "mouse.h" +#include "ps2.h" + +/* PRIVATE VARIABLES **********************************************************/ + +static MOUSE_MODE Mode, PreviousMode; +static COORD Position; +static ULONG WidthMm, HeightMm, WidthPixels, HeightPixels; +static ULONG SampleRate; +static ULONG Resolution; +static BOOLEAN Scaling; +static BOOLEAN Reporting; +static BYTE MouseId; +static ULONG ButtonState; +static SHORT HorzCounter; +static SHORT VertCounter; +static CHAR ScrollCounter; + +/* PRIVATE FUNCTIONS **********************************************************/ + +static VOID MouseResetConfig(VOID) +{ + /* Reset the configuration to defaults */ + SampleRate = 100; + Resolution = 4; + Scaling = FALSE; + Reporting = FALSE; +} + +static VOID MouseResetCounters(VOID) +{ + /* Reset all flags and counters */ + ButtonState = HorzCounter = VertCounter = ScrollCounter = 0; +} + +static VOID MouseReset(VOID) +{ + /* Reset everything */ + MouseResetConfig(); + MouseResetCounters(); + + /* Enter streaming mode and the reset the mouse ID */ + Mode = MOUSE_STREAMING_MODE; + MouseId = 0; + + /* Send the Basic Assurance Test success code and the device ID */ + KeyboardQueuePush(MOUSE_BAT_SUCCESS); + KeyboardQueuePush(MouseId); +} + +#if 0 +static VOID MouseGetPacket(PMOUSE_PACKET Packet) +{ + /* Clear the packet */ + ZeroMemory(Packet, sizeof(MOUSE_PACKET)); + + Packet->Flags |= MOUSE_ALWAYS_SET; + + /* Check for horizontal overflows */ + if ((HorzCounter < MOUSE_MIN) || (HorzCounter > MOUSE_MAX)) + { + if (HorzCounter > MOUSE_MAX) HorzCounter = MOUSE_MAX; + if (HorzCounter < MOUSE_MIN) HorzCounter = MOUSE_MIN; + + Packet->Flags |= MOUSE_X_OVERFLOW; + } + + /* Check for vertical overflows */ + if ((VertCounter < MOUSE_MIN) || (VertCounter > MOUSE_MAX)) + { + if (VertCounter > MOUSE_MIN) VertCounter = MOUSE_MIN; + if (VertCounter < MOUSE_MIN) VertCounter = MOUSE_MIN; + + Packet->Flags |= MOUSE_Y_OVERFLOW; + } + + /* Set the sign flags */ + if (HorzCounter & MOUSE_SIGN_BIT) Packet->Flags |= MOUSE_X_SIGN; + if (HorzCounter & MOUSE_SIGN_BIT) Packet->Flags |= MOUSE_Y_SIGN; + + /* Set the button flags */ + if (ButtonState & FROM_LEFT_1ST_BUTTON_PRESSED) Packet->Flags |= MOUSE_LEFT_BUTTON; + if (ButtonState & FROM_LEFT_2ND_BUTTON_PRESSED) Packet->Flags |= MOUSE_MIDDLE_BUTTON; + if (ButtonState & RIGHTMOST_BUTTON_PRESSED) Packet->Flags |= MOUSE_RIGHT_BUTTON; + + if (MouseId == 4) + { + if (ButtonState & FROM_LEFT_3RD_BUTTON_PRESSED) Packet->Extra |= MOUSE_4TH_BUTTON; + if (ButtonState & FROM_LEFT_4TH_BUTTON_PRESSED) Packet->Extra |= MOUSE_5TH_BUTTON; + } + + if (MouseId >= 3) + { + /* Set the scroll counter */ + Packet->Extra |= (UCHAR)ScrollCounter & 0x0F; + } + + /* Store the counters in the packet */ + Packet->HorzCounter = LOBYTE(HorzCounter); + Packet->VertCounter = LOBYTE(VertCounter); + + /* Reset the counters */ + MouseResetCounters(); +} +#endif + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID MouseUpdatePosition(PCOORD NewPosition) +{ + /* Update the counters */ + HorzCounter += ((NewPosition->X - Position.X) * WidthMm * Resolution) / WidthPixels; + VertCounter += ((NewPosition->Y - Position.Y) * HeightMm * Resolution) / HeightPixels; + + /* Update the position */ + Position = *NewPosition; +} + +VOID MouseUpdateButtons(ULONG NewButtonState) +{ + ButtonState = NewButtonState; +} + +VOID MouseScroll(LONG Direction) +{ + ScrollCounter += Direction; +} + +COORD MouseGetPosition(VOID) +{ + return Position; +} + +VOID MouseCommand(BYTE Command) +{ + switch (Command) + { + /* Set 1:1 Scaling */ + case 0xE6: + { + Scaling = FALSE; + KeyboardQueuePush(MOUSE_ACK); + break; + } + + /* Set 2:1 Scaling */ + case 0xE7: + { + Scaling = TRUE; + KeyboardQueuePush(MOUSE_ACK); + break; + } + + /* Set Resolution */ + case 0xE8: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + break; + } + + /* Read Status */ + case 0xE9: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + break; + } + + /* Enter Streaming Mode */ + case 0xEA: + { + MouseResetCounters(); + Mode = MOUSE_STREAMING_MODE; + + KeyboardQueuePush(MOUSE_ACK); + break; + } + + /* Read Packet */ + case 0xEB: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + break; + } + + /* Return From Wrap Mode */ + case 0xEC: + { + if (Mode == MOUSE_WRAP_MODE) + { + /* Restore the previous mode */ + MouseResetCounters(); + Mode = PreviousMode; + KeyboardQueuePush(MOUSE_ACK); + } + else KeyboardQueuePush(MOUSE_ERROR); + + break; + } + + /* Enter Wrap Mode */ + case 0xEE: + { + if (Mode != MOUSE_WRAP_MODE) + { + /* Save the previous mode */ + PreviousMode = Mode; + } + + MouseResetCounters(); + Mode = MOUSE_WRAP_MODE; + + KeyboardQueuePush(MOUSE_ACK); + break; + } + + /* Enter Remote Mode */ + case 0xF0: + { + MouseResetCounters(); + Mode = MOUSE_REMOTE_MODE; + + KeyboardQueuePush(MOUSE_ACK); + break; + } + + /* Get Mouse ID */ + case 0xF2: + { + KeyboardQueuePush(MOUSE_ACK); + KeyboardQueuePush(MouseId); + break; + } + + /* Set Sample Rate */ + case 0xF3: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + break; + } + + /* Enable Reporting */ + case 0xF4: + { + Reporting = TRUE; + KeyboardQueuePush(MOUSE_ACK); + break; + } + + /* Disable Reporting */ + case 0xF5: + { + Reporting = FALSE; + KeyboardQueuePush(MOUSE_ACK); + break; + } + + /* Set Defaults */ + case 0xF6: + { + /* Reset the configuration and counters */ + MouseResetConfig(); + MouseResetCounters(); + break; + } + + /* Resend */ + case 0xFE: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + break; + } + + /* Reset */ + case 0xFF: + { + MouseReset(); + break; + } + + /* Unknown command */ + default: + { + KeyboardQueuePush(MOUSE_ERROR); + } + } +} + +BOOLEAN MouseInit(VOID) +{ + HWND hWnd; + HDC hDC; + + /* Get the console window */ + hWnd = GetConsoleWindow(); + if (hWnd == NULL) return FALSE; + + /* Get the console window's device context */ + hDC = GetWindowDC(hWnd); + if (hDC == NULL) return FALSE; + + /* Get the parameters */ + WidthMm = (ULONG)GetDeviceCaps(hDC, HORZSIZE); + HeightMm = (ULONG)GetDeviceCaps(hDC, VERTSIZE); + WidthPixels = (ULONG)GetDeviceCaps(hDC, HORZRES); + HeightPixels = (ULONG)GetDeviceCaps(hDC, VERTRES); + + /* Release the device context */ + ReleaseDC(hWnd, hDC); + + MouseReset(); + return TRUE; +} Propchange: trunk/reactos/subsystems/ntvdm/hardware/mouse.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/ntvdm/hardware/mouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/mouse.h (added) +++ trunk/reactos/subsystems/ntvdm/hardware/mouse.h [iso-8859-1] Sat Aug 9 01:39:28 2014 @@ -0,0 +1,78 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: mouse.h + * PURPOSE: Mouse emulation + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#ifndef _MOUSE_H_ +#define _MOUSE_H_ + +/* INCLUDES *******************************************************************/ + +#include "ntvdm.h" + +/* DEFINES ********************************************************************/ + +/* Mouse packet constants */ +#define MOUSE_MIN -256 +#define MOUSE_MAX 255 +#define MOUSE_SIGN_BIT (1 << 8) + +/* Mouse packet flags */ +#define MOUSE_LEFT_BUTTON (1 << 0) +#define MOUSE_RIGHT_BUTTON (1 << 1) +#define MOUSE_MIDDLE_BUTTON (1 << 2) +#define MOUSE_ALWAYS_SET (1 << 3) +#define MOUSE_X_SIGN (1 << 4) +#define MOUSE_Y_SIGN (1 << 5) +#define MOUSE_X_OVERFLOW (1 << 6) +#define MOUSE_Y_OVERFLOW (1 << 7) + +/* Mouse packet extra flags */ +#define MOUSE_4TH_BUTTON (1 << 4) +#define MOUSE_5TH_BUTTON (1 << 5) + +/* Command responses */ +#define MOUSE_BAT_SUCCESS 0xAA +#define MOUSE_ACK 0xFA +#define MOUSE_ERROR 0xFC + +/* + * Scrolling directions + * + * It may seem odd that the directions are implemented this way, but + * this is how it's done on real hardware. It works because the two + * scroll wheels can't be used at the same time. + */ +#define MOUSE_SCROLL_UP 1 +#define MOUSE_SCROLL_DOWN -1 +#define MOUSE_SCROLL_RIGHT 2 +#define MOUSE_SCROLL_LET -2 + +typedef enum _MOUSE_MODE +{ + MOUSE_STREAMING_MODE, + MOUSE_REMOTE_MODE, + MOUSE_WRAP_MODE, +} MOUSE_MODE, *PMOUSE_MODE; + +typedef struct _MOUSE_PACKET +{ + BYTE Flags; + BYTE HorzCounter; + BYTE VertCounter; + BYTE Extra; +} MOUSE_PACKET, *PMOUSE_PACKET; + +/* FUNCTIONS ******************************************************************/ + +VOID MouseUpdatePosition(PCOORD NewPosition); +VOID MouseUpdateButtons(ULONG NewButtonState); +VOID MouseScroll(LONG Direction); +COORD MouseGetPosition(VOID); +VOID MouseCommand(BYTE Command); +BOOLEAN MouseInit(VOID); + +#endif // _MOUSE_H_ Propchange: trunk/reactos/subsystems/ntvdm/hardware/mouse.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/ps2.c [iso-8859-1] Sat Aug 9 01:39:28 2014 @@ -14,6 +14,7 @@ #include "io.h" #include "ps2.h" #include "pic.h" +#include "mouse.h" /* PRIVATE VARIABLES **********************************************************/ @@ -27,69 +28,6 @@ static HANDLE QueueMutex = NULL; /* PRIVATE FUNCTIONS **********************************************************/ - -static BOOLEAN KeyboardQueuePush(BYTE ScanCode) -{ - BOOLEAN Result = TRUE; - - WaitForSingleObject(QueueMutex, INFINITE); - - /* Check if the keyboard queue is full */ - if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd)) - { - Result = FALSE; - goto Done; - } - - /* Insert the value in the queue */ - KeyboardQueue[KeyboardQueueEnd] = ScanCode; - KeyboardQueueEnd++; - KeyboardQueueEnd %= KEYBOARD_BUFFER_SIZE; - - /* Since we inserted a value, it's not empty anymore */ - KeyboardQueueEmpty = FALSE; - -Done: - ReleaseMutex(QueueMutex); - return Result; -} - -static BOOLEAN KeyboardQueuePop(BYTE *ScanCode) -{ - BOOLEAN Result = TRUE; - - /* Make sure the keyboard queue is not empty (fast check) */ - if (KeyboardQueueEmpty) return FALSE; - - WaitForSingleObject(QueueMutex, INFINITE); - - /* - * Recheck whether keyboard queue is not empty (it - * may have changed after having grabbed the mutex). - */ - if (KeyboardQueueEmpty) - { - Result = FALSE; - goto Done; - } - - /* Get the scan code */ - *ScanCode = KeyboardQueue[KeyboardQueueStart]; - - /* Remove the value from the queue */ - KeyboardQueueStart++; - KeyboardQueueStart %= KEYBOARD_BUFFER_SIZE; - - /* Check if the queue is now empty */ - if (KeyboardQueueStart == KeyboardQueueEnd) - { - KeyboardQueueEmpty = TRUE; - } - -Done: - ReleaseMutex(QueueMutex); - return Result; -} static BYTE WINAPI PS2ReadPort(ULONG Port) { @@ -156,14 +94,14 @@ /* Disable mouse */ case 0xA7: { - // TODO: Mouse support + // TODO: Not implemented break; } /* Enable mouse */ case 0xA8: { - // TODO: Mouse support + // TODO: Not implemented break; } @@ -268,7 +206,7 @@ case 0xD4: { - // TODO: Mouse support + MouseCommand(Data); break; } } @@ -281,6 +219,69 @@ } /* PUBLIC FUNCTIONS ***********************************************************/ + +BOOLEAN KeyboardQueuePush(BYTE ScanCode) +{ + BOOLEAN Result = TRUE; + + WaitForSingleObject(QueueMutex, INFINITE); + + /* Check if the keyboard queue is full */ + if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd)) + { + Result = FALSE; + goto Done; + } + + /* Insert the value in the queue */ + KeyboardQueue[KeyboardQueueEnd] = ScanCode; + KeyboardQueueEnd++; + KeyboardQueueEnd %= KEYBOARD_BUFFER_SIZE; + + /* Since we inserted a value, it's not empty anymore */ + KeyboardQueueEmpty = FALSE; + +Done: + ReleaseMutex(QueueMutex); + return Result; +} + +BOOLEAN KeyboardQueuePop(BYTE *ScanCode) +{ + BOOLEAN Result = TRUE; + + /* Make sure the keyboard queue is not empty (fast check) */ + if (KeyboardQueueEmpty) return FALSE; + + WaitForSingleObject(QueueMutex, INFINITE); + + /* + * Recheck whether keyboard queue is not empty (it + * may have changed after having grabbed the mutex). + */ + if (KeyboardQueueEmpty) + { + Result = FALSE; + goto Done; + } + + /* Get the scan code */ + *ScanCode = KeyboardQueue[KeyboardQueueStart]; + + /* Remove the value from the queue */ + KeyboardQueueStart++; + KeyboardQueueStart %= KEYBOARD_BUFFER_SIZE; + + /* Check if the queue is now empty */ + if (KeyboardQueueStart == KeyboardQueueEnd) + { + KeyboardQueueEmpty = TRUE; + } + +Done: + ReleaseMutex(QueueMutex); + return Result; +} VOID PS2Dispatch(PINPUT_RECORD InputRecord) { Modified: trunk/reactos/subsystems/ntvdm/hardware/ps2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/ps2.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/ps2.h [iso-8859-1] Sat Aug 9 01:39:28 2014 @@ -24,6 +24,8 @@ /* FUNCTIONS ******************************************************************/ +BOOLEAN KeyboardQueuePush(BYTE ScanCode); +BOOLEAN KeyboardQueuePop(BYTE *ScanCode); VOID PS2Dispatch(PINPUT_RECORD InputRecord); VOID GenerateKeyboardInterrupts(VOID);

10 years, 4 months

[hbelusca] 63841: [KERNEL32][CONSRV] For WriteConsoleOutput API only!! Diagnosed with ApiMonitor from Rohitab. If one tries to write a too large buffer (>= 80*198 CHAR_INFO cells), the CsrAllocateC...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Aug 8 17:06:28 2014 New Revision: 63841 URL: http://svn.reactos.org/svn/reactos?rev=63841&view=rev Log: [KERNEL32][CONSRV] For WriteConsoleOutput API only!! Diagnosed with ApiMonitor from Rohitab. If one tries to write a too large buffer (>= 80*198 CHAR_INFO cells), the CsrAllocateCaptureBuffer API helper fails, because it uses the non-growable CSR port heap of fixed size 64kB. Since many applications use the API with large buffers (for example, Far Manager <= 1.70, the Windows XTree app http://textmode.netne.net/Extreme.html , ...) and maybe NTVDM, Windows (and hence ReactOS for compatibility reasons) allocates a buffer in the process' heap (and not in the CSR port heap via the CSR capture API), so that the big buffer allocation should work. Then, to be able to access it, CSR needs to call NtReadVirtualMemory for capturing the buffer. CORE-5006 CORE-6397 CORE-8424 #resolve Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c branches/condrv_restructure/include/reactos/subsys/win/conmsg.h branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Fri Aug 8 17:06:28 2014 @@ -881,6 +881,7 @@ { WriteOutputRequest->CharInfo = &WriteOutputRequest->StaticBuffer; // CaptureBuffer = NULL; + WriteOutputRequest->UseVirtualMemory = FALSE; } else { @@ -888,17 +889,36 @@ /* Allocate a Capture Buffer */ CaptureBuffer = CsrAllocateCaptureBuffer(1, Size); - if (CaptureBuffer == NULL) - { - DPRINT1("CsrAllocateCaptureBuffer failed with size %ld!\n", Size); - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - /* Allocate space in the Buffer */ - CsrAllocateMessagePointer(CaptureBuffer, - Size, - (PVOID*)&WriteOutputRequest->CharInfo); + if (CaptureBuffer) + { + /* Allocate space in the Buffer */ + CsrAllocateMessagePointer(CaptureBuffer, + Size, + (PVOID*)&WriteOutputRequest->CharInfo); + WriteOutputRequest->UseVirtualMemory = FALSE; + } + else + { + /* + * CsrAllocateCaptureBuffer failed because we tried to allocate + * a too large (>= 64 kB, size of the CSR heap) data buffer. + * To circumvent this, Windows uses a trick (that we reproduce for + * compatibility reasons): we allocate a heap buffer in the process' + * memory, and CSR will read it via NtReadVirtualMemory. + */ + DPRINT1("CsrAllocateCaptureBuffer failed with size %ld, let's use local heap buffer...\n", Size); + + WriteOutputRequest->CharInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, Size); + WriteOutputRequest->UseVirtualMemory = TRUE; + + /* Bail out if we still cannot allocate memory */ + if (WriteOutputRequest->CharInfo == NULL) + { + DPRINT1("Failed to allocate heap buffer with size %ld!\n", Size); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + } } /* Capture the user buffer contents */ @@ -945,7 +965,16 @@ Success = NT_SUCCESS(ApiMessage.Status); /* Release the capture buffer if needed */ - if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer); + if (CaptureBuffer) + { + CsrFreeCaptureBuffer(CaptureBuffer); + } + else + { + /* If we used a heap buffer, free it */ + if (WriteOutputRequest->UseVirtualMemory) + RtlFreeHeap(RtlGetProcessHeap(), 0, WriteOutputRequest->CharInfo); + } /* Retrieve the results */ _SEH2_TRY Modified: branches/condrv_restructure/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… ============================================================================== --- branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] Fri Aug 8 17:06:28 2014 @@ -544,7 +544,12 @@ SMALL_RECT WriteRegion; BOOLEAN Unicode; - ULONG Unknown; + /* + * If we are going to write too large (>= 64 kB, size of the CSR heap) + * data buffers, we allocate a heap buffer in the process' memory, and + * CSR will read it via NtReadVirtualMemory. + */ + BOOLEAN UseVirtualMemory; } CONSOLE_WRITEOUTPUT, *PCONSOLE_WRITEOUTPUT; typedef struct Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Fri Aug 8 17:06:28 2014 @@ -463,15 +463,15 @@ DPRINT("SrvReadConsoleOutput\n"); + NumCells = (ReadOutputRequest->ReadRegion.Right - ReadOutputRequest->ReadRegion.Left + 1) * + (ReadOutputRequest->ReadRegion.Bottom - ReadOutputRequest->ReadRegion.Top + 1); + /* * For optimization purposes, Windows (and hence ReactOS, too, for * compatibility reasons) uses a static buffer if no more than one * cell is read. Otherwise a new buffer is used. * The client-side expects that we know this behaviour. */ - NumCells = (ReadOutputRequest->ReadRegion.Right - ReadOutputRequest->ReadRegion.Left + 1) * - (ReadOutputRequest->ReadRegion.Bottom - ReadOutputRequest->ReadRegion.Top + 1); - if (NumCells <= 1) { /* @@ -520,47 +520,83 @@ NTSTATUS Status; PCONSOLE_WRITEOUTPUT WriteOutputRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.WriteOutputRequest; PTEXTMODE_SCREEN_BUFFER Buffer; + PCSR_PROCESS Process = CsrGetClientThread()->Process; ULONG NumCells; PCHAR_INFO CharInfo; DPRINT("SrvWriteConsoleOutput\n"); - /* - * For optimization purposes, Windows (and hence ReactOS, too, for - * compatibility reasons) uses a static buffer if no more than one - * cell is written. Otherwise a new buffer is used. - * The client-side expects that we know this behaviour. - */ NumCells = (WriteOutputRequest->WriteRegion.Right - WriteOutputRequest->WriteRegion.Left + 1) * (WriteOutputRequest->WriteRegion.Bottom - WriteOutputRequest->WriteRegion.Top + 1); - if (NumCells <= 1) - { - /* - * Adjust the internal pointer, because its old value points to - * the static buffer in the original ApiMessage structure. - */ - // WriteOutputRequest->CharInfo = &WriteOutputRequest->StaticBuffer; - CharInfo = &WriteOutputRequest->StaticBuffer; - } - else - { - if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&WriteOutputRequest->CharInfo, - NumCells, - sizeof(CHAR_INFO))) - { - return STATUS_INVALID_PARAMETER; - } - - CharInfo = WriteOutputRequest->CharInfo; - } - - Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(Process), WriteOutputRequest->OutputHandle, &Buffer, GENERIC_WRITE, TRUE); if (!NT_SUCCESS(Status)) return Status; + + /* + * Validate the message buffer if we do not use a process' heap buffer + * (CsrAllocateCaptureBuffer succeeded because we haven't allocated + * a too large (>= 64 kB, size of the CSR heap) data buffer). + */ + if (!WriteOutputRequest->UseVirtualMemory) + { + /* + * For optimization purposes, Windows (and hence ReactOS, too, for + * compatibility reasons) uses a static buffer if no more than one + * cell is written. Otherwise a new buffer is used. + * The client-side expects that we know this behaviour. + */ + if (NumCells <= 1) + { + /* + * Adjust the internal pointer, because its old value points to + * the static buffer in the original ApiMessage structure. + */ + // WriteOutputRequest->CharInfo = &WriteOutputRequest->StaticBuffer; + CharInfo = &WriteOutputRequest->StaticBuffer; + } + else + { + if (!CsrValidateMessageBuffer(ApiMessage, + (PVOID*)&WriteOutputRequest->CharInfo, + NumCells, + sizeof(CHAR_INFO))) + { + Status = STATUS_INVALID_PARAMETER; + goto Quit; + } + + CharInfo = WriteOutputRequest->CharInfo; + } + } + else + { + /* + * This was not the case: we use a heap buffer. Retrieve its contents. + */ + ULONG Size = NumCells * sizeof(CHAR_INFO); + + CharInfo = ConsoleAllocHeap(HEAP_ZERO_MEMORY, Size); + if (CharInfo == NULL) + { + Status = STATUS_NO_MEMORY; + goto Quit; + } + + Status = NtReadVirtualMemory(Process->ProcessHandle, + WriteOutputRequest->CharInfo, + CharInfo, + Size, + NULL); + if (!NT_SUCCESS(Status)) + { + ConsoleFreeHeap(CharInfo); + // Status = STATUS_NO_MEMORY; + goto Quit; + } + } Status = ConDrvWriteConsoleOutput(Buffer->Header.Console, Buffer, @@ -568,6 +604,11 @@ CharInfo, &WriteOutputRequest->WriteRegion); + /* Free the temporary buffer if we used the process' heap buffer */ + if (WriteOutputRequest->UseVirtualMemory && CharInfo) + ConsoleFreeHeap(CharInfo); + +Quit: ConSrvReleaseScreenBuffer(Buffer, TRUE); return Status; }

10 years, 4 months

[spetreolle] 63840: [WIN32SS] Fix new cursoricon implementation build. Dedicated to Jim and Jérome.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Aug 8 16:14:38 2014 New Revision: 63840 URL: http://svn.reactos.org/svn/reactos?rev=63840&view=rev Log: [WIN32SS] Fix new cursoricon implementation build. Dedicated to Jim and Jérome. Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c trunk/reactos/win32ss/user/ntuser/cursoricon_new.c Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Fri Aug 8 16:14:38 2014 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Cursor and icon functions - * FILE: subsystems/win32/win32k/ntuser/cursoricon.c + * FILE: win32ss/user/ntuser/cursoricon.c * PROGRAMER: ReactOS Team */ /* Modified: trunk/reactos/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1] Fri Aug 8 16:14:38 2014 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Cursor and icon functions - * FILE: subsystems/win32/win32k/ntuser/cursoricon.c + * FILE: win32ss/user/ntuser/cursoricon.c * PROGRAMER: ReactOS Team */ /* @@ -298,7 +298,7 @@ if (!(CurIcon = UserGetCurIconObject(hCurIcon))) { - RETURN(FALSE); + return(FALSE); } ret = IntDestroyCurIconObject(CurIcon, bForce); @@ -1291,7 +1291,7 @@ /* We now have our destination surface */ psurfDest = psurfOffScreen; #else - pdcClipObj = pdc->rosdc.CombinedClip; + pdcClipObj = &pdc->co.ClipObj; /* Paint the brush */ EBRUSHOBJ_vInit(&eboFill, pbrush, psurfDest, 0x00FFFFFF, 0, NULL); @@ -1322,7 +1322,7 @@ { /* We directly draw to the DC */ TRACE("Performing on screen rendering.\n"); - pdcClipObj = pdc->rosdc.CombinedClip; + pdcClipObj = &pdc->co.ClipObj; // psurfOffScreen = NULL; }

10 years, 4 months

[spetreolle] 63839: [WIN32SS] Fix trace.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Aug 8 16:12:23 2014 New Revision: 63839 URL: http://svn.reactos.org/svn/reactos?rev=63839&view=rev Log: [WIN32SS] Fix trace. Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Fri Aug 8 16:12:23 2014 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Clipboard routines - * FILE: subsys/win32k/ntuser/clipboard.c + * FILE: win32ss/user/ntuser/clipboard.c * PROGRAMER: Filip Navara <xnavara(a)volny.cz> * Pablo Borobia <pborobia(a)gmail.com> * Rafal Harabien <rafalh(a)reactos.org> @@ -622,7 +622,7 @@ if (pWinStaObj->spwndClipOwner) { - TRACE("Clipboard: WM_DESTROYCLIPBOARD to %p", pWinStaObj->spwndClipOwner->head.h); + TRACE("Clipboard: WM_DESTROYCLIPBOARD to %p\n", pWinStaObj->spwndClipOwner->head.h); co_IntSendMessageNoWait(pWinStaObj->spwndClipOwner->head.h, WM_DESTROYCLIPBOARD, 0, 0); }

10 years, 4 months

[spetreolle] 63838: [WIN32K] Formatting only.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Fri Aug 8 16:04:08 2014 New Revision: 63838 URL: http://svn.reactos.org/svn/reactos?rev=63838&view=rev Log: [WIN32K] Formatting only. Modified: trunk/reactos/win32ss/user/ntuser/cursoricon_new.c Modified: trunk/reactos/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1] Fri Aug 8 16:04:08 2014 @@ -670,7 +670,7 @@ prcl = &rclLocal; } - UserEnterExclusive(); + UserEnterExclusive(); /* Call the internal function */ bResult = UserClipCursor(prcl); @@ -1327,9 +1327,9 @@ } /* Now do the rendering */ - if(hbmAlpha && ((diFlags & DI_NORMAL) == DI_NORMAL)) - { - BLENDOBJ blendobj = { {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA } }; + if(hbmAlpha && ((diFlags & DI_NORMAL) == DI_NORMAL)) + { + BLENDOBJ blendobj = { {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA } }; PSURFACE psurf = NULL; psurf = SURFACE_ShareLockSurface(hbmAlpha); @@ -1354,7 +1354,7 @@ EXLATEOBJ_vCleanup(&exlo); SURFACE_ShareUnlockSurface(psurf); if(Ret) goto done; - ERR("NtGdiAlphaBlend failed!\n"); + ERR("NtGdiAlphaBlend failed!\n"); } NoAlpha: if (diFlags & DI_MASK) @@ -1387,7 +1387,7 @@ if(diFlags & DI_IMAGE) { - if (psurfColor) + if (psurfColor) { DWORD rop4 = (diFlags & DI_MASK) ? ROP4_SRCINVERT : ROP4_SRCCOPY ;

10 years, 4 months

← Newer
1
...
15
16
17
18
19
20
21
22
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2014