Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 68571: [NTOSKRNL] NtQuerySystemInformation: - Windows Vista and later: Check the information class before probing the buffer. - Pre-Vista Windows: Check the information class after probing ...
by ekohl＠svn.reactos.org 25 Jul '15

25 Jul '15

Author: ekohl Date: Sat Jul 25 11:53:16 2015 New Revision: 68571 URL: http://svn.reactos.org/svn/reactos?rev=68571&view=rev Log: [NTOSKRNL] NtQuerySystemInformation: - Windows Vista and later: Check the information class before probing the buffer. - Pre-Vista Windows: Check the information class after probing the buffer. - Pre-Vista Windows: Fixed the aligment check for invalid information classes. - Pre-Vista Windows: The SystemFlagsInformation and SystemKernelDebuggerInformation classes return no required length in case of an error. This fixes all ntdll_apitest:NtSystemInformation fails. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sat Jul 25 11:53:16 2015 @@ -1065,12 +1065,20 @@ /* Class 9 - Flags Information */ QSI_DEF(SystemFlagsInformation) { +#if (NTDDI_VERSION >= NTDDI_VISTA) + *ReqSize = sizeof(SYSTEM_FLAGS_INFORMATION); +#endif + if (sizeof(SYSTEM_FLAGS_INFORMATION) != Size) { - *ReqSize = sizeof(SYSTEM_FLAGS_INFORMATION); - return (STATUS_INFO_LENGTH_MISMATCH); - } + return STATUS_INFO_LENGTH_MISMATCH; + } + ((PSYSTEM_FLAGS_INFORMATION) Buffer)->Flags = NtGlobalFlag; +#if (NTDDI_VERSION < NTDDI_VISTA) + *ReqSize = sizeof(SYSTEM_FLAGS_INFORMATION); +#endif + return STATUS_SUCCESS; } @@ -1631,7 +1639,10 @@ { PSYSTEM_KERNEL_DEBUGGER_INFORMATION skdi = (PSYSTEM_KERNEL_DEBUGGER_INFORMATION) Buffer; +#if (NTDDI_VERSION >= NTDDI_VISTA) *ReqSize = sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION); +#endif + if (Size < sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION)) { return STATUS_INFO_LENGTH_MISMATCH; @@ -1639,6 +1650,10 @@ skdi->KernelDebuggerEnabled = KD_DEBUGGER_ENABLED; skdi->KernelDebuggerNotPresent = KD_DEBUGGER_NOT_PRESENT; + +#if (NTDDI_VERSION < NTDDI_VISTA) + *ReqSize = sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION); +#endif return STATUS_SUCCESS; } @@ -2308,7 +2323,6 @@ { NTSTATUS (* Query) (PVOID,ULONG,PULONG); NTSTATUS (* Set) (PVOID,ULONG); - ULONG Alignment; } QSSI_CALLS; // QS Query & Set @@ -2316,12 +2330,9 @@ // XS Set // XX unknown behaviour // -#define SI_QS(n) {QSI_USE(n),SSI_USE(n),TYPE_ALIGNMENT(ULONG)} -#define SI_QX(n) {QSI_USE(n),NULL,TYPE_ALIGNMENT(ULONG)} -#define SI_XS(n) {NULL,SSI_USE(n),TYPE_ALIGNMENT(ULONG)} -#define SI_QS_ALIGN(n,a) {QSI_USE(n),SSI_USE(n),a} -#define SI_QX_ALIGN(n,a) {QSI_USE(n),NULL,a} -#define SI_XS_ALIGN(n,a) {NULL,SSI_USE(n),a} +#define SI_QS(n) {QSI_USE(n),SSI_USE(n)} +#define SI_QX(n) {QSI_USE(n),NULL} +#define SI_XS(n) {NULL,SSI_USE(n)} #define SI_XX(n) {NULL,NULL} static @@ -2363,7 +2374,7 @@ SI_QX(SystemCrashDumpInformation), SI_QX(SystemExceptionInformation), SI_QX(SystemCrashDumpStateInformation), - SI_QX_ALIGN(SystemKernelDebuggerInformation, TYPE_ALIGNMENT(BOOLEAN)), + SI_QX(SystemKernelDebuggerInformation), SI_QX(SystemContextSwitchInformation), SI_QS(SystemRegistryQuotaInformation), SI_XS(SystemExtendServiceTableInformation), @@ -2406,6 +2417,7 @@ { KPROCESSOR_MODE PreviousMode; ULONG ResultLength = 0; + ULONG Alignment = TYPE_ALIGNMENT(ULONG); NTSTATUS FStatus = STATUS_NOT_IMPLEMENTED; PAGED_CODE(); @@ -2414,6 +2426,7 @@ _SEH2_TRY { +#if (NTDDI_VERSION >= NTDDI_VISTA) /* * Check if the request is valid. */ @@ -2421,17 +2434,31 @@ { _SEH2_YIELD(return STATUS_INVALID_INFO_CLASS); } +#endif if (PreviousMode != KernelMode) { /* SystemKernelDebuggerInformation needs only BOOLEAN alignment */ - ProbeForWrite(SystemInformation, Length, CallQS[SystemInformationClass].Alignment); + if (SystemInformationClass == SystemKernelDebuggerInformation) + Alignment = TYPE_ALIGNMENT(BOOLEAN); + + ProbeForWrite(SystemInformation, Length, Alignment); if (UnsafeResultLength != NULL) ProbeForWriteUlong(UnsafeResultLength); } if (UnsafeResultLength) *UnsafeResultLength = 0; + +#if (NTDDI_VERSION < NTDDI_VISTA) + /* + * Check if the request is valid. + */ + if (SystemInformationClass >= MAX_SYSTEM_INFO_CLASS) + { + _SEH2_YIELD(return STATUS_INVALID_INFO_CLASS); + } +#endif if (NULL != CallQS [SystemInformationClass].Query) {

1 0

[ekohl] 68570: [NTOSKRNL] Revert r68346. CORE-9933 #resolve
by ekohl＠svn.reactos.org 25 Jul '15

25 Jul '15

Author: ekohl Date: Sat Jul 25 10:21:18 2015 New Revision: 68570 URL: http://svn.reactos.org/svn/reactos?rev=68570&view=rev Log: [NTOSKRNL] Revert r68346. CORE-9933 #resolve Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sat Jul 25 10:21:18 2015 @@ -2443,7 +2443,7 @@ &ResultLength); /* Save the result length to the caller */ - if (NT_SUCCESS(FStatus) && UnsafeResultLength) + if (UnsafeResultLength) *UnsafeResultLength = ResultLength; } }

1 0

[ekohl] 68569: [DIKPART] Implement the RESCAN command.
by ekohl＠svn.reactos.org 24 Jul '15

24 Jul '15

Author: ekohl Date: Fri Jul 24 20:02:56 2015 New Revision: 68569 URL: http://svn.reactos.org/svn/reactos?rev=68569&view=rev Log: [DIKPART] Implement the RESCAN command. Modified: trunk/reactos/base/system/diskpart/lang/en-US.rc trunk/reactos/base/system/diskpart/lang/ro-RO.rc trunk/reactos/base/system/diskpart/lang/ru-RU.rc trunk/reactos/base/system/diskpart/lang/sq-AL.rc trunk/reactos/base/system/diskpart/lang/tr-TR.rc trunk/reactos/base/system/diskpart/partlist.c trunk/reactos/base/system/diskpart/rescan.c trunk/reactos/base/system/diskpart/resource.h Modified: trunk/reactos/base/system/diskpart/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/en-US.rc [iso-8859-1] Fri Jul 24 20:02:56 2015 @@ -43,8 +43,15 @@ IDS_LIST_PARTITION_HEAD "\n Partition Type Size Offset\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" - IDS_LIST_PARTITION_NO_DISK "\nThere is no disk for listing partitions.\nPlease select a disk and try again.\n\n" + IDS_LIST_PARTITION_NO_DISK "\nThere is no disk to list partitions.\nPlease select a disk and try again.\n\n" IDS_LIST_VOLUME_HEAD " Volume ### Ltr Label\n" +END + +/* RESCAN command string */ +STRINGTABLE +BEGIN + IDS_RESCAN_START "\nPlease wait while DiskPart scans your configuration...\n" + IDS_RESCAN_END "\nDiskPart has finished scanning your configuration.\n\n" END /* Select command strings */ Modified: trunk/reactos/base/system/diskpart/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/ro-RO.rc [iso-8859-1] Fri Jul 24 20:02:56 2015 @@ -44,11 +44,18 @@ IDS_LIST_PARTITION_HEAD "\n Partition Type Size Offset\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" - IDS_LIST_PARTITION_NO_DISK "\nThere is no disk for listing partitions.\nPlease select a disk and try again.\n\n" + IDS_LIST_PARTITION_NO_DISK "\nThere is no disk to list partitions.\nPlease select a disk and try again.\n\n" IDS_LIST_VOLUME_HEAD "Volum ###\tLtr\tEtichetÄ\n" END -/* Select command strings */ +/* RESCAN command string */ +STRINGTABLE +BEGIN + IDS_RESCAN_START "\nPlease wait while DiskPart scans your configuration...\n" + IDS_RESCAN_END "\nDiskPart has finished scanning your configuration.\n\n" +END + +/* SELECT command strings */ STRINGTABLE BEGIN IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" Modified: trunk/reactos/base/system/diskpart/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/ru-RU.rc [iso-8859-1] Fri Jul 24 20:02:56 2015 @@ -45,11 +45,18 @@ IDS_LIST_PARTITION_HEAD "\n Partition Type Size Offset\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" - IDS_LIST_PARTITION_NO_DISK "\nThere is no disk for listing partitions.\nPlease select a disk and try again.\n\n" + IDS_LIST_PARTITION_NO_DISK "\nThere is no disk to list partitions.\nPlease select a disk and try again.\n\n" IDS_LIST_VOLUME_HEAD "Ð¢Ð¾Ð¼ ###\tÐÐ¼Ñ\tÐÐµÑÐºÐ°\n" END -/* Select command strings */ +/* RESCAN command string */ +STRINGTABLE +BEGIN + IDS_RESCAN_START "\nPlease wait while DiskPart scans your configuration...\n" + IDS_RESCAN_END "\nDiskPart has finished scanning your configuration.\n\n" +END + +/* SELECT command strings */ STRINGTABLE BEGIN IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" Modified: trunk/reactos/base/system/diskpart/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/sq-AL.rc [iso-8859-1] Fri Jul 24 20:02:56 2015 @@ -47,11 +47,18 @@ IDS_LIST_PARTITION_HEAD "\n Partition Type Size Offset\n" IDS_LIST_PARTITION_LINE "%c ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT " Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" - IDS_LIST_PARTITION_NO_DISK "\nThere is no disk for listing partitions.\nPlease select a disk and try again.\n\n" + IDS_LIST_PARTITION_NO_DISK "\nThere is no disk to list partitions.\nPlease select a disk and try again.\n\n" IDS_LIST_VOLUME_HEAD "Volume ###\tLtr\tLabel\n" END -/* Select command strings */ +/* RESCAN command string */ +STRINGTABLE +BEGIN + IDS_RESCAN_START "\nPlease wait while DiskPart scans your configuration...\n" + IDS_RESCAN_END "\nDiskPart has finished scanning your configuration.\n\n" +END + +/* SELECT command strings */ STRINGTABLE BEGIN IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" Modified: trunk/reactos/base/system/diskpart/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… ============================================================================== --- trunk/reactos/base/system/diskpart/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/lang/tr-TR.rc [iso-8859-1] Fri Jul 24 20:02:56 2015 @@ -45,11 +45,18 @@ IDS_LIST_PARTITION_HEAD "\n Partition Type Size Offset\n" IDS_LIST_PARTITION_LINE " ------------- ---------------- ------- -------\n" IDS_LIST_PARTITION_FORMAT "%c Partition %2lu %-16s %4I64u %-2s %4I64u %-2s\n" - IDS_LIST_PARTITION_NO_DISK "\nThere is no disk for listing partitions.\nPlease select a disk and try again.\n\n" + IDS_LIST_PARTITION_NO_DISK "\nThere is no disk to list partitions.\nPlease select a disk and try again.\n\n" IDS_LIST_VOLUME_HEAD "Birim ###\tHarf\tEtiket\n" END -/* Select command strings */ +/* RESCAN command string */ +STRINGTABLE +BEGIN + IDS_RESCAN_START "\nPlease wait while DiskPart scans your configuration...\n" + IDS_RESCAN_END "\nDiskPart has finished scanning your configuration.\n\n" +END + +/* SELECT command strings */ STRINGTABLE BEGIN IDS_SELECT_NO_DISK "\nThere is no disk currently selected.\nPlease select a disk and try again.\n\n" Modified: trunk/reactos/base/system/diskpart/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/partl… ============================================================================== --- trunk/reactos/base/system/diskpart/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/partlist.c [iso-8859-1] Fri Jul 24 20:02:56 2015 @@ -1137,6 +1137,9 @@ PPARTENTRY PartEntry; PLIST_ENTRY Entry; + CurrentDisk = NULL; + CurrentPartition = NULL; + /* Release disk and partition info */ while (!IsListEmpty(&DiskListHead)) { Modified: trunk/reactos/base/system/diskpart/rescan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/resca… ============================================================================== --- trunk/reactos/base/system/diskpart/rescan.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/rescan.c [iso-8859-1] Fri Jul 24 20:02:56 2015 @@ -2,8 +2,7 @@ * PROJECT: ReactOS DiskPart * LICENSE: GPL - See COPYING in the top level directory * FILE: base/system/diskpart/rescan.c - * PURPOSE: Manages all the partitions of the OS in - * an interactive way + * PURPOSE: Manages all the partitions of the OS in an interactive way * PROGRAMMERS: Lee Schroeder */ @@ -11,5 +10,10 @@ BOOL rescan_main(INT argc, LPWSTR *argv) { + PrintResourceString(IDS_RESCAN_START); + DestroyPartitionList(); + CreatePartitionList(); + PrintResourceString(IDS_RESCAN_END); + return TRUE; } Modified: trunk/reactos/base/system/diskpart/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/resou… ============================================================================== --- trunk/reactos/base/system/diskpart/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/resource.h [iso-8859-1] Fri Jul 24 20:02:56 2015 @@ -40,6 +40,9 @@ #define IDS_LIST_PARTITION_FORMAT 3305 #define IDS_LIST_PARTITION_NO_DISK 3306 #define IDS_LIST_VOLUME_HEAD 3307 + +#define IDS_RESCAN_START 4100 +#define IDS_RESCAN_END 4101 #define IDS_SELECT_NO_DISK 4400 #define IDS_SELECT_DISK 4401

1 0

[jimtabor] 68568: [User32] - Fix check menu item and preserve the calling ID. See CORE-9884.
by jimtabor＠svn.reactos.org 24 Jul '15

24 Jul '15

Author: jimtabor Date: Fri Jul 24 10:16:53 2015 New Revision: 68568 URL: http://svn.reactos.org/svn/reactos?rev=68568&view=rev Log: [User32] - Fix check menu item and preserve the calling ID. See CORE-9884. Modified: trunk/reactos/win32ss/user/user32/windows/menu.c Modified: trunk/reactos/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/menu.c [iso-8859-1] Fri Jul 24 10:16:53 2015 @@ -4600,11 +4600,12 @@ { PITEM item; DWORD Ret; + UINT uID = uIDCheckItem; if (!ValidateHandle(hmenu, TYPE_MENU)) return -1; - if (!(item = MENU_FindItem( &hmenu, &uIDCheckItem, uCheck ))) return -1; + if (!(item = MENU_FindItem( &hmenu, &uID, uCheck ))) return -1; Ret = item->fState & MFS_CHECKED; if ( Ret == (uCheck & MFS_CHECKED)) return Ret; // Already Checked...

1 0

[cfinck] 68567: [WINSPOOL_PRINT] Make winspool_print print a file to the "Dummy Printer On LPT1". We're now able to print RAW data through the native Win32 Spooler APIs. https://youtu.be/cNzePucTOLY
by cfinck＠svn.reactos.org 23 Jul '15

23 Jul '15

Author: cfinck Date: Thu Jul 23 17:48:17 2015 New Revision: 68567 URL: http://svn.reactos.org/svn/reactos?rev=68567&view=rev Log: [WINSPOOL_PRINT] Make winspool_print print a file to the "Dummy Printer On LPT1". We're now able to print RAW data through the native Win32 Spooler APIs. https://youtu.be/cNzePucTOLY Modified: branches/colins-printing-for-freedom/reactos/temp/winspool_print/CMakeLists.txt branches/colins-printing-for-freedom/reactos/temp/winspool_print/main.c Modified: branches/colins-printing-for-freedom/reactos/temp/winspool_print/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/temp/winspool_print/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/temp/winspool_print/CMakeLists.txt [iso-8859-1] Thu Jul 23 17:48:17 2015 @@ -1,4 +1,4 @@ add_executable(winspool_print main.c) set_module_type(winspool_print win32cui) -add_importlibs(winspool_print kernel32 msvcrt winspool) +add_importlibs(winspool_print winspool msvcrt kernel32) add_cd_file(TARGET winspool_print DESTINATION reactos/system32 FOR all) Modified: branches/colins-printing-for-freedom/reactos/temp/winspool_print/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/temp/winspool_print/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/temp/winspool_print/main.c [iso-8859-1] Thu Jul 23 17:48:17 2015 @@ -4,14 +4,29 @@ int main() { int ReturnValue = 1; + DWORD dwRead; DWORD dwWritten; + HANDLE hFile = INVALID_HANDLE_VALUE; HANDLE hPrinter = NULL; DOC_INFO_1W docInfo; - char szString[] = "winspool_print Test\f"; + BYTE Buffer[20000]; - if (!OpenPrinterW(L"Generic / Text Only", &hPrinter, NULL)) + hFile = CreateFileW(L"testfile", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (hFile == INVALID_HANDLE_VALUE) { - printf("OpenPrinterW failed\n"); + printf("CreateFileW failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + + if (!ReadFile(hFile, Buffer, sizeof(Buffer), &dwRead, NULL)) + { + printf("ReadFile failed, last error is %lu!\n", GetLastError()); + goto Cleanup; + } + + if (!OpenPrinterW(L"Dummy Printer On LPT1", &hPrinter, NULL)) + { + printf("OpenPrinterW failed, last error is %lu!\n", GetLastError()); goto Cleanup; } @@ -20,37 +35,40 @@ if (!StartDocPrinterW(hPrinter, 1, (LPBYTE)&docInfo)) { - printf("StartDocPrinterW failed, last error is %u!\n", GetLastError()); + printf("StartDocPrinterW failed, last error is %lu!\n", GetLastError()); goto Cleanup; } if (!StartPagePrinter(hPrinter)) { - printf("StartPagePrinter failed, last error is %u!\n", GetLastError()); + printf("StartPagePrinter failed, last error is %lu!\n", GetLastError()); goto Cleanup; } - if (!WritePrinter(hPrinter, szString, strlen(szString), &dwWritten)) + if (!WritePrinter(hPrinter, Buffer, dwRead, &dwWritten)) { - printf("WritePrinter failed, last error is %u!\n", GetLastError()); + printf("WritePrinter failed, last error is %lu!\n", GetLastError()); goto Cleanup; } if (!EndPagePrinter(hPrinter)) { - printf("EndPagePrinter failed, last error is %u!\n", GetLastError()); + printf("EndPagePrinter failed, last error is %lu!\n", GetLastError()); goto Cleanup; } if (!EndDocPrinter(hPrinter)) { - printf("EndDocPrinter failed, last error is %u!\n", GetLastError()); + printf("EndDocPrinter failed, last error is %lu!\n", GetLastError()); goto Cleanup; } ReturnValue = 0; Cleanup: + if (hFile != INVALID_HANDLE_VALUE) + CloseHandle(hFile); + if (hPrinter) ClosePrinter(hPrinter);

1 0

[bfreisen] 68566: [MSPAINT_NEW] move hDrawingDC and mirror/rotate stuff to ImageModel
by bfreisen＠svn.reactos.org 23 Jul '15

23 Jul '15

Author: bfreisen Date: Thu Jul 23 13:52:02 2015 New Revision: 68566 URL: http://svn.reactos.org/svn/reactos?rev=68566&view=rev Log: [MSPAINT_NEW] move hDrawingDC and mirror/rotate stuff to ImageModel Modified: trunk/reactos/base/applications/mspaint_new/globalvar.h trunk/reactos/base/applications/mspaint_new/history.cpp trunk/reactos/base/applications/mspaint_new/history.h trunk/reactos/base/applications/mspaint_new/imgarea.cpp trunk/reactos/base/applications/mspaint_new/main.cpp trunk/reactos/base/applications/mspaint_new/miniature.cpp trunk/reactos/base/applications/mspaint_new/selection.cpp trunk/reactos/base/applications/mspaint_new/winproc.cpp Modified: trunk/reactos/base/applications/mspaint_new/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] Thu Jul 23 13:52:02 2015 @@ -14,8 +14,6 @@ } STRETCHSKEW; /* VARIABLES declared in main.c *************************************/ - -extern HDC hDrawingDC; extern int widthSetInDlg; extern int heightSetInDlg; Modified: trunk/reactos/base/applications/mspaint_new/history.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] Thu Jul 23 13:52:02 2015 @@ -210,3 +210,35 @@ Rectangle(hDrawingDC, 0 - 1, 0 - 1, GetWidth() + 1, GetHeight() + 1); NotifyImageChanged(); } + +HDC ImageModel::GetDC() +{ + return hDrawingDC; +} + +void ImageModel::FlipHorizontally() +{ + CopyPrevious(); + StretchBlt(hDrawingDC, GetWidth() - 1, 0, -GetWidth(), GetHeight(), GetDC(), 0, 0, + GetWidth(), GetHeight(), SRCCOPY); + NotifyImageChanged(); +} + +void ImageModel::FlipVertically() +{ + CopyPrevious(); + StretchBlt(hDrawingDC, 0, GetHeight() - 1, GetWidth(), -GetHeight(), GetDC(), 0, 0, + GetWidth(), GetHeight(), SRCCOPY); + NotifyImageChanged(); +} + +void ImageModel::RotateNTimes90Degrees(int iN) +{ + if (iN == 2) + { + CopyPrevious(); + StretchBlt(hDrawingDC, GetWidth() - 1, GetHeight() - 1, -GetWidth(), -GetHeight(), GetDC(), + 0, 0, GetWidth(), GetHeight(), SRCCOPY); + } + NotifyImageChanged(); +} Modified: trunk/reactos/base/applications/mspaint_new/history.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/history.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/history.h [iso-8859-1] Thu Jul 23 13:52:02 2015 @@ -11,6 +11,7 @@ private: void NotifyDimensionsChanged(); void NotifyImageChanged(); + HDC hDrawingDC; public: HBITMAP hBms[HISTORYSIZE]; private: @@ -37,4 +38,8 @@ int GetHeight(); void InvertColors(); void Clear(COLORREF color = 0x00ffffff); + HDC GetDC(); + void FlipHorizontally(); + void FlipVertically(); + void RotateNTimes90Degrees(int iN); }; Modified: trunk/reactos/base/applications/mspaint_new/imgarea.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/imgarea.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/imgarea.cpp [iso-8859-1] Thu Jul 23 13:52:02 2015 @@ -99,7 +99,7 @@ HDC hdc = GetDC(); int imgXRes = imageModel.GetWidth(); int imgYRes = imageModel.GetHeight(); - StretchBlt(hdc, 0, 0, imgXRes * toolsModel.GetZoom() / 1000, imgYRes * toolsModel.GetZoom() / 1000, hDrawingDC, 0, 0, imgXRes, + StretchBlt(hdc, 0, 0, imgXRes * toolsModel.GetZoom() / 1000, imgYRes * toolsModel.GetZoom() / 1000, imageModel.GetDC(), 0, 0, imgXRes, imgYRes, SRCCOPY); if (showGrid && (toolsModel.GetZoom() >= 4000)) { @@ -154,7 +154,7 @@ { SetCapture(); drawing = TRUE; - startPaintingL(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), + startPaintingL(imageModel.GetDC(), GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), paletteModel.GetFgColor(), paletteModel.GetBgColor()); } else @@ -174,7 +174,7 @@ { SetCapture(); drawing = TRUE; - startPaintingR(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), + startPaintingR(imageModel.GetDC(), GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), paletteModel.GetFgColor(), paletteModel.GetBgColor()); } else @@ -194,13 +194,13 @@ { ReleaseCapture(); drawing = FALSE; - endPaintingL(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), paletteModel.GetFgColor(), + endPaintingL(imageModel.GetDC(), GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), paletteModel.GetFgColor(), paletteModel.GetBgColor()); Invalidate(FALSE); if (toolsModel.GetActiveTool() == TOOL_COLOR) { COLORREF tempColor = - GetPixel(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom()); + GetPixel(imageModel.GetDC(), GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom()); if (tempColor != CLR_INVALID) paletteModel.SetFgColor(tempColor); } @@ -215,13 +215,13 @@ { ReleaseCapture(); drawing = FALSE; - endPaintingR(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), paletteModel.GetFgColor(), + endPaintingR(imageModel.GetDC(), GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), paletteModel.GetFgColor(), paletteModel.GetBgColor()); Invalidate(FALSE); if (toolsModel.GetActiveTool() == TOOL_COLOR) { COLORREF tempColor = - GetPixel(hDrawingDC, GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom()); + GetPixel(imageModel.GetDC(), GET_X_LPARAM(lParam) * 1000 / toolsModel.GetZoom(), GET_Y_LPARAM(lParam) * 1000 / toolsModel.GetZoom()); if (tempColor != CLR_INVALID) paletteModel.SetBgColor(tempColor); } @@ -300,7 +300,7 @@ } if ((wParam & MK_LBUTTON) != 0) { - whilePaintingL(hDrawingDC, xNow, yNow, paletteModel.GetFgColor(), paletteModel.GetBgColor()); + whilePaintingL(imageModel.GetDC(), xNow, yNow, paletteModel.GetFgColor(), paletteModel.GetBgColor()); Invalidate(FALSE); if ((toolsModel.GetActiveTool() >= TOOL_TEXT) || (toolsModel.GetActiveTool() == TOOL_RECTSEL) || (toolsModel.GetActiveTool() == TOOL_FREESEL)) { @@ -313,7 +313,7 @@ } if ((wParam & MK_RBUTTON) != 0) { - whilePaintingR(hDrawingDC, xNow, yNow, paletteModel.GetFgColor(), paletteModel.GetBgColor()); + whilePaintingR(imageModel.GetDC(), xNow, yNow, paletteModel.GetFgColor(), paletteModel.GetBgColor()); Invalidate(FALSE); if (toolsModel.GetActiveTool() >= TOOL_TEXT) { Modified: trunk/reactos/base/applications/mspaint_new/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] Thu Jul 23 13:52:02 2015 @@ -11,8 +11,6 @@ #include "precomp.h" /* FUNCTIONS ********************************************************/ - -HDC hDrawingDC; int widthSetInDlg; int heightSetInDlg; Modified: trunk/reactos/base/applications/mspaint_new/miniature.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/miniature.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/miniature.cpp [iso-8859-1] Thu Jul 23 13:52:02 2015 @@ -27,7 +27,7 @@ HDC hdc; miniature.GetClientRect(&mclient); hdc = miniature.GetDC(); - StretchBlt(hdc, 0, 0, mclient.right, mclient.bottom, hDrawingDC, 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), SRCCOPY); + StretchBlt(hdc, 0, 0, mclient.right, mclient.bottom, imageModel.GetDC(), 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), SRCCOPY); miniature.ReleaseDC(hdc); return 0; } Modified: trunk/reactos/base/applications/mspaint_new/selection.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/selection.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/selection.cpp [iso-8859-1] Thu Jul 23 13:52:02 2015 @@ -178,14 +178,14 @@ if (toolsModel.GetActiveTool() == TOOL_TEXT) { - selectionModel.DrawTextToolText(hDrawingDC, paletteModel.GetFgColor(), paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); + selectionModel.DrawTextToolText(imageModel.GetDC(), paletteModel.GetFgColor(), paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); } else { if (m_iAction != ACTION_MOVE) - selectionModel.DrawSelectionStretched(hDrawingDC); + selectionModel.DrawSelectionStretched(imageModel.GetDC()); else - selectionModel.DrawSelection(hDrawingDC, paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); + selectionModel.DrawSelection(imageModel.GetDC(), paletteModel.GetBgColor(), toolsModel.IsBackgroundTransparent()); } imageArea.InvalidateRect(NULL, FALSE); imageArea.SendMessage(WM_PAINT, 0, 0); Modified: trunk/reactos/base/applications/mspaint_new/winproc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/winproc.cpp [iso-8859-1] Thu Jul 23 13:52:02 2015 @@ -306,9 +306,9 @@ /* Deselect */ if ((toolsModel.GetActiveTool() == TOOL_RECTSEL) || (toolsModel.GetActiveTool() == TOOL_FREESEL)) { - startPaintingL(hDrawingDC, 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); - whilePaintingL(hDrawingDC, 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); - endPaintingL(hDrawingDC, 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); + startPaintingL(imageModel.GetDC(), 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); + whilePaintingL(imageModel.GetDC(), 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); + endPaintingL(imageModel.GetDC(), 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); selectionWindow.ShowWindow(SW_HIDE); } } @@ -443,14 +443,14 @@ SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELPARAM(TRUE, 0)); toolBoxContainer.SendMessage(WM_COMMAND, ID_RECTSEL); //TODO: do this properly - startPaintingL(hDrawingDC, 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); - whilePaintingL(hDrawingDC, imageModel.GetWidth(), imageModel.GetHeight(), paletteModel.GetFgColor(), paletteModel.GetBgColor()); - endPaintingL(hDrawingDC, imageModel.GetWidth(), imageModel.GetHeight(), paletteModel.GetFgColor(), paletteModel.GetBgColor()); + startPaintingL(imageModel.GetDC(), 0, 0, paletteModel.GetFgColor(), paletteModel.GetBgColor()); + whilePaintingL(imageModel.GetDC(), imageModel.GetWidth(), imageModel.GetHeight(), paletteModel.GetFgColor(), paletteModel.GetBgColor()); + endPaintingL(imageModel.GetDC(), imageModel.GetWidth(), imageModel.GetHeight(), paletteModel.GetFgColor(), paletteModel.GetBgColor()); break; } case IDM_EDITCOPYTO: if (GetSaveFileName(&ofn) != 0) - SaveDIBToFile(selectionModel.GetBitmap(), ofn.lpstrFile, hDrawingDC, NULL, NULL, fileHPPM, fileVPPM); + SaveDIBToFile(selectionModel.GetBitmap(), ofn.lpstrFile, imageModel.GetDC(), NULL, NULL, fileHPPM, fileVPPM); break; case IDM_EDITPASTEFROM: if (GetOpenFileName(&ofn) != 0) @@ -481,7 +481,7 @@ } case IDM_IMAGEDELETEIMAGE: imageModel.CopyPrevious(); - Rect(hDrawingDC, 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), paletteModel.GetBgColor(), paletteModel.GetBgColor(), 0, TRUE); + Rect(imageModel.GetDC(), 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), paletteModel.GetBgColor(), paletteModel.GetBgColor(), 0, TRUE); imageArea.Invalidate(FALSE); break; case IDM_IMAGEROTATEMIRROR: @@ -491,23 +491,13 @@ if (selectionWindow.IsWindowVisible()) selectionModel.FlipHorizontally(); else - { - imageModel.CopyPrevious(); - StretchBlt(hDrawingDC, imageModel.GetWidth() - 1, 0, -imageModel.GetWidth(), imageModel.GetHeight(), hDrawingDC, 0, 0, - imageModel.GetWidth(), imageModel.GetHeight(), SRCCOPY); - imageArea.Invalidate(FALSE); - } + imageModel.FlipHorizontally(); break; case 2: /* flip vertically */ if (selectionWindow.IsWindowVisible()) selectionModel.FlipVertically(); else - { - imageModel.CopyPrevious(); - StretchBlt(hDrawingDC, 0, imageModel.GetHeight() - 1, imageModel.GetWidth(), -imageModel.GetHeight(), hDrawingDC, 0, 0, - imageModel.GetWidth(), imageModel.GetHeight(), SRCCOPY); - imageArea.Invalidate(FALSE); - } + imageModel.FlipVertically(); break; case 3: /* rotate 90 degrees */ break; @@ -515,12 +505,7 @@ if (selectionWindow.IsWindowVisible()) selectionModel.RotateNTimes90Degrees(2); else - { - imageModel.CopyPrevious(); - StretchBlt(hDrawingDC, imageModel.GetWidth() - 1, imageModel.GetHeight() - 1, -imageModel.GetWidth(), -imageModel.GetHeight(), hDrawingDC, - 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), SRCCOPY); - imageArea.Invalidate(FALSE); - } + imageModel.RotateNTimes90Degrees(2); break; case 5: /* rotate 270 degrees */ break;

1 0

[bfreisen] 68565: [MSPAINT_NEW] - move bitmap and DC initialization to ImageModel - remove unused global variables - remove copy-pasta bug from SelectionModel::DrawSelection
by bfreisen＠svn.reactos.org 23 Jul '15

23 Jul '15

Author: bfreisen Date: Thu Jul 23 13:11:54 2015 New Revision: 68565 URL: http://svn.reactos.org/svn/reactos?rev=68565&view=rev Log: [MSPAINT_NEW] - move bitmap and DC initialization to ImageModel - remove unused global variables - remove copy-pasta bug from SelectionModel::DrawSelection Modified: trunk/reactos/base/applications/mspaint_new/globalvar.h trunk/reactos/base/applications/mspaint_new/history.cpp trunk/reactos/base/applications/mspaint_new/history.h trunk/reactos/base/applications/mspaint_new/main.cpp trunk/reactos/base/applications/mspaint_new/selectionmodel.cpp trunk/reactos/base/applications/mspaint_new/selectionmodel.h trunk/reactos/base/applications/mspaint_new/textedit.cpp Modified: trunk/reactos/base/applications/mspaint_new/globalvar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/globalvar.h [iso-8859-1] Thu Jul 23 13:11:54 2015 @@ -5,11 +5,6 @@ * PURPOSE: Declaring global variables for later initialization * PROGRAMMERS: Benedikt Freisen */ - -/* INCLUDES *********************************************************/ - -//#include <windows.h> -//#include "definitions.h" /* TYPES ************************************************************/ @@ -21,8 +16,6 @@ /* VARIABLES declared in main.c *************************************/ extern HDC hDrawingDC; -extern int *bmAddress; -extern BITMAPINFO bitmapinfo; extern int widthSetInDlg; extern int heightSetInDlg; @@ -42,7 +35,6 @@ class SelectionModel; extern SelectionModel selectionModel; -extern HWND hwndEditCtl; extern LOGFONT lfTextFont; extern HFONT hfontTextFont; extern LPTSTR textToolText; Modified: trunk/reactos/base/applications/mspaint_new/history.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] Thu Jul 23 13:11:54 2015 @@ -28,6 +28,18 @@ undoSteps = 0; redoSteps = 0; imageSaved = TRUE; + + // TODO: load dimensions from registry + int imgXRes = 400; + int imgYRes = 300; + + hDrawingDC = CreateCompatibleDC(NULL); + SelectObject(hDrawingDC, CreatePen(PS_SOLID, 0, paletteModel.GetFgColor())); + SelectObject(hDrawingDC, CreateSolidBrush(paletteModel.GetBgColor())); + + hBms[0] = CreateDIBWithProperties(imgXRes, imgYRes); + SelectObject(hDrawingDC, hBms[0]); + Rectangle(hDrawingDC, 0 - 1, 0 - 1, imgXRes + 1, imgYRes + 1); } void ImageModel::CopyPrevious() Modified: trunk/reactos/base/applications/mspaint_new/history.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/history.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/history.h [iso-8859-1] Thu Jul 23 13:11:54 2015 @@ -13,9 +13,11 @@ void NotifyImageChanged(); public: HBITMAP hBms[HISTORYSIZE]; +private: int currInd; int undoSteps; int redoSteps; +public: BOOL imageSaved; ImageModel(); Modified: trunk/reactos/base/applications/mspaint_new/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/main.cpp [iso-8859-1] Thu Jul 23 13:11:54 2015 @@ -13,18 +13,11 @@ /* FUNCTIONS ********************************************************/ HDC hDrawingDC; -int *bmAddress; -BITMAPINFO bitmapinfo; -int imgXRes = 400; -int imgYRes = 300; int widthSetInDlg; int heightSetInDlg; STRETCHSKEW stretchSkew; - -ImageModel imageModel; -BOOL askBeforeEnlarging = FALSE; // TODO: initialize from registry POINT start; POINT last; @@ -40,6 +33,9 @@ int textToolTextMaxLen = 0; PaletteModel paletteModel; + +ImageModel imageModel; +BOOL askBeforeEnlarging = FALSE; // TODO: initialize from registry HWND hStatusBar; CHOOSECOLOR choosecolor; @@ -100,7 +96,6 @@ TCHAR resstr[100]; HMENU menu; HANDLE haccel; - HDC hDC; TCHAR *c; TCHAR sfnFilename[1000]; @@ -198,20 +193,8 @@ selectionWindow.Create(scrlClientWindow.m_hWnd, selectionWindowPos, NULL, WS_CHILD | BS_OWNERDRAW); /* creating the window inside the scroll box, on which the image in hDrawingDC's bitmap is drawn */ - RECT imageAreaPos = {3, 3, 3 + imgXRes, 3 + imgYRes}; + RECT imageAreaPos = {3, 3, 3 + imageModel.GetWidth(), 3 + imageModel.GetHeight()}; imageArea.Create(scrlClientWindow.m_hWnd, imageAreaPos, NULL, WS_CHILD | WS_VISIBLE); - - hDC = imageArea.GetDC(); - hDrawingDC = CreateCompatibleDC(hDC); - selectionModel.SetDC(CreateCompatibleDC(hDC)); - imageArea.ReleaseDC(hDC); - SelectObject(hDrawingDC, CreatePen(PS_SOLID, 0, paletteModel.GetFgColor())); - SelectObject(hDrawingDC, CreateSolidBrush(paletteModel.GetBgColor())); - - //TODO: move to ImageModel - imageModel.hBms[0] = CreateDIBWithProperties(imgXRes, imgYRes); - SelectObject(hDrawingDC, imageModel.hBms[0]); - Rectangle(hDrawingDC, 0 - 1, 0 - 1, imgXRes + 1, imgYRes + 1); if (lpszArgument[0] != 0) { Modified: trunk/reactos/base/applications/mspaint_new/selectionmodel.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/selectionmodel.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/selectionmodel.cpp [iso-8859-1] Thu Jul 23 13:11:54 2015 @@ -16,11 +16,8 @@ { m_ptStack = NULL; m_iPtSP = 0; -} - -void SelectionModel::SetDC(HDC hDC) -{ - m_hDC = hDC; + + m_hDC = CreateCompatibleDC(NULL); } void SelectionModel::ResetPtStack() @@ -106,7 +103,7 @@ void SelectionModel::DrawBackgroundRect(HDC hDCImage, COLORREF crBg) { - Rect(hDCImage, m_rcSrc.left, m_rcSrc.top, m_rcSrc.right, m_rcSrc.bottom, crBg, crBg, 0, TRUE); + Rect(hDCImage, m_rcSrc.left, m_rcSrc.top, m_rcSrc.right, m_rcSrc.bottom, crBg, crBg, 0, 1); } extern BOOL @@ -114,8 +111,6 @@ void SelectionModel::DrawSelection(HDC hDCImage, COLORREF crBg, BOOL bBgTransparent) { - MaskBlt(hDCImage, m_rcSrc.left, m_rcSrc.top, RECT_WIDTH(m_rcSrc), RECT_HEIGHT(m_rcSrc), m_hDC, 0, - 0, m_hMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND)); if (!bBgTransparent) MaskBlt(hDCImage, m_rcDest.left, m_rcDest.top, RECT_WIDTH(m_rcDest), RECT_HEIGHT(m_rcDest), m_hDC, 0, 0, m_hMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND)); Modified: trunk/reactos/base/applications/mspaint_new/selectionmodel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/selectionmodel.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/selectionmodel.h [iso-8859-1] Thu Jul 23 13:11:54 2015 @@ -37,7 +37,6 @@ public: SelectionModel(); - void SetDC(HDC hDC); void ResetPtStack(); void PushToPtStack(LONG x, LONG y); void CalculateBoundingBoxAndContents(HDC hDCImage); Modified: trunk/reactos/base/applications/mspaint_new/textedit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/textedit.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/textedit.cpp [iso-8859-1] Thu Jul 23 13:11:54 2015 @@ -15,9 +15,9 @@ { /* creating the edit control within the editor window */ RECT editControlPos = {0, 0, 0 + 100, 0 + 100}; - hwndEditCtl = editControl.Create(_T("EDIT"), m_hWnd, editControlPos, NULL, - WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_AUTOHSCROLL | ES_AUTOVSCROLL, - WS_EX_CLIENTEDGE); + editControl.Create(_T("EDIT"), m_hWnd, editControlPos, NULL, + WS_CHILD | WS_VISIBLE | WS_BORDER | WS_HSCROLL | WS_VSCROLL | ES_MULTILINE | ES_NOHIDESEL | ES_AUTOHSCROLL | ES_AUTOVSCROLL, + WS_EX_CLIENTEDGE); return 0; }

1 0

[akhaldi] 68564: [README.WINE] Mark some modules as synced with Wine Staging 1.7.47. CORE-9924
by akhaldi＠svn.reactos.org 23 Jul '15

23 Jul '15

Author: akhaldi Date: Thu Jul 23 13:08:39 2015 New Revision: 68564 URL: http://svn.reactos.org/svn/reactos?rev=68564&view=rev Log: [README.WINE] Mark some modules as synced with Wine Staging 1.7.47. CORE-9924 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Jul 23 13:08:39 2015 @@ -15,9 +15,9 @@ The following build tools are shared with Wine. -reactos/tools/unicode # Synced to WineStaging-1.7.37 +reactos/tools/unicode # Synced to WineStaging-1.7.47 reactos/tools/widl # Synced to Wine-1.7.17 -reactos/tools/wpp # Synced to WineStaging-1.7.37 +reactos/tools/wpp # Synced to WineStaging-1.7.47 The following libraries are shared with Wine. @@ -31,10 +31,10 @@ reactos/dll/directx/wine/ddraw # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/devenum # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dinput # Synced to WineStaging-1.7.47 -reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.7.37 +reactos/dll/directx/wine/dinput8 # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dmusic # Synced to WineStaging-1.7.47 -reactos/dll/directx/wine/dplay # Synced to WineStaging-1.7.37 -reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.7.37 +reactos/dll/directx/wine/dplay # Synced to WineStaging-1.7.47 +reactos/dll/directx/wine/dplayx # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dsound # Synced to Wine-1.3.29 reactos/dll/directx/wine/dxdiagn # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/dxgi # Synced to WineStaging-1.7.47 @@ -43,158 +43,158 @@ reactos/dll/directx/wine/quartz # Synced to WineStaging-1.7.47 reactos/dll/directx/wine/wined3d # Synced to WineStaging-1.7.47 -reactos/dll/win32/activeds # Synced to WineStaging-1.7.37 -reactos/dll/win32/actxprxy # Synced to WineStaging-1.7.37 -reactos/dll/win32/advpack # Synced to WineStaging-1.7.37 +reactos/dll/win32/activeds # Synced to WineStaging-1.7.47 +reactos/dll/win32/actxprxy # Synced to WineStaging-1.7.47 +reactos/dll/win32/advpack # Synced to WineStaging-1.7.47 reactos/dll/win32/atl # Synced to WineStaging-1.7.47 reactos/dll/win32/atl80 # Synced to WineStaging-1.7.47 reactos/dll/win32/atl100 # Synced to WineStaging-1.7.47 reactos/dll/win32/avifil32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/bcrypt # Synced to WineStaging-1.7.37 +reactos/dll/win32/bcrypt # Synced to WineStaging-1.7.47 reactos/dll/win32/browseui # Out of sync -reactos/dll/win32/cabinet # Synced to WineStaging-1.7.37 -reactos/dll/win32/clusapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/comcat # Synced to WineStaging-1.7.37 +reactos/dll/win32/cabinet # Synced to WineStaging-1.7.47 +reactos/dll/win32/clusapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/comcat # Synced to WineStaging-1.7.47 reactos/dll/win32/comctl32 # Synced to WineStaging-1.7.47 reactos/dll/win32/comdlg32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/compstui # Synced to WineStaging-1.7.37 -reactos/dll/win32/credui # Synced to WineStaging-1.7.37 +reactos/dll/win32/compstui # Synced to WineStaging-1.7.47 +reactos/dll/win32/credui # Synced to WineStaging-1.7.47 reactos/dll/win32/crypt32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/cryptdlg # Synced to WineStaging-1.7.37 -reactos/dll/win32/cryptdll # Synced to WineStaging-1.7.37 -reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.37 -reactos/dll/win32/cryptui # Synced to WineStaging-1.7.37 +reactos/dll/win32/cryptdlg # Synced to WineStaging-1.7.47 +reactos/dll/win32/cryptdll # Synced to WineStaging-1.7.47 +reactos/dll/win32/cryptnet # Synced to WineStaging-1.7.47 +reactos/dll/win32/cryptui # Synced to WineStaging-1.7.47 reactos/dll/win32/dbghelp # Synced to WineStaging-1.7.47 -reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/dwmapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/faultrep # Synced to WineStaging-1.7.37 +reactos/dll/win32/dciman32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/dwmapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/faultrep # Synced to WineStaging-1.7.47 reactos/dll/win32/fltlib # Synced to WineStaging-1.7.47 reactos/dll/win32/fusion # Synced to WineStaging-1.7.47 reactos/dll/win32/gdiplus # Synced to WineStaging-1.7.47 reactos/dll/win32/hhctrl.ocx # Synced to WineStaging-1.7.47 -reactos/dll/win32/hlink # Synced to WineStaging-1.7.37 -reactos/dll/win32/hnetcfg # Synced to WineStaging-1.7.37 -reactos/dll/win32/httpapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/iccvid # Synced to WineStaging-1.7.37 +reactos/dll/win32/hlink # Synced to WineStaging-1.7.47 +reactos/dll/win32/hnetcfg # Synced to WineStaging-1.7.47 +reactos/dll/win32/httpapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/iccvid # Synced to WineStaging-1.7.47 reactos/dll/win32/icmp # Out of sync reactos/dll/win32/ieframe # Synced to WineStaging-1.7.47 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.7.47 -reactos/dll/win32/imagehlp # Synced to WineStaging-1.7.37 +reactos/dll/win32/imagehlp # Synced to WineStaging-1.7.47 reactos/dll/win32/imm32 # Synced to Wine-1.7.27 reactos/dll/win32/inetcomm # Synced to WineStaging-1.7.47 -reactos/dll/win32/inetmib1 # Synced to WineStaging-1.7.37 -reactos/dll/win32/initpki # Synced to WineStaging-1.7.37 +reactos/dll/win32/inetmib1 # Synced to WineStaging-1.7.47 +reactos/dll/win32/initpki # Synced to WineStaging-1.7.47 reactos/dll/win32/inseng # Synced to WineStaging-1.7.47 reactos/dll/win32/iphlpapi # Out of sync -reactos/dll/win32/itircl # Synced to WineStaging-1.7.37 -reactos/dll/win32/itss # Synced to WineStaging-1.7.37 +reactos/dll/win32/itircl # Synced to WineStaging-1.7.47 +reactos/dll/win32/itss # Synced to WineStaging-1.7.47 reactos/dll/win32/jscript # Synced to WineStaging-1.7.47 -reactos/dll/win32/jsproxy # Synced to WineStaging-1.7.37 -reactos/dll/win32/loadperf # Synced to WineStaging-1.7.37 -reactos/dll/win32/localspl # Synced to WineStaging-1.7.37 -reactos/dll/win32/localui # Synced to WineStaging-1.7.37 -reactos/dll/win32/lz32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mapi32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mcicda # Synced to WineStaging-1.7.37 +reactos/dll/win32/jsproxy # Synced to WineStaging-1.7.47 +reactos/dll/win32/loadperf # Synced to WineStaging-1.7.47 +reactos/dll/win32/localspl # Synced to WineStaging-1.7.47 +reactos/dll/win32/localui # Synced to WineStaging-1.7.47 +reactos/dll/win32/lz32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mapi32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mciavi32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mcicda # Synced to WineStaging-1.7.47 reactos/dll/win32/mciqtz32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/mciseq # Synced to WineStaging-1.7.37 -reactos/dll/win32/mciwave # Synced to WineStaging-1.7.37 -reactos/dll/win32/mgmtapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/mlang # Synced to WineStaging-1.7.37 +reactos/dll/win32/mciseq # Synced to WineStaging-1.7.47 +reactos/dll/win32/mciwave # Synced to WineStaging-1.7.47 +reactos/dll/win32/mgmtapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/mlang # Synced to WineStaging-1.7.47 reactos/dll/win32/mmdevapi # Synced to WineStaging-1.7.47 reactos/dll/win32/mpr # Synced to WineStaging-1.7.47 -reactos/dll/win32/mprapi # Synced to WineStaging-1.7.37 +reactos/dll/win32/mprapi # Synced to WineStaging-1.7.47 reactos/dll/win32/msacm32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/msacm32/msacm32.drv # Synced to WineStaging-1.7.37 +reactos/dll/win32/msacm32/msacm32.drv # Synced to WineStaging-1.7.47 reactos/dll/win32/msadp32.acm # Synced to WineStaging-1.7.47 -reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mscms # Synced to WineStaging-1.7.37 +reactos/dll/win32/mscat32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mscms # Synced to WineStaging-1.7.47 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to WineStaging-1.7.47 -reactos/dll/win32/msftedit # Synced to WineStaging-1.7.37 +reactos/dll/win32/msftedit # Synced to WineStaging-1.7.47 reactos/dll/win32/msg711.acm # Synced to WineStaging-1.7.47 reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.7.47 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.37 -reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.37 +reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.47 reactos/dll/win32/msi # Synced to WineStaging-1.7.47 -reactos/dll/win32/msimg32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/msimtf # Synced to WineStaging-1.7.37 -reactos/dll/win32/msisip # Synced to WineStaging-1.7.37 -reactos/dll/win32/msisys.ocx # Synced to WineStaging-1.7.37 -reactos/dll/win32/msnet32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mspatcha # Synced to WineStaging-1.7.37 -reactos/dll/win32/msrle32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mssign32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/mssip32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/msimg32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/msimtf # Synced to WineStaging-1.7.47 +reactos/dll/win32/msisip # Synced to WineStaging-1.7.47 +reactos/dll/win32/msisys.ocx # Synced to WineStaging-1.7.47 +reactos/dll/win32/msnet32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mspatcha # Synced to WineStaging-1.7.47 +reactos/dll/win32/msrle32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mssign32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/mssip32 # Synced to WineStaging-1.7.47 reactos/dll/win32/mstask # Synced to WineStaging-1.7.47 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync -reactos/dll/win32/msvfw32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/msvidc32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/msxml # Synced to WineStaging-1.7.37 -reactos/dll/win32/msxml2 # Synced to WineStaging-1.7.37 +reactos/dll/win32/msvfw32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/msvidc32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/msxml # Synced to WineStaging-1.7.47 +reactos/dll/win32/msxml2 # Synced to WineStaging-1.7.47 reactos/dll/win32/msxml3 # Synced to WineStaging-1.7.47 -reactos/dll/win32/msxml4 # Synced to WineStaging-1.7.37 -reactos/dll/win32/msxml6 # Synced to WineStaging-1.7.37 -reactos/dll/win32/nddeapi # Synced to WineStaging-1.7.37 +reactos/dll/win32/msxml4 # Synced to WineStaging-1.7.47 +reactos/dll/win32/msxml6 # Synced to WineStaging-1.7.47 +reactos/dll/win32/nddeapi # Synced to WineStaging-1.7.47 reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 -reactos/dll/win32/npptools # Synced to WineStaging-1.7.37 -reactos/dll/win32/ntdsapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/ntprint # Synced to WineStaging-1.7.37 -reactos/dll/win32/objsel # Synced to WineStaging-1.7.37 +reactos/dll/win32/npptools # Synced to WineStaging-1.7.47 +reactos/dll/win32/ntdsapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/ntprint # Synced to WineStaging-1.7.47 +reactos/dll/win32/objsel # Synced to WineStaging-1.7.47 reactos/dll/win32/odbc32 # Synced to WineStaging-1.7.37. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to WineStaging-1.7.47 reactos/dll/win32/ole32 # Synced to WineStaging-1.7.47 reactos/dll/win32/oleacc # Synced to WineStaging-1.7.47 reactos/dll/win32/oleaut32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/olecli32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/olecli32 # Synced to WineStaging-1.7.47 reactos/dll/win32/oledlg # Synced to WineStaging-1.7.47 -reactos/dll/win32/olepro32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/olesvr32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/olethk32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/pdh # Synced to WineStaging-1.7.37 -reactos/dll/win32/pidgen # Synced to WineStaging-1.7.37 +reactos/dll/win32/olepro32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/olesvr32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/olethk32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/pdh # Synced to WineStaging-1.7.47 +reactos/dll/win32/pidgen # Synced to WineStaging-1.7.47 reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 -reactos/dll/win32/printui # Synced to WineStaging-1.7.37 -reactos/dll/win32/propsys # Synced to WineStaging-1.7.37 -reactos/dll/win32/pstorec # Synced to WineStaging-1.7.37 +reactos/dll/win32/printui # Synced to WineStaging-1.7.47 +reactos/dll/win32/propsys # Synced to WineStaging-1.7.47 +reactos/dll/win32/pstorec # Synced to WineStaging-1.7.47 reactos/dll/win32/qmgr # Synced to WineStaging-1.7.47 reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.7.47 -reactos/dll/win32/query # Synced to WineStaging-1.7.37 +reactos/dll/win32/query # Synced to WineStaging-1.7.47 reactos/dll/win32/rasapi32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/resutils # Synced to WineStaging-1.7.37 +reactos/dll/win32/resutils # Synced to WineStaging-1.7.47 reactos/dll/win32/riched20 # Synced to WineStaging-1.7.47 -reactos/dll/win32/riched32 # Synced to WineStaging-1.7.37 +reactos/dll/win32/riched32 # Synced to WineStaging-1.7.47 reactos/dll/win32/rpcrt4 # Synced to Wine-1.7.17 -reactos/dll/win32/rsabase # Synced to WineStaging-1.7.37 +reactos/dll/win32/rsabase # Synced to WineStaging-1.7.47 reactos/dll/win32/rsaenh # Synced to WineStaging-1.7.47 -reactos/dll/win32/sccbase # Synced to WineStaging-1.7.37 -reactos/dll/win32/schannel # Synced to WineStaging-1.7.37 +reactos/dll/win32/sccbase # Synced to WineStaging-1.7.47 +reactos/dll/win32/schannel # Synced to WineStaging-1.7.47 reactos/dll/win32/scrrun # Synced to WineStaging-1.7.47 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) -reactos/dll/win32/sensapi # Synced to WineStaging-1.7.37 +reactos/dll/win32/sensapi # Synced to WineStaging-1.7.47 reactos/dll/win32/setupapi # Forked at Wine-20050524 -reactos/dll/win32/shdoclc # Synced to WineStaging-1.7.37 +reactos/dll/win32/shdoclc # Synced to WineStaging-1.7.47 reactos/dll/win32/shdocvw # Synced to WineStaging-1.7.47 reactos/dll/win32/shell32 # Forked at Wine-20071011 -reactos/dll/win32/shfolder # Synced to WineStaging-1.7.37 +reactos/dll/win32/shfolder # Synced to WineStaging-1.7.47 reactos/dll/win32/shlwapi # Synced to WineStaging-1.7.47 -reactos/dll/win32/slbcsp # Synced to WineStaging-1.7.37 -reactos/dll/win32/snmpapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/softpub # Synced to WineStaging-1.7.37 -reactos/dll/win32/spoolss # Synced to WineStaging-1.7.37 -reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.7.37 -reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.7.37 -reactos/dll/win32/sti # Synced to WineStaging-1.7.37 -reactos/dll/win32/sxs # Synced to WineStaging-1.7.37 -reactos/dll/win32/tapi32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/traffic # Synced to WineStaging-1.7.37 +reactos/dll/win32/slbcsp # Synced to WineStaging-1.7.47 +reactos/dll/win32/snmpapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/softpub # Synced to WineStaging-1.7.47 +reactos/dll/win32/spoolss # Synced to WineStaging-1.7.47 +reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.7.47 +reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.7.47 +reactos/dll/win32/sti # Synced to WineStaging-1.7.47 +reactos/dll/win32/sxs # Synced to WineStaging-1.7.47 +reactos/dll/win32/tapi32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/traffic # Synced to WineStaging-1.7.47 reactos/dll/win32/twain_32 # Synced to WineStaging-1.7.37 reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why do we need this?!) -reactos/dll/win32/updspapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/url # Synced to WineStaging-1.7.37 +reactos/dll/win32/updspapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/url # Synced to WineStaging-1.7.47 reactos/dll/win32/urlmon # Synced to WineStaging-1.7.47 reactos/dll/win32/usp10 # Synced to WineStaging-1.7.47 reactos/dll/win32/uxtheme # Forked @@ -203,7 +203,7 @@ reactos/dll/win32/wbemdisp # Synced to WineStaging-1.7.47 reactos/dll/win32/wbemprox # Synced to WineStaging-1.7.47 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.7.47 -reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.7.37 +reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.7.47 reactos/dll/win32/winemp3.acm # Synced to WineStaging-1.7.47 reactos/dll/win32/wing32 # Out of sync reactos/dll/win32/winhttp # Synced to WineStaging-1.7.47 @@ -212,46 +212,46 @@ reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/winscard # Synced to WineStaging-1.7.47 -reactos/dll/win32/wintrust # Synced to WineStaging-1.7.37 -reactos/dll/win32/wldap32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/wmi # Synced to WineStaging-1.7.37 -reactos/dll/win32/wmiutils # Synced to WineStaging-1.7.37 +reactos/dll/win32/wintrust # Synced to WineStaging-1.7.47 +reactos/dll/win32/wldap32 # Synced to WineStaging-1.7.47 +reactos/dll/win32/wmi # Synced to WineStaging-1.7.47 +reactos/dll/win32/wmiutils # Synced to WineStaging-1.7.47 reactos/dll/win32/wshom.ocx # Synced to WineStaging-1.7.47 reactos/dll/win32/wtsapi32 # Synced to WineStaging-1.7.47 -reactos/dll/win32/wuapi # Synced to WineStaging-1.7.37 -reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.7.37 -reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.7.37 -reactos/dll/win32/xinput1_3 # Synced to WineStaging-1.7.37 -reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.7.37 +reactos/dll/win32/wuapi # Synced to WineStaging-1.7.47 +reactos/dll/win32/xinput1_1 # Synced to WineStaging-1.7.47 +reactos/dll/win32/xinput1_2 # Synced to WineStaging-1.7.47 +reactos/dll/win32/xinput1_3 # Synced to WineStaging-1.7.47 +reactos/dll/win32/xinput9_1_0 # Synced to WineStaging-1.7.47 reactos/dll/win32/xmllite # Synced to WineStaging-1.7.47 reactos/dll/cpl/inetcpl # Synced to WineStaging-1.7.47 ReactOS shares the following programs with Winehq. -reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.7.37 +reactos/base/applications/cmdutils/cscript # Synced to WineStaging-1.7.47 reactos/base/applications/cmdutils/reg # Synced to WineStaging-1.7.37 -reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.7.37 -reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.7.37 +reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.7.47 +reactos/base/applications/cmdutils/wmic # Synced to WineStaging-1.7.47 reactos/base/applications/cmdutils/wscript # Synced to WineStaging-1.7.37 -reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.7.37 -reactos/base/applications/games/winmine # Synced to WineStaging-1.7.37 with our own resources. -reactos/base/applications/extrac32 # Synced to WineStaging-1.7.37 -reactos/base/applications/iexplore # Synced to WineStaging-1.7.37 +reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-1.7.47 +reactos/base/applications/games/winmine # Synced to WineStaging-1.7.47 with our own resources. +reactos/base/applications/extrac32 # Synced to WineStaging-1.7.47 +reactos/base/applications/iexplore # Synced to WineStaging-1.7.47 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to WineStaging-1.7.37 reactos/base/applications/wordpad # Synced to WineStaging-1.7.37 reactos/base/services/rpcss # Synced to WineStaging-1.7.37 -reactos/base/system/expand # Synced to WineStaging-1.7.37 -reactos/base/system/msiexec # Synced to WineStaging-1.7.37 +reactos/base/system/expand # Synced to WineStaging-1.7.47 +reactos/base/system/msiexec # Synced to WineStaging-1.7.47 reactos/modules/rosapps/winfile # Autosync In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files check Wine current sources first as it may already be fixed. -reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.7.37 +reactos/lib/3rdparty/strmbase # Synced to WineStaging-1.7.47 reactos/lib/rtl/actctx.c # Partly synced with WineStaging-1.7.37

1 0

[bfreisen] 68563: [MSPAINT_NEW] initialize ImageModel member variables
by bfreisen＠svn.reactos.org 23 Jul '15

23 Jul '15

Author: bfreisen Date: Thu Jul 23 07:48:32 2015 New Revision: 68563 URL: http://svn.reactos.org/svn/reactos?rev=68563&view=rev Log: [MSPAINT_NEW] initialize ImageModel member variables Modified: trunk/reactos/base/applications/mspaint_new/history.cpp trunk/reactos/base/applications/mspaint_new/history.h Modified: trunk/reactos/base/applications/mspaint_new/history.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/history.cpp [iso-8859-1] Thu Jul 23 07:48:32 2015 @@ -20,6 +20,14 @@ void ImageModel::NotifyImageChanged() { imageArea.SendMessage(WM_IMAGEMODELIMAGECHANGED); +} + +ImageModel::ImageModel() +{ + currInd = 0; + undoSteps = 0; + redoSteps = 0; + imageSaved = TRUE; } void ImageModel::CopyPrevious() Modified: trunk/reactos/base/applications/mspaint_new/history.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint_… ============================================================================== --- trunk/reactos/base/applications/mspaint_new/history.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint_new/history.h [iso-8859-1] Thu Jul 23 07:48:32 2015 @@ -18,6 +18,7 @@ int redoSteps; BOOL imageSaved; + ImageModel(); void CopyPrevious(void); void Undo(void); void Redo(void);

1 0

[ekohl] 68562: [MSGINA] Show shutdown dialog at the logon screen if the user wants to shutdown. Patch by Jared Smudde. CORE-9919 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 22 Jul '15

22 Jul '15

Author: ekohl Date: Wed Jul 22 20:28:51 2015 New Revision: 68562 URL: http://svn.reactos.org/svn/reactos?rev=68562&view=rev Log: [MSGINA] Show shutdown dialog at the logon screen if the user wants to shutdown. Patch by Jared Smudde. CORE-9919 #resolve #comment Thanks a lot! Modified: trunk/reactos/dll/win32/msgina/gui.c Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Wed Jul 22 20:28:51 2015 @@ -1161,7 +1161,8 @@ return TRUE; case IDC_SHUTDOWN: - EndDialog(hwndDlg, WLX_SAS_ACTION_SHUTDOWN); + if (OnShutDown(hwndDlg, pgContext) == IDOK) + EndDialog(hwndDlg, pgContext->nShutdownAction); return TRUE; } break;

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