Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[dreimer] 28358: German RC Files Update charmap, devmgmt, servman, wordpad, fedebug: updated the License to a German Translation from Notepad matrix, explorer, syssetup: small RC File fixes desk, newdev, translated new stuff Still tbd: access and mmsys
by dreimer＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: dreimer Date: Wed Aug 15 19:48:42 2007 New Revision: 28358 URL: http://svn.reactos.org/svn/reactos?rev=28358&view=rev Log: German RC Files Update charmap, devmgmt, servman, wordpad, fedebug: updated the License to a German Translation from Notepad matrix, explorer, syssetup: small RC File fixes desk, newdev, translated new stuff Still tbd: access and mmsys Modified: trunk/reactos/base/applications/charmap/lang/de-DE.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc trunk/reactos/base/applications/screensavers/matrix/lang/de-DE.rc trunk/reactos/base/applications/wordpad/lang/de-DE.rc trunk/reactos/base/shell/explorer/explorer-de.rc trunk/reactos/base/shell/explorer/explorer-ro.rc trunk/reactos/boot/freeldr/fdebug/lang/de-DE.rc trunk/reactos/dll/cpl/access/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/win32/newdev/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Modified: trunk/reactos/base/applications/charmap/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/charmap/lang/de-DE.rc Wed Aug 15 19:48:42 2007 @@ -30,6 +30,6 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_LICENSE "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." IDS_ABOUT "Ü&ber..." END Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc Wed Aug 15 19:48:42 2007 @@ -51,7 +51,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_LICENSE "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc Wed Aug 15 19:48:42 2007 @@ -190,7 +190,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Anzahl der Dienste: %d" - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_LICENSE "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/screensavers/matrix/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/de-DE.rc Wed Aug 15 19:48:42 2007 @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources +// German (Germany) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) #ifdef _WIN32 @@ -149,7 +149,7 @@ IDS_DESCRIPTION "Matrix ScreenSaver" END -#endif // English (U.S.) resources +#endif // German (Germany) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/base/applications/wordpad/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/wordpad/lang/de-DE.rc Wed Aug 15 19:48:42 2007 @@ -110,7 +110,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_LICENSE "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." IDS_DEFAULT_NAME "Dokument %1!u!" IDS_READY " Fertig." END Modified: trunk/reactos/base/shell/explorer/explorer-de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-de.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-de.rc Wed Aug 15 19:48:42 2007 @@ -231,7 +231,7 @@ CAPTION "Auswahl des Explorerfenster-Modus" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN - LTEXT "Please select your prefered explorer user interface:", + LTEXT "Bitte wählen Sie ihr bevorzugtes Explorer Userinterface:", IDC_STATIC,7,7,160,8 CONTROL "&MDI (Multiple Document Interface)",IDC_MDI,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 @@ -344,7 +344,7 @@ IDS_PROGRAMS "Programme" IDS_SETTINGS "Einstellungen" IDS_EXPLORE "Explore" - IDS_EMPTY "(Empty)" + IDS_EMPTY "(Leer)" IDS_RECENT "Aktuelle Dokumente" IDS_ADMIN "Verwaltung" END Modified: trunk/reactos/base/shell/explorer/explorer-ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ro.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-ro.rc Wed Aug 15 19:48:42 2007 @@ -191,7 +191,7 @@ ///////////////////////////////////////////////////////////////////////////// -// German (Germany) resources +// Romanian resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) #ifdef _WIN32 @@ -227,7 +227,7 @@ #endif // APSTUDIO_INVOKED -#endif // German (Germany) resources +#endif // Romanian resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/boot/freeldr/fdebug/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/d… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/de-DE.rc (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/de-DE.rc Wed Aug 15 19:48:42 2007 @@ -170,10 +170,10 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." + IDS_LICENSE "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\r\n\r\nThis program 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 General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END -#endif // English (U.S.) resources +#endif // German (Germany) resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/dll/cpl/access/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/access/lang/de-DE.rc Wed Aug 15 19:48:42 2007 @@ -102,7 +102,7 @@ LTEXT "Drücken Sie fünfmal die Umschalttaste um die Einrastfunktion zu aktivieren.",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) AUTOCHECKBOX "Tastenkombination a&ktivieren",IDC_STICKY_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 - GROUPBOX "Options",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) + GROUPBOX "Optionen",-1,PROPSHEETPADDING(1),LABELLINE(9),PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(4)+PROPSHEETPADDING(1) AUTOCHECKBOX "&Press modifier key twice to lock",IDC_STICKY_LOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(10)+2,PROPSHEETPADDING(28)+4,14 AUTOCHECKBOX "&Turn StickyKeys off if two keys are pressed at once",IDC_STICKY_UNLOCK_CHECK,PROPSHEETPADDING(4),LABELLINE(12),PROPSHEETPADDING(28)+4,14 @@ -123,7 +123,7 @@ LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Abrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -137,7 +137,7 @@ AUTOCHECKBOX "Use &shortcut",IDC_TOGGLE_ACTIVATE_CHECK,PROPSHEETPADDING(4),LABELLINE(5)+2,PROPSHEETPADDING(17)+4,14 PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -156,7 +156,7 @@ CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 END @@ -168,7 +168,7 @@ LTEXT "TBD",-1,PROPSHEETPADDING(4)+ICONSIZE,LABELLINE(2),PROPSHEETWIDTH-PROPSHEETPADDING(6)-ICONSIZE,LABELLINE(3) PUSHBUTTON "OK", IDOK, PROPSHEETWIDTH-111, PROPSHEETHEIGHT-21, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, PROPSHEETWIDTH-57, PROPSHEETHEIGHT-21, 50, 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 Wed Aug 15 19:48:42 2007 @@ -21,27 +21,27 @@ IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Screensaver" +CAPTION "Bildschirmschoner" FONT 8, "MS Shell Dlg", 0, 0 BEGIN CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE - GROUPBOX "&Screensaver",IDC_SCREENS_DUMMY, 8, 92, 230, 52 + GROUPBOX "Bild&schirmschoner",IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Se&ttings",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP - PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "&Wait",IDC_WAITTEXT, 14, 125, 16, 9 + PUSHBUTTON "Eins&tellungen",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "&Vorschau",IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "&Warte",IDC_WAITTEXT, 14, 125, 16, 9 EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 - LTEXT "minutes", IDC_MINTEXT, 70, 125, 26, 9 - CONTROL "Ask for &password on resume.",IDC_SCREENS_USEPASSCHK,"button", + LTEXT "minuten", IDC_MINTEXT, 70, 125, 26, 9 + CONTROL "Nach einem Resume nach &Password fragen.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 - GROUPBOX "&Energy Saving features of monitor", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 - LTEXT "To adjust the power settings for your monitor, click on Power Settings.", + GROUPBOX "&Enerigespar Features des Monitors:", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + LTEXT "Um die Energieeinstellungen des Monitors zu editieren, wählen Sie Energieeinstellungen.", IDC_STATIC, 14, 166, 146 ,20 - PUSHBUTTON "P&ower...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 + PUSHBUTTON "Energieeinstell&ungen", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 END IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 228 Modified: trunk/reactos/dll/win32/newdev/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/newdev/lang/de-DE.rc Wed Aug 15 19:48:42 2007 @@ -82,13 +82,13 @@ IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Device installation" +CAPTION "Geräteinstallation" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Installation complete",IDC_FINISHTITLE,120,8,195,11 - LTEXT "You need to reboot to finish the install of:", + LTEXT "Installation vollständig",IDC_FINISHTITLE,120,8,195,11 + LTEXT "Sie müssen den Computer neustarten, um folgende Installation abzuschließen:", IDC_STATIC,120,32,195,19 - LTEXT "Click Finish to close the wizard.",IDC_STATIC,120,174, + LTEXT "Wählen Sie Beenden, um den Wizard zu schließen.",IDC_STATIC,120,174, 179,11 LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 END Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Wed Aug 15 19:48:42 2007 @@ -165,7 +165,7 @@ IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 STYLE NOT WS_VISIBLE | DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | DS_FIXEDSYS | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP -CAPTION "Please wait..." +CAPTION "Bitte warten..." FONT 8,"MS Shell Dlg 2",400,0,1 BEGIN LTEXT "",IDC_STATUSLABEL,7,8,234,12,SS_WORDELLIPSIS

1 0

[dreimer] 28357: Several PC, several Trees, several ages :-P Some more things to delete on a cleanup.
by dreimer＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: dreimer Date: Wed Aug 15 19:43:01 2007 New Revision: 28357 URL: http://svn.reactos.org/svn/reactos?rev=28357&view=rev Log: Several PC, several Trees, several ages :-P Some more things to delete on a cleanup. Modified: trunk/tools/RosBE-Windows/Root/Clean.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 Wed Aug 15 19:43:01 2007 @@ -81,14 +81,20 @@ del /f "dll\ntdll\napi.S" 1> NUL 2> NUL del /f "dll\ntdll\i386\napi.S" 1> NUL 2> NUL + rmdir /q "dll\ntdll\i386" 1> NUL 2> NUL del /f "dll\win32\gdi32\misc\win32k.S" 1> NUL 2> NUL del /f "dll\win32\gdi32\misc\i386\win32k.S" 1> NUL 2> NUL + rmdir /q "dll\win32\gdi32\misc\i386" 1> NUL 2> NUL del /f "dll\win32\kernel32\errcodes.rc" 1> NUL 2> NUL del /f "dll\win32\user32\misc\win32k.S" 1> NUL 2> NUL del /f "dll\win32\user32\misc\i386\win32k.S" 1> NUL 2> NUL + rmdir /q "dll\win32\user32\misc\i386" 1> NUL 2> NUL del /f "include\reactos\bugcodes.h" 1> NUL 2> NUL del /f "include\reactos\buildno.h" 1> NUL 2> NUL del /f "include\reactos\errcodes.h" 1> NUL 2> NUL + del /f "lib\win32ksys\win32k.S" 1> NUL 2> NUL + del /f "lib\win32ksys\i386\win32k.S" 1> NUL 2> NUL + rmdir /q "lib\win32ksys\i386" 1> NUL 2> NUL del /f "ntoskrnl\bugcodes.rc" 1> NUL 2> NUL del /f "ntoskrnl\ex\zw.S" 1> NUL 2> NUL del /f "ntoskrnl\ex\i386\zw.S" 1> NUL 2> NUL

1 0

[cfinck] 28356: Drag & Drop (hack)fix by Timo from r27884
by cfinck＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: cfinck Date: Wed Aug 15 19:39:34 2007 New Revision: 28356 URL: http://svn.reactos.org/svn/reactos?rev=28356&view=rev Log: Drag & Drop (hack)fix by Timo from r27884 Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shlview.c Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shlview.c (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/shell32/shlview.c Wed Aug 15 19:39:34 2007 @@ -2307,12 +2307,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; @@ -2323,12 +2325,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; @@ -2565,3 +2570,4 @@ ISVViewObject_SetAdvise, ISVViewObject_GetAdvise }; +

1 0

[cfinck] 28355: Hack: Revert vmwinst back to r23933, so setting the resolution of the VMware Graphics Driver works.
by cfinck＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: cfinck Date: Wed Aug 15 19:33:43 2007 New Revision: 28355 URL: http://svn.reactos.org/svn/reactos?rev=28355&view=rev Log: Hack: Revert vmwinst back to r23933, so setting the resolution of the VMware Graphics Driver works. Added: branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/Cz.rc - copied unchanged from r23933, trunk/reactos/base/setup/vmwinst/Cz.rc branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/De.rc - copied unchanged from r23933, trunk/reactos/base/setup/vmwinst/De.rc branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/Dk.rc - copied unchanged from r23933, trunk/reactos/base/setup/vmwinst/Dk.rc branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/En.rc - copied unchanged from r23933, trunk/reactos/base/setup/vmwinst/En.rc branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/Es.rc - copied unchanged from r23933, trunk/reactos/base/setup/vmwinst/Es.rc branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/Hu.rc - copied unchanged from r23933, trunk/reactos/base/setup/vmwinst/Hu.rc branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/Ja.rc - copied unchanged from r23933, trunk/reactos/base/setup/vmwinst/Ja.rc branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/Ru.rc - copied unchanged from r23933, trunk/reactos/base/setup/vmwinst/Ru.rc branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/Uk.rc - copied unchanged from r23933, trunk/reactos/base/setup/vmwinst/Uk.rc branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/vmware.inf - copied unchanged from r23933, trunk/reactos/base/setup/vmwinst/vmware.inf Removed: branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/lang/ branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/rsrc.rc Modified: branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/ (props changed) branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/resources/ (props changed) branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/vmwinst.c branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/vmwinst.h branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/vmwinst.rbuild branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/vmwinst.rc Propchange: branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Aug 15 19:33:43 2007 @@ -1,4 +1,9 @@ +*.o +*.a +*.d +*.exe +*.coff +*.sym +*.map GNUmakefile *.vcproj -*.user -*.cbp Propchange: branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/resources/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore (removed) @@ -1,4 +1,0 @@ -GNUmakefile -*.vcproj -*.user -*.cbp Removed: branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/rsrc.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/rsrc.rc (removed) @@ -1,33 +1,0 @@ -#include <windows.h> -#include "vmwinst.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 24 DISCARDABLE "manifest.xml" - -/* Bitmaps */ -IDB_WATERMARK BITMAP "resources/watermark.bmp" -IDB_HEADER BITMAP "resources/header.bmp" - -/* - * Everything specific to any language goes in one of the specific - * files. Note that you can and may override resources which also have - * a neutral version. This is to get localized bitmaps for example. - */ -#include "lang/cs-CZ.rc" -#include "lang/da-DK.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/lt-LT.rc" -#include "lang/nb-NO.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc" -#include "lang/zh-CN.rc" Modified: branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/vmwinst.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/vmwinst.c (original) +++ branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/vmwinst.c Wed Aug 15 19:33:43 2007 @@ -18,7 +18,8 @@ * * VMware is a registered trademark of VMware, Inc. */ -/* +/* $Id$ + * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS VMware(r) driver installation utility * FILE: subsys/system/vmwinst/vmwinst.c @@ -27,11 +28,9 @@ */ #include <windows.h> #include <commctrl.h> -#include <newdev.h> #include <stdio.h> #include <string.h> #include "vmwinst.h" -#include <debug.h> extern VOID CALLBACK InstallHinfSectionW(HWND hwnd, HINSTANCE ModuleHandle, PCWSTR CmdLineBuffer, INT nCmdShow); @@ -42,14 +41,12 @@ static WCHAR DestinationDriversPath[MAX_PATH+1]; static WCHAR CDDrive = L'\0'; -static WCHAR PathToVideoDrivers60[MAX_PATH+1] = L"X:\\program files\\VMWare\\VMWare Tools\\Drivers\\video\\2k\\32bit\\"; static WCHAR PathToVideoDrivers55[MAX_PATH+1] = L"X:\\program files\\VMware\\VMware Tools\\Drivers\\video\\winnt2k\\32Bit\\"; static WCHAR PathToVideoDrivers45[MAX_PATH+1] = L"X:\\program files\\VMware\\VMware Tools\\Drivers\\video\\winnt2k\\"; static WCHAR PathToVideoDrivers40[MAX_PATH+1] = L"X:\\video\\winnt2k\\"; static WCHAR DestinationPath[MAX_PATH+1]; static WCHAR *vmx_fb = L"vmx_fb.dll"; static WCHAR *vmx_mode = L"vmx_mode.dll"; -static WCHAR *vmx_mode_v6 = L"vmx mode.dll"; static WCHAR *vmx_svga = L"vmx_svga.sys"; static WCHAR *SrcPath = PathToVideoDrivers45; @@ -98,8 +95,27 @@ return FALSE; } +BOOL +ProcessMessage(void) +{ + MSG msg; + if(PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + return TRUE; + } + return FALSE; +} + +void +ProcessMessages(void) +{ + while(ProcessMessage()); +} + /* try to open the file */ -static BOOL +BOOL FileExists(WCHAR *Path, WCHAR *File) { WCHAR FileName[MAX_PATH + 1]; @@ -151,8 +167,54 @@ } +/* Copy file */ +BOOL +InstallFile(WCHAR *Destination, WCHAR *File) +{ + static char Buffer[1024]; + WCHAR SourceFileName[MAX_PATH + 1]; + WCHAR DestFileName[MAX_PATH + 1]; + HANDLE SourceFileHandle, DestFileHandle; + DWORD DataRead, DataWritten; + + SourceFileName[0] = L'\0'; + DestFileName[0] = L'\0'; + wcscat(SourceFileName, SrcPath); + wcscat(SourceFileName, File); + wcscat(DestFileName, Destination); + wcscat(DestFileName, File); + + SourceFileHandle = CreateFile(SourceFileName, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if(SourceFileHandle == INVALID_HANDLE_VALUE) + { + return FALSE; + } + DestFileHandle = CreateFile(DestFileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if(DestFileHandle == INVALID_HANDLE_VALUE) + { + CloseHandle(SourceFileHandle); + return FALSE; + } + + while(ReadFile(SourceFileHandle, Buffer, sizeof(Buffer), &DataRead, NULL) && DataRead > 0) + { + if(!WriteFile(DestFileHandle, Buffer, DataRead, &DataWritten, NULL) || + DataRead != DataWritten) + { + CloseHandle(SourceFileHandle); + CloseHandle(DestFileHandle); + DeleteFile(DestFileName); + return FALSE; + } + } + + CloseHandle(SourceFileHandle); + CloseHandle(DestFileHandle); + return TRUE; +} + /* Find the drive with the inserted VMware cd-rom */ -static BOOL +BOOL IsVMwareCDInDrive(WCHAR *Drv) { static WCHAR Drive[4] = L"X:\\"; @@ -166,13 +228,10 @@ if(GetDriveType(Drive) == DRIVE_CDROM) { #endif - PathToVideoDrivers60[0] = Current; PathToVideoDrivers55[0] = Current; PathToVideoDrivers40[0] = Current; PathToVideoDrivers45[0] = Current; - if(SetCurrentDirectory(PathToVideoDrivers60)) - SrcPath = PathToVideoDrivers60; - else if(SetCurrentDirectory(PathToVideoDrivers55)) + if(SetCurrentDirectory(PathToVideoDrivers55)) SrcPath = PathToVideoDrivers55; else if(SetCurrentDirectory(PathToVideoDrivers45)) SrcPath = PathToVideoDrivers45; @@ -185,7 +244,7 @@ } if(FileExists(SrcPath, vmx_fb) && - (FileExists(SrcPath, vmx_mode) || FileExists(SrcPath, vmx_mode_v6)) && + FileExists(SrcPath, vmx_mode) && FileExists(SrcPath, vmx_svga)) { *Drv = Current; @@ -199,14 +258,14 @@ return FALSE; } -static BOOL +BOOL LoadResolutionSettings(DWORD *ResX, DWORD *ResY, DWORD *ColDepth) { HKEY hReg; DWORD Type, Size; if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Services\\vmx_svga\\Device0", + L"SYSTEM\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\vmx_svga\\Device0", 0, KEY_QUERY_VALUE, &hReg) != ERROR_SUCCESS) { return FALSE; @@ -214,26 +273,29 @@ if(RegQueryValueEx(hReg, L"DefaultSettings.BitsPerPel", 0, &Type, (BYTE*)ColDepth, &Size) != ERROR_SUCCESS || Type != REG_DWORD) { - *ColDepth = 8; + RegCloseKey(hReg); + return FALSE; } if(RegQueryValueEx(hReg, L"DefaultSettings.XResolution", 0, &Type, (BYTE*)ResX, &Size) != ERROR_SUCCESS || Type != REG_DWORD) { - *ResX = 640; + RegCloseKey(hReg); + return FALSE; } if(RegQueryValueEx(hReg, L"DefaultSettings.YResolution", 0, &Type, (BYTE*)ResY, &Size) != ERROR_SUCCESS || Type != REG_DWORD) { - *ResY = 480; + RegCloseKey(hReg); + return FALSE; } RegCloseKey(hReg); return TRUE; } -static BOOL +BOOL IsVmwSVGAEnabled(VOID) { HKEY hReg; @@ -258,13 +320,13 @@ -static BOOL +BOOL SaveResolutionSettings(DWORD ResX, DWORD ResY, DWORD ColDepth) { HKEY hReg; if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Services\\vmx_svga\\Device0", + L"SYSTEM\\CurrentControlSet\\Hardware Profiles\\Current\\System\\CurrentControlSet\\Services\\vmx_svga\\Device0", 0, KEY_SET_VALUE, &hReg) != ERROR_SUCCESS) { return FALSE; @@ -291,7 +353,7 @@ return TRUE; } -static BOOL +BOOL EnableDriver(WCHAR *Key, BOOL Enable) { DWORD Value; @@ -314,7 +376,7 @@ } /* Activate the vmware driver and deactivate the others */ -static BOOL +BOOL EnableVmwareDriver(BOOL VBE, BOOL VGA, BOOL VMX) { if(!EnableDriver(L"SYSTEM\\CurrentControlSet\\Services\\VBE", VBE)) @@ -333,11 +395,94 @@ return TRUE; } +/* Make sure the required registry entries are present */ +BOOL +AddVmwareRegistryEntries() +{ + HRSRC VmwareInfResource; + HGLOBAL VmwareInfMem; + PVOID VmwareInfLocked; + DWORD Size; + WCHAR TempPath[MAX_PATH]; + WCHAR BufferSize; + WCHAR TempFileName[MAX_PATH]; + HANDLE TempFile; + DWORD Written; + WCHAR CmdLine[19 + MAX_PATH]; + + VmwareInfResource = FindResourceW(hAppInstance, + MAKEINTRESOURCE(IDR_VMWARE_INF), + L"RT_INF"); + if (NULL == VmwareInfResource) + { + return FALSE; + } + Size = SizeofResource(hAppInstance, VmwareInfResource); + if (0 == Size) + { + return FALSE; + } + VmwareInfMem = LoadResource(hAppInstance, VmwareInfResource); + if (NULL == VmwareInfMem) + { + return FALSE; + } + VmwareInfLocked = LockResource(VmwareInfMem); + if (NULL == VmwareInfLocked) + { + return FALSE; + } + + BufferSize = GetTempPathW(sizeof(TempPath) / sizeof(TempPath[0]), TempPath); + if (0 == BufferSize || sizeof(TempPath) / sizeof(TempPath[0]) < BufferSize) + { + return FALSE; + } + if (0 == GetTempFileNameW(TempPath, L"vmx", 0, TempFileName)) + { + return FALSE; + } + + TempFile = CreateFileW(TempFileName, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); + if (INVALID_HANDLE_VALUE == TempFile) + { + DeleteFile(TempFileName); + return FALSE; + } + if (! WriteFile(TempFile, VmwareInfLocked, Size, &Written, NULL) || + Written != Size) + { + CloseHandle(TempFile); + DeleteFile(TempFileName); + return FALSE; + } + CloseHandle(TempFile); + + wcscpy(CmdLine, L"DefaultInstall 128 "); + wcscat(CmdLine, TempFileName); + InstallHinfSectionW(NULL, NULL, CmdLine, 0); + + DeleteFile(TempFileName); + + return TRUE; +} + /* GUI */ +void +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DWORD Flags, DLGPROC DlgProc) +{ + ZeroMemory(psp, sizeof(PROPSHEETPAGE)); + psp->dwSize = sizeof(PROPSHEETPAGE); + psp->dwFlags = PSP_DEFAULT | Flags; + psp->hInstance = hAppInstance; + psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pfnDlgProc = DlgProc; +} /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageWelcomeProc( HWND hwndDlg, UINT uMsg, @@ -367,6 +512,23 @@ { if(DriverFilesFound) { + if(!AddVmwareRegistryEntries()) + { + WCHAR Msg[1024]; + LoadString(hAppInstance, IDS_FAILEDTOADDREGENTRIES, Msg, sizeof(Msg) / sizeof(WCHAR)); + MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_WELCOMEPAGE); + return TRUE; + } + if(!EnableVmwareDriver(TRUE, TRUE, TRUE)) + { + + WCHAR Msg[1024]; + LoadString(hAppInstance, IDS_FAILEDTOACTIVATEDRIVER, Msg, sizeof(Msg) / sizeof(WCHAR)); + MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING); + SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_WELCOMEPAGE); + return TRUE; + } SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_CONFIG); return TRUE; } @@ -380,7 +542,7 @@ } /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageInsertDiscProc( HWND hwndDlg, UINT uMsg, @@ -408,7 +570,7 @@ return FALSE; } -static VOID +VOID InstTerminateInstaller(BOOL Wait) { if(hInstallationThread != NULL) @@ -425,11 +587,10 @@ } } -static DWORD STDCALL +DWORD STDCALL InstInstallationThread(LPVOID lpParameter) { HANDLE hThread; - WCHAR InfFileName[1024]; BOOL DriveAvailable; int DrivesTested = 0; @@ -452,22 +613,47 @@ if(AbortInstall != 0) goto done; PostMessage(hInstallationNotifyWnd, WM_INSTSTATUSUPDATE, IDS_COPYINGFILES, 0); - wcscpy(InfFileName, SrcPath); - wcscat(InfFileName, L"vmx_svga.inf"); - DPRINT1("Calling UpdateDriverForPlugAndPlayDevices()\n"); - if (!UpdateDriverForPlugAndPlayDevices( - hInstallationNotifyWnd, - L"PCI\\VEN_15AD&DEV_0405&SUBSYS_040515AD&REV_00", - InfFileName, - 0, - NULL)) - { - AbortInstall = 1; - } - else - { - AbortInstall = 0; - } + if(AbortInstall != 0) goto done; + if(!InstallFile(DestinationPath, vmx_fb)) + { + PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOCOPYFILES, 0); + goto cleanup; + } + + Sleep(250); + + if(AbortInstall != 0) goto done; + if(!InstallFile(DestinationPath, vmx_mode)) + { + PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOCOPYFILES, 0); + goto cleanup; + } + + Sleep(250); + + if(AbortInstall != 0) goto done; + if(!InstallFile(DestinationDriversPath, vmx_svga)) + { + PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOCOPYFILES, 0); + goto cleanup; + } + + Sleep(250); + + if(AbortInstall != 0) goto done; + PostMessage(hInstallationNotifyWnd, WM_INSTSTATUSUPDATE, IDS_ENABLINGDRIVER, 0); + if(!AddVmwareRegistryEntries()) + { + PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOADDREGENTRIES, 0); + goto cleanup; + } + if(!EnableVmwareDriver(TRUE, TRUE, TRUE)) + { + PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOACTIVATEDRIVER, 0); + goto cleanup; + } + + Sleep(500); done: switch(AbortInstall) @@ -489,7 +675,7 @@ return 0; } -static BOOL +BOOL InstStartInstallationThread(HWND hwndNotify) { if(hInstallationThread == NULL) @@ -516,7 +702,7 @@ } /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageInstallingProc( HWND hwndDlg, UINT uMsg, @@ -585,7 +771,7 @@ } /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageInstallFailedProc( HWND hwndDlg, UINT uMsg, @@ -610,7 +796,7 @@ return FALSE; } -static void +void FillComboBox(HWND Dlg, int idComboBox, int From, int To) { int i; @@ -633,7 +819,7 @@ } MAPCTLRES; /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageConfigProc( HWND hwndDlg, UINT uMsg, @@ -752,7 +938,7 @@ } /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageChooseActionProc( HWND hwndDlg, UINT uMsg, @@ -804,7 +990,7 @@ } /* Property page dialog callback */ -static INT_PTR CALLBACK +INT_PTR CALLBACK PageSelectDriverProc( HWND hwndDlg, UINT uMsg, @@ -866,7 +1052,7 @@ return FALSE; } -static VOID +VOID ShowUninstNotice(HWND Owner) { WCHAR Msg[1024]; @@ -874,7 +1060,7 @@ MessageBox(Owner, Msg, NULL, MB_ICONINFORMATION); } -static INT_PTR CALLBACK +INT_PTR CALLBACK PageDoUninstallProc( HWND hwndDlg, UINT uMsg, Modified: branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/vmwinst.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/vmwinst.h (original) +++ branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/vmwinst.h Wed Aug 15 19:33:43 2007 @@ -68,4 +68,6 @@ #define IDD_DOUNINSTALLTITLE 361 #define IDD_DOUNINSTALLSUBTITLE 362 +#define IDR_VMWARE_INF 400 + #endif /* __VMWINST_H */ Modified: branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/vmwinst.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/vmwinst.rbuild (original) +++ branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/vmwinst.rbuild Wed Aug 15 19:33:43 2007 @@ -8,11 +8,9 @@ <library>advapi32</library> <library>comctl32</library> <library>comdlg32</library> - <library>newdev</library> <library>user32</library> <library>setupapi</library> <library>shell32</library> - <library>ntdll</library> <file>vmwinst.c</file> <file>vmwinst.rc</file> </module> Modified: branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/vmwinst.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/vmwinst.rc (original) +++ branches/ros-branch-0_3_3-new/reactos/base/setup/vmwinst/vmwinst.rc Wed Aug 15 19:33:43 2007 @@ -1,3 +1,5 @@ +/* $Id$ */ + #include <windows.h> #include "vmwinst.h" @@ -6,4 +8,29 @@ #define REACTOS_STR_ORIGINAL_FILENAME "vmwinst.exe\0" #include <reactos/version.rc> -#include "rsrc.rc" +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +1 24 DISCARDABLE "manifest.xml" + +/* Bitmaps */ +IDB_WATERMARK BITMAP "resources/watermark.bmp" +IDB_HEADER BITMAP "resources/header.bmp" + +/* The vmware.inf file */ +IDR_VMWARE_INF RT_INF "vmware.inf" + + +/* + * Everything specific to any language goes in one of the specific + * files. Note that you can and may override resources which also have + * a neutral version. This is to get localized bitmaps for example. + */ +#include "Cz.rc" +#include "En.rc" +#include "De.rc" +#include "Dk.rc" +#include "Es.rc" +#include "Ja.rc" +#include "Hu.rc" +#include "Ru.rc" +#include "Uk.rc"

1 0

[cfinck] 28354: Add the OpenGL hackfix from r27743
by cfinck＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: cfinck Date: Wed Aug 15 19:03:44 2007 New Revision: 28354 URL: http://svn.reactos.org/svn/reactos?rev=28354&view=rev Log: Add the OpenGL hackfix from r27743 Modified: branches/ros-branch-0_3_3-new/reactos/dll/3rdparty/mesa32/mesa32.rbuild Modified: branches/ros-branch-0_3_3-new/reactos/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/3rdparty/mesa32/mesa32.rbuild (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/3rdparty/mesa32/mesa32.rbuild Wed Aug 15 19:03:44 2007 @@ -15,9 +15,6 @@ <define name="USE_EXTERNAL_DXTN_LIB=1" /> <define name="USE_MGL_NAMESPACE" /> <define name="USE_X86_ASM" /> - <define name="USE_MMX_ASM" /> - <define name="USE_SSE_ASM" /> - <define name="USE_3DNOW_ASM" /> <include base="mesa32">include</include> <include base="mesa32">src</include> <include base="mesa32">src/main</include>

1 0

[cfinck] 28353: Add the 0.3.3 start menu bitmap from r27738
by cfinck＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: cfinck Date: Wed Aug 15 19:01:53 2007 New Revision: 28353 URL: http://svn.reactos.org/svn/reactos?rev=28353&view=rev Log: Add the 0.3.3 start menu bitmap from r27738 Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/res/logov.bmp Modified: branches/ros-branch-0_3_3-new/reactos/base/shell/explorer/res/logov.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/ba… ============================================================================== Binary files - no diff available.

1 0

[cfinck] 28352: Set "lake.bmp" as the default wallpaper. Due to the recent changes, we can now use the %SystemRoot% environment variable here and don't need to hardcode the exact path.
by cfinck＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: cfinck Date: Wed Aug 15 18:56:52 2007 New Revision: 28352 URL: http://svn.reactos.org/svn/reactos?rev=28352&view=rev Log: Set "lake.bmp" as the default wallpaper. Due to the recent changes, we can now use the %SystemRoot% environment variable here and don't need to hardcode the exact path. Modified: branches/ros-branch-0_3_3-new/reactos/boot/bootdata/hivedef.inf Modified: branches/ros-branch-0_3_3-new/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/bo… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/boot/bootdata/hivedef.inf (original) +++ branches/ros-branch-0_3_3-new/reactos/boot/bootdata/hivedef.inf Wed Aug 15 18:56:52 2007 @@ -20,7 +20,7 @@ HKCU,"Control Panel\Desktop","HungAppTimeout",0x00000002,"5000" HKCU,"Control Panel\Desktop","SCRNSAVE.EXE",0x00000000,"" HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" -HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" +HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"%SystemRoot%\lake.bmp" HKCU,"Control Panel\International",,0x00000012 HKCU,"Control Panel\International","Locale",0x00000000,"0409"

1 0

[fireball] 28351: Dmitry Chapyshev <lentind@yandex.ru>: - Fix so that letters like "p" or "y" are correctly displayed in messageboxes.
by fireball＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: fireball Date: Wed Aug 15 18:49:44 2007 New Revision: 28351 URL: http://svn.reactos.org/svn/reactos?rev=28351&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru>: - Fix so that letters like "p" or "y" are correctly displayed in messageboxes. Modified: trunk/reactos/dll/win32/user32/windows/messagebox.c Modified: trunk/reactos/dll/win32/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/messagebox.c (original) +++ trunk/reactos/dll/win32/user32/windows/messagebox.c Wed Aug 15 18:49:44 2007 @@ -491,7 +491,7 @@ txtrect.right = GetSystemMetrics(SM_CXSCREEN) / 5 * 4; if(Icon) txtrect.right -= GetSystemMetrics(SM_CXICON) + MSGBOXEX_SPACING; - txtrect.top = txtrect.left = txtrect.bottom = 0; + txtrect.top = txtrect.left = txtrect.bottom = 5; SelectObject(hDC, hFont); if (textlen != 0) {

1 0

[fireball] 28350: Dmitry Chapyshev <lentind@yandex.ru>: - Russian translation fixes - Separation of hardcoded strings into resource files
by fireball＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: fireball Date: Wed Aug 15 18:46:36 2007 New Revision: 28350 URL: http://svn.reactos.org/svn/reactos?rev=28350&view=rev Log: Dmitry Chapyshev <lentind(a)yandex.ru>: - Russian translation fixes - Separation of hardcoded strings into resource files Added: trunk/reactos/base/applications/cmdutils/find/lang/ (with props) trunk/reactos/base/applications/cmdutils/find/lang/en-US.rc (with props) trunk/reactos/base/applications/cmdutils/find/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/charmap/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/find/find.c trunk/reactos/base/applications/cmdutils/find/find.rbuild trunk/reactos/base/applications/cmdutils/find/find.rc trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc trunk/reactos/base/applications/msconfig/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/notepad/lang/ru-RU.rc trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc trunk/reactos/base/applications/wordpad/lang/ru-RU.rc trunk/reactos/base/shell/explorer/explorer-ru.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/intl/lang/ru-RU.rc trunk/reactos/dll/cpl/main/lang/ru-RU.rc trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc trunk/reactos/dll/cpl/mmsys/lang/en-US.rc trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/mmsys/mmsys.c trunk/reactos/dll/cpl/mmsys/mmsys.rbuild trunk/reactos/dll/cpl/mmsys/mmsys.rc trunk/reactos/dll/cpl/mmsys/resource.h trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/win32/comctl32/comctl_Ru.rc trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc trunk/reactos/dll/win32/netid/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/shell32_Ru.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/charmap/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/cmdutils/find/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/find.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/find.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/find/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/find/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/msconfig/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/taskmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/wordpad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/shell/explorer/explorer-ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… 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… Modified: trunk/reactos/dll/cpl/intl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ru-RU.rc… Modified: trunk/reactos/dll/cpl/main/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ru-RU.rc… Modified: trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/cs-CZ.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/de-DE.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/el-GR.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/en-US.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/es-ES.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/fr-FR.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/id-ID.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/it-IT.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/nl-NL.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pl-PL.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/pt-BR.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ru-RU.r… Modified: trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/uk-UA.r… Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rc?rev… Modified: trunk/reactos/dll/cpl/mmsys/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/resource.h?r… Modified: trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ru-R… Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… Modified: trunk/reactos/dll/win32/comctl32/comctl_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_… Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… Modified: trunk/reactos/dll/win32/netid/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/ru-RU… Modified: trunk/reactos/dll/win32/shell32/shell32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru…

1 0

[cfinck] 28349: Reapply the taskbar icon hackfix from r27734
by cfinck＠svn.reactos.org 15 Aug '07

15 Aug '07

Author: cfinck Date: Wed Aug 15 18:45:59 2007 New Revision: 28349 URL: http://svn.reactos.org/svn/reactos?rev=28349&view=rev Log: Reapply the taskbar icon hackfix from r27734 Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/comctl32/toolbar.c Modified: branches/ros-branch-0_3_3-new/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dl… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/dll/win32/comctl32/toolbar.c (original) +++ branches/ros-branch-0_3_3-new/reactos/dll/win32/comctl32/toolbar.c Wed Aug 15 18:45:59 2007 @@ -2669,7 +2669,33 @@ TRACE("adding hInst=%p nID=%d nButtons=%d\n", bitmap->hInst, bitmap->nID, bitmap->nButtons); /* Add bitmaps to the default image list */ if (bitmap->hInst == NULL) /* a handle was passed */ - hbmLoad = (HBITMAP)CopyImage(ULongToHandle(bitmap->nID), IMAGE_BITMAP, 0, 0, 0); + { + BITMAP bmp; + HBITMAP hOldBitmapBitmap, hOldBitmapLoad; + HDC hdcImage, hdcBitmap; + + /* copy the bitmap before adding it so that the user's bitmap + * doesn't get modified. + */ + GetObjectW ((HBITMAP)bitmap->nID, sizeof(BITMAP), (LPVOID)&bmp); + + hdcImage = CreateCompatibleDC(0); + hdcBitmap = CreateCompatibleDC(0); + + /* create new bitmap */ + hbmLoad = CreateBitmap (bmp.bmWidth, bmp.bmHeight, bmp.bmPlanes, bmp.bmBitsPixel, NULL); + hOldBitmapBitmap = SelectObject(hdcBitmap, (HBITMAP)bitmap->nID); + hOldBitmapLoad = SelectObject(hdcImage, hbmLoad); + + /* Copy the user's image */ + BitBlt (hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, + hdcBitmap, 0, 0, SRCCOPY); + + SelectObject (hdcImage, hOldBitmapLoad); + SelectObject (hdcBitmap, hOldBitmapBitmap); + DeleteDC (hdcImage); + DeleteDC (hdcBitmap); + } else hbmLoad = CreateMappedBitmap(bitmap->hInst, bitmap->nID, 0, NULL, 0);

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
67
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 August 2007