Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[jimtabor] 22333: Wine patch by Thomas Kho: Fix behavior when selecting disabled menu items.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jun 13 03:23:50 2006 New Revision: 22333 URL: http://svn.reactos.ru/svn/reactos?rev=22333&view=rev Log: Wine patch by Thomas Kho: Fix behavior when selecting disabled menu items. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/windows/me… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Tue Jun 13 03:23:50 2006 @@ -2252,7 +2252,7 @@ * * Execute a menu item (for instance when user pressed Enter). * Return the wID of the executed item. Otherwise, -1 indicating - * that no menu item was executed; + * that no menu item was executed, -2 if a popup is shown; * Have to receive the flags for the TrackPopupMenu options to avoid * sending unwanted message. * @@ -2306,6 +2306,7 @@ else { Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, MenuInfo, TRUE, Flags); + return -2; } return -1; @@ -2406,8 +2407,9 @@ { if (0 == (ItemInfo.fType & MF_POPUP)) { + INT ExecutedMenuId = MenuExecFocusedItem(Mt, &MenuInfo, Flags); MenuCleanupRosMenuItemInfo(&ItemInfo); - return MenuExecFocusedItem(Mt, &MenuInfo, Flags); + return (ExecutedMenuId < 0) ? -1 : ExecutedMenuId; } MenuCleanupRosMenuItemInfo(&ItemInfo); @@ -3355,6 +3357,7 @@ break; /* WM_SYSKEYDOWN */ case WM_CHAR: + case WM_SYSCHAR: { UINT Pos; @@ -3365,7 +3368,7 @@ if (L'\r' == Msg.wParam || L' ' == Msg.wParam) { ExecutedMenuId = MenuExecFocusedItem(&Mt, &MenuInfo, Flags); - fEndMenu = (ExecutedMenuId != -1); + fEndMenu = (ExecutedMenuId != -2); break; } @@ -3390,7 +3393,7 @@ { MenuSelectItem(Mt.OwnerWnd, &MenuInfo, Pos, TRUE, 0); ExecutedMenuId = MenuExecFocusedItem(&Mt, &MenuInfo, Flags); - fEndMenu = (-1 != ExecutedMenuId); + fEndMenu = (-2 != ExecutedMenuId); } } break; @@ -3453,7 +3456,9 @@ } /* The return value is only used by TrackPopupMenu */ - return (-1 != ExecutedMenuId) ? ExecutedMenuId : 0; + if (!(Flags & TPM_RETURNCMD)) return TRUE; + if (ExecutedMenuId < 0) ExecutedMenuId = 0; + return ExecutedMenuId; } /***********************************************************************

18 years, 5 months

[hpoussin] 22332: Add a script to download some Wine dlls and create the associated .rbuild file That is a first version and things won't probably won't work as expected.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Jun 13 02:42:57 2006 New Revision: 22332 URL: http://svn.reactos.ru/svn/reactos?rev=22332&view=rev Log: Add a script to download some Wine dlls and create the associated .rbuild file That is a first version and things won't probably won't work as expected. Added: trunk/tools/wineimport.cmd (with props) Added: trunk/tools/wineimport.cmd URL: http://svn.reactos.ru/svn/reactos/trunk/tools/wineimport.cmd?rev=22332&view… ============================================================================== --- trunk/tools/wineimport.cmd (added) +++ trunk/tools/wineimport.cmd Tue Jun 13 02:42:57 2006 @@ -1,0 +1,105 @@ +@ECHO OFF + +REM Copyright (C) 2006 Hervé Poussineau (hpoussin(a)reactos.org) + +SET WINE_TMPFILE1=tmpfile1.wine +SET WINE_TMPFILE2=tmpfile2.wine +IF "%WINE_RESULTFILE%" == "" SET WINE_RESULTFILE=con + +IF "%1" == "" GOTO help +IF "%1" == "download" GOTO download +IF "%1" == "process" GOTO process +IF "%1" == "internal_analyseline" GOTO internal_analyseline + +:help +ECHO Syntax: +ECHO %0 download {wine_lib} [{wine_lib} ...] +ECHO %0 process {wine_lib} [{wine_lib} ...] +GOTO :eof + +:download +IF "%2" == "" GOTO help +SET CVSROOT=:pserver:cvs@cvs.winehq.org:/home/wine +ECHO *** Password is "cvs" *** +cvs.exe login +:startdownload +ECHO Downloading %2 ... +>NUL 2>NUL cvs.exe -z 3 checkout wine/dlls/%2 +SHIFT +IF NOT "%2" == "" GOTO startdownload +>NUL 2>NUL cvs.exe logout +GOTO :eof + +:process +SET WINE_BATCH=%0 +IF "%2" == "" GOTO help +:startprocess +IF NOT EXIST wine\dlls\%2\makefile.in ( + ECHO WARNING: Did you forget "%WINE_BATCH% download %2"? + GOTO :processnext +) +>NUL COPY /Y wine\dlls\%2\makefile.in %WINE_TMPFILE1% + +>%WINE_RESULTFILE% ECHO ^<module name="%2" type="win32dll" baseaddress="${BASEADDRESS_%2}" installbase="system32" installname="%2.dll" allowwarnings="true"^> +>>%WINE_RESULTFILE% ECHO ^<importlibrary definition="%2.spec.def" /^> +>>%WINE_RESULTFILE% ECHO ^<include base="%2"^>.^</include^> +>>%WINE_RESULTFILE% ECHO ^<include base="ReactOS"^>include/reactos/wine^</include^> +>>%WINE_RESULTFILE% ECHO ^<define name="__REACTOS__" /^> +>>%WINE_RESULTFILE% ECHO ^<define name="__USE_W32API" /^> +>>%WINE_RESULTFILE% ECHO ^<define name="_WIN32_IE"^>0x600^</define^> +>>%WINE_RESULTFILE% ECHO ^<define name="_WIN32_WINNT"^>0x501^</define^> +>>%WINE_RESULTFILE% ECHO ^<define name="WINVER"^>0x501^</define^> +>>%WINE_RESULTFILE% ECHO ^<library^>wine^</library^> +SET WINE_FULL_LINE= +SET WINE_END_PREC_LINE= +SET WINE_VARTYPE=0 +FOR /F "eol=# delims=" %%l IN (%WINE_TMPFILE1%) DO ( + CALL %WINE_BATCH% internal_analyseline %%l +) +>>%WINE_RESULTFILE% ECHO ^<file^>%2.spec^</file^> +>>%WINE_RESULTFILE% ECHO ^</module^> + +:processnext +SHIFT +IF NOT "%2" == "" GOTO startprocess +DEL %WINE_TMPFILE1% %WINE_TMPFILE2% +GOTO :eof + +:internal_analyseline +SET WINE_LINE=%* +SET WINE_LINE=%WINE_LINE:~21% +SET WINE_LINE=%WINE_LINE:-luuid=% +SET WINE_START_LINE1=%WINE_LINE:~0,1% +SET WINE_START_LINE2=%WINE_LINE:~0,2% +SET WINE_END_LINE=%WINE_LINE:~-1% +IF NOT "%WINE_END_PREC_LINE%" == "\" ( + IF NOT "%WINE_VARTYPE%" == "0" ( + FOR /F "tokens=2* delims= " %%h IN ("%WINE_FULL_LINE%") DO ( + FOR %%j IN (%%i) DO ( + IF "%WINE_VARTYPE%" == "1" ( + >>%WINE_RESULTFILE% ECHO ^<file^>%%j^</file^> + ) ELSE ( + >>%WINE_RESULTFILE% ECHO ^<library^>%%j^</library^> + ) + ) + ) + ) + SET WINE_FULL_LINE= + IF "%2" == "C_SRCS" ( + SET WINE_VARTYPE=1 + ) ELSE IF "%2" == "RC_SRCS" ( + SET WINE_VARTYPE=1 + ) ELSE IF "%2" == "IMPORTS" ( + SET WINE_VARTYPE=2 + ) ELSE ( + SET WINE_VARTYPE=0 + ) +) +IF "%WINE_END_LINE%" == "\" ( + >%WINE_TMPFILE2% ECHO %WINE_FULL_LINE%%WINE_LINE:~0,-1% + <%WINE_TMPFILE2% SET /P WINE_FULL_LINE= +) ELSE ( + >%WINE_TMPFILE2% ECHO %WINE_FULL_LINE%%WINE_LINE% + <%WINE_TMPFILE2% SET /P WINE_FULL_LINE= +) +SET WINE_END_PREC_LINE=%WINE_END_LINE% Propchange: trunk/tools/wineimport.cmd ------------------------------------------------------------------------------ svn:eol-style = native

18 years, 5 months

[gedmurphy] 22331: missed this little blighter ....

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jun 13 02:40:56 2006 New Revision: 22331 URL: http://svn.reactos.ru/svn/reactos?rev=22331&view=rev Log: missed this little blighter .... Added: trunk/reactos/dll/win32/comctl32/comctl_Eo.rc Added: trunk/reactos/dll/win32/comctl32/comctl_Eo.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_E… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl_Eo.rc (added) +++ trunk/reactos/dll/win32/comctl32/comctl_Eo.rc Tue Jun 13 02:40:56 2006 @@ -1,0 +1,87 @@ +/* Esperanto Language Support + * Copyright 2006 Antonio Codazzi + * + * 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 + */ + +LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Ecoj laý " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Bone", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Rezigni", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Apliku", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Helpo", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Langeto", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Estrita Proceduro" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Retro", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Antaýen >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Konkludi", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Rezigni", IDCANCEL,178,138,50,14 + PUSHBUTTON "Helpo", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Langeto", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Agordu stangon de la iloj" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Fermu", IDCANCEL,308,6,44,14 + PUSHBUTTON "R&ee agordu", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Helpo", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "&Supre forþovu", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Su&be forþovu", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "&Disponeblaj butonoj:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Aldonu ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Forigu", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "Butonoj por stango de la &iloj", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Fermu" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Hodiaý:" + IDM_GOTODAY "Iru a la hodiaý" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Dividilo" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Neniu" +}

18 years, 5 months

[gedmurphy] 22330: add missing file

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jun 13 02:40:05 2006 New Revision: 22330 URL: http://svn.reactos.ru/svn/reactos?rev=22330&view=rev Log: add missing file Added: vendor/wine/dlls/comctl32/current/comctl_Eo.rc Added: vendor/wine/dlls/comctl32/current/comctl_Eo.rc URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/comctl32/current/comctl_… ============================================================================== --- vendor/wine/dlls/comctl32/current/comctl_Eo.rc (added) +++ vendor/wine/dlls/comctl32/current/comctl_Eo.rc Tue Jun 13 02:40:05 2006 @@ -1,0 +1,87 @@ +/* Esperanto Language Support + * Copyright 2006 Antonio Codazzi + * + * 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 + */ + +LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT + +IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 +STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Ecoj laý " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Bone", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Rezigni", IDCANCEL,58,122,50,14 + PUSHBUTTON "&Apliku", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED + PUSHBUTTON "Helpo", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP + CONTROL "Langeto", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 +END + + +IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Estrita Proceduro" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "< &Retro", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Antaýen >", IDC_NEXT_BUTTON,121,138,50,14 + DEFPUSHBUTTON "Konkludi", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "Rezigni", IDCANCEL,178,138,50,14 + PUSHBUTTON "Helpo", IDHELP,235,138,50,14,WS_GROUP + LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN + CONTROL "Langeto", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5 + LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE +END + + +IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Agordu stangon de la iloj" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Fermu", IDCANCEL,308,6,44,14 + PUSHBUTTON "R&ee agordu", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Helpo", IDC_HELP_BTN,308,40,44,14 + PUSHBUTTON "&Supre forþovu", IDC_MOVEUP_BTN,308,74,44,14 + PUSHBUTTON "Su&be forþovu", IDC_MOVEDN_BTN,308,91,44,14 + LTEXT "&Disponeblaj butonoj:", -1,4,5,84,10 + LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP + PUSHBUTTON "&Aldonu ->", IDOK, 131, 42, 44, 14 + PUSHBUTTON "<- &Forigu", IDC_REMOVE_BTN,131,62,44,14 + LTEXT "Butonoj por stango de la &iloj", -1,182,5,78,10 + LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +END + +STRINGTABLE DISCARDABLE +{ + IDS_CLOSE "Fermu" +} + +STRINGTABLE DISCARDABLE +{ + IDM_TODAY "Hodiaý:" + IDM_GOTODAY "Iru a la hodiaý" +} + +STRINGTABLE DISCARDABLE +{ + IDS_SEPARATOR "Dividilo" +} + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Neniu" +}

18 years, 5 months

[gedmurphy] 22328: enable all tests

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jun 13 00:26:30 2006 New Revision: 22328 URL: http://svn.reactos.ru/svn/reactos?rev=22328&view=rev Log: enable all tests Modified: trunk/reactos/regtests/winetests/comctl32/testlist.c Modified: trunk/reactos/regtests/winetests/comctl32/testlist.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/comctl32… ============================================================================== --- trunk/reactos/regtests/winetests/comctl32/testlist.c (original) +++ trunk/reactos/regtests/winetests/comctl32/testlist.c Tue Jun 13 00:26:30 2006 @@ -23,19 +23,19 @@ const struct test winetest_testlist[] = { -// { "comboex", func_comboex }, + { "comboex", func_comboex }, { "dpa", func_dpa }, -// { "header", func_header }, -// { "imagelist", func_imagelist }, -// { "monthcal", func_monthcal }, + { "header", func_header }, + { "imagelist", func_imagelist }, + { "monthcal", func_monthcal }, { "mru", func_mru }, -// { "progress", func_progress }, -// { "propsheet", func_propsheet }, + { "progress", func_progress }, + { "propsheet", func_propsheet }, { "subclass", func_subclass }, { "tab", func_tab }, -// { "toolbar", func_toolbar }, -// { "tooltips", func_tooltips }, -// { "treeview", func_treeview }, -// { "updown", func_updown }, + { "toolbar", func_toolbar }, + { "tooltips", func_tooltips }, + { "treeview", func_treeview }, + { "updown", func_updown }, { 0, 0 } };

18 years, 5 months

[janderwald] 22327: fix build prob #take one

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jun 12 22:09:47 2006 New Revision: 22327 URL: http://svn.reactos.ru/svn/reactos?rev=22327&view=rev Log: fix build prob #take one Modified: trunk/reactos/boot/freeldr/fdebug/De.rc trunk/reactos/boot/freeldr/fdebug/En.rc trunk/reactos/boot/freeldr/fdebug/Hu.rc trunk/reactos/boot/freeldr/fdebug/Ja.rc trunk/reactos/boot/freeldr/fdebug/No.rc trunk/reactos/boot/freeldr/fdebug/Pl.rc trunk/reactos/boot/freeldr/fdebug/Tr.rc Modified: trunk/reactos/boot/freeldr/fdebug/De.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/De.rc?r… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/De.rc (original) +++ trunk/reactos/boot/freeldr/fdebug/De.rc Mon Jun 12 22:09:47 2006 @@ -14,7 +14,7 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_FDEBUG ICON DISCARDABLE "fdebug.ico" +IDI_FDEBUG ICON "fdebug.ico" ///////////////////////////////////////////////////////////////////////////// // Modified: trunk/reactos/boot/freeldr/fdebug/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/En.rc?r… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/En.rc (original) +++ trunk/reactos/boot/freeldr/fdebug/En.rc Mon Jun 12 22:09:47 2006 @@ -14,7 +14,7 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_FDEBUG ICON DISCARDABLE "fdebug.ico" +IDI_FDEBUG ICON "fdebug.ico" ///////////////////////////////////////////////////////////////////////////// // Modified: trunk/reactos/boot/freeldr/fdebug/Hu.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/Hu.rc?r… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/Hu.rc (original) +++ trunk/reactos/boot/freeldr/fdebug/Hu.rc Mon Jun 12 22:09:47 2006 @@ -14,7 +14,7 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_FDEBUG ICON DISCARDABLE "fdebug.ico" +IDI_FDEBUG ICON "fdebug.ico" ///////////////////////////////////////////////////////////////////////////// // Modified: trunk/reactos/boot/freeldr/fdebug/Ja.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/Ja.rc?r… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/Ja.rc (original) +++ trunk/reactos/boot/freeldr/fdebug/Ja.rc Mon Jun 12 22:09:47 2006 @@ -14,7 +14,7 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_FDEBUG ICON DISCARDABLE "fdebug.ico" +IDI_FDEBUG ICON "fdebug.ico" ///////////////////////////////////////////////////////////////////////////// // Modified: trunk/reactos/boot/freeldr/fdebug/No.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/No.rc?r… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/No.rc (original) +++ trunk/reactos/boot/freeldr/fdebug/No.rc Mon Jun 12 22:09:47 2006 @@ -14,7 +14,7 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_FDEBUG ICON DISCARDABLE "fdebug.ico" +IDI_FDEBUG ICON "fdebug.ico" ///////////////////////////////////////////////////////////////////////////// // Modified: trunk/reactos/boot/freeldr/fdebug/Pl.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/Pl.rc?r… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/Pl.rc (original) +++ trunk/reactos/boot/freeldr/fdebug/Pl.rc Mon Jun 12 22:09:47 2006 @@ -14,7 +14,7 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_FDEBUG ICON DISCARDABLE "fdebug.ico" +IDI_FDEBUG ICON "fdebug.ico" ///////////////////////////////////////////////////////////////////////////// // Modified: trunk/reactos/boot/freeldr/fdebug/Tr.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/Tr.rc?r… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/Tr.rc (original) +++ trunk/reactos/boot/freeldr/fdebug/Tr.rc Mon Jun 12 22:09:47 2006 @@ -14,7 +14,7 @@ // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_FDEBUG ICON DISCARDABLE "fdebug.ico" +IDI_FDEBUG ICON "fdebug.ico" ///////////////////////////////////////////////////////////////////////////// //

18 years, 5 months

[gedmurphy] 22326: fix build

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Jun 12 21:58:59 2006 New Revision: 22326 URL: http://svn.reactos.ru/svn/reactos?rev=22326&view=rev Log: fix build Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug.… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.c (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.c Mon Jun 12 21:58:59 2006 @@ -106,7 +106,7 @@ wcex.hIcon = LoadIcon(hInstance, (LPCTSTR)IDI_FDEBUG); wcex.hCursor = LoadCursor(NULL, IDC_ARROW); wcex.hbrBackground = NULL;//(HBRUSH)(COLOR_WINDOW+1); - wcex.lpszMenuName = (LPCSTR)IDC_FDEBUG; + wcex.lpszMenuName = (LPCTSTR)IDC_FDEBUG; wcex.lpszClassName = szWindowClass; wcex.hIconSm = LoadIcon(wcex.hInstance, (LPCTSTR)IDI_SMALL); @@ -160,8 +160,8 @@ { case WM_CREATE: - hEditWnd = CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("EDIT"), "", WS_CHILD|WS_VISIBLE|WS_VSCROLL|ES_AUTOHSCROLL|ES_LEFT|ES_MULTILINE, 0, 0, 0, 0, hWnd, NULL, hInst, NULL); - hDisplayWnd = CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("EDIT"), "", WS_CHILD|WS_VISIBLE|WS_HSCROLL|WS_VSCROLL|ES_MULTILINE, 0, 0, 0, 0, hWnd, NULL, hInst, NULL); + hEditWnd = CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("EDIT"), TEXT(""), WS_CHILD|WS_VISIBLE|WS_VSCROLL|ES_AUTOHSCROLL|ES_LEFT|ES_MULTILINE, 0, 0, 0, 0, hWnd, NULL, hInst, NULL); + hDisplayWnd = CreateWindowEx(WS_EX_CLIENTEDGE, TEXT("EDIT"), TEXT(""), WS_CHILD|WS_VISIBLE|WS_HSCROLL|WS_VSCROLL|ES_MULTILINE, 0, 0, 0, 0, hWnd, NULL, hInst, NULL); memset(&ncm, 0, sizeof(NONCLIENTMETRICS)); ncm.cbSize = sizeof(NONCLIENTMETRICS);

18 years, 5 months

[janderwald] 22325: fix typo in solitaire.cpp patch by Wildcat (bug 1555)

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jun 12 21:51:03 2006 New Revision: 22325 URL: http://svn.reactos.ru/svn/reactos?rev=22325&view=rev Log: fix typo in solitaire.cpp patch by Wildcat (bug 1555) Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/games/sol… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Mon Jun 12 21:51:03 2006 @@ -188,7 +188,7 @@ return 0; case IDM_HELP_ABOUT: - MessageBox(hwnd, _T("Solitare by J Brown\r\n\r\nCardLib version 1.0."), szAppName, MB_OK|MB_ICONINFORMATION); + MessageBox(hwnd, _T("Solitaire by J Brown\r\n\r\nCardLib version 1.0."), szAppName, MB_OK|MB_ICONINFORMATION); return 0;

18 years, 5 months

[janderwald] 22324: set focus back after messagebox fix formating of previous commit

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jun 12 21:44:57 2006 New Revision: 22324 URL: http://svn.reactos.ru/svn/reactos?rev=22324&view=rev Log: set focus back after messagebox fix formating of previous commit Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.c… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Mon Jun 12 21:44:57 2006 @@ -521,7 +521,7 @@ _T("Setup cannot continue until you enter the name of your computer."), _T("ReactOS Setup"), MB_ICONERROR | MB_OK); - SetFocus(GetDlgItem(hwndDlg, IDC_COMPUTERNAME)); + SetFocus(GetDlgItem(hwndDlg, IDC_COMPUTERNAME)); SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); return TRUE; } @@ -534,6 +534,7 @@ _T("Setup failed to set the computer name."), _T("ReactOS Setup"), MB_ICONERROR | MB_OK); + SetFocus(GetDlgItem(hwndDlg, IDC_COMPUTERNAME)); SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); return TRUE; }

18 years, 5 months

[janderwald] 22323: set focus back to computer name when invalid name was entered bug report by keytotime (bug 1569)

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jun 12 21:40:35 2006 New Revision: 22323 URL: http://svn.reactos.ru/svn/reactos?rev=22323&view=rev Log: set focus back to computer name when invalid name was entered bug report by keytotime (bug 1569) Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.c… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c Mon Jun 12 21:40:35 2006 @@ -521,6 +521,7 @@ _T("Setup cannot continue until you enter the name of your computer."), _T("ReactOS Setup"), MB_ICONERROR | MB_OK); + SetFocus(GetDlgItem(hwndDlg, IDC_COMPUTERNAME)); SetWindowLong(hwndDlg, DWL_MSGRESULT, -1); return TRUE; }

18 years, 5 months

← Newer
1
...
38
39
40
41
42
43
44
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2006