- Set "lake.bmp" as the default wallpaper

- Add a shortcut to "Download !" to the Desktop
- Change the version number for the Explorer start menu bitmap

svn path=/branches/ros-branch-0_3_4/; revision=31933

reactos/base/applications/mstsc/connectdialog.c

@@ -197,19 +197,12 @@ ReLoadGeneralPage(PINFO pInfo)
 
 
 static VOID
-GeneralOnInit(HWND hwnd,
+GeneralOnInit(PINFO pInfo)
-              PINFO pInfo)
 {
-    SetWindowLongPtrW(hwnd,
-                      GWLP_USERDATA,
-                      (LONG_PTR)pInfo);
-
-    pInfo->hGeneralPage = hwnd;
-
     SetWindowPos(pInfo->hGeneralPage,
                  NULL,
-                 2,
+                 13,
-                 22,
+                 110,
                  0,
                  0,
                  SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
@@ -255,13 +248,14 @@ GeneralDlgProc(HWND hDlg,
                WPARAM wParam,
                LPARAM lParam)
 {
-    PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg,
+    PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg),
                                            GWLP_USERDATA);
 
     switch (message)
     {
         case WM_INITDIALOG:
-            GeneralOnInit(hDlg, (PINFO)lParam);
+            pInfo->hGeneralPage = hDlg;
+            GeneralOnInit(pInfo);
             return TRUE;
 
         case WM_COMMAND:
@@ -745,23 +739,16 @@ ReLoadDisplayPage(PINFO pInfo)
 
 
 static VOID
-DisplayOnInit(HWND hwnd,
+DisplayOnInit(PINFO pInfo)
-              PINFO pInfo)
 {
     DISPLAY_DEVICEW displayDevice;
     DWORD iDevNum = 0;
     BOOL GotDev = FALSE;
 
-    SetWindowLongPtrW(hwnd,
-                      GWLP_USERDATA,
-                      (LONG_PTR)pInfo);
-
-    pInfo->hDisplayPage = hwnd;
-
     SetWindowPos(pInfo->hDisplayPage,
                  NULL,
-                 2,
+                 13,
-                 22,
+                 110,
                  0,
                  0,
                  SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
@@ -835,13 +822,14 @@ DisplayDlgProc(HWND hDlg,
                WPARAM wParam,
                LPARAM lParam)
 {
-    PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg,
+    PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg),
                                            GWLP_USERDATA);
 
     switch (message)
     {
         case WM_INITDIALOG:
-            DisplayOnInit(hDlg, (PINFO)lParam);
+            pInfo->hDisplayPage = hDlg;
+            DisplayOnInit(pInfo);
             return TRUE;
 
         case WM_DRAWITEM:
@@ -983,11 +971,10 @@ OnMainCreate(HWND hwnd,
         pInfo->hTab = GetDlgItem(hwnd, IDC_TAB);
         if (pInfo->hTab)
         {
-            if (CreateDialogParamW(hInst,
+            if (CreateDialogW(hInst,
-                                   MAKEINTRESOURCEW(IDD_GENERAL),
+                              MAKEINTRESOURCEW(IDD_GENERAL),
-                                   pInfo->hTab,
+                              hwnd,
-                                   (DLGPROC)GeneralDlgProc,
+                              (DLGPROC)GeneralDlgProc))
-                                   (LPARAM)pInfo))
             {
                 WCHAR str[256];
                 ZeroMemory(&item, sizeof(TCITEM));
@@ -998,11 +985,10 @@ OnMainCreate(HWND hwnd,
                 (void)TabCtrl_InsertItem(pInfo->hTab, 0, &item);
             }
 
-            if (CreateDialogParamW(hInst,
+            if (CreateDialogW(hInst,
-                                   MAKEINTRESOURCEW(IDD_DISPLAY),
+                              MAKEINTRESOURCEW(IDD_DISPLAY),
-                                   pInfo->hTab,
+                              hwnd,
-                                   (DLGPROC)DisplayDlgProc,
+                              (DLGPROC)DisplayDlgProc))
-                                   (LPARAM)pInfo))
             {
                 WCHAR str[256];
                 ZeroMemory(&item, sizeof(TCITEM));

reactos/boot/bootdata/hivedef.inf

@@ -20,7 +20,7 @@ HKCU,"Control Panel\Desktop","PaintDesktopVersion",0x00010001,"0"
 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"
 

reactos/dll/win32/comctl32/toolbar.c

@@ -2668,7 +2668,33 @@ TOOLBAR_AddBitmapToImageList(TOOLBAR_INFO *infoPtr, HIMAGELIST himlDef, const TB
     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);
 

reactos/dll/win32/syssetup/install.c

@@ -741,6 +741,7 @@ CreateShortcuts(VOID)
 
     /* Create desktop shortcuts */
     CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, FALSE);
+    CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_DOWNLOADER, _T("%SystemRoot%\\system32\\downloader.exe"), IDS_CMT_DOWNLOADER, TRUE);
 
     /* Create program startmenu shortcuts */
     CreateShortcut(CSIDL_PROGRAMS, NULL, IDS_SHORT_EXPLORER, _T("%SystemRoot%\\explorer.exe"), IDS_CMT_EXPLORER, FALSE);

reactos/include/reactos/version.h

@@ -18,13 +18,13 @@
 #define __VERSION_H
 
 #define KERNEL_VERSION_MAJOR        0
-#define KERNEL_VERSION_MINOR        4
+#define KERNEL_VERSION_MINOR        3
-#define KERNEL_VERSION_PATCH_LEVEL  0
+#define KERNEL_VERSION_PATCH_LEVEL  4
 
 #define COPYRIGHT_YEAR              "2008"
 
 /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */
-#define KERNEL_VERSION_BUILD_TYPE   L"SVN"
+#define KERNEL_VERSION_BUILD_TYPE   L""
 
 
 #endif

reactos/ntoskrnl/config/cmdelay.c

@@ -60,7 +60,7 @@ CmpDelayCloseWorker(IN PVOID Context)
     ASSERT(CmpDelayCloseWorkItemActive);
 
     /* FIXME: TODO */
-    ASSERT(FALSE);
+    //ASSERT(FALSE);
 }
 
 VOID

reactos/ntoskrnl/config/cmindex.c

@@ -1019,7 +1019,7 @@ CmpAddToLeaf(IN PHHIVE Hive,
     /* Find the insertion point for our entry */
     i = CmpFindSubKeyInLeaf(Hive, Leaf, Name, &Child);
     if (i & 0x80000000) return HCELL_NIL;
-    ASSERT(Child == HCELL_NIL);
+    //ASSERT(Child == HCELL_NIL);
 
     /* Check if we're not last */
     if (i != Leaf->Count)
@@ -1031,7 +1031,7 @@ CmpAddToLeaf(IN PHHIVE Hive,
                                    Leaf,
                                    &Child);
         if (Result == 2) return HCELL_NIL;
-        ASSERT(Result != 0);
+        //ASSERT(Result != 0);
 
         /* Check if we come after */
         if (Result > 0)

rosapps/downloader/downloader.xml

@@ -28,12 +28,6 @@
 			<description>The most popular and one of the best free Mail Clients out there.</description>
 			<location>http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.9/win32/en-US/Thunderbird%20Setup%202.0.0.9.exe</location>
 		</application>
-		<application name="SeaMonkey">
-			<regname>SeaMonkey (1.1.7)</regname>
-			<version>1.1.7</version>
-			<description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.</description>
-			<location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.1.7/seamonkey-1.1.7.en-US.win32.installer.exe</location>
-		</application>
 		<application name="Mozilla ActiveX Control">
 			<regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname>
 			<version>1.7.12</version>
@@ -56,19 +50,6 @@
 			<description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description>
 			<location>http://svn.reactos.org/packages/samba-tng.exe</location>
 		</application>
-		<application name="Miranda IM">
-			<regname>Miranda IM</regname>
-			<version>0.7.3</version>
-			<description>Open source multiprotocol instant messaging application - May not work completely.</description>
-			<location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.7.3-unicode.exe</location>
-		</application>
-		<application name="Putty">
-			<regname>PuTTY version 0.60</regname>
-			<licence>MIT</licence>
-			<version>0.60</version>
-			<description>A free SSH, Telnet, rlogin, and raw TCP client.</description>
-			<location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.60-installer.exe</location>
-		</application>
 	</category>
 	<category name="Office" icon="2">
 		<application name="Abiword">
@@ -78,30 +59,13 @@
 			<location>http://www.abiword.org/downloads/abiword/2.4.6/Windows/abiword-setup-2.4.6.exe</location>
 		</application>
 		<application name="OpenOffice">
-			<regname>OpenOffice.org 2.3</regname>
+			<regname>OpenOffice.org 2.0.3</regname>
-			<version>2.3.0</version>
+			<version>2.0.3</version>
 			<description>THE Open Source Office Suite.</description>
-			<location>http://ftp.tu-chemnitz.de/pub/openoffice-extended/stable/2.3.0/OOo_2.3.0_Win32Intel_install_en-US.exe</location>
+			<location>http://openoffice.paris.fr/openoffice/stable/2.0.3/OOo_2.0.3_Win32Intel_install.exe</location>
 		</application>
 	</category>
 	<category name="Graphics" icon="3">
-		<application name="IrfanView">
-			<regname>IrfanView (remove only)</regname>
-			<version>4.10</version>
-			<description>Viewer for all kinds of graphics/audio files/video files.</description>
-			<location>http://gd.tuwien.ac.at/graphics/irfanview/iview410_setup.exe</location>
-		</application>
-		<application name="IrfanView Plugins">
-			<version>4.10</version>
-			<description>Additional Plugins for supporting more file types.</description>
-			<location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_410_setup.exe</location>
-		</application>
-		<application name="TuxPaint">
-			<regname>Tux Paint 0.9.18</regname>
-			<version>0.9.18</version>
-			<description>An Open Source bitmap graphics editor geared towards young children.</description>
-			<location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.18-win32-installer.exe</location>
-		</application>
 		<application name="zeckensack's glide wrapper">
 			<regname>GlidewrapZbag</regname>
 			<version>0.84c</version>
@@ -109,21 +73,7 @@
 			<location>http://www.zeckensack.de/glide/archive/GlideWrapper084c.exe</location>
 		</application>
 	</category>
-	<category name="Multimedia" icon="4">
-	</category>
 	<category name="Development" icon="5">
-		<application name="ReactOS Build Environment">
-			<regname>ReactOS Build Environment 1.0</regname>
-			<version>1.0</version>
-			<description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description>
-			<location>http://kent.dl.sourceforge.net/sourceforge/reactos/RosBE-1.0.exe</location>
-		</application>
-		<application name="MinGW">
-			<regname>MinGW 5.1.3</regname>
-			<version>5.1.3</version>
-			<description>A Port of the GNU toolchain with GCC, GDB, GNU make, etc.</description>
-			<location>http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location>
-		</application>
 		<application name="FreeBASIC">
 			<regname>FreeBASIC 0.18.2b</regname>
 			<version>0.18.2b</version>
@@ -132,12 +82,6 @@
 		</application>
 	</category>
 	<category name="Games &amp; Fun" icon="6">
-		<application name="ScummVM">
-			<regname>ScummVM 0.10.0</regname>
-			<version>0.10.0</version>
-			<description>SamNMax, Day of Tentacle, etc on ReactOS</description>
-			<location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.10.0-win32.exe</location>
-		</application>
 		<application name="Diablo 2 Shareware">
 			<regname>Diablo II Shareware</regname>
 			<version>1.4</version>
@@ -150,36 +94,6 @@
 			<description>Nice Clone of Chip's Challenge originally made for the Atari Lynx. Includes free CCLP2 Graphics Pack, so you dont need the copyrighted Original.</description>
 			<location>http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0-win32-CCLP2.exe</location>
 		</application>
-		<application name="OpenTTD">
-			<regname>OpenTTD 0.5.3</regname>
-			<version>0.5.3-RC2</version>
-			<description>Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon.</description>
-			<location>http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.5.3-RC2-win32.exe</location>
-		</application>
-		<application name="LBreakout2">
-			<regname>LBreakout2 2.4.1</regname>
-			<version>2.4.1</version>
-			<description>Breakout Clone using SDL libs.</description>
-			<location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.exe</location>
-		</application>
-		<application name="LGeneral">
-			<regname>LGeneral 1.1</regname>
-			<version>1.1</version>
-			<description>Panzer General Clone using SDL libs.</description>
-			<location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lgeneral-1.1-win32.exe</location>
-		</application>
-		<application name="LMarbles">
-			<regname>LMarbles 1.0.6</regname>
-			<version>1.0.6</version>
-			<description>Atomix Clone using SDL libs.</description>
-			<location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location>
-		</application>
-	</category>
-	<category name="Science" icon="11">
-	</category>
-	<category name="Edutainment" icon="12">
-	</category>
-	<category name="Engineering" icon="13">
 	</category>
 	<category name="Tools" icon="7">
 		<application name="7-Zip">
@@ -188,18 +102,6 @@
 			<description>Utility to create and open 7zip, zip, tar, rar and other archive files.</description>
 			<location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z456.exe</location>
 		</application>
-		<application name="uTorrent">
-			<regname>&#181;Torrent</regname>
-			<version>1.7.5</version>
-			<description>Small and fast BitTorrent Client.</description>
-			<location>http://download.utorrent.com/1.7.5/utorrent.exe</location>
-		</application>
-		<application name="Audio Grabber">
-			<regname>Audiograbber 1.83 SE</regname>
-			<version>1.83 SE</version>
-			<description>A very good CD Ripper/Audio File Converter.</description>
-			<location>http://www.audiograbber.de/files/342677432/agsetup183se.exe</location>
-		</application>
 	</category>
 	<category name="Others" icon="8">
 		<application name="Simple Direct Media Layer (SDL) Runtime">