Ros-diffs March 2014

ros-diffs@reactos.org

14 participants
233 discussions

[hbelusca] 62505: [CONSRV] Fix changing foreground and background console colors via console properties dialog. Fully developed and tested in ReactOS 8^D CORE-4901 #resolve #comment Fixed in revisi...
by hbelusca＠svn.reactos.org 15 Mar '14

15 Mar '14

Author: hbelusca Date: Sat Mar 15 17:15:23 2014 New Revision: 62505 URL: http://svn.reactos.org/svn/reactos?rev=62505&view=rev Log: [CONSRV] Fix changing foreground and background console colors via console properties dialog. Fully developed and tested in ReactOS 8^D CORE-4901 #resolve #comment Fixed in revision 62505. Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c trunk/reactos/win32ss/user/winsrv/consrv/settings.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Sat Mar 15 17:15:23 2014 @@ -585,6 +585,78 @@ return STATUS_SUCCESS; } +NTSTATUS NTAPI +ConDrvChangeScreenBufferAttributes(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN USHORT NewScreenAttrib, + IN USHORT NewPopupAttrib) +{ + DWORD X, Y, Length; + PCHAR_INFO Ptr; + + COORD TopLeft = {0}; + ULONG NumCodesToWrite = Buffer->ScreenBufferSize.X * Buffer->ScreenBufferSize.Y; + USHORT OldScreenAttrib = Buffer->ScreenDefaultAttrib; + + if (Console == NULL || Buffer == NULL) + { + return STATUS_INVALID_PARAMETER; + } + + /* Validity check */ + ASSERT(Console == Buffer->Header.Console); + + X = TopLeft.X; + Y = (TopLeft.Y + Buffer->VirtualY) % Buffer->ScreenBufferSize.Y; + Length = NumCodesToWrite; + // Ptr = ConioCoordToPointer(Buffer, X, Y); // Doesn't work + // Ptr = &Buffer->Buffer[X + Y * Buffer->ScreenBufferSize.X]; // May work + + while (Length--) + { + // Ptr = ConioCoordToPointer(Buffer, X, Y); // Doesn't work either + Ptr = &Buffer->Buffer[X + Y * Buffer->ScreenBufferSize.X]; + + /* + * Change the current colors only if they are the old ones. + */ + + /* Foreground color */ + if ((Ptr->Attributes & 0x0F) == (OldScreenAttrib & 0x0F)) + Ptr->Attributes = (Ptr->Attributes & 0xFFF0) | (NewScreenAttrib & 0x0F); + + /* Background color */ + if ((Ptr->Attributes & 0xF0) == (OldScreenAttrib & 0xF0)) + Ptr->Attributes = (Ptr->Attributes & 0xFF0F) | (NewScreenAttrib & 0xF0); + + // ++Ptr; + + if (++X == Buffer->ScreenBufferSize.X) + { + X = 0; + + if (++Y == Buffer->ScreenBufferSize.Y) + { + Y = 0; + } + } + } + + /* Save foreground and background colors for both screen and popup */ + Buffer->ScreenDefaultAttrib = (NewScreenAttrib & 0x00FF); + Buffer->PopupDefaultAttrib = (NewPopupAttrib & 0x00FF); + + /* Refresh the display if needed */ + if ((PCONSOLE_SCREEN_BUFFER)Buffer == Console->ActiveBuffer) + { + SMALL_RECT UpdateRect; + ConioComputeUpdateRect(Buffer, &UpdateRect, &TopLeft, NumCodesToWrite); + TermDrawRegion(Console, &UpdateRect); + } + + return STATUS_SUCCESS; +} + /* PUBLIC DRIVER APIS *********************************************************/ @@ -947,7 +1019,6 @@ PWCHAR tmpString = NULL; DWORD X, Y, Length; // , Written = 0; ULONG CodeSize; - SMALL_RECT UpdateRect; PCHAR_INFO Ptr; if (Console == NULL || Buffer == NULL || @@ -1046,6 +1117,7 @@ if ((PCONSOLE_SCREEN_BUFFER)Buffer == Console->ActiveBuffer) { + SMALL_RECT UpdateRect; ConioComputeUpdateRect(Buffer, &UpdateRect, WriteCoord, NumCodesToWrite); TermDrawRegion(Console, &UpdateRect); } @@ -1071,7 +1143,6 @@ { DWORD X, Y, Length; // , Written = 0; PCHAR_INFO Ptr; - SMALL_RECT UpdateRect; if (Console == NULL || Buffer == NULL || Code == NULL || WriteCoord == NULL /* || CodesWritten == NULL */) @@ -1144,6 +1215,7 @@ if ((PCONSOLE_SCREEN_BUFFER)Buffer == Console->ActiveBuffer) { + SMALL_RECT UpdateRect; ConioComputeUpdateRect(Buffer, &UpdateRect, WriteCoord, NumCodesToWrite); TermDrawRegion(Console, &UpdateRect); } Modified: trunk/reactos/win32ss/user/winsrv/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/settings.c [iso-8859-1] Sat Mar 15 17:15:23 2014 @@ -436,7 +436,11 @@ } } - +NTSTATUS NTAPI +ConDrvChangeScreenBufferAttributes(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN USHORT NewScreenAttrib, + IN USHORT NewPopupAttrib); /* * NOTE: This function explicitely references Console->ActiveBuffer. * It is possible that it should go into some frontend... @@ -455,25 +459,9 @@ Console->QuickEdit = ConsoleInfo->QuickEdit; Console->InsertMode = ConsoleInfo->InsertMode; - /* - * Apply foreground and background colors for both screen and popup - * and copy the new palette. - */ - if (GetType(ActiveBuffer) == TEXTMODE_BUFFER) - { - PTEXTMODE_SCREEN_BUFFER Buffer = (PTEXTMODE_SCREEN_BUFFER)ActiveBuffer; - - Buffer->ScreenDefaultAttrib = ConsoleInfo->ScreenAttrib; - Buffer->PopupDefaultAttrib = ConsoleInfo->PopupAttrib; - } - else // if (Console->ActiveBuffer->Header.Type == GRAPHICS_BUFFER) - { - } - + /* Copy the new console palette */ // FIXME: Possible buffer overflow if s_colors is bigger than pConInfo->Colors. memcpy(Console->Colors, ConsoleInfo->Colors, sizeof(s_Colors)); - - // TODO: Really update the screen attributes as FillConsoleOutputAttribute does. /* Apply cursor size */ ActiveBuffer->CursorInfo.bVisible = (ConsoleInfo->CursorSize != 0); @@ -537,6 +525,12 @@ if (SizeChanged) TermResizeTerminal(Console); } + + /* Apply foreground and background colors for both screen and popup */ + ConDrvChangeScreenBufferAttributes(Console, + Buffer, + ConsoleInfo->ScreenAttrib, + ConsoleInfo->PopupAttrib); } else // if (GetType(ActiveBuffer) == GRAPHICS_BUFFER) {

1 0

[akhaldi] 62504: [EXPLORER_NEW] * Fix MSVC build.
by akhaldi＠svn.reactos.org 15 Mar '14

15 Mar '14

Author: akhaldi Date: Sat Mar 15 15:02:53 2014 New Revision: 62504 URL: http://svn.reactos.org/svn/reactos?rev=62504&view=rev Log: [EXPLORER_NEW] * Fix MSVC build. Modified: branches/shell-experiments/base/shell/explorer-new/explorer.c Modified: branches/shell-experiments/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/explorer.c [iso-8859-1] Sat Mar 15 15:02:53 2014 @@ -449,6 +449,8 @@ HRESULT hr; LPSHELLFOLDER pDesktopFolder = NULL; LPITEMIDLIST pidlRoot = NULL; + typedef HRESULT(WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14); + SH_OPEN_NEW_FRAME SHOpenNewFrame; /* A shell is already loaded. Parse the command line arguments and unless we need to do something specific simply display @@ -526,9 +528,6 @@ DbgPrint("Trying to open browser window... \n"); - typedef HRESULT(WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14); - SH_OPEN_NEW_FRAME SHOpenNewFrame; - hBrowseui = LoadLibraryW(L"browseui.dll"); if (!hBrowseui) {

1 0

[akhaldi] 62503: * Sync up to trunk HEAD (r62502).
by akhaldi＠svn.reactos.org 15 Mar '14

15 Mar '14

Author: akhaldi Date: Sat Mar 15 14:56:08 2014 New Revision: 62503 URL: http://svn.reactos.org/svn/reactos?rev=62503&view=rev Log: * Sync up to trunk HEAD (r62502). Added: branches/shell-experiments/dll/win32/browseui/lang/de-DE.rc - copied unchanged from r62502, trunk/reactos/dll/win32/browseui/lang/de-DE.rc branches/shell-experiments/dll/win32/devmgr/lang/tr-TR.rc - copied unchanged from r62502, trunk/reactos/dll/win32/devmgr/lang/tr-TR.rc branches/shell-experiments/dll/win32/shell32/droptargets/ - copied from r62502, trunk/reactos/dll/win32/shell32/droptargets/ branches/shell-experiments/dll/win32/shell32/res/rgs/exedrophandler.rgs - copied unchanged from r62502, trunk/reactos/dll/win32/shell32/res/rgs/exedrophandler.rgs branches/shell-experiments/lib/3rdparty/freetype/devel/ft2build.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/devel/ft2build.h branches/shell-experiments/lib/3rdparty/freetype/devel/ftoption.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/devel/ftoption.h branches/shell-experiments/lib/3rdparty/freetype/include/config/ - copied from r62502, trunk/reactos/lib/3rdparty/freetype/include/config/ branches/shell-experiments/lib/3rdparty/freetype/include/freetype.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/freetype.h branches/shell-experiments/lib/3rdparty/freetype/include/ftadvanc.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftadvanc.h branches/shell-experiments/lib/3rdparty/freetype/include/ftautoh.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftautoh.h branches/shell-experiments/lib/3rdparty/freetype/include/ftbbox.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftbbox.h branches/shell-experiments/lib/3rdparty/freetype/include/ftbdf.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftbdf.h branches/shell-experiments/lib/3rdparty/freetype/include/ftbitmap.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftbitmap.h branches/shell-experiments/lib/3rdparty/freetype/include/ftbzip2.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftbzip2.h branches/shell-experiments/lib/3rdparty/freetype/include/ftcache.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftcache.h branches/shell-experiments/lib/3rdparty/freetype/include/ftcffdrv.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftcffdrv.h branches/shell-experiments/lib/3rdparty/freetype/include/ftchapters.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftchapters.h branches/shell-experiments/lib/3rdparty/freetype/include/ftcid.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftcid.h branches/shell-experiments/lib/3rdparty/freetype/include/fterrdef.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/fterrdef.h branches/shell-experiments/lib/3rdparty/freetype/include/fterrors.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/fterrors.h branches/shell-experiments/lib/3rdparty/freetype/include/ftgasp.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftgasp.h branches/shell-experiments/lib/3rdparty/freetype/include/ftglyph.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftglyph.h branches/shell-experiments/lib/3rdparty/freetype/include/ftgxval.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftgxval.h branches/shell-experiments/lib/3rdparty/freetype/include/ftgzip.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftgzip.h branches/shell-experiments/lib/3rdparty/freetype/include/ftimage.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftimage.h branches/shell-experiments/lib/3rdparty/freetype/include/ftincrem.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftincrem.h branches/shell-experiments/lib/3rdparty/freetype/include/ftlcdfil.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftlcdfil.h branches/shell-experiments/lib/3rdparty/freetype/include/ftlist.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftlist.h branches/shell-experiments/lib/3rdparty/freetype/include/ftlzw.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftlzw.h branches/shell-experiments/lib/3rdparty/freetype/include/ftmac.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftmac.h branches/shell-experiments/lib/3rdparty/freetype/include/ftmm.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftmm.h branches/shell-experiments/lib/3rdparty/freetype/include/ftmodapi.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftmodapi.h branches/shell-experiments/lib/3rdparty/freetype/include/ftmoderr.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftmoderr.h branches/shell-experiments/lib/3rdparty/freetype/include/ftotval.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftotval.h branches/shell-experiments/lib/3rdparty/freetype/include/ftoutln.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftoutln.h branches/shell-experiments/lib/3rdparty/freetype/include/ftpfr.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftpfr.h branches/shell-experiments/lib/3rdparty/freetype/include/ftrender.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftrender.h branches/shell-experiments/lib/3rdparty/freetype/include/ftsizes.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftsizes.h branches/shell-experiments/lib/3rdparty/freetype/include/ftsnames.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftsnames.h branches/shell-experiments/lib/3rdparty/freetype/include/ftstroke.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftstroke.h branches/shell-experiments/lib/3rdparty/freetype/include/ftsynth.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftsynth.h branches/shell-experiments/lib/3rdparty/freetype/include/ftsystem.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftsystem.h branches/shell-experiments/lib/3rdparty/freetype/include/fttrigon.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/fttrigon.h branches/shell-experiments/lib/3rdparty/freetype/include/ftttdrv.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftttdrv.h branches/shell-experiments/lib/3rdparty/freetype/include/fttypes.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/fttypes.h branches/shell-experiments/lib/3rdparty/freetype/include/ftwinfnt.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftwinfnt.h branches/shell-experiments/lib/3rdparty/freetype/include/ftxf86.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ftxf86.h branches/shell-experiments/lib/3rdparty/freetype/include/internal/ - copied from r62502, trunk/reactos/lib/3rdparty/freetype/include/internal/ branches/shell-experiments/lib/3rdparty/freetype/include/t1tables.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/t1tables.h branches/shell-experiments/lib/3rdparty/freetype/include/ttnameid.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ttnameid.h branches/shell-experiments/lib/3rdparty/freetype/include/tttables.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/tttables.h branches/shell-experiments/lib/3rdparty/freetype/include/tttags.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/tttags.h branches/shell-experiments/lib/3rdparty/freetype/include/ttunpat.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/include/ttunpat.h branches/shell-experiments/lib/3rdparty/freetype/objs/README - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/objs/README branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afblue.c - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.c branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afblue.cin - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.cin branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afblue.dat - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.dat branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afblue.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.h branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afblue.hin - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/src/autofit/afblue.hin branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afscript.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/src/autofit/afscript.h branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afwrtsys.h - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/src/autofit/afwrtsys.h branches/shell-experiments/lib/3rdparty/freetype/src/tools/afblue.pl - copied unchanged from r62502, trunk/reactos/lib/3rdparty/freetype/src/tools/afblue.pl branches/shell-experiments/lib/3rdparty/libwin-iconv/ - copied from r62502, trunk/reactos/lib/3rdparty/libwin-iconv/ branches/shell-experiments/toolchain-clang.cmake - copied unchanged from r62502, trunk/reactos/toolchain-clang.cmake Removed: branches/shell-experiments/lib/3rdparty/freetype/include/freetype/ branches/shell-experiments/lib/3rdparty/freetype/src/bdf/Jamfile branches/shell-experiments/lib/3rdparty/freetype/src/bzip2/Jamfile branches/shell-experiments/lib/3rdparty/freetype/src/cache/Jamfile branches/shell-experiments/lib/3rdparty/freetype/src/gzip/Jamfile branches/shell-experiments/lib/3rdparty/freetype/src/psaux/Jamfile 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/lang/tr-TR.rc branches/shell-experiments/base/applications/cmdutils/help/help.c branches/shell-experiments/base/applications/games/solitaire/lang/tr-TR.rc branches/shell-experiments/base/applications/games/solitaire/rsrc.rc branches/shell-experiments/base/applications/games/spider/lang/tr-TR.rc branches/shell-experiments/base/applications/games/spider/rsrc.rc branches/shell-experiments/base/applications/games/winmine/lang/tr-TR.rc branches/shell-experiments/base/applications/games/winmine/rsrc.rc branches/shell-experiments/base/applications/magnify/lang/tr-TR.rc branches/shell-experiments/base/applications/magnify/magnify.rc branches/shell-experiments/base/applications/msconfig/lang/tr-TR.rc branches/shell-experiments/base/applications/mscutils/devmgmt/lang/tr-TR.rc branches/shell-experiments/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc branches/shell-experiments/base/applications/mscutils/eventvwr/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/network/ftp/cmds.c branches/shell-experiments/base/applications/notepad/lang/tr-TR.rc branches/shell-experiments/base/applications/notepad/rsrc.rc branches/shell-experiments/base/applications/rapps/lang/tr-TR.rc branches/shell-experiments/base/applications/rapps/rapps/rosbe.txt branches/shell-experiments/base/applications/regedit/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/interface/usetup.c branches/shell-experiments/base/shell/cmd/console.c branches/shell-experiments/base/system/services/rpcserver.c branches/shell-experiments/boot/bootdata/hivecls.inf branches/shell-experiments/boot/bootdata/hivesys.inf branches/shell-experiments/boot/freeldr/fdebug/lang/tr-TR.rc branches/shell-experiments/cmake/CMakeMacros.cmake branches/shell-experiments/cmake/gcc.cmake branches/shell-experiments/cmake/msvc.cmake branches/shell-experiments/configure.cmd branches/shell-experiments/dll/3rdparty/libxslt/CMakeLists.txt 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/intl/lang/tr-TR.rc branches/shell-experiments/dll/cpl/main/lang/tr-TR.rc branches/shell-experiments/dll/directx/wine/d3d8/CMakeLists.txt branches/shell-experiments/dll/directx/wine/d3d9/CMakeLists.txt branches/shell-experiments/dll/directx/wine/ddraw/CMakeLists.txt branches/shell-experiments/dll/directx/wine/dinput/CMakeLists.txt branches/shell-experiments/dll/directx/wine/dinput8/CMakeLists.txt branches/shell-experiments/dll/ntdll/CMakeLists.txt branches/shell-experiments/dll/ntdll/ldr/ldrapi.c branches/shell-experiments/dll/opengl/opengl32/CMakeLists.txt branches/shell-experiments/dll/opengl/opengl32/wgl.c branches/shell-experiments/dll/win32/advapi32/service/sctrl.c branches/shell-experiments/dll/win32/browseui/browseui.rc branches/shell-experiments/dll/win32/cards/cards.c branches/shell-experiments/dll/win32/cards/cards.h branches/shell-experiments/dll/win32/comctl32/toolbar.c branches/shell-experiments/dll/win32/crypt32/lang/crypt32_Tr.rc branches/shell-experiments/dll/win32/cryptui/lang/cryptui_Tr.rc branches/shell-experiments/dll/win32/devmgr/devmgr.rc branches/shell-experiments/dll/win32/hhctrl.ocx/hhctrl.rc branches/shell-experiments/dll/win32/hhctrl.ocx/lang/Tr.rc branches/shell-experiments/dll/win32/iccvid/lang/iccvid_Tr.rc branches/shell-experiments/dll/win32/iccvid/rsrc.rc branches/shell-experiments/dll/win32/iphlpapi/CMakeLists.txt branches/shell-experiments/dll/win32/iphlpapi/iphlpapi_main.c branches/shell-experiments/dll/win32/kernel32/CMakeLists.txt branches/shell-experiments/dll/win32/kernel32/client/console/console.c branches/shell-experiments/dll/win32/kernel32/client/loader.c branches/shell-experiments/dll/win32/kernel32/client/proc.c branches/shell-experiments/dll/win32/kernel32/client/synch.c branches/shell-experiments/dll/win32/kernel32/client/thread.c branches/shell-experiments/dll/win32/msgina/gui.c branches/shell-experiments/dll/win32/msgina/lang/bg-BG.rc branches/shell-experiments/dll/win32/msgina/lang/cs-CZ.rc branches/shell-experiments/dll/win32/msgina/lang/de-DE.rc branches/shell-experiments/dll/win32/msgina/lang/en-US.rc branches/shell-experiments/dll/win32/msgina/lang/es-ES.rc branches/shell-experiments/dll/win32/msgina/lang/fr-FR.rc branches/shell-experiments/dll/win32/msgina/lang/he-IL.rc branches/shell-experiments/dll/win32/msgina/lang/id-ID.rc branches/shell-experiments/dll/win32/msgina/lang/it-IT.rc branches/shell-experiments/dll/win32/msgina/lang/ja-JP.rc branches/shell-experiments/dll/win32/msgina/lang/no-NO.rc branches/shell-experiments/dll/win32/msgina/lang/pl-PL.rc branches/shell-experiments/dll/win32/msgina/lang/ro-RO.rc branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc branches/shell-experiments/dll/win32/msgina/lang/sk-SK.rc branches/shell-experiments/dll/win32/msgina/lang/sq-AL.rc branches/shell-experiments/dll/win32/msgina/lang/tr-TR.rc branches/shell-experiments/dll/win32/msgina/lang/uk-UA.rc branches/shell-experiments/dll/win32/msgina/lsa.c branches/shell-experiments/dll/win32/msgina/msgina.c branches/shell-experiments/dll/win32/msgina/msgina.h branches/shell-experiments/dll/win32/msgina/resource.h branches/shell-experiments/dll/win32/msgina/tui.c branches/shell-experiments/dll/win32/msv1_0/msv1_0.c branches/shell-experiments/dll/win32/msxml3/CMakeLists.txt branches/shell-experiments/dll/win32/netapi32/user.c branches/shell-experiments/dll/win32/shell32/CMakeLists.txt branches/shell-experiments/dll/win32/shell32/CMenuDeskBar.cpp branches/shell-experiments/dll/win32/shell32/changenotify.cpp branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp branches/shell-experiments/dll/win32/shell32/dragdrophelper.cpp branches/shell-experiments/dll/win32/shell32/dragdrophelper.h branches/shell-experiments/dll/win32/shell32/folders.cpp branches/shell-experiments/dll/win32/shell32/folders/desktop.cpp branches/shell-experiments/dll/win32/shell32/folders/desktop.h branches/shell-experiments/dll/win32/shell32/folders/fs.cpp branches/shell-experiments/dll/win32/shell32/folders/fs.h branches/shell-experiments/dll/win32/shell32/folders/mydocuments.cpp branches/shell-experiments/dll/win32/shell32/folders/mydocuments.h branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp branches/shell-experiments/dll/win32/shell32/precomp.h branches/shell-experiments/dll/win32/shell32/rgs_res.rc branches/shell-experiments/dll/win32/shell32/shell32_main.cpp branches/shell-experiments/dll/win32/shell32/shelllink.cpp branches/shell-experiments/dll/win32/shell32/shelllink.h branches/shell-experiments/dll/win32/shell32/shellord.cpp branches/shell-experiments/dll/win32/shell32/shellpath.cpp branches/shell-experiments/dll/win32/shell32/shfldr.h branches/shell-experiments/dll/win32/shell32/shlexec.cpp branches/shell-experiments/dll/win32/shell32/shlfileop.cpp branches/shell-experiments/dll/win32/shell32/shlview.cpp branches/shell-experiments/dll/win32/shell32/shpolicy.cpp branches/shell-experiments/dll/win32/shell32/shresdef.h branches/shell-experiments/dll/win32/winmm/CMakeLists.txt branches/shell-experiments/dll/win32/winmm/joystick.c branches/shell-experiments/dll/win32/xinput1_3/CMakeLists.txt branches/shell-experiments/dll/win32/xinput1_3/xinput1_3_main.c branches/shell-experiments/drivers/bus/acpi/buspdo.c branches/shell-experiments/drivers/bus/acpi/main.c branches/shell-experiments/drivers/filesystems/ext2/src/ext2init.c branches/shell-experiments/drivers/filesystems/ext2/src/fsctrl.c branches/shell-experiments/drivers/filesystems/fastfat/cleanup.c branches/shell-experiments/drivers/filesystems/fastfat/create.c branches/shell-experiments/drivers/filesystems/fastfat/dir.c branches/shell-experiments/drivers/filesystems/fastfat/fsctl.c branches/shell-experiments/drivers/filesystems/fastfat/rw.c branches/shell-experiments/drivers/filesystems/fastfat/vfat.h branches/shell-experiments/drivers/filesystems/fs_rec/ext2.c branches/shell-experiments/drivers/filesystems/fs_rec/fs_rec.c branches/shell-experiments/drivers/filesystems/npfs/main.c branches/shell-experiments/drivers/storage/ide/uniata/bm_devs.h branches/shell-experiments/drivers/storage/ide/uniata/bsmaster.h branches/shell-experiments/drivers/storage/ide/uniata/id_ata.cpp branches/shell-experiments/drivers/storage/ide/uniata/id_dma.cpp branches/shell-experiments/drivers/storage/ide/uniata/id_init.cpp branches/shell-experiments/drivers/storage/ide/uniata/id_sata.cpp branches/shell-experiments/drivers/storage/ide/uniata/uniata_ver.h branches/shell-experiments/include/crt/_mingw.h branches/shell-experiments/include/crt/mingw32/intrin_x86.h branches/shell-experiments/include/ndk/vffuncs.h branches/shell-experiments/include/psdk/commctrl.h branches/shell-experiments/include/psdk/guiddef.h branches/shell-experiments/include/psdk/intsafe.h branches/shell-experiments/include/psdk/shellapi.h branches/shell-experiments/include/psdk/shlguid_undoc.h branches/shell-experiments/include/psdk/strsafe.h branches/shell-experiments/include/psdk/wincon.h branches/shell-experiments/include/psdk/winternl.h branches/shell-experiments/include/reactos/libs/pseh/pseh3.h branches/shell-experiments/include/reactos/subsys/win/conmsg.h branches/shell-experiments/include/reactos/wine/commctrl.h branches/shell-experiments/include/reactos/wine/config.h branches/shell-experiments/include/reactos/wine/test.h branches/shell-experiments/lib/3rdparty/CMakeLists.txt branches/shell-experiments/lib/3rdparty/cardlib/CMakeLists.txt branches/shell-experiments/lib/3rdparty/freetype/CMakeLists.txt branches/shell-experiments/lib/3rdparty/freetype/ChangeLog branches/shell-experiments/lib/3rdparty/freetype/README branches/shell-experiments/lib/3rdparty/freetype/autogen.sh branches/shell-experiments/lib/3rdparty/freetype/include/ft2build.h branches/shell-experiments/lib/3rdparty/freetype/modules.cfg branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afcjk.c branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afcjk.h branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afdummy.c branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afdummy.h branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afglobal.c branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afglobal.h branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afhints.c branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afhints.h branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afindic.c branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afindic.h branches/shell-experiments/lib/3rdparty/freetype/src/autofit/aflatin.c branches/shell-experiments/lib/3rdparty/freetype/src/autofit/aflatin.h branches/shell-experiments/lib/3rdparty/freetype/src/autofit/aflatin2.c branches/shell-experiments/lib/3rdparty/freetype/src/autofit/aflatin2.h branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afloader.c branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afpic.c branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afpic.h branches/shell-experiments/lib/3rdparty/freetype/src/autofit/aftypes.h branches/shell-experiments/lib/3rdparty/freetype/src/autofit/autofit.c branches/shell-experiments/lib/3rdparty/freetype/src/autofit/rules.mk branches/shell-experiments/lib/3rdparty/freetype/src/base/ftbbox.c branches/shell-experiments/lib/3rdparty/freetype/src/base/ftbitmap.c branches/shell-experiments/lib/3rdparty/freetype/src/base/ftcalc.c branches/shell-experiments/lib/3rdparty/freetype/src/base/ftdebug.c branches/shell-experiments/lib/3rdparty/freetype/src/base/ftglyph.c branches/shell-experiments/lib/3rdparty/freetype/src/base/ftinit.c branches/shell-experiments/lib/3rdparty/freetype/src/base/ftmac.c branches/shell-experiments/lib/3rdparty/freetype/src/base/ftobjs.c branches/shell-experiments/lib/3rdparty/freetype/src/base/ftoutln.c branches/shell-experiments/lib/3rdparty/freetype/src/base/ftpic.c branches/shell-experiments/lib/3rdparty/freetype/src/base/ftsynth.c branches/shell-experiments/lib/3rdparty/freetype/src/base/md5.c branches/shell-experiments/lib/3rdparty/freetype/src/base/md5.h branches/shell-experiments/lib/3rdparty/freetype/src/base/rules.mk branches/shell-experiments/lib/3rdparty/freetype/src/bdf/bdfdrivr.c branches/shell-experiments/lib/3rdparty/freetype/src/cff/cf2blues.c branches/shell-experiments/lib/3rdparty/freetype/src/cff/cf2font.c branches/shell-experiments/lib/3rdparty/freetype/src/cff/cf2font.h branches/shell-experiments/lib/3rdparty/freetype/src/cff/cf2ft.c branches/shell-experiments/lib/3rdparty/freetype/src/cff/cf2hints.c branches/shell-experiments/lib/3rdparty/freetype/src/cff/cf2hints.h branches/shell-experiments/lib/3rdparty/freetype/src/cff/cffdrivr.c branches/shell-experiments/lib/3rdparty/freetype/src/cff/cffgload.c branches/shell-experiments/lib/3rdparty/freetype/src/cff/cffload.c branches/shell-experiments/lib/3rdparty/freetype/src/cff/cffobjs.c branches/shell-experiments/lib/3rdparty/freetype/src/cff/cffobjs.h branches/shell-experiments/lib/3rdparty/freetype/src/cid/cidgload.c branches/shell-experiments/lib/3rdparty/freetype/src/cid/cidload.c branches/shell-experiments/lib/3rdparty/freetype/src/gxvalid/gxvcommn.c branches/shell-experiments/lib/3rdparty/freetype/src/gxvalid/gxvcommn.h branches/shell-experiments/lib/3rdparty/freetype/src/gxvalid/gxvmort.c branches/shell-experiments/lib/3rdparty/freetype/src/gxvalid/gxvmorx2.c branches/shell-experiments/lib/3rdparty/freetype/src/gzip/ftgzip.c branches/shell-experiments/lib/3rdparty/freetype/src/gzip/rules.mk branches/shell-experiments/lib/3rdparty/freetype/src/pcf/pcfdrivr.c branches/shell-experiments/lib/3rdparty/freetype/src/pcf/pcfread.c branches/shell-experiments/lib/3rdparty/freetype/src/pcf/pcfutil.c branches/shell-experiments/lib/3rdparty/freetype/src/pfr/pfrcmap.c branches/shell-experiments/lib/3rdparty/freetype/src/pfr/pfrgload.c branches/shell-experiments/lib/3rdparty/freetype/src/pfr/pfrobjs.c branches/shell-experiments/lib/3rdparty/freetype/src/pshinter/pshglob.c branches/shell-experiments/lib/3rdparty/freetype/src/raster/ftraster.c branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/pngshim.c branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/pngshim.h branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/sfdriver.c branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/sfobjs.c branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/ttcmap.c branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/ttkern.c branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/ttload.c branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/ttmtx.c branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/ttsbit.c branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/ttsbit.h branches/shell-experiments/lib/3rdparty/freetype/src/smooth/ftgrays.c branches/shell-experiments/lib/3rdparty/freetype/src/tools/chktrcmp.py branches/shell-experiments/lib/3rdparty/freetype/src/tools/docmaker/content.py branches/shell-experiments/lib/3rdparty/freetype/src/tools/docmaker/docmaker.py branches/shell-experiments/lib/3rdparty/freetype/src/tools/docmaker/sources.py branches/shell-experiments/lib/3rdparty/freetype/src/tools/docmaker/tohtml.py branches/shell-experiments/lib/3rdparty/freetype/src/truetype/ttdriver.c branches/shell-experiments/lib/3rdparty/freetype/src/truetype/ttgload.c branches/shell-experiments/lib/3rdparty/freetype/src/truetype/ttgload.h branches/shell-experiments/lib/3rdparty/freetype/src/truetype/ttinterp.c branches/shell-experiments/lib/3rdparty/freetype/src/truetype/ttinterp.h branches/shell-experiments/lib/3rdparty/freetype/src/truetype/ttobjs.c branches/shell-experiments/lib/3rdparty/freetype/src/type1/t1gload.c branches/shell-experiments/lib/3rdparty/freetype/src/type1/t1load.c branches/shell-experiments/lib/3rdparty/freetype/src/type42/t42objs.c branches/shell-experiments/lib/3rdparty/freetype/src/winfonts/winfnt.c branches/shell-experiments/lib/3rdparty/libxml2/CMakeLists.txt branches/shell-experiments/lib/atl/atlwin.h branches/shell-experiments/lib/fslib/vfatlib/CMakeLists.txt branches/shell-experiments/lib/fslib/vfatlib/check/io.c branches/shell-experiments/lib/fslib/vfatlib/check/lfn.c branches/shell-experiments/lib/fslib/vfatlib/vfatlib.h branches/shell-experiments/lib/lsalib/lsa.c branches/shell-experiments/lib/pseh/i386/pseh3.c branches/shell-experiments/lib/pseh/i386/pseh3_asmdef.h branches/shell-experiments/lib/pseh/i386/pseh3_i386.S branches/shell-experiments/media/doc/3rd Party Files.txt branches/shell-experiments/ntoskrnl/config/cmapi.c branches/shell-experiments/ntoskrnl/fsrtl/notify.c branches/shell-experiments/ntoskrnl/include/internal/fsrtl.h branches/shell-experiments/ntoskrnl/include/internal/mm.h branches/shell-experiments/ntoskrnl/ke/bug.c branches/shell-experiments/ntoskrnl/ke/powerpc/kiinit.c branches/shell-experiments/ntoskrnl/ke/powerpc/stubs.c branches/shell-experiments/ntoskrnl/mm/ARM3/expool.c branches/shell-experiments/ntoskrnl/mm/ARM3/virtual.c branches/shell-experiments/ntoskrnl/mm/amd64/page.c branches/shell-experiments/ntoskrnl/mm/arm/page.c branches/shell-experiments/ntoskrnl/mm/arm/stubs.c branches/shell-experiments/ntoskrnl/mm/freelist.c branches/shell-experiments/ntoskrnl/mm/i386/page.c branches/shell-experiments/ntoskrnl/mm/i386/pagepae.c branches/shell-experiments/ntoskrnl/mm/marea.c branches/shell-experiments/ntoskrnl/mm/pagefile.c branches/shell-experiments/ntoskrnl/mm/powerpc/page.c branches/shell-experiments/win32ss/gdi/ntgdi/freetype.c branches/shell-experiments/win32ss/user/ntuser/focus.c branches/shell-experiments/win32ss/user/ntuser/msgqueue.c branches/shell-experiments/win32ss/user/ntuser/object.c branches/shell-experiments/win32ss/user/ntuser/object.h branches/shell-experiments/win32ss/user/ntuser/window.c branches/shell-experiments/win32ss/user/ntuser/winpos.c branches/shell-experiments/win32ss/user/ntuser/winpos.h branches/shell-experiments/win32ss/user/user32/CMakeLists.txt branches/shell-experiments/win32ss/user/user32/controls/listbox.c branches/shell-experiments/win32ss/user/user32/controls/scrollbar.c branches/shell-experiments/win32ss/user/user32/misc/stubs.c branches/shell-experiments/win32ss/user/user32/windows/class.c branches/shell-experiments/win32ss/user/user32/windows/cursoricon.c branches/shell-experiments/win32ss/user/user32/windows/defwnd.c branches/shell-experiments/win32ss/user/user32/windows/font.c branches/shell-experiments/win32ss/user/user32/windows/input.c branches/shell-experiments/win32ss/user/user32/windows/message.c branches/shell-experiments/win32ss/user/user32/windows/nonclient.c branches/shell-experiments/win32ss/user/user32/windows/window.c branches/shell-experiments/win32ss/user/user32/windows/winpos.c branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/console.c branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c branches/shell-experiments/win32ss/user/winsrv/consrv/condrv/text.c branches/shell-experiments/win32ss/user/winsrv/consrv/conoutput.c branches/shell-experiments/win32ss/user/winsrv/consrv/console.c branches/shell-experiments/win32ss/user/winsrv/consrv/frontendctl.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/resource.h branches/shell-experiments/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c branches/shell-experiments/win32ss/user/winsrv/consrv/handle.c branches/shell-experiments/win32ss/user/winsrv/consrv/include/conio.h branches/shell-experiments/win32ss/user/winsrv/consrv/include/term.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/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/cmdutils/help/help.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/spider/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/winmine/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/games/winmine/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/magnify/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/magnify/magnify.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/msconfig/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/devmgmt/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/applicat… Modified: branches/shell-experiments/base/applications/mscutils/eventvwr/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/network/ftp/cmds.c 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/notepad/rsrc.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/rosbe.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/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/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/setup/us… Modified: branches/shell-experiments/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/cm… Modified: branches/shell-experiments/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/system/s… Modified: branches/shell-experiments/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/bootdata… Modified: branches/shell-experiments/boot/freeldr/fdebug/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/boot/freeldr/… Modified: branches/shell-experiments/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/cmake/CMakeMa… Modified: branches/shell-experiments/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/cmake/gcc.cma… Modified: branches/shell-experiments/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/cmake/msvc.cm… Modified: branches/shell-experiments/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/configure.cmd… Modified: branches/shell-experiments/dll/3rdparty/libxslt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/3rdparty/… 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/intl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/cpl/intl/… 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/directx/wine/d3d8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/dinput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/directx/wine/dinput8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/directx/w… Modified: branches/shell-experiments/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/ntdll/CMa… Modified: branches/shell-experiments/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/ntdll/ldr… Modified: branches/shell-experiments/dll/opengl/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/opengl/op… Modified: branches/shell-experiments/dll/opengl/opengl32/wgl.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/opengl/op… Modified: branches/shell-experiments/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/adv… Modified: branches/shell-experiments/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… Modified: branches/shell-experiments/dll/win32/cards/cards.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/cards/cards.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/car… Modified: branches/shell-experiments/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/com… 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/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/devmgr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/dev… Modified: branches/shell-experiments/dll/win32/hhctrl.ocx/hhctrl.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/hhc… Modified: branches/shell-experiments/dll/win32/hhctrl.ocx/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/hhc… Modified: branches/shell-experiments/dll/win32/iccvid/lang/iccvid_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/icc… Modified: branches/shell-experiments/dll/win32/iccvid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/icc… Modified: branches/shell-experiments/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/iph… Modified: branches/shell-experiments/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/iph… Modified: branches/shell-experiments/dll/win32/kernel32/CMakeLists.txt 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/loader.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/client/synch.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/kernel32/client/thread.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/ker… Modified: branches/shell-experiments/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… 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/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msgina/tui.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msg… Modified: branches/shell-experiments/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msv… Modified: branches/shell-experiments/dll/win32/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/msx… Modified: branches/shell-experiments/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/net… Modified: branches/shell-experiments/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/changenotify.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/dragdrophelper.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/dragdrophelper.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… 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/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/desktop.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/fs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/mydocuments.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/mydocuments.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/folders/recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/rgs_res.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/shelllink.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/shellord.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/shellpath.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/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/shpolicy.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… Modified: branches/shell-experiments/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/win… Modified: branches/shell-experiments/dll/win32/winmm/joystick.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/win… Modified: branches/shell-experiments/dll/win32/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/xin… Modified: branches/shell-experiments/dll/win32/xinput1_3/xinput1_3_main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/xin… Modified: branches/shell-experiments/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/bus/a… Modified: branches/shell-experiments/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/bus/a… Modified: branches/shell-experiments/drivers/filesystems/ext2/src/ext2init.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/ext2/src/fsctrl.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/dir.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fs_rec/ext2.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/fs_rec/fs_rec.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/filesystems/npfs/main.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/files… Modified: branches/shell-experiments/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/stora… Modified: branches/shell-experiments/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/stora… Modified: branches/shell-experiments/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/stora… Modified: branches/shell-experiments/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/stora… Modified: branches/shell-experiments/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/stora… Modified: branches/shell-experiments/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/stora… Modified: branches/shell-experiments/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/drivers/stora… Modified: branches/shell-experiments/include/crt/_mingw.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/crt/_… Modified: branches/shell-experiments/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/crt/m… Modified: branches/shell-experiments/include/ndk/vffuncs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/ndk/v… Modified: branches/shell-experiments/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/guiddef.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… Modified: branches/shell-experiments/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/psdk/… 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/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/include/reactos/wine/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/include/react… Modified: branches/shell-experiments/lib/3rdparty/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/cardlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/ChangeLog URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/README URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/autogen.sh URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/include/ft2build.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/modules.cfg URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afcjk.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afcjk.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afdummy.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afdummy.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afglobal.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afglobal.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afhints.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afhints.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afindic.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afindic.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/aflatin.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/aflatin.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/aflatin2.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/aflatin2.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afloader.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afpic.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/afpic.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/aftypes.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/autofit.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/autofit/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/base/ftbbox.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/base/ftbitmap.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/base/ftcalc.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/base/ftdebug.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/base/ftglyph.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/base/ftinit.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/base/ftmac.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/base/ftobjs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/base/ftoutln.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/base/ftpic.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/base/ftsynth.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/base/md5.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/base/md5.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/base/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Removed: branches/shell-experiments/lib/3rdparty/freetype/src/bdf/Jamfile URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/bdf/bdfdrivr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Removed: branches/shell-experiments/lib/3rdparty/freetype/src/bzip2/Jamfile URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Removed: branches/shell-experiments/lib/3rdparty/freetype/src/cache/Jamfile URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/cff/cf2blues.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/cff/cf2font.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/cff/cf2font.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/cff/cf2ft.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/cff/cf2hints.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/cff/cf2hints.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/cff/cffdrivr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/cff/cffgload.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/cff/cffload.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/cff/cffobjs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/cff/cffobjs.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/cid/cidgload.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/cid/cidload.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/gxvalid/gxvcommn.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/gxvalid/gxvcommn.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/gxvalid/gxvmort.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/gxvalid/gxvmorx2.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Removed: branches/shell-experiments/lib/3rdparty/freetype/src/gzip/Jamfile URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/gzip/ftgzip.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/gzip/rules.mk URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/pcf/pcfdrivr.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/pcf/pcfread.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/pcf/pcfutil.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/pfr/pfrcmap.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/pfr/pfrgload.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/pfr/pfrobjs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Removed: branches/shell-experiments/lib/3rdparty/freetype/src/psaux/Jamfile URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/pshinter/pshglob.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/raster/ftraster.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/pngshim.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/pngshim.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/sfdriver.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/sfobjs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/ttcmap.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/ttkern.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/ttload.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/ttmtx.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/ttsbit.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/sfnt/ttsbit.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/smooth/ftgrays.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/tools/chktrcmp.py URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/tools/docmaker/content.py URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/tools/docmaker/docmaker.py URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/tools/docmaker/sources.py URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/tools/docmaker/tohtml.py URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/truetype/ttdriver.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/truetype/ttgload.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/truetype/ttgload.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/truetype/ttinterp.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/truetype/ttinterp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/truetype/ttobjs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/type1/t1gload.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/type1/t1load.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/type42/t42objs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/freetype/src/winfonts/winfnt.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/3rdparty/libxml2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/3rdparty/… Modified: branches/shell-experiments/lib/atl/atlwin.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/atl/atlwi… Modified: branches/shell-experiments/lib/fslib/vfatlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fslib/vfa… Modified: branches/shell-experiments/lib/fslib/vfatlib/check/io.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fslib/vfa… Modified: branches/shell-experiments/lib/fslib/vfatlib/check/lfn.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fslib/vfa… Modified: branches/shell-experiments/lib/fslib/vfatlib/vfatlib.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/fslib/vfa… Modified: branches/shell-experiments/lib/lsalib/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/lsalib/ls… 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/lib/pseh/i386/pseh3_asmdef.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/pseh/i386… Modified: branches/shell-experiments/lib/pseh/i386/pseh3_i386.S URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/pseh/i386… Modified: branches/shell-experiments/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/media/doc/3rd… Modified: branches/shell-experiments/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/conf… Modified: branches/shell-experiments/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/fsrt… Modified: branches/shell-experiments/ntoskrnl/include/internal/fsrtl.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/ke/bug.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/ke/b… Modified: branches/shell-experiments/ntoskrnl/ke/powerpc/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/ke/p… Modified: branches/shell-experiments/ntoskrnl/ke/powerpc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/ke/p… Modified: branches/shell-experiments/ntoskrnl/mm/ARM3/expool.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/amd64/page.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/a… Modified: branches/shell-experiments/ntoskrnl/mm/arm/page.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/a… Modified: branches/shell-experiments/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/a… Modified: branches/shell-experiments/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/f… Modified: branches/shell-experiments/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/i… Modified: branches/shell-experiments/ntoskrnl/mm/i386/pagepae.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/i… Modified: branches/shell-experiments/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/m… 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/powerpc/page.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/ntoskrnl/mm/p… Modified: branches/shell-experiments/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/gdi/n… Modified: branches/shell-experiments/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/ntuser/winpos.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/controls/scrollbar.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/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… Modified: branches/shell-experiments/win32ss/user/user32/windows/winpos.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/… Modified: 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/text.c 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/console.c 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/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/resource.h 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/handle.c 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/term.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…

1 0

[akhaldi] 62502: [SHELL32] * Implement support for file formats' drop target shell extensions. * Implement a shell extension for executable files. * Implement a shell extension for lnk files. * Cha...
by akhaldi＠svn.reactos.org 15 Mar '14

15 Mar '14

Author: akhaldi Date: Sat Mar 15 13:59:22 2014 New Revision: 62502 URL: http://svn.reactos.org/svn/reactos?rev=62502&view=rev Log: [SHELL32] * Implement support for file formats' drop target shell extensions. * Implement a shell extension for executable files. * Implement a shell extension for lnk files. * Change the shell notifications for moving files and folders, as they were all conflated with renaming files. * Fix up SHChangeNotification so the desktop receives notifications when files are added to common or user desktop directories. * Fix up SHChangeNotification such that folder pidls are not incorrectly assumed to be file pidls and displayed incorrectly. * Implement a drop target for My Documents. * Fix up the desktop's drop target resolution so files can be dropped on the recycle bin and my documents etc properly. * Stub IDragSourceHelper in CLSID_DragDropHelper. * Add a few additional shell change notifications. * Silence a few FIXMEs to TRACEs. * Some code clean up. * Brought to you by Huw Campbell. CORE-3760 Added: trunk/reactos/dll/win32/shell32/droptargets/ (with props) trunk/reactos/dll/win32/shell32/droptargets/CexeDropHandler.cpp (with props) trunk/reactos/dll/win32/shell32/droptargets/CexeDropHandler.h (with props) trunk/reactos/dll/win32/shell32/res/rgs/exedrophandler.rgs (with props) Modified: trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/changenotify.cpp trunk/reactos/dll/win32/shell32/defcontextmenu.cpp trunk/reactos/dll/win32/shell32/dragdrophelper.cpp trunk/reactos/dll/win32/shell32/dragdrophelper.h trunk/reactos/dll/win32/shell32/folders/desktop.cpp trunk/reactos/dll/win32/shell32/folders/desktop.h trunk/reactos/dll/win32/shell32/folders/fs.cpp trunk/reactos/dll/win32/shell32/folders/fs.h trunk/reactos/dll/win32/shell32/folders/mydocuments.cpp trunk/reactos/dll/win32/shell32/folders/mydocuments.h trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/rgs_res.rc trunk/reactos/dll/win32/shell32/shell32_main.cpp trunk/reactos/dll/win32/shell32/shelllink.cpp trunk/reactos/dll/win32/shell32/shelllink.h trunk/reactos/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shlfileop.cpp trunk/reactos/dll/win32/shell32/shlview.cpp trunk/reactos/dll/win32/shell32/shresdef.h trunk/reactos/include/psdk/shlguid_undoc.h Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -100,6 +100,7 @@ HKCR,"exefile\Defaulticon","",0x00000000,"%1" HKCR,"exefile\shell\open\command","",0x00000000,"""%1"" %*" HKCR,"exefile\shell\runas\command","",0x00020000,"""%1"" %*" +HKCR,"exefile\shellex\DropHandler","",0x00020000,"{86C86720-42A0-1069-A2E8-08002B30309D}" ; Fonts HKCR,".fon","",0x00000000,"fonfile" @@ -191,6 +192,7 @@ HKCR,"lnkfile","IsShortcut",0x00000000,"yes" HKCR,"lnkfile\CLSID","",0x00000000,"{00021401-0000-0000-C000-000000000046}" HKCR,"lnkfile\shellex\IconHandler","",0x00000000,"{00021401-0000-0000-C000-000000000046}" +HKCR,"lnkfile\shellex\DropHandler","",0x00000000,"{00021401-0000-0000-C000-000000000046}" HKCR,"lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046}","",0x00000000,"" HKCR,"lnkfile\shellex\PropertySheetHandlers\Shellink Property Page", "", 0x00000000, "{00021401-0000-0000-C000-000000000046}" Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -54,6 +54,7 @@ folders/fonts.cpp folders/cpanel.cpp folders/recyclebin.cpp + droptargets/CexeDropHandler.cpp shlexec.cpp shlfileop.cpp shlfolder.cpp Modified: trunk/reactos/dll/win32/shell32/changenotify.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/changeno… ============================================================================== --- trunk/reactos/dll/win32/shell32/changenotify.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/changenotify.cpp [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -264,6 +264,25 @@ return TRUE; if( sub && ILIsParent( watched, changed, TRUE ) ) return TRUE; + if (sub && _ILIsDesktop(watched)) { + WCHAR wszPath[MAX_PATH]; + SHGetSpecialFolderPathW(0, wszPath, CSIDL_DESKTOPDIRECTORY, FALSE); + LPITEMIDLIST deskpidl = SHSimpleIDListFromPathW(wszPath); + if (ILIsParent(deskpidl, changed, TRUE)) + { + ILFree(deskpidl); + return TRUE; + } + ILFree(deskpidl); + SHGetSpecialFolderPathW(0, wszPath, CSIDL_COMMON_DESKTOPDIRECTORY, FALSE); + deskpidl = SHSimpleIDListFromPathW(wszPath); + if (ILIsParent(deskpidl, changed, TRUE)) + { + ILFree(deskpidl); + return TRUE; + } + ILFree(deskpidl); + } return FALSE; } @@ -272,7 +291,7 @@ */ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID dwItem2) { - LPCITEMIDLIST Pidls[2]; + LPITEMIDLIST Pidls[2]; LPNOTIFICATIONLIST ptr; UINT typeFlag = uFlags & SHCNF_TYPE; @@ -316,10 +335,43 @@ case SHCNF_PATHW: if (dwItem1) Pidls[0] = SHSimpleIDListFromPathW((LPCWSTR)dwItem1); if (dwItem2) Pidls[1] = SHSimpleIDListFromPathW((LPCWSTR)dwItem2); + if (wEventId & (SHCNE_MKDIR | SHCNE_RMDIR | SHCNE_UPDATEDIR | SHCNE_RENAMEFOLDER)) + { + /* + * The last items in the ID are currently files. So we chop off the last + * entry, and create a new one using a find data struct. + */ + if (dwItem1 && Pidls[0]){ + ILRemoveLastID(Pidls[0]); + WIN32_FIND_DATAW wfd; + LPWSTR p = PathFindFileNameW((LPCWSTR)dwItem1); + lstrcpynW(&wfd.cFileName[0], p, MAX_PATH); + wfd.dwFileAttributes = FILE_ATTRIBUTE_DIRECTORY; + LPITEMIDLIST newpidl = _ILCreateFromFindDataW(&wfd); + LPITEMIDLIST oldpidl = ILClone(Pidls[0]); + ILFree(Pidls[0]); + Pidls[0] = ILCombine(oldpidl, newpidl); + ILFree(newpidl); + ILFree(oldpidl); + } + if (dwItem2 && Pidls[1]){ + ILRemoveLastID(Pidls[1]); + WIN32_FIND_DATAW wfd; + LPWSTR p = PathFindFileNameW((LPCWSTR)dwItem2); + lstrcpynW(&wfd.cFileName[0], p, MAX_PATH); + wfd.dwFileAttributes = FILE_ATTRIBUTE_DIRECTORY; + LPITEMIDLIST newpidl = _ILCreateFromFindDataW(&wfd); + LPITEMIDLIST oldpidl = ILClone(Pidls[0]); + ILFree(Pidls[1]); + Pidls[1] = ILCombine(oldpidl, newpidl); + ILFree(newpidl); + ILFree(oldpidl); + } + } break; case SHCNF_IDLIST: - Pidls[0] = (LPCITEMIDLIST)dwItem1; - Pidls[1] = (LPCITEMIDLIST)dwItem2; + Pidls[0] = (LPITEMIDLIST)dwItem1; + Pidls[1] = (LPITEMIDLIST)dwItem2; break; case SHCNF_PRINTERA: case SHCNF_PRINTERW: Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/defconte… ============================================================================== --- trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -61,6 +61,7 @@ HRESULT DoPaste(LPCMINVOKECOMMANDINFO lpcmi, BOOL bLink); HRESULT DoOpenOrExplore(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoCreateLink(LPCMINVOKECOMMANDINFO lpcmi); + HRESULT DoRefresh(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoDelete(LPCMINVOKECOMMANDINFO lpcmi); HRESULT DoCopyOrCut(LPCMINVOKECOMMANDINFO lpcmi, BOOL bCopy); HRESULT DoRename(LPCMINVOKECOMMANDINFO lpcmi); @@ -931,17 +932,32 @@ if (FAILED(lpSB->QueryActiveShellView(&lpSV))) return E_FAIL; - if (LOWORD(lpcmi->lpVerb) == FCIDM_SHVIEW_REFRESH || bRefresh) - lpSV->Refresh(); - else - { - HWND hwndSV = NULL; - if (SUCCEEDED(lpSV->GetWindow(&hwndSV))) - SendMessageW(hwndSV, WM_COMMAND, MAKEWPARAM(LOWORD(lpcmi->lpVerb), 0), 0); - } + HWND hwndSV = NULL; + if (SUCCEEDED(lpSV->GetWindow(&hwndSV))) + SendMessageW(hwndSV, WM_COMMAND, MAKEWPARAM(LOWORD(lpcmi->lpVerb), 0), 0); lpSV->Release(); return S_OK; +} + +HRESULT +CDefaultContextMenu::DoRefresh( + LPCMINVOKECOMMANDINFO lpcmi) +{ + CComPtr<IPersistFolder2> ppf2 = NULL; + LPITEMIDLIST pidl; + HRESULT hr = m_Dcm.psf->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); + if (SUCCEEDED(hr)) + { + hr = ppf2->GetCurFolder(&pidl); + if (SUCCEEDED(hr)) + { + SHChangeNotify(SHCNE_UPDATEDIR, SHCNF_IDLIST, pidl, NULL); + ILFree(pidl); + } + ppf2->Release(); + } + return hr; } HRESULT @@ -1512,8 +1528,9 @@ case 0x33: case FCIDM_SHVIEW_AUTOARRANGE: case FCIDM_SHVIEW_SNAPTOGRID: + return NotifyShellViewWindow(lpcmi, FALSE); case FCIDM_SHVIEW_REFRESH: - return NotifyShellViewWindow(lpcmi, FALSE); + return DoRefresh(lpcmi); case FCIDM_SHVIEW_INSERT: return DoPaste(lpcmi, FALSE); case FCIDM_SHVIEW_INSERTLINK: Modified: trunk/reactos/dll/win32/shell32/dragdrophelper.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dragdrop… ============================================================================== --- trunk/reactos/dll/win32/shell32/dragdrophelper.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dragdrophelper.cpp [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -36,6 +36,18 @@ { } +HRESULT WINAPI CDropTargetHelper::InitializeFromBitmap(LPSHDRAGIMAGE pshdi, IDataObject *pDataObject) +{ + FIXME ("(%p)->()\n", this); + return E_NOTIMPL; +} +HRESULT WINAPI CDropTargetHelper::InitializeFromWindow(HWND hwnd, POINT *ppt, IDataObject *pDataObject) +{ + FIXME ("(%p)->()\n", this); + return E_NOTIMPL; +} + + HRESULT WINAPI CDropTargetHelper::DragEnter (HWND hwndTarget, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect) { FIXME ("(%p)->(%p %p %p 0x%08x)\n", this, hwndTarget, pDataObject, ppt, dwEffect); Modified: trunk/reactos/dll/win32/shell32/dragdrophelper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dragdrop… ============================================================================== --- trunk/reactos/dll/win32/shell32/dragdrophelper.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dragdrophelper.h [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -26,6 +26,7 @@ class CDropTargetHelper : public CComCoClass<CDropTargetHelper, &CLSID_DragDropHelper>, public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IDragSourceHelper, public IDropTargetHelper { private: @@ -33,7 +34,9 @@ CDropTargetHelper(); ~CDropTargetHelper(); - //////// + virtual HRESULT WINAPI InitializeFromBitmap(LPSHDRAGIMAGE pshdi, IDataObject *pDataObject); + virtual HRESULT WINAPI InitializeFromWindow(HWND hwnd, POINT *ppt, IDataObject *pDataObject); + virtual HRESULT WINAPI DragEnter (HWND hwndTarget, IDataObject* pDataObject, POINT* ppt, DWORD dwEffect); virtual HRESULT WINAPI DragLeave(); virtual HRESULT WINAPI DragOver(POINT *ppt, DWORD dwEffect); @@ -46,6 +49,7 @@ DECLARE_PROTECT_FINAL_CONSTRUCT() BEGIN_COM_MAP(CDropTargetHelper) + COM_INTERFACE_ENTRY_IID(IID_IDragSourceHelper, IDragSourceHelper) COM_INTERFACE_ENTRY_IID(IID_IDropTargetHelper, IDropTargetHelper) END_COM_MAP() }; Propchange: trunk/reactos/dll/win32/shell32/droptargets/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Mar 15 13:59:22 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/shell32/droptargets/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/shell32/droptargets/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/shell32/droptargets/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/shell32/droptargets/CexeDropHandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/droptarg… ============================================================================== --- trunk/reactos/dll/win32/shell32/droptargets/CexeDropHandler.cpp (added) +++ trunk/reactos/dll/win32/shell32/droptargets/CexeDropHandler.cpp [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -0,0 +1,138 @@ +/* + * executable drop target handler + * + * Copyright 2014 Huw Campbell + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <precomp.h> + +WINE_DEFAULT_DEBUG_CHANNEL (shell); + +CExeDropHandler::CExeDropHandler() +{ + pclsid = (CLSID *)&CLSID_ExeDropHandler; +} + +CExeDropHandler::~CExeDropHandler() +{ + +} + +// IDropTarget +HRESULT WINAPI CExeDropHandler::DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +{ + TRACE ("(%p)\n", this); + *pdwEffect = DROPEFFECT_COPY; + return S_OK; +} + +HRESULT WINAPI CExeDropHandler::DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +{ + TRACE ("(%p)\n", this); + *pdwEffect = DROPEFFECT_COPY; + return S_OK; +} + +HRESULT WINAPI CExeDropHandler::DragLeave() +{ + TRACE ("(%p)\n", this); + return S_OK; +} + +HRESULT WINAPI CExeDropHandler::Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +{ + TRACE ("(%p)\n", this); + FORMATETC fmt; + STGMEDIUM medium; + LPWSTR pszSrcList; + InitFormatEtc (fmt, CF_HDROP, TYMED_HGLOBAL); + WCHAR wszBuf[MAX_PATH * 2 + 8], *pszEnd = wszBuf; + size_t cchRemaining = _countof(wszBuf); + + if (SUCCEEDED(pDataObject->GetData(&fmt, &medium)) /* && SUCCEEDED(pDataObject->GetData(&fmt2, &medium))*/) + { + LPDROPFILES lpdf = (LPDROPFILES) GlobalLock(medium.hGlobal); + if (!lpdf) + { + ERR("Error locking global\n"); + return E_FAIL; + } + pszSrcList = (LPWSTR) (((byte*) lpdf) + lpdf->pFiles); + while (*pszSrcList) + { + if (StrChrW(pszSrcList, L' ') && cchRemaining > 3) + StringCchPrintfExW(pszEnd, cchRemaining, &pszEnd, &cchRemaining, 0, L"\"%ls\" ", pszSrcList); + else + StringCchPrintfExW(pszEnd, cchRemaining, &pszEnd, &cchRemaining, 0, L"%ls ", pszSrcList); + + pszSrcList += wcslen(pszSrcList) + 1; + } + } + + ShellExecute(NULL, L"open", sPathTarget, wszBuf, NULL,SW_SHOWNORMAL); + + return S_OK; +} + + +// IPersistFile +HRESULT WINAPI CExeDropHandler::GetCurFile(LPOLESTR *ppszFileName) +{ + FIXME ("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT WINAPI CExeDropHandler::IsDirty() +{ + FIXME ("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT WINAPI CExeDropHandler::Load(LPCOLESTR pszFileName, DWORD dwMode) +{ + UINT len = strlenW(pszFileName); + sPathTarget = (WCHAR *)SHAlloc((len + 1) * sizeof(WCHAR)); + memcpy(sPathTarget, pszFileName, (len + 1) * sizeof(WCHAR)); + return S_OK; +} + +HRESULT WINAPI CExeDropHandler::Save(LPCOLESTR pszFileName, BOOL fRemember) +{ + FIXME ("(%p)\n", this); + return E_NOTIMPL; +} + +HRESULT WINAPI CExeDropHandler::SaveCompleted(LPCOLESTR pszFileName) +{ + FIXME ("(%p)\n", this); + return E_NOTIMPL; +} + +/************************************************************************ + * CFSFolder::GetClassID + */ +HRESULT WINAPI CExeDropHandler::GetClassID(CLSID * lpClassId) +{ + TRACE ("(%p)\n", this); + + if (!lpClassId) + return E_POINTER; + + *lpClassId = *pclsid; + + return S_OK; +} Propchange: trunk/reactos/dll/win32/shell32/droptargets/CexeDropHandler.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shell32/droptargets/CexeDropHandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/droptarg… ============================================================================== --- trunk/reactos/dll/win32/shell32/droptargets/CexeDropHandler.h (added) +++ trunk/reactos/dll/win32/shell32/droptargets/CexeDropHandler.h [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -0,0 +1,66 @@ +/* + * executable drop target handler + * + * Copyright 2014 Huw Campbell + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _CEXEDROPHANDLER_H_ +#define _CEXEDROPHANDLER_H_ + +class CExeDropHandler : + public CComCoClass<CExeDropHandler, &CLSID_ExeDropHandler>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IDropTarget, + public IPersistFile +{ +private: + CLSID *pclsid; + LPWSTR sPathTarget; +public: + CExeDropHandler(); + ~CExeDropHandler(); + + // IDropTarget + virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT WINAPI DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT WINAPI DragLeave(); + virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + + // IPersist + virtual HRESULT WINAPI GetClassID(CLSID *lpClassId); + + //////// IPersistFile + virtual HRESULT WINAPI GetCurFile(LPOLESTR *ppszFileName); + virtual HRESULT WINAPI IsDirty(); + virtual HRESULT WINAPI Load(LPCOLESTR pszFileName, DWORD dwMode); + virtual HRESULT WINAPI Save(LPCOLESTR pszFileName, BOOL fRemember); + virtual HRESULT WINAPI SaveCompleted(LPCOLESTR pszFileName); + + +DECLARE_REGISTRY_RESOURCEID(IDR_EXEDROPHANDLER) +DECLARE_NOT_AGGREGATABLE(CExeDropHandler) + +DECLARE_PROTECT_FINAL_CONSTRUCT() + +BEGIN_COM_MAP(CExeDropHandler) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IPersistFile, IPersistFile) + COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) +END_COM_MAP() +}; + +#endif /* _CEXEDROPHANDLER_H_ */ Propchange: trunk/reactos/dll/win32/shell32/droptargets/CexeDropHandler.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/folders/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/desktop.cpp [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -651,7 +651,7 @@ else if (IsEqualIID (riid, IID_IDropTarget)) { /* only interested in attempting to bind to shell folders, not files, semicolon intentionate */ - if (cidl == 1 && SUCCEEDED(this->BindToObject(apidl[0], NULL, IID_IDropTarget, (LPVOID*)&pObj))); + if (cidl == 1 && SUCCEEDED(hr = this->_GetDropTarget(apidl[0], (LPVOID*)&pObj))); else hr = this->QueryInterface(IID_IDropTarget, (LPVOID*)&pObj); } @@ -1451,7 +1451,7 @@ else { InitFormatEtc (formatetc, CF_HDROP, TYMED_HGLOBAL); - if SUCCEEDED(pDataObject->QueryGetData(&formatetc)); + if (SUCCEEDED(pDataObject->QueryGetData(&formatetc))) { passthroughtofs = TRUE; } @@ -1488,4 +1488,53 @@ /* Todo, rewrite the registry such that the icons are well placed. Blocked by no bags implementation. */ return hr; +} + +HRESULT WINAPI CDesktopFolder::_GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut) { + HRESULT hr; + + TRACE("CFSFolder::_GetDropTarget entered\n"); + + if (_ILGetGUIDPointer (pidl) || _ILIsFolder (pidl)) + return this->BindToObject(pidl, NULL, IID_IDropTarget, ppvOut); + + LPITEMIDLIST pidlNext = NULL; + + STRRET strFile; + hr = this->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strFile); + if (SUCCEEDED(hr)) + { + WCHAR wszPath[MAX_PATH]; + hr = StrRetToBufW(&strFile, pidl, wszPath, _countof(wszPath)); + + if (SUCCEEDED(hr)) + { + PathRemoveFileSpecW (wszPath); + hr = this->ParseDisplayName(NULL, NULL, wszPath, NULL, &pidlNext, NULL); + + if (SUCCEEDED(hr)) + { + IShellFolder *psf; + hr = this->BindToObject(pidlNext, NULL, IID_IShellFolder, (LPVOID*)&psf); + CoTaskMemFree(pidlNext); + if (SUCCEEDED(hr)) + { + hr = psf->GetUIObjectOf(NULL, 1, &pidl, IID_IDropTarget, NULL, ppvOut); + psf->Release(); + if (FAILED(hr)) + ERR("FS GetUIObjectOf failed: %x\n", hr); + } + else + ERR("BindToObject failed: %x\n", hr); + } + else + ERR("ParseDisplayName failed: %x\n", hr); + } + else + ERR("StrRetToBufW failed: %x\n", hr); + } + else + ERR("GetDisplayNameOf failed: %x\n", hr); + + return hr; } Modified: trunk/reactos/dll/win32/shell32/folders/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/desktop.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/desktop.h [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -40,6 +40,7 @@ BOOL fAcceptFmt; /* flag for pending Drop */ BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); void SF_RegisterClipFmt(); + virtual HRESULT WINAPI _GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut); public: CDesktopFolder(); Modified: trunk/reactos/dll/win32/shell32/folders/fs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fs.cpp [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -81,6 +81,7 @@ cfShellIDList = 0; SF_RegisterClipFmt(); fAcceptFmt = FALSE; + m_bGroupPolicyActive = 0; } CFSFolder::~CFSFolder() @@ -502,7 +503,7 @@ else if (IsEqualIID (riid, IID_IDropTarget)) { /* only interested in attempting to bind to shell folders, not files (except exe), so if we fail, rebind to root */ - if (cidl == 1 && SUCCEEDED(hr = this->BindToObject(apidl[0], NULL, IID_IDropTarget, (LPVOID*)&pObj))); + if (cidl == 1 && SUCCEEDED(hr = this->_GetDropTarget(apidl[0], (LPVOID*)&pObj))); else hr = this->QueryInterface(IID_IDropTarget, (LPVOID*)&pObj); } @@ -1617,6 +1618,9 @@ } hr = ppf->Save(wszTarget, FALSE); + if (FAILED(hr)) + break; + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); } else { @@ -1653,6 +1657,9 @@ break; hr = ppf->Save(wszTarget, TRUE); + if (FAILED(hr)) + break; + SHChangeNotify(SHCNE_CREATE, SHCNF_PATHW, wszTarget, NULL); } } } @@ -1748,4 +1755,114 @@ //Release the parameter from the heap. HeapFree(GetProcessHeap(), 0, data); return 0; +} + +HRESULT WINAPI CFSFolder::_GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut) { + HKEY hKey; + HRESULT hr; + + TRACE("CFSFolder::_GetDropTarget entered\n"); + + if (_ILGetGUIDPointer (pidl) || _ILIsFolder (pidl)) + return this->BindToObject(pidl, NULL, IID_IDropTarget, ppvOut); + + STRRET strFile; + hr = this->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strFile); + if (hr == S_OK) + { + WCHAR wszPath[MAX_PATH]; + hr = StrRetToBufW(&strFile, pidl, wszPath, _countof(wszPath)); + + if (hr == S_OK) + { + LPCWSTR pwszExt = PathFindExtensionW(wszPath); + if (pwszExt[0]) + { + /* enumerate dynamic/static for a given file class */ + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, pwszExt, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + /* load dynamic extensions from file extension key, for example .jpg */ + _LoadDynamicDropTargetHandlerForKey(hKey, wszPath, ppvOut); + RegCloseKey(hKey); + } + + WCHAR wszTemp[40]; + DWORD dwSize = sizeof(wszTemp); + if (RegGetValueW(HKEY_CLASSES_ROOT, pwszExt, NULL, RRF_RT_REG_SZ, NULL, wszTemp, &dwSize) == ERROR_SUCCESS) + { + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, wszTemp, 0, KEY_READ, &hKey) == ERROR_SUCCESS) + { + /* load dynamic extensions from progid key, for example jpegfile */ + _LoadDynamicDropTargetHandlerForKey(hKey, wszPath, ppvOut); + RegCloseKey(hKey); + } + } + } + } + } + else + ERR("GetDisplayNameOf failed: %x\n", hr); + + return hr; +} + +HRESULT WINAPI CFSFolder::_LoadDynamicDropTargetHandlerForKey(HKEY hRootKey, LPCWSTR pwcsname, LPVOID *ppvOut) +{ + TRACE("CFSFolder::_LoadDynamicDropTargetHandlerForKey entered\n"); + + WCHAR wszName[MAX_PATH], *pwszClsid; + DWORD dwSize = sizeof(wszName); + HRESULT hr; + + if (RegGetValueW(hRootKey, L"shellex\\DropHandler", NULL, RRF_RT_REG_SZ, NULL, wszName, &dwSize) == ERROR_SUCCESS) + { + CLSID clsid; + hr = CLSIDFromString(wszName, &clsid); + if (hr == S_OK) + pwszClsid = wszName; + + if (m_bGroupPolicyActive) + { + if (RegGetValueW(HKEY_LOCAL_MACHINE, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved", + pwszClsid, + RRF_RT_REG_SZ, + NULL, + NULL, + NULL) == ERROR_SUCCESS) + { + hr = _LoadDynamicDropTargetHandler(&clsid, pwcsname, ppvOut); + } + } + else + { + hr = _LoadDynamicDropTargetHandler(&clsid, pwcsname, ppvOut); + } + } + else + return E_FAIL; + return hr; +} + +HRESULT WINAPI CFSFolder::_LoadDynamicDropTargetHandler(const CLSID *pclsid, LPCWSTR pwcsname, LPVOID *ppvOut) +{ + TRACE("CFSFolder::_LoadDynamicDropTargetHandler entered\n"); + HRESULT hr; + + IPersistFile *pp; + hr = SHCoCreateInstance(NULL, pclsid, NULL, IID_PPV_ARG(IPersistFile, &pp)); + if (hr != S_OK) + { + ERR("SHCoCreateInstance failed %x\n", GetLastError()); + } + pp->Load(pwcsname, 0); + + hr = pp->QueryInterface(IID_PPV_ARG(IDropTarget, (IDropTarget**) ppvOut)); + if (hr != S_OK) + { + ERR("Failed to query for interface IID_IShellExtInit hr %x pclsid %s\n", hr, wine_dbgstr_guid(pclsid)); + return hr; + } + pp->Release(); + return hr; } Modified: trunk/reactos/dll/win32/shell32/folders/fs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/fs.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/fs.h [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -44,10 +44,14 @@ UINT cfShellIDList; /* clipboardformat for IDropTarget */ BOOL fAcceptFmt; /* flag for pending Drop */ BOOL QueryDrop (DWORD dwKeyState, LPDWORD pdwEffect); + DWORD m_bGroupPolicyActive; void SF_RegisterClipFmt(); BOOL GetUniqueFileName(LPWSTR pwszBasePath, LPCWSTR pwszExt, LPWSTR pwszTarget, BOOL bShortcut); static DWORD WINAPI _DoDropThreadProc(LPVOID lpParameter); virtual HRESULT WINAPI _DoDrop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT WINAPI _GetDropTarget(LPCITEMIDLIST pidl, LPVOID *ppvOut); + virtual HRESULT WINAPI _LoadDynamicDropTargetHandlerForKey(HKEY hRootKey, LPCWSTR pwcsname, LPVOID *ppvOut); + virtual HRESULT WINAPI _LoadDynamicDropTargetHandler(const CLSID *pclsid, LPCWSTR pwcsname, LPVOID *ppvOut); public: CFSFolder(); Modified: trunk/reactos/dll/win32/shell32/folders/mydocuments.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/mydocuments.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/mydocuments.cpp [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -78,6 +78,7 @@ { pidlRoot = NULL; sPathTarget = NULL; + mFSDropTarget = NULL; } CMyDocsFolder::~CMyDocsFolder() @@ -85,6 +86,7 @@ TRACE ("-- destroying IShellFolder(%p)\n", this); SHFree(pidlRoot); HeapFree(GetProcessHeap(), 0, sPathTarget); + mFSDropTarget->Release(); } HRESULT WINAPI CMyDocsFolder::FinalConstruct() @@ -97,6 +99,29 @@ pidlRoot = _ILCreateMyDocuments(); /* my qualified pidl */ sPathTarget = (LPWSTR)SHAlloc((wcslen(szMyPath) + 1) * sizeof(WCHAR)); wcscpy(sPathTarget, szMyPath); + + LPITEMIDLIST pidl = NULL; + + WCHAR szPath[MAX_PATH]; + lstrcpynW(szPath, sPathTarget, MAX_PATH); + PathAddBackslashW(szPath); + CComPtr<IShellFolder> psfDesktop = NULL; + + HRESULT hr = SHGetDesktopFolder(&psfDesktop); + if (SUCCEEDED(hr)) + hr = psfDesktop->ParseDisplayName(NULL, NULL, szPath, NULL, &pidl, NULL); + else + ERR("Error getting desktop folder\n"); + + if (SUCCEEDED(hr)) + { + hr = psfDesktop->BindToObject(pidl, NULL, IID_IDropTarget, (LPVOID*) &mFSDropTarget); + CoTaskMemFree(pidl); + if (FAILED(hr)) + ERR("Error Binding"); + } + else + ERR("Error creating from %s\n", debugstr_w(szPath)); return S_OK; } @@ -271,8 +296,7 @@ if (IsEqualIID (riid, IID_IDropTarget)) { - WARN ("IDropTarget not implemented\n"); - hr = E_NOTIMPL; + hr = this->QueryInterface (IID_IDropTarget, ppvOut); } else if (IsEqualIID (riid, IID_IContextMenu)) { @@ -679,3 +703,26 @@ *pidl = ILClone (pidlRoot); return S_OK; } + +HRESULT WINAPI CMyDocsFolder::DragEnter(IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +{ + return mFSDropTarget->DragEnter(pDataObject, dwKeyState, pt, pdwEffect); +} + +HRESULT WINAPI CMyDocsFolder::DragOver(DWORD dwKeyState, POINTL pt, + DWORD *pdwEffect) +{ + return mFSDropTarget->DragOver(dwKeyState, pt, pdwEffect); +} + +HRESULT WINAPI CMyDocsFolder::DragLeave() +{ + return mFSDropTarget->DragLeave(); +} + +HRESULT WINAPI CMyDocsFolder::Drop(IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +{ + return mFSDropTarget->Drop(pDataObject, dwKeyState, pt, pdwEffect); +} Modified: trunk/reactos/dll/win32/shell32/folders/mydocuments.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/mydocuments.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/mydocuments.h [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -26,12 +26,14 @@ public CComCoClass<CMyDocsFolder, &CLSID_MyDocuments>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IShellFolder2, - public IPersistFolder2 + public IPersistFolder2, + public IDropTarget { private: /* both paths are parsible from the MyDocuments */ LPWSTR sPathTarget; /* complete path to target used for enumeration and ChangeNotify */ LPITEMIDLIST pidlRoot; /* absolute pidl */ + IDropTarget *mFSDropTarget; public: CMyDocsFolder(); ~CMyDocsFolder(); @@ -67,6 +69,12 @@ // IPersistFolder2 virtual HRESULT WINAPI GetCurFolder(LPITEMIDLIST * pidl); + // IDropTarget + virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT WINAPI DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT WINAPI DragLeave(); + virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + DECLARE_REGISTRY_RESOURCEID(IDR_MYDOCUMENTS) DECLARE_NOT_AGGREGATABLE(CMyDocsFolder) @@ -78,6 +86,7 @@ COM_INTERFACE_ENTRY_IID(IID_IPersistFolder, IPersistFolder) COM_INTERFACE_ENTRY_IID(IID_IPersistFolder2, IPersistFolder2) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) END_COM_MAP() }; Modified: trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/recyclebin.cpp [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -1416,7 +1416,7 @@ HRESULT WINAPI CRecycleBin::DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { - FIXME("Recycle bin drag over (%p)\n", this); + TRACE("Recycle bin drag over (%p)\n", this); /* The recycle bin accepts pretty much everything, and sets a CSIDL flag. */ fAcceptFmt = TRUE; @@ -1449,7 +1449,7 @@ HRESULT WINAPI CRecycleBin::Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) { - FIXME("(%p) object dropped on recycle bin, effect %u\n", this, *pdwEffect); + TRACE("(%p) object dropped on recycle bin, effect %u\n", this, *pdwEffect); /* TODO: pdwEffect should be read and make the drop object be permanently deleted in the move case (shift held) */ Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -55,6 +55,7 @@ #include "folders/printers.h" #include "folders/admintools.h" #include "folders/recyclebin.h" +#include "droptargets/CexeDropHandler.h" #include "openwithmenu.h" #include "newmenu.h" #include "startmenu.h" Added: trunk/reactos/dll/win32/shell32/res/rgs/exedrophandler.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/exedrophandler.rgs (added) +++ trunk/reactos/dll/win32/shell32/res/rgs/exedrophandler.rgs [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -0,0 +1,13 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {86C86720-42A0-1069-A2E8-08002B30309D} = s 'Executable Drag and Drop target' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } +} Propchange: trunk/reactos/dll/win32/shell32/res/rgs/exedrophandler.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/rgs_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/rgs_res.… ============================================================================== --- trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -23,3 +23,4 @@ IDR_OPENWITHMENU REGISTRY "res/rgs/openwithmenu.rgs" IDR_FILEDEFEXT REGISTRY "res/rgs/shellfiledefext.rgs" IDR_DRVDEFEXT REGISTRY "res/rgs/shelldrvdefext.rgs" +IDR_EXEDROPHANDLER REGISTRY "res/rgs/exedrophandler.rgs" Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -1371,6 +1371,7 @@ OBJECT_ENTRY(CLSID_MenuBandSite, CMenuBandSite) OBJECT_ENTRY(CLSID_MenuBand, CMenuBand) OBJECT_ENTRY(CLSID_MenuDeskBar, CMenuDeskBar) + OBJECT_ENTRY(CLSID_ExeDropHandler, CExeDropHandler) END_OBJECT_MAP() CShell32Module gModule; Modified: trunk/reactos/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.cpp [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -2168,6 +2168,68 @@ return site->QueryInterface(iid, ppvSite); } +HRESULT WINAPI CShellLink::DragEnter(IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +{ + TRACE("(%p)->(DataObject=%p)\n", this, pDataObject); + LPCITEMIDLIST pidlLast; + IShellFolder *psf; + + HRESULT hr = SHBindToParent(pPidl, IID_PPV_ARG(IShellFolder, &psf), &pidlLast); + + if (SUCCEEDED(hr)) + { + hr = psf->GetUIObjectOf(0, 1, &pidlLast, IID_IDropTarget, NULL, (LPVOID*)&mDropTarget); + + if (SUCCEEDED(hr)) + hr = mDropTarget->DragEnter(pDataObject, dwKeyState, pt, pdwEffect); + else + *pdwEffect = DROPEFFECT_NONE; + + psf->Release(); + } + else + *pdwEffect = DROPEFFECT_NONE; + + return S_OK; +} + + + +HRESULT WINAPI CShellLink::DragOver(DWORD dwKeyState, POINTL pt, + DWORD *pdwEffect) +{ + TRACE("(%p)\n", this); + HRESULT hr = S_OK; + if (mDropTarget) + hr = mDropTarget->DragOver(dwKeyState, pt, pdwEffect); + return hr; +} + +HRESULT WINAPI CShellLink::DragLeave() +{ + TRACE("(%p)\n", this); + HRESULT hr = S_OK; + if (mDropTarget) + { + hr = mDropTarget->DragLeave(); + mDropTarget->Release(); + } + + return hr; +} + +HRESULT WINAPI CShellLink::Drop(IDataObject *pDataObject, + DWORD dwKeyState, POINTL pt, DWORD *pdwEffect) +{ + TRACE("(%p)\n", this); + HRESULT hr = S_OK; + if (mDropTarget) + hr = mDropTarget->Drop(pDataObject, dwKeyState, pt, pdwEffect); + + return hr; +} + /************************************************************************** * IShellLink_ConstructFromFile */ Modified: trunk/reactos/dll/win32/shell32/shelllink.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelllin… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelllink.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelllink.h [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -25,140 +25,148 @@ #define _SHELLLINK_H_ class CShellLink : - public CComCoClass<CShellLink, &CLSID_ShellLink>, - public CComObjectRootEx<CComMultiThreadModelNoCS>, - public IShellLinkA, - public IShellLinkW, - public IPersistFile, - public IPersistStream, - public IShellLinkDataList, - public IShellExtInit, - public IContextMenu, - public IObjectWithSite, - public IShellPropSheetExt + public CComCoClass<CShellLink, &CLSID_ShellLink>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IShellLinkA, + public IShellLinkW, + public IPersistFile, + public IPersistStream, + public IShellLinkDataList, + public IShellExtInit, + public IContextMenu, + public IDropTarget, + public IObjectWithSite, + public IShellPropSheetExt { public: - /* link file formats */ + /* link file formats */ - #include "pshpack1.h" + #include "pshpack1.h" - struct volume_info - { - DWORD type; - DWORD serial; - WCHAR label[12]; /* assume 8.3 */ - }; + struct volume_info + { + DWORD type; + DWORD serial; + WCHAR label[12]; /* assume 8.3 */ + }; - #include "poppack.h" + #include "poppack.h" private: - /* data structures according to the information in the link */ - LPITEMIDLIST pPidl; - WORD wHotKey; - SYSTEMTIME time1; - SYSTEMTIME time2; - SYSTEMTIME time3; + /* data structures according to the information in the link */ + LPITEMIDLIST pPidl; + WORD wHotKey; + SYSTEMTIME time1; + SYSTEMTIME time2; + SYSTEMTIME time3; - DWORD iShowCmd; - LPWSTR sIcoPath; - INT iIcoNdx; - LPWSTR sPath; - LPWSTR sArgs; - LPWSTR sWorkDir; - LPWSTR sDescription; - LPWSTR sPathRel; - LPWSTR sProduct; - LPWSTR sComponent; - volume_info volume; - LPWSTR sLinkPath; - BOOL bRunAs; - BOOL bDirty; - INT iIdOpen; /* id of the "Open" entry in the context menu */ - CComPtr<IUnknown> site; + DWORD iShowCmd; + LPWSTR sIcoPath; + INT iIcoNdx; + LPWSTR sPath; + LPWSTR sArgs; + LPWSTR sWorkDir; + LPWSTR sDescription; + LPWSTR sPathRel; + LPWSTR sProduct; + LPWSTR sComponent; + volume_info volume; + LPWSTR sLinkPath; + BOOL bRunAs; + BOOL bDirty; + INT iIdOpen; /* id of the "Open" entry in the context menu */ + CComPtr<IUnknown> site; + IDropTarget *mDropTarget; public: - CShellLink(); - ~CShellLink(); - LPWSTR ShellLink_GetAdvertisedArg(LPCWSTR str); - HRESULT ShellLink_SetAdvertiseInfo(LPCWSTR str); - static INT_PTR CALLBACK SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); + CShellLink(); + ~CShellLink(); + LPWSTR ShellLink_GetAdvertisedArg(LPCWSTR str); + HRESULT ShellLink_SetAdvertiseInfo(LPCWSTR str); + static INT_PTR CALLBACK SH_ShellLinkDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - // IPersistFile - virtual HRESULT WINAPI GetClassID(CLSID *pclsid); - virtual HRESULT WINAPI IsDirty(); - virtual HRESULT WINAPI Load(LPCOLESTR pszFileName, DWORD dwMode); - virtual HRESULT WINAPI Save(LPCOLESTR pszFileName, BOOL fRemember); - virtual HRESULT WINAPI SaveCompleted(LPCOLESTR pszFileName); - virtual HRESULT WINAPI GetCurFile(LPOLESTR *ppszFileName); + // IPersistFile + virtual HRESULT WINAPI GetClassID(CLSID *pclsid); + virtual HRESULT WINAPI IsDirty(); + virtual HRESULT WINAPI Load(LPCOLESTR pszFileName, DWORD dwMode); + virtual HRESULT WINAPI Save(LPCOLESTR pszFileName, BOOL fRemember); + virtual HRESULT WINAPI SaveCompleted(LPCOLESTR pszFileName); + virtual HRESULT WINAPI GetCurFile(LPOLESTR *ppszFileName); - // IPersistStream -// virtual WINAPI HRESULT GetClassID(CLSID *pclsid); -// virtual HRESULT WINAPI IsDirty(); - virtual HRESULT WINAPI Load(IStream *stm); - virtual HRESULT WINAPI Save(IStream *stm, BOOL fClearDirty); - virtual HRESULT WINAPI GetSizeMax(ULARGE_INTEGER *pcbSize); + // IPersistStream + // virtual WINAPI HRESULT GetClassID(CLSID *pclsid); + // virtual HRESULT WINAPI IsDirty(); + virtual HRESULT WINAPI Load(IStream *stm); + virtual HRESULT WINAPI Save(IStream *stm, BOOL fClearDirty); + virtual HRESULT WINAPI GetSizeMax(ULARGE_INTEGER *pcbSize); - // IShellLinkA - virtual HRESULT WINAPI GetPath(LPSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAA *pfd, DWORD fFlags); - virtual HRESULT WINAPI GetIDList(LPITEMIDLIST * ppidl); - virtual HRESULT WINAPI SetIDList(LPCITEMIDLIST pidl); - virtual HRESULT WINAPI GetDescription(LPSTR pszName,INT cchMaxName); - virtual HRESULT WINAPI SetDescription(LPCSTR pszName); - virtual HRESULT WINAPI GetWorkingDirectory(LPSTR pszDir,INT cchMaxPath); - virtual HRESULT WINAPI SetWorkingDirectory(LPCSTR pszDir); - virtual HRESULT WINAPI GetArguments(LPSTR pszArgs,INT cchMaxPath); - virtual HRESULT WINAPI SetArguments(LPCSTR pszArgs); - virtual HRESULT WINAPI GetHotkey(WORD *pwHotkey); - virtual HRESULT WINAPI SetHotkey(WORD wHotkey); - virtual HRESULT WINAPI GetShowCmd(INT *piShowCmd); - virtual HRESULT WINAPI SetShowCmd(INT iShowCmd); - virtual HRESULT WINAPI GetIconLocation(LPSTR pszIconPath,INT cchIconPath,INT *piIcon); - virtual HRESULT WINAPI SetIconLocation(LPCSTR pszIconPath,INT iIcon); - virtual HRESULT WINAPI SetRelativePath(LPCSTR pszPathRel, DWORD dwReserved); - virtual HRESULT WINAPI Resolve(HWND hwnd, DWORD fFlags); - virtual HRESULT WINAPI SetPath(LPCSTR pszFile); + // IShellLinkA + virtual HRESULT WINAPI GetPath(LPSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAA *pfd, DWORD fFlags); + virtual HRESULT WINAPI GetIDList(LPITEMIDLIST * ppidl); + virtual HRESULT WINAPI SetIDList(LPCITEMIDLIST pidl); + virtual HRESULT WINAPI GetDescription(LPSTR pszName,INT cchMaxName); + virtual HRESULT WINAPI SetDescription(LPCSTR pszName); + virtual HRESULT WINAPI GetWorkingDirectory(LPSTR pszDir,INT cchMaxPath); + virtual HRESULT WINAPI SetWorkingDirectory(LPCSTR pszDir); + virtual HRESULT WINAPI GetArguments(LPSTR pszArgs,INT cchMaxPath); + virtual HRESULT WINAPI SetArguments(LPCSTR pszArgs); + virtual HRESULT WINAPI GetHotkey(WORD *pwHotkey); + virtual HRESULT WINAPI SetHotkey(WORD wHotkey); + virtual HRESULT WINAPI GetShowCmd(INT *piShowCmd); + virtual HRESULT WINAPI SetShowCmd(INT iShowCmd); + virtual HRESULT WINAPI GetIconLocation(LPSTR pszIconPath,INT cchIconPath,INT *piIcon); + virtual HRESULT WINAPI SetIconLocation(LPCSTR pszIconPath,INT iIcon); + virtual HRESULT WINAPI SetRelativePath(LPCSTR pszPathRel, DWORD dwReserved); + virtual HRESULT WINAPI Resolve(HWND hwnd, DWORD fFlags); + virtual HRESULT WINAPI SetPath(LPCSTR pszFile); - // IShellLinkW - virtual HRESULT WINAPI GetPath(LPWSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAW *pfd, DWORD fFlags); -// virtual HRESULT WINAPI GetIDList(LPITEMIDLIST *ppidl); -// virtual HRESULT WINAPI SetIDList(LPCITEMIDLIST pidl); - virtual HRESULT WINAPI GetDescription(LPWSTR pszName, INT cchMaxName); - virtual HRESULT WINAPI SetDescription(LPCWSTR pszName); - virtual HRESULT WINAPI GetWorkingDirectory(LPWSTR pszDir, INT cchMaxPath); - virtual HRESULT WINAPI SetWorkingDirectory(LPCWSTR pszDir); - virtual HRESULT WINAPI GetArguments(LPWSTR pszArgs,INT cchMaxPath); - virtual HRESULT WINAPI SetArguments(LPCWSTR pszArgs); -// virtual HRESULT WINAPI GetHotkey(WORD *pwHotkey); -// virtual HRESULT WINAPI SetHotkey(WORD wHotkey); -// virtual HRESULT WINAPI GetShowCmd(INT *piShowCmd); -// virtual HRESULT WINAPI SetShowCmd(INT iShowCmd); - virtual HRESULT WINAPI GetIconLocation(LPWSTR pszIconPath,INT cchIconPath,INT *piIcon); - virtual HRESULT WINAPI SetIconLocation(LPCWSTR pszIconPath,INT iIcon); - virtual HRESULT WINAPI SetRelativePath(LPCWSTR pszPathRel, DWORD dwReserved); -// virtual HRESULT WINAPI Resolve(HWND hwnd, DWORD fFlags); - virtual HRESULT WINAPI SetPath(LPCWSTR pszFile); + // IShellLinkW + virtual HRESULT WINAPI GetPath(LPWSTR pszFile, INT cchMaxPath, WIN32_FIND_DATAW *pfd, DWORD fFlags); + // virtual HRESULT WINAPI GetIDList(LPITEMIDLIST *ppidl); + // virtual HRESULT WINAPI SetIDList(LPCITEMIDLIST pidl); + virtual HRESULT WINAPI GetDescription(LPWSTR pszName, INT cchMaxName); + virtual HRESULT WINAPI SetDescription(LPCWSTR pszName); + virtual HRESULT WINAPI GetWorkingDirectory(LPWSTR pszDir, INT cchMaxPath); + virtual HRESULT WINAPI SetWorkingDirectory(LPCWSTR pszDir); + virtual HRESULT WINAPI GetArguments(LPWSTR pszArgs,INT cchMaxPath); + virtual HRESULT WINAPI SetArguments(LPCWSTR pszArgs); + // virtual HRESULT WINAPI GetHotkey(WORD *pwHotkey); + // virtual HRESULT WINAPI SetHotkey(WORD wHotkey); + // virtual HRESULT WINAPI GetShowCmd(INT *piShowCmd); + // virtual HRESULT WINAPI SetShowCmd(INT iShowCmd); + virtual HRESULT WINAPI GetIconLocation(LPWSTR pszIconPath,INT cchIconPath,INT *piIcon); + virtual HRESULT WINAPI SetIconLocation(LPCWSTR pszIconPath,INT iIcon); + virtual HRESULT WINAPI SetRelativePath(LPCWSTR pszPathRel, DWORD dwReserved); + // virtual HRESULT WINAPI Resolve(HWND hwnd, DWORD fFlags); + virtual HRESULT WINAPI SetPath(LPCWSTR pszFile); - // IShellLinkDataList - virtual HRESULT WINAPI AddDataBlock(void *pDataBlock); - virtual HRESULT WINAPI CopyDataBlock(DWORD dwSig, void **ppDataBlock); - virtual HRESULT WINAPI RemoveDataBlock(DWORD dwSig); - virtual HRESULT WINAPI GetFlags(DWORD *pdwFlags); - virtual HRESULT WINAPI SetFlags(DWORD dwFlags); + // IShellLinkDataList + virtual HRESULT WINAPI AddDataBlock(void *pDataBlock); + virtual HRESULT WINAPI CopyDataBlock(DWORD dwSig, void **ppDataBlock); + virtual HRESULT WINAPI RemoveDataBlock(DWORD dwSig); + virtual HRESULT WINAPI GetFlags(DWORD *pdwFlags); + virtual HRESULT WINAPI SetFlags(DWORD dwFlags); - // IShellExtInit - virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); + // IShellExtInit + virtual HRESULT WINAPI Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID); - // IContextMenu - virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); - virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici); - virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax); + // IContextMenu + virtual HRESULT WINAPI QueryContextMenu(HMENU hmenu, UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags); + virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpici); + virtual HRESULT WINAPI GetCommandString(UINT_PTR idCmd, UINT uType, UINT *pwReserved, LPSTR pszName, UINT cchMax); - // IShellPropSheetExt - virtual HRESULT WINAPI AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam); - virtual HRESULT WINAPI ReplacePage(UINT uPageID, LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam); + // IShellPropSheetExt + virtual HRESULT WINAPI AddPages(LPFNADDPROPSHEETPAGE pfnAddPage, LPARAM lParam); + virtual HRESULT WINAPI ReplacePage(UINT uPageID, LPFNADDPROPSHEETPAGE pfnReplacePage, LPARAM lParam); - // IObjectWithSite - virtual HRESULT WINAPI SetSite(IUnknown *punk); - virtual HRESULT WINAPI GetSite(REFIID iid, void **ppvSite); + // IObjectWithSite + virtual HRESULT WINAPI SetSite(IUnknown *punk); + virtual HRESULT WINAPI GetSite(REFIID iid, void **ppvSite); + + // IDropTarget + virtual HRESULT WINAPI DragEnter(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT WINAPI DragOver(DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); + virtual HRESULT WINAPI DragLeave(); + virtual HRESULT WINAPI Drop(IDataObject *pDataObject, DWORD dwKeyState, POINTL pt, DWORD *pdwEffect); DECLARE_REGISTRY_RESOURCEID(IDR_SHELLLINK) DECLARE_NOT_AGGREGATABLE(CShellLink) @@ -166,16 +174,17 @@ DECLARE_PROTECT_FINAL_CONSTRUCT() BEGIN_COM_MAP(CShellLink) - COM_INTERFACE_ENTRY2_IID(IID_IPersist, IPersist, IPersistFile) - COM_INTERFACE_ENTRY_IID(IID_IPersistFile, IPersistFile) - COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) - COM_INTERFACE_ENTRY_IID(IID_IShellLinkA, IShellLinkA) - COM_INTERFACE_ENTRY_IID(IID_IShellLinkW, IShellLinkW) - COM_INTERFACE_ENTRY_IID(IID_IShellLinkDataList, IShellLinkDataList) - COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) - COM_INTERFACE_ENTRY_IID(IID_IShellPropSheetExt, IShellPropSheetExt) - COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + COM_INTERFACE_ENTRY2_IID(IID_IPersist, IPersist, IPersistFile) + COM_INTERFACE_ENTRY_IID(IID_IPersistFile, IPersistFile) + COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) + COM_INTERFACE_ENTRY_IID(IID_IShellLinkA, IShellLinkA) + COM_INTERFACE_ENTRY_IID(IID_IShellLinkW, IShellLinkW) + COM_INTERFACE_ENTRY_IID(IID_IShellLinkDataList, IShellLinkDataList) + COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) + COM_INTERFACE_ENTRY_IID(IID_IDropTarget, IDropTarget) + COM_INTERFACE_ENTRY_IID(IID_IShellPropSheetExt, IShellPropSheetExt) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) END_COM_MAP() }; 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 Mar 15 13:59:22 2014 @@ -1,10 +1,10 @@ /* - * Virtual Folder - * common definitions + * Virtual Folder + * common definitions * - * Copyright 1997 Marcus Meissner - * Copyright 1998, 1999, 2002 Juergen Schmied + * Copyright 1997 Marcus Meissner + * Copyright 1998, 1999, 2002 Juergen Schmied * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -40,13 +40,13 @@ LPCWSTR GetNextElementW (LPCWSTR pszNext, LPWSTR pszOut, DWORD dwOut); HRESULT SHELL32_ParseNextElement (IShellFolder2 * psf, HWND hwndOwner, LPBC pbc, LPITEMIDLIST * pidlInOut, - LPOLESTR szNext, DWORD * pEaten, DWORD * pdwAttributes); + LPOLESTR szNext, DWORD * pEaten, DWORD * pdwAttributes); HRESULT SHELL32_GetItemAttributes (IShellFolder * psf, LPCITEMIDLIST pidl, LPDWORD pdwAttributes); HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf, LPCITEMIDLIST pidl, DWORD dwFlags, LPWSTR szOut, - DWORD dwOutLen); + DWORD dwOutLen); HRESULT SHELL32_BindToChild (LPCITEMIDLIST pidlRoot, - LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut); + LPCWSTR pathRoot, LPCITEMIDLIST pidlComplete, REFIID riid, LPVOID * ppvOut); HRESULT SHELL32_CompareIDs (IShellFolder * iface, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); LPITEMIDLIST SHELL32_CreatePidlFromBindCtx(IBindCtx *pbc, LPCWSTR path); Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -42,7 +42,7 @@ static DWORD SHNotifyCreateDirectoryW(LPCWSTR path, LPSECURITY_ATTRIBUTES sec); static DWORD SHNotifyRemoveDirectoryW(LPCWSTR path); static DWORD SHNotifyDeleteFileW(LPCWSTR path); -static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest); +static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest, BOOL isdir); static DWORD SHNotifyCopyFileW(LPCWSTR src, LPCWSTR dest, BOOL bFailIfExists); static DWORD SHFindAttrW(LPCWSTR pName, BOOL fileOnly); @@ -531,7 +531,7 @@ * RETURNS * ERORR_SUCCESS if successful */ -static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest) +static DWORD SHNotifyMoveFileW(LPCWSTR src, LPCWSTR dest, BOOL isdir) { BOOL ret; @@ -559,7 +559,8 @@ } if (ret) { - SHChangeNotify(SHCNE_RENAMEITEM, SHCNF_PATHW, src, dest); + SHChangeNotify(isdir ? SHCNE_MKDIR : SHCNE_CREATE, SHCNF_PATHW, dest, NULL); + SHChangeNotify(isdir ? SHCNE_RMDIR : SHCNE_DELETE, SHCNF_PATHW, src, NULL); return ERROR_SUCCESS; } return GetLastError(); @@ -1474,7 +1475,10 @@ { BOOL bDelete; if (TRASH_TrashFile(fileEntry->szFullPath)) + { + SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, fileEntry->szFullPath, NULL); continue; + } /* Note: Windows silently deletes the file in such a situation, we show a dialog */ if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (lpFileOp->fFlags & FOF_WANTNUKEWARNING)) @@ -1491,7 +1495,10 @@ /* delete the file or directory */ if (IsAttribFile(fileEntry->attributes)) + { bPathExists = DeleteFileW(fileEntry->szFullPath); + SHChangeNotify(SHCNE_DELETE, SHCNF_PATHW, fileEntry->szFullPath, NULL); + } else bPathExists = SHELL_DeleteDirectoryW(lpFileOp->hwnd, fileEntry->szFullPath, FALSE); @@ -1548,7 +1555,7 @@ PathCombineW(szDestPath, feTo->szFullPath, feFrom->szFilename); if (IsAttribFile(feFrom->attributes)) - SHNotifyMoveFileW(feFrom->szFullPath, szDestPath); + SHNotifyMoveFileW(feFrom->szFullPath, szDestPath, FALSE); else if (!(lpFileOp->fFlags & FOF_FILESONLY && feFrom->bFromWildcard)) move_dir_to_dir(lpFileOp, feFrom, szDestPath); } @@ -1599,7 +1606,7 @@ if (fileDest->bExists && IsAttribDir(fileDest->attributes)) move_to_dir(lpFileOp, entryToMove, fileDest); else - SHNotifyMoveFileW(entryToMove->szFullPath, fileDest->szFullPath); + SHNotifyMoveFileW(entryToMove->szFullPath, fileDest->szFullPath, IsAttribDir(entryToMove->attributes)); } return ERROR_SUCCESS; @@ -1628,7 +1635,7 @@ if (feTo->bExists) return ERROR_ALREADY_EXISTS; - return SHNotifyMoveFileW(feFrom->szFullPath, feTo->szFullPath); + return SHNotifyMoveFileW(feFrom->szFullPath, feTo->szFullPath, IsAttribDir(feFrom->attributes)); } /* alert the user if an unsupported flag is used */ Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -1807,9 +1807,13 @@ break; case SHCNE_UPDATEITEM: - break; - } - + LV_RenameItem(Pidls[0], Pidls[0]); + break; + + case SHCNE_UPDATEDIR: + Refresh(); + break; + } return TRUE; } @@ -2493,12 +2497,10 @@ { m_pCurDropTarget->Drop(pDataObject, grfKeyState, pt, pdwEffect); m_pCurDropTarget.Release(); - - this->Refresh(); - } - - m_pCurDataObject.Release(); m_iDragOverItem = 0; - + } + + m_pCurDataObject.Release(); + m_iDragOverItem = 0; return S_OK; } Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -523,3 +523,4 @@ #define IDR_DRVDEFEXT 148 #define IDR_MENUBAND 149 #define IDR_MENUDESKBAR 150 +#define IDR_EXEDROPHANDLER 151 Modified: trunk/reactos/include/psdk/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid_undoc… ============================================================================== --- trunk/reactos/include/psdk/shlguid_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid_undoc.h [iso-8859-1] Sat Mar 15 13:59:22 2014 @@ -105,6 +105,8 @@ DEFINE_GUID(CLSID_ShellDrvDefExt, 0x5F5295E0, 0x429F, 0x1069, 0xA2, 0xE2, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); DEFINE_GUID(CLSID_ShellNetDefExt, 0x86422020, 0x42A0, 0x1069, 0xA2, 0xE5, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); +DEFINE_GUID(CLSID_ExeDropHandler, 0x86C86720, 0x42A0, 0x1069, 0xA2, 0xE8, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); + #define CGID_IExplorerToolbar IID_IExplorerToolbar #define SID_IExplorerToolbar IID_IExplorerToolbar #define SID_ITargetFrame2 IID_ITargetFrame2

1 0

[ekohl] 62501: [MSGINA] Update russian translation. Patch by jperm. Thanks a lot! CORE-7974 #resolve
by ekohl＠svn.reactos.org 15 Mar '14

15 Mar '14

Author: ekohl Date: Sat Mar 15 13:46:33 2014 New Revision: 62501 URL: http://svn.reactos.org/svn/reactos?rev=62501&view=rev Log: [MSGINA] Update russian translation. Patch by jperm. Thanks a lot! CORE-7974 #resolve Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Sat Mar 15 13:46:33 2014 @@ -51,7 +51,7 @@ PUSHBUTTON "ÐÐ°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ", IDC_LOCK, 7, 135, 86, 14 PUSHBUTTON "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐµÐ°Ð½ÑÐ°", IDC_LOGOFF, 102, 135, 86, 14 PUSHBUTTON "ÐÑÐºÐ»ÑÑÐµÐ½Ð¸Ðµ", IDC_SHUTDOWN, 198, 135, 70, 14 - PUSHBUTTON "Change Password", IDC_CHANGEPWD, 10, 154, 76, 14 + PUSHBUTTON "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¿Ð°ÑÐ¾Ð»Ñ", IDC_CHANGEPWD, 7, 155, 86, 14 PUSHBUTTON "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð·Ð°Ð´Ð°Ñ", IDC_TASKMGR, 102, 154, 86, 14 PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 198, 154, 70, 14 END @@ -77,9 +77,9 @@ ICON IDI_LOCKICON, -1, 7, 59, 20, 20 LTEXT "ÐÑÐ¾Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð¸ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½.", IDC_STATIC, 36, 61, 232, 8 LTEXT "Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ", IDC_LOCKMSG, 36, 75, 232, 26 - LTEXT "ÐÐ¾&Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:", IDC_STATIC, 36, 107, 40, 8 + LTEXT "ÐÐ¾&Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:", IDC_STATIC, 36, 107, 51, 8 EDITTEXT IDC_USERNAME, 84, 104, 119, 14, ES_AUTOHSCROLL - LTEXT "&ÐÐ°ÑÐ¾Ð»Ñ:", IDC_STATIC, 36, 125, 42, 8 + LTEXT "&ÐÐ°ÑÐ¾Ð»Ñ:", IDC_STATIC, 33, 125, 42, 8 EDITTEXT IDC_PASSWORD, 84, 123, 119, 14, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 80, 154, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 144, 154, 50, 14 @@ -87,33 +87,33 @@ IDD_CHANGE_PASSWORD DIALOGEX 0, 0, 275, 166 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Change Password" +CAPTION "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¿Ð°ÑÐ¾Ð»Ñ" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN CONTROL IDI_ROSLOGO, IDC_ROSLOGO, "Static", SS_BITMAP, 0, 0, 275, 54 - LTEXT "User name:", IDC_STATIC, 7, 61, 78, 8 + LTEXT "ÐÐ¼Ñ:", IDC_STATIC, 7, 61, 78, 8 EDITTEXT IDC_CHANGEPWD_USERNAME, 90, 59, 127, 12, ES_AUTOHSCROLL - LTEXT "Log on to:", IDC_STATIC, 7, 78, 78, 8 + LTEXT "ÐÐ¾Ð¹ÑÐ¸ Ð½Ð°:", IDC_STATIC, 7, 78, 78, 8 COMBOBOX IDC_CHANGEPWD_DOMAIN, 90, 75, 127, 144, CBS_DROPDOWNLIST | CBS_SORT - LTEXT "Old Password:", IDC_STATIC, 7, 95, 78, 8 + LTEXT "Ð¡ÑÐ°ÑÑÐ¹ Ð¿Ð°ÑÐ¾Ð»Ñ:", IDC_STATIC, 7, 95, 78, 8 EDITTEXT IDC_CHANGEPWD_OLDPWD, 90, 92, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD - LTEXT "New Password:", IDC_STATIC, 7, 111, 78, 8 + LTEXT "ÐÐ¾Ð²ÑÐ¹ Ð¿Ð°ÑÐ¾Ð»Ñ:", IDC_STATIC, 7, 111, 78, 8 EDITTEXT IDC_CHANGEPWD_NEWPWD1, 90, 109, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD - LTEXT "Confirm new Password:", IDC_STATIC, 7, 127, 78, 8 + LTEXT "ÐÐ¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ:", IDC_STATIC, 7, 127, 78, 20 EDITTEXT IDC_CHANGEPWD_NEWPWD2, 90, 125, 127, 12, ES_AUTOHSCROLL | ES_PASSWORD PUSHBUTTON "OK", IDOK, 164, 145, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 218, 145, 50, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 218, 145, 50, 14 END IDD_LOGOFF_DLG DIALOGEX 0, 0, 188, 60 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU | WS_POPUP -CAPTION "Log Off ReactOS" +CAPTION "ÐÑÑÐ¾Ð´ Ð¸Ð· ReactOS" FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN ICON IDI_LOCKICON, -1, 7, 7, 20, 20 - LTEXT "Are you sure you want to log off?", IDC_STATIC, 35, 16, 146, 8 - PUSHBUTTON "Yes", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON - PUSHBUTTON "No", IDNO, 95, 39, 50, 14 + LTEXT "ÐÑ ÑÐ²ÐµÑÐµÐ½Ñ, ÑÑÐ¾ ÑÐ¾ÑÐ¸ÑÐµ Ð²ÑÐ¹ÑÐ¸?", IDC_STATIC, 35, 16, 146, 8 + PUSHBUTTON "ÐÐ°", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "ÐÐµÑ", IDNO, 95, 39, 50, 14 END IDD_SHUTDOWN_DLG DIALOGEX 0, 0, 275, 146 @@ -139,31 +139,31 @@ IDS_ASKFORPASSWORD "ÐÐ°ÑÐ¾Ð»Ñ: " IDS_FORCELOGOFF "ÐÑÐ¸ ÑÐµÐ³Ð¸ÑÑÑÐ°ÑÐ¸Ð¸ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð²ÑÐµ Ð½ÐµÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð½ÑÐµ Ð´Ð°Ð½Ð½ÑÐµ Ð±ÑÐ´ÑÑ ÑÑÐµÑÑÐ½Ñ. ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ?" IDS_LOCKMSG "Ð¢Ð¾Ð»ÑÐºÐ¾ %s Ð¸Ð»Ð¸ ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾Ñ Ð¼Ð¾Ð³ÑÑ ÑÐ°Ð·Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÑÐ¾Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ." - IDS_LOGONMSG "You are logged on as %s." + IDS_LOGONMSG "ÐÑ Ð²Ð¾ÑÐ»Ð¸ Ð² ÑÐ¸ÑÑÐµÐ¼Ñ ÐºÐ°Ðº %s." IDS_LOGONDATE "ÐÐ°ÑÐ° Ð²ÑÐ¾Ð´Ð°: %s %s" - IDS_COMPUTERLOCKED "Computer locked" - IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." + IDS_COMPUTERLOCKED "ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½" + IDS_LOCKEDWRONGPASSWORD "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ¾Ð»Ñ. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð²Ð²ÐµÐ´Ð¸ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ ÐµÑÐµ ÑÐ°Ð·. Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ñ Ð² ÐÐ°ÑÐ¾Ð»Ð¸ Ð²Ð²Ð¾Ð´ÑÑÑÑ Ñ ÑÑÐµÑÐ¾Ð¼ ÑÐµÐ³Ð¸ÑÑÑÐ°." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." - IDS_CHANGEPWDTITLE "Change Password" - IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." - IDS_PASSWORDCHANGED "Your password has been changed." + IDS_CHANGEPWDTITLE "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ Ð¿Ð°ÑÐ¾Ð»Ñ" + IDS_NONMATCHINGPASSWORDS "ÐÐ²ÐµÐ´ÐµÐ½Ð½ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ð¸ Ð½ÐµÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑÑ. ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ Ð² Ð¾Ð±Ð° Ð¿Ð¾Ð»Ñ" + IDS_PASSWORDCHANGED "ÐÐ°Ñ Ð¿Ð°ÑÐ¾Ð»Ñ Ð±ÑÐ» Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½." IDS_LOGONTITLE "Logon Message" - IDS_LOGONWRONGUSERORPWD "The system could not log you on. Make sure your User name and domain are correct, then type your password again. Letters in passwords must be typed using the correct case." - IDS_LOGONUSERDISABLED "Your account has been disabled. Please see your system administrator." + IDS_LOGONWRONGUSERORPWD "Ð¡Ð¸ÑÑÐµÐ¼Ðµ Ð½Ðµ ÑÐ´Ð°ÐµÑÑÑ Ð²Ð¾Ð¹ÑÐ¸ Ð². Ð£Ð±ÐµÐ´Ð¸ÑÐµÑÑ Ð² ÑÐ¾Ð¼, Ð²Ð°ÑÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¸ Ð´Ð¾Ð¼ÐµÐ½ Ð²ÐµÑÐ½Ñ, ÑÐ¾ Ð²Ð²ÐµÐ´Ð¸ÑÐµ Ð¿Ð°ÑÐ¾Ð»Ñ ÐµÑÐµ ÑÐ°Ð·. Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ñ Ð² ÐÐ°ÑÐ¾Ð»Ð¸ Ð²Ð²Ð¾Ð´ÑÑÑÑ Ñ ÑÑÐµÑÐ¾Ð¼ ÑÐµÐ³Ð¸ÑÑÑÐ°" + IDS_LOGONUSERDISABLED "ÐÐ°Ñ Ð°ÐºÐºÐ°ÑÐ½Ñ Ð±ÑÐ» Ð¾ÑÐºÐ»ÑÑÐµÐ½. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð¾Ð±ÑÐ°ÑÐ¸ÑÐµÑÑ Ðº ÑÐ¸ÑÑÐµÐ¼Ð½Ð¾Ð¼Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÑ." END /* Shutdown Dialog Strings */ STRINGTABLE BEGIN - IDS_SHUTDOWN_LOGOFF "Log off ""%s""" - IDS_SHUTDOWN_SHUTDOWN "Shut down" - IDS_SHUTDOWN_RESTART "Restart" - IDS_SHUTDOWN_SLEEP "Sleep" - IDS_SHUTDOWN_HIBERNATE "Hibernate" + IDS_SHUTDOWN_LOGOFF "ÐÑÐ¹ÑÐ¸ ""%s""" + IDS_SHUTDOWN_SHUTDOWN "ÐÐ°Ð²ÐµÑÑÐµÐ½Ð¸Ðµ ÑÐ°Ð±Ð¾ÑÑ" + IDS_SHUTDOWN_RESTART "ÐÐµÑÐµÐ·Ð°Ð³ÑÑÐ·ÐºÐ°" + IDS_SHUTDOWN_SLEEP "Ð¡Ð¿ÑÑÐ¸Ð¹ ÑÐµÐ¶Ð¸Ð¼" + IDS_SHUTDOWN_HIBERNATE "ÐÐ¸Ð±ÐµÑÐ½Ð°ÑÐ¸Ñ" /* Shut down descriptions */ - IDS_SHUTDOWN_LOGOFF_DESC "Ends your current session and allows other users to log on to the system." - IDS_SHUTDOWN_SHUTDOWN_DESC "Ends your current session and shuts down the system so you can safely shut down the power." - IDS_SHUTDOWN_RESTART_DESC "Ends your current session and reboots the system." - IDS_SHUTDOWN_SLEEP_DESC "Puts the system in sleep mode." - IDS_SHUTDOWN_HIBERNATE_DESC "Saves the current session and shuts down the computer." + IDS_SHUTDOWN_LOGOFF_DESC "ÐÐ°Ð²ÐµÑÑÐ°ÐµÑ ÑÐµÐºÑÑÐ¸Ð¹ ÑÐµÐ°Ð½Ñ Ð¸ Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐµÑ Ð´ÑÑÐ³Ð¸Ð¼ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÐ¼ Ð²Ð¾Ð¹ÑÐ¸ Ð² ÑÐ¸ÑÑÐµÐ¼Ñ." + IDS_SHUTDOWN_SHUTDOWN_DESC "ÐÐ°Ð²ÐµÑÑÐ°ÐµÑ ÑÐµÐºÑÑÐ¸Ð¹ ÑÐµÐ°Ð½Ñ Ð¸ Ð¾ÑÐºÐ»ÑÑÐ°ÐµÑ ÑÐ¸ÑÑÐµÐ¼Ñ ÑÐ°Ðº ÑÑÐ¾ Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐ¿Ð¾ÐºÐ¾Ð¹Ð½Ð¾ Ð²ÑÐºÐ»ÑÑÐ¸ÑÑ Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ." + IDS_SHUTDOWN_RESTART_DESC "ÐÐ°Ð²ÐµÑÑÐ°ÐµÑ ÑÐµÐºÑÑÐ¸Ð¹ ÑÐµÐ°Ð½Ñ Ð¸ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ¶Ð°ÐµÑ ÑÐ¸ÑÑÐµÐ¼Ñ." + IDS_SHUTDOWN_SLEEP_DESC "ÐÐµÑÐµÐ²Ð¾Ð´Ð¸Ñ ÑÐ¸ÑÑÐµÐ¼Ñ Ð² ÑÐµÐ¶Ð¸Ð¼ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ." + IDS_SHUTDOWN_HIBERNATE_DESC "Ð¡Ð¾ÑÑÐ°Ð½ÑÐµÑ ÑÐµÐºÑÑÐ¸Ð¹ ÑÐµÐ°Ð½Ñ Ð¸ Ð²ÑÐºÐ»ÑÑÐ¸Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ." END

1 0

[hbelusca] 62500: [CONSRV]: Silence some DPRINTs.
by hbelusca＠svn.reactos.org 15 Mar '14

15 Mar '14

Author: hbelusca Date: Sat Mar 15 02:04:54 2014 New Revision: 62500 URL: http://svn.reactos.org/svn/reactos?rev=62500&view=rev Log: [CONSRV]: Silence some DPRINTs. Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Sat Mar 15 02:04:54 2014 @@ -231,7 +231,7 @@ er.EventType = MENU_EVENT; er.Event.MenuEvent.dwCommandId = CmdId; - DPRINT1("Menu item ID: %d\n", CmdId); + DPRINT("Menu item ID: %d\n", CmdId); ConioProcessInputEvent(Console, &er); } @@ -1713,7 +1713,7 @@ { PCONSOLE_SCREEN_BUFFER ActiveBuffer = GuiData->ActiveBuffer; - DPRINT1("WM_PALETTECHANGED called\n"); + DPRINT("WM_PALETTECHANGED called\n"); /* * Protects against infinite loops: @@ -1730,12 +1730,12 @@ */ if ((HWND)wParam == hWnd) break; - DPRINT1("WM_PALETTECHANGED ok\n"); + DPRINT("WM_PALETTECHANGED ok\n"); // if (GetType(ActiveBuffer) == GRAPHICS_BUFFER) if (ActiveBuffer->PaletteHandle) { - DPRINT1("WM_PALETTECHANGED changing palette\n"); + DPRINT("WM_PALETTECHANGED changing palette\n"); /* Specify the use of the system palette for the framebuffer */ SetSystemPaletteUse(GuiData->hMemDC, ActiveBuffer->PaletteUsage); @@ -1744,7 +1744,7 @@ RealizePalette(GuiData->hMemDC); } - DPRINT1("WM_PALETTECHANGED quit\n"); + DPRINT("WM_PALETTECHANGED quit\n"); break; }

1 0

[hbelusca] 62499: [RAPPS]: Update RosBE to 2.1.1
by hbelusca＠svn.reactos.org 15 Mar '14

15 Mar '14

Author: hbelusca Date: Sat Mar 15 00:47:09 2014 New Revision: 62499 URL: http://svn.reactos.org/svn/reactos?rev=62499&view=rev Log: [RAPPS]: Update RosBE to 2.1.1 Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] Sat Mar 15 00:47:09 2014 @@ -2,13 +2,13 @@ [Section] Name = ReactOS Build Environment -Version = 2.1 +Version = 2.1.1 Licence = GPL Description = Allows you to build the ReactOS Source. For more instructions see ReactOS wiki. -Size = 31.6 MB +Size = 28.3 MB Category = 7 URLSite = http://reactos.org/wiki/Build_Environment -URLDownload = http://download.sourceforge.net/project/reactos/RosBE-Windows/i386/2.1/RosB… +URLDownload = http://downloads.sourceforge.net/reactos/RosBE-2.1.1.exe CDPath = none [Section.0405] @@ -21,8 +21,8 @@ Description = Te permite compilar el cÃ³digo de ReactOS. Para mÃ¡s instrucciones consulta la wiki de ReactOS. [Section.040c] -Description = Vous permet de compiler le code source de ReactOS. Pour plus d'instruction, reportez-vous au wiki ReactOS. -Size = 31,6 Mo +Description = Vous permet de compiler le code source de ReactOS. Pour plus d'instructions, reportez-vous au wiki ReactOS. +Size = 28,3 Mo [Section.0410] Description = Permette di compilare i sorgenti di ReactOS. Per maggiori informazioni consultare il Wiki di ReactOS. @@ -35,12 +35,12 @@ [Section.0418] Description = Permite compilarea surselor ReactOS. Pentru instrucÈiuni, consultaÈi wiki ReactOS. -Size = 31,6 Mo +Size = 28,3 Mo [Section.041f] Name = ReactOS Derleme OrtamÄ± Description = ReactOS Kaynak KodlarÄ±'nÄ± derlettirir. Daha Ã§ok aÃ§Ä±klama iÃ§in ReactOS Wiki'ye bakÄ±nÄ±z. -Size = 31,6 MB +Size = 28,3 MB [Section.0422] Description = ÐÐ¾Ð·Ð²Ð¾Ð»ÑÑ Ð·ÑÐ±ÑÐ°ÑÐ¸ ReactOS Ð· Ð²Ð¸ÑÑÐ´Ð½Ð¸Ñ ÐºÐ¾Ð´ÑÐ². ÐÐ° Ð´ÐµÑÐ°Ð»ÑÐ½Ð¾Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑÑ Ð´Ð¸Ð²ÑÑÑÑÑ Ð² ReactOS ÐÑÐºÑ.

1 0

[hbelusca] 62498: [CARDS] Fix GDI leak. Patch by mudhead. CORE-7854 #resolve #comment Fixed in revision 62498, thanks ; )
by hbelusca＠svn.reactos.org 14 Mar '14

14 Mar '14

Author: hbelusca Date: Fri Mar 14 23:12:10 2014 New Revision: 62498 URL: http://svn.reactos.org/svn/reactos?rev=62498&view=rev Log: [CARDS] Fix GDI leak. Patch by mudhead. CORE-7854 #resolve #comment Fixed in revision 62498, thanks ;) Modified: trunk/reactos/dll/win32/cards/cards.c Modified: trunk/reactos/dll/win32/cards/cards.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.c?re… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cards/cards.c [iso-8859-1] Fri Mar 14 23:12:10 2014 @@ -169,13 +169,15 @@ if (type == ectEMPTY || type == ectERASE) { POINT pPoint; - HBRUSH hBrush; + HBRUSH hBrush, hOldBrush; hBrush = CreateSolidBrush(color); GetDCOrgEx(hdc, &pPoint); SetBrushOrgEx(hdc, pPoint.x, pPoint.y, 0); - SelectObject(hdc, hBrush); + hOldBrush = SelectObject(hdc, hBrush); PatBlt(hdc, x, y, dx, dy, PATCOPY); + SelectObject(hdc, hOldBrush); + DeleteObject(hBrush); } if (type != ectERASE) {

1 0

[hbelusca] 62497: [CARDS]: "Localize" some variables.
by hbelusca＠svn.reactos.org 14 Mar '14

14 Mar '14

Author: hbelusca Date: Fri Mar 14 22:50:03 2014 New Revision: 62497 URL: http://svn.reactos.org/svn/reactos?rev=62497&view=rev Log: [CARDS]: "Localize" some variables. Modified: trunk/reactos/dll/win32/cards/cards.c Modified: trunk/reactos/dll/win32/cards/cards.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.c?re… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cards/cards.c [iso-8859-1] Fri Mar 14 22:50:03 2014 @@ -123,8 +123,7 @@ */ BOOL WINAPI cdtDrawExt(HDC hdc, INT x, INT y, INT dx, INT dy, INT card, INT type, COLORREF color) { - HDC hdcCard; - DWORD dwRasterOp = SRCCOPY, OldBkColor; + DWORD dwRasterOp = SRCCOPY; BOOL bSaveEdges = TRUE; BOOL bStretch = FALSE; @@ -180,22 +179,25 @@ } if (type != ectERASE) { + HDC hdcCard; + COLORREF OldBkColor; + hdcCard = CreateCompatibleDC(hdc); SelectObject(hdcCard, g_CardBitmaps[card]); OldBkColor = SetBkColor(hdc, (type == ectFACES) ? 0xFFFFFF : color); if (bSaveEdges) { COLORREF SavedPixels[12]; - SavedPixels[0] = GetPixel(hdc, x, y); - SavedPixels[1] = GetPixel(hdc, x + 1, y); - SavedPixels[2] = GetPixel(hdc, x, y + 1); - SavedPixels[3] = GetPixel(hdc, x + dx - 1, y); - SavedPixels[4] = GetPixel(hdc, x + dx - 2, y); - SavedPixels[5] = GetPixel(hdc, x + dx - 1, y + 1); - SavedPixels[6] = GetPixel(hdc, x, y + dy - 1); - SavedPixels[7] = GetPixel(hdc, x + 1, y + dy - 1); - SavedPixels[8] = GetPixel(hdc, x, y + dy - 2); - SavedPixels[9] = GetPixel(hdc, x + dx - 1, y + dy - 1); + SavedPixels[0] = GetPixel(hdc, x, y); + SavedPixels[1] = GetPixel(hdc, x + 1, y); + SavedPixels[2] = GetPixel(hdc, x, y + 1); + SavedPixels[3] = GetPixel(hdc, x + dx - 1, y); + SavedPixels[4] = GetPixel(hdc, x + dx - 2, y); + SavedPixels[5] = GetPixel(hdc, x + dx - 1, y + 1); + SavedPixels[6] = GetPixel(hdc, x, y + dy - 1); + SavedPixels[7] = GetPixel(hdc, x + 1, y + dy - 1); + SavedPixels[8] = GetPixel(hdc, x, y + dy - 2); + SavedPixels[9] = GetPixel(hdc, x + dx - 1, y + dy - 1); SavedPixels[10] = GetPixel(hdc, x + dx - 2, y + dy - 1); SavedPixels[11] = GetPixel(hdc, x + dx - 1, y + dy - 2); @@ -244,6 +246,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { UNREFERENCED_PARAMETER(lpvReserved); + if (fdwReason == DLL_PROCESS_ATTACH) g_hModule = hinstDLL;

1 0

[hbelusca] 62496: [CARDS]: Code formatting only (tabs --> spaces).
by hbelusca＠svn.reactos.org 14 Mar '14

14 Mar '14

Author: hbelusca Date: Fri Mar 14 20:59:02 2014 New Revision: 62496 URL: http://svn.reactos.org/svn/reactos?rev=62496&view=rev Log: [CARDS]: Code formatting only (tabs --> spaces). Modified: trunk/reactos/dll/win32/cards/cards.c trunk/reactos/dll/win32/cards/cards.h Modified: trunk/reactos/dll/win32/cards/cards.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.c?re… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cards/cards.c [iso-8859-1] Fri Mar 14 20:59:02 2014 @@ -1,7 +1,7 @@ /* - * ReactOS Cards - * - * Copyright (C) 2003 Filip Navara <xnavara(a)volny.org> + * ReactOS Cards + * + * Copyright (C) 2003 Filip Navara <xnavara(a)volny.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,8 +33,8 @@ */ BOOL WINAPI WEP(DWORD Unknown) { - UNREFERENCED_PARAMETER(Unknown); - return TRUE; + UNREFERENCED_PARAMETER(Unknown); + return TRUE; } /* @@ -45,15 +45,15 @@ DWORD dwIndex; /* Report card width and height to user */ - *Width = CARD_WIDTH; - *Height = CARD_HEIGHT; - - /* Load images */ - for (dwIndex = 0; dwIndex < MAX_CARD_BITMAPS; ++dwIndex) - g_CardBitmaps[dwIndex] = - (HBITMAP)LoadBitmapA(g_hModule, MAKEINTRESOURCEA(dwIndex + 1)); - - return TRUE; + *Width = CARD_WIDTH; + *Height = CARD_HEIGHT; + + /* Load images */ + for (dwIndex = 0; dwIndex < MAX_CARD_BITMAPS; ++dwIndex) + g_CardBitmaps[dwIndex] = + (HBITMAP)LoadBitmapA(g_hModule, MAKEINTRESOURCEA(dwIndex + 1)); + + return TRUE; } /* @@ -64,8 +64,8 @@ DWORD dwIndex; /* Unload images */ - for (dwIndex = 0; dwIndex < MAX_CARD_BITMAPS; dwIndex++) - DeleteObject(g_CardBitmaps[dwIndex]); + for (dwIndex = 0; dwIndex < MAX_CARD_BITMAPS; dwIndex++) + DeleteObject(g_CardBitmaps[dwIndex]); } /* @@ -73,7 +73,7 @@ */ BOOL WINAPI cdtDraw(HDC hdc, INT x, INT y, INT card, INT type, COLORREF color) { - return cdtDrawExt(hdc, x, y, CARD_WIDTH, CARD_HEIGHT, card, type, color); + return cdtDrawExt(hdc, x, y, CARD_WIDTH, CARD_HEIGHT, card, type, color); } /* @@ -81,30 +81,31 @@ */ static __inline VOID BltCard(HDC hdc, INT x, INT y, INT dx, INT dy, HDC hdcCard, DWORD dwRasterOp, BOOL bStretch) { - if (bStretch) - { - StretchBlt(hdc, x, y, dx, dy, hdcCard, 0, 0, CARD_WIDTH, CARD_HEIGHT, dwRasterOp); - } else - { - BitBlt(hdc, x, y, dx, dy, hdcCard, 0, 0, dwRasterOp); + if (bStretch) + { + StretchBlt(hdc, x, y, dx, dy, hdcCard, 0, 0, CARD_WIDTH, CARD_HEIGHT, dwRasterOp); + } + else + { + BitBlt(hdc, x, y, dx, dy, hdcCard, 0, 0, dwRasterOp); /* * This is need when using Microsoft images, because they use two-color red/white images for * red cards and thus needs fix-up of the edge to black color. */ #if 0 - if (ISREDCARD(card)) - { - PatBlt(hdc, x, y + 2, 1, dy - 4, BLACKNESS); - PatBlt(hdc, x + dx - 1, y + 2, 1, dy - 4, BLACKNESS); - PatBlt(hdc, x + 2, y, dx - 4, 1, BLACKNESS); - PatBlt(hdc, x + 2, y + dy - 1, dx - 4, 1, BLACKNESS); - SetPixel(hdc, x + 1, y + 1, 0); - SetPixel(hdc, x + dx - 2, y + 1, 0); - SetPixel(hdc, x + 1, y + dy - 2, 0); - SetPixel(hdc, x + dx - 2, y + dy - 2, 0); - } + if (ISREDCARD(card)) + { + PatBlt(hdc, x, y + 2, 1, dy - 4, BLACKNESS); + PatBlt(hdc, x + dx - 1, y + 2, 1, dy - 4, BLACKNESS); + PatBlt(hdc, x + 2, y, dx - 4, 1, BLACKNESS); + PatBlt(hdc, x + 2, y + dy - 1, dx - 4, 1, BLACKNESS); + SetPixel(hdc, x + 1, y + 1, 0); + SetPixel(hdc, x + dx - 2, y + 1, 0); + SetPixel(hdc, x + 1, y + dy - 2, 0); + SetPixel(hdc, x + dx - 2, y + dy - 2, 0); + } #endif - } + } } /* @@ -122,106 +123,106 @@ */ BOOL WINAPI cdtDrawExt(HDC hdc, INT x, INT y, INT dx, INT dy, INT card, INT type, COLORREF color) { - HDC hdcCard; - DWORD dwRasterOp = SRCCOPY, OldBkColor; - BOOL bSaveEdges = TRUE; - BOOL bStretch = FALSE; - - if (type & ectSAVEEDGESMASK) - { - type &= ~ectSAVEEDGESMASK; - bSaveEdges = FALSE; - } - - if (dx != CARD_WIDTH || dy != CARD_HEIGHT) - { - bStretch = TRUE; - bSaveEdges = FALSE; - } - - switch (type) - { - case ectINVERTED: - dwRasterOp = NOTSRCCOPY; - case ectFACES: - card = (card % 4) * 13 + (card / 4); - break; - case ectBACKS: - --card; - break; - case ectEMPTYNOBG: - dwRasterOp = SRCAND; - case ectEMPTY: - card = 52; - break; - case ectERASE: - break; - case ectREDX: - card = 66; - break; - case ectGREENO: - card = 67; - break; - default: - return FALSE; - } - - if (type == ectEMPTY || type == ectERASE) - { - POINT pPoint; - HBRUSH hBrush; - - hBrush = CreateSolidBrush(color); - GetDCOrgEx(hdc, &pPoint); - SetBrushOrgEx(hdc, pPoint.x, pPoint.y, 0); - SelectObject(hdc, hBrush); - PatBlt(hdc, x, y, dx, dy, PATCOPY); - } - if (type != ectERASE) - { - hdcCard = CreateCompatibleDC(hdc); - SelectObject(hdcCard, g_CardBitmaps[card]); - OldBkColor = SetBkColor(hdc, (type == ectFACES) ? 0xFFFFFF : color); - if (bSaveEdges) - { - COLORREF SavedPixels[12]; - SavedPixels[0] = GetPixel(hdc, x, y); - SavedPixels[1] = GetPixel(hdc, x + 1, y); - SavedPixels[2] = GetPixel(hdc, x, y + 1); - SavedPixels[3] = GetPixel(hdc, x + dx - 1, y); - SavedPixels[4] = GetPixel(hdc, x + dx - 2, y); - SavedPixels[5] = GetPixel(hdc, x + dx - 1, y + 1); - SavedPixels[6] = GetPixel(hdc, x, y + dy - 1); - SavedPixels[7] = GetPixel(hdc, x + 1, y + dy - 1); - SavedPixels[8] = GetPixel(hdc, x, y + dy - 2); - SavedPixels[9] = GetPixel(hdc, x + dx - 1, y + dy - 1); - SavedPixels[10] = GetPixel(hdc, x + dx - 2, y + dy - 1); - SavedPixels[11] = GetPixel(hdc, x + dx - 1, y + dy - 2); - - BltCard(hdc, x, y, dx, dy, hdcCard, dwRasterOp, bStretch); - - SetPixel(hdc, x, y, SavedPixels[0]); - SetPixel(hdc, x + 1, y, SavedPixels[1]); - SetPixel(hdc, x, y + 1, SavedPixels[2]); - SetPixel(hdc, x + dx - 1, y, SavedPixels[3]); - SetPixel(hdc, x + dx - 2, y, SavedPixels[4]); - SetPixel(hdc, x + dx - 1, y + 1, SavedPixels[5]); - SetPixel(hdc, x, y + dy - 1, SavedPixels[6]); - SetPixel(hdc, x + 1, y + dy - 1, SavedPixels[7]); - SetPixel(hdc, x, y + dy - 2, SavedPixels[8]); - SetPixel(hdc, x + dx - 1, y + dy - 1, SavedPixels[9]); - SetPixel(hdc, x + dx - 2, y + dy - 1, SavedPixels[10]); - SetPixel(hdc, x + dx - 1, y + dy - 2, SavedPixels[11]); - } - else - { - BltCard(hdc, x, y, dx, dy, hdcCard, dwRasterOp, bStretch); - } - SetBkColor(hdc, OldBkColor); - DeleteDC(hdcCard); - } - - return TRUE; + HDC hdcCard; + DWORD dwRasterOp = SRCCOPY, OldBkColor; + BOOL bSaveEdges = TRUE; + BOOL bStretch = FALSE; + + if (type & ectSAVEEDGESMASK) + { + type &= ~ectSAVEEDGESMASK; + bSaveEdges = FALSE; + } + + if (dx != CARD_WIDTH || dy != CARD_HEIGHT) + { + bStretch = TRUE; + bSaveEdges = FALSE; + } + + switch (type) + { + case ectINVERTED: + dwRasterOp = NOTSRCCOPY; + case ectFACES: + card = (card % 4) * 13 + (card / 4); + break; + case ectBACKS: + --card; + break; + case ectEMPTYNOBG: + dwRasterOp = SRCAND; + case ectEMPTY: + card = 52; + break; + case ectERASE: + break; + case ectREDX: + card = 66; + break; + case ectGREENO: + card = 67; + break; + default: + return FALSE; + } + + if (type == ectEMPTY || type == ectERASE) + { + POINT pPoint; + HBRUSH hBrush; + + hBrush = CreateSolidBrush(color); + GetDCOrgEx(hdc, &pPoint); + SetBrushOrgEx(hdc, pPoint.x, pPoint.y, 0); + SelectObject(hdc, hBrush); + PatBlt(hdc, x, y, dx, dy, PATCOPY); + } + if (type != ectERASE) + { + hdcCard = CreateCompatibleDC(hdc); + SelectObject(hdcCard, g_CardBitmaps[card]); + OldBkColor = SetBkColor(hdc, (type == ectFACES) ? 0xFFFFFF : color); + if (bSaveEdges) + { + COLORREF SavedPixels[12]; + SavedPixels[0] = GetPixel(hdc, x, y); + SavedPixels[1] = GetPixel(hdc, x + 1, y); + SavedPixels[2] = GetPixel(hdc, x, y + 1); + SavedPixels[3] = GetPixel(hdc, x + dx - 1, y); + SavedPixels[4] = GetPixel(hdc, x + dx - 2, y); + SavedPixels[5] = GetPixel(hdc, x + dx - 1, y + 1); + SavedPixels[6] = GetPixel(hdc, x, y + dy - 1); + SavedPixels[7] = GetPixel(hdc, x + 1, y + dy - 1); + SavedPixels[8] = GetPixel(hdc, x, y + dy - 2); + SavedPixels[9] = GetPixel(hdc, x + dx - 1, y + dy - 1); + SavedPixels[10] = GetPixel(hdc, x + dx - 2, y + dy - 1); + SavedPixels[11] = GetPixel(hdc, x + dx - 1, y + dy - 2); + + BltCard(hdc, x, y, dx, dy, hdcCard, dwRasterOp, bStretch); + + SetPixel(hdc, x, y, SavedPixels[0]); + SetPixel(hdc, x + 1, y, SavedPixels[1]); + SetPixel(hdc, x, y + 1, SavedPixels[2]); + SetPixel(hdc, x + dx - 1, y, SavedPixels[3]); + SetPixel(hdc, x + dx - 2, y, SavedPixels[4]); + SetPixel(hdc, x + dx - 1, y + 1, SavedPixels[5]); + SetPixel(hdc, x, y + dy - 1, SavedPixels[6]); + SetPixel(hdc, x + 1, y + dy - 1, SavedPixels[7]); + SetPixel(hdc, x, y + dy - 2, SavedPixels[8]); + SetPixel(hdc, x + dx - 1, y + dy - 1, SavedPixels[9]); + SetPixel(hdc, x + dx - 2, y + dy - 1, SavedPixels[10]); + SetPixel(hdc, x + dx - 1, y + dy - 2, SavedPixels[11]); + } + else + { + BltCard(hdc, x, y, dx, dy, hdcCard, dwRasterOp, bStretch); + } + SetBkColor(hdc, OldBkColor); + DeleteDC(hdcCard); + } + + return TRUE; } @@ -232,19 +233,19 @@ */ BOOL WINAPI cdtAnimate(HDC hdc, int cardback, int x, int y, int frame) { - UNREFERENCED_PARAMETER(frame); - UNREFERENCED_PARAMETER(y); - UNREFERENCED_PARAMETER(x); - UNREFERENCED_PARAMETER(cardback); - UNREFERENCED_PARAMETER(hdc); - return TRUE; + UNREFERENCED_PARAMETER(frame); + UNREFERENCED_PARAMETER(y); + UNREFERENCED_PARAMETER(x); + UNREFERENCED_PARAMETER(cardback); + UNREFERENCED_PARAMETER(hdc); + return TRUE; } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved); - if (fdwReason == DLL_PROCESS_ATTACH) - g_hModule = hinstDLL; - - return TRUE; -} + UNREFERENCED_PARAMETER(lpvReserved); + if (fdwReason == DLL_PROCESS_ATTACH) + g_hModule = hinstDLL; + + return TRUE; +} Modified: trunk/reactos/dll/win32/cards/cards.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.h?re… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cards/cards.h [iso-8859-1] Fri Mar 14 20:59:02 2014 @@ -1,7 +1,7 @@ /* - * ReactOS Cards + * ReactOS Cards * - * Copyright (C) 2003 Filip Navara <xnavara(a)volny.org> + * Copyright (C) 2003 Filip Navara <xnavara(a)volny.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,29 +28,29 @@ * FreeCard + * Joker */ -#define MAX_CARD_BITMAPS 68 +#define MAX_CARD_BITMAPS 68 -#define ectFACES 0 -#define ectBACKS 1 -#define ectINVERTED 2 -#define ectEMPTY 3 -#define ectERASE 4 -#define ectEMPTYNOBG 5 -#define ectREDX 6 -#define ectGREENO 7 -#define ectSAVEEDGESMASK 0x80000000 +#define ectFACES 0 +#define ectBACKS 1 +#define ectINVERTED 2 +#define ectEMPTY 3 +#define ectERASE 4 +#define ectEMPTYNOBG 5 +#define ectREDX 6 +#define ectGREENO 7 +#define ectSAVEEDGESMASK 0x80000000 #if defined(CARDSTYLE_DEFAULT) -# define CARD_WIDTH 72 // The original Microsoft cards are 71px wide, but ours are taken from MacSolitaireX -# define CARD_HEIGHT 96 +# define CARD_WIDTH 72 // The original Microsoft cards are 71px wide, but ours are taken from MacSolitaireX +# define CARD_HEIGHT 96 #elif defined(CARDSTYLE_BAVARIAN) -# define CARD_WIDTH 110 -# define CARD_HEIGHT 198 +# define CARD_WIDTH 110 +# define CARD_HEIGHT 198 #else -# error No or unsupported cardstyle defined +# error No or unsupported cardstyle defined #endif -#define ISREDCARD(x) (x >= 13 && x <= 39) +#define ISREDCARD(x) (x >= 13 && x <= 39) BOOL WINAPI cdtInit(int *width, int *height); BOOL WINAPI cdtDraw(HDC hdc, int x, int y, int card, int type, DWORD color);

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2014