Merge r37177

This should be the very final now, no more bugs accepted ;-)

svn path=/branches/ros-branch-0_3_7/; revision=37178

reactos/base/applications/mstsc/connectdialog.c

@@ -198,19 +198,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);
@@ -256,13 +249,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:
@@ -746,23 +740,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);
@@ -836,13 +823,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:
@@ -986,11 +974,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));
@@ -1001,11 +988,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));

reactos/base/shell/cmd/batch.c

@@ -427,7 +427,7 @@ LPTSTR ReadBatchLine ()
 			return textline;
 		}
 
-		if (!FileGetString (bc->hBatchFile, textline, sizeof (textline) / sizeof (textline[0])))
+		if (!FileGetString (bc->hBatchFile, textline, sizeof (textline) / sizeof (textline[0]) - 1))
 		{
 			TRACE ("ReadBatchLine(): Reached EOF!\n");
 			/* End of file.... */
@@ -440,6 +440,9 @@ LPTSTR ReadBatchLine ()
 		}
 		TRACE ("ReadBatchLine(): textline: \'%s\'\n", debugstr_aw(textline));
 
+		if (textline[_tcslen(textline) - 1] != _T('\n'))
+			_tcscat(textline, _T("\n"));
+
 		first = textline;
 
 		/* cmd block over multiple lines (..) */

reactos/base/shell/explorer/taskbar/traynotify.cpp

@@ -741,7 +741,7 @@ void NotifyArea::Paint()
 			AlphaBlend(canvas, x, y, NOTIFYICON_SIZE, NOTIFYICON_SIZE, mem_dc, 0, 0, NOTIFYICON_SIZE, NOTIFYICON_SIZE, blend);
 		} else
 #endif
-			DrawIconEx(canvas, x, y, it->_hIcon, NOTIFYICON_SIZE, NOTIFYICON_SIZE, 0, 0, DI_NORMAL);
+			DrawIconEx(canvas, x, y, it->_hIcon, NOTIFYICON_SIZE, NOTIFYICON_SIZE, 0, GetSysColorBrush(COLOR_BTNFACE), DI_NORMAL);
 
 		x += NOTIFYICON_DIST;
 	}

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"

reactos/dll/3rdparty/mesa32/src/x86/common_x86.c

@@ -140,11 +140,9 @@ static void check_os_sse_support( void )
          _mesa_x86_cpu_features &= ~(X86_FEATURE_XMM);
    }
 #elif defined(WIN32)
-   LPTOP_LEVEL_EXCEPTION_FILTER oldFilter;
-   
    /* Install our ExceptionFilter */
-   oldFilter = SetUnhandledExceptionFilter( ExceptionFilter );
-   
+   AddVectoredExceptionHandler( 1, ExceptionFilter );
+
    if ( cpu_has_xmm ) {
       _mesa_debug(NULL, "Testing OS support for SSE...\n");
 
@@ -169,8 +167,7 @@ static void check_os_sse_support( void )
       }
    }
 
-   /* Restore previous exception filter */
-   SetUnhandledExceptionFilter( oldFilter );
+   RemoveVectoredExceptionHandler( ExceptionFilter );
 
    if ( cpu_has_xmm ) {
       _mesa_debug(NULL, "Tests of OS support for SSE passed.\n");
@@ -312,3 +309,4 @@ void _mesa_init_all_x86_transform_asm( void )
 #endif
 }
 
+

reactos/dll/nls/nls.rbuild

@@ -4,13 +4,13 @@
 	<directory name="idndl">
 		<xi:include href="idndl/idndl.rbuild" />
 	</directory>
-	<directory name="idndl_redist">
+	<!--<directory name="idndl_redist">
 		<xi:include href="idndl_redist/idndl_redist.rbuild" />
-	</directory>
+	</directory>-->
 	<directory name="normaliz">
 		<xi:include href="normaliz/normaliz.rbuild" />
 	</directory>
-	<directory name="normaliz_redist">
+	<!--<directory name="normaliz_redist">
 		<xi:include href="normaliz_redist/normaliz_redist.rbuild" />
-	</directory>
+	</directory>-->
 </group>

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);
 

reactos/dll/win32/iphlpapi/iphlpapi_main.c

@@ -1388,8 +1388,32 @@ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen)
     CopyMemory(&pFixedInfo->DnsServerList, resInfo->DnsList, sizeof(IP_ADDR_STRING));
     if (resInfo->riCount > 1)
     {
-      pFixedInfo->DnsServerList.Next = (struct _IP_ADDR_STRING*)((char*)pFixedInfo + sizeof(FIXED_INFO));
-      CopyMemory(pFixedInfo->DnsServerList.Next, resInfo->DnsList->Next, sizeof(IP_ADDR_STRING) * (resInfo->riCount-1));
+      IP_ADDR_STRING *pSrc = resInfo->DnsList->Next;
+      IP_ADDR_STRING *pTarget = (struct _IP_ADDR_STRING*)((char*)pFixedInfo + sizeof(FIXED_INFO));
+
+      pFixedInfo->DnsServerList.Next = pTarget;
+
+      do
+      {
+        CopyMemory(pTarget, pSrc, sizeof(IP_ADDR_STRING));
+        resInfo->riCount--;
+        if (resInfo->riCount > 1)
+        {
+          pTarget->Next = (IP_ADDR_STRING*)((char*)pTarget + sizeof(IP_ADDR_STRING));
+          pTarget = pTarget->Next;
+          pSrc = pSrc->Next;
+        }
+        else
+        {
+          pTarget->Next = NULL;
+          break;
+        }
+      }
+      while(TRUE);
+    }
+    else
+    {
+      pFixedInfo->DnsServerList.Next = NULL;
     }
   }
 

reactos/dll/win32/iphlpapi/resinfo_reactos.c

@@ -244,6 +244,6 @@ PIPHLP_RES_INFO getResInfo() {
 
 VOID disposeResInfo( PIPHLP_RES_INFO InfoPtr ) 
 {
-    RtlFreeHeap( GetProcessHeap(), 0, InfoPtr );
     HeapFree(GetProcessHeap(), 0, InfoPtr->DnsList);
+    RtlFreeHeap( GetProcessHeap(), 0, InfoPtr );
 }

reactos/dll/win32/netcfgx/inetcfgcomp_iface.c

@@ -442,10 +442,11 @@ INetCfgComponent_fnRaisePropertyUi(
          hr = CreateNotificationObject(This,iface, pUnk);
          if (FAILED(hr))
              return hr;
-         if (dwFlags == NCRP_QUERY_PROPERTY_UI)
-             return S_OK;
     }
 
+    if (dwFlags == NCRP_QUERY_PROPERTY_UI)
+        return S_OK;
+
     dwDefPages = 0;
     Pages = 0;
 

reactos/dll/win32/netshell/lanstatusui.c

@@ -429,9 +429,11 @@ LANStatusUiDetailsDlg(
             {
                 li.iItem = InsertItemToListView(hDlgCtrl, IDS_PHYSICAL_ADDRESS);
                 if (li.iItem >= 0)
-                    if (MultiByteToWideChar(CP_ACP, 0, (LPCSTR)pCurAdapter->Address, -1, szBuffer, sizeof(szBuffer)/sizeof(WCHAR)))
-                        SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li);
-
+                {
+                    swprintf(szBuffer, L"%02x-%02x-%02x-%02x-%02x-%02x",pCurAdapter->Address[0], pCurAdapter->Address[1],
+                             pCurAdapter->Address[2], pCurAdapter->Address[3], pCurAdapter->Address[4], pCurAdapter->Address[5]);
+                    SendMessageW(hDlgCtrl, LVM_SETITEMW, 0, (LPARAM)&li);
+                }
                 li.iItem = InsertItemToListView(hDlgCtrl, IDS_IP_ADDRESS);
                 if (li.iItem >= 0)
                     if (MultiByteToWideChar(CP_ACP, 0, pCurAdapter->IpAddressList.IpAddress.String, -1, szBuffer, sizeof(szBuffer)/sizeof(WCHAR)))

reactos/dll/win32/shell32/shfldr_cpanel.c

@@ -1212,7 +1212,7 @@ static HRESULT WINAPI ICPanel_IContextMenu2_QueryContextMenu(
     if (LoadStringW(shell32_hInstance, IDS_OPEN, szBuffer, sizeof(szBuffer)/sizeof(WCHAR)))
     {
         szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
-        _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_DEFAULT);
+        _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_OPEN, MFT_STRING, szBuffer, MFS_DEFAULT); //FIXME identifier
         Count++;
     }
 
@@ -1224,7 +1224,7 @@ static HRESULT WINAPI ICPanel_IContextMenu2_QueryContextMenu(
         }
         szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0';
 
-        _InsertMenuItemW(hMenu, indexMenu++, TRUE, idCmdFirst + Count, MFT_STRING, szBuffer, MFS_ENABLED);
+        _InsertMenuItemW(hMenu, indexMenu++, TRUE, IDS_CREATELINK, MFT_STRING, szBuffer, MFS_ENABLED); //FIXME identifier
         Count++;
     }
     return MAKE_HRESULT(SEVERITY_SUCCESS, 0, Count);
@@ -1251,7 +1251,7 @@ static HRESULT WINAPI ICPanel_IContextMenu2_InvokeCommand(
 
     TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd);
 
-    if (lpcmi->lpVerb == MAKEINTRESOURCEA(1))
+    if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_OPEN)) //FIXME
     {
        ZeroMemory(&sei, sizeof(sei));
        sei.cbSize = sizeof(sei);
@@ -1264,7 +1264,7 @@ static HRESULT WINAPI ICPanel_IContextMenu2_InvokeCommand(
        if (sei.hInstApp <= (HINSTANCE)32)
           return E_FAIL;
     }
-    else if (lpcmi->lpVerb == MAKEINTRESOURCEA(2))
+    else if (lpcmi->lpVerb == MAKEINTRESOURCEA(IDS_CREATELINK)) //FIXME
     {
         if (!SHGetSpecialFolderPathW(NULL, szPath, CSIDL_DESKTOPDIRECTORY, FALSE))
              return E_FAIL;

reactos/dll/win32/shell32/shlview.c

@@ -835,6 +835,8 @@ static HRESULT ShellView_OpenSelectedItems(IShellViewImpl * This)
 	static UINT CF_IDLIST = 0;
 	HRESULT hr;
 	IDataObject* selection;
+	IContextMenu * cm;
+	HMENU hmenu;
 	FORMATETC fetc;
 	STGMEDIUM stgm;
 	LPIDA pIDList;
@@ -843,14 +845,70 @@ static HRESULT ShellView_OpenSelectedItems(IShellViewImpl * This)
 	LPCWSTR parent_dir = NULL;
 	SFGAOF attribs;
 	int i;
+	CMINVOKECOMMANDINFOEX ici;
+	MENUITEMINFOW info;
 
 	if (0 == ShellView_GetSelections(This))
 	{
 	  return S_OK;
 	}
+
+	hr = IShellFolder_GetUIObjectOf(This->pSFParent, This->hWnd, This->cidl,
+	                                (LPCITEMIDLIST*)This->apidl, &IID_IContextMenu,
+	                                0, (LPVOID *)&cm);
+
+	if (SUCCEEDED(hr))
+	{
+		hmenu = CreatePopupMenu();
+		if (hmenu)
+		{
+			if (SUCCEEDED(IContextMenu_QueryContextMenu( cm, hmenu, 0, 0x20, 0x7fff, CMF_DEFAULTONLY)))
+			{
+				INT def = -1, n = GetMenuItemCount(hmenu);
+
+				for ( i = 0; i < n; i++ )
+				{
+					memset( &info, 0, sizeof info );
+					info.cbSize = sizeof info;
+					info.fMask = MIIM_FTYPE | MIIM_STATE | MIIM_ID;
+					if (GetMenuItemInfoW( hmenu, i, TRUE, &info))
+					{
+						if (info.fState & MFS_DEFAULT)
+						{
+							def = info.wID;
+							break;
+						}
+					}
+				}
+				if (def != -1)
+				{
+					memset( &ici, 0, sizeof ici );
+					ici.cbSize = sizeof ici;
+					ici.lpVerb = MAKEINTRESOURCEA( def );
+					ici.hwnd = This->hWnd;
+
+					if (IContextMenu_InvokeCommand(cm, (LPCMINVOKECOMMANDINFO) &ici ) == S_OK)
+					{
+						IContextMenu_Release(cm);
+						DestroyMenu( hmenu );
+						return S_OK;
+					}
+				}
+				
+			}
+			DestroyMenu( hmenu );
+		}
+		IContextMenu_Release(cm);
+	}
+
+
+
 	hr = IShellFolder_GetUIObjectOf(This->pSFParent, This->hWnd, This->cidl,
 	                                (LPCITEMIDLIST*)This->apidl, &IID_IDataObject,
 	                                0, (LPVOID *)&selection);
+
+
+
 	if (FAILED(hr))
 	  return hr;
 

reactos/dll/win32/shell32/shv_def_cmenu.c

@@ -1404,10 +1404,10 @@ DoProperties(
     }
     else if (_ILIsNetHood(This->dcm.apidl[0]))
     {
-        /* FIXME
-         * implement nethood properties
-         */
-        FIXME("implement network connection shell folder\n");
+        //FIXME path!
+        ShellExecuteW(NULL, L"open", L"explorer.exe",
+                      L"/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}", 
+                      NULL, SW_SHOWDEFAULT);
         return S_OK;
     }
     else if (_ILIsBitBucket(This->dcm.apidl[0]))

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);

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  7
 
 #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

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/2.0.0.17/win32/en-US/Firefox%20Setup%202.0.0.17.exe</location>
 		</application>
-		<application name="Opera">
-			<regname>Opera</regname>
-			<licence>Freeware</licence>
-			<version>9.26</version>
-			<description>The popular Opera Browser with many advanced features and including a Mail and BitTorrent client.</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/2.0.0.17/win32/en-US/Thunderbird%20Setup%202.0.0.17.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.12/seamonkey-1.1.12.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,12 +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.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>
@@ -84,25 +65,8 @@
 			<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>
-		</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>
@@ -116,91 +80,7 @@
 			<location>http://www.zeckensack.de/glide/archive/GlideWrapper084c.exe</location>
 		</application>
 	</category>
-	<category name="Libraries" icon="4">
-		<application name="Microsoft XML 3">
-			<regname>msxml3</regname>
-			<version>3.0</version>
-			<description>MSXML3 is needed for some MSI Installers.</description>
-			<location>http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b19f33dd/msxml3.msi</location>
-		</application>
-		<application name="OLE Viewer and Microsoft Foundation Classes version 4">
-			<regname>mfc40</regname>
-			<version>4.0</version>
-			<description>MFC 4 is needed by some applications</description>
-			<location>http://download.microsoft.com/download/ole/ole2v/3.5/w351/en-us/ole2v.exe</location>
-		</application>
-
-		<application name="Visual Basic 3 Runtime">
-			<regname>vb3run</regname>
-			<version>3.0</version>
-			<description>Visual Basic 3 Runtime</description>
-			<location>http://download.microsoft.com/download/vb30/utility/1/w9xnt4/en-us/vb3run.exe</location>
-		</application>
-
-		<application name="Visual Basic 4 Runtime">
-			<regname>vb4run</regname>
-			<version>4.0</version>
-			<description>Visual Basic 4 Runtime</description>
-			<location>http://download.microsoft.com/download/vb40ent/sample27/1/w9xnt4/en-us/vb4run.exe</location>
-		</application>
-
-		<application name="Visual Basic 5 Runtime">
-			<regname>vb5run</regname>
-			<version>5.0</version>
-			<description>Visual Basic 5 Runtime</description>
-			<location>http://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm50.exe</location>
-		</application>
-
-		<application name="Visual Basic 6 Runtime">
-			<regname>vb6run</regname>
-			<version>6.0</version>
-			<description>Visual Basic 6 Runtime</description>
-			<location>http://download.microsoft.com/download/vb60pro/install/6/win98me/en-us/vbrun60.exe</location>
-		</application>
-
-		<application name="Visual Studio 6 Runtime">
-			<regname>vc6run</regname>
-			<version>6.0</version>
-			<description>Visual Studio 6 Runtime</description>
-			<location>http://download.microsoft.com/download/vc60pro/update/1/w9xnt4/en-us/vc6redistsetup_enu.exe</location>
-		</application>
-
-		<application name="Visual Studio 2005 Runtime">
-			<regname>vc2005run</regname>
-			<version>7.0</version>
-			<description>Visual Studio 2005 Runtime</description>
-			<location>http://download.microsoft.com/download/d/3/4/d342efa6-3266-4157-a2ec-5174867be706/vcredist_x86.exe</location>
-		</application>
-
-		<application name="Visual Studio 2005 Runtime SP1">
-			<regname>vc2005sp1run</regname>
-			<version>7.1</version>
-			<description>Visual Studio 2005 Runtime SP1</description>
-			<location>http://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906ecf088/vcredist_x86.exe</location>
-		</application>
-
-		<application name="Visual Studio 2008 Runtime">
-			<regname>vc2008run</regname>
-			<version>8.0</version>
-			<description>Visual Studio 2008 Runtime</description>
-			<location>http://download.microsoft.com/download/1/1/1/1116b75a-9ec3-481a-a3c8-1777b5381140/vcredist_x86.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>
@@ -209,12 +89,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>
@@ -223,10 +97,6 @@
 			<depends>GlidewrapZbag</depends>
 			<postinstallaction>http://svn.reactos.org/downloads/d2fix.exe</postinstallaction>
 		</application>
-		<application name="Tile World">
-			<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>
@@ -251,19 +121,6 @@
 			<description>Atomix Clone using SDL libs.</description>
 			<location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location>
 		</application>
-		<application name="WinBoard">
-			<regname>WinBoard 4.2.7b</regname>
-			<version>4.2.7b</version>
-			<licence>GPL 3</licence>
-			<description>WinBoard is a graphical chessboard for the Windows/ReactOS that can serve as a user interface for GNU Chess, Crafty, and other chess engines, for the Internet Chess Servers, and for electronic mail correspondence chess.</description>
-			<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">
@@ -272,12 +129,6 @@
 			<description>Utility to create and open 7zip, zip, tar, rar and other archive files.</description>
 			<location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z457.exe</location>
 		</application>
-		<application name="uTorrent">
-			<regname>&#181;Torrent</regname>
-			<version>1.8</version>
-			<description>Small and fast BitTorrent Client.</description>
-			<location>http://download.utorrent.com/1.8/utorrent.exe</location>
-		</application>
 		<application name="Audio Grabber">
 			<regname>Audiograbber 1.83 SE</regname>
 			<version>1.83 SE</version>