Ros-diffs April 2017

ros-diffs@reactos.org

14 participants
179 discussions

[mjansen] 74286: [WIN32SS] Addendum to r74285, actually leak the pointer used by Freetype, so that when it is accessed later, we have not freed it.
by mjansen＠svn.reactos.org 08 Apr '17

08 Apr '17

Author: mjansen Date: Sat Apr 8 19:06:46 2017 New Revision: 74286 URL: http://svn.reactos.org/svn/reactos?rev=74286&view=rev Log: [WIN32SS] Addendum to r74285, actually leak the pointer used by Freetype, so that when it is accessed later, we have not freed it. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sat Apr 8 19:06:46 2017 @@ -1070,8 +1070,16 @@ INT FontCount; HANDLE Ret = 0; + /* We leak this buffer for now, same as all fonts do with their buffer! */ + LoadFont.Buffer = ExAllocatePoolWithTag(PagedPool, dwSize, TAG_FONT); + if (!LoadFont.Buffer) + { + *pNumAdded = 0; + return NULL; + } + memcpy(LoadFont.Buffer, Buffer, dwSize); + LoadFont.pFileName = NULL; - LoadFont.Buffer = Buffer; LoadFont.BufferSize = dwSize; LoadFont.Characteristics = FR_PRIVATE | FR_NOT_ENUM; RtlInitUnicodeString(&LoadFont.RegValueName, NULL);

1 0

[mjansen] 74285: [WIN32SS] Implement NtGdiAddFontMemResourceEx and NtGdiRemoveFontMemResourceEx. CORE-13046
by mjansen＠svn.reactos.org 08 Apr '17

08 Apr '17

Author: mjansen Date: Sat Apr 8 17:32:45 2017 New Revision: 74285 URL: http://svn.reactos.org/svn/reactos?rev=74285&view=rev Log: [WIN32SS] Implement NtGdiAddFontMemResourceEx and NtGdiRemoveFontMemResourceEx. CORE-13046 Added: trunk/reactos/win32ss/gdi/ntgdi/font.h (with props) Modified: trunk/reactos/win32ss/gdi/eng/stubs.c trunk/reactos/win32ss/gdi/ntgdi/font.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/gdi/ntgdi/init.c trunk/reactos/win32ss/gdi/ntgdi/text.h trunk/reactos/win32ss/user/ntuser/win32.h Modified: trunk/reactos/win32ss/gdi/eng/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/stubs.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/stubs.c [iso-8859-1] Sat Apr 8 17:32:45 2017 @@ -838,22 +838,6 @@ /* * @unimplemented */ -HANDLE -APIENTRY -NtGdiAddFontMemResourceEx( - IN PVOID pvBuffer, - IN DWORD cjBuffer, - IN DESIGNVECTOR *pdv, - IN ULONG cjDV, - OUT DWORD *pNumFonts) -{ - UNIMPLEMENTED; - return NULL; -} - -/* - * @unimplemented - */ BOOL APIENTRY NtGdiRemoveMergeFont( @@ -1324,18 +1308,6 @@ { UNIMPLEMENTED; return 0; -} - -/* - * @unimplemented - */ -BOOL -APIENTRY -NtGdiRemoveFontMemResourceEx( - IN HANDLE hMMFont) -{ - UNIMPLEMENTED; - return FALSE; } /* Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/font.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] Sat Apr 8 17:32:45 2017 @@ -478,6 +478,71 @@ return Ret; } +HANDLE +APIENTRY +NtGdiAddFontMemResourceEx( + IN PVOID pvBuffer, + IN DWORD cjBuffer, + IN DESIGNVECTOR *pdv, + IN ULONG cjDV, + OUT DWORD *pNumFonts) +{ + _SEH2_VOLATILE PVOID Buffer = NULL; + HANDLE Ret; + DWORD NumFonts = 0; + + DPRINT("NtGdiAddFontMemResourceEx\n"); + DBG_UNREFERENCED_PARAMETER(pdv); + DBG_UNREFERENCED_PARAMETER(cjDV); + + if (!pvBuffer || !cjBuffer) + return NULL; + + _SEH2_TRY + { + ProbeForRead(pvBuffer, cjBuffer, sizeof(BYTE)); + Buffer = ExAllocatePoolWithQuotaTag(PagedPool, cjBuffer, TAG_FONT); + RtlCopyMemory(Buffer, pvBuffer, cjBuffer); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + if (Buffer != NULL) + { + ExFreePoolWithTag(Buffer, TAG_FONT); + } + _SEH2_YIELD(return NULL); + } + _SEH2_END; + + Ret = IntGdiAddFontMemResource(Buffer, cjBuffer, &NumFonts); + ExFreePoolWithTag(Buffer, TAG_FONT); + + _SEH2_TRY + { + ProbeForWrite(pNumFonts, sizeof(NumFonts), 1); + *pNumFonts = NumFonts; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Leak it? */ + _SEH2_YIELD(return NULL); + } + _SEH2_END; + + + return Ret; +} + + +BOOL +APIENTRY +NtGdiRemoveFontMemResourceEx( + IN HANDLE hMMFont) +{ + return IntGdiRemoveFontMemResource(hMMFont); +} + + /* * @unimplemented */ Added: trunk/reactos/win32ss/gdi/ntgdi/font.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/font.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/font.h (added) +++ trunk/reactos/win32ss/gdi/ntgdi/font.h [iso-8859-1] Sat Apr 8 17:32:45 2017 @@ -0,0 +1,64 @@ +#pragma once + + +typedef struct _FONT_ENTRY +{ + LIST_ENTRY ListEntry; + FONTGDI *Font; + UNICODE_STRING FaceName; + BYTE NotEnum; +} FONT_ENTRY, *PFONT_ENTRY; + +typedef struct _FONT_ENTRY_MEM +{ + LIST_ENTRY ListEntry; + FONT_ENTRY *Entry; +} FONT_ENTRY_MEM, *PFONT_ENTRY_MEM; + +typedef struct _FONT_ENTRY_COLL_MEM +{ + LIST_ENTRY ListEntry; + UINT Handle; + FONT_ENTRY_MEM *Entry; +} FONT_ENTRY_COLL_MEM, *PFONT_ENTRY_COLL_MEM; + +typedef struct _FONT_CACHE_ENTRY +{ + LIST_ENTRY ListEntry; + int GlyphIndex; + FT_Face Face; + FT_BitmapGlyph BitmapGlyph; + int Height; + MATRIX mxWorldToDevice; +} FONT_CACHE_ENTRY, *PFONT_CACHE_ENTRY; + + +/* + * FONTSUBST_... --- constants for font substitutes + */ +#define FONTSUBST_FROM 0 +#define FONTSUBST_TO 1 +#define FONTSUBST_FROM_AND_TO 2 + +/* + * FONTSUBST_ENTRY --- font substitute entry + */ +typedef struct FONTSUBST_ENTRY +{ + LIST_ENTRY ListEntry; + UNICODE_STRING FontNames[FONTSUBST_FROM_AND_TO]; + BYTE CharSets[FONTSUBST_FROM_AND_TO]; +} FONTSUBST_ENTRY, *PFONTSUBST_ENTRY; + + +typedef struct GDI_LOAD_FONT +{ + PUNICODE_STRING pFileName; + PVOID Buffer; + ULONG BufferSize; + DWORD Characteristics; + UNICODE_STRING RegValueName; + BOOL IsTrueType; + PFONT_ENTRY_MEM PrivateEntry; +} GDI_LOAD_FONT, *PGDI_LOAD_FONT; + Propchange: trunk/reactos/win32ss/gdi/ntgdi/font.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sat Apr 8 17:32:45 2017 @@ -31,6 +31,7 @@ #include FT_INTERNAL_TRUETYPE_TYPES_H #include <gdi/eng/floatobj.h> +#include "font.h" #define NDEBUG #include <debug.h> @@ -90,13 +91,6 @@ } } -typedef struct _FONT_ENTRY -{ - LIST_ENTRY ListEntry; - FONTGDI *Font; - UNICODE_STRING FaceName; - BYTE NotEnum; -} FONT_ENTRY, *PFONT_ENTRY; /* The FreeType library is not thread safe, so we have to serialize access to it */ @@ -120,15 +114,6 @@ #define MAX_FONT_CACHE 256 -typedef struct _FONT_CACHE_ENTRY -{ - LIST_ENTRY ListEntry; - int GlyphIndex; - FT_Face Face; - FT_BitmapGlyph BitmapGlyph; - int Height; - MATRIX mxWorldToDevice; -} FONT_CACHE_ENTRY, *PFONT_CACHE_ENTRY; static LIST_ENTRY FontCacheListHead; static UINT FontCacheNumEntries; @@ -200,23 +185,6 @@ { DEFAULT_CHARSET, 0, {{0,0,0,0},{FS_LATIN1,0}} }, { SYMBOL_CHARSET, CP_SYMBOL, {{0,0,0,0},{FS_SYMBOL,0}} } }; - -/* - * FONTSUBST_... --- constants for font substitutes - */ -#define FONTSUBST_FROM 0 -#define FONTSUBST_TO 1 -#define FONTSUBST_FROM_AND_TO 2 - -/* - * FONTSUBST_ENTRY --- font substitute entry - */ -typedef struct FONTSUBST_ENTRY -{ - LIST_ENTRY ListEntry; - UNICODE_STRING FontNames[FONTSUBST_FROM_AND_TO]; - BYTE CharSets[FONTSUBST_FROM_AND_TO]; -} FONTSUBST_ENTRY, *PFONTSUBST_ENTRY; /* list head */ static RTL_STATIC_LIST_HEAD(FontSubstListHead); @@ -695,22 +663,13 @@ return FW_NORMAL; } -typedef struct GDI_LOAD_FONT -{ - PUNICODE_STRING pFileName; - PVOID Buffer; - ULONG BufferSize; - DWORD Characteristics; - UNICODE_STRING RegValueName; - BOOL IsTrueType; -} GDI_LOAD_FONT, *PGDI_LOAD_FONT; - static INT FASTCALL IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont, PSHARED_FACE SharedFace, FT_Long FontIndex, INT CharSetIndex) { FT_Error Error; PFONT_ENTRY Entry; + FONT_ENTRY_MEM* PrivateEntry = NULL; FONTGDI * FontGDI; NTSTATUS Status; FT_Face Face; @@ -780,19 +739,48 @@ } /* set file name */ - FontGDI->Filename = ExAllocatePoolWithTag(PagedPool, - pFileName->Length + sizeof(UNICODE_NULL), - GDITAG_PFF); - if (FontGDI->Filename == NULL) - { - EngFreeMem(FontGDI); - SharedFace_Release(SharedFace); - ExFreePoolWithTag(Entry, TAG_FONT); - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; /* failure */ - } - RtlCopyMemory(FontGDI->Filename, pFileName->Buffer, pFileName->Length); - FontGDI->Filename[pFileName->Length / sizeof(WCHAR)] = UNICODE_NULL; + if (pFileName) + { + FontGDI->Filename = ExAllocatePoolWithTag(PagedPool, + pFileName->Length + sizeof(UNICODE_NULL), + GDITAG_PFF); + if (FontGDI->Filename == NULL) + { + EngFreeMem(FontGDI); + SharedFace_Release(SharedFace); + ExFreePoolWithTag(Entry, TAG_FONT); + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; /* failure */ + } + RtlCopyMemory(FontGDI->Filename, pFileName->Buffer, pFileName->Length); + FontGDI->Filename[pFileName->Length / sizeof(WCHAR)] = UNICODE_NULL; + } + else + { + FontGDI->Filename = NULL; + + PrivateEntry = ExAllocatePoolWithTag(PagedPool, sizeof(FONT_ENTRY_MEM), TAG_FONT); + if (!PrivateEntry) + { + if (FontGDI->Filename) + ExFreePoolWithTag(FontGDI->Filename, GDITAG_PFF); + EngFreeMem(FontGDI); + SharedFace_Release(SharedFace); + ExFreePoolWithTag(Entry, TAG_FONT); + return 0; + } + + PrivateEntry->Entry = Entry; + if (pLoadFont->PrivateEntry) + { + InsertTailList(&pLoadFont->PrivateEntry->ListEntry, &PrivateEntry->ListEntry); + } + else + { + InitializeListHead(&PrivateEntry->ListEntry); + pLoadFont->PrivateEntry = PrivateEntry; + } + } /* set face */ FontGDI->SharedFace = SharedFace; @@ -806,7 +794,20 @@ Status = RtlAnsiStringToUnicodeString(&Entry->FaceName, &AnsiFaceName, TRUE); if (!NT_SUCCESS(Status)) { - ExFreePoolWithTag(FontGDI->Filename, GDITAG_PFF); + if (PrivateEntry) + { + if (pLoadFont->PrivateEntry == PrivateEntry) + { + pLoadFont->PrivateEntry = NULL; + } + else + { + RemoveEntryList(&PrivateEntry->ListEntry); + } + ExFreePoolWithTag(PrivateEntry, TAG_FONT); + } + if (FontGDI->Filename) + ExFreePoolWithTag(FontGDI->Filename, GDITAG_PFF); EngFreeMem(FontGDI); SharedFace_Release(SharedFace); ExFreePoolWithTag(Entry, TAG_FONT); @@ -1010,6 +1011,7 @@ LoadFont.Characteristics = Characteristics; RtlInitUnicodeString(&LoadFont.RegValueName, NULL); LoadFont.IsTrueType = FALSE; + LoadFont.PrivateEntry = NULL; FontCount = IntGdiLoadFontsFromMemory(&LoadFont, NULL, -1, -1); ObDereferenceObject(SectionObject); @@ -1060,7 +1062,99 @@ return FontCount; } +HANDLE FASTCALL +IntGdiAddFontMemResource(PVOID Buffer, DWORD dwSize, PDWORD pNumAdded) +{ + GDI_LOAD_FONT LoadFont; + FONT_ENTRY_COLL_MEM* EntryCollection; + INT FontCount; + HANDLE Ret = 0; + + LoadFont.pFileName = NULL; + LoadFont.Buffer = Buffer; + LoadFont.BufferSize = dwSize; + LoadFont.Characteristics = FR_PRIVATE | FR_NOT_ENUM; + RtlInitUnicodeString(&LoadFont.RegValueName, NULL); + LoadFont.IsTrueType = FALSE; + LoadFont.PrivateEntry = NULL; + FontCount = IntGdiLoadFontsFromMemory(&LoadFont, NULL, -1, -1); + + RtlFreeUnicodeString(&LoadFont.RegValueName); + + *pNumAdded = FontCount; + if (FontCount > 0) + { + EntryCollection = ExAllocatePoolWithTag(PagedPool, sizeof(FONT_ENTRY_COLL_MEM), TAG_FONT); + if (EntryCollection) + { + PPROCESSINFO Win32Process = PsGetCurrentProcessWin32Process(); + EntryCollection->Entry = LoadFont.PrivateEntry; + IntLockProcessPrivateFonts(Win32Process); + EntryCollection->Handle = ++Win32Process->PrivateMemFontHandleCount; + InsertTailList(&Win32Process->PrivateMemFontListHead, &EntryCollection->ListEntry); + IntUnLockProcessPrivateFonts(Win32Process); + Ret = (HANDLE)EntryCollection->Handle; + } + } + + return Ret; +} + // FIXME: Add RemoveFontResource + +VOID FASTCALL +IntGdiCleanupMemEntry(PFONT_ENTRY_MEM Head) +{ + PLIST_ENTRY Entry; + PFONT_ENTRY_MEM FontEntry; + + while (!IsListEmpty(&Head->ListEntry)) + { + Entry = RemoveHeadList(&Head->ListEntry); + FontEntry = CONTAINING_RECORD(Entry, FONT_ENTRY_MEM, ListEntry); + + // Delete FontEntry->Entry (FONT_ENTRY*) + ExFreePoolWithTag(FontEntry, TAG_FONT); + } + + // Delete Head->Entry (FONT_ENTRY*) + ExFreePoolWithTag(Head, TAG_FONT); +} + +BOOL FASTCALL +IntGdiRemoveFontMemResource(HANDLE hMMFont) +{ + PLIST_ENTRY Entry; + PFONT_ENTRY_COLL_MEM CurrentEntry; + PFONT_ENTRY_COLL_MEM EntryCollection = NULL; + PPROCESSINFO Win32Process = PsGetCurrentProcessWin32Process(); + + IntLockProcessPrivateFonts(Win32Process); + Entry = Win32Process->PrivateMemFontListHead.Flink; + while (Entry != &Win32Process->PrivateMemFontListHead) + { + CurrentEntry = CONTAINING_RECORD(Entry, FONT_ENTRY_COLL_MEM, ListEntry); + + if (CurrentEntry->Handle == (UINT)hMMFont) + { + EntryCollection = CurrentEntry; + RemoveEntryList(Entry); + break; + } + + Entry = Entry->Flink; + } + IntUnLockProcessPrivateFonts(Win32Process); + + if (EntryCollection) + { + IntGdiCleanupMemEntry(EntryCollection->Entry); + ExFreePoolWithTag(EntryCollection, TAG_FONT); + return TRUE; + } + return FALSE; +} + BOOL FASTCALL IntIsFontRenderingEnabled(VOID) Modified: trunk/reactos/win32ss/gdi/ntgdi/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/init.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/init.c [iso-8859-1] Sat Apr 8 17:32:45 2017 @@ -21,6 +21,8 @@ ASSERT(ppiCurrent); InitializeListHead(&ppiCurrent->PrivateFontListHead); + InitializeListHead(&ppiCurrent->PrivateMemFontListHead); + ppiCurrent->PrivateMemFontHandleCount = 0; ExInitializeFastMutex(&ppiCurrent->PrivateFontListLock); InitializeListHead(&ppiCurrent->GDIBrushAttrFreeList); Modified: trunk/reactos/win32ss/gdi/ntgdi/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] Sat Apr 8 17:32:45 2017 @@ -113,6 +113,8 @@ ULONG FASTCALL FontGetObject(PTEXTOBJ TextObj, ULONG Count, PVOID Buffer); VOID FASTCALL IntLoadSystemFonts(VOID); INT FASTCALL IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics); +HANDLE FASTCALL IntGdiAddFontMemResource(PVOID Buffer, DWORD dwSize, PDWORD pNumAdded); +BOOL FASTCALL IntGdiRemoveFontMemResource(HANDLE hMMFont); ULONG FASTCALL ftGdiGetGlyphOutline(PDC,WCHAR,UINT,LPGLYPHMETRICS,ULONG,PVOID,LPMAT2,BOOL); INT FASTCALL IntGetOutlineTextMetrics(PFONTGDI,UINT,OUTLINETEXTMETRICW *); BOOL FASTCALL TextIntUpdateSize(PDC,PTEXTOBJ,PFONTGDI,BOOL); Modified: trunk/reactos/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] Sat Apr 8 17:32:45 2017 @@ -273,6 +273,9 @@ /* ReactOS */ FAST_MUTEX PrivateFontListLock; LIST_ENTRY PrivateFontListHead; + LIST_ENTRY PrivateMemFontListHead; + UINT PrivateMemFontHandleCount; + FAST_MUTEX DriverObjListLock; LIST_ENTRY DriverObjListHead; W32HEAP_USER_MAPPING HeapMappings;

1 0

[tfaber] 74284: [LIBUSB] - Silence some debug prints
by tfaber＠svn.reactos.org 08 Apr '17

08 Apr '17

Author: tfaber Date: Sat Apr 8 15:55:00 2017 New Revision: 74284 URL: http://svn.reactos.org/svn/reactos?rev=74284&view=rev Log: [LIBUSB] - Silence some debug prints Modified: trunk/reactos/sdk/lib/drivers/libusb/hub_controller.cpp Modified: trunk/reactos/sdk/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/libusb/hub… ============================================================================== --- trunk/reactos/sdk/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Sat Apr 8 15:55:00 2017 @@ -2672,7 +2672,7 @@ { CHubController * Controller = (CHubController*)BusContext; - DPRINT1("USBH_InterfaceReference\n"); + DPRINT("USBI_InterfaceReference\n"); // // add reference @@ -2687,7 +2687,7 @@ { CHubController * Controller = (CHubController*)BusContext; - DPRINT1("USBH_InterfaceDereference\n"); + DPRINT("USBI_InterfaceDereference\n"); // // release

1 0

[tfaber] 74283: [NTOS:IO] - Make debug prints about IopOpenRegistryKeyEx failure consistent
by tfaber＠svn.reactos.org 08 Apr '17

08 Apr '17

Author: tfaber Date: Sat Apr 8 09:26:42 2017 New Revision: 74283 URL: http://svn.reactos.org/svn/reactos?rev=74283&view=rev Log: [NTOS:IO] - Make debug prints about IopOpenRegistryKeyEx failure consistent Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sat Apr 8 09:26:42 2017 @@ -337,7 +337,7 @@ Status = IopOpenRegistryKeyEx(&CCSKey, NULL, &CCSName, KEY_READ); if (!NT_SUCCESS(Status)) { - DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with Status %08X\n", + DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", &CCSName, Status); return Status; } @@ -346,7 +346,7 @@ Status = IopOpenRegistryKeyEx(&ServiceKey, CCSKey, ServiceName, KEY_READ); if (!NT_SUCCESS(Status)) { - DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with Status %08X\n", + DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", ServiceName, Status); ZwClose(CCSKey); return Status; @@ -656,7 +656,8 @@ KEY_READ); if (!NT_SUCCESS(Status)) { - DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); + DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", + &EnumRoot, Status); return Status; } @@ -667,7 +668,8 @@ KEY_READ); if (!NT_SUCCESS(Status)) { - DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); + DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", + &DeviceNode->InstancePath, Status); ZwClose(EnumRootKey); return Status; } @@ -731,7 +733,8 @@ KEY_READ); if (!NT_SUCCESS(Status)) { - DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); + DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", + &ControlClass, Status); return Status; } @@ -743,7 +746,8 @@ if (!NT_SUCCESS(Status)) { /* It's okay if there's no class key */ - DPRINT1("ZwOpenKey() failed with Status %08X\n", Status); + DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", + &Class, Status); ZwClose(EnumRootKey); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] Sat Apr 8 09:26:42 2017 @@ -268,7 +268,8 @@ KEY_READ); if (!NT_SUCCESS(Status)) { - DPRINT1("IopOpenRegistryKeyEx() failed with Status %08X\n", Status); + DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", + &EnumRoot, Status); return Status; } @@ -280,7 +281,8 @@ ZwClose(EnumRootKey); if (!NT_SUCCESS(Status)) { - DPRINT1("IopOpenRegistryKeyEx() failed with Status %08X\n", Status); + DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", + &DeviceNode->InstancePath, Status); return Status; } @@ -304,7 +306,8 @@ if (!NT_SUCCESS(Status)) { /* No class key */ - DPRINT1("IopOpenRegistryKeyEx() failed with Status %08X\n", Status); + DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", + &ControlClass, Status); ClassKey = NULL; } else @@ -318,7 +321,8 @@ if (!NT_SUCCESS(Status)) { /* No class key */ - DPRINT1("IopOpenRegistryKeyEx() failed with Status %08X\n", Status); + DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", + &ClassGuid, Status); ClassKey = NULL; } } @@ -336,7 +340,8 @@ if (!NT_SUCCESS(Status)) { /* No properties */ - DPRINT("IopOpenRegistryKeyEx() failed with Status %08X\n", Status); + DPRINT("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", + &Properties, Status); PropertiesKey = NULL; } else Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Sat Apr 8 09:26:42 2017 @@ -525,7 +525,8 @@ Status = IopOpenRegistryKeyEx(&SubKeyHandle, KeyHandle, &SubKeyName, KEY_ENUMERATE_SUB_KEYS); if (!NT_SUCCESS(Status)) { - DPRINT("IopOpenRegistryKeyEx() failed with status 0x%08lx\n", Status); + DPRINT("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", + &SubKeyName, Status); break; } @@ -585,7 +586,8 @@ Status = IopOpenRegistryKeyEx(&DeviceKeyHandle, SubKeyHandle, &Device->InstanceID, KEY_READ); if (!NT_SUCCESS(Status)) { - DPRINT1("IopOpenRegistryKeyEx() failed with status 0x%08lx\n", Status); + DPRINT1("IopOpenRegistryKeyEx() failed for '%wZ' with status 0x%lx\n", + &Device->InstanceID, Status); break; }

1 0

[mjansen] 74282: [WIN32SS] Use Panose info from freetype. Patch by Katayama Hirofumi MZ. CORE-13038
by mjansen＠svn.reactos.org 07 Apr '17

07 Apr '17

Author: mjansen Date: Fri Apr 7 22:30:20 2017 New Revision: 74282 URL: http://svn.reactos.org/svn/reactos?rev=74282&view=rev Log: [WIN32SS] Use Panose info from freetype. Patch by Katayama Hirofumi MZ. CORE-13038 Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Fri Apr 7 22:30:20 2017 @@ -1358,7 +1358,15 @@ if (!FT_IS_FIXED_WIDTH(Face)) { - TM->tmPitchAndFamily = _TMPF_VARIABLE_PITCH; + switch (pOS2->panose[PAN_PROPORTION_INDEX]) + { + case PAN_PROP_MONOSPACED: + TM->tmPitchAndFamily = 0; + break; + default: + TM->tmPitchAndFamily = _TMPF_VARIABLE_PITCH; + break; + } } else {

1 0

[mjansen] 74281: [USETUP] Improve CJK Font Substitutes settings. Patch by Katayama Hirofumi MZ. CORE-12956
by mjansen＠svn.reactos.org 07 Apr '17

07 Apr '17

Author: mjansen Date: Fri Apr 7 21:54:43 2017 New Revision: 74281 URL: http://svn.reactos.org/svn/reactos?rev=74281&view=rev Log: [USETUP] Improve CJK Font Substitutes settings. Patch by Katayama Hirofumi MZ. CORE-12956 Modified: trunk/reactos/base/setup/usetup/muifonts.h Modified: trunk/reactos/base/setup/usetup/muifonts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muifonts… ============================================================================== --- trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muifonts.h [iso-8859-1] Fri Apr 7 21:54:43 2017 @@ -137,6 +137,7 @@ { L"Terminal", L"DejaVu Sans Mono" }, { L"Times New Roman", L"Liberation Serif" }, { L"Ming Light", L"Droid Sans Fallback" }, + { L"MingLiU", L"Droid Sans Fallback" }, { L"PMingLiU", L"Droid Sans Fallback" }, { L"DLCMingMedium", L"Droid Sans Fallback" }, { L"DLCMingBold", L"Droid Sans Fallback" }, @@ -169,6 +170,10 @@ { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times New Roman", L"Liberation Serif" }, + { L"MS Mincho", L"Droid Sans Fallback" }, + { L"MS PMincho", L"Droid Sans Fallback" }, + { L"MS Gothic", L"Droid Sans Fallback" }, + { L"MS PGothic", L"Droid Sans Fallback" }, /* localized names */ { JF_LocalName0, L"Droid Sans Fallback" }, { JF_LocalName1, L"Droid Sans Fallback" }, @@ -181,6 +186,8 @@ WCHAR KF_LocalName1[] = {0xBC14, 0xD0D5, 0xCCB4, 0}; WCHAR KF_LocalName2[] = {0xAD81, 0xC11C, 0}; WCHAR KF_LocalName3[] = {0xAD81, 0xC11C, 0xCCB4, 0}; +WCHAR KF_LocalName4[] = {0xAD74, 0xB9BC, 0}; +WCHAR KF_LocalName5[] = {0xAD74, 0xB9BC, 0xCCB4, 0}; MUI_SUBFONT KoreanFonts[] = { { L"Arial", L"Liberation Sans" }, @@ -202,11 +209,15 @@ { L"BatangChe", L"Droid Sans Fallback" }, { L"Gungsuh", L"Droid Sans Fallback" }, { L"GungsuhChe", L"Droid Sans Fallback" }, + { L"Gulim", L"Droid Sans Fallback" }, + { L"GulimChe", L"Droid Sans Fallback" }, /* localized names */ { KF_LocalName0, L"Droid Sans Fallback" }, { KF_LocalName1, L"Droid Sans Fallback" }, { KF_LocalName2, L"Droid Sans Fallback" }, { KF_LocalName3, L"Droid Sans Fallback" }, + { KF_LocalName4, L"Droid Sans Fallback" }, + { KF_LocalName5, L"Droid Sans Fallback" }, { NULL, NULL } };

1 0

[gadamopoulos] 74280: [GDI32] -Implement GdiDrawStream. - This is based on the prototype I found in a sample app on codeproject. I don't really know what the unknown parameters are for but I haven'...
by gadamopoulos＠svn.reactos.org 07 Apr '17

07 Apr '17

Author: gadamopoulos Date: Fri Apr 7 14:09:24 2017 New Revision: 74280 URL: http://svn.reactos.org/svn/reactos?rev=74280&view=rev Log: [GDI32] -Implement GdiDrawStream. - This is based on the prototype I found in a sample app on codeproject. I don't really know what the unknown parameters are for but I haven't found anything yet passing different values. Almost all of the code is from the drawing code from uxtheme with the only difference that in uxtheme UXTHEME_DrawImageBackground reads several values from the theme but his takes them as parameters. I don't see any reason to spend time understanding what these are for. I found what the draw flags are for by passing different values in the test application and trying to replicate the parameters that UXTHEME_DrawImageBackground need. I decided to keep the naming like that since it is almost verbatim wine code. At some point it should be moved to win32k however. CORE-4420 Modified: trunk/reactos/win32ss/gdi/gdi32/misc/misc.c Modified: trunk/reactos/win32ss/gdi/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/mis… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/misc/misc.c [iso-8859-1] Fri Apr 7 14:09:24 2017 @@ -272,16 +272,441 @@ return 0; } +#define ALPHABLEND_NONE 0 +#define ALPHABLEND_BINARY 1 +#define ALPHABLEND_FULL 2 + +typedef struct _MARGINS { + int cxLeftWidth; + int cxRightWidth; + int cyTopHeight; + int cyBottomHeight; +} MARGINS, *PMARGINS; + +typedef struct GDI_DRAW_STREAM_TAG +{ + DWORD signature; // must be 0x44727753;//"Swrd" + DWORD reserved; // must be 0 + HDC hDC; // handle to the device object of windiw to draw. + RECT rcDest; // desination rect of window to draw. + DWORD unknown1; // must be 1. + HBITMAP hImage; + DWORD unknown2; // must be 9. + RECT rcClip; // desination rect of window to draw. + RECT rcSrc; // source rect of bitmap to draw. + DWORD drawOption; // 0x2 is tile instead of stretch. 0x4 is transparent. 0x20 is true size + DWORD leftSizingMargin; + DWORD rightSizingMargin; + DWORD topSizingMargin; + DWORD bottomSizingMargin; + DWORD crTransparent; // transparent color. + +} GDI_DRAW_STREAM, *PGDI_DRAW_STREAM; + +enum SIZINGTYPE { + ST_TRUESIZE = 0, + ST_STRETCH = 1, + ST_TILE = 2, +}; + +#define TransparentBlt GdiTransparentBlt +#define AlphaBlend GdiAlphaBlend + +/*********************************************************************** + * UXTHEME_StretchBlt + * + * Pseudo TransparentBlt/StretchBlt + */ +static inline BOOL UXTHEME_StretchBlt(HDC hdcDst, int nXOriginDst, int nYOriginDst, int nWidthDst, int nHeightDst, + HDC hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, + INT transparent, COLORREF transcolor) +{ + static const BLENDFUNCTION blendFunc = + { + AC_SRC_OVER, /* BlendOp */ + 0, /* BlendFlag */ + 255, /* SourceConstantAlpha */ + AC_SRC_ALPHA /* AlphaFormat */ + }; + + BOOL ret = TRUE; + int old_stretch_mode; + POINT old_brush_org; + + old_stretch_mode = SetStretchBltMode(hdcDst, HALFTONE); + SetBrushOrgEx(hdcDst, nXOriginDst, nYOriginDst, &old_brush_org); + + if (transparent == ALPHABLEND_BINARY) { + /* Ensure we don't pass any negative values to TransparentBlt */ + ret = TransparentBlt(hdcDst, nXOriginDst, nYOriginDst, abs(nWidthDst), abs(nHeightDst), + hdcSrc, nXOriginSrc, nYOriginSrc, abs(nWidthSrc), abs(nHeightSrc), + transcolor); + } else if ((transparent == ALPHABLEND_NONE) || + !AlphaBlend(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, + hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, + blendFunc)) + { + ret = StretchBlt(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, + hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, + SRCCOPY); + } + + SetBrushOrgEx(hdcDst, old_brush_org.x, old_brush_org.y, NULL); + SetStretchBltMode(hdcDst, old_stretch_mode); + + return ret; +} + +/*********************************************************************** + * UXTHEME_Blt + * + * Simplify sending same width/height for both source and dest + */ +static inline BOOL UXTHEME_Blt(HDC hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, + HDC hdcSrc, int nXOriginSrc, int nYOriginSrc, + INT transparent, COLORREF transcolor) +{ + return UXTHEME_StretchBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, + hdcSrc, nXOriginSrc, nYOriginSrc, nWidthDest, nHeightDest, + transparent, transcolor); +} + +/*********************************************************************** + * UXTHEME_SizedBlt + * + * Stretches or tiles, depending on sizingtype. + */ +static inline BOOL UXTHEME_SizedBlt (HDC hdcDst, int nXOriginDst, int nYOriginDst, + int nWidthDst, int nHeightDst, + HDC hdcSrc, int nXOriginSrc, int nYOriginSrc, + int nWidthSrc, int nHeightSrc, + int sizingtype, + INT transparent, COLORREF transcolor) +{ + if (sizingtype == ST_TILE) + { + HDC hdcTemp; + BOOL result = FALSE; + + if (!nWidthSrc || !nHeightSrc) return TRUE; + + /* For destination width/height less than or equal to source + width/height, do not bother with memory bitmap optimization */ + if (nWidthSrc >= nWidthDst && nHeightSrc >= nHeightDst) + { + int bltWidth = min (nWidthDst, nWidthSrc); + int bltHeight = min (nHeightDst, nHeightSrc); + + return UXTHEME_Blt (hdcDst, nXOriginDst, nYOriginDst, bltWidth, bltHeight, + hdcSrc, nXOriginSrc, nYOriginSrc, + transparent, transcolor); + } + + /* Create a DC with a bitmap consisting of a tiling of the source + bitmap, with standard GDI functions. This is faster than an + iteration with UXTHEME_Blt(). */ + hdcTemp = CreateCompatibleDC(hdcSrc); + if (hdcTemp != 0) + { + HBITMAP bitmapTemp; + HBITMAP bitmapOrig; + int nWidthTemp, nHeightTemp; + int xOfs, xRemaining; + int yOfs, yRemaining; + int growSize; + + /* Calculate temp dimensions of integer multiples of source dimensions */ + nWidthTemp = ((nWidthDst + nWidthSrc - 1) / nWidthSrc) * nWidthSrc; + nHeightTemp = ((nHeightDst + nHeightSrc - 1) / nHeightSrc) * nHeightSrc; + bitmapTemp = CreateCompatibleBitmap(hdcSrc, nWidthTemp, nHeightTemp); + bitmapOrig = SelectObject(hdcTemp, bitmapTemp); + + /* Initial copy of bitmap */ + BitBlt(hdcTemp, 0, 0, nWidthSrc, nHeightSrc, hdcSrc, nXOriginSrc, nYOriginSrc, SRCCOPY); + + /* Extend bitmap in the X direction. Growth of width is exponential */ + xOfs = nWidthSrc; + xRemaining = nWidthTemp - nWidthSrc; + growSize = nWidthSrc; + while (xRemaining > 0) + { + growSize = min(growSize, xRemaining); + BitBlt(hdcTemp, xOfs, 0, growSize, nHeightSrc, hdcTemp, 0, 0, SRCCOPY); + xOfs += growSize; + xRemaining -= growSize; + growSize *= 2; + } + + /* Extend bitmap in the Y direction. Growth of height is exponential */ + yOfs = nHeightSrc; + yRemaining = nHeightTemp - nHeightSrc; + growSize = nHeightSrc; + while (yRemaining > 0) + { + growSize = min(growSize, yRemaining); + BitBlt(hdcTemp, 0, yOfs, nWidthTemp, growSize, hdcTemp, 0, 0, SRCCOPY); + yOfs += growSize; + yRemaining -= growSize; + growSize *= 2; + } + + /* Use temporary hdc for source */ + result = UXTHEME_Blt (hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, + hdcTemp, 0, 0, + transparent, transcolor); + + SelectObject(hdcTemp, bitmapOrig); + DeleteObject(bitmapTemp); + } + DeleteDC(hdcTemp); + return result; + } + else + { + return UXTHEME_StretchBlt (hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, + hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, + transparent, transcolor); + } +} + +/*********************************************************************** + * UXTHEME_DrawImageBackground + * + * Draw an imagefile background + */ +static HRESULT UXTHEME_DrawImageBackground(HDC hdc, HBITMAP bmpSrc, RECT *prcSrc, INT transparent, + COLORREF transparentcolor, BOOL borderonly, int sizingtype, MARGINS *psm, RECT *pRect) +{ + HRESULT hr = S_OK; + HBITMAP bmpSrcResized = NULL; + HGDIOBJ oldSrc; + HDC hdcSrc, hdcOrigSrc = NULL; + RECT rcDst; + POINT dstSize; + POINT srcSize; + RECT rcSrc; + MARGINS sm; + + rcDst = *pRect; + rcSrc = *prcSrc; + sm = *psm; + + hdcSrc = CreateCompatibleDC(hdc); + if(!hdcSrc) { + hr = HRESULT_FROM_WIN32(GetLastError()); + return hr; + } + oldSrc = SelectObject(hdcSrc, bmpSrc); + + dstSize.x = rcDst.right-rcDst.left; + dstSize.y = rcDst.bottom-rcDst.top; + srcSize.x = rcSrc.right-rcSrc.left; + srcSize.y = rcSrc.bottom-rcSrc.top; + + if(sizingtype == ST_TRUESIZE) { + if(!UXTHEME_StretchBlt(hdc, rcDst.left, rcDst.top, dstSize.x, dstSize.y, + hdcSrc, rcSrc.left, rcSrc.top, srcSize.x, srcSize.y, + transparent, transparentcolor)) + hr = HRESULT_FROM_WIN32(GetLastError()); + } + else { + HDC hdcDst = NULL; + POINT org; + + dstSize.x = abs(dstSize.x); + dstSize.y = abs(dstSize.y); + + /* Resize source image if destination smaller than margins */ +#ifndef __REACTOS__ + /* Revert Wine Commit 2b650fa as it breaks themed Explorer Toolbar Separators + FIXME: Revisit this when the bug is fixed. CORE-9636 and Wine Bug #38538 */ + if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y || sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { + if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y) { + sm.cyTopHeight = MulDiv(sm.cyTopHeight, dstSize.y, srcSize.y); + sm.cyBottomHeight = dstSize.y - sm.cyTopHeight; + srcSize.y = dstSize.y; + } + + if (sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { + sm.cxLeftWidth = MulDiv(sm.cxLeftWidth, dstSize.x, srcSize.x); + sm.cxRightWidth = dstSize.x - sm.cxLeftWidth; + srcSize.x = dstSize.x; + } + + hdcOrigSrc = hdcSrc; + hdcSrc = CreateCompatibleDC(NULL); + bmpSrcResized = CreateBitmap(srcSize.x, srcSize.y, 1, 32, NULL); + SelectObject(hdcSrc, bmpSrcResized); + + UXTHEME_StretchBlt(hdcSrc, 0, 0, srcSize.x, srcSize.y, hdcOrigSrc, rcSrc.left, rcSrc.top, + rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, transparent, transparentcolor); + + rcSrc.left = 0; + rcSrc.top = 0; + rcSrc.right = srcSize.x; + rcSrc.bottom = srcSize.y; + } +#endif /* __REACTOS__ */ + + hdcDst = hdc; + OffsetViewportOrgEx(hdcDst, rcDst.left, rcDst.top, &org); + + /* Upper left corner */ + if(!UXTHEME_Blt(hdcDst, 0, 0, sm.cxLeftWidth, sm.cyTopHeight, + hdcSrc, rcSrc.left, rcSrc.top, + transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + /* Upper right corner */ + if(!UXTHEME_Blt (hdcDst, dstSize.x-sm.cxRightWidth, 0, + sm.cxRightWidth, sm.cyTopHeight, + hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top, + transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + /* Lower left corner */ + if(!UXTHEME_Blt (hdcDst, 0, dstSize.y-sm.cyBottomHeight, + sm.cxLeftWidth, sm.cyBottomHeight, + hdcSrc, rcSrc.left, rcSrc.bottom-sm.cyBottomHeight, + transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + /* Lower right corner */ + if(!UXTHEME_Blt (hdcDst, dstSize.x-sm.cxRightWidth, dstSize.y-sm.cyBottomHeight, + sm.cxRightWidth, sm.cyBottomHeight, + hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.bottom-sm.cyBottomHeight, + transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + + if ((sizingtype == ST_STRETCH) || (sizingtype == ST_TILE)) { + int destCenterWidth = dstSize.x - (sm.cxLeftWidth + sm.cxRightWidth); + int srcCenterWidth = srcSize.x - (sm.cxLeftWidth + sm.cxRightWidth); + int destCenterHeight = dstSize.y - (sm.cyTopHeight + sm.cyBottomHeight); + int srcCenterHeight = srcSize.y - (sm.cyTopHeight + sm.cyBottomHeight); + + if(destCenterWidth > 0) { + /* Center top */ + if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, 0, + destCenterWidth, sm.cyTopHeight, + hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top, + srcCenterWidth, sm.cyTopHeight, + sizingtype, transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + /* Center bottom */ + if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, dstSize.y-sm.cyBottomHeight, + destCenterWidth, sm.cyBottomHeight, + hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.bottom-sm.cyBottomHeight, + srcCenterWidth, sm.cyBottomHeight, + sizingtype, transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + } + if(destCenterHeight > 0) { + /* Left center */ + if(!UXTHEME_SizedBlt (hdcDst, 0, sm.cyTopHeight, + sm.cxLeftWidth, destCenterHeight, + hdcSrc, rcSrc.left, rcSrc.top+sm.cyTopHeight, + sm.cxLeftWidth, srcCenterHeight, + sizingtype, + transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + /* Right center */ + if(!UXTHEME_SizedBlt (hdcDst, dstSize.x-sm.cxRightWidth, sm.cyTopHeight, + sm.cxRightWidth, destCenterHeight, + hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top+sm.cyTopHeight, + sm.cxRightWidth, srcCenterHeight, + sizingtype, transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + } + if(destCenterHeight > 0 && destCenterWidth > 0) { + if(!borderonly) { + /* Center */ + if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, sm.cyTopHeight, + destCenterWidth, destCenterHeight, + hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top+sm.cyTopHeight, + srcCenterWidth, srcCenterHeight, + sizingtype, transparent, transparentcolor)) { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto draw_error; + } + } + } + } + +draw_error: + SetViewportOrgEx (hdcDst, org.x, org.y, NULL); + } + SelectObject(hdcSrc, oldSrc); + DeleteDC(hdcSrc); + if (bmpSrcResized) DeleteObject(bmpSrcResized); + if (hdcOrigSrc) DeleteDC(hdcOrigSrc); + *pRect = rcDst; + return hr; +} /* * @unimplemented */ BOOL WINAPI -GdiDrawStream(HDC dc, ULONG l, VOID *v) // See Bug 4784 -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); +GdiDrawStream(HDC dc, ULONG l, PGDI_DRAW_STREAM pDS) +{ + if (!pDS || l != sizeof(*pDS)) + { + DPRINT1("GdiDrawStream: Invalid params\n"); + return 0; + } + + if (pDS->signature != 0x44727753 || + pDS->reserved != 0 || + pDS->unknown1 != 1 || + pDS->unknown2 != 9) + { + DPRINT1("GdiDrawStream: Got unknown pDS data\n"); + return 0; + } + + { + MARGINS sm = {pDS->leftSizingMargin, pDS->rightSizingMargin, pDS->topSizingMargin, pDS->bottomSizingMargin}; + INT transparent = 0; + int sizingtype; + + if (pDS->drawOption & 0x4) + transparent = ALPHABLEND_FULL; + else if (pDS->drawOption & 0x8) + transparent = ALPHABLEND_BINARY; + else + transparent = ALPHABLEND_NONE; + + if (pDS->drawOption & 0x2) + sizingtype = ST_TILE; + else if (pDS->drawOption & 0x20) + sizingtype = ST_TRUESIZE; + else + sizingtype = ST_STRETCH; + + UXTHEME_DrawImageBackground(pDS->hDC, + pDS->hImage, + &pDS->rcSrc, + transparent, + pDS->crTransparent, + FALSE, + sizingtype, + &sm, + &pDS->rcDest); + } return 0; }

1 0

[gadamopoulos] 74279: [SHSVCS] -Add the module that should host the theme service. Implement ThemeWaitForServiceReady and ThemeWatchForStart. These are already called by our msgina and are responsi...
by gadamopoulos＠svn.reactos.org 07 Apr '17

07 Apr '17

Author: gadamopoulos Date: Fri Apr 7 13:01:42 2017 New Revision: 74279 URL: http://svn.reactos.org/svn/reactos?rev=74279&view=rev Log: [SHSVCS] -Add the module that should host the theme service. Implement ThemeWaitForServiceReady and ThemeWatchForStart. These are already called by our msgina and are responsible for starting themes in the session. Added: trunk/reactos/base/services/shsvcs/ trunk/reactos/base/services/shsvcs/CMakeLists.txt (with props) trunk/reactos/base/services/shsvcs/shsvcs.c (with props) trunk/reactos/base/services/shsvcs/shsvcs.rc (with props) trunk/reactos/base/services/shsvcs/shsvcs.spec (with props) trunk/reactos/base/services/shsvcs/thmserver.c (with props) trunk/reactos/base/services/shsvcs/thmsvc.c - copied, changed from r74278, trunk/reactos/base/services/thmsvc/thmsvc.c Removed: trunk/reactos/base/services/thmsvc/ Modified: trunk/reactos/base/services/CMakeLists.txt trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/CMakeLists.t… ============================================================================== --- trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] Fri Apr 7 13:01:42 2017 @@ -4,12 +4,12 @@ add_subdirectory(eventlog) add_subdirectory(rpcss) add_subdirectory(schedsvc) +add_subdirectory(shsvcs) add_subdirectory(srvsvc) add_subdirectory(svchost) add_subdirectory(tcpsvcs) add_subdirectory(telnetd) #add_subdirectory(tftpd) -add_subdirectory(thmsvc) add_subdirectory(umpnpmgr) add_subdirectory(wkssvc) add_subdirectory(wlansvc) Added: trunk/reactos/base/services/shsvcs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/shsvcs/CMake… ============================================================================== --- trunk/reactos/base/services/shsvcs/CMakeLists.txt (added) +++ trunk/reactos/base/services/shsvcs/CMakeLists.txt [iso-8859-1] Fri Apr 7 13:01:42 2017 @@ -0,0 +1,15 @@ + +spec2def(shsvcs.dll shsvcs.spec ADD_IMPORTLIB) + +add_library(shsvcs SHARED + shsvcs.c + thmsvc.c + thmserver.c + shsvcs.rc + ${CMAKE_CURRENT_BINARY_DIR}/shsvcs_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/shsvcs.def) + +set_module_type(shsvcs win32dll UNICODE) +target_link_libraries(shsvcs wine) +add_importlibs(shsvcs uxtheme advapi32 msvcrt kernel32 ntdll) +add_cd_file(TARGET shsvcs DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/services/shsvcs/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/shsvcs/shsvcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/shsvcs/shsvc… ============================================================================== --- trunk/reactos/base/services/shsvcs/shsvcs.c (added) +++ trunk/reactos/base/services/shsvcs/shsvcs.c [iso-8859-1] Fri Apr 7 13:01:42 2017 @@ -0,0 +1,60 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Shell + * FILE: base/services/shsvcs/shsvcs.c + * PURPOSE: ReactOS Shell Services + * PROGRAMMER: Giannis Adamopoulos + */ + +/* INCLUDES *****************************************************************/ + +#include <windows.h> +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(shsvcs); + +/* FUNCTIONS *****************************************************************/ + +HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) +{ + return S_OK; +} + +HRESULT WINAPI DllRegisterServer() +{ + return S_OK; +} + +HRESULT WINAPI DllUnregisterServer() +{ + return S_OK; +} + +HRESULT WINAPI DllCanUnloadNow() +{ + return S_OK; +} + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + TRACE("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} Propchange: trunk/reactos/base/services/shsvcs/shsvcs.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/shsvcs/shsvcs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/shsvcs/shsvc… ============================================================================== --- trunk/reactos/base/services/shsvcs/shsvcs.rc (added) +++ trunk/reactos/base/services/shsvcs/shsvcs.rc [iso-8859-1] Fri Apr 7 13:01:42 2017 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Shell Services Dll" +#define REACTOS_STR_INTERNAL_NAME "shsvcs" +#define REACTOS_STR_ORIGINAL_FILENAME "shsvcs.dll" +#include <reactos/version.rc> Propchange: trunk/reactos/base/services/shsvcs/shsvcs.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/shsvcs/shsvcs.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/shsvcs/shsvc… ============================================================================== --- trunk/reactos/base/services/shsvcs/shsvcs.spec (added) +++ trunk/reactos/base/services/shsvcs/shsvcs.spec [iso-8859-1] Fri Apr 7 13:01:42 2017 @@ -0,0 +1,16 @@ +1 stdcall ThemeWatchForStart() +2 stdcall ThemeWaitForServiceReady(long) +#3 stub Stub3 +#4 stub Stub4 +#5 stub Stub5 +#6 stub Stub6 +#7 stub BadApplicationServiceMain +8 stdcall DllInstall(long wstr) +9 stdcall DllRegisterServer() +10 stdcall DllUnregisterServer() +#11 stub HardwareDetectionServiceMain +12 stdcall ThemeServiceMain(long ptr) +#13 stub CreateHardwareEventMoniker +14 stdcall DllCanUnloadNow() +15 stdcall DllGetClassObject(ptr ptr ptr) +#16 stub FUSCompatibilityEntryW Propchange: trunk/reactos/base/services/shsvcs/shsvcs.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/shsvcs/thmserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/shsvcs/thmse… ============================================================================== --- trunk/reactos/base/services/shsvcs/thmserver.c (added) +++ trunk/reactos/base/services/shsvcs/thmserver.c [iso-8859-1] Fri Apr 7 13:01:42 2017 @@ -0,0 +1,177 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: base/services/thmsvc/thmserver.c + * PURPOSE: Themes server + * PROGRAMMER: Giannis Adamopoulos + */ + +/* + * NOTE: + * ThemeWaitForServiceReady and ThemeWatchForStart are called from msgina + * so all the functions in this file run in the context of winlogon + */ + +/* INCLUDES *****************************************************************/ + +#include <windows.h> +#include <uxtheme.h> +#include <uxundoc.h> +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(shsvcs); + +/* GLOBALS ******************************************************************/ + +static WCHAR ServiceName[] = L"Themes"; + +HANDLE hThemeStartWaitObject, hThemeStopWaitObject, hThemeServiceWaitObject; +HANDLE hStartEvent, hStopEvent, hServiceProcess; + +BOOL WINAPI ThemeWatchForStart(); + +/* FUNCTIONS *****************************************************************/ + +static +HANDLE +GetThemeServiceProcessHandle() +{ + SC_HANDLE scm, service; + SERVICE_STATUS_PROCESS status; + DWORD dummy; + HANDLE ret; + + if (!(scm = OpenSCManagerW( NULL, NULL, 0 ))) + { + ERR( "failed to open service manager\n" ); + return NULL; + } + if (!(service = OpenServiceW( scm, ServiceName, SERVICE_QUERY_STATUS ))) + { + ERR( "failed to open themes service\n" ); + CloseServiceHandle( scm ); + return NULL; + } + + if (!QueryServiceStatusEx( service, SC_STATUS_PROCESS_INFO, + (BYTE *)&status, sizeof(status), &dummy )) + { + ERR("QueryServiceStatusEx failed\n"); + CloseServiceHandle( service ); + CloseServiceHandle( scm ); + return NULL; + } + + ret = OpenProcess(SYNCHRONIZE, FALSE, status.dwProcessId); + + CloseServiceHandle( service ); + CloseServiceHandle( scm ); + + return ret; +} + +static +VOID +CALLBACK +ThemeStopCallback(PVOID lpParameter, BOOLEAN TimerOrWaitFired) +{ + CloseHandle(hServiceProcess); + UnregisterWait(hThemeStopWaitObject); + UnregisterWait(hThemeServiceWaitObject); + + ThemeWatchForStart(); + ThemeHooksRemove(); +} + +static +VOID +CALLBACK +ThemeServiceDiedCallback(PVOID lpParameter, BOOLEAN TimerOrWaitFired) +{ + /* The theme service died and we don't know if it could set its events properly */ + ResetEvent(hStartEvent); + ResetEvent(hStopEvent); + + ThemeStopCallback(lpParameter, TimerOrWaitFired); +} + +static +VOID +CALLBACK +ThemeStartCallback(PVOID lpParameter, BOOLEAN TimerOrWaitFired) +{ + UnregisterWait(hThemeStartWaitObject); + + hServiceProcess = GetThemeServiceProcessHandle(); + + RegisterWaitForSingleObject(&hThemeStopWaitObject, hStopEvent, ThemeStopCallback, NULL, INFINITE, WT_EXECUTEDEFAULT); + RegisterWaitForSingleObject(&hThemeServiceWaitObject, hServiceProcess, ThemeServiceDiedCallback, NULL, INFINITE, WT_EXECUTEDEFAULT); + + ThemeHooksInstall(); +} + +BOOL +WINAPI +ThemeWatchForStart() +{ + hStartEvent = CreateEventW(NULL, TRUE, FALSE, L"Global\\ThemeStartEvent"); + hStopEvent = CreateEventW(NULL, TRUE, FALSE, L"Global\\ThemeStopEvent"); + + RegisterWaitForSingleObject(&hThemeStartWaitObject, hStartEvent, ThemeStartCallback, NULL, INFINITE, WT_EXECUTEDEFAULT); + + return TRUE; +} + +DWORD +WINAPI +ThemeWaitForServiceReady(DWORD dwTimeout) +{ + SC_HANDLE scm, service; + SERVICE_STATUS_PROCESS status; + BOOL ret = FALSE; + DWORD start_time = GetTickCount(); + + TRACE("\n"); + + if (!(scm = OpenSCManagerW( NULL, NULL, 0 ))) + { + ERR( "failed to open service manager\n" ); + return FALSE; + } + if (!(service = OpenServiceW( scm, ServiceName, SERVICE_QUERY_STATUS ))) + { + ERR( "failed to open themes service\n" ); + CloseServiceHandle( scm ); + return FALSE; + } + + while(TRUE) + { + DWORD dummy; + + if (!QueryServiceStatusEx( service, SC_STATUS_PROCESS_INFO, + (BYTE *)&status, sizeof(status), &dummy )) + break; + if (status.dwCurrentState == SERVICE_RUNNING) + { + ret = TRUE; + break; + } + if (status.dwCurrentState != SERVICE_START_PENDING) + { + break; + } + + if (GetTickCount() - start_time > dwTimeout) + { + break; + } + Sleep( 100 ); + }; + + CloseServiceHandle( service ); + CloseServiceHandle( scm ); + return ret; +} + +/* EOF */ Propchange: trunk/reactos/base/services/shsvcs/thmserver.c ------------------------------------------------------------------------------ svn:eol-style = native Copied: trunk/reactos/base/services/shsvcs/thmsvc.c (from r74278, trunk/reactos/base/services/thmsvc/thmsvc.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/shsvcs/thmsv… ============================================================================== --- trunk/reactos/base/services/thmsvc/thmsvc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/shsvcs/thmsvc.c [iso-8859-1] Fri Apr 7 13:01:42 2017 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: base/services/thmsvc/thmsvc.c + * FILE: base/services/shsvcs/thmsvc.c * PURPOSE: Themes service * PROGRAMMER: Giannis Adamopoulos */ @@ -9,28 +9,21 @@ /* INCLUDES *****************************************************************/ #include <windows.h> -#include <uxtheme.h> -#include <uxundoc.h> #include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(thmsvc); - +WINE_DEFAULT_DEBUG_CHANNEL(shsvcs); /* GLOBALS ******************************************************************/ -static VOID CALLBACK ServiceMain(DWORD argc, LPWSTR *argv); static WCHAR ServiceName[] = L"Themes"; -static SERVICE_TABLE_ENTRYW ServiceTable[] = -{ - {ServiceName, ServiceMain}, - {NULL, NULL} -}; SERVICE_STATUS_HANDLE ServiceStatusHandle; SERVICE_STATUS ServiceStatus; /* FUNCTIONS *****************************************************************/ + +HANDLE StartEvent, StopEvent; static VOID UpdateServiceStatus(DWORD dwState) @@ -74,7 +67,10 @@ { case SERVICE_CONTROL_STOP: TRACE(" SERVICE_CONTROL_STOP received\n"); - ThemeHooksRemove(); + + /* Signal the theme server in winlogon to remove theme hooks */ + ResetEvent(StartEvent); + SetEvent(StopEvent); UpdateServiceStatus(SERVICE_STOPPED); return ERROR_SUCCESS; @@ -105,42 +101,30 @@ } } - -static VOID CALLBACK -ServiceMain(DWORD argc, LPWSTR *argv) +VOID +WINAPI +ThemeServiceMain(DWORD argc, LPTSTR *argv) { UNREFERENCED_PARAMETER(argc); UNREFERENCED_PARAMETER(argv); - TRACE("ServiceMain() called\n"); - ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, ServiceControlHandler, NULL); + if (!ServiceStatusHandle) + { + ERR("RegisterServiceCtrlHandlerExW() failed! (Error %lu)\n", GetLastError()); + return; + } - TRACE("Calling SetServiceStatus()\n"); + StartEvent = CreateEventW(NULL, TRUE, FALSE, L"Global\\ThemeStartEvent"); + StopEvent = CreateEventW(NULL, TRUE, FALSE, L"Global\\ThemeStopEvent"); + UpdateServiceStatus(SERVICE_RUNNING); - TRACE("SetServiceStatus() called\n"); - ThemeHooksInstall(); - - TRACE("ServiceMain() done\n"); -} - - -int -wmain(int argc, WCHAR *argv[]) -{ - UNREFERENCED_PARAMETER(argc); - UNREFERENCED_PARAMETER(argv); - - TRACE("thmsvc: main() started\n"); - - StartServiceCtrlDispatcher(ServiceTable); - - TRACE("thmsvc: main() done\n"); - - return 0; + /* Signal the theme server in winlogon to install theme hooks */ + ResetEvent(StopEvent); + SetEvent(StartEvent); } /* EOF */ Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Fri Apr 7 13:01:42 2017 @@ -1651,7 +1651,7 @@ ; SvcHost services HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","DcomLaunch",0x00010000,"PlugPlay" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"DHCP","BITS","lanmanserver","lanmanworkstation","Schedule","winmgmt" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"DHCP","BITS","lanmanserver","lanmanworkstation","Schedule","Themes","winmgmt" ; Win32 config HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows",,0x00000012 Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Fri Apr 7 13:01:42 2017 @@ -1982,10 +1982,12 @@ 80,51,01,00,00,00,00,00,00,00,00,00,03,00,00,00,00,00,00,00, \ 01,00,00,00,60,ea,00,00,01,00,00,00,60,ea,00,00,00,00,00,00,00,00,00,00 HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Group",0x00000000,"UIGroup" -HKLM,"SYSTEM\CurrentControlSet\Services\Themes","ImagePath",0x00020000,"%SystemRoot%\system32\thmsvc.exe" +HKLM,"SYSTEM\CurrentControlSet\Services\Themes","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" HKLM,"SYSTEM\CurrentControlSet\Services\Themes","ObjectName",0x00000000,"LocalSystem" HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Themes","Type",0x00010001,0x00000020 +HKLM,"SYSTEM\CurrentControlSet\Services\Themes\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\shsvcs.dll" +HKLM,"SYSTEM\CurrentControlSet\Services\Themes\Parameters","ServiceMain",0x00000000,"ThemeServiceMain" ; ReactOS Installer Service HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","DependOnService",0x00010000,"RPCSS"

1 0

[gadamopoulos] 74278: [WIN32K] -Implement NtUserCalcMenuBar.
by gadamopoulos＠svn.reactos.org 05 Apr '17

05 Apr '17

Author: gadamopoulos Date: Wed Apr 5 21:07:44 2017 New Revision: 74278 URL: http://svn.reactos.org/svn/reactos?rev=74278&view=rev Log: [WIN32K] -Implement NtUserCalcMenuBar. Modified: trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/ntstubs.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Wed Apr 5 21:07:44 2017 @@ -5288,6 +5288,54 @@ /* * @implemented */ +/* http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634c… */ +DWORD +APIENTRY +NtUserCalcMenuBar( + HWND hwnd, + DWORD leftBorder, + DWORD rightBorder, + DWORD top, + LPRECT prc ) +{ + HDC hdc; + PWND Window; + RECT Rect; + DWORD ret; + + UserEnterExclusive(); + + if(!(Window = UserGetWindowObject(hwnd))) + { + EngSetLastError(ERROR_INVALID_WINDOW_HANDLE); + UserLeave(); + return 0; + } + + hdc = UserGetDCEx(NULL, NULL, DCX_CACHE); + if (!hdc) + { + UserLeave(); + return 0; + } + + Rect.left = leftBorder; + Rect.right = Window->rcWindow.right - Window->rcWindow.left - rightBorder; + Rect.top = top; + Rect.bottom = 0; + + ret = MENU_DrawMenuBar(hdc, &Rect, Window, TRUE); + + UserReleaseDC( 0, hdc, FALSE ); + + UserLeave(); + + return ret; +} + +/* + * @implemented + */ DWORD APIENTRY NtUserCheckMenuItem( HMENU hMenu, Modified: trunk/reactos/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntstub… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntstubs.c [iso-8859-1] Wed Apr 5 21:07:44 2017 @@ -862,20 +862,6 @@ return 0; } -/* http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634c… */ -DWORD -APIENTRY -NtUserCalcMenuBar( - HWND hwnd, - DWORD x, - DWORD width, // Scale the edge thickness, offset? - DWORD y, - LPRECT prc ) -{ - ERR("hwnd %p, X %d, Width %d, Y %d, prc 0x%x\n",hwnd,x,width,y,prc); - return 0; -} - DWORD APIENTRY NtUserRemoteConnect(

1 0

[tfaber] 74277: [NTOS:IO] - Remove broken casts
by tfaber＠svn.reactos.org 05 Apr '17

05 Apr '17

Author: tfaber Date: Wed Apr 5 14:00:03 2017 New Revision: 74277 URL: http://svn.reactos.org/svn/reactos?rev=74277&view=rev Log: [NTOS:IO] - Remove broken casts Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/io/iomgr/rawfs.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Wed Apr 5 14:00:03 2017 @@ -1050,7 +1050,7 @@ Irp->Cancel = TRUE; /* Clear the cancel routine and get the old one */ - CancelRoutine = (PVOID)IoSetCancelRoutine(Irp, NULL); + CancelRoutine = IoSetCancelRoutine(Irp, NULL); if (CancelRoutine) { /* We had a routine, make sure the IRP isn't completed */ Modified: trunk/reactos/ntoskrnl/io/iomgr/rawfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/rawfs.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/rawfs.c [iso-8859-1] Wed Apr 5 14:00:03 2017 @@ -1053,9 +1053,10 @@ NTSTATUS NTAPI -RawDispatch(IN PVOLUME_DEVICE_OBJECT DeviceObject, +RawDispatch(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PVOLUME_DEVICE_OBJECT VolumeDeviceObject = (PVOLUME_DEVICE_OBJECT)DeviceObject; NTSTATUS Status = STATUS_INVALID_DEVICE_REQUEST; PIO_STACK_LOCATION IoStackLocation; PVCB Vcb; @@ -1067,7 +1068,7 @@ IoStackLocation = IoGetCurrentIrpStackLocation(Irp); /* Differentiate between Volume DO and FS DO */ - if ((((PDEVICE_OBJECT)DeviceObject)->Size == sizeof(DEVICE_OBJECT)) && + if ((DeviceObject->Size == sizeof(DEVICE_OBJECT)) && !((IoStackLocation->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL) && (IoStackLocation->MinorFunction == IRP_MN_MOUNT_VOLUME))) { @@ -1093,7 +1094,7 @@ /* Otherwise, get our VCB and start handling the IRP */ FsRtlEnterFileSystem(); - Vcb = &DeviceObject->Vcb; + Vcb = &VolumeDeviceObject->Vcb; /* Check what kind of IRP this is */ switch (IoStackLocation->MajorFunction) @@ -1252,7 +1253,7 @@ DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = (PDRIVER_DISPATCH)RawDispatch; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = RawDispatch; /* Shutdown and unload */ DriverObject->MajorFunction[IRP_MJ_SHUTDOWN] = RawShutdown;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2017