Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mbosma] 25767: New try: Lester Kortenhoeven (lester(at)kortenhoeven(dot)de): * Implement uninstall feature. Does not work under reactos yet, because it does not seem to store the installer information under the registry path windows stores them. * Show Version in the description.
by mbosma＠svn.reactos.org 10 Feb '07

10 Feb '07

Author: mbosma Date: Sun Feb 11 00:48:44 2007 New Revision: 25767 URL: http://svn.reactos.org/svn/reactos?rev=25767&view=rev Log: New try: Lester Kortenhoeven (lester(at)kortenhoeven(dot)de): * Implement uninstall feature. Does not work under reactos yet, because it does not seem to store the installer information under the registry path windows stores them. * Show Version in the description. Added: trunk/reactos/base/applications/downloader/resources/10.bmp (with props) trunk/reactos/base/applications/downloader/resources/9.bmp (with props) trunk/reactos/base/applications/downloader/resources/uninstall.bmp (with props) Modified: trunk/reactos/base/applications/downloader/downloader.rbuild trunk/reactos/base/applications/downloader/downloader.xml trunk/reactos/base/applications/downloader/main.c trunk/reactos/base/applications/downloader/resources.h trunk/reactos/base/applications/downloader/rsrc.rc trunk/reactos/base/applications/downloader/structures.h trunk/reactos/base/applications/downloader/translations/de.rc trunk/reactos/base/applications/downloader/translations/en.rc trunk/reactos/base/applications/downloader/translations/fr.rc trunk/reactos/base/applications/downloader/translations/it.rc trunk/reactos/base/applications/downloader/xml.c Modified: trunk/reactos/base/applications/downloader/downloader.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.rbuild (original) +++ trunk/reactos/base/applications/downloader/downloader.rbuild Sun Feb 11 00:48:44 2007 @@ -10,8 +10,9 @@ <define name="__USE_W32API" /> <define name="WINVER">0x0501</define> <define name="_WIN32_IE>0x0600</define> - + <library>kernel32</library> + <library>advapi32</library> <library>ntdll</library> <library>user32</library> <library>gdi32</library> Modified: trunk/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.xml (original) +++ trunk/reactos/base/applications/downloader/downloader.xml Sun Feb 11 00:48:44 2007 @@ -1,54 +1,90 @@ <tree Version="1">  <category name="Internet & Network" icon="1"> - <application name="Firefox"> + <application name="Firefox 1.5"> + <regname>Mozilla Firefox (1.5)</regname> + <licence>MPL/GPL/LGPL</licence> + <version>1.5.0.9</version> + <description>The most popular and one of the best free WebBrowsers out there.</description> + <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/1.5.0.9/wi…</location> + </application> + <application name="Firefox 2.0"> + <regname>Mozilla Firefox (2.0.0.1)</regname> + <licence>MPL/GPL/LGPL</licence> + <version>2.0.0.1</version> <description>The most popular and one of the best free WebBrowsers out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win…</location> </application> <application name="Thunderbird"> + <regname>Mozilla Thunderbird (1.5)</regname> + <licence>MPL/GPL/LGPL</licence> + <version>1.5.0.9</version> <description>The most popular and one of the best free MailClients out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/thunderbird/releases/latest…</location> </application> <application name="SeaMonkey"> + <regname>SeaMonkey (1.0.7)</regname> + <version>1.0.7</version> <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, Composer bundle you will ever need.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.0.7/se…</location> + </application> + <application name="Mozilla ActiveX Control"> + <regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname> + <version>1.7.12</version> + <description>Essential Component to get ReactOS Explorer's and other application's Internet Browsing feature running.</description> + <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactO…</location> + </application> + <application name="Off By One Browser"> + <regname>The Off By One Web Browser</regname> + <description>The Off By One Browser is a very small and fast web browser with full HTML 3.2 support.</description> + <location>http://offbyone.com/offbyone/images/OffByOneSetup.exe</location> </application> <application name="Samba TNG"> <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="Mozilla ActiveX Control"> - <description>Essential Component to get ReactOS Explorer's and other application's Internet Browsing feature running.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactO…</location> - </application> <application name="Miranda IM"> + <regname>Miranda IM</regname> + <version>0.5.1</version> <description>Open source multiprotocol instant messaging application - May not work completely.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.5.1-unicode…</location> </application> <application name="Putty"> + <regname>PuTTY version 0.59</regname> + <licence>MIT</licence> + <version>0.59</version> <description>A free SSH, Telnet, rlogin, and raw TCP client.</description> - <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.58-installer.exe</location> + <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.59-installer.exe</location> </application> </category> <category name="Office" icon="2"> <application name="Abiword"> + <regname>"AbiWord 2.4.1 (remove only)"</regname> + <version>2.4.1</version> <description>Word processor.</description> <location>http://www.abiword.org/downloads/abiword/2.4.1/Windows/abiword-setup-2.4.1.…</location> </application> <application name="OpenOffice"> + <regname>OpenOffice.org 2.1</regname> + <version>2.1.0</version> <description>THE Open Source Office Suite.</description> <location>http://ftp.tu-chemnitz.de/pub/openoffice-extended//stable/2.1.0/OOo_2.1.0_W…</location> </application> </category> <category name="Graphics" icon="3"> <application name="IrfanView"> + <regname>IrfanView (remove only)</regname> + <version>3.99</version> <description>Viewer for all kinds of graphics/audio files/video files.</description> <location>http://gd.tuwien.ac.at/graphics/irfanview/iview399.exe</location> </application> <application name="IrfanView Plugins"> + <version>3.99</version> <description>Additional Plugins for supporting more file types.</description> <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_399.exe</location> </application> <application name="TuxPaint"> + <regname>Tux Paint 0.9.16</regname> + <version>0.9.16</version> <description>An open source bitmap graphics editor geared towards young children.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.16-win32-in…</location> </application> @@ -57,12 +93,16 @@ </category> <category name="Development" icon="5"> <application name="ReactOS Build Environment"> + <regname>ReactOS Build Environment 0.3.4</regname> + <version>0.3.4</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-0.3.3.exe</location> + <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-0.3.4.exe</location> </application> </category> <category name="Games & Fun" icon="6"> <application name="ScummVM"> + <regname>ScummVM 0.9.1</regname> + <version>0.9.1</version> <description>SamNMax, Day of Tentacle, etc on ReactOS</description> <location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.9.1-win32.exe</location> </application> @@ -70,17 +110,41 @@ <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-…</location> </application> + <application name="LBreakout2">LBreakout2 2.4.1 + <regname>LBreakout2 2.4.1</regname> + <version>2.4.1</version> + <description>Breakout Clone using SDL libs.</description> + <location>http://switch.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.…</location> + </application> + <application name="LGeneral"> + <regname>LGeneral 1.1</regname> + <version>1.1</version> + <description>Panzer General Clone using SDL libs.</description> + <location>http://kent.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://heanet.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location> + </application> </category> <category name="Tools" icon="7"> <application name="7-Zip"> + <regname>7-Zip 4.42</regname> + <version>4.42</version> <description>Utility to create and open 7zip, zip, tar, rar and other archive files.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z442.exe</location> </application> <application name="uTorrent"> + <regname>µTorrent</regname>  + <version>1.6</version> <description>Small and fast Torrent Client.</description> <location>http://download.utorrent.com/1.6/uTorrent-1.6-install.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> Modified: trunk/reactos/base/applications/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/main.c (original) +++ trunk/reactos/base/applications/downloader/main.c Sun Feb 11 00:48:44 2007 @@ -2,19 +2,20 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/downloader/xml.c * PURPOSE: Main program - * PROGRAMMERS: Maarten Bosma + * PROGRAMMERS: Maarten Bosma, Lester Kortenhoeven */ #include <windows.h> #include <commctrl.h> #include <richedit.h> #include <stdio.h> +#include <shlwapi.h> #include "resources.h" #include "structures.h" #define XML_PATH "C:\\ReactOS\\system32\\downloader.xml" -HWND hCategories, hApps, hDownloadButton, hUpdateButton, hHelpButton; +HWND hwnd, hCategories, hApps, hDownloadButton, hUninstallButton, hUpdateButton, hHelpButton; HBITMAP hLogo, hUnderline; WCHAR* DescriptionHeadline = L""; WCHAR* DescriptionText = L""; @@ -27,13 +28,49 @@ VOID FreeTree (struct Category* Node); WCHAR Strings [STRING_COUNT][MAX_STRING_LENGHT]; +BOOL getUninstaller(WCHAR* RegName, WCHAR* Uninstaller) { + + const DWORD ArraySize = 200; + + HKEY hKey1; + HKEY hKey2; + DWORD Type = 0; + DWORD Size = ArraySize; + WCHAR Value[ArraySize]; + WCHAR KeyName[ArraySize]; + LONG i = 0; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall",0,KEY_READ,&hKey1) == ERROR_SUCCESS) { + while (RegEnumKeyExW(hKey1,i,KeyName,&Size,NULL,NULL,NULL,NULL) == ERROR_SUCCESS) { + ++i; + RegOpenKeyExW(hKey1,KeyName,0,KEY_READ,&hKey2); + Size = ArraySize; + if (RegQueryValueExW(hKey2,L"DisplayName",0,&Type,(LPBYTE)Value,&Size) == ERROR_SUCCESS) { + Size = ArraySize; + if (StrCmpW(Value,RegName) == 0) { + if (RegQueryValueExW(hKey2,L"UninstallString",0,&Type,(LPBYTE)Uninstaller,&Size) == ERROR_SUCCESS) { + RegCloseKey(hKey2); + RegCloseKey(hKey1); + return TRUE; + } else { + RegCloseKey(hKey2); + RegCloseKey(hKey1); + return FALSE; + } + } + } + RegCloseKey(hKey2); + Size = ArraySize; + } + RegCloseKey(hKey1); + } + return FALSE; +} + void ShowMessage (WCHAR* title, WCHAR* message) { - HWND hwnd; DescriptionHeadline = title; DescriptionText = message; - - hwnd = GetParent(hCategories); InvalidateRect(hwnd,NULL,TRUE); UpdateWindow(hwnd); } @@ -81,15 +118,23 @@ Insert.item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_IMAGE; Insert.hInsertAfter = TVI_LAST; Insert.hParent = TVI_ROOT; - Insert.item.iImage = 0; CurrentApplication = Category->Apps; + WCHAR Uninstaller[200]; while(CurrentApplication) { Insert.item.lParam = (UINT)CurrentApplication; Insert.item.pszText = CurrentApplication->Name; - Insert.item.cchTextMax = lstrlenW(CurrentApplication->Name); + Insert.item.cchTextMax = lstrlenW(CurrentApplication->Name); + Insert.item.iImage = 10; + if(StrCmpW(CurrentApplication->RegName,L"")) { + if(getUninstaller(CurrentApplication->RegName, Uninstaller)) + Insert.item.iImage = 9; + } else { + if(getUninstaller(CurrentApplication->Name, Uninstaller)) + Insert.item.iImage = 9; + } SendMessage(hwnd, TVM_INSERTITEM, 0, (LPARAM)&Insert); CurrentApplication = CurrentApplication->Next; } @@ -118,10 +163,13 @@ hHelpButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 550, 10, 40, 40, hwnd, 0, hInstance, NULL); hUpdateButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 500, 10, 40, 40, hwnd, 0, hInstance, NULL); hDownloadButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 330, 505, 140, 33, hwnd, 0, hInstance, NULL); + hUninstallButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 260, 505, 140, 33, hwnd, 0, hInstance, NULL); SendMessageW(hHelpButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_HELP))); SendMessageW(hUpdateButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_UPDATE))); SendMessageW(hDownloadButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_DOWNLOAD))); + SendMessageW(hUninstallButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_UNINSTALL))); + ShowWindow(hUninstallButton, SW_HIDE); // Set deflaut entry for hApps Insert.item.mask = TVIF_TEXT|TVIF_IMAGE; @@ -143,7 +191,9 @@ ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_5)), NULL); ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_6)), NULL); ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_7)), NULL); - ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_8)), NULL); + ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_8)), NULL); + ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_9)), NULL); + ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_10)), NULL); // Fill the TreeViews AddItems (hCategories, Root.Children, NULL); @@ -198,6 +248,37 @@ DrawTextW(hdc, DescriptionText, lstrlenW(DescriptionText), &Rect, DT_WORDBREAK|DT_NOPREFIX); // ToDo: Call TabbedTextOut to draw a nice table DeleteObject(Font); +} + +void showUninstaller() { + int Split_Vertical = 200; + RECT Rect; + + GetClientRect(hwnd,&Rect); + ShowWindow(hUninstallButton,SW_SHOW); + MoveWindow(hDownloadButton,(Split_Vertical+Rect.right-Rect.left)/2,Rect.bottom-Rect.top-45,140,35,TRUE);; +} + +void hideUninstaller() { + int Split_Vertical = 200; + RECT Rect; + + GetClientRect(hwnd,&Rect); + ShowWindow(hUninstallButton,SW_HIDE); + MoveWindow(hDownloadButton,(Split_Vertical+Rect.right-Rect.left)/2-70,Rect.bottom-Rect.top-45,140,35,TRUE); +} + +void startUninstaller(WCHAR* Uninstaller) { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + CreateProcessW(NULL,Uninstaller,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi); + CloseHandle(pi.hThread); + // WaitForSingleObject(pi.hProcess, INFINITE); // If you want to wait for the Unistaller + CloseHandle(pi.hProcess); + hideUninstaller(); } LRESULT CALLBACK WndProc (HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) @@ -244,6 +325,20 @@ else ShowMessage(Strings[IDS_NO_APP_TITLE], Strings[IDS_NO_APP]); } + else if (lParam == (LPARAM)hUninstallButton) + { + if(SelectedApplication) + { + WCHAR Uninstaller[200]; + if(StrCmpW(SelectedApplication->RegName, L"")) { + if(getUninstaller(SelectedApplication->RegName, Uninstaller)) + startUninstaller(Uninstaller); + } else { + if(getUninstaller(SelectedApplication->Name, Uninstaller)) + startUninstaller(Uninstaller); + } + } + } else if (lParam == (LPARAM)hUpdateButton) { ShowMessage(Strings[IDS_UPDATE_TITLE], Strings[IDS_UPDATE]); @@ -261,6 +356,7 @@ LPNMHDR data = (LPNMHDR)lParam; if(data->code == TVN_SELCHANGED) { + BOOL bShowUninstaller = FALSE; if(data->hwndFrom == hCategories) { struct Category* Category = (struct Category*) ((LPNMTREEVIEW)lParam)->itemNew.lParam; @@ -270,8 +366,43 @@ { SelectedApplication = (struct Application*) ((LPNMTREEVIEW)lParam)->itemNew.lParam; if(SelectedApplication) - ShowMessage(SelectedApplication->Name, SelectedApplication->Description); - } + { + DescriptionText = calloc(700,sizeof(WCHAR)); + if(StrCmpW(SelectedApplication->Version, L"")) { + StrCatW(DescriptionText, Strings[IDS_VERSION]); + StrCatW(DescriptionText, SelectedApplication->Version); + StrCatW(DescriptionText, L"\n"); + } + if(StrCmpW(SelectedApplication->Licence, L"")) { + StrCatW(DescriptionText, Strings[IDS_LICENCE]); + StrCatW(DescriptionText, SelectedApplication->Licence); + StrCatW(DescriptionText, L"\n"); + } + if(StrCmpW(SelectedApplication->Maintainer, L"")) { + StrCatW(DescriptionText, Strings[IDS_MAINTAINER]); + StrCatW(DescriptionText, SelectedApplication->Maintainer); + StrCatW(DescriptionText, L"\n"); + } + if(StrCmpW(SelectedApplication->Licence, L"") || StrCmpW(SelectedApplication->Version, L"") || StrCmpW(SelectedApplication->Maintainer, L"")) + StrCatW(DescriptionText, L"\n"); + StrCatW(DescriptionText, SelectedApplication->Description); + ShowMessage(SelectedApplication->Name, DescriptionText); + WCHAR Uninstaller[200]; + if(StrCmpW(SelectedApplication->RegName, L"")) { + if(getUninstaller(SelectedApplication->RegName, Uninstaller)) { + bShowUninstaller = TRUE; + } + } else { + if(getUninstaller(SelectedApplication->Name, Uninstaller)) { + bShowUninstaller = TRUE; + } + } + } + } + if (bShowUninstaller) + showUninstaller(); + else + hideUninstaller(); } } break; @@ -279,8 +410,8 @@ case WM_SIZING: { LPRECT pRect = (LPRECT)lParam; - if (pRect->right-pRect->left < 400) - pRect->right = pRect->left + 400; + if (pRect->right-pRect->left < 520) + pRect->right = pRect->left + 520; if (pRect->bottom-pRect->top < 300) pRect->bottom = pRect->top + 300; @@ -299,7 +430,11 @@ MoveWindow(hHelpButton, LOWORD(lParam)-50, 10, 40, 40, TRUE); MoveWindow(hUpdateButton, LOWORD(lParam)-100, 10, 40, 40, TRUE); - MoveWindow(hDownloadButton, (Split_Vertical+LOWORD(lParam))/2-70, HIWORD(lParam)-45, 140, 35, TRUE); + if(IsWindowVisible(hUninstallButton)) + MoveWindow(hDownloadButton, (Split_Vertical+LOWORD(lParam))/2, HIWORD(lParam)-45, 140, 35, TRUE); + else + MoveWindow(hDownloadButton, (Split_Vertical+LOWORD(lParam))/2-70, HIWORD(lParam)-45, 140, 35, TRUE); + MoveWindow(hUninstallButton, (Split_Vertical+LOWORD(lParam))/2-140, HIWORD(lParam)-45, 140, 35, TRUE); } break; @@ -320,7 +455,6 @@ INT WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInst, LPSTR lpCmdLine, INT nCmdShow) { - HWND hwnd; int i; WNDCLASSEXW WndClass = {0}; MSG msg; Modified: trunk/reactos/base/applications/downloader/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/resources.h (original) +++ trunk/reactos/base/applications/downloader/resources.h Sun Feb 11 00:48:44 2007 @@ -5,6 +5,7 @@ #define IDB_HELP 0x102 #define IDB_UPDATE 0x103 #define IDB_DOWNLOAD 0x104 +#define IDB_UNINSTALL 0x105 #define IDB_TREEVIEW_ICON_0 0x900 #define IDB_TREEVIEW_ICON_1 0x901 #define IDB_TREEVIEW_ICON_2 0x902 @@ -14,6 +15,8 @@ #define IDB_TREEVIEW_ICON_6 0x906 #define IDB_TREEVIEW_ICON_7 0x907 #define IDB_TREEVIEW_ICON_8 0x908 +#define IDB_TREEVIEW_ICON_9 0x909 +#define IDB_TREEVIEW_ICON_10 0x910 #define IDD_DOWNLOAD 0x100 #define IDC_PROGRESS 0x1000 #define IDC_STATUS 0x1001 @@ -36,6 +39,9 @@ #define IDS_XMLERROR_1 14 #define IDS_XMLERROR_2 15 #define IDS_DOWNLOAD_ERROR 16 +#define IDS_VERSION 17 +#define IDS_LICENCE 18 +#define IDS_MAINTAINER 19 -#define STRING_COUNT 17 +#define STRING_COUNT 20 #define MAX_STRING_LENGHT 0x100 Added: trunk/reactos/base/applications/downloader/resources/10.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/downloader/resources/10.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/downloader/resources/9.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/downloader/resources/9.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/downloader/resources/uninstall.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/downloader/resources/uninstall.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/applications/downloader/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/rsrc.rc (original) +++ trunk/reactos/base/applications/downloader/rsrc.rc Sun Feb 11 00:48:44 2007 @@ -1,11 +1,11 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_MAIN ICON DISCARDABLE "resources/main.ico" -//IDB_UNDERLINE BITMAP DISCARDABLE "resources/underline.bmp" IDB_LOGO BITMAP DISCARDABLE "resources/logo.bmp" IDB_HELP BITMAP DISCARDABLE "resources/help.bmp" IDB_UPDATE BITMAP DISCARDABLE "resources/update.bmp" IDB_DOWNLOAD BITMAP DISCARDABLE "resources/download.bmp" +IDB_UNINSTALL BITMAP DISCARDABLE "resources/uninstall.bmp" IDB_UNDERLINE BITMAP DISCARDABLE "resources/underline.bmp" IDB_TREEVIEW_ICON_0 BITMAP DISCARDABLE "resources/0.bmp" IDB_TREEVIEW_ICON_1 BITMAP DISCARDABLE "resources/1.bmp" @@ -16,6 +16,8 @@ IDB_TREEVIEW_ICON_6 BITMAP DISCARDABLE "resources/6.bmp" IDB_TREEVIEW_ICON_7 BITMAP DISCARDABLE "resources/7.bmp" IDB_TREEVIEW_ICON_8 BITMAP DISCARDABLE "resources/8.bmp" +IDB_TREEVIEW_ICON_9 BITMAP DISCARDABLE "resources/9.bmp" +IDB_TREEVIEW_ICON_10 BITMAP DISCARDABLE "resources/10.bmp" #include "translations/de.rc" Modified: trunk/reactos/base/applications/downloader/structures.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/structures.h (original) +++ trunk/reactos/base/applications/downloader/structures.h Sun Feb 11 00:48:44 2007 @@ -2,6 +2,7 @@ struct Application { WCHAR Name[0x100]; + WCHAR RegName[0x100]; WCHAR Version[0x100]; WCHAR Maintainer[0x100]; WCHAR Licence[0x100]; Modified: trunk/reactos/base/applications/downloader/translations/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/translations/de.rc (original) +++ trunk/reactos/base/applications/downloader/translations/de.rc Sun Feb 11 00:48:44 2007 @@ -29,4 +29,7 @@ IDS_XMLERROR_1 "XML Datei nicht gefunden!" IDS_XMLERROR_2 "XML Datei kann nicht verarbeitet werden!" IDS_DOWNLOAD_ERROR "Die Datei konnte nicht runtergeladen werden.\nBitte prüfen sie, ob eine Verbindung zum Internet besteht." + IDS_VERSION "Version: " + IDS_LICENCE "Lizenz: " + IDS_MAINTAINER "Maintainer: " END Modified: trunk/reactos/base/applications/downloader/translations/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/translations/en.rc (original) +++ trunk/reactos/base/applications/downloader/translations/en.rc Sun Feb 11 00:48:44 2007 @@ -29,4 +29,7 @@ IDS_XMLERROR_1 "Could not find the xml file !" IDS_XMLERROR_2 "Could not parse the xml file !" IDS_DOWNLOAD_ERROR "Unable to download the file.\nPlease check you internet connection." + IDS_VERSION "Version: " + IDS_LICENCE "Licence: " + IDS_MAINTAINER "Maintainer: " END Modified: trunk/reactos/base/applications/downloader/translations/fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/translations/fr.rc (original) +++ trunk/reactos/base/applications/downloader/translations/fr.rc Sun Feb 11 00:48:44 2007 @@ -29,4 +29,7 @@ IDS_XMLERROR_1 "Impossible de trouver le fichier xml !" IDS_XMLERROR_2 "Impossible d'analyser le fichier xml !" IDS_DOWNLOAD_ERROR "Impossible de télécharger le fichier.\nVeuillez vérifier votre connexion Internet." + IDS_VERSION "Version: " + IDS_LICENCE "Licence: " + IDS_MAINTAINER "Maintainer: " END Modified: trunk/reactos/base/applications/downloader/translations/it.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/translations/it.rc (original) +++ trunk/reactos/base/applications/downloader/translations/it.rc Sun Feb 11 00:48:44 2007 @@ -29,4 +29,7 @@ IDS_XMLERROR_1 "File xml non trovato !" IDS_XMLERROR_2 "Impossibile trattare il contenuto del file xml !" IDS_DOWNLOAD_ERROR "Download del file impossibile.\nVerifica la connessione a Internet." + IDS_VERSION "Version: " + IDS_LICENCE "Licence: " + IDS_MAINTAINER "Maintainer: " END Modified: trunk/reactos/base/applications/downloader/xml.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/xml.c (original) +++ trunk/reactos/base/applications/downloader/xml.c Sun Feb 11 00:48:44 2007 @@ -2,7 +2,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base\applications\downloader\xml.c * PURPOSE: Parsing of application information xml files - * PROGRAMMERS: Maarten Bosma + * PROGRAMMERS: Maarten Bosma, Lester Kortenhoeven */ #include <libs/expat/expat.h> @@ -81,6 +81,15 @@ CurrentApplication = Current->Apps; } + int currentlengt = lstrlenW(CurrentApplication->Maintainer); + MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->Maintainer[currentlengt], 0x100-currentlengt); + currentlengt = lstrlenW(CurrentApplication->RegName); + MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->RegName[currentlengt], 0x100-currentlengt); + currentlengt = lstrlenW(CurrentApplication->Version); + MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->Version[currentlengt], 0x100-currentlengt); + currentlengt = lstrlenW(CurrentApplication->Licence); + MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->Licence[currentlengt], 0x100-currentlengt); + for (i=0; arg[i]; i+=2) { if(!strcmp(arg[i], "name")) @@ -103,11 +112,15 @@ if (!CurrentApplication) return; - // FIXME: handle newlines e.g. in Description if(!strcmp(CurrentTag, "maintainer")) { - int currentlengt = lstrlenW(CurrentApplication->Location); + int currentlengt = lstrlenW(CurrentApplication->Maintainer); MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Maintainer[currentlengt], 0x100-currentlengt); + } + else if(!strcmp(CurrentTag, "regname")) + { + int currentlengt = lstrlenW(CurrentApplication->RegName); + MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->RegName[currentlengt], 0x100-currentlengt); } else if(!strcmp(CurrentTag, "description")) { @@ -118,6 +131,16 @@ { int currentlengt = lstrlenW(CurrentApplication->Location); MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Location[currentlengt], 0x100-currentlengt); + } + else if(!strcmp(CurrentTag, "version")) + { + int currentlengt = lstrlenW(CurrentApplication->Version); + MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Version[currentlengt], 0x400-currentlengt); + } + else if(!strcmp(CurrentTag, "licence")) + { + int currentlengt = lstrlenW(CurrentApplication->Licence); + MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Licence[currentlengt], 0x100-currentlengt); } }

1 0

[mbosma] 25766: sorry 25765 was ment to go to trunk
by mbosma＠svn.reactos.org 10 Feb '07

10 Feb '07

Author: mbosma Date: Sun Feb 11 00:46:37 2007 New Revision: 25766 URL: http://svn.reactos.org/svn/reactos?rev=25766&view=rev Log: sorry 25765 was ment to go to trunk Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.rbuild branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.xml branches/ros-branch-0_3_1/reactos/base/applications/downloader/main.c branches/ros-branch-0_3_1/reactos/base/applications/downloader/resources.h branches/ros-branch-0_3_1/reactos/base/applications/downloader/rsrc.rc branches/ros-branch-0_3_1/reactos/base/applications/downloader/structures.h branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/de.rc branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/en.rc branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/fr.rc branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/it.rc branches/ros-branch-0_3_1/reactos/base/applications/downloader/xml.c Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.rbuild (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.rbuild Sun Feb 11 00:46:37 2007 @@ -10,9 +10,8 @@ <define name="__USE_W32API" /> <define name="WINVER">0x0501</define> <define name="_WIN32_IE>0x0600</define> - + <library>kernel32</library> - <library>advapi32</library> <library>ntdll</library> <library>user32</library> <library>gdi32</library> Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.xml (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.xml Sun Feb 11 00:46:37 2007 @@ -1,90 +1,54 @@ <tree Version="1">  <category name="Internet & Network" icon="1"> - <application name="Firefox 1.5"> - <regname>Mozilla Firefox (1.5)</regname> - <licence>MPL/GPL/LGPL</licence> - <version>1.5.0.9</version> - <description>The most popular and one of the best free WebBrowsers out there.</description> - <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/1.5.0.9/wi…</location> - </application> - <application name="Firefox 2.0"> - <regname>Mozilla Firefox (2.0.0.1)</regname> - <licence>MPL/GPL/LGPL</licence> - <version>2.0.0.1</version> + <application name="Firefox"> <description>The most popular and one of the best free WebBrowsers out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win…</location> </application> <application name="Thunderbird"> - <regname>Mozilla Thunderbird (1.5)</regname> - <licence>MPL/GPL/LGPL</licence> - <version>1.5.0.9</version> <description>The most popular and one of the best free MailClients out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/thunderbird/releases/latest…</location> </application> <application name="SeaMonkey"> - <regname>SeaMonkey (1.0.7)</regname> - <version>1.0.7</version> <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, Composer bundle you will ever need.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.0.7/se…</location> - </application> - <application name="Mozilla ActiveX Control"> - <regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname> - <version>1.7.12</version> - <description>Essential Component to get ReactOS Explorer's and other application's Internet Browsing feature running.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactO…</location> - </application> - <application name="Off By One Browser"> - <regname>The Off By One Web Browser</regname> - <description>The Off By One Browser is a very small and fast web browser with full HTML 3.2 support.</description> - <location>http://offbyone.com/offbyone/images/OffByOneSetup.exe</location> </application> <application name="Samba TNG"> <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="Mozilla ActiveX Control"> + <description>Essential Component to get ReactOS Explorer's and other application's Internet Browsing feature running.</description> + <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactO…</location> + </application> <application name="Miranda IM"> - <regname>Miranda IM</regname> - <version>0.5.1</version> <description>Open source multiprotocol instant messaging application - May not work completely.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.5.1-unicode…</location> </application> <application name="Putty"> - <regname>PuTTY version 0.59</regname> - <licence>MIT</licence> - <version>0.59</version> <description>A free SSH, Telnet, rlogin, and raw TCP client.</description> - <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.59-installer.exe</location> + <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.58-installer.exe</location> </application> </category> <category name="Office" icon="2"> <application name="Abiword"> - <regname>"AbiWord 2.4.1 (remove only)"</regname> - <version>2.4.1</version> <description>Word processor.</description> <location>http://www.abiword.org/downloads/abiword/2.4.1/Windows/abiword-setup-2.4.1.…</location> </application> <application name="OpenOffice"> - <regname>OpenOffice.org 2.1</regname> - <version>2.1.0</version> <description>THE Open Source Office Suite.</description> <location>http://ftp.tu-chemnitz.de/pub/openoffice-extended//stable/2.1.0/OOo_2.1.0_W…</location> </application> </category> <category name="Graphics" icon="3"> <application name="IrfanView"> - <regname>IrfanView (remove only)</regname> - <version>3.99</version> <description>Viewer for all kinds of graphics/audio files/video files.</description> <location>http://gd.tuwien.ac.at/graphics/irfanview/iview399.exe</location> </application> <application name="IrfanView Plugins"> - <version>3.99</version> <description>Additional Plugins for supporting more file types.</description> <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_399.exe</location> </application> <application name="TuxPaint"> - <regname>Tux Paint 0.9.16</regname> - <version>0.9.16</version> <description>An open source bitmap graphics editor geared towards young children.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.16-win32-in…</location> </application> @@ -93,16 +57,12 @@ </category> <category name="Development" icon="5"> <application name="ReactOS Build Environment"> - <regname>ReactOS Build Environment 0.3.4</regname> - <version>0.3.4</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-0.3.4.exe</location> + <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-0.3.3.exe</location> </application> </category> <category name="Games & Fun" icon="6"> <application name="ScummVM"> - <regname>ScummVM 0.9.1</regname> - <version>0.9.1</version> <description>SamNMax, Day of Tentacle, etc on ReactOS</description> <location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.9.1-win32.exe</location> </application> @@ -110,41 +70,17 @@ <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-…</location> </application> - <application name="LBreakout2">LBreakout2 2.4.1 - <regname>LBreakout2 2.4.1</regname> - <version>2.4.1</version> - <description>Breakout Clone using SDL libs.</description> - <location>http://switch.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.…</location> - </application> - <application name="LGeneral"> - <regname>LGeneral 1.1</regname> - <version>1.1</version> - <description>Panzer General Clone using SDL libs.</description> - <location>http://kent.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://heanet.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location> - </application> </category> <category name="Tools" icon="7"> <application name="7-Zip"> - <regname>7-Zip 4.42</regname> - <version>4.42</version> <description>Utility to create and open 7zip, zip, tar, rar and other archive files.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z442.exe</location> </application> <application name="uTorrent"> - <regname>µTorrent</regname>  - <version>1.6</version> <description>Small and fast Torrent Client.</description> <location>http://download.utorrent.com/1.6/uTorrent-1.6-install.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> Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/main.c (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/main.c Sun Feb 11 00:46:37 2007 @@ -2,20 +2,19 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/downloader/xml.c * PURPOSE: Main program - * PROGRAMMERS: Maarten Bosma, Lester Kortenhoeven + * PROGRAMMERS: Maarten Bosma */ #include <windows.h> #include <commctrl.h> #include <richedit.h> #include <stdio.h> -#include <shlwapi.h> #include "resources.h" #include "structures.h" #define XML_PATH "C:\\ReactOS\\system32\\downloader.xml" -HWND hwnd, hCategories, hApps, hDownloadButton, hUninstallButton, hUpdateButton, hHelpButton; +HWND hCategories, hApps, hDownloadButton, hUpdateButton, hHelpButton; HBITMAP hLogo, hUnderline; WCHAR* DescriptionHeadline = L""; WCHAR* DescriptionText = L""; @@ -28,49 +27,13 @@ VOID FreeTree (struct Category* Node); WCHAR Strings [STRING_COUNT][MAX_STRING_LENGHT]; -BOOL getUninstaller(WCHAR* RegName, WCHAR* Uninstaller) { - - const DWORD ArraySize = 200; - - HKEY hKey1; - HKEY hKey2; - DWORD Type = 0; - DWORD Size = ArraySize; - WCHAR Value[ArraySize]; - WCHAR KeyName[ArraySize]; - LONG i = 0; - - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall",0,KEY_READ,&hKey1) == ERROR_SUCCESS) { - while (RegEnumKeyExW(hKey1,i,KeyName,&Size,NULL,NULL,NULL,NULL) == ERROR_SUCCESS) { - ++i; - RegOpenKeyExW(hKey1,KeyName,0,KEY_READ,&hKey2); - Size = ArraySize; - if (RegQueryValueExW(hKey2,L"DisplayName",0,&Type,(LPBYTE)Value,&Size) == ERROR_SUCCESS) { - Size = ArraySize; - if (StrCmpW(Value,RegName) == 0) { - if (RegQueryValueExW(hKey2,L"UninstallString",0,&Type,(LPBYTE)Uninstaller,&Size) == ERROR_SUCCESS) { - RegCloseKey(hKey2); - RegCloseKey(hKey1); - return TRUE; - } else { - RegCloseKey(hKey2); - RegCloseKey(hKey1); - return FALSE; - } - } - } - RegCloseKey(hKey2); - Size = ArraySize; - } - RegCloseKey(hKey1); - } - return FALSE; -} - void ShowMessage (WCHAR* title, WCHAR* message) { + HWND hwnd; DescriptionHeadline = title; DescriptionText = message; + + hwnd = GetParent(hCategories); InvalidateRect(hwnd,NULL,TRUE); UpdateWindow(hwnd); } @@ -118,23 +81,15 @@ Insert.item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_IMAGE; Insert.hInsertAfter = TVI_LAST; Insert.hParent = TVI_ROOT; + Insert.item.iImage = 0; CurrentApplication = Category->Apps; - WCHAR Uninstaller[200]; while(CurrentApplication) { Insert.item.lParam = (UINT)CurrentApplication; Insert.item.pszText = CurrentApplication->Name; - Insert.item.cchTextMax = lstrlenW(CurrentApplication->Name); - Insert.item.iImage = 10; - if(StrCmpW(CurrentApplication->RegName,L"")) { - if(getUninstaller(CurrentApplication->RegName, Uninstaller)) - Insert.item.iImage = 9; - } else { - if(getUninstaller(CurrentApplication->Name, Uninstaller)) - Insert.item.iImage = 9; - } + Insert.item.cchTextMax = lstrlenW(CurrentApplication->Name); SendMessage(hwnd, TVM_INSERTITEM, 0, (LPARAM)&Insert); CurrentApplication = CurrentApplication->Next; } @@ -163,13 +118,10 @@ hHelpButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 550, 10, 40, 40, hwnd, 0, hInstance, NULL); hUpdateButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 500, 10, 40, 40, hwnd, 0, hInstance, NULL); hDownloadButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 330, 505, 140, 33, hwnd, 0, hInstance, NULL); - hUninstallButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 260, 505, 140, 33, hwnd, 0, hInstance, NULL); SendMessageW(hHelpButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_HELP))); SendMessageW(hUpdateButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_UPDATE))); SendMessageW(hDownloadButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_DOWNLOAD))); - SendMessageW(hUninstallButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_UNINSTALL))); - ShowWindow(hUninstallButton, SW_HIDE); // Set deflaut entry for hApps Insert.item.mask = TVIF_TEXT|TVIF_IMAGE; @@ -191,9 +143,7 @@ ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_5)), NULL); ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_6)), NULL); ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_7)), NULL); - ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_8)), NULL); - ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_9)), NULL); - ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_10)), NULL); + ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_8)), NULL); // Fill the TreeViews AddItems (hCategories, Root.Children, NULL); @@ -248,37 +198,6 @@ DrawTextW(hdc, DescriptionText, lstrlenW(DescriptionText), &Rect, DT_WORDBREAK|DT_NOPREFIX); // ToDo: Call TabbedTextOut to draw a nice table DeleteObject(Font); -} - -void showUninstaller() { - int Split_Vertical = 200; - RECT Rect; - - GetClientRect(hwnd,&Rect); - ShowWindow(hUninstallButton,SW_SHOW); - MoveWindow(hDownloadButton,(Split_Vertical+Rect.right-Rect.left)/2,Rect.bottom-Rect.top-45,140,35,TRUE);; -} - -void hideUninstaller() { - int Split_Vertical = 200; - RECT Rect; - - GetClientRect(hwnd,&Rect); - ShowWindow(hUninstallButton,SW_HIDE); - MoveWindow(hDownloadButton,(Split_Vertical+Rect.right-Rect.left)/2-70,Rect.bottom-Rect.top-45,140,35,TRUE); -} - -void startUninstaller(WCHAR* Uninstaller) { - STARTUPINFOW si; - PROCESS_INFORMATION pi; - - memset(&si, 0, sizeof(si)); - si.cb = sizeof(si); - CreateProcessW(NULL,Uninstaller,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi); - CloseHandle(pi.hThread); - // WaitForSingleObject(pi.hProcess, INFINITE); // If you want to wait for the Unistaller - CloseHandle(pi.hProcess); - hideUninstaller(); } LRESULT CALLBACK WndProc (HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) @@ -325,20 +244,6 @@ else ShowMessage(Strings[IDS_NO_APP_TITLE], Strings[IDS_NO_APP]); } - else if (lParam == (LPARAM)hUninstallButton) - { - if(SelectedApplication) - { - WCHAR Uninstaller[200]; - if(StrCmpW(SelectedApplication->RegName, L"")) { - if(getUninstaller(SelectedApplication->RegName, Uninstaller)) - startUninstaller(Uninstaller); - } else { - if(getUninstaller(SelectedApplication->Name, Uninstaller)) - startUninstaller(Uninstaller); - } - } - } else if (lParam == (LPARAM)hUpdateButton) { ShowMessage(Strings[IDS_UPDATE_TITLE], Strings[IDS_UPDATE]); @@ -356,7 +261,6 @@ LPNMHDR data = (LPNMHDR)lParam; if(data->code == TVN_SELCHANGED) { - BOOL bShowUninstaller = FALSE; if(data->hwndFrom == hCategories) { struct Category* Category = (struct Category*) ((LPNMTREEVIEW)lParam)->itemNew.lParam; @@ -366,43 +270,8 @@ { SelectedApplication = (struct Application*) ((LPNMTREEVIEW)lParam)->itemNew.lParam; if(SelectedApplication) - { - DescriptionText = calloc(700,sizeof(WCHAR)); - if(StrCmpW(SelectedApplication->Version, L"")) { - StrCatW(DescriptionText, Strings[IDS_VERSION]); - StrCatW(DescriptionText, SelectedApplication->Version); - StrCatW(DescriptionText, L"\n"); - } - if(StrCmpW(SelectedApplication->Licence, L"")) { - StrCatW(DescriptionText, Strings[IDS_LICENCE]); - StrCatW(DescriptionText, SelectedApplication->Licence); - StrCatW(DescriptionText, L"\n"); - } - if(StrCmpW(SelectedApplication->Maintainer, L"")) { - StrCatW(DescriptionText, Strings[IDS_MAINTAINER]); - StrCatW(DescriptionText, SelectedApplication->Maintainer); - StrCatW(DescriptionText, L"\n"); - } - if(StrCmpW(SelectedApplication->Licence, L"") || StrCmpW(SelectedApplication->Version, L"") || StrCmpW(SelectedApplication->Maintainer, L"")) - StrCatW(DescriptionText, L"\n"); - StrCatW(DescriptionText, SelectedApplication->Description); - ShowMessage(SelectedApplication->Name, DescriptionText); - WCHAR Uninstaller[200]; - if(StrCmpW(SelectedApplication->RegName, L"")) { - if(getUninstaller(SelectedApplication->RegName, Uninstaller)) { - bShowUninstaller = TRUE; - } - } else { - if(getUninstaller(SelectedApplication->Name, Uninstaller)) { - bShowUninstaller = TRUE; - } - } - } - } - if (bShowUninstaller) - showUninstaller(); - else - hideUninstaller(); + ShowMessage(SelectedApplication->Name, SelectedApplication->Description); + } } } break; @@ -410,8 +279,8 @@ case WM_SIZING: { LPRECT pRect = (LPRECT)lParam; - if (pRect->right-pRect->left < 520) - pRect->right = pRect->left + 520; + if (pRect->right-pRect->left < 400) + pRect->right = pRect->left + 400; if (pRect->bottom-pRect->top < 300) pRect->bottom = pRect->top + 300; @@ -430,11 +299,7 @@ MoveWindow(hHelpButton, LOWORD(lParam)-50, 10, 40, 40, TRUE); MoveWindow(hUpdateButton, LOWORD(lParam)-100, 10, 40, 40, TRUE); - if(IsWindowVisible(hUninstallButton)) - MoveWindow(hDownloadButton, (Split_Vertical+LOWORD(lParam))/2, HIWORD(lParam)-45, 140, 35, TRUE); - else - MoveWindow(hDownloadButton, (Split_Vertical+LOWORD(lParam))/2-70, HIWORD(lParam)-45, 140, 35, TRUE); - MoveWindow(hUninstallButton, (Split_Vertical+LOWORD(lParam))/2-140, HIWORD(lParam)-45, 140, 35, TRUE); + MoveWindow(hDownloadButton, (Split_Vertical+LOWORD(lParam))/2-70, HIWORD(lParam)-45, 140, 35, TRUE); } break; @@ -455,6 +320,7 @@ INT WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInst, LPSTR lpCmdLine, INT nCmdShow) { + HWND hwnd; int i; WNDCLASSEXW WndClass = {0}; MSG msg; Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/resources.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/resources.h (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/resources.h Sun Feb 11 00:46:37 2007 @@ -5,7 +5,6 @@ #define IDB_HELP 0x102 #define IDB_UPDATE 0x103 #define IDB_DOWNLOAD 0x104 -#define IDB_UNINSTALL 0x105 #define IDB_TREEVIEW_ICON_0 0x900 #define IDB_TREEVIEW_ICON_1 0x901 #define IDB_TREEVIEW_ICON_2 0x902 @@ -15,8 +14,6 @@ #define IDB_TREEVIEW_ICON_6 0x906 #define IDB_TREEVIEW_ICON_7 0x907 #define IDB_TREEVIEW_ICON_8 0x908 -#define IDB_TREEVIEW_ICON_9 0x909 -#define IDB_TREEVIEW_ICON_10 0x910 #define IDD_DOWNLOAD 0x100 #define IDC_PROGRESS 0x1000 #define IDC_STATUS 0x1001 @@ -39,9 +36,6 @@ #define IDS_XMLERROR_1 14 #define IDS_XMLERROR_2 15 #define IDS_DOWNLOAD_ERROR 16 -#define IDS_VERSION 17 -#define IDS_LICENCE 18 -#define IDS_MAINTAINER 19 -#define STRING_COUNT 20 +#define STRING_COUNT 17 #define MAX_STRING_LENGHT 0x100 Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/rsrc.rc (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/rsrc.rc Sun Feb 11 00:46:37 2007 @@ -1,11 +1,11 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_MAIN ICON DISCARDABLE "resources/main.ico" +//IDB_UNDERLINE BITMAP DISCARDABLE "resources/underline.bmp" IDB_LOGO BITMAP DISCARDABLE "resources/logo.bmp" IDB_HELP BITMAP DISCARDABLE "resources/help.bmp" IDB_UPDATE BITMAP DISCARDABLE "resources/update.bmp" IDB_DOWNLOAD BITMAP DISCARDABLE "resources/download.bmp" -IDB_UNINSTALL BITMAP DISCARDABLE "resources/uninstall.bmp" IDB_UNDERLINE BITMAP DISCARDABLE "resources/underline.bmp" IDB_TREEVIEW_ICON_0 BITMAP DISCARDABLE "resources/0.bmp" IDB_TREEVIEW_ICON_1 BITMAP DISCARDABLE "resources/1.bmp" @@ -16,8 +16,6 @@ IDB_TREEVIEW_ICON_6 BITMAP DISCARDABLE "resources/6.bmp" IDB_TREEVIEW_ICON_7 BITMAP DISCARDABLE "resources/7.bmp" IDB_TREEVIEW_ICON_8 BITMAP DISCARDABLE "resources/8.bmp" -IDB_TREEVIEW_ICON_9 BITMAP DISCARDABLE "resources/9.bmp" -IDB_TREEVIEW_ICON_10 BITMAP DISCARDABLE "resources/10.bmp" #include "translations/de.rc" Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/structures.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/structures.h (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/structures.h Sun Feb 11 00:46:37 2007 @@ -2,7 +2,6 @@ struct Application { WCHAR Name[0x100]; - WCHAR RegName[0x100]; WCHAR Version[0x100]; WCHAR Maintainer[0x100]; WCHAR Licence[0x100]; Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/de.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/de.rc (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/de.rc Sun Feb 11 00:46:37 2007 @@ -29,7 +29,4 @@ IDS_XMLERROR_1 "XML Datei nicht gefunden!" IDS_XMLERROR_2 "XML Datei kann nicht verarbeitet werden!" IDS_DOWNLOAD_ERROR "Die Datei konnte nicht runtergeladen werden.\nBitte prüfen sie, ob eine Verbindung zum Internet besteht." - IDS_VERSION "Version: " - IDS_LICENCE "Lizenz: " - IDS_MAINTAINER "Maintainer: " END Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/en.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/en.rc (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/en.rc Sun Feb 11 00:46:37 2007 @@ -29,7 +29,4 @@ IDS_XMLERROR_1 "Could not find the xml file !" IDS_XMLERROR_2 "Could not parse the xml file !" IDS_DOWNLOAD_ERROR "Unable to download the file.\nPlease check you internet connection." - IDS_VERSION "Version: " - IDS_LICENCE "Licence: " - IDS_MAINTAINER "Maintainer: " END Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/fr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/fr.rc (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/fr.rc Sun Feb 11 00:46:37 2007 @@ -29,7 +29,4 @@ IDS_XMLERROR_1 "Impossible de trouver le fichier xml !" IDS_XMLERROR_2 "Impossible d'analyser le fichier xml !" IDS_DOWNLOAD_ERROR "Impossible de télécharger le fichier.\nVeuillez vérifier votre connexion Internet." - IDS_VERSION "Version: " - IDS_LICENCE "Licence: " - IDS_MAINTAINER "Maintainer: " END Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/it.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/it.rc (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/it.rc Sun Feb 11 00:46:37 2007 @@ -29,7 +29,4 @@ IDS_XMLERROR_1 "File xml non trovato !" IDS_XMLERROR_2 "Impossibile trattare il contenuto del file xml !" IDS_DOWNLOAD_ERROR "Download del file impossibile.\nVerifica la connessione a Internet." - IDS_VERSION "Version: " - IDS_LICENCE "Licence: " - IDS_MAINTAINER "Maintainer: " END Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/xml.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/xml.c (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/xml.c Sun Feb 11 00:46:37 2007 @@ -2,7 +2,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base\applications\downloader\xml.c * PURPOSE: Parsing of application information xml files - * PROGRAMMERS: Maarten Bosma, Lester Kortenhoeven + * PROGRAMMERS: Maarten Bosma */ #include <libs/expat/expat.h> @@ -81,15 +81,6 @@ CurrentApplication = Current->Apps; } - int currentlengt = lstrlenW(CurrentApplication->Maintainer); - MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->Maintainer[currentlengt], 0x100-currentlengt); - currentlengt = lstrlenW(CurrentApplication->RegName); - MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->RegName[currentlengt], 0x100-currentlengt); - currentlengt = lstrlenW(CurrentApplication->Version); - MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->Version[currentlengt], 0x100-currentlengt); - currentlengt = lstrlenW(CurrentApplication->Licence); - MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->Licence[currentlengt], 0x100-currentlengt); - for (i=0; arg[i]; i+=2) { if(!strcmp(arg[i], "name")) @@ -112,15 +103,11 @@ if (!CurrentApplication) return; + // FIXME: handle newlines e.g. in Description if(!strcmp(CurrentTag, "maintainer")) { - int currentlengt = lstrlenW(CurrentApplication->Maintainer); + int currentlengt = lstrlenW(CurrentApplication->Location); MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Maintainer[currentlengt], 0x100-currentlengt); - } - else if(!strcmp(CurrentTag, "regname")) - { - int currentlengt = lstrlenW(CurrentApplication->RegName); - MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->RegName[currentlengt], 0x100-currentlengt); } else if(!strcmp(CurrentTag, "description")) { @@ -131,16 +118,6 @@ { int currentlengt = lstrlenW(CurrentApplication->Location); MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Location[currentlengt], 0x100-currentlengt); - } - else if(!strcmp(CurrentTag, "version")) - { - int currentlengt = lstrlenW(CurrentApplication->Version); - MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Version[currentlengt], 0x400-currentlengt); - } - else if(!strcmp(CurrentTag, "licence")) - { - int currentlengt = lstrlenW(CurrentApplication->Licence); - MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Licence[currentlengt], 0x100-currentlengt); } }

1 0

[mbosma] 25765: Lester Kortenhoeven (lester(at)kortenhoeven(dot)de): * Implement uninstall feature. Does not work under reactos yet, because it does not seem to store the installer information under the registry path windows stores them. * Show Version in the description.
by mbosma＠svn.reactos.org 10 Feb '07

10 Feb '07

Author: mbosma Date: Sun Feb 11 00:41:28 2007 New Revision: 25765 URL: http://svn.reactos.org/svn/reactos?rev=25765&view=rev Log: Lester Kortenhoeven (lester(at)kortenhoeven(dot)de): * Implement uninstall feature. Does not work under reactos yet, because it does not seem to store the installer information under the registry path windows stores them. * Show Version in the description. Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.rbuild branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.xml branches/ros-branch-0_3_1/reactos/base/applications/downloader/main.c branches/ros-branch-0_3_1/reactos/base/applications/downloader/resources.h branches/ros-branch-0_3_1/reactos/base/applications/downloader/rsrc.rc branches/ros-branch-0_3_1/reactos/base/applications/downloader/structures.h branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/de.rc branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/en.rc branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/fr.rc branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/it.rc branches/ros-branch-0_3_1/reactos/base/applications/downloader/xml.c Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.rbuild (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.rbuild Sun Feb 11 00:41:28 2007 @@ -10,8 +10,9 @@ <define name="__USE_W32API" /> <define name="WINVER">0x0501</define> <define name="_WIN32_IE>0x0600</define> - + <library>kernel32</library> + <library>advapi32</library> <library>ntdll</library> <library>user32</library> <library>gdi32</library> Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.xml (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/downloader.xml Sun Feb 11 00:41:28 2007 @@ -1,54 +1,90 @@ <tree Version="1">  <category name="Internet & Network" icon="1"> - <application name="Firefox"> + <application name="Firefox 1.5"> + <regname>Mozilla Firefox (1.5)</regname> + <licence>MPL/GPL/LGPL</licence> + <version>1.5.0.9</version> + <description>The most popular and one of the best free WebBrowsers out there.</description> + <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/1.5.0.9/wi…</location> + </application> + <application name="Firefox 2.0"> + <regname>Mozilla Firefox (2.0.0.1)</regname> + <licence>MPL/GPL/LGPL</licence> + <version>2.0.0.1</version> <description>The most popular and one of the best free WebBrowsers out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win…</location> </application> <application name="Thunderbird"> + <regname>Mozilla Thunderbird (1.5)</regname> + <licence>MPL/GPL/LGPL</licence> + <version>1.5.0.9</version> <description>The most popular and one of the best free MailClients out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/thunderbird/releases/latest…</location> </application> <application name="SeaMonkey"> + <regname>SeaMonkey (1.0.7)</regname> + <version>1.0.7</version> <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, Composer bundle you will ever need.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/seamonkey/releases/1.0.7/se…</location> + </application> + <application name="Mozilla ActiveX Control"> + <regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname> + <version>1.7.12</version> + <description>Essential Component to get ReactOS Explorer's and other application's Internet Browsing feature running.</description> + <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactO…</location> + </application> + <application name="Off By One Browser"> + <regname>The Off By One Web Browser</regname> + <description>The Off By One Browser is a very small and fast web browser with full HTML 3.2 support.</description> + <location>http://offbyone.com/offbyone/images/OffByOneSetup.exe</location> </application> <application name="Samba TNG"> <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="Mozilla ActiveX Control"> - <description>Essential Component to get ReactOS Explorer's and other application's Internet Browsing feature running.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/MozillaControl1712-ReactO…</location> - </application> <application name="Miranda IM"> + <regname>Miranda IM</regname> + <version>0.5.1</version> <description>Open source multiprotocol instant messaging application - May not work completely.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.5.1-unicode…</location> </application> <application name="Putty"> + <regname>PuTTY version 0.59</regname> + <licence>MIT</licence> + <version>0.59</version> <description>A free SSH, Telnet, rlogin, and raw TCP client.</description> - <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.58-installer.exe</location> + <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.59-installer.exe</location> </application> </category> <category name="Office" icon="2"> <application name="Abiword"> + <regname>"AbiWord 2.4.1 (remove only)"</regname> + <version>2.4.1</version> <description>Word processor.</description> <location>http://www.abiword.org/downloads/abiword/2.4.1/Windows/abiword-setup-2.4.1.…</location> </application> <application name="OpenOffice"> + <regname>OpenOffice.org 2.1</regname> + <version>2.1.0</version> <description>THE Open Source Office Suite.</description> <location>http://ftp.tu-chemnitz.de/pub/openoffice-extended//stable/2.1.0/OOo_2.1.0_W…</location> </application> </category> <category name="Graphics" icon="3"> <application name="IrfanView"> + <regname>IrfanView (remove only)</regname> + <version>3.99</version> <description>Viewer for all kinds of graphics/audio files/video files.</description> <location>http://gd.tuwien.ac.at/graphics/irfanview/iview399.exe</location> </application> <application name="IrfanView Plugins"> + <version>3.99</version> <description>Additional Plugins for supporting more file types.</description> <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_399.exe</location> </application> <application name="TuxPaint"> + <regname>Tux Paint 0.9.16</regname> + <version>0.9.16</version> <description>An open source bitmap graphics editor geared towards young children.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.16-win32-in…</location> </application> @@ -57,12 +93,16 @@ </category> <category name="Development" icon="5"> <application name="ReactOS Build Environment"> + <regname>ReactOS Build Environment 0.3.4</regname> + <version>0.3.4</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-0.3.3.exe</location> + <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-0.3.4.exe</location> </application> </category> <category name="Games & Fun" icon="6"> <application name="ScummVM"> + <regname>ScummVM 0.9.1</regname> + <version>0.9.1</version> <description>SamNMax, Day of Tentacle, etc on ReactOS</description> <location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.9.1-win32.exe</location> </application> @@ -70,17 +110,41 @@ <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-…</location> </application> + <application name="LBreakout2">LBreakout2 2.4.1 + <regname>LBreakout2 2.4.1</regname> + <version>2.4.1</version> + <description>Breakout Clone using SDL libs.</description> + <location>http://switch.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.…</location> + </application> + <application name="LGeneral"> + <regname>LGeneral 1.1</regname> + <version>1.1</version> + <description>Panzer General Clone using SDL libs.</description> + <location>http://kent.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://heanet.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location> + </application> </category> <category name="Tools" icon="7"> <application name="7-Zip"> + <regname>7-Zip 4.42</regname> + <version>4.42</version> <description>Utility to create and open 7zip, zip, tar, rar and other archive files.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z442.exe</location> </application> <application name="uTorrent"> + <regname>µTorrent</regname>  + <version>1.6</version> <description>Small and fast Torrent Client.</description> <location>http://download.utorrent.com/1.6/uTorrent-1.6-install.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> Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/main.c (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/main.c Sun Feb 11 00:41:28 2007 @@ -2,19 +2,20 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/downloader/xml.c * PURPOSE: Main program - * PROGRAMMERS: Maarten Bosma + * PROGRAMMERS: Maarten Bosma, Lester Kortenhoeven */ #include <windows.h> #include <commctrl.h> #include <richedit.h> #include <stdio.h> +#include <shlwapi.h> #include "resources.h" #include "structures.h" #define XML_PATH "C:\\ReactOS\\system32\\downloader.xml" -HWND hCategories, hApps, hDownloadButton, hUpdateButton, hHelpButton; +HWND hwnd, hCategories, hApps, hDownloadButton, hUninstallButton, hUpdateButton, hHelpButton; HBITMAP hLogo, hUnderline; WCHAR* DescriptionHeadline = L""; WCHAR* DescriptionText = L""; @@ -27,13 +28,49 @@ VOID FreeTree (struct Category* Node); WCHAR Strings [STRING_COUNT][MAX_STRING_LENGHT]; +BOOL getUninstaller(WCHAR* RegName, WCHAR* Uninstaller) { + + const DWORD ArraySize = 200; + + HKEY hKey1; + HKEY hKey2; + DWORD Type = 0; + DWORD Size = ArraySize; + WCHAR Value[ArraySize]; + WCHAR KeyName[ArraySize]; + LONG i = 0; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall",0,KEY_READ,&hKey1) == ERROR_SUCCESS) { + while (RegEnumKeyExW(hKey1,i,KeyName,&Size,NULL,NULL,NULL,NULL) == ERROR_SUCCESS) { + ++i; + RegOpenKeyExW(hKey1,KeyName,0,KEY_READ,&hKey2); + Size = ArraySize; + if (RegQueryValueExW(hKey2,L"DisplayName",0,&Type,(LPBYTE)Value,&Size) == ERROR_SUCCESS) { + Size = ArraySize; + if (StrCmpW(Value,RegName) == 0) { + if (RegQueryValueExW(hKey2,L"UninstallString",0,&Type,(LPBYTE)Uninstaller,&Size) == ERROR_SUCCESS) { + RegCloseKey(hKey2); + RegCloseKey(hKey1); + return TRUE; + } else { + RegCloseKey(hKey2); + RegCloseKey(hKey1); + return FALSE; + } + } + } + RegCloseKey(hKey2); + Size = ArraySize; + } + RegCloseKey(hKey1); + } + return FALSE; +} + void ShowMessage (WCHAR* title, WCHAR* message) { - HWND hwnd; DescriptionHeadline = title; DescriptionText = message; - - hwnd = GetParent(hCategories); InvalidateRect(hwnd,NULL,TRUE); UpdateWindow(hwnd); } @@ -81,15 +118,23 @@ Insert.item.mask = TVIF_TEXT|TVIF_PARAM|TVIF_IMAGE; Insert.hInsertAfter = TVI_LAST; Insert.hParent = TVI_ROOT; - Insert.item.iImage = 0; CurrentApplication = Category->Apps; + WCHAR Uninstaller[200]; while(CurrentApplication) { Insert.item.lParam = (UINT)CurrentApplication; Insert.item.pszText = CurrentApplication->Name; - Insert.item.cchTextMax = lstrlenW(CurrentApplication->Name); + Insert.item.cchTextMax = lstrlenW(CurrentApplication->Name); + Insert.item.iImage = 10; + if(StrCmpW(CurrentApplication->RegName,L"")) { + if(getUninstaller(CurrentApplication->RegName, Uninstaller)) + Insert.item.iImage = 9; + } else { + if(getUninstaller(CurrentApplication->Name, Uninstaller)) + Insert.item.iImage = 9; + } SendMessage(hwnd, TVM_INSERTITEM, 0, (LPARAM)&Insert); CurrentApplication = CurrentApplication->Next; } @@ -118,10 +163,13 @@ hHelpButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 550, 10, 40, 40, hwnd, 0, hInstance, NULL); hUpdateButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 500, 10, 40, 40, hwnd, 0, hInstance, NULL); hDownloadButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 330, 505, 140, 33, hwnd, 0, hInstance, NULL); + hUninstallButton = CreateWindowW (L"Button", L"", WS_CHILD|WS_VISIBLE|BS_BITMAP, 260, 505, 140, 33, hwnd, 0, hInstance, NULL); SendMessageW(hHelpButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_HELP))); SendMessageW(hUpdateButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_UPDATE))); SendMessageW(hDownloadButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_DOWNLOAD))); + SendMessageW(hUninstallButton, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP,(LPARAM)(HANDLE)LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_UNINSTALL))); + ShowWindow(hUninstallButton, SW_HIDE); // Set deflaut entry for hApps Insert.item.mask = TVIF_TEXT|TVIF_IMAGE; @@ -143,7 +191,9 @@ ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_5)), NULL); ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_6)), NULL); ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_7)), NULL); - ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_8)), NULL); + ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_8)), NULL); + ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_9)), NULL); + ImageList_Add(hImageList, LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_TREEVIEW_ICON_10)), NULL); // Fill the TreeViews AddItems (hCategories, Root.Children, NULL); @@ -198,6 +248,37 @@ DrawTextW(hdc, DescriptionText, lstrlenW(DescriptionText), &Rect, DT_WORDBREAK|DT_NOPREFIX); // ToDo: Call TabbedTextOut to draw a nice table DeleteObject(Font); +} + +void showUninstaller() { + int Split_Vertical = 200; + RECT Rect; + + GetClientRect(hwnd,&Rect); + ShowWindow(hUninstallButton,SW_SHOW); + MoveWindow(hDownloadButton,(Split_Vertical+Rect.right-Rect.left)/2,Rect.bottom-Rect.top-45,140,35,TRUE);; +} + +void hideUninstaller() { + int Split_Vertical = 200; + RECT Rect; + + GetClientRect(hwnd,&Rect); + ShowWindow(hUninstallButton,SW_HIDE); + MoveWindow(hDownloadButton,(Split_Vertical+Rect.right-Rect.left)/2-70,Rect.bottom-Rect.top-45,140,35,TRUE); +} + +void startUninstaller(WCHAR* Uninstaller) { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + CreateProcessW(NULL,Uninstaller,NULL,NULL,FALSE,0,NULL,NULL,&si,&pi); + CloseHandle(pi.hThread); + // WaitForSingleObject(pi.hProcess, INFINITE); // If you want to wait for the Unistaller + CloseHandle(pi.hProcess); + hideUninstaller(); } LRESULT CALLBACK WndProc (HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) @@ -244,6 +325,20 @@ else ShowMessage(Strings[IDS_NO_APP_TITLE], Strings[IDS_NO_APP]); } + else if (lParam == (LPARAM)hUninstallButton) + { + if(SelectedApplication) + { + WCHAR Uninstaller[200]; + if(StrCmpW(SelectedApplication->RegName, L"")) { + if(getUninstaller(SelectedApplication->RegName, Uninstaller)) + startUninstaller(Uninstaller); + } else { + if(getUninstaller(SelectedApplication->Name, Uninstaller)) + startUninstaller(Uninstaller); + } + } + } else if (lParam == (LPARAM)hUpdateButton) { ShowMessage(Strings[IDS_UPDATE_TITLE], Strings[IDS_UPDATE]); @@ -261,6 +356,7 @@ LPNMHDR data = (LPNMHDR)lParam; if(data->code == TVN_SELCHANGED) { + BOOL bShowUninstaller = FALSE; if(data->hwndFrom == hCategories) { struct Category* Category = (struct Category*) ((LPNMTREEVIEW)lParam)->itemNew.lParam; @@ -270,8 +366,43 @@ { SelectedApplication = (struct Application*) ((LPNMTREEVIEW)lParam)->itemNew.lParam; if(SelectedApplication) - ShowMessage(SelectedApplication->Name, SelectedApplication->Description); - } + { + DescriptionText = calloc(700,sizeof(WCHAR)); + if(StrCmpW(SelectedApplication->Version, L"")) { + StrCatW(DescriptionText, Strings[IDS_VERSION]); + StrCatW(DescriptionText, SelectedApplication->Version); + StrCatW(DescriptionText, L"\n"); + } + if(StrCmpW(SelectedApplication->Licence, L"")) { + StrCatW(DescriptionText, Strings[IDS_LICENCE]); + StrCatW(DescriptionText, SelectedApplication->Licence); + StrCatW(DescriptionText, L"\n"); + } + if(StrCmpW(SelectedApplication->Maintainer, L"")) { + StrCatW(DescriptionText, Strings[IDS_MAINTAINER]); + StrCatW(DescriptionText, SelectedApplication->Maintainer); + StrCatW(DescriptionText, L"\n"); + } + if(StrCmpW(SelectedApplication->Licence, L"") || StrCmpW(SelectedApplication->Version, L"") || StrCmpW(SelectedApplication->Maintainer, L"")) + StrCatW(DescriptionText, L"\n"); + StrCatW(DescriptionText, SelectedApplication->Description); + ShowMessage(SelectedApplication->Name, DescriptionText); + WCHAR Uninstaller[200]; + if(StrCmpW(SelectedApplication->RegName, L"")) { + if(getUninstaller(SelectedApplication->RegName, Uninstaller)) { + bShowUninstaller = TRUE; + } + } else { + if(getUninstaller(SelectedApplication->Name, Uninstaller)) { + bShowUninstaller = TRUE; + } + } + } + } + if (bShowUninstaller) + showUninstaller(); + else + hideUninstaller(); } } break; @@ -279,8 +410,8 @@ case WM_SIZING: { LPRECT pRect = (LPRECT)lParam; - if (pRect->right-pRect->left < 400) - pRect->right = pRect->left + 400; + if (pRect->right-pRect->left < 520) + pRect->right = pRect->left + 520; if (pRect->bottom-pRect->top < 300) pRect->bottom = pRect->top + 300; @@ -299,7 +430,11 @@ MoveWindow(hHelpButton, LOWORD(lParam)-50, 10, 40, 40, TRUE); MoveWindow(hUpdateButton, LOWORD(lParam)-100, 10, 40, 40, TRUE); - MoveWindow(hDownloadButton, (Split_Vertical+LOWORD(lParam))/2-70, HIWORD(lParam)-45, 140, 35, TRUE); + if(IsWindowVisible(hUninstallButton)) + MoveWindow(hDownloadButton, (Split_Vertical+LOWORD(lParam))/2, HIWORD(lParam)-45, 140, 35, TRUE); + else + MoveWindow(hDownloadButton, (Split_Vertical+LOWORD(lParam))/2-70, HIWORD(lParam)-45, 140, 35, TRUE); + MoveWindow(hUninstallButton, (Split_Vertical+LOWORD(lParam))/2-140, HIWORD(lParam)-45, 140, 35, TRUE); } break; @@ -320,7 +455,6 @@ INT WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInst, LPSTR lpCmdLine, INT nCmdShow) { - HWND hwnd; int i; WNDCLASSEXW WndClass = {0}; MSG msg; Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/resources.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/resources.h (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/resources.h Sun Feb 11 00:41:28 2007 @@ -5,6 +5,7 @@ #define IDB_HELP 0x102 #define IDB_UPDATE 0x103 #define IDB_DOWNLOAD 0x104 +#define IDB_UNINSTALL 0x105 #define IDB_TREEVIEW_ICON_0 0x900 #define IDB_TREEVIEW_ICON_1 0x901 #define IDB_TREEVIEW_ICON_2 0x902 @@ -14,6 +15,8 @@ #define IDB_TREEVIEW_ICON_6 0x906 #define IDB_TREEVIEW_ICON_7 0x907 #define IDB_TREEVIEW_ICON_8 0x908 +#define IDB_TREEVIEW_ICON_9 0x909 +#define IDB_TREEVIEW_ICON_10 0x910 #define IDD_DOWNLOAD 0x100 #define IDC_PROGRESS 0x1000 #define IDC_STATUS 0x1001 @@ -36,6 +39,9 @@ #define IDS_XMLERROR_1 14 #define IDS_XMLERROR_2 15 #define IDS_DOWNLOAD_ERROR 16 +#define IDS_VERSION 17 +#define IDS_LICENCE 18 +#define IDS_MAINTAINER 19 -#define STRING_COUNT 17 +#define STRING_COUNT 20 #define MAX_STRING_LENGHT 0x100 Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/rsrc.rc (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/rsrc.rc Sun Feb 11 00:41:28 2007 @@ -1,11 +1,11 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDI_MAIN ICON DISCARDABLE "resources/main.ico" -//IDB_UNDERLINE BITMAP DISCARDABLE "resources/underline.bmp" IDB_LOGO BITMAP DISCARDABLE "resources/logo.bmp" IDB_HELP BITMAP DISCARDABLE "resources/help.bmp" IDB_UPDATE BITMAP DISCARDABLE "resources/update.bmp" IDB_DOWNLOAD BITMAP DISCARDABLE "resources/download.bmp" +IDB_UNINSTALL BITMAP DISCARDABLE "resources/uninstall.bmp" IDB_UNDERLINE BITMAP DISCARDABLE "resources/underline.bmp" IDB_TREEVIEW_ICON_0 BITMAP DISCARDABLE "resources/0.bmp" IDB_TREEVIEW_ICON_1 BITMAP DISCARDABLE "resources/1.bmp" @@ -16,6 +16,8 @@ IDB_TREEVIEW_ICON_6 BITMAP DISCARDABLE "resources/6.bmp" IDB_TREEVIEW_ICON_7 BITMAP DISCARDABLE "resources/7.bmp" IDB_TREEVIEW_ICON_8 BITMAP DISCARDABLE "resources/8.bmp" +IDB_TREEVIEW_ICON_9 BITMAP DISCARDABLE "resources/9.bmp" +IDB_TREEVIEW_ICON_10 BITMAP DISCARDABLE "resources/10.bmp" #include "translations/de.rc" Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/structures.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/structures.h (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/structures.h Sun Feb 11 00:41:28 2007 @@ -2,6 +2,7 @@ struct Application { WCHAR Name[0x100]; + WCHAR RegName[0x100]; WCHAR Version[0x100]; WCHAR Maintainer[0x100]; WCHAR Licence[0x100]; Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/de.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/de.rc (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/de.rc Sun Feb 11 00:41:28 2007 @@ -29,4 +29,7 @@ IDS_XMLERROR_1 "XML Datei nicht gefunden!" IDS_XMLERROR_2 "XML Datei kann nicht verarbeitet werden!" IDS_DOWNLOAD_ERROR "Die Datei konnte nicht runtergeladen werden.\nBitte prüfen sie, ob eine Verbindung zum Internet besteht." + IDS_VERSION "Version: " + IDS_LICENCE "Lizenz: " + IDS_MAINTAINER "Maintainer: " END Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/en.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/en.rc (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/en.rc Sun Feb 11 00:41:28 2007 @@ -29,4 +29,7 @@ IDS_XMLERROR_1 "Could not find the xml file !" IDS_XMLERROR_2 "Could not parse the xml file !" IDS_DOWNLOAD_ERROR "Unable to download the file.\nPlease check you internet connection." + IDS_VERSION "Version: " + IDS_LICENCE "Licence: " + IDS_MAINTAINER "Maintainer: " END Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/fr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/fr.rc (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/fr.rc Sun Feb 11 00:41:28 2007 @@ -29,4 +29,7 @@ IDS_XMLERROR_1 "Impossible de trouver le fichier xml !" IDS_XMLERROR_2 "Impossible d'analyser le fichier xml !" IDS_DOWNLOAD_ERROR "Impossible de télécharger le fichier.\nVeuillez vérifier votre connexion Internet." + IDS_VERSION "Version: " + IDS_LICENCE "Licence: " + IDS_MAINTAINER "Maintainer: " END Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/it.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/it.rc (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/translations/it.rc Sun Feb 11 00:41:28 2007 @@ -29,4 +29,7 @@ IDS_XMLERROR_1 "File xml non trovato !" IDS_XMLERROR_2 "Impossibile trattare il contenuto del file xml !" IDS_DOWNLOAD_ERROR "Download del file impossibile.\nVerifica la connessione a Internet." + IDS_VERSION "Version: " + IDS_LICENCE "Licence: " + IDS_MAINTAINER "Maintainer: " END Modified: branches/ros-branch-0_3_1/reactos/base/applications/downloader/xml.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/base/a… ============================================================================== --- branches/ros-branch-0_3_1/reactos/base/applications/downloader/xml.c (original) +++ branches/ros-branch-0_3_1/reactos/base/applications/downloader/xml.c Sun Feb 11 00:41:28 2007 @@ -2,7 +2,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base\applications\downloader\xml.c * PURPOSE: Parsing of application information xml files - * PROGRAMMERS: Maarten Bosma + * PROGRAMMERS: Maarten Bosma, Lester Kortenhoeven */ #include <libs/expat/expat.h> @@ -81,6 +81,15 @@ CurrentApplication = Current->Apps; } + int currentlengt = lstrlenW(CurrentApplication->Maintainer); + MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->Maintainer[currentlengt], 0x100-currentlengt); + currentlengt = lstrlenW(CurrentApplication->RegName); + MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->RegName[currentlengt], 0x100-currentlengt); + currentlengt = lstrlenW(CurrentApplication->Version); + MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->Version[currentlengt], 0x100-currentlengt); + currentlengt = lstrlenW(CurrentApplication->Licence); + MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->Licence[currentlengt], 0x100-currentlengt); + for (i=0; arg[i]; i+=2) { if(!strcmp(arg[i], "name")) @@ -103,11 +112,15 @@ if (!CurrentApplication) return; - // FIXME: handle newlines e.g. in Description if(!strcmp(CurrentTag, "maintainer")) { - int currentlengt = lstrlenW(CurrentApplication->Location); + int currentlengt = lstrlenW(CurrentApplication->Maintainer); MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Maintainer[currentlengt], 0x100-currentlengt); + } + else if(!strcmp(CurrentTag, "regname")) + { + int currentlengt = lstrlenW(CurrentApplication->RegName); + MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->RegName[currentlengt], 0x100-currentlengt); } else if(!strcmp(CurrentTag, "description")) { @@ -118,6 +131,16 @@ { int currentlengt = lstrlenW(CurrentApplication->Location); MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Location[currentlengt], 0x100-currentlengt); + } + else if(!strcmp(CurrentTag, "version")) + { + int currentlengt = lstrlenW(CurrentApplication->Version); + MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Version[currentlengt], 0x400-currentlengt); + } + else if(!strcmp(CurrentTag, "licence")) + { + int currentlengt = lstrlenW(CurrentApplication->Licence); + MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Licence[currentlengt], 0x100-currentlengt); } }

1 0

[fireball] 25764: Fix user32, gdi32 and dnsapi's base addresses so that no relocations occur during system bootup. Please note that their base addresses do not correspond anymore to the base addresses those DLLs have in Windows.
by fireball＠svn.reactos.org 10 Feb '07

10 Feb '07

Author: fireball Date: Sat Feb 10 18:49:50 2007 New Revision: 25764 URL: http://svn.reactos.org/svn/reactos?rev=25764&view=rev Log: Fix user32, gdi32 and dnsapi's base addresses so that no relocations occur during system bootup. Please note that their base addresses do not correspond anymore to the base addresses those DLLs have in Windows. Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=257… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Sat Feb 10 18:49:50 2007 @@ -123,9 +123,9 @@ <property name="BASEADDRESS_OLE32" value="0x77a50000" /> <property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> - <property name="BASEADDRESS_USER32" value="0x77e40000" /> - <property name="BASEADDRESS_GDI32" value="0x77f10000" /> - <property name="BASEADDRESS_DNSAPI" value="0x77f30000" /> + <property name="BASEADDRESS_USER32" value="0x77e30000" /> + <property name="BASEADDRESS_GDI32" value="0x77f70000" /> + <property name="BASEADDRESS_DNSAPI" value="0x77fb0000" /> <property name="BASEADDRESS_MSVCRT" value="0x78000000" /> <property name="BASEADDRESS_MSVCRT20" value="0x78500000" /> <property name="BASEADDRESS_KERNEL32" value="0x7c800000" />

1 0

[greatlrd] 25763: reverting 25758 : for follow reason 1. it cause regress of loading keyboard layout from the regsiter when reatcos booting. 2. it does not follow windows implement 3. it does not using ntoskrnl for it is ntoskrnl that handling the keyboard not the win32k. 4. it does not using right protoype for some syscall 5. some syscall does not working like windows. it mess it up instead. 6. Do not implement own design on public api and syscall
by greatlrd＠svn.reactos.org 10 Feb '07

10 Feb '07

Author: greatlrd Date: Sat Feb 10 17:52:46 2007 New Revision: 25763 URL: http://svn.reactos.org/svn/reactos?rev=25763&view=rev Log: reverting 25758 : for follow reason 1. it cause regress of loading keyboard layout from the regsiter when reatcos booting. 2. it does not follow windows implement 3. it does not using ntoskrnl for it is ntoskrnl that handling the keyboard not the win32k. 4. it does not using right protoype for some syscall 5. some syscall does not working like windows. it mess it up instead. 6. Do not implement own design on public api and syscall Removed: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/base/shell/cmd/console.c trunk/reactos/dll/win32/user32/user32.def trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/drivers/video/videoprt/videoprt.h trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c (original) +++ trunk/reactos/base/shell/cmd/console.c Sat Feb 10 17:52:46 2007 @@ -241,10 +241,13 @@ INT ConPrintfPaging(BOOL NewPage, LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle) { INT len; - PTCHAR pBuf; - CONSOLE_SCREEN_BUFFER_INFO csbi; TCHAR szOut[OUTPUT_BUFFER_SIZE]; DWORD dwWritten; + CONSOLE_SCREEN_BUFFER_INFO csbi; +#ifdef _UNICODE + INT WideLen; + PCHAR pBuf; +#endif /* used to count number of lines since last pause */ static int LineCount = 0; @@ -266,8 +269,7 @@ /* rest LineCount and return if no string have been given */ if (szFormat == NULL) return 0; - - + //get the size of the visual screen that can be printed too if (!GetConsoleScreenBufferInfo(hConsole, &csbi)) { @@ -287,37 +289,48 @@ } len = _vstprintf (szOut, szFormat, arg_ptr); - pBuf = szOut; + + +#ifdef _UNICODE + pBuf = malloc(len + 1); +#endif for(i = 0; i < len; i++) { // search 'end of string' '\n' or 'end of screen line' - for(; (i < len) && (pBuf[i] != _T('\n') && (CharSL<ScreenCol)) ; i++) + for(; (i < len) && (szOut[i] != _T('\n') && (CharSL<ScreenCol)) ; i++) CharSL++; - WriteFile (GetStdHandle (nStdHandle),&pBuf[i-CharSL],sizeof(CHAR)*(CharSL+1),&dwWritten,NULL); - LineCount++; - CharSL=0; +#ifdef _UNICODE + WideLen = WideCharToMultiByte( OutputCodePage, 0, &szOut[i-CharSL], CharSL + 1, pBuf, CharSL + 1, NULL, NULL); + WriteFile (GetStdHandle (nStdHandle),pBuf,WideLen,&dwWritten,NULL); +#else + WriteFile (GetStdHandle (nStdHandle),&szOut[i-CharSL],sizeof(CHAR)*(CharSL+1),&dwWritten,NULL); +#endif + + LineCount++; if(LineCount >= ScreenLines) { - if(_tcsnicmp(&pBuf[i], _T("\n"), 2)!=0) + if(_tcsnicmp(&szOut[i], _T("\n"), 2)!=0) WriteFile (GetStdHandle (nStdHandle),_T("\n"),sizeof(CHAR),&dwWritten,NULL); if(PagePrompt() != PROMPT_YES) { - return 1; + break; } //reset the number of lines being printed LineCount = 0; - CharSL=0; } - + CharSL=0; } #ifdef _UNICODE free(pBuf); #endif + if (i < len) //!= PROMPT_YES + return 1; + return 0; } Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.def (original) +++ trunk/reactos/dll/win32/user32/user32.def Sat Feb 10 17:52:46 2007 @@ -1,7 +1,7 @@ LIBRARY user32.dll EXPORTS -ActivateKeyboardLayout@8=NtUserActivateKeyboardLayout@8 +ActivateKeyboardLayout@8 AdjustWindowRect@12 AdjustWindowRectEx@16 AlignRects@16 @@ -295,7 +295,7 @@ GetKeyNameTextW@12 GetKeyState@4 GetKeyboardLayout@4 -GetKeyboardLayoutList@8=NtUserGetKeyboardLayoutList@8 +GetKeyboardLayoutList@8 GetKeyboardLayoutNameA@4 GetKeyboardLayoutNameW@4 GetKeyboardState@4 Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c (original) +++ trunk/reactos/dll/win32/user32/windows/input.c Sat Feb 10 17:52:46 2007 @@ -44,6 +44,218 @@ static _TRACKINGLIST tracking_info; static UINT_PTR timer; static const INT iTimerInterval = 50; /* msec for timer interval */ + + +/* LOCALE FUNCTIONS **********************************************************/ + +/* + * Utility function to read a value from the registry more easily. + * + * IN PUNICODE_STRING KeyName -> Name of key to open + * IN PUNICODE_STRING ValueName -> Name of value to open + * OUT PUNICODE_STRING ReturnedValue -> String contained in registry + * + * Returns NTSTATUS + */ + +static +NTSTATUS FASTCALL +ReadRegistryValue( PUNICODE_STRING KeyName, + PUNICODE_STRING ValueName, + PUNICODE_STRING ReturnedValue ) +{ + NTSTATUS Status; + HANDLE KeyHandle; + OBJECT_ATTRIBUTES KeyAttributes; + PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; + ULONG Length = 0; + ULONG ResLength = 0; + PWCHAR ReturnBuffer; + + InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, + NULL, NULL); + + Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes); + if( !NT_SUCCESS(Status) ) + { + return Status; + } + + Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, + 0, + 0, + &ResLength); + + if( Status != STATUS_BUFFER_TOO_SMALL ) + { + NtClose(KeyHandle); + return Status; + } + + ResLength += sizeof( *KeyValuePartialInfo ); + KeyValuePartialInfo = LocalAlloc(LMEM_ZEROINIT, ResLength); + Length = ResLength; + + if( !KeyValuePartialInfo ) + { + NtClose(KeyHandle); + return STATUS_NO_MEMORY; + } + + Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, + (PVOID)KeyValuePartialInfo, + Length, + &ResLength); + + if( !NT_SUCCESS(Status) ) + { + NtClose(KeyHandle); + LocalFree(KeyValuePartialInfo); + return Status; + } + + /* At this point, KeyValuePartialInfo->Data contains the key data */ + ReturnBuffer = LocalAlloc(0, KeyValuePartialInfo->DataLength); + if(!ReturnBuffer) + { + NtClose(KeyHandle); + LocalFree(KeyValuePartialInfo); + return STATUS_NO_MEMORY; + } + + RtlCopyMemory(ReturnBuffer, KeyValuePartialInfo->Data, KeyValuePartialInfo->DataLength); + RtlInitUnicodeString(ReturnedValue, ReturnBuffer); + + LocalFree(KeyValuePartialInfo); + NtClose(KeyHandle); + + return Status; +} + + +static +HKL FASTCALL +IntLoadKeyboardLayout( LPCWSTR pwszKLID, + UINT Flags) +{ + HANDLE Handle; + HINSTANCE KBModule = 0; + FARPROC pAddr = 0; + DWORD offTable = 0; + HKL hKL; + NTSTATUS Status; + WCHAR LocaleBuffer[16]; + UNICODE_STRING LayoutKeyName; + UNICODE_STRING LayoutValueName; + UNICODE_STRING DefaultLocale; + UNICODE_STRING LayoutFile; + UNICODE_STRING FullLayoutPath; + LCID LocaleId; + ULONG_PTR layout; + LANGID langid; + WCHAR FullPathBuffer[MAX_PATH]; + WCHAR LayoutKeyNameBuffer[128] = L"\\REGISTRY\\Machine\\SYSTEM\\CurrentControlSet" + L"\\Control\\KeyboardLayouts\\"; + + layout = (ULONG_PTR) wcstoul(pwszKLID, NULL, 16); + +// LocaleId = GetSystemDefaultLCID(); + + LocaleId = (LCID) layout; + + /* Create the HKL to be used by NtUserLoadKeyboardLayoutEx*/ + /* + * Microsoft Office expects this value to be something specific + * for Japanese and Korean Windows with an IME the value is 0xe001 + * We should probably check to see if an IME exists and if so then + * set this word properly. + */ + langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); + if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) + layout |= 0xe001 << 16; /* FIXME */ + else + layout |= layout << 16; + + DPRINT("Input = %S, DefaultLocale = %lx\n", pwszKLID, LocaleId ); + swprintf(LocaleBuffer, L"%08lx", LocaleId); + DPRINT("DefaultLocale = %S\n", LocaleBuffer); + RtlInitUnicodeString(&DefaultLocale, LocaleBuffer); + + RtlInitUnicodeString(&LayoutKeyName, LayoutKeyNameBuffer); + LayoutKeyName.MaximumLength = sizeof(LayoutKeyNameBuffer); + RtlAppendUnicodeStringToString(&LayoutKeyName, &DefaultLocale); + DPRINT("LayoutKeyName=%wZ\n", &LayoutKeyName); + RtlInitUnicodeString(&LayoutValueName, L"Layout File"); + Status = ReadRegistryValue(&LayoutKeyName,&LayoutValueName,&LayoutFile); + + if(!NT_SUCCESS(Status)) + { + DPRINT1("Failed to read registry value, %x\n", Status); + return NULL; + } + + DPRINT("Read registry and got %wZ\n", &LayoutFile); + + Status = GetSystemDirectory(FullPathBuffer, sizeof(FullPathBuffer)); + if(Status == 0 || Status > sizeof(FullPathBuffer)) + { + DPRINT1("GetSystemDirectory() failed! (%d)\n", GetLastError()); + RtlFreeUnicodeString(&LayoutFile); + return NULL; + } + + RtlInitUnicodeString(&FullLayoutPath, FullPathBuffer); + FullLayoutPath.MaximumLength = sizeof(FullPathBuffer); + if(FullLayoutPath.Length < FullLayoutPath.MaximumLength-1) + { + FullLayoutPath.Buffer[FullLayoutPath.Length/sizeof(WCHAR)] = '\\'; + FullLayoutPath.Buffer[FullLayoutPath.Length/sizeof(WCHAR)+1] = 0; + FullLayoutPath.Length+=sizeof(WCHAR); + } + Status = RtlAppendUnicodeStringToString(&FullLayoutPath, &LayoutFile); + DPRINT("Loading Keyboard DLL %wZ\n", &FullLayoutPath); + RtlFreeUnicodeString(&LayoutFile); + + if(!NT_SUCCESS(Status)) + { + DPRINT1("RtlAppendUnicodeStringToString() failed! (%x)\n", Status); + return NULL; + } + + KBModule = LoadLibraryEx(FullPathBuffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + + if(!KBModule ) + { + DPRINT1( "Failed to load %wZ, lasterror = %d\n", &FullLayoutPath, GetLastError() ); + return NULL; + } + + pAddr = GetProcAddress( KBModule, (LPCSTR) 1); + offTable = (DWORD) pAddr - (DWORD) KBModule; // Weeks to figure this out! + + DPRINT( "Load Keyboard Module Offset: %x\n", offTable ); + + FreeLibrary(KBModule); + + Handle = CreateFileW( FullPathBuffer, + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + 0, + NULL); + + hKL = NtUserLoadKeyboardLayoutEx( Handle, + offTable, + (HKL) layout, + &DefaultLocale, + (UINT) layout, + Flags); + + NtClose(Handle); + + return hKL; +} /* FUNCTIONS *****************************************************************/ @@ -102,6 +314,18 @@ /* + * @unimplemented + */ +HKL STDCALL +ActivateKeyboardLayout(HKL hkl, + UINT Flags) +{ + UNIMPLEMENTED; + return (HKL)0; +} + + +/* * @implemented */ BOOL STDCALL @@ -237,6 +461,18 @@ /* + * @unimplemented + */ +UINT STDCALL +GetKeyboardLayoutList(int nBuff, + HKL FAR *lpList) +{ + UNIMPLEMENTED; + return 0; +} + + +/* * @implemented */ BOOL STDCALL @@ -298,9 +534,15 @@ LoadKeyboardLayoutA(LPCSTR pwszKLID, UINT Flags) { - return NtUserLoadKeyboardLayoutEx( - strtoul(pwszKLID, NULL, 16), - Flags); + HKL ret; + UNICODE_STRING pwszKLIDW; + + if (pwszKLID) RtlCreateUnicodeStringFromAsciiz(&pwszKLIDW, pwszKLID); + else pwszKLIDW.Buffer = NULL; + + ret = LoadKeyboardLayoutW(pwszKLIDW.Buffer, Flags); + RtlFreeUnicodeString(&pwszKLIDW); + return ret; } @@ -311,11 +553,7 @@ LoadKeyboardLayoutW(LPCWSTR pwszKLID, UINT Flags) { - // Look at revision 25596 to see how it's done in windows. - // We will do things our own way. - return NtUserLoadKeyboardLayoutEx( - wcstoul(pwszKLID, NULL, 16), - Flags); + return IntLoadKeyboardLayout( pwszKLID, Flags); } Modified: trunk/reactos/drivers/video/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.h (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.h Sat Feb 10 17:52:46 2007 @@ -34,7 +34,9 @@ #include <ndk/ntndk.h> #include <reactos/helper.h> -#define NDEBUG +//#define NDEBUG +#undef NDEBUG +#define DEBUG #include <debug.h> #define TAG_VIDEO_PORT TAG('V', 'I', 'D', 'P') Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Sat Feb 10 17:52:46 2007 @@ -299,11 +299,11 @@ NtUserAcquireOrReleaseInputOwnership( BOOLEAN Release); -HKL +DWORD NTAPI NtUserActivateKeyboardLayout( - HKL hKl, - ULONG Flags); + DWORD Unknown0, + DWORD Unknown1); DWORD NTAPI @@ -1008,11 +1008,11 @@ NtUserGetKeyboardLayout( DWORD dwThreadid); -UINT +DWORD NTAPI NtUserGetKeyboardLayoutList( - INT nItems, - HKL *pHklBuff); + DWORD Unknown0, + DWORD Unknown1); BOOL NTAPI @@ -1219,7 +1219,11 @@ HKL NTAPI NtUserLoadKeyboardLayoutEx( - LCID LocaleId, + HANDLE Handle, + DWORD offTable, + HKL hKL, + PUNICODE_STRING puszKLID, + UINT KLayoutLangID, UINT Flags); BOOL Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h Sat Feb 10 17:52:46 2007 @@ -3,16 +3,19 @@ #include <internal/kbd.h> +typedef struct _KBDRVFILE +{ + PSINGLE_LIST_ENTRY pkbdfChain; + WCHAR wcKBDF[9]; // used w GetKeyboardLayoutName same as wszKLID. + struct _KBDTABLES* KBTables; // KBDTABLES in ntoskrnl/include/internal/kbd.h +} KBDRVFILE, *PKBDRVFILE; + typedef struct _KBL { - LIST_ENTRY List; - DWORD Flags; - WCHAR Name[9]; // used w GetKeyboardLayoutName same as wszKLID. - struct _KBDTABLES* KBTables; // KBDTABLES in ntoskrnl/include/internal/kbd.h - HANDLE hModule; - ULONG RefCount; + PLIST_ENTRY pklChain; + DWORD dwKBLFlags; HKL hkl; - LCID lcid; + PKBDRVFILE pkbdf; } KBL, *PKBL; #define KBL_UNLOADED 0x20000000 @@ -24,14 +27,12 @@ InitKeyboardImpl(VOID); PUSER_MESSAGE_QUEUE W32kGetPrimitiveMessageQueue(VOID); VOID W32kUnregisterPrimitiveMessageQueue(VOID); -PKBL W32kGetDefaultKeyLayout(VOID); +PKBDTABLES W32kGetDefaultKeyLayout(VOID); VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyLayout, BYTE Prefix); BOOL FASTCALL IntBlockInput(PW32THREAD W32Thread, BOOL BlockIt); BOOL FASTCALL IntMouseInput(MOUSEINPUT *mi); BOOL FASTCALL IntKeyboardInput(KEYBDINPUT *ki); -BOOL UserInitDefaultKeyboardLayout(); - #define ThreadHasInputAccess(W32Thread) \ (TRUE) Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h Sat Feb 10 17:52:46 2007 @@ -8,7 +8,7 @@ struct _USER_MESSAGE_QUEUE* MessageQueue; LIST_ENTRY WindowListHead; LIST_ENTRY W32CallbackListHead; - struct _KBL* KeyboardLayout; + struct _KBDTABLES* KeyboardLayout; struct _DESKTOP_OBJECT* Desktop; HANDLE hDesktop; DWORD MessagePumpHookValue; @@ -36,7 +36,7 @@ LIST_ENTRY PrivateFontListHead; FAST_MUTEX DriverObjListLock; LIST_ENTRY DriverObjListHead; - struct _KBL* KeyboardLayout; + struct _KBDTABLES* KeyboardLayout; ULONG Flags; LONG GDIObjects; LONG UserObjects; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Sat Feb 10 17:52:46 2007 @@ -529,8 +529,8 @@ KernelMode, TRUE, NULL); - DPRINT( "Keyboard Input Thread Starting...\n" ); + /* * Receive and process keyboard input. */ @@ -754,7 +754,7 @@ * keyboard layout in use. */ W32kKeyProcessMessage(&msg, - ((PW32THREAD)FocusThread->Tcb.Win32Thread)->KeyboardLayout->KBTables, + ((PW32THREAD)FocusThread->Tcb.Win32Thread)->KeyboardLayout, KeyInput.Flags & KEY_E0 ? 0xE0 : (KeyInput.Flags & KEY_E1 ? 0xE1 : 0)); @@ -816,10 +816,8 @@ } /* Initialize the default keyboard layout */ - if(!UserInitDefaultKeyboardLayout()) - { - DPRINT1("Failed to initialize default keyboard layout!\n"); - } + (VOID)W32kGetDefaultKeyLayout(); + Status = PsCreateSystemThread(&MouseThreadHandle, THREAD_ALL_ACCESS, Removed: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (removed) @@ -1,468 +1,0 @@ - -/* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: subsystems/win32/win32k/ntuser/kbdlayout.c - * PURPOSE: Keyboard layout management - * COPYRIGHT: Copyright 2007 Saveliy Tretiakov - * - */ - - -/* INCLUDES ******************************************************************/ - -#include <w32k.h> - -#define NDEBUG -#include <debug.h> - -PKBL KBLList = NULL; // Keyboard layout list. -PKBL DefaultKL = NULL; - -typedef PVOID (*KbdLayerDescriptor)(VOID); -NTSTATUS STDCALL LdrGetProcedureAddress(PVOID module, - PANSI_STRING import_name, - DWORD flags, - PVOID *func_addr); - - - -/* PRIVATE FUNCTIONS ******************************************************/ - - -/* - * Utility function to read a value from the registry more easily. - * - * IN PUNICODE_STRING KeyName -> Name of key to open - * IN PUNICODE_STRING ValueName -> Name of value to open - * OUT PUNICODE_STRING ReturnedValue -> String contained in registry - * - * Returns NTSTATUS - */ - -static NTSTATUS NTAPI ReadRegistryValue( PUNICODE_STRING KeyName, - PUNICODE_STRING ValueName, - PUNICODE_STRING ReturnedValue ) -{ - NTSTATUS Status; - HANDLE KeyHandle; - OBJECT_ATTRIBUTES KeyAttributes; - PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; - ULONG Length = 0; - ULONG ResLength = 0; - PWCHAR ReturnBuffer; - - InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, - NULL, NULL); - Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes); - if( !NT_SUCCESS(Status) ) - { - return Status; - } - - Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, - 0, - 0, - &ResLength); - - if( Status != STATUS_BUFFER_TOO_SMALL ) - { - NtClose(KeyHandle); - return Status; - } - - ResLength += sizeof( *KeyValuePartialInfo ); - KeyValuePartialInfo = - ExAllocatePoolWithTag(PagedPool, ResLength, TAG_STRING); - Length = ResLength; - - if( !KeyValuePartialInfo ) - { - NtClose(KeyHandle); - return STATUS_NO_MEMORY; - } - - Status = ZwQueryValueKey(KeyHandle, - ValueName, - KeyValuePartialInformation, - (PVOID)KeyValuePartialInfo, - Length, - &ResLength); - - if( !NT_SUCCESS(Status) ) - { - NtClose(KeyHandle); - ExFreePool(KeyValuePartialInfo); - return Status; - } - - /* At this point, KeyValuePartialInfo->Data contains the key data */ - ReturnBuffer = ExAllocatePoolWithTag(PagedPool, - KeyValuePartialInfo->DataLength, - TAG_STRING); - - if(!ReturnBuffer) - { - NtClose(KeyHandle); - ExFreePool(KeyValuePartialInfo); - return STATUS_NO_MEMORY; - } - - RtlCopyMemory(ReturnBuffer, - KeyValuePartialInfo->Data, - KeyValuePartialInfo->DataLength); - RtlInitUnicodeString(ReturnedValue, ReturnBuffer); - - ExFreePool(KeyValuePartialInfo); - NtClose(KeyHandle); - - return Status; -} - -static BOOL UserLoadKbdDll(WCHAR *wsKLID, - HANDLE *phModule, - PKBDTABLES *pKbdTables) -{ - NTSTATUS Status; - KbdLayerDescriptor layerDescGetFn; - ANSI_STRING kbdProcedureName; - UNICODE_STRING LayoutKeyName; - UNICODE_STRING LayoutValueName; - UNICODE_STRING LayoutFile; - UNICODE_STRING FullLayoutPath; - UNICODE_STRING klid; - WCHAR LayoutPathBuffer[MAX_PATH] = L"\\SystemRoot\\System32\\"; - WCHAR KeyNameBuffer[MAX_PATH] = L"\\REGISTRY\\Machine\\SYSTEM\\" - L"CurrentControlSet\\Control\\KeyboardLayouts\\"; - - RtlInitUnicodeString(&klid, wsKLID); - RtlInitUnicodeString(&LayoutValueName,L"Layout File"); - RtlInitUnicodeString(&LayoutKeyName, KeyNameBuffer); - LayoutKeyName.MaximumLength = sizeof(KeyNameBuffer); - - RtlAppendUnicodeStringToString(&LayoutKeyName, &klid); - Status = ReadRegistryValue(&LayoutKeyName, &LayoutValueName, &LayoutFile); - - if(!NT_SUCCESS(Status)) - { - DPRINT1("Can't get layout filename for %wZ. (%08lx)\n", klid, Status); - return FALSE; - } - - DPRINT("Read registry and got %wZ\n", &LayoutFile); - RtlInitUnicodeString(&FullLayoutPath, LayoutPathBuffer); - FullLayoutPath.MaximumLength = sizeof(LayoutPathBuffer); - RtlAppendUnicodeStringToString(&FullLayoutPath, &LayoutFile); - DPRINT("Loading Keyboard DLL %wZ\n", &FullLayoutPath); - RtlFreeUnicodeString(&LayoutFile); - - *phModule = EngLoadImage(FullLayoutPath.Buffer); - - if(*phModule) - { - DPRINT("Loaded %wZ\n", &FullLayoutPath); - - RtlInitAnsiString( &kbdProcedureName, "KbdLayerDescriptor" ); - LdrGetProcedureAddress((PVOID)*phModule, - &kbdProcedureName, - 0, - (PVOID*)&layerDescGetFn); - - if(layerDescGetFn) - { - *pKbdTables = layerDescGetFn(); - } - else - { - DPRINT1("Error: %wZ has no KbdLayerDescriptor()\n", &FullLayoutPath); - } - - if(!layerDescGetFn || !*pKbdTables) - { - DPRINT1("Failed to load the keyboard layout.\n"); - EngUnloadImage(*phModule); - return FALSE; - } - } - else - { - DPRINT1("Failed to load dll %wZ\n", &FullLayoutPath); - return FALSE; - } - - return TRUE; -} - -static PKBL UserLoadDllAndCreateKbl(LCID LocaleId) -{ - PKBL NewKbl; - ULONG hKl; - LANGID langid; - - NewKbl = ExAllocatePool(PagedPool, sizeof(NewKbl)); - - if(!NewKbl) - { - DPRINT1("%s: Can't allocate memory!\n", __FUNCTION__); - return NULL; - } - - swprintf(NewKbl->Name, L"%08lx", LocaleId); - - if(!UserLoadKbdDll(NewKbl->Name, &NewKbl->hModule, &NewKbl->KBTables)) - { - DPRINT1("%s: failed to load %x dll!\n", __FUNCTION__, LocaleId); - ExFreePool(NewKbl); - return NULL; - } - - /* Microsoft Office expects this value to be something specific - * for Japanese and Korean Windows with an IME the value is 0xe001 - * We should probably check to see if an IME exists and if so then - * set this word properly. - */ - langid = PRIMARYLANGID(LANGIDFROMLCID(LocaleId)); - hKl = LocaleId; - - if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - hKl |= 0xe001 << 16; /* FIXME */ - else hKl |= hKl << 16; - - NewKbl->hkl = (HKL) hKl; - NewKbl->lcid = LocaleId; - NewKbl->Flags = 0; - NewKbl->RefCount = 0; - - return NewKbl; -} - -BOOL UserInitDefaultKeyboardLayout() -{ - - LCID LocaleId; - NTSTATUS Status; - - Status = ZwQueryDefaultLocale(FALSE, &LocaleId); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Could not get default locale (%08lx).\n", Status); - } - else - { - DPRINT("DefaultLocale = %08lx\n", LocaleId); - } - - if(!NT_SUCCESS(Status) || !(DefaultKL = UserLoadDllAndCreateKbl(LocaleId))) - { - DPRINT1("Trying to load US Keyboard Layout.\n"); - LocaleId = 0x409; - - if(!(DefaultKL = UserLoadDllAndCreateKbl(LocaleId))) - { - DPRINT1("Failed to load any Keyboard Layout\n"); - return FALSE; - } - } - - InitializeListHead(&DefaultKL->List); - KBLList = DefaultKL; - return TRUE; -} - - -PKBL W32kGetDefaultKeyLayout(VOID) -{ - return DefaultKL; -} - -static PKBL UserHklToKbl(HKL hKl) -{ - PKBL pKbl = KBLList; - do - { - if(pKbl->hkl == hKl) return pKbl; - pKbl = (PKBL) pKbl->List.Flink; - } while(pKbl != KBLList); - - return NULL; -} - -static PKBL UserActivateKbl(PW32THREAD Thread, PKBL pKbl) -{ - PKBL Prev; - - Prev = Thread->KeyboardLayout; - Prev->RefCount--; - Thread->KeyboardLayout = pKbl; - pKbl->RefCount++; - - return Prev; -} - -HKL FASTCALL -UserGetKeyboardLayout( - DWORD dwThreadId) -{ - NTSTATUS Status; - PETHREAD Thread; - PW32THREAD W32Thread; - HKL Ret; - - if(!dwThreadId) - { - W32Thread = PsGetCurrentThreadWin32Thread(); - return W32Thread->KeyboardLayout->hkl; - } - - Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread); - if(!NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return NULL; - } - - W32Thread = PsGetThreadWin32Thread(Thread); - Ret = W32Thread->KeyboardLayout->hkl; - ObDereferenceObject(Thread); - return Ret; -} - -/* EXPORTS *******************************************************************/ - -UINT -STDCALL -NtUserGetKeyboardLayoutList( - INT nItems, - HKL* pHklBuff) -{ - UINT Ret = 0; - PKBL pKbl; - - UserEnterShared(); - pKbl = KBLList; - - if(nItems == 0) - { - do - { - Ret++; - pKbl = (PKBL) pKbl->List.Flink; - } while(pKbl != KBLList); - } - else - { - _SEH_TRY - { - ProbeForWrite(pHklBuff, nItems*sizeof(HKL), 4); - - while(Ret < nItems) - { - pHklBuff[Ret] = pKbl->hkl; - Ret++; - pKbl = (PKBL) pKbl->List.Flink; - if(pKbl == KBLList) break; - } - - } - _SEH_HANDLE - { - SetLastNtError(_SEH_GetExceptionCode()); - Ret = 0; - } - _SEH_END; - } - - UserLeave(); - return Ret; -} - -BOOL -STDCALL -NtUserGetKeyboardLayoutName( - LPWSTR lpszName) -{ - BOOL ret = FALSE; - PKBL pKbl; - - UserEnterShared(); - - _SEH_TRY - { - ProbeForWrite(lpszName, 9*sizeof(WCHAR), 1); - pKbl = PsGetCurrentThreadWin32Thread()->KeyboardLayout; - RtlCopyMemory(lpszName, pKbl->Name, 9*sizeof(WCHAR)); - ret = TRUE; - } - _SEH_HANDLE - { - SetLastNtError(_SEH_GetExceptionCode()); - ret = FALSE; - } - _SEH_END; - - UserLeave(); - return ret; -} - - -HKL -STDCALL -NtUserLoadKeyboardLayoutEx( - IN LCID LocaleId, - IN UINT Flags) -{ - HKL Ret = NULL; - PKBL pKbl; - - UserEnterExclusive(); - - pKbl = KBLList; - do - { - if(pKbl->lcid == LocaleId) - { - Ret = pKbl->hkl; - goto the_end; - } - - pKbl = (PKBL) pKbl->List.Flink; - } while(pKbl != KBLList); - - pKbl = UserLoadDllAndCreateKbl(LocaleId); - InsertTailList(&KBLList->List, &pKbl->List); - Ret = pKbl->hkl; - - //FIXME: Respect Flags! - -the_end: - UserLeave(); - return Ret; -} - -HKL -STDCALL -NtUserActivateKeyboardLayout( - HKL hKl, - ULONG Flags) -{ - PKBL pKbl; - HKL Ret = NULL; - - UserEnterExclusive(); - - pKbl = UserHklToKbl(hKl); - - if(pKbl) - { - pKbl = UserActivateKbl(PsGetCurrentThreadWin32Thread(), pKbl); - Ret = pKbl->hkl; - - //FIXME: Respect flags! - } - - UserLeave(); - return Ret; -} - - -/* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Sat Feb 10 17:52:46 2007 @@ -33,7 +33,8 @@ #define NDEBUG #include <debug.h> - +/* Directory to load key layouts from */ +#define SYSTEMROOT_DIR L"\\SystemRoot\\System32\\" /* Lock modifiers */ #define CAPITAL_BIT 0x80000000 #define NUMLOCK_BIT 0x40000000 @@ -51,6 +52,8 @@ BYTE gQueueKeyStateTable[256]; + +PKBDRVFILE KBLList = NULL; // Keyboard layout list. /* FUNCTIONS *****************************************************************/ @@ -431,7 +434,7 @@ cchBuff, wFlags, PsGetCurrentThreadWin32Thread() ? - PsGetCurrentThreadWin32Thread()->KeyboardLayout->KBTables : 0 ); + PsGetCurrentThreadWin32Thread()->KeyboardLayout : 0 ); } return ToUnicodeResult; @@ -453,6 +456,255 @@ 0 ); } +/* + * Utility to copy and append two unicode strings. + * + * IN OUT PUNICODE_STRING ResultFirst -> First string and result + * IN PUNICODE_STRING Second -> Second string to append + * IN BOOL Deallocate -> TRUE: Deallocate First string before + * overwriting. + * + * Returns NTSTATUS. + */ + +NTSTATUS NTAPI AppendUnicodeString(PUNICODE_STRING ResultFirst, + PUNICODE_STRING Second, + BOOL Deallocate) +{ + NTSTATUS Status; + PWSTR new_string = + ExAllocatePoolWithTag(PagedPool, + (ResultFirst->Length + Second->Length + sizeof(WCHAR)), + TAG_STRING); + if( !new_string ) + { + return STATUS_NO_MEMORY; + } + memcpy( new_string, ResultFirst->Buffer, + ResultFirst->Length ); + memcpy( new_string + ResultFirst->Length / sizeof(WCHAR), + Second->Buffer, + Second->Length ); + if( Deallocate ) + RtlFreeUnicodeString(ResultFirst); + ResultFirst->Length += Second->Length; + ResultFirst->MaximumLength = ResultFirst->Length; + new_string[ResultFirst->Length / sizeof(WCHAR)] = 0; + Status = RtlCreateUnicodeString(ResultFirst,new_string) ? + STATUS_SUCCESS : STATUS_NO_MEMORY; + ExFreePool(new_string); + return Status; +} + +/* + * Utility function to read a value from the registry more easily. + * + * IN PUNICODE_STRING KeyName -> Name of key to open + * IN PUNICODE_STRING ValueName -> Name of value to open + * OUT PUNICODE_STRING ReturnedValue -> String contained in registry + * + * Returns NTSTATUS + */ + +static NTSTATUS NTAPI ReadRegistryValue( PUNICODE_STRING KeyName, + PUNICODE_STRING ValueName, + PUNICODE_STRING ReturnedValue ) +{ + NTSTATUS Status; + HANDLE KeyHandle; + OBJECT_ATTRIBUTES KeyAttributes; + PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; + ULONG Length = 0; + ULONG ResLength = 0; + UNICODE_STRING Temp; + + InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, + NULL, NULL); + Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes); + if( !NT_SUCCESS(Status) ) + { + return Status; + } + + Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, + 0, + 0, + &ResLength); + + if( Status != STATUS_BUFFER_TOO_SMALL ) + { + NtClose(KeyHandle); + return Status; + } + + ResLength += sizeof( *KeyValuePartialInfo ); + KeyValuePartialInfo = + ExAllocatePoolWithTag(PagedPool, ResLength, TAG_STRING); + Length = ResLength; + + if( !KeyValuePartialInfo ) + { + NtClose(KeyHandle); + return STATUS_NO_MEMORY; + } + + Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, + (PVOID)KeyValuePartialInfo, + Length, + &ResLength); + + if( !NT_SUCCESS(Status) ) + { + NtClose(KeyHandle); + ExFreePool(KeyValuePartialInfo); + return Status; + } + + Temp.Length = Temp.MaximumLength = KeyValuePartialInfo->DataLength; + Temp.Buffer = (PWCHAR)KeyValuePartialInfo->Data; + + /* At this point, KeyValuePartialInfo->Data contains the key data */ + RtlInitUnicodeString(ReturnedValue,L""); + AppendUnicodeString(ReturnedValue,&Temp,FALSE); + + ExFreePool(KeyValuePartialInfo); + NtClose(KeyHandle); + + return Status; +} + +typedef PVOID (*KbdLayerDescriptor)(VOID); +NTSTATUS STDCALL LdrGetProcedureAddress(PVOID module, + PANSI_STRING import_name, + DWORD flags, + PVOID *func_addr); + +void InitKbdLayout( PVOID *pkKeyboardLayout ) +{ + WCHAR LocaleBuffer[16]; + UNICODE_STRING LayoutKeyName; + UNICODE_STRING LayoutValueName; + UNICODE_STRING DefaultLocale; + UNICODE_STRING LayoutFile; + UNICODE_STRING FullLayoutPath; + LCID LocaleId; + PWCHAR KeyboardLayoutWSTR; + HMODULE kbModule = 0; + NTSTATUS Status; + ANSI_STRING kbdProcedureName; + KbdLayerDescriptor layerDescGetFn; + +#define XX_STATUS(x) if (!NT_SUCCESS(Status = (x))) continue; + + do + { + Status = ZwQueryDefaultLocale(FALSE, &LocaleId); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not get default locale (%08lx).\n", Status); + } + else + { + DPRINT("DefaultLocale = %lx\n", LocaleId); + swprintf(LocaleBuffer, L"%08lx", LocaleId); + DPRINT("DefaultLocale = %S\n", LocaleBuffer); + RtlInitUnicodeString(&DefaultLocale, LocaleBuffer); + + RtlInitUnicodeString(&LayoutKeyName, + L"\\REGISTRY\\Machine\\SYSTEM\\CurrentControlSet" + L"\\Control\\KeyboardLayouts\\"); + + AppendUnicodeString(&LayoutKeyName,&DefaultLocale,FALSE); + + RtlInitUnicodeString(&LayoutValueName,L"Layout File"); + + Status = ReadRegistryValue(&LayoutKeyName,&LayoutValueName,&LayoutFile); + + RtlFreeUnicodeString(&LayoutKeyName); + + if( !NT_SUCCESS(Status) ) + { + DPRINT1("Got default locale but not layout file. (%08lx)\n", + Status); + } + else + { + DPRINT("Read registry and got %wZ\n", &LayoutFile); + + + RtlInitUnicodeString(&FullLayoutPath,SYSTEMROOT_DIR); + AppendUnicodeString(&FullLayoutPath,&LayoutFile,FALSE); + + DPRINT("Loading Keyboard DLL %wZ\n", &FullLayoutPath); + + RtlFreeUnicodeString(&LayoutFile); + + KeyboardLayoutWSTR = + ExAllocatePoolWithTag(PagedPool, + FullLayoutPath.Length + sizeof(WCHAR), + TAG_STRING); + + if( !KeyboardLayoutWSTR ) + { + DPRINT1("Couldn't allocate a string for the keyboard layout name.\n"); + RtlFreeUnicodeString(&FullLayoutPath); + return; + } + memcpy(KeyboardLayoutWSTR,FullLayoutPath.Buffer, + FullLayoutPath.Length); + KeyboardLayoutWSTR[FullLayoutPath.Length / sizeof(WCHAR)] = 0; + + kbModule = EngLoadImage(KeyboardLayoutWSTR); + DPRINT( "Load Keyboard Layout: %S\n", KeyboardLayoutWSTR ); + + if( !kbModule ) + DPRINT1( "Load Keyboard Layout: No %wZ\n", &FullLayoutPath ); + + ExFreePool(KeyboardLayoutWSTR); + RtlFreeUnicodeString(&FullLayoutPath); + } + } + + if( !kbModule ) + { + DPRINT1("Trying to load US Keyboard Layout\n"); + kbModule = EngLoadImage(L"\\SystemRoot\\system32\\kbdus.dll"); + + if (!kbModule) + { + DPRINT1("Failed to load any Keyboard Layout\n"); + return; + } + } + + RtlInitAnsiString( &kbdProcedureName, "KbdLayerDescriptor" ); + + LdrGetProcedureAddress((PVOID)kbModule, + &kbdProcedureName, + 0, + (PVOID*)&layerDescGetFn); + + if( layerDescGetFn ) + { + *pkKeyboardLayout = layerDescGetFn(); + } + } + while (FALSE); + + if( !*pkKeyboardLayout ) + { + DPRINT1("Failed to load the keyboard layout.\n"); + } + +#undef XX_STATUS +} + +PKBDTABLES W32kGetDefaultKeyLayout(VOID) +{ + PKBDTABLES pkKeyboardLayout = 0; + InitKbdLayout( (PVOID) &pkKeyboardLayout ); + return pkKeyboardLayout; +} BOOL FASTCALL IntTranslateKbdMessage(LPMSG lpMsg, @@ -467,7 +719,7 @@ DWORD ScanCode = 0; - keyLayout = PsGetCurrentThreadWin32Thread()->KeyboardLayout->KBTables; + keyLayout = PsGetCurrentThreadWin32Thread()->KeyboardLayout; if( !keyLayout ) return FALSE; @@ -708,7 +960,7 @@ DPRINT("Enter NtUserMapVirtualKeyEx\n"); UserEnterExclusive(); - keyLayout = PsGetCurrentThreadWin32Thread() ? PsGetCurrentThreadWin32Thread()->KeyboardLayout->KBTables : 0; + keyLayout = PsGetCurrentThreadWin32Thread() ? PsGetCurrentThreadWin32Thread()->KeyboardLayout : 0; if( !keyLayout ) RETURN(0); @@ -801,7 +1053,7 @@ UserEnterShared(); keyLayout = PsGetCurrentThreadWin32Thread() ? - PsGetCurrentThreadWin32Thread()->KeyboardLayout->KBTables : 0; + PsGetCurrentThreadWin32Thread()->KeyboardLayout : 0; if( !keyLayout || nSize < 1 ) RETURN(0); @@ -898,7 +1150,7 @@ { VK_UP, VK_NUMPAD8 }, { VK_PRIOR, VK_NUMPAD9 }, { 0,0 } }; - PVSC_VK VscVkTable = NULL; + PVSC_VK VscVkTable = NULL; if( !KeyboardLayout || !Msg || (Msg->message != WM_KEYDOWN && Msg->message != WM_SYSKEYDOWN && @@ -995,6 +1247,101 @@ } +DWORD +STDCALL +NtUserGetKeyboardLayoutList( + DWORD Items, + DWORD pHklBuff) +{ + UNIMPLEMENTED + + return 0; +} + +BOOL +STDCALL +NtUserGetKeyboardLayoutName( + LPWSTR lpszName) +{ + BOOL ret = FALSE; + LCID LocaleId; + WCHAR LocaleBuffer[16]; + NTSTATUS Status; + + + UserEnterExclusive(); + + DPRINT("Enter NtUserGetKeyboardLayoutName\n"); + + Status = ZwQueryDefaultLocale(FALSE, &LocaleId); + if (NT_SUCCESS(Status)) + { + swprintf(LocaleBuffer, L"%08lx", LocaleId); + DPRINT("LocaleId : %08lx\n",LocaleId); + _SEH_TRY + { + ProbeForWrite(lpszName, 16, 1); + RtlCopyMemory(lpszName,LocaleBuffer,16); + ret = TRUE; + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + ret = FALSE; + } + _SEH_END; + } + UserLeave(); + return ret; +} + + +HKL FASTCALL +UserGetKeyboardLayout( + DWORD dwThreadId) +{ + NTSTATUS Status; + PETHREAD Thread; + PW32THREAD W32Thread; + PKBDTABLES layout; + + if (!dwThreadId) + W32Thread = PsGetCurrentThreadWin32Thread(); + else + { + Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread);//fixme: deref thread + if(!NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } + W32Thread = Thread->Tcb.Win32Thread; /* Wrong, but returning the pointer to + the table. */ + } + layout = W32Thread->KeyboardLayout; + if(!layout) + return 0; + return (HKL)layout; +} + + +HKL +STDCALL +NtUserGetKeyboardLayout( + DWORD dwThreadId) +{ + DECLARE_RETURN(HKL); + + UserEnterShared(); + DPRINT("Enter NtUserGetKeyboardLayout\n"); + + RETURN( UserGetKeyboardLayout(dwThreadId)); + +CLEANUP: + DPRINT("Leave NtUserGetKeyboardLayout, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; +} DWORD FASTCALL @@ -1013,6 +1360,22 @@ DPRINT1("Unknown type!\n"); return 0; /* The book says 0 here, so 0 */ } +} + + +HKL +STDCALL +NtUserLoadKeyboardLayoutEx( + IN HANDLE Handle, + IN DWORD offTable, + IN HKL hKL, + IN PUNICODE_STRING puszKLID, + IN UINT KLayoutLangID, + IN UINT Flags) +{ + UNIMPLEMENTED + + return 0; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Sat Feb 10 17:52:46 2007 @@ -12,6 +12,17 @@ #define NDEBUG #include <debug.h> + +DWORD +STDCALL +NtUserActivateKeyboardLayout( + DWORD Unknown0, + DWORD Unknown1) +{ + UNIMPLEMENTED + + return 0; +} DWORD STDCALL @@ -626,7 +637,6 @@ return 0; } - DWORD STDCALL NtUserUpdateInputContext( Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Sat Feb 10 17:52:46 2007 @@ -120,7 +120,6 @@ <file>hotkey.c</file> <file>input.c</file> <file>keyboard.c</file> - <file>kbdlayout.c</file> <file>menu.c</file> <file>message.c</file> <file>metric.c</file> Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Sat Feb 10 17:52:46 2007 @@ -428,7 +428,7 @@ NtUserIsClipboardFormatAvailable 1 NtUserKillSystemTimer 2 NtUserKillTimer 2 -NtUserLoadKeyboardLayoutEx 2 +NtUserLoadKeyboardLayoutEx 6 NtUserLockWindowStation 1 NtUserLockWindowUpdate 1 NtUserLockWorkStation 0

1 0

[tretiakov] 25762: Add missing return
by tretiakov＠svn.reactos.org 10 Feb '07

10 Feb '07

Author: tretiakov Date: Sat Feb 10 16:11:02 2007 New Revision: 25762 URL: http://svn.reactos.org/svn/reactos?rev=25762&view=rev Log: Add missing return Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Sat Feb 10 16:11:02 2007 @@ -283,6 +283,8 @@ if(pKbl->hkl == hKl) return pKbl; pKbl = (PKBL) pKbl->List.Flink; } while(pKbl != KBLList); + + return NULL; } static PKBL UserActivateKbl(PW32THREAD Thread, PKBL pKbl)

1 0

[greatlrd] 25761: stub shall be in stub. file not in other files.
by greatlrd＠svn.reactos.org 10 Feb '07

10 Feb '07

Author: greatlrd Date: Sat Feb 10 12:15:04 2007 New Revision: 25761 URL: http://svn.reactos.org/svn/reactos?rev=25761&view=rev Log: stub shall be in stub. file not in other files. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Sat Feb 10 12:15:04 2007 @@ -462,14 +462,5 @@ return Ret; } -DWORD -STDCALL -NtUserUnloadKeyboardLayout( - DWORD Unknown0) -{ - UNIMPLEMENTED - - return 0; -} /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Sat Feb 10 12:15:04 2007 @@ -616,6 +616,16 @@ return 0; } +DWORD +STDCALL +NtUserUnloadKeyboardLayout( + DWORD Unknown0) +{ + UNIMPLEMENTED + + return 0; +} + DWORD STDCALL

1 0

[tretiakov] 25760: Fix a bug.
by tretiakov＠svn.reactos.org 10 Feb '07

10 Feb '07

Author: tretiakov Date: Sat Feb 10 11:09:04 2007 New Revision: 25760 URL: http://svn.reactos.org/svn/reactos?rev=25760&view=rev Log: Fix a bug. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Sat Feb 10 11:09:04 2007 @@ -158,34 +158,35 @@ *phModule = EngLoadImage(FullLayoutPath.Buffer); - if(!*phModule) - { - DPRINT1( "Failed to load %wZ\n", &FullLayoutPath ); - } - else - { - DPRINT( "Loaded Keyboard Layout: %wZ\n", &FullLayoutPath ); - } - - RtlInitAnsiString( &kbdProcedureName, "KbdLayerDescriptor" ); - LdrGetProcedureAddress((PVOID)*phModule, - &kbdProcedureName, - 0, - (PVOID*)&layerDescGetFn); - - if(layerDescGetFn) - { - *pKbdTables = layerDescGetFn(); + if(*phModule) + { + DPRINT("Loaded %wZ\n", &FullLayoutPath); + + RtlInitAnsiString( &kbdProcedureName, "KbdLayerDescriptor" ); + LdrGetProcedureAddress((PVOID)*phModule, + &kbdProcedureName, + 0, + (PVOID*)&layerDescGetFn); + + if(layerDescGetFn) + { + *pKbdTables = layerDescGetFn(); + } + else + { + DPRINT1("Error: %wZ has no KbdLayerDescriptor()\n", &FullLayoutPath); + } + + if(!layerDescGetFn || !*pKbdTables) + { + DPRINT1("Failed to load the keyboard layout.\n"); + EngUnloadImage(*phModule); + return FALSE; + } } else { - DPRINT1("Error: %wZ has no KbdLayerDescriptor()\n", &FullLayoutPath); - } - - if(!layerDescGetFn || !*pKbdTables) - { - DPRINT1("Failed to load the keyboard layout.\n"); - EngUnloadImage(*phModule); + DPRINT1("Failed to load dll %wZ\n", &FullLayoutPath); return FALSE; }

1 0

[tretiakov] 25759: Add braces to if.
by tretiakov＠svn.reactos.org 10 Feb '07

10 Feb '07

Author: tretiakov Date: Sat Feb 10 10:28:25 2007 New Revision: 25759 URL: http://svn.reactos.org/svn/reactos?rev=25759&view=rev Log: Add braces to if. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Sat Feb 10 10:28:25 2007 @@ -158,8 +158,14 @@ *phModule = EngLoadImage(FullLayoutPath.Buffer); - if(!*phModule) DPRINT1( "Failed to load %wZ\n", &FullLayoutPath ); - else DPRINT( "Loaded Keyboard Layout: %wZ\n", &FullLayoutPath ); + if(!*phModule) + { + DPRINT1( "Failed to load %wZ\n", &FullLayoutPath ); + } + else + { + DPRINT( "Loaded Keyboard Layout: %wZ\n", &FullLayoutPath ); + } RtlInitAnsiString( &kbdProcedureName, "KbdLayerDescriptor" ); LdrGetProcedureAddress((PVOID)*phModule, @@ -204,7 +210,7 @@ if(!UserLoadKbdDll(NewKbl->Name, &NewKbl->hModule, &NewKbl->KBTables)) { - DPRINT1("%s: failed to load %x dll!\n", LocaleId); + DPRINT1("%s: failed to load %x dll!\n", __FUNCTION__, LocaleId); ExFreePool(NewKbl); return NULL; } @@ -240,7 +246,10 @@ { DPRINT1("Could not get default locale (%08lx).\n", Status); } - else DPRINT("DefaultLocale = %08lx\n", LocaleId); + else + { + DPRINT("DefaultLocale = %08lx\n", LocaleId); + } if(!NT_SUCCESS(Status) || !(DefaultKL = UserLoadDllAndCreateKbl(LocaleId))) {

1 0

[tretiakov] 25758: Add multiple keyboard layout support. Implemented NtUserLoadKeyboardLayoutEx, NtUserActivateKeyboardLayout, NtUserGetKeyboardLayoutList, NtUserGetKeyboardLayoutName.
by tretiakov＠svn.reactos.org 09 Feb '07

09 Feb '07

Author: tretiakov Date: Fri Feb 9 23:48:37 2007 New Revision: 25758 URL: http://svn.reactos.org/svn/reactos?rev=25758&view=rev Log: Add multiple keyboard layout support. Implemented NtUserLoadKeyboardLayoutEx, NtUserActivateKeyboardLayout, NtUserGetKeyboardLayoutList, NtUserGetKeyboardLayoutName. Added: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Modified: trunk/reactos/dll/win32/user32/user32.def trunk/reactos/dll/win32/user32/windows/input.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.def (original) +++ trunk/reactos/dll/win32/user32/user32.def Fri Feb 9 23:48:37 2007 @@ -1,7 +1,7 @@ LIBRARY user32.dll EXPORTS -ActivateKeyboardLayout@8 +ActivateKeyboardLayout@8=NtUserActivateKeyboardLayout@8 AdjustWindowRect@12 AdjustWindowRectEx@16 AlignRects@16 @@ -295,7 +295,7 @@ GetKeyNameTextW@12 GetKeyState@4 GetKeyboardLayout@4 -GetKeyboardLayoutList@8 +GetKeyboardLayoutList@8=NtUserGetKeyboardLayoutList@8 GetKeyboardLayoutNameA@4 GetKeyboardLayoutNameW@4 GetKeyboardState@4 Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c (original) +++ trunk/reactos/dll/win32/user32/windows/input.c Fri Feb 9 23:48:37 2007 @@ -44,218 +44,6 @@ static _TRACKINGLIST tracking_info; static UINT_PTR timer; static const INT iTimerInterval = 50; /* msec for timer interval */ - - -/* LOCALE FUNCTIONS **********************************************************/ - -/* - * Utility function to read a value from the registry more easily. - * - * IN PUNICODE_STRING KeyName -> Name of key to open - * IN PUNICODE_STRING ValueName -> Name of value to open - * OUT PUNICODE_STRING ReturnedValue -> String contained in registry - * - * Returns NTSTATUS - */ - -static -NTSTATUS FASTCALL -ReadRegistryValue( PUNICODE_STRING KeyName, - PUNICODE_STRING ValueName, - PUNICODE_STRING ReturnedValue ) -{ - NTSTATUS Status; - HANDLE KeyHandle; - OBJECT_ATTRIBUTES KeyAttributes; - PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; - ULONG Length = 0; - ULONG ResLength = 0; - PWCHAR ReturnBuffer; - - InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, - NULL, NULL); - - Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes); - if( !NT_SUCCESS(Status) ) - { - return Status; - } - - Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, - 0, - 0, - &ResLength); - - if( Status != STATUS_BUFFER_TOO_SMALL ) - { - NtClose(KeyHandle); - return Status; - } - - ResLength += sizeof( *KeyValuePartialInfo ); - KeyValuePartialInfo = LocalAlloc(LMEM_ZEROINIT, ResLength); - Length = ResLength; - - if( !KeyValuePartialInfo ) - { - NtClose(KeyHandle); - return STATUS_NO_MEMORY; - } - - Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, - (PVOID)KeyValuePartialInfo, - Length, - &ResLength); - - if( !NT_SUCCESS(Status) ) - { - NtClose(KeyHandle); - LocalFree(KeyValuePartialInfo); - return Status; - } - - /* At this point, KeyValuePartialInfo->Data contains the key data */ - ReturnBuffer = LocalAlloc(0, KeyValuePartialInfo->DataLength); - if(!ReturnBuffer) - { - NtClose(KeyHandle); - LocalFree(KeyValuePartialInfo); - return STATUS_NO_MEMORY; - } - - RtlCopyMemory(ReturnBuffer, KeyValuePartialInfo->Data, KeyValuePartialInfo->DataLength); - RtlInitUnicodeString(ReturnedValue, ReturnBuffer); - - LocalFree(KeyValuePartialInfo); - NtClose(KeyHandle); - - return Status; -} - - -static -HKL FASTCALL -IntLoadKeyboardLayout( LPCWSTR pwszKLID, - UINT Flags) -{ - HANDLE Handle; - HINSTANCE KBModule = 0; - FARPROC pAddr = 0; - DWORD offTable = 0; - HKL hKL; - NTSTATUS Status; - WCHAR LocaleBuffer[16]; - UNICODE_STRING LayoutKeyName; - UNICODE_STRING LayoutValueName; - UNICODE_STRING DefaultLocale; - UNICODE_STRING LayoutFile; - UNICODE_STRING FullLayoutPath; - LCID LocaleId; - ULONG_PTR layout; - LANGID langid; - WCHAR FullPathBuffer[MAX_PATH]; - WCHAR LayoutKeyNameBuffer[128] = L"\\REGISTRY\\Machine\\SYSTEM\\CurrentControlSet" - L"\\Control\\KeyboardLayouts\\"; - - layout = (ULONG_PTR) wcstoul(pwszKLID, NULL, 16); - -// LocaleId = GetSystemDefaultLCID(); - - LocaleId = (LCID) layout; - - /* Create the HKL to be used by NtUserLoadKeyboardLayoutEx*/ - /* - * Microsoft Office expects this value to be something specific - * for Japanese and Korean Windows with an IME the value is 0xe001 - * We should probably check to see if an IME exists and if so then - * set this word properly. - */ - langid = PRIMARYLANGID(LANGIDFROMLCID(layout)); - if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) - layout |= 0xe001 << 16; /* FIXME */ - else - layout |= layout << 16; - - DPRINT("Input = %S, DefaultLocale = %lx\n", pwszKLID, LocaleId ); - swprintf(LocaleBuffer, L"%08lx", LocaleId); - DPRINT("DefaultLocale = %S\n", LocaleBuffer); - RtlInitUnicodeString(&DefaultLocale, LocaleBuffer); - - RtlInitUnicodeString(&LayoutKeyName, LayoutKeyNameBuffer); - LayoutKeyName.MaximumLength = sizeof(LayoutKeyNameBuffer); - RtlAppendUnicodeStringToString(&LayoutKeyName, &DefaultLocale); - DPRINT("LayoutKeyName=%wZ\n", &LayoutKeyName); - RtlInitUnicodeString(&LayoutValueName, L"Layout File"); - Status = ReadRegistryValue(&LayoutKeyName,&LayoutValueName,&LayoutFile); - - if(!NT_SUCCESS(Status)) - { - DPRINT1("Failed to read registry value, %x\n", Status); - return NULL; - } - - DPRINT("Read registry and got %wZ\n", &LayoutFile); - - Status = GetSystemDirectory(FullPathBuffer, sizeof(FullPathBuffer)); - if(Status == 0 || Status > sizeof(FullPathBuffer)) - { - DPRINT1("GetSystemDirectory() failed! (%d)\n", GetLastError()); - RtlFreeUnicodeString(&LayoutFile); - return NULL; - } - - RtlInitUnicodeString(&FullLayoutPath, FullPathBuffer); - FullLayoutPath.MaximumLength = sizeof(FullPathBuffer); - if(FullLayoutPath.Length < FullLayoutPath.MaximumLength-1) - { - FullLayoutPath.Buffer[FullLayoutPath.Length/sizeof(WCHAR)] = '\\'; - FullLayoutPath.Buffer[FullLayoutPath.Length/sizeof(WCHAR)+1] = 0; - FullLayoutPath.Length+=sizeof(WCHAR); - } - Status = RtlAppendUnicodeStringToString(&FullLayoutPath, &LayoutFile); - DPRINT("Loading Keyboard DLL %wZ\n", &FullLayoutPath); - RtlFreeUnicodeString(&LayoutFile); - - if(!NT_SUCCESS(Status)) - { - DPRINT1("RtlAppendUnicodeStringToString() failed! (%x)\n", Status); - return NULL; - } - - KBModule = LoadLibraryEx(FullPathBuffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); - - if(!KBModule ) - { - DPRINT1( "Failed to load %wZ, lasterror = %d\n", &FullLayoutPath, GetLastError() ); - return NULL; - } - - pAddr = GetProcAddress( KBModule, (LPCSTR) 1); - offTable = (DWORD) pAddr - (DWORD) KBModule; // Weeks to figure this out! - - DPRINT( "Load Keyboard Module Offset: %x\n", offTable ); - - FreeLibrary(KBModule); - - Handle = CreateFileW( FullPathBuffer, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - 0, - NULL); - - hKL = NtUserLoadKeyboardLayoutEx( Handle, - offTable, - (HKL) layout, - &DefaultLocale, - (UINT) layout, - Flags); - - NtClose(Handle); - - return hKL; -} /* FUNCTIONS *****************************************************************/ @@ -314,18 +102,6 @@ /* - * @unimplemented - */ -HKL STDCALL -ActivateKeyboardLayout(HKL hkl, - UINT Flags) -{ - UNIMPLEMENTED; - return (HKL)0; -} - - -/* * @implemented */ BOOL STDCALL @@ -461,18 +237,6 @@ /* - * @unimplemented - */ -UINT STDCALL -GetKeyboardLayoutList(int nBuff, - HKL FAR *lpList) -{ - UNIMPLEMENTED; - return 0; -} - - -/* * @implemented */ BOOL STDCALL @@ -534,15 +298,9 @@ LoadKeyboardLayoutA(LPCSTR pwszKLID, UINT Flags) { - HKL ret; - UNICODE_STRING pwszKLIDW; - - if (pwszKLID) RtlCreateUnicodeStringFromAsciiz(&pwszKLIDW, pwszKLID); - else pwszKLIDW.Buffer = NULL; - - ret = LoadKeyboardLayoutW(pwszKLIDW.Buffer, Flags); - RtlFreeUnicodeString(&pwszKLIDW); - return ret; + return NtUserLoadKeyboardLayoutEx( + strtoul(pwszKLID, NULL, 16), + Flags); } @@ -553,7 +311,11 @@ LoadKeyboardLayoutW(LPCWSTR pwszKLID, UINT Flags) { - return IntLoadKeyboardLayout( pwszKLID, Flags); + // Look at revision 25596 to see how it's done in windows. + // We will do things our own way. + return NtUserLoadKeyboardLayoutEx( + wcstoul(pwszKLID, NULL, 16), + Flags); } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Fri Feb 9 23:48:37 2007 @@ -299,11 +299,11 @@ NtUserAcquireOrReleaseInputOwnership( BOOLEAN Release); -DWORD +HKL NTAPI NtUserActivateKeyboardLayout( - DWORD Unknown0, - DWORD Unknown1); + HKL hKl, + ULONG Flags); DWORD NTAPI @@ -1008,11 +1008,11 @@ NtUserGetKeyboardLayout( DWORD dwThreadid); -DWORD +UINT NTAPI NtUserGetKeyboardLayoutList( - DWORD Unknown0, - DWORD Unknown1); + INT nItems, + HKL *pHklBuff); BOOL NTAPI @@ -1219,11 +1219,7 @@ HKL NTAPI NtUserLoadKeyboardLayoutEx( - HANDLE Handle, - DWORD offTable, - HKL hKL, - PUNICODE_STRING puszKLID, - UINT KLayoutLangID, + LCID LocaleId, UINT Flags); BOOL Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h Fri Feb 9 23:48:37 2007 @@ -3,19 +3,16 @@ #include <internal/kbd.h> -typedef struct _KBDRVFILE -{ - PSINGLE_LIST_ENTRY pkbdfChain; - WCHAR wcKBDF[9]; // used w GetKeyboardLayoutName same as wszKLID. - struct _KBDTABLES* KBTables; // KBDTABLES in ntoskrnl/include/internal/kbd.h -} KBDRVFILE, *PKBDRVFILE; - typedef struct _KBL { - PLIST_ENTRY pklChain; - DWORD dwKBLFlags; + LIST_ENTRY List; + DWORD Flags; + WCHAR Name[9]; // used w GetKeyboardLayoutName same as wszKLID. + struct _KBDTABLES* KBTables; // KBDTABLES in ntoskrnl/include/internal/kbd.h + HANDLE hModule; + ULONG RefCount; HKL hkl; - PKBDRVFILE pkbdf; + LCID lcid; } KBL, *PKBL; #define KBL_UNLOADED 0x20000000 @@ -27,12 +24,14 @@ InitKeyboardImpl(VOID); PUSER_MESSAGE_QUEUE W32kGetPrimitiveMessageQueue(VOID); VOID W32kUnregisterPrimitiveMessageQueue(VOID); -PKBDTABLES W32kGetDefaultKeyLayout(VOID); +PKBL W32kGetDefaultKeyLayout(VOID); VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyLayout, BYTE Prefix); BOOL FASTCALL IntBlockInput(PW32THREAD W32Thread, BOOL BlockIt); BOOL FASTCALL IntMouseInput(MOUSEINPUT *mi); BOOL FASTCALL IntKeyboardInput(KEYBDINPUT *ki); +BOOL UserInitDefaultKeyboardLayout(); + #define ThreadHasInputAccess(W32Thread) \ (TRUE) Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h Fri Feb 9 23:48:37 2007 @@ -8,7 +8,7 @@ struct _USER_MESSAGE_QUEUE* MessageQueue; LIST_ENTRY WindowListHead; LIST_ENTRY W32CallbackListHead; - struct _KBDTABLES* KeyboardLayout; + struct _KBL* KeyboardLayout; struct _DESKTOP_OBJECT* Desktop; HANDLE hDesktop; DWORD MessagePumpHookValue; @@ -36,7 +36,7 @@ LIST_ENTRY PrivateFontListHead; FAST_MUTEX DriverObjListLock; LIST_ENTRY DriverObjListHead; - struct _KBDTABLES* KeyboardLayout; + struct _KBL* KeyboardLayout; ULONG Flags; LONG GDIObjects; LONG UserObjects; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Fri Feb 9 23:48:37 2007 @@ -529,8 +529,8 @@ KernelMode, TRUE, NULL); + DPRINT( "Keyboard Input Thread Starting...\n" ); - /* * Receive and process keyboard input. */ @@ -754,7 +754,7 @@ * keyboard layout in use. */ W32kKeyProcessMessage(&msg, - ((PW32THREAD)FocusThread->Tcb.Win32Thread)->KeyboardLayout, + ((PW32THREAD)FocusThread->Tcb.Win32Thread)->KeyboardLayout->KBTables, KeyInput.Flags & KEY_E0 ? 0xE0 : (KeyInput.Flags & KEY_E1 ? 0xE1 : 0)); @@ -816,8 +816,10 @@ } /* Initialize the default keyboard layout */ - (VOID)W32kGetDefaultKeyLayout(); - + if(!UserInitDefaultKeyboardLayout()) + { + DPRINT1("Failed to initialize default keyboard layout!\n"); + } Status = PsCreateSystemThread(&MouseThreadHandle, THREAD_ALL_ACCESS, Added: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c (added) +++ trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c Fri Feb 9 23:48:37 2007 @@ -1,0 +1,465 @@ + +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/ntuser/kbdlayout.c + * PURPOSE: Keyboard layout management + * COPYRIGHT: Copyright 2007 Saveliy Tretiakov + * + */ + + +/* INCLUDES ******************************************************************/ + +#include <w32k.h> + +#define NDEBUG +#include <debug.h> + +PKBL KBLList = NULL; // Keyboard layout list. +PKBL DefaultKL = NULL; + +typedef PVOID (*KbdLayerDescriptor)(VOID); +NTSTATUS STDCALL LdrGetProcedureAddress(PVOID module, + PANSI_STRING import_name, + DWORD flags, + PVOID *func_addr); + + + +/* PRIVATE FUNCTIONS ******************************************************/ + + +/* + * Utility function to read a value from the registry more easily. + * + * IN PUNICODE_STRING KeyName -> Name of key to open + * IN PUNICODE_STRING ValueName -> Name of value to open + * OUT PUNICODE_STRING ReturnedValue -> String contained in registry + * + * Returns NTSTATUS + */ + +static NTSTATUS NTAPI ReadRegistryValue( PUNICODE_STRING KeyName, + PUNICODE_STRING ValueName, + PUNICODE_STRING ReturnedValue ) +{ + NTSTATUS Status; + HANDLE KeyHandle; + OBJECT_ATTRIBUTES KeyAttributes; + PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; + ULONG Length = 0; + ULONG ResLength = 0; + PWCHAR ReturnBuffer; + + InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, + NULL, NULL); + Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes); + if( !NT_SUCCESS(Status) ) + { + return Status; + } + + Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, + 0, + 0, + &ResLength); + + if( Status != STATUS_BUFFER_TOO_SMALL ) + { + NtClose(KeyHandle); + return Status; + } + + ResLength += sizeof( *KeyValuePartialInfo ); + KeyValuePartialInfo = + ExAllocatePoolWithTag(PagedPool, ResLength, TAG_STRING); + Length = ResLength; + + if( !KeyValuePartialInfo ) + { + NtClose(KeyHandle); + return STATUS_NO_MEMORY; + } + + Status = ZwQueryValueKey(KeyHandle, + ValueName, + KeyValuePartialInformation, + (PVOID)KeyValuePartialInfo, + Length, + &ResLength); + + if( !NT_SUCCESS(Status) ) + { + NtClose(KeyHandle); + ExFreePool(KeyValuePartialInfo); + return Status; + } + + /* At this point, KeyValuePartialInfo->Data contains the key data */ + ReturnBuffer = ExAllocatePoolWithTag(PagedPool, + KeyValuePartialInfo->DataLength, + TAG_STRING); + + if(!ReturnBuffer) + { + NtClose(KeyHandle); + ExFreePool(KeyValuePartialInfo); + return STATUS_NO_MEMORY; + } + + RtlCopyMemory(ReturnBuffer, + KeyValuePartialInfo->Data, + KeyValuePartialInfo->DataLength); + RtlInitUnicodeString(ReturnedValue, ReturnBuffer); + + ExFreePool(KeyValuePartialInfo); + NtClose(KeyHandle); + + return Status; +} + +static BOOL UserLoadKbdDll(WCHAR *wsKLID, + HANDLE *phModule, + PKBDTABLES *pKbdTables) +{ + NTSTATUS Status; + KbdLayerDescriptor layerDescGetFn; + ANSI_STRING kbdProcedureName; + UNICODE_STRING LayoutKeyName; + UNICODE_STRING LayoutValueName; + UNICODE_STRING LayoutFile; + UNICODE_STRING FullLayoutPath; + UNICODE_STRING klid; + WCHAR LayoutPathBuffer[MAX_PATH] = L"\\SystemRoot\\System32\\"; + WCHAR KeyNameBuffer[MAX_PATH] = L"\\REGISTRY\\Machine\\SYSTEM\\" + L"CurrentControlSet\\Control\\KeyboardLayouts\\"; + + RtlInitUnicodeString(&klid, wsKLID); + RtlInitUnicodeString(&LayoutValueName,L"Layout File"); + RtlInitUnicodeString(&LayoutKeyName, KeyNameBuffer); + LayoutKeyName.MaximumLength = sizeof(KeyNameBuffer); + + RtlAppendUnicodeStringToString(&LayoutKeyName, &klid); + Status = ReadRegistryValue(&LayoutKeyName, &LayoutValueName, &LayoutFile); + + if(!NT_SUCCESS(Status)) + { + DPRINT1("Can't get layout filename for %wZ. (%08lx)\n", klid, Status); + return FALSE; + } + + DPRINT("Read registry and got %wZ\n", &LayoutFile); + RtlInitUnicodeString(&FullLayoutPath, LayoutPathBuffer); + FullLayoutPath.MaximumLength = sizeof(LayoutPathBuffer); + RtlAppendUnicodeStringToString(&FullLayoutPath, &LayoutFile); + DPRINT("Loading Keyboard DLL %wZ\n", &FullLayoutPath); + RtlFreeUnicodeString(&LayoutFile); + + *phModule = EngLoadImage(FullLayoutPath.Buffer); + + if(!*phModule) DPRINT1( "Failed to load %wZ\n", &FullLayoutPath ); + else DPRINT( "Loaded Keyboard Layout: %wZ\n", &FullLayoutPath ); + + RtlInitAnsiString( &kbdProcedureName, "KbdLayerDescriptor" ); + LdrGetProcedureAddress((PVOID)*phModule, + &kbdProcedureName, + 0, + (PVOID*)&layerDescGetFn); + + if(layerDescGetFn) + { + *pKbdTables = layerDescGetFn(); + } + else + { + DPRINT1("Error: %wZ has no KbdLayerDescriptor()\n", &FullLayoutPath); + } + + if(!layerDescGetFn || !*pKbdTables) + { + DPRINT1("Failed to load the keyboard layout.\n"); + EngUnloadImage(*phModule); + return FALSE; + } + + return TRUE; +} + +static PKBL UserLoadDllAndCreateKbl(LCID LocaleId) +{ + PKBL NewKbl; + ULONG hKl; + LANGID langid; + + NewKbl = ExAllocatePool(PagedPool, sizeof(NewKbl)); + + if(!NewKbl) + { + DPRINT1("%s: Can't allocate memory!\n", __FUNCTION__); + return NULL; + } + + swprintf(NewKbl->Name, L"%08lx", LocaleId); + + if(!UserLoadKbdDll(NewKbl->Name, &NewKbl->hModule, &NewKbl->KBTables)) + { + DPRINT1("%s: failed to load %x dll!\n", LocaleId); + ExFreePool(NewKbl); + return NULL; + } + + /* Microsoft Office expects this value to be something specific + * for Japanese and Korean Windows with an IME the value is 0xe001 + * We should probably check to see if an IME exists and if so then + * set this word properly. + */ + langid = PRIMARYLANGID(LANGIDFROMLCID(LocaleId)); + hKl = LocaleId; + + if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) + hKl |= 0xe001 << 16; /* FIXME */ + else hKl |= hKl << 16; + + NewKbl->hkl = (HKL) hKl; + NewKbl->lcid = LocaleId; + NewKbl->Flags = 0; + NewKbl->RefCount = 0; + + return NewKbl; +} + +BOOL UserInitDefaultKeyboardLayout() +{ + + LCID LocaleId; + NTSTATUS Status; + + Status = ZwQueryDefaultLocale(FALSE, &LocaleId); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not get default locale (%08lx).\n", Status); + } + else DPRINT("DefaultLocale = %08lx\n", LocaleId); + + if(!NT_SUCCESS(Status) || !(DefaultKL = UserLoadDllAndCreateKbl(LocaleId))) + { + DPRINT1("Trying to load US Keyboard Layout.\n"); + LocaleId = 0x409; + + if(!(DefaultKL = UserLoadDllAndCreateKbl(LocaleId))) + { + DPRINT1("Failed to load any Keyboard Layout\n"); + return FALSE; + } + } + + InitializeListHead(&DefaultKL->List); + KBLList = DefaultKL; + return TRUE; +} + + +PKBL W32kGetDefaultKeyLayout(VOID) +{ + return DefaultKL; +} + +static PKBL UserHklToKbl(HKL hKl) +{ + PKBL pKbl = KBLList; + do + { + if(pKbl->hkl == hKl) return pKbl; + pKbl = (PKBL) pKbl->List.Flink; + } while(pKbl != KBLList); +} + +static PKBL UserActivateKbl(PW32THREAD Thread, PKBL pKbl) +{ + PKBL Prev; + + Prev = Thread->KeyboardLayout; + Prev->RefCount--; + Thread->KeyboardLayout = pKbl; + pKbl->RefCount++; + + return Prev; +} + +HKL FASTCALL +UserGetKeyboardLayout( + DWORD dwThreadId) +{ + NTSTATUS Status; + PETHREAD Thread; + PW32THREAD W32Thread; + HKL Ret; + + if(!dwThreadId) + { + W32Thread = PsGetCurrentThreadWin32Thread(); + return W32Thread->KeyboardLayout->hkl; + } + + Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread); + if(!NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return NULL; + } + + W32Thread = PsGetThreadWin32Thread(Thread); + Ret = W32Thread->KeyboardLayout->hkl; + ObDereferenceObject(Thread); + return Ret; +} + +/* EXPORTS *******************************************************************/ + +UINT +STDCALL +NtUserGetKeyboardLayoutList( + INT nItems, + HKL* pHklBuff) +{ + UINT Ret = 0; + PKBL pKbl; + + UserEnterShared(); + pKbl = KBLList; + + if(nItems == 0) + { + do + { + Ret++; + pKbl = (PKBL) pKbl->List.Flink; + } while(pKbl != KBLList); + } + else + { + _SEH_TRY + { + ProbeForWrite(pHklBuff, nItems*sizeof(HKL), 4); + + while(Ret < nItems) + { + pHklBuff[Ret] = pKbl->hkl; + Ret++; + pKbl = (PKBL) pKbl->List.Flink; + if(pKbl == KBLList) break; + } + + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + Ret = 0; + } + _SEH_END; + } + + UserLeave(); + return Ret; +} + +BOOL +STDCALL +NtUserGetKeyboardLayoutName( + LPWSTR lpszName) +{ + BOOL ret = FALSE; + PKBL pKbl; + + UserEnterShared(); + + _SEH_TRY + { + ProbeForWrite(lpszName, 9*sizeof(WCHAR), 1); + pKbl = PsGetCurrentThreadWin32Thread()->KeyboardLayout; + RtlCopyMemory(lpszName, pKbl->Name, 9*sizeof(WCHAR)); + ret = TRUE; + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + ret = FALSE; + } + _SEH_END; + + UserLeave(); + return ret; +} + + +HKL +STDCALL +NtUserLoadKeyboardLayoutEx( + IN LCID LocaleId, + IN UINT Flags) +{ + HKL Ret = NULL; + PKBL pKbl; + + UserEnterExclusive(); + + pKbl = KBLList; + do + { + if(pKbl->lcid == LocaleId) + { + Ret = pKbl->hkl; + goto the_end; + } + + pKbl = (PKBL) pKbl->List.Flink; + } while(pKbl != KBLList); + + pKbl = UserLoadDllAndCreateKbl(LocaleId); + InsertTailList(&KBLList->List, &pKbl->List); + Ret = pKbl->hkl; + + //FIXME: Respect Flags! + +the_end: + UserLeave(); + return Ret; +} + +HKL +STDCALL +NtUserActivateKeyboardLayout( + HKL hKl, + ULONG Flags) +{ + PKBL pKbl; + HKL Ret = NULL; + + UserEnterExclusive(); + + pKbl = UserHklToKbl(hKl); + + if(pKbl) + { + pKbl = UserActivateKbl(PsGetCurrentThreadWin32Thread(), pKbl); + Ret = pKbl->hkl; + + //FIXME: Respect flags! + } + + UserLeave(); + return Ret; +} + +DWORD +STDCALL +NtUserUnloadKeyboardLayout( + DWORD Unknown0) +{ + UNIMPLEMENTED + + return 0; +} + +/* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Fri Feb 9 23:48:37 2007 @@ -33,8 +33,7 @@ #define NDEBUG #include <debug.h> -/* Directory to load key layouts from */ -#define SYSTEMROOT_DIR L"\\SystemRoot\\System32\\" + /* Lock modifiers */ #define CAPITAL_BIT 0x80000000 #define NUMLOCK_BIT 0x40000000 @@ -52,8 +51,6 @@ BYTE gQueueKeyStateTable[256]; - -PKBDRVFILE KBLList = NULL; // Keyboard layout list. /* FUNCTIONS *****************************************************************/ @@ -434,7 +431,7 @@ cchBuff, wFlags, PsGetCurrentThreadWin32Thread() ? - PsGetCurrentThreadWin32Thread()->KeyboardLayout : 0 ); + PsGetCurrentThreadWin32Thread()->KeyboardLayout->KBTables : 0 ); } return ToUnicodeResult; @@ -456,255 +453,6 @@ 0 ); } -/* - * Utility to copy and append two unicode strings. - * - * IN OUT PUNICODE_STRING ResultFirst -> First string and result - * IN PUNICODE_STRING Second -> Second string to append - * IN BOOL Deallocate -> TRUE: Deallocate First string before - * overwriting. - * - * Returns NTSTATUS. - */ - -NTSTATUS NTAPI AppendUnicodeString(PUNICODE_STRING ResultFirst, - PUNICODE_STRING Second, - BOOL Deallocate) -{ - NTSTATUS Status; - PWSTR new_string = - ExAllocatePoolWithTag(PagedPool, - (ResultFirst->Length + Second->Length + sizeof(WCHAR)), - TAG_STRING); - if( !new_string ) - { - return STATUS_NO_MEMORY; - } - memcpy( new_string, ResultFirst->Buffer, - ResultFirst->Length ); - memcpy( new_string + ResultFirst->Length / sizeof(WCHAR), - Second->Buffer, - Second->Length ); - if( Deallocate ) - RtlFreeUnicodeString(ResultFirst); - ResultFirst->Length += Second->Length; - ResultFirst->MaximumLength = ResultFirst->Length; - new_string[ResultFirst->Length / sizeof(WCHAR)] = 0; - Status = RtlCreateUnicodeString(ResultFirst,new_string) ? - STATUS_SUCCESS : STATUS_NO_MEMORY; - ExFreePool(new_string); - return Status; -} - -/* - * Utility function to read a value from the registry more easily. - * - * IN PUNICODE_STRING KeyName -> Name of key to open - * IN PUNICODE_STRING ValueName -> Name of value to open - * OUT PUNICODE_STRING ReturnedValue -> String contained in registry - * - * Returns NTSTATUS - */ - -static NTSTATUS NTAPI ReadRegistryValue( PUNICODE_STRING KeyName, - PUNICODE_STRING ValueName, - PUNICODE_STRING ReturnedValue ) -{ - NTSTATUS Status; - HANDLE KeyHandle; - OBJECT_ATTRIBUTES KeyAttributes; - PKEY_VALUE_PARTIAL_INFORMATION KeyValuePartialInfo; - ULONG Length = 0; - ULONG ResLength = 0; - UNICODE_STRING Temp; - - InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, - NULL, NULL); - Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes); - if( !NT_SUCCESS(Status) ) - { - return Status; - } - - Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, - 0, - 0, - &ResLength); - - if( Status != STATUS_BUFFER_TOO_SMALL ) - { - NtClose(KeyHandle); - return Status; - } - - ResLength += sizeof( *KeyValuePartialInfo ); - KeyValuePartialInfo = - ExAllocatePoolWithTag(PagedPool, ResLength, TAG_STRING); - Length = ResLength; - - if( !KeyValuePartialInfo ) - { - NtClose(KeyHandle); - return STATUS_NO_MEMORY; - } - - Status = ZwQueryValueKey(KeyHandle, ValueName, KeyValuePartialInformation, - (PVOID)KeyValuePartialInfo, - Length, - &ResLength); - - if( !NT_SUCCESS(Status) ) - { - NtClose(KeyHandle); - ExFreePool(KeyValuePartialInfo); - return Status; - } - - Temp.Length = Temp.MaximumLength = KeyValuePartialInfo->DataLength; - Temp.Buffer = (PWCHAR)KeyValuePartialInfo->Data; - - /* At this point, KeyValuePartialInfo->Data contains the key data */ - RtlInitUnicodeString(ReturnedValue,L""); - AppendUnicodeString(ReturnedValue,&Temp,FALSE); - - ExFreePool(KeyValuePartialInfo); - NtClose(KeyHandle); - - return Status; -} - -typedef PVOID (*KbdLayerDescriptor)(VOID); -NTSTATUS STDCALL LdrGetProcedureAddress(PVOID module, - PANSI_STRING import_name, - DWORD flags, - PVOID *func_addr); - -void InitKbdLayout( PVOID *pkKeyboardLayout ) -{ - WCHAR LocaleBuffer[16]; - UNICODE_STRING LayoutKeyName; - UNICODE_STRING LayoutValueName; - UNICODE_STRING DefaultLocale; - UNICODE_STRING LayoutFile; - UNICODE_STRING FullLayoutPath; - LCID LocaleId; - PWCHAR KeyboardLayoutWSTR; - HMODULE kbModule = 0; - NTSTATUS Status; - ANSI_STRING kbdProcedureName; - KbdLayerDescriptor layerDescGetFn; - -#define XX_STATUS(x) if (!NT_SUCCESS(Status = (x))) continue; - - do - { - Status = ZwQueryDefaultLocale(FALSE, &LocaleId); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Could not get default locale (%08lx).\n", Status); - } - else - { - DPRINT("DefaultLocale = %lx\n", LocaleId); - swprintf(LocaleBuffer, L"%08lx", LocaleId); - DPRINT("DefaultLocale = %S\n", LocaleBuffer); - RtlInitUnicodeString(&DefaultLocale, LocaleBuffer); - - RtlInitUnicodeString(&LayoutKeyName, - L"\\REGISTRY\\Machine\\SYSTEM\\CurrentControlSet" - L"\\Control\\KeyboardLayouts\\"); - - AppendUnicodeString(&LayoutKeyName,&DefaultLocale,FALSE); - - RtlInitUnicodeString(&LayoutValueName,L"Layout File"); - - Status = ReadRegistryValue(&LayoutKeyName,&LayoutValueName,&LayoutFile); - - RtlFreeUnicodeString(&LayoutKeyName); - - if( !NT_SUCCESS(Status) ) - { - DPRINT1("Got default locale but not layout file. (%08lx)\n", - Status); - } - else - { - DPRINT("Read registry and got %wZ\n", &LayoutFile); - - - RtlInitUnicodeString(&FullLayoutPath,SYSTEMROOT_DIR); - AppendUnicodeString(&FullLayoutPath,&LayoutFile,FALSE); - - DPRINT("Loading Keyboard DLL %wZ\n", &FullLayoutPath); - - RtlFreeUnicodeString(&LayoutFile); - - KeyboardLayoutWSTR = - ExAllocatePoolWithTag(PagedPool, - FullLayoutPath.Length + sizeof(WCHAR), - TAG_STRING); - - if( !KeyboardLayoutWSTR ) - { - DPRINT1("Couldn't allocate a string for the keyboard layout name.\n"); - RtlFreeUnicodeString(&FullLayoutPath); - return; - } - memcpy(KeyboardLayoutWSTR,FullLayoutPath.Buffer, - FullLayoutPath.Length); - KeyboardLayoutWSTR[FullLayoutPath.Length / sizeof(WCHAR)] = 0; - - kbModule = EngLoadImage(KeyboardLayoutWSTR); - DPRINT( "Load Keyboard Layout: %S\n", KeyboardLayoutWSTR ); - - if( !kbModule ) - DPRINT1( "Load Keyboard Layout: No %wZ\n", &FullLayoutPath ); - - ExFreePool(KeyboardLayoutWSTR); - RtlFreeUnicodeString(&FullLayoutPath); - } - } - - if( !kbModule ) - { - DPRINT1("Trying to load US Keyboard Layout\n"); - kbModule = EngLoadImage(L"\\SystemRoot\\system32\\kbdus.dll"); - - if (!kbModule) - { - DPRINT1("Failed to load any Keyboard Layout\n"); - return; - } - } - - RtlInitAnsiString( &kbdProcedureName, "KbdLayerDescriptor" ); - - LdrGetProcedureAddress((PVOID)kbModule, - &kbdProcedureName, - 0, - (PVOID*)&layerDescGetFn); - - if( layerDescGetFn ) - { - *pkKeyboardLayout = layerDescGetFn(); - } - } - while (FALSE); - - if( !*pkKeyboardLayout ) - { - DPRINT1("Failed to load the keyboard layout.\n"); - } - -#undef XX_STATUS -} - -PKBDTABLES W32kGetDefaultKeyLayout(VOID) -{ - PKBDTABLES pkKeyboardLayout = 0; - InitKbdLayout( (PVOID) &pkKeyboardLayout ); - return pkKeyboardLayout; -} BOOL FASTCALL IntTranslateKbdMessage(LPMSG lpMsg, @@ -719,7 +467,7 @@ DWORD ScanCode = 0; - keyLayout = PsGetCurrentThreadWin32Thread()->KeyboardLayout; + keyLayout = PsGetCurrentThreadWin32Thread()->KeyboardLayout->KBTables; if( !keyLayout ) return FALSE; @@ -960,7 +708,7 @@ DPRINT("Enter NtUserMapVirtualKeyEx\n"); UserEnterExclusive(); - keyLayout = PsGetCurrentThreadWin32Thread() ? PsGetCurrentThreadWin32Thread()->KeyboardLayout : 0; + keyLayout = PsGetCurrentThreadWin32Thread() ? PsGetCurrentThreadWin32Thread()->KeyboardLayout->KBTables : 0; if( !keyLayout ) RETURN(0); @@ -1053,7 +801,7 @@ UserEnterShared(); keyLayout = PsGetCurrentThreadWin32Thread() ? - PsGetCurrentThreadWin32Thread()->KeyboardLayout : 0; + PsGetCurrentThreadWin32Thread()->KeyboardLayout->KBTables : 0; if( !keyLayout || nSize < 1 ) RETURN(0); @@ -1150,7 +898,7 @@ { VK_UP, VK_NUMPAD8 }, { VK_PRIOR, VK_NUMPAD9 }, { 0,0 } }; - PVSC_VK VscVkTable = NULL; + PVSC_VK VscVkTable = NULL; if( !KeyboardLayout || !Msg || (Msg->message != WM_KEYDOWN && Msg->message != WM_SYSKEYDOWN && @@ -1247,101 +995,6 @@ } -DWORD -STDCALL -NtUserGetKeyboardLayoutList( - DWORD Items, - DWORD pHklBuff) -{ - UNIMPLEMENTED - - return 0; -} - -BOOL -STDCALL -NtUserGetKeyboardLayoutName( - LPWSTR lpszName) -{ - BOOL ret = FALSE; - LCID LocaleId; - WCHAR LocaleBuffer[16]; - NTSTATUS Status; - - - UserEnterExclusive(); - - DPRINT("Enter NtUserGetKeyboardLayoutName\n"); - - Status = ZwQueryDefaultLocale(FALSE, &LocaleId); - if (NT_SUCCESS(Status)) - { - swprintf(LocaleBuffer, L"%08lx", LocaleId); - DPRINT("LocaleId : %08lx\n",LocaleId); - _SEH_TRY - { - ProbeForWrite(lpszName, 16, 1); - RtlCopyMemory(lpszName,LocaleBuffer,16); - ret = TRUE; - } - _SEH_HANDLE - { - SetLastNtError(_SEH_GetExceptionCode()); - ret = FALSE; - } - _SEH_END; - } - UserLeave(); - return ret; -} - - -HKL FASTCALL -UserGetKeyboardLayout( - DWORD dwThreadId) -{ - NTSTATUS Status; - PETHREAD Thread; - PW32THREAD W32Thread; - PKBDTABLES layout; - - if (!dwThreadId) - W32Thread = PsGetCurrentThreadWin32Thread(); - else - { - Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread);//fixme: deref thread - if(!NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return 0; - } - W32Thread = Thread->Tcb.Win32Thread; /* Wrong, but returning the pointer to - the table. */ - } - layout = W32Thread->KeyboardLayout; - if(!layout) - return 0; - return (HKL)layout; -} - - -HKL -STDCALL -NtUserGetKeyboardLayout( - DWORD dwThreadId) -{ - DECLARE_RETURN(HKL); - - UserEnterShared(); - DPRINT("Enter NtUserGetKeyboardLayout\n"); - - RETURN( UserGetKeyboardLayout(dwThreadId)); - -CLEANUP: - DPRINT("Leave NtUserGetKeyboardLayout, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} DWORD FASTCALL @@ -1360,22 +1013,6 @@ DPRINT1("Unknown type!\n"); return 0; /* The book says 0 here, so 0 */ } -} - - -HKL -STDCALL -NtUserLoadKeyboardLayoutEx( - IN HANDLE Handle, - IN DWORD offTable, - IN HKL hKL, - IN PUNICODE_STRING puszKLID, - IN UINT KLayoutLangID, - IN UINT Flags) -{ - UNIMPLEMENTED - - return 0; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Fri Feb 9 23:48:37 2007 @@ -12,17 +12,6 @@ #define NDEBUG #include <debug.h> - -DWORD -STDCALL -NtUserActivateKeyboardLayout( - DWORD Unknown0, - DWORD Unknown1) -{ - UNIMPLEMENTED - - return 0; -} DWORD STDCALL @@ -627,15 +616,6 @@ return 0; } -DWORD -STDCALL -NtUserUnloadKeyboardLayout( - DWORD Unknown0) -{ - UNIMPLEMENTED - - return 0; -} DWORD STDCALL Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild Fri Feb 9 23:48:37 2007 @@ -120,6 +120,7 @@ <file>hotkey.c</file> <file>input.c</file> <file>keyboard.c</file> + <file>kbdlayout.c</file> <file>menu.c</file> <file>message.c</file> <file>metric.c</file> Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Fri Feb 9 23:48:37 2007 @@ -428,7 +428,7 @@ NtUserIsClipboardFormatAvailable 1 NtUserKillSystemTimer 2 NtUserKillTimer 2 -NtUserLoadKeyboardLayoutEx 6 +NtUserLoadKeyboardLayoutEx 2 NtUserLockWindowStation 1 NtUserLockWindowUpdate 1 NtUserLockWorkStation 0

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs