Ros-diffs November 2014

ros-diffs@reactos.org

18 participants
373 discussions

[pschweitzer] 65525: [FASTFAT] If you decrease handles count on cleanup, don't forget to increase it on create. This fixes sharing violation on ReactOS installation with IopParseDevice hack disabled.
by pschweitzer＠svn.reactos.org 29 Nov '14

29 Nov '14

Author: pschweitzer Date: Sat Nov 29 20:09:44 2014 New Revision: 65525 URL: http://svn.reactos.org/svn/reactos?rev=65525&view=rev Log: [FASTFAT] If you decrease handles count on cleanup, don't forget to increase it on create. This fixes sharing violation on ReactOS installation with IopParseDevice hack disabled. Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Sat Nov 29 20:09:44 2014 @@ -526,6 +526,7 @@ vfatAttachFCBToFileObject(DeviceExt, pFcb, FileObject); DeviceExt->OpenHandleCount++; + pFcb->OpenHandleCount++; Irp->IoStatus.Information = FILE_OPENED; return STATUS_SUCCESS;

1 0

[dquintana] 65524: [SHELL32] * Make use of the resource IDs for all paths that need localizing. It was working in the past but was broken by re-synchronizing the code with WINE, which has unlocaliz...
by dquintana＠svn.reactos.org 29 Nov '14

29 Nov '14

Author: dquintana Date: Sat Nov 29 17:17:52 2014 New Revision: 65524 URL: http://svn.reactos.org/svn/reactos?rev=65524&view=rev Log: [SHELL32] * Make use of the resource IDs for all paths that need localizing. It was working in the past but was broken by re-synchronizing the code with WINE, which has unlocalized hardcoded strings instead. This fixes the shortcuts not appearing in other languages. * Fix the folder for Administrative tools in spanish language [USERENV] * Fix spanish folder names to match our shell32 and Windows. TRANSLATORS: If your language is broken, ensure that the paths in userenv and shell32 resources match! CORE-8834 #resolve #comment Should be fixed in trunk r65524, thanks for reporting. If this problem still happens, speak with your language's translator or provide your own patch. Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/wine/shellpath.c trunk/reactos/dll/win32/userenv/lang/es-ES.rc Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Sat Nov 29 17:17:52 2014 @@ -709,7 +709,7 @@ IDS_MYPICTURES "Mis imÃ¡genes" IDS_PROGRAM_FILES_COMMON "Archivos de programa\\Archivos comunes" IDS_COMMON_DOCUMENTS "Documentos" - IDS_ADMINTOOLS "MenÃº Inicio\\Programas\\Accesorios\\Herramientas del sistema" + IDS_ADMINTOOLS "MenÃº Inicio\\Programas\\Herramientas Administrativas" IDS_COMMON_MUSIC "Documentos\\Mi mÃºsica" IDS_COMMON_PICTURES "Documentos\\Mis imÃ¡genes" IDS_COMMON_VIDEO "Documentos\\Mis vÃdeos" Modified: trunk/reactos/dll/win32/shell32/wine/shellpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shellpath.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shellpath.c [iso-8859-1] Sat Nov 29 17:17:52 2014 @@ -665,12 +665,14 @@ CSIDL_Type_SystemX86Path, } CSIDL_Type; +#if WIN32_WINNT >= 0x0600 #define CSIDL_CONTACTS 0x0043 #define CSIDL_DOWNLOADS 0x0047 #define CSIDL_LINKS 0x004d #define CSIDL_APPDATA_LOCALLOW 0x004e #define CSIDL_SAVED_GAMES 0x0062 #define CSIDL_SEARCHES 0x0063 +#endif typedef struct { @@ -698,7 +700,7 @@ &FOLDERID_Programs, CSIDL_Type_User, ProgramsW, - Start_Menu_ProgramsW + MAKEINTRESOURCEW(IDS_PROGRAMS) }, { /* 0x03 - CSIDL_CONTROLS (.CPL files) */ &FOLDERID_ControlPanelFolder, @@ -722,25 +724,25 @@ &FOLDERID_Favorites, CSIDL_Type_User, FavoritesW, - FavoritesW + MAKEINTRESOURCEW(IDS_FAVORITES) }, { /* 0x07 - CSIDL_STARTUP */ &FOLDERID_Startup, CSIDL_Type_User, StartUpW, - Start_Menu_StartupW + MAKEINTRESOURCEW(IDS_STARTUP) }, { /* 0x08 - CSIDL_RECENT */ &FOLDERID_Recent, CSIDL_Type_User, RecentW, - RecentW + MAKEINTRESOURCEW(IDS_RECENT) }, { /* 0x09 - CSIDL_SENDTO */ &FOLDERID_SendTo, CSIDL_Type_User, SendToW, - SendToW + MAKEINTRESOURCEW(IDS_SENDTO) }, { /* 0x0a - CSIDL_BITBUCKET - Recycle Bin */ &FOLDERID_RecycleBinFolder, @@ -752,7 +754,7 @@ &FOLDERID_StartMenu, CSIDL_Type_User, Start_MenuW, - Start_MenuW + MAKEINTRESOURCEW(IDS_STARTMENU) }, { /* 0x0c - CSIDL_MYDOCUMENTS */ &GUID_NULL, @@ -800,37 +802,37 @@ &FOLDERID_NetHood, CSIDL_Type_User, NetHoodW, - NetHoodW + MAKEINTRESOURCEW(IDS_NETHOOD) }, { /* 0x14 - CSIDL_FONTS */ &FOLDERID_Fonts, CSIDL_Type_WindowsPath, FontsW, - FontsW + MAKEINTRESOURCEW(IDS_FONTS) }, { /* 0x15 - CSIDL_TEMPLATES */ &FOLDERID_Templates, CSIDL_Type_User, TemplatesW, - TemplatesW + MAKEINTRESOURCEW(IDS_TEMPLATES) }, { /* 0x16 - CSIDL_COMMON_STARTMENU */ &FOLDERID_CommonStartMenu, CSIDL_Type_AllUsers, Common_Start_MenuW, - Start_MenuW + MAKEINTRESOURCEW(IDS_STARTMENU) }, { /* 0x17 - CSIDL_COMMON_PROGRAMS */ &FOLDERID_CommonPrograms, CSIDL_Type_AllUsers, Common_ProgramsW, - Start_Menu_ProgramsW + MAKEINTRESOURCEW(IDS_PROGRAMS) }, { /* 0x18 - CSIDL_COMMON_STARTUP */ &FOLDERID_CommonStartup, CSIDL_Type_AllUsers, Common_StartUpW, - Start_Menu_StartupW + MAKEINTRESOURCEW(IDS_STARTUP) }, { /* 0x19 - CSIDL_COMMON_DESKTOPDIRECTORY */ &FOLDERID_PublicDesktop, @@ -842,19 +844,19 @@ &FOLDERID_RoamingAppData, CSIDL_Type_User, AppDataW, - Application_DataW + MAKEINTRESOURCEW(IDS_APPDATA) }, { /* 0x1b - CSIDL_PRINTHOOD */ &FOLDERID_PrintHood, CSIDL_Type_User, PrintHoodW, - PrintHoodW + MAKEINTRESOURCEW(IDS_PRINTHOOD) }, { /* 0x1c - CSIDL_LOCAL_APPDATA */ &FOLDERID_LocalAppData, CSIDL_Type_User, Local_AppDataW, - Local_Settings_Application_DataW + MAKEINTRESOURCEW(IDS_LOCAL_APPDATA) }, { /* 0x1d - CSIDL_ALTSTARTUP */ &GUID_NULL, @@ -872,31 +874,31 @@ &FOLDERID_Favorites, CSIDL_Type_AllUsers, Common_FavoritesW, - FavoritesW + MAKEINTRESOURCEW(IDS_FAVORITES) }, { /* 0x20 - CSIDL_INTERNET_CACHE */ &FOLDERID_InternetCache, CSIDL_Type_User, CacheW, - Local_Settings_Temporary_Internet_FilesW + MAKEINTRESOURCEW(IDS_INTERNET_CACHE) }, { /* 0x21 - CSIDL_COOKIES */ &FOLDERID_Cookies, CSIDL_Type_User, CookiesW, - CookiesW + MAKEINTRESOURCEW(IDS_COOKIES) }, { /* 0x22 - CSIDL_HISTORY */ &FOLDERID_History, CSIDL_Type_User, HistoryW, - Local_Settings_HistoryW + MAKEINTRESOURCEW(IDS_HISTORY) }, { /* 0x23 - CSIDL_COMMON_APPDATA */ &FOLDERID_ProgramData, CSIDL_Type_AllUsers, Common_AppDataW, - Application_DataW + MAKEINTRESOURCEW(IDS_APPDATA) }, { /* 0x24 - CSIDL_WINDOWS */ &FOLDERID_Windows, @@ -914,7 +916,7 @@ &FOLDERID_ProgramFiles, CSIDL_Type_CurrVer, ProgramFilesDirW, - Program_FilesW + MAKEINTRESOURCEW(IDS_PROGRAM_FILES) }, { /* 0x27 - CSIDL_MYPICTURES */ &FOLDERID_Pictures, @@ -944,7 +946,7 @@ &FOLDERID_ProgramFilesCommon, CSIDL_Type_CurrVer, CommonFilesDirW, - Program_Files_Common_FilesW + MAKEINTRESOURCEW(IDS_PROGRAM_FILES_COMMON) }, { /* 0x2c - CSIDL_PROGRAM_FILES_COMMONX86 */ &FOLDERID_ProgramFilesCommonX86, @@ -956,25 +958,25 @@ &FOLDERID_CommonTemplates, CSIDL_Type_AllUsers, Common_TemplatesW, - TemplatesW + MAKEINTRESOURCEW(IDS_TEMPLATES) }, { /* 0x2e - CSIDL_COMMON_DOCUMENTS */ &FOLDERID_PublicDocuments, CSIDL_Type_AllUsers, Common_DocumentsW, - DocumentsW + MAKEINTRESOURCEW(IDS_PERSONAL) }, { /* 0x2f - CSIDL_COMMON_ADMINTOOLS */ &FOLDERID_CommonAdminTools, CSIDL_Type_AllUsers, Common_Administrative_ToolsW, - Start_Menu_Admin_ToolsW + MAKEINTRESOURCEW(IDS_ADMINTOOLS) }, { /* 0x30 - CSIDL_ADMINTOOLS */ &FOLDERID_AdminTools, CSIDL_Type_User, Administrative_ToolsW, - Start_Menu_Admin_ToolsW + MAKEINTRESOURCEW(IDS_ADMINTOOLS) }, { /* 0x31 - CSIDL_CONNECTIONS */ &FOLDERID_ConnectionsFolder, @@ -1004,19 +1006,19 @@ &FOLDERID_PublicMusic, CSIDL_Type_AllUsers, CommonMusicW, - MusicW + MAKEINTRESOURCEW(IDS_COMMON_MUSIC) }, { /* 0x36 - CSIDL_COMMON_PICTURES */ &FOLDERID_PublicPictures, CSIDL_Type_AllUsers, CommonPicturesW, - PicturesW + MAKEINTRESOURCEW(IDS_COMMON_PICTURES) }, { /* 0x37 - CSIDL_COMMON_VIDEO */ &FOLDERID_PublicVideos, CSIDL_Type_AllUsers, CommonVideoW, - VideosW + MAKEINTRESOURCEW(IDS_COMMON_VIDEO) }, { /* 0x38 - CSIDL_RESOURCES */ &FOLDERID_ResourceDir, @@ -1060,6 +1062,7 @@ NULL, NULL }, +#if WIN32_WINNT >= 0x0600 { /* 0x3f */ &FOLDERID_AddNewPrograms, CSIDL_Type_Disallowed, @@ -1372,6 +1375,7 @@ NULL, NULL } +#endif }; static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest); @@ -1546,7 +1550,7 @@ } else { - FIXME("(%d,%s), LoadString failed, missing translation?\n", folder, + ERR("(%d,%s), LoadString failed, missing translation?\n", folder, debugstr_w(pszPath)); hr = E_FAIL; } @@ -2288,12 +2292,14 @@ CSIDL_MYPICTURES, CSIDL_FONTS, CSIDL_ADMINTOOLS, +#if WIN32_WINNT >= 0x0600 CSIDL_CONTACTS, CSIDL_DOWNLOADS, CSIDL_LINKS, CSIDL_APPDATA_LOCALLOW, CSIDL_SAVED_GAMES, CSIDL_SEARCHES +#endif }; WCHAR userShellFolderPath[MAX_PATH], shellFolderPath[MAX_PATH]; LPCWSTR pUserShellFolderPath, pShellFolderPath; Modified: trunk/reactos/dll/win32/userenv/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/es-ES.rc [iso-8859-1] Sat Nov 29 17:17:52 2014 @@ -8,14 +8,14 @@ IDS_APPDATA "Datos de programa" IDS_DESKTOP "Escritorio" IDS_FAVORITES "Favoritos" - IDS_STARTMENU "Menu de Inicio" - IDS_PROGRAMS "Menu de Inicio\\Programas" - IDS_ADMINTOOLS "Menu de Inicio\\Programas\\Herramientas Administrativas" - IDS_STARTUP "Menu de Inicio\\Programas\\Inicio" - IDS_MYDOCUMENTS "Mis Documentos" - IDS_MYPICTURES "Mis Documentos\\Mis imÃ¡genes" - IDS_MYMUSIC "Mis Documentos\\Mi mÃºsica" - IDS_MYVIDEOS "Mis Documentos\\Mis videos" + IDS_STARTMENU "MenÃº Inicio" + IDS_PROGRAMS "MenÃº Inicio\\Programas" + IDS_ADMINTOOLS "MenÃº Inicio\\Programas\\Herramientas Administrativas" + IDS_STARTUP "MenÃº Inicio\\Programas\\Inicio" + IDS_MYDOCUMENTS "Mis documentos" + IDS_MYPICTURES "Mis documentos\\Mis imÃ¡genes" + IDS_MYMUSIC "Mis documentos\\Mi mÃºsica" + IDS_MYVIDEOS "Mis documentos\\Mis videos" IDS_TEMPLATES "Plantillas" IDS_RECENT "Reciente" IDS_SENDTO "SendTo"

1 0

[akhaldi] 65523: [KBDES] Update, fix and improve the Spanish keyboard layout file. * Brought to you by Ismael Ferreras Morezuelas (swyter) with consistency formatting changes by me. CORE-8848 #reso...
by akhaldi＠svn.reactos.org 29 Nov '14

29 Nov '14

Author: akhaldi Date: Sat Nov 29 10:15:37 2014 New Revision: 65523 URL: http://svn.reactos.org/svn/reactos?rev=65523&view=rev Log: [KBDES] Update, fix and improve the Spanish keyboard layout file. * Brought to you by Ismael Ferreras Morezuelas (swyter) with consistency formatting changes by me. CORE-8848 #resolve #comment Committed the changes in r65523. Gracias! Modified: trunk/reactos/dll/keyboard/kbdes/kbdes.c Modified: trunk/reactos/dll/keyboard/kbdes/kbdes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdes/kbdes.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdes/kbdes.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdes/kbdes.c [iso-8859-1] Sat Nov 29 10:15:37 2014 @@ -1,4 +1,4 @@ -/* +ï»¿/* * ReactOS Spanish Keyboard Layout * Copyright (C) 2003 ReactOS * License: LGPL, see: LGPL.txt @@ -195,12 +195,12 @@ { 0x5C, VK_RWIN | KBDEXT }, // Tecla windows derecha { 0x5D, VK_APPS | KBDEXT }, // Tecla menu aplicacion derecha { 0x5F, VK_SLEEP | KBDEXT }, // Tecla Sleep - { 0x65, VK_BROWSER_SEARCH | KBDEXT }, // Pagina de búsqueda en el navegador de internet + { 0x65, VK_BROWSER_SEARCH | KBDEXT }, // Pagina de bÃºsqueda en el navegador de internet { 0x66, VK_BROWSER_FAVORITES | KBDEXT }, // Favoritos, tengo que esperar a que el tcp/ip { 0x67, VK_BROWSER_REFRESH | KBDEXT }, // Refrescar el navegador de internet { 0x68, VK_BROWSER_STOP | KBDEXT }, // Stop en el navegador de internet { 0x69, VK_BROWSER_FORWARD | KBDEXT }, // Adelante en el navegador de internet - { 0x6A, VK_BROWSER_BACK | KBDEXT }, // Atrás en el navegador de internet + { 0x6A, VK_BROWSER_BACK | KBDEXT }, // AtrÃ¡s en el navegador de internet { 0x6B, VK_LAUNCH_APP1 | KBDEXT }, // Tecla Mi pc { 0x6C, VK_LAUNCH_MAIL | KBDEXT }, // Abrir programa de e-mail { 0x6D, VK_LAUNCH_MEDIA_SELECT | KBDEXT }, // Abrir reproductor multimedia @@ -238,11 +238,11 @@ { '8', 0, {'8', '('} }, { '9', 0, {'9', ')'} }, { '0', 0, {'0', '='} }, - { VK_OEM_3, CAPLOK, {0x00F1, 0x00D1} }, // ñÑ + { VK_OEM_3, CAPLOK, {0x00F1, 0x00D1} }, // Ã±Ã /* Specials */ /* Ctrl-_ generates ES */ - { VK_OEM_6 ,0, {0x00a1, 0x00bf} }, // ¡¿ + { VK_OEM_6 ,0, {0x00a1, 0x00bf} }, // Â¡Â¿ { VK_OEM_4 ,0, {0x0027, '?'} }, //'? { VK_OEM_COMMA ,0, {',', ';'} }, { VK_OEM_PERIOD ,0, {'.', ':'} }, @@ -299,19 +299,22 @@ /* Normal, shifted, control, Alt+Gr */ { '1', 0, {'1', '!', WCH_NONE, 0x00a6} }, // 1!| { '2', 0, {'2', '"', WCH_NONE, '@'} }, // 2"@ - { '3', 0, {'3', 0x00B7, WCH_NONE, '#'} }, // 3·# - { '6', 0, {'6', '&', WCH_NONE, 0x00AC} }, // 6&¬ - { 'E', CAPLOK, {'e', 'E', 0x05, 0x20AC} }, // eE + { '3', 0, {'3', 0x00B7, WCH_NONE, '#'} }, // 3Â·# + { L'4', 0, {L'4', L'$', WCH_NONE, WCH_DEAD} }, // 4$~ + { VK_EMPTY, 0, {WCH_NONE, WCH_NONE, WCH_NONE, L'~'} }, // 4$~ + { L'5', 0, {L'5', L'%', WCH_NONE, L'â¬'} }, // 5%â¬ + { '6', 0, {'6', '&', WCH_NONE, 0x00AC} }, // 6&Â¬ + { 'E', CAPLOK, {'e', 'E', 0x05, 0x20AC} }, // eEâ¬ { VK_OEM_PLUS, 0, {'+', '*', WCH_NONE, 0x005d} }, // +*] - { VK_OEM_2, 0, {0x00e7, 0x00c7, WCH_NONE, '}'} }, // çÇ} - - { VK_OEM_7, 0, {WCH_DEAD, WCH_DEAD, WCH_NONE, '{'} }, // ´¨{ - { VK_EMPTY, 0, {0xB4, 0xA8, WCH_NONE, WCH_NONE} }, // ´¨{ + { VK_OEM_2, 0, {0x00e7, 0x00c7, WCH_NONE, '}'} }, // Ã§Ã} + + { VK_OEM_7, 0, {WCH_DEAD, WCH_DEAD, WCH_NONE, '{'} }, // Â´Â¨{ + { VK_EMPTY, 0, {0xB4, 0xA8, WCH_NONE, WCH_NONE} }, // Â´Â¨{ { VK_OEM_1, 0, {WCH_DEAD, WCH_DEAD, WCH_NONE, 0x5B} }, // `^[ { VK_EMPTY, 0, {0x60, 0x5e, WCH_NONE, WCH_NONE} }, // `^[ - { VK_OEM_5, 0, {0x00BA, 0x00AA, WCH_NONE, 0x005c} }, // çÇ} + { VK_OEM_5, 0, {0x00BA, 0x00AA, WCH_NONE, 0x005c} }, // Ã§Ã} { 0, 0 } }; @@ -344,17 +347,17 @@ #define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags //no funciona ROSDATA DEADKEY deadkey[] = { - //*´* - { DEADTRANS(L'a', 0xb4, 0xE1, 0x00) }, // letra a con ´ - { DEADTRANS(L'A', 0xb4, 0xC1, 0x00) }, // letra A con ´ - { DEADTRANS(L'e', 0xb4, 0xE9, 0x00) }, // letra e con ´ - { DEADTRANS(L'E', 0xb4, 0xC9, 0x00) }, // letra E con ´ - { DEADTRANS(L'i', 0xb4, 0xED, 0x00) }, // letra i con ´ - { DEADTRANS(L'I', 0xb4, 0xCD, 0x00) }, // letra I con ´ - { DEADTRANS(L'o', 0xb4, 0xF3, 0x00) }, // letra o con ´ - { DEADTRANS(L'O', 0xb4, 0xD3, 0x00) }, // letra O con ´ - { DEADTRANS(L'u', 0xb4, 0xFA, 0x00) }, // letra u con ´ - { DEADTRANS(L'U', 0xb4, 0xDA, 0x00) }, // letra U con ´ + //*Â´* + { DEADTRANS(L'a', 0xb4, 0xE1, 0x00) }, // letra a con Â´ + { DEADTRANS(L'A', 0xb4, 0xC1, 0x00) }, // letra A con Â´ + { DEADTRANS(L'e', 0xb4, 0xE9, 0x00) }, // letra e con Â´ + { DEADTRANS(L'E', 0xb4, 0xC9, 0x00) }, // letra E con Â´ + { DEADTRANS(L'i', 0xb4, 0xED, 0x00) }, // letra i con Â´ + { DEADTRANS(L'I', 0xb4, 0xCD, 0x00) }, // letra I con Â´ + { DEADTRANS(L'o', 0xb4, 0xF3, 0x00) }, // letra o con Â´ + { DEADTRANS(L'O', 0xb4, 0xD3, 0x00) }, // letra O con Â´ + { DEADTRANS(L'u', 0xb4, 0xFA, 0x00) }, // letra u con Â´ + { DEADTRANS(L'U', 0xb4, 0xDA, 0x00) }, // letra U con Â´ //*`* { DEADTRANS(L'a', 0x60, 0xE0, 0x00) }, // letra a con ` { DEADTRANS(L'A', 0x60, 0xC0, 0x00) }, // letra A con ` @@ -377,33 +380,40 @@ { DEADTRANS(L'O', 0x5E, 0xD4, 0x00) }, // letra O con ^ { DEADTRANS(L'u', 0x5E, 0xFB, 0x00) }, // letra u con ^ { DEADTRANS(L'U', 0x5E, 0xDB, 0x00) }, // letra U con ^ - //*¨* - { DEADTRANS(L'a', 0xA8, 0xE4, 0x00) }, // letra a con ¨ - { DEADTRANS(L'A', 0xA8, 0xC4, 0x00) }, // letra A con ¨ - { DEADTRANS(L'e', 0xA8, 0xEB, 0x00) }, // letra e con ¨ - { DEADTRANS(L'E', 0xA8, 0xCB, 0x00) }, // letra E con ¨ - { DEADTRANS(L'i', 0xA8, 0xEF, 0x00) }, // letra i con ¨ - { DEADTRANS(L'I', 0xA8, 0xCF, 0x00) }, // letra I con ¨ - { DEADTRANS(L'o', 0xA8, 0xF6, 0x00) }, // letra o con ¨ - { DEADTRANS(L'O', 0xA8, 0xD6, 0x00) }, // letra O con ¨ - { DEADTRANS(L'u', 0xA8, 0xFC, 0x00) }, // letra u con ¨ - { DEADTRANS(L'U', 0xA8, 0xDC, 0x00) }, // letra U con ¨ + //*Â¨* + { DEADTRANS(L'a', 0xA8, 0xE4, 0x00) }, // letra a con Â¨ + { DEADTRANS(L'A', 0xA8, 0xC4, 0x00) }, // letra A con Â¨ + { DEADTRANS(L'e', 0xA8, 0xEB, 0x00) }, // letra e con Â¨ + { DEADTRANS(L'E', 0xA8, 0xCB, 0x00) }, // letra E con Â¨ + { DEADTRANS(L'i', 0xA8, 0xEF, 0x00) }, // letra i con Â¨ + { DEADTRANS(L'I', 0xA8, 0xCF, 0x00) }, // letra I con Â¨ + { DEADTRANS(L'o', 0xA8, 0xF6, 0x00) }, // letra o con Â¨ + { DEADTRANS(L'O', 0xA8, 0xD6, 0x00) }, // letra O con Â¨ + { DEADTRANS(L'u', 0xA8, 0xFC, 0x00) }, // letra u con Â¨ + { DEADTRANS(L'U', 0xA8, 0xDC, 0x00) }, // letra U con Â¨ + //*~* + { DEADTRANS(L'a', 0x7e, 0xe3, 0x00) }, // Ã£ + { DEADTRANS(L'A', 0x7e, 0xc3, 0x00) }, // Ã + { DEADTRANS(L'n', 0x7e, 0xf1, 0x00) }, // Ã± + { DEADTRANS(L'N', 0x7e, 0xd1, 0x00) }, // Ã + { DEADTRANS(L'o', 0x7e, 0xf5, 0x00) }, // Ãµ + { DEADTRANS(L'O', 0x7e, 0xd5, 0x00) }, // Ã { 0, 0, 0} }; ROSDATA VSC_LPWSTR key_names[] = { { 0x00, L"" }, - { 0x01, L"Escape" }, - { 0x0e, L"Borrar" }, - { 0x0f, L"Tabulador" }, + { 0x01, L"Esc" }, + { 0x0e, L"Retroceso" }, + { 0x0f, L"Tab" }, { 0x1c, L"Intro" }, { 0x1d, L"Ctrl" }, - { 0x2a, L"Shift" }, - { 0x36, L"Shift derecho" }, - { 0x37, L"* numerico" }, + { 0x2a, L"MayÃºs" }, + { 0x36, L"MayÃºs der." }, + { 0x37, L"* num" }, { 0x38, L"Alt" }, { 0x39, L"Espacio" }, - { 0x3a, L"Bloqueo mayusculas" }, + { 0x3a, L"Bloq mayÃºs" }, { 0x3b, L"F1" }, { 0x3c, L"F2" }, { 0x3d, L"F3" }, @@ -415,7 +425,7 @@ { 0x43, L"F9" }, { 0x44, L"F10" }, { 0x45, L"Pausa" }, - { 0x46, L"Bloqueo de scroll" }, + { 0x46, L"Bloqueo despl." }, { 0x47, L"Num 7" }, { 0x48, L"Num 8" }, { 0x49, L"Num 9" }, @@ -428,8 +438,8 @@ { 0x50, L"Num 2" }, { 0x51, L"Num 3" }, { 0x52, L"Num 0" }, - { 0x53, L"Borrardo numerico" }, - { 0x54, L"Peticion de sistema" }, + { 0x53, L"Supr numÃ©r." }, + { 0x54, L"Pet sist" }, { 0x57, L"F11" }, { 0x58, L"F12" }, { 0x7c, L"F13" }, @@ -448,28 +458,28 @@ }; ROSDATA VSC_LPWSTR extended_key_names[] = { - { 0x1c, L"Intro numerico" }, - { 0x1d, L"Ctrl derecho" }, - { 0x35, L"/ numerica" }, - { 0x37, L"Imprimir pantalla" }, - { 0x38, L"Alt derecho" }, - { 0x45, L"Bloqueo numerico" }, - { 0x46, L"Interrumpir" }, + { 0x1c, L"Intro num" }, + { 0x1d, L"Ctrl der." }, + { 0x35, L"/ num." }, + { 0x37, L"Impr pant." }, + { 0x38, L"Alt der." }, + { 0x45, L"Bloq num" }, + { 0x46, L"Int" }, { 0x47, L"Inicio" }, { 0x48, L"Arriba" }, - { 0x49, L"Subir pagina" }, + { 0x49, L"RepÃ¡g" }, { 0x4b, L"Izquierda" }, { 0x4c, L"Centrar" }, { 0x4d, L"Derecha" }, { 0x4f, L"Fin" }, { 0x50, L"Abajo" }, - { 0x51, L"Bajar pagina" }, - { 0x52, L"Insertar" }, - { 0x53, L"Borrar" }, + { 0x51, L"AvpÃ¡g" }, + { 0x52, L"Ins" }, + { 0x53, L"Supr" }, { 0x54, L"<ReactOS>" }, { 0x55, L"Ayuda" }, - { 0x5b, L"Windows izquierda" }, - { 0x5c, L"Windows derecha" }, + { 0x5b, L"Windows izq." }, + { 0x5c, L"Windows der." }, { 0, NULL }, }; @@ -477,7 +487,7 @@ L"\x00b4" L"Agudo", L"\x0060" L"Grave", L"\x005e" L"Circunflejo", - L"\x00A8" L"Dieresis", + L"\x00A8" L"DiÃ©resis", NULL };

1 0

[jimtabor] 65522: [NtUser] - Fix timeout for send messages. - Assert if not the same thread while dispatching messages.
by jimtabor＠svn.reactos.org 29 Nov '14

29 Nov '14

Author: jimtabor Date: Sat Nov 29 08:26:54 2014 New Revision: 65522 URL: http://svn.reactos.org/svn/reactos?rev=65522&view=rev Log: [NtUser] - Fix timeout for send messages. - Assert if not the same thread while dispatching messages. Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sat Nov 29 08:26:54 2014 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: Message queues - * FILE: subsystems/win32/win32k/ntuser/msgqueue.c + * FILE: win32ss/user/ntuser/msgqueue.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) Alexandre Julliard Maarten Lankhorst @@ -751,6 +751,8 @@ BOOL Ret; LRESULT Result = 0; + ASSERT(pti == PsGetCurrentThreadWin32Thread()); + if (IsListEmpty(&pti->SentMessagesListHead)) { return(FALSE); @@ -1098,7 +1100,8 @@ KeInitializeEvent(&CompletionEvent, NotificationEvent, FALSE); - Timeout.QuadPart = (LONGLONG) uTimeout * (LONGLONG) -10000; + Timeout.QuadPart = Int32x32To64(-10000,uTimeout); // Pass SMTO test with a TO of 0x80000000. + TRACE("Timeout val %lld\n",Timeout.QuadPart) /* FIXME: Increase reference counter of sender's message queue here */ @@ -1181,7 +1184,7 @@ TRACE("MsqSendMessage (blocked) timed out 1\n"); } - while (co_MsqDispatchOneSentMessage(ptirec)) + while (co_MsqDispatchOneSentMessage(pti)) ; } else

1 0

[hbelusca] 65521: [USER32] - Move to an appropriate file, and correctly implement (i.e. via CSR call to USERSRV) EndTask. [USERSRV] - Hackplement SrvEndTask using our old code. Part 4/X CORE-8322
by hbelusca＠svn.reactos.org 28 Nov '14

28 Nov '14

Author: hbelusca Date: Fri Nov 28 23:42:40 2014 New Revision: 65521 URL: http://svn.reactos.org/svn/reactos?rev=65521&view=rev Log: [USER32] - Move to an appropriate file, and correctly implement (i.e. via CSR call to USERSRV) EndTask. [USERSRV] - Hackplement SrvEndTask using our old code. Part 4/X CORE-8322 Modified: trunk/reactos/include/reactos/subsys/win/winmsg.h trunk/reactos/win32ss/user/user32/misc/exit.c trunk/reactos/win32ss/user/user32/misc/misc.c trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c Modified: trunk/reactos/include/reactos/subsys/win/winmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/winmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/winmsg.h [iso-8859-1] Fri Nov 28 23:42:40 2014 @@ -42,6 +42,14 @@ DWORD Reserved; } USER_EXIT_REACTOS, *PUSER_EXIT_REACTOS; +typedef struct _USER_END_TASK +{ + DWORD LastError; + HWND WndHandle; + BOOL Force; + BOOL Success; +} USER_END_TASK, *PUSER_END_TASK; + typedef struct _USER_GET_THREAD_CONSOLE_DESKTOP { ULONG_PTR ThreadId; @@ -71,6 +79,7 @@ union { USER_EXIT_REACTOS ExitReactosRequest; + USER_END_TASK EndTaskRequest; USER_GET_THREAD_CONSOLE_DESKTOP GetThreadConsoleDesktopRequest; USER_REGISTER_SERVICES_PROCESS RegisterServicesProcessRequest; USER_REGISTER_LOGON_PROCESS RegisterLogonProcessRequest; Modified: trunk/reactos/win32ss/user/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/exit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/exit.c [iso-8859-1] Fri Nov 28 23:42:40 2014 @@ -86,4 +86,38 @@ return TRUE; } +/* + * @implemented + */ +BOOL +WINAPI +EndTask(HWND hWnd, + BOOL fShutDown, + BOOL fForce) +{ + USER_API_MESSAGE ApiMessage; + PUSER_END_TASK EndTaskRequest = &ApiMessage.Data.EndTaskRequest; + + UNREFERENCED_PARAMETER(fShutDown); + + // EndTaskRequest->LastError = ERROR_SUCCESS; + EndTaskRequest->WndHandle = hWnd; + EndTaskRequest->Force = fForce; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(USERSRV_SERVERDLL_INDEX, UserpEndTask), + sizeof(*EndTaskRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + UserSetLastNTError(ApiMessage.Status); + return FALSE; + } + + if (EndTaskRequest->LastError != ERROR_SUCCESS) + UserSetLastError(EndTaskRequest->LastError); + + return EndTaskRequest->Success; +} + /* EOF */ Modified: trunk/reactos/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/m… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/misc.c [iso-8859-1] Fri Nov 28 23:42:40 2014 @@ -150,29 +150,6 @@ dwWin32Error = RtlNtStatusToDosError( Status ); NtCurrentTeb()->LastErrorValue = dwWin32Error; return FALSE; - } - - return TRUE; -} - -/* - * @implemented - */ -BOOL -WINAPI -EndTask( - HWND hWnd, - BOOL fShutDown, - BOOL fForce) -{ - SendMessageW(hWnd, WM_CLOSE, 0, 0); - - if (IsWindow(hWnd)) - { - if (fForce) - return DestroyWindow(hWnd); - else - return FALSE; } return TRUE; Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] Fri Nov 28 23:42:40 2014 @@ -940,20 +940,45 @@ CSR_API(SrvEndTask) { + PUSER_END_TASK EndTaskRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.EndTaskRequest; + + // FIXME: This is HACK-plemented!! + DPRINT1("SrvEndTask is HACKPLEMENTED!!\n"); + + SendMessageW(EndTaskRequest->WndHandle, WM_CLOSE, 0, 0); + // PostMessageW(EndTaskRequest->WndHandle, WM_CLOSE, 0, 0); + + if (IsWindow(EndTaskRequest->WndHandle)) + { + if (EndTaskRequest->Force) + { + EndTaskRequest->Success = DestroyWindow(EndTaskRequest->WndHandle); + EndTaskRequest->LastError = GetLastError(); + } + else + { + EndTaskRequest->Success = FALSE; + } + } + else + { + EndTaskRequest->LastError = ERROR_SUCCESS; + EndTaskRequest->Success = TRUE; + } + + return STATUS_SUCCESS; +} + +CSR_API(SrvLogon) +{ DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(SrvLogon) +CSR_API(SrvRecordShutdownReason) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(SrvRecordShutdownReason) -{ - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; -} - /* EOF */

1 0

[hbelusca] 65520: Forgot this file too.
by hbelusca＠svn.reactos.org 28 Nov '14

28 Nov '14

Author: hbelusca Date: Fri Nov 28 23:24:38 2014 New Revision: 65520 URL: http://svn.reactos.org/svn/reactos?rev=65520&view=rev Log: Forgot this file too. Modified: trunk/reactos/win32ss/w32ksvc.h Modified: trunk/reactos/win32ss/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.h?rev=6552… ============================================================================== --- trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] Fri Nov 28 23:24:38 2014 @@ -485,7 +485,7 @@ SVC_(UserPostThreadMessage, 4) SVC_(UserPrintWindow, 3) SVC_(UserProcessConnect, 3) -SVC_(UserQueryInformationThread, 5) +SVC_(UserQueryInformationThread, 4) SVC_(UserQueryInputContext, 2) SVC_(UserQuerySendMessage, 1) SVC_(UserQueryUserCounters, 5)

1 0

[hbelusca] 65519: [WIN32K][ROSTESTS] So... ... first of all NtUserQueryInformationThread takes only 4 parameters in Win2k3 so do it as well... ... and since we claim at being compatible with Win2k3...
by hbelusca＠svn.reactos.org 28 Nov '14

28 Nov '14

Author: hbelusca Date: Fri Nov 28 23:19:25 2014 New Revision: 65519 URL: http://svn.reactos.org/svn/reactos?rev=65519&view=rev Log: [WIN32K][ROSTESTS] So... ... first of all NtUserQueryInformationThread takes only 4 parameters in Win2k3 so do it as well... ... and since we claim at being compatible with Win2k3 (and not XP), one **MUST** review **ALL** our win32k exports, in win32ss/w32ksvc.db database first, and then in our w32kdll apitests !!!!! But I won't do it ! Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/ntstubs.c trunk/reactos/win32ss/w32ksvc.db trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.spec trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec trunk/rostests/apitests/w32kdll/w32kdll_ros/win32ksvc-ros.h Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Fri Nov 28 23:19:25 2014 @@ -2601,14 +2601,14 @@ OUT PUSERCONNECT pUserConnect, IN DWORD dwSize); // sizeof(USERCONNECT) -DWORD +NTSTATUS NTAPI NtUserQueryInformationThread( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5); + IN HANDLE ThreadHandle, + IN USERTHREADINFOCLASS ThreadInformationClass, + OUT PVOID ThreadInformation, + IN ULONG ThreadInformationLength +); DWORD NTAPI Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Fri Nov 28 23:19:25 2014 @@ -754,17 +754,15 @@ return STATUS_UNSUCCESSFUL; } -DWORD -APIENTRY -NtUserQueryInformationThread( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4, - DWORD dwUnknown5) -{ - STUB; - return 0; +NTSTATUS +APIENTRY +NtUserQueryInformationThread(IN HANDLE ThreadHandle, + IN USERTHREADINFOCLASS ThreadInformationClass, + OUT PVOID ThreadInformation, + IN ULONG ThreadInformationLength) +{ + STUB; + return STATUS_SUCCESS; } DWORD Modified: trunk/reactos/win32ss/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.db?rev=655… ============================================================================== --- trunk/reactos/win32ss/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/win32ss/w32ksvc.db [iso-8859-1] Fri Nov 28 23:19:25 2014 @@ -483,7 +483,7 @@ NtUserPostThreadMessage 4 NtUserPrintWindow 3 NtUserProcessConnect 3 -NtUserQueryInformationThread 5 +NtUserQueryInformationThread 4 NtUserQueryInputContext 2 NtUserQuerySendMessage 1 NtUserQueryUserCounters 5 Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.spec [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.spec [iso-8859-1] Fri Nov 28 23:19:25 2014 @@ -482,7 +482,7 @@ @ stdcall NtUserPostThreadMessage(long long long long) @ stdcall NtUserPrintWindow(ptr ptr long) @ stdcall NtUserProcessConnect(ptr ptr long) -@ stdcall NtUserQueryInformationThread(long long long long) +@ stdcall NtUserQueryInformationThread(ptr long ptr long) @ stdcall NtUserQueryInputContext(long long) @ stdcall NtUserQuerySendMessage(long) @ stdcall NtUserQueryWindow(ptr long) Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec [iso-8859-1] Fri Nov 28 23:19:25 2014 @@ -484,7 +484,7 @@ @ stdcall NtUserPostThreadMessage(long long long long) @ stdcall NtUserPrintWindow(ptr ptr long) @ stdcall NtUserProcessConnect(ptr ptr long) -@ stdcall NtUserQueryInformationThread(long long long long long) +@ stdcall NtUserQueryInformationThread(ptr long ptr long) @ stdcall NtUserQueryInputContext(long long) @ stdcall NtUserQuerySendMessage(long) @ stdcall NtUserQueryUserCounters(long long long long long) Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/win32ksvc-ros.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… ============================================================================== --- trunk/rostests/apitests/w32kdll/w32kdll_ros/win32ksvc-ros.h [iso-8859-1] (original) +++ trunk/rostests/apitests/w32kdll/w32kdll_ros/win32ksvc-ros.h [iso-8859-1] Fri Nov 28 23:19:25 2014 @@ -485,7 +485,7 @@ SVC_(UserPostThreadMessage, 4) SVC_(UserPrintWindow, 3) SVC_(UserProcessConnect, 3) -SVC_(UserQueryInformationThread, 5) +SVC_(UserQueryInformationThread, 4) SVC_(UserQueryInputContext, 2) SVC_(UserQuerySendMessage, 1) SVC_(UserQueryUserCounters, 5)

1 0

[hbelusca] 65518: [WIN32K]: Remove those unneeded #defines, they are already declared in include/reactos/undocuser.h CORE-8322
by hbelusca＠svn.reactos.org 28 Nov '14

28 Nov '14

Author: hbelusca Date: Fri Nov 28 21:59:32 2014 New Revision: 65518 URL: http://svn.reactos.org/svn/reactos?rev=65518&view=rev Log: [WIN32K]: Remove those unneeded #defines, they are already declared in include/reactos/undocuser.h CORE-8322 Modified: trunk/reactos/win32ss/user/ntuser/shutdown.c Modified: trunk/reactos/win32ss/user/ntuser/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/shutdo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/shutdown.c [iso-8859-1] Fri Nov 28 21:59:32 2014 @@ -8,14 +8,6 @@ #include <win32k.h> // DBG_DEFAULT_CHANNEL(UserShutdown); - -// Client Shutdown messages -#define MCS_SHUTDOWNTIMERS 1 -#define MCS_QUERYENDSESSION 2 -// Client Shutdown returns -#define MCSR_GOODFORSHUTDOWN 1 -#define MCSR_SHUTDOWNFINISHED 2 -#define MCSR_DONOTSHUTDOWN 3 /* * Based on CSRSS and described in pages 1115 - 1118 "Windows Internals, Fifth Edition".

1 0

[hbelusca] 65517: [WIN32K]: Move IntClientShutdown function to a dedicated file (that will contain other shutdown helper functions in the future). Part 3/X CORE-8322
by hbelusca＠svn.reactos.org 28 Nov '14

28 Nov '14

Author: hbelusca Date: Fri Nov 28 21:48:44 2014 New Revision: 65517 URL: http://svn.reactos.org/svn/reactos?rev=65517&view=rev Log: [WIN32K]: Move IntClientShutdown function to a dedicated file (that will contain other shutdown helper functions in the future). Part 3/X CORE-8322 Added: trunk/reactos/win32ss/user/ntuser/shutdown.c (with props) trunk/reactos/win32ss/user/ntuser/shutdown.h (with props) Modified: trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/win32kdebug.h trunk/reactos/win32ss/win32kp.h Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Fri Nov 28 21:48:44 2014 @@ -130,6 +130,7 @@ user/ntuser/prop.c user/ntuser/scrollbar.c user/ntuser/session.c + user/ntuser/shutdown.c user/ntuser/simplecall.c user/ntuser/sysparams.c user/ntuser/timer.c Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] Fri Nov 28 21:48:44 2014 @@ -85,6 +85,7 @@ {L"UserProcess", DbgChUserProcess}, {L"UserProp", DbgChUserProp}, {L"UserScrollbar", DbgChUserScrollbar}, + {L"UserShutdown", DbgChUserShutdown}, {L"UserSysparams", DbgChUserSysparams}, {L"UserTimer", DbgChUserTimer}, {L"UserThread", DbgChUserThread}, Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Fri Nov 28 21:48:44 2014 @@ -7,7 +7,6 @@ */ #include <win32k.h> - #include <windowsx.h> DBG_DEFAULT_CHANNEL(UserDefwnd); @@ -31,91 +30,6 @@ (((hit) == HTTOP) || ((hit) == HTTOPLEFT) || ((hit) == HTTOPRIGHT)) #define ON_BOTTOM_BORDER(hit) \ (((hit) == HTBOTTOM) || ((hit) == HTBOTTOMLEFT) || ((hit) == HTBOTTOMRIGHT)) - -// Client Shutdown messages -#define MCS_SHUTDOWNTIMERS 1 -#define MCS_QUERYENDSESSION 2 -// Client Shutdown returns -#define MCSR_GOODFORSHUTDOWN 1 -#define MCSR_SHUTDOWNFINISHED 2 -#define MCSR_DONOTSHUTDOWN 3 - -/* - * Based on CSRSS and described in pages 1115 - 1118 "Windows Internals, Fifth Edition". - * Apparently CSRSS sends out messages to do this w/o going into win32k internals. - */ -static -LRESULT FASTCALL -IntClientShutdown( - PWND pWindow, - WPARAM wParam, - LPARAM lParam -) -{ - LPARAM lParams; - BOOL KillTimers; - INT i; - LRESULT lResult = MCSR_GOODFORSHUTDOWN; - HWND *List; - - lParams = wParam & (ENDSESSION_LOGOFF|ENDSESSION_CRITICAL|ENDSESSION_CLOSEAPP); - KillTimers = wParam & MCS_SHUTDOWNTIMERS ? TRUE : FALSE; -/* - First, send end sessions to children. - */ - List = IntWinListChildren(pWindow); - - if (List) - { - for (i = 0; List[i]; i++) - { - PWND WndChild; - - if (!(WndChild = UserGetWindowObject(List[i]))) - continue; - - if (wParam & MCS_QUERYENDSESSION) - { - if (!co_IntSendMessage(WndChild->head.h, WM_QUERYENDSESSION, 0, lParams)) - { - lResult = MCSR_DONOTSHUTDOWN; - break; - } - } - else - { - co_IntSendMessage(WndChild->head.h, WM_ENDSESSION, KillTimers, lParams); - if (KillTimers) - { - DestroyTimersForWindow(WndChild->head.pti, WndChild); - } - lResult = MCSR_SHUTDOWNFINISHED; - } - } - ExFreePoolWithTag(List, USERTAG_WINDOWLIST); - } - if (List && (lResult == MCSR_DONOTSHUTDOWN)) return lResult; -/* - Send to the caller. - */ - if (wParam & MCS_QUERYENDSESSION) - { - if (!co_IntSendMessage(pWindow->head.h, WM_QUERYENDSESSION, 0, lParams)) - { - lResult = MCSR_DONOTSHUTDOWN; - } - } - else - { - co_IntSendMessage(pWindow->head.h, WM_ENDSESSION, KillTimers, lParams); - if (KillTimers) - { - DestroyTimersForWindow(pWindow->head.pti, pWindow); - } - lResult = MCSR_SHUTDOWNFINISHED; - } - return lResult; -} HBRUSH FASTCALL DefWndControlColor(HDC hDC, UINT ctlType) @@ -916,6 +830,7 @@ } } break; + case WM_CLIENTSHUTDOWN: return IntClientShutdown(Wnd, wParam, lParam); Added: trunk/reactos/win32ss/user/ntuser/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/shutdo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/shutdown.c (added) +++ trunk/reactos/win32ss/user/ntuser/shutdown.c [iso-8859-1] Fri Nov 28 21:48:44 2014 @@ -0,0 +1,96 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Win32k subsystem + * PURPOSE: Shutdown routines + * FILE: subsystems/win32/win32k/ntuser/shutdown.c + * PROGRAMER: Hermes Belusca + */ + +#include <win32k.h> +// DBG_DEFAULT_CHANNEL(UserShutdown); + +// Client Shutdown messages +#define MCS_SHUTDOWNTIMERS 1 +#define MCS_QUERYENDSESSION 2 +// Client Shutdown returns +#define MCSR_GOODFORSHUTDOWN 1 +#define MCSR_SHUTDOWNFINISHED 2 +#define MCSR_DONOTSHUTDOWN 3 + +/* + * Based on CSRSS and described in pages 1115 - 1118 "Windows Internals, Fifth Edition". + * CSRSS sends WM_CLIENTSHUTDOWN messages to top-level windows, and it is our job + * to send WM_QUERYENDSESSION / WM_ENDSESSION messages in response. + */ +LRESULT +IntClientShutdown(IN PWND pWindow, + IN WPARAM wParam, + IN LPARAM lParam) +{ + LPARAM lParams; + BOOL KillTimers; + INT i; + LRESULT lResult = MCSR_GOODFORSHUTDOWN; + HWND *List; + + lParams = wParam & (ENDSESSION_LOGOFF|ENDSESSION_CRITICAL|ENDSESSION_CLOSEAPP); + KillTimers = wParam & MCS_SHUTDOWNTIMERS ? TRUE : FALSE; + + /* First, send end sessions to children */ + List = IntWinListChildren(pWindow); + + if (List) + { + for (i = 0; List[i]; i++) + { + PWND WndChild; + + if (!(WndChild = UserGetWindowObject(List[i]))) + continue; + + if (wParam & MCS_QUERYENDSESSION) + { + if (!co_IntSendMessage(WndChild->head.h, WM_QUERYENDSESSION, 0, lParams)) + { + lResult = MCSR_DONOTSHUTDOWN; + break; + } + } + else + { + co_IntSendMessage(WndChild->head.h, WM_ENDSESSION, KillTimers, lParams); + if (KillTimers) + { + DestroyTimersForWindow(WndChild->head.pti, WndChild); + } + lResult = MCSR_SHUTDOWNFINISHED; + } + } + ExFreePoolWithTag(List, USERTAG_WINDOWLIST); + } + + if (List && (lResult == MCSR_DONOTSHUTDOWN)) + return lResult; + + /* Send to the caller */ + if (wParam & MCS_QUERYENDSESSION) + { + if (!co_IntSendMessage(pWindow->head.h, WM_QUERYENDSESSION, 0, lParams)) + { + lResult = MCSR_DONOTSHUTDOWN; + } + } + else + { + co_IntSendMessage(pWindow->head.h, WM_ENDSESSION, KillTimers, lParams); + if (KillTimers) + { + DestroyTimersForWindow(pWindow->head.pti, pWindow); + } + lResult = MCSR_SHUTDOWNFINISHED; + } + + return lResult; +} + +/* EOF */ Propchange: trunk/reactos/win32ss/user/ntuser/shutdown.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/win32ss/user/ntuser/shutdown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/shutdo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/shutdown.h (added) +++ trunk/reactos/win32ss/user/ntuser/shutdown.h [iso-8859-1] Fri Nov 28 21:48:44 2014 @@ -0,0 +1,6 @@ +#pragma once + +LRESULT +IntClientShutdown(IN PWND pWindow, + IN WPARAM wParam, + IN LPARAM lParam); Propchange: trunk/reactos/win32ss/user/ntuser/shutdown.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/user/ntuser/win32kdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32k… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32kdebug.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32kdebug.h [iso-8859-1] Fri Nov 28 21:48:44 2014 @@ -109,6 +109,7 @@ DbgChUserProcess, DbgChUserProp, DbgChUserScrollbar, + DbgChUserShutdown, DbgChUserSysparams, DbgChUserThread, DbgChUserTimer, Modified: trunk/reactos/win32ss/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/win32kp.h?rev=6551… ============================================================================== --- trunk/reactos/win32ss/win32kp.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/win32kp.h [iso-8859-1] Fri Nov 28 21:48:44 2014 @@ -75,6 +75,7 @@ #include "user/ntuser/win32.h" #include "user/ntuser/object.h" #include "user/ntuser/ntuser.h" +#include "user/ntuser/shutdown.h" #include "user/ntuser/cursoricon.h" #include "user/ntuser/accelerator.h" #include "user/ntuser/hook.h"

1 0

[hbelusca] 65516: [USERSRV]: Use UlongToHandle and make ServicesProcessId global (will be used later on, for shutdown). Part 2/X CORE-8322
by hbelusca＠svn.reactos.org 28 Nov '14

28 Nov '14

Author: hbelusca Date: Fri Nov 28 21:08:57 2014 New Revision: 65516 URL: http://svn.reactos.org/svn/reactos?rev=65516&view=rev Log: [USERSRV]: Use UlongToHandle and make ServicesProcessId global (will be used later on, for shutdown). Part 2/X CORE-8322 Modified: trunk/reactos/win32ss/user/winsrv/usersrv/register.c trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h Modified: trunk/reactos/win32ss/user/winsrv/usersrv/register.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/register.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/register.c [iso-8859-1] Fri Nov 28 21:08:57 2014 @@ -17,8 +17,7 @@ /* GLOBALS ********************************************************************/ static BOOLEAN ServicesProcessIdValid = FALSE; -static ULONG_PTR ServicesProcessId = 0; - +ULONG_PTR ServicesProcessId = 0; ULONG_PTR LogonProcessId = 0; /* PUBLIC SERVER APIS *********************************************************/ @@ -36,7 +35,7 @@ } else { - if (ApiMessage->Header.ClientId.UniqueProcess != (HANDLE)LogonProcessId) + if (ApiMessage->Header.ClientId.UniqueProcess != UlongToHandle(LogonProcessId)) { DPRINT1("Current logon process 0x%x, can't deregister from process 0x%x\n", LogonProcessId, ApiMessage->Header.ClientId.UniqueProcess); Modified: trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/usersrv.h [iso-8859-1] Fri Nov 28 21:08:57 2014 @@ -38,6 +38,7 @@ /* Globals */ extern HINSTANCE UserServerDllInstance; extern HANDLE UserServerHeap; +extern ULONG_PTR ServicesProcessId; extern ULONG_PTR LogonProcessId; #endif /* __USERSRV_H__ */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2014