Remove non-working apps from the Downloader list (according to http://www.reactos.org/wiki/index.php/Tests_for_0.3.6 ) and downgrade Abiword to 2.4.6 (currently runs best on ROS)

svn path=/branches/ros-branch-0_3_6/; revision=35133
- Set "lake.bmp" as the default wallpaper
2025-10-06 16:32:42 +02:00 · 2008-08-05 21:07:19 +00:00 · 2008-08-02 13:10:59 +00:00 · 2008-08-02 13:02:42 +00:00 · 2008-08-02 13:01:08 +00:00 · 2008-08-02 10:19:56 +00:00
7 changed files with 55 additions and 129 deletions
--- a/reactos/base/applications/mstsc/connectdialog.c
+++ b/reactos/base/applications/mstsc/connectdialog.c
@@ -197,19 +197,12 @@ ReLoadGeneralPage(PINFO pInfo)


 static VOID
-GeneralOnInit(HWND hwnd,
-              PINFO pInfo)
+GeneralOnInit(PINFO pInfo)
 {
-    SetWindowLongPtrW(hwnd,
-                      GWLP_USERDATA,
-                      (LONG_PTR)pInfo);
-
-    pInfo->hGeneralPage = hwnd;
-
    SetWindowPos(pInfo->hGeneralPage,
                 NULL,
-                 2,
-                 22,
+                 13,
+                 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,
-              PINFO pInfo)
+DisplayOnInit(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,
-                 22,
+                 13,
+                 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,
-                                   MAKEINTRESOURCEW(IDD_GENERAL),
-                                   pInfo->hTab,
-                                   (DLGPROC)GeneralDlgProc,
-                                   (LPARAM)pInfo))
+            if (CreateDialogW(hInst,
+                              MAKEINTRESOURCEW(IDD_GENERAL),
+                              hwnd,
+                              (DLGPROC)GeneralDlgProc))
            {
                WCHAR str[256];
                ZeroMemory(&item, sizeof(TCITEM));
@@ -998,11 +985,10 @@ OnMainCreate(HWND hwnd,
                (void)TabCtrl_InsertItem(pInfo->hTab, 0, &item);
            }

-            if (CreateDialogParamW(hInst,
-                                   MAKEINTRESOURCEW(IDD_DISPLAY),
-                                   pInfo->hTab,
-                                   (DLGPROC)DisplayDlgProc,
-                                   (LPARAM)pInfo))
+            if (CreateDialogW(hInst,
+                              MAKEINTRESOURCEW(IDD_DISPLAY),
+                              hwnd,
+                              (DLGPROC)DisplayDlgProc))
            {
                WCHAR str[256];
                ZeroMemory(&item, sizeof(TCITEM));
--- a/reactos/base/shell/explorer/res/logov.bmp
+++ b/reactos/base/shell/explorer/res/logov.bmp
--- a/reactos/boot/bootdata/hivedef_i386.inf
+++ b/reactos/boot/bootdata/hivedef_i386.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"
 HKCU,"Control Panel\International\Geo","Nation",0x00000000,"1"
--- a/reactos/dll/win32/comctl32/toolbar.c
+++ b/reactos/dll/win32/comctl32/toolbar.c
@@ -2665,7 +2665,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);

--- a/reactos/dll/win32/syssetup/install.c
+++ b/reactos/dll/win32/syssetup/install.c
@@ -756,6 +756,7 @@ CreateShortcuts(VOID)

    /* Create desktop shortcuts */
    CreateShortcut(CSIDL_DESKTOP, NULL, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE);
+    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, TRUE);
--- a/reactos/include/reactos/version.h
+++ b/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_PATCH_LEVEL  0
+#define KERNEL_VERSION_MINOR        3
+#define KERNEL_VERSION_PATCH_LEVEL  6

 #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
--- a/rosapps/applications/downloader/downloader.xml
+++ b/rosapps/applications/downloader/downloader.xml
@@ -14,13 +14,6 @@
 			<description>The most popular and one of the best free Web Browsers out there.</description>
 			<location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-2.0/win32/en-US/Firefox%20Setup%202.0.0.16.exe</location>
 		</application>
-		<application name="Opera">
-			<regname>Opera</regname>
-			<licence>Freeware</licence>
-			<version>9.26</version>
-			<description>The most popular and one of the best free Web Browsers out there.</description>
-			<location>http://mirror.nwps.ws/opera/win/926/en/Opera_9.26_Classic_Setup.exe</location>
-		</application>
 		<application name="Thunderbird 1.5">
 			<regname>Mozilla Thunderbird (1.5)</regname>
 			<licence>MPL/GPL/LGPL</licence>
@@ -35,12 +28,6 @@
 			<description>The most popular and one of the best free Mail Clients out there.</description>
 			<location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-2.0/win32/en-US/Thunderbird%20Setup%202.0.0.16.exe</location>
 		</application>
-		<application name="SeaMonkey">
-			<regname>SeaMonkey (1.1.9)</regname>
-			<version>1.1.9</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://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.9/seamonkey-1.1.9.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>
@@ -63,52 +50,16 @@
 			<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.4</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.4-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">
-			<regname>"AbiWord 2.6.4 (remove only)"</regname>
-			<version>2.6.4</version>
+			<regname>"AbiWord 2.4.6 (remove only)"</regname>
+			<version>2.4.6</version>
 			<description>Word processor.</description>
-			<location>http://www.abiword.org/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.4.exe</location>
-		</application>
-		<application name="OpenOffice">
-			<regname>OpenOffice.org 2.4</regname>
-			<version>2.4.0</version>
-			<description>THE Open Source Office Suite.</description>
-			<location>http://ftp.tu-chemnitz.de/pub/openoffice-extended/stable/2.4.0/OOo_2.4.0_Win32Intel_install_en-US.exe</location>
+			<location>http://abisource.com/downloads/abiword/2.4.6/Windows/abiword-setup-2.4.6.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.19</regname>
-			<version>0.9.19</version>
-			<description>An Open Source bitmap graphics editor geared towards young children.</description>
-			<location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.19-win32-installer.exe</location>
-		</application>
 		<application name="zeckensack's glide wrapper">
 			<regname>GlidewrapZbag</regname>
 			<version>0.84c</version>
@@ -116,21 +67,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.2</regname>
-			<version>1.2</version>
-			<description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description>
-			<location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.2.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.4b</regname>
 			<version>0.18.4b</version>
@@ -139,12 +76,6 @@
 		</application>
 	</category>
 	<category name="Games &amp; Fun" icon="6">
-		<application name="ScummVM">
-			<regname>ScummVM 0.11.1</regname>
-			<version>0.11.1</version>
-			<description>SamNMax, Day of Tentacle, etc on ReactOS</description>
-			<location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.11.1-win32.exe</location>
-		</application>
 		<application name="Diablo 2 Shareware">
 			<regname>Diablo II Shareware</regname>
 			<version>1.4</version>
@@ -157,24 +88,12 @@
 			<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.6.0</regname>
-			<version>0.6.0</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.6.0-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>
@@ -189,12 +108,6 @@
 			<location>http://ftp.gnu.org/gnu/winboard/winboard-4_2_7b.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">
 			<regname>7-Zip 4.57</regname>
Author	SHA1	Message	Date
Colin Finck	cb2e180e16	Remove non-working apps from the Downloader list (according to http://www.reactos.org/wiki/index.php/Tests_for_0.3.6 ) and downgrade Abiword to 2.4.6 (currently runs best on ROS) svn path=/branches/ros-branch-0_3_6/; revision=35133	2008-08-05 21:07:19 +00:00
Colin Finck	841c7bfe4f	- Set "lake.bmp" as the default wallpaper - Add a shortcut to "Download !" to the Desktop - Change the version number in the Explorer start menu bitmap svn path=/branches/ros-branch-0_3_6/; revision=35035	2008-08-02 13:10:59 +00:00
Colin Finck	fa4bdfe8bb	Hack: Copy the toolbar image on our own instead of using CopyImage to hackfix the messed up toolbar graphics as it was done for previous releases. svn path=/branches/ros-branch-0_3_6/; revision=35034	2008-08-02 13:02:42 +00:00
Colin Finck	4a8be5c1a2	Hack: Hackfix the HitTest problem in mstsc as it was done for previous releases svn path=/branches/ros-branch-0_3_6/; revision=35033	2008-08-02 13:01:08 +00:00
Colin Finck	9c2dbc7133	Change the version to 0.3.6 svn path=/branches/ros-branch-0_3_6/; revision=35029	2008-08-02 10:19:56 +00:00