Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 73863: [MSWSOCK] - Eliminate dead code in NSP_LookupServiceNextW. Patch by Víctor Martínez Calvo. CID 1400942 CORE-12806 #resolve
by tfaber＠svn.reactos.org 20 Feb '17

20 Feb '17

Author: tfaber Date: Mon Feb 20 19:32:12 2017 New Revision: 73863 URL: http://svn.reactos.org/svn/reactos?rev=73863&view=rev Log: [MSWSOCK] - Eliminate dead code in NSP_LookupServiceNextW. Patch by Víctor Martínez Calvo. CID 1400942 CORE-12806 #resolve Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt trunk/reactos/dll/win32/mswsock/nsplookup.c Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/CMakeLists.txt [iso-8859-1] Mon Feb 20 19:32:12 2017 @@ -16,6 +16,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/mswsock.def) set_module_type(mswsock win32dll UNICODE) -add_importlibs(mswsock ws2_32 advapi32 dnsapi msvcrt kernel32) +add_importlibs(mswsock ws2_32 advapi32 dnsapi msvcrt kernel32 ntdll) add_pch(mswsock precomp.h SOURCE) add_cd_file(TARGET mswsock DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/mswsock/nsplookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/nsplooku… ============================================================================== --- trunk/reactos/dll/win32/mswsock/nsplookup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mswsock/nsplookup.c [iso-8859-1] Mon Feb 20 19:32:12 2017 @@ -13,6 +13,9 @@ #include <winreg.h> #include "mswhelper.h" + +#define NDEBUG +#include <debug.h> #define NSP_CALLID_DNS 0x0001 #define NSP_CALLID_HOSTNAME 0x0002 @@ -891,18 +894,14 @@ if (result != ERROR_SUCCESS) goto End; } - else if (CallID == NSP_CALLID_SERVICEBYNAME) - { + else + { + ASSERT(CallID == NSP_CALLID_SERVICEBYNAME); result = NSP_GetServiceByNameHeapAllocW(data->hostnameW, &data->providerId, &hostinfo); if (result != ERROR_SUCCESS) goto End; - } - else - { - result = WSANO_RECOVERY; // Internal error! - goto End; } if (((LUP_RETURN_BLOB & data->dwControlFlags) != 0) ||

1 0

[tfaber] 73862: [USER32][UXTHEME] - Make API hooks type-safe. Fixes stack pointer corruption when calling ThemeGetScrollInfo. Powered by /RTC1
by tfaber＠svn.reactos.org 20 Feb '17

20 Feb '17

Author: tfaber Date: Mon Feb 20 17:31:50 2017 New Revision: 73862 URL: http://svn.reactos.org/svn/reactos?rev=73862&view=rev Log: [USER32][UXTHEME] - Make API hooks type-safe. Fixes stack pointer corruption when calling ThemeGetScrollInfo. Powered by /RTC1 Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c trunk/reactos/sdk/include/reactos/undocuser.h trunk/reactos/win32ss/user/user32/misc/usrapihk.c Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] Mon Feb 20 17:31:50 2017 @@ -269,7 +269,7 @@ return user32ApiHook.SetWindowRgn(hWnd, hRgn, bRedraw); } -BOOL ThemeGetScrollInfo(HWND hwnd, int fnBar, LPSCROLLINFO lpsi) +BOOL WINAPI ThemeGetScrollInfo(HWND hwnd, int fnBar, LPSCROLLINFO lpsi) { PWND_CONTEXT pwndContext; DWORD style; @@ -341,7 +341,7 @@ puah->DlgProcArray.Size = UAHOWP_MAX_SIZE; puah->SetWindowRgn = ThemeSetWindowRgn; - puah->GetScrollInfo = (FARPROC)ThemeGetScrollInfo; + puah->GetScrollInfo = ThemeGetScrollInfo; UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCPAINT); UAH_HOOK_MESSAGE(puah->DefWndProcArray, WM_NCACTIVATE); Modified: trunk/reactos/sdk/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/undocu… ============================================================================== --- trunk/reactos/sdk/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/undocuser.h [iso-8859-1] Mon Feb 20 17:31:50 2017 @@ -204,6 +204,18 @@ typedef LRESULT(CALLBACK *WNDPROC_OWP)(HWND,UINT,WPARAM,LPARAM,ULONG_PTR,PDWORD); typedef int (WINAPI *SETWINDOWRGN)(HWND hWnd, HRGN hRgn, BOOL bRedraw); +typedef BOOL (WINAPI *GETSCROLLINFO)(HWND,INT,LPSCROLLINFO); +typedef INT (WINAPI *SETSCROLLINFO)(HWND,int,LPCSCROLLINFO,BOOL); +typedef BOOL (WINAPI *ENABLESCROLLBAR)(HWND,UINT,UINT); +typedef BOOL (WINAPI *ADJUSTWINDOWRECTEX)(LPRECT,DWORD,BOOL,DWORD); +typedef int (WINAPI *GETSYSTEMMETRICS)(int); +typedef BOOL (WINAPI *SYSTEMPARAMETERSINFOA)(UINT,UINT,PVOID,UINT); +typedef BOOL (WINAPI *SYSTEMPARAMETERSINFOW)(UINT,UINT,PVOID,UINT); +typedef BOOL (__fastcall *FORCERESETUSERAPIHOOK)(HINSTANCE); +typedef BOOL (WINAPI *DRAWFRAMECONTROL)(HDC,LPRECT,UINT,UINT); +typedef BOOL (WINAPI *DRAWCAPTION)(HWND,HDC,LPCRECT,UINT); +typedef BOOL (WINAPI *MDIREDRAWFRAME)(HWND,DWORD); +typedef DWORD (WINAPI *GETREALWINDOWOWNER)(HWND); typedef struct _UAHOWP { @@ -221,10 +233,10 @@ WNDPROC DefWindowProcA; WNDPROC DefWindowProcW; UAHOWP DefWndProcArray; - FARPROC GetScrollInfo; - FARPROC SetScrollInfo; - FARPROC EnableScrollBar; - FARPROC AdjustWindowRectEx; + GETSCROLLINFO GetScrollInfo; + SETSCROLLINFO SetScrollInfo; + ENABLESCROLLBAR EnableScrollBar; + ADJUSTWINDOWRECTEX AdjustWindowRectEx; SETWINDOWRGN SetWindowRgn; WNDPROC_OWP PreWndProc; WNDPROC_OWP PostWndProc; @@ -232,14 +244,14 @@ WNDPROC_OWP PreDefDlgProc; WNDPROC_OWP PostDefDlgProc; UAHOWP DlgProcArray; - FARPROC GetSystemMetrics; - FARPROC SystemParametersInfoA; - FARPROC SystemParametersInfoW; - FARPROC ForceResetUserApiHook; - FARPROC DrawFrameControl; - FARPROC DrawCaption; - FARPROC MDIRedrawFrame; - FARPROC GetRealWindowOwner; + GETSYSTEMMETRICS GetSystemMetrics; + SYSTEMPARAMETERSINFOA SystemParametersInfoA; + SYSTEMPARAMETERSINFOW SystemParametersInfoW; + FORCERESETUSERAPIHOOK ForceResetUserApiHook; + DRAWFRAMECONTROL DrawFrameControl; + DRAWCAPTION DrawCaption; + MDIREDRAWFRAME MDIRedrawFrame; + GETREALWINDOWOWNER GetRealWindowOwner; } USERAPIHOOK, *PUSERAPIHOOK; typedef enum _UAPIHK Modified: trunk/reactos/win32ss/user/user32/misc/usrapihk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/u… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/usrapihk.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/usrapihk.c [iso-8859-1] Mon Feb 20 17:31:50 2017 @@ -28,7 +28,7 @@ BOOL WINAPI RealSystemParametersInfoA(UINT,UINT,PVOID,UINT); BOOL WINAPI RealSystemParametersInfoW(UINT,UINT,PVOID,UINT); DWORD WINAPI GetRealWindowOwner(HWND); -LRESULT WINAPI RealUserDrawCaption(HWND hWnd, HDC hDC, LPCRECT lpRc, UINT uFlags); +BOOL WINAPI RealUserDrawCaption(HWND hWnd, HDC hDC, LPCRECT lpRc, UINT uFlags); /* GLOBALS *******************************************************************/ @@ -137,10 +137,10 @@ puah->DefWindowProcW = RealDefWindowProcW; puah->DefWndProcArray.MsgBitArray = NULL; puah->DefWndProcArray.Size = 0; - puah->GetScrollInfo = (FARPROC)RealGetScrollInfo; - puah->SetScrollInfo = (FARPROC)RealSetScrollInfo; - puah->EnableScrollBar = (FARPROC)NtUserEnableScrollBar; - puah->AdjustWindowRectEx = (FARPROC)RealAdjustWindowRectEx; + puah->GetScrollInfo = RealGetScrollInfo; + puah->SetScrollInfo = RealSetScrollInfo; + puah->EnableScrollBar = NtUserEnableScrollBar; + puah->AdjustWindowRectEx = RealAdjustWindowRectEx; puah->SetWindowRgn = NtUserSetWindowRgn; puah->PreWndProc = DefaultOWP; puah->PostWndProc = DefaultOWP; @@ -150,14 +150,14 @@ puah->PostDefDlgProc = DefaultOWP; puah->DlgProcArray.MsgBitArray = NULL; puah->DlgProcArray.Size = 0; - puah->GetSystemMetrics = (FARPROC)RealGetSystemMetrics; - puah->SystemParametersInfoA = (FARPROC)RealSystemParametersInfoA; - puah->SystemParametersInfoW = (FARPROC)RealSystemParametersInfoW; - puah->ForceResetUserApiHook = (FARPROC)ForceResetUserApiHook; - puah->DrawFrameControl = (FARPROC)RealDrawFrameControl; - puah->DrawCaption = (FARPROC)RealUserDrawCaption; - puah->MDIRedrawFrame = (FARPROC)RealMDIRedrawFrame; - puah->GetRealWindowOwner = (FARPROC)GetRealWindowOwner; + puah->GetSystemMetrics = RealGetSystemMetrics; + puah->SystemParametersInfoA = RealSystemParametersInfoA; + puah->SystemParametersInfoW = RealSystemParametersInfoW; + puah->ForceResetUserApiHook = ForceResetUserApiHook; + puah->DrawFrameControl = RealDrawFrameControl; + puah->DrawCaption = RealUserDrawCaption; + puah->MDIRedrawFrame = RealMDIRedrawFrame; + puah->GetRealWindowOwner = GetRealWindowOwner; } BOOL @@ -262,7 +262,7 @@ RtlEnterCriticalSection(&gcsUserApiHook); if (!pfn(uahLoadInit,&uah) || // Swap data, User32 to and Uxtheme from! - uah.ForceResetUserApiHook != (FARPROC)ForceResetUserApiHook || + uah.ForceResetUserApiHook != ForceResetUserApiHook || uah.size <= 0 ) { RtlLeaveCriticalSection(&gcsUserApiHook); @@ -347,10 +347,10 @@ RealDefWindowProcA, RealDefWindowProcW, {NULL, 0}, - (FARPROC)RealGetScrollInfo, - (FARPROC)RealSetScrollInfo, - (FARPROC)NtUserEnableScrollBar, - (FARPROC)RealAdjustWindowRectEx, + RealGetScrollInfo, + RealSetScrollInfo, + NtUserEnableScrollBar, + RealAdjustWindowRectEx, NtUserSetWindowRgn, DefaultOWP, DefaultOWP, @@ -358,14 +358,14 @@ DefaultOWP, DefaultOWP, {NULL, 0}, - (FARPROC)RealGetSystemMetrics, - (FARPROC)RealSystemParametersInfoA, - (FARPROC)RealSystemParametersInfoW, - (FARPROC)ForceResetUserApiHook, - (FARPROC)RealDrawFrameControl, - (FARPROC)NtUserDrawCaption, - (FARPROC)RealMDIRedrawFrame, - (FARPROC)GetRealWindowOwner, + RealGetSystemMetrics, + RealSystemParametersInfoA, + RealSystemParametersInfoW, + ForceResetUserApiHook, + RealDrawFrameControl, + NtUserDrawCaption, + RealMDIRedrawFrame, + GetRealWindowOwner, }; /* FUNCTIONS *****************************************************************/

1 0

[tfaber] 73861: [WS2_32] - Re-apply null termination fix in GetProtoGetNextEnt, which was lost in ws2_32_new work. CID 716700 CORE-11218
by tfaber＠svn.reactos.org 20 Feb '17

20 Feb '17

Author: tfaber Date: Mon Feb 20 16:33:44 2017 New Revision: 73861 URL: http://svn.reactos.org/svn/reactos?rev=73861&view=rev Log: [WS2_32] - Re-apply null termination fix in GetProtoGetNextEnt, which was lost in ws2_32_new work. CID 716700 CORE-11218 Modified: trunk/reactos/dll/win32/ws2_32/src/getproto.c Modified: trunk/reactos/dll/win32/ws2_32/src/getproto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/getpr… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/getproto.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/getproto.c [iso-8859-1] Mon Feb 20 16:33:44 2017 @@ -145,12 +145,13 @@ /* Read 512 bytes */ if (!ReadFile(DbHandle, Buffer->LineBuffer, - 512, + sizeof(Buffer->LineBuffer) - 1, &Read, NULL)) return NULL; /* Find out where the line ends */ p1 = Buffer->LineBuffer; + Buffer->LineBuffer[Read] = ANSI_NULL; p = strchr(Buffer->LineBuffer, '\n'); /* Bail out if the file is parsed */ @@ -243,7 +244,7 @@ PWSTHREAD Thread; INT ErrorCode; PPROTOENT Protoent; - PVOID GetProtoBuffer; + PVOID GetProtoBuffer; HANDLE DbHandle; DPRINT("getprotobynumber: %lx\n", number); @@ -307,7 +308,7 @@ PWSTHREAD Thread; INT ErrorCode; PPROTOENT Protoent; - PVOID GetProtoBuffer; + PVOID GetProtoBuffer; HANDLE DbHandle; DPRINT("getprotobyname: %s\n", name);

1 0

[tfaber] 73860: [BROWSEUI] - Correctly pass the buffer size to RegQueryValueW in CAutoComplete::Init. Patch by Víctor Martínez Calvo. CID 1401255 CORE-12795 #resolve
by tfaber＠svn.reactos.org 20 Feb '17

20 Feb '17

Author: tfaber Date: Mon Feb 20 16:07:05 2017 New Revision: 73860 URL: http://svn.reactos.org/svn/reactos?rev=73860&view=rev Log: [BROWSEUI] - Correctly pass the buffer size to RegQueryValueW in CAutoComplete::Init. Patch by Víctor Martínez Calvo. CID 1401255 CORE-12795 #resolve Modified: trunk/reactos/dll/win32/browseui/CAutoComplete.cpp Modified: trunk/reactos/dll/win32/browseui/CAutoComplete.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/CAutoCo… ============================================================================== --- trunk/reactos/dll/win32/browseui/CAutoComplete.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/CAutoComplete.cpp [iso-8859-1] Mon Feb 20 16:07:05 2017 @@ -184,6 +184,7 @@ if (res == ERROR_SUCCESS) { + len = sizeof(result); res = RegQueryValueW(hKey, value, result, &len); if (res == ERROR_SUCCESS) {

1 0

[hbelusca] 73859: [FREELDR]: Update the FreeLdr's startup notes.
by hbelusca＠svn.reactos.org 20 Feb '17

20 Feb '17

Author: hbelusca Date: Mon Feb 20 15:45:01 2017 New Revision: 73859 URL: http://svn.reactos.org/svn/reactos?rev=73859&view=rev Log: [FREELDR]: Update the FreeLdr's startup notes. Modified: trunk/reactos/boot/freeldr/notes.txt Modified: trunk/reactos/boot/freeldr/notes.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/notes.txt?rev… ============================================================================== --- trunk/reactos/boot/freeldr/notes.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/notes.txt [iso-8859-1] Mon Feb 20 15:45:01 2017 @@ -1,6 +1,8 @@ -FreeLoader notes +FreeLoader notes (for x86 PC architecture only!) +================================================ -Memory layout: +Memory layout (WARNING: may be out-of-date) +-~-~-~-~-~-~- 0000:0000 - 0000:0FFF: Interrupt vector table & BIOS data 0000:1000 - 0000:6FFF: Real mode stack area @@ -14,44 +16,45 @@ FreeLoader Boot Process +-~-~-~-~-~-~-~-~-~-~-~- FAT 12/16/32 Boot Sector - The BIOS loads the boot sector at 0000:7C00. The FAT32 boot sector -relocates itself higher in memory at 9000:0000 and loads it's extra sector -at 9000:0200 and then looks for freeldr.sys on the file system. Once found -it loads freeldr.sys to 0000:7E00 and then jumps to it's entry point at -0000:8000. The FAT12/16 boot sector does no relocation, it just searches for -the freeldr.sys and loads the first 512 bytes to 0000:7E00. This extra code -enables it to fully navigate the file allocation table. Then it loads -freeldr.sys to 0000:7E00 and jumps to it's entry point at 0000:8000. Before -FreeLoader gets control the boot sector saves the screen contents to a buffer -at 9000:8000 and the cursor x & y position to bytes at 9000:8FA0 & 9000:8FA1 -respectively. + The BIOS loads the boot sector at 0000:7C00. The FAT12/16 boot sector just +searches for FREELDR.SYS and loads its first 512 bytes to 0000:F800. This extra +helper code enables it to fully navigate the file allocation table. The boot +sector then jumps to FREELDR.SYS entry point at 0000:F803 and the helper code +takes the relay. It finishes loading the FREELDR.SYS image and finally jumps to +its final entry point at 0000:FA00. + The FAT32 boot sector loads its extra sector at 0000:7E00 and looks for +FREELDR.SYS on the file system. Once found it loads FREELDR.SYS to 0000:F800 +and jumps to its entry point at the same address. This allows it to jump over +the FAT12/16 extra helper code situated at this address, and go to the final +entry point at 0000:FA00. ISO-9660 (CD-ROM) Boot Sector - The BIOS loads the boot sector (2048 bytes) at 0000:7C00. First, the + The BIOS loads the boot sector (2048 bytes) at 0000:7C00. First, the boot sector relocates itself to 0000:7000 (up to 0000:7800). Then it looks -for the LOADER directory and makes it the current directory. Next it looks for -FREELDR.SYS and loads it at 0000:8000. Finally it restores the boot drive -number in the DL register and jumps to FreeLoader's entry point at 0000:8000. +for the LOADER directory and makes it the current directory. Next it looks +for FREELDR.SYS and loads it at 0000:F800. Finally it restores the boot drive +number in the DL register and jumps to FreeLoader's entry point at 0000:F800. Multiboot - Freeldr contains a multiboot signature and can itself be loaded by a -multiboot-compliant loader (like Grub). The multiboot header instructs the -primary loader to load freeldr.sys at 0x200000 (needs to be above 1MB). Control -is then transferred to the multiboot entry point. Since freeldr.sys expects to -be loaded at a base address 0000:8000 it will start by relocating itself there + Freeldr contains a multiboot signature and can itself be loaded by a +multiboot-compliant loader (like GRUB). The multiboot header instructs the +primary loader to load FREELDR.SYS at 0x200000 (needs to be above 1MB). Control +is then transferred to the multiboot entry point. Since FREELDR.SYS expects to +be loaded at a base address 0000:F800 it will start by relocating itself there and then jumping to the relocated copy. +FreeLoader Initialization +-~-~-~-~-~-~-~-~-~-~-~-~- -FreeLoader Initialization - - When FreeLoader gets control it saves the boot drive, passed to it in -the DL register, and sets up the stack, enables protected mode, and calls -BootMain(). + When FreeLoader gets control it saves the boot drive and partition, passed +to it respectively in the DL and DH registers, and sets up the stack, enables +protected mode, and calls BootMain().

1 0

[khornicek] 73858: [EVENTLOG] - Silence some debug prints. This commit bears the "Hermès' seal of approval".
by khornicek＠svn.reactos.org 20 Feb '17

20 Feb '17

Author: khornicek Date: Mon Feb 20 14:45:03 2017 New Revision: 73858 URL: http://svn.reactos.org/svn/reactos?rev=73858&view=rev Log: [EVENTLOG] - Silence some debug prints. This commit bears the "Hermès' seal of approval". Modified: trunk/reactos/base/services/eventlog/file.c Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Mon Feb 20 14:45:03 2017 @@ -332,7 +332,7 @@ NULL, NULL); - DPRINT1("Going to create or open %wZ\n", FileName); + DPRINT("Going to create or open %wZ\n", FileName); Status = NtCreateFile(&pLogFile->FileHandle, Backup ? (GENERIC_READ | SYNCHRONIZE) : (GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE), @@ -352,7 +352,7 @@ } CreateNew = (IoStatusBlock.Information == FILE_CREATED); - DPRINT1("%wZ %s successfully\n", FileName, CreateNew ? "created" : "opened"); + DPRINT("%wZ %s successfully\n", FileName, CreateNew ? "created" : "opened"); /* * Retrieve the log file size and check whether the file is not too large; @@ -504,7 +504,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - DPRINT1("LogfBackupFile(%p, %wZ)\n", LogFile, BackupFileName); + DPRINT("LogfBackupFile(%p, %wZ)\n", LogFile, BackupFileName); /* Lock the log file shared */ RtlAcquireResourceShared(&LogFile->Lock, TRUE);

1 0

[tfaber] 73857: [WINPRINT] - Avoid uninitialized hPrintMonitor in PrintRawJob failure case. Patch by Víctor Martínez Calvo CORE-12792 #resolve
by tfaber＠svn.reactos.org 20 Feb '17

20 Feb '17

Author: tfaber Date: Mon Feb 20 12:00:13 2017 New Revision: 73857 URL: http://svn.reactos.org/svn/reactos?rev=73857&view=rev Log: [WINPRINT] - Avoid uninitialized hPrintMonitor in PrintRawJob failure case. Patch by Víctor Martínez Calvo CORE-12792 #resolve Modified: trunk/reactos/win32ss/printing/processors/winprint/raw.c Modified: trunk/reactos/win32ss/printing/processors/winprint/raw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/processor… ============================================================================== --- trunk/reactos/win32ss/printing/processors/winprint/raw.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/processors/winprint/raw.c [iso-8859-1] Mon Feb 20 12:00:13 2017 @@ -31,7 +31,7 @@ DWORD cbWritten; DWORD dwErrorCode; HANDLE hPrintJob; - HANDLE hPrintMonitor; + HANDLE hPrintMonitor = NULL; PBYTE pBuffer = NULL; // Open the spooled job to read from it.

1 0

[tfaber] 73856: [KS] - Avoid leaking AllocatorFraming in KsCreateDefaultAllocatorEx. Patch by Sebastian Gasiorek CORE-12797 #resolve
by tfaber＠svn.reactos.org 20 Feb '17

20 Feb '17

Author: tfaber Date: Mon Feb 20 11:35:24 2017 New Revision: 73856 URL: http://svn.reactos.org/svn/reactos?rev=73856&view=rev Log: [KS] - Avoid leaking AllocatorFraming in KsCreateDefaultAllocatorEx. Patch by Sebastian Gasiorek CORE-12797 #resolve Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c Modified: trunk/reactos/drivers/ksfilter/ks/allocators.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/alloca… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/allocators.c [iso-8859-1] Mon Feb 20 11:35:24 2017 @@ -593,20 +593,27 @@ /* check the valid file alignment */ if (AllocatorFraming->FileAlignment > (PAGE_SIZE-1)) + { + FreeItem(AllocatorFraming); return STATUS_INVALID_PARAMETER; + } /* allocate allocator struct */ Allocator = AllocateItem(NonPagedPool, sizeof(ALLOCATOR)); if (!Allocator) + { + FreeItem(AllocatorFraming); return STATUS_INSUFFICIENT_RESOURCES; + } /* allocate object header */ Status = KsAllocateObjectHeader((KSOBJECT_HEADER*)&Allocator->Header, 0, NULL, Irp, &DispatchTable); if (!NT_SUCCESS(Status)) { - FreeItem(Allocator); - return Status; + FreeItem(AllocatorFraming); + FreeItem(Allocator); + return Status; } /* set allocator type in object header */ @@ -652,6 +659,7 @@ /* backup allocator framing */ RtlMoveMemory(&Allocator->Status.Framing, AllocatorFraming, sizeof(KSALLOCATOR_FRAMING)); + FreeItem(AllocatorFraming); return Status; }

1 0

[khornicek] 73855: [WIN32K] - Don't try to delete the pattern bitmap in UserInitialize. - Set the correct owner before deleting the update region in co_UserFreeWindow. - Fixes some "Trying to delet...
by khornicek＠svn.reactos.org 20 Feb '17

20 Feb '17

Author: khornicek Date: Mon Feb 20 10:10:37 2017 New Revision: 73855 URL: http://svn.reactos.org/svn/reactos?rev=73855&view=rev Log: [WIN32K] - Don't try to delete the pattern bitmap in UserInitialize. - Set the correct owner before deleting the update region in co_UserFreeWindow. - Fixes some "Trying to delete global object" debug prints. Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c trunk/reactos/win32ss/user/ntuser/window.c Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Mon Feb 20 10:10:37 2017 @@ -154,9 +154,8 @@ if (hPattern55AABitmap == NULL) return STATUS_INSUFFICIENT_RESOURCES; - //NT_VERIFY(GreSetBitmapOwner(hPattern55AABitmap, GDI_OBJ_HMGR_PUBLIC)); gpsi->hbrGray = IntGdiCreatePatternBrush(hPattern55AABitmap); - GreDeleteObject(hPattern55AABitmap); + if (gpsi->hbrGray == NULL) return STATUS_INSUFFICIENT_RESOURCES; } 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] Mon Feb 20 10:10:37 2017 @@ -602,6 +602,7 @@ MsqDecPaintCountQueue(Window->head.pti); if (Window->hrgnUpdate > HRGN_WINDOW && GreIsHandleValid(Window->hrgnUpdate)) { + IntGdiSetRegionOwner(Window->hrgnUpdate, GDI_OBJ_HMGR_POWNED); GreDeleteObject(Window->hrgnUpdate); } Window->hrgnUpdate = NULL;

1 0

[gadamopoulos] 73854: [blackshade.msstyles] -Add a skeleton for a theme based on a mockup by David Quintana
by gadamopoulos＠svn.reactos.org 19 Feb '17

19 Feb '17

Author: gadamopoulos Date: Sun Feb 19 20:40:45 2017 New Revision: 73854 URL: http://svn.reactos.org/svn/reactos?rev=73854&view=rev Log: [blackshade.msstyles] -Add a skeleton for a theme based on a mockup by David Quintana Added: trunk/reactos/media/themes/blackshade.msstyles/ trunk/reactos/media/themes/blackshade.msstyles/BlackShade.png (with props) trunk/reactos/media/themes/blackshade.msstyles/CMakeLists.txt (with props) trunk/reactos/media/themes/blackshade.msstyles/bitmaps/ trunk/reactos/media/themes/blackshade.msstyles/bitmaps/dummy.bmp (with props) trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc (with props) trunk/reactos/media/themes/blackshade.msstyles/lang/ trunk/reactos/media/themes/blackshade.msstyles/lang/en-US.rc (with props) trunk/reactos/media/themes/blackshade.msstyles/textfiles/ - copied from r73835, trunk/reactos/media/themes/lautus.msstyles/textfiles/ Modified: trunk/reactos/media/themes/CMakeLists.txt Modified: trunk/reactos/media/themes/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/CMakeLists.tx… ============================================================================== --- trunk/reactos/media/themes/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/themes/CMakeLists.txt [iso-8859-1] Sun Feb 19 20:40:45 2017 @@ -1,2 +1,3 @@ +add_subdirectory(blackshade.msstyles) add_subdirectory(lautus.msstyles) Added: trunk/reactos/media/themes/blackshade.msstyles/BlackShade.png URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/blackshade.ms… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/themes/blackshade.msstyles/BlackShade.png ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/themes/blackshade.msstyles/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/blackshade.ms… ============================================================================== --- trunk/reactos/media/themes/blackshade.msstyles/CMakeLists.txt (added) +++ trunk/reactos/media/themes/blackshade.msstyles/CMakeLists.txt [iso-8859-1] Sun Feb 19 20:40:45 2017 @@ -0,0 +1,23 @@ + +list(APPEND TEXTFILES + textfiles/ExtraLargeNormal.INI + textfiles/LargeFontsNormal.INI + textfiles/NormalNormal.INI) + +file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/textfiles) +foreach(_file ${TEXTFILES}) + get_filename_component(_file_name ${_file} NAME_WE) + string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} _converted_file "${_file}") + string(REPLACE ${_file_name} "${_file_name}_utf16" _converted_file ${_converted_file}) + set(_file ${CMAKE_CURRENT_SOURCE_DIR}/${_file}) + set(_converted_file ${CMAKE_CURRENT_BINARY_DIR}/${_converted_file}) + add_custom_command(OUTPUT ${_converted_file} + COMMAND native-utf16le ${_file} ${_converted_file} + DEPENDS native-utf16le ${_file}) + list(APPEND _converted_files ${_converted_file}) +endforeach() + +set_source_files_properties(blackshade.rc PROPERTIES OBJECT_DEPENDS "${_converted_files}") +add_library(blackshade.msstyles SHARED blackshade.rc) +set_module_type(blackshade.msstyles module) +set_target_properties(blackshade.msstyles PROPERTIES SUFFIX "") Propchange: trunk/reactos/media/themes/blackshade.msstyles/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/media/themes/blackshade.msstyles/bitmaps/dummy.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/blackshade.ms… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/themes/blackshade.msstyles/bitmaps/dummy.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/blackshade.ms… ============================================================================== --- trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc (added) +++ trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc [iso-8859-1] Sun Feb 19 20:40:45 2017 @@ -0,0 +1,187 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Black Shade Theme\0" +#define REACTOS_STR_INTERNAL_NAME "Black Shade\0" +#define REACTOS_STR_ORIGINAL_FILENAME "blackshade.msstyles\0" +#include <reactos/version.rc> + +#include <windows.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1 COLORNAMES {L"Normal Color\0\0"} +COMBO COMBODATA {0x0003,0x0003, 0x0000, 0x0003, 0x0006, 0x0001,0x0004,0x0007,0x0002,0x0005,0x08,} +1 PACKTHEM_VERSION {0x03,} +1 FILERESNAMES {L"NORMALNORMAL_INI\0LARGEFONTSNORMAL_INI\0EXTRALARGENORMAL_INI\0\0"} +1 SIZENAMES {L"Normal Size\0Large Fonts\0Extra Large Fonts\0\0"} +1 MINDEPTH {0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x0000,} + +EXTRALARGENORMAL_INI TEXTFILE "textfiles/ExtraLargeNormal_utf16.INI" +LARGEFONTSNORMAL_INI TEXTFILE "textfiles/LargeFontsNormal_utf16.INI" +NORMALNORMAL_INI TEXTFILE "textfiles/NormalNormal_utf16.INI" +THEMES_INI TEXTFILE {L"\r\n"} + +NORMAL_BALLOONCLOSE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_BALLOONCLOSE.bmp" +NORMAL_BUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_BUTTON.bmp" +NORMAL_CHECKBOX13_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_CHECKBOX13.bmp" +NORMAL_CHECKBOX16_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_CHECKBOX16.bmp" +NORMAL_CHECKBOX25_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_CHECKBOX25.bmp" +NORMAL_CHEVRON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_CHEVRON.bmp" +NORMAL_CLOSEBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_CLOSEBUTTON.bmp" +NORMAL_CLOSEGLYPH9_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_CLOSEGLYPH9.bmp" +NORMAL_COMBOBUTTONGLYPH_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_COMBOBUTTONGLYPH.bmp" +NORMAL_COMBOBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_COMBOBUTTON.bmp" +NORMAL_EXPLORERBARHEADERBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_EXPLORERBARHEADERBACKGROUND.bmp" +NORMAL_EXPLORERBARHEADERCLOSE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_EXPLORERBARHEADERCLOSE.bmp" +NORMAL_EXPLORERBARTOOLBARBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBACKGROUND.bmp" +NORMAL_EXPLORERBARTOOLBARBUTTONSSPLITDROPDOWN_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONSSPLITDROPDOWN.bmp" +NORMAL_EXPLORERBARTOOLBARBUTTONSSPLIT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_EXPLORERBARTOOLBARBUTTONSSPLIT.bmp" +NORMAL_FIELDOUTLINEBLUE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_FIELDOUTLINEBLUE.bmp" +NORMAL_FRAMEBOTTOM_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_FRAMEBOTTOM.bmp" +NORMAL_FRAMECAPTIONMIN_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_FRAMECAPTIONMIN.bmp" +NORMAL_FRAMECAPTIONSIZING_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_FRAMECAPTIONSIZING.bmp" +NORMAL_FRAMECAPTION_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_FRAMECAPTION.bmp" +NORMAL_FRAMELEFT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_FRAMELEFT.bmp" +NORMAL_FRAMEMAXIMIZED_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_FRAMEMAXIMIZED.bmp" +NORMAL_FRAMERIGHT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_FRAMERIGHT.bmp" +NORMAL_GRIPPERVERT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_GRIPPERVERT.bmp" +NORMAL_GRIPPER_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_GRIPPER.bmp" +NORMAL_GROUPBOX_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_GROUPBOX.bmp" +NORMAL_HELPBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_HELPBUTTON.bmp" +NORMAL_LISTVIEWHEADERBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_LISTVIEWHEADERBACKGROUND.bmp" +NORMAL_LISTVIEWHEADER_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_LISTVIEWHEADER.bmp" +NORMAL_MAXBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_MAXBUTTON.bmp" +NORMAL_MDICAPTIONBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_MDICAPTIONBUTTON.bmp" +NORMAL_MDIGLYPHCLOSE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_MDIGLYPHCLOSE.bmp" +NORMAL_MDIGLYPHMINIMIZE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_MDIGLYPHMINIMIZE.bmp" +NORMAL_MDIGLYPHRESTORE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_MDIGLYPHRESTORE.bmp" +NORMAL_MINBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_MINBUTTON.bmp" +NORMAL_NORMALGROUPBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_NORMALGROUPBACKGROUND.bmp" +NORMAL_NORMALGROUPHEAD_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_NORMALGROUPHEAD.bmp" +NORMAL_PLACEBARBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_PLACEBARBACKGROUND.bmp" +NORMAL_PLACEBARBUTTONS_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_PLACEBARBUTTONS.bmp" +NORMAL_PROGRESSCHUNKVERT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_PROGRESSCHUNKVERT.bmp" +NORMAL_PROGRESSCHUNK_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_PROGRESSCHUNK.bmp" +NORMAL_PROGRESSTRACKVERT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_PROGRESSTRACKVERT.bmp" +NORMAL_PROGRESSTRACK_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_PROGRESSTRACK.bmp" +NORMAL_RADIOBUTTON13_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_RADIOBUTTON13.bmp" +NORMAL_RESIZEGRIP2_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_RESIZEGRIP2.bmp" +NORMAL_RESTOREBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_RESTOREBUTTON.bmp" +NORMAL_SCROLLARROWGLYPHSSMALL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLARROWGLYPHSSMALL.bmp" +NORMAL_SCROLLARROWGLYPHS_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLARROWGLYPHS.bmp" +NORMAL_SCROLLARROWS_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLARROWS.bmp" +NORMAL_SCROLLSHAFTHORIZONTAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLSHAFTHORIZONTAL.bmp" +NORMAL_SCROLLSHAFTVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLSHAFTVERTICAL.bmp" +NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBGRIPPERHORIZONTAL.bmp" +NORMAL_SCROLLTHUMBGRIPPERVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBGRIPPERVERTICAL.bmp" +NORMAL_SCROLLTHUMBHORIZONTAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBHORIZONTAL.bmp" +NORMAL_SCROLLTHUMBVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SCROLLTHUMBVERTICAL.bmp" +NORMAL_SEPARATORVERT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SEPARATORVERT.bmp" +NORMAL_SEPARATOR_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SEPARATOR.bmp" +NORMAL_SLIDERTRACK_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SLIDERTRACK.bmp" +NORMAL_SLIDERTRACKVERT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SLIDERTRACKVERT.bmp" +NORMAL_SMALLCLOSEBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SMALLCLOSEBUTTON.bmp" +NORMAL_SMALLFRAMECAPTIONSIZING_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SMALLFRAMECAPTIONSIZING.bmp" +NORMAL_SMALLFRAMECAPTION_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SMALLFRAMECAPTION.bmp" +NORMAL_SPECIALGROUPBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPECIALGROUPBACKGROUND.bmp" +NORMAL_SPECIALGROUPHEAD_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPECIALGROUPHEAD.bmp" +NORMAL_SPINBUTTONBACKGROUNDDOWN_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDDOWN.bmp" +NORMAL_SPINBUTTONBACKGROUNDLEFT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDLEFT.bmp" +NORMAL_SPINBUTTONBACKGROUNDRIGHT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDRIGHT.bmp" +NORMAL_SPINBUTTONBACKGROUNDUP_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPINBUTTONBACKGROUNDUP.bmp" +NORMAL_SPINDOWNGLYPH_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPINDOWNGLYPH.bmp" +NORMAL_SPINLEFTGLYPH_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPINLEFTGLYPH.bmp" +NORMAL_SPINRIGHTGLYPH_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPINRIGHTGLYPH.bmp" +NORMAL_SPINUPGLYPH_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_SPINUPGLYPH.bmp" +NORMAL_STARTBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.bmp" +NORMAL_STARTGROUPBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTGROUPBACKGROUND.bmp" +NORMAL_STARTGROUPNEWAPPBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTGROUPNEWAPPBUTTON.bmp" +NORMAL_STARTGROUPSEPERATOR_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTGROUPSEPERATOR.bmp" +NORMAL_STARTGROUPTOOLBARBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTGROUPTOOLBARBUTTON.bmp" +NORMAL_STARTPANELLOGOFFBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPANELLOGOFFBACKGROUND.bmp" +NORMAL_STARTPANELLOGOFFBUTTONSHOT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPANELLOGOFFBUTTONSHOT.bmp" +NORMAL_STARTPANELLOGOFFBUTTONS_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPANELLOGOFFBUTTONS.bmp" +NORMAL_STARTPANELMFUBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPANELMFUBACKGROUND.bmp" +NORMAL_STARTPANELMOREPROGARROWHOT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPANELMOREPROGARROWHOT.bmp" +NORMAL_STARTPANELMOREPROGARROW_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPANELMOREPROGARROW.bmp" +NORMAL_STARTPANELMOREPROGBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPANELMOREPROGBACKGROUND.bmp" +NORMAL_STARTPANELPLACESBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPANELPLACESBACKGROUND.bmp" +NORMAL_STARTPLACESSEPARATOR_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPLACESSEPARATOR.bmp" +NORMAL_STARTPROGRAMSSEPARATOR_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTPROGRAMSSEPARATOR.bmp" +NORMAL_STARTUSERPANEL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STARTUSERPANEL.bmp" +NORMAL_STATUSBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STATUSBACKGROUND.bmp" +NORMAL_STATUSPANE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_STATUSPANE.bmp" +NORMAL_TABBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABBACKGROUND.bmp" +NORMAL_TABITEMBOTH_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABITEMBOTH.bmp" +NORMAL_TABITEMLEFT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABITEMLEFT.bmp" +NORMAL_TABITEMRIGHT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABITEMRIGHT.bmp" +NORMAL_TABITEMTOPBOTH_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABITEMTOPBOTH.bmp" +NORMAL_TABITEMTOPLEFT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABITEMTOPLEFT.bmp" +NORMAL_TABITEMTOPRIGHT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABITEMTOPRIGHT.bmp" +NORMAL_TABITEMTOP_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABITEMTOP.bmp" +NORMAL_TABITEM_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABITEM.bmp" +NORMAL_TABPANEEDGE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TABPANEEDGE.bmp" +NORMAL_TASKBANDBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDBACKGROUND.bmp" +NORMAL_TASKBANDBUTTONNOEDGEVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDBUTTONNOEDGEVERTICAL.bmp" +NORMAL_TASKBANDBUTTONNOEDGE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDBUTTONNOEDGE.bmp" +NORMAL_TASKBANDBUTTONVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDBUTTONVERTICAL.bmp" +NORMAL_TASKBANDBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDBUTTON.bmp" +NORMAL_TASKBANDFLASHBUTTONGROUPMENU_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDFLASHBUTTONGROUPMENU.bmp" +NORMAL_TASKBANDFLASHBUTTON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDFLASHBUTTON.bmp" +NORMAL_TASKBANDHOVER_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDHOVER.bmp" +NORMAL_TASKBANDSCROLLARROWGLYPHS_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLARROWGLYPHS.bmp" +NORMAL_TASKBANDSCROLLARROWS_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLARROWS.bmp" +NORMAL_TASKBANDSCROLLSHAFTHORIZONTAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTHORIZONTAL.bmp" +NORMAL_TASKBANDSCROLLSHAFTVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLSHAFTVERTICAL.bmp" +NORMAL_TASKBANDSCROLLTHUMBGRIPPERHORIZONTAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBGRIPPERHORIZONTAL.bmp" +NORMAL_TASKBANDSCROLLTHUMBGRIPPERVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBGRIPPERVERTICAL.bmp" +NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBHORIZONTAL.bmp" +NORMAL_TASKBANDSCROLLTHUMBVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBANDSCROLLTHUMBVERTICAL.bmp" +NORMAL_TASKBARBACKGROUNDVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARBACKGROUNDVERTICAL.bmp" +NORMAL_TASKBARBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARBACKGROUND.bmp" +NORMAL_TASKBARCHEVRONVERT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARCHEVRONVERT.bmp" +NORMAL_TASKBARCHEVRON_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARCHEVRON.bmp" +NORMAL_TASKBARGRIPPERVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARGRIPPERVERTICAL.bmp" +NORMAL_TASKBARGRIPPER_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARGRIPPER.bmp" +NORMAL_TASKBARSIZINGBARBOTTOM_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARSIZINGBARBOTTOM.bmp" +NORMAL_TASKBARSIZINGBARLEFT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARSIZINGBARLEFT.bmp" +NORMAL_TASKBARSIZINGBARRIGHT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARSIZINGBARRIGHT.bmp" +NORMAL_TASKBARSIZINGBARTOP_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARSIZINGBARTOP.bmp" +NORMAL_TASKBARTRAYVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARTRAYVERTICAL.bmp" +NORMAL_TASKBARTRAY_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TASKBARTRAY.bmp" +NORMAL_TOOLBARBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TOOLBARBACKGROUND.bmp" +NORMAL_TOOLBARBUTTONSSPLITDROPDOWNGLYPH_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TOOLBARBUTTONSSPLITDROPDOWNGLYPH.bmp" +NORMAL_TOOLBARBUTTONSSPLITDROPDOWN_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TOOLBARBUTTONSSPLITDROPDOWN.bmp" +NORMAL_TOOLBARBUTTONSSPLIT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TOOLBARBUTTONSSPLIT.bmp" +NORMAL_TOOLBARBUTTONS_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TOOLBARBUTTONS.bmp" +NORMAL_TOOLBARGRIPPERVERT_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TOOLBARGRIPPERVERT.bmp" +NORMAL_TOOLBARGRIPPER_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TOOLBARGRIPPER.bmp" +NORMAL_TRACKBARDOWN13_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARDOWN13.bmp" +NORMAL_TRACKBARDOWN16_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARDOWN16.bmp" +NORMAL_TRACKBARDOWN25_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARDOWN25.bmp" +NORMAL_TRACKBARHORIZONTAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARHORIZONTAL.bmp" +NORMAL_TRACKBARLEFT13_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARLEFT13.bmp" +NORMAL_TRACKBARLEFT16_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARLEFT16.bmp" +NORMAL_TRACKBARLEFT25_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARLEFT25.bmp" +NORMAL_TRACKBARRIGHT13_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARRIGHT13.bmp" +NORMAL_TRACKBARRIGHT16_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARRIGHT16.bmp" +NORMAL_TRACKBARRIGHT25_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARRIGHT25.bmp" +NORMAL_TRACKBARUP13_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARUP13.bmp" +NORMAL_TRACKBARUP16_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARUP16.bmp" +NORMAL_TRACKBARUP25_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARUP25.bmp" +NORMAL_TRACKBARVERTICAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRACKBARVERTICAL.bmp" +NORMAL_TRAYCHEVRONHORIZONTALOPEN_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRAYCHEVRONHORIZONTALOPEN.bmp" +NORMAL_TRAYCHEVRONHORIZONTAL_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TRAYCHEVRONHORIZONTAL.bmp" +NORMAL_TREEEXPANDCOLLAPSE_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_TREEEXPANDCOLLAPSE.bmp" +NORMAL_USERTILEBACKGROUND_BMP BITMAP "../lautus.msstyles/bitmaps/NORMAL_USERTILEBACKGROUND.bmp" + +/* These three are needed before Windows will accept the theme */ +NORMAL_EXPLORERBARHEADERPIN_BMP BITMAP "bitmaps/dummy.bmp" +NORMAL_EXPLORERBARTOOLBARBUTTONS_BMP BITMAP "bitmaps/dummy.bmp" +NORMAL_IE_PERSONALBARMENU_BMP BITMAP "bitmaps/dummy.bmp" +NORMAL_NORMALGROUPCOLLAPSE_BMP BITMAP "bitmaps/dummy.bmp" +NORMAL_NORMALGROUPEXPAND_BMP BITMAP "bitmaps/dummy.bmp" + +#pragma code_page(65001) + +#include "lang/en-US.rc" + Propchange: trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/media/themes/blackshade.msstyles/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/blackshade.ms… ============================================================================== --- trunk/reactos/media/themes/blackshade.msstyles/lang/en-US.rc (added) +++ trunk/reactos/media/themes/blackshade.msstyles/lang/en-US.rc [iso-8859-1] Sun Feb 19 20:40:45 2017 @@ -0,0 +1,37 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +{ +1000, "Black Shade" +} + +STRINGTABLE +{ +2000, "Black Shade" +} + +STRINGTABLE +{ +3000, "Normal" +3001, "Large Fonts" +3002, "Extra Large Fonts" +} + +STRINGTABLE +{ +4000, "Normal" +4001, "Large Fonts" +4002, "Extra Large Fonts" +} + +STRINGTABLE +{ +5000, "Black Shade" +5001, "Visual Style" +5002, "ReactOS Foundation" +5003, "Images by David Quintana <gigaherz(a)gmail.com>" +5004, "Images released under CC-BY-SA 4.0" +5005, "http://www.reactos.org" +5006, "1.0" +5007, "Visual Style for ReactOS" +} Propchange: trunk/reactos/media/themes/blackshade.msstyles/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native

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