Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 69501: [INTL] Update number and currency examples according to the current settings. CORE-10074 #resolve
by ekohl＠svn.reactos.org 11 Oct '15

11 Oct '15

Author: ekohl Date: Sun Oct 11 18:36:22 2015 New Revision: 69501 URL: http://svn.reactos.org/svn/reactos?rev=69501&view=rev Log: [INTL] Update number and currency examples according to the current settings. CORE-10074 #resolve Modified: trunk/reactos/dll/cpl/intl/currency.c trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/intl.h trunk/reactos/dll/cpl/intl/numbers.c Modified: trunk/reactos/dll/cpl/intl/currency.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/currency.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/currency.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/currency.c [iso-8859-1] Sun Oct 11 18:36:22 2015 @@ -33,18 +33,28 @@ UpdateExamples(HWND hwndDlg, PGLOBALDATA pGlobalData) { WCHAR szBuffer[MAX_FMT_SIZE]; + CURRENCYFMTW CurrencyFormat; + + CurrencyFormat.NumDigits = pGlobalData->nCurrDigits; + CurrencyFormat.LeadingZero = pGlobalData->nNumLeadingZero; + CurrencyFormat.Grouping = GroupingFormats[pGlobalData->nCurrGrouping].nInteger; + CurrencyFormat.lpDecimalSep = pGlobalData->szCurrDecimalSep; + CurrencyFormat.lpThousandSep = pGlobalData->szCurrThousandSep; + CurrencyFormat.NegativeOrder = pGlobalData->nCurrNegFormat; + CurrencyFormat.PositiveOrder = pGlobalData->nCurrPosFormat; + CurrencyFormat.lpCurrencySymbol = pGlobalData->szCurrSymbol; /* Positive example */ GetCurrencyFormatW(pGlobalData->UserLCID, 0, POSITIVE_EXAMPLE, - NULL, szBuffer, MAX_FMT_SIZE); + &CurrencyFormat, szBuffer, MAX_FMT_SIZE); SendDlgItemMessageW(hwndDlg, IDC_CURRENCYPOSSAMPLE, WM_SETTEXT, 0, (LPARAM)szBuffer); /* Negative example */ GetCurrencyFormatW(pGlobalData->UserLCID, 0, NEGATIVE_EXAMPLE, - NULL, szBuffer, MAX_FMT_SIZE); + &CurrencyFormat, szBuffer, MAX_FMT_SIZE); SendDlgItemMessageW(hwndDlg, IDC_CURRENCYNEGSAMPLE, WM_SETTEXT, 0, (LPARAM)szBuffer); } @@ -219,6 +229,7 @@ { WCHAR szBuffer[MAX_FMT_SIZE]; CURRENCYFMTW cyFmt; + INT i; /* Digit grouping */ cyFmt.NumDigits = 0; @@ -228,37 +239,19 @@ cyFmt.PositiveOrder = 0; cyFmt.NegativeOrder = 0; cyFmt.lpCurrencySymbol = L""; - cyFmt.Grouping = 0; - GetCurrencyFormatW(pGlobalData->UserLCID, 0, - L"123456789", - &cyFmt, szBuffer, MAX_FMT_SIZE); - SendDlgItemMessageW(hwndDlg, IDC_CURRENCYGRPNUM, - CB_INSERTSTRING, - -1, - (LPARAM)szBuffer); - - cyFmt.Grouping = 3; - GetCurrencyFormatW(pGlobalData->UserLCID, 0, - L"123456789", - &cyFmt, szBuffer, MAX_FMT_SIZE); - SendDlgItemMessageW(hwndDlg, IDC_CURRENCYGRPNUM, - CB_INSERTSTRING, - -1, - (LPARAM)szBuffer); - - cyFmt.Grouping = 32; - GetCurrencyFormatW(pGlobalData->UserLCID, 0, - L"123456789", - &cyFmt, szBuffer, MAX_FMT_SIZE); - SendDlgItemMessageW(hwndDlg, IDC_CURRENCYGRPNUM, - CB_INSERTSTRING, - -1, - (LPARAM)szBuffer); - - SendDlgItemMessageW(hwndDlg, IDC_CURRENCYGRPNUM, - CB_SETCURSEL, - pGlobalData->nCurrGrouping, /* Index */ - 0); + + for (i = 0 ; i < MAX_GROUPINGFORMATS ; i++) + { + cyFmt.Grouping = GroupingFormats[i].nInteger; + + GetCurrencyFormatW(pGlobalData->UserLCID, 0, + L"123456789", + &cyFmt, szBuffer, MAX_FMT_SIZE); + SendDlgItemMessageW(hwndDlg, IDC_CURRENCYGRPNUM, + CB_INSERTSTRING, + -1, + (LPARAM)szBuffer); + } } Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] Sun Oct 11 18:36:22 2015 @@ -30,28 +30,22 @@ #include <debug.h> #define SAMPLE_NUMBER L"123456789" -#define NO_FLAG 0 #define NUM_SHEETS 4 #define MAX_FIELD_DIG_SAMPLES 3 -typedef struct -{ - LCTYPE lcType; - PWSTR pKeyName; -} LOCALE_KEY_DATA, *PLOCALE_KEY_DATA; HWND hList; HWND hLocaleList, hGeoList; BOOL bSpain = FALSE; - -PWSTR szCurrencyGrouping[3] = +GROUPINGDATA +GroupingFormats[MAX_GROUPINGFORMATS] = { - L"0;0", - L"3;0", - L"3;2;0" + {0, L"0;0"}, + {3, L"3;0"}, + {32, L"3;2;0"} }; static BOOL CALLBACK @@ -111,16 +105,36 @@ PGLOBALDATA pGlobalData) { WCHAR OutBuffer[MAX_SAMPLES_STR_SIZE]; + NUMBERFMT NumberFormat; + CURRENCYFMTW CurrencyFormat; + + NumberFormat.NumDigits = pGlobalData->nNumDigits; + NumberFormat.LeadingZero = pGlobalData->nNumLeadingZero; + NumberFormat.Grouping = GroupingFormats[pGlobalData->nNumGrouping].nInteger; + NumberFormat.lpDecimalSep = pGlobalData->szNumDecimalSep; + NumberFormat.lpThousandSep = pGlobalData->szNumThousandSep; + NumberFormat.NegativeOrder = pGlobalData->nNumNegFormat; + + CurrencyFormat.NumDigits = pGlobalData->nCurrDigits; + CurrencyFormat.LeadingZero = pGlobalData->nNumLeadingZero; + CurrencyFormat.Grouping = GroupingFormats[pGlobalData->nCurrGrouping].nInteger; + CurrencyFormat.lpDecimalSep = pGlobalData->szCurrDecimalSep; + CurrencyFormat.lpThousandSep = pGlobalData->szCurrThousandSep; + CurrencyFormat.NegativeOrder = pGlobalData->nCurrNegFormat; + CurrencyFormat.PositiveOrder = pGlobalData->nCurrPosFormat; + CurrencyFormat.lpCurrencySymbol = pGlobalData->szCurrSymbol; /* Get number format sample */ - GetNumberFormatW(pGlobalData->UserLCID, NO_FLAG, SAMPLE_NUMBER, NULL, + GetNumberFormatW(pGlobalData->UserLCID, 0, SAMPLE_NUMBER, + &NumberFormat, OutBuffer, MAX_SAMPLES_STR_SIZE); SendDlgItemMessageW(hwndDlg, IDC_NUMSAMPLE_EDIT, WM_SETTEXT, 0, (LPARAM)OutBuffer); ZeroMemory(OutBuffer, MAX_SAMPLES_STR_SIZE * sizeof(WCHAR)); /* Get monetary format sample */ - GetCurrencyFormatW(pGlobalData->UserLCID, NO_FLAG, SAMPLE_NUMBER, NULL, + GetCurrencyFormatW(pGlobalData->UserLCID, 0, SAMPLE_NUMBER, + &CurrencyFormat, OutBuffer, MAX_SAMPLES_STR_SIZE); SendDlgItemMessageW(hwndDlg, IDC_MONEYSAMPLE_EDIT, WM_SETTEXT, 0, (LPARAM)OutBuffer); @@ -833,8 +847,8 @@ L"sGrouping", 0, REG_SZ, - (PBYTE)szCurrencyGrouping[pGlobalData->nNumGrouping], - (wcslen(szCurrencyGrouping[pGlobalData->nNumGrouping]) + 1) * sizeof(WCHAR)); + (PBYTE)GroupingFormats[pGlobalData->nNumGrouping].pszString, + (wcslen(GroupingFormats[pGlobalData->nNumGrouping].pszString) + 1) * sizeof(WCHAR)); RegSetValueExW(hLocaleKey, L"sList", @@ -921,8 +935,8 @@ L"sMonGrouping", 0, REG_SZ, - (PBYTE)szCurrencyGrouping[pGlobalData->nCurrGrouping], - (wcslen(szCurrencyGrouping[pGlobalData->nCurrGrouping]) + 1) * sizeof(WCHAR)); + (PBYTE)GroupingFormats[pGlobalData->nCurrGrouping].pszString, + (wcslen(GroupingFormats[pGlobalData->nCurrGrouping].pszString) + 1) * sizeof(WCHAR)); _itow(pGlobalData->nCurrPosFormat, szBuffer, DECIMAL_RADIX); Modified: trunk/reactos/dll/cpl/intl/intl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/intl.h?rev=69… ============================================================================== --- trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/intl.h [iso-8859-1] Sun Oct 11 18:36:22 2015 @@ -48,6 +48,8 @@ #define MAX_MISCCOUNTRY 80 #define MAX_MISCLANGUAGE 80 + +#define MAX_GROUPINGFORMATS 3 typedef struct _APPLET @@ -116,9 +118,16 @@ } GLOBALDATA, *PGLOBALDATA; +typedef struct +{ + UINT nInteger; + PWSTR pszString; +} GROUPINGDATA; + extern HINSTANCE hApplet; extern DWORD IsUnattendedSetupEnabled; extern DWORD UnattendLCID; +extern GROUPINGDATA GroupingFormats[MAX_GROUPINGFORMATS]; /* intl.c */ VOID PrintErrorMsgBox(UINT msg); Modified: trunk/reactos/dll/cpl/intl/numbers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/numbers.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/intl/numbers.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/numbers.c [iso-8859-1] Sun Oct 11 18:36:22 2015 @@ -420,12 +420,20 @@ PGLOBALDATA pGlobalData) { WCHAR OutBuffer[MAX_FMT_SIZE]; + NUMBERFMT NumberFormat; + + NumberFormat.NumDigits = pGlobalData->nNumDigits; + NumberFormat.LeadingZero = pGlobalData->nNumLeadingZero; + NumberFormat.Grouping = GroupingFormats[pGlobalData->nNumGrouping].nInteger; + NumberFormat.lpDecimalSep = pGlobalData->szNumDecimalSep; + NumberFormat.lpThousandSep = pGlobalData->szNumThousandSep; + NumberFormat.NegativeOrder = pGlobalData->nNumNegFormat; /* Get positive number format sample */ GetNumberFormatW(pGlobalData->UserLCID, 0, SAMPLE_NUMBER, - NULL, + &NumberFormat, OutBuffer, MAX_FMT_SIZE); @@ -438,7 +446,7 @@ GetNumberFormatW(pGlobalData->UserLCID, 0, SAMPLE_NEG_NUMBER, - NULL, + &NumberFormat, OutBuffer, MAX_FMT_SIZE);

1 0

[tfaber] 69500: [KMTESTS:PO] - Fix build
by tfaber＠svn.reactos.org 11 Oct '15

11 Oct '15

Author: tfaber Date: Sun Oct 11 17:11:53 2015 New Revision: 69500 URL: http://svn.reactos.org/svn/reactos?rev=69500&view=rev Log: [KMTESTS:PO] - Fix build Modified: trunk/rostests/kmtests/ntos_po/PoIrp_drv.c Modified: trunk/rostests/kmtests/ntos_po/PoIrp_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_po/PoIrp_drv… ============================================================================== --- trunk/rostests/kmtests/ntos_po/PoIrp_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_po/PoIrp_drv.c [iso-8859-1] Sun Oct 11 17:11:53 2015 @@ -138,7 +138,7 @@ ok_eq_uint(Irp->CurrentLocation, 4); IoStackLocation = IoGetCurrentIrpStackLocation(Irp); ok_eq_pointer(IoStackLocation->Parameters.Others.Argument1, DeviceObject); - ok_eq_pointer(IoStackLocation->Parameters.Others.Argument2, (PVOID)MinorFunction); + ok_eq_pointer(IoStackLocation->Parameters.Others.Argument2, (PVOID)(ULONG_PTR)MinorFunction); ok_eq_pointer(IoStackLocation->Parameters.Others.Argument3, (PVOID)PowerState.SystemState); ok_eq_pointer(IoStackLocation->Parameters.Others.Argument4, Context); }

1 0

[tfaber] 69499: [KMTESTS:PO] - Add a test for PoRequestPowerIrp
by tfaber＠svn.reactos.org 11 Oct '15

11 Oct '15

Author: tfaber Date: Sun Oct 11 17:06:14 2015 New Revision: 69499 URL: http://svn.reactos.org/svn/reactos?rev=69499&view=rev Log: [KMTESTS:PO] - Add a test for PoRequestPowerIrp Added: trunk/rostests/kmtests/ntos_po/ (with props) trunk/rostests/kmtests/ntos_po/CMakeLists.txt (with props) trunk/rostests/kmtests/ntos_po/PoIrp.h (with props) trunk/rostests/kmtests/ntos_po/PoIrp_drv.c (with props) trunk/rostests/kmtests/ntos_po/PoIrp_user.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest/testlist.c trunk/rostests/kmtests/kmtest_drv/kmtest_standalone.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Sun Oct 11 17:06:14 2015 @@ -7,6 +7,7 @@ add_subdirectory(example) add_subdirectory(kernel32) add_subdirectory(ntos_io) +add_subdirectory(ntos_po) add_subdirectory(tcpip) list(APPEND COMMON_SOURCE @@ -115,6 +116,7 @@ ntos_io/IoCreateFile_user.c ntos_io/IoDeviceObject_user.c ntos_io/IoReadWrite_user.c + ntos_po/PoIrp_user.c tcpip/TcpIp_user.c ${COMMON_SOURCE} @@ -136,10 +138,12 @@ add_dependencies(kmtest_drivers kmtest_drv example_drv + findfile_drv iocreatefile_drv iodeviceobject_drv iohelper_drv ioreadwrite_drv + poirp_drv tcpip_drv) add_custom_target(kmtest_all) Modified: trunk/rostests/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/testlist.c… ============================================================================== --- trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] Sun Oct 11 17:06:14 2015 @@ -12,6 +12,7 @@ KMT_TESTFUNC Test_IoCreateFile; KMT_TESTFUNC Test_IoDeviceObject; KMT_TESTFUNC Test_IoReadWrite; +KMT_TESTFUNC Test_PoIrp; KMT_TESTFUNC Test_RtlAvlTree; KMT_TESTFUNC Test_RtlException; KMT_TESTFUNC Test_RtlIntSafe; @@ -31,6 +32,7 @@ { "IoCreateFile", Test_IoCreateFile }, { "IoDeviceObject", Test_IoDeviceObject }, { "IoReadWrite", Test_IoReadWrite }, + { "PoIrp", Test_PoIrp }, { "RtlAvlTree", Test_RtlAvlTree }, { "RtlException", Test_RtlException }, { "RtlIntSafe", Test_RtlIntSafe }, Modified: trunk/rostests/kmtests/kmtest_drv/kmtest_standalone.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/kmtest… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/kmtest_standalone.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/kmtest_standalone.c [iso-8859-1] Sun Oct 11 17:06:14 2015 @@ -309,8 +309,6 @@ NTSTATUS Status = STATUS_SUCCESS; PIO_STACK_LOCATION IoStackLocation; int i; - - PAGED_CODE(); IoStackLocation = IoGetCurrentIrpStackLocation(Irp); Propchange: trunk/rostests/kmtests/ntos_po/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Oct 11 17:06:14 2015 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/kmtests/ntos_po/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/kmtests/ntos_po/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/kmtests/ntos_po/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/kmtests/ntos_po/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_po/CMakeList… ============================================================================== --- trunk/rostests/kmtests/ntos_po/CMakeLists.txt (added) +++ trunk/rostests/kmtests/ntos_po/CMakeLists.txt [iso-8859-1] Sun Oct 11 17:06:14 2015 @@ -0,0 +1,17 @@ + +include_directories(../include) + +# +# PoIrp +# +list(APPEND POIRP_DRV_SOURCE + ../kmtest_drv/kmtest_standalone.c + PoIrp_drv.c) + +add_library(poirp_drv SHARED ${POIRP_DRV_SOURCE}) +set_module_type(poirp_drv kernelmodedriver) +target_link_libraries(poirp_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(poirp_drv ntoskrnl hal) +add_target_compile_definitions(poirp_drv KMT_STANDALONE_DRIVER) +#add_pch(poirp_drv ../include/kmt_test.h) +add_cd_file(TARGET poirp_drv DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/kmtests/ntos_po/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/ntos_po/PoIrp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_po/PoIrp.h?r… ============================================================================== --- trunk/rostests/kmtests/ntos_po/PoIrp.h (added) +++ trunk/rostests/kmtests/ntos_po/PoIrp.h [iso-8859-1] Sun Oct 11 17:06:14 2015 @@ -0,0 +1,13 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite Power IRP management test declarations + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#ifndef _KMTEST_POIRP_H_ +#define _KMTEST_POIRP_H_ + +#define IOCTL_RUN_TEST 1 + +#endif /* !defined _KMTEST_POIRP_H_ */ Propchange: trunk/rostests/kmtests/ntos_po/PoIrp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/ntos_po/PoIrp_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_po/PoIrp_drv… ============================================================================== --- trunk/rostests/kmtests/ntos_po/PoIrp_drv.c (added) +++ trunk/rostests/kmtests/ntos_po/PoIrp_drv.c [iso-8859-1] Sun Oct 11 17:06:14 2015 @@ -0,0 +1,265 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite Power IRP management test + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <kmt_test.h> +#include "PoIrp.h" + +static PDRIVER_OBJECT TestDriverObject; +static KMT_MESSAGE_HANDLER TestMessageHandler; + +static PDEVICE_OBJECT DeviceObject1; +static PDEVICE_OBJECT DeviceObject2; +static PDEVICE_OBJECT DeviceObject3; + +static +NTSTATUS +CreateTestDevices( + _In_ PDRIVER_OBJECT DriverObject) +{ + NTSTATUS Status; + PDEVICE_OBJECT AttachedDevice; + + Status = IoCreateDevice(DriverObject, 0, NULL, FILE_DEVICE_UNKNOWN, 0, FALSE, &DeviceObject1); + if (!NT_SUCCESS(Status)) + return Status; + + DeviceObject1->Flags &= ~DO_DEVICE_INITIALIZING; + + Status = IoCreateDevice(DriverObject, 0, NULL, FILE_DEVICE_UNKNOWN, 0, FALSE, &DeviceObject2); + if (!NT_SUCCESS(Status)) + { + IoDeleteDevice(DeviceObject1); + return Status; + } + + AttachedDevice = IoAttachDeviceToDeviceStack(DeviceObject2, DeviceObject1); + ok(AttachedDevice == DeviceObject1, "Device attached to %p is %p, expected %p\n", DeviceObject2, AttachedDevice, DeviceObject1); + if (AttachedDevice == NULL) + { + IoDeleteDevice(DeviceObject2); + IoDeleteDevice(DeviceObject1); + return STATUS_UNSUCCESSFUL; + } + + DeviceObject2->Flags &= ~DO_DEVICE_INITIALIZING; + + Status = IoCreateDevice(DriverObject, 0, NULL, FILE_DEVICE_UNKNOWN, 0, FALSE, &DeviceObject3); + if (!NT_SUCCESS(Status)) + { + IoDetachDevice(DeviceObject1); + IoDeleteDevice(DeviceObject2); + IoDeleteDevice(DeviceObject1); + return Status; + } + + AttachedDevice = IoAttachDeviceToDeviceStack(DeviceObject3, DeviceObject1); + ok(AttachedDevice == DeviceObject2, "Device attached to %p is %p, expected %p\n", DeviceObject2, AttachedDevice, DeviceObject2); + if (AttachedDevice == NULL) + { + IoDeleteDevice(DeviceObject3); + IoDetachDevice(DeviceObject1); + IoDeleteDevice(DeviceObject2); + IoDeleteDevice(DeviceObject1); + return STATUS_UNSUCCESSFUL; + } + + DeviceObject3->Flags &= ~DO_DEVICE_INITIALIZING; + + return Status; +} + +NTSTATUS +TestEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PCUNICODE_STRING RegistryPath, + _Out_ PCWSTR *DeviceName, + _Inout_ INT *Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(RegistryPath); + + TestDriverObject = DriverObject; + + *DeviceName = L"PoIrp"; + *Flags = TESTENTRY_NO_EXCLUSIVE_DEVICE; + + KmtRegisterMessageHandler(0, NULL, TestMessageHandler); + + return Status; +} + +VOID +TestUnload( + IN PDRIVER_OBJECT DriverObject) +{ + UNREFERENCED_PARAMETER(DriverObject); + + PAGED_CODE(); +} + +// +// PoRequestPowerIrp test +// +static KEVENT TestDoneEvent; +static PIRP RequestedPowerIrp; +static PIRP RequestedPowerIrpReturned; + +static +VOID +NTAPI +RequestedPowerCompletion( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ UCHAR MinorFunction, + _In_ POWER_STATE PowerState, + _In_opt_ PVOID Context, + _In_ PIO_STATUS_BLOCK IoStatus) +{ + PIRP Irp; + PIO_STACK_LOCATION IoStackLocation; + + ok_eq_pointer(DeviceObject, DeviceObject2); + ok_eq_uint(MinorFunction, IRP_MN_SET_POWER); + ok_eq_uint(PowerState.DeviceState, PowerDeviceD0); + ok_eq_pointer(Context, &RequestedPowerIrp); + Irp = CONTAINING_RECORD(IoStatus, IRP, IoStatus); + ok_eq_pointer(Irp, RequestedPowerIrp); + ok_eq_ulongptr(IoStatus->Information, 7); + ok_eq_hex(IoStatus->Status, STATUS_WAIT_3); + KeSetEvent(&TestDoneEvent, IO_NO_INCREMENT, FALSE); + + ok_eq_uint(Irp->StackCount, 5); + ok_eq_uint(Irp->CurrentLocation, 4); + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + ok_eq_pointer(IoStackLocation->Parameters.Others.Argument1, DeviceObject); + ok_eq_pointer(IoStackLocation->Parameters.Others.Argument2, (PVOID)MinorFunction); + ok_eq_pointer(IoStackLocation->Parameters.Others.Argument3, (PVOID)PowerState.SystemState); + ok_eq_pointer(IoStackLocation->Parameters.Others.Argument4, Context); +} + +static +NTSTATUS +RequestedPowerIrpHandler( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp, + _In_ PIO_STACK_LOCATION IoStackLocation) +{ + if (RequestedPowerIrp == NULL) + RequestedPowerIrp = Irp; + else + ok_eq_pointer(Irp, RequestedPowerIrp); + + ok_eq_uint(Irp->StackCount, 5); + ok_eq_ulongptr(Irp->IoStatus.Information, 0); + ok_eq_hex(Irp->IoStatus.Status, STATUS_NOT_SUPPORTED); + ok_eq_uint(IoStackLocation->MajorFunction, IRP_MJ_POWER); + ok_eq_uint(IoStackLocation->MinorFunction, IRP_MN_SET_POWER); + ok_eq_uint(IoStackLocation->Parameters.Power.Type, DevicePowerState); + ok_eq_uint(IoStackLocation->Parameters.Power.State.DeviceState, PowerDeviceD0); + + if (DeviceObject == DeviceObject1) + { + ok_eq_uint(Irp->CurrentLocation, 3); + Irp->IoStatus.Information = 7; + Irp->IoStatus.Status = STATUS_WAIT_3; + PoStartNextPowerIrp(Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + else if (DeviceObject == DeviceObject2) + { + ok_eq_uint(Irp->CurrentLocation, 3); + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(DeviceObject1, Irp); + } + else if (DeviceObject == DeviceObject3) + { + ok_eq_uint(Irp->CurrentLocation, 3); + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(DeviceObject2, Irp); + } + else + { + ok(0, "\n"); + PoStartNextPowerIrp(Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; + } +} + +static +VOID +TestPoRequestPowerIrp(VOID) +{ + NTSTATUS Status; + POWER_STATE PowerState; + + KmtRegisterIrpHandler(IRP_MJ_POWER, NULL, RequestedPowerIrpHandler); + + KeInitializeEvent(&TestDoneEvent, NotificationEvent, FALSE); + + PowerState.DeviceState = PowerDeviceD0; + Status = PoRequestPowerIrp(DeviceObject2, + IRP_MN_SET_POWER, + PowerState, + RequestedPowerCompletion, + &RequestedPowerIrp, + &RequestedPowerIrpReturned); + ok(Status == STATUS_PENDING, "PoRequestPowerIrp returned %lx\n", Status); + ok_eq_pointer(RequestedPowerIrpReturned, RequestedPowerIrp); + + Status = KeWaitForSingleObject(&TestDoneEvent, Executive, KernelMode, FALSE, NULL); + ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); + KmtUnregisterIrpHandler(IRP_MJ_POWER, NULL, RequestedPowerIrpHandler); +} + + +// +// Message handler +// +static +NTSTATUS +TestMessageHandler( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ ULONG ControlCode, + _In_ PVOID Buffer OPTIONAL, + _In_ SIZE_T InLength, + _Inout_ PSIZE_T OutLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + switch (ControlCode) + { + case IOCTL_RUN_TEST: + { + Status = CreateTestDevices(TestDriverObject); + ok_eq_hex(Status, STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + return Status; + + TestPoRequestPowerIrp(); + + IoDetachDevice(DeviceObject2); + IoDeleteDevice(DeviceObject3); + IoDetachDevice(DeviceObject1); + IoDeleteDevice(DeviceObject2); + IoDeleteDevice(DeviceObject1); + + break; + } + default: + return STATUS_NOT_SUPPORTED; + } + + return Status; +} Propchange: trunk/rostests/kmtests/ntos_po/PoIrp_drv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/ntos_po/PoIrp_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_po/PoIrp_use… ============================================================================== --- trunk/rostests/kmtests/ntos_po/PoIrp_user.c (added) +++ trunk/rostests/kmtests/ntos_po/PoIrp_user.c [iso-8859-1] Sun Oct 11 17:06:14 2015 @@ -0,0 +1,18 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite power IRP management test user-mode part + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <kmt_test.h> +#include "PoIrp.h" + +START_TEST(PoIrp) +{ + KmtLoadDriver(L"PoIrp", TRUE); + KmtOpenDriver(); + KmtSendToDriver(IOCTL_RUN_TEST); + KmtCloseDriver(); + KmtUnloadDriver(); +} Propchange: trunk/rostests/kmtests/ntos_po/PoIrp_user.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dreimer] 69498: [RAPPS] Add SHA-1 digests to RAPPS DB packages by Ismael Ferreras Morasuelas (swyter) CORE-10319 #resolve #comment Errr... sorry, I was just told that we already verify downloaded ...
by dreimer＠svn.reactos.org 11 Oct '15

11 Oct '15

Author: dreimer Date: Sun Oct 11 15:41:55 2015 New Revision: 69498 URL: http://svn.reactos.org/svn/reactos?rev=69498&view=rev Log: [RAPPS] Add SHA-1 digests to RAPPS DB packages by Ismael Ferreras Morasuelas (swyter) CORE-10319 #resolve #comment Errr... sorry, I was just told that we already verify downloaded stuff in rapps... committed and thx for the work you spent in it... /me hides Modified: trunk/reactos/media/rapps/abiword.txt trunk/reactos/media/rapps/abiword26.txt trunk/reactos/media/rapps/abyss.txt trunk/reactos/media/rapps/ac97forvirtualbox.txt trunk/reactos/media/rapps/agatemulator.txt trunk/reactos/media/rapps/akelpad.txt trunk/reactos/media/rapps/alreader.txt trunk/reactos/media/rapps/audacity.txt trunk/reactos/media/rapps/audiograbber.txt trunk/reactos/media/rapps/bittorrent.txt trunk/reactos/media/rapps/bochs.txt trunk/reactos/media/rapps/boswars.txt trunk/reactos/media/rapps/boundaround.txt trunk/reactos/media/rapps/burnawarefree.txt trunk/reactos/media/rapps/ccleaner.txt trunk/reactos/media/rapps/christmasbound.txt trunk/reactos/media/rapps/chromium.txt trunk/reactos/media/rapps/cnt.txt trunk/reactos/media/rapps/codeblocks.txt trunk/reactos/media/rapps/codeblocks_gcc.txt trunk/reactos/media/rapps/codeblocks_gcc_2.txt trunk/reactos/media/rapps/comctl32ocx.txt trunk/reactos/media/rapps/cstalin.txt trunk/reactos/media/rapps/devcpp_tdm_gcc_x64.txt trunk/reactos/media/rapps/diablo2.txt trunk/reactos/media/rapps/dosblaster.txt trunk/reactos/media/rapps/doublecommander.txt trunk/reactos/media/rapps/dplus.txt trunk/reactos/media/rapps/dvdwritenow.txt trunk/reactos/media/rapps/efserch.txt trunk/reactos/media/rapps/excelview.txt trunk/reactos/media/rapps/fall.txt trunk/reactos/media/rapps/famitracker.txt trunk/reactos/media/rapps/fap.txt trunk/reactos/media/rapps/fira.txt trunk/reactos/media/rapps/firefox.txt trunk/reactos/media/rapps/firefox28.txt trunk/reactos/media/rapps/firefox36.txt trunk/reactos/media/rapps/foxit.txt trunk/reactos/media/rapps/freebasic.txt trunk/reactos/media/rapps/gensemulator.txt trunk/reactos/media/rapps/ghostscript.txt trunk/reactos/media/rapps/ghostview.txt trunk/reactos/media/rapps/gimp.txt trunk/reactos/media/rapps/glidewrapzbag.txt trunk/reactos/media/rapps/globulation2.txt trunk/reactos/media/rapps/gnucash.txt trunk/reactos/media/rapps/hexedit.txt trunk/reactos/media/rapps/hiawatha.txt trunk/reactos/media/rapps/hover.txt trunk/reactos/media/rapps/hxd.txt trunk/reactos/media/rapps/indiftpd.txt trunk/reactos/media/rapps/irfanview.txt trunk/reactos/media/rapps/irfanviewplugins.txt trunk/reactos/media/rapps/jre.txt trunk/reactos/media/rapps/kdewin.txt trunk/reactos/media/rapps/kindlepc.txt trunk/reactos/media/rapps/kmeleon.txt trunk/reactos/media/rapps/kompozer.txt trunk/reactos/media/rapps/kyodai.txt trunk/reactos/media/rapps/lazaruside.txt trunk/reactos/media/rapps/lbreakout2.txt trunk/reactos/media/rapps/lgeneral.txt trunk/reactos/media/rapps/librecad.txt trunk/reactos/media/rapps/libreoffice.txt trunk/reactos/media/rapps/libreofficehelp.txt trunk/reactos/media/rapps/lmarbles.txt trunk/reactos/media/rapps/mcwin32.txt trunk/reactos/media/rapps/md5summer.txt trunk/reactos/media/rapps/mfc40.txt trunk/reactos/media/rapps/miktex.txt trunk/reactos/media/rapps/mirandaim.txt trunk/reactos/media/rapps/mirc.txt trunk/reactos/media/rapps/mirc6.txt trunk/reactos/media/rapps/mkvtoolnix.txt trunk/reactos/media/rapps/mono2.txt trunk/reactos/media/rapps/mpc.txt trunk/reactos/media/rapps/mpxplay.txt trunk/reactos/media/rapps/msxml3.txt trunk/reactos/media/rapps/net11.txt trunk/reactos/media/rapps/net20.txt trunk/reactos/media/rapps/net20sp2.txt trunk/reactos/media/rapps/neverball.txt trunk/reactos/media/rapps/nginx.txt trunk/reactos/media/rapps/nirlauncher.txt trunk/reactos/media/rapps/npp.txt trunk/reactos/media/rapps/nvdisp.txt trunk/reactos/media/rapps/offbyone.txt trunk/reactos/media/rapps/officeformatpack.txt trunk/reactos/media/rapps/openarena.txt trunk/reactos/media/rapps/opencodecs.txt trunk/reactos/media/rapps/openoffice.txt trunk/reactos/media/rapps/openttd.txt trunk/reactos/media/rapps/opera.txt trunk/reactos/media/rapps/opera9.txt trunk/reactos/media/rapps/pdfsam.txt trunk/reactos/media/rapps/peazip.txt trunk/reactos/media/rapps/pengupop.txt trunk/reactos/media/rapps/photofiltre.txt trunk/reactos/media/rapps/pidgin.txt trunk/reactos/media/rapps/pingus.txt trunk/reactos/media/rapps/pptview.txt trunk/reactos/media/rapps/precisecalc.txt trunk/reactos/media/rapps/pspad.txt trunk/reactos/media/rapps/ptanks.txt trunk/reactos/media/rapps/putty.txt trunk/reactos/media/rapps/python.txt trunk/reactos/media/rapps/python2.txt trunk/reactos/media/rapps/qb64sdl.txt trunk/reactos/media/rapps/qmmp.txt trunk/reactos/media/rapps/remood.txt trunk/reactos/media/rapps/reshack.txt trunk/reactos/media/rapps/revo.txt trunk/reactos/media/rapps/rfstools.txt trunk/reactos/media/rapps/rocks.txt trunk/reactos/media/rapps/rosbe.txt trunk/reactos/media/rapps/sambatng.txt trunk/reactos/media/rapps/sbforvmware.txt trunk/reactos/media/rapps/scite.txt trunk/reactos/media/rapps/scratch.txt trunk/reactos/media/rapps/scribus.txt trunk/reactos/media/rapps/scummvm.txt trunk/reactos/media/rapps/sdl_mixer.txt trunk/reactos/media/rapps/sdl_runtime.txt trunk/reactos/media/rapps/seamonkey.txt trunk/reactos/media/rapps/shed.txt trunk/reactos/media/rapps/smplayer.txt trunk/reactos/media/rapps/snoopy.txt trunk/reactos/media/rapps/stamina.txt trunk/reactos/media/rapps/steam.txt trunk/reactos/media/rapps/sumatrapdf.txt trunk/reactos/media/rapps/summerbound.txt trunk/reactos/media/rapps/superdxb.txt trunk/reactos/media/rapps/superfinder.txt trunk/reactos/media/rapps/supertux.txt trunk/reactos/media/rapps/tahoma.txt trunk/reactos/media/rapps/thunderbird.txt trunk/reactos/media/rapps/thunderbird3.txt trunk/reactos/media/rapps/tightvnc.txt trunk/reactos/media/rapps/tileworld.txt trunk/reactos/media/rapps/totalcommander.txt trunk/reactos/media/rapps/tuxpaint.txt trunk/reactos/media/rapps/ultraiso.txt trunk/reactos/media/rapps/ultravnc.txt trunk/reactos/media/rapps/utorrent.txt trunk/reactos/media/rapps/vb5run.txt trunk/reactos/media/rapps/vb6run.txt trunk/reactos/media/rapps/vbasdl.txt trunk/reactos/media/rapps/vc2005sp1run.txt trunk/reactos/media/rapps/vc2008sp1run.txt trunk/reactos/media/rapps/vc2010sp1run.txt trunk/reactos/media/rapps/vc2012run.txt trunk/reactos/media/rapps/vc2013run.txt trunk/reactos/media/rapps/vc6run.txt trunk/reactos/media/rapps/vlc.txt trunk/reactos/media/rapps/watercolor.txt trunk/reactos/media/rapps/winamp.txt trunk/reactos/media/rapps/winboard.txt trunk/reactos/media/rapps/windirstat.txt trunk/reactos/media/rapps/winemono.txt trunk/reactos/media/rapps/winmerge.txt trunk/reactos/media/rapps/winspypp.txt trunk/reactos/media/rapps/wme9.txt trunk/reactos/media/rapps/wordview.txt trunk/reactos/media/rapps/zaz.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/rapps/abiword.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/abiword.txt?re… Modified: trunk/reactos/media/rapps/abiword26.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/abiword26.txt?… Modified: trunk/reactos/media/rapps/abyss.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/abyss.txt?rev=… Modified: trunk/reactos/media/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ac97forvirtual… Modified: trunk/reactos/media/rapps/agatemulator.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/agatemulator.t… Modified: trunk/reactos/media/rapps/akelpad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/akelpad.txt?re… Modified: trunk/reactos/media/rapps/alreader.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/alreader.txt?r… Modified: trunk/reactos/media/rapps/audacity.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/audacity.txt?r… Modified: trunk/reactos/media/rapps/audiograbber.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/audiograbber.t… Modified: trunk/reactos/media/rapps/bittorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/bittorrent.txt… Modified: trunk/reactos/media/rapps/bochs.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/bochs.txt?rev=… Modified: trunk/reactos/media/rapps/boswars.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/boswars.txt?re… Modified: trunk/reactos/media/rapps/boundaround.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/boundaround.tx… Modified: trunk/reactos/media/rapps/burnawarefree.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/burnawarefree.… Modified: trunk/reactos/media/rapps/ccleaner.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ccleaner.txt?r… Modified: trunk/reactos/media/rapps/christmasbound.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/christmasbound… Modified: trunk/reactos/media/rapps/chromium.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/chromium.txt?r… Modified: trunk/reactos/media/rapps/cnt.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/cnt.txt?rev=69… Modified: trunk/reactos/media/rapps/codeblocks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/codeblocks.txt… Modified: trunk/reactos/media/rapps/codeblocks_gcc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/codeblocks_gcc… Modified: trunk/reactos/media/rapps/codeblocks_gcc_2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/codeblocks_gcc… Modified: trunk/reactos/media/rapps/comctl32ocx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/comctl32ocx.tx… Modified: trunk/reactos/media/rapps/cstalin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/cstalin.txt?re… Modified: trunk/reactos/media/rapps/devcpp_tdm_gcc_x64.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/devcpp_tdm_gcc… Modified: trunk/reactos/media/rapps/diablo2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/diablo2.txt?re… Modified: trunk/reactos/media/rapps/dosblaster.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/dosblaster.txt… Modified: trunk/reactos/media/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/doublecommande… Modified: trunk/reactos/media/rapps/dplus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/dplus.txt?rev=… Modified: trunk/reactos/media/rapps/dvdwritenow.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/dvdwritenow.tx… Modified: trunk/reactos/media/rapps/efserch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/efserch.txt?re… Modified: trunk/reactos/media/rapps/excelview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/excelview.txt?… Modified: trunk/reactos/media/rapps/fall.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/fall.txt?rev=6… Modified: trunk/reactos/media/rapps/famitracker.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/famitracker.tx… Modified: trunk/reactos/media/rapps/fap.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/fap.txt?rev=69… Modified: trunk/reactos/media/rapps/fira.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/fira.txt?rev=6… Modified: trunk/reactos/media/rapps/firefox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/firefox.txt?re… Modified: trunk/reactos/media/rapps/firefox28.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/firefox28.txt?… Modified: trunk/reactos/media/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/firefox36.txt?… Modified: trunk/reactos/media/rapps/foxit.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/foxit.txt?rev=… Modified: trunk/reactos/media/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/freebasic.txt?… Modified: trunk/reactos/media/rapps/gensemulator.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/gensemulator.t… Modified: trunk/reactos/media/rapps/ghostscript.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ghostscript.tx… Modified: trunk/reactos/media/rapps/ghostview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ghostview.txt?… Modified: trunk/reactos/media/rapps/gimp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/gimp.txt?rev=6… Modified: trunk/reactos/media/rapps/glidewrapzbag.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/glidewrapzbag.… Modified: trunk/reactos/media/rapps/globulation2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/globulation2.t… Modified: trunk/reactos/media/rapps/gnucash.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/gnucash.txt?re… Modified: trunk/reactos/media/rapps/hexedit.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/hexedit.txt?re… Modified: trunk/reactos/media/rapps/hiawatha.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/hiawatha.txt?r… Modified: trunk/reactos/media/rapps/hover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/hover.txt?rev=… Modified: trunk/reactos/media/rapps/hxd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/hxd.txt?rev=69… Modified: trunk/reactos/media/rapps/indiftpd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/indiftpd.txt?r… Modified: trunk/reactos/media/rapps/irfanview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/irfanview.txt?… Modified: trunk/reactos/media/rapps/irfanviewplugins.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/irfanviewplugi… Modified: trunk/reactos/media/rapps/jre.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/jre.txt?rev=69… Modified: trunk/reactos/media/rapps/kdewin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kdewin.txt?rev… Modified: trunk/reactos/media/rapps/kindlepc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kindlepc.txt?r… Modified: trunk/reactos/media/rapps/kmeleon.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kmeleon.txt?re… Modified: trunk/reactos/media/rapps/kompozer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kompozer.txt?r… Modified: trunk/reactos/media/rapps/kyodai.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/kyodai.txt?rev… Modified: trunk/reactos/media/rapps/lazaruside.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/lazaruside.txt… Modified: trunk/reactos/media/rapps/lbreakout2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/lbreakout2.txt… Modified: trunk/reactos/media/rapps/lgeneral.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/lgeneral.txt?r… Modified: trunk/reactos/media/rapps/librecad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/librecad.txt?r… Modified: trunk/reactos/media/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreoffice.tx… Modified: trunk/reactos/media/rapps/libreofficehelp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/libreofficehel… Modified: trunk/reactos/media/rapps/lmarbles.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/lmarbles.txt?r… Modified: trunk/reactos/media/rapps/mcwin32.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mcwin32.txt?re… Modified: trunk/reactos/media/rapps/md5summer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/md5summer.txt?… Modified: trunk/reactos/media/rapps/mfc40.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mfc40.txt?rev=… Modified: trunk/reactos/media/rapps/miktex.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/miktex.txt?rev… Modified: trunk/reactos/media/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mirandaim.txt?… Modified: trunk/reactos/media/rapps/mirc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mirc.txt?rev=6… Modified: trunk/reactos/media/rapps/mirc6.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mirc6.txt?rev=… Modified: trunk/reactos/media/rapps/mkvtoolnix.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mkvtoolnix.txt… Modified: trunk/reactos/media/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mono2.txt?rev=… Modified: trunk/reactos/media/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mpc.txt?rev=69… Modified: trunk/reactos/media/rapps/mpxplay.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/mpxplay.txt?re… Modified: trunk/reactos/media/rapps/msxml3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/msxml3.txt?rev… Modified: trunk/reactos/media/rapps/net11.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/net11.txt?rev=… Modified: trunk/reactos/media/rapps/net20.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/net20.txt?rev=… Modified: trunk/reactos/media/rapps/net20sp2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/net20sp2.txt?r… Modified: trunk/reactos/media/rapps/neverball.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/neverball.txt?… Modified: trunk/reactos/media/rapps/nginx.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nginx.txt?rev=… Modified: trunk/reactos/media/rapps/nirlauncher.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nirlauncher.tx… Modified: trunk/reactos/media/rapps/npp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/npp.txt?rev=69… Modified: trunk/reactos/media/rapps/nvdisp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/nvdisp.txt?rev… Modified: trunk/reactos/media/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/offbyone.txt?r… Modified: trunk/reactos/media/rapps/officeformatpack.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/officeformatpa… Modified: trunk/reactos/media/rapps/openarena.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/openarena.txt?… Modified: trunk/reactos/media/rapps/opencodecs.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/opencodecs.txt… Modified: trunk/reactos/media/rapps/openoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/openoffice.txt… Modified: trunk/reactos/media/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/openttd.txt?re… Modified: trunk/reactos/media/rapps/opera.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/opera.txt?rev=… Modified: trunk/reactos/media/rapps/opera9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/opera9.txt?rev… Modified: trunk/reactos/media/rapps/pdfsam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pdfsam.txt?rev… Modified: trunk/reactos/media/rapps/peazip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/peazip.txt?rev… Modified: trunk/reactos/media/rapps/pengupop.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pengupop.txt?r… Modified: trunk/reactos/media/rapps/photofiltre.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/photofiltre.tx… Modified: trunk/reactos/media/rapps/pidgin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pidgin.txt?rev… Modified: trunk/reactos/media/rapps/pingus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pingus.txt?rev… Modified: trunk/reactos/media/rapps/pptview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pptview.txt?re… Modified: trunk/reactos/media/rapps/precisecalc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/precisecalc.tx… Modified: trunk/reactos/media/rapps/pspad.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/pspad.txt?rev=… Modified: trunk/reactos/media/rapps/ptanks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ptanks.txt?rev… Modified: trunk/reactos/media/rapps/putty.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/putty.txt?rev=… Modified: trunk/reactos/media/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/python.txt?rev… Modified: trunk/reactos/media/rapps/python2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/python2.txt?re… Modified: trunk/reactos/media/rapps/qb64sdl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/qb64sdl.txt?re… Modified: trunk/reactos/media/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/qmmp.txt?rev=6… Modified: trunk/reactos/media/rapps/remood.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/remood.txt?rev… Modified: trunk/reactos/media/rapps/reshack.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/reshack.txt?re… Modified: trunk/reactos/media/rapps/revo.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/revo.txt?rev=6… Modified: trunk/reactos/media/rapps/rfstools.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/rfstools.txt?r… Modified: trunk/reactos/media/rapps/rocks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/rocks.txt?rev=… Modified: trunk/reactos/media/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/rosbe.txt?rev=… Modified: trunk/reactos/media/rapps/sambatng.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/sambatng.txt?r… Modified: trunk/reactos/media/rapps/sbforvmware.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/sbforvmware.tx… Modified: trunk/reactos/media/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scite.txt?rev=… Modified: trunk/reactos/media/rapps/scratch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scratch.txt?re… Modified: trunk/reactos/media/rapps/scribus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scribus.txt?re… Modified: trunk/reactos/media/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scummvm.txt?re… Modified: trunk/reactos/media/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/sdl_mixer.txt?… Modified: trunk/reactos/media/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/sdl_runtime.tx… Modified: trunk/reactos/media/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/seamonkey.txt?… Modified: trunk/reactos/media/rapps/shed.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/shed.txt?rev=6… Modified: trunk/reactos/media/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/smplayer.txt?r… Modified: trunk/reactos/media/rapps/snoopy.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/snoopy.txt?rev… Modified: trunk/reactos/media/rapps/stamina.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/stamina.txt?re… Modified: trunk/reactos/media/rapps/steam.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/steam.txt?rev=… Modified: trunk/reactos/media/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/sumatrapdf.txt… Modified: trunk/reactos/media/rapps/summerbound.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/summerbound.tx… Modified: trunk/reactos/media/rapps/superdxb.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/superdxb.txt?r… Modified: trunk/reactos/media/rapps/superfinder.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/superfinder.tx… Modified: trunk/reactos/media/rapps/supertux.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/supertux.txt?r… Modified: trunk/reactos/media/rapps/tahoma.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tahoma.txt?rev… Modified: trunk/reactos/media/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/thunderbird.tx… Modified: trunk/reactos/media/rapps/thunderbird3.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/thunderbird3.t… Modified: trunk/reactos/media/rapps/tightvnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tightvnc.txt?r… Modified: trunk/reactos/media/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tileworld.txt?… Modified: trunk/reactos/media/rapps/totalcommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/totalcommander… Modified: trunk/reactos/media/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tuxpaint.txt?r… Modified: trunk/reactos/media/rapps/ultraiso.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ultraiso.txt?r… Modified: trunk/reactos/media/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/ultravnc.txt?r… Modified: trunk/reactos/media/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/utorrent.txt?r… Modified: trunk/reactos/media/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vb5run.txt?rev… Modified: trunk/reactos/media/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vb6run.txt?rev… Modified: trunk/reactos/media/rapps/vbasdl.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vbasdl.txt?rev… Modified: trunk/reactos/media/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc2005sp1run.t… Modified: trunk/reactos/media/rapps/vc2008sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc2008sp1run.t… Modified: trunk/reactos/media/rapps/vc2010sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc2010sp1run.t… Modified: trunk/reactos/media/rapps/vc2012run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc2012run.txt?… Modified: trunk/reactos/media/rapps/vc2013run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc2013run.txt?… Modified: trunk/reactos/media/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vc6run.txt?rev… Modified: trunk/reactos/media/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/vlc.txt?rev=69… Modified: trunk/reactos/media/rapps/watercolor.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/watercolor.txt… Modified: trunk/reactos/media/rapps/winamp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winamp.txt?rev… Modified: trunk/reactos/media/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winboard.txt?r… Modified: trunk/reactos/media/rapps/windirstat.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/windirstat.txt… Modified: trunk/reactos/media/rapps/winemono.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winemono.txt?r… Modified: trunk/reactos/media/rapps/winmerge.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winmerge.txt?r… Modified: trunk/reactos/media/rapps/winspypp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/winspypp.txt?r… Modified: trunk/reactos/media/rapps/wme9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/wme9.txt?rev=6… Modified: trunk/reactos/media/rapps/wordview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/wordview.txt?r… Modified: trunk/reactos/media/rapps/zaz.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/zaz.txt?rev=69…

1 0

[ekohl] 69497: [INTL] Update date and time examples according to the current settings. CORE-10074
by ekohl＠svn.reactos.org 11 Oct '15

11 Oct '15

Author: ekohl Date: Sun Oct 11 15:21:25 2015 New Revision: 69497 URL: http://svn.reactos.org/svn/reactos?rev=69497&view=rev Log: [INTL] Update date and time examples according to the current settings. CORE-10074 Modified: trunk/reactos/dll/cpl/intl/date.c trunk/reactos/dll/cpl/intl/generalp.c trunk/reactos/dll/cpl/intl/time.c Modified: trunk/reactos/dll/cpl/intl/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/date.c?rev=69… ============================================================================== --- trunk/reactos/dll/cpl/intl/date.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/date.c [iso-8859-1] Sun Oct 11 15:21:25 2015 @@ -503,13 +503,15 @@ WCHAR OutBuffer[MAX_SAMPLES_STR_SIZE]; /* Get short date format sample */ - GetDateFormatW(pGlobalData->UserLCID, DATE_SHORTDATE, NULL, NULL, OutBuffer, + GetDateFormatW(pGlobalData->UserLCID, 0, NULL, + pGlobalData->szShortDateFormat, OutBuffer, MAX_SAMPLES_STR_SIZE); SendDlgItemMessageW(hwndDlg, IDC_SHRTDATESAMPLE_EDIT, WM_SETTEXT, 0, (LPARAM)OutBuffer); /* Get long date sample */ - GetDateFormatW(pGlobalData->UserLCID, DATE_LONGDATE, NULL, NULL, OutBuffer, + GetDateFormatW(pGlobalData->UserLCID, 0, NULL, + pGlobalData->szLongDateFormat, OutBuffer, MAX_SAMPLES_STR_SIZE); SendDlgItemMessageW(hwndDlg, IDC_LONGDATESAMPLE_EDIT, WM_SETTEXT, 0, (LPARAM)OutBuffer); Modified: trunk/reactos/dll/cpl/intl/generalp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/generalp.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/generalp.c [iso-8859-1] Sun Oct 11 15:21:25 2015 @@ -127,20 +127,23 @@ ZeroMemory(OutBuffer, MAX_SAMPLES_STR_SIZE * sizeof(WCHAR)); /* Get time format sample */ - GetTimeFormatW(pGlobalData->UserLCID, NO_FLAG, NULL, NULL, + GetTimeFormatW(pGlobalData->UserLCID, 0, NULL, + pGlobalData->szTimeFormat, OutBuffer, MAX_SAMPLES_STR_SIZE); SendDlgItemMessageW(hwndDlg, IDC_TIMESAMPLE_EDIT, WM_SETTEXT, 0, (LPARAM)OutBuffer); ZeroMemory(OutBuffer, MAX_SAMPLES_STR_SIZE * sizeof(WCHAR)); /* Get short date format sample */ - GetDateFormatW(pGlobalData->UserLCID, DATE_SHORTDATE, NULL, NULL, + GetDateFormatW(pGlobalData->UserLCID, 0, NULL, + pGlobalData->szShortDateFormat, OutBuffer, MAX_SAMPLES_STR_SIZE); SendDlgItemMessageW(hwndDlg, IDC_SHORTTIMESAMPLE_EDIT, WM_SETTEXT, 0, (LPARAM)OutBuffer); /* Get long date sample */ - GetDateFormatW(pGlobalData->UserLCID, DATE_LONGDATE, NULL, NULL, + GetDateFormatW(pGlobalData->UserLCID, 0, NULL, + pGlobalData->szLongDateFormat, OutBuffer, MAX_SAMPLES_STR_SIZE); SendDlgItemMessageW(hwndDlg, IDC_FULLTIMESAMPLE_EDIT, WM_SETTEXT, 0, (LPARAM)OutBuffer); Modified: trunk/reactos/dll/cpl/intl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/time.c?rev=69… ============================================================================== --- trunk/reactos/dll/cpl/intl/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/time.c [iso-8859-1] Sun Oct 11 15:21:25 2015 @@ -41,9 +41,11 @@ static VOID UpdateTimeSample(HWND hWnd, PGLOBALDATA pGlobalData) { - WCHAR szBuffer[80]; - - GetTimeFormatW(pGlobalData->UserLCID, 0, NULL, pGlobalData->szTimeFormat, szBuffer, 80); + WCHAR szBuffer[MAX_SAMPLES_STR_SIZE]; + + GetTimeFormatW(pGlobalData->UserLCID, 0, NULL, + pGlobalData->szTimeFormat, szBuffer, + MAX_SAMPLES_STR_SIZE); SendDlgItemMessageW(hWnd, IDC_TIMESAMPLE, WM_SETTEXT, 0, (LPARAM)szBuffer); }

1 0

[sginsberg] 69496: [NTOS] Follow up to r69075: Assert IRQL correctly in KeDisconnectInterrupt too (do not assume debug build means MP build).
by sginsberg＠svn.reactos.org 11 Oct '15

11 Oct '15

Author: sginsberg Date: Sun Oct 11 13:18:30 2015 New Revision: 69496 URL: http://svn.reactos.org/svn/reactos?rev=69496&view=rev Log: [NTOS] Follow up to r69075: Assert IRQL correctly in KeDisconnectInterrupt too (do not assume debug build means MP build). Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Sun Oct 11 13:18:30 2015 @@ -454,10 +454,8 @@ */ #if defined(CONFIG_SMP) ASSERT(Irql <= SYNCH_LEVEL); -#elif (NTDDI_VERSION >= NTDDI_WS03) +#else ASSERT(Irql <= (IPI_LEVEL - 2)); -#else - ASSERT(Irql <= (IPI_LEVEL - 1)); #endif /* Check if this is the first chain */ @@ -526,7 +524,11 @@ if (Dispatch.Type == ChainConnect) { /* Check if the top-level interrupt is being removed */ +#if defined(CONFIG_SMP) ASSERT(Irql <= SYNCH_LEVEL); +#else + ASSERT(Irql <= (IPI_LEVEL - 2)); +#endif if (Interrupt == Dispatch.Interrupt) { /* Get the next one */

1 0

[tfaber] 69495: [PORTCLS] - Don't attempt broken pointer magic on power states
by tfaber＠svn.reactos.org 11 Oct '15

11 Oct '15

Author: tfaber Date: Sun Oct 11 08:19:18 2015 New Revision: 69495 URL: http://svn.reactos.org/svn/reactos?rev=69495&view=rev Log: [PORTCLS] - Don't attempt broken pointer magic on power states Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] Sun Oct 11 08:19:18 2015 @@ -112,7 +112,7 @@ DeviceExt->SystemPowerState = PowerSystemWorking; // notify power manager of current state - PowerState = *((POWER_STATE*)&DeviceExt->DevicePowerState); + PowerState.DeviceState = DeviceExt->DevicePowerState; PoSetPowerState(DeviceObject, DevicePowerState, PowerState); Irp->IoStatus.Status = STATUS_SUCCESS; @@ -271,7 +271,7 @@ if (DeviceExtension->AdapterPowerManagement) { // it is query if the change can be changed - PowerState = *((POWER_STATE*)&IoStack->Parameters.Power.State.DeviceState); + PowerState = IoStack->Parameters.Power.State; Status = DeviceExtension->AdapterPowerManagement->QueryPowerChangeState(PowerState); // sanity check @@ -294,7 +294,7 @@ else { // set power state - PowerState = *((POWER_STATE*)&IoStack->Parameters.Power.State.DeviceState); + PowerState = IoStack->Parameters.Power.State; PoSetPowerState(DeviceObject, DevicePowerState, PowerState); // check if there is a registered adapter power management @@ -307,7 +307,7 @@ // FIXME call all registered IPowerNotify interfaces via ISubdevice interface // store new power state - DeviceExtension->DevicePowerState = IoStack->Parameters.Power.State.DeviceState; + DeviceExtension->DevicePowerState = IoStack->Parameters.Power.State.DeviceState; // complete request Irp->IoStatus.Status = Status; @@ -348,7 +348,7 @@ PwrContext->DeviceObject = DeviceObject; // pass the irp down - PowerState = *((POWER_STATE*)IoStack->Parameters.Power.State.SystemState); + PowerState = IoStack->Parameters.Power.State; Status = PoRequestPowerIrp(DeviceExtension->PhysicalDeviceObject, IoStack->MinorFunction, PowerState, PwrCompletionFunction, (PVOID)PwrContext, NULL); // check for success

1 0

[tfaber] 69494: [WIN32K] - Separate system-defined from user-defined window properties. The values stored by win32k/user32 must not interfere with those stored by applications. Fixes various applic...
by tfaber＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: tfaber Date: Sat Oct 10 19:50:05 2015 New Revision: 69494 URL: http://svn.reactos.org/svn/reactos?rev=69494&view=rev Log: [WIN32K] - Separate system-defined from user-defined window properties. The values stored by win32k/user32 must not interfere with those stored by applications. Fixes various applications (e.g. PeaZip) randomly getting their window properties overwritten by the system CORE-3897 #resolve Modified: trunk/reactos/win32ss/gdi/eng/engwindow.c trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/dde.c trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/layered.c trunk/reactos/win32ss/user/ntuser/nonclient.c trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/prop.c trunk/reactos/win32ss/user/ntuser/prop.h trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/ntuser/windc.c trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/user32/include/user32p.h trunk/reactos/win32ss/user/user32/windows/defwnd.c trunk/reactos/win32ss/user/user32/windows/prop.c Modified: trunk/reactos/win32ss/gdi/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engwindow.… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -104,7 +104,7 @@ ASSERT_IRQL_LESS_OR_EQUAL(PASSIVE_LEVEL); - Clip = UserGetProp(Window, AtomWndObj); + Clip = UserGetProp(Window, AtomWndObj, TRUE); if (!Clip) { return; @@ -208,7 +208,7 @@ Clip->PixelFormat = iPixelFormat; /* associate object with window */ - UserSetProp(Window, AtomWndObj, Clip); + UserSetProp(Window, AtomWndObj, Clip, TRUE); ++gcountPWO; TRACE("EngCreateWnd: SUCCESS: %p!\n", WndObjUser); @@ -253,7 +253,7 @@ else { /* Remove object from window */ - UserRemoveProp(Window, AtomWndObj); + UserRemoveProp(Window, AtomWndObj, TRUE); } --gcountPWO; Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -1028,6 +1028,8 @@ ATOM Atom; HANDLE Data; } PROPLISTITEM, *PPROPLISTITEM; + +#define PROPERTY_FLAG_SYSTEM 1 typedef struct _PROPERTY { Modified: trunk/reactos/win32ss/user/ntuser/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/dde.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -339,7 +339,7 @@ if (pMsg->message == WM_DDE_TERMINATE) { - pddeProp = (PDDE_PROP)UserGetProp(pWnd, AtomDDETrack); + pddeProp = (PDDE_PROP)UserGetProp(pWnd, AtomDDETrack, TRUE); if (pddeProp) { pWndClient = UserGetWindowObject((HWND)pMsg->wParam); @@ -348,7 +348,7 @@ ERR("DDE Get Client WM_DDE_TERMINATE\n"); } - UserRemoveProp(pWnd, AtomDDETrack); + UserRemoveProp(pWnd, AtomDDETrack, TRUE); ExFreePoolWithTag(pddeProp, USERTAG_DDE1); } return TRUE; @@ -419,7 +419,7 @@ pddeProp->spwnd = pWndServer; pddeProp->spwndPartner = pWnd; - UserSetProp(pWndServer, AtomDDETrack, (HANDLE)pddeProp); + UserSetProp(pWndServer, AtomDDETrack, (HANDLE)pddeProp, TRUE); } return TRUE; } Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -441,8 +441,8 @@ EngSetLastError(ERROR_INVALID_PARAMETER); return 0; } - hIconSmall = UserGetProp(pWnd, gpsi->atomIconSmProp); - hIcon = UserGetProp(pWnd, gpsi->atomIconProp); + hIconSmall = UserGetProp(pWnd, gpsi->atomIconSmProp, TRUE); + hIcon = UserGetProp(pWnd, gpsi->atomIconProp, TRUE); hIconOld = wParam == ICON_BIG ? hIcon : hIconSmall; @@ -460,8 +460,8 @@ break; } - UserSetProp(pWnd, gpsi->atomIconProp, hIcon); - UserSetProp(pWnd, gpsi->atomIconSmProp, hIconSmall); + UserSetProp(pWnd, gpsi->atomIconProp, hIcon, TRUE); + UserSetProp(pWnd, gpsi->atomIconSmProp, hIconSmall, TRUE); if ((pWnd->style & WS_CAPTION ) == WS_CAPTION) UserPaintCaption(pWnd, DC_ICON); @@ -481,11 +481,11 @@ switch(wParam) { case ICON_BIG: - hIconRet = UserGetProp(pWnd, gpsi->atomIconProp); + hIconRet = UserGetProp(pWnd, gpsi->atomIconProp, TRUE); break; case ICON_SMALL: case ICON_SMALL2: - hIconRet = UserGetProp(pWnd, gpsi->atomIconSmProp); + hIconRet = UserGetProp(pWnd, gpsi->atomIconSmProp, TRUE); break; default: break; Modified: trunk/reactos/win32ss/user/ntuser/layered.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/layere… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/layered.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/layered.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -22,7 +22,7 @@ BOOL FASTCALL GetLayeredStatus(PWND pWnd) { - PLRD_PROP pLrdProp = UserGetProp(pWnd, AtomLayer); + PLRD_PROP pLrdProp = UserGetProp(pWnd, AtomLayer, TRUE); if (pLrdProp) { return pLrdProp->is_Layered; @@ -33,7 +33,7 @@ BOOL FASTCALL SetLayeredStatus(PWND pWnd, BYTE set) { - PLRD_PROP pLrdProp = UserGetProp(pWnd, AtomLayer); + PLRD_PROP pLrdProp = UserGetProp(pWnd, AtomLayer, TRUE); if (pLrdProp) { pLrdProp->is_Layered = set; @@ -57,7 +57,7 @@ return FALSE; } - pLrdProp = UserGetProp(pWnd, AtomLayer); + pLrdProp = UserGetProp(pWnd, AtomLayer, TRUE); if (!pLrdProp) { @@ -68,7 +68,7 @@ return FALSE; } RtlZeroMemory(pLrdProp, sizeof(LRD_PROP)); - UserSetProp(pWnd, AtomLayer, (HANDLE)pLrdProp); + UserSetProp(pWnd, AtomLayer, (HANDLE)pLrdProp, TRUE); } if (pLrdProp) @@ -258,7 +258,7 @@ goto Exit; } - pLrdProp = UserGetProp(pWnd, AtomLayer); + pLrdProp = UserGetProp(pWnd, AtomLayer, TRUE); if (!pLrdProp) { Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/noncli… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/nonclient.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -606,8 +606,8 @@ //FIXME: This is bad and we should feel bad. //FIXME: Stop whining over wine code. - hIcon = UserGetProp(pWnd, gpsi->atomIconSmProp); - if (!hIcon) hIcon = UserGetProp(pWnd, gpsi->atomIconProp); + hIcon = UserGetProp(pWnd, gpsi->atomIconSmProp, TRUE); + if (!hIcon) hIcon = UserGetProp(pWnd, gpsi->atomIconProp, TRUE); if (!hIcon && pWnd->pcls->spicnSm) return pWnd->pcls->spicnSm; Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -1189,7 +1189,7 @@ ASSERT(pfwi); - FlashState = (DWORD)UserGetProp(pWnd, AtomFlashWndState); + FlashState = (DWORD)UserGetProp(pWnd, AtomFlashWndState, TRUE); if (FlashState == FLASHW_FINISHED) { @@ -1267,7 +1267,7 @@ IntKillTimer(pWnd, ID_EVENT_SYSTIMER_FLASHWIN, TRUE); } - UserRemoveProp(pWnd, AtomFlashWndState); + UserRemoveProp(pWnd, AtomFlashWndState, TRUE); } else { // Have a count and started, set timer. @@ -1305,7 +1305,7 @@ FlashState ^= (FlashState ^ pfwi->dwFlags) & (FLASHW_MASK & ~FLASHW_TIMER); } FlashState = MAKELONG(LOWORD(FlashState),uCount); - UserSetProp(pWnd, AtomFlashWndState, (HANDLE) FlashState); + UserSetProp(pWnd, AtomFlashWndState, (HANDLE)FlashState, TRUE); } return Ret; } Modified: trunk/reactos/win32ss/user/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -15,11 +15,13 @@ FASTCALL IntGetProp( _In_ PWND Window, - _In_ ATOM Atom) + _In_ ATOM Atom, + _In_ BOOLEAN SystemProp) { PLIST_ENTRY ListEntry; PPROPERTY Property; UINT i; + WORD SystemFlag = SystemProp ? PROPERTY_FLAG_SYSTEM : 0; NT_ASSERT(UserIsEntered()); ListEntry = Window->PropListHead.Flink; @@ -27,33 +29,29 @@ for (i = 0; i < Window->PropListItems; i++) { Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); - - if (ListEntry == NULL) - { - ERR("Corrupted (or uninitialized?) property list for window %p. Prop count %u. Atom %u.\n", - Window, Window->PropListItems, Atom); - return NULL; - } - - if (Property->Atom == Atom) - { - return(Property); - } ListEntry = ListEntry->Flink; - } - return(NULL); + + if (Property->Atom == Atom && + (Property->fs & PROPERTY_FLAG_SYSTEM) == SystemFlag) + { + return Property; + } + } + NT_ASSERT(ListEntry == &Window->PropListHead); + return NULL; } HANDLE FASTCALL UserGetProp( _In_ PWND Window, - _In_ ATOM Atom) + _In_ ATOM Atom, + _In_ BOOLEAN SystemProp) { PPROPERTY Prop; NT_ASSERT(UserIsEntered()); - Prop = IntGetProp(Window, Atom); + Prop = IntGetProp(Window, Atom, SystemProp); return Prop ? Prop->Data : NULL; } @@ -62,13 +60,14 @@ FASTCALL UserRemoveProp( _In_ PWND Window, - _In_ ATOM Atom) + _In_ ATOM Atom, + _In_ BOOLEAN SystemProp) { PPROPERTY Prop; HANDLE Data; NT_ASSERT(UserIsEnteredExclusive()); - Prop = IntGetProp(Window, Atom); + Prop = IntGetProp(Window, Atom, SystemProp); if (Prop == NULL) { return NULL; @@ -87,12 +86,13 @@ UserSetProp( _In_ PWND Window, _In_ ATOM Atom, - _In_ HANDLE Data) + _In_ HANDLE Data, + _In_ BOOLEAN SystemProp) { PPROPERTY Prop; NT_ASSERT(UserIsEnteredExclusive()); - Prop = IntGetProp(Window, Atom); + Prop = IntGetProp(Window, Atom, SystemProp); if (Prop == NULL) { Prop = UserHeapAlloc(sizeof(PROPERTY)); @@ -101,6 +101,7 @@ return FALSE; } Prop->Atom = Atom; + Prop->fs = SystemProp ? PROPERTY_FLAG_SYSTEM : 0; InsertTailList(&Window->PropListHead, &Prop->PropListEntry); Window->PropListItems++; } @@ -171,24 +172,28 @@ (ListEntry != &Window->PropListHead)) { Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); - listitem.Atom = Property->Atom; - listitem.Data = Property->Data; - - Status = MmCopyToCaller(li, &listitem, sizeof(PROPLISTITEM)); - if (!NT_SUCCESS(Status)) + ListEntry = ListEntry->Flink; + if (!(Property->fs & PROPERTY_FLAG_SYSTEM)) { - goto Exit; + listitem.Atom = Property->Atom; + listitem.Data = Property->Data; + + Status = MmCopyToCaller(li, &listitem, sizeof(PROPLISTITEM)); + if (!NT_SUCCESS(Status)) + { + goto Exit; + } + + BufferSize -= sizeof(PROPLISTITEM); + Cnt++; + li++; } - - BufferSize -= sizeof(PROPLISTITEM); - Cnt++; - li++; - ListEntry = ListEntry->Flink; } } else { + /* FIXME: This counts user and system props */ Cnt = Window->PropListItems * sizeof(PROPLISTITEM); } @@ -228,7 +233,7 @@ goto Exit; } - Data = UserRemoveProp(Window, Atom); + Data = UserRemoveProp(Window, Atom, FALSE); Exit: TRACE("Leave NtUserRemoveProp, ret=%p\n", Data); @@ -257,7 +262,7 @@ goto Exit; } - Ret = UserSetProp(Window, Atom, Data); + Ret = UserSetProp(Window, Atom, Data, FALSE); Exit: TRACE("Leave NtUserSetProp, ret=%i\n", Ret); Modified: trunk/reactos/win32ss/user/ntuser/prop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.h… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -4,13 +4,15 @@ FASTCALL UserGetProp( _In_ PWND Window, - _In_ ATOM Atom); + _In_ ATOM Atom, + _In_ BOOLEAN SystemProp); HANDLE FASTCALL UserRemoveProp( _In_ PWND Window, - _In_ ATOM Atom); + _In_ ATOM Atom, + _In_ BOOLEAN SystemProp); _Success_(return) BOOL @@ -18,7 +20,8 @@ UserSetProp( _In_ PWND Window, _In_ ATOM Atom, - _In_ HANDLE Data); + _In_ HANDLE Data, + _In_ BOOLEAN SystemProp); VOID FASTCALL Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -610,7 +610,7 @@ return 0; } - HelpId = (DWORD)(DWORD_PTR)UserGetProp(Window, gpsi->atomContextHelpIdProp); + HelpId = (DWORD)(DWORD_PTR)UserGetProp(Window, gpsi->atomContextHelpIdProp, TRUE); UserLeave(); return HelpId; @@ -666,9 +666,9 @@ } if ( Param ) - UserSetProp(Window, gpsi->atomContextHelpIdProp, (HANDLE)Param); + UserSetProp(Window, gpsi->atomContextHelpIdProp, (HANDLE)Param, TRUE); else - UserRemoveProp(Window, gpsi->atomContextHelpIdProp); + UserRemoveProp(Window, gpsi->atomContextHelpIdProp, TRUE); UserLeave(); return TRUE; Modified: trunk/reactos/win32ss/user/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/windc.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -967,7 +967,7 @@ if (hWnd && (Wnd = UserGetWindowObject(hWnd))) { - Clip = (XCLIPOBJ*)UserGetProp(Wnd, AtomWndObj); + Clip = (XCLIPOBJ*)UserGetProp(Wnd, AtomWndObj, TRUE); if ( Clip && Clip->Hwnd == hWnd ) { Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -373,7 +373,7 @@ do { - HelpId = (DWORD)(DWORD_PTR)UserGetProp(pWnd, gpsi->atomContextHelpIdProp); + HelpId = (DWORD)(DWORD_PTR)UserGetProp(pWnd, gpsi->atomContextHelpIdProp, TRUE); if (!HelpId) break; pWnd = IntGetParent(pWnd); } Modified: trunk/reactos/win32ss/user/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/user32p.h [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -133,7 +133,7 @@ HWND* WIN_ListChildren (HWND hWndparent); VOID DeleteFrameBrushes(VOID); BOOL WINAPI GdiValidateHandle(HGDIOBJ); -HANDLE FASTCALL UserGetProp(HWND hWnd, ATOM Atom); +HANDLE FASTCALL UserGetProp(HWND hWnd, ATOM Atom, BOOLEAN SystemProp); BOOL WINAPI InitializeImmEntryTable(VOID); /* EOF */ Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -397,11 +397,11 @@ switch(wParam) { case ICON_BIG: - hIconRet = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconProp); + hIconRet = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconProp, TRUE); break; case ICON_SMALL: case ICON_SMALL2: - hIconRet = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconSmProp); + hIconRet = UserGetProp(UserHMGetHandle(pWnd), gpsi->atomIconSmProp, TRUE); break; default: break; Modified: trunk/reactos/win32ss/user/user32/windows/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/prop.c [iso-8859-1] Sat Oct 10 19:50:05 2015 @@ -35,12 +35,13 @@ HANDLE FASTCALL -IntGetProp(HWND hWnd, ATOM Atom) +IntGetProp(HWND hWnd, ATOM Atom, BOOLEAN SystemProp) { PLIST_ENTRY ListEntry, temp; PPROPERTY Property; PWND pWnd; int i; + WORD SystemFlag = SystemProp ? PROPERTY_FLAG_SYSTEM : 0; pWnd = ValidateHwnd(hWnd); if (!pWnd) return NULL; @@ -49,7 +50,8 @@ for (i = 0; i < pWnd->PropListItems; i++ ) { Property = CONTAINING_RECORD(ListEntry, PROPERTY, PropListEntry); - if (Property->Atom == Atom) + if (Property->Atom == Atom && + (Property->fs & PROPERTY_FLAG_SYSTEM) == SystemFlag) { return(Property); } @@ -61,10 +63,10 @@ HANDLE FASTCALL -UserGetProp(HWND hWnd, ATOM Atom) +UserGetProp(HWND hWnd, ATOM Atom, BOOLEAN SystemProp) { PPROPERTY Prop; - Prop = IntGetProp(hWnd, Atom); + Prop = IntGetProp(hWnd, Atom, SystemProp); return Prop ? Prop->Data : NULL; } @@ -383,7 +385,7 @@ { Atom = LOWORD((DWORD_PTR)lpString); } - Prop = IntGetProp(hWnd, Atom); + Prop = IntGetProp(hWnd, Atom, FALSE); if (Prop != NULL) Data = Prop->Data; return Data; }

1 0

[tfaber] 69493: [WIN32K] - Rename IntSetProp to UserSetProp, IntRemoveProp to UserRemoveProp and IntRemoveWindowProp to UserRemoveWindowProps
by tfaber＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: tfaber Date: Sat Oct 10 17:56:09 2015 New Revision: 69493 URL: http://svn.reactos.org/svn/reactos?rev=69493&view=rev Log: [WIN32K] - Rename IntSetProp to UserSetProp, IntRemoveProp to UserRemoveProp and IntRemoveWindowProp to UserRemoveWindowProps Modified: trunk/reactos/win32ss/gdi/eng/engwindow.c trunk/reactos/win32ss/user/ntuser/dde.c trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/layered.c trunk/reactos/win32ss/user/ntuser/painting.c trunk/reactos/win32ss/user/ntuser/prop.c trunk/reactos/win32ss/user/ntuser/prop.h trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/gdi/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engwindow.… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engwindow.c [iso-8859-1] Sat Oct 10 17:56:09 2015 @@ -208,7 +208,7 @@ Clip->PixelFormat = iPixelFormat; /* associate object with window */ - IntSetProp(Window, AtomWndObj, Clip); + UserSetProp(Window, AtomWndObj, Clip); ++gcountPWO; TRACE("EngCreateWnd: SUCCESS: %p!\n", WndObjUser); @@ -253,7 +253,7 @@ else { /* Remove object from window */ - IntRemoveProp(Window, AtomWndObj); + UserRemoveProp(Window, AtomWndObj); } --gcountPWO; Modified: trunk/reactos/win32ss/user/ntuser/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/dde.c?… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/dde.c [iso-8859-1] Sat Oct 10 17:56:09 2015 @@ -348,7 +348,7 @@ ERR("DDE Get Client WM_DDE_TERMINATE\n"); } - IntRemoveProp(pWnd, AtomDDETrack); + UserRemoveProp(pWnd, AtomDDETrack); ExFreePoolWithTag(pddeProp, USERTAG_DDE1); } return TRUE; @@ -419,7 +419,7 @@ pddeProp->spwnd = pWndServer; pddeProp->spwndPartner = pWnd; - IntSetProp(pWndServer, AtomDDETrack, (HANDLE)pddeProp); + UserSetProp(pWndServer, AtomDDETrack, (HANDLE)pddeProp); } return TRUE; } Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Sat Oct 10 17:56:09 2015 @@ -460,8 +460,8 @@ break; } - IntSetProp(pWnd, gpsi->atomIconProp, hIcon); - IntSetProp(pWnd, gpsi->atomIconSmProp, hIconSmall); + UserSetProp(pWnd, gpsi->atomIconProp, hIcon); + UserSetProp(pWnd, gpsi->atomIconSmProp, hIconSmall); if ((pWnd->style & WS_CAPTION ) == WS_CAPTION) UserPaintCaption(pWnd, DC_ICON); Modified: trunk/reactos/win32ss/user/ntuser/layered.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/layere… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/layered.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/layered.c [iso-8859-1] Sat Oct 10 17:56:09 2015 @@ -68,7 +68,7 @@ return FALSE; } RtlZeroMemory(pLrdProp, sizeof(LRD_PROP)); - IntSetProp(pWnd, AtomLayer, (HANDLE)pLrdProp); + UserSetProp(pWnd, AtomLayer, (HANDLE)pLrdProp); } if (pLrdProp) Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Sat Oct 10 17:56:09 2015 @@ -1267,7 +1267,7 @@ IntKillTimer(pWnd, ID_EVENT_SYSTIMER_FLASHWIN, TRUE); } - IntRemoveProp(pWnd, AtomFlashWndState); + UserRemoveProp(pWnd, AtomFlashWndState); } else { // Have a count and started, set timer. @@ -1305,7 +1305,7 @@ FlashState ^= (FlashState ^ pfwi->dwFlags) & (FLASHW_MASK & ~FLASHW_TIMER); } FlashState = MAKELONG(LOWORD(FlashState),uCount); - IntSetProp(pWnd, AtomFlashWndState, (HANDLE) FlashState); + UserSetProp(pWnd, AtomFlashWndState, (HANDLE) FlashState); } return Ret; } Modified: trunk/reactos/win32ss/user/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.c [iso-8859-1] Sat Oct 10 17:56:09 2015 @@ -60,7 +60,7 @@ _Success_(return) HANDLE FASTCALL -IntRemoveProp( +UserRemoveProp( _In_ PWND Window, _In_ ATOM Atom) { @@ -84,7 +84,7 @@ _Success_(return) BOOL FASTCALL -IntSetProp( +UserSetProp( _In_ PWND Window, _In_ ATOM Atom, _In_ HANDLE Data) @@ -111,7 +111,7 @@ VOID FASTCALL -IntRemoveWindowProp( +UserRemoveWindowProps( _In_ PWND Window) { PLIST_ENTRY ListEntry; @@ -228,7 +228,7 @@ goto Exit; } - Data = IntRemoveProp(Window, Atom); + Data = UserRemoveProp(Window, Atom); Exit: TRACE("Leave NtUserRemoveProp, ret=%p\n", Data); @@ -257,7 +257,7 @@ goto Exit; } - Ret = IntSetProp(Window, Atom, Data); + Ret = UserSetProp(Window, Atom, Data); Exit: TRACE("Leave NtUserSetProp, ret=%i\n", Ret); Modified: trunk/reactos/win32ss/user/ntuser/prop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.h… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/prop.h [iso-8859-1] Sat Oct 10 17:56:09 2015 @@ -8,19 +8,19 @@ HANDLE FASTCALL -IntRemoveProp( +UserRemoveProp( _In_ PWND Window, _In_ ATOM Atom); _Success_(return) BOOL FASTCALL -IntSetProp( +UserSetProp( _In_ PWND Window, _In_ ATOM Atom, _In_ HANDLE Data); VOID FASTCALL -IntRemoveWindowProp( +UserRemoveWindowProps( _In_ PWND Window); Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sat Oct 10 17:56:09 2015 @@ -666,9 +666,9 @@ } if ( Param ) - IntSetProp(Window, gpsi->atomContextHelpIdProp, (HANDLE)Param); + UserSetProp(Window, gpsi->atomContextHelpIdProp, (HANDLE)Param); else - IntRemoveProp(Window, gpsi->atomContextHelpIdProp); + UserRemoveProp(Window, gpsi->atomContextHelpIdProp); UserLeave(); return TRUE; Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sat Oct 10 17:56:09 2015 @@ -630,7 +630,7 @@ if (Window->PropListItems) { - IntRemoveWindowProp(Window); + UserRemoveWindowProps(Window); TRACE("Window->PropListItems %lu\n",Window->PropListItems); ASSERT(Window->PropListItems==0); }

1 0

[tfaber] 69492: [WIN32K:NTUSER] - Remove some unnecessary referencing in NtUserCallHwnd
by tfaber＠svn.reactos.org 10 Oct '15

10 Oct '15

Author: tfaber Date: Sat Oct 10 17:46:57 2015 New Revision: 69492 URL: http://svn.reactos.org/svn/reactos?rev=69492&view=rev Log: [WIN32K:NTUSER] - Remove some unnecessary referencing in NtUserCallHwnd Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sat Oct 10 17:46:57 2015 @@ -601,20 +601,17 @@ { PWND Window; DWORD HelpId; - USER_REFERENCE_ENTRY Ref; - - UserEnterExclusive(); + + UserEnterShared(); if (!(Window = UserGetWindowObject(hWnd))) { UserLeave(); return 0; } - UserRefObjectCo(Window, &Ref); HelpId = (DWORD)(DWORD_PTR)UserGetProp(Window, gpsi->atomContextHelpIdProp); - UserDerefObjectCo(Window); UserLeave(); return HelpId; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs