Ros-diffs April 2011

ros-diffs@reactos.org

19 participants
296 discussions

[ekohl] 51262: [WIDL] Reapply the switchtype patch.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Apr 5 21:37:54 2011 New Revision: 51262 URL: http://svn.reactos.org/svn/reactos?rev=51262&view=rev Log: [WIDL] Reapply the switchtype patch. Modified: trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.y Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… ============================================================================== --- trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.tab.c [iso-8859-1] Tue Apr 5 21:37:54 2011 @@ -6334,6 +6334,12 @@ else if (is_attr(attrs, ATTR_UUID) && !is_attr(attrs, ATTR_PUBLIC)) attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); + /* Append the SWITCHTYPE attribute to a non-encapsulated union if it does not already have it. */ + if (type_get_type_detect_alias(type) == TYPE_UNION && + is_attr(attrs, ATTR_SWITCHTYPE) && + !is_attr(type->attrs, ATTR_SWITCHTYPE)) + type->attrs = append_attr(type->attrs, make_attrp(ATTR_SWITCHTYPE, get_attrp(attrs, ATTR_SWITCHTYPE))); + LIST_FOR_EACH_ENTRY( decl, decls, const declarator_t, entry ) { Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=51… ============================================================================== --- trunk/reactos/tools/widl/parser.y [iso-8859-1] (original) +++ trunk/reactos/tools/widl/parser.y [iso-8859-1] Tue Apr 5 21:37:54 2011 @@ -1854,6 +1854,12 @@ else if (is_attr(attrs, ATTR_UUID) && !is_attr(attrs, ATTR_PUBLIC)) attrs = append_attr( attrs, make_attr(ATTR_PUBLIC) ); + /* Append the SWITCHTYPE attribute to a non-encapsulated union if it does not already have it. */ + if (type_get_type_detect_alias(type) == TYPE_UNION && + is_attr(attrs, ATTR_SWITCHTYPE) && + !is_attr(type->attrs, ATTR_SWITCHTYPE)) + type->attrs = append_attr(type->attrs, make_attrp(ATTR_SWITCHTYPE, get_attrp(attrs, ATTR_SWITCHTYPE))); + LIST_FOR_EACH_ENTRY( decl, decls, const declarator_t, entry ) {

13 years, 8 months

[rharabien] 51261: [USRMGR] Free buffer instead of freeing pointer to buffer

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Apr 5 21:24:25 2011 New Revision: 51261 URL: http://svn.reactos.org/svn/reactos?rev=51261&view=rev Log: [USRMGR] Free buffer instead of freeing pointer to buffer Modified: trunk/reactos/dll/cpl/usrmgr/groupprops.c trunk/reactos/dll/cpl/usrmgr/groups.c trunk/reactos/dll/cpl/usrmgr/userprops.c trunk/reactos/dll/cpl/usrmgr/users.c Modified: trunk/reactos/dll/cpl/usrmgr/groupprops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groupprops.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groupprops.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/groupprops.c [iso-8859-1] Tue Apr 5 21:24:25 2011 @@ -139,7 +139,7 @@ pUserBuffer[i].usri20_comment); } - NetApiBufferFree(&pUserBuffer); + NetApiBufferFree(pUserBuffer); /* No more data left */ if (netStatus != ERROR_MORE_DATA) Modified: trunk/reactos/dll/cpl/usrmgr/groups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groups.c?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] Tue Apr 5 21:24:25 2011 @@ -77,7 +77,7 @@ pBuffer[i].lgrpi1_comment); } - NetApiBufferFree(&pBuffer); + NetApiBufferFree(pBuffer); /* No more data left */ if (netStatus != ERROR_MORE_DATA) Modified: trunk/reactos/dll/cpl/usrmgr/userprops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/userprops.c… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/userprops.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/userprops.c [iso-8859-1] Tue Apr 5 21:24:25 2011 @@ -432,7 +432,7 @@ pBuffer[i].lgrpi1_comment); } - NetApiBufferFree(&pBuffer); + NetApiBufferFree(pBuffer); /* No more data left */ if (netStatus != ERROR_MORE_DATA) Modified: trunk/reactos/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/users.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] Tue Apr 5 21:24:25 2011 @@ -441,7 +441,7 @@ pBuffer[i].usri20_comment); } - NetApiBufferFree(&pBuffer); + NetApiBufferFree(pBuffer); /* No more data left */ if (netStatus != ERROR_MORE_DATA)

13 years, 8 months

[rharabien] 51260: [SYSTEMINFO] Add Italian translation (patch by Vincenzo Cotugno <vins8920 at hotmail dot com>) Decrease buffer size Don't print NULL domain/workgroup Add network adapters detection

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Apr 5 21:20:42 2011 New Revision: 51260 URL: http://svn.reactos.org/svn/reactos?rev=51260&view=rev Log: [SYSTEMINFO] Add Italian translation (patch by Vincenzo Cotugno <vins8920 at hotmail dot com>) Decrease buffer size Don't print NULL domain/workgroup Add network adapters detection Added: trunk/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc (with props) Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc trunk/rosapps/applications/sysutils/systeminfo/resource.h trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc [iso-8859-1] Tue Apr 5 21:20:42 2011 @@ -64,5 +64,11 @@ IDS_DOMAIN, "Domain" IDS_NETWORK_CARDS, "Netzwerkkarte(n)" IDS_NETWORK_CARDS_FORMAT, "%u Installiert." +IDS_CONNECTION_NAME, "Connection Name" +IDS_STATUS, "Status" +IDS_MEDIA_DISCONNECTED, "Media disconnected" +IDS_DHCP_ENABLED, "DHCP Enabled" +IDS_NO, "No" +IDS_IP_ADDRESSES, "IP address(es)" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/en-US.rc [iso-8859-1] Tue Apr 5 21:20:42 2011 @@ -62,5 +62,11 @@ IDS_DOMAIN, "Domain" IDS_NETWORK_CARDS, "Network Card(s)" IDS_NETWORK_CARDS_FORMAT, "%u Installed." +IDS_CONNECTION_NAME, "Connection Name" +IDS_STATUS, "Status" +IDS_MEDIA_DISCONNECTED, "Media disconnected" +IDS_DHCP_ENABLED, "DHCP Enabled" +IDS_NO, "No" +IDS_IP_ADDRESSES, "IP address(es)" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc [iso-8859-1] Tue Apr 5 21:20:42 2011 @@ -67,5 +67,11 @@ IDS_DOMAIN, "Dominio" IDS_NETWORK_CARDS, "Tarjeta(s) de Red" IDS_NETWORK_CARDS_FORMAT, "%u No Instalada." +IDS_CONNECTION_NAME, "Connection Name" +IDS_STATUS, "Status" +IDS_MEDIA_DISCONNECTED, "Media disconnected" +IDS_DHCP_ENABLED, "DHCP Enabled" +IDS_NO, "No" +IDS_IP_ADDRESSES, "IP address(es)" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc [iso-8859-1] Tue Apr 5 21:20:42 2011 @@ -62,5 +62,11 @@ IDS_DOMAIN, "Domaine" IDS_NETWORK_CARDS, "Carte(s) réseau" IDS_NETWORK_CARDS_FORMAT, "%u installée(s)." +IDS_CONNECTION_NAME, "Connection Name" +IDS_STATUS, "Status" +IDS_MEDIA_DISCONNECTED, "Media disconnected" +IDS_DHCP_ENABLED, "DHCP Enabled" +IDS_NO, "No" +IDS_IP_ADDRESSES, "IP address(es)" END Added: trunk/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc (added) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc [iso-8859-1] Tue Apr 5 21:20:42 2011 @@ -1,0 +1,72 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "SYSTEMINFO [/S sistema [/U nomeutente [/P [password]]]] [/FO formato] [/NH]\n\n\ +Descrizione:\n\ + Questà utilità permettere ad un amministratore di\n\ + visualizzare alcune informazioni basilari sulla configurazione del pc.\n\n\ +Lista Parametri:\n\ + /S sistema Specifica il sistema remoto a cui connettersi.\n\n\ + /U [dominio\\]utente Specifica il contesto utente in cui eseguire\n\ + il comando.\n\n\ + /P [password] Specifica la password per il dato\n\ + contesto utente. Se omesso, viene richiesto.\n\n\ + /FO formato Specifica il formato con cui l'output\n\ + viene mostrato.\n\ + Valori Validi: ""TABLE"", ""LIST"", ""CSV"".\n\n\ + /NH Specifica che la ""Etichetta Colonna"" non\n\ + deve essere mostrata nell'output.\n\ + Valido solo per i formati ""TABLE"" e ""CSV"" .\n\n\ + /? Mostra questo aiuto.\n\n\ +Esempi:\n\ + SYSTEMINFO\n\ + SYSTEMINFO /?\n\ + SYSTEMINFO /S sistema\n\ + SYSTEMINFO /S sistema /U utente\n\ + SYSTEMINFO /S sistema /U dominio\\utente /P password /FO TABLE\n\ + SYSTEMINFO /S sistema /FO LIST\n\ + SYSTEMINFO /S sistema /FO CSV /NH\n" + +IDS_HOST_NAME, "Nome Host" +IDS_OS_NAME, "Nome SO" +IDS_OS_VERSION, "Versione SO" +IDS_BUILD, "Build" +IDS_OS_BUILD_TYPE, "Tipo SO" +IDS_REG_OWNER, "Proprietario Registrato" +IDS_REG_ORG, "Organizzazione Registrata" +IDS_PRODUCT_ID, "ID Prodotto" +IDS_INST_DATE, "Data Installazione" +IDS_UP_TIME, "Tempo di Avvio Sistema" +IDS_UP_TIME_FORMAT "%u Giorno, %u Ore, %u Minuti, %u Secondi" +IDS_SYS_MANUFACTURER, "Produttore PC" +IDS_SYS_MODEL, "Modello Sistema" +IDS_SYS_TYPE, "Tipo Sistema" +IDS_PROCESSORS, "Processore" +IDS_PROCESSORS_FORMAT, "%u Processore(i) Installato." +IDS_BIOS_DATE, "Data BIOS" +IDS_BIOS_VERSION, "Versione BIOS" +IDS_ROS_DIR, "Directory ReactOS" +IDS_SYS_DIR, "Directory di Sistema" +IDS_BOOT_DEV, "Periferica di Avvio" +IDS_SYS_LOCALE, "Impostazioni Locali Sistema" +IDS_INPUT_LOCALE, "Impostazioni Locali Input" +IDS_TIME_ZONE, "Fuso Orario" +IDS_TOTAL_PHYS_MEM, "Memoria Fisica Totale" +IDS_AVAIL_PHISICAL_MEM, "Memoria Fisica Disponibile" +IDS_VIRT_MEM_MAX, "Memoria Virtuale: Dimensione Massima" +IDS_VIRT_MEM_AVAIL, "Memoria Virtuale: Disponibile" +IDS_VIRT_MEM_INUSE, "Memoria Virtuale: In Uso" +IDS_PAGEFILE_LOC, "Posizioni File di Paging" +IDS_DOMAIN, "Dominio" +IDS_NETWORK_CARDS, "Schede di Rete" +IDS_NETWORK_CARDS_FORMAT, "%u Installate." +IDS_CONNECTION_NAME, "Nome Connessione" +IDS_STATUS, "Stato" +IDS_MEDIA_DISCONNECTED, "Disconnesso" +IDS_DHCP_ENABLED, "DHCP Abilitato" +IDS_NO, "No" +IDS_IP_ADDRESSES, "Indirizzo(i) IP" + +END Propchange: trunk/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rosapps/applications/sysutils/systeminfo/lang/it-IT.rc ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/no-NO.rc [iso-8859-1] Tue Apr 5 21:20:42 2011 @@ -62,5 +62,11 @@ IDS_DOMAIN, "Domene" IDS_NETWORK_CARDS, "Nettverkskort(er)" IDS_NETWORK_CARDS_FORMAT, "%u installert." +IDS_CONNECTION_NAME, "Connection Name" +IDS_STATUS, "Status" +IDS_MEDIA_DISCONNECTED, "Media disconnected" +IDS_DHCP_ENABLED, "DHCP Enabled" +IDS_NO, "No" +IDS_IP_ADDRESSES, "IP address(es)" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc [iso-8859-1] Tue Apr 5 21:20:42 2011 @@ -69,5 +69,11 @@ IDS_DOMAIN, "Domena" IDS_NETWORK_CARDS, "Karty sieciowe" IDS_NETWORK_CARDS_FORMAT, "Zainstalowane karty NIC: %u." +IDS_CONNECTION_NAME, "Nazwa po³¹czenia" +IDS_STATUS, "Stan" +IDS_MEDIA_DISCONNECTED, "Nonik od³¹czony" +IDS_DHCP_ENABLED, "DHCP w³¹czone" +IDS_NO, "Nie" +IDS_IP_ADDRESSES, "Adresy IP" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/sk-SK.rc [iso-8859-1] Tue Apr 5 21:20:42 2011 @@ -66,5 +66,11 @@ IDS_DOMAIN, "Domna" IDS_NETWORK_CARDS, "Sieov karta(y)" IDS_NETWORK_CARDS_FORMAT, "%u nainçtalovan." +IDS_CONNECTION_NAME, "Connection Name" +IDS_STATUS, "Status" +IDS_MEDIA_DISCONNECTED, "Media disconnected" +IDS_DHCP_ENABLED, "DHCP Enabled" +IDS_NO, "No" +IDS_IP_ADDRESSES, "IP address(es)" END Modified: trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc [iso-8859-1] Tue Apr 5 21:20:42 2011 @@ -70,5 +70,11 @@ IDS_DOMAIN, "Äîìåí" IDS_NETWORK_CARDS, "Ìåðåæíà êàðòà(è)" IDS_NETWORK_CARDS_FORMAT, "%u Installed." +IDS_CONNECTION_NAME, "Connection Name" +IDS_STATUS, "Status" +IDS_MEDIA_DISCONNECTED, "Media disconnected" +IDS_DHCP_ENABLED, "DHCP Enabled" +IDS_NO, "No" +IDS_IP_ADDRESSES, "IP address(es)" END Modified: trunk/rosapps/applications/sysutils/systeminfo/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/resource.h [iso-8859-1] Tue Apr 5 21:20:42 2011 @@ -1,35 +1,41 @@ -#define IDS_USAGE 1000 +#define IDS_USAGE 1000 -#define IDS_HOST_NAME 100 -#define IDS_OS_NAME 101 -#define IDS_OS_VERSION 102 -#define IDS_BUILD 103 -#define IDS_OS_BUILD_TYPE 104 -#define IDS_REG_OWNER 105 -#define IDS_REG_ORG 106 -#define IDS_PRODUCT_ID 107 -#define IDS_INST_DATE 108 -#define IDS_UP_TIME 109 -#define IDS_UP_TIME_FORMAT 110 -#define IDS_SYS_MANUFACTURER 111 -#define IDS_SYS_MODEL 112 -#define IDS_SYS_TYPE 113 -#define IDS_PROCESSORS 114 -#define IDS_PROCESSORS_FORMAT 115 -#define IDS_BIOS_DATE 116 -#define IDS_BIOS_VERSION 117 -#define IDS_ROS_DIR 118 -#define IDS_SYS_DIR 119 -#define IDS_BOOT_DEV 120 -#define IDS_SYS_LOCALE 121 -#define IDS_INPUT_LOCALE 122 -#define IDS_TOTAL_PHYS_MEM 123 -#define IDS_AVAIL_PHISICAL_MEM 124 -#define IDS_VIRT_MEM_MAX 125 -#define IDS_VIRT_MEM_AVAIL 126 -#define IDS_VIRT_MEM_INUSE 127 -#define IDS_PAGEFILE_LOC 128 -#define IDS_TIME_ZONE 129 -#define IDS_DOMAIN 130 -#define IDS_NETWORK_CARDS 131 +#define IDS_HOST_NAME 100 +#define IDS_OS_NAME 101 +#define IDS_OS_VERSION 102 +#define IDS_BUILD 103 +#define IDS_OS_BUILD_TYPE 104 +#define IDS_REG_OWNER 105 +#define IDS_REG_ORG 106 +#define IDS_PRODUCT_ID 107 +#define IDS_INST_DATE 108 +#define IDS_UP_TIME 109 +#define IDS_UP_TIME_FORMAT 110 +#define IDS_SYS_MANUFACTURER 111 +#define IDS_SYS_MODEL 112 +#define IDS_SYS_TYPE 113 +#define IDS_PROCESSORS 114 +#define IDS_PROCESSORS_FORMAT 115 +#define IDS_BIOS_DATE 116 +#define IDS_BIOS_VERSION 117 +#define IDS_ROS_DIR 118 +#define IDS_SYS_DIR 119 +#define IDS_BOOT_DEV 120 +#define IDS_SYS_LOCALE 121 +#define IDS_INPUT_LOCALE 122 +#define IDS_TOTAL_PHYS_MEM 123 +#define IDS_AVAIL_PHISICAL_MEM 124 +#define IDS_VIRT_MEM_MAX 125 +#define IDS_VIRT_MEM_AVAIL 126 +#define IDS_VIRT_MEM_INUSE 127 +#define IDS_PAGEFILE_LOC 128 +#define IDS_TIME_ZONE 129 +#define IDS_DOMAIN 130 +#define IDS_NETWORK_CARDS 131 #define IDS_NETWORK_CARDS_FORMAT 132 +#define IDS_CONNECTION_NAME 133 +#define IDS_STATUS 134 +#define IDS_MEDIA_DISCONNECTED 135 +#define IDS_DHCP_ENABLED 136 +#define IDS_NO 137 +#define IDS_IP_ADDRESSES 138 Modified: trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/rsrc.rc [iso-8859-1] Tue Apr 5 21:20:42 2011 @@ -5,7 +5,9 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/fr-FR.rc" +#include "lang/it-IT.rc" +#include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" -#include "lang/no-NO.rc" + Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/systeminfo.c [iso-8859-1] Tue Apr 5 21:20:42 2011 @@ -25,31 +25,22 @@ #include <locale.h> #include <lm.h> #include <shlwapi.h> +#include <iphlpapi.h> +#include <winsock2.h> #include "resource.h" -#define BUFFER_SIZE 32767 - -/* Load from resource and convert to OEM */ -static -BOOL -GetOemStrings(UINT rcID, LPWSTR OutMsg) -{ - if (LoadStringW(GetModuleHandle(NULL), rcID, OutMsg, BUFFER_SIZE)) - return TRUE; - - return FALSE; -} - -/* Load data from registry */ +#define BUFFER_SIZE 1024 + +/* Load string from registry */ static unsigned RegGetSZ(HKEY hKey, LPCWSTR lpSubKey, LPCWSTR lpValueName, LPWSTR lpBuf, DWORD cchBuf) { - DWORD dwBytes = cchBuf*sizeof(WCHAR), dwType; + DWORD dwBytes = cchBuf*sizeof(WCHAR), dwType = 0; unsigned cChars; - /* If SubKy is specified open it */ + /* If SubKey is specified open it */ if (lpSubKey && RegOpenKeyExW(hKey, lpSubKey, 0, @@ -60,6 +51,7 @@ return 0; } + /* Query registry value and check its type */ if (RegQueryValueExW(hKey, lpValueName, NULL, @@ -70,6 +62,11 @@ wprintf(L"Warning! Cannot query %s. Last error: %lu, type: %lu.\n", lpValueName, GetLastError(), dwType); dwBytes = 0; } + else + { + wcscpy(lpBuf, L"N/A"); + dwBytes = 6; + } /* Close key if we opened it */ if (lpSubKey) @@ -87,6 +84,7 @@ return cChars; } +/* Load DWORD from registry */ static BOOL RegGetDWORD(HKEY hKey, LPCWSTR lpSubKey, LPCWSTR lpValueName, LPDWORD lpData) @@ -94,7 +92,7 @@ DWORD dwBytes = sizeof(*lpData), dwType; BOOL bRet = TRUE; - /* If SubKy is specified open it */ + /* If SubKey is specified open it */ if (lpSubKey && RegOpenKeyExW(hKey, lpSubKey, 0, @@ -105,6 +103,7 @@ return FALSE; } + /* Query registry value and check its type */ if (RegQueryValueExW(hKey, lpValueName, NULL, @@ -124,6 +123,7 @@ return bRet; } +/* Format bytes */ static VOID FormatBytes(LPWSTR lpBuf, unsigned cBytes) @@ -147,6 +147,7 @@ wcscpy(lpBuf + i, L" MB"); } +/* Format date and time */ static VOID FormatDateTime(time_t Time, LPWSTR lpBuf) @@ -181,30 +182,35 @@ VOID Usage(VOID) { - WCHAR Buf[BUFFER_SIZE]; - - if(GetOemStrings(IDS_USAGE, Buf)) + WCHAR Buf[4096]; + if (LoadStringW(GetModuleHandle(NULL), IDS_USAGE, Buf, 4096)) wprintf(L"%s", Buf); } static VOID -PrintRow(UINT nTitleID, unsigned cxOffset, LPWSTR lpFormat, ...) +PrintRow(UINT nTitleID, BOOL bIndent, LPWSTR lpFormat, ...) { WCHAR Buf[BUFFER_SIZE]; va_list Args; unsigned c; - + if (nTitleID) { - c = LoadStringW(GetModuleHandle(NULL), nTitleID, Buf, BUFFER_SIZE); + c = LoadStringW(GetModuleHandle(NULL), nTitleID, Buf, BUFFER_SIZE - 2); if (!c) return; - - wcscpy(Buf + c, L":"); + + wcscpy(Buf + c, L": "); } else Buf[0] = L'\0'; - wprintf(L"%-32s ", Buf); + + if (!bIndent) + wprintf(L"%-32s", Buf); + else if (Buf[0]) + wprintf(L"%38s%-16s", L"", Buf); + else + wprintf(L"%38s", L""); va_start(Args, lpFormat); vwprintf(lpFormat, Args); @@ -217,10 +223,10 @@ VOID AllSysInfo(VOID) { - DWORD dwCharCount = BUFFER_SIZE, dwTimestamp; + DWORD dwCharCount = BUFFER_SIZE, dwTimestamp, dwResult; OSVERSIONINFOW VersionInfo; SYSTEM_INFO SysInfo; - WCHAR Buf[BUFFER_SIZE], Tmp[BUFFER_SIZE], Msg[BUFFER_SIZE], szSystemDir[MAX_PATH]; + WCHAR Buf[BUFFER_SIZE], Tmp[BUFFER_SIZE], szSystemDir[MAX_PATH]; const WCHAR *lpcszSysType; LPWSTR lpBuffer; NETSETUP_JOIN_STATUS NetJoinStatus; @@ -228,6 +234,8 @@ unsigned int cSeconds, i, j; TIME_ZONE_INFORMATION TimeZoneInfo; HKEY hKey; + PIP_ADAPTER_ADDRESSES pAdapters; + ULONG cbAdapters; if (!GetSystemDirectoryW(szSystemDir, sizeof(szSystemDir)/sizeof(szSystemDir[0]))) { @@ -242,7 +250,7 @@ if (!GetComputerNameW(Buf, &dwCharCount)) wprintf(L"Error! GetComputerName failed.\n"); else - PrintRow(IDS_HOST_NAME, 0, L"%s", Buf); + PrintRow(IDS_HOST_NAME, FALSE, L"%s", Buf); // open CurrentVersion key if(RegOpenKeyExW(HKEY_LOCAL_MACHINE, @@ -257,7 +265,7 @@ //getting OS Name RegGetSZ(hKey, NULL, L"ProductName", Buf, BUFFER_SIZE); - PrintRow(IDS_OS_NAME, 0, L"%s", Buf); + PrintRow(IDS_OS_NAME, FALSE, L"%s", Buf); //getting OS Version ZeroMemory(&VersionInfo, sizeof(VersionInfo)); @@ -267,14 +275,14 @@ if (!LoadStringW(GetModuleHandle(NULL), IDS_BUILD, Tmp, BUFFER_SIZE)) Tmp[0] = L'\0'; PrintRow(IDS_OS_VERSION, - 0, - L"%u.%u.%u %s %s %u", - (unsigned)VersionInfo.dwMajorVersion, - (unsigned)VersionInfo.dwMinorVersion, - (unsigned)VersionInfo.dwBuildNumber, + FALSE, + L"%lu.%lu.%lu %s %s %lu", + VersionInfo.dwMajorVersion, + VersionInfo.dwMinorVersion, + VersionInfo.dwBuildNumber, VersionInfo.szCSDVersion, Tmp, - (unsigned)VersionInfo.dwBuildNumber); + VersionInfo.dwBuildNumber); //getting OS Manufacturer @@ -282,24 +290,24 @@ //getting OS Build Type RegGetSZ(hKey, NULL, L"CurrentType", Buf, BUFFER_SIZE); - PrintRow(IDS_OS_BUILD_TYPE, 0, L"%s", Buf); + PrintRow(IDS_OS_BUILD_TYPE, FALSE, L"%s", Buf); //getting Registered Owner RegGetSZ(hKey, NULL, L"RegisteredOwner", Buf, BUFFER_SIZE); - PrintRow(IDS_REG_OWNER, 0, L"%s", Buf); + PrintRow(IDS_REG_OWNER, FALSE, L"%s", Buf); //getting Registered Organization RegGetSZ(hKey, NULL, L"RegisteredOrganization", Buf, BUFFER_SIZE); - PrintRow(IDS_REG_ORG, 0, L"%s", Buf); + PrintRow(IDS_REG_ORG, FALSE, L"%s", Buf); //getting Product ID RegGetSZ(hKey, NULL, L"ProductId", Buf, BUFFER_SIZE); - PrintRow(IDS_PRODUCT_ID, 0, L"%s", Buf); + PrintRow(IDS_PRODUCT_ID, FALSE, L"%s", Buf); //getting Install Date RegGetDWORD(hKey, NULL, L"InstallDate", &dwTimestamp); FormatDateTime((time_t)dwTimestamp, Buf); - PrintRow(IDS_INST_DATE, 0, L"%s", Buf); + PrintRow(IDS_INST_DATE, FALSE, L"%s", Buf); // close Current Version key now RegCloseKey(hKey); @@ -309,7 +317,7 @@ if (!LoadStringW(GetModuleHandle(NULL), IDS_UP_TIME_FORMAT, Tmp, BUFFER_SIZE)) Tmp[0] = L'\0'; swprintf(Buf, Tmp, cSeconds / (60*60*24), (cSeconds / (60*60)) % 24, (cSeconds / 60) % 60, cSeconds % 60); - PrintRow(IDS_UP_TIME, 0, L"%s", Buf); + PrintRow(IDS_UP_TIME, FALSE, L"%s", Buf); //getting System Manufacturer; HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OEMInformation\Manufacturer for Win >= 6.0 swprintf(Tmp, L"%s\\oeminfo.ini", szSystemDir); @@ -319,7 +327,7 @@ Buf, sizeof(Buf)/sizeof(Buf[0]), Tmp); - PrintRow(IDS_SYS_MANUFACTURER, 0, L"%s", Buf); + PrintRow(IDS_SYS_MANUFACTURER, FALSE, L"%s", Buf); //getting System Model; HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OEMInformation\Model for Win >= 6.0 GetPrivateProfileStringW(L"General", @@ -328,7 +336,7 @@ Buf, sizeof(Buf)/sizeof(Buf[0]), Tmp); - PrintRow(IDS_SYS_MODEL, 0, L"%s", Buf); + PrintRow(IDS_SYS_MODEL, FALSE, L"%s", Buf); //getting System type switch (SysInfo.wProcessorArchitecture) @@ -346,13 +354,13 @@ lpcszSysType = L"Unknown"; break; } - PrintRow(IDS_SYS_TYPE, 0, L"%s", lpcszSysType); + PrintRow(IDS_SYS_TYPE, FALSE, L"%s", lpcszSysType); //getting Processor(s) if (!LoadStringW(GetModuleHandle(NULL), IDS_PROCESSORS_FORMAT, Tmp, BUFFER_SIZE)) Tmp[0] = L'\0'; swprintf(Buf, Tmp, (unsigned)SysInfo.dwNumberOfProcessors); - PrintRow(IDS_PROCESSORS, 0, L"%s", Buf); + PrintRow(IDS_PROCESSORS, FALSE, L"%s", Buf); for(i = 0; i < (unsigned int)SysInfo.dwNumberOfProcessors; i++) { swprintf(Tmp, L"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\%u", i); @@ -363,7 +371,7 @@ Buf[j++] = L' '; RegGetSZ(HKEY_LOCAL_MACHINE, Tmp, L"VendorIdentifier", Buf + j, BUFFER_SIZE - j); - PrintRow(0, 0, L"%s", Buf); + PrintRow(0, FALSE, L"%s", Buf); } //getting BIOS Version @@ -372,7 +380,7 @@ L"SystemBiosVersion", Buf, BUFFER_SIZE); - PrintRow(IDS_BIOS_VERSION, 0, L"%s", Buf); + PrintRow(IDS_BIOS_VERSION, FALSE, L"%s", Buf); //gettings BIOS date RegGetSZ(HKEY_LOCAL_MACHINE, @@ -380,13 +388,13 @@ L"SystemBiosDate", Buf, BUFFER_SIZE); - PrintRow(IDS_BIOS_DATE, 0, L"%s", Buf); + PrintRow(IDS_BIOS_DATE, FALSE, L"%s", Buf); //getting ReactOS Directory if (!GetWindowsDirectoryW(Buf, BUFFER_SIZE)) wprintf(L"Error! GetWindowsDirectory failed."); else - PrintRow(IDS_ROS_DIR, 0, L"%s", Buf); + PrintRow(IDS_ROS_DIR, FALSE, L"%s", Buf); //getting System Directory PrintRow(IDS_SYS_DIR, 0, L"%s", szSystemDir); @@ -397,7 +405,7 @@ L"SystemPartition", Buf, BUFFER_SIZE); - PrintRow(IDS_BOOT_DEV, 0, L"%s", Buf); + PrintRow(IDS_BOOT_DEV, FALSE, L"%s", Buf); //getting System Locale if (GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_ILANGUAGE, Tmp, BUFFER_SIZE)) @@ -412,7 +420,7 @@ if (lpBuffer) SHLoadIndirectString(lpBuffer+1, lpBuffer+1, BUFFER_SIZE - (lpBuffer-Buf) - 1, NULL); - PrintRow(IDS_SYS_LOCALE, 0, L"%s", Buf); + PrintRow(IDS_SYS_LOCALE, FALSE, L"%s", Buf); } //getting Input Locale @@ -432,7 +440,7 @@ if (lpBuffer) SHLoadIndirectString(lpBuffer+1, lpBuffer+1, BUFFER_SIZE - (lpBuffer-Buf) - 1, NULL); - PrintRow(IDS_INPUT_LOCALE, 0, L"%s", Buf); + PrintRow(IDS_INPUT_LOCALE, FALSE, L"%s", Buf); } //getting Time Zone @@ -448,16 +456,16 @@ unsigned i; /* Find current timezone */ - dwCharCount = 256; // Windows seems to have a bug - it doesnt accept BUFFER_SIZE here + dwCharCount = BUFFER_SIZE; for(i = 0; RegEnumKeyExW(hKey, i, Tmp, &dwCharCount, NULL, NULL, NULL, NULL) == ERROR_SUCCESS; ++i, dwCharCount = 255) { RegGetSZ(hKey, Tmp, L"Std", Buf, BUFFER_SIZE); - if(!wcscmp(Buf, TimeZoneInfo.StandardName)) + if (!wcscmp(Buf, TimeZoneInfo.StandardName)) { RegGetSZ(hKey, Tmp, L"Display", Buf, BUFFER_SIZE); - PrintRow(IDS_TIME_ZONE, 0, L"%s", Buf); + PrintRow(IDS_TIME_ZONE, FALSE, L"%s", Buf); break; } @@ -468,23 +476,23 @@ //getting Total Physical Memory GlobalMemoryStatus(&MemoryStatus); FormatBytes(Buf, MemoryStatus.dwTotalPhys); - PrintRow(IDS_TOTAL_PHYS_MEM, 0, L"%s", Buf); + PrintRow(IDS_TOTAL_PHYS_MEM, FALSE, L"%s", Buf); //getting Available Physical Memory FormatBytes(Buf, MemoryStatus.dwAvailPhys); - PrintRow(IDS_AVAIL_PHISICAL_MEM, 0, L"%s", Buf); + PrintRow(IDS_AVAIL_PHISICAL_MEM, FALSE, L"%s", Buf); //getting Virtual Memory: Max Size FormatBytes(Buf, MemoryStatus.dwTotalVirtual); - PrintRow(IDS_VIRT_MEM_MAX, 0, L"%s", Buf); + PrintRow(IDS_VIRT_MEM_MAX, FALSE, L"%s", Buf); //getting Virtual Memory: Available FormatBytes(Buf, MemoryStatus.dwAvailVirtual); - PrintRow(IDS_VIRT_MEM_AVAIL, 0, L"%s", Buf); + PrintRow(IDS_VIRT_MEM_AVAIL, FALSE, L"%s", Buf); //getting Virtual Memory: In Use FormatBytes(Buf, MemoryStatus.dwTotalVirtual-MemoryStatus.dwAvailVirtual); - PrintRow(IDS_VIRT_MEM_INUSE, 0, L"%s", Buf); + PrintRow(IDS_VIRT_MEM_INUSE, FALSE, L"%s", Buf); //getting Page File Location(s) if (RegGetSZ(HKEY_LOCAL_MACHINE, @@ -504,13 +512,14 @@ } } - PrintRow(IDS_PAGEFILE_LOC, 0, L"%s", Buf); + PrintRow(IDS_PAGEFILE_LOC, FALSE, L"%s", Buf); } //getting Domain if (NetGetJoinInformation (NULL, &lpBuffer, &NetJoinStatus) == NERR_Success) { - PrintRow(IDS_DOMAIN, 0, L"%s", lpBuffer); + if (NetJoinStatus == NetSetupWorkgroupName || NetJoinStatus == NetSetupDomainName) + PrintRow(IDS_DOMAIN, FALSE, L"%s", lpBuffer); NetApiBufferFree(lpBuffer); } @@ -518,22 +527,100 @@ //getting Logon Server //getting NetWork Card(s) - if(GetOemStrings(IDS_NETWORK_CARDS, Msg)) - { - - } + cbAdapters = 4096; + pAdapters = malloc(cbAdapters); + while((dwResult = GetAdaptersAddresses(AF_UNSPEC, 0x0002, NULL, pAdapters, &cbAdapters)) == ERROR_BUFFER_OVERFLOW) + { + cbAdapters += 4096; + pAdapters = (PIP_ADAPTER_ADDRESSES)realloc(pAdapters, cbAdapters); + } + + if (dwResult == ERROR_SUCCESS) + { + PIP_ADAPTER_ADDRESSES pCurrentAdapter = pAdapters; + unsigned cAdapters = 0; + + /* Count adapters */ + for(i = 0; pCurrentAdapter; ++i) + { + if (pCurrentAdapter->IfType != 24 && pCurrentAdapter->IfType != 131) + ++cAdapters; + pCurrentAdapter = pCurrentAdapter->Next; + } + + + /* Print adapters count */ + if (!LoadStringW(GetModuleHandle(NULL), IDS_NETWORK_CARDS_FORMAT, Tmp, BUFFER_SIZE)) + Tmp[0] = L'\0'; + swprintf(Buf, Tmp, cAdapters); + PrintRow(IDS_NETWORK_CARDS, FALSE, L"%s", Buf); + + /* Show information about each adapter */ + pCurrentAdapter = pAdapters; + for(i = 0; pCurrentAdapter; ++i) + { + if (pCurrentAdapter->IfType != 24 && pCurrentAdapter->IfType != 131)//IF_TYPE_SOFTWARE_LOOPBACK) + { + PIP_ADAPTER_UNICAST_ADDRESS pAddress; + + PrintRow(0, FALSE, L"[%02u]: %s", i + 1, pCurrentAdapter->Description); + PrintRow(IDS_CONNECTION_NAME, TRUE, L"%s", pCurrentAdapter->FriendlyName); + if (!(pCurrentAdapter->Flags & 0x0004)) + { + if (!LoadStringW(GetModuleHandle(NULL), IDS_NO, Buf, BUFFER_SIZE)) + Buf[0] = L'\0'; + PrintRow(IDS_DHCP_ENABLED, TRUE, Buf); + } + if (pCurrentAdapter->OperStatus == IfOperStatusDown) + { + if (!LoadStringW(GetModuleHandle(NULL), IDS_MEDIA_DISCONNECTED, Buf, BUFFER_SIZE)) + Buf[0] = L'\0'; + PrintRow(IDS_STATUS, TRUE, Buf); + } + else + { + if (!LoadStringW(GetModuleHandle(NULL), IDS_IP_ADDRESSES, Buf, BUFFER_SIZE)) + Buf[0] = L'\0'; + PrintRow(0, TRUE, Buf); + pAddress = pCurrentAdapter->FirstUnicastAddress; + for (j = 0; pAddress; ++j) + { + dwCharCount = BUFFER_SIZE; + WSAAddressToStringW(pAddress->Address.lpSockaddr, pAddress->Address.iSockaddrLength, NULL, Buf, &dwCharCount); + PrintRow(0, TRUE, L"[%02u]: %s", j + 1, Buf); + pAddress = pAddress->Next; + } + } + } + pCurrentAdapter = pCurrentAdapter->Next; + } + } + free(pAdapters); } /* Main program */ int main(int argc, char *argv[]) { + WSADATA WsaData; + int i; + setlocale(LC_ALL, ""); - if (argc > 1 && (!strcmp(argv[1], "/?") || !strcmp(argv[1], "-?"))) - { - Usage(); - return 0; + WSAStartup(MAKEWORD(2, 2), &WsaData); + + for (i = 1; i < argc; ++i) + { + if (!strcmp(argv[i], "/?") || !strcmp(argv[i], "-?")) + { + Usage(); + return 0; + } + else + { + printf("Unsupported argument: %s\n", argv[i]); + return -1; + } } AllSysInfo(); Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst… ============================================================================== --- trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild [iso-8859-1] Tue Apr 5 21:20:42 2011 @@ -4,6 +4,8 @@ <library>advapi32</library> <library>netapi32</library> <library>shlwapi</library> + <library>iphlpapi</library> + <library>ws2_32</library> <file>systeminfo.c</file> <file>systeminfo.rc</file> <file>rsrc.rc</file>

13 years, 8 months

[rharabien] 51259: [PSDK] Add GetAdaptersAddresses declaration Add forgotten GetComputerNameEx macro

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Apr 5 21:14:18 2011 New Revision: 51259 URL: http://svn.reactos.org/svn/reactos?rev=51259&view=rev Log: [PSDK] Add GetAdaptersAddresses declaration Add forgotten GetComputerNameEx macro Modified: trunk/reactos/include/psdk/iphlpapi.h trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/iphlpapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/iphlpapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/iphlpapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/iphlpapi.h [iso-8859-1] Tue Apr 5 21:14:18 2011 @@ -19,6 +19,9 @@ DWORD WINAPI EnableRouter(HANDLE*,OVERLAPPED*); DWORD WINAPI FlushIpNetTable(DWORD); DWORD WINAPI GetAdapterIndex(LPWSTR,PULONG); +#ifdef _WINSOCK2API_ +DWORD WINAPI GetAdaptersAddresses(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG); +#endif DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO,PULONG); DWORD WINAPI GetBestInterface(IPAddr,PDWORD); DWORD WINAPI GetBestRoute(DWORD,DWORD,PMIB_IPFORWARDROW); Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Tue Apr 5 21:14:18 2011 @@ -2416,6 +2416,9 @@ #define GetCommandLine GetCommandLineW #define GetCompressedFileSize GetCompressedFileSizeW #define GetComputerName GetComputerNameW +#if (_WIN32_WINNT >= 0x0500) +#define GetComputerNameEx GetComputerNameExW +#endif #define GetCurrentDirectory GetCurrentDirectoryW #define GetDefaultCommConfig GetDefaultCommConfigW #define GetDiskFreeSpace GetDiskFreeSpaceW @@ -2619,6 +2622,9 @@ #define GetBinaryType GetBinaryTypeA #define GetCommandLine GetCommandLineA #define GetComputerName GetComputerNameA +#if (_WIN32_WINNT >= 0x0500) +#define GetComputerNameEx GetComputerNameExA +#endif #define GetCompressedFileSize GetCompressedFileSizeA #define GetCurrentDirectory GetCurrentDirectoryA #define GetDefaultCommConfig GetDefaultCommConfigA

13 years, 8 months

[mjmartin] 51258: [NTOS/MM] - Update PoolTag used with ExFreePooWithTag to match changes made in 46987 by richard.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Tue Apr 5 11:42:38 2011 New Revision: 51258 URL: http://svn.reactos.org/svn/reactos?rev=51258&view=rev Log: [NTOS/MM] - Update PoolTag used with ExFreePooWithTag to match changes made in 46987 by richard. Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Tue Apr 5 11:42:38 2011 @@ -1059,7 +1059,7 @@ { /* It's not, it's importing stuff it shouldn't be! */ MiDereferenceImports(LoadedImports); - if (LoadedImports) ExFreePool(LoadedImports); + if (LoadedImports) ExFreePoolWithTag(LoadedImports, 'TDmM'); return STATUS_PROCEDURE_NOT_FOUND; } @@ -1073,7 +1073,7 @@ { /* This is not kernel code */ MiDereferenceImports(LoadedImports); - if (LoadedImports) ExFreePool(LoadedImports); + if (LoadedImports) ExFreePoolWithTag(LoadedImports, 'TDmM'); return STATUS_PROCEDURE_NOT_FOUND; } @@ -1098,7 +1098,7 @@ { /* Failed */ MiDereferenceImports(LoadedImports); - if (LoadedImports) ExFreePoolWithTag(LoadedImports, TAG_LDR_WSTR); + if (LoadedImports) ExFreePoolWithTag(LoadedImports, 'TDmM'); return Status; } @@ -1219,7 +1219,7 @@ /* Cleanup and return */ RtlFreeUnicodeString(&NameString); MiDereferenceImports(LoadedImports); - if (LoadedImports) ExFreePoolWithTag(LoadedImports, TAG_LDR_WSTR); + if (LoadedImports) ExFreePoolWithTag(LoadedImports, 'TDmM'); return Status; } @@ -1252,7 +1252,7 @@ { /* Cleanup and return */ MiDereferenceImports(LoadedImports); - if (LoadedImports) ExFreePoolWithTag(LoadedImports, TAG_LDR_WSTR); + if (LoadedImports) ExFreePoolWithTag(LoadedImports, 'TDmM'); DPRINT1("Warning: Driver failed to load, %S not found\n", *MissingDriver); return STATUS_DRIVER_ENTRYPOINT_NOT_FOUND; } @@ -1282,7 +1282,7 @@ { /* Cleanup and return */ MiDereferenceImports(LoadedImports); - if (LoadedImports) ExFreePoolWithTag(LoadedImports, TAG_LDR_WSTR); + if (LoadedImports) ExFreePoolWithTag(LoadedImports, 'TDmM'); return Status; } @@ -1315,13 +1315,13 @@ if (!ImportCount) { /* Free the list and set it to no imports */ - ExFreePoolWithTag(LoadedImports, TAG_LDR_WSTR); + ExFreePoolWithTag(LoadedImports, 'TDmM'); LoadedImports = MM_SYSLDR_NO_IMPORTS; } else if (ImportCount == 1) { /* Just one entry, we can free the table and only use our entry */ - ExFreePoolWithTag(LoadedImports, TAG_LDR_WSTR); + ExFreePoolWithTag(LoadedImports, 'TDmM'); LoadedImports = (PLOAD_IMPORTS)ImportEntry; } else if (ImportCount != LoadedImports->Count) @@ -1349,7 +1349,7 @@ } /* Free the old copy */ - ExFreePoolWithTag(LoadedImports, TAG_LDR_WSTR); + ExFreePoolWithTag(LoadedImports, 'TDmM'); LoadedImports = NewImports; } } @@ -3004,7 +3004,7 @@ /* if (NamePrefix) ExFreePool(PrefixName.Buffer); */ /* Free the name buffer and return status */ - ExFreePoolWithTag(Buffer, TAG_LDR_WSTR); + ExFreePoolWithTag(Buffer, 'nLmM'); return Status; }

13 years, 8 months

[ekohl] 51257: [ADVAPI32/LSASRV] - Implement LsaLookupNames2 in advapi32.dll. - Implement LsarLookupNames3 in lsasrv.dll as a mock-up which returns a hard-coded user account (Administrator). This f...

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Apr 4 22:08:45 2011 New Revision: 51257 URL: http://svn.reactos.org/svn/reactos?rev=51257&view=rev Log: [ADVAPI32/LSASRV] - Implement LsaLookupNames2 in advapi32.dll. - Implement LsarLookupNames3 in lsasrv.dll as a mock-up which returns a hard-coded user account (Administrator). This fixes several wine tests. Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Mon Apr 4 22:08:45 2011 @@ -430,20 +430,22 @@ OUT PLSA_REFERENCED_DOMAIN_LIST *ReferencedDomains, OUT PLSA_TRANSLATED_SID *Sids) { - LSAPR_TRANSLATED_SIDS TranslatedSids; + LSAPR_TRANSLATED_SIDS TranslatedSids = {0, NULL}; ULONG MappedCount = 0; NTSTATUS Status; TRACE("(%p,0x%08x,%p,%p,%p)\n", PolicyHandle, Count, Names, ReferencedDomains, Sids); + if (ReferencedDomains == NULL || Sids == NULL) + return STATUS_INVALID_PARAMETER; + RpcTryExcept { *ReferencedDomains = NULL; *Sids = NULL; TranslatedSids.Entries = Count; - TranslatedSids.Sids = *Sids; Status = LsarLookupNames((LSAPR_HANDLE)PolicyHandle, Count, @@ -458,40 +460,67 @@ RpcExcept(EXCEPTION_EXECUTE_HANDLER) { if (TranslatedSids.Sids != NULL) - { MIDL_user_free(TranslatedSids.Sids); - } - - Status = I_RpcMapWin32Status(RpcExceptionCode()); - } - RpcEndExcept; - - return Status; -} - - -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaLookupNames2( - LSA_HANDLE PolicyHandle, - ULONG Flags, - ULONG Count, - PLSA_UNICODE_STRING Names, - PLSA_REFERENCED_DOMAIN_LIST *ReferencedDomains, - PLSA_TRANSLATED_SID2 *Sids) -{ - FIXME("(%p,0x%08x,0x%08x,%p,%p,%p) stub\n", PolicyHandle, Flags, - Count, Names, ReferencedDomains, Sids); - if (Names != NULL && Count > 0) - { - *ReferencedDomains = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(LSA_REFERENCED_DOMAIN_LIST)); - *Sids = RtlAllocateHeap(RtlGetProcessHeap(), 0, Count * sizeof(LSA_TRANSLATED_SID2)); - return STATUS_SOME_NOT_MAPPED; - } - return STATUS_NONE_MAPPED; + + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +/* + * @implemented + */ +NTSTATUS +WINAPI +LsaLookupNames2(IN LSA_HANDLE PolicyHandle, + IN ULONG Flags, + IN ULONG Count, + IN PLSA_UNICODE_STRING Names, + OUT PLSA_REFERENCED_DOMAIN_LIST *ReferencedDomains, + OUT PLSA_TRANSLATED_SID2 *Sids) +{ + LSAPR_TRANSLATED_SIDS_EX2 TranslatedSids = {0, NULL}; + ULONG MappedCount = 0; + NTSTATUS Status; + + TRACE("(%p,0x%08x,0x%08x,%p,%p,%p) stub\n", PolicyHandle, Flags, + Count, Names, ReferencedDomains, Sids); + + if (ReferencedDomains == NULL || Sids == NULL) + return STATUS_INVALID_PARAMETER; + + RpcTryExcept + { + *ReferencedDomains = NULL; + *Sids = NULL; + + TranslatedSids.Entries = Count; + + Status = LsarLookupNames3((LSAPR_HANDLE)PolicyHandle, + Count, + (PRPC_UNICODE_STRING)Names, + (PLSAPR_REFERENCED_DOMAIN_LIST *)ReferencedDomains, + &TranslatedSids, + LsapLookupWksta, + &MappedCount, + Flags, + 2); + + *Sids = (PLSA_TRANSLATED_SID2)TranslatedSids.Sids; + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + if (TranslatedSids.Sids != NULL) + MIDL_user_free(TranslatedSids.Sids); + + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; } @@ -762,6 +791,7 @@ return STATUS_NOT_IMPLEMENTED; } + /* * @unimplemented */ Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Mon Apr 4 22:08:45 2011 @@ -554,7 +554,7 @@ for (i = 0; i < Count; i++) { OutputSids[i].Use = SidTypeWellKnownGroup; - OutputSids[i].RelativeId = DOMAIN_ALIAS_RID_ADMINS; + OutputSids[i].RelativeId = DOMAIN_USER_RID_ADMIN; //DOMAIN_ALIAS_RID_ADMINS; OutputSids[i].DomainIndex = i; } @@ -1293,8 +1293,126 @@ DWORD LookupOptions, DWORD ClientRevision) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority = {SECURITY_NT_AUTHORITY}; + static const UNICODE_STRING DomainName = RTL_CONSTANT_STRING(L"DOMAIN"); + PLSAPR_REFERENCED_DOMAIN_LIST DomainsBuffer = NULL; + PLSAPR_TRANSLATED_SID_EX2 SidsBuffer = NULL; + ULONG SidsBufferLength; + ULONG DomainSidLength; + ULONG AccountSidLength; + PSID DomainSid; + PSID AccountSid; + ULONG i; + NTSTATUS Status; + + TRACE("LsarLookupNames3(%p, %lu, %p, %p, %p, %d, %p, %lu, %lu)\n", + PolicyHandle, Count, Names, ReferencedDomains, TranslatedSids, + LookupLevel, MappedCount, LookupOptions, ClientRevision); + + if (Count == 0) + return STATUS_NONE_MAPPED; + + TranslatedSids->Entries = Count; + TranslatedSids->Sids = NULL; + *ReferencedDomains = NULL; + + SidsBufferLength = Count * sizeof(LSAPR_TRANSLATED_SID_EX2); + SidsBuffer = MIDL_user_allocate(SidsBufferLength); + if (SidsBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + for (i = 0; i < Count; i++) + { + SidsBuffer[i].Use = SidTypeUser; + SidsBuffer[i].Sid = NULL; + SidsBuffer[i].DomainIndex = -1; + SidsBuffer[i].Flags = 0; + } + + DomainsBuffer = MIDL_user_allocate(sizeof(LSAPR_REFERENCED_DOMAIN_LIST)); + if (DomainsBuffer == NULL) + { + MIDL_user_free(SidsBuffer); + return STATUS_INSUFFICIENT_RESOURCES; + } + + DomainsBuffer->Entries = Count; + DomainsBuffer->Domains = MIDL_user_allocate(Count * sizeof(LSA_TRUST_INFORMATION)); + if (DomainsBuffer->Domains == NULL) + { + MIDL_user_free(DomainsBuffer); + MIDL_user_free(SidsBuffer); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = RtlAllocateAndInitializeSid(&IdentifierAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, 0, 0, 0, 0, 0, + &DomainSid); + if (!NT_SUCCESS(Status)) + { + MIDL_user_free(DomainsBuffer->Domains); + MIDL_user_free(DomainsBuffer); + MIDL_user_free(SidsBuffer); + return Status; + } + + DomainSidLength = RtlLengthSid(DomainSid); + + for (i = 0; i < Count; i++) + { + DomainsBuffer->Domains[i].Sid = MIDL_user_allocate(DomainSidLength); + RtlCopyMemory(DomainsBuffer->Domains[i].Sid, + DomainSid, + DomainSidLength); + + DomainsBuffer->Domains[i].Name.Buffer = MIDL_user_allocate(DomainName.MaximumLength); + DomainsBuffer->Domains[i].Name.Length = DomainName.Length; + DomainsBuffer->Domains[i].Name.MaximumLength = DomainName.MaximumLength; + RtlCopyMemory(DomainsBuffer->Domains[i].Name.Buffer, + DomainName.Buffer, + DomainName.MaximumLength); + } + + Status = RtlAllocateAndInitializeSid(&IdentifierAuthority, + 3, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + DOMAIN_USER_RID_ADMIN, + 0, 0, 0, 0, 0, + &AccountSid); + if (!NT_SUCCESS(Status)) + { + MIDL_user_free(DomainsBuffer->Domains); + MIDL_user_free(DomainsBuffer); + MIDL_user_free(SidsBuffer); + return Status; + } + + AccountSidLength = RtlLengthSid(AccountSid); + + for (i = 0; i < Count; i++) + { + SidsBuffer[i].Use = SidTypeWellKnownGroup; + SidsBuffer[i].Sid = MIDL_user_allocate(AccountSidLength); + + RtlCopyMemory(SidsBuffer[i].Sid, + AccountSid, + AccountSidLength); + + SidsBuffer[i].DomainIndex = i; + SidsBuffer[i].Flags = 0; + } + + *ReferencedDomains = DomainsBuffer; + *MappedCount = Count; + + TranslatedSids->Entries = Count; + TranslatedSids->Sids = SidsBuffer; + + return STATUS_SUCCESS; }

13 years, 8 months

[mjmartin] 51256: - Revert 51255 that was committed on accident. The patch is not ready yet.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Mon Apr 4 22:08:39 2011 New Revision: 51256 URL: http://svn.reactos.org/svn/reactos?rev=51256&view=rev Log: - Revert 51255 that was committed on accident. The patch is not ready yet. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Mon Apr 4 22:08:39 2011 @@ -115,19 +115,15 @@ /* FIXME should get timeout from * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ - Status = co_MsqSendMessage( ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue, - pEH->head.pti->MessageQueue, + Status = co_MsqSendMessage( pEH->head.pti->MessageQueue, hwnd, event, 0, - (LPARAM)pEP, - FALSE, - NULL, - 0, + (LPARAM)pEP, 300, TRUE, MSQ_ISEVENT, - &uResult); + &uResult); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(pEP, TAG_HOOK); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Mon Apr 4 22:08:39 2011 @@ -88,19 +88,15 @@ /* FIXME should get timeout from * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ - Status = co_MsqSendMessage( ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue, - pti->MessageQueue, + Status = co_MsqSendMessage( pti->MessageQueue, IntToPtr(Code), // hWnd Hook->HookId, // Msg wParam, - (LPARAM)pHP, - FALSE, - NULL, - 0, + (LPARAM)pHP, uTimeout, Block, MSQ_ISHOOK, - &uResult); + &uResult); if (!NT_SUCCESS(Status)) { DPRINT1("Error Hook Call SendMsg. %d Status: 0x%x\n", Hook->HookId, Status); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Apr 4 22:08:39 2011 @@ -1261,15 +1261,11 @@ do { - Status = co_MsqSendMessage(((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue, - Window->head.pti->MessageQueue, + Status = co_MsqSendMessage( Window->head.pti->MessageQueue, hWnd, Msg, wParam, lParam, - FALSE, - NULL, - 0, uTimeout, (uFlags & SMTO_BLOCK), MSQ_NORMAL, @@ -1358,7 +1354,6 @@ LPARAM lParam) { ULONG_PTR Result = 0; - /* Piggyback off CallBack */ co_IntSendMessageWithCallBack(hWnd, Msg, wParam, @@ -1377,12 +1372,12 @@ */ LRESULT FASTCALL co_IntSendMessageWithCallBack( HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - SENDASYNCPROC CompletionCallback, - ULONG_PTR CompletionCallbackContext, - ULONG_PTR *uResult) + UINT Msg, + WPARAM wParam, + LPARAM lParam, + SENDASYNCPROC CompletionCallback, + ULONG_PTR CompletionCallbackContext, + ULONG_PTR *uResult) { ULONG_PTR Result; PWND Window = NULL; @@ -1442,7 +1437,7 @@ } /* If this is not a callback and it can be sent now, then send it. */ - if (Window->head.pti->MessageQueue == Win32Thread->MessageQueue) + if ((Window->head.pti->MessageQueue == Win32Thread->MessageQueue) && (CompletionCallback == NULL)) { ObReferenceObject(Win32Thread->pEThread); Result = (ULONG_PTR)co_IntCallWindowProc( Window->lpfnWndProc, @@ -1457,20 +1452,11 @@ *uResult = Result; } ObDereferenceObject(Win32Thread->pEThread); - - if (CompletionCallback) - { - co_IntCallSentMessageCallback(CompletionCallback, - hWnd, - Msg, - CompletionCallbackContext, - Result); - } } IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); - if (Window->head.pti->MessageQueue == Win32Thread->MessageQueue) + if ((Window->head.pti->MessageQueue == Win32Thread->MessageQueue) && (CompletionCallback == NULL)) { if (! NT_SUCCESS(UnpackParam(lParamPacked, Msg, wParam, lParam, FALSE))) { @@ -1494,21 +1480,18 @@ Message->lResult = 0; Message->QS_Flags = 0; Message->SenderQueue = NULL; // mjmartin, you are right! This is null. - if (CompletionCallback) - Message->CallBackSenderQueue = Win32Thread->MessageQueue; - else - Message->CallBackSenderQueue = NULL; + Message->CallBackSenderQueue = Win32Thread->MessageQueue; + IntReferenceMessageQueue(Window->head.pti->MessageQueue); Message->CompletionCallback = CompletionCallback; Message->CompletionCallbackContext = CompletionCallbackContext; - Message->HookMessage = MSQ_NORMAL; - Message->HasPackedLParam = (lParamBufferSize > -1); + Message->HookMessage = MSQ_NORMAL | MSQ_SENTNOWAIT; + Message->HasPackedLParam = (lParamBufferSize > 0); Message->QS_Flags = QS_SENDMESSAGE; - if (CompletionCallback) - InsertTailList(&Win32Thread->MessageQueue->DispatchingMessagesHead, &Message->DispatchingListEntry); + MsqWakeQueue(Window->head.pti->MessageQueue, QS_SENDMESSAGE, FALSE); + InsertTailList(&Window->head.pti->MessageQueue->SentMessagesListHead, &Message->ListEntry); - MsqWakeQueue(Window->head.pti->MessageQueue, QS_SENDMESSAGE, FALSE); IntDereferenceMessageQueue(Window->head.pti->MessageQueue); RETURN(TRUE); @@ -2129,7 +2112,7 @@ { co_IntSendMessageTimeout( HWND_BROADCAST, Msg, - wParam, + wParam, lParam, SMTO_NORMAL, 2000, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Mon Apr 4 22:08:39 2011 @@ -423,7 +423,7 @@ PLIST_ENTRY Entry; LRESULT Result; PTHREADINFO pti; - + if (IsListEmpty(&MessageQueue->SentMessagesListHead)) { return(FALSE); @@ -466,18 +466,6 @@ Message->Msg.wParam, Message->Msg.lParam); } - else if ((Message->CompletionCallback) - && (Message->CallBackSenderQueue == MessageQueue)) - { /* Call the callback routine */ - ASSERT(Message->QS_Flags & QS_SMRESULT); - co_IntCallSentMessageCallback(Message->CompletionCallback, - Message->Msg.hwnd, - Message->Msg.message, - Message->CompletionCallbackContext, - Message->lResult); - /* Set callback to NULL to prevent reentry */ - Message->CompletionCallback = NULL; - } else { /* Call the window procedure. */ Result = co_IntSendMessage( Message->Msg.hwnd, @@ -490,23 +478,8 @@ to be cleaned up on thread termination anymore */ RemoveEntryList(&Message->ListEntry); - if (Message->CompletionCallback) - { - if (Message->CallBackSenderQueue) - { - Message->lResult = Result; - Message->QS_Flags |= QS_SMRESULT; - - /* queue it in the callers message queue */ - InsertTailList(&Message->CallBackSenderQueue->SentMessagesListHead, &Message->ListEntry); - MsqWakeQueue(Message->CallBackSenderQueue, QS_SENDMESSAGE, TRUE); - IntDereferenceMessageQueue(Message->CallBackSenderQueue); - } - return (TRUE); - } - - /* remove the message from the dispatching list if there is a SenderQueue, so lock the sender's message queue */ - if ((Message->SenderQueue) || (Message->CallBackSenderQueue)) + /* remove the message from the dispatching list if needed, so lock the sender's message queue */ + if (!(Message->HookMessage & MSQ_SENTNOWAIT)) { if (Message->DispatchingListEntry.Flink != NULL) { @@ -540,8 +513,18 @@ KeSetEvent(Message->CompletionEvent, IO_NO_INCREMENT, FALSE); } - /* If SenderQueue then SenderQueue and MessageQueue was referenced, dereference them here */ - if (Message->SenderQueue) + /* Call the callback if the message was sent with SendMessageCallback */ + if (Message->CompletionCallback != NULL) + { + co_IntCallSentMessageCallback(Message->CompletionCallback, + Message->Msg.hwnd, + Message->Msg.message, + Message->CompletionCallbackContext, + Result); + } + + /* Only if it is not a no wait message */ + if (!(Message->HookMessage & MSQ_SENTNOWAIT)) { IntDereferenceMessageQueue(Message->SenderQueue); IntDereferenceMessageQueue(MessageQueue); @@ -605,11 +588,10 @@ RemoveEntryList(&SentMessage->ListEntry); ClearMsgBitsMask(MessageQueue, SentMessage->QS_Flags); - /* If there was a SenderQueue then remove the message from this threads dispatching list */ - if (((SentMessage->SenderQueue) || (SentMessage->CallBackSenderQueue)) + /* remove the message from the dispatching list if neede */ + if ((!(SentMessage->HookMessage & MSQ_SENTNOWAIT)) && (SentMessage->DispatchingListEntry.Flink != NULL)) { - SentMessage->CallBackSenderQueue = NULL; RemoveEntryList(&SentMessage->DispatchingListEntry); } @@ -625,8 +607,8 @@ ExFreePool((PVOID)SentMessage->Msg.lParam); } - /* If SenderQueue then SenderQueue and MessageQueue was referenced, dereference them here */ - if (SentMessage->SenderQueue) + /* Only if it is not a no wait message */ + if (!(SentMessage->HookMessage & MSQ_SENTNOWAIT)) { /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue); @@ -646,9 +628,8 @@ } NTSTATUS FASTCALL -co_MsqSendMessage(PUSER_MESSAGE_QUEUE ThreadQueue, PUSER_MESSAGE_QUEUE MessageQueue, - HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL HasPackedLParam, - SENDASYNCPROC CompletionCallback, ULONG_PTR CompletionCallbackContext, +co_MsqSendMessage(PUSER_MESSAGE_QUEUE MessageQueue, + HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, UINT uTimeout, BOOL Block, INT HookMessage, ULONG_PTR *uResult) { @@ -656,100 +637,55 @@ PUSER_SENT_MESSAGE Message; KEVENT CompletionEvent; NTSTATUS WaitStatus; + PUSER_MESSAGE_QUEUE ThreadQueue; LARGE_INTEGER Timeout; PLIST_ENTRY Entry; - BOOL WaitForCompletion; LRESULT Result = 0; //// Result could be trashed. //// - /* Notification messages and some internal messages sent from the subsystem must not block current - thread and therefore pass NULL as ThreadQueue. Callbacks also do not block */ - WaitForCompletion = ((ThreadQueue) && (!CompletionCallback)); - if(!(Message = ExAllocatePoolWithTag(PagedPool, sizeof(USER_SENT_MESSAGE), TAG_USRMSG))) { DPRINT1("MsqSendMessage(): Not enough memory to allocate a message"); return STATUS_INSUFFICIENT_RESOURCES; } - /* Initialize event if calling thread will wait on completion */ - if (WaitForCompletion) - KeInitializeEvent(&CompletionEvent, NotificationEvent, FALSE); + KeInitializeEvent(&CompletionEvent, NotificationEvent, FALSE); pti = PsGetCurrentThreadWin32Thread(); + ThreadQueue = pti->MessageQueue; ptirec = MessageQueue->Thread->Tcb.Win32Thread; ASSERT(ThreadQueue != MessageQueue); ASSERT(ptirec->pcti); // Send must have a client side to receive it!!!! Timeout.QuadPart = (LONGLONG) uTimeout * (LONGLONG) -10000; + /* FIXME - increase reference counter of sender's message queue here */ + Message->Msg.hwnd = Wnd; Message->Msg.message = Msg; Message->Msg.wParam = wParam; Message->Msg.lParam = lParam; + Message->CompletionEvent = &CompletionEvent; + Message->Result = &Result; Message->lResult = 0; Message->QS_Flags = 0; - - if (WaitForCompletion) - { - /* Normal SendMessage that will block until the Windows Procedure handles the message */ - Message->SenderQueue = ThreadQueue; - Message->CompletionEvent = &CompletionEvent; - Message->Result = &Result; - } - else - { - /* Either a SendMessageCallback, Notify Message or Internal Message from Win32k */ - Message->SenderQueue = NULL; - Message->CompletionEvent = NULL; - Message->Result = NULL; - } - - if (CompletionCallback) - { - Message->CallBackSenderQueue = ThreadQueue; - } - else - { - Message->CallBackSenderQueue = NULL; - } - - /* Reference the ThreadQueue if there was one. For normal messages - the thread is dereferenced when the messages is processed by windows procedure. - For callbacks it dereferenced once the callback message is processed and placed back - into the sending message queue */ - if (ThreadQueue != NULL) - IntReferenceMessageQueue(ThreadQueue); - - Message->CompletionCallback = CompletionCallback; - Message->CompletionCallbackContext = CompletionCallbackContext; + Message->SenderQueue = ThreadQueue; + Message->CallBackSenderQueue = NULL; + IntReferenceMessageQueue(ThreadQueue); + Message->CompletionCallback = NULL; + Message->CompletionCallbackContext = 0; Message->HookMessage = HookMessage; - Message->HasPackedLParam = HasPackedLParam; - - if (HasPackedLParam) - { - ASSERT(Message->SenderQueue == NULL); - } - + Message->HasPackedLParam = FALSE; + IntReferenceMessageQueue(MessageQueue); - /* Add it to the list of pending messages if waiting on completion or if message is callback. - This is done for callbacks as if the Sender terminates it will set the CallBackSenderQueue member to NULL, - informing the windows procedure handling the message to discard the callback procedure */ - if (ThreadQueue != NULL) - InsertTailList(&ThreadQueue->DispatchingMessagesHead, &Message->DispatchingListEntry); + /* add it to the list of pending messages */ + InsertTailList(&ThreadQueue->DispatchingMessagesHead, &Message->DispatchingListEntry); /* queue it in the destination's message queue */ InsertTailList(&MessageQueue->SentMessagesListHead, &Message->ListEntry); Message->QS_Flags = QS_SENDMESSAGE; MsqWakeQueue(MessageQueue, QS_SENDMESSAGE, TRUE); - - /* If not waiting on completion, dereference the MessageQueue and return */ - if (!WaitForCompletion) - { - IntDereferenceMessageQueue(MessageQueue); - return STATUS_SUCCESS; - } /* we can't access the Message anymore since it could have already been deleted! */ @@ -918,7 +854,7 @@ * Send a WM_PARENTNOTIFY to all ancestors of the given window, unless * the window has the WS_EX_NOPARENTNOTIFY style. */ -void MsqSendParentNotify( PWND pwnd, WORD event, WORD idChild, POINT pt ) +static void MsqSendParentNotify( PWND pwnd, WORD event, WORD idChild, POINT pt ) { PWND pwndDesktop = UserGetWindowObject(IntGetDesktopWindow()); @@ -1530,8 +1466,8 @@ DPRINT("Notify the sender and remove a message from the queue that had not been dispatched\n"); - /* remove the message from the dispatching list if there was a SenderQueue */ - if (((CurrentSentMessage->SenderQueue) || (CurrentSentMessage->CallBackSenderQueue)) + /* remove the message from the dispatching list if needed */ + if ((!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) && (CurrentSentMessage->DispatchingListEntry.Flink != NULL)) { RemoveEntryList(&CurrentSentMessage->DispatchingListEntry); @@ -1549,8 +1485,8 @@ ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); } - /* If SenderQueue then SenderQueue and MessageQueue was referenced, dereference them here */ - if (CurrentSentMessage->SenderQueue) + /* Only if it is not a no wait message */ + if (!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) { /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue); @@ -1589,8 +1525,8 @@ ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); } - /* If SenderQueue then SenderQueue and MessageQueue was referenced, dereference them here */ - if (CurrentSentMessage->SenderQueue) + /* Only if it is not a no wait message */ + if (!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) { /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue);

13 years, 8 months

[mjmartin] 51255: [Win32k] - co_MsqDispatchOneSentMessage: After calling the windows procedure check if the message was a callback. If so place the message into the calling MessageQueue. Also check...

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Mon Apr 4 21:50:24 2011 New Revision: 51255 URL: http://svn.reactos.org/svn/reactos?rev=51255&view=rev Log: [Win32k] - co_MsqDispatchOneSentMessage: After calling the windows procedure check if the message was a callback. If so place the message into the calling MessageQueue. Also check if the current MessageQueue is the calling MessageQueue in which case dont call the Windows procedure but call the callback routine. SendMessageCallback is now properly implemented. - Remove the use of MSQ_SENTNOWAIT and instead use the SenderQueue and CallBackSenderQueue members to determine if the MessageQueues need to be dereferenced. - Modify co_MsqSendMessage to accept more parameters so that it can handle Notification, Callback and Internal messages. These changes make this function more complex but removes duplicate code in messages.c and move the handling for all queued messages in one location. - co_IntSendMessageWithCallBack: If the callback is for the same Message Queue, call it vice queuing it. Insert the message into the MessageQueue before waking the thread to handle the message. Should fix bug 5580. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Mon Apr 4 21:50:24 2011 @@ -115,15 +115,19 @@ /* FIXME should get timeout from * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ - Status = co_MsqSendMessage( pEH->head.pti->MessageQueue, + Status = co_MsqSendMessage( ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue, + pEH->head.pti->MessageQueue, hwnd, event, 0, - (LPARAM)pEP, + (LPARAM)pEP, + FALSE, + NULL, + 0, 300, TRUE, MSQ_ISEVENT, - &uResult); + &uResult); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(pEP, TAG_HOOK); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Mon Apr 4 21:50:24 2011 @@ -88,15 +88,19 @@ /* FIXME should get timeout from * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ - Status = co_MsqSendMessage( pti->MessageQueue, + Status = co_MsqSendMessage( ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue, + pti->MessageQueue, IntToPtr(Code), // hWnd Hook->HookId, // Msg wParam, - (LPARAM)pHP, + (LPARAM)pHP, + FALSE, + NULL, + 0, uTimeout, Block, MSQ_ISHOOK, - &uResult); + &uResult); if (!NT_SUCCESS(Status)) { DPRINT1("Error Hook Call SendMsg. %d Status: 0x%x\n", Hook->HookId, Status); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Apr 4 21:50:24 2011 @@ -1261,11 +1261,15 @@ do { - Status = co_MsqSendMessage( Window->head.pti->MessageQueue, + Status = co_MsqSendMessage(((PTHREADINFO)PsGetCurrentThreadWin32Thread())->MessageQueue, + Window->head.pti->MessageQueue, hWnd, Msg, wParam, lParam, + FALSE, + NULL, + 0, uTimeout, (uFlags & SMTO_BLOCK), MSQ_NORMAL, @@ -1354,6 +1358,7 @@ LPARAM lParam) { ULONG_PTR Result = 0; + /* Piggyback off CallBack */ co_IntSendMessageWithCallBack(hWnd, Msg, wParam, @@ -1372,12 +1377,12 @@ */ LRESULT FASTCALL co_IntSendMessageWithCallBack( HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam, - SENDASYNCPROC CompletionCallback, - ULONG_PTR CompletionCallbackContext, - ULONG_PTR *uResult) + UINT Msg, + WPARAM wParam, + LPARAM lParam, + SENDASYNCPROC CompletionCallback, + ULONG_PTR CompletionCallbackContext, + ULONG_PTR *uResult) { ULONG_PTR Result; PWND Window = NULL; @@ -1437,7 +1442,7 @@ } /* If this is not a callback and it can be sent now, then send it. */ - if ((Window->head.pti->MessageQueue == Win32Thread->MessageQueue) && (CompletionCallback == NULL)) + if (Window->head.pti->MessageQueue == Win32Thread->MessageQueue) { ObReferenceObject(Win32Thread->pEThread); Result = (ULONG_PTR)co_IntCallWindowProc( Window->lpfnWndProc, @@ -1452,11 +1457,20 @@ *uResult = Result; } ObDereferenceObject(Win32Thread->pEThread); + + if (CompletionCallback) + { + co_IntCallSentMessageCallback(CompletionCallback, + hWnd, + Msg, + CompletionCallbackContext, + Result); + } } IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); - if ((Window->head.pti->MessageQueue == Win32Thread->MessageQueue) && (CompletionCallback == NULL)) + if (Window->head.pti->MessageQueue == Win32Thread->MessageQueue) { if (! NT_SUCCESS(UnpackParam(lParamPacked, Msg, wParam, lParam, FALSE))) { @@ -1480,18 +1494,21 @@ Message->lResult = 0; Message->QS_Flags = 0; Message->SenderQueue = NULL; // mjmartin, you are right! This is null. - Message->CallBackSenderQueue = Win32Thread->MessageQueue; - + if (CompletionCallback) + Message->CallBackSenderQueue = Win32Thread->MessageQueue; + else + Message->CallBackSenderQueue = NULL; IntReferenceMessageQueue(Window->head.pti->MessageQueue); Message->CompletionCallback = CompletionCallback; Message->CompletionCallbackContext = CompletionCallbackContext; - Message->HookMessage = MSQ_NORMAL | MSQ_SENTNOWAIT; - Message->HasPackedLParam = (lParamBufferSize > 0); + Message->HookMessage = MSQ_NORMAL; + Message->HasPackedLParam = (lParamBufferSize > -1); Message->QS_Flags = QS_SENDMESSAGE; + if (CompletionCallback) + InsertTailList(&Win32Thread->MessageQueue->DispatchingMessagesHead, &Message->DispatchingListEntry); + InsertTailList(&Window->head.pti->MessageQueue->SentMessagesListHead, &Message->ListEntry); MsqWakeQueue(Window->head.pti->MessageQueue, QS_SENDMESSAGE, FALSE); - - InsertTailList(&Window->head.pti->MessageQueue->SentMessagesListHead, &Message->ListEntry); IntDereferenceMessageQueue(Window->head.pti->MessageQueue); RETURN(TRUE); @@ -2112,7 +2129,7 @@ { co_IntSendMessageTimeout( HWND_BROADCAST, Msg, - wParam, + wParam, lParam, SMTO_NORMAL, 2000, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Mon Apr 4 21:50:24 2011 @@ -423,7 +423,7 @@ PLIST_ENTRY Entry; LRESULT Result; PTHREADINFO pti; - + if (IsListEmpty(&MessageQueue->SentMessagesListHead)) { return(FALSE); @@ -466,6 +466,18 @@ Message->Msg.wParam, Message->Msg.lParam); } + else if ((Message->CompletionCallback) + && (Message->CallBackSenderQueue == MessageQueue)) + { /* Call the callback routine */ + ASSERT(Message->QS_Flags & QS_SMRESULT); + co_IntCallSentMessageCallback(Message->CompletionCallback, + Message->Msg.hwnd, + Message->Msg.message, + Message->CompletionCallbackContext, + Message->lResult); + /* Set callback to NULL to prevent reentry */ + Message->CompletionCallback = NULL; + } else { /* Call the window procedure. */ Result = co_IntSendMessage( Message->Msg.hwnd, @@ -478,8 +490,23 @@ to be cleaned up on thread termination anymore */ RemoveEntryList(&Message->ListEntry); - /* remove the message from the dispatching list if needed, so lock the sender's message queue */ - if (!(Message->HookMessage & MSQ_SENTNOWAIT)) + if (Message->CompletionCallback) + { + if (Message->CallBackSenderQueue) + { + Message->lResult = Result; + Message->QS_Flags |= QS_SMRESULT; + + /* queue it in the callers message queue */ + InsertTailList(&Message->CallBackSenderQueue->SentMessagesListHead, &Message->ListEntry); + MsqWakeQueue(Message->CallBackSenderQueue, QS_SENDMESSAGE, TRUE); + IntDereferenceMessageQueue(Message->CallBackSenderQueue); + } + return (TRUE); + } + + /* remove the message from the dispatching list if there is a SenderQueue, so lock the sender's message queue */ + if ((Message->SenderQueue) || (Message->CallBackSenderQueue)) { if (Message->DispatchingListEntry.Flink != NULL) { @@ -513,18 +540,8 @@ KeSetEvent(Message->CompletionEvent, IO_NO_INCREMENT, FALSE); } - /* Call the callback if the message was sent with SendMessageCallback */ - if (Message->CompletionCallback != NULL) - { - co_IntCallSentMessageCallback(Message->CompletionCallback, - Message->Msg.hwnd, - Message->Msg.message, - Message->CompletionCallbackContext, - Result); - } - - /* Only if it is not a no wait message */ - if (!(Message->HookMessage & MSQ_SENTNOWAIT)) + /* If SenderQueue then SenderQueue and MessageQueue was referenced, dereference them here */ + if (Message->SenderQueue) { IntDereferenceMessageQueue(Message->SenderQueue); IntDereferenceMessageQueue(MessageQueue); @@ -588,10 +605,11 @@ RemoveEntryList(&SentMessage->ListEntry); ClearMsgBitsMask(MessageQueue, SentMessage->QS_Flags); - /* remove the message from the dispatching list if neede */ - if ((!(SentMessage->HookMessage & MSQ_SENTNOWAIT)) + /* If there was a SenderQueue then remove the message from this threads dispatching list */ + if (((SentMessage->SenderQueue) || (SentMessage->CallBackSenderQueue)) && (SentMessage->DispatchingListEntry.Flink != NULL)) { + SentMessage->CallBackSenderQueue = NULL; RemoveEntryList(&SentMessage->DispatchingListEntry); } @@ -607,8 +625,8 @@ ExFreePool((PVOID)SentMessage->Msg.lParam); } - /* Only if it is not a no wait message */ - if (!(SentMessage->HookMessage & MSQ_SENTNOWAIT)) + /* If SenderQueue then SenderQueue and MessageQueue was referenced, dereference them here */ + if (SentMessage->SenderQueue) { /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue); @@ -628,8 +646,9 @@ } NTSTATUS FASTCALL -co_MsqSendMessage(PUSER_MESSAGE_QUEUE MessageQueue, - HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, +co_MsqSendMessage(PUSER_MESSAGE_QUEUE ThreadQueue, PUSER_MESSAGE_QUEUE MessageQueue, + HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL HasPackedLParam, + SENDASYNCPROC CompletionCallback, ULONG_PTR CompletionCallbackContext, UINT uTimeout, BOOL Block, INT HookMessage, ULONG_PTR *uResult) { @@ -637,55 +656,100 @@ PUSER_SENT_MESSAGE Message; KEVENT CompletionEvent; NTSTATUS WaitStatus; - PUSER_MESSAGE_QUEUE ThreadQueue; LARGE_INTEGER Timeout; PLIST_ENTRY Entry; + BOOL WaitForCompletion; LRESULT Result = 0; //// Result could be trashed. //// + /* Notification messages and some internal messages sent from the subsystem must not block current + thread and therefore pass NULL as ThreadQueue. Callbacks also do not block */ + WaitForCompletion = ((ThreadQueue) && (!CompletionCallback)); + if(!(Message = ExAllocatePoolWithTag(PagedPool, sizeof(USER_SENT_MESSAGE), TAG_USRMSG))) { DPRINT1("MsqSendMessage(): Not enough memory to allocate a message"); return STATUS_INSUFFICIENT_RESOURCES; } - KeInitializeEvent(&CompletionEvent, NotificationEvent, FALSE); + /* Initialize event if calling thread will wait on completion */ + if (WaitForCompletion) + KeInitializeEvent(&CompletionEvent, NotificationEvent, FALSE); pti = PsGetCurrentThreadWin32Thread(); - ThreadQueue = pti->MessageQueue; ptirec = MessageQueue->Thread->Tcb.Win32Thread; ASSERT(ThreadQueue != MessageQueue); ASSERT(ptirec->pcti); // Send must have a client side to receive it!!!! Timeout.QuadPart = (LONGLONG) uTimeout * (LONGLONG) -10000; - /* FIXME - increase reference counter of sender's message queue here */ - Message->Msg.hwnd = Wnd; Message->Msg.message = Msg; Message->Msg.wParam = wParam; Message->Msg.lParam = lParam; - Message->CompletionEvent = &CompletionEvent; - Message->Result = &Result; Message->lResult = 0; Message->QS_Flags = 0; - Message->SenderQueue = ThreadQueue; - Message->CallBackSenderQueue = NULL; - IntReferenceMessageQueue(ThreadQueue); - Message->CompletionCallback = NULL; - Message->CompletionCallbackContext = 0; + + if (WaitForCompletion) + { + /* Normal SendMessage that will block until the Windows Procedure handles the message */ + Message->SenderQueue = ThreadQueue; + Message->CompletionEvent = &CompletionEvent; + Message->Result = &Result; + } + else + { + /* Either a SendMessageCallback, Notify Message or Internal Message from Win32k */ + Message->SenderQueue = NULL; + Message->CompletionEvent = NULL; + Message->Result = NULL; + } + + if (CompletionCallback) + { + Message->CallBackSenderQueue = ThreadQueue; + } + else + { + Message->CallBackSenderQueue = NULL; + } + + /* Reference the ThreadQueue if there was one. For normal messages + the thread is dereferenced when the messages is processed by windows procedure. + For callbacks it dereferenced once the callback message is processed and placed back + into the sending message queue */ + if (ThreadQueue != NULL) + IntReferenceMessageQueue(ThreadQueue); + + Message->CompletionCallback = CompletionCallback; + Message->CompletionCallbackContext = CompletionCallbackContext; Message->HookMessage = HookMessage; - Message->HasPackedLParam = FALSE; - + Message->HasPackedLParam = HasPackedLParam; + + if (HasPackedLParam) + { + ASSERT(Message->SenderQueue == NULL); + } + IntReferenceMessageQueue(MessageQueue); - /* add it to the list of pending messages */ - InsertTailList(&ThreadQueue->DispatchingMessagesHead, &Message->DispatchingListEntry); + /* Add it to the list of pending messages if waiting on completion or if message is callback. + This is done for callbacks as if the Sender terminates it will set the CallBackSenderQueue member to NULL, + informing the windows procedure handling the message to discard the callback procedure */ + if (ThreadQueue != NULL) + InsertTailList(&ThreadQueue->DispatchingMessagesHead, &Message->DispatchingListEntry); /* queue it in the destination's message queue */ InsertTailList(&MessageQueue->SentMessagesListHead, &Message->ListEntry); Message->QS_Flags = QS_SENDMESSAGE; MsqWakeQueue(MessageQueue, QS_SENDMESSAGE, TRUE); + + /* If not waiting on completion, dereference the MessageQueue and return */ + if (!WaitForCompletion) + { + IntDereferenceMessageQueue(MessageQueue); + return STATUS_SUCCESS; + } /* we can't access the Message anymore since it could have already been deleted! */ @@ -854,7 +918,7 @@ * Send a WM_PARENTNOTIFY to all ancestors of the given window, unless * the window has the WS_EX_NOPARENTNOTIFY style. */ -static void MsqSendParentNotify( PWND pwnd, WORD event, WORD idChild, POINT pt ) +void MsqSendParentNotify( PWND pwnd, WORD event, WORD idChild, POINT pt ) { PWND pwndDesktop = UserGetWindowObject(IntGetDesktopWindow()); @@ -1466,8 +1530,8 @@ DPRINT("Notify the sender and remove a message from the queue that had not been dispatched\n"); - /* remove the message from the dispatching list if needed */ - if ((!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) + /* remove the message from the dispatching list if there was a SenderQueue */ + if (((CurrentSentMessage->SenderQueue) || (CurrentSentMessage->CallBackSenderQueue)) && (CurrentSentMessage->DispatchingListEntry.Flink != NULL)) { RemoveEntryList(&CurrentSentMessage->DispatchingListEntry); @@ -1485,8 +1549,8 @@ ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); } - /* Only if it is not a no wait message */ - if (!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) + /* If SenderQueue then SenderQueue and MessageQueue was referenced, dereference them here */ + if (CurrentSentMessage->SenderQueue) { /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue); @@ -1525,8 +1589,8 @@ ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); } - /* Only if it is not a no wait message */ - if (!(CurrentSentMessage->HookMessage & MSQ_SENTNOWAIT)) + /* If SenderQueue then SenderQueue and MessageQueue was referenced, dereference them here */ + if (CurrentSentMessage->SenderQueue) { /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(MessageQueue);

13 years, 8 months

[mjmartin] 51254: [Win32k] - Do not block calling thread when sending WM_PARENTNOTIFY messages. Fixes hang at end of user32 winetest for msg.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Mon Apr 4 21:15:07 2011 New Revision: 51254 URL: http://svn.reactos.org/svn/reactos?rev=51254&view=rev Log: [Win32k] - Do not block calling thread when sending WM_PARENTNOTIFY messages. Fixes hang at end of user32 winetest for msg. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Apr 4 21:15:07 2011 @@ -1529,10 +1529,10 @@ { if (pWindow->spwndParent && pWindow->spwndParent != UserGetDesktopWindow()) { - co_IntSendMessage( pWindow->spwndParent->head.h, - WM_PARENTNOTIFY, - MAKEWPARAM( msg, pWindow->IDMenu), - (LPARAM)pWindow->head.h ); + co_IntSendMessageNoWait( pWindow->spwndParent->head.h, + WM_PARENTNOTIFY, + MAKEWPARAM( msg, pWindow->IDMenu), + (LPARAM)pWindow->head.h ); } } }

13 years, 8 months

[fireball] 51253: [KERNEL32] - Minor cleanup, better flag names (thanks to ProcessHacker team for the good names and values). - Return error in failure path of BasepGetModuleHandleExW. - Optimize G...

by fireball＠svn.reactos.org

Author: fireball Date: Mon Apr 4 19:35:24 2011 New Revision: 51253 URL: http://svn.reactos.org/svn/reactos?rev=51253&view=rev Log: [KERNEL32] - Minor cleanup, better flag names (thanks to ProcessHacker team for the good names and values). - Return error in failure path of BasepGetModuleHandleExW. - Optimize GetModuleHandleExA so that it calls the internal routine directly, without going through GetModuleHandleExW first and thus validating parameters second time. Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/dll/win32/kernel32/misc/ldr.c trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Mon Apr 4 19:35:24 2011 @@ -15,9 +15,6 @@ /* GLOBALS *******************************************************************/ -#define LDR_LOCK_HELD 0x2 -#define LDR_LOCK_FREE 0x1 - LONG LdrpLoaderLockAcquisitonCount; /* FUNCTIONS *****************************************************************/ @@ -38,7 +35,7 @@ if (Flags & ~1) { /* Flags are invalid, check how to fail */ - if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS) + if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* The caller wants us to raise status */ RtlRaiseStatus(STATUS_INVALID_PARAMETER_1); @@ -60,7 +57,7 @@ DPRINT1("LdrUnlockLoaderLock() called with an invalid cookie!\n"); /* Invalid cookie, check how to fail */ - if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS) + if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* The caller wants us to raise status */ RtlRaiseStatus(STATUS_INVALID_PARAMETER_2); @@ -73,7 +70,7 @@ } /* Ready to release the lock */ - if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS) + if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* Do a direct leave */ RtlLeaveCriticalSection(&LdrpLoaderLock); @@ -118,11 +115,11 @@ if (Cookie) *Cookie = 0; /* Validate the flags */ - if (Flags & ~(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS | + if (Flags & ~(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS | LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY)) { /* Flags are invalid, check how to fail */ - if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS) + if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* The caller wants us to raise status */ RtlRaiseStatus(STATUS_INVALID_PARAMETER_1); @@ -136,7 +133,7 @@ if (!Cookie) { /* No cookie check how to fail */ - if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS) + if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* The caller wants us to raise status */ RtlRaiseStatus(STATUS_INVALID_PARAMETER_3); @@ -150,7 +147,7 @@ if ((Flags & LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY) && !(Result)) { /* No pointer to return the data to */ - if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS) + if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* The caller wants us to raise status */ RtlRaiseStatus(STATUS_INVALID_PARAMETER_2); @@ -164,7 +161,7 @@ if (InInit) return STATUS_SUCCESS; /* Check what locking semantic to use */ - if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS) + if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS) { /* Check if we should enter or simply try */ if (Flags & LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY) @@ -173,13 +170,13 @@ if (!RtlTryEnterCriticalSection(&LdrpLoaderLock)) { /* It's locked */ - *Result = LDR_LOCK_HELD; + *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_NOT_ACQUIRED; goto Quickie; } else { /* It worked */ - *Result = LDR_LOCK_FREE; + *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED; } } else @@ -188,7 +185,7 @@ RtlEnterCriticalSection(&LdrpLoaderLock); /* See if result was requested */ - if (Result) *Result = LDR_LOCK_FREE; + if (Result) *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED; } /* Increase the acquisition count */ @@ -209,13 +206,13 @@ if (!RtlTryEnterCriticalSection(&LdrpLoaderLock)) { /* It's locked */ - *Result = LDR_LOCK_HELD; + *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_NOT_ACQUIRED; _SEH2_YIELD(return STATUS_SUCCESS); } else { /* It worked */ - *Result = LDR_LOCK_FREE; + *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED; } } else @@ -224,7 +221,7 @@ RtlEnterCriticalSection(&LdrpLoaderLock); /* See if result was requested */ - if (Result) *Result = LDR_LOCK_FREE; + if (Result) *Result = LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED; } /* Increase the acquisition count */ Modified: trunk/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ld… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/ldr.c [iso-8859-1] Mon Apr 4 19:35:24 2011 @@ -22,7 +22,7 @@ extern BOOLEAN InWindows; extern WaitForInputIdleType lpfnGlobalRegisterWaitForInputIdle; -#define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_FAIL 1 +#define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_ERROR 1 #define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS 2 #define BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_CONTINUE 3 @@ -47,14 +47,14 @@ ) { BaseSetLastNTError(STATUS_INVALID_PARAMETER_1); - return BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_FAIL; + return BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_ERROR; } /* Check 2nd parameter */ if (!phModule) { BaseSetLastNTError(STATUS_INVALID_PARAMETER_2); - return BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_FAIL; + return BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_ERROR; } /* Return what we have according to the module name */ @@ -578,7 +578,7 @@ Peb = NtCurrentPeb (); /* Acquire a loader lock */ - LdrLockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS, NULL, &Cookie); + LdrLockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, NULL, &Cookie); /* Traverse the module list */ ModuleListHead = &Peb->Ldr->InLoadOrderModuleList; @@ -615,7 +615,7 @@ } _SEH2_END /* Release the loader lock */ - LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS, Cookie); + LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie); return Length / sizeof(WCHAR); } @@ -709,7 +709,8 @@ hModule = GetModuleHandleForUnicodeString(&ModuleNameU); if (!hModule) { - // FIXME: Status?! + /* Last error is already set, so just return failure by setting status */ + Status = STATUS_DLL_NOT_FOUND; goto quickie; } } @@ -737,6 +738,10 @@ hModule); } + /* Set last error in case of failure */ + if (!NT_SUCCESS(Status)) + SetLastErrorByStatus(Status); + quickie: /* Unlock loader lock if it was acquired */ if (!NoLock) @@ -744,10 +749,6 @@ Status2 = LdrUnlockLoaderLock(0, Cookie); ASSERT(NT_SUCCESS(Status2)); } - - /* Set last error in case of failure */ - if (!NT_SUCCESS(Status)) - SetLastErrorByStatus(Status); /* Set the module handle to the caller */ if (phModule) *phModule = hModule; @@ -827,7 +828,7 @@ dwValid = BasepGetModuleHandleExParameterValidation(dwFlags, lpwModuleName, phModule); /* If result is invalid parameter - return failure */ - if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_FAIL) return FALSE; + if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_ERROR) return FALSE; /* If result is 2, there is no need to do anything - return success. */ if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS) return TRUE; @@ -855,13 +856,14 @@ { PUNICODE_STRING lpModuleNameW; DWORD dwValid; - BOOL Ret; + BOOL Ret = FALSE; + NTSTATUS Status; /* Validate parameters */ dwValid = BasepGetModuleHandleExParameterValidation(dwFlags, (LPCWSTR)lpModuleName, phModule); /* If result is invalid parameter - return failure */ - if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_FAIL) return FALSE; + if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_ERROR) return FALSE; /* If result is 2, there is no need to do anything - return success. */ if (dwValid == BASEP_GET_MODULE_HANDLE_EX_PARAMETER_VALIDATION_SUCCESS) return TRUE; @@ -869,10 +871,11 @@ /* Check if we don't need to convert the name */ if (dwFlags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) { - /* Call the W version of the API without conversion */ - Ret = GetModuleHandleExW(dwFlags, - (LPCWSTR)lpModuleName, - phModule); + /* Call the extended version of the API without conversion */ + Status = BasepGetModuleHandleExW(FALSE, + dwFlags, + (LPCWSTR)lpModuleName, + phModule); } else { @@ -882,11 +885,16 @@ /* Return FALSE if conversion failed */ if (!lpModuleNameW) return FALSE; - /* Call the W version of the API */ - Ret = GetModuleHandleExW(dwFlags, - lpModuleNameW->Buffer, - phModule); - } + /* Call the extended version of the API */ + Status = BasepGetModuleHandleExW(FALSE, + dwFlags, + lpModuleNameW->Buffer, + phModule); + } + + /* If result was successful - return true */ + if (NT_SUCCESS(Status)) + Ret = TRUE; /* Return result */ return Ret; Modified: trunk/reactos/include/ndk/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Mon Apr 4 19:35:24 2011 @@ -71,8 +71,12 @@ // // LdrLockLoaderLock Flags // -#define LDR_LOCK_LOADER_LOCK_FLAG_RAISE_STATUS 0x00000001 -#define LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY 0x00000002 +#define LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS 0x00000001 +#define LDR_LOCK_LOADER_LOCK_FLAG_TRY_ONLY 0x00000002 + +#define LDR_LOCK_LOADER_LOCK_DISPOSITION_INVALID 0 +#define LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED 1 +#define LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_NOT_ACQUIRED 2 // // FIXME: THIS SHOULD *NOT* BE USED!

13 years, 8 months

← Newer
1
...
23
24
25
26
27
28
29
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2011