Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[gedmurphy] 29891: fix use of globals introduced in r29883
by gedmurphy＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: gedmurphy Date: Fri Oct 26 03:23:53 2007 New Revision: 29891 URL: http://svn.reactos.org/svn/reactos?rev=29891&view=rev Log: fix use of globals introduced in r29883 Modified: trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Fri Oct 26 03:23:53 2007 @@ -15,10 +15,11 @@ { PDISPLAY_DEVICE_ENTRY DisplayDeviceList; PDISPLAY_DEVICE_ENTRY CurrentDisplayDevice; + HBITMAP hBitmap; + int cxSource; + int cySource; } GLOBAL_DATA, *PGLOBAL_DATA; -static HBITMAP hBitmap = NULL; -static int cxSource, cySource; static VOID UpdateDisplay(IN HWND hwndDlg, PGLOBAL_DATA pGlobalData, IN BOOL bUpdateThumb) @@ -281,6 +282,7 @@ static VOID OnInitDialog(IN HWND hwndDlg) { + BITMAP bitmap; DWORD Result = 0; DWORD iDevNum = 0; DISPLAY_DEVICE displayDevice; @@ -359,6 +361,16 @@ HeapFree(GetProcessHeap(), 0, pMonitors); } } + + /* init the color spectrum*/ + pGlobalData->hBitmap = LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_SPECTRUM), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + if (pGlobalData->hBitmap != NULL) + { + GetObjectW(pGlobalData->hBitmap, sizeof(BITMAP), &bitmap); + + pGlobalData->cxSource = bitmap.bmWidth; + pGlobalData->cySource = bitmap.bmHeight; + } } static VOID @@ -561,22 +573,12 @@ pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); - BITMAP bitmap; - + switch(uMsg) { case WM_INITDIALOG: { OnInitDialog(hwndDlg); - - hBitmap = LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_SPECTRUM), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - if (hBitmap != NULL) - { - GetObjectW(hBitmap, sizeof(BITMAP), &bitmap); - - cxSource = bitmap.bmWidth; - cySource = bitmap.bmHeight; - } break; } case WM_DRAWITEM: @@ -589,11 +591,11 @@ hdcMem = CreateCompatibleDC(lpDrawItem->hDC); if (hdcMem != NULL) { - SelectObject(hdcMem, hBitmap); + SelectObject(hdcMem, pGlobalData->hBitmap); StretchBlt(lpDrawItem->hDC, lpDrawItem->rcItem.left, lpDrawItem->rcItem.top, lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, - hdcMem, 0, 0, cxSource, cySource, SRCCOPY); + hdcMem, 0, 0, pGlobalData->cxSource, pGlobalData->cySource, SRCCOPY); DeleteDC(hdcMem); } } @@ -798,7 +800,8 @@ HeapFree(GetProcessHeap(), 0, pGlobalData); - DeleteObject(hBitmap); + if (pGlobalData->hBitmap) + DeleteObject(pGlobalData->hBitmap); } } return FALSE;

1 0

[tkreuzer] 29890: UserScrollDC: - rename rcScroll to rcClip - simplify calculation of source point - fix calculation of invalidated region
by tkreuzer＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: tkreuzer Date: Fri Oct 26 03:10:50 2007 New Revision: 29890 URL: http://svn.reactos.org/svn/reactos?rev=29890&view=rev Log: UserScrollDC: - rename rcScroll to rcClip - simplify calculation of source point - fix calculation of invalidated region Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Fri Oct 26 03:10:50 2007 @@ -1131,40 +1131,31 @@ const RECT *prcClip, HRGN hrgnUpdate, LPRECT prcUpdate) { PDC pDC; - RECT rcScroll, rcSrc, rcDst; - SIZE szSrcOrg; + RECT rcClip, rcSrc, rcDst; INT Result; - IntGdiGetClipBox(hDC, &rcScroll); + IntGdiGetClipBox(hDC, &rcClip); if (prcClip) { - IntGdiIntersectRect(&rcScroll, &rcScroll, prcClip); + IntGdiIntersectRect(&rcClip, &rcClip, prcClip); } if (prcScroll) { - IntGdiIntersectRect(&rcSrc, &rcScroll, prcScroll); + IntGdiIntersectRect(&rcSrc, &rcClip, prcScroll); } else { - rcSrc = rcScroll; + rcSrc = rcClip; } rcDst = rcSrc; IntGdiOffsetRect(&rcDst, dx, dy); - if (rcDst.left < rcScroll.left) - szSrcOrg.cx = rcScroll.left - rcDst.left; - else - szSrcOrg.cx = 0; - if (rcDst.top < rcScroll.top) - szSrcOrg.cy = rcScroll.top - rcDst.top; - else - szSrcOrg.cy = 0; - IntGdiIntersectRect(&rcDst, &rcDst, &rcScroll); + IntGdiIntersectRect(&rcDst, &rcDst, &rcClip); if (!NtGdiBitBlt(hDC, rcDst.left, rcDst.top, rcDst.right - rcDst.left, rcDst.bottom - rcDst.top, - hDC, rcSrc.left + szSrcOrg.cx, rcSrc.top + szSrcOrg.cy, SRCCOPY, 0, 0)) + hDC, rcDst.left - dx, rcDst.top - dy, SRCCOPY, 0, 0)) { return ERROR; } @@ -1173,7 +1164,7 @@ could not be copied, because it was not visible */ if (hrgnUpdate || prcUpdate) { - HRGN hrgnOwn, hrgnVisible, hrgnDst; + HRGN hrgnOwn, hrgnVisible, hrgnTmp; pDC = DC_LockDc(hDC); if (!pDC) @@ -1183,24 +1174,34 @@ hrgnVisible = pDC->w.hVisRgn; // pDC->w.hGCClipRgn? DC_UnlockDc(pDC); + /* Begin with the source rect */ if (hrgnUpdate) { hrgnOwn = hrgnUpdate; - if (!NtGdiSetRectRgn(hrgnOwn, rcScroll.left, rcScroll.top, rcScroll.right, rcScroll.bottom)) + if (!NtGdiSetRectRgn(hrgnOwn, rcSrc.left, rcSrc.top, rcSrc.right, rcSrc.bottom)) { return ERROR; } } else { - hrgnOwn = UnsafeIntCreateRectRgnIndirect(&rcScroll); - } - - hrgnDst = UnsafeIntCreateRectRgnIndirect(&rcSrc); - NtGdiCombineRgn(hrgnDst, hrgnDst, hrgnVisible, RGN_AND); - NtGdiOffsetRgn(hrgnDst, dx, dy); - Result = NtGdiCombineRgn(hrgnOwn, hrgnOwn, hrgnDst, RGN_DIFF); - NtGdiDeleteObject(hrgnDst); + hrgnOwn = UnsafeIntCreateRectRgnIndirect(&rcSrc); + } + + /* Substract the dest rect */ + hrgnTmp = UnsafeIntCreateRectRgnIndirect(&rcDst); + NtGdiCombineRgn(hrgnOwn, hrgnOwn, hrgnTmp, RGN_DIFF); + + /* Add the part of the dest that wasn't visible in source */ + NtGdiSetRectRgn(hrgnTmp, rcSrc.left, rcSrc.top, rcSrc.right, rcSrc.bottom); + Result = NtGdiCombineRgn(hrgnTmp, hrgnTmp, hrgnVisible, RGN_DIFF); + if (Result != NULLREGION && Result != ERROR) + { + NtGdiOffsetRgn(hrgnTmp, dx, dy); + NtGdiCombineRgn(hrgnOwn, hrgnOwn, hrgnTmp, RGN_OR); + } + + NtGdiDeleteObject(hrgnTmp); if (prcUpdate) {

1 0

[tkreuzer] 29889: remove ToUnicode() stub from win32k
by tkreuzer＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: tkreuzer Date: Fri Oct 26 03:06:50 2007 New Revision: 29889 URL: http://svn.reactos.org/svn/reactos?rev=29889&view=rev Log: remove ToUnicode() stub from win32k Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Fri Oct 26 03:06:50 2007 @@ -437,22 +437,6 @@ return ToUnicodeResult; } -int STDCALL ToUnicode( UINT wVirtKey, - UINT wScanCode, - PBYTE lpKeyState, - LPWSTR pwszBuff, - int cchBuff, - UINT wFlags ) -{ - return ToUnicodeEx( wVirtKey, - wScanCode, - gQueueKeyStateTable, - pwszBuff, - cchBuff, - wFlags, - 0 ); -} - BOOL FASTCALL IntTranslateKbdMessage(LPMSG lpMsg,

1 0

[tkreuzer] 29888: fix error check
by tkreuzer＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: tkreuzer Date: Fri Oct 26 03:03:04 2007 New Revision: 29888 URL: http://svn.reactos.org/svn/reactos?rev=29888&view=rev Log: fix error check Modified: trunk/reactos/base/system/autochk/autochk.c Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c (original) +++ trunk/reactos/base/system/autochk/autochk.c Fri Oct 26 03:03:04 2007 @@ -285,7 +285,7 @@ /* Load the provider which will do the chkdsk */ Provider = LoadProvider(FileSystem); - if (!NT_SUCCESS(Status)) + if (Provider == NULL) { DPRINT1("LoadProvider() failed\n"); PrintString(" Unable to verify a %S volume\n", FileSystem);

1 0

[dreimer] 29887: Fix Build. Someone forgot to remove some +, when he copy pasted from a diff.
by dreimer＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: dreimer Date: Fri Oct 26 01:47:33 2007 New Revision: 29887 URL: http://svn.reactos.org/svn/reactos?rev=29887&view=rev Log: Fix Build. Someone forgot to remove some +, when he copy pasted from a diff. Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KO.rc Fri Oct 26 01:47:33 2007 @@ -112,18 +112,18 @@ PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP END -+SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 -+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -+CAPTION "ÞÃÁö" -+FONT 8, "MS Shell Dlg" -+{ -+DEFPUSHBUTTON "¿¹(&Y)", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP -+PUSHBUTTON "ðµÎ ¿¹(&A)", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP -+PUSHBUTTON " ÆÏ¿À(&N)", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP -+PUSHBUTTON "ÃëÒ(&C)", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP -+ICON "", IDD_ICON, 10, 10, 16, 16 -+LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 -+} +SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ÞÃÁö" +FONT 8, "MS Shell Dlg" +{ +DEFPUSHBUTTON "¿¹(&Y)", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP +PUSHBUTTON "ðµÎ ¿¹(&A)", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP +PUSHBUTTON " ÆÏ¿À(&N)", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP +PUSHBUTTON "ÃëÒ(&C)", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP +ICON "", IDD_ICON, 10, 10, 16, 16 +LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 +} SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

1 0

[dreimer] 29886: Update the RosBE Configurator Page to the new Configurator App.
by dreimer＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: dreimer Date: Fri Oct 26 01:32:56 2007 New Revision: 29886 URL: http://svn.reactos.org/svn/reactos?rev=29886&view=rev Log: Update the RosBE Configurator Page to the new Configurator App. Modified: trunk/tools/RosBE-Windows/Documentation/files/options.html trunk/tools/RosBE-Windows/Documentation/files/options.jpg Modified: trunk/tools/RosBE-Windows/Documentation/files/options.html URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== --- trunk/tools/RosBE-Windows/Documentation/files/options.html (original) +++ trunk/tools/RosBE-Windows/Documentation/files/options.html Fri Oct 26 01:32:56 2007 @@ -3,24 +3,46 @@ <head> </head> <body> -RosBE has a small configuration application, which lets you control -many aspects of RosBE's look and feel. Additionally you can change -settings which affect the build process. - -<div style="text-align: center;"><img - style="width: 389px; height: 425px;" alt="RosBE Configurator" - src="options.jpg"> -<div style="text-align: left;"> +The RosBE Configurator is the Main app to change more advanced Settings +for Look and Feel and in the Build Process. As you can see, it is possible to edit the font and background color with RosBE Configurator. Additionally you can check the look in the Preview below. -Additionally you can Enable/Disable many Things with it. So you can -switch on/off showing the time the build process needed. A new feature -is the usage of ccache which can speed up the build process for ~5-10% -for a cost of ~1,5 GB of Cache size. You can switch off/on the logging -and stripping the Output Files, too. Stripping might help if you want + +<div style="text-align: center;"><img + style="width: 389px; height: 471px;" alt="Configurator" + src="options.jpg"> +<div style="text-align: left;"> + +1. +You can +switch on/off showing the time the build process needed. +2. +A new feature +in Version 1.0 is the usage of CCache which can speed up the build +process for ~5-10% +for a cost of ~1,5 GB of Cache size (BEWARE: First Build Process is +waay slower due to Cache building process. The first sped up build +process will be the second one). +3. +Stripped Output might help if you want to use ReactOS on a PC with less than 48 MB RAM, because stripped apps -use less RAM. +use less RAM and are smaller. +4. +Here you can set another GCC Compiler as the Active one in RosBE. +5. +You can switch off/on the logging and/or change te Path where the logs +will be saved to. +6. +and 7. +are mainly made for Speed up the Build Process. By Changing the Output +to a RAMDisk you can Speed up the building for about 10-15%. But it +will cost VERY MUCH RAM. The fastest way would be to save the Source +(~300MB), the LOGs (some KB), the Object Files (!!!~2.3 GB!!!) and the +Output (~200 MB) to RAM Additionally you need some MB as Temp File +Buffer, too. So a maximum speedup would cost ~2.8 GB RAM. If you have +so much RAM, be happy and install a RAMDisk on it for building. +Otherwise you might need to keep OBJ on HDD. </div> </div> </body> Modified: trunk/tools/RosBE-Windows/Documentation/files/options.jpg URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Documentation/… ============================================================================== Binary files - no diff available.

1 0

[dreimer] 29885: Add a Shortcut Listing Feature to scut.cmd. Modify many "if" to "if /I" to ignore lower and upper case.
by dreimer＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: dreimer Date: Fri Oct 26 00:13:00 2007 New Revision: 29885 URL: http://svn.reactos.org/svn/reactos?rev=29885&view=rev Log: Add a Shortcut Listing Feature to scut.cmd. Modify many "if" to "if /I" to ignore lower and upper case. Modified: trunk/tools/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Clean.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Clean.cmd Fri Oct 26 00:13:00 2007 @@ -105,7 +105,7 @@ ) goto :EOC ) -if "%1" == "logs" ( +if /i "%1" == "logs" ( :: : Check if we have any logs to clean, if so, clean them. :: Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Fri Oct 26 00:13:00 2007 @@ -13,7 +13,7 @@ :: :: Receive the first Parameter and decide what to do. :: -if "%1" == "delete" ( +if /i "%1" == "delete" ( echo config.rbuild will be permanently deleted. All your settings will be gone. echo Continue? set /p XY="(yes), (no)" @@ -36,7 +36,7 @@ ) goto :NOK ) -if "%1" == "update" ( +if /i "%1" == "update" ( echo old config.rbuild will be deleted and will be updated with a recent, echo default one. You will need to reconfigure it to your wishes later. echo Continue? Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Fri Oct 26 00:13:00 2007 @@ -46,7 +46,7 @@ ) if exist "%_ROSBE_BASEDIR%\scut.cmd" ( - echo scut [OPTIONS] - Define, Edit, Remove, Switch and Default to + echo scut [OPTIONS] - List, Define, Edit, Remove, Switch and Default to echo Shortcutted Source-Directories. ) @@ -69,13 +69,13 @@ :: Now check if we are displaying help on individual commands, if so, :: display the help for that command. :: -if "%1" == "make" ( +if /i "%1" == "make" ( echo Usage: make [OPTIONS] echo Without options it does a standard build of ReactOS. OPTIONS are the echo standard ReactOS build options ie. "bootcd", "livecd", etc. goto :EOC ) -if "%1" == "makex" ( +if /i "%1" == "makex" ( echo Usage: makex [OPTIONS] echo Same as 'make' but automatically determines the number of CPU Cores in echo the system and uses "make -j x" with the appropriate number. @@ -84,13 +84,13 @@ echo contained within the file. goto :EOC ) -if "%1" == "basedir" ( +if /i "%1" == "basedir" ( echo Usage: basedir echo Switches back to the ReactOS source directory. goto :EOC ) if exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( - if "%1" == "chdefdir" ( + if /i "%1" == "chdefdir" ( echo Usage: chdefdir [OPTIONS] echo Change the ReactOS source directory for the current RosBE session. echo. @@ -98,7 +98,7 @@ goto :EOC ) ) -if "%1" == "clean" ( +if /i "%1" == "clean" ( echo Usage: clean [logs] echo Fully clean the ReactOS source directory. echo. @@ -106,7 +106,7 @@ goto :EOC ) if exist "%_ROSBE_BASEDIR%\Config.cmd" ( - if "%1" == "config" ( + if /i "%1" == "config" ( echo Usage: config [OPTIONS] echo Creates a Configuration File, which tells RosBE how to build the Tree. echo. @@ -117,13 +117,13 @@ goto :EOC ) ) -if "%1" == "help" ( +if /i "%1" == "help" ( echo Usage: help [COMMAND] echo Shows help for the specified command or lists all available commands. goto :EOC ) if exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( - if "%1" == "raddr2line" ( + if /i "%1" == "raddr2line" ( echo Usage: raddr2line [FILE] [ADDRESS] echo Translates program addresses into file names and line numbers to echo assist developers with finding specific bugs in ReactOS. If @@ -140,12 +140,14 @@ ) ) if exist "%_ROSBE_BASEDIR%\scut.cmd" ( - if "%1" == "scut" ( + if /i "%1" == "scut" ( echo Usage: scut [OPTIONS] echo Defines, Edits, Removes, Switches and Defaults to Shortcutted Source echo Directories. scut started without a parameter or with the name of a echo Shortcut as parameter sets this Shortcut active. echo. + echo list - Lists all Shortcuts. + echo Optional: "path" as second parameter lists the Paths, too. echo add - Adds a Shortcut. echo Optional: "Shortcut" "Directory" as second and third parameter echo rem - Removes a shortcut. @@ -159,7 +161,7 @@ ) ) if exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( - if "%1" == "ssvn" ( + if /i "%1" == "ssvn" ( echo Usage: ssvn [OPTIONS] echo Creates, Updates or cleans up your ReactOS Source Tree or shows the echo Revision Number of the Offline Tree and Online HEAD Revision. @@ -174,7 +176,7 @@ ) ) if exist "%_ROSBE_BASEDIR%\options.cmd" ( - if "%1" == "options" ( + if /i "%1" == "options" ( echo Usage: options echo Starts RosBE Configurator and restarts RosBE afterwards to make the echo changes effective at the end. Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Fri Oct 26 00:13:00 2007 @@ -41,7 +41,7 @@ :: :: Make sure RosBE was initialized right. :: -if "%1" == "oldmode" ( +if /i "%1" == "oldmode" ( cls set _ROSBE_OLDMODE="" call :RosBE4 Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.… ============================================================================== --- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Fri Oct 26 00:13:00 2007 @@ -20,7 +20,7 @@ ) else ( set _1=%1 ) -if "%_1%" == "previous" ( +if /i "%_1%" == "previous" ( set _ROSBE_ROSSOURCEDIR=%_ROSBE_PREVIOUSSOURCEDIR% ) else ( if not exist "%_1%\." ( Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Fri Oct 26 00:13:00 2007 @@ -18,7 +18,7 @@ :: :: These two are directly parsed to svn. :: -if "%1" == "update" ( +if /i "%1" == "update" ( title Updating... if not "%2" == "" ( svn update -r %2 @@ -27,7 +27,7 @@ ) goto :ExitSVN ) -if "%1" == "cleanup" ( +if /i "%1" == "cleanup" ( title Cleaning... svn cleanup goto :ExitSVN @@ -36,7 +36,7 @@ :: Check if the Folder is empty. If not, output an error. :: -if "%1" == "create" ( +if /i "%1" == "create" ( title Creating... if exist ".svn\." ( echo ERROR: Folder already cotains a Reposority. Exiting @@ -54,7 +54,7 @@ :: Output the rev of your and the Online Tree and tell the User if :: its Up to Date or not. :: -if "%1" == "status" ( +if /i "%1" == "status" ( title Status for /f "usebackq tokens=2" %%i in (`"svn info | find "Revision:""`) do set OFFSVN=%%i for /f "usebackq tokens=2" %%j in (`"svn info svn://svn.reactos.org/reactos/trunk/reactos | find "Revision:""`) do set ONSVN=%%j Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Fri Oct 26 00:13:00 2007 @@ -27,6 +27,17 @@ ) if /i "%1"=="def" ( goto :DEF2 +) +if /i "%1"=="list" ( + if /i "%2"=="" ( + echo Shortcuts: + for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do echo %%i + ) + if /i "%2"=="path" ( + echo Shortcuts, Paths: + for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do echo %%i, %%j + ) + goto :END ) if /i "%1"=="run" ( for /f "usebackq tokens=1-2 delims=," %%i in (`type "%_ROSBE_BASEDIR%\srclist.txt"`) do (

1 0

[dreimer] 29884: Hopefully the last time fun with missing "".
by dreimer＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: dreimer Date: Thu Oct 25 23:47:32 2007 New Revision: 29884 URL: http://svn.reactos.org/svn/reactos?rev=29884&view=rev Log: Hopefully the last time fun with missing "". Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2l… ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Thu Oct 25 23:47:32 2007 @@ -41,7 +41,7 @@ :: adress and can be given directly to raddr2line. If not, add it and :: give the result to raddr2line. :: -if %_1% == "" ( +if "%_1%" == "" ( echo ERROR: You must specify a path/file to examine. goto :EOC ) @@ -70,6 +70,10 @@ ) if "%_2%" == "" ( set /p _2="Please enter the address you would like to analyze: " + if "%_2%" == "" ( + echo ERROR: You must specify a address to analyze. + goto :EOC + ) ) goto :EOF

1 0

[janderwald] 29883: - Draw color quality indicator in Display Properties -> Settings - patch by Vytis Girdzijauskas, "CMan", cman[at]cman[dot]us See issue #2762 for more details.
by janderwald＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: janderwald Date: Thu Oct 25 23:40:27 2007 New Revision: 29883 URL: http://svn.reactos.org/svn/reactos?rev=29883&view=rev Log: - Draw color quality indicator in Display Properties -> Settings - patch by Vytis Girdzijauskas, "CMan", cman[at]cman[dot]us See issue #2762 for more details. Added: trunk/reactos/dll/cpl/desk/resources/spectrum.bmp (with props) Modified: trunk/reactos/dll/cpl/desk/desk.rc trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/resource.h trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/desk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rc (original) +++ trunk/reactos/dll/cpl/desk/desk.rc Thu Oct 25 23:40:27 2007 @@ -15,5 +15,6 @@ IDC_DESK_ICON ICON "resources/applet.ico" IDC_DESK_ICON2 ICON "resources/applet.ico" IDC_MONITOR BITMAP "resources/monitor.bmp" +IDB_SPECTRUM BITMAP "resources/spectrum.bmp" #include "rsrc.rc" Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc Thu Oct 25 23:40:27 2007 @@ -116,8 +116,7 @@ GROUPBOX "&Öâåòîâå",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 PUSHBUTTON "Ðàç&øèðåíè...",IDC_SETTINGS_ADVANCED,306,165,56,14 END Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc Thu Oct 25 23:40:27 2007 @@ -113,8 +113,7 @@ GROUPBOX "&Poèet barev",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 PUSHBUTTON "R&ozíøené nastavení...",IDC_SETTINGS_ADVANCED,170,165,70,14 END Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc Thu Oct 25 23:40:27 2007 @@ -112,8 +112,7 @@ GROUPBOX "&Farbqualität",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 PUSHBUTTON "&Erweitert",IDC_SETTINGS_ADVANCED,170,165,70,14 END Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/el-GR.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/el-GR.rc Thu Oct 25 23:40:27 2007 @@ -112,8 +112,7 @@ GROUPBOX "&×ñþìáôá",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 PUSHBUTTON "Ãéá &ðñï÷ùñçìÝíïõò...",IDC_SETTINGS_ADVANCED,170,165,70,14 END Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc Thu Oct 25 23:40:27 2007 @@ -114,8 +114,7 @@ GROUPBOX "&Colors",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,170,165,70,14 END Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/es-ES.rc Thu Oct 25 23:40:27 2007 @@ -119,8 +119,7 @@ GROUPBOX "&Calidad de color",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 PUSHBUTTON "A&vanzado...",IDC_SETTINGS_ADVANCED,170,165,70,14 END Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc Thu Oct 25 23:40:27 2007 @@ -115,8 +115,7 @@ GROUPBOX "&Couleurs",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 PUSHBUTTON "A&vancé...",IDC_SETTINGS_ADVANCED,170,165,70,14 END Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/hu-HU.rc Thu Oct 25 23:40:27 2007 @@ -113,8 +113,7 @@ GROUPBOX "&Színek",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 PUSHBUTTON "&Haladóknak...",IDC_SETTINGS_ADVANCED,170,165,70,14 END Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/id-ID.rc Thu Oct 25 23:40:27 2007 @@ -112,8 +112,7 @@ GROUPBOX "&Warna",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 PUSHBUTTON "&Lanjutan...",IDC_SETTINGS_ADVANCED,170,165,70,14 END Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc Thu Oct 25 23:40:27 2007 @@ -112,8 +112,7 @@ GROUPBOX "&Colori",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 PUSHBUTTON "A&vanzate...",IDC_SETTINGS_ADVANCED,170,165,70,14 END Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc Thu Oct 25 23:40:27 2007 @@ -112,8 +112,7 @@ GROUPBOX "F(&C)",1817,125,160,115,43 COMBOBOX IDC_SETTINGS_BPP,131,170,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,188,103,9 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 PUSHBUTTON "Ú×Ýè(&V)...",IDC_SETTINGS_ADVANCED,170,205,70,14 END Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc Thu Oct 25 23:40:27 2007 @@ -114,8 +114,7 @@ GROUPBOX "&Kleuren",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 PUSHBUTTON "&Geavanceerd...",IDC_SETTINGS_ADVANCED,170,165,70,14 END Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc Thu Oct 25 23:40:27 2007 @@ -118,8 +118,7 @@ GROUPBOX "&Jakoæ kolorów",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 PUSHBUTTON "Zaawa&nsowane...",IDC_SETTINGS_ADVANCED,170,165,70,14 END Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc Thu Oct 25 23:40:27 2007 @@ -112,8 +112,7 @@ GROUPBOX "&Êà÷åñòâî öâåòîïåðåäà÷è",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 PUSHBUTTON "Äî&ïîëíèòåëüíî",IDC_SETTINGS_ADVANCED,170,165,70,14 END Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc Thu Oct 25 23:40:27 2007 @@ -121,8 +121,7 @@ GROUPBOX "&Farby",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 PUSHBUTTON "&Spresni...",IDC_SETTINGS_ADVANCED,170,165,70,14 END Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sv-SE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/sv-SE.rc Thu Oct 25 23:40:27 2007 @@ -115,8 +115,7 @@ GROUPBOX "&Färger",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,138,103,9 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 PUSHBUTTON "&Avancerat...",IDC_SETTINGS_ADVANCED,170,165,70,14 END Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc Thu Oct 25 23:40:27 2007 @@ -120,8 +120,7 @@ GROUPBOX "&ßê³ñòü êîëüîðîïåðåäà÷³",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, - 131,148,103,9 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 PUSHBUTTON "Äîä&àòêîâî...",IDC_SETTINGS_ADVANCED,170,165,70,14 END Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h (original) +++ trunk/reactos/dll/cpl/desk/resource.h Thu Oct 25 23:40:27 2007 @@ -65,6 +65,8 @@ #define IDC_SETTINGS_RESOLUTION_TEXT 204 #define IDC_SETTINGS_ADVANCED 205 #define IDC_SETTINGS_MONSEL 206 +#define IDC_SETTINGS_SPECTRUM 207 +#define IDB_SPECTRUM 208 #define IDR_PREVIEW_MENU 2100 #define ID_MENU_NORMAL 2101 @@ -159,3 +161,4 @@ #endif /* __CPL_DESK_RESOURCE_H__ */ + Added: trunk/reactos/dll/cpl/desk/resources/spectrum.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resources/spe… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/desk/resources/spectrum.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Thu Oct 25 23:40:27 2007 @@ -16,6 +16,9 @@ PDISPLAY_DEVICE_ENTRY DisplayDeviceList; PDISPLAY_DEVICE_ENTRY CurrentDisplayDevice; } GLOBAL_DATA, *PGLOBAL_DATA; + +static HBITMAP hBitmap = NULL; +static int cxSource, cySource; static VOID UpdateDisplay(IN HWND hwndDlg, PGLOBAL_DATA pGlobalData, IN BOOL bUpdateThumb) @@ -558,11 +561,43 @@ pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + BITMAP bitmap; + switch(uMsg) { case WM_INITDIALOG: + { OnInitDialog(hwndDlg); + + hBitmap = LoadImageW(hApplet, MAKEINTRESOURCEW(IDB_SPECTRUM), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + if (hBitmap != NULL) + { + GetObjectW(hBitmap, sizeof(BITMAP), &bitmap); + + cxSource = bitmap.bmWidth; + cySource = bitmap.bmHeight; + } break; + } + case WM_DRAWITEM: + { + LPDRAWITEMSTRUCT lpDrawItem; + lpDrawItem = (LPDRAWITEMSTRUCT) lParam; + if(lpDrawItem->CtlID == IDC_SETTINGS_SPECTRUM) + { + HDC hdcMem; + hdcMem = CreateCompatibleDC(lpDrawItem->hDC); + if (hdcMem != NULL) + { + SelectObject(hdcMem, hBitmap); + StretchBlt(lpDrawItem->hDC, lpDrawItem->rcItem.left, lpDrawItem->rcItem.top, + lpDrawItem->rcItem.right - lpDrawItem->rcItem.left, + lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top, + hdcMem, 0, 0, cxSource, cySource, SRCCOPY); + DeleteDC(hdcMem); + } + } + } case WM_COMMAND: { DWORD controlId = LOWORD(wParam); @@ -762,6 +797,8 @@ } HeapFree(GetProcessHeap(), 0, pGlobalData); + + DeleteObject(hBitmap); } } return FALSE;

1 0

[janderwald] 29882: Hwang YunSong() <hys545@dreamwiz.com> - Updated Korean resource. Timo Kreuzer - check if theres a current IDrapDropTarget interface and only then perform actions on it See issue #1211 for more details.
by janderwald＠svn.reactos.org 25 Oct '07

25 Oct '07

Author: janderwald Date: Thu Oct 25 23:25:40 2007 New Revision: 29882 URL: http://svn.reactos.org/svn/reactos?rev=29882&view=rev Log: Hwang YunSong() <hys545(a)dreamwiz.com> - Updated Korean resource. Timo Kreuzer - check if theres a current IDrapDropTarget interface and only then perform actions on it See issue #1211 for more details. Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc trunk/reactos/dll/win32/shell32/shlview.c Modified: trunk/reactos/dll/win32/shell32/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KO.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KO.rc Thu Oct 25 23:25:40 2007 @@ -112,18 +112,18 @@ PUSHBUTTON "Cancel", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP END -SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 -STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Message" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Yes", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "Yes to &all", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Cancel", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP - ICON "", IDD_ICON, 10, 10, 16, 16 - LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 -END ++SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 ++STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU ++CAPTION "ÞÃÁö" ++FONT 8, "MS Shell Dlg" ++{ ++DEFPUSHBUTTON "¿¹(&Y)", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP ++PUSHBUTTON "ðµÎ ¿¹(&A)", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP ++PUSHBUTTON " ÆÏ¿À(&N)", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP ++PUSHBUTTON "ÃëÒ(&C)", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP ++ICON "", IDD_ICON, 10, 10, 16, 16 ++LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 ++} SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c (original) +++ trunk/reactos/dll/win32/shell32/shlview.c Thu Oct 25 23:25:40 2007 @@ -2340,12 +2340,14 @@ static HRESULT WINAPI ISVDropTarget_DragLeave(IDropTarget *iface) { IShellViewImpl *This = impl_from_IDropTarget(iface); - IDropTarget_DragLeave(This->pCurDropTarget); - - IDropTarget_Release(This->pCurDropTarget); + if (This->pCurDropTarget) + { + IDropTarget_DragLeave(This->pCurDropTarget); + IDropTarget_Release(This->pCurDropTarget); + This->pCurDropTarget = NULL; + } IDataObject_Release(This->pCurDataObject); This->pCurDataObject = NULL; - This->pCurDropTarget = NULL; This->iDragOverItem = 0; return S_OK; @@ -2356,12 +2358,15 @@ { IShellViewImpl *This = impl_from_IDropTarget(iface); - IDropTarget_Drop(This->pCurDropTarget, pDataObject, grfKeyState, pt, pdwEffect); - - IDropTarget_Release(This->pCurDropTarget); + if (This->pCurDropTarget) + { + IDropTarget_Drop(This->pCurDropTarget, pDataObject, grfKeyState, pt, pdwEffect); + IDropTarget_Release(This->pCurDropTarget); + This->pCurDropTarget = NULL; + } + IDataObject_Release(This->pCurDataObject); This->pCurDataObject = NULL; - This->pCurDropTarget = NULL; This->iDragOverItem = 0; return S_OK;

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
71
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 October 2007