Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [COMDLG32] Fix treatment of wrong filename extension (#1545)
by Katayama Hirofumi MZ 02 May '19

02 May '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dcaaf3e7af8ecd9448e82… commit dcaaf3e7af8ecd9448e82dcf0cce034b698e1a1c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu May 2 22:48:01 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 2 22:48:01 2019 +0900 [COMDLG32] Fix treatment of wrong filename extension (#1545) Fix treatment of wrong filename extensions upon GetOpenFileName/GetSaveFileName. CORE-15270 --- dll/win32/comdlg32/filedlg.c | 97 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dll/win32/comdlg32/filedlg.c b/dll/win32/comdlg32/filedlg.c index 76d18bf47e..4afdae19af 100644 --- a/dll/win32/comdlg32/filedlg.c +++ b/dll/win32/comdlg32/filedlg.c @@ -2985,6 +2985,102 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) /* Attach the file extension with file name*/ ext = PathFindExtensionW(lpstrPathAndFile); +#ifdef __REACTOS__ + { + LPWSTR filterExt = NULL, lpstrFilter = NULL, pch, pchNext; + LPCWSTR the_ext = NULL; + static const WCHAR szwDot[] = {'.',0}; + int PathLength = lstrlenW(lpstrPathAndFile); + + /* get filter extensions */ + lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, + fodInfos->ofnInfos->nFilterIndex - 1); + if (lpstrFilter != (LPWSTR)CB_ERR) /* control is not empty */ + { + LPWSTR filterSearchIndex, pchFirst = NULL; + filterExt = heap_alloc((lstrlenW(lpstrFilter) + 1) * sizeof(WCHAR)); + if (filterExt) + { + strcpyW(filterExt, lpstrFilter); + + if (ext && *ext) + { + /* find ext in filter */ + for (pch = filterExt; pch && *pch; pch = pchNext) + { + filterSearchIndex = strchrW(pch, ';'); + if (filterSearchIndex) + { + filterSearchIndex[0] = 0; + pchNext = filterSearchIndex + 1; + } + else + { + pchNext = NULL; + } + + while (*pch == '*' || *pch == '.' || *pch == '?') + { + ++pch; + } + + if (!pchFirst) + pchFirst = pch; + + if (lstrcmpiW(pch, &ext[1]) == 0) + { + the_ext = pch; + break; + } + } + + /* use first one if not found */ + if (!the_ext && pchFirst && *pchFirst) + { + the_ext = pchFirst; + } + } + } + } + + if (!the_ext) + { + /* use default extension if no extension in filter */ + the_ext = fodInfos->defext; + } + + if (the_ext && *the_ext && lstrcmpiW(&ext[1], the_ext) != 0) + { + if (strlenW(lpstrPathAndFile) + 1 + strlenW(the_ext) + 1 <= + fodInfos->ofnInfos->nMaxFile) + { + /* append the dot */ + lstrcatW(lpstrPathAndFile, szwDot); + /* append the extension */ + lstrcatW(lpstrPathAndFile, the_ext); + /* update ext */ + ext = PathFindExtensionW(lpstrPathAndFile); + } + } + + heap_free(filterExt); + + /* In Open dialog: if file does not exist try without extension */ + if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) && !PathFileExistsW(lpstrPathAndFile)) + lpstrPathAndFile[PathLength] = 0; + + /* Set/clear the output OFN_EXTENSIONDIFFERENT flag */ + if (*ext) + ext++; + if (!lstrcmpiW(fodInfos->defext, ext)) + fodInfos->ofnInfos->Flags &= ~OFN_EXTENSIONDIFFERENT; + else + fodInfos->ofnInfos->Flags |= OFN_EXTENSIONDIFFERENT; + } + + /* update dialog data */ + SetWindowTextW(fodInfos->DlgInfos.hwndFileName, PathFindFileNameW(lpstrPathAndFile)); +#else if (! *ext && fodInfos->defext) { /* if no extension is specified with file name, then */ @@ -3058,6 +3154,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) else fodInfos->ofnInfos->Flags |= OFN_EXTENSIONDIFFERENT; } +#endif /* In Save dialog: check if the file already exists */ if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG

1 0

[reactos] 01/01: [NTDLL_APITEST] Query sector size for NtWriteFile tests
by Pierre Schweitzer 02 May '19

02 May '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bdaa8e5ad1064e6bbb3a6… commit bdaa8e5ad1064e6bbb3a61c23248b8d2b22e117d Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu May 2 13:59:47 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu May 2 13:59:47 2019 +0200 [NTDLL_APITEST] Query sector size for NtWriteFile tests --- modules/rostests/apitests/ntdll/NtWriteFile.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/ntdll/NtWriteFile.c b/modules/rostests/apitests/ntdll/NtWriteFile.c index 1383e4e71c..7080fa84ec 100644 --- a/modules/rostests/apitests/ntdll/NtWriteFile.c +++ b/modules/rostests/apitests/ntdll/NtWriteFile.c @@ -38,6 +38,24 @@ SizeOfMdl(VOID) return Is64BitSystem() ? 48 : 28; } +static +ULONG +SizeOfSector(VOID) +{ + BOOL Ret; + ULONG SectorSize; + + /* FIXME: Would be better to actually open systemroot */ + Ret = GetDiskFreeSpaceW(NULL, NULL, &SectorSize, NULL, NULL); + ok(Ret != FALSE, "GetDiskFreeSpaceW failed: %lx\n", GetLastError()); + if (!Ret) + { + SectorSize = 4096; /* On failure, assume max size */ + } + + return SectorSize; +} + START_TEST(NtWriteFile) { NTSTATUS Status; @@ -213,7 +231,10 @@ START_TEST(NtWriteFile) ok_hex(Status, STATUS_SUCCESS); /* Now, testing aligned/non aligned writes */ - BufferSize = 4096; /* We assume max sector size */ + + BufferSize = SizeOfSector(); + trace("Sector is %ld bytes\n", BufferSize); + Status = NtAllocateVirtualMemory(NtCurrentProcess(), &Buffer, 0,

1 0

[reactos] 01/01: [NTDLL_APITEST] Add tests for alignment for NtWriteFile This mimics the usage of WriteFile which is done in rosautotest.
by Pierre Schweitzer 02 May '19

02 May '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64b6327dd78d2e145e9bc… commit 64b6327dd78d2e145e9bc67681f52800177887ad Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Thu May 2 12:07:46 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu May 2 12:09:34 2019 +0200 [NTDLL_APITEST] Add tests for alignment for NtWriteFile This mimics the usage of WriteFile which is done in rosautotest. CORE-15973 --- modules/rostests/apitests/ntdll/NtWriteFile.c | 84 +++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/modules/rostests/apitests/ntdll/NtWriteFile.c b/modules/rostests/apitests/ntdll/NtWriteFile.c index f9f1e70236..1383e4e71c 100644 --- a/modules/rostests/apitests/ntdll/NtWriteFile.c +++ b/modules/rostests/apitests/ntdll/NtWriteFile.c @@ -211,4 +211,88 @@ START_TEST(NtWriteFile) &BufferSize, MEM_RELEASE); ok_hex(Status, STATUS_SUCCESS); + + /* Now, testing aligned/non aligned writes */ + BufferSize = 4096; /* We assume max sector size */ + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &Buffer, + 0, + &BufferSize, + MEM_RESERVE | MEM_COMMIT, + PAGE_READONLY); + if (!NT_SUCCESS(Status)) + { + skip("Failed to allocate memory, status %lx\n", Status); + return; + } + + Status = NtCreateFile(&FileHandle, + FILE_WRITE_DATA | DELETE | SYNCHRONIZE, + &ObjectAttributes, + &IoStatus, + NULL, + 0, + 0, + FILE_SUPERSEDE, + FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | + FILE_NO_INTERMEDIATE_BUFFERING | + FILE_WRITE_THROUGH, + NULL, + 0); + ok_hex(Status, STATUS_SUCCESS); + + /* non-cached, broken length -- fails with invalid parameter */ + ByteOffset.QuadPart = 0; + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatus, + Buffer, + 4, + &ByteOffset, + NULL); + ok_hex(Status, STATUS_INVALID_PARAMETER); + + /* non-cached, broken offset -- fails with invalid parameter */ + ByteOffset.QuadPart = 4; + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatus, + Buffer, + BufferSize, + &ByteOffset, + NULL); + ok_hex(Status, STATUS_INVALID_PARAMETER); + + /* non-cached, good length and offset -- succeeds */ + ByteOffset.QuadPart = 0; + Status = NtWriteFile(FileHandle, + NULL, + NULL, + NULL, + &IoStatus, + Buffer, + BufferSize, + &ByteOffset, + NULL); + ok_hex(Status, STATUS_SUCCESS); + + DispositionInfo.DeleteFile = TRUE; + Status = NtSetInformationFile(FileHandle, + &IoStatus, + &DispositionInfo, + sizeof(DispositionInfo), + FileDispositionInformation); + ok_hex(Status, STATUS_SUCCESS); + Status = NtClose(FileHandle); + ok_hex(Status, STATUS_SUCCESS); + + Status = NtFreeVirtualMemory(NtCurrentProcess(), + &Buffer, + &BufferSize, + MEM_RELEASE); + ok_hex(Status, STATUS_SUCCESS); }

1 0

[reactos] 01/01: [GDI32] Add batch flag for Text Out
by James Tabor 02 May '19

02 May '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d004137549ec742a5d9e… commit 9d004137549ec742a5d9e6e893b84141c8e9408b Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Wed May 1 23:24:53 2019 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Wed May 1 23:24:53 2019 -0500 [GDI32] Add batch flag for Text Out Set batch flag for Text Out with font and attributes change sets. --- win32ss/gdi/gdi32/objects/text.c | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/gdi/gdi32/objects/text.c b/win32ss/gdi/gdi32/objects/text.c index ab86a51f11..6d4936edfc 100644 --- a/win32ss/gdi/gdi32/objects/text.c +++ b/win32ss/gdi/gdi32/objects/text.c @@ -568,6 +568,7 @@ ExtTextOutW( if ((pTeb->GdiTebBatch.Offset + cjSize ) <= GDIBATCHBUFSIZE) { + pdcattr->ulDirty_ |= DC_MODE_DIRTY|DC_FONTTEXT_DIRTY; pgO->cbCount = cwc; pgO->x = x; pgO->y = y;

1 0

[reactos] 01/01: [GDI32] Fix MS build
by James Tabor 02 May '19

02 May '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44b11ad6a90613f632954… commit 44b11ad6a90613f63295474cf7be041a968e9e32 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Wed May 1 20:53:06 2019 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Wed May 1 20:53:06 2019 -0500 [GDI32] Fix MS build Fix old uncovered code. --- win32ss/gdi/gdi32/objects/coord.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/coord.c b/win32ss/gdi/gdi32/objects/coord.c index f405490d84..dd40889ea0 100644 --- a/win32ss/gdi/gdi32/objects/coord.c +++ b/win32ss/gdi/gdi32/objects/coord.c @@ -866,7 +866,7 @@ OffsetViewportOrgEx( if (lpPoint) { - *lpPoint = (POINT)pdcattr->ptlViewportOrg; + *lpPoint = pdcattr->ptlViewportOrg; if ( pdcattr->dwLayout & LAYOUT_RTL) lpPoint->x = -lpPoint->x; } @@ -917,7 +917,7 @@ OffsetWindowOrgEx( if ( lpPoint ) { - *lpPoint = (POINT)pdcattr->ptlWindowOrg; + *lpPoint = pdcattr->ptlWindowOrg; //lpPoint->x = pdcattr->lWindowOrgx; }

1 0

[reactos] 01/01: [GDI32] Update signal flags for batch.
by James Tabor 02 May '19

02 May '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b751c31c74507699e1e3d… commit b751c31c74507699e1e3d8d4788d09ed11457783 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Wed May 1 20:33:09 2019 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Wed May 1 20:33:09 2019 -0500 [GDI32] Update signal flags for batch. Add removed flags for batch signaling. This will allow syncing of changed Xfroms after batched drawing. Disable calls to kernel mode since the code is closely identical. Kernel calls are for init time when PDCATTR is normally zero. ReactOS seems to work better keeping this from NULL. While making code changes add Xform state flags from: https://www.reactos.org/archives/public/ros-diffs/2019-May/070693.html Test BOT results: https://reactos.org/testman/compare.php?ids=67251,67254 https://reactos.org/testman/compare.php?ids=67253,67255 --- win32ss/gdi/gdi32/objects/coord.c | 62 +++++++++++++++++------------------- win32ss/gdi/gdi32/objects/dc.c | 4 +-- win32ss/gdi/gdi32/objects/font.c | 25 ++++----------- win32ss/gdi/gdi32/objects/painting.c | 2 ++ win32ss/gdi/gdi32/objects/text.c | 1 + 5 files changed, 40 insertions(+), 54 deletions(-) diff --git a/win32ss/gdi/gdi32/objects/coord.c b/win32ss/gdi/gdi32/objects/coord.c index a42fa1236b..f405490d84 100644 --- a/win32ss/gdi/gdi32/objects/coord.c +++ b/win32ss/gdi/gdi32/objects/coord.c @@ -279,7 +279,6 @@ GetWorldTransform( _In_ HDC hdc, _Out_ LPXFORM pxform) { -#if 0 PDC_ATTR pdcattr; pdcattr = GdiGetDcAttr(hdc); @@ -288,7 +287,7 @@ GetWorldTransform( SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - +#if 0 if (pdcattr->flXform & ANY_XFORM_INVALID) { GdiFixupTransforms(pdcattr); @@ -503,10 +502,10 @@ SetViewportExtEx( { if (NtCurrentTeb()->GdiTebBatch.HDC == hdc) { - if (pdcattr->ulDirty_ & DC_FONTTEXT_DIRTY) + if (pdcattr->ulDirty_ & DC_MODE_DIRTY) { NtGdiFlush(); // Sync up pdcattr from Kernel space. - pdcattr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + pdcattr->ulDirty_ &= ~DC_MODE_DIRTY; } } @@ -519,8 +518,7 @@ SetViewportExtEx( NtGdiMirrorWindowOrg(hdc); /* Update xform flags */ - pdcattr->flXform |= (PAGE_EXTENTS_CHANGED | INVALIDATE_ATTRIBUTES | - DEVICE_TO_WORLD_INVALID); + pdcattr->flXform |= (PAGE_EXTENTS_CHANGED|INVALIDATE_ATTRIBUTES|DEVICE_TO_WORLD_INVALID); } return TRUE; @@ -548,7 +546,7 @@ SetWindowOrgEx( /* Do not set LastError here! */ return FALSE; } -#if 0 + if (lpPoint) { lpPoint->x = pdcattr->ptlWindowOrg.x; @@ -558,23 +556,24 @@ SetWindowOrgEx( if ((pdcattr->ptlWindowOrg.x == X) && (pdcattr->ptlWindowOrg.y == Y)) return TRUE; - if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) + if (NtCurrentTeb()->GdiTebBatch.HDC == hdc) { - if (pdcattr->ulDirty_ & DC_FONTTEXT_DIRTY) + if (pdcattr->ulDirty_ & DC_MODE_DIRTY) { NtGdiFlush(); // Sync up pdcattr from Kernel space. - pdcattr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + pdcattr->ulDirty_ &= ~DC_MODE_DIRTY; } } pdcattr->ptlWindowOrg.x = X; - pdcattr->lWindowOrgx = X; pdcattr->ptlWindowOrg.y = Y; + + pdcattr->lWindowOrgx = X; if (pdcattr->dwLayout & LAYOUT_RTL) NtGdiMirrorWindowOrg(hdc); - pdcattr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); + pdcattr->flXform |= (PAGE_XLATE_CHANGED|WORLD_XFORM_CHANGED|DEVICE_TO_WORLD_INVALID); return TRUE; -#endif - return NtGdiSetWindowOrgEx(hdc, X, Y, lpPoint); + +// return NtGdiSetWindowOrgEx(hdc, X, Y, lpPoint); } /* @@ -630,10 +629,10 @@ SetWindowExtEx( if (NtCurrentTeb()->GdiTebBatch.HDC == hdc) { - if (pdcattr->ulDirty_ & DC_FONTTEXT_DIRTY) + if (pdcattr->ulDirty_ & DC_MODE_DIRTY) { NtGdiFlush(); // Sync up Dc_Attr from Kernel space. - pdcattr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + pdcattr->ulDirty_ &= ~DC_MODE_DIRTY; } } @@ -671,20 +670,19 @@ SetViewportOrgEx( return FALSE; } -#if 0 if (lpPoint) { lpPoint->x = pdcattr->ptlViewportOrg.x; lpPoint->y = pdcattr->ptlViewportOrg.y; if (pdcattr->dwLayout & LAYOUT_RTL) lpPoint->x = -lpPoint->x; } - pdcattr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); + pdcattr->flXform |= (PAGE_XLATE_CHANGED|WORLD_XFORM_CHANGED|DEVICE_TO_WORLD_INVALID); if (pdcattr->dwLayout & LAYOUT_RTL) X = -X; pdcattr->ptlViewportOrg.x = X; pdcattr->ptlViewportOrg.y = Y; return TRUE; -#endif - return NtGdiSetViewportOrgEx(hdc,X,Y,lpPoint); + +// return NtGdiSetViewportOrgEx(hdc,X,Y,lpPoint); } /* @@ -854,10 +852,9 @@ OffsetViewportOrgEx( _In_ int nYOffset, _Out_opt_ LPPOINT lpPoint) { - //PDC_ATTR pdcattr; + PDC_ATTR pdcattr; HANDLE_METADC(BOOL, OffsetViewportOrgEx, FALSE, hdc, nXOffset, nYOffset, lpPoint); -#if 0 /* Get the DC attribute */ pdcattr = GdiGetDcAttr(hdc); @@ -875,7 +872,7 @@ OffsetViewportOrgEx( if ( nXOffset || nYOffset != nXOffset ) { - if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) + if (NtCurrentTeb()->GdiTebBatch.HDC == hdc) { if (pdcattr->ulDirty_ & DC_MODE_DIRTY) { @@ -884,14 +881,14 @@ OffsetViewportOrgEx( } } - pdcattr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); + pdcattr->flXform |= (PAGE_XLATE_CHANGED|WORLD_XFORM_CHANGED|DEVICE_TO_WORLD_INVALID); if (pdcattr->dwLayout & LAYOUT_RTL) nXOffset = -nXOffset; pdcattr->ptlViewportOrg.x += nXOffset; pdcattr->ptlViewportOrg.y += nYOffset; } return TRUE; -#endif - return NtGdiOffsetViewportOrgEx(hdc, nXOffset, nYOffset, lpPoint); + +// return NtGdiOffsetViewportOrgEx(hdc, nXOffset, nYOffset, lpPoint); } /* @@ -906,11 +903,10 @@ OffsetWindowOrgEx( _In_ int nYOffset, _Out_opt_ LPPOINT lpPoint) { - //PDC_ATTR pdcattr; + PDC_ATTR pdcattr; HANDLE_METADC(BOOL, OffsetWindowOrgEx, FALSE, hdc, nXOffset, nYOffset, lpPoint); -#if 0 /* Get the DC attribute */ pdcattr = GdiGetDcAttr(hdc); if (!pdcattr) @@ -922,12 +918,12 @@ OffsetWindowOrgEx( if ( lpPoint ) { *lpPoint = (POINT)pdcattr->ptlWindowOrg; - lpPoint->x = pdcattr->lWindowOrgx; + //lpPoint->x = pdcattr->lWindowOrgx; } if ( nXOffset || nYOffset != nXOffset ) { - if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc) + if (NtCurrentTeb()->GdiTebBatch.HDC == hdc) { if (pdcattr->ulDirty_ & DC_MODE_DIRTY) { @@ -936,13 +932,13 @@ OffsetWindowOrgEx( } } - pdcattr->flXform |= (PAGE_XLATE_CHANGED|DEVICE_TO_WORLD_INVALID); + pdcattr->flXform |= (PAGE_XLATE_CHANGED|WORLD_XFORM_CHANGED|DEVICE_TO_WORLD_INVALID); pdcattr->ptlWindowOrg.x += nXOffset; pdcattr->ptlWindowOrg.y += nYOffset; pdcattr->lWindowOrgx += nXOffset; } return TRUE; -#endif - return NtGdiOffsetWindowOrgEx(hdc, nXOffset, nYOffset, lpPoint); + +// return NtGdiOffsetWindowOrgEx(hdc, nXOffset, nYOffset, lpPoint); } diff --git a/win32ss/gdi/gdi32/objects/dc.c b/win32ss/gdi/gdi32/objects/dc.c index 7ea146ab20..716e42ee51 100644 --- a/win32ss/gdi/gdi32/objects/dc.c +++ b/win32ss/gdi/gdi32/objects/dc.c @@ -1162,7 +1162,7 @@ SetPolyFillMode( if (pdcattr->ulDirty_ & DC_MODE_DIRTY) { NtGdiFlush(); // Sync up pdcattr from Kernel space. - pdcattr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + pdcattr->ulDirty_ &= ~DC_MODE_DIRTY; } } @@ -1230,7 +1230,7 @@ SetGraphicsMode( if (pdcattr->ulDirty_ & DC_MODE_DIRTY) { NtGdiFlush(); // Sync up pdcattr from Kernel space. - pdcattr->ulDirty_ &= ~(DC_MODE_DIRTY|DC_FONTTEXT_DIRTY); + pdcattr->ulDirty_ &= ~DC_MODE_DIRTY; } } diff --git a/win32ss/gdi/gdi32/objects/font.c b/win32ss/gdi/gdi32/objects/font.c index 8789223183..0d88defc57 100644 --- a/win32ss/gdi/gdi32/objects/font.c +++ b/win32ss/gdi/gdi32/objects/font.c @@ -2239,27 +2239,14 @@ SetMapperFlags( { DWORD Ret = GDI_ERROR; PDC_ATTR Dc_Attr; -#if 0 - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + + /* Get the DC attribute */ + Dc_Attr = GdiGetDcAttr(hDC); + if (Dc_Attr == NULL) { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_SetMapperFlags( hDC, flags); - else - { - PLDC pLDC = Dc_Attr->pvLDC; - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return GDI_ERROR; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_SetMapperFlags( hDC, flags); - } - } + SetLastError(ERROR_INVALID_PARAMETER); + return GDI_ERROR; } -#endif - if (!GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return GDI_ERROR; if (NtCurrentTeb()->GdiTebBatch.HDC == hDC) { diff --git a/win32ss/gdi/gdi32/objects/painting.c b/win32ss/gdi/gdi32/objects/painting.c index 8fc0d645c3..f41e7a78ab 100644 --- a/win32ss/gdi/gdi32/objects/painting.c +++ b/win32ss/gdi/gdi32/objects/painting.c @@ -469,6 +469,7 @@ PatBlt( pgO = GdiAllocBatchCommand(hdc, GdiBCPatBlt); if (pgO) { + pdcattr->ulDirty_ |= DC_MODE_DIRTY; pgO->nXLeft = nXLeft; pgO->nYLeft = nYLeft; pgO->nWidth = nWidth; @@ -553,6 +554,7 @@ PolyPatBlt( if ((pTeb->GdiTebBatch.Offset + cjSize) <= GDIBATCHBUFSIZE) { + pdcattr->ulDirty_ |= DC_MODE_DIRTY; pgO->Count = nCount; pgO->Mode = dwMode; pgO->rop4 = dwRop; diff --git a/win32ss/gdi/gdi32/objects/text.c b/win32ss/gdi/gdi32/objects/text.c index e35c7c99e8..ab86a51f11 100644 --- a/win32ss/gdi/gdi32/objects/text.c +++ b/win32ss/gdi/gdi32/objects/text.c @@ -526,6 +526,7 @@ ExtTextOutW( pgO = GdiAllocBatchCommand(hdc, GdiBCExtTextOut); if (pgO) { + pdcattr->ulDirty_ |= DC_MODE_DIRTY; pgO->Count = cwc; pgO->Rect = *lprc; pgO->Options = fuOptions;

1 0

[reactos] 01/01: [OSK] Hotfix for PR #1536 (#1549)
by Bișoc George 01 May '19

01 May '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8b90805ff124a951c903… commit f8b90805ff124a951c903535ce30090d7a57798a Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Wed May 1 10:33:13 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 1 22:22:08 2019 +0200 [OSK] Hotfix for PR #1536 (#1549) CORE-15965 --- base/applications/osk/main.c | 78 +++++++++++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 26 deletions(-) diff --git a/base/applications/osk/main.c b/base/applications/osk/main.c index 6f04d78f97..939326d0da 100644 --- a/base/applications/osk/main.c +++ b/base/applications/osk/main.c @@ -181,7 +181,7 @@ int OSK_DlgInitDialog(HWND hDlg) GetMonitorInfoW(monitor, &info); GetWindowRect(hDlg, &rcWindow); - /* + /* If the coordination values are default then re-initialize using the specific formulas to move the dialog at the bottom of the screen. */ @@ -191,7 +191,7 @@ int OSK_DlgInitDialog(HWND hDlg) Globals.PosY = info.rcMonitor.bottom - (rcWindow.bottom - rcWindow.top); } - /* + /* Calculate the intersection of two rectangle sources (dialog and work desktop area). If such sources do not intersect, then the dialog is deemed as "off screen". */ @@ -439,6 +439,7 @@ LRESULT APIENTRY OSK_ThemeHandler(HWND hDlg, NMCUSTOMDRAW *pNmDraw) { HTHEME hTheme; HWND hDlgButtonCtrl; + LRESULT Ret; INT iState = PBS_NORMAL; /* Retrieve the theme handle for the button controls */ @@ -451,34 +452,59 @@ LRESULT APIENTRY OSK_ThemeHandler(HWND hDlg, NMCUSTOMDRAW *pNmDraw) */ if (hTheme) { - /* - The button could be either in normal state or pushed. - Retrieve its state and save to a variable. - */ - if (pNmDraw->uItemState & CDIS_DEFAULT) - { - iState = PBS_DEFAULTED; - } - else if (pNmDraw->uItemState & CDIS_SELECTED) - { - iState = PBS_PRESSED; - } - else if (pNmDraw->uItemState & CDIS_HOT) + /* Obtain CDDS drawing stages */ + switch (pNmDraw->dwDrawStage) { - iState = PBS_HOT; - } + case CDDS_PREPAINT: + { + /* + The button could be either in normal state or pushed. + Retrieve its state and save to a variable. + */ + if (pNmDraw->uItemState & CDIS_DEFAULT) + { + iState = PBS_DEFAULTED; + } + else if (pNmDraw->uItemState & CDIS_SELECTED) + { + iState = PBS_PRESSED; + } + else if (pNmDraw->uItemState & CDIS_HOT) + { + iState = PBS_HOT; + } - if (IsThemeBackgroundPartiallyTransparent(hTheme, BP_PUSHBUTTON, iState)) - { - /* Draw the application if the theme is transparent */ - DrawThemeParentBackground(hDlg, pNmDraw->hdc, &pNmDraw->rc); - } + if (IsThemeBackgroundPartiallyTransparent(hTheme, BP_PUSHBUTTON, iState)) + { + /* Draw the application if the theme is transparent */ + DrawThemeParentBackground(hDlgButtonCtrl, pNmDraw->hdc, &pNmDraw->rc); + } - /* Draw it */ - DrawThemeBackground(hTheme, pNmDraw->hdc, BP_PUSHBUTTON, iState, &pNmDraw->rc, NULL); + /* Draw it */ + DrawThemeBackground(hTheme, pNmDraw->hdc, BP_PUSHBUTTON, iState, &pNmDraw->rc, NULL); + + Ret = CDRF_SKIPDEFAULT; + break; + } + + case CDDS_PREERASE: + { + Ret = CDRF_DODEFAULT; + break; + } + + default: + Ret = CDRF_SKIPDEFAULT; + break; + } + } + else + { + /* hTheme is NULL so bail right away */ + Ret = CDRF_DODEFAULT; } - return CDRF_SKIPDEFAULT; + return Ret; } /*********************************************************************** @@ -543,7 +569,7 @@ INT_PTR APIENTRY OSK_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { if (!Globals.bIsEnhancedKeyboard) { - /* + /* The user attempted to switch to enhanced keyboard dialog type. Set the member value as TRUE, destroy the dialog and save the data configuration into the registry. */

1 0

[reactos] 03/03: [ACGENRAL] Add a test shim
by Mark Jansen 01 May '19

01 May '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=575ab6c760ccc1439cf82… commit 575ab6c760ccc1439cf829824b5721c0426cb88c Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Apr 30 22:51:28 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed May 1 19:22:19 2019 +0200 [ACGENRAL] Add a test shim --- dll/appcompat/shims/genral/CMakeLists.txt | 1 + dll/appcompat/shims/genral/shimtest.c | 88 +++++++++++++++++++++++++++++++ media/sdb/sysmain.xml | 14 +++++ 3 files changed, 103 insertions(+) diff --git a/dll/appcompat/shims/genral/CMakeLists.txt b/dll/appcompat/shims/genral/CMakeLists.txt index da6a55d998..bc2c1d083f 100644 --- a/dll/appcompat/shims/genral/CMakeLists.txt +++ b/dll/appcompat/shims/genral/CMakeLists.txt @@ -7,6 +7,7 @@ list(APPEND SOURCE ignoredbgout.c ignorefreelib.c main.c + shimtest.c themes.c genral.spec) diff --git a/dll/appcompat/shims/genral/shimtest.c b/dll/appcompat/shims/genral/shimtest.c new file mode 100644 index 0000000000..630b04263b --- /dev/null +++ b/dll/appcompat/shims/genral/shimtest.c @@ -0,0 +1,88 @@ +/* + * PROJECT: ReactOS 'General' Shim library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test shim used to verify the inner working of the shim engine + * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#define WIN32_NO_STATUS +#include <windef.h> +#include <winbase.h> +#include <shimlib.h> +#include <strsafe.h> + + +#define SHIM_NS ShimTest +#include <setup_shim.inl> + + +typedef BOOL (WINAPI *tGetComputerNameA)(LPSTR lpBuffer, LPDWORD lpnSize); + +BOOL WINAPI SHIM_OBJ_NAME(GetComputerNameA)(LPSTR lpBuffer, LPDWORD lpnSize) +{ + CHAR Buffer[100] = {0}; + DWORD dwSize = sizeof(Buffer) - 1; + size_t cchLen; + + if (CALL_SHIM(0, tGetComputerNameA)(Buffer, &dwSize)) + { + SHIM_INFO("Original function returned: '%s'\n", Buffer); + } + else + { + SHIM_INFO("Original function failed\n"); + Buffer[0] = '\0'; + } + + if (!lpnSize) + { + SHIM_WARN("No lpnSize\n"); + return FALSE; + } + + StringCchCopyA(lpBuffer, *lpnSize, "ShimTest:"); + StringCchCatA(lpBuffer, *lpnSize, Buffer); + StringCchLengthA(lpBuffer, *lpnSize, &cchLen); + *lpnSize = (DWORD)cchLen; + return TRUE; +} + +typedef INT (WINAPI *tSHStringFromGUIDA)(REFGUID guid, LPSTR lpszDest, INT cchMax); +int WINAPI SHIM_OBJ_NAME(SHStringFromGUIDA)(REFGUID guid, LPSTR lpszDest, INT cchMax) +{ + CHAR Buffer[100] = {0}; + + if (CALL_SHIM(1, tSHStringFromGUIDA)(guid, Buffer, sizeof(Buffer)-1)) + { + SHIM_INFO("Original function returned: '%s'\n", Buffer); + } + else + { + SHIM_INFO("Original function failed\n"); + Buffer[0] = '\0'; + } + + StringCchCopyA(lpszDest, cchMax, "ShimTest:"); + StringCchCatA(lpszDest, cchMax, Buffer); + return 0; +} + + +BOOL WINAPI SHIM_OBJ_NAME(Notify)(DWORD fdwReason, PVOID ptr) +{ + if (fdwReason == SHIM_REASON_INIT) + { + SHIM_MSG("SHIM_REASON_INIT\n"); + } + return TRUE; +} + +#define SHIM_NOTIFY_FN SHIM_OBJ_NAME(Notify) +#define SHIM_NUM_HOOKS 2 +#define SHIM_SETUP_HOOKS \ + SHIM_HOOK(0, "KERNEL32.DLL", "GetComputerNameA", SHIM_OBJ_NAME(GetComputerNameA)) \ + SHIM_HOOK(1, "SHLWAPI.DLL", (PCSTR)23, SHIM_OBJ_NAME(SHStringFromGUIDA)) + + +#include <implement_shim.inl> + diff --git a/media/sdb/sysmain.xml b/media/sdb/sysmain.xml index de87df7c0d..7afab95388 100644 --- a/media/sdb/sysmain.xml +++ b/media/sdb/sysmain.xml @@ -225,6 +225,10 @@ <SHIM NAME="IgnoreLoadLibrary"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> + <SHIM NAME="ShimTest"> + <DLLFILE>acgenral.dll</DLLFILE> + <DESCRIPTION>Shim used to test ReactOS shim engine functionality</DESCRIPTION> + </SHIM> <SHIM NAME="VMHorizonSetup"> <DLLFILE>aclayers.dll</DLLFILE> </SHIM> @@ -405,5 +409,15 @@ <SHIM_REF NAME="IgnoreFreeLibrary" COMMAND_LINE="libpng12.dll" /> </EXE> +  + <EXE NAME="shimtest_ros.exe" APP_NAME="Shim test application" VENDOR="ReactOS"> + <MATCHING_FILE NAME="*"> + <FILE_DESCRIPTION>ReactOS Shim Engine test utility</FILE_DESCRIPTION> + <ORIGINAL_FILENAME>shimtest_ros.exe</ORIGINAL_FILENAME> + <INTERNAL_NAME>shimtest_ros</INTERNAL_NAME> + <COMPANY_NAME>ReactOS - test</COMPANY_NAME> + </MATCHING_FILE> + <SHIM_REF NAME="ShimTest" /> + </EXE> </DATABASE> </SDB> \ No newline at end of file

1 0

[reactos] 02/03: [ROSAPPS] Add a test application for shims
by Mark Jansen 01 May '19

01 May '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e9ca37517ee7ab224e94… commit 0e9ca37517ee7ab224e940649a4cd058e1184c63 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue Apr 30 22:50:21 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed May 1 19:22:19 2019 +0200 [ROSAPPS] Add a test application for shims --- .../rosapps/applications/devutils/CMakeLists.txt | 1 + .../devutils/shimtest_ros/CMakeLists.txt | 8 ++ .../devutils/shimtest_ros/shimtest_ros.c | 120 +++++++++++++++++++++ .../devutils/shimtest_ros/shimtest_ros.rc | 6 ++ 4 files changed, 135 insertions(+) diff --git a/modules/rosapps/applications/devutils/CMakeLists.txt b/modules/rosapps/applications/devutils/CMakeLists.txt index 5ea4b089d6..ccbc43e68e 100644 --- a/modules/rosapps/applications/devutils/CMakeLists.txt +++ b/modules/rosapps/applications/devutils/CMakeLists.txt @@ -5,6 +5,7 @@ add_subdirectory(gdihv) add_subdirectory(genguid) add_subdirectory(nls2txt) add_subdirectory(shimdbg) +add_subdirectory(shimtest_ros) add_subdirectory(shlextdbg) add_subdirectory(symdump) add_subdirectory(syscalldump) diff --git a/modules/rosapps/applications/devutils/shimtest_ros/CMakeLists.txt b/modules/rosapps/applications/devutils/shimtest_ros/CMakeLists.txt new file mode 100644 index 0000000000..d4fc95484c --- /dev/null +++ b/modules/rosapps/applications/devutils/shimtest_ros/CMakeLists.txt @@ -0,0 +1,8 @@ + +project(appcompat) + +add_executable(shimtest_ros shimtest_ros.c shimtest_ros.rc) + +set_module_type(shimtest_ros win32cui) +add_importlibs(shimtest_ros shlwapi msvcrt kernel32 ntdll) +add_cd_file(TARGET shimtest_ros DESTINATION reactos/bin FOR all) diff --git a/modules/rosapps/applications/devutils/shimtest_ros/shimtest_ros.c b/modules/rosapps/applications/devutils/shimtest_ros/shimtest_ros.c new file mode 100644 index 0000000000..69592297e1 --- /dev/null +++ b/modules/rosapps/applications/devutils/shimtest_ros/shimtest_ros.c @@ -0,0 +1,120 @@ +/* + * PROJECT: Shim test application + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test application for the shim engine + * COPYRIGHT: Copyright 2019 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include <stdio.h> +#include <stdlib.h> +#include <ctype.h> +#include <ntndk.h> +#include <winbase.h> + +NTSYSAPI ULONG NTAPI vDbgPrintEx(_In_ ULONG ComponentId, _In_ ULONG Level, _In_z_ PCCH Format, _In_ va_list ap); +#define DPFLTR_ERROR_LEVEL 0 + +void xprintf(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vprintf(fmt, ap); + vDbgPrintEx(-1, DPFLTR_ERROR_LEVEL, fmt, ap); + va_end(ap); +} + +void test_normal_imports() +{ + char buf[100]; + DWORD dwSize; + HMODULE mod; + BOOL (WINAPI *p_GetComputerNameA)(LPSTR lpBuffer, LPDWORD lpnSize); + + /* Call it directly */ + ZeroMemory(buf, sizeof(buf)); + dwSize = sizeof(buf); + if (!GetComputerNameA(buf, &dwSize)) + { + xprintf("GetComputerNameA failed: %d\n", GetLastError()); + } + else + { + xprintf("GetComputerNameA returned: '%s'\n", buf); + } + + /* Call it using GetProcAddress */ + mod = GetModuleHandleA("kernel32.dll"); + p_GetComputerNameA = (void*)GetProcAddress(mod, "GetComputerNameA"); + if (p_GetComputerNameA == NULL) + { + xprintf("GetProcAddress failed: %d\n", GetLastError()); + } + else + { + ZeroMemory(buf, sizeof(buf)); + dwSize = sizeof(buf); + if (!p_GetComputerNameA(buf, &dwSize)) + { + xprintf("p_GetComputerNameA failed: %d\n", GetLastError()); + } + else + { + xprintf("p_GetComputerNameA returned: '%s'\n", buf); + } + } +} + +INT WINAPI SHStringFromGUIDA(REFGUID,LPSTR,INT); +void test_ordinal_imports() +{ + GUID guid = { 0x11223344, 0x5566, 0x7788 }; + char buf[100]; + int r; + HMODULE mod; + INT (WINAPI *p_SHStringFromGUIDA)(REFGUID guid, LPSTR lpszDest, INT cchMax); + + /* Call it directly */ + ZeroMemory(buf, sizeof(buf)); + r = SHStringFromGUIDA(&guid, buf, _countof(buf)-1); + if (r) + { + xprintf("SHStringFromGUIDA failed (%d)\n", r); + } + else + { + xprintf("SHStringFromGUIDA returned: '%s'\n", buf); + } + + /* Call it using GetProcAddress */ + mod = GetModuleHandleA("shlwapi.dll"); + p_SHStringFromGUIDA = (void*)GetProcAddress(mod, (LPCSTR)23); + if (p_SHStringFromGUIDA == NULL) + { + xprintf("GetProcAddress failed: %d\n", GetLastError()); + } + else + { + ZeroMemory(buf, sizeof(buf)); + r = p_SHStringFromGUIDA(&guid, buf, _countof(buf)-1); + if (r) + { + xprintf("p_SHStringFromGUIDA failed (%d)\n", r); + } + else + { + xprintf("p_SHStringFromGUIDA returned: '%s'\n", buf); + } + } +} + + +int main(int argc, char* argv[]) +{ + xprintf("Normal import (kernel32!GetComputerNameA)\n"); + test_normal_imports(); + xprintf("\nOrdinal import (shlwapi!#23)\n"); + test_ordinal_imports(); + + return 0; +} diff --git a/modules/rosapps/applications/devutils/shimtest_ros/shimtest_ros.rc b/modules/rosapps/applications/devutils/shimtest_ros/shimtest_ros.rc new file mode 100644 index 0000000000..147e770cda --- /dev/null +++ b/modules/rosapps/applications/devutils/shimtest_ros/shimtest_ros.rc @@ -0,0 +1,6 @@ + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Shim Engine test utility" +#define REACTOS_STR_INTERNAL_NAME "shimtest_ros" +#define REACTOS_STR_ORIGINAL_FILENAME "shimtest_ros.exe" +#define REACTOS_STR_COMPANY_NAME "ReactOS - test" +#include <reactos/version.rc>

1 0

[reactos] 01/03: [APPHELP] Add ordinal import support
by Mark Jansen 01 May '19

01 May '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1570f08b4d82e44928d7b… commit 1570f08b4d82e44928d7b328fa07aa32759858e5 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Feb 11 22:40:51 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Wed May 1 19:22:19 2019 +0200 [APPHELP] Add ordinal import support --- dll/appcompat/apphelp/shimeng.c | 155 +++++++++++++++++++++++++--------------- 1 file changed, 96 insertions(+), 59 deletions(-) diff --git a/dll/appcompat/apphelp/shimeng.c b/dll/appcompat/apphelp/shimeng.c index 3e8a169617..190e17c2a7 100644 --- a/dll/appcompat/apphelp/shimeng.c +++ b/dll/appcompat/apphelp/shimeng.c @@ -37,6 +37,7 @@ static ARRAY g_pShimInfo; /* PSHIMMODULE */ static ARRAY g_pHookArray; /* HOOKMODULEINFO */ static ARRAY g_InExclude; /* INEXCLUDE */ +typedef FARPROC(WINAPI* GETPROCADDRESSPROC)(HINSTANCE, LPCSTR); /* If we have setup a hook for a function, we should also redirect GetProcAddress for this function */ HOOKAPIEX g_IntHookEx[] = { @@ -207,6 +208,39 @@ BOOL WINAPIV SeiDbgPrint(SEI_LOG_LEVEL Level, PCSTR Function, PCSTR Format, ...) return TRUE; } +static +BOOL SeiIsOrdinalName(LPCSTR lpProcName) +{ + return (ULONG_PTR)lpProcName <= MAXUSHORT; +} + +LPCSTR SeiPrintFunctionName(LPCSTR lpProcName, char szOrdProcFmt[10]) +{ + if (SeiIsOrdinalName(lpProcName)) + { + StringCchPrintfA(szOrdProcFmt, 10, "#%Iu", (ULONG_PTR)lpProcName); + return szOrdProcFmt; + } + return lpProcName; +} + +int SeiCompareFunctionName(LPCSTR lpProcName1, LPCSTR lpProcName2) +{ + BOOL Ord1 = SeiIsOrdinalName(lpProcName1); + BOOL Ord2 = SeiIsOrdinalName(lpProcName2); + + /* One is an ordinal, the other not */ + if (Ord1 != Ord2) + return 1; + + /* Compare ordinals */ + if (Ord1) + return (ULONG_PTR)lpProcName1 != (ULONG_PTR)lpProcName2; + + /* Compare names */ + return strcmp(lpProcName1, lpProcName2); +} + PVOID SeiGetModuleFromAddress(PVOID addr) { @@ -216,7 +250,6 @@ PVOID SeiGetModuleFromAddress(PVOID addr) } - /* TODO: Guard against recursive calling / calling init multiple times! */ VOID NotifyShims(DWORD dwReason, PVOID Info) { @@ -429,7 +462,7 @@ static VOID SeiSetLayerEnvVar(LPCWSTR wszLayer) Status = RtlSetEnvironmentVariable(NULL, &VarName, &Value); if (NT_SUCCESS(Status)) - SHIMENG_INFO("Set env var %wZ=%wZ\n", &VarName, &Value); + SHIMENG_INFO("%wZ=%wZ\n", &VarName, &Value); else SHIMENG_FAIL("Failed to set %wZ: 0x%x\n", &VarName, Status); } @@ -542,7 +575,6 @@ VOID SeiAddHooks(PHOOKAPIEX hooks, DWORD dwHookCount, PSHIMINFO pShim) continue; } - RtlInitAnsiString(&AnsiString, hook->FunctionName); if (NT_SUCCESS(LdrGetDllHandle(NULL, 0, &UnicodeModName, &DllHandle))) { HookModuleInfo = SeiFindHookModuleInfo(NULL, DllHandle); @@ -569,7 +601,7 @@ VOID SeiAddHooks(PHOOKAPIEX hooks, DWORD dwHookCount, PSHIMINFO pShim) for (j = 0; j < ARRAY_Size(&HookModuleInfo->HookApis); ++j) { PHOOKAPIEX HookApi = *ARRAY_At(&HookModuleInfo->HookApis, PHOOKAPIEX, j); - int CmpResult = strcmp(hook->FunctionName, HookApi->FunctionName); + int CmpResult = SeiCompareFunctionName(hook->FunctionName, HookApi->FunctionName); if (CmpResult == 0) { while (HookApi->ApiLink) @@ -591,42 +623,32 @@ VOID SeiAddHooks(PHOOKAPIEX hooks, DWORD dwHookCount, PSHIMINFO pShim) } } -typedef FARPROC(WINAPI* GETPROCADDRESSPROC)(HINSTANCE, LPCSTR); - /* Check if we should fake the return from GetProcAddress (because we also redirected the iat for this module) */ FARPROC WINAPI StubGetProcAddress(HINSTANCE hModule, LPCSTR lpProcName) { - char szOrdProcName[10] = ""; - LPCSTR lpPrintName = lpProcName; PVOID Addr = _ReturnAddress(); PHOOKMODULEINFO HookModuleInfo; FARPROC proc = ((GETPROCADDRESSPROC)g_IntHookEx[0].OriginalFunction)(hModule, lpProcName); - - if ((DWORD_PTR)lpProcName <= MAXUSHORT) - { - sprintf(szOrdProcName, "#%Iu", (DWORD_PTR)lpProcName); - lpPrintName = szOrdProcName; - } + char szOrdProcFmt[10]; Addr = SeiGetModuleFromAddress(Addr); if (SE_IsShimDll(Addr)) { - SHIMENG_MSG("Not touching GetProcAddress for shim dll (%p!%s)", hModule, lpPrintName); + SHIMENG_MSG("Not touching GetProcAddress for shim dll (%p!%s)", hModule, SeiPrintFunctionName(lpProcName, szOrdProcFmt)); return proc; } - SHIMENG_INFO("(GetProcAddress(%p!%s) => %p\n", hModule, lpPrintName, proc); + SHIMENG_INFO("(GetProcAddress(%p!%s) => %p\n", hModule, SeiPrintFunctionName(lpProcName, szOrdProcFmt), proc); HookModuleInfo = SeiFindHookModuleInfo(NULL, hModule); - /* FIXME: Ordinal not yet supported */ - if (HookModuleInfo && HIWORD(lpProcName)) + if (HookModuleInfo) { DWORD n; for (n = 0; n < ARRAY_Size(&HookModuleInfo->HookApis); ++n) { PHOOKAPIEX HookApi = *ARRAY_At(&HookModuleInfo->HookApis, PHOOKAPIEX, n); - int CmpResult = strcmp(lpProcName, HookApi->FunctionName); + int CmpResult = SeiCompareFunctionName(lpProcName, HookApi->FunctionName); if (CmpResult == 0) { SHIMENG_MSG("Redirecting %p to %p\n", proc, HookApi->ReplacementFunction); @@ -648,13 +670,25 @@ VOID SeiResolveAPI(PHOOKMODULEINFO HookModuleInfo) for (n = 0; n < ARRAY_Size(&HookModuleInfo->HookApis); ++n) { + NTSTATUS Status; PVOID ProcAddress; PHOOKAPIEX HookApi = *ARRAY_At(&HookModuleInfo->HookApis, PHOOKAPIEX, n); - RtlInitAnsiString(&AnsiString, HookApi->FunctionName); - if (!NT_SUCCESS(LdrGetProcedureAddress(HookModuleInfo->BaseAddress, &AnsiString, 0, &ProcAddress))) + if (!SeiIsOrdinalName(HookApi->FunctionName)) + { + RtlInitAnsiString(&AnsiString, HookApi->FunctionName); + Status = LdrGetProcedureAddress(HookModuleInfo->BaseAddress, &AnsiString, 0, &ProcAddress); + } + else + { + Status = LdrGetProcedureAddress(HookModuleInfo->BaseAddress, NULL, (ULONG_PTR)HookApi->FunctionName, &ProcAddress); + } + + if (!NT_SUCCESS(Status)) { - SHIMENG_FAIL("Unable to retrieve %s!%s\n", HookApi->LibraryName, HookApi->FunctionName); + char szOrdProcFmt[10]; + LPCSTR lpFunctionName = SeiPrintFunctionName(HookApi->FunctionName, szOrdProcFmt); + SHIMENG_FAIL("Unable to retrieve %s!%s\n", HookApi->LibraryName, lpFunctionName); continue; } @@ -732,8 +766,9 @@ VOID SeiPatchNewImport(PIMAGE_THUNK_DATA FirstThunk, PHOOKAPIEX HookApi, PLDR_DA PVOID Ptr; SIZE_T Size; NTSTATUS Status; + char szOrdProcFmt[10]; - SHIMENG_INFO("Hooking API \"%s!%s\" for DLL \"%wZ\"\n", HookApi->LibraryName, HookApi->FunctionName, &LdrEntry->BaseDllName); + SHIMENG_INFO("Hooking API \"%s!%s\" for DLL \"%wZ\"\n", HookApi->LibraryName, SeiPrintFunctionName(HookApi->FunctionName, szOrdProcFmt), &LdrEntry->BaseDllName); Ptr = &FirstThunk->u1.Function; Size = sizeof(FirstThunk->u1.Function); @@ -746,11 +781,7 @@ VOID SeiPatchNewImport(PIMAGE_THUNK_DATA FirstThunk, PHOOKAPIEX HookApi, PLDR_DA } SHIMENG_INFO("changing 0x%p to 0x%p\n", FirstThunk->u1.Function, HookApi->ReplacementFunction); -#ifdef _WIN64 - FirstThunk->u1.Function = (ULONGLONG)HookApi->ReplacementFunction; -#else - FirstThunk->u1.Function = (DWORD)HookApi->ReplacementFunction; -#endif + FirstThunk->u1.Function = (ULONG_PTR)HookApi->ReplacementFunction; Size = sizeof(FirstThunk->u1.Function); Status = NtProtectVirtualMemory(NtCurrentProcess(), &Ptr, &Size, OldProtection, &OldProtection); @@ -782,6 +813,7 @@ BOOL SeiIsExcluded(PLDR_DATA_TABLE_ENTRY LdrEntry, PHOOKAPIEX HookApi) PSHIMINFO pShimInfo = HookApi->pShimInfo; PINEXCLUDE InExclude; BOOL IsExcluded = FALSE; + char szOrdProcFmt[10]; if (!pShimInfo) { @@ -801,7 +833,7 @@ BOOL SeiIsExcluded(PLDR_DATA_TABLE_ENTRY LdrEntry, PHOOKAPIEX HookApi) if (!InExclude->Include) { SHIMENG_INFO("Module '%wZ' excluded for shim %S, API '%s!%s', because it on in the exclude list.\n", - &LdrEntry->BaseDllName, pShimInfo->ShimName, HookApi->LibraryName, HookApi->FunctionName); + &LdrEntry->BaseDllName, pShimInfo->ShimName, HookApi->LibraryName, SeiPrintFunctionName(HookApi->FunctionName, szOrdProcFmt)); return TRUE; } @@ -809,7 +841,7 @@ BOOL SeiIsExcluded(PLDR_DATA_TABLE_ENTRY LdrEntry, PHOOKAPIEX HookApi) if (IsExcluded) { SHIMENG_INFO("Module '%wZ' included for shim %S, API '%s!%s', because it is on the include list.\n", - &LdrEntry->BaseDllName, pShimInfo->ShimName, HookApi->LibraryName, HookApi->FunctionName); + &LdrEntry->BaseDllName, pShimInfo->ShimName, HookApi->LibraryName, SeiPrintFunctionName(HookApi->FunctionName, szOrdProcFmt)); } IsExcluded = FALSE; @@ -818,7 +850,7 @@ BOOL SeiIsExcluded(PLDR_DATA_TABLE_ENTRY LdrEntry, PHOOKAPIEX HookApi) if (IsExcluded) { SHIMENG_INFO("Module '%wZ' excluded for shim %S, API '%s!%s', because it is in System32/WinSXS.\n", - &LdrEntry->BaseDllName, pShimInfo->ShimName, HookApi->LibraryName, HookApi->FunctionName); + &LdrEntry->BaseDllName, pShimInfo->ShimName, HookApi->LibraryName, SeiPrintFunctionName(HookApi->FunctionName, szOrdProcFmt)); } return IsExcluded; @@ -974,33 +1006,45 @@ VOID SeiHookImports(PLDR_DATA_TABLE_ENTRY LdrEntry) /* Walk all imports */ for (;OriginalThunk->u1.AddressOfData && FirstThunk->u1.Function; OriginalThunk++, FirstThunk++) { - if (!IMAGE_SNAP_BY_ORDINAL32(OriginalThunk->u1.AddressOfData)) + if (!IMAGE_SNAP_BY_ORDINAL(OriginalThunk->u1.Function)) { - PIMAGE_IMPORT_BY_NAME ImportName; - - ImportName = (PIMAGE_IMPORT_BY_NAME)(DllBase + OriginalThunk->u1.AddressOfData); - if (!strcmp((PCSTR)ImportName->Name, HookApi->FunctionName)) + if (!SeiIsOrdinalName(HookApi->FunctionName)) { - SeiPatchNewImport(FirstThunk, HookApi, LdrEntry); + PIMAGE_IMPORT_BY_NAME ImportName; - /* Sadly, iat does not have to be sorted, and can even contain duplicate entries. */ - dwFound++; + ImportName = (PIMAGE_IMPORT_BY_NAME)(DllBase + OriginalThunk->u1.Function); + if (!strcmp((PCSTR)ImportName->Name, HookApi->FunctionName)) + { + SeiPatchNewImport(FirstThunk, HookApi, LdrEntry); + + /* Sadly, iat does not have to be sorted, and can even contain duplicate entries. */ + dwFound++; + } } } else { - SHIMENG_FAIL("Ordinals not yet supported\n"); - ASSERT(0); + if (SeiIsOrdinalName(HookApi->FunctionName)) + { + if ((PCSTR)IMAGE_ORDINAL(OriginalThunk->u1.Function) == HookApi->FunctionName) + { + SeiPatchNewImport(FirstThunk, HookApi, LdrEntry); + dwFound++; + } + } } } if (dwFound != 1) { + char szOrdProcFmt[10]; + LPCSTR FuncName = SeiPrintFunctionName(HookApi->FunctionName, szOrdProcFmt); + /* One entry not found. */ if (!dwFound) - SHIMENG_INFO("Entry \"%s!%s\" not found for \"%wZ\"\n", HookApi->LibraryName, HookApi->FunctionName, &LdrEntry->BaseDllName); + SHIMENG_INFO("Entry \"%s!%s\" not found for \"%wZ\"\n", HookApi->LibraryName, FuncName, &LdrEntry->BaseDllName); else - SHIMENG_INFO("Entry \"%s!%s\" found %d times for \"%wZ\"\n", HookApi->LibraryName, HookApi->FunctionName, dwFound, &LdrEntry->BaseDllName); + SHIMENG_INFO("Entry \"%s!%s\" found %d times for \"%wZ\"\n", HookApi->LibraryName, FuncName, dwFound, &LdrEntry->BaseDllName); } } } @@ -1315,28 +1359,21 @@ BOOL SeiGetShimData(PUNICODE_STRING ProcessImage, PVOID pShimData, HSDB* pHsdb, RTL_CONSTANT_STRING(L"slsvc.exe"), #endif }; - static const UNICODE_STRING BackSlash = RTL_CONSTANT_STRING(L"\\"); - static const UNICODE_STRING ForwdSlash = RTL_CONSTANT_STRING(L"/"); + static const UNICODE_STRING PathDividerFind = RTL_CONSTANT_STRING(L"\\/"); UNICODE_STRING ProcessName; - USHORT Back, Forward; + USHORT PathDivider; HSDB hsdb; DWORD n; - if (!NT_SUCCESS(RtlFindCharInUnicodeString(RTL_FIND_CHAR_IN_UNICODE_STRING_START_AT_END, ProcessImage, &BackSlash, &Back))) - Back = 0; - - if (!NT_SUCCESS(RtlFindCharInUnicodeString(RTL_FIND_CHAR_IN_UNICODE_STRING_START_AT_END, ProcessImage, &ForwdSlash, &Forward))) - Forward = 0; - - if (Back < Forward) - Back = Forward; + if (!NT_SUCCESS(RtlFindCharInUnicodeString(RTL_FIND_CHAR_IN_UNICODE_STRING_START_AT_END, ProcessImage, &PathDividerFind, &PathDivider))) + PathDivider = 0; - if (Back) - Back += sizeof(WCHAR); + if (PathDivider) + PathDivider += sizeof(WCHAR); - ProcessName.Buffer = ProcessImage->Buffer + Back / sizeof(WCHAR); - ProcessName.Length = ProcessImage->Length - Back; - ProcessName.MaximumLength = ProcessImage->MaximumLength - Back; + ProcessName.Buffer = ProcessImage->Buffer + PathDivider / sizeof(WCHAR); + ProcessName.Length = ProcessImage->Length - PathDivider; + ProcessName.MaximumLength = ProcessImage->MaximumLength - PathDivider; for (n = 0; n < ARRAYSIZE(ForbiddenShimmingApps); ++n) {

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