Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 65899: [USETUP] Change the partition creation workflow, so that the user is forced to choose a file system type and format a partition after it has been created.
by ekohl＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: ekohl Date: Mon Dec 29 21:23:30 2014 New Revision: 65899 URL: http://svn.reactos.org/svn/reactos?rev=65899&view=rev Log: [USETUP] Change the partition creation workflow, so that the user is forced to choose a file system type and format a partition after it has been created. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon Dec 29 21:23:30 2014 @@ -1618,7 +1618,7 @@ DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; - return SELECT_FILE_SYSTEM_PAGE; + return INSTALL_DIRECTORY_PAGE; } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'P') /* P */ { @@ -1969,7 +1969,7 @@ return QUIT_PAGE; } - return SELECT_PARTITION_PAGE; + return SELECT_FILE_SYSTEM_PAGE; } } @@ -2279,7 +2279,7 @@ return QUIT_PAGE; } - return SELECT_PARTITION_PAGE; + return SELECT_FILE_SYSTEM_PAGE; } } @@ -2868,7 +2868,11 @@ DestroyFileSystemList(FileSystemList); FileSystemList = NULL; - return INSTALL_DIRECTORY_PAGE; + + if (IsUnattendedSetup) + return INSTALL_DIRECTORY_PAGE; + else + return SELECT_PARTITION_PAGE; } } Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Mon Dec 29 21:23:30 2014 @@ -2426,6 +2426,8 @@ PartEntry->StartSector.QuadPart = NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart; PartEntry->SectorCount.QuadPart -= (PartEntry->StartSector.QuadPart - NewPartEntry->StartSector.QuadPart); + + List->CurrentPartition = NewPartEntry; } UpdateDiskLayout(DiskEntry); @@ -2568,6 +2570,8 @@ DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart); DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1); DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart); + + List->CurrentPartition = NewPartEntry; } AddLogicalDiskSpace(DiskEntry);

1 0

[pschweitzer] 65898: [RAMDISK] Wait for 1 min max but don't limit the number of acquire, ie: swap inverted args. This fixes ASSERT on use. Spotted by Hervé
by pschweitzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: pschweitzer Date: Mon Dec 29 21:22:49 2014 New Revision: 65898 URL: http://svn.reactos.org/svn/reactos?rev=65898&view=rev Log: [RAMDISK] Wait for 1 min max but don't limit the number of acquire, ie: swap inverted args. This fixes ASSERT on use. Spotted by Hervé Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Mon Dec 29 21:22:49 2014 @@ -623,8 +623,8 @@ ExInitializeFastMutex(&DriveExtension->DiskListLock); IoInitializeRemoveLock(&DriveExtension->RemoveLock, 'dmaR', - 0, - 1); + 1, + 0); DriveExtension->DriveDeviceName = DeviceName; DriveExtension->SymbolicLinkName = SymbolicLinkName; DriveExtension->GuidString = GuidString; @@ -2645,8 +2645,8 @@ ExInitializeFastMutex(&DeviceExtension->DiskListLock); IoInitializeRemoveLock(&DeviceExtension->RemoveLock, 'dmaR', - 0, - 1); + 1, + 0); InitializeListHead(&DeviceExtension->DiskList); DeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; DeviceExtension->DeviceObject = DeviceObject;

1 0

[hbelusca] 65897: [RAPPS] Finish Japanese translation, fix by Ai Asano and reported by Marco Maria Emanuele Bartucci. CORE-8983 #resolve #comment Fixed, thanks!
by hbelusca＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: hbelusca Date: Mon Dec 29 21:12:06 2014 New Revision: 65897 URL: http://svn.reactos.org/svn/reactos?rev=65897&view=rev Log: [RAPPS] Finish Japanese translation, fix by Ai Asano and reported by Marco Maria Emanuele Bartucci. CORE-8983 #resolve #comment Fixed, thanks! Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Mon Dec 29 21:12:06 2014 @@ -18,7 +18,7 @@ MENUITEM SEPARATOR MENUITEM "æ´æ°(&R)", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Update Da&tabase", ID_RESETDB + MENUITEM "ã¢ãããã¼ã ãã¼ã¿ãã¼ã¹(&T)", ID_RESETDB END POPUP "ãã«ã" BEGIN @@ -48,7 +48,7 @@ MENUITEM SEPARATOR MENUITEM "æ´æ°(&R)", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Update Da&tabase", ID_RESETDB + MENUITEM "ã¢ãããã¼ã ãã¼ã¿ãã¼ã¹(&T)", ID_RESETDB END END

1 0

[pschweitzer] 65896: [RAMDISK] Define the GUID_BUS_TYPE_RAMDISK GUID
by pschweitzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: pschweitzer Date: Mon Dec 29 20:41:15 2014 New Revision: 65896 URL: http://svn.reactos.org/svn/reactos?rev=65896&view=rev Log: [RAMDISK] Define the GUID_BUS_TYPE_RAMDISK GUID Modified: trunk/reactos/include/reactos/drivers/ntddrdsk.h Modified: trunk/reactos/include/reactos/drivers/ntddrdsk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/nt… ============================================================================== --- trunk/reactos/include/reactos/drivers/ntddrdsk.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/ntddrdsk.h [iso-8859-1] Mon Dec 29 20:41:15 2014 @@ -20,6 +20,11 @@ // This guid identifies a RAM disk volume // DEFINE_GUID(RAMDISK_BOOTDISK_GUID, 0xd9b257fc, 0x684e, 0x4dcb, 0x79, 0xab, 0xf6, 0xa2, 0xcf, 0x03, 0x50, 0xb7); + +// +// This guid identifies a RAM disk bus +// +DEFINE_GUID(GUID_BUS_TYPE_RAMDISK, 0x9d6d66a6, 0x0b0c, 0x4563, 0x90, 0x77, 0xa0, 0xe9, 0xa7, 0x95, 0x5a, 0xe4); // // Device Name - this string is the name of the device. It is the name

1 0

[pschweitzer] 65895: [RAMDISK] Implement RamdiskQueryId() which is used in case of IRP_MJ_PNP + IRP_MN_QUERY_ID
by pschweitzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: pschweitzer Date: Mon Dec 29 18:00:50 2014 New Revision: 65895 URL: http://svn.reactos.org/svn/reactos?rev=65895&view=rev Log: [RAMDISK] Implement RamdiskQueryId() which is used in case of IRP_MJ_PNP + IRP_MN_QUERY_ID Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Mon Dec 29 18:00:50 2014 @@ -2024,6 +2024,131 @@ NTSTATUS NTAPI +RamdiskQueryId(IN PRAMDISK_DRIVE_EXTENSION DriveExtension, + IN PIRP Irp) +{ + NTSTATUS Status; + PIO_STACK_LOCATION IoStackLocation; + PWSTR OutputString = NULL; + ULONG StringLength; + + Status = STATUS_SUCCESS; + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + // + // Get what is being queried + // + switch (IoStackLocation->Parameters.QueryId.IdType) + { + case BusQueryDeviceID: + + // + // Allocate a buffer long enough to receive Ramdisk\RamDisk in any case + // In case we don't have RAMDISK_REGISTRY_DISK, we then need two more + // chars to store Ramdisk\RamVolume instead + // + StringLength = 4 * (DriveExtension->DiskType != RAMDISK_REGISTRY_DISK) + sizeof(L"Ramdisk\\RamDisk"); + OutputString = ExAllocatePoolWithTag(PagedPool, StringLength, 'dmaR'); + if (OutputString == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + wcsncpy(OutputString, L"Ramdisk\\", StringLength / sizeof(WCHAR)); + if (DriveExtension->DiskType != RAMDISK_REGISTRY_DISK) + { + wcsncat(OutputString, L"RamVolume", StringLength / sizeof(WCHAR)); + } + else + { + wcsncat(OutputString, L"RamDisk", StringLength / sizeof(WCHAR)); + } + + break; + + case BusQueryHardwareIDs: + + // + // Allocate a buffer long enough to receive Ramdisk\RamDisk in any case + // In case we don't have RAMDISK_REGISTRY_DISK, we then need two more + // chars to store Ramdisk\RamVolume instead + // We also need an extra char, because it is required that the string + // is null-terminated twice + // + StringLength = 4 * (DriveExtension->DiskType != RAMDISK_REGISTRY_DISK) + + sizeof(UNICODE_NULL) + sizeof(L"Ramdisk\\RamDisk"); + OutputString = ExAllocatePoolWithTag(PagedPool, StringLength, 'dmaR'); + if (OutputString == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + wcsncpy(OutputString, L"Ramdisk\\", StringLength / sizeof(WCHAR)); + if (DriveExtension->DiskType != RAMDISK_REGISTRY_DISK) + { + wcsncat(OutputString, L"RamVolume", StringLength / sizeof(WCHAR)); + } + else + { + wcsncat(OutputString, L"RamDisk", StringLength / sizeof(WCHAR)); + } + OutputString[(StringLength / sizeof(WCHAR)) - 1] = UNICODE_NULL; + + break; + + case BusQueryCompatibleIDs: + + if (DriveExtension->DiskType != RAMDISK_REGISTRY_DISK) + { + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + StringLength = sizeof(L"GenDisk"); + OutputString = ExAllocatePoolWithTag(PagedPool, StringLength, 'dmaR'); + if (OutputString == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + wcsncpy(OutputString, L"GenDisk", StringLength / sizeof(WCHAR)); + OutputString[(StringLength / sizeof(WCHAR)) - 1] = UNICODE_NULL; + + break; + + case BusQueryInstanceID: + + OutputString = ExAllocatePoolWithTag(PagedPool, DriveExtension->GuidString.MaximumLength, 'dmaR'); + if (OutputString == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + wcsncpy(OutputString, DriveExtension->GuidString.Buffer, DriveExtension->GuidString.MaximumLength / sizeof(WCHAR)); + + break; + + case BusQueryDeviceSerialNumber: + + // + // Nothing to do + // + + break; + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = (ULONG_PTR)OutputString; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS +NTAPI RamdiskPnp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -2150,7 +2275,7 @@ // if (DeviceExtension->Type == RamdiskDrive) { - UNIMPLEMENTED_DBGBREAK("PnP IRP: %lx\n", Minor); + Status = RamdiskQueryId((PRAMDISK_DRIVE_EXTENSION)DeviceExtension, Irp); } break;

1 0

[aandrejevic] 65894: [WHOAMI] Use ANSI when printing to the console. Fix the logic of LookupPrivilegeDisplayNameW. Patch by Ismael Ferreras Morezuelas. CORE-8965 #resolve #comment Committed in revi...
by aandrejevic＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: aandrejevic Date: Mon Dec 29 16:20:00 2014 New Revision: 65894 URL: http://svn.reactos.org/svn/reactos?rev=65894&view=rev Log: [WHOAMI] Use ANSI when printing to the console. Fix the logic of LookupPrivilegeDisplayNameW. Patch by Ismael Ferreras Morezuelas. CORE-8965 #resolve #comment Committed in revision r65894. Thanks! Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc trunk/reactos/base/applications/cmdutils/whoami/lang/fr-FR.rc trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/whoami/whoami.c Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc [iso-8859-1] Mon Dec 29 16:20:00 2014 @@ -38,19 +38,19 @@ IDS_ERROR_INVALIDARG "FEHLER: Argument/Option ungültig - '%s'.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" IDS_ERROR_NH_LIST "FEHLER: Option /NH kann nicht mit Format LIST verwendet werden.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n" IDS_HELP "BESCHREIBUNG:\n\ - Ermittelt Benutzername, Gruppen und Berechtigungen für den aktuellen Benutzer auf dem lokalen System.\n\ - Ohne Parameterangabe werden die aktuelle Domäne und Benutzername angezeigt.\n\ + Ermittelt Benutzername, Gruppen und Berechtigungen für den aktuellen Benutzer auf dem lokalen System.\n\ + Ohne Parameterangabe werden die aktuelle Domäne und Benutzername angezeigt.\n\ \n\ - Gültige Ausgabeformate für den '/fo' Parameter sind 'CSV', 'LIST' und 'TABLE'.\n\ - '/nh' legt fest, dass der Spaltenheader nicht in der Ausgabe angezeigt wird. Standardmäßig werden diese in einer TABLE angezeigt.\n\ + Gültige Ausgabeformate für den '/fo' Parameter sind 'CSV', 'LIST' und 'TABLE'.\n\ + '/nh' legt fest, dass der Spaltenheader nicht in der Ausgabe angezeigt wird. Standardmäßig werden diese in einer TABLE angezeigt.\n\ \n\ SYNTAX:\n\ - whoami [/upn | /fqdn | /logonid] \n\ - whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\ - whoami /all [/fo <Format>] [/nh] \n\ + whoami [/upn | /fqdn | /logonid] \n\ + whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\ + whoami /all [/fo <Format>] [/nh] \n\ \n\ BEISPIELE: \n\ - whoami /groups /priv /nh /fo csv \n\ - whoami /logonid \n\ - whoami \n" + whoami /groups /priv /nh /fo csv \n\ + whoami /logonid \n\ + whoami \n" END Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc [iso-8859-1] Mon Dec 29 16:20:00 2014 @@ -38,19 +38,19 @@ IDS_ERROR_INVALIDARG "ERROR: Invalid argument/option - '%s'.\nType ""WHOAMI /?"" for usage.\n" IDS_ERROR_NH_LIST "ERROR: /NH switch cannot be used with the LIST format.\nType ""WHOAMI /?"" for usage.\n" IDS_HELP "DESCRIPTION:\n\ - Display user, group and privileges information for the local logged-on user.\n\ - If no arguments are provided, displays the current domain and user name.\n\ + Display user, group and privileges information for the local logged-on user.\n\ + If no arguments are provided, displays the current domain and user name.\n\ \n\ - Available output formats for the '/fo' option are 'csv', 'list' and 'table'.\n\ - Use '/nh' to hide headers. By default the data is displayed in a table.\n\ + Available output formats for the '/fo' option are 'csv', 'list' and 'table'.\n\ + Use '/nh' to hide headers. By default the data is displayed in a table.\n\ \n\ SYNTAX:\n\ - whoami [/upn | /fqdn | /logonid] \n\ - whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\ - whoami /all [/fo <Format>] [/nh] \n\ + whoami [/upn | /fqdn | /logonid] \n\ + whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\ + whoami /all [/fo <Format>] [/nh] \n\ \n\ EXAMPLES: \n\ - whoami /groups /priv /nh /fo csv \n\ - whoami /logonid \n\ - whoami \n" + whoami /groups /priv /nh /fo csv \n\ + whoami /logonid \n\ + whoami \n" END Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc [iso-8859-1] Mon Dec 29 16:20:00 2014 @@ -39,20 +39,20 @@ IDS_ERROR_INVALIDARG "ERROR: Argumento u opciÃ³n no vÃ¡lido - ""%s"".\nEscriba ""WHOAMI /?"" para su uso.\n" IDS_ERROR_NH_LIST "ERROR: no se puede usar el modificador /NH con el formato LIST.\nEscriba ""WHOAMI /?"" para obtener detalles de uso.\n" IDS_HELP "DESCRIPCIÃN:\n\ - Muestra informaciÃ³n sobre el usuario local, sus privilegios y grupos.\n\ - Si no se aÃ±aden argumentos se mostrarÃ¡ el usuario y dominio actual.\n\ + Muestra informaciÃ³n sobre el usuario local, sus privilegios y grupos.\n\ + Si no se aÃ±aden argumentos se mostrarÃ¡ el usuario y dominio actual.\n\ \n\ - Los formatos disponibles para '/fo' son 'csv', 'list' y 'table'.\n\ - Por defecto los datos se muestran en una tabla (opciÃ³n 'table').\n\ - Puedes utilizar '/nh' para ocultar los encabezados. \n\ + Los formatos disponibles para '/fo' son 'csv', 'list' y 'table'.\n\ + Por defecto los datos se muestran en una tabla (opciÃ³n 'table').\n\ + Puedes utilizar '/nh' para ocultar los encabezados. \n\ \n\ SINTAXIS:\n\ - whoami [/upn | /fqdn | /logonid] \n\ - whoami {[/user] [/groups] [/priv]} [/fo <Formato>] [/nh] \n\ - whoami /all [/fo <Formato>] [/nh] \n\ + whoami [/upn | /fqdn | /logonid] \n\ + whoami {[/user] [/groups] [/priv]} [/fo <Formato>] [/nh] \n\ + whoami /all [/fo <Formato>] [/nh] \n\ \n\ EJEMPLOS: \n\ - whoami /groups /priv /nh /fo csv \n\ - whoami /logonid \n\ - whoami \n" + whoami /groups /priv /nh /fo csv \n\ + whoami /logonid \n\ + whoami \n" END Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/fr-FR.rc [iso-8859-1] Mon Dec 29 16:20:00 2014 @@ -38,19 +38,19 @@ IDS_ERROR_INVALIDARG "Erreur : Argument/option non valide - '%s'.\nTapez ""WHOAMI /?"" pour l'aide.\n" IDS_ERROR_NH_LIST "Erreur : l'argument /NH ne peut pas Ãªtre utilisÃ© avec le format LIST.\nTapez ""WHOAMI /?"" pour l'aide.\n" IDS_HELP "DESCRIPTION:\n\ - Affiche les informations sur l'utilisateur, les groupes et les privilÃ¨ges pour l'utilisateur actuellement connectÃ©.\n\ - Si aucun argument n'est fourni, affiche le domaine et le nom d'utilisateur en cours d'usage.\n\ + Affiche les informations sur l'utilisateur, les groupes et les privilÃ¨ges pour l'utilisateur actuellement connectÃ©.\n\ + Si aucun argument n'est fourni, affiche le domaine et le nom d'utilisateur en cours d'usage.\n\ \n\ - Les formats de sortie disponibles pour l'option '/fo' sont 'csv', 'list' et 'table'.\n\ - Utilisez '/nh' pour cacher les entÃªtes. Par dÃ©faut, les donnÃ©es sont affichÃ©es dans un tableau.\n\ + Les formats de sortie disponibles pour l'option '/fo' sont 'csv', 'list' et 'table'.\n\ + Utilisez '/nh' pour cacher les entÃªtes. Par dÃ©faut, les donnÃ©es sont affichÃ©es dans un tableau.\n\ \n\ SYNTAX:\n\ - whoami [/upn | /fqdn | /logonid] \n\ - whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\ - whoami /all [/fo <Format>] [/nh] \n\ + whoami [/upn | /fqdn | /logonid] \n\ + whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\ + whoami /all [/fo <Format>] [/nh] \n\ \n\ EXAMPLES: \n\ - whoami /groups /priv /nh /fo csv \n\ - whoami /logonid \n\ - whoami \n" + whoami /groups /priv /nh /fo csv \n\ + whoami /logonid \n\ + whoami \n" END Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/ru-RU.rc [iso-8859-1] Mon Dec 29 16:20:00 2014 @@ -40,19 +40,19 @@ IDS_ERROR_INVALIDARG "ÐÐ¨ÐÐÐÐ: ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ Ð¸Ð»Ð¸ Ð°ÑÐ³ÑÐ¼ÐµÐ½Ñ - '%s'.\nÐÐ²ÐµÐ´Ð¸ÑÐµ ""WHOAMI /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n" IDS_ERROR_NH_LIST "ÐÐ¨ÐÐÐÐ: ÐÐ°ÑÐ°Ð¼ÐµÑÑ /NH Ð½ÐµÐ»ÑÐ·Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ñ ÑÐ¾ÑÐ¼Ð°ÑÐ¾Ð¼ LIST.\nÐÐ²ÐµÐ´Ð¸ÑÐµ ""WHOAMI /?"" Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð¿Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ.\n" IDS_HELP "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:\n\ - ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾Ð± Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ðµ, Ð³ÑÑÐ¿Ð¿Ðµ Ð¸ Ð¿ÑÐ¸Ð²Ð¸Ð»ÐµÐ³Ð¸ÑÑ Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾ Ð²Ð¾ÑÐµÐ´ÑÐ¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹.\n\ - ÐÑÐ»Ð¸ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Ð°ÑÐ³ÑÐ¼ÐµÐ½ÑÐ¾Ð², ÑÐ¾ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ ÑÐµÐºÑÑÐ¸Ð¹ Ð´Ð¾Ð¼ÐµÐ½ Ð¸ ÑÐµÐºÑÑÐµÐ³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ (Ð´Ð¾Ð¼ÐµÐ½/Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ).\n\ + ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾Ð± Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ðµ, Ð³ÑÑÐ¿Ð¿Ðµ Ð¸ Ð¿ÑÐ¸Ð²Ð¸Ð»ÐµÐ³Ð¸ÑÑ Ð´Ð»Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾ Ð²Ð¾ÑÐµÐ´ÑÐ¸Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹.\n\ + ÐÑÐ»Ð¸ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð¾ Ð°ÑÐ³ÑÐ¼ÐµÐ½ÑÐ¾Ð², ÑÐ¾ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑ ÑÐµÐºÑÑÐ¸Ð¹ Ð´Ð¾Ð¼ÐµÐ½ Ð¸ ÑÐµÐºÑÑÐµÐ³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ (Ð´Ð¾Ð¼ÐµÐ½/Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ).\n\ \n\ - ÐÐ¾ÑÑÑÐ¿Ð½ÑÐµ ÑÐ¾ÑÐ¼Ð°ÑÑ Ð´Ð»Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° '/fo' - 'csv', 'list' Ð¸ 'table'.\n\ - ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ '/nh' ÑÑÐ¾Ð±Ñ ÑÐºÑÑÑÑ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸. ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ Ð´Ð°Ð½Ð½ÑÐµ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑÑÑ Ð² ÑÐ°Ð±Ð»Ð¸ÑÐµ.\n\ + ÐÐ¾ÑÑÑÐ¿Ð½ÑÐµ ÑÐ¾ÑÐ¼Ð°ÑÑ Ð´Ð»Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° '/fo' - 'csv', 'list' Ð¸ 'table'.\n\ + ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ '/nh' ÑÑÐ¾Ð±Ñ ÑÐºÑÑÑÑ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸. ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ Ð´Ð°Ð½Ð½ÑÐµ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑÑÑ Ð² ÑÐ°Ð±Ð»Ð¸ÑÐµ.\n\ \n\ Ð¡Ð¸Ð½ÑÐ°ÐºÑÐ¸Ñ:\n\ - whoami [/upn | /fqdn | /logonid] \n\ - whoami {[/user] [/groups] [/priv]} [/fo <ÑÐ¾ÑÐ¼Ð°Ñ>] [/nh] \n\ - whoami /all [/fo <ÑÐ¾ÑÐ¼Ð°Ñ>] [/nh] \n\ + whoami [/upn | /fqdn | /logonid] \n\ + whoami {[/user] [/groups] [/priv]} [/fo <ÑÐ¾ÑÐ¼Ð°Ñ>] [/nh] \n\ + whoami /all [/fo <ÑÐ¾ÑÐ¼Ð°Ñ>] [/nh] \n\ \n\ ÐÑÐ¸Ð¼ÐµÑÑ:\n\ - whoami /groups /priv /nh /fo csv \n\ - whoami /logonid \n\ - whoami \n" + whoami /groups /priv /nh /fo csv \n\ + whoami /logonid \n\ + whoami \n" END Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/whoami.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/whoami.c [iso-8859-1] Mon Dec 29 16:20:00 2014 @@ -15,6 +15,61 @@ #include "resource.h" + +/* Unicode (W) to ANSI OEM wrapper function, as console and Unicode don't mix well, sigh */ +static void WhoamiOemConversion_printf(const WCHAR *lpSourceFormatW, ...) +{ + CHAR *lpBufferA = NULL; + WCHAR *lpBufferW = NULL; + + UINT Size; + va_list Args; + + /* first let's find out the final output'ed length of the wprintf routine */ + va_start(Args, lpSourceFormatW); + + Size = _vscwprintf(lpSourceFormatW, Args); + + va_end(Args); + + /* allocate a proportional memory chunk taking into account the char width */ + lpBufferW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (Size + 1) * sizeof(WCHAR)); + + if (!lpBufferW) + return; + + /* do wprintf to this newly allocated buffer of ours */ + va_start(Args, lpSourceFormatW); + + _vsnwprintf(lpBufferW, Size, lpSourceFormatW, Args); + + va_end(Args); + + /* allocate a similarly sized buffer for the ANSI/OEM version of our string */ + lpBufferA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (Size + 1) * sizeof(CHAR)); + + if (!lpBufferA) + { + HeapFree(GetProcessHeap(), 0, lpBufferW); + return; + } + + /* convert our Unicode/Wide char string into a proper ANSI/OEM + string that our console may understand, at least in theory */ + CharToOemBuffW(lpBufferW, + lpBufferA, + Size); + + /* print the converted OEM string into the console's output and call it a day */ + printf("%s", lpBufferA); + + /* clean everything up */ + HeapFree(GetProcessHeap(), 0, lpBufferW); + HeapFree(GetProcessHeap(), 0, lpBufferA); +} + +#define wprintf WhoamiOemConversion_printf + BOOL NoHeader = FALSE; UINT NoHeaderArgCount = 0; UINT PrintFormatArgCount = 0; @@ -139,7 +194,8 @@ while (Length--) wprintf(L"-"); - _putws(L"\n"); + /* _putws seems to be broken in ReactOS' CRT ??? */ + wprintf(L"\n\n"); } typedef struct @@ -620,21 +676,27 @@ WhoamiSetTableDyn(PrivTable, PrivName, dwIndex + 1, 0); - ret = LookupPrivilegeDisplayNameW(NULL, PrivName, NULL, &DispNameSize, &dwResult); - - if (!ret || GetLastError() == ERROR_NO_SUCH_PRIVILEGE) - { - DispName = HeapAlloc(GetProcessHeap(), 0, ++DispNameSize * sizeof(WCHAR)); - - LookupPrivilegeDisplayNameW(NULL, PrivName, DispName, &DispNameSize, &dwResult); - - //wprintf(L"DispName: %d %x '%s'\n", DispNameSize, GetLastError(), DispName); - + + /* try to grab the size of the string, also, beware, as this call is + unimplemented in ReactOS/Wine at the moment */ + + LookupPrivilegeDisplayNameW(NULL, PrivName, NULL, &DispNameSize, &dwResult); + + DispName = HeapAlloc(GetProcessHeap(), 0, ++DispNameSize * sizeof(WCHAR)); + + ret = LookupPrivilegeDisplayNameW(NULL, PrivName, DispName, &DispNameSize, &dwResult); + + if (ret && DispName) + { + // wprintf(L"DispName: %d %x '%s'\n", DispNameSize, GetLastError(), DispName); WhoamiSetTableDyn(PrivTable, DispName, dwIndex + 1, 1); } else { WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_UNKNOWN_DESCRIPTION), dwIndex + 1, 1); + + if (DispName != NULL) + WhoamiFree(DispName); } if (pPrivInfo->Privileges[dwIndex].Attributes & SE_PRIVILEGE_ENABLED)

1 0

[tkreuzer] 65893: [GDI32] Import metafile code from wine. The wine code is unmodified (please keep it that way) and used through a wrapper function dispatcher and some helpers. Fixes 1931 wine tests.
by tkreuzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: tkreuzer Date: Mon Dec 29 14:25:30 2014 New Revision: 65893 URL: http://svn.reactos.org/svn/reactos?rev=65893&view=rev Log: [GDI32] Import metafile code from wine. The wine code is unmodified (please keep it that way) and used through a wrapper function dispatcher and some helpers. Fixes 1931 wine tests. Added: trunk/reactos/win32ss/gdi/gdi32/include/wine/ (with props) trunk/reactos/win32ss/gdi/gdi32/include/wine/gdi_driver.h (with props) trunk/reactos/win32ss/gdi/gdi32/wine/ (with props) trunk/reactos/win32ss/gdi/gdi32/wine/CMakeLists.txt (with props) trunk/reactos/win32ss/gdi/gdi32/wine/enhmetafile.c (with props) trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/ (with props) trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/bitblt.c (with props) trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/dc.c (with props) trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/enhmetafiledrv.h (with props) trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/graphics.c (with props) trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/init.c (with props) trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/objects.c (with props) trunk/reactos/win32ss/gdi/gdi32/wine/gdi_private.h (with props) trunk/reactos/win32ss/gdi/gdi32/wine/metafile.c (with props) trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/ (with props) trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/bitblt.c (with props) trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/dc.c (with props) trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/graphics.c (with props) trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/init.c (with props) trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/metafiledrv.h (with props) trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/objects.c (with props) trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/text.c (with props) trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c (with props) Modified: trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h trunk/reactos/win32ss/gdi/gdi32/misc/misc.c trunk/reactos/win32ss/gdi/gdi32/objects/arc.c trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c trunk/reactos/win32ss/gdi/gdi32/objects/coord.c trunk/reactos/win32ss/gdi/gdi32/objects/dc.c trunk/reactos/win32ss/gdi/gdi32/objects/enhmfile.c trunk/reactos/win32ss/gdi/gdi32/objects/gdiobj.c trunk/reactos/win32ss/gdi/gdi32/objects/metafile.c trunk/reactos/win32ss/gdi/gdi32/objects/painting.c trunk/reactos/win32ss/gdi/gdi32/objects/palette.c trunk/reactos/win32ss/gdi/gdi32/objects/path.c trunk/reactos/win32ss/gdi/gdi32/objects/region.c trunk/reactos/win32ss/gdi/gdi32/objects/text.c trunk/reactos/win32ss/include/ntgdihdl.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/CMakeLis… Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… Added: trunk/reactos/win32ss/gdi/gdi32/include/wine/gdi_driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… Modified: trunk/reactos/win32ss/gdi/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/mis… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/enhmfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Modified: trunk/reactos/win32ss/gdi/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… Added: trunk/reactos/win32ss/gdi/gdi32/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/CMa… Added: trunk/reactos/win32ss/gdi/gdi32/wine/enhmetafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/enh… Added: trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/enh… Added: trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/enh… Added: trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/enhmetafiledrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/enh… Added: trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/enh… Added: trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/enh… Added: trunk/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/objects.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/enh… Added: trunk/reactos/win32ss/gdi/gdi32/wine/gdi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/gdi… Added: trunk/reactos/win32ss/gdi/gdi32/wine/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/met… Added: trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/mfd… Added: trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/mfd… Added: trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/mfd… Added: trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/mfd… Added: trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/metafiledrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/mfd… Added: trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/objects.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/mfd… Added: trunk/reactos/win32ss/gdi/gdi32/wine/mfdrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/mfd… Added: trunk/reactos/win32ss/gdi/gdi32/wine/rosglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/ros… Modified: trunk/reactos/win32ss/include/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntgdihdl.h…

1 0

[tkreuzer] 65892: [WIN32K] Simplify and fix calculation of biCompression in GreGetDIBitsInternal
by tkreuzer＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: tkreuzer Date: Mon Dec 29 14:16:16 2014 New Revision: 65892 URL: http://svn.reactos.org/svn/reactos?rev=65892&view=rev Log: [WIN32K] Simplify and fix calculation of biCompression in GreGetDIBitsInternal Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Mon Dec 29 14:16:16 2014 @@ -737,20 +737,9 @@ Info->bmiHeader.biSizeImage = DIB_GetDIBImageBytes( Info->bmiHeader.biWidth, Info->bmiHeader.biHeight, Info->bmiHeader.biBitCount); - if(psurf->hSecure) - { - switch(Info->bmiHeader.biBitCount) - { - case 16: - case 32: - Info->bmiHeader.biCompression = BI_BITFIELDS; - break; - default: - Info->bmiHeader.biCompression = BI_RGB; - break; - } - } - else if(Info->bmiHeader.biBitCount > 8) + + if ((Info->bmiHeader.biBitCount == 16) || + (Info->bmiHeader.biBitCount == 32)) { Info->bmiHeader.biCompression = BI_BITFIELDS; }

1 0

[hbelusca] 65891: [WIN32K] - Add global user heap (un)map helper functions that will be used in other portions of code. - For consistency purpose also add the note about the mapping in desktop.c (s...
by hbelusca＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: hbelusca Date: Mon Dec 29 13:56:28 2014 New Revision: 65891 URL: http://svn.reactos.org/svn/reactos?rev=65891&view=rev Log: [WIN32K] - Add global user heap (un)map helper functions that will be used in other portions of code. - For consistency purpose also add the note about the mapping in desktop.c (see r65863 for what I mean). - Temporarily add many trace messages. Modified: trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/ntuser.c trunk/reactos/win32ss/user/ntuser/userfuncs.h trunk/reactos/win32ss/user/ntuser/usrheap.c trunk/reactos/win32ss/user/ntuser/usrheap.h trunk/reactos/win32ss/user/user32/misc/dllmain.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Mon Dec 29 13:56:28 2014 @@ -1849,9 +1849,13 @@ TRACE("IntUnmapDesktopView called for desktop object %p\n", pdesk); ppi = PsGetCurrentProcessWin32Process(); + + /* + * Unmap if we're the last thread using the desktop. + * Start the search at the next mapping: skip the first entry + * as it must be the global user heap mapping. + */ PrevLink = &ppi->HeapMappings.Next; - - /* Unmap if we're the last thread using the desktop */ HeapMapping = *PrevLink; while (HeapMapping != NULL) { Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Mon Dec 29 13:56:28 2014 @@ -15,8 +15,8 @@ HANDLE hModuleWin; -NTSTATUS DestroyProcessCallback(PEPROCESS Process); -NTSTATUS NTAPI DestroyThreadCallback(PETHREAD Thread); +NTSTATUS ExitProcessCallback(PEPROCESS Process); +NTSTATUS NTAPI ExitThreadCallback(PETHREAD Thread); // TODO: Should be moved to some GDI header NTSTATUS GdiProcessCreate(PEPROCESS Process); @@ -163,7 +163,7 @@ ppiCurrent->peProcess = Process; /* Setup process flags */ - ppiCurrent->W32PF_flags = W32PF_PROCESSCONNECTED; + ppiCurrent->W32PF_flags |= W32PF_PROCESSCONNECTED; if ( Process->Peb->ProcessParameters && Process->Peb->ProcessParameters->WindowFlags & STARTF_SCRNSAVER ) { @@ -172,7 +172,7 @@ } // FIXME: check if this process is allowed. - ppiCurrent->W32PF_flags |= W32PF_ALLOWFOREGROUNDACTIVATE; // Starting application it will get toggled off. + ppiCurrent->W32PF_flags |= W32PF_ALLOWFOREGROUNDACTIVATE; // Starting application will get it toggled off. return STATUS_SUCCESS; } @@ -228,13 +228,11 @@ } NTSTATUS -CreateProcessCallback(PEPROCESS Process) -{ +InitProcessCallback(PEPROCESS Process) +{ + NTSTATUS Status; PPROCESSINFO ppiCurrent; - NTSTATUS Status; - SIZE_T ViewSize = 0; - LARGE_INTEGER Offset; - PVOID UserBase = NULL; + PVOID KernelMapping = NULL, UserMapping = NULL; /* We might be called with an already allocated win32 process */ ppiCurrent = PsGetProcessWin32Process(Process); @@ -243,6 +241,8 @@ /* There is no more to do for us (this is a success code!) */ return STATUS_ALREADY_WIN32; } + // if (ppiCurrent->W32PF_flags & W32PF_PROCESSCONNECTED) + // return STATUS_ALREADY_WIN32; /* Allocate a new Win32 process info */ Status = AllocW32Process(Process, &ppiCurrent); @@ -260,27 +260,16 @@ #endif #endif - /* Map the global heap into the process */ - Offset.QuadPart = 0; - Status = MmMapViewOfSection(GlobalUserHeapSection, - PsGetCurrentProcess(), - &UserBase, - 0, - 0, - &Offset, - &ViewSize, - ViewUnmap, - SEC_NO_CHANGE, - PAGE_EXECUTE_READ); /* would prefer PAGE_READONLY, but thanks to RTL heaps... */ + /* Map the global user heap into the process */ + Status = MapGlobalUserHeap(Process, &KernelMapping, &UserMapping); if (!NT_SUCCESS(Status)) { TRACE_CH(UserProcess, "Failed to map the global heap! 0x%x\n", Status); goto error; } - ppiCurrent->HeapMappings.Next = NULL; - ppiCurrent->HeapMappings.KernelMapping = (PVOID)GlobalUserHeap; - ppiCurrent->HeapMappings.UserMapping = UserBase; - ppiCurrent->HeapMappings.Count = 1; + + TRACE_CH(UserProcess, "InitProcessCallback -- We have KernelMapping 0x%p and UserMapping 0x%p with delta = 0x%x\n", + KernelMapping, UserMapping, (ULONG_PTR)KernelMapping - (ULONG_PTR)UserMapping); /* Initialize USER process info */ Status = UserProcessCreate(Process); @@ -305,14 +294,14 @@ return STATUS_SUCCESS; error: - ERR_CH(UserProcess, "CreateProcessCallback failed! Freeing ppi 0x%p for PID:0x%lx\n", + ERR_CH(UserProcess, "InitProcessCallback failed! Freeing ppi 0x%p for PID:0x%lx\n", ppiCurrent, HandleToUlong(Process->UniqueProcessId)); - DestroyProcessCallback(Process); + ExitProcessCallback(Process); return Status; } NTSTATUS -DestroyProcessCallback(PEPROCESS Process) +ExitProcessCallback(PEPROCESS Process) { PPROCESSINFO ppiCurrent, *pppi; @@ -352,7 +341,7 @@ NTSTATUS APIENTRY Win32kProcessCallback(PEPROCESS Process, - BOOLEAN Create) + BOOLEAN Initialize) { NTSTATUS Status; @@ -362,13 +351,13 @@ UserEnterExclusive(); - if (Create) - { - Status = CreateProcessCallback(Process); + if (Initialize) + { + Status = InitProcessCallback(Process); } else { - Status = DestroyProcessCallback(Process); + Status = ExitProcessCallback(Process); } UserLeave(); @@ -462,7 +451,7 @@ } NTSTATUS NTAPI -CreateThreadCallback(PETHREAD Thread) +InitThreadCallback(PETHREAD Thread) { PEPROCESS Process; PCLIENTINFO pci; @@ -669,15 +658,15 @@ return STATUS_SUCCESS; error: - ERR_CH(UserThread, "CreateThreadCallback failed! Freeing pti 0x%p for TID:0x%lx\n", + ERR_CH(UserThread, "InitThreadCallback failed! Freeing pti 0x%p for TID:0x%lx\n", ptiCurrent, HandleToUlong(Thread->Cid.UniqueThread)); - DestroyThreadCallback(Thread); + ExitThreadCallback(Thread); return Status; } NTSTATUS NTAPI -DestroyThreadCallback(PETHREAD Thread) +ExitThreadCallback(PETHREAD Thread) { PTHREADINFO *ppti; PSINGLE_LIST_ENTRY psle; @@ -843,12 +832,12 @@ if (Type == PsW32ThreadCalloutInitialize) { ASSERT(PsGetThreadWin32Thread(Thread) == NULL); - Status = CreateThreadCallback(Thread); - } - else + Status = InitThreadCallback(Thread); + } + else // if (Type == PsW32ThreadCalloutExit) { ASSERT(PsGetThreadWin32Thread(Thread) != NULL); - Status = DestroyThreadCallback(Thread); + Status = ExitThreadCallback(Thread); } UserLeave(); Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Mon Dec 29 13:56:28 2014 @@ -123,7 +123,7 @@ // { /* Initialize the current thread */ - Status = CreateThreadCallback(PsGetCurrentThread()); + Status = InitThreadCallback(PsGetCurrentThread()); if (!NT_SUCCESS(Status)) return Status; // } Modified: trunk/reactos/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userfu… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] Mon Dec 29 13:56:28 2014 @@ -42,7 +42,7 @@ /*************** MAIN.C ***************/ -NTSTATUS NTAPI CreateThreadCallback(PETHREAD Thread); +NTSTATUS NTAPI InitThreadCallback(PETHREAD Thread); /*************** WINSTA.C ***************/ Modified: trunk/reactos/win32ss/user/ntuser/usrheap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/usrhea… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/usrheap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/usrheap.c [iso-8859-1] Mon Dec 29 13:56:28 2014 @@ -227,3 +227,111 @@ return pHeap; } + +NTSTATUS +UnmapGlobalUserHeap(IN PEPROCESS Process) +{ + NTSTATUS Status = STATUS_SUCCESS; + PPROCESSINFO W32Process; + PW32HEAP_USER_MAPPING HeapMapping; + + TRACE_CH(UserProcess, "IntUnmapDesktopView called for process 0x%p\n", Process); + + W32Process = PsGetProcessWin32Process(Process); + if (W32Process == NULL) + { + ERR_CH(UserProcess, "UnmapGlobalUserHeap - We don't have a Win32 process!\n"); + ASSERT(FALSE); + } + + /* The first mapping entry must be the global user heap */ + HeapMapping = &W32Process->HeapMappings; + ASSERT(HeapMapping->KernelMapping == (PVOID)GlobalUserHeap); + + /* Unmap if we're the last thread using the global user heap */ + if (--HeapMapping->Count == 0) + { + TRACE_CH(UserProcess, "UnmapGlobalUserHeap - Unmapping\n"); + Status = MmUnmapViewOfSection(Process, HeapMapping->UserMapping); + } + + return Status; +} + +NTSTATUS +MapGlobalUserHeap(IN PEPROCESS Process, + OUT PVOID* KernelMapping, + OUT PVOID* UserMapping) +{ + NTSTATUS Status; + PPROCESSINFO W32Process; + PW32HEAP_USER_MAPPING HeapMapping; + PVOID UserBase = NULL; + + SIZE_T ViewSize = 0; + LARGE_INTEGER Offset; + + TRACE_CH(UserProcess, "MapGlobalUserHeap called for process 0x%p\n", Process); + + W32Process = PsGetProcessWin32Process(Process); + if (W32Process == NULL) + { + ERR_CH(UserProcess, "MapGlobalUserHeap - We don't have a Win32 process!\n"); + ASSERT(FALSE); + } + + TRACE_CH(UserProcess, "MapGlobalUserHeap - We got a Win32 process, find for existing global user heap mapping...\n"); + + /* The first mapping entry must be the global user heap */ + HeapMapping = &W32Process->HeapMappings; + + /* Find out if another thread already mapped the global user heap */ + if (HeapMapping->KernelMapping == (PVOID)GlobalUserHeap) + { + HeapMapping->Count++; + + TRACE_CH(UserProcess, "MapGlobalUserHeap - A mapping was found, return it.\n"); + + *KernelMapping = HeapMapping->KernelMapping; + *UserMapping = HeapMapping->UserMapping; + + return STATUS_SUCCESS; + } + + TRACE_CH(UserProcess, "MapGlobalUserHeap - No mapping was found, let's map...\n"); + + /* We're the first, map the global heap into the process */ + Offset.QuadPart = 0; + Status = MmMapViewOfSection(GlobalUserHeapSection, + Process, + &UserBase, + 0, + 0, + &Offset, + &ViewSize, + ViewUnmap, + SEC_NO_CHANGE, + PAGE_EXECUTE_READ); /* Would prefer PAGE_READONLY, but thanks to RTL heaps... */ + if (!NT_SUCCESS(Status)) + { + ERR_CH(UserProcess, "MapGlobalUserHeap - Failed to map the global heap! 0x%x\n", Status); + return Status; + } + + TRACE_CH(UserProcess, "MapGlobalUserHeap -- Mapped kernel global heap 0x%p to user space at 0x%p\n", + GlobalUserHeap, UserBase); + + /* Add the mapping */ + HeapMapping->Next = NULL; + HeapMapping->KernelMapping = (PVOID)GlobalUserHeap; + HeapMapping->UserMapping = UserBase; + HeapMapping->Limit = ViewSize; + HeapMapping->Count = 1; + + *KernelMapping = HeapMapping->KernelMapping; + *UserMapping = HeapMapping->UserMapping; + + return STATUS_SUCCESS; +} + +/* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/usrheap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/usrhea… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/usrheap.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/usrheap.h [iso-8859-1] Mon Dec 29 13:56:28 2014 @@ -21,6 +21,14 @@ UserCreateHeap(OUT PVOID *SectionObject, IN OUT PVOID *SystemBase, IN SIZE_T HeapSize); + +NTSTATUS +UnmapGlobalUserHeap(IN PEPROCESS Process); + +NTSTATUS +MapGlobalUserHeap(IN PEPROCESS Process, + OUT PVOID* KernelMapping, + OUT PVOID* UserMapping); static __inline PVOID UserHeapAlloc(SIZE_T Bytes) Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Mon Dec 29 13:56:28 2014 @@ -216,7 +216,7 @@ { /* * Normally we are called by win32k so the win32 thread pointers - * should be valid as they are set in win32k::CreateThreadCallback. + * should be valid as they are set in win32k::InitThreadCallback. */ PCLIENTINFO ClientInfo = GetWin32ClientInfo(); BOOLEAN IsFirstThread = _InterlockedExchange8((PCHAR)&gfFirstThread, FALSE);

1 0

[hpoussin] 65890: [NTOS:IO] Add some debug prints for remove locks
by hpoussin＠svn.reactos.org 29 Dec '14

29 Dec '14

Author: hpoussin Date: Mon Dec 29 13:16:07 2014 New Revision: 65890 URL: http://svn.reactos.org/svn/reactos?rev=65890&view=rev Log: [NTOS:IO] Add some debug prints for remove locks Modified: trunk/reactos/ntoskrnl/io/iomgr/remlock.c Modified: trunk/reactos/ntoskrnl/io/iomgr/remlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/remlock.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/remlock.c [iso-8859-1] Mon Dec 29 13:16:07 2014 @@ -38,6 +38,8 @@ { PEXTENDED_IO_REMOVE_LOCK Lock = (PEXTENDED_IO_REMOVE_LOCK)RemoveLock; PAGED_CODE(); + + DPRINT("%s(%p 0x%08x %u %u %u)\n", __FUNCTION__, RemoveLock, AllocateTag, MaxLockedMinutes, HighWatermark, RemlockSize); ASSERT(HighWatermark < MAXLONG); @@ -86,6 +88,8 @@ PIO_REMOVE_LOCK_TRACKING_BLOCK TrackingBlock; PEXTENDED_IO_REMOVE_LOCK Lock = (PEXTENDED_IO_REMOVE_LOCK)RemoveLock; + DPRINT("%s(%p %p %s %u %u)\n", __FUNCTION__, RemoveLock, Tag, File, Line, RemlockSize); + /* Increase the lock count */ LockValue = InterlockedIncrement(&(Lock->Common.IoCount)); ASSERT(LockValue > 0); @@ -154,6 +158,8 @@ PIO_REMOVE_LOCK_TRACKING_BLOCK *TrackingBlockLink; PEXTENDED_IO_REMOVE_LOCK Lock = (PEXTENDED_IO_REMOVE_LOCK)RemoveLock; + DPRINT("%s(%p %p %u)\n", __FUNCTION__, RemoveLock, Tag, RemlockSize); + /* Check what kind of lock this is */ if (RemlockSize == (sizeof(IO_REMOVE_LOCK_DBG_BLOCK) + sizeof(IO_REMOVE_LOCK_COMMON_BLOCK))) { @@ -242,6 +248,8 @@ PIO_REMOVE_LOCK_TRACKING_BLOCK TrackingBlock; PEXTENDED_IO_REMOVE_LOCK Lock = (PEXTENDED_IO_REMOVE_LOCK)RemoveLock; PAGED_CODE(); + + DPRINT("%s(%p %p %u)\n", __FUNCTION__, RemoveLock, Tag, RemlockSize); /* Remove the lock and decrement the count */ Lock->Common.Removed = TRUE;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs