Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MSAFD] Move the default debug channel to msafd.h.
by Amine Khaldi 09 Dec '17

09 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6108f3187789fba6fb5c… commit f6108f3187789fba6fb5cd05ce66eee99ee93812 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 9 13:24:35 2017 +0100 [MSAFD] Move the default debug channel to msafd.h. --- dll/win32/msafd/misc/dllmain.c | 3 --- dll/win32/msafd/misc/event.c | 3 --- dll/win32/msafd/misc/helpers.c | 3 --- dll/win32/msafd/misc/sndrcv.c | 3 --- dll/win32/msafd/misc/stubs.c | 3 --- dll/win32/msafd/msafd.h | 4 ++++ 6 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dll/win32/msafd/misc/dllmain.c b/dll/win32/msafd/misc/dllmain.c index c2ee828b08..e456796147 100644 --- a/dll/win32/msafd/misc/dllmain.c +++ b/dll/win32/msafd/misc/dllmain.c @@ -15,9 +15,6 @@ #include <winuser.h> #include <wchar.h> -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(msafd); - HANDLE GlobalHeap; WSPUPCALLTABLE Upcalls; DWORD CatalogEntryId; /* CatalogEntryId for upcalls */ diff --git a/dll/win32/msafd/misc/event.c b/dll/win32/msafd/misc/event.c index 27ceb3cae3..467c039cb4 100644 --- a/dll/win32/msafd/misc/event.c +++ b/dll/win32/msafd/misc/event.c @@ -12,9 +12,6 @@ #include <msafd.h> -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(msafd); - int WSPAPI WSPEventSelect( diff --git a/dll/win32/msafd/misc/helpers.c b/dll/win32/msafd/misc/helpers.c index aab52bab61..69ee86a1e4 100644 --- a/dll/win32/msafd/misc/helpers.c +++ b/dll/win32/msafd/misc/helpers.c @@ -14,9 +14,6 @@ #include <winreg.h> -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(msafd); - CRITICAL_SECTION HelperDLLDatabaseLock; LIST_ENTRY HelperDLLDatabaseListHead; diff --git a/dll/win32/msafd/misc/sndrcv.c b/dll/win32/msafd/misc/sndrcv.c index 2f5fd3270d..507bd47256 100644 --- a/dll/win32/msafd/misc/sndrcv.c +++ b/dll/win32/msafd/misc/sndrcv.c @@ -12,9 +12,6 @@ #include <msafd.h> -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(msafd); - INT WSPAPI WSPAsyncSelect(IN SOCKET Handle, diff --git a/dll/win32/msafd/misc/stubs.c b/dll/win32/msafd/misc/stubs.c index 215cb2c4e3..2ee41289cd 100644 --- a/dll/win32/msafd/misc/stubs.c +++ b/dll/win32/msafd/misc/stubs.c @@ -10,9 +10,6 @@ #include <msafd.h> -#include <wine/debug.h> -WINE_DEFAULT_DEBUG_CHANNEL(msafd); - INT WSPAPI WSPCancelBlockingCall( diff --git a/dll/win32/msafd/msafd.h b/dll/win32/msafd/msafd.h index 1b8d3cf463..3765c2fca7 100644 --- a/dll/win32/msafd/msafd.h +++ b/dll/win32/msafd/msafd.h @@ -28,6 +28,10 @@ #include <tdi.h> #include <afd/shared.h> #include <mswsock.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(msafd); + #include "include/helpers.h" extern HANDLE GlobalHeap;

1 0

[reactos] 01/01: [HAL] Add some header guards.
by Amine Khaldi 09 Dec '17

09 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bae06fa5f5f3e198adcb… commit 0bae06fa5f5f3e198adcb50a86e9ede3649ef22a Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 9 13:20:22 2017 +0100 [HAL] Add some header guards. --- hal/halx86/apic/apic.h | 2 ++ hal/halx86/apic/tsc.h | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/hal/halx86/apic/apic.h b/hal/halx86/apic/apic.h index 3c5f4234d7..5de22834be 100644 --- a/hal/halx86/apic/apic.h +++ b/hal/halx86/apic/apic.h @@ -1,4 +1,6 @@ +#pragma once + #ifdef _M_AMD64 #define IOAPIC_BASE 0xFFFFFFFFFFFE1000ULL // checkme #define ZERO_VECTOR 0x00 // IRQL 00 diff --git a/hal/halx86/apic/tsc.h b/hal/halx86/apic/tsc.h index 3d06ae12ec..00595a7a69 100644 --- a/hal/halx86/apic/tsc.h +++ b/hal/halx86/apic/tsc.h @@ -1,4 +1,6 @@ +#ifndef _TSC_H_ +#define _TSC_H_ #define NUM_SAMPLES 4 #define MSR_RDTSC 0x10 @@ -16,3 +18,5 @@ VOID NTAPI HalpInitializeTsc(void); #endif #endif + +#endif /* !_TSC_H_ */

1 0

[reactos] 01/01: [VGA] Correct VgaInterpretCmdStream() declaration.
by Amine Khaldi 09 Dec '17

09 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a308735be60121be4ab67… commit a308735be60121be4ab67f0bef53b48e2b6f69d6 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 9 13:11:45 2017 +0100 [VGA] Correct VgaInterpretCmdStream() declaration. --- win32ss/drivers/miniport/vga_new/vga.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32ss/drivers/miniport/vga_new/vga.c b/win32ss/drivers/miniport/vga_new/vga.c index 22c3c92caa..1b07397419 100644 --- a/win32ss/drivers/miniport/vga_new/vga.c +++ b/win32ss/drivers/miniport/vga_new/vga.c @@ -91,10 +91,10 @@ VgaIsPresent( PHW_DEVICE_EXTENSION HwDeviceExtension ); -VOID +VP_STATUS NTAPI VgaInterpretCmdStream( - PVOID HwDeviceExtension, + PHW_DEVICE_EXTENSION HwDeviceExtension, PUSHORT pusCmdStream );

1 0

[reactos] 01/01: [UUID] Add a PCH.
by Amine Khaldi 09 Dec '17

09 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=69005963fb4b1378f6a66… commit 69005963fb4b1378f6a666c2b8b2483c222740f8 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 9 13:04:23 2017 +0100 [UUID] Add a PCH. --- sdk/lib/uuid/CMakeLists.txt | 4 +++- sdk/lib/uuid/precomp.h | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sdk/lib/uuid/CMakeLists.txt b/sdk/lib/uuid/CMakeLists.txt index d99bc73a35..09efcd927f 100644 --- a/sdk/lib/uuid/CMakeLists.txt +++ b/sdk/lib/uuid/CMakeLists.txt @@ -219,7 +219,9 @@ list(APPEND SOURCE # vcguids.c wdmguids.c otherguids.c - undoc.c) + undoc.c + precomp.h) add_library(uuid ${SOURCE}) +add_pch(uuid precomp.h SOURCE) add_dependencies(uuid psdk) diff --git a/sdk/lib/uuid/precomp.h b/sdk/lib/uuid/precomp.h new file mode 100644 index 0000000000..abe35fac5e --- /dev/null +++ b/sdk/lib/uuid/precomp.h @@ -0,0 +1,10 @@ +#ifndef _UUID_PRECOMP_H_ +#define _UUID_PRECOMP_H_ + +#define WIN32_NO_STATUS +#define WIN32_LEAN_AND_MEAN + +#include <rpc.h> +#include <rpcndr.h> + +#endif /* _UUID_PRECOMP_H_ */

1 0

[reactos] 01/01: [FASTFAT] Fix size checking in VfatGetFileNameInformation()
by Pierre Schweitzer 09 Dec '17

09 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28343c6c0c5ca7a91778f… commit 28343c6c0c5ca7a91778fcf46f08e1cc6213272c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Dec 9 12:45:16 2017 +0100 [FASTFAT] Fix size checking in VfatGetFileNameInformation() --- drivers/filesystems/fastfat/dir.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/filesystems/fastfat/dir.c b/drivers/filesystems/fastfat/dir.c index 284c04bca1..1e657f19fd 100644 --- a/drivers/filesystems/fastfat/dir.c +++ b/drivers/filesystems/fastfat/dir.c @@ -101,17 +101,17 @@ VfatGetFileNameInformation( *Written = 0; Status = STATUS_BUFFER_OVERFLOW; - if (FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName) > BufferLength) + if (FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) > BufferLength) return Status; - if (First || (BufferLength >= FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName) + DirContext->LongNameU.Length)) + if (First || (BufferLength >= FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + DirContext->LongNameU.Length)) { pInfo->FileNameLength = DirContext->LongNameU.Length; - *Written = FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName); - if (BufferLength > FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName)) + *Written = FIELD_OFFSET(FILE_NAME_INFORMATION, FileName); + if (BufferLength > FIELD_OFFSET(FILE_NAME_INFORMATION, FileName)) { - BytesToCopy = min(DirContext->LongNameU.Length, BufferLength - FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName)); + BytesToCopy = min(DirContext->LongNameU.Length, BufferLength - FIELD_OFFSET(FILE_NAME_INFORMATION, FileName)); RtlCopyMemory(pInfo->FileName, DirContext->LongNameU.Buffer, BytesToCopy);

1 0

[reactos] 01/01: [FASTFAT] Don't mix FileNameInformation and FileNamesInformation (and support the later). This commit fixes weird behavior in our FastFAT implementation. It was mixing two classes: FileNameInformation and FileNamesInformation. It was handling FileNameInformation like FileNamesInformation and was filling buffer with FILE_NAMES_INFORMATION structure instead of FILE_NAME_INFORMATION structure (how many things did that break?!). Also, it wasn't implementing the FileNamesInformation
by Pierre Schweitzer 09 Dec '17

09 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f3c80193e5f5d9c04970… commit 9f3c80193e5f5d9c0497033322c515cdb3690e8c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Dec 9 12:33:29 2017 +0100 [FASTFAT] Don't mix FileNameInformation and FileNamesInformation (and support the later). This commit fixes weird behavior in our FastFAT implementation. It was mixing two classes: FileNameInformation and FileNamesInformation. It was handling FileNameInformation like FileNamesInformation and was filling buffer with FILE_NAMES_INFORMATION structure instead of FILE_NAME_INFORMATION structure (how many things did that break?!). Also, it wasn't implementing the FileNamesInformation class at all. This is required by ntdll_winetest:directory which doesn't expect it to fail and thus, attempts to read never filled in memory. This commit fixes the winetest crash, and may fix other weird FS behavior. CORE-13367 --- drivers/filesystems/fastfat/dir.c | 51 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/drivers/filesystems/fastfat/dir.c b/drivers/filesystems/fastfat/dir.c index db96257281..284c04bca1 100644 --- a/drivers/filesystems/fastfat/dir.c +++ b/drivers/filesystems/fastfat/dir.c @@ -89,6 +89,47 @@ FsdSystemTimeToDosDateTime( static NTSTATUS VfatGetFileNameInformation( + PVFAT_DIRENTRY_CONTEXT DirContext, + PFILE_NAME_INFORMATION pInfo, + ULONG BufferLength, + PULONG Written, + BOOLEAN First) +{ + NTSTATUS Status; + ULONG BytesToCopy = 0; + + *Written = 0; + Status = STATUS_BUFFER_OVERFLOW; + + if (FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName) > BufferLength) + return Status; + + if (First || (BufferLength >= FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName) + DirContext->LongNameU.Length)) + { + pInfo->FileNameLength = DirContext->LongNameU.Length; + + *Written = FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName); + if (BufferLength > FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName)) + { + BytesToCopy = min(DirContext->LongNameU.Length, BufferLength - FIELD_OFFSET(FILE_NAMES_INFORMATION, FileName)); + RtlCopyMemory(pInfo->FileName, + DirContext->LongNameU.Buffer, + BytesToCopy); + *Written += BytesToCopy; + + if (BytesToCopy == DirContext->LongNameU.Length) + { + Status = STATUS_SUCCESS; + } + } + } + + return Status; +} + +static +NTSTATUS +VfatGetFileNamesInformation( PVFAT_DIRENTRY_CONTEXT DirContext, PFILE_NAMES_INFORMATION pInfo, ULONG BufferLength, @@ -622,7 +663,7 @@ DoQuery( { case FileNameInformation: Status = VfatGetFileNameInformation(&DirContext, - (PFILE_NAMES_INFORMATION)Buffer, + (PFILE_NAME_INFORMATION)Buffer, BufferLength, &Written, Buffer0 == NULL); @@ -655,6 +696,14 @@ DoQuery( Buffer0 == NULL); break; + case FileNamesInformation: + Status = VfatGetFileNamesInformation(&DirContext, + (PFILE_NAMES_INFORMATION)Buffer, + BufferLength, + &Written, + Buffer0 == NULL); + break; + default: Status = STATUS_INVALID_INFO_CLASS; break;

1 0

[reactos] 01/01: [SAMLIB] Use precomp.h in dllmain.c.
by Amine Khaldi 09 Dec '17

09 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d086a431cb9a31cb9ed7a… commit d086a431cb9a31cb9ed7a4f592b8c82efbd1b552 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sat Dec 9 12:32:18 2017 +0100 [SAMLIB] Use precomp.h in dllmain.c. --- dll/win32/samlib/dllmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/samlib/dllmain.c b/dll/win32/samlib/dllmain.c index 630d1f998b..99b7275e55 100644 --- a/dll/win32/samlib/dllmain.c +++ b/dll/win32/samlib/dllmain.c @@ -24,7 +24,7 @@ * PROGRAMER: Eric Kohl */ -#include <windef.h> +#include "precomp.h" /* FUNCTIONS *****************************************************************/

1 0

[reactos] 01/01: [SHELL32_APITEST] Add test for SHCreateFileExtractIconW CORE-14082
by Mark Jansen 09 Dec '17

09 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ac511405f69535076bbd… commit 4ac511405f69535076bbdabfc2710891978e5d02 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sat Dec 9 00:51:56 2017 +0100 [SHELL32_APITEST] Add test for SHCreateFileExtractIconW CORE-14082 --- modules/rostests/apitests/shell32/1.ico | Bin 0 -> 4286 bytes modules/rostests/apitests/shell32/CMakeLists.txt | 2 + .../apitests/shell32/SHCreateFileExtractIconW.cpp | 204 +++++++++++++++++++++ modules/rostests/apitests/shell32/resource.rc | 5 + modules/rostests/apitests/shell32/testlist.c | 2 + 5 files changed, 213 insertions(+) diff --git a/modules/rostests/apitests/shell32/1.ico b/modules/rostests/apitests/shell32/1.ico new file mode 100644 index 0000000000..0b2dee3cc6 Binary files /dev/null and b/modules/rostests/apitests/shell32/1.ico differ diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 65d0f6c504..48c41820c9 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -14,10 +14,12 @@ add_executable(shell32_apitest CShellLink.cpp menu.cpp PathResolve.cpp + SHCreateFileExtractIconW.cpp ShellExecuteEx.cpp shelltest.cpp SHParseDisplayName.cpp testlist.c + resource.rc ${CMAKE_CURRENT_BINARY_DIR}/shell32_apitest.def) target_link_libraries(shell32_apitest wine uuid ${PSEH_LIB}) set_module_type(shell32_apitest win32cui) diff --git a/modules/rostests/apitests/shell32/SHCreateFileExtractIconW.cpp b/modules/rostests/apitests/shell32/SHCreateFileExtractIconW.cpp new file mode 100644 index 0000000000..38247dabe3 --- /dev/null +++ b/modules/rostests/apitests/shell32/SHCreateFileExtractIconW.cpp @@ -0,0 +1,204 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for SHCreateFileExtractIconW + * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + */ + +#include "shelltest.h" +#include <atlbase.h> +#include <atlcom.h> +ULONG DbgPrint(PCH Format,...); +#include <shellutils.h> +#include <wincon.h> +#include <wingdi.h> + + +HRESULT (STDAPICALLTYPE *pSHCreateFileExtractIconW)(LPCWSTR pszFile, DWORD dwFileAttributes, REFIID riid, void **ppv); + +struct test_data +{ + const WCHAR* Name; + DWORD dwFlags; +}; + +static test_data Tests[] = +{ + { L"xxx.zip", FILE_ATTRIBUTE_NORMAL }, + { L"xxx.zip", FILE_ATTRIBUTE_DIRECTORY }, + { L"xxx.exe", FILE_ATTRIBUTE_NORMAL }, + { L"xxx.exe", FILE_ATTRIBUTE_DIRECTORY }, + { L"xxx.dll", FILE_ATTRIBUTE_NORMAL }, + { L"xxx.dll", FILE_ATTRIBUTE_DIRECTORY }, + { L"xxx.txt", FILE_ATTRIBUTE_NORMAL }, + { L"xxx.txt", FILE_ATTRIBUTE_DIRECTORY }, + { NULL, FILE_ATTRIBUTE_NORMAL }, + { NULL, FILE_ATTRIBUTE_DIRECTORY }, +}; + + +static void ExtractOneBitmap(HBITMAP hbm, CComHeapPtr<BYTE>& data, DWORD& size) +{ + HDC hdc = CreateCompatibleDC(NULL); + HGDIOBJ obj = SelectObject(hdc, hbm); + + CComHeapPtr<BITMAPINFO> pInfoBM; + + pInfoBM.AllocateBytes(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + memset(pInfoBM, 0, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + pInfoBM->bmiHeader.biSize = sizeof(pInfoBM->bmiHeader); + if (!GetDIBits(hdc, hbm, 0, 0, NULL, pInfoBM, DIB_RGB_COLORS)) + return; + + size = pInfoBM->bmiHeader.biSizeImage; + data.Allocate(size); + GetDIBits(hdc, hbm, 0, pInfoBM->bmiHeader.biHeight, data, pInfoBM, DIB_RGB_COLORS); + + SelectObject(hdc, obj); + DeleteDC(hdc); +} + +static bool GetIconData(HICON icon, CComHeapPtr<BYTE>& colorData, DWORD& colorSize, CComHeapPtr<BYTE>& maskData, DWORD& maskSize) +{ + ICONINFO iconinfo; + + if (!GetIconInfo(icon, &iconinfo)) + return false; + + ExtractOneBitmap(iconinfo.hbmColor, colorData, colorSize); + ExtractOneBitmap(iconinfo.hbmMask, maskData, maskSize); + + DeleteObject(iconinfo.hbmColor); + DeleteObject(iconinfo.hbmMask); + + return true; +} + + +START_TEST(SHCreateFileExtractIconW) +{ + WCHAR CurrentModule[MAX_PATH]; + HMODULE shell32 = LoadLibraryA("shell32.dll"); + HICON myIcon; + pSHCreateFileExtractIconW = (HRESULT (__stdcall *)(LPCWSTR, DWORD, REFIID, void **))GetProcAddress(shell32, "SHCreateFileExtractIconW"); + + CoInitialize(NULL); + + GetModuleFileNameW(NULL, CurrentModule, _countof(CurrentModule)); + { + SHFILEINFOW shfi; + ULONG_PTR firet = SHGetFileInfoW(CurrentModule, 0, &shfi, sizeof(shfi), SHGFI_ICON); + myIcon = shfi.hIcon; + if (!firet) + { + skip("Unable to get my own icon\n"); + return; + } + } + + if (!pSHCreateFileExtractIconW) + { + skip("SHCreateFileExtractIconW not available\n"); + return; + } + + for (size_t n = 0; n < _countof(Tests); ++n) + { + test_data& cur = Tests[n]; + bool useMyIcon = false; + + if (cur.Name == NULL) + { + cur.Name = CurrentModule; + useMyIcon = true; + } + + CComPtr<IExtractIconW> spExtract; + HRESULT hr = pSHCreateFileExtractIconW(cur.Name, cur.dwFlags, IID_PPV_ARG(IExtractIconW, &spExtract)); + ok(hr == S_OK, "Expected hr to be S_OK, was 0x%lx for %S(%lx)\n", hr, cur.Name, cur.dwFlags); + + if (!SUCCEEDED(hr)) + continue; + + int ilIndex = -1; + UINT wFlags = 0xdeaddead; + WCHAR Buffer[MAX_PATH]; + + hr = spExtract->GetIconLocation(0, Buffer, _countof(Buffer), &ilIndex, &wFlags); + ok(hr == S_OK, "Expected hr to be S_OK, was 0x%lx for %S(%lx)\n", hr, cur.Name, cur.dwFlags); + if (!SUCCEEDED(hr)) + continue; + + ok(wFlags & (GIL_NOTFILENAME|GIL_PERCLASS), "Expected GIL_NOTFILENAME|GIL_PERCLASS to be set for %S(%lx)\n", cur.Name, cur.dwFlags); + ok(!wcscmp(Buffer, L"*"), "Expected '*', was '%S' for %S(%lx)\n", Buffer, cur.Name, cur.dwFlags); + + HICON ico; + hr = spExtract->Extract(Buffer, ilIndex, &ico, NULL, 0); + + /* Visualize the icon extracted for whoever is stepping through this code. */ + HWND console = GetConsoleWindow(); + SendMessage(console, WM_SETICON, ICON_BIG, (LPARAM)ico); + SendMessage(console, WM_SETICON, ICON_SMALL, (LPARAM)ico); + + CComHeapPtr<BYTE> colorData, maskData; + DWORD colorSize = 0, maskSize = 0; + + GetIconData(ico, colorData, colorSize, maskData, maskSize); + + if (!colorSize || !maskSize) + continue; + + SHFILEINFOW shfi; + ULONG_PTR firet = SHGetFileInfoW(cur.Name, cur.dwFlags, &shfi, sizeof(shfi), SHGFI_USEFILEATTRIBUTES | SHGFI_ICON); + + if (!firet) + continue; + + CComHeapPtr<BYTE> colorDataRef, maskDataRef; + DWORD colorSizeRef = 0, maskSizeRef = 0; + GetIconData(shfi.hIcon, colorDataRef, colorSizeRef, maskDataRef, maskSizeRef); + + ok(colorSizeRef == colorSize, "Expected %lu, was %lu for %S(%lx)\n", colorSizeRef, colorSize, cur.Name, cur.dwFlags); + ok(maskSizeRef == maskSize, "Expected %lu, was %lu for %S(%lx)\n", maskSizeRef, maskSize, cur.Name, cur.dwFlags); + + if (colorSizeRef == colorSize) + { + ok(!memcmp(colorData, colorDataRef, colorSize), "Expected equal colorData for %S(%lx)\n", cur.Name, cur.dwFlags); + } + + if (maskSizeRef == maskSize) + { + ok(!memcmp(maskData, maskDataRef, maskSize), "Expected equal maskData for %S(%lx)\n", cur.Name, cur.dwFlags); + } + + if (useMyIcon) + { + colorDataRef.Free(); + maskDataRef.Free(); + colorSizeRef = maskSizeRef = 0; + GetIconData(myIcon, colorDataRef, colorSizeRef, maskDataRef, maskSizeRef); + + ok(colorSizeRef == colorSize, "Expected %lu, was %lu for %S(%lx)\n", colorSizeRef, colorSize, cur.Name, cur.dwFlags); + ok(maskSizeRef == maskSize, "Expected %lu, was %lu for %S(%lx)\n", maskSizeRef, maskSize, cur.Name, cur.dwFlags); + + if (colorSizeRef == colorSize) + { + /* Incase requested filetype does not match, the exe icon is not used! */ + if (cur.dwFlags == FILE_ATTRIBUTE_DIRECTORY) + { + ok(memcmp(colorData, colorDataRef, colorSize), "Expected colorData to be changed for %S(%lx)\n", cur.Name, cur.dwFlags); + } + else + { + ok(!memcmp(colorData, colorDataRef, colorSize), "Expected equal colorData for %S(%lx)\n", cur.Name, cur.dwFlags); + } + } + + // Mask is not reliable for some reason + //if (maskSizeRef == maskSize) + //{ + // ok(!memcmp(maskData, maskDataRef, maskSize), "Expected equal maskData for %S(%lx)\n", cur.Name, cur.dwFlags); + //} + } + } +} diff --git a/modules/rostests/apitests/shell32/resource.rc b/modules/rostests/apitests/shell32/resource.rc new file mode 100644 index 0000000000..89a0f853a8 --- /dev/null +++ b/modules/rostests/apitests/shell32/resource.rc @@ -0,0 +1,5 @@ +#include <windef.h> + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +1 ICON "1.ico" diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 769f587800..b0a8638046 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -11,6 +11,7 @@ extern void func_CShellDesktop(void); extern void func_CShellLink(void); extern void func_menu(void); extern void func_PathResolve(void); +extern void func_SHCreateFileExtractIconW(void); extern void func_ShellExecuteEx(void); extern void func_SHParseDisplayName(void); @@ -24,6 +25,7 @@ const struct test winetest_testlist[] = { "CShellLink", func_CShellLink }, { "menu", func_menu }, { "PathResolve", func_PathResolve }, + { "SHCreateFileExtractIconW", func_SHCreateFileExtractIconW }, { "ShellExecuteEx", func_ShellExecuteEx }, { "SHParseDisplayName", func_SHParseDisplayName }, { 0, 0 }

1 0

[reactos] 01/01: [KERNEL32] Silent a noisy DPRINT1
by Pierre Schweitzer 09 Dec '17

09 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4fcaf92ec385dfb2a0506… commit 4fcaf92ec385dfb2a05064aef1ef75c205a68c81 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Dec 9 11:53:54 2017 +0100 [KERNEL32] Silent a noisy DPRINT1 --- dll/win32/kernel32/client/console/readwrite.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/console/readwrite.c b/dll/win32/kernel32/client/console/readwrite.c index 1721fefcbd..c10d833bec 100644 --- a/dll/win32/kernel32/client/console/readwrite.c +++ b/dll/win32/kernel32/client/console/readwrite.c @@ -66,7 +66,7 @@ IntReadConsole(IN HANDLE hConsoleInput, UNICODE_STRING ExeName; ExeName.Length = ExeName.MaximumLength = ReadConsoleRequest->ExeLength; ExeName.Buffer = (PWCHAR)ReadConsoleRequest->StaticBuffer; - DPRINT1("IntReadConsole(ExeName = %wZ)\n", &ExeName); + DPRINT("IntReadConsole(ExeName = %wZ)\n", &ExeName); } /******************************/

1 0

[reactos] 01/01: [WIN32K] Fix NtGdiGetTextFaceW to report face name correctly (#173)
by Katayama Hirofumi MZ 09 Dec '17

09 Dec '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea4daf8b6873cd6256c45… commit ea4daf8b6873cd6256c45ac1c6b7cfea2e58b340 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 9 19:06:51 2017 +0900 [WIN32K] Fix NtGdiGetTextFaceW to report face name correctly (#173) Initialize TEXTOBJ.FaceName member in TextIntRealizeFont and use it in NtGdiGetTextFaceW CORE-14071 --- win32ss/gdi/ntgdi/freetype.c | 12 ++++++++++++ win32ss/gdi/ntgdi/text.c | 26 ++++++++++++++++++++------ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 5fb58cf3e4..b8b3f74a03 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -4504,6 +4504,7 @@ TextIntRealizeFont(HFONT FontHandle, PTEXTOBJ pTextObj) } else { + UNICODE_STRING NameW; PFONTGDI FontGdi = ObjToGDI(TextObj->Font, FONT); // Need hdev, when freetype is loaded need to create DEVOBJ for // Consumer and Producer. @@ -4518,6 +4519,17 @@ TextIntRealizeFont(HFONT FontHandle, PTEXTOBJ pTextObj) else FontGdi->RequestWeight = FW_NORMAL; + /* store the localized family name */ + RtlInitUnicodeString(&NameW, NULL); + Status = IntGetFontLocalizedName(&NameW, FontGdi->SharedFace, + TT_NAME_ID_FONT_FAMILY, gusLanguageID); + if (NT_SUCCESS(Status)) + { + RtlCopyMemory(TextObj->FaceName, NameW.Buffer, NameW.Length); + TextObj->FaceName[NameW.Length / sizeof(WCHAR)] = UNICODE_NULL; + RtlFreeUnicodeString(&NameW); + } + Face = FontGdi->SharedFace->Face; //FontGdi->OriginalWeight = WeightFromStyle(Face->style_name); diff --git a/win32ss/gdi/ntgdi/text.c b/win32ss/gdi/ntgdi/text.c index b4130b6b2f..4d8d8779df 100644 --- a/win32ss/gdi/ntgdi/text.c +++ b/win32ss/gdi/ntgdi/text.c @@ -3,7 +3,11 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: win32ss/gdi/ntgdi/text.c * PURPOSE: Text/Font - * PROGRAMMER: + * PROGRAMMERS: Amine Khaldi <amine.khaldi(a)reactos.org> + * Timo Kreuzer <timo.kreuzer(a)reactos.org> + * James Tabor <james.tabor(a)reactos.org> + * Hermes Belusca-Maito <hermes.belusca(a)sfr.fr> + * Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ /** Includes ******************************************************************/ @@ -512,12 +516,14 @@ NtGdiGetTextFaceW( TextObj = RealizeFontInit(hFont); ASSERT(TextObj != NULL); - fLen = wcslen(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName) + 1; + fLen = wcslen(TextObj->FaceName) + 1; + if (fLen > LF_FACESIZE) + fLen = LF_FACESIZE; if (FaceName != NULL) { Count = min(Count, fLen); - Status = MmCopyToCaller(FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName, Count * sizeof(WCHAR)); + Status = MmCopyToCaller(FaceName, TextObj->FaceName, Count * sizeof(WCHAR)); if (!NT_SUCCESS(Status)) { TEXTOBJ_UnlockText(TextObj); @@ -525,11 +531,19 @@ NtGdiGetTextFaceW( return 0; } /* Terminate if we copied only part of the font name */ - if (Count > 0 && Count < fLen) + ret = Count; + if (Count > 0 && Count <= fLen) { - FaceName[Count - 1] = '\0'; + _SEH2_TRY + { + FaceName[Count - 1] = '\0'; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = 0; + } + _SEH2_END; } - ret = Count; } else {

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