Ros-diffs August 2013

ros-diffs@reactos.org

10 participants
327 discussions

[hbelusca] 59802: [NTOSKRNL] Don't hardcode L"\\Driver\\" but use the #define DRIVER_ROOT_NAME instead (2/2)
by hbelusca＠svn.reactos.org 23 Aug '13

23 Aug '13

Author: hbelusca Date: Fri Aug 23 21:03:37 2013 New Revision: 59802 URL: http://svn.reactos.org/svn/reactos?rev=59802&view=rev Log: [NTOSKRNL] Don't hardcode L"\\Driver\\" but use the #define DRIVER_ROOT_NAME instead (2/2) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] Fri Aug 23 21:03:37 2013 @@ -364,7 +364,7 @@ ULONG Disposition; HANDLE KeyHandle, EnumHandle, ParentHandle, TreeHandle, ControlHandle; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET"); - UNICODE_STRING PnpManagerDriverName = RTL_CONSTANT_STRING(L"\\Driver\\PnpManager"); + UNICODE_STRING PnpManagerDriverName = RTL_CONSTANT_STRING(DRIVER_ROOT_NAME L"PnpManager"); PDEVICE_OBJECT Pdo; /* Initialize locks and such */

1 0

[akhaldi] 59801: [PSDK] * Apply some formatting consistency in winspool.h.
by akhaldi＠svn.reactos.org 23 Aug '13

23 Aug '13

Author: akhaldi Date: Fri Aug 23 20:52:09 2013 New Revision: 59801 URL: http://svn.reactos.org/svn/reactos?rev=59801&view=rev Log: [PSDK] * Apply some formatting consistency in winspool.h. Modified: trunk/reactos/include/psdk/winspool.h Modified: trunk/reactos/include/psdk/winspool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winspool.h?re… ============================================================================== --- trunk/reactos/include/psdk/winspool.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winspool.h [iso-8859-1] Fri Aug 23 20:52:09 2013 @@ -1,223 +1,245 @@ -#ifndef _WINSPOOL_H -#define _WINSPOOL_H +#ifndef _WINSPOOL_ +#define _WINSPOOL_ #ifdef __cplusplus extern "C" { #endif + #ifdef _MSC_VER #pragma warning(push) #pragma warning(disable:4820) #endif -#define DI_CHANNEL 1 -#define DI_CHANNEL_WRITE 2 + +#define DI_CHANNEL 1 +#define DI_CHANNEL_WRITE 2 #define DI_READ_SPOOL_JOB 3 -#define FORM_BUILTIN 1 -#define JOB_CONTROL_PAUSE 1 -#define JOB_CONTROL_RESUME 2 -#define JOB_CONTROL_CANCEL 3 -#define JOB_CONTROL_RESTART 4 -#define JOB_CONTROL_DELETE 5 -#define JOB_STATUS_PAUSED 1 -#define JOB_STATUS_ERROR 2 -#define JOB_STATUS_DELETING 4 -#define JOB_STATUS_SPOOLING 8 -#define JOB_STATUS_PRINTING 16 -#define JOB_STATUS_OFFLINE 32 -#define JOB_STATUS_PAPEROUT 0x40 -#define JOB_STATUS_PRINTED 0x80 -#define JOB_STATUS_DELETED 0x100 -#define JOB_STATUS_BLOCKED_DEVQ 0x200 -#define JOB_STATUS_USER_INTERVENTION 0x400 -#define JOB_POSITION_UNSPECIFIED 0 -#define JOB_NOTIFY_TYPE 1 -#define JOB_NOTIFY_FIELD_PRINTER_NAME 0 -#define JOB_NOTIFY_FIELD_MACHINE_NAME 1 -#define JOB_NOTIFY_FIELD_PORT_NAME 2 -#define JOB_NOTIFY_FIELD_USER_NAME 3 -#define JOB_NOTIFY_FIELD_NOTIFY_NAME 4 -#define JOB_NOTIFY_FIELD_DATATYPE 5 -#define JOB_NOTIFY_FIELD_PRINT_PROCESSOR 6 -#define JOB_NOTIFY_FIELD_PARAMETERS 7 -#define JOB_NOTIFY_FIELD_DRIVER_NAME 8 -#define JOB_NOTIFY_FIELD_DEVMODE 9 -#define JOB_NOTIFY_FIELD_STATUS 10 -#define JOB_NOTIFY_FIELD_STATUS_STRING 11 -#define JOB_NOTIFY_FIELD_SECURITY_DESCRIPTOR 12 -#define JOB_NOTIFY_FIELD_DOCUMENT 13 -#define JOB_NOTIFY_FIELD_PRIORITY 14 -#define JOB_NOTIFY_FIELD_POSITION 15 -#define JOB_NOTIFY_FIELD_SUBMITTED 16 -#define JOB_NOTIFY_FIELD_START_TIME 17 -#define JOB_NOTIFY_FIELD_UNTIL_TIME 18 -#define JOB_NOTIFY_FIELD_TIME 19 -#define JOB_NOTIFY_FIELD_TOTAL_PAGES 20 -#define JOB_NOTIFY_FIELD_PAGES_PRINTED 21 -#define JOB_NOTIFY_FIELD_TOTAL_BYTES 22 -#define JOB_NOTIFY_FIELD_BYTES_PRINTED 23 -#define JOB_ACCESS_ADMINISTER 16 -#define JOB_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|JOB_ACCESS_ADMINISTER) -#define JOB_READ (STANDARD_RIGHTS_READ| JOB_ACCESS_ADMINISTER) -#define JOB_WRITE (STANDARD_RIGHTS_WRITE|JOB_ACCESS_ADMINISTER) -#define JOB_EXECUTE (STANDARD_RIGHTS_EXECUTE|JOB_ACCESS_ADMINISTER) -#define PRINTER_NOTIFY_OPTIONS_REFRESH 1 -#define PRINTER_ACCESS_ADMINISTER 4 -#define PRINTER_ACCESS_USE 8 -#define PRINTER_ERROR_INFORMATION 0x80000000 -#define PRINTER_ERROR_WARNING 0x40000000 -#define PRINTER_ERROR_SEVERE 0x20000000 -#define PRINTER_ERROR_OUTOFPAPER 1 -#define PRINTER_ERROR_JAM 2 -#define PRINTER_ERROR_OUTOFTONER 4 -#define PRINTER_CONTROL_PAUSE 1 -#define PRINTER_CONTROL_RESUME 2 -#define PRINTER_CONTROL_PURGE 3 -#define PRINTER_CONTROL_SET_STATUS 4 -#define PRINTER_STATUS_PAUSED 1 -#define PRINTER_STATUS_ERROR 2 -#define PRINTER_STATUS_PENDING_DELETION 4 -#define PRINTER_STATUS_PAPER_JAM 8 -#define PRINTER_STATUS_PAPER_OUT 0x10 -#define PRINTER_STATUS_MANUAL_FEED 0x20 -#define PRINTER_STATUS_PAPER_PROBLEM 0x40 -#define PRINTER_STATUS_OFFLINE 0x80 -#define PRINTER_STATUS_IO_ACTIVE 0x100 -#define PRINTER_STATUS_BUSY 0x200 -#define PRINTER_STATUS_PRINTING 0x400 -#define PRINTER_STATUS_OUTPUT_BIN_FULL 0x800 -#define PRINTER_STATUS_NOT_AVAILABLE 0x1000 -#define PRINTER_STATUS_WAITING 0x2000 -#define PRINTER_STATUS_PROCESSING 0x4000 -#define PRINTER_STATUS_INITIALIZING 0x8000 -#define PRINTER_STATUS_WARMING_UP 0x10000 -#define PRINTER_STATUS_TONER_LOW 0x20000 -#define PRINTER_STATUS_NO_TONER 0x40000 -#define PRINTER_STATUS_PAGE_PUNT 0x80000 -#define PRINTER_STATUS_USER_INTERVENTION 0x100000 -#define PRINTER_STATUS_OUT_OF_MEMORY 0x200000 -#define PRINTER_STATUS_DOOR_OPEN 0x400000 -#define PRINTER_STATUS_SERVER_UNKNOWN 0x800000 -#define PRINTER_STATUS_POWER_SAVE 0x1000000 -#define PRINTER_ATTRIBUTE_QUEUED 1 -#define PRINTER_ATTRIBUTE_DIRECT 2 -#define PRINTER_ATTRIBUTE_DEFAULT 4 -#define PRINTER_ATTRIBUTE_SHARED 8 -#define PRINTER_ATTRIBUTE_NETWORK 0x10 -#define PRINTER_ATTRIBUTE_HIDDEN 0x20 -#define PRINTER_ATTRIBUTE_LOCAL 0x40 -#define PRINTER_ATTRIBUTE_ENABLE_DEVQ 0x80 -#define PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS 0x100 -#define PRINTER_ATTRIBUTE_DO_COMPLETE_FIRST 0x200 -#define PRINTER_ATTRIBUTE_WORK_OFFLINE 0x400 -#define PRINTER_ATTRIBUTE_ENABLE_BIDI 0x800 -#define PRINTER_ATTRIBUTE_RAW_ONLY 0x1000 -#define PRINTER_ATTRIBUTE_PUBLISHED 0x2000 -#define PRINTER_ENUM_DEFAULT 1 -#define PRINTER_ENUM_LOCAL 2 -#define PRINTER_ENUM_CONNECTIONS 4 -#define PRINTER_ENUM_FAVORITE 4 -#define PRINTER_ENUM_NAME 8 -#define PRINTER_ENUM_REMOTE 16 -#define PRINTER_ENUM_SHARED 32 -#define PRINTER_ENUM_NETWORK 0x40 -#define PRINTER_ENUM_EXPAND 0x4000 -#define PRINTER_ENUM_CONTAINER 0x8000 -#define PRINTER_ENUM_ICONMASK 0xff0000 -#define PRINTER_ENUM_ICON1 0x10000 -#define PRINTER_ENUM_ICON2 0x20000 -#define PRINTER_ENUM_ICON3 0x40000 -#define PRINTER_ENUM_ICON4 0x80000 -#define PRINTER_ENUM_ICON5 0x100000 -#define PRINTER_ENUM_ICON6 0x200000 -#define PRINTER_ENUM_ICON7 0x400000 -#define PRINTER_ENUM_ICON8 0x800000 -#define PRINTER_NOTIFY_TYPE 0 -#define PRINTER_NOTIFY_FIELD_SERVER_NAME 0 -#define PRINTER_NOTIFY_FIELD_PRINTER_NAME 1 -#define PRINTER_NOTIFY_FIELD_SHARE_NAME 2 -#define PRINTER_NOTIFY_FIELD_PORT_NAME 3 -#define PRINTER_NOTIFY_FIELD_DRIVER_NAME 4 -#define PRINTER_NOTIFY_FIELD_COMMENT 5 -#define PRINTER_NOTIFY_FIELD_LOCATION 6 -#define PRINTER_NOTIFY_FIELD_DEVMODE 7 -#define PRINTER_NOTIFY_FIELD_SEPFILE 8 -#define PRINTER_NOTIFY_FIELD_PRINT_PROCESSOR 9 -#define PRINTER_NOTIFY_FIELD_PARAMETERS 10 -#define PRINTER_NOTIFY_FIELD_DATATYPE 11 -#define PRINTER_NOTIFY_FIELD_SECURITY_DESCRIPTOR 12 -#define PRINTER_NOTIFY_FIELD_ATTRIBUTES 13 -#define PRINTER_NOTIFY_FIELD_PRIORITY 14 -#define PRINTER_NOTIFY_FIELD_DEFAULT_PRIORITY 15 -#define PRINTER_NOTIFY_FIELD_START_TIME 16 -#define PRINTER_NOTIFY_FIELD_UNTIL_TIME 17 -#define PRINTER_NOTIFY_FIELD_STATUS 18 -#define PRINTER_NOTIFY_FIELD_STATUS_STRING 19 -#define PRINTER_NOTIFY_FIELD_CJOBS 20 -#define PRINTER_NOTIFY_FIELD_AVERAGE_PPM 21 -#define PRINTER_NOTIFY_FIELD_TOTAL_PAGES 22 -#define PRINTER_NOTIFY_FIELD_PAGES_PRINTED 23 -#define PRINTER_NOTIFY_FIELD_TOTAL_BYTES 24 -#define PRINTER_NOTIFY_FIELD_BYTES_PRINTED 25 -#define PRINTER_CHANGE_ADD_PRINTER 1 -#define PRINTER_CHANGE_SET_PRINTER 2 -#define PRINTER_CHANGE_DELETE_PRINTER 4 -#define PRINTER_CHANGE_FAILED_CONNECTION_PRINTER 8 -#define PRINTER_CHANGE_PRINTER 0xFF -#define PRINTER_CHANGE_ADD_JOB 0x100 -#define PRINTER_CHANGE_SET_JOB 0x200 -#define PRINTER_CHANGE_DELETE_JOB 0x400 -#define PRINTER_CHANGE_WRITE_JOB 0x800 -#define PRINTER_CHANGE_JOB 0xFF00 -#define PRINTER_CHANGE_ADD_FORM 0x10000 -#define PRINTER_CHANGE_SET_FORM 0x20000 -#define PRINTER_CHANGE_DELETE_FORM 0x40000 -#define PRINTER_CHANGE_FORM 0x70000 -#define PRINTER_CHANGE_ADD_PORT 0x100000 -#define PRINTER_CHANGE_CONFIGURE_PORT 0x200000 -#define PRINTER_CHANGE_DELETE_PORT 0x400000 -#define PRINTER_CHANGE_PORT 0x700000 -#define PRINTER_CHANGE_ADD_PRINT_PROCESSOR 0x1000000 -#define PRINTER_CHANGE_DELETE_PRINT_PROCESSOR 0x4000000 -#define PRINTER_CHANGE_PRINT_PROCESSOR 0x7000000 -#define PRINTER_CHANGE_ADD_PRINTER_DRIVER 0x10000000 -#define PRINTER_CHANGE_SET_PRINTER_DRIVER 0x20000000 -#define PRINTER_CHANGE_DELETE_PRINTER_DRIVER 0x40000000 -#define PRINTER_CHANGE_PRINTER_DRIVER 0x70000000 -#define PRINTER_CHANGE_TIMEOUT 0x80000000 -#define PRINTER_CHANGE_ALL 0x7777FFFF -#define PRINTER_NOTIFY_INFO_DISCARDED 1 -#define PRINTER_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|PRINTER_ACCESS_ADMINISTER|PRINTER_ACCESS_USE) -#define PRINTER_READ (STANDARD_RIGHTS_READ|PRINTER_ACCESS_USE) -#define PRINTER_WRITE (STANDARD_RIGHTS_WRITE|PRINTER_ACCESS_USE) -#define PRINTER_EXECUTE (STANDARD_RIGHTS_EXECUTE|PRINTER_ACCESS_USE) -#define NO_PRIORITY 0 -#define MAX_PRIORITY 99 -#define MIN_PRIORITY 1 -#define DEF_PRIORITY 1 -#define PORT_TYPE_WRITE 1 -#define PORT_TYPE_READ 2 -#define PORT_TYPE_REDIRECTED 4 -#define PORT_TYPE_NET_ATTACHED 8 -#define SERVER_ACCESS_ADMINISTER 1 -#define SERVER_ACCESS_ENUMERATE 2 -#define SERVER_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SERVER_ACCESS_ADMINISTER|SERVER_ACCESS_ENUMERATE) -#define SERVER_READ (STANDARD_RIGHTS_READ|SERVER_ACCESS_ENUMERATE) -#define SERVER_WRITE (STANDARD_RIGHTS_WRITE|SERVER_ACCESS_ADMINISTER|SERVER_ACCESS_ENUMERATE) -#define SERVER_EXECUTE (STANDARD_RIGHTS_EXECUTE|SERVER_ACCESS_ENUMERATE) -#define PORT_STATUS_TYPE_ERROR 1 -#define PORT_STATUS_TYPE_WARNING 2 -#define PORT_STATUS_TYPE_INFO 3 -#define PORT_STATUS_OFFLINE 1 -#define PORT_STATUS_PAPER_JAM 2 -#define PORT_STATUS_PAPER_OUT 3 -#define PORT_STATUS_OUTPUT_BIN_FULL 4 -#define PORT_STATUS_PAPER_PROBLEM 5 -#define PORT_STATUS_NO_TONER 6 -#define PORT_STATUS_DOOR_OPEN 7 -#define PORT_STATUS_USER_INTERVENTION 8 -#define PORT_STATUS_OUT_OF_MEMORY 9 -#define PORT_STATUS_TONER_LOW 10 -#define PORT_STATUS_WARMING_UP 11 -#define PORT_STATUS_POWER_SAVE 12 + +#define FORM_BUILTIN 1 + +#define JOB_CONTROL_PAUSE 1 +#define JOB_CONTROL_RESUME 2 +#define JOB_CONTROL_CANCEL 3 +#define JOB_CONTROL_RESTART 4 +#define JOB_CONTROL_DELETE 5 + +#define JOB_STATUS_PAUSED 1 +#define JOB_STATUS_ERROR 2 +#define JOB_STATUS_DELETING 4 +#define JOB_STATUS_SPOOLING 8 +#define JOB_STATUS_PRINTING 16 +#define JOB_STATUS_OFFLINE 32 +#define JOB_STATUS_PAPEROUT 0x40 +#define JOB_STATUS_PRINTED 0x80 +#define JOB_STATUS_DELETED 0x100 +#define JOB_STATUS_BLOCKED_DEVQ 0x200 +#define JOB_STATUS_USER_INTERVENTION 0x400 + +#define JOB_POSITION_UNSPECIFIED 0 + +#define JOB_NOTIFY_TYPE 1 + +#define JOB_NOTIFY_FIELD_PRINTER_NAME 0 +#define JOB_NOTIFY_FIELD_MACHINE_NAME 1 +#define JOB_NOTIFY_FIELD_PORT_NAME 2 +#define JOB_NOTIFY_FIELD_USER_NAME 3 +#define JOB_NOTIFY_FIELD_NOTIFY_NAME 4 +#define JOB_NOTIFY_FIELD_DATATYPE 5 +#define JOB_NOTIFY_FIELD_PRINT_PROCESSOR 6 +#define JOB_NOTIFY_FIELD_PARAMETERS 7 +#define JOB_NOTIFY_FIELD_DRIVER_NAME 8 +#define JOB_NOTIFY_FIELD_DEVMODE 9 +#define JOB_NOTIFY_FIELD_STATUS 10 +#define JOB_NOTIFY_FIELD_STATUS_STRING 11 +#define JOB_NOTIFY_FIELD_SECURITY_DESCRIPTOR 12 +#define JOB_NOTIFY_FIELD_DOCUMENT 13 +#define JOB_NOTIFY_FIELD_PRIORITY 14 +#define JOB_NOTIFY_FIELD_POSITION 15 +#define JOB_NOTIFY_FIELD_SUBMITTED 16 +#define JOB_NOTIFY_FIELD_START_TIME 17 +#define JOB_NOTIFY_FIELD_UNTIL_TIME 18 +#define JOB_NOTIFY_FIELD_TIME 19 +#define JOB_NOTIFY_FIELD_TOTAL_PAGES 20 +#define JOB_NOTIFY_FIELD_PAGES_PRINTED 21 +#define JOB_NOTIFY_FIELD_TOTAL_BYTES 22 +#define JOB_NOTIFY_FIELD_BYTES_PRINTED 23 + +#define JOB_ACCESS_ADMINISTER 16 +#define JOB_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|JOB_ACCESS_ADMINISTER) +#define JOB_READ (STANDARD_RIGHTS_READ|JOB_ACCESS_ADMINISTER) +#define JOB_WRITE (STANDARD_RIGHTS_WRITE|JOB_ACCESS_ADMINISTER) +#define JOB_EXECUTE (STANDARD_RIGHTS_EXECUTE|JOB_ACCESS_ADMINISTER) + +#define PRINTER_NOTIFY_OPTIONS_REFRESH 1 +#define PRINTER_ACCESS_ADMINISTER 4 +#define PRINTER_ACCESS_USE 8 + +#define PRINTER_ERROR_INFORMATION 0x80000000 +#define PRINTER_ERROR_WARNING 0x40000000 +#define PRINTER_ERROR_SEVERE 0x20000000 +#define PRINTER_ERROR_OUTOFPAPER 1 +#define PRINTER_ERROR_JAM 2 +#define PRINTER_ERROR_OUTOFTONER 4 + +#define PRINTER_CONTROL_PAUSE 1 +#define PRINTER_CONTROL_RESUME 2 +#define PRINTER_CONTROL_PURGE 3 +#define PRINTER_CONTROL_SET_STATUS 4 + +#define PRINTER_STATUS_PAUSED 1 +#define PRINTER_STATUS_ERROR 2 +#define PRINTER_STATUS_PENDING_DELETION 4 +#define PRINTER_STATUS_PAPER_JAM 8 +#define PRINTER_STATUS_PAPER_OUT 0x10 +#define PRINTER_STATUS_MANUAL_FEED 0x20 +#define PRINTER_STATUS_PAPER_PROBLEM 0x40 +#define PRINTER_STATUS_OFFLINE 0x80 +#define PRINTER_STATUS_IO_ACTIVE 0x100 +#define PRINTER_STATUS_BUSY 0x200 +#define PRINTER_STATUS_PRINTING 0x400 +#define PRINTER_STATUS_OUTPUT_BIN_FULL 0x800 +#define PRINTER_STATUS_NOT_AVAILABLE 0x1000 +#define PRINTER_STATUS_WAITING 0x2000 +#define PRINTER_STATUS_PROCESSING 0x4000 +#define PRINTER_STATUS_INITIALIZING 0x8000 +#define PRINTER_STATUS_WARMING_UP 0x10000 +#define PRINTER_STATUS_TONER_LOW 0x20000 +#define PRINTER_STATUS_NO_TONER 0x40000 +#define PRINTER_STATUS_PAGE_PUNT 0x80000 +#define PRINTER_STATUS_USER_INTERVENTION 0x100000 +#define PRINTER_STATUS_OUT_OF_MEMORY 0x200000 +#define PRINTER_STATUS_DOOR_OPEN 0x400000 +#define PRINTER_STATUS_SERVER_UNKNOWN 0x800000 +#define PRINTER_STATUS_POWER_SAVE 0x1000000 + +#define PRINTER_ATTRIBUTE_QUEUED 1 +#define PRINTER_ATTRIBUTE_DIRECT 2 +#define PRINTER_ATTRIBUTE_DEFAULT 4 +#define PRINTER_ATTRIBUTE_SHARED 8 +#define PRINTER_ATTRIBUTE_NETWORK 0x10 +#define PRINTER_ATTRIBUTE_HIDDEN 0x20 +#define PRINTER_ATTRIBUTE_LOCAL 0x40 +#define PRINTER_ATTRIBUTE_ENABLE_DEVQ 0x80 +#define PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS 0x100 +#define PRINTER_ATTRIBUTE_DO_COMPLETE_FIRST 0x200 +#define PRINTER_ATTRIBUTE_WORK_OFFLINE 0x400 +#define PRINTER_ATTRIBUTE_ENABLE_BIDI 0x800 +#define PRINTER_ATTRIBUTE_RAW_ONLY 0x1000 +#define PRINTER_ATTRIBUTE_PUBLISHED 0x2000 + +#define PRINTER_ENUM_DEFAULT 1 +#define PRINTER_ENUM_LOCAL 2 +#define PRINTER_ENUM_CONNECTIONS 4 +#define PRINTER_ENUM_FAVORITE 4 +#define PRINTER_ENUM_NAME 8 +#define PRINTER_ENUM_REMOTE 16 +#define PRINTER_ENUM_SHARED 32 +#define PRINTER_ENUM_NETWORK 0x40 +#define PRINTER_ENUM_EXPAND 0x4000 +#define PRINTER_ENUM_CONTAINER 0x8000 +#define PRINTER_ENUM_ICONMASK 0xff0000 +#define PRINTER_ENUM_ICON1 0x10000 +#define PRINTER_ENUM_ICON2 0x20000 +#define PRINTER_ENUM_ICON3 0x40000 +#define PRINTER_ENUM_ICON4 0x80000 +#define PRINTER_ENUM_ICON5 0x100000 +#define PRINTER_ENUM_ICON6 0x200000 +#define PRINTER_ENUM_ICON7 0x400000 +#define PRINTER_ENUM_ICON8 0x800000 + +#define PRINTER_NOTIFY_TYPE 0 +#define PRINTER_NOTIFY_FIELD_SERVER_NAME 0 +#define PRINTER_NOTIFY_FIELD_PRINTER_NAME 1 +#define PRINTER_NOTIFY_FIELD_SHARE_NAME 2 +#define PRINTER_NOTIFY_FIELD_PORT_NAME 3 +#define PRINTER_NOTIFY_FIELD_DRIVER_NAME 4 +#define PRINTER_NOTIFY_FIELD_COMMENT 5 +#define PRINTER_NOTIFY_FIELD_LOCATION 6 +#define PRINTER_NOTIFY_FIELD_DEVMODE 7 +#define PRINTER_NOTIFY_FIELD_SEPFILE 8 +#define PRINTER_NOTIFY_FIELD_PRINT_PROCESSOR 9 +#define PRINTER_NOTIFY_FIELD_PARAMETERS 10 +#define PRINTER_NOTIFY_FIELD_DATATYPE 11 +#define PRINTER_NOTIFY_FIELD_SECURITY_DESCRIPTOR 12 +#define PRINTER_NOTIFY_FIELD_ATTRIBUTES 13 +#define PRINTER_NOTIFY_FIELD_PRIORITY 14 +#define PRINTER_NOTIFY_FIELD_DEFAULT_PRIORITY 15 +#define PRINTER_NOTIFY_FIELD_START_TIME 16 +#define PRINTER_NOTIFY_FIELD_UNTIL_TIME 17 +#define PRINTER_NOTIFY_FIELD_STATUS 18 +#define PRINTER_NOTIFY_FIELD_STATUS_STRING 19 +#define PRINTER_NOTIFY_FIELD_CJOBS 20 +#define PRINTER_NOTIFY_FIELD_AVERAGE_PPM 21 +#define PRINTER_NOTIFY_FIELD_TOTAL_PAGES 22 +#define PRINTER_NOTIFY_FIELD_PAGES_PRINTED 23 +#define PRINTER_NOTIFY_FIELD_TOTAL_BYTES 24 +#define PRINTER_NOTIFY_FIELD_BYTES_PRINTED 25 + +#define PRINTER_CHANGE_ADD_PRINTER 1 +#define PRINTER_CHANGE_SET_PRINTER 2 +#define PRINTER_CHANGE_DELETE_PRINTER 4 +#define PRINTER_CHANGE_FAILED_CONNECTION_PRINTER 8 +#define PRINTER_CHANGE_PRINTER 0xFF +#define PRINTER_CHANGE_ADD_JOB 0x100 +#define PRINTER_CHANGE_SET_JOB 0x200 +#define PRINTER_CHANGE_DELETE_JOB 0x400 +#define PRINTER_CHANGE_WRITE_JOB 0x800 +#define PRINTER_CHANGE_JOB 0xFF00 +#define PRINTER_CHANGE_ADD_FORM 0x10000 +#define PRINTER_CHANGE_SET_FORM 0x20000 +#define PRINTER_CHANGE_DELETE_FORM 0x40000 +#define PRINTER_CHANGE_FORM 0x70000 +#define PRINTER_CHANGE_ADD_PORT 0x100000 +#define PRINTER_CHANGE_CONFIGURE_PORT 0x200000 +#define PRINTER_CHANGE_DELETE_PORT 0x400000 +#define PRINTER_CHANGE_PORT 0x700000 +#define PRINTER_CHANGE_ADD_PRINT_PROCESSOR 0x1000000 +#define PRINTER_CHANGE_DELETE_PRINT_PROCESSOR 0x4000000 +#define PRINTER_CHANGE_PRINT_PROCESSOR 0x7000000 +#define PRINTER_CHANGE_ADD_PRINTER_DRIVER 0x10000000 +#define PRINTER_CHANGE_SET_PRINTER_DRIVER 0x20000000 +#define PRINTER_CHANGE_DELETE_PRINTER_DRIVER 0x40000000 +#define PRINTER_CHANGE_PRINTER_DRIVER 0x70000000 +#define PRINTER_CHANGE_TIMEOUT 0x80000000 +#define PRINTER_CHANGE_ALL 0x7777FFFF + +#define PRINTER_NOTIFY_INFO_DISCARDED 1 +#define PRINTER_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|PRINTER_ACCESS_ADMINISTER|PRINTER_ACCESS_USE) +#define PRINTER_READ (STANDARD_RIGHTS_READ|PRINTER_ACCESS_USE) +#define PRINTER_WRITE (STANDARD_RIGHTS_WRITE|PRINTER_ACCESS_USE) +#define PRINTER_EXECUTE (STANDARD_RIGHTS_EXECUTE|PRINTER_ACCESS_USE) + +#define NO_PRIORITY 0 +#define MAX_PRIORITY 99 +#define MIN_PRIORITY 1 +#define DEF_PRIORITY 1 + +#define PORT_TYPE_WRITE 1 +#define PORT_TYPE_READ 2 +#define PORT_TYPE_REDIRECTED 4 +#define PORT_TYPE_NET_ATTACHED 8 + +#define SERVER_ACCESS_ADMINISTER 1 +#define SERVER_ACCESS_ENUMERATE 2 +#define SERVER_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SERVER_ACCESS_ADMINISTER|SERVER_ACCESS_ENUMERATE) +#define SERVER_READ (STANDARD_RIGHTS_READ|SERVER_ACCESS_ENUMERATE) +#define SERVER_WRITE (STANDARD_RIGHTS_WRITE|SERVER_ACCESS_ADMINISTER|SERVER_ACCESS_ENUMERATE) +#define SERVER_EXECUTE (STANDARD_RIGHTS_EXECUTE|SERVER_ACCESS_ENUMERATE) + +#define PORT_STATUS_TYPE_ERROR 1 +#define PORT_STATUS_TYPE_WARNING 2 +#define PORT_STATUS_TYPE_INFO 3 +#define PORT_STATUS_OFFLINE 1 +#define PORT_STATUS_PAPER_JAM 2 +#define PORT_STATUS_PAPER_OUT 3 +#define PORT_STATUS_OUTPUT_BIN_FULL 4 +#define PORT_STATUS_PAPER_PROBLEM 5 +#define PORT_STATUS_NO_TONER 6 +#define PORT_STATUS_DOOR_OPEN 7 +#define PORT_STATUS_USER_INTERVENTION 8 +#define PORT_STATUS_OUT_OF_MEMORY 9 +#define PORT_STATUS_TONER_LOW 10 +#define PORT_STATUS_WARMING_UP 11 +#define PORT_STATUS_POWER_SAVE 12 typedef struct _PRINTER_NOTIFY_OPTIONS_TYPE { WORD Type; @@ -236,549 +258,686 @@ } PRINTER_NOTIFY_OPTIONS, *PPRINTER_NOTIFY_OPTIONS, *LPPRINTER_NOTIFY_OPTIONS; #ifndef RC_INVOKED + typedef struct _ADDJOB_INFO_1A { - LPSTR Path; - DWORD JobId; -} ADDJOB_INFO_1A,*PADDJOB_INFO_1A,*LPADDJOB_INFO_1A; + LPSTR Path; + DWORD JobId; +} ADDJOB_INFO_1A, *PADDJOB_INFO_1A, *LPADDJOB_INFO_1A; + typedef struct _ADDJOB_INFO_1W { - LPWSTR Path; - DWORD JobId; -} ADDJOB_INFO_1W,*PADDJOB_INFO_1W,*LPADDJOB_INFO_1W; -typedef struct _DATATYPES_INFO_1A{LPSTR pName;} DATATYPES_INFO_1A,*PDATATYPES_INFO_1A,*LPDATATYPES_INFO_1A; -typedef struct _DATATYPES_INFO_1W{LPWSTR pName;} DATATYPES_INFO_1W,*PDATATYPES_INFO_1W,*LPDATATYPES_INFO_1W; + LPWSTR Path; + DWORD JobId; +} ADDJOB_INFO_1W, *PADDJOB_INFO_1W, *LPADDJOB_INFO_1W; + +typedef struct _DATATYPES_INFO_1A { + LPSTR pName; +} DATATYPES_INFO_1A, *PDATATYPES_INFO_1A, *LPDATATYPES_INFO_1A; + +typedef struct _DATATYPES_INFO_1W { + LPWSTR pName; +} DATATYPES_INFO_1W, *PDATATYPES_INFO_1W, *LPDATATYPES_INFO_1W; + typedef struct _JOB_INFO_1A { - DWORD JobId; - LPSTR pPrinterName; - LPSTR pMachineName; - LPSTR pUserName; - LPSTR pDocument; - LPSTR pDatatype; - LPSTR pStatus; - DWORD Status; - DWORD Priority; - DWORD Position; - DWORD TotalPages; - DWORD PagesPrinted; - SYSTEMTIME Submitted; -} JOB_INFO_1A,*PJOB_INFO_1A,*LPJOB_INFO_1A; + DWORD JobId; + LPSTR pPrinterName; + LPSTR pMachineName; + LPSTR pUserName; + LPSTR pDocument; + LPSTR pDatatype; + LPSTR pStatus; + DWORD Status; + DWORD Priority; + DWORD Position; + DWORD TotalPages; + DWORD PagesPrinted; + SYSTEMTIME Submitted; +} JOB_INFO_1A, *PJOB_INFO_1A, *LPJOB_INFO_1A; + typedef struct _JOB_INFO_1W { - DWORD JobId; - LPWSTR pPrinterName; - LPWSTR pMachineName; - LPWSTR pUserName; - LPWSTR pDocument; - LPWSTR pDatatype; - LPWSTR pStatus; - DWORD Status; - DWORD Priority; - DWORD Position; - DWORD TotalPages; - DWORD PagesPrinted; - SYSTEMTIME Submitted; -} JOB_INFO_1W,*PJOB_INFO_1W,*LPJOB_INFO_1W; + DWORD JobId; + LPWSTR pPrinterName; + LPWSTR pMachineName; + LPWSTR pUserName; + LPWSTR pDocument; + LPWSTR pDatatype; + LPWSTR pStatus; + DWORD Status; + DWORD Priority; + DWORD Position; + DWORD TotalPages; + DWORD PagesPrinted; + SYSTEMTIME Submitted; +} JOB_INFO_1W, *PJOB_INFO_1W, *LPJOB_INFO_1W; + typedef struct _JOB_INFO_2A { - DWORD JobId; - LPSTR pPrinterName; - LPSTR pMachineName; - LPSTR pUserName; - LPSTR pDocument; - LPSTR pNotifyName; - LPSTR pDatatype; - LPSTR pPrintProcessor; - LPSTR pParameters; - LPSTR pDriverName; - LPDEVMODEA pDevMode; - LPSTR pStatus; - PSECURITY_DESCRIPTOR pSecurityDescriptor; - DWORD Status; - DWORD Priority; - DWORD Position; - DWORD StartTime; - DWORD UntilTime; - DWORD TotalPages; - DWORD Size; - SYSTEMTIME Submitted; - DWORD Time; - DWORD PagesPrinted; -} JOB_INFO_2A,*PJOB_INFO_2A,*LPJOB_INFO_2A; + DWORD JobId; + LPSTR pPrinterName; + LPSTR pMachineName; + LPSTR pUserName; + LPSTR pDocument; + LPSTR pNotifyName; + LPSTR pDatatype; + LPSTR pPrintProcessor; + LPSTR pParameters; + LPSTR pDriverName; + LPDEVMODEA pDevMode; + LPSTR pStatus; + PSECURITY_DESCRIPTOR pSecurityDescriptor; + DWORD Status; + DWORD Priority; + DWORD Position; + DWORD StartTime; + DWORD UntilTime; + DWORD TotalPages; + DWORD Size; + SYSTEMTIME Submitted; + DWORD Time; + DWORD PagesPrinted; +} JOB_INFO_2A, *PJOB_INFO_2A, *LPJOB_INFO_2A; + typedef struct _JOB_INFO_2W { - DWORD JobId; - LPWSTR pPrinterName; - LPWSTR pMachineName; - LPWSTR pUserName; - LPWSTR pDocument; - LPWSTR pNotifyName; - LPWSTR pDatatype; - LPWSTR pPrintProcessor; - LPWSTR pParameters; - LPWSTR pDriverName; - LPDEVMODEW pDevMode; - LPWSTR pStatus; - PSECURITY_DESCRIPTOR pSecurityDescriptor; - DWORD Status; - DWORD Priority; - DWORD Position; - DWORD StartTime; - DWORD UntilTime; - DWORD TotalPages; - DWORD Size; - SYSTEMTIME Submitted; - DWORD Time; - DWORD PagesPrinted; -} JOB_INFO_2W,*PJOB_INFO_2W,*LPJOB_INFO_2W; + DWORD JobId; + LPWSTR pPrinterName; + LPWSTR pMachineName; + LPWSTR pUserName; + LPWSTR pDocument; + LPWSTR pNotifyName; + LPWSTR pDatatype; + LPWSTR pPrintProcessor; + LPWSTR pParameters; + LPWSTR pDriverName; + LPDEVMODEW pDevMode; + LPWSTR pStatus; + PSECURITY_DESCRIPTOR pSecurityDescriptor; + DWORD Status; + DWORD Priority; + DWORD Position; + DWORD StartTime; + DWORD UntilTime; + DWORD TotalPages; + DWORD Size; + SYSTEMTIME Submitted; + DWORD Time; + DWORD PagesPrinted; +} JOB_INFO_2W, *PJOB_INFO_2W, *LPJOB_INFO_2W; + typedef struct _DOC_INFO_1A { - LPSTR pDocName; - LPSTR pOutputFile; - LPSTR pDatatype; -} DOC_INFO_1A,*PDOC_INFO_1A,*LPDOC_INFO_1A; + LPSTR pDocName; + LPSTR pOutputFile; + LPSTR pDatatype; +} DOC_INFO_1A, *PDOC_INFO_1A, *LPDOC_INFO_1A; + typedef struct _DOC_INFO_1W { - LPWSTR pDocName; - LPWSTR pOutputFile; - LPWSTR pDatatype; -} DOC_INFO_1W,*PDOC_INFO_1W,*LPDOC_INFO_1W; + LPWSTR pDocName; + LPWSTR pOutputFile; + LPWSTR pDatatype; +} DOC_INFO_1W, *PDOC_INFO_1W, *LPDOC_INFO_1W; + typedef struct _DOC_INFO_2A { - LPSTR pDocName; - LPSTR pOutputFile; - LPSTR pDatatype; - DWORD dwMode; - DWORD JobId; -} DOC_INFO_2A,*PDOC_INFO_2A,*LPDOC_INFO_2A; + LPSTR pDocName; + LPSTR pOutputFile; + LPSTR pDatatype; + DWORD dwMode; + DWORD JobId; +} DOC_INFO_2A, *PDOC_INFO_2A, *LPDOC_INFO_2A; + typedef struct _DOC_INFO_2W { - LPWSTR pDocName; - LPWSTR pOutputFile; - LPWSTR pDatatype; - DWORD dwMode; - DWORD JobId; -} DOC_INFO_2W,*PDOC_INFO_2W,*LPDOC_INFO_2W; -typedef struct _DRIVER_INFO_1A {LPSTR pName;} DRIVER_INFO_1A,*PDRIVER_INFO_1A,*LPDRIVER_INFO_1A; -typedef struct _DRIVER_INFO_1W {LPWSTR pName;} DRIVER_INFO_1W,*PDRIVER_INFO_1W,*LPDRIVER_INFO_1W; -typedef struct _DRIVER_INFO_2A { - DWORD cVersion; - LPSTR pName; - LPSTR pEnvironment; - LPSTR pDriverPath; - LPSTR pDataFile; - LPSTR pConfigFile; -} DRIVER_INFO_2A,*PDRIVER_INFO_2A,*LPDRIVER_INFO_2A; -typedef struct _DRIVER_INFO_2W { - DWORD cVersion; - LPWSTR pName; - LPWSTR pEnvironment; - LPWSTR pDriverPath; - LPWSTR pDataFile; - LPWSTR pConfigFile; -} DRIVER_INFO_2W,*PDRIVER_INFO_2W,*LPDRIVER_INFO_2W; -typedef struct _DRIVER_INFO_3A { - DWORD cVersion; - LPSTR pName; - LPSTR pEnvironment; - LPSTR pDriverPath; - LPSTR pDataFile; - LPSTR pConfigFile; - LPSTR pHelpFile; - LPSTR pDependentFiles; - LPSTR pMonitorName; - LPSTR pDefaultDataType; -} DRIVER_INFO_3A,*PDRIVER_INFO_3A,*LPDRIVER_INFO_3A; -typedef struct _DRIVER_INFO_3W { - DWORD cVersion; - LPWSTR pName; - LPWSTR pEnvironment; - LPWSTR pDriverPath; - LPWSTR pDataFile; - LPWSTR pConfigFile; - LPWSTR pHelpFile; - LPWSTR pDependentFiles; - LPWSTR pMonitorName; - LPWSTR pDefaultDataType; -} DRIVER_INFO_3W,*PDRIVER_INFO_3W,*LPDRIVER_INFO_3W; + LPWSTR pDocName; + LPWSTR pOutputFile; + LPWSTR pDatatype; + DWORD dwMode; + DWORD JobId; +} DOC_INFO_2W, *PDOC_INFO_2W, *LPDOC_INFO_2W; + +typedef struct _DRIVER_INFO_1A { + LPSTR pName; +} DRIVER_INFO_1A, *PDRIVER_INFO_1A, *LPDRIVER_INFO_1A; + +typedef struct _DRIVER_INFO_1W { + LPWSTR pName; +} DRIVER_INFO_1W, *PDRIVER_INFO_1W, *LPDRIVER_INFO_1W; + +typedef struct _DRIVER_INFO_2A { + DWORD cVersion; + LPSTR pName; + LPSTR pEnvironment; + LPSTR pDriverPath; + LPSTR pDataFile; + LPSTR pConfigFile; +} DRIVER_INFO_2A, *PDRIVER_INFO_2A, *LPDRIVER_INFO_2A; + +typedef struct _DRIVER_INFO_2W { + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; +} DRIVER_INFO_2W, *PDRIVER_INFO_2W, *LPDRIVER_INFO_2W; + +typedef struct _DRIVER_INFO_3A { + DWORD cVersion; + LPSTR pName; + LPSTR pEnvironment; + LPSTR pDriverPath; + LPSTR pDataFile; + LPSTR pConfigFile; + LPSTR pHelpFile; + LPSTR pDependentFiles; + LPSTR pMonitorName; + LPSTR pDefaultDataType; +} DRIVER_INFO_3A, *PDRIVER_INFO_3A, *LPDRIVER_INFO_3A; + +typedef struct _DRIVER_INFO_3W { + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; + LPWSTR pHelpFile; + LPWSTR pDependentFiles; + LPWSTR pMonitorName; + LPWSTR pDefaultDataType; +} DRIVER_INFO_3W, *PDRIVER_INFO_3W, *LPDRIVER_INFO_3W; + typedef struct _DRIVER_INFO_4A { - DWORD cVersion; // SDK examples: - LPSTR pName; // QMS 810 - LPSTR pEnvironment; // Win32 x86 - LPSTR pDriverPath; // c:\drivers\pscript.dll - LPSTR pDataFile; // c:\drivers\QMS810.PPD - LPSTR pConfigFile; // c:\drivers\PSCRPTUI.DLL - LPSTR pHelpFile; // c:\drivers\PSCRPTUI.HLP - LPSTR pDependentFiles; // PSCRIPT.DLL\0QMS810.PPD\0PSCRIPTUI.DLL\0PSCRIPTUI.HLP\0PSTEST.TXT\0\0 - LPSTR pMonitorName; // "PJL monitor" - LPSTR pDefaultDataType; // "EMF" - LPSTR pszzPreviousNames; // "OldName1\0OldName2\0\0 + DWORD cVersion; // SDK examples: + LPSTR pName; // QMS 810 + LPSTR pEnvironment; // Win32 x86 + LPSTR pDriverPath; // c:\drivers\pscript.dll + LPSTR pDataFile; // c:\drivers\QMS810.PPD + LPSTR pConfigFile; // c:\drivers\PSCRPTUI.DLL + LPSTR pHelpFile; // c:\drivers\PSCRPTUI.HLP + LPSTR pDependentFiles; // PSCRIPT.DLL\0QMS810.PPD\0PSCRIPTUI.DLL\0PSCRIPTUI.HLP\0PSTEST.TXT\0\0 + LPSTR pMonitorName; // "PJL monitor" + LPSTR pDefaultDataType; // "EMF" + LPSTR pszzPreviousNames; // "OldName1\0OldName2\0\0 } DRIVER_INFO_4A, *PDRIVER_INFO_4A, *LPDRIVER_INFO_4A; + typedef struct _DRIVER_INFO_4W { - DWORD cVersion; - LPWSTR pName; - LPWSTR pEnvironment; - LPWSTR pDriverPath; - LPWSTR pDataFile; - LPWSTR pConfigFile; - LPWSTR pHelpFile; - LPWSTR pDependentFiles; - LPWSTR pMonitorName; - LPWSTR pDefaultDataType; - LPWSTR pszzPreviousNames; + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; + LPWSTR pHelpFile; + LPWSTR pDependentFiles; + LPWSTR pMonitorName; + LPWSTR pDefaultDataType; + LPWSTR pszzPreviousNames; } DRIVER_INFO_4W, *PDRIVER_INFO_4W, *LPDRIVER_INFO_4W; + typedef struct _DRIVER_INFO_5A { - DWORD cVersion; // SDK examples: - LPSTR pName; // QMS 810 - LPSTR pEnvironment; // Win32 x86 - LPSTR pDriverPath; // c:\drivers\pscript.dll - LPSTR pDataFile; // c:\drivers\QMS810.PPD - LPSTR pConfigFile; // c:\drivers\PSCRPTUI.DLL - DWORD dwDriverAttributes; // driver attributes (like UMPD/KMPD) - DWORD dwConfigVersion; // version number of the config file since reboot - DWORD dwDriverVersion; // version number of the driver file since reboot + DWORD cVersion; // SDK examples: + LPSTR pName; // QMS 810 + LPSTR pEnvironment; // Win32 x86 + LPSTR pDriverPath; // c:\drivers\pscript.dll + LPSTR pDataFile; // c:\drivers\QMS810.PPD + LPSTR pConfigFile; // c:\drivers\PSCRPTUI.DLL + DWORD dwDriverAttributes; // driver attributes (like UMPD/KMPD) + DWORD dwConfigVersion; // version number of the config file since reboot + DWORD dwDriverVersion; // version number of the driver file since reboot } DRIVER_INFO_5A, *PDRIVER_INFO_5A, *LPDRIVER_INFO_5A; + typedef struct _DRIVER_INFO_5W { - DWORD cVersion; - LPWSTR pName; - LPWSTR pEnvironment; - LPWSTR pDriverPath; - LPWSTR pDataFile; - LPWSTR pConfigFile; - DWORD dwDriverAttributes; - DWORD dwConfigVersion; - DWORD dwDriverVersion; + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; + DWORD dwDriverAttributes; + DWORD dwConfigVersion; + DWORD dwDriverVersion; } DRIVER_INFO_5W, *PDRIVER_INFO_5W, *LPDRIVER_INFO_5W; + typedef struct _DRIVER_INFO_6A { - DWORD cVersion; - LPSTR pName; - LPSTR pEnvironment; - LPSTR pDriverPath; - LPSTR pDataFile; - LPSTR pConfigFile; - LPSTR pHelpFile; - LPSTR pDependentFiles; - LPSTR pMonitorName; - LPSTR pDefaultDataType; - LPSTR pszzPreviousNames; - FILETIME ftDriverDate; - DWORDLONG dwlDriverVersion; - LPSTR pszMfgName; - LPSTR pszOEMUrl; - LPSTR pszHardwareID; - LPSTR pszProvider; + DWORD cVersion; + LPSTR pName; + LPSTR pEnvironment; + LPSTR pDriverPath; + LPSTR pDataFile; + LPSTR pConfigFile; + LPSTR pHelpFile; + LPSTR pDependentFiles; + LPSTR pMonitorName; + LPSTR pDefaultDataType; + LPSTR pszzPreviousNames; + FILETIME ftDriverDate; + DWORDLONG dwlDriverVersion; + LPSTR pszMfgName; + LPSTR pszOEMUrl; + LPSTR pszHardwareID; + LPSTR pszProvider; } DRIVER_INFO_6A, *PDRIVER_INFO_6A, *LPDRIVER_INFO_6A; + typedef struct _DRIVER_INFO_6W { - DWORD cVersion; - LPWSTR pName; - LPWSTR pEnvironment; - LPWSTR pDriverPath; - LPWSTR pDataFile; - LPWSTR pConfigFile; - LPWSTR pHelpFile; - LPWSTR pDependentFiles; - LPWSTR pMonitorName; - LPWSTR pDefaultDataType; - LPWSTR pszzPreviousNames; - FILETIME ftDriverDate; - DWORDLONG dwlDriverVersion; - LPWSTR pszMfgName; - LPWSTR pszOEMUrl; - LPWSTR pszHardwareID; - LPWSTR pszProvider; + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; + LPWSTR pHelpFile; + LPWSTR pDependentFiles; + LPWSTR pMonitorName; + LPWSTR pDefaultDataType; + LPWSTR pszzPreviousNames; + FILETIME ftDriverDate; + DWORDLONG dwlDriverVersion; + LPWSTR pszMfgName; + LPWSTR pszOEMUrl; + LPWSTR pszHardwareID; + LPWSTR pszProvider; } DRIVER_INFO_6W, *PDRIVER_INFO_6W, *LPDRIVER_INFO_6W; -#define PRINTER_DRIVER_PACKAGE_AWARE 0x00000001 + +#define PRINTER_DRIVER_PACKAGE_AWARE 0x00000001 + typedef struct _DRIVER_INFO_8A { - DWORD cVersion; - LPSTR pName; - LPSTR pEnvironment; - LPSTR pDriverPath; - LPSTR pDataFile; - LPSTR pConfigFile; - LPSTR pHelpFile; - LPSTR pDependentFiles; - LPSTR pMonitorName; - LPSTR pDefaultDataType; - LPSTR pszzPreviousNames; - FILETIME ftDriverDate; - DWORDLONG dwlDriverVersion; - LPSTR pszMfgName; - LPSTR pszOEMUrl; - LPSTR pszHardwareID; - LPSTR pszProvider; - LPSTR pszPrintProcessor; - LPSTR pszVendorSetup; - LPSTR pszzColorProfiles; - LPSTR pszInfPath; - DWORD dwPrinterDriverAttributes; - LPSTR pszzCoreDriverDependencies; - FILETIME ftMinInboxDriverVerDate; - DWORDLONG dwlMinInboxDriverVerVersion; + DWORD cVersion; + LPSTR pName; + LPSTR pEnvironment; + LPSTR pDriverPath; + LPSTR pDataFile; + LPSTR pConfigFile; + LPSTR pHelpFile; + LPSTR pDependentFiles; + LPSTR pMonitorName; + LPSTR pDefaultDataType; + LPSTR pszzPreviousNames; + FILETIME ftDriverDate; + DWORDLONG dwlDriverVersion; + LPSTR pszMfgName; + LPSTR pszOEMUrl; + LPSTR pszHardwareID; + LPSTR pszProvider; + LPSTR pszPrintProcessor; + LPSTR pszVendorSetup; + LPSTR pszzColorProfiles; + LPSTR pszInfPath; + DWORD dwPrinterDriverAttributes; + LPSTR pszzCoreDriverDependencies; + FILETIME ftMinInboxDriverVerDate; + DWORDLONG dwlMinInboxDriverVerVersion; } DRIVER_INFO_8A, *PDRIVER_INFO_8A, *LPDRIVER_INFO_8A; + typedef struct _DRIVER_INFO_8W { - DWORD cVersion; - LPWSTR pName; - LPWSTR pEnvironment; - LPWSTR pDriverPath; - LPWSTR pDataFile; - LPWSTR pConfigFile; - LPWSTR pHelpFile; - LPWSTR pDependentFiles; - LPWSTR pMonitorName; - LPWSTR pDefaultDataType; - LPWSTR pszzPreviousNames; - FILETIME ftDriverDate; - DWORDLONG dwlDriverVersion; - LPWSTR pszMfgName; - LPWSTR pszOEMUrl; - LPWSTR pszHardwareID; - LPWSTR pszProvider; - LPWSTR pszPrintProcessor; - LPWSTR pszVendorSetup; - LPWSTR pszzColorProfiles; - LPWSTR pszInfPath; - DWORD dwPrinterDriverAttributes; - LPWSTR pszzCoreDriverDependencies; - FILETIME ftMinInboxDriverVerDate; - DWORDLONG dwlMinInboxDriverVerVersion; + DWORD cVersion; + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDriverPath; + LPWSTR pDataFile; + LPWSTR pConfigFile; + LPWSTR pHelpFile; + LPWSTR pDependentFiles; + LPWSTR pMonitorName; + LPWSTR pDefaultDataType; + LPWSTR pszzPreviousNames; + FILETIME ftDriverDate; + DWORDLONG dwlDriverVersion; + LPWSTR pszMfgName; + LPWSTR pszOEMUrl; + LPWSTR pszHardwareID; + LPWSTR pszProvider; + LPWSTR pszPrintProcessor; + LPWSTR pszVendorSetup; + LPWSTR pszzColorProfiles; + LPWSTR pszInfPath; + DWORD dwPrinterDriverAttributes; + LPWSTR pszzCoreDriverDependencies; + FILETIME ftMinInboxDriverVerDate; + DWORDLONG dwlMinInboxDriverVerVersion; } DRIVER_INFO_8W, *PDRIVER_INFO_8W, *LPDRIVER_INFO_8W; + // FLAGS for dwDriverAttributes -#define DRIVER_KERNELMODE 0x00000001 -#define DRIVER_USERMODE 0x00000002 +#define DRIVER_KERNELMODE 0x00000001 +#define DRIVER_USERMODE 0x00000002 + // FLAGS for DeletePrinterDriverEx. -#define DPD_DELETE_UNUSED_FILES 0x00000001 -#define DPD_DELETE_SPECIFIC_VERSION 0x00000002 -#define DPD_DELETE_ALL_FILES 0x00000004 +#define DPD_DELETE_UNUSED_FILES 0x00000001 +#define DPD_DELETE_SPECIFIC_VERSION 0x00000002 +#define DPD_DELETE_ALL_FILES 0x00000004 + // FLAGS for AddPrinterDriverEx. -#define APD_STRICT_UPGRADE 0x00000001 -#define APD_STRICT_DOWNGRADE 0x00000002 -#define APD_COPY_ALL_FILES 0x00000004 -#define APD_COPY_NEW_FILES 0x00000008 +#define APD_STRICT_UPGRADE 0x00000001 +#define APD_STRICT_DOWNGRADE 0x00000002 +#define APD_COPY_ALL_FILES 0x00000004 +#define APD_COPY_NEW_FILES 0x00000008 #if(_WIN32_WINNT >= 0x0501) - #define APD_COPY_FROM_DIRECTORY 0x00000010 +#define APD_COPY_FROM_DIRECTORY 0x00000010 #endif -typedef struct _MONITOR_INFO_1A{LPSTR pName;} MONITOR_INFO_1A,*PMONITOR_INFO_1A,*LPMONITOR_INFO_1A; -typedef struct _MONITOR_INFO_1W{LPWSTR pName;} MONITOR_INFO_1W,*PMONITOR_INFO_1W,*LPMONITOR_INFO_1W; -typedef struct _PORT_INFO_1A {LPSTR pName;} PORT_INFO_1A,*PPORT_INFO_1A,*LPPORT_INFO_1A; -typedef struct _PORT_INFO_1W {LPWSTR pName;} PORT_INFO_1W,*PPORT_INFO_1W,*LPPORT_INFO_1W; -typedef struct _MONITOR_INFO_2A{ - LPSTR pName; - LPSTR pEnvironment; - LPSTR pDLLName; -} MONITOR_INFO_2A,*PMONITOR_INFO_2A,*LPMONITOR_INFO_2A; -typedef struct _MONITOR_INFO_2W{ - LPWSTR pName; - LPWSTR pEnvironment; - LPWSTR pDLLName; -} MONITOR_INFO_2W,*PMONITOR_INFO_2W,*LPMONITOR_INFO_2W; + +typedef struct _MONITOR_INFO_1A { + LPSTR pName; +} MONITOR_INFO_1A, *PMONITOR_INFO_1A, *LPMONITOR_INFO_1A; + +typedef struct _MONITOR_INFO_1W { + LPWSTR pName; +} MONITOR_INFO_1W, *PMONITOR_INFO_1W, *LPMONITOR_INFO_1W; + +typedef struct _PORT_INFO_1A { + LPSTR pName; +} PORT_INFO_1A, *PPORT_INFO_1A, *LPPORT_INFO_1A; + +typedef struct _PORT_INFO_1W { + LPWSTR pName; +} PORT_INFO_1W, *PPORT_INFO_1W, *LPPORT_INFO_1W; + +typedef struct _MONITOR_INFO_2A { + LPSTR pName; + LPSTR pEnvironment; + LPSTR pDLLName; +} MONITOR_INFO_2A, *PMONITOR_INFO_2A, *LPMONITOR_INFO_2A; + +typedef struct _MONITOR_INFO_2W { + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDLLName; +} MONITOR_INFO_2W, *PMONITOR_INFO_2W, *LPMONITOR_INFO_2W; + typedef struct _PORT_INFO_2A { - LPSTR pPortName; - LPSTR pMonitorName; - LPSTR pDescription; - DWORD fPortType; - DWORD Reserved; -} PORT_INFO_2A,*PPORT_INFO_2A,*LPPORT_INFO_2A; + LPSTR pPortName; + LPSTR pMonitorName; + LPSTR pDescription; + DWORD fPortType; + DWORD Reserved; +} PORT_INFO_2A, *PPORT_INFO_2A, *LPPORT_INFO_2A; + typedef struct _PORT_INFO_2W { - LPWSTR pPortName; - LPWSTR pMonitorName; - LPWSTR pDescription; - DWORD fPortType; - DWORD Reserved; -} PORT_INFO_2W,*PPORT_INFO_2W,*LPPORT_INFO_2W; + LPWSTR pPortName; + LPWSTR pMonitorName; + LPWSTR pDescription; + DWORD fPortType; + DWORD Reserved; +} PORT_INFO_2W, *PPORT_INFO_2W, *LPPORT_INFO_2W; + typedef struct _PORT_INFO_3A { - DWORD dwStatus; - LPSTR pszStatus; - DWORD dwSeverity; -} PORT_INFO_3A,*PPORT_INFO_3A,*LPPORT_INFO_3A; + DWORD dwStatus; + LPSTR pszStatus; + DWORD dwSeverity; +} PORT_INFO_3A, *PPORT_INFO_3A, *LPPORT_INFO_3A; + typedef struct _PORT_INFO_3W { - DWORD dwStatus; - LPWSTR pszStatus; - DWORD dwSeverity; -} PORT_INFO_3W,*PPORT_INFO_3W,*LPPORT_INFO_3W; -typedef struct _PRINTER_INFO_1A { - DWORD Flags; - LPSTR pDescription; - LPSTR pName; - LPSTR pComment; -} PRINTER_INFO_1A,*PPRINTER_INFO_1A,*LPPRINTER_INFO_1A; -typedef struct _PRINTER_INFO_1W { - DWORD Flags; - LPWSTR pDescription; - LPWSTR pName; - LPWSTR pComment; -} PRINTER_INFO_1W,*PPRINTER_INFO_1W,*LPPRINTER_INFO_1W; -typedef struct _PRINTER_INFO_2A { - LPSTR pServerName; - LPSTR pPrinterName; - LPSTR pShareName; - LPSTR pPortName; - LPSTR pDriverName; - LPSTR pComment; - LPSTR pLocation; - LPDEVMODEA pDevMode; - LPSTR pSepFile; - LPSTR pPrintProcessor; - LPSTR pDatatype; - LPSTR pParameters; - PSECURITY_DESCRIPTOR pSecurityDescriptor; - DWORD Attributes; - DWORD Priority; - DWORD DefaultPriority; - DWORD StartTime; - DWORD UntilTime; - DWORD Status; - DWORD cJobs; - DWORD AveragePPM; -} PRINTER_INFO_2A,*PPRINTER_INFO_2A,*LPPRINTER_INFO_2A; -typedef struct _PRINTER_INFO_2W { - LPWSTR pServerName; - LPWSTR pPrinterName; - LPWSTR pShareName; - LPWSTR pPortName; - LPWSTR pDriverName; - LPWSTR pComment; - LPWSTR pLocation; - LPDEVMODEW pDevMode; - LPWSTR pSepFile; - LPWSTR pPrintProcessor; - LPWSTR pDatatype; - LPWSTR pParameters; - PSECURITY_DESCRIPTOR pSecurityDescriptor; - DWORD Attributes; - DWORD Priority; - DWORD DefaultPriority; - DWORD StartTime; - DWORD UntilTime; - DWORD Status; - DWORD cJobs; - DWORD AveragePPM; -} PRINTER_INFO_2W,*PPRINTER_INFO_2W,*LPPRINTER_INFO_2W; -typedef struct _PRINTER_INFO_3 { - PSECURITY_DESCRIPTOR pSecurityDescriptor; -} PRINTER_INFO_3,*PPRINTER_INFO_3,*LPPRINTER_INFO_3; -typedef struct _PRINTER_INFO_4A { - LPSTR pPrinterName; - LPSTR pServerName; - DWORD Attributes; -} PRINTER_INFO_4A,*PPRINTER_INFO_4A,*LPPRINTER_INFO_4A; -typedef struct _PRINTER_INFO_4W { - LPWSTR pPrinterName; - LPWSTR pServerName; - DWORD Attributes; -} PRINTER_INFO_4W,*PPRINTER_INFO_4W,*LPPRINTER_INFO_4W; -typedef struct _PRINTER_INFO_5A { - LPSTR pPrinterName; - LPSTR pPortName; - DWORD Attributes; - DWORD DeviceNotSelectedTimeout; - DWORD TransmissionRetryTimeout; -} PRINTER_INFO_5A,*PPRINTER_INFO_5A,*LPPRINTER_INFO_5A; -typedef struct _PRINTER_INFO_5W { - LPWSTR pPrinterName; - LPWSTR pPortName; - DWORD Attributes; - DWORD DeviceNotSelectedTimeout; - DWORD TransmissionRetryTimeout; -} PRINTER_INFO_5W,*PPRINTER_INFO_5W,*LPPRINTER_INFO_5W; + DWORD dwStatus; + LPWSTR pszStatus; + DWORD dwSeverity; +} PORT_INFO_3W, *PPORT_INFO_3W, *LPPORT_INFO_3W; + +typedef struct _PRINTER_INFO_1A { + DWORD Flags; + LPSTR pDescription; + LPSTR pName; + LPSTR pComment; +} PRINTER_INFO_1A, *PPRINTER_INFO_1A, *LPPRINTER_INFO_1A; + +typedef struct _PRINTER_INFO_1W { + DWORD Flags; + LPWSTR pDescription; + LPWSTR pName; + LPWSTR pComment; +} PRINTER_INFO_1W, *PPRINTER_INFO_1W, *LPPRINTER_INFO_1W; + +typedef struct _PRINTER_INFO_2A { + LPSTR pServerName; + LPSTR pPrinterName; + LPSTR pShareName; + LPSTR pPortName; + LPSTR pDriverName; + LPSTR pComment; + LPSTR pLocation; + LPDEVMODEA pDevMode; + LPSTR pSepFile; + LPSTR pPrintProcessor; + LPSTR pDatatype; + LPSTR pParameters; + PSECURITY_DESCRIPTOR pSecurityDescriptor; + DWORD Attributes; + DWORD Priority; + DWORD DefaultPriority; + DWORD StartTime; + DWORD UntilTime; + DWORD Status; + DWORD cJobs; + DWORD AveragePPM; +} PRINTER_INFO_2A, *PPRINTER_INFO_2A, *LPPRINTER_INFO_2A; + +typedef struct _PRINTER_INFO_2W { + LPWSTR pServerName; + LPWSTR pPrinterName; + LPWSTR pShareName; + LPWSTR pPortName; + LPWSTR pDriverName; + LPWSTR pComment; + LPWSTR pLocation; + LPDEVMODEW pDevMode; + LPWSTR pSepFile; + LPWSTR pPrintProcessor; + LPWSTR pDatatype; + LPWSTR pParameters; + PSECURITY_DESCRIPTOR pSecurityDescriptor; + DWORD Attributes; + DWORD Priority; + DWORD DefaultPriority; + DWORD StartTime; + DWORD UntilTime; + DWORD Status; + DWORD cJobs; + DWORD AveragePPM; +} PRINTER_INFO_2W, *PPRINTER_INFO_2W, *LPPRINTER_INFO_2W; + +typedef struct _PRINTER_INFO_3 { + PSECURITY_DESCRIPTOR pSecurityDescriptor; +} PRINTER_INFO_3, *PPRINTER_INFO_3, *LPPRINTER_INFO_3; + +typedef struct _PRINTER_INFO_4A { + LPSTR pPrinterName; + LPSTR pServerName; + DWORD Attributes; +} PRINTER_INFO_4A, *PPRINTER_INFO_4A, *LPPRINTER_INFO_4A; + +typedef struct _PRINTER_INFO_4W { + LPWSTR pPrinterName; + LPWSTR pServerName; + DWORD Attributes; +} PRINTER_INFO_4W, *PPRINTER_INFO_4W, *LPPRINTER_INFO_4W; + +typedef struct _PRINTER_INFO_5A { + LPSTR pPrinterName; + LPSTR pPortName; + DWORD Attributes; + DWORD DeviceNotSelectedTimeout; + DWORD TransmissionRetryTimeout; +} PRINTER_INFO_5A, *PPRINTER_INFO_5A, *LPPRINTER_INFO_5A; + +typedef struct _PRINTER_INFO_5W { + LPWSTR pPrinterName; + LPWSTR pPortName; + DWORD Attributes; + DWORD DeviceNotSelectedTimeout; + DWORD TransmissionRetryTimeout; +} PRINTER_INFO_5W, *PPRINTER_INFO_5W, *LPPRINTER_INFO_5W; + typedef struct _PRINTER_INFO_6 { - DWORD dwStatus; -} PRINTER_INFO_6,*PPRINTER_INFO_6,*LPPRINTER_INFO_6; -typedef struct _PRINTPROCESSOR_INFO_1A {LPSTR pName;} PRINTPROCESSOR_INFO_1A,*PPRINTPROCESSOR_INFO_1A,*LPPRINTPROCESSOR_INFO_1A; -typedef struct _PRINTPROCESSOR_INFO_1W {LPWSTR pName;} PRINTPROCESSOR_INFO_1W,*PPRINTPROCESSOR_INFO_1W,*LPPRINTPROCESSOR_INFO_1W; -typedef struct _PRINTER_NOTIFY_INFO_DATA { - WORD Type; - WORD Field; - DWORD Reserved; - DWORD Id; - union { - DWORD adwData[2]; - struct { - DWORD cbBuf; - PVOID pBuf; - } Data; - } NotifyData; -} PRINTER_NOTIFY_INFO_DATA,*PPRINTER_NOTIFY_INFO_DATA,*LPPRINTER_NOTIFY_INFO_DATA; -typedef struct _PRINTER_NOTIFY_INFO { - DWORD Version; - DWORD Flags; - DWORD Count; - PRINTER_NOTIFY_INFO_DATA aData[1]; -} PRINTER_NOTIFY_INFO,*PPRINTER_NOTIFY_INFO,*LPPRINTER_NOTIFY_INFO; -typedef struct _FORM_INFO_1A { - DWORD Flags; - LPSTR pName; - SIZEL Size; - RECTL ImageableArea; -} FORM_INFO_1A,*PFORM_INFO_1A,*LPFORM_INFO_1A; -typedef struct _FORM_INFO_1W { - DWORD Flags; - LPWSTR pName; - SIZEL Size; - RECTL ImageableArea; -} FORM_INFO_1W,*PFORM_INFO_1W,*LPFORM_INFO_1W; -typedef struct _PRINTER_DEFAULTSA { - LPSTR pDatatype; - LPDEVMODE pDevMode; - ACCESS_MASK DesiredAccess; -} PRINTER_DEFAULTSA,*PPRINTER_DEFAULTSA,*LPPRINTER_DEFAULTSA; -typedef struct _PRINTER_DEFAULTSW { - LPWSTR pDatatype; - LPDEVMODE pDevMode; - ACCESS_MASK DesiredAccess; -} PRINTER_DEFAULTSW,*PPRINTER_DEFAULTSW,*LPPRINTER_DEFAULTSW; - -typedef struct _PROVIDOR_INFO_1A{ - LPSTR pName; - LPSTR pEnvironment; - LPSTR pDLLName; + DWORD dwStatus; +} PRINTER_INFO_6, *PPRINTER_INFO_6, *LPPRINTER_INFO_6; + +typedef struct _PRINTPROCESSOR_INFO_1A { + LPSTR pName; +} PRINTPROCESSOR_INFO_1A, *PPRINTPROCESSOR_INFO_1A, *LPPRINTPROCESSOR_INFO_1A; + +typedef struct _PRINTPROCESSOR_INFO_1W { + LPWSTR pName; +} PRINTPROCESSOR_INFO_1W, *PPRINTPROCESSOR_INFO_1W, *LPPRINTPROCESSOR_INFO_1W; + +typedef struct _PRINTER_NOTIFY_INFO_DATA { + WORD Type; + WORD Field; + DWORD Reserved; + DWORD Id; + union { + DWORD adwData[2]; + struct { + DWORD cbBuf; + PVOID pBuf; + } Data; + } NotifyData; +} PRINTER_NOTIFY_INFO_DATA, *PPRINTER_NOTIFY_INFO_DATA, *LPPRINTER_NOTIFY_INFO_DATA; + +typedef struct _PRINTER_NOTIFY_INFO { + DWORD Version; + DWORD Flags; + DWORD Count; + PRINTER_NOTIFY_INFO_DATA aData[1]; +} PRINTER_NOTIFY_INFO, *PPRINTER_NOTIFY_INFO, *LPPRINTER_NOTIFY_INFO; + +typedef struct _FORM_INFO_1A { + DWORD Flags; + LPSTR pName; + SIZEL Size; + RECTL ImageableArea; +} FORM_INFO_1A, *PFORM_INFO_1A, *LPFORM_INFO_1A; + +typedef struct _FORM_INFO_1W { + DWORD Flags; + LPWSTR pName; + SIZEL Size; + RECTL ImageableArea; +} FORM_INFO_1W, *PFORM_INFO_1W, *LPFORM_INFO_1W; + +typedef struct _PRINTER_DEFAULTSA { + LPSTR pDatatype; + LPDEVMODE pDevMode; + ACCESS_MASK DesiredAccess; +} PRINTER_DEFAULTSA, *PPRINTER_DEFAULTSA, *LPPRINTER_DEFAULTSA; + +typedef struct _PRINTER_DEFAULTSW { + LPWSTR pDatatype; + LPDEVMODE pDevMode; + ACCESS_MASK DesiredAccess; +} PRINTER_DEFAULTSW, *PPRINTER_DEFAULTSW, *LPPRINTER_DEFAULTSW; + +typedef struct _PROVIDOR_INFO_1A { + LPSTR pName; + LPSTR pEnvironment; + LPSTR pDLLName; } PROVIDOR_INFO_1A, *PPROVIDOR_INFO_1A, *LPPROVIDOR_INFO_1A; -typedef struct _PROVIDOR_INFO_1W{ - LPWSTR pName; - LPWSTR pEnvironment; - LPWSTR pDLLName; + +typedef struct _PROVIDOR_INFO_1W { + LPWSTR pName; + LPWSTR pEnvironment; + LPWSTR pDLLName; } PROVIDOR_INFO_1W, *LPPROVIDOR_INFO_1W; -typedef struct _PROVIDOR_INFO_2A{ - LPSTR pOrder; +typedef struct _PROVIDOR_INFO_2A { + LPSTR pOrder; } PROVIDOR_INFO_2A, *PPROVIDOR_INFO_2A, *LPPROVIDOR_INFO_2A; -typedef struct _PROVIDOR_INFO_2W{ - LPWSTR pOrder; + +typedef struct _PROVIDOR_INFO_2W { + LPWSTR pOrder; } PROVIDOR_INFO_2W, *LPPROVIDOR_INFO_2W; typedef struct _BINARY_CONTAINER { - DWORD cbBuf; - LPBYTE pData; + DWORD cbBuf; + LPBYTE pData; } BINARY_CONTAINER, *PBINARY_CONTAINER; typedef struct _BIDI_DATA { - DWORD dwBidiType; - union - { - BOOL bData; - INT iData; - LPWSTR sData; - FLOAT fData; - BINARY_CONTAINER biData; - } u; + DWORD dwBidiType; + union { + BOOL bData; + INT iData; + LPWSTR sData; + FLOAT fData; + BINARY_CONTAINER biData; + } u; } BIDI_DATA, *LPBIDI_DATA, *PBIDI_DATA; typedef struct _BIDI_REQUEST_DATA { - DWORD dwReqNumber; - LPWSTR pSchema; - BIDI_DATA data; + DWORD dwReqNumber; + LPWSTR pSchema; + BIDI_DATA data; } BIDI_REQUEST_DATA, *LPBIDI_REQUEST_DATA, *PBIDI_REQUEST_DATA; typedef struct _BIDI_REQUEST_CONTAINER { - DWORD Version; - DWORD Flags; - DWORD Count; - BIDI_REQUEST_DATA aData[1]; + DWORD Version; + DWORD Flags; + DWORD Count; + BIDI_REQUEST_DATA aData[1]; } BIDI_REQUEST_CONTAINER, *LPBIDI_REQUEST_CONTAINER, *PBIDI_REQUEST_CONTAINER; typedef struct _BIDI_RESPONSE_DATA { - DWORD dwResult; - DWORD dwReqNumber; - LPWSTR pSchema; - BIDI_DATA data; + DWORD dwResult; + DWORD dwReqNumber; + LPWSTR pSchema; + BIDI_DATA data; } BIDI_RESPONSE_DATA, *LPBIDI_RESPONSE_DATA, *PBIDI_RESPONSE_DATA; typedef struct _BIDI_RESPONSE_CONTAINER { - DWORD Version; - DWORD Flags; - DWORD Count; - BIDI_RESPONSE_DATA aData[1]; + DWORD Version; + DWORD Flags; + DWORD Count; + BIDI_RESPONSE_DATA aData[1]; } BIDI_RESPONSE_CONTAINER, *LPBIDI_RESPONSE_CONTAINER, *PBIDI_RESPONSE_CONTAINER; + +#ifdef UNICODE + +typedef JOB_INFO_1W JOB_INFO_1, *PJOB_INFO_1, *LPJOB_INFO_1; +typedef JOB_INFO_2W JOB_INFO_2, *PJOB_INFO_2, *LPJOB_INFO_2; +typedef ADDJOB_INFO_1W ADDJOB_INFO_1, *PADDJOB_INFO_1, *LPADDJOB_INFO_1; +typedef DATATYPES_INFO_1W DATATYPES_INFO_1, *PDATATYPES_INFO_1, *LPDATATYPES_INFO_1; +typedef MONITOR_INFO_1W MONITOR_INFO_1, *PMONITOR_INFO_1, *LPMONITOR_INFO_1; +typedef MONITOR_INFO_2W MONITOR_INFO_2, *PMONITOR_INFO_2, *LPMONITOR_INFO_2; +typedef DOC_INFO_1W DOC_INFO_1, *PDOC_INFO_1, *LPDOC_INFO_1; +typedef DOC_INFO_2W DOC_INFO_2, *PDOC_INFO_2, *LPDOC_INFO_2; +typedef PORT_INFO_1W PORT_INFO_1, *PPORT_INFO_1, *LPPORT_INFO_1; +typedef PORT_INFO_2W PORT_INFO_2, *PPORT_INFO_2, *LPPORT_INFO_2; +typedef PORT_INFO_3W PORT_INFO_3, *PPORT_INFO_3, *LPPORT_INFO_3; +typedef DRIVER_INFO_2W DRIVER_INFO_2, *PDRIVER_INFO_2, *LPDRIVER_INFO_2; +typedef DRIVER_INFO_4W DRIVER_INFO_4, *PDRIVER_INFO_4, *LPDRIVER_INFO_4; +typedef DRIVER_INFO_5W DRIVER_INFO_5, *PDRIVER_INFO_5, *LPDRIVER_INFO_5; +typedef DRIVER_INFO_6W DRIVER_INFO_6, *PDRIVER_INFO_6, *LPDRIVER_INFO_6; +typedef DRIVER_INFO_8W DRIVER_INFO_8, *PDRIVER_INFO_8, *LPDRIVER_INFO_8; +typedef PRINTER_INFO_1W PRINTER_INFO_1, *PPRINTER_INFO_1, *LPPRINTER_INFO_1; +typedef PRINTER_INFO_2W PRINTER_INFO_2, *PPRINTER_INFO_2, *LPPRINTER_INFO_2; +typedef PRINTER_INFO_4W PRINTER_INFO_4, *PPRINTER_INFO_4, *LPPRINTER_INFO_4; +typedef PRINTER_INFO_5W PRINTER_INFO_5, *PPRINTER_INFO_5, *LPPRINTER_INFO_5; +typedef PRINTPROCESSOR_INFO_1W PRINTPROCESSOR_INFO_1, *PPRINTPROCESSOR_INFO_1, *LPPRINTPROCESSOR_INFO_1; +typedef FORM_INFO_1W FORM_INFO_1, *PFORM_INFO_1, *LPFORM_INFO_1; +typedef PRINTER_DEFAULTSW PRINTER_DEFAULTS, *PPRINTER_DEFAULTS, *LPPRINTER_DEFAULTS; +typedef PROVIDOR_INFO_1W PROVIDOR_INFO_1; +typedef LPPROVIDOR_INFO_1W LPPROVIDOR_INFO_1; +typedef PROVIDOR_INFO_2W PROVIDOR_INFO_2; +typedef LPPROVIDOR_INFO_2W LPPROVIDOR_INFO_2; + +#else /* UNICODE */ + +typedef JOB_INFO_1A JOB_INFO_1, *PJOB_INFO_1, *LPJOB_INFO_1; +typedef JOB_INFO_2A JOB_INFO_2, *PJOB_INFO_2, *LPJOB_INFO_2; +typedef ADDJOB_INFO_1A ADDJOB_INFO_1, *PADDJOB_INFO_1, *LPADDJOB_INFO_1; +typedef DATATYPES_INFO_1A DATATYPES_INFO_1, *PDATATYPES_INFO_1, *LPDATATYPES_INFO_1; +typedef MONITOR_INFO_1A MONITOR_INFO_1, *PMONITOR_INFO_1, *LPMONITOR_INFO_1; +typedef MONITOR_INFO_2A MONITOR_INFO_2, *PMONITOR_INFO_2, *LPMONITOR_INFO_2; +typedef DOC_INFO_1A DOC_INFO_1, *PDOC_INFO_1, *LPDOC_INFO_1; +typedef DOC_INFO_2A DOC_INFO_2, *PDOC_INFO_2, *LPDOC_INFO_2; +typedef PORT_INFO_1A PORT_INFO_1, *PPORT_INFO_1, *LPPORT_INFO_1; +typedef PORT_INFO_2A PORT_INFO_2, *PPORT_INFO_2, *LPPORT_INFO_2; +typedef PORT_INFO_3A PORT_INFO_3, *PPORT_INFO_3, *LPPORT_INFO_3; +typedef DRIVER_INFO_2A DRIVER_INFO_2, *PDRIVER_INFO_2, *LPDRIVER_INFO_2; +typedef DRIVER_INFO_4A DRIVER_INFO_4, *PDRIVER_INFO_4, *LPDRIVER_INFO_4; +typedef DRIVER_INFO_5A DRIVER_INFO_5, *PDRIVER_INFO_5, *LPDRIVER_INFO_5; +typedef DRIVER_INFO_6A DRIVER_INFO_6, *PDRIVER_INFO_6, *LPDRIVER_INFO_6; +typedef DRIVER_INFO_8A DRIVER_INFO_8, *PDRIVER_INFO_8, *LPDRIVER_INFO_8; +typedef PRINTER_INFO_1A PRINTER_INFO_1, *PPRINTER_INFO_1, *LPPRINTER_INFO_1; +typedef PRINTER_INFO_2A PRINTER_INFO_2, *PPRINTER_INFO_2, *LPPRINTER_INFO_2; +typedef PRINTER_INFO_4A PRINTER_INFO_4, *PPRINTER_INFO_4, *LPPRINTER_INFO_4; +typedef PRINTER_INFO_5A PRINTER_INFO_5, *PPRINTER_INFO_5, *LPPRINTER_INFO_5; +typedef PRINTPROCESSOR_INFO_1A PRINTPROCESSOR_INFO_1, *PPRINTPROCESSOR_INFO_1, *LPPRINTPROCESSOR_INFO_1; +typedef FORM_INFO_1A FORM_INFO_1, *PFORM_INFO_1, *LPFORM_INFO_1; +typedef PRINTER_DEFAULTSA PRINTER_DEFAULTS, *PPRINTER_DEFAULTS, *LPPRINTER_DEFAULTS; + +#endif /* UNICODE */ BOOL WINAPI AbortPrinter(HANDLE); BOOL WINAPI AddFormA(HANDLE,DWORD,PBYTE); @@ -901,33 +1060,7 @@ BOOL WINAPI XcvDataW(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD, PDWORD); #ifdef UNICODE -typedef JOB_INFO_1W JOB_INFO_1,*PJOB_INFO_1,*LPJOB_INFO_1; -typedef JOB_INFO_2W JOB_INFO_2,*PJOB_INFO_2,*LPJOB_INFO_2; -typedef ADDJOB_INFO_1W ADDJOB_INFO_1,*PADDJOB_INFO_1,*LPADDJOB_INFO_1; -typedef DATATYPES_INFO_1W DATATYPES_INFO_1,*PDATATYPES_INFO_1,*LPDATATYPES_INFO_1; -typedef MONITOR_INFO_1W MONITOR_INFO_1,*PMONITOR_INFO_1,*LPMONITOR_INFO_1; -typedef MONITOR_INFO_2W MONITOR_INFO_2,*PMONITOR_INFO_2,*LPMONITOR_INFO_2; -typedef DOC_INFO_1W DOC_INFO_1,*PDOC_INFO_1,*LPDOC_INFO_1; -typedef DOC_INFO_2W DOC_INFO_2,*PDOC_INFO_2,*LPDOC_INFO_2; -typedef PORT_INFO_1W PORT_INFO_1,*PPORT_INFO_1,*LPPORT_INFO_1; -typedef PORT_INFO_2W PORT_INFO_2,*PPORT_INFO_2,*LPPORT_INFO_2; -typedef PORT_INFO_3W PORT_INFO_3,*PPORT_INFO_3,*LPPORT_INFO_3; -typedef DRIVER_INFO_2W DRIVER_INFO_2,*PDRIVER_INFO_2,*LPDRIVER_INFO_2; -typedef DRIVER_INFO_4W DRIVER_INFO_4,*PDRIVER_INFO_4,*LPDRIVER_INFO_4; -typedef DRIVER_INFO_5W DRIVER_INFO_5,*PDRIVER_INFO_5,*LPDRIVER_INFO_5; -typedef DRIVER_INFO_6W DRIVER_INFO_6,*PDRIVER_INFO_6,*LPDRIVER_INFO_6; -typedef DRIVER_INFO_8W DRIVER_INFO_8,*PDRIVER_INFO_8,*LPDRIVER_INFO_8; -typedef PRINTER_INFO_1W PRINTER_INFO_1,*PPRINTER_INFO_1,*LPPRINTER_INFO_1; -typedef PRINTER_INFO_2W PRINTER_INFO_2,*PPRINTER_INFO_2,*LPPRINTER_INFO_2; -typedef PRINTER_INFO_4W PRINTER_INFO_4,*PPRINTER_INFO_4,*LPPRINTER_INFO_4; -typedef PRINTER_INFO_5W PRINTER_INFO_5,*PPRINTER_INFO_5,*LPPRINTER_INFO_5; -typedef PRINTPROCESSOR_INFO_1W PRINTPROCESSOR_INFO_1,*PPRINTPROCESSOR_INFO_1,*LPPRINTPROCESSOR_INFO_1; -typedef FORM_INFO_1W FORM_INFO_1,*PFORM_INFO_1,*LPFORM_INFO_1; -typedef PRINTER_DEFAULTSW PRINTER_DEFAULTS,*PPRINTER_DEFAULTS,*LPPRINTER_DEFAULTS; -typedef PROVIDOR_INFO_1W PROVIDOR_INFO_1; -typedef LPPROVIDOR_INFO_1W LPPROVIDOR_INFO_1; -typedef PROVIDOR_INFO_2W PROVIDOR_INFO_2; -typedef LPPROVIDOR_INFO_2W LPPROVIDOR_INFO_2; + #define AddForm AddFormW #define AddJob AddJobW #define AddMonitor AddMonitorW @@ -958,7 +1091,7 @@ #define EnumPrintProcessorDatatypes EnumPrintProcessorDatatypesW #define EnumPrintProcessors EnumPrintProcessorsW #define GetDefaultPrinter GetDefaultPrinterW -#define GetForm GetFormW +#define GetForm GetFormW #define GetJob GetJobW #define GetPrinter GetPrinterW #define GetPrinterData GetPrinterDataW @@ -974,30 +1107,9 @@ #define SetPrinter SetPrinterW #define SetPrinterData SetPrinterDataW #define StartDocPrinter StartDocPrinterW -#else -typedef JOB_INFO_1A JOB_INFO_1,*PJOB_INFO_1,*LPJOB_INFO_1; -typedef JOB_INFO_2A JOB_INFO_2,*PJOB_INFO_2,*LPJOB_INFO_2; -typedef ADDJOB_INFO_1A ADDJOB_INFO_1,*PADDJOB_INFO_1,*LPADDJOB_INFO_1; -typedef DATATYPES_INFO_1A DATATYPES_INFO_1,*PDATATYPES_INFO_1,*LPDATATYPES_INFO_1; -typedef MONITOR_INFO_1A MONITOR_INFO_1,*PMONITOR_INFO_1,*LPMONITOR_INFO_1; -typedef MONITOR_INFO_2A MONITOR_INFO_2,*PMONITOR_INFO_2,*LPMONITOR_INFO_2; -typedef DOC_INFO_1A DOC_INFO_1,*PDOC_INFO_1,*LPDOC_INFO_1; -typedef DOC_INFO_2A DOC_INFO_2,*PDOC_INFO_2,*LPDOC_INFO_2; -typedef PORT_INFO_1A PORT_INFO_1,*PPORT_INFO_1,*LPPORT_INFO_1; -typedef PORT_INFO_2A PORT_INFO_2,*PPORT_INFO_2,*LPPORT_INFO_2; -typedef PORT_INFO_3A PORT_INFO_3,*PPORT_INFO_3,*LPPORT_INFO_3; -typedef DRIVER_INFO_2A DRIVER_INFO_2,*PDRIVER_INFO_2,*LPDRIVER_INFO_2; -typedef DRIVER_INFO_4A DRIVER_INFO_4,*PDRIVER_INFO_4,*LPDRIVER_INFO_4; -typedef DRIVER_INFO_5A DRIVER_INFO_5,*PDRIVER_INFO_5,*LPDRIVER_INFO_5; -typedef DRIVER_INFO_6A DRIVER_INFO_6,*PDRIVER_INFO_6,*LPDRIVER_INFO_6; -typedef DRIVER_INFO_8A DRIVER_INFO_8,*PDRIVER_INFO_8,*LPDRIVER_INFO_8; -typedef PRINTER_INFO_1A PRINTER_INFO_1,*PPRINTER_INFO_1,*LPPRINTER_INFO_1; -typedef PRINTER_INFO_2A PRINTER_INFO_2,*PPRINTER_INFO_2,*LPPRINTER_INFO_2; -typedef PRINTER_INFO_4A PRINTER_INFO_4,*PPRINTER_INFO_4,*LPPRINTER_INFO_4; -typedef PRINTER_INFO_5A PRINTER_INFO_5,*PPRINTER_INFO_5,*LPPRINTER_INFO_5; -typedef PRINTPROCESSOR_INFO_1A PRINTPROCESSOR_INFO_1,*PPRINTPROCESSOR_INFO_1,*LPPRINTPROCESSOR_INFO_1; -typedef FORM_INFO_1A FORM_INFO_1,*PFORM_INFO_1,*LPFORM_INFO_1; -typedef PRINTER_DEFAULTSA PRINTER_DEFAULTS,*PPRINTER_DEFAULTS,*LPPRINTER_DEFAULTS; + +#else /* UNICODE */ + #define AddForm AddFormA #define AddJob AddJobA #define AddMonitor AddMonitorA @@ -1028,7 +1140,7 @@ #define EnumPrintProcessorDatatypes EnumPrintProcessorDatatypesA #define EnumPrintProcessors EnumPrintProcessorsA #define GetDefaultPrinter GetDefaultPrinterA -#define GetForm GetFormA +#define GetForm GetFormA #define GetJob GetJobA #define GetPrinter GetPrinterA #define GetPrinterData GetPrinterDataA @@ -1044,12 +1156,17 @@ #define SetPrinter SetPrinterA #define SetPrinterData SetPrinterDataA #define StartDocPrinter StartDocPrinterA -#endif -#endif /* RC_INVOKED */ + +#endif /* UNICODE */ + +#endif /* !RC_INVOKED */ + #ifdef _MSC_VER #pragma warning(pop) #endif + #ifdef __cplusplus } #endif -#endif + +#endif /* _WINSPOOL_ */

1 0

[hbelusca] 59800: [NTOSKRNL] Code formatting, and don't hardcode L"\\Driver\\" but use the #define DRIVER_ROOT_NAME instead.
by hbelusca＠svn.reactos.org 23 Aug '13

23 Aug '13

Author: hbelusca Date: Fri Aug 23 20:03:38 2013 New Revision: 59800 URL: http://svn.reactos.org/svn/reactos?rev=59800&view=rev Log: [NTOSKRNL] Code formatting, and don't hardcode L"\\Driver\\" but use the #define DRIVER_ROOT_NAME instead. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Fri Aug 23 20:03:38 2013 @@ -1191,7 +1191,7 @@ ObjectName.MaximumLength = ObjectName.Length + sizeof(WCHAR); ObjectName.Buffer = ExAllocatePool(PagedPool, ObjectName.MaximumLength); if (!ObjectName.Buffer) return STATUS_INSUFFICIENT_RESOURCES; - wcscpy(ObjectName.Buffer, L"\\Driver\\"); + wcscpy(ObjectName.Buffer, DRIVER_ROOT_NAME); memcpy(ObjectName.Buffer + 8, Start, ObjectName.Length - 8 * sizeof(WCHAR)); ObjectName.Buffer[ObjectName.Length/sizeof(WCHAR)] = 0; @@ -1452,7 +1452,7 @@ { /* Create a random name and set up the string*/ NameLength = (USHORT)swprintf(NameBuffer, - L"\\Driver\\%08u", + DRIVER_ROOT_NAME L"%08u", KeTickCount); LocalDriverName.Length = NameLength * sizeof(WCHAR); LocalDriverName.MaximumLength = LocalDriverName.Length + sizeof(UNICODE_NULL); @@ -1886,7 +1886,6 @@ Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, LoadParams->ServiceName->Buffer, QueryTable, NULL, NULL); - if (!NT_SUCCESS(Status)) { DPRINT("RtlQueryRegistryValues() failed (Status %lx)\n", Status); @@ -1901,7 +1900,6 @@ */ Status = IopNormalizeImagePath(&ImagePath, &ServiceName); - if (!NT_SUCCESS(Status)) { DPRINT("IopNormalizeImagePath() failed (Status %x)\n", Status); @@ -1913,13 +1911,14 @@ DPRINT("FullImagePath: '%wZ'\n", &ImagePath); DPRINT("Type: %lx\n", Type); - /* Get existing DriverObject pointer (in case the driver has - already been loaded and initialized) */ - Status = IopGetDriverObject( - &DriverObject, - &ServiceName, - (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || - Type == 8 /* SERVICE_RECOGNIZER_DRIVER */)); + /* + * Get existing DriverObject pointer (in case the driver + * has already been loaded and initialized). + */ + Status = IopGetDriverObject(&DriverObject, + &ServiceName, + (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || + Type == 8 /* SERVICE_RECOGNIZER_DRIVER */)); if (!NT_SUCCESS(Status)) { @@ -1929,7 +1928,6 @@ DPRINT("Loading module from %wZ\n", &ImagePath); Status = MmLoadSystemImage(&ImagePath, NULL, NULL, 0, (PVOID)&ModuleObject, &BaseAddress); - if (!NT_SUCCESS(Status)) { DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); @@ -1939,8 +1937,8 @@ } /* - * Initialize the driver module if it's loaded for the first time - */ + * Initialize the driver module if it's loaded for the first time + */ Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &ServiceName, &DeviceNode); if (!NT_SUCCESS(Status)) { @@ -2015,8 +2013,8 @@ PreviousMode = KeGetPreviousMode(); /* - * Check security privileges - */ + * Check security privileges + */ /* FIXME: Uncomment when privileges will be correctly implemented. */ #if 0

1 0

[akhaldi] 59799: [PSDK] * Annotate hidpi.h.
by akhaldi＠svn.reactos.org 23 Aug '13

23 Aug '13

Author: akhaldi Date: Fri Aug 23 18:29:18 2013 New Revision: 59799 URL: http://svn.reactos.org/svn/reactos?rev=59799&view=rev Log: [PSDK] * Annotate hidpi.h. Modified: trunk/reactos/include/psdk/hidpi.h Modified: trunk/reactos/include/psdk/hidpi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/hidpi.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/hidpi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/hidpi.h [iso-8859-1] Fri Aug 23 18:29:18 2013 @@ -20,8 +20,8 @@ * */ -#ifndef __HIDPI_H -#define __HIDPI_H +#ifndef __HIDPI_H__ +#define __HIDPI_H__ #include "hidusage.h" @@ -69,10 +69,11 @@ } DUMMYUNIONNAME; } HIDP_KEYBOARD_MODIFIER_STATE, *PHIDP_KEYBOARD_MODIFIER_STATE; -typedef BOOLEAN (NTAPI *PHIDP_INSERT_SCANCODES)( - IN PVOID Context, - IN PCHAR NewScanCodes, - IN ULONG Length); +typedef BOOLEAN +(NTAPI *PHIDP_INSERT_SCANCODES)( + _In_opt_ PVOID Context, + _In_reads_bytes_(Length) PCHAR NewScanCodes, + _In_ ULONG Length); typedef struct _USAGE_AND_PAGE { USAGE Usage; @@ -92,27 +93,29 @@ ULONG RingBufferSize; } HIDD_CONFIGURATION, *PHIDD_CONFIGURATION; +_Must_inspect_result_ HIDAPI NTSTATUS NTAPI HidP_TranslateUsageAndPagesToI8042ScanCodes( - IN PUSAGE_AND_PAGE ChangedUsageList, - IN ULONG UsageListLength, - IN HIDP_KEYBOARD_DIRECTION KeyAction, - IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, - IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, - IN PVOID InsertCodesContext); - + _In_reads_(UsageListLength) PUSAGE_AND_PAGE ChangedUsageList, + _In_ ULONG UsageListLength, + _In_ HIDP_KEYBOARD_DIRECTION KeyAction, + _Inout_ PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, + _In_ PHIDP_INSERT_SCANCODES InsertCodesProcedure, + _In_opt_ PVOID InsertCodesContext); + +_Must_inspect_result_ HIDAPI NTSTATUS NTAPI HidP_TranslateUsagesToI8042ScanCodes( - IN PUSAGE ChangedUsageList, - IN ULONG UsageListLength, - IN HIDP_KEYBOARD_DIRECTION KeyAction, - IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, - IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, - IN PVOID InsertCodesContext); + _In_reads_(UsageListLength) PUSAGE ChangedUsageList, + _In_ ULONG UsageListLength, + _In_ HIDP_KEYBOARD_DIRECTION KeyAction, + _Inout_ PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, + _In_ PHIDP_INSERT_SCANCODES InsertCodesProcedure, + _In_opt_ PVOID InsertCodesContext); typedef struct _HIDP_BUTTON_CAPS { USAGE UsagePage; @@ -311,130 +314,148 @@ #endif /* _HIDPI_NO_FUNCTION_MACROS_ */ +_Must_inspect_result_ +_IRQL_requires_max_(PASSIVE_LEVEL) HIDAPI NTSTATUS NTAPI HidP_GetCaps( - IN PHIDP_PREPARSED_DATA PreparsedData, - OUT PHIDP_CAPS Capabilities); - + _In_ PHIDP_PREPARSED_DATA PreparsedData, + _Out_ PHIDP_CAPS Capabilities); + +_Must_inspect_result_ +_IRQL_requires_max_(DISPATCH_LEVEL) HIDAPI NTSTATUS NTAPI HidP_GetData( - IN HIDP_REPORT_TYPE ReportType, - OUT PHIDP_DATA DataList, - IN OUT PULONG DataLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength); - + _In_ HIDP_REPORT_TYPE ReportType, + _Out_writes_to_(*DataLength, *DataLength) PHIDP_DATA DataList, + _Inout_ PULONG DataLength, + _In_ PHIDP_PREPARSED_DATA PreparsedData, + _Out_writes_bytes_(ReportLength) PCHAR Report, + _In_ ULONG ReportLength); + +_Must_inspect_result_ +_IRQL_requires_max_(DISPATCH_LEVEL) HIDAPI NTSTATUS NTAPI HidP_GetExtendedAttributes( - IN HIDP_REPORT_TYPE ReportType, - IN USHORT DataIndex, - IN PHIDP_PREPARSED_DATA PreparsedData, - OUT PHIDP_EXTENDED_ATTRIBUTES Attributes, - IN OUT PULONG LengthAttributes); - + _In_ HIDP_REPORT_TYPE ReportType, + _In_ USHORT DataIndex, + _In_ PHIDP_PREPARSED_DATA PreparsedData, + _Out_writes_to_(*LengthAttributes, *LengthAttributes) PHIDP_EXTENDED_ATTRIBUTES Attributes, + _Inout_ OUT PULONG LengthAttributes); + +_Must_inspect_result_ +_IRQL_requires_max_(DISPATCH_LEVEL) HIDAPI NTSTATUS NTAPI HidP_GetLinkCollectionNodes( - OUT PHIDP_LINK_COLLECTION_NODE LinkCollectionNodes, - IN OUT PULONG LinkCollectionNodesLength, - IN PHIDP_PREPARSED_DATA PreparsedData); - + _Out_ PHIDP_LINK_COLLECTION_NODE LinkCollectionNodes, + _Inout_ PULONG LinkCollectionNodesLength, + _In_ PHIDP_PREPARSED_DATA PreparsedData); + +_Must_inspect_result_ HIDAPI NTSTATUS NTAPI HidP_GetScaledUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - OUT PLONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength); - + _In_ HIDP_REPORT_TYPE ReportType, + _In_ USAGE UsagePage, + _In_ USHORT LinkCollection, + _In_ USAGE Usage, + _Out_ PLONG UsageValue, + _In_ PHIDP_PREPARSED_DATA PreparsedData, + _In_reads_bytes_(ReportLength) PCHAR Report, + _In_ ULONG ReportLength); + +_Must_inspect_result_ +_IRQL_requires_max_(PASSIVE_LEVEL) HIDAPI NTSTATUS NTAPI HidP_GetSpecificButtonCaps( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN USAGE Usage, - OUT PHIDP_BUTTON_CAPS ButtonCaps, - IN OUT PUSHORT ButtonCapsLength, - IN PHIDP_PREPARSED_DATA PreparsedData); - + _In_ HIDP_REPORT_TYPE ReportType, + _In_ USAGE UsagePage, + _In_ USHORT LinkCollection, + _In_ USAGE Usage, + _Out_ PHIDP_BUTTON_CAPS ButtonCaps, + _Inout_ PUSHORT ButtonCapsLength, + _In_ PHIDP_PREPARSED_DATA PreparsedData); + +_Must_inspect_result_ +_IRQL_requires_max_(DISPATCH_LEVEL) HIDAPI NTSTATUS NTAPI HidP_GetSpecificValueCaps( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN USAGE Usage, - OUT PHIDP_VALUE_CAPS ValueCaps, - IN OUT PUSHORT ValueCapsLength, - IN PHIDP_PREPARSED_DATA PreparsedData); - + _In_ HIDP_REPORT_TYPE ReportType, + _In_ USAGE UsagePage, + _In_ USHORT LinkCollection, + _In_ USAGE Usage, + _Out_ PHIDP_VALUE_CAPS ValueCaps, + _Inout_ PUSHORT ValueCapsLength, + _In_ PHIDP_PREPARSED_DATA PreparsedData); + +_Must_inspect_result_ HIDAPI NTSTATUS NTAPI HidP_GetUsages( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - OUT USAGE *UsageList, - IN OUT ULONG *UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength); - + _In_ HIDP_REPORT_TYPE ReportType, + _In_ USAGE UsagePage, + _In_ USHORT LinkCollection, + _Out_writes_to_(*UsageLength, *UsageLength) USAGE *UsageList, + _Inout_ ULONG *UsageLength, + _In_ PHIDP_PREPARSED_DATA PreparsedData, + _Out_writes_bytes_(ReportLength) PCHAR Report, + _In_ ULONG ReportLength); + +_Must_inspect_result_ +_IRQL_requires_max_(DISPATCH_LEVEL) HIDAPI NTSTATUS NTAPI HidP_GetUsagesEx( - IN HIDP_REPORT_TYPE ReportType, - IN USHORT LinkCollection, - OUT PUSAGE_AND_PAGE ButtonList, - IN OUT ULONG *UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength); - + _In_ HIDP_REPORT_TYPE ReportType, + _In_ USHORT LinkCollection, + _Inout_updates_to_(*UsageLength, *UsageLength) PUSAGE_AND_PAGE ButtonList, + _Inout_ ULONG *UsageLength, + _In_ PHIDP_PREPARSED_DATA PreparsedData, + _In_reads_bytes_(ReportLength) PCHAR Report, + _In_ ULONG ReportLength); + +_Must_inspect_result_ HIDAPI NTSTATUS NTAPI HidP_GetUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN USAGE Usage, - OUT PULONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength); - + _In_ HIDP_REPORT_TYPE ReportType, + _In_ USAGE UsagePage, + _In_ USHORT LinkCollection, + _In_ USAGE Usage, + _Out_ PULONG UsageValue, + _In_ PHIDP_PREPARSED_DATA PreparsedData, + _In_reads_bytes_(ReportLength) PCHAR Report, + _In_ ULONG ReportLength); + +_Must_inspect_result_ HIDAPI NTSTATUS NTAPI HidP_GetUsageValueArray( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - OUT PCHAR UsageValue, - IN USHORT UsageValueByteLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength); + _In_ HIDP_REPORT_TYPE ReportType, + _In_ USAGE UsagePage, + _In_ USHORT LinkCollection, + _In_ USAGE Usage, + _Inout_updates_bytes_(UsageValueByteLength) PCHAR UsageValue, + _In_ USHORT UsageValueByteLength, + _In_ PHIDP_PREPARSED_DATA PreparsedData, + _In_reads_bytes_(ReportLength) PCHAR Report, + _In_ ULONG ReportLength); #if !defined(_HIDPI_NO_FUNCTION_MACROS_) @@ -451,15 +472,17 @@ #endif /* _HIDPI_NO_FUNCTION_MACROS_ */ +_Must_inspect_result_ +_IRQL_requires_max_(DISPATCH_LEVEL) HIDAPI NTSTATUS NTAPI HidP_InitializeReportForID( - IN HIDP_REPORT_TYPE ReportType, - IN UCHAR ReportID, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength); + _In_ HIDP_REPORT_TYPE ReportType, + _In_ UCHAR ReportID, + _In_ PHIDP_PREPARSED_DATA PreparsedData, + _Out_writes_bytes_(ReportLength) PCHAR Report, + _In_ ULONG ReportLength); #if !defined(_HIDPI_NO_FUNCTION_MACROS_) @@ -473,20 +496,22 @@ #endif /* _HIDPI_NO_FUNCTION_MACROS_ */ +_IRQL_requires_max_(DISPATCH_LEVEL) HIDAPI ULONG NTAPI HidP_MaxDataListLength( - IN HIDP_REPORT_TYPE ReportType, - IN PHIDP_PREPARSED_DATA PreparsedData); - + _In_ HIDP_REPORT_TYPE ReportType, + _In_ PHIDP_PREPARSED_DATA PreparsedData); + +_IRQL_requires_max_(PASSIVE_LEVEL) HIDAPI ULONG NTAPI HidP_MaxUsageListLength( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage OPTIONAL, - IN PHIDP_PREPARSED_DATA PreparsedData); + _In_ HIDP_REPORT_TYPE ReportType, + _In_ USAGE UsagePage, + _In_ PHIDP_PREPARSED_DATA PreparsedData); #if !defined(_HIDPI_NO_FUNCTION_MACROS_) @@ -507,69 +532,74 @@ #endif /* _HIDPI_NO_FUNCTION_MACROS_ */ +_Must_inspect_result_ HIDAPI NTSTATUS NTAPI HidP_SetData( - IN HIDP_REPORT_TYPE ReportType, - IN PHIDP_DATA DataList, - IN OUT PULONG DataLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength); - + _In_ HIDP_REPORT_TYPE ReportType, + _Inout_updates_to_(*DataLength, *DataLength) PHIDP_DATA DataList, + _Inout_ PULONG DataLength, + _In_ PHIDP_PREPARSED_DATA PreparsedData, + _In_reads_bytes_(ReportLength) PCHAR Report, + _In_ ULONG ReportLength); + +_Must_inspect_result_ HIDAPI NTSTATUS NTAPI HidP_SetScaledUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - IN LONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength); - + _In_ HIDP_REPORT_TYPE ReportType, + _In_ USAGE UsagePage, + _In_ USHORT LinkCollection, + _In_ USAGE Usage, + _In_ LONG UsageValue, + _In_ PHIDP_PREPARSED_DATA PreparsedData, + _Inout_updates_bytes_(ReportLength) PCHAR Report, + _In_ ULONG ReportLength); + +_Must_inspect_result_ HIDAPI NTSTATUS NTAPI HidP_SetUsages( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, /* Optional */ - IN PUSAGE UsageList, - IN OUT PULONG UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength); - + _In_ HIDP_REPORT_TYPE ReportType, + _In_ USAGE UsagePage, + _In_ USHORT LinkCollection, /* Optional */ + _Inout_updates_to_(*UsageLength, *UsageLength) PUSAGE UsageList, + _Inout_ PULONG UsageLength, + _In_ PHIDP_PREPARSED_DATA PreparsedData, + _In_reads_bytes_(ReportLength) PCHAR Report, + _In_ ULONG ReportLength); + +_Must_inspect_result_ HIDAPI NTSTATUS NTAPI HidP_SetUsageValue( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN USAGE Usage, - IN ULONG UsageValue, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength); - + _In_ HIDP_REPORT_TYPE ReportType, + _In_ USAGE UsagePage, + _In_ USHORT LinkCollection, + _In_ USAGE Usage, + _In_ ULONG UsageValue, + _In_ PHIDP_PREPARSED_DATA PreparsedData, + _Inout_updates_bytes_(ReportLength) PCHAR Report, + _In_ ULONG ReportLength); + +_Must_inspect_result_ HIDAPI NTSTATUS NTAPI HidP_SetUsageValueArray( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection OPTIONAL, - IN USAGE Usage, - IN PCHAR UsageValue, - IN USHORT UsageValueByteLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - OUT PCHAR Report, - IN ULONG ReportLength); + _In_ HIDP_REPORT_TYPE ReportType, + _In_ USAGE UsagePage, + _In_ USHORT LinkCollection, + _In_ USAGE Usage, + _In_reads_bytes_(UsageValueByteLength) PCHAR UsageValue, + _In_ USHORT UsageValueByteLength, + _In_ PHIDP_PREPARSED_DATA PreparsedData, + _Inout_updates_bytes_(ReportLength) PCHAR Report, + _In_ ULONG ReportLength); #if !defined(_HIDPI_NO_FUNCTION_MACROS_) @@ -590,41 +620,46 @@ #endif /* _HIDPI_NO_FUNCTION_MACROS_ */ +_Must_inspect_result_ HIDAPI NTSTATUS NTAPI HidP_UnsetUsages( - IN HIDP_REPORT_TYPE ReportType, - IN USAGE UsagePage, - IN USHORT LinkCollection, - IN PUSAGE UsageList, - IN OUT PULONG UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN OUT PCHAR Report, - IN ULONG ReportLength); - + _In_ HIDP_REPORT_TYPE ReportType, + _In_ USAGE UsagePage, + _In_opt_ USHORT LinkCollection, + _Inout_updates_to_(*UsageLength, *UsageLength) PUSAGE UsageList, + _Inout_ PULONG UsageLength, + _In_ PHIDP_PREPARSED_DATA PreparsedData, + _In_reads_bytes_(ReportLength) PCHAR Report, + _In_ ULONG ReportLength); + +_Must_inspect_result_ +_IRQL_requires_max_(PASSIVE_LEVEL) HIDAPI NTSTATUS NTAPI HidP_UsageAndPageListDifference( - IN PUSAGE_AND_PAGE PreviousUsageList, - IN PUSAGE_AND_PAGE CurrentUsageList, - OUT PUSAGE_AND_PAGE BreakUsageList, - OUT PUSAGE_AND_PAGE MakeUsageList, - IN ULONG UsageListLength); - + _In_reads_(UsageListLength) PUSAGE_AND_PAGE PreviousUsageList, + _In_reads_(UsageListLength) PUSAGE_AND_PAGE CurrentUsageList, + _Out_writes_(UsageListLength) PUSAGE_AND_PAGE BreakUsageList, + _Out_writes_(UsageListLength) PUSAGE_AND_PAGE MakeUsageList, + _In_ ULONG UsageListLength); + +_Must_inspect_result_ +_IRQL_requires_max_(PASSIVE_LEVEL) HIDAPI NTSTATUS NTAPI HidP_UsageListDifference( - IN PUSAGE PreviousUsageList, - IN PUSAGE CurrentUsageList, - OUT PUSAGE BreakUsageList, - OUT PUSAGE MakeUsageList, - IN ULONG UsageListLength); + _In_reads_(UsageListLength) PUSAGE PreviousUsageList, + _In_reads_(UsageListLength) PUSAGE CurrentUsageList, + _Out_writes_(UsageListLength) PUSAGE BreakUsageList, + _Out_writes_(UsageListLength) PUSAGE MakeUsageList, + _In_ ULONG UsageListLength); #ifdef __cplusplus } #endif -#endif /* __HIDPI_H */ +#endif /* __HIDPI_H__ */

1 0

[akhaldi] 59798: [PSDK] * Annotate mstcpip.h.
by akhaldi＠svn.reactos.org 23 Aug '13

23 Aug '13

Author: akhaldi Date: Fri Aug 23 15:26:52 2013 New Revision: 59798 URL: http://svn.reactos.org/svn/reactos?rev=59798&view=rev Log: [PSDK] * Annotate mstcpip.h. Modified: trunk/reactos/include/psdk/mstcpip.h Modified: trunk/reactos/include/psdk/mstcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mstcpip.h?rev… ============================================================================== --- trunk/reactos/include/psdk/mstcpip.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mstcpip.h [iso-8859-1] Fri Aug 23 15:26:52 2013 @@ -236,8 +236,8 @@ MSTCPIP_INLINE BOOLEAN IN4_ADDR_EQUAL( - IN CONST IN_ADDR *a, - IN CONST IN_ADDR *b) + _In_ CONST IN_ADDR *a, + _In_ CONST IN_ADDR *b) { return (BOOLEAN)(a->s_addr == b->s_addr); } @@ -245,8 +245,8 @@ MSTCPIP_INLINE BOOLEAN IN4_UNALIGNED_ADDR_EQUAL( - IN CONST IN_ADDR UNALIGNED *a, - IN CONST IN_ADDR UNALIGNED *b) + _In_ CONST IN_ADDR UNALIGNED *a, + _In_ CONST IN_ADDR UNALIGNED *b) { return (BOOLEAN)(a->s_addr == b->s_addr); } @@ -254,7 +254,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_ADDR_UNSPECIFIED( - IN CONST IN_ADDR *a) + _In_ CONST IN_ADDR *a) { return (BOOLEAN)(a->s_addr == IN4ADDR_ANY); } @@ -262,7 +262,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_UNALIGNED_ADDR_UNSPECIFIED( - IN CONST IN_ADDR UNALIGNED *a) + _In_ CONST IN_ADDR UNALIGNED *a) { return (BOOLEAN)(a->s_addr == IN4ADDR_ANY); } @@ -270,7 +270,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_ADDR_LOOPBACK( - IN CONST IN_ADDR *a) + _In_ CONST IN_ADDR *a) { return (BOOLEAN)(*((PUCHAR) a) == 0x7f); } @@ -278,7 +278,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_UNALIGNED_ADDR_LOOPBACK( - IN CONST IN_ADDR UNALIGNED *a) + _In_ CONST IN_ADDR UNALIGNED *a) { return (BOOLEAN)(*((PUCHAR) a) == 0x7f); } @@ -286,7 +286,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_ADDR_BROADCAST( - IN CONST IN_ADDR *a) + _In_ CONST IN_ADDR *a) { return (BOOLEAN)(a->s_addr == IN4ADDR_BROADCAST); } @@ -294,7 +294,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_UNALIGNED_ADDR_BROADCAST( - IN CONST IN_ADDR UNALIGNED *a) + _In_ CONST IN_ADDR UNALIGNED *a) { return (BOOLEAN)(a->s_addr == IN4ADDR_BROADCAST); } @@ -302,7 +302,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_ADDR_MULTICAST( - IN CONST IN_ADDR *a) + _In_ CONST IN_ADDR *a) { return (BOOLEAN)IN4_MULTICAST(a->s_addr); } @@ -310,7 +310,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_UNALIGNED_ADDR_MULTICAST( - IN CONST IN_ADDR UNALIGNED *a) + _In_ CONST IN_ADDR UNALIGNED *a) { return (BOOLEAN)IN4_MULTICAST(a->s_addr); } @@ -318,7 +318,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_ADDR_LINKLOCAL( - IN CONST IN_ADDR *a) + _In_ CONST IN_ADDR *a) { return (BOOLEAN)((a->s_addr & 0xffff) == 0xfea9); } @@ -326,7 +326,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_UNALIGNED_ADDR_LINKLOCAL( - IN CONST IN_ADDR UNALIGNED *a) + _In_ CONST IN_ADDR UNALIGNED *a) { return (BOOLEAN)((a->s_addr & 0xffff) == 0xfea9); // 169.254/16 } @@ -334,7 +334,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_ADDR_SITELOCAL( - IN CONST IN_ADDR *a) + _In_ CONST IN_ADDR *a) { UNREFERENCED_PARAMETER(a); return FALSE; @@ -344,7 +344,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_ADDR_RFC1918( - IN CONST IN_ADDR *a) + _In_ CONST IN_ADDR *a) { return (BOOLEAN)(((a->s_addr & 0x00ff) == 0x0a) || ((a->s_addr & 0xf0ff) == 0x10ac) || @@ -354,7 +354,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_UNALIGNED_ADDR_RFC1918( - IN CONST IN_ADDR UNALIGNED *a) + _In_ CONST IN_ADDR UNALIGNED *a) { IN_ADDR Ipv4Address = *a; return IN4_IS_ADDR_RFC1918(&Ipv4Address); @@ -363,7 +363,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_ADDR_MC_LINKLOCAL( - IN CONST IN_ADDR *a) + _In_ CONST IN_ADDR *a) { return (BOOLEAN)((a->s_addr & 0xffffff) == 0xe0); } @@ -371,7 +371,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_ADDR_MC_ADMINLOCAL( - IN CONST IN_ADDR *a) + _In_ CONST IN_ADDR *a) { return (BOOLEAN)((a->s_addr & 0xffff) == 0xffef); } @@ -379,7 +379,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_ADDR_MC_SITELOCAL( - IN CONST IN_ADDR *a) + _In_ CONST IN_ADDR *a) { return (BOOLEAN)((a->s_addr & 0xff) == 0xef) && !IN4_IS_ADDR_MC_ADMINLOCAL(a); @@ -388,9 +388,9 @@ MSTCPIP_INLINE VOID IN4ADDR_SETSOCKADDR( - OUT PSOCKADDR_IN a, - IN CONST IN_ADDR *addr, - IN USHORT port) + _Out_ PSOCKADDR_IN a, + _In_ CONST IN_ADDR *addr, + _In_ USHORT port) { a->sin_family = AF_INET; a->sin_port = port; @@ -401,7 +401,7 @@ MSTCPIP_INLINE VOID IN4ADDR_SETANY( - OUT PSOCKADDR_IN a) + _Out_ PSOCKADDR_IN a) { a->sin_family = AF_INET; a->sin_port = 0; @@ -412,7 +412,7 @@ MSTCPIP_INLINE VOID IN4ADDR_SETLOOPBACK( - OUT PSOCKADDR_IN a) + _Out_ PSOCKADDR_IN a) { a->sin_family = AF_INET; a->sin_port = 0; @@ -423,7 +423,7 @@ MSTCPIP_INLINE BOOLEAN IN4ADDR_ISANY( - IN CONST SOCKADDR_IN *a) + _In_ CONST SOCKADDR_IN *a) { ASSERT(a->sin_family == AF_INET); return IN4_IS_ADDR_UNSPECIFIED(&a->sin_addr); @@ -432,7 +432,7 @@ MSTCPIP_INLINE BOOLEAN IN4ADDR_ISLOOPBACK( - IN CONST SOCKADDR_IN *a) + _In_ CONST SOCKADDR_IN *a) { ASSERT(a->sin_family == AF_INET); return IN4_IS_ADDR_LOOPBACK(&a->sin_addr); @@ -441,7 +441,7 @@ MSTCPIP_INLINE SCOPE_ID IN4ADDR_SCOPE_ID( - IN CONST SOCKADDR_IN *a) + _In_ CONST SOCKADDR_IN *a) { SCOPE_ID UnspecifiedScopeId = {{{0}}}; UNREFERENCED_PARAMETER(a); @@ -451,8 +451,8 @@ MSTCPIP_INLINE BOOLEAN IN4ADDR_ISEQUAL( - IN CONST SOCKADDR_IN *a, - IN CONST SOCKADDR_IN *b) + _In_ CONST SOCKADDR_IN *a, + _In_ CONST SOCKADDR_IN *b) { ASSERT(a->sin_family == AF_INET); return (BOOLEAN)(IN4ADDR_SCOPE_ID(a).Value == IN4ADDR_SCOPE_ID(b).Value && @@ -462,7 +462,7 @@ MSTCPIP_INLINE BOOLEAN IN4ADDR_ISUNSPECIFIED( - IN CONST SOCKADDR_IN *a) + _In_ CONST SOCKADDR_IN *a) { ASSERT(a->sin_family == AF_INET); return (BOOLEAN)(IN4ADDR_SCOPE_ID(a).Value == 0 && @@ -475,7 +475,7 @@ MSTCPIP_INLINE SCOPE_LEVEL Ipv4UnicastAddressScope( - IN CONST UCHAR *Address) + _In_ CONST UCHAR *Address) { IN_ADDR Ipv4Address; @@ -493,7 +493,7 @@ MSTCPIP_INLINE SCOPE_LEVEL Ipv4MulticastAddressScope( - IN CONST UCHAR *Address) + _In_ CONST UCHAR *Address) { IN_ADDR Ipv4Address; @@ -515,9 +515,9 @@ MSTCPIP_INLINE SCOPE_LEVEL Ipv4AddressScope( - IN CONST UCHAR *Address) -{ - IN CONST IN_ADDR Ipv4Address = *(CONST IN_ADDR UNALIGNED *)Address; + _In_ CONST UCHAR *Address) +{ + CONST IN_ADDR Ipv4Address = *(CONST IN_ADDR UNALIGNED *)Address; if (IN4_IS_ADDR_BROADCAST(&Ipv4Address)) { return ScopeLevelLink; @@ -531,7 +531,7 @@ MSTCPIP_INLINE NL_ADDRESS_TYPE Ipv4AddressType( - IN CONST UCHAR *Address) + _In_ CONST UCHAR *Address) { IN_ADDR Ipv4Address = *(CONST IN_ADDR UNALIGNED *) Address; @@ -554,8 +554,8 @@ MSTCPIP_INLINE VOID IN4_UNCANONICALIZE_SCOPE_ID( - IN CONST IN_ADDR *Address, - IN OUT SCOPE_ID *ScopeId) + _In_ CONST IN_ADDR *Address, + _Inout_ SCOPE_ID *ScopeId) { SCOPE_LEVEL ScopeLevel = Ipv4AddressScope((CONST UCHAR *)Address); @@ -570,7 +570,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_ADDR_6TO4ELIGIBLE( - IN CONST IN_ADDR *a) + _In_ CONST IN_ADDR *a) { return (BOOLEAN)((Ipv4AddressType((CONST UCHAR *) a) == NlatUnicast) && !(IN4_IS_ADDR_LOOPBACK(a) || @@ -582,7 +582,7 @@ MSTCPIP_INLINE BOOLEAN IN4_IS_UNALIGNED_ADDR_6TO4ELIGIBLE( - IN CONST IN_ADDR UNALIGNED *a) + _In_ CONST IN_ADDR UNALIGNED *a) { IN_ADDR Ipv4Address = *a; return IN4_IS_ADDR_6TO4ELIGIBLE(&Ipv4Address); @@ -597,9 +597,9 @@ MSTCPIP_INLINE BOOLEAN IN6_PREFIX_EQUAL( - IN CONST IN6_ADDR *a, - IN CONST IN6_ADDR *b, - IN UINT8 len) + _In_ CONST IN6_ADDR *a, + _In_ CONST IN6_ADDR *b, + _In_ UINT8 len) { UINT8 Bytes = len / 8; UINT8 Bits = len % 8; @@ -613,7 +613,7 @@ MSTCPIP_INLINE BOOLEAN IN6_IS_ADDR_ALLNODESONNODE( - IN CONST IN6_ADDR *a) + _In_ CONST IN6_ADDR *a) { return IN6_ADDR_EQUAL(a, &in6addr_allnodesonnode); } @@ -621,7 +621,7 @@ MSTCPIP_INLINE BOOLEAN IN6_IS_ADDR_ALLNODESONLINK( - IN CONST IN6_ADDR *a) + _In_ CONST IN6_ADDR *a) { return IN6_ADDR_EQUAL(a, &in6addr_allnodesonlink); } @@ -629,7 +629,7 @@ MSTCPIP_INLINE BOOLEAN IN6_IS_ADDR_ALLROUTERSONLINK( - IN CONST IN6_ADDR *a) + _In_ CONST IN6_ADDR *a) { return IN6_ADDR_EQUAL(a, &in6addr_allroutersonlink); } @@ -637,7 +637,7 @@ MSTCPIP_INLINE BOOLEAN IN6_IS_ADDR_SOLICITEDNODE( - IN CONST IN6_ADDR *a) + _In_ CONST IN6_ADDR *a) { return IN6_PREFIX_EQUAL(a, &in6addr_solicitednodemulticastprefix, IN6ADDR_SOLICITEDNODEMULTICASTPREFIX_LENGTH); @@ -646,7 +646,7 @@ MSTCPIP_INLINE BOOLEAN IN6_IS_ADDR_ISATAP( - IN CONST IN6_ADDR *a) + _In_ CONST IN6_ADDR *a) { return (BOOLEAN)(((a->s6_words[4] & 0xfffd) == 0x0000) && (a->s6_words[5] == 0xfe5e)); @@ -655,7 +655,7 @@ MSTCPIP_INLINE BOOLEAN IN6_IS_ADDR_6TO4( - IN CONST IN6_ADDR *a) + _In_ CONST IN6_ADDR *a) { C_ASSERT(IN6ADDR_6TO4PREFIX_LENGTH == RTL_BITS_OF(USHORT)); return (BOOLEAN)(a->s6_words[0] == in6addr_6to4prefix.s6_words[0]); @@ -664,7 +664,7 @@ MSTCPIP_INLINE BOOLEAN IN6_IS_ADDR_TEREDO( - IN CONST IN6_ADDR *a) + _In_ CONST IN6_ADDR *a) { C_ASSERT(IN6ADDR_TEREDOPREFIX_LENGTH == 2 * RTL_BITS_OF(USHORT)); return (BOOLEAN) @@ -677,7 +677,7 @@ MSTCPIP_INLINE BOOLEAN IN6ADDR_ISV4MAPPED( - IN CONST SOCKADDR_IN6 *a) + _In_ CONST SOCKADDR_IN6 *a) { ASSERT(a->sin6_family == AF_INET6); return IN6_IS_ADDR_V4MAPPED(&a->sin6_addr); @@ -686,7 +686,7 @@ MSTCPIP_INLINE BOOLEAN IN6ADDR_ISISATAP( - IN CONST SOCKADDR_IN6 *a) + _In_ CONST SOCKADDR_IN6 *a) { ASSERT(a->sin6_family == AF_INET6); return IN6_IS_ADDR_ISATAP(&a->sin6_addr); @@ -695,7 +695,7 @@ MSTCPIP_INLINE BOOLEAN IN6ADDR_IS6TO4( - IN CONST SOCKADDR_IN6 *a) + _In_ CONST SOCKADDR_IN6 *a) { ASSERT(a->sin6_family == AF_INET6); return IN6_IS_ADDR_6TO4(&a->sin6_addr); @@ -704,7 +704,7 @@ MSTCPIP_INLINE BOOLEAN IN6ADDR_ISTEREDO( - IN CONST SOCKADDR_IN6 *a) + _In_ CONST SOCKADDR_IN6 *a) { ASSERT(a->sin6_family == AF_INET6); return IN6_IS_ADDR_TEREDO(&a->sin6_addr); @@ -713,7 +713,7 @@ MSTCPIP_INLINE CONST UCHAR* IN6_GET_ADDR_V4MAPPED( - IN CONST IN6_ADDR *Ipv6Address) + _In_ CONST IN6_ADDR *Ipv6Address) { return (CONST UCHAR *) (Ipv6Address->s6_words + 6); } @@ -721,7 +721,7 @@ MSTCPIP_INLINE CONST UCHAR* IN6_GET_ADDR_V4COMPAT( - IN CONST IN6_ADDR *Ipv6Address) + _In_ CONST IN6_ADDR *Ipv6Address) { return (CONST UCHAR *) (Ipv6Address->s6_words + 6); } @@ -729,7 +729,7 @@ MSTCPIP_INLINE CONST UCHAR* IN6_EXTRACT_V4ADDR_FROM_ISATAP( - IN CONST IN6_ADDR *Ipv6Address) + _In_ CONST IN6_ADDR *Ipv6Address) { return (CONST UCHAR *) (Ipv6Address->s6_words + 6); } @@ -737,7 +737,7 @@ MSTCPIP_INLINE CONST UCHAR* IN6_EXTRACT_V4ADDR_FROM_6TO4( - IN CONST IN6_ADDR *Ipv6Address) + _In_ CONST IN6_ADDR *Ipv6Address) { return (CONST UCHAR *) (Ipv6Address->s6_words + 1); } @@ -745,8 +745,8 @@ MSTCPIP_INLINE VOID IN6_SET_ADDR_V4MAPPED( - OUT PIN6_ADDR a6, - IN CONST IN_ADDR* a4) + _Out_ PIN6_ADDR a6, + _In_ CONST IN_ADDR* a4) { *a6 = in6addr_v4mappedprefix; a6->s6_bytes[12] = ((CONST UCHAR *) a4)[0]; @@ -758,8 +758,8 @@ MSTCPIP_INLINE VOID IN6_SET_ADDR_V4COMPAT( - OUT PIN6_ADDR a6, - IN CONST IN_ADDR* a4) + _Out_ PIN6_ADDR a6, + _In_ CONST IN_ADDR* a4) { *a6 = in6addr_any; a6->s6_bytes[12] = ((CONST UCHAR *) a4)[0]; @@ -771,8 +771,8 @@ MSTCPIP_INLINE VOID IN6_SET_ADDR_SOLICITEDNODE( - OUT PIN6_ADDR Multicast, - IN CONST IN6_ADDR *Unicast) + _Out_ PIN6_ADDR Multicast, + _In_ CONST IN6_ADDR *Unicast) { *Multicast = in6addr_solicitednodemulticastprefix; Multicast->s6_bytes[13] = Unicast->s6_bytes[13]; @@ -783,8 +783,8 @@ MSTCPIP_INLINE VOID IN6_SET_ISATAP_IDENTIFIER( - IN OUT IN6_ADDR *Ipv6Address, - IN CONST IN_ADDR *Ipv4Address) + _Inout_ IN6_ADDR *Ipv6Address, + _In_ CONST IN_ADDR *Ipv4Address) { if (IN4_IS_ADDR_6TO4ELIGIBLE(Ipv4Address)) { Ipv6Address->s6_words[4] = 0x0002; @@ -798,8 +798,8 @@ MSTCPIP_INLINE VOID IN6_SET_6TO4_PREFIX( - IN OUT IN6_ADDR *Ipv6Address, - IN CONST IN_ADDR *Ipv4Address) + _Inout_ IN6_ADDR *Ipv6Address, + _In_ CONST IN_ADDR *Ipv4Address) { Ipv6Address->s6_words[0] = 0x0220; *((UNALIGNED IN_ADDR *) (Ipv6Address->s6_words + 1)) = *Ipv4Address; @@ -809,7 +809,7 @@ MSTCPIP_INLINE SCOPE_LEVEL Ipv6UnicastAddressScope( - IN CONST UCHAR *Address) + _In_ CONST UCHAR *Address) { IN6_ADDR Ipv6Address; @@ -830,7 +830,7 @@ MSTCPIP_INLINE SCOPE_LEVEL IN6_MULTICAST_SCOPE( - IN CONST UCHAR *Address) + _In_ CONST UCHAR *Address) { PIN6_ADDR Ipv6Address = (PIN6_ADDR) Address; return (SCOPE_LEVEL)(Ipv6Address->s6_bytes[1] & 0xf); @@ -839,7 +839,7 @@ MSTCPIP_INLINE SCOPE_LEVEL Ipv6AddressScope( - IN CONST UCHAR *Address) + _In_ CONST UCHAR *Address) { if (IN6_IS_ADDR_MULTICAST((CONST IN6_ADDR *) Address)) { return IN6_MULTICAST_SCOPE(Address); @@ -851,7 +851,7 @@ MSTCPIP_INLINE NL_ADDRESS_TYPE Ipv6AddressType( - IN CONST UCHAR *Address) + _In_ CONST UCHAR *Address) { CONST IN6_ADDR *Ipv6Address = (CONST IN6_ADDR *) Address; CONST UCHAR *Ipv4Address; @@ -879,8 +879,8 @@ MSTCPIP_INLINE VOID IN6_UNCANONICALIZE_SCOPE_ID( - IN CONST IN6_ADDR *Address, - IN OUT SCOPE_ID *ScopeId) + _In_ CONST IN6_ADDR *Address, + _Inout_ SCOPE_ID *ScopeId) { SCOPE_LEVEL ScopeLevel = Ipv6AddressScope((CONST UCHAR *)Address); @@ -897,10 +897,10 @@ MSTCPIP_INLINE VOID IN6ADDR_SETSOCKADDR( - OUT PSOCKADDR_IN6 a, - IN CONST IN6_ADDR *addr, - IN SCOPE_ID scope, - IN USHORT port) + _Out_ PSOCKADDR_IN6 a, + _In_ CONST IN6_ADDR *addr, + _In_ SCOPE_ID scope, + _In_ USHORT port) { a->sin6_family = AF_INET6; a->sin6_port = port; @@ -913,10 +913,10 @@ MSTCPIP_INLINE VOID IN6ADDR_SETV4MAPPED( - OUT PSOCKADDR_IN6 a6, - IN CONST IN_ADDR* a4, - IN SCOPE_ID scope, - IN USHORT port) + _Out_ PSOCKADDR_IN6 a6, + _In_ CONST IN_ADDR* a4, + _In_ SCOPE_ID scope, + _In_ USHORT port) { a6->sin6_family = AF_INET6; a6->sin6_port = port; @@ -931,9 +931,9 @@ MSTCPIP_INLINE BOOLEAN INET_ADDR_EQUAL( - IN ADDRESS_FAMILY af, - IN CONST VOID* a, - IN CONST VOID* b) + _In_ ADDRESS_FAMILY af, + _In_ CONST VOID* a, + _In_ CONST VOID* b) { if (af == AF_INET6) { return IN6_ADDR_EQUAL((CONST IN6_ADDR*)a, (CONST IN6_ADDR*)b); @@ -946,9 +946,9 @@ MSTCPIP_INLINE BOOLEAN INET_UNALIGNED_ADDR_EQUAL( - IN ADDRESS_FAMILY af, - IN CONST VOID* a, - IN CONST VOID* b) + _In_ ADDRESS_FAMILY af, + _In_ CONST VOID* a, + _In_ CONST VOID* b) { if (af == AF_INET6) { return IN6_ADDR_EQUAL((CONST IN6_ADDR*)a, (CONST IN6_ADDR*)b); @@ -961,8 +961,8 @@ MSTCPIP_INLINE BOOLEAN INET_IS_ADDR_UNSPECIFIED( - IN ADDRESS_FAMILY af, - IN CONST VOID* a) + _In_ ADDRESS_FAMILY af, + _In_ CONST VOID* a) { if (af == AF_INET6) { return IN6_IS_ADDR_UNSPECIFIED((CONST IN6_ADDR*)a); @@ -975,8 +975,8 @@ MSTCPIP_INLINE BOOLEAN INET_IS_UNALIGNED_ADDR_UNSPECIFIED( - IN ADDRESS_FAMILY af, - IN CONST VOID* a) + _In_ ADDRESS_FAMILY af, + _In_ CONST VOID* a) { if (af == AF_INET6) { return IN6_IS_ADDR_UNSPECIFIED((CONST IN6_ADDR*)a); @@ -989,8 +989,8 @@ MSTCPIP_INLINE BOOLEAN INET_IS_ADDR_LOOPBACK( - IN ADDRESS_FAMILY af, - IN CONST VOID* a) + _In_ ADDRESS_FAMILY af, + _In_ CONST VOID* a) { if (af == AF_INET6) { return IN6_IS_ADDR_LOOPBACK((CONST IN6_ADDR*)a); @@ -1003,8 +1003,8 @@ MSTCPIP_INLINE BOOLEAN INET_IS_ADDR_BROADCAST( - IN ADDRESS_FAMILY af, - IN CONST VOID* a) + _In_ ADDRESS_FAMILY af, + _In_ CONST VOID* a) { if (af == AF_INET6) { return FALSE; @@ -1017,8 +1017,8 @@ MSTCPIP_INLINE BOOLEAN INET_IS_ADDR_MULTICAST( - IN ADDRESS_FAMILY af, - IN CONST VOID* a) + _In_ ADDRESS_FAMILY af, + _In_ CONST VOID* a) { if (af == AF_INET6) { return IN6_IS_ADDR_MULTICAST((CONST IN6_ADDR*)a); @@ -1031,7 +1031,7 @@ MSTCPIP_INLINE CONST UCHAR* INET_ADDR_UNSPECIFIED( - IN ADDRESS_FAMILY af) + _In_ ADDRESS_FAMILY af) { if (af == AF_INET6) { return (CONST UCHAR*)&in6addr_any; @@ -1044,9 +1044,9 @@ MSTCPIP_INLINE VOID INET_SET_ADDRESS( - IN ADDRESS_FAMILY Family, - OUT PUCHAR Address, - IN CONST UCHAR *Value) + _In_ ADDRESS_FAMILY Family, + _Out_ PUCHAR Address, + _In_ CONST UCHAR *Value) { if (Family == AF_INET6) { *((PIN6_ADDR)Address) = *((PIN6_ADDR)Value); @@ -1059,7 +1059,7 @@ MSTCPIP_INLINE SIZE_T INET_ADDR_LENGTH( - IN ADDRESS_FAMILY af) + _In_ ADDRESS_FAMILY af) { if (af == AF_INET6) { return sizeof(IN6_ADDR); @@ -1072,7 +1072,7 @@ MSTCPIP_INLINE SIZE_T INET_SOCKADDR_LENGTH( - IN ADDRESS_FAMILY af) + _In_ ADDRESS_FAMILY af) { if (af == AF_INET6) { return sizeof(SOCKADDR_IN6); @@ -1086,11 +1086,11 @@ MSTCPIP_INLINE VOID INETADDR_SETSOCKADDR( - IN ADDRESS_FAMILY af, - OUT PSOCKADDR a, - IN CONST VOID* addr, - IN SCOPE_ID scope, - IN USHORT port) + _In_ ADDRESS_FAMILY af, + _Out_ PSOCKADDR a, + _In_ CONST VOID* addr, + _In_ SCOPE_ID scope, + _In_ USHORT port) { if (af == AF_INET6) { IN6ADDR_SETSOCKADDR((PSOCKADDR_IN6) a, (CONST IN6_ADDR *) addr, scope, port); @@ -1105,7 +1105,7 @@ MSTCPIP_INLINE VOID INETADDR_SETANY( - OUT PSOCKADDR a) + _Inout_ PSOCKADDR a) { if (a->sa_family == AF_INET6) { IN6ADDR_SETANY((PSOCKADDR_IN6)a); @@ -1118,7 +1118,7 @@ MSTCPIP_INLINE VOID INETADDR_SETLOOPBACK( - OUT PSOCKADDR a) + _Inout_ PSOCKADDR a) { if (a->sa_family == AF_INET6) { IN6ADDR_SETLOOPBACK((PSOCKADDR_IN6)a); @@ -1131,7 +1131,7 @@ MSTCPIP_INLINE BOOLEAN INETADDR_ISANY( - IN CONST SOCKADDR *a) + _In_ CONST SOCKADDR *a) { if (a->sa_family == AF_INET6) { return IN6ADDR_ISANY((CONST SOCKADDR_IN6*)a); @@ -1144,7 +1144,7 @@ MSTCPIP_INLINE BOOLEAN INETADDR_ISLOOPBACK( - IN CONST SOCKADDR *a) + _In_ CONST SOCKADDR *a) { if (a->sa_family == AF_INET6) { return IN6ADDR_ISLOOPBACK((CONST SOCKADDR_IN6*)a); @@ -1156,7 +1156,8 @@ MSTCPIP_INLINE BOOLEAN -INETADDR_ISV4MAPPED(IN CONST SOCKADDR *a) +INETADDR_ISV4MAPPED( + _In_ CONST SOCKADDR *a) { if (a->sa_family == AF_INET6) { return IN6ADDR_ISV4MAPPED((CONST SOCKADDR_IN6*)a); @@ -1168,11 +1169,11 @@ MSTCPIP_INLINE BOOLEAN NL_ADDR_EQUAL( - IN ADDRESS_FAMILY af, - IN SCOPE_ID sa, - IN CONST UCHAR* aa, - IN SCOPE_ID sb, - IN CONST UCHAR* ab) + _In_ ADDRESS_FAMILY af, + _In_ SCOPE_ID sa, + _In_ CONST UCHAR* aa, + _In_ SCOPE_ID sb, + _In_ CONST UCHAR* ab) { return (BOOLEAN)((sa.Value == sb.Value) && INET_ADDR_EQUAL(af, aa, ab)); } @@ -1180,9 +1181,9 @@ MSTCPIP_INLINE BOOLEAN NL_IS_ADDR_UNSPECIFIED( - IN ADDRESS_FAMILY af, - IN SCOPE_ID s, - IN CONST UCHAR* a) + _In_ ADDRESS_FAMILY af, + _In_ SCOPE_ID s, + _In_ CONST UCHAR* a) { return (BOOLEAN)((s.Value == 0) && INET_IS_ADDR_UNSPECIFIED(af, a)); } @@ -1190,8 +1191,8 @@ MSTCPIP_INLINE BOOLEAN INETADDR_ISEQUAL( - IN CONST SOCKADDR *a, - IN CONST SOCKADDR *b) + _In_ CONST SOCKADDR *a, + _In_ CONST SOCKADDR *b) { if (a->sa_family == AF_INET6) { return (BOOLEAN) (b->sa_family == AF_INET6 && @@ -1206,7 +1207,7 @@ MSTCPIP_INLINE BOOLEAN INETADDR_ISUNSPECIFIED( - IN CONST SOCKADDR *a) + _In_ CONST SOCKADDR *a) { if (a->sa_family == AF_INET6) { return IN6ADDR_ISUNSPECIFIED((CONST SOCKADDR_IN6*)a); @@ -1220,7 +1221,7 @@ MSTCPIP_INLINE SCOPE_ID INETADDR_SCOPE_ID( - IN CONST SOCKADDR *a) + _In_ CONST SOCKADDR *a) { if (a->sa_family == AF_INET6) { return ((CONST SOCKADDR_IN6*)a)->sin6_scope_struct; @@ -1234,7 +1235,7 @@ MSTCPIP_INLINE USHORT INETADDR_PORT( - IN CONST SOCKADDR *a) + _In_ CONST SOCKADDR *a) { if (a->sa_family == AF_INET6) { return ((CONST SOCKADDR_IN6*)a)->sin6_port; @@ -1247,7 +1248,7 @@ MSTCPIP_INLINE PUCHAR INETADDR_ADDRESS( - IN CONST SOCKADDR* a) + _In_ CONST SOCKADDR* a) { if (a->sa_family == AF_INET6) { return (PUCHAR)&((PSOCKADDR_IN6)a)->sin6_addr; @@ -1260,8 +1261,8 @@ MSTCPIP_INLINE VOID INETADDR_SET_PORT( - IN OUT PSOCKADDR a, - IN USHORT Port) + _Inout_ PSOCKADDR a, + _In_ USHORT Port) { SS_PORT(a) = Port; } @@ -1269,8 +1270,8 @@ MSTCPIP_INLINE VOID INETADDR_SET_ADDRESS( - IN OUT PSOCKADDR a, - IN CONST UCHAR *Address) + _Inout_ PSOCKADDR a, + _In_ CONST UCHAR *Address) { if (a->sa_family == AF_INET6) { ((PSOCKADDR_IN6)a)->sin6_addr = *((CONST IN6_ADDR*)Address); @@ -1283,9 +1284,9 @@ MSTCPIP_INLINE VOID INET_UNCANONICALIZE_SCOPE_ID( - IN ADDRESS_FAMILY AddressFamily, - IN CONST UCHAR *Address, - IN OUT SCOPE_ID *ScopeId) + _In_ ADDRESS_FAMILY AddressFamily, + _In_ CONST UCHAR *Address, + _Inout_ SCOPE_ID *ScopeId) { if (AddressFamily == AF_INET6) { IN6_UNCANONICALIZE_SCOPE_ID((CONST IN6_ADDR*) Address, ScopeId); @@ -1307,69 +1308,69 @@ PSTR NTAPI RtlIpv4AddressToStringA( - IN const struct in_addr *Addr, - OUT PSTR S); + _In_ const struct in_addr *Addr, + _Out_writes_(16) PSTR S); NTSYSAPI LONG NTAPI RtlIpv4AddressToStringExA( - IN const struct in_addr *Address, - IN USHORT Port, - OUT PSTR AddressString, - IN OUT PULONG AddressStringLength); + _In_ const struct in_addr *Address, + _In_ USHORT Port, + _Out_writes_to_(*AddressStringLength, *AddressStringLength) PSTR AddressString, + _Inout_ PULONG AddressStringLength); NTSYSAPI PWSTR NTAPI RtlIpv4AddressToStringW( - IN const struct in_addr *Addr, - OUT PWSTR S); + _In_ const struct in_addr *Addr, + _Out_writes_(16) PWSTR S); NTSYSAPI LONG NTAPI RtlIpv4AddressToStringExW( - IN const struct in_addr *Address, - IN USHORT Port, - OUT PWSTR AddressString, - IN OUT PULONG AddressStringLength); + _In_ const struct in_addr *Address, + _In_ USHORT Port, + _Out_writes_to_(*AddressStringLength, *AddressStringLength) PWSTR AddressString, + _Inout_ PULONG AddressStringLength); NTSYSAPI LONG NTAPI RtlIpv4StringToAddressA( - IN PCSTR S, - IN BOOLEAN Strict, - OUT PCSTR *Terminator, - OUT struct in_addr *Addr); + _In_ PCSTR S, + _In_ BOOLEAN Strict, + _Out_ PCSTR *Terminator, + _Out_ struct in_addr *Addr); NTSYSAPI LONG NTAPI RtlIpv4StringToAddressExA( - IN PCSTR AddressString, - IN BOOLEAN Strict, - OUT struct in_addr *Address, - OUT PUSHORT Port); + _In_ PCSTR AddressString, + _In_ BOOLEAN Strict, + _Out_ struct in_addr *Address, + _Out_ PUSHORT Port); NTSYSAPI LONG NTAPI RtlIpv4StringToAddressW( - IN PCWSTR S, - IN BOOLEAN Strict, - OUT LPCWSTR *Terminator, - OUT struct in_addr *Addr); + _In_ PCWSTR S, + _In_ BOOLEAN Strict, + _Out_ LPCWSTR *Terminator, + _Out_ struct in_addr *Addr); NTSYSAPI LONG NTAPI RtlIpv4StringToAddressExW( - IN PCWSTR AddressString, - IN BOOLEAN Strict, - OUT struct in_addr *Address, - OUT PUSHORT Port); + _In_ PCWSTR AddressString, + _In_ BOOLEAN Strict, + _Out_ struct in_addr *Address, + _Out_ PUSHORT Port); #ifdef UNICODE #define RtlIpv4AddressToString RtlIpv4AddressToStringW @@ -1391,69 +1392,69 @@ PSTR NTAPI RtlIpv6AddressToStringA( - IN const struct in6_addr *Addr, - OUT PSTR S); + _In_ const struct in6_addr *Addr, + _Out_writes_(46) PSTR S); NTSYSAPI LONG NTAPI RtlIpv6AddressToStringExA( - IN const struct in6_addr *Address, - IN ULONG ScopeId, - IN USHORT Port, - OUT PSTR AddressString, - IN OUT PULONG AddressStringLength); + _In_ const struct in6_addr *Address, + _In_ ULONG ScopeId, + _In_ USHORT Port, + _Out_writes_to_(*AddressStringLength, *AddressStringLength) PSTR AddressString, + _Inout_ PULONG AddressStringLength); NTSYSAPI PWSTR NTAPI RtlIpv6AddressToStringW( - IN const struct in6_addr *Addr, - OUT PWSTR S); + _In_ const struct in6_addr *Addr, + _Out_writes_(46) PWSTR S); NTSYSAPI LONG NTAPI RtlIpv6AddressToStringExW( - IN const struct in6_addr *Address, - IN ULONG ScopeId, - IN USHORT Port, - OUT PWSTR AddressString, - IN OUT PULONG AddressStringLength); + _In_ const struct in6_addr *Address, + _In_ ULONG ScopeId, + _In_ USHORT Port, + _Out_writes_to_(*AddressStringLength, *AddressStringLength) PWSTR AddressString, + _Inout_ PULONG AddressStringLength); NTSYSAPI LONG NTAPI RtlIpv6StringToAddressA( - IN PCSTR S, - OUT PCSTR *Terminator, - OUT struct in6_addr *Addr); + _In_ PCSTR S, + _Out_ PCSTR *Terminator, + _Out_ struct in6_addr *Addr); NTSYSAPI LONG NTAPI RtlIpv6StringToAddressExA( - IN PCSTR AddressString, - OUT struct in6_addr *Address, - OUT PULONG ScopeId, - OUT PUSHORT Port); + _In_ PCSTR AddressString, + _Out_ struct in6_addr *Address, + _Out_ PULONG ScopeId, + _Out_ PUSHORT Port); NTSYSAPI LONG NTAPI RtlIpv6StringToAddressW( - IN PCWSTR S, - OUT PCWSTR *Terminator, - OUT struct in6_addr *Addr); + _In_ PCWSTR S, + _Out_ PCWSTR *Terminator, + _Out_ struct in6_addr *Addr); NTSYSAPI LONG NTAPI RtlIpv6StringToAddressExW( - IN PCWSTR AddressString, - OUT struct in6_addr *Address, - OUT PULONG ScopeId, - OUT PUSHORT Port); + _In_ PCWSTR AddressString, + _Out_ struct in6_addr *Address, + _Out_ PULONG ScopeId, + _Out_ PUSHORT Port); #ifdef UNICODE #define RtlIpv6AddressToString RtlIpv6AddressToStringW @@ -1478,31 +1479,31 @@ PSTR NTAPI RtlEthernetAddressToStringA( - IN const DL_EUI48 *Addr, - OUT PSTR S); + _In_ const DL_EUI48 *Addr, + _Out_writes_(18) PSTR S); NTSYSAPI PWSTR NTAPI RtlEthernetAddressToStringW( - IN const DL_EUI48 *Addr, - OUT PWSTR S); + _In_ const DL_EUI48 *Addr, + _Out_writes_(18) PWSTR S); NTSYSAPI LONG NTAPI RtlEthernetStringToAddressA( - IN PCSTR S, - OUT PCSTR *Terminator, - OUT DL_EUI48 *Addr); + _In_ PCSTR S, + _Out_ PCSTR *Terminator, + _Out_ DL_EUI48 *Addr); NTSYSAPI LONG NTAPI RtlEthernetStringToAddressW( - IN PCWSTR S, - OUT LPCWSTR *Terminator, - OUT DL_EUI48 *Addr); + _In_ PCWSTR S, + _Out_ LPCWSTR *Terminator, + _Out_ DL_EUI48 *Addr); #ifdef UNICODE #define RtlEthernetAddressToString RtlEthernetAddressToStringW

1 0

[akhaldi] 59797: [WORDPAD][WRITE] * Improve resource files layout to make it consistent with the rest of our codebase. By Robert Naumann. CORE-7397 #resolve #comment Committed in r59797. Thanks.
by akhaldi＠svn.reactos.org 23 Aug '13

23 Aug '13

Author: akhaldi Date: Fri Aug 23 15:21:10 2013 New Revision: 59797 URL: http://svn.reactos.org/svn/reactos?rev=59797&view=rev Log: [WORDPAD][WRITE] * Improve resource files layout to make it consistent with the rest of our codebase. By Robert Naumann. CORE-7397 #resolve #comment Committed in r59797. Thanks. Added: trunk/reactos/base/applications/wordpad/lang/ trunk/reactos/base/applications/wordpad/lang/Da.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/Da.rc trunk/reactos/base/applications/wordpad/lang/De.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/base/applications/wordpad/lang/En.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/En.rc trunk/reactos/base/applications/wordpad/lang/Fr.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/Fr.rc trunk/reactos/base/applications/wordpad/lang/He.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/He.rc trunk/reactos/base/applications/wordpad/lang/Hu.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/Hu.rc trunk/reactos/base/applications/wordpad/lang/It.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/It.rc trunk/reactos/base/applications/wordpad/lang/Ja.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/Ja.rc trunk/reactos/base/applications/wordpad/lang/Ko.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/Ko.rc trunk/reactos/base/applications/wordpad/lang/Lt.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/Lt.rc trunk/reactos/base/applications/wordpad/lang/Nl.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/lang/No.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/No.rc trunk/reactos/base/applications/wordpad/lang/Pl.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/Pl.rc trunk/reactos/base/applications/wordpad/lang/Pt.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/Pt.rc trunk/reactos/base/applications/wordpad/lang/Ro.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/Ro.rc trunk/reactos/base/applications/wordpad/lang/Ru.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/base/applications/wordpad/lang/Si.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/Si.rc trunk/reactos/base/applications/wordpad/lang/Sv.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/Sv.rc trunk/reactos/base/applications/wordpad/lang/Tr.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/Tr.rc trunk/reactos/base/applications/wordpad/lang/Uk.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/Uk.rc trunk/reactos/base/applications/wordpad/lang/Zh.rc - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/Zh.rc trunk/reactos/base/applications/wordpad/res/ trunk/reactos/base/applications/wordpad/res/formatbar.bmp - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/formatbar.bmp trunk/reactos/base/applications/wordpad/res/toolbar.bmp - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/toolbar.bmp trunk/reactos/base/applications/wordpad/res/wordpad.ico - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/wordpad.ico trunk/reactos/base/applications/wordpad/res/zoom.cur - copied unchanged from r59775, trunk/reactos/base/applications/wordpad/zoom.cur trunk/reactos/base/applications/write/lang/ trunk/reactos/base/applications/write/lang/Bg.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Bg.rc trunk/reactos/base/applications/write/lang/Da.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Da.rc trunk/reactos/base/applications/write/lang/De.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/De.rc trunk/reactos/base/applications/write/lang/En.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/En.rc trunk/reactos/base/applications/write/lang/Es.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Es.rc trunk/reactos/base/applications/write/lang/Fr.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Fr.rc trunk/reactos/base/applications/write/lang/He.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/He.rc trunk/reactos/base/applications/write/lang/It.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/It.rc trunk/reactos/base/applications/write/lang/Ja.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Ja.rc trunk/reactos/base/applications/write/lang/Ko.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Ko.rc trunk/reactos/base/applications/write/lang/Lt.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Lt.rc trunk/reactos/base/applications/write/lang/Nl.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Nl.rc trunk/reactos/base/applications/write/lang/No.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/No.rc trunk/reactos/base/applications/write/lang/Pl.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Pl.rc trunk/reactos/base/applications/write/lang/Pt.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Pt.rc trunk/reactos/base/applications/write/lang/Ro.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Ro.rc trunk/reactos/base/applications/write/lang/Ru.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Ru.rc trunk/reactos/base/applications/write/lang/Si.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Si.rc trunk/reactos/base/applications/write/lang/Sr.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Sr.rc trunk/reactos/base/applications/write/lang/Sv.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Sv.rc trunk/reactos/base/applications/write/lang/Tr.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Tr.rc trunk/reactos/base/applications/write/lang/Uk.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Uk.rc trunk/reactos/base/applications/write/lang/Zh.rc - copied unchanged from r59775, trunk/reactos/base/applications/write/Zh.rc Removed: trunk/reactos/base/applications/wordpad/Da.rc trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/base/applications/wordpad/En.rc trunk/reactos/base/applications/wordpad/Fr.rc trunk/reactos/base/applications/wordpad/He.rc trunk/reactos/base/applications/wordpad/Hu.rc trunk/reactos/base/applications/wordpad/It.rc trunk/reactos/base/applications/wordpad/Ja.rc trunk/reactos/base/applications/wordpad/Ko.rc trunk/reactos/base/applications/wordpad/Lt.rc trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/No.rc trunk/reactos/base/applications/wordpad/Pl.rc trunk/reactos/base/applications/wordpad/Pt.rc trunk/reactos/base/applications/wordpad/Ro.rc trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/base/applications/wordpad/Si.rc trunk/reactos/base/applications/wordpad/Sv.rc trunk/reactos/base/applications/wordpad/Tr.rc trunk/reactos/base/applications/wordpad/Uk.rc trunk/reactos/base/applications/wordpad/Zh.rc trunk/reactos/base/applications/wordpad/formatbar.bmp trunk/reactos/base/applications/wordpad/toolbar.bmp trunk/reactos/base/applications/wordpad/wordpad.ico trunk/reactos/base/applications/wordpad/zoom.cur trunk/reactos/base/applications/write/Bg.rc trunk/reactos/base/applications/write/Da.rc trunk/reactos/base/applications/write/De.rc trunk/reactos/base/applications/write/En.rc trunk/reactos/base/applications/write/Es.rc trunk/reactos/base/applications/write/Fr.rc trunk/reactos/base/applications/write/He.rc trunk/reactos/base/applications/write/It.rc trunk/reactos/base/applications/write/Ja.rc trunk/reactos/base/applications/write/Ko.rc trunk/reactos/base/applications/write/Lt.rc trunk/reactos/base/applications/write/Nl.rc trunk/reactos/base/applications/write/No.rc trunk/reactos/base/applications/write/Pl.rc trunk/reactos/base/applications/write/Pt.rc trunk/reactos/base/applications/write/Ro.rc trunk/reactos/base/applications/write/Ru.rc trunk/reactos/base/applications/write/Si.rc trunk/reactos/base/applications/write/Sr.rc trunk/reactos/base/applications/write/Sv.rc trunk/reactos/base/applications/write/Tr.rc trunk/reactos/base/applications/write/Uk.rc trunk/reactos/base/applications/write/Zh.rc Modified: trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/applications/wordpad/wordpad.c trunk/reactos/base/applications/write/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/base/applications/wordpad/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/formatbar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/toolbar.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/wordpad.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/wordpad/zoom.cur URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Removed: trunk/reactos/base/applications/write/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Bg… Removed: trunk/reactos/base/applications/write/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Da… Removed: trunk/reactos/base/applications/write/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/De… Removed: trunk/reactos/base/applications/write/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/En… Removed: trunk/reactos/base/applications/write/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Es… Removed: trunk/reactos/base/applications/write/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Fr… Removed: trunk/reactos/base/applications/write/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/He… Removed: trunk/reactos/base/applications/write/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/It… Removed: trunk/reactos/base/applications/write/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Ja… Removed: trunk/reactos/base/applications/write/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Ko… Removed: trunk/reactos/base/applications/write/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Lt… Removed: trunk/reactos/base/applications/write/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Nl… Removed: trunk/reactos/base/applications/write/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/No… Removed: trunk/reactos/base/applications/write/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Pl… Removed: trunk/reactos/base/applications/write/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Pt… Removed: trunk/reactos/base/applications/write/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Ro… Removed: trunk/reactos/base/applications/write/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Ru… Removed: trunk/reactos/base/applications/write/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Si… Removed: trunk/reactos/base/applications/write/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Sr… Removed: trunk/reactos/base/applications/write/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Sv… Removed: trunk/reactos/base/applications/write/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Tr… Removed: trunk/reactos/base/applications/write/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Uk… Removed: trunk/reactos/base/applications/write/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/Zh… Modified: trunk/reactos/base/applications/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/rs…

1 0

[akhaldi] 59796: [PSDK] * Replace WINBOOL by BOOL. The former is a mingw-w64 invention.
by akhaldi＠svn.reactos.org 23 Aug '13

23 Aug '13

Author: akhaldi Date: Fri Aug 23 15:04:39 2013 New Revision: 59796 URL: http://svn.reactos.org/svn/reactos?rev=59796&view=rev Log: [PSDK] * Replace WINBOOL by BOOL. The former is a mingw-w64 invention. Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Fri Aug 23 15:04:39 2013 @@ -72,7 +72,7 @@ #define ICC_STANDARD_CLASSES 0x4000 #define ICC_LINK_CLASS 0x8000 - WINCOMMCTRLAPI WINBOOL WINAPI InitCommonControlsEx(_In_ const INITCOMMONCONTROLSEX *); + WINCOMMCTRLAPI BOOL WINAPI InitCommonControlsEx(_In_ const INITCOMMONCONTROLSEX *); #define ODT_HEADER 100 #define ODT_TAB 101 @@ -332,11 +332,11 @@ #define ILC_PERITEMMIRROR 0x8000 WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Create(int cx,int cy,UINT flags,int cInitial,int cGrow); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_Destroy(_In_opt_ HIMAGELIST himl); + WINCOMMCTRLAPI BOOL WINAPI ImageList_Destroy(_In_opt_ HIMAGELIST himl); WINCOMMCTRLAPI int WINAPI ImageList_GetImageCount(_In_ HIMAGELIST himl); WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI ImageList_SetImageCount( _In_ HIMAGELIST himl, @@ -368,7 +368,7 @@ WINCOMMCTRLAPI COLORREF WINAPI ImageList_GetBkColor(_In_ HIMAGELIST himl); WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI ImageList_SetOverlayImage( _In_ HIMAGELIST himl, @@ -410,7 +410,7 @@ #define ILS_ALPHA 0x8 WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI ImageList_Draw( _In_ HIMAGELIST himl, @@ -421,7 +421,7 @@ _In_ UINT fStyle); WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI ImageList_Replace( _In_ HIMAGELIST himl, @@ -438,7 +438,7 @@ _In_ COLORREF crMask); WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI ImageList_DrawEx( _In_ HIMAGELIST himl, @@ -453,13 +453,13 @@ _In_ UINT fStyle); WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI ImageList_DrawIndirect( _In_ IMAGELISTDRAWPARAMS *pimldp); WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI ImageList_Remove( _In_ HIMAGELIST himl, @@ -482,7 +482,7 @@ #define ILCF_SWAP 0x1 WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI ImageList_Copy( _In_ HIMAGELIST himlDst, @@ -492,7 +492,7 @@ _In_ UINT uFlags); WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI ImageList_BeginDrag( _In_ HIMAGELIST himlTrack, @@ -501,12 +501,12 @@ _In_ int dyHotspot); WINCOMMCTRLAPI void WINAPI ImageList_EndDrag(void); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_DragEnter(HWND hwndLock,int x,int y); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_DragLeave(HWND hwndLock); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_DragMove(int x,int y); + WINCOMMCTRLAPI BOOL WINAPI ImageList_DragEnter(HWND hwndLock,int x,int y); + WINCOMMCTRLAPI BOOL WINAPI ImageList_DragLeave(HWND hwndLock); + WINCOMMCTRLAPI BOOL WINAPI ImageList_DragMove(int x,int y); WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI ImageList_SetDragCursorImage( _In_ HIMAGELIST himlDrag, @@ -514,7 +514,7 @@ _In_ int dxHotspot, _In_ int dyHotspot); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_DragShowNolock(WINBOOL fShow); + WINCOMMCTRLAPI BOOL WINAPI ImageList_DragShowNolock(BOOL fShow); _Success_(return != NULL) WINCOMMCTRLAPI @@ -530,7 +530,7 @@ #ifdef __IStream_INTERFACE_DEFINED__ WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Read(_In_ LPSTREAM pstm); - WINCOMMCTRLAPI WINBOOL WINAPI ImageList_Write(_In_ HIMAGELIST himl, _In_ LPSTREAM pstm); + WINCOMMCTRLAPI BOOL WINAPI ImageList_Write(_In_ HIMAGELIST himl, _In_ LPSTREAM pstm); #define ILP_NORMAL 0 #define ILP_DOWNLEVEL 1 WINCOMMCTRLAPI HRESULT WINAPI ImageList_ReadEx(_In_ DWORD dwFlags, _In_ LPSTREAM pstm, _In_ REFIID riid, _Outptr_ PVOID *ppv); @@ -549,7 +549,7 @@ _Success_(return != 0) WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI ImageList_GetIconSize( _In_ HIMAGELIST himl, @@ -558,7 +558,7 @@ _Success_(return != 0) WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI ImageList_SetIconSize( _In_ HIMAGELIST himl, @@ -567,7 +567,7 @@ _Success_(return != 0) WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI ImageList_GetImageInfo( _In_ HIMAGELIST himl, @@ -712,21 +712,21 @@ #define Header_InsertItem(hwndHD,i,phdi) (int)SNDMSG((hwndHD),HDM_INSERTITEM,(WPARAM)(int)(i),(LPARAM)(const HD_ITEM *)(phdi)) #define HDM_DELETEITEM (HDM_FIRST+2) -#define Header_DeleteItem(hwndHD,i) (WINBOOL)SNDMSG((hwndHD),HDM_DELETEITEM,(WPARAM)(int)(i),0L) +#define Header_DeleteItem(hwndHD,i) (BOOL)SNDMSG((hwndHD),HDM_DELETEITEM,(WPARAM)(int)(i),0L) #define HDM_GETITEMA (HDM_FIRST+3) #define HDM_GETITEMW (HDM_FIRST+11) #define HDM_GETITEM __MINGW_NAME_AW(HDM_GETITEM) -#define Header_GetItem(hwndHD,i,phdi) (WINBOOL)SNDMSG((hwndHD),HDM_GETITEM,(WPARAM)(int)(i),(LPARAM)(HD_ITEM *)(phdi)) +#define Header_GetItem(hwndHD,i,phdi) (BOOL)SNDMSG((hwndHD),HDM_GETITEM,(WPARAM)(int)(i),(LPARAM)(HD_ITEM *)(phdi)) #define HDM_SETITEMA (HDM_FIRST+4) #define HDM_SETITEMW (HDM_FIRST+12) #define HDM_SETITEM __MINGW_NAME_AW(HDM_SETITEM) -#define Header_SetItem(hwndHD,i,phdi) (WINBOOL)SNDMSG((hwndHD),HDM_SETITEM,(WPARAM)(int)(i),(LPARAM)(const HD_ITEM *)(phdi)) +#define Header_SetItem(hwndHD,i,phdi) (BOOL)SNDMSG((hwndHD),HDM_SETITEM,(WPARAM)(int)(i),(LPARAM)(const HD_ITEM *)(phdi)) #define HD_LAYOUT HDLAYOUT @@ -736,7 +736,7 @@ } HDLAYOUT,*LPHDLAYOUT; #define HDM_LAYOUT (HDM_FIRST+5) -#define Header_Layout(hwndHD,playout) (WINBOOL)SNDMSG((hwndHD),HDM_LAYOUT,0,(LPARAM)(HD_LAYOUT *)(playout)) +#define Header_Layout(hwndHD,playout) (BOOL)SNDMSG((hwndHD),HDM_LAYOUT,0,(LPARAM)(HD_LAYOUT *)(playout)) #define HHT_NOWHERE 0x1 #define HHT_ONHEADER 0x2 @@ -760,7 +760,7 @@ #define HDM_HITTEST (HDM_FIRST+6) #define HDM_GETITEMRECT (HDM_FIRST+7) -#define Header_GetItemRect(hwnd,iItem,lprc) (WINBOOL)SNDMSG((hwnd),HDM_GETITEMRECT,(WPARAM)(iItem),(LPARAM)(lprc)) +#define Header_GetItemRect(hwnd,iItem,lprc) (BOOL)SNDMSG((hwnd),HDM_GETITEMRECT,(WPARAM)(iItem),(LPARAM)(lprc)) #define HDM_SETIMAGELIST (HDM_FIRST+8) #define Header_SetImageList(hwnd,himl) (HIMAGELIST)SNDMSG((hwnd),HDM_SETIMAGELIST,0,(LPARAM)(himl)) @@ -775,10 +775,10 @@ #define Header_CreateDragImage(hwnd,i) (HIMAGELIST)SNDMSG((hwnd),HDM_CREATEDRAGIMAGE,(WPARAM)(i),0) #define HDM_GETORDERARRAY (HDM_FIRST+17) -#define Header_GetOrderArray(hwnd,iCount,lpi) (WINBOOL)SNDMSG((hwnd),HDM_GETORDERARRAY,(WPARAM)(iCount),(LPARAM)(lpi)) +#define Header_GetOrderArray(hwnd,iCount,lpi) (BOOL)SNDMSG((hwnd),HDM_GETORDERARRAY,(WPARAM)(iCount),(LPARAM)(lpi)) #define HDM_SETORDERARRAY (HDM_FIRST+18) -#define Header_SetOrderArray(hwnd,iCount,lpi) (WINBOOL)SNDMSG((hwnd),HDM_SETORDERARRAY,(WPARAM)(iCount),(LPARAM)(lpi)) +#define Header_SetOrderArray(hwnd,iCount,lpi) (BOOL)SNDMSG((hwnd),HDM_SETORDERARRAY,(WPARAM)(iCount),(LPARAM)(lpi)) #define HDM_SETHOTDIVIDER (HDM_FIRST+19) #define Header_SetHotDivider(hwnd,fPos,dw) (int)SNDMSG((hwnd),HDM_SETHOTDIVIDER,(WPARAM)(fPos),(LPARAM)(dw)) @@ -790,10 +790,10 @@ #define Header_GetBitmapMargin(hwnd) (int)SNDMSG((hwnd),HDM_GETBITMAPMARGIN,0,0) #define HDM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT -#define Header_SetUnicodeFormat(hwnd,fUnicode) (WINBOOL)SNDMSG((hwnd),HDM_SETUNICODEFORMAT,(WPARAM)(fUnicode),0) +#define Header_SetUnicodeFormat(hwnd,fUnicode) (BOOL)SNDMSG((hwnd),HDM_SETUNICODEFORMAT,(WPARAM)(fUnicode),0) #define HDM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT -#define Header_GetUnicodeFormat(hwnd) (WINBOOL)SNDMSG((hwnd),HDM_GETUNICODEFORMAT,0,0) +#define Header_GetUnicodeFormat(hwnd) (BOOL)SNDMSG((hwnd),HDM_GETUNICODEFORMAT,0,0) #define HDM_SETFILTERCHANGETIMEOUT (HDM_FIRST+22) #define Header_SetFilterChangeTimeout(hwnd,i) (int)SNDMSG((hwnd),HDM_SETFILTERCHANGETIMEOUT,0,(LPARAM)(i)) @@ -1611,7 +1611,7 @@ typedef struct tagNMRBAUTOSIZE { NMHDR hdr; - WINBOOL fChanged; + BOOL fChanged; RECT rcTarget; RECT rcActual; } NMRBAUTOSIZE,*LPNMRBAUTOSIZE; @@ -1635,7 +1635,7 @@ LPARAM lParam; UINT uMsg; UINT fStyleCurrent; - WINBOOL fAutoBreak; + BOOL fAutoBreak; } NMREBARAUTOBREAK,*LPNMREBARAUTOBREAK; #define RBHT_NOWHERE 0x1 @@ -1933,7 +1933,7 @@ WINCOMMCTRLAPI void WINAPI MenuHelp(UINT uMsg,WPARAM wParam,LPARAM lParam,HMENU hMainMenu,HINSTANCE hInst,HWND hwndStatus,UINT *lpwIDs); WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI ShowHideMenuCtl( _In_ HWND hWnd, @@ -2051,10 +2051,10 @@ #define DRAGLISTMSGSTRING TEXT("commctrl_DragListMsg") - WINCOMMCTRLAPI WINBOOL WINAPI MakeDragList(HWND hLB); + WINCOMMCTRLAPI BOOL WINAPI MakeDragList(HWND hLB); WINCOMMCTRLAPI void WINAPI DrawInsert(HWND handParent,HWND hLB,int nItem); - WINCOMMCTRLAPI int WINAPI LBItemFromPt(HWND hLB,POINT pt,WINBOOL bAutoScroll); + WINCOMMCTRLAPI int WINAPI LBItemFromPt(HWND hLB,POINT pt,BOOL bAutoScroll); #endif #ifndef NOUPDOWN @@ -2227,13 +2227,13 @@ #define LVS_NOSORTHEADER 0x8000 #define LVM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT -#define ListView_SetUnicodeFormat(hwnd,fUnicode) (WINBOOL)SNDMSG((hwnd),LVM_SETUNICODEFORMAT,(WPARAM)(fUnicode),0) +#define ListView_SetUnicodeFormat(hwnd,fUnicode) (BOOL)SNDMSG((hwnd),LVM_SETUNICODEFORMAT,(WPARAM)(fUnicode),0) #define LVM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT -#define ListView_GetUnicodeFormat(hwnd) (WINBOOL)SNDMSG((hwnd),LVM_GETUNICODEFORMAT,0,0) +#define ListView_GetUnicodeFormat(hwnd) (BOOL)SNDMSG((hwnd),LVM_GETUNICODEFORMAT,0,0) #define LVM_GETBKCOLOR (LVM_FIRST+0) #define ListView_GetBkColor(hwnd) (COLORREF)SNDMSG((hwnd),LVM_GETBKCOLOR,0,0L) #define LVM_SETBKCOLOR (LVM_FIRST+1) -#define ListView_SetBkColor(hwnd,clrBk) (WINBOOL)SNDMSG((hwnd),LVM_SETBKCOLOR,0,(LPARAM)(COLORREF)(clrBk)) +#define ListView_SetBkColor(hwnd,clrBk) (BOOL)SNDMSG((hwnd),LVM_SETBKCOLOR,0,(LPARAM)(COLORREF)(clrBk)) #define LVM_GETIMAGELIST (LVM_FIRST+2) #define ListView_GetImageList(hwnd,iImageList) (HIMAGELIST)SNDMSG((hwnd),LVM_GETIMAGELIST,(WPARAM)(INT)(iImageList),0L) @@ -2333,14 +2333,14 @@ #define LVM_GETITEM __MINGW_NAME_AW(LVM_GETITEM) -#define ListView_GetItem(hwnd,pitem) (WINBOOL)SNDMSG((hwnd),LVM_GETITEM,0,(LPARAM)(LV_ITEM *)(pitem)) +#define ListView_GetItem(hwnd,pitem) (BOOL)SNDMSG((hwnd),LVM_GETITEM,0,(LPARAM)(LV_ITEM *)(pitem)) #define LVM_SETITEMA (LVM_FIRST+6) #define LVM_SETITEMW (LVM_FIRST+76) #define LVM_SETITEM __MINGW_NAME_AW(LVM_SETITEM) -#define ListView_SetItem(hwnd,pitem) (WINBOOL)SNDMSG((hwnd),LVM_SETITEM,0,(LPARAM)(const LV_ITEM *)(pitem)) +#define ListView_SetItem(hwnd,pitem) (BOOL)SNDMSG((hwnd),LVM_SETITEM,0,(LPARAM)(const LV_ITEM *)(pitem)) #define LVM_INSERTITEMA (LVM_FIRST+7) #define LVM_INSERTITEMW (LVM_FIRST+77) @@ -2350,16 +2350,16 @@ #define ListView_InsertItem(hwnd,pitem) (int)SNDMSG((hwnd),LVM_INSERTITEM,0,(LPARAM)(const LV_ITEM *)(pitem)) #define LVM_DELETEITEM (LVM_FIRST+8) -#define ListView_DeleteItem(hwnd,i) (WINBOOL)SNDMSG((hwnd),LVM_DELETEITEM,(WPARAM)(int)(i),0L) +#define ListView_DeleteItem(hwnd,i) (BOOL)SNDMSG((hwnd),LVM_DELETEITEM,(WPARAM)(int)(i),0L) #define LVM_DELETEALLITEMS (LVM_FIRST+9) -#define ListView_DeleteAllItems(hwnd) (WINBOOL)SNDMSG((hwnd),LVM_DELETEALLITEMS,0,0L) +#define ListView_DeleteAllItems(hwnd) (BOOL)SNDMSG((hwnd),LVM_DELETEALLITEMS,0,0L) #define LVM_GETCALLBACKMASK (LVM_FIRST+10) -#define ListView_GetCallbackMask(hwnd) (WINBOOL)SNDMSG((hwnd),LVM_GETCALLBACKMASK,0,0) +#define ListView_GetCallbackMask(hwnd) (BOOL)SNDMSG((hwnd),LVM_GETCALLBACKMASK,0,0) #define LVM_SETCALLBACKMASK (LVM_FIRST+11) -#define ListView_SetCallbackMask(hwnd,mask) (WINBOOL)SNDMSG((hwnd),LVM_SETCALLBACKMASK,(WPARAM)(UINT)(mask),0) +#define ListView_SetCallbackMask(hwnd,mask) (BOOL)SNDMSG((hwnd),LVM_SETCALLBACKMASK,(WPARAM)(UINT)(mask),0) #define LVNI_ALL 0x0 #define LVNI_FOCUSED 0x1 @@ -2417,13 +2417,13 @@ #define LVIR_SELECTBOUNDS 3 #define LVM_GETITEMRECT (LVM_FIRST+14) -#define ListView_GetItemRect(hwnd,i,prc,code) (WINBOOL)SNDMSG((hwnd),LVM_GETITEMRECT,(WPARAM)(int)(i),((prc) ? (((RECT *)(prc))->left = (code),(LPARAM)(RECT *)(prc)) : (LPARAM)(RECT *)NULL)) +#define ListView_GetItemRect(hwnd,i,prc,code) (BOOL)SNDMSG((hwnd),LVM_GETITEMRECT,(WPARAM)(int)(i),((prc) ? (((RECT *)(prc))->left = (code),(LPARAM)(RECT *)(prc)) : (LPARAM)(RECT *)NULL)) #define LVM_SETITEMPOSITION (LVM_FIRST+15) -#define ListView_SetItemPosition(hwndLV,i,x,y) (WINBOOL)SNDMSG((hwndLV),LVM_SETITEMPOSITION,(WPARAM)(int)(i),MAKELPARAM((x),(y))) +#define ListView_SetItemPosition(hwndLV,i,x,y) (BOOL)SNDMSG((hwndLV),LVM_SETITEMPOSITION,(WPARAM)(int)(i),MAKELPARAM((x),(y))) #define LVM_GETITEMPOSITION (LVM_FIRST+16) -#define ListView_GetItemPosition(hwndLV,i,ppt) (WINBOOL)SNDMSG((hwndLV),LVM_GETITEMPOSITION,(WPARAM)(int)(i),(LPARAM)(POINT *)(ppt)) +#define ListView_GetItemPosition(hwndLV,i,ppt) (BOOL)SNDMSG((hwndLV),LVM_GETITEMPOSITION,(WPARAM)(int)(i),(LPARAM)(POINT *)(ppt)) #define LVM_GETSTRINGWIDTHA (LVM_FIRST+17) #define LVM_GETSTRINGWIDTHW (LVM_FIRST+87) @@ -2458,13 +2458,13 @@ #define ListView_HitTest(hwndLV,pinfo) (int)SNDMSG((hwndLV),LVM_HITTEST,0,(LPARAM)(LV_HITTESTINFO *)(pinfo)) #define LVM_ENSUREVISIBLE (LVM_FIRST+19) -#define ListView_EnsureVisible(hwndLV,i,fPartialOK) (WINBOOL)SNDMSG((hwndLV),LVM_ENSUREVISIBLE,(WPARAM)(int)(i),MAKELPARAM((fPartialOK),0)) +#define ListView_EnsureVisible(hwndLV,i,fPartialOK) (BOOL)SNDMSG((hwndLV),LVM_ENSUREVISIBLE,(WPARAM)(int)(i),MAKELPARAM((fPartialOK),0)) #define LVM_SCROLL (LVM_FIRST+20) -#define ListView_Scroll(hwndLV,dx,dy) (WINBOOL)SNDMSG((hwndLV),LVM_SCROLL,(WPARAM)(int)(dx),(LPARAM)(int)(dy)) +#define ListView_Scroll(hwndLV,dx,dy) (BOOL)SNDMSG((hwndLV),LVM_SCROLL,(WPARAM)(int)(dx),(LPARAM)(int)(dy)) #define LVM_REDRAWITEMS (LVM_FIRST+21) -#define ListView_RedrawItems(hwndLV,iFirst,iLast) (WINBOOL)SNDMSG((hwndLV),LVM_REDRAWITEMS,(WPARAM)(int)(iFirst),(LPARAM)(int)(iLast)) +#define ListView_RedrawItems(hwndLV,iFirst,iLast) (BOOL)SNDMSG((hwndLV),LVM_REDRAWITEMS,(WPARAM)(int)(iFirst),(LPARAM)(int)(iLast)) #define LVA_DEFAULT 0x0 #define LVA_ALIGNLEFT 0x1 @@ -2472,7 +2472,7 @@ #define LVA_SNAPTOGRID 0x5 #define LVM_ARRANGE (LVM_FIRST+22) -#define ListView_Arrange(hwndLV,code) (WINBOOL)SNDMSG((hwndLV),LVM_ARRANGE,(WPARAM)(UINT)(code),0L) +#define ListView_Arrange(hwndLV,code) (BOOL)SNDMSG((hwndLV),LVM_ARRANGE,(WPARAM)(UINT)(code),0L) #define LVM_EDITLABELA (LVM_FIRST+23) #define LVM_EDITLABELW (LVM_FIRST+118) @@ -2561,14 +2561,14 @@ #define LVM_GETCOLUMN __MINGW_NAME_AW(LVM_GETCOLUMN) -#define ListView_GetColumn(hwnd,iCol,pcol) (WINBOOL)SNDMSG((hwnd),LVM_GETCOLUMN,(WPARAM)(int)(iCol),(LPARAM)(LV_COLUMN *)(pcol)) +#define ListView_GetColumn(hwnd,iCol,pcol) (BOOL)SNDMSG((hwnd),LVM_GETCOLUMN,(WPARAM)(int)(iCol),(LPARAM)(LV_COLUMN *)(pcol)) #define LVM_SETCOLUMNA (LVM_FIRST+26) #define LVM_SETCOLUMNW (LVM_FIRST+96) #define LVM_SETCOLUMN __MINGW_NAME_AW(LVM_SETCOLUMN) -#define ListView_SetColumn(hwnd,iCol,pcol) (WINBOOL)SNDMSG((hwnd),LVM_SETCOLUMN,(WPARAM)(int)(iCol),(LPARAM)(const LV_COLUMN *)(pcol)) +#define ListView_SetColumn(hwnd,iCol,pcol) (BOOL)SNDMSG((hwnd),LVM_SETCOLUMN,(WPARAM)(int)(iCol),(LPARAM)(const LV_COLUMN *)(pcol)) #define LVM_INSERTCOLUMNA (LVM_FIRST+27) #define LVM_INSERTCOLUMNW (LVM_FIRST+97) @@ -2578,7 +2578,7 @@ #define ListView_InsertColumn(hwnd,iCol,pcol) (int)SNDMSG((hwnd),LVM_INSERTCOLUMN,(WPARAM)(int)(iCol),(LPARAM)(const LV_COLUMN *)(pcol)) #define LVM_DELETECOLUMN (LVM_FIRST+28) -#define ListView_DeleteColumn(hwnd,iCol) (WINBOOL)SNDMSG((hwnd),LVM_DELETECOLUMN,(WPARAM)(int)(iCol),0) +#define ListView_DeleteColumn(hwnd,iCol) (BOOL)SNDMSG((hwnd),LVM_DELETECOLUMN,(WPARAM)(int)(iCol),0) #define LVM_GETCOLUMNWIDTH (LVM_FIRST+29) #define ListView_GetColumnWidth(hwnd,iCol) (int)SNDMSG((hwnd),LVM_GETCOLUMNWIDTH,(WPARAM)(int)(iCol),0) @@ -2587,30 +2587,30 @@ #define LVSCW_AUTOSIZE_USEHEADER -2 #define LVM_SETCOLUMNWIDTH (LVM_FIRST+30) -#define ListView_SetColumnWidth(hwnd,iCol,cx) (WINBOOL)SNDMSG((hwnd),LVM_SETCOLUMNWIDTH,(WPARAM)(int)(iCol),MAKELPARAM((cx),0)) +#define ListView_SetColumnWidth(hwnd,iCol,cx) (BOOL)SNDMSG((hwnd),LVM_SETCOLUMNWIDTH,(WPARAM)(int)(iCol),MAKELPARAM((cx),0)) #define LVM_GETHEADER (LVM_FIRST+31) #define ListView_GetHeader(hwnd) (HWND)SNDMSG((hwnd),LVM_GETHEADER,0,0L) #define LVM_CREATEDRAGIMAGE (LVM_FIRST+33) #define ListView_CreateDragImage(hwnd,i,lpptUpLeft) (HIMAGELIST)SNDMSG((hwnd),LVM_CREATEDRAGIMAGE,(WPARAM)(int)(i),(LPARAM)(LPPOINT)(lpptUpLeft)) #define LVM_GETVIEWRECT (LVM_FIRST+34) -#define ListView_GetViewRect(hwnd,prc) (WINBOOL)SNDMSG((hwnd),LVM_GETVIEWRECT,0,(LPARAM)(RECT *)(prc)) +#define ListView_GetViewRect(hwnd,prc) (BOOL)SNDMSG((hwnd),LVM_GETVIEWRECT,0,(LPARAM)(RECT *)(prc)) #define LVM_GETTEXTCOLOR (LVM_FIRST+35) #define ListView_GetTextColor(hwnd) (COLORREF)SNDMSG((hwnd),LVM_GETTEXTCOLOR,0,0L) #define LVM_SETTEXTCOLOR (LVM_FIRST+36) -#define ListView_SetTextColor(hwnd,clrText) (WINBOOL)SNDMSG((hwnd),LVM_SETTEXTCOLOR,0,(LPARAM)(COLORREF)(clrText)) +#define ListView_SetTextColor(hwnd,clrText) (BOOL)SNDMSG((hwnd),LVM_SETTEXTCOLOR,0,(LPARAM)(COLORREF)(clrText)) #define LVM_GETTEXTBKCOLOR (LVM_FIRST+37) #define ListView_GetTextBkColor(hwnd) (COLORREF)SNDMSG((hwnd),LVM_GETTEXTBKCOLOR,0,0L) #define LVM_SETTEXTBKCOLOR (LVM_FIRST+38) -#define ListView_SetTextBkColor(hwnd,clrTextBk) (WINBOOL)SNDMSG((hwnd),LVM_SETTEXTBKCOLOR,0,(LPARAM)(COLORREF)(clrTextBk)) +#define ListView_SetTextBkColor(hwnd,clrTextBk) (BOOL)SNDMSG((hwnd),LVM_SETTEXTBKCOLOR,0,(LPARAM)(COLORREF)(clrTextBk)) #define LVM_GETTOPINDEX (LVM_FIRST+39) #define ListView_GetTopIndex(hwndLV) (int)SNDMSG((hwndLV),LVM_GETTOPINDEX,0,0) #define LVM_GETCOUNTPERPAGE (LVM_FIRST+40) #define ListView_GetCountPerPage(hwndLV) (int)SNDMSG((hwndLV),LVM_GETCOUNTPERPAGE,0,0) #define LVM_GETORIGIN (LVM_FIRST+41) -#define ListView_GetOrigin(hwndLV,ppt) (WINBOOL)SNDMSG((hwndLV),LVM_GETORIGIN,(WPARAM)0,(LPARAM)(POINT *)(ppt)) +#define ListView_GetOrigin(hwndLV,ppt) (BOOL)SNDMSG((hwndLV),LVM_GETORIGIN,(WPARAM)0,(LPARAM)(POINT *)(ppt)) #define LVM_UPDATE (LVM_FIRST+42) -#define ListView_Update(hwndLV,i) (WINBOOL)SNDMSG((hwndLV),LVM_UPDATE,(WPARAM)(i),0L) +#define ListView_Update(hwndLV,i) (BOOL)SNDMSG((hwndLV),LVM_UPDATE,(WPARAM)(i),0L) #define LVM_SETITEMSTATE (LVM_FIRST+43) #define ListView_SetItemState(hwndLV,i,data,mask) { LV_ITEM _ms_lvi; _ms_lvi.stateMask = mask; _ms_lvi.state = data; SNDMSG((hwndLV),LVM_SETITEMSTATE,(WPARAM)(i),(LPARAM)(LV_ITEM *)&_ms_lvi);} #define ListView_SetCheckState(hwndLV,i,fCheck) ListView_SetItemState(hwndLV,i,INDEXTOSTATEIMAGEMASK((fCheck)?2:1),LVIS_STATEIMAGEMASK) @@ -2642,7 +2642,7 @@ typedef int (CALLBACK *PFNLVCOMPARE)(LPARAM,LPARAM,LPARAM); #define LVM_SORTITEMS (LVM_FIRST+48) -#define ListView_SortItems(hwndLV,_pfnCompare,_lPrm) (WINBOOL)SNDMSG((hwndLV),LVM_SORTITEMS,(WPARAM)(LPARAM)(_lPrm),(LPARAM)(PFNLVCOMPARE)(_pfnCompare)) +#define ListView_SortItems(hwndLV,_pfnCompare,_lPrm) (BOOL)SNDMSG((hwndLV),LVM_SORTITEMS,(WPARAM)(LPARAM)(_lPrm),(LPARAM)(PFNLVCOMPARE)(_pfnCompare)) #define LVM_SETITEMPOSITION32 (LVM_FIRST+49) #define ListView_SetItemPosition32(hwndLV,i,x0,y0) { POINT ptNewPos; ptNewPos.x = x0; ptNewPos.y = y0; SNDMSG((hwndLV),LVM_SETITEMPOSITION32,(WPARAM)(int)(i),(LPARAM)&ptNewPos); } @@ -2658,7 +2658,7 @@ #define LVM_GETISEARCHSTRING __MINGW_NAME_AW(LVM_GETISEARCHSTRING) -#define ListView_GetISearchString(hwndLV,lpsz) (WINBOOL)SNDMSG((hwndLV),LVM_GETISEARCHSTRING,0,(LPARAM)(LPTSTR)(lpsz)) +#define ListView_GetISearchString(hwndLV,lpsz) (BOOL)SNDMSG((hwndLV),LVM_GETISEARCHSTRING,0,(LPARAM)(LPTSTR)(lpsz)) #define LVM_SETICONSPACING (LVM_FIRST+53) @@ -2702,13 +2702,13 @@ #endif #define LVM_GETSUBITEMRECT (LVM_FIRST+56) -#define ListView_GetSubItemRect(hwnd,iItem,iSubItem,code,prc) (WINBOOL)SNDMSG((hwnd),LVM_GETSUBITEMRECT,(WPARAM)(int)(iItem),((prc) ? ((((LPRECT)(prc))->top = iSubItem),(((LPRECT)(prc))->left = code),(LPARAM)(prc)) : (LPARAM)(LPRECT)NULL)) +#define ListView_GetSubItemRect(hwnd,iItem,iSubItem,code,prc) (BOOL)SNDMSG((hwnd),LVM_GETSUBITEMRECT,(WPARAM)(int)(iItem),((prc) ? ((((LPRECT)(prc))->top = iSubItem),(((LPRECT)(prc))->left = code),(LPARAM)(prc)) : (LPARAM)(LPRECT)NULL)) #define LVM_SUBITEMHITTEST (LVM_FIRST+57) #define ListView_SubItemHitTest(hwnd,plvhti) (int)SNDMSG((hwnd),LVM_SUBITEMHITTEST,0,(LPARAM)(LPLVHITTESTINFO)(plvhti)) #define LVM_SETCOLUMNORDERARRAY (LVM_FIRST+58) -#define ListView_SetColumnOrderArray(hwnd,iCount,pi) (WINBOOL)SNDMSG((hwnd),LVM_SETCOLUMNORDERARRAY,(WPARAM)(iCount),(LPARAM)(LPINT)(pi)) +#define ListView_SetColumnOrderArray(hwnd,iCount,pi) (BOOL)SNDMSG((hwnd),LVM_SETCOLUMNORDERARRAY,(WPARAM)(iCount),(LPARAM)(LPINT)(pi)) #define LVM_GETCOLUMNORDERARRAY (LVM_FIRST+59) -#define ListView_GetColumnOrderArray(hwnd,iCount,pi) (WINBOOL)SNDMSG((hwnd),LVM_GETCOLUMNORDERARRAY,(WPARAM)(iCount),(LPARAM)(LPINT)(pi)) +#define ListView_GetColumnOrderArray(hwnd,iCount,pi) (BOOL)SNDMSG((hwnd),LVM_GETCOLUMNORDERARRAY,(WPARAM)(iCount),(LPARAM)(LPINT)(pi)) #define LVM_SETHOTITEM (LVM_FIRST+60) #define ListView_SetHotItem(hwnd,i) (int)SNDMSG((hwnd),LVM_SETHOTITEM,(WPARAM)(i),0) #define LVM_GETHOTITEM (LVM_FIRST+61) @@ -2722,11 +2722,11 @@ #define LV_MAX_WORKAREAS 16 #define LVM_SETWORKAREAS (LVM_FIRST+65) -#define ListView_SetWorkAreas(hwnd,nWorkAreas,prc) (WINBOOL)SNDMSG((hwnd),LVM_SETWORKAREAS,(WPARAM)(int)(nWorkAreas),(LPARAM)(RECT *)(prc)) +#define ListView_SetWorkAreas(hwnd,nWorkAreas,prc) (BOOL)SNDMSG((hwnd),LVM_SETWORKAREAS,(WPARAM)(int)(nWorkAreas),(LPARAM)(RECT *)(prc)) #define LVM_GETWORKAREAS (LVM_FIRST+70) -#define ListView_GetWorkAreas(hwnd,nWorkAreas,prc) (WINBOOL)SNDMSG((hwnd),LVM_GETWORKAREAS,(WPARAM)(int)(nWorkAreas),(LPARAM)(RECT *)(prc)) +#define ListView_GetWorkAreas(hwnd,nWorkAreas,prc) (BOOL)SNDMSG((hwnd),LVM_GETWORKAREAS,(WPARAM)(int)(nWorkAreas),(LPARAM)(RECT *)(prc)) #define LVM_GETNUMBEROFWORKAREAS (LVM_FIRST+73) -#define ListView_GetNumberOfWorkAreas(hwnd,pnWorkAreas) (WINBOOL)SNDMSG((hwnd),LVM_GETNUMBEROFWORKAREAS,0,(LPARAM)(UINT *)(pnWorkAreas)) +#define ListView_GetNumberOfWorkAreas(hwnd,pnWorkAreas) (BOOL)SNDMSG((hwnd),LVM_GETNUMBEROFWORKAREAS,0,(LPARAM)(UINT *)(pnWorkAreas)) #define LVM_GETSELECTIONMARK (LVM_FIRST+66) #define ListView_GetSelectionMark(hwnd) (int)SNDMSG((hwnd),LVM_GETSELECTIONMARK,0,0) #define LVM_SETSELECTIONMARK (LVM_FIRST+67) @@ -2740,7 +2740,7 @@ #define LVM_GETTOOLTIPS (LVM_FIRST+78) #define ListView_GetToolTips(hwndLV) (HWND)SNDMSG((hwndLV),LVM_GETTOOLTIPS,0,0) #define LVM_SORTITEMSEX (LVM_FIRST+81) -#define ListView_SortItemsEx(hwndLV,_pfnCompare,_lPrm) (WINBOOL)SNDMSG((hwndLV),LVM_SORTITEMSEX,(WPARAM)(LPARAM)(_lPrm),(LPARAM)(PFNLVCOMPARE)(_pfnCompare)) +#define ListView_SortItemsEx(hwndLV,_pfnCompare,_lPrm) (BOOL)SNDMSG((hwndLV),LVM_SORTITEMSEX,(WPARAM)(LPARAM)(_lPrm),(LPARAM)(PFNLVCOMPARE)(_pfnCompare)) typedef struct tagLVBKIMAGEA { ULONG ulFlags; @@ -2921,9 +2921,9 @@ #define LVIM_AFTER 0x1 #define LVM_SETINSERTMARK (LVM_FIRST+166) -#define ListView_SetInsertMark(hwnd,lvim) (WINBOOL)SNDMSG((hwnd),LVM_SETINSERTMARK,(WPARAM) 0,(LPARAM) (lvim)) +#define ListView_SetInsertMark(hwnd,lvim) (BOOL)SNDMSG((hwnd),LVM_SETINSERTMARK,(WPARAM) 0,(LPARAM) (lvim)) #define LVM_GETINSERTMARK (LVM_FIRST+167) -#define ListView_GetInsertMark(hwnd,lvim) (WINBOOL)SNDMSG((hwnd),LVM_GETINSERTMARK,(WPARAM) 0,(LPARAM) (lvim)) +#define ListView_GetInsertMark(hwnd,lvim) (BOOL)SNDMSG((hwnd),LVM_GETINSERTMARK,(WPARAM) 0,(LPARAM) (lvim)) #define LVM_INSERTMARKHITTEST (LVM_FIRST+168) #define ListView_InsertMarkHitTest(hwnd,point,lvim) (int)SNDMSG((hwnd),LVM_INSERTMARKHITTEST,(WPARAM)(LPPOINT)(point),(LPARAM)(LPLVINSERTMARK)(lvim)) #define LVM_GETINSERTMARKRECT (LVM_FIRST+169) @@ -2942,11 +2942,11 @@ } LVSETINFOTIP,*PLVSETINFOTIP; #define LVM_SETINFOTIP (LVM_FIRST+173) -#define ListView_SetInfoTip(hwndLV,plvInfoTip) (WINBOOL)SNDMSG((hwndLV),LVM_SETINFOTIP,(WPARAM)0,(LPARAM)plvInfoTip) +#define ListView_SetInfoTip(hwndLV,plvInfoTip) (BOOL)SNDMSG((hwndLV),LVM_SETINFOTIP,(WPARAM)0,(LPARAM)plvInfoTip) #define LVM_GETSELECTEDCOLUMN (LVM_FIRST+174) #define ListView_GetSelectedColumn(hwnd) (UINT)SNDMSG((hwnd),LVM_GETSELECTEDCOLUMN,0,0) #define LVM_ISGROUPVIEWENABLED (LVM_FIRST+175) -#define ListView_IsGroupViewEnabled(hwnd) (WINBOOL)SNDMSG((hwnd),LVM_ISGROUPVIEWENABLED,0,0) +#define ListView_IsGroupViewEnabled(hwnd) (BOOL)SNDMSG((hwnd),LVM_ISGROUPVIEWENABLED,0,0) #define LVM_GETOUTLINECOLOR (LVM_FIRST+176) #define ListView_GetOutlineColor(hwnd) (COLORREF)SNDMSG((hwnd),LVM_GETOUTLINECOLOR,0,0) #define LVM_SETOUTLINECOLOR (LVM_FIRST+177) @@ -2965,8 +2965,8 @@ #define LVM_SETBKIMAGE __MINGW_NAME_AW(LVM_SETBKIMAGE) #define LVM_GETBKIMAGE __MINGW_NAME_AW(LVM_GETBKIMAGE) -#define ListView_SetBkImage(hwnd,plvbki) (WINBOOL)SNDMSG((hwnd),LVM_SETBKIMAGE,0,(LPARAM)(plvbki)) -#define ListView_GetBkImage(hwnd,plvbki) (WINBOOL)SNDMSG((hwnd),LVM_GETBKIMAGE,0,(LPARAM)(plvbki)) +#define ListView_SetBkImage(hwnd,plvbki) (BOOL)SNDMSG((hwnd),LVM_SETBKIMAGE,0,(LPARAM)(plvbki)) +#define ListView_GetBkImage(hwnd,plvbki) (BOOL)SNDMSG((hwnd),LVM_GETBKIMAGE,0,(LPARAM)(plvbki)) #define LPNM_LISTVIEW LPNMLISTVIEW #define NM_LISTVIEW NMLISTVIEW @@ -3350,12 +3350,12 @@ #define TreeView_InsertItem(hwnd,lpis) (HTREEITEM)SNDMSG((hwnd),TVM_INSERTITEM,0,(LPARAM)(LPTV_INSERTSTRUCT)(lpis)) #define TVM_DELETEITEM (TV_FIRST+1) -#define TreeView_DeleteItem(hwnd,hitem) (WINBOOL)SNDMSG((hwnd),TVM_DELETEITEM,0,(LPARAM)(HTREEITEM)(hitem)) - -#define TreeView_DeleteAllItems(hwnd) (WINBOOL)SNDMSG((hwnd),TVM_DELETEITEM,0,(LPARAM)TVI_ROOT) +#define TreeView_DeleteItem(hwnd,hitem) (BOOL)SNDMSG((hwnd),TVM_DELETEITEM,0,(LPARAM)(HTREEITEM)(hitem)) + +#define TreeView_DeleteAllItems(hwnd) (BOOL)SNDMSG((hwnd),TVM_DELETEITEM,0,(LPARAM)TVI_ROOT) #define TVM_EXPAND (TV_FIRST+2) -#define TreeView_Expand(hwnd,hitem,code) (WINBOOL)SNDMSG((hwnd),TVM_EXPAND,(WPARAM)(code),(LPARAM)(HTREEITEM)(hitem)) +#define TreeView_Expand(hwnd,hitem,code) (BOOL)SNDMSG((hwnd),TVM_EXPAND,(WPARAM)(code),(LPARAM)(HTREEITEM)(hitem)) #define TVE_COLLAPSE 0x1 #define TVE_EXPAND 0x2 @@ -3364,7 +3364,7 @@ #define TVE_COLLAPSERESET 0x8000 #define TVM_GETITEMRECT (TV_FIRST+4) -#define TreeView_GetItemRect(hwnd,hitem,prc,code) (*(HTREEITEM *)prc = (hitem),(WINBOOL)SNDMSG((hwnd),TVM_GETITEMRECT,(WPARAM)(code),(LPARAM)(RECT *)(prc))) +#define TreeView_GetItemRect(hwnd,hitem,prc,code) (*(HTREEITEM *)prc = (hitem),(BOOL)SNDMSG((hwnd),TVM_GETITEMRECT,(WPARAM)(code),(LPARAM)(RECT *)(prc))) #define TVM_GETCOUNT (TV_FIRST+5) #define TreeView_GetCount(hwnd) (UINT)SNDMSG((hwnd),TVM_GETCOUNT,0,0) @@ -3373,7 +3373,7 @@ #define TreeView_GetIndent(hwnd) (UINT)SNDMSG((hwnd),TVM_GETINDENT,0,0) #define TVM_SETINDENT (TV_FIRST+7) -#define TreeView_SetIndent(hwnd,indent) (WINBOOL)SNDMSG((hwnd),TVM_SETINDENT,(WPARAM)(indent),0) +#define TreeView_SetIndent(hwnd,indent) (BOOL)SNDMSG((hwnd),TVM_SETINDENT,(WPARAM)(indent),0) #define TVM_GETIMAGELIST (TV_FIRST+8) #define TreeView_GetImageList(hwnd,iImage) (HIMAGELIST)SNDMSG((hwnd),TVM_GETIMAGELIST,iImage,0) @@ -3414,7 +3414,7 @@ #define TreeView_GetLastVisible(hwnd) TreeView_GetNextItem(hwnd,NULL,TVGN_LASTVISIBLE) #define TVM_SELECTITEM (TV_FIRST+11) -#define TreeView_Select(hwnd,hitem,code) (WINBOOL)SNDMSG((hwnd),TVM_SELECTITEM,(WPARAM)(code),(LPARAM)(HTREEITEM)(hitem)) +#define TreeView_Select(hwnd,hitem,code) (BOOL)SNDMSG((hwnd),TVM_SELECTITEM,(WPARAM)(code),(LPARAM)(HTREEITEM)(hitem)) #define TreeView_SelectItem(hwnd,hitem) TreeView_Select(hwnd,hitem,TVGN_CARET) #define TreeView_SelectDropTarget(hwnd,hitem) TreeView_Select(hwnd,hitem,TVGN_DROPHILITE) @@ -3425,14 +3425,14 @@ #define TVM_GETITEM __MINGW_NAME_AW(TVM_GETITEM) -#define TreeView_GetItem(hwnd,pitem) (WINBOOL)SNDMSG((hwnd),TVM_GETITEM,0,(LPARAM)(TV_ITEM *)(pitem)) +#define TreeView_GetItem(hwnd,pitem) (BOOL)SNDMSG((hwnd),TVM_GETITEM,0,(LPARAM)(TV_ITEM *)(pitem)) #define TVM_SETITEMA (TV_FIRST+13) #define TVM_SETITEMW (TV_FIRST+63) #define TVM_SETITEM __MINGW_NAME_AW(TVM_SETITEM) -#define TreeView_SetItem(hwnd,pitem) (WINBOOL)SNDMSG((hwnd),TVM_SETITEM,0,(LPARAM)(const TV_ITEM *)(pitem)) +#define TreeView_SetItem(hwnd,pitem) (BOOL)SNDMSG((hwnd),TVM_SETITEM,0,(LPARAM)(const TV_ITEM *)(pitem)) #define TVM_EDITLABELA (TV_FIRST+14) #define TVM_EDITLABELW (TV_FIRST+65) @@ -3477,16 +3477,16 @@ #define TreeView_CreateDragImage(hwnd,hitem) (HIMAGELIST)SNDMSG((hwnd),TVM_CREATEDRAGIMAGE,0,(LPARAM)(HTREEITEM)(hitem)) #define TVM_SORTCHILDREN (TV_FIRST+19) -#define TreeView_SortChildren(hwnd,hitem,recurse) (WINBOOL)SNDMSG((hwnd),TVM_SORTCHILDREN,(WPARAM)(recurse),(LPARAM)(HTREEITEM)(hitem)) +#define TreeView_SortChildren(hwnd,hitem,recurse) (BOOL)SNDMSG((hwnd),TVM_SORTCHILDREN,(WPARAM)(recurse),(LPARAM)(HTREEITEM)(hitem)) #define TVM_ENSUREVISIBLE (TV_FIRST+20) -#define TreeView_EnsureVisible(hwnd,hitem) (WINBOOL)SNDMSG((hwnd),TVM_ENSUREVISIBLE,0,(LPARAM)(HTREEITEM)(hitem)) +#define TreeView_EnsureVisible(hwnd,hitem) (BOOL)SNDMSG((hwnd),TVM_ENSUREVISIBLE,0,(LPARAM)(HTREEITEM)(hitem)) #define TVM_SORTCHILDRENCB (TV_FIRST+21) -#define TreeView_SortChildrenCB(hwnd,psort,recurse) (WINBOOL)SNDMSG((hwnd),TVM_SORTCHILDRENCB,(WPARAM)(recurse),(LPARAM)(LPTV_SORTCB)(psort)) +#define TreeView_SortChildrenCB(hwnd,psort,recurse) (BOOL)SNDMSG((hwnd),TVM_SORTCHILDRENCB,(WPARAM)(recurse),(LPARAM)(LPTV_SORTCB)(psort)) #define TVM_ENDEDITLABELNOW (TV_FIRST+22) -#define TreeView_EndEditLabelNow(hwnd,fCancel) (WINBOOL)SNDMSG((hwnd),TVM_ENDEDITLABELNOW,(WPARAM)(fCancel),0) +#define TreeView_EndEditLabelNow(hwnd,fCancel) (BOOL)SNDMSG((hwnd),TVM_ENDEDITLABELNOW,(WPARAM)(fCancel),0) #define TVM_GETISEARCHSTRINGA (TV_FIRST+23) #define TVM_GETISEARCHSTRINGW (TV_FIRST+64) @@ -3497,14 +3497,14 @@ #define TreeView_SetToolTips(hwnd,hwndTT) (HWND)SNDMSG((hwnd),TVM_SETTOOLTIPS,(WPARAM)(hwndTT),0) #define TVM_GETTOOLTIPS (TV_FIRST+25) #define TreeView_GetToolTips(hwnd) (HWND)SNDMSG((hwnd),TVM_GETTOOLTIPS,0,0) -#define TreeView_GetISearchString(hwndTV,lpsz) (WINBOOL)SNDMSG((hwndTV),TVM_GETISEARCHSTRING,0,(LPARAM)(LPTSTR)(lpsz)) +#define TreeView_GetISearchString(hwndTV,lpsz) (BOOL)SNDMSG((hwndTV),TVM_GETISEARCHSTRING,0,(LPARAM)(LPTSTR)(lpsz)) #define TVM_SETINSERTMARK (TV_FIRST+26) -#define TreeView_SetInsertMark(hwnd,hItem,fAfter) (WINBOOL)SNDMSG((hwnd),TVM_SETINSERTMARK,(WPARAM) (fAfter),(LPARAM) (hItem)) +#define TreeView_SetInsertMark(hwnd,hItem,fAfter) (BOOL)SNDMSG((hwnd),TVM_SETINSERTMARK,(WPARAM) (fAfter),(LPARAM) (hItem)) #define TVM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT -#define TreeView_SetUnicodeFormat(hwnd,fUnicode) (WINBOOL)SNDMSG((hwnd),TVM_SETUNICODEFORMAT,(WPARAM)(fUnicode),0) +#define TreeView_SetUnicodeFormat(hwnd,fUnicode) (BOOL)SNDMSG((hwnd),TVM_SETUNICODEFORMAT,(WPARAM)(fUnicode),0) #define TVM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT -#define TreeView_GetUnicodeFormat(hwnd) (WINBOOL)SNDMSG((hwnd),TVM_GETUNICODEFORMAT,0,0) +#define TreeView_GetUnicodeFormat(hwnd) (BOOL)SNDMSG((hwnd),TVM_GETUNICODEFORMAT,0,0) #define TVM_SETITEMHEIGHT (TV_FIRST+27) #define TreeView_SetItemHeight(hwnd,iHeight) (int)SNDMSG((hwnd),TVM_SETITEMHEIGHT,(WPARAM)(iHeight),0) @@ -3846,7 +3846,7 @@ typedef struct { NMHDR hdr; - WINBOOL fChanged; + BOOL fChanged; int iNewSelection; WCHAR szText[CBEMAXSTRLEN]; int iWhy; @@ -3854,7 +3854,7 @@ typedef struct { NMHDR hdr; - WINBOOL fChanged; + BOOL fChanged; int iNewSelection; char szText[CBEMAXSTRLEN]; int iWhy; @@ -3971,14 +3971,14 @@ #define TCM_GETITEM __MINGW_NAME_AW(TCM_GETITEM) -#define TabCtrl_GetItem(hwnd,iItem,pitem) (WINBOOL)SNDMSG((hwnd),TCM_GETITEM,(WPARAM)(int)(iItem),(LPARAM)(TC_ITEM *)(pitem)) +#define TabCtrl_GetItem(hwnd,iItem,pitem) (BOOL)SNDMSG((hwnd),TCM_GETITEM,(WPARAM)(int)(iItem),(LPARAM)(TC_ITEM *)(pitem)) #define TCM_SETITEMA (TCM_FIRST+6) #define TCM_SETITEMW (TCM_FIRST+61) #define TCM_SETITEM __MINGW_NAME_AW(TCM_SETITEM) -#define TabCtrl_SetItem(hwnd,iItem,pitem) (WINBOOL)SNDMSG((hwnd),TCM_SETITEM,(WPARAM)(int)(iItem),(LPARAM)(TC_ITEM *)(pitem)) +#define TabCtrl_SetItem(hwnd,iItem,pitem) (BOOL)SNDMSG((hwnd),TCM_SETITEM,(WPARAM)(int)(iItem),(LPARAM)(TC_ITEM *)(pitem)) #define TCM_INSERTITEMA (TCM_FIRST+7) #define TCM_INSERTITEMW (TCM_FIRST+62) @@ -3988,13 +3988,13 @@ #define TabCtrl_InsertItem(hwnd,iItem,pitem) (int)SNDMSG((hwnd),TCM_INSERTITEM,(WPARAM)(int)(iItem),(LPARAM)(const TC_ITEM *)(pitem)) #define TCM_DELETEITEM (TCM_FIRST+8) -#define TabCtrl_DeleteItem(hwnd,i) (WINBOOL)SNDMSG((hwnd),TCM_DELETEITEM,(WPARAM)(int)(i),0L) +#define TabCtrl_DeleteItem(hwnd,i) (BOOL)SNDMSG((hwnd),TCM_DELETEITEM,(WPARAM)(int)(i),0L) #define TCM_DELETEALLITEMS (TCM_FIRST+9) -#define TabCtrl_DeleteAllItems(hwnd) (WINBOOL)SNDMSG((hwnd),TCM_DELETEALLITEMS,0,0L) +#define TabCtrl_DeleteAllItems(hwnd) (BOOL)SNDMSG((hwnd),TCM_DELETEALLITEMS,0,0L) #define TCM_GETITEMRECT (TCM_FIRST+10) -#define TabCtrl_GetItemRect(hwnd,i,prc) (WINBOOL)SNDMSG((hwnd),TCM_GETITEMRECT,(WPARAM)(int)(i),(LPARAM)(RECT *)(prc)) +#define TabCtrl_GetItemRect(hwnd,i,prc) (BOOL)SNDMSG((hwnd),TCM_GETITEMRECT,(WPARAM)(int)(i),(LPARAM)(RECT *)(prc)) #define TCM_GETCURSEL (TCM_FIRST+11) #define TabCtrl_GetCurSel(hwnd) (int)SNDMSG((hwnd),TCM_GETCURSEL,0,0) @@ -4018,9 +4018,9 @@ #define TCM_HITTEST (TCM_FIRST+13) #define TabCtrl_HitTest(hwndTC,pinfo) (int)SNDMSG((hwndTC),TCM_HITTEST,0,(LPARAM)(TC_HITTESTINFO *)(pinfo)) #define TCM_SETITEMEXTRA (TCM_FIRST+14) -#define TabCtrl_SetItemExtra(hwndTC,cb) (WINBOOL)SNDMSG((hwndTC),TCM_SETITEMEXTRA,(WPARAM)(cb),0L) +#define TabCtrl_SetItemExtra(hwndTC,cb) (BOOL)SNDMSG((hwndTC),TCM_SETITEMEXTRA,(WPARAM)(cb),0L) #define TCM_ADJUSTRECT (TCM_FIRST+40) -#define TabCtrl_AdjustRect(hwnd,bLarger,prc) (int)SNDMSG(hwnd,TCM_ADJUSTRECT,(WPARAM)(WINBOOL)(bLarger),(LPARAM)(RECT *)prc) +#define TabCtrl_AdjustRect(hwnd,bLarger,prc) (int)SNDMSG(hwnd,TCM_ADJUSTRECT,(WPARAM)(BOOL)(bLarger),(LPARAM)(RECT *)prc) #define TCM_SETITEMSIZE (TCM_FIRST+41) #define TabCtrl_SetItemSize(hwnd,x,y) (DWORD)SNDMSG((hwnd),TCM_SETITEMSIZE,0,MAKELPARAM(x,y)) #define TCM_REMOVEIMAGE (TCM_FIRST+42) @@ -4042,15 +4042,15 @@ #define TCM_DESELECTALL (TCM_FIRST+50) #define TabCtrl_DeselectAll(hwnd,fExcludeFocus) (void)SNDMSG((hwnd),TCM_DESELECTALL,fExcludeFocus,0) #define TCM_HIGHLIGHTITEM (TCM_FIRST+51) -#define TabCtrl_HighlightItem(hwnd,i,fHighlight) (WINBOOL)SNDMSG((hwnd),TCM_HIGHLIGHTITEM,(WPARAM)(i),(LPARAM)MAKELONG (fHighlight,0)) +#define TabCtrl_HighlightItem(hwnd,i,fHighlight) (BOOL)SNDMSG((hwnd),TCM_HIGHLIGHTITEM,(WPARAM)(i),(LPARAM)MAKELONG (fHighlight,0)) #define TCM_SETEXTENDEDSTYLE (TCM_FIRST+52) #define TabCtrl_SetExtendedStyle(hwnd,dw) (DWORD)SNDMSG((hwnd),TCM_SETEXTENDEDSTYLE,0,dw) #define TCM_GETEXTENDEDSTYLE (TCM_FIRST+53) #define TabCtrl_GetExtendedStyle(hwnd) (DWORD)SNDMSG((hwnd),TCM_GETEXTENDEDSTYLE,0,0) #define TCM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT -#define TabCtrl_SetUnicodeFormat(hwnd,fUnicode) (WINBOOL)SNDMSG((hwnd),TCM_SETUNICODEFORMAT,(WPARAM)(fUnicode),0) +#define TabCtrl_SetUnicodeFormat(hwnd,fUnicode) (BOOL)SNDMSG((hwnd),TCM_SETUNICODEFORMAT,(WPARAM)(fUnicode),0) #define TCM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT -#define TabCtrl_GetUnicodeFormat(hwnd) (WINBOOL)SNDMSG((hwnd),TCM_GETUNICODEFORMAT,0,0) +#define TabCtrl_GetUnicodeFormat(hwnd) (BOOL)SNDMSG((hwnd),TCM_GETUNICODEFORMAT,0,0) #define TCN_KEYDOWN (TCN_FIRST - 0) @@ -4097,10 +4097,10 @@ #define Animate_Create(hwndP,id,dwStyle,hInstance) CreateWindow(ANIMATE_CLASS,NULL,dwStyle,0,0,0,0,hwndP,(HMENU)(id),hInstance,NULL) -#define Animate_Open(hwnd,szName) (WINBOOL)SNDMSG(hwnd,ACM_OPEN,0,(LPARAM)(LPTSTR)(szName)) -#define Animate_OpenEx(hwnd,hInst,szName) (WINBOOL)SNDMSG(hwnd,ACM_OPEN,(WPARAM)(hInst),(LPARAM)(LPTSTR)(szName)) -#define Animate_Play(hwnd,from,to,rep) (WINBOOL)SNDMSG(hwnd,ACM_PLAY,(WPARAM)(rep),(LPARAM)MAKELONG(from,to)) -#define Animate_Stop(hwnd) (WINBOOL)SNDMSG(hwnd,ACM_STOP,0,0) +#define Animate_Open(hwnd,szName) (BOOL)SNDMSG(hwnd,ACM_OPEN,0,(LPARAM)(LPTSTR)(szName)) +#define Animate_OpenEx(hwnd,hInst,szName) (BOOL)SNDMSG(hwnd,ACM_OPEN,(WPARAM)(hInst),(LPARAM)(LPTSTR)(szName)) +#define Animate_Play(hwnd,from,to,rep) (BOOL)SNDMSG(hwnd,ACM_PLAY,(WPARAM)(rep),(LPARAM)MAKELONG(from,to)) +#define Animate_Stop(hwnd) (BOOL)SNDMSG(hwnd,ACM_STOP,0,0) #define Animate_Close(hwnd) Animate_Open(hwnd,NULL) #define Animate_Seek(hwnd,frame) Animate_Play(hwnd,frame,frame,1) #endif @@ -4116,13 +4116,13 @@ #define MCM_FIRST 0x1000 #define MCM_GETCURSEL (MCM_FIRST+1) -#define MonthCal_GetCurSel(hmc,pst) (WINBOOL)SNDMSG(hmc,MCM_GETCURSEL,0,(LPARAM)(pst)) +#define MonthCal_GetCurSel(hmc,pst) (BOOL)SNDMSG(hmc,MCM_GETCURSEL,0,(LPARAM)(pst)) #define MCM_SETCURSEL (MCM_FIRST+2) -#define MonthCal_SetCurSel(hmc,pst) (WINBOOL)SNDMSG(hmc,MCM_SETCURSEL,0,(LPARAM)(pst)) +#define MonthCal_SetCurSel(hmc,pst) (BOOL)SNDMSG(hmc,MCM_SETCURSEL,0,(LPARAM)(pst)) #define MCM_GETMAXSELCOUNT (MCM_FIRST+3) #define MonthCal_GetMaxSelCount(hmc) (DWORD)SNDMSG(hmc,MCM_GETMAXSELCOUNT,0,0L) #define MCM_SETMAXSELCOUNT (MCM_FIRST+4) -#define MonthCal_SetMaxSelCount(hmc,n) (WINBOOL)SNDMSG(hmc,MCM_SETMAXSELCOUNT,(WPARAM)(n),0L) +#define MonthCal_SetMaxSelCount(hmc,n) (BOOL)SNDMSG(hmc,MCM_SETMAXSELCOUNT,(WPARAM)(n),0L) #define MCM_GETSELRANGE (MCM_FIRST+5) #define MonthCal_GetSelRange(hmc,rgst) SNDMSG(hmc,MCM_GETSELRANGE,0,(LPARAM)(rgst)) #define MCM_SETSELRANGE (MCM_FIRST+6) @@ -4148,7 +4148,7 @@ #define MCM_SETTODAY (MCM_FIRST+12) #define MonthCal_SetToday(hmc,pst) SNDMSG(hmc,MCM_SETTODAY,0,(LPARAM)(pst)) #define MCM_GETTODAY (MCM_FIRST+13) -#define MonthCal_GetToday(hmc,pst) (WINBOOL)SNDMSG(hmc,MCM_GETTODAY,0,(LPARAM)(pst)) +#define MonthCal_GetToday(hmc,pst) (BOOL)SNDMSG(hmc,MCM_GETTODAY,0,(LPARAM)(pst)) #define MCM_HITTEST (MCM_FIRST+14) #define MonthCal_HitTest(hmc,pinfo) SNDMSG(hmc,MCM_HITTEST,0,(LPARAM)(PMCHITTESTINFO)(pinfo)) @@ -4196,7 +4196,7 @@ #define MCM_GETRANGE (MCM_FIRST+17) #define MonthCal_GetRange(hmc,rgst) (DWORD)SNDMSG(hmc,MCM_GETRANGE,0,(LPARAM)(rgst)) #define MCM_SETRANGE (MCM_FIRST+18) -#define MonthCal_SetRange(hmc,gd,rgst) (WINBOOL)SNDMSG(hmc,MCM_SETRANGE,(WPARAM)(gd),(LPARAM)(rgst)) +#define MonthCal_SetRange(hmc,gd,rgst) (BOOL)SNDMSG(hmc,MCM_SETRANGE,(WPARAM)(gd),(LPARAM)(rgst)) #define MCM_GETMONTHDELTA (MCM_FIRST+19) #define MonthCal_GetMonthDelta(hmc) (int)SNDMSG(hmc,MCM_GETMONTHDELTA,0,0) #define MCM_SETMONTHDELTA (MCM_FIRST+20) @@ -4208,9 +4208,9 @@ #define MCM_GETCALENDARCOUNT (MCM_FIRST + 23) #define MonthCal_GetCalendarCount(hmc) (DWORD)SNDMSG(hmc, MCM_GETCALENDARCOUNT, 0, 0) #define MCM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT -#define MonthCal_SetUnicodeFormat(hwnd,fUnicode) (WINBOOL)SNDMSG((hwnd),MCM_SETUNICODEFORMAT,(WPARAM)(fUnicode),0) +#define MonthCal_SetUnicodeFormat(hwnd,fUnicode) (BOOL)SNDMSG((hwnd),MCM_SETUNICODEFORMAT,(WPARAM)(fUnicode),0) #define MCM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT -#define MonthCal_GetUnicodeFormat(hwnd) (WINBOOL)SNDMSG((hwnd),MCM_GETUNICODEFORMAT,0,0) +#define MonthCal_GetUnicodeFormat(hwnd) (BOOL)SNDMSG((hwnd),MCM_GETUNICODEFORMAT,0,0) #define MCM_SIZERECTTOMIN (MCM_FIRST + 29) #define MonthCal_SizeRectToMin(hmc, prc) SNDMSG(hmc, MCM_SIZERECTTOMIN, 0, (LPARAM)(prc)) #define MCM_SETCALENDARBORDER (MCM_FIRST + 30) @@ -4260,17 +4260,17 @@ #define DTM_GETSYSTEMTIME (DTM_FIRST+1) #define DateTime_GetSystemtime(hdp,pst) (DWORD)SNDMSG(hdp,DTM_GETSYSTEMTIME,0,(LPARAM)(pst)) #define DTM_SETSYSTEMTIME (DTM_FIRST+2) -#define DateTime_SetSystemtime(hdp,gd,pst) (WINBOOL)SNDMSG(hdp,DTM_SETSYSTEMTIME,(WPARAM)(gd),(LPARAM)(pst)) +#define DateTime_SetSystemtime(hdp,gd,pst) (BOOL)SNDMSG(hdp,DTM_SETSYSTEMTIME,(WPARAM)(gd),(LPARAM)(pst)) #define DTM_GETRANGE (DTM_FIRST+3) #define DateTime_GetRange(hdp,rgst) (DWORD)SNDMSG(hdp,DTM_GETRANGE,0,(LPARAM)(rgst)) #define DTM_SETRANGE (DTM_FIRST+4) -#define DateTime_SetRange(hdp,gd,rgst) (WINBOOL)SNDMSG(hdp,DTM_SETRANGE,(WPARAM)(gd),(LPARAM)(rgst)) +#define DateTime_SetRange(hdp,gd,rgst) (BOOL)SNDMSG(hdp,DTM_SETRANGE,(WPARAM)(gd),(LPARAM)(rgst)) #define DTM_SETFORMATA (DTM_FIRST+5) #define DTM_SETFORMATW (DTM_FIRST+50) #define DTM_SETFORMAT __MINGW_NAME_AW(DTM_SETFORMAT) -#define DateTime_SetFormat(hdp,sz) (WINBOOL)SNDMSG(hdp,DTM_SETFORMAT,0,(LPARAM)(sz)) +#define DateTime_SetFormat(hdp,sz) (BOOL)SNDMSG(hdp,DTM_SETFORMAT,0,(LPARAM)(sz)) #define DTM_SETMCCOLOR (DTM_FIRST+6) #define DateTime_SetMonthCalColor(hdp,iColor,clr) SNDMSG(hdp,DTM_SETMCCOLOR,iColor,clr) @@ -4560,18 +4560,18 @@ } BUTTON_IMAGELIST,*PBUTTON_IMAGELIST; #define BCM_GETIDEALSIZE (BCM_FIRST+0x1) -#define Button_GetIdealSize(hwnd,psize) (WINBOOL)SNDMSG((hwnd),BCM_GETIDEALSIZE,0,(LPARAM)(psize)) +#define Button_GetIdealSize(hwnd,psize) (BOOL)SNDMSG((hwnd),BCM_GETIDEALSIZE,0,(LPARAM)(psize)) #define BCM_SETIMAGELIST (BCM_FIRST+0x2) -#define Button_SetImageList(hwnd,pbuttonImagelist) (WINBOOL)SNDMSG((hwnd),BCM_SETIMAGELIST,0,(LPARAM)(pbuttonImagelist)) +#define Button_SetImageList(hwnd,pbuttonImagelist) (BOOL)SNDMSG((hwnd),BCM_SETIMAGELIST,0,(LPARAM)(pbuttonImagelist)) #define BCM_GETIMAGELIST (BCM_FIRST+0x3) -#define Button_GetImageList(hwnd,pbuttonImagelist) (WINBOOL)SNDMSG((hwnd),BCM_GETIMAGELIST,0,(LPARAM)(pbuttonImagelist)) +#define Button_GetImageList(hwnd,pbuttonImagelist) (BOOL)SNDMSG((hwnd),BCM_GETIMAGELIST,0,(LPARAM)(pbuttonImagelist)) #define BCM_SETTEXTMARGIN (BCM_FIRST+0x4) -#define Button_SetTextMargin(hwnd,pmargin) (WINBOOL)SNDMSG((hwnd),BCM_SETTEXTMARGIN,0,(LPARAM)(pmargin)) +#define Button_SetTextMargin(hwnd,pmargin) (BOOL)SNDMSG((hwnd),BCM_SETTEXTMARGIN,0,(LPARAM)(pmargin)) #define BCM_GETTEXTMARGIN (BCM_FIRST+0x5) -#define Button_GetTextMargin(hwnd,pmargin) (WINBOOL)SNDMSG((hwnd),BCM_GETTEXTMARGIN,0,(LPARAM)(pmargin)) +#define Button_GetTextMargin(hwnd,pmargin) (BOOL)SNDMSG((hwnd),BCM_GETTEXTMARGIN,0,(LPARAM)(pmargin)) typedef struct tagNMBCHOTITEM { NMHDR hdr; @@ -4597,9 +4597,9 @@ #define WC_EDIT __MINGW_NAME_AW(WC_EDIT) #define EM_SETCUEBANNER (ECM_FIRST+1) -#define Edit_SetCueBannerText(hwnd,lpcwText) (WINBOOL)SNDMSG((hwnd),EM_SETCUEBANNER,0,(LPARAM)(lpcwText)) +#define Edit_SetCueBannerText(hwnd,lpcwText) (BOOL)SNDMSG((hwnd),EM_SETCUEBANNER,0,(LPARAM)(lpcwText)) #define EM_GETCUEBANNER (ECM_FIRST+2) -#define Edit_GetCueBannerText(hwnd,lpwText,cchText) (WINBOOL)SNDMSG((hwnd),EM_GETCUEBANNER,(WPARAM)(lpwText),(LPARAM)(cchText)) +#define Edit_GetCueBannerText(hwnd,lpwText,cchText) (BOOL)SNDMSG((hwnd),EM_GETCUEBANNER,(WPARAM)(lpwText),(LPARAM)(cchText)) typedef struct _tagEDITBALLOONTIP { DWORD cbStruct; @@ -4608,9 +4608,9 @@ INT ttiIcon; } EDITBALLOONTIP,*PEDITBALLOONTIP; #define EM_SHOWBALLOONTIP (ECM_FIRST+3) -#define Edit_ShowBalloonTip(hwnd,peditballoontip) (WINBOOL)SNDMSG((hwnd),EM_SHOWBALLOONTIP,0,(LPARAM)(peditballoontip)) +#define Edit_ShowBalloonTip(hwnd,peditballoontip) (BOOL)SNDMSG((hwnd),EM_SHOWBALLOONTIP,0,(LPARAM)(peditballoontip)) #define EM_HIDEBALLOONTIP (ECM_FIRST+4) -#define Edit_HideBalloonTip(hwnd) (WINBOOL)SNDMSG((hwnd),EM_HIDEBALLOONTIP,0,0) +#define Edit_HideBalloonTip(hwnd) (BOOL)SNDMSG((hwnd),EM_HIDEBALLOONTIP,0,0) #endif #ifndef NOLISTBOX @@ -4632,7 +4632,7 @@ #define CB_SETMINVISIBLE (CBM_FIRST+1) #define CB_GETMINVISIBLE (CBM_FIRST+2) -#define ComboBox_SetMinVisible(hwnd,iMinVisible) (WINBOOL)SNDMSG((hwnd),CB_SETMINVISIBLE,(WPARAM)iMinVisible,0) +#define ComboBox_SetMinVisible(hwnd,iMinVisible) (BOOL)SNDMSG((hwnd),CB_SETMINVISIBLE,(WPARAM)iMinVisible,0) #define ComboBox_GetMinVisible(hwnd) (int)SNDMSG((hwnd),CB_GETMINVISIBLE,0,0) #ifndef NOSCROLLBAR @@ -4704,7 +4704,7 @@ typedef int (CALLBACK *PFNDSAENUMCALLBACK)(void *p,void *pData); WINCOMMCTRLAPI HDSA WINAPI DSA_Create(int cbItem,int cItemGrow); - WINCOMMCTRLAPI WINBOOL WINAPI DSA_Destroy(_Inout_opt_ HDSA hdsa); + WINCOMMCTRLAPI BOOL WINAPI DSA_Destroy(_Inout_opt_ HDSA hdsa); WINCOMMCTRLAPI void @@ -4727,9 +4727,9 @@ typedef struct _DPA *HDPA; WINCOMMCTRLAPI HDPA WINAPI DPA_Create(int cItemGrow); - WINCOMMCTRLAPI WINBOOL WINAPI DPA_Destroy(_Inout_opt_ HDPA hdpa); + WINCOMMCTRLAPI BOOL WINAPI DPA_Destroy(_Inout_opt_ HDPA hdpa); WINCOMMCTRLAPI PVOID WINAPI DPA_DeletePtr(_Inout_ HDPA hdpa, _In_ int i); - WINCOMMCTRLAPI WINBOOL WINAPI DPA_DeleteAllPtrs(_Inout_ HDPA hdpa); + WINCOMMCTRLAPI BOOL WINAPI DPA_DeleteAllPtrs(_Inout_ HDPA hdpa); WINCOMMCTRLAPI void @@ -4750,7 +4750,7 @@ typedef int (CALLBACK *PFNDPACOMPARE)(void *p1,void *p2,LPARAM lParam); WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI DPA_Sort( _Inout_ HDPA hdpa, @@ -4773,7 +4773,7 @@ _In_ UINT options); WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI Str_SetPtrW( _Inout_ LPWSTR *ppsz, _In_opt_ LPCWSTR psz); @@ -4823,7 +4823,7 @@ _In_ struct IStream * pstream, _In_opt_ void *pvInstData); - WINCOMMCTRLAPI WINBOOL WINAPI DPA_Grow(_Inout_ HDPA pdpa, _In_ int cp); + WINCOMMCTRLAPI BOOL WINAPI DPA_Grow(_Inout_ HDPA pdpa, _In_ int cp); WINCOMMCTRLAPI int @@ -4836,7 +4836,7 @@ WINCOMMCTRLAPI PVOID WINAPI DPA_GetPtr(_In_ HDPA hdpa, _In_ INT_PTR i); WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI DPA_SetPtr( _Inout_ HDPA hdpa, @@ -4892,7 +4892,7 @@ #endif WINCOMMCTRLAPI - WINBOOL + BOOL WINAPI _TrackMouseEvent( _Inout_ LPTRACKMOUSEEVENT lpEventTrack); @@ -4919,24 +4919,24 @@ #define FSB_ENCARTA_MODE 1 #define FSB_REGULAR_MODE 0 - WINCOMMCTRLAPI WINBOOL WINAPI FlatSB_EnableScrollBar(HWND,int,UINT); - WINCOMMCTRLAPI WINBOOL WINAPI FlatSB_ShowScrollBar(HWND,int code,WINBOOL); - WINCOMMCTRLAPI WINBOOL WINAPI FlatSB_GetScrollRange(HWND,int code,LPINT,LPINT); - WINCOMMCTRLAPI WINBOOL WINAPI FlatSB_GetScrollInfo(HWND,int code,LPSCROLLINFO); + WINCOMMCTRLAPI BOOL WINAPI FlatSB_EnableScrollBar(HWND,int,UINT); + WINCOMMCTRLAPI BOOL WINAPI FlatSB_ShowScrollBar(HWND,int code,BOOL); + WINCOMMCTRLAPI BOOL WINAPI FlatSB_GetScrollRange(HWND,int code,LPINT,LPINT); + WINCOMMCTRLAPI BOOL WINAPI FlatSB_GetScrollInfo(HWND,int code,LPSCROLLINFO); WINCOMMCTRLAPI int WINAPI FlatSB_GetScrollPos(HWND,int code); - WINCOMMCTRLAPI WINBOOL WINAPI FlatSB_GetScrollProp(HWND,int propIndex,LPINT); + WINCOMMCTRLAPI BOOL WINAPI FlatSB_GetScrollProp(HWND,int propIndex,LPINT); #ifdef _WIN64 - WINCOMMCTRLAPI WINBOOL WINAPI FlatSB_GetScrollPropPtr(HWND,int propIndex,PINT_PTR); + WINCOMMCTRLAPI BOOL WINAPI FlatSB_GetScrollPropPtr(HWND,int propIndex,PINT_PTR); #else #define FlatSB_GetScrollPropPtr FlatSB_GetScrollProp #endif - WINCOMMCTRLAPI int WINAPI FlatSB_SetScrollPos(HWND,int code,int pos,WINBOOL fRedraw); - WINCOMMCTRLAPI int WINAPI FlatSB_SetScrollInfo(HWND,int code,LPSCROLLINFO,WINBOOL fRedraw); - WINCOMMCTRLAPI int WINAPI FlatSB_SetScrollRange(HWND,int code,int min,int max,WINBOOL fRedraw); - WINCOMMCTRLAPI WINBOOL WINAPI FlatSB_SetScrollProp(HWND,UINT index,INT_PTR newValue,WINBOOL); + WINCOMMCTRLAPI int WINAPI FlatSB_SetScrollPos(HWND,int code,int pos,BOOL fRedraw); + WINCOMMCTRLAPI int WINAPI FlatSB_SetScrollInfo(HWND,int code,LPSCROLLINFO,BOOL fRedraw); + WINCOMMCTRLAPI int WINAPI FlatSB_SetScrollRange(HWND,int code,int min,int max,BOOL fRedraw); + WINCOMMCTRLAPI BOOL WINAPI FlatSB_SetScrollProp(HWND,UINT index,INT_PTR newValue,BOOL); #define FlatSB_SetScrollPropPtr FlatSB_SetScrollProp - WINCOMMCTRLAPI WINBOOL WINAPI InitializeFlatSB(HWND); + WINCOMMCTRLAPI BOOL WINAPI InitializeFlatSB(HWND); WINCOMMCTRLAPI HRESULT WINAPI UninitializeFlatSB(HWND); #endif #endif @@ -4944,7 +4944,7 @@ typedef LRESULT (CALLBACK *SUBCLASSPROC)(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam,UINT_PTR uIdSubclass,DWORD_PTR dwRefData); _Success_(return != 0) - WINBOOL + BOOL WINAPI SetWindowSubclass( _In_ HWND hWnd, @@ -4953,7 +4953,7 @@ _In_ DWORD_PTR dwRefData); _Success_(return != 0) - WINBOOL + BOOL WINAPI GetWindowSubclass( _In_ HWND hWnd, @@ -4962,7 +4962,7 @@ _Out_opt_ DWORD_PTR *pdwRefData); _Success_(return != 0) - WINBOOL + BOOL WINAPI RemoveWindowSubclass( _In_ HWND hWnd,

1 0

[aandrejevic] 59795: [SOFT386] Halfplement Soft386ExecutionControl.
by aandrejevic＠svn.reactos.org 22 Aug '13

22 Aug '13

Author: aandrejevic Date: Thu Aug 22 22:54:59 2013 New Revision: 59795 URL: http://svn.reactos.org/svn/reactos?rev=59795&view=rev Log: [SOFT386] Halfplement Soft386ExecutionControl. Added: branches/ntvdm/lib/soft386/opcodes.c (with props) branches/ntvdm/lib/soft386/opcodes.h (with props) Modified: branches/ntvdm/lib/soft386/CMakeLists.txt branches/ntvdm/lib/soft386/soft386.c Modified: branches/ntvdm/lib/soft386/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/CMakeLists.tx… ============================================================================== --- branches/ntvdm/lib/soft386/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/CMakeLists.txt [iso-8859-1] Thu Aug 22 22:54:59 2013 @@ -2,6 +2,7 @@ list(APPEND SOURCE soft386.c + opcodes.c common.c) add_library(soft386 ${SOURCE}) Added: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c (added) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Thu Aug 22 22:54:59 2013 @@ -0,0 +1,28 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: 386/486 CPU Emulation Library + * FILE: opcodes.c + * PURPOSE: Opcode handlers. + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +/* INCLUDES *******************************************************************/ + +// #define WIN32_NO_STATUS +// #define _INC_WINDOWS +#include <windef.h> + +#include <soft386.h> +#include "opcodes.h" +#include "common.h" + +// #define NDEBUG +#include <debug.h> + +/* PUBLIC VARIABLES ***********************************************************/ + +SOFT386_OPCODE_HANDLER_PROC +Soft386OpcodeHandlers[SOFT386_NUM_OPCODE_HANDLERS] = +{ + NULL +}; Propchange: branches/ntvdm/lib/soft386/opcodes.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h (added) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Thu Aug 22 22:54:59 2013 @@ -0,0 +1,22 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: 386/486 CPU Emulation Library + * FILE: opcodes.h + * PURPOSE: Opcode handlers. (header file) + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#ifndef _OPCODES_H_ +#define _OPCODES_H_ + +/* DEFINES ********************************************************************/ + +#define SOFT386_NUM_OPCODE_HANDLERS 256 + +typedef BOOLEAN (__fastcall *SOFT386_OPCODE_HANDLER_PROC)(PSOFT386_STATE); + +extern +SOFT386_OPCODE_HANDLER_PROC +Soft386OpcodeHandlers[SOFT386_NUM_OPCODE_HANDLERS]; + +#endif // _OPCODES_H_ Propchange: branches/ntvdm/lib/soft386/opcodes.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ntvdm/lib/soft386/soft386.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/soft386.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] Thu Aug 22 22:54:59 2013 @@ -14,6 +14,7 @@ #include <soft386.h> #include "common.h" +#include "opcodes.h" // #define NDEBUG #include <debug.h> @@ -36,8 +37,31 @@ NTAPI Soft386ExecutionControl(PSOFT386_STATE State, INT Command) { - // TODO: NOT IMPLEMENTED!!! - UNIMPLEMENTED; + BYTE Opcode; + INT ProcedureCallCount = 0; + + /* Main execution loop */ + do + { + /* Perform an instruction fetch */ + if (!Soft386FetchByte(State, &Opcode)) continue; + + // TODO: Check for CALL/RET to update ProcedureCallCount. + + if (Soft386OpcodeHandlers[Opcode] != NULL) + { + /* Call the opcode handler */ + Soft386OpcodeHandlers[Opcode](State); + } + else + { + /* This is not a valid opcode */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + } + } + while ((Command == SOFT386_CONTINUE) + || (Command == SOFT386_STEP_OVER && ProcedureCallCount > 0) + || (Command == SOFT386_STEP_OUT && ProcedureCallCount >= 0)); } /* PUBLIC FUNCTIONS ***********************************************************/

1 0

[hbelusca] 59794: [NTOSKRNL] Fix some code indentation and a DPRINT.
by hbelusca＠svn.reactos.org 22 Aug '13

22 Aug '13

Author: hbelusca Date: Thu Aug 22 19:17:17 2013 New Revision: 59794 URL: http://svn.reactos.org/svn/reactos?rev=59794&view=rev Log: [NTOSKRNL] Fix some code indentation and a DPRINT. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Thu Aug 22 19:17:17 2013 @@ -1822,169 +1822,169 @@ VOID NTAPI IopLoadUnloadDriver(PLOAD_UNLOAD_PARAMS LoadParams) { - RTL_QUERY_REGISTRY_TABLE QueryTable[3]; - UNICODE_STRING ImagePath; - UNICODE_STRING ServiceName; - NTSTATUS Status; - ULONG Type; - PDEVICE_NODE DeviceNode; - PDRIVER_OBJECT DriverObject; - PLDR_DATA_TABLE_ENTRY ModuleObject; - PVOID BaseAddress; - WCHAR *cur; - - /* Check if it's an unload request */ - if (LoadParams->DriverObject) - { - (*LoadParams->DriverObject->DriverUnload)(LoadParams->DriverObject); - - /* Return success and signal the event */ - LoadParams->Status = STATUS_SUCCESS; - (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); - return; - } - - RtlInitUnicodeString(&ImagePath, NULL); - - /* - * Get the service name from the registry key name. - */ - ASSERT(LoadParams->ServiceName->Length >= sizeof(WCHAR)); - - ServiceName = *LoadParams->ServiceName; - cur = LoadParams->ServiceName->Buffer + - (LoadParams->ServiceName->Length / sizeof(WCHAR)) - 1; - while (LoadParams->ServiceName->Buffer != cur) - { - if(*cur == L'\\') - { - ServiceName.Buffer = cur + 1; - ServiceName.Length = LoadParams->ServiceName->Length - - (USHORT)((ULONG_PTR)ServiceName.Buffer - - (ULONG_PTR)LoadParams->ServiceName->Buffer); - break; - } - cur--; - } - - /* + RTL_QUERY_REGISTRY_TABLE QueryTable[3]; + UNICODE_STRING ImagePath; + UNICODE_STRING ServiceName; + NTSTATUS Status; + ULONG Type; + PDEVICE_NODE DeviceNode; + PDRIVER_OBJECT DriverObject; + PLDR_DATA_TABLE_ENTRY ModuleObject; + PVOID BaseAddress; + WCHAR *cur; + + /* Check if it's an unload request */ + if (LoadParams->DriverObject) + { + (*LoadParams->DriverObject->DriverUnload)(LoadParams->DriverObject); + + /* Return success and signal the event */ + LoadParams->Status = STATUS_SUCCESS; + KeSetEvent(&LoadParams->Event, 0, FALSE); + return; + } + + RtlInitUnicodeString(&ImagePath, NULL); + + /* + * Get the service name from the registry key name. + */ + ASSERT(LoadParams->ServiceName->Length >= sizeof(WCHAR)); + + ServiceName = *LoadParams->ServiceName; + cur = LoadParams->ServiceName->Buffer + + (LoadParams->ServiceName->Length / sizeof(WCHAR)) - 1; + while (LoadParams->ServiceName->Buffer != cur) + { + if (*cur == L'\\') + { + ServiceName.Buffer = cur + 1; + ServiceName.Length = LoadParams->ServiceName->Length - + (USHORT)((ULONG_PTR)ServiceName.Buffer - + (ULONG_PTR)LoadParams->ServiceName->Buffer); + break; + } + cur--; + } + + /* * Get service type. */ - RtlZeroMemory(&QueryTable, sizeof(QueryTable)); - - RtlInitUnicodeString(&ImagePath, NULL); - - QueryTable[0].Name = L"Type"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[0].EntryContext = &Type; - - QueryTable[1].Name = L"ImagePath"; - QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[1].EntryContext = &ImagePath; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - LoadParams->ServiceName->Buffer, QueryTable, NULL, NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlQueryRegistryValues() failed (Status %lx)\n", Status); - if (ImagePath.Buffer) - ExFreePool(ImagePath.Buffer); - LoadParams->Status = Status; - (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); - return; - } - - /* + RtlZeroMemory(&QueryTable, sizeof(QueryTable)); + + RtlInitUnicodeString(&ImagePath, NULL); + + QueryTable[0].Name = L"Type"; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[0].EntryContext = &Type; + + QueryTable[1].Name = L"ImagePath"; + QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[1].EntryContext = &ImagePath; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + LoadParams->ServiceName->Buffer, + QueryTable, NULL, NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT("RtlQueryRegistryValues() failed (Status %lx)\n", Status); + if (ImagePath.Buffer) ExFreePool(ImagePath.Buffer); + LoadParams->Status = Status; + KeSetEvent(&LoadParams->Event, 0, FALSE); + return; + } + + /* * Normalize the image path for all later processing. */ - Status = IopNormalizeImagePath(&ImagePath, &ServiceName); - - if (!NT_SUCCESS(Status)) - { - DPRINT("IopNormalizeImagePath() failed (Status %x)\n", Status); - LoadParams->Status = Status; - (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); - return; - } - - DPRINT("FullImagePath: '%wZ'\n", &ImagePath); - DPRINT("Type: %lx\n", Type); - - /* Get existing DriverObject pointer (in case the driver has + Status = IopNormalizeImagePath(&ImagePath, &ServiceName); + + if (!NT_SUCCESS(Status)) + { + DPRINT("IopNormalizeImagePath() failed (Status %x)\n", Status); + LoadParams->Status = Status; + KeSetEvent(&LoadParams->Event, 0, FALSE); + return; + } + + DPRINT("FullImagePath: '%wZ'\n", &ImagePath); + DPRINT("Type: %lx\n", Type); + + /* Get existing DriverObject pointer (in case the driver has already been loaded and initialized) */ - Status = IopGetDriverObject( - &DriverObject, - &ServiceName, - (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || - Type == 8 /* SERVICE_RECOGNIZER_DRIVER */)); - - if (!NT_SUCCESS(Status)) - { - /* - * Load the driver module - */ - - DPRINT("Loading module from %wZ\n", &ImagePath); - Status = MmLoadSystemImage(&ImagePath, NULL, NULL, 0, (PVOID)&ModuleObject, &BaseAddress); - - if (!NT_SUCCESS(Status)) - { - DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); - LoadParams->Status = Status; - (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); - return; - } - - /* + Status = IopGetDriverObject( + &DriverObject, + &ServiceName, + (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || + Type == 8 /* SERVICE_RECOGNIZER_DRIVER */)); + + if (!NT_SUCCESS(Status)) + { + /* + * Load the driver module + */ + + DPRINT("Loading module from %wZ\n", &ImagePath); + Status = MmLoadSystemImage(&ImagePath, NULL, NULL, 0, (PVOID)&ModuleObject, &BaseAddress); + + if (!NT_SUCCESS(Status)) + { + DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); + LoadParams->Status = Status; + KeSetEvent(&LoadParams->Event, 0, FALSE); + return; + } + + /* * Initialize the driver module if it's loaded for the first time */ - Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &ServiceName, &DeviceNode); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopCreateDeviceNode() failed (Status %lx)\n", Status); - MmUnloadSystemImage(ModuleObject); - LoadParams->Status = Status; - (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); - return; - } - - IopDisplayLoadingMessage(&DeviceNode->ServiceName); - - Status = IopInitializeDriverModule(DeviceNode, - ModuleObject, - &DeviceNode->ServiceName, - (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || - Type == 8 /* SERVICE_RECOGNIZER_DRIVER */), - &DriverObject); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopInitializeDriver() failed (Status %lx)\n", Status); - MmUnloadSystemImage(ModuleObject); - IopFreeDeviceNode(DeviceNode); - LoadParams->Status = Status; - (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); - return; - } - - /* Initialize and start device */ - IopInitializeDevice(DeviceNode, DriverObject); - Status = IopStartDevice(DeviceNode); - } - else - { - DPRINT("DriverObject already exist in ObjectManager\n"); - Status = STATUS_IMAGE_ALREADY_LOADED; - - /* IopGetDriverObject references the DriverObject, so dereference it */ - ObDereferenceObject(DriverObject); - } - - /* Pass status to the caller and signal the event */ - LoadParams->Status = Status; - (VOID)KeSetEvent(&LoadParams->Event, 0, FALSE); + Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &ServiceName, &DeviceNode); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopCreateDeviceNode() failed (Status %lx)\n", Status); + MmUnloadSystemImage(ModuleObject); + LoadParams->Status = Status; + KeSetEvent(&LoadParams->Event, 0, FALSE); + return; + } + + IopDisplayLoadingMessage(&DeviceNode->ServiceName); + + Status = IopInitializeDriverModule(DeviceNode, + ModuleObject, + &DeviceNode->ServiceName, + (Type == 2 /* SERVICE_FILE_SYSTEM_DRIVER */ || + Type == 8 /* SERVICE_RECOGNIZER_DRIVER */), + &DriverObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopInitializeDriverModule() failed (Status %lx)\n", Status); + MmUnloadSystemImage(ModuleObject); + IopFreeDeviceNode(DeviceNode); + LoadParams->Status = Status; + KeSetEvent(&LoadParams->Event, 0, FALSE); + return; + } + + /* Initialize and start device */ + IopInitializeDevice(DeviceNode, DriverObject); + Status = IopStartDevice(DeviceNode); + } + else + { + DPRINT("DriverObject already exist in ObjectManager\n"); + Status = STATUS_IMAGE_ALREADY_LOADED; + + /* IopGetDriverObject references the DriverObject, so dereference it */ + ObDereferenceObject(DriverObject); + } + + /* Pass status to the caller and signal the event */ + LoadParams->Status = Status; + KeSetEvent(&LoadParams->Event, 0, FALSE); } /*

1 0

[hbelusca] 59793: [KERNEL32] Fix usage of the 2nd parameter of NtFlushVirtualMemory, in the FlushViewOfFile file. This fixes the creation of "self-extracted" files from executables (e.g. DeviceTree...
by hbelusca＠svn.reactos.org 22 Aug '13

22 Aug '13

Author: hbelusca Date: Thu Aug 22 18:25:02 2013 New Revision: 59793 URL: http://svn.reactos.org/svn/reactos?rev=59793&view=rev Log: [KERNEL32] Fix usage of the 2nd parameter of NtFlushVirtualMemory, in the FlushViewOfFile file. This fixes the creation of "self-extracted" files from executables (e.g. DeviceTree utility from OSR or some Sysinternals tools). CORE-6572 #comment Partly fixed in revision r59793. Now the objinfo.sys file is created without corruption, but there are problems loading the driver itself... This fixes a bug introduced in revision 775 about 14 years ago! Many thanks to Oláf for having debugged DeviceTree and oriented me to the real problem :D Modified: trunk/reactos/dll/win32/kernel32/client/file/filemap.c Modified: trunk/reactos/dll/win32/kernel32/client/file/filemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/filemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/filemap.c [iso-8859-1] Thu Aug 22 18:25:02 2013 @@ -346,16 +346,14 @@ FlushViewOfFile(IN LPCVOID lpBaseAddress, IN SIZE_T dwNumberOfBytesToFlush) { - SIZE_T NumberOfBytesToFlush; - NTSTATUS Status; + NTSTATUS Status; + PVOID BaseAddress = (PVOID)lpBaseAddress; + SIZE_T NumberOfBytesToFlush = dwNumberOfBytesToFlush; IO_STATUS_BLOCK IoStatusBlock; - - /* Save amount of bytes to flush to a local var */ - NumberOfBytesToFlush = dwNumberOfBytesToFlush; /* Flush the view */ Status = NtFlushVirtualMemory(NtCurrentProcess(), - (LPVOID)lpBaseAddress, + &BaseAddress, &NumberOfBytesToFlush, &IoStatusBlock); if (!NT_SUCCESS(Status) && (Status != STATUS_NOT_MAPPED_DATA))

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2013