March 2019 - Wine-devel - list.winehq.org

[PATCH 2/2] ntoskrnl.exe: Implement IoCreateSynchronizationEvent.
by Jacek Caban 27 Mar '19

27 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46804 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +---------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 + dlls/ntoskrnl.exe/sync.c | 26 ++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.c | 27 +++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 6 files changed, 57 insertions(+), 11 deletions(-)

1 0

[PATCH 1/2] [v4] user32/tests: Use calculated EC_USEFONTINFO margins in the CJK case.
by Akihiro Sagawa 27 Mar '19

27 Mar '19

In v4, arrange the patch order and add todo_wine_if keyword. Since the font metrics vary between versions, we calculate the expected value in the tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 96 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 81 insertions(+), 15 deletions(-)

1 0

[PATCH 3/3] wineboot: Remove superfluous fixme
by André Hentschel 27 Mar '19

27 Mar '19

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- programs/wineboot/wineboot.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index b85a3b6b6ea..01c85508430 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -197,7 +197,6 @@ __ASM_GLOBAL_FUNC( do_cpuid, #else void do_cpuid( unsigned int ax, unsigned int *p ) { - FIXME("\n"); } #endif -- 2.17.1

1 0

[PATCH 2/3] ntdll: Adjust PC according to THUMB/ARM flag
by André Hentschel 27 Mar '19

27 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46189 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/signal_arm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 7478f1f826d..2ff7afa928f 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -283,9 +283,12 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, void DECLSPEC_HIDDEN set_cpu_context( const CONTEXT *context ); __ASM_GLOBAL_FUNC( set_cpu_context, ".arm\n\t" - "ldr r1, [r0, #0x44]\n\t" /* context->Cpsr */ - "msr CPSR_f, r1\n\t" + "ldr r2, [r0, #0x44]\n\t" /* context->Cpsr */ + "tst r2, #0x20\n\t" /* thumb? */ "ldr r1, [r0, #0x40]\n\t" /* context->Pc */ + "orrne r1, r1, #1\n\t" /* Adjust PC according to thumb */ + "biceq r1, r1, #1\n\t" /* Adjust PC according to arm */ + "msr CPSR_f, r2\n\t" "ldr lr, [r0, #0x3c]\n\t" /* context->Lr */ "ldr sp, [r0, #0x38]\n\t" /* context->Sp */ "push {r1}\n\t" -- 2.17.1

1 0

[PATCH 1/3] ntdll: Treat trap code 0 on ARM as pagefault
by André Hentschel 27 Mar '19

27 Mar '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46187 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/signal_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 75a1133b4fd..7478f1f826d 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -145,7 +145,7 @@ struct UNWIND_INFO static inline enum arm_trap_code get_trap_code( const ucontext_t *sigcontext ) { #ifdef TRAP_sig - return TRAP_sig(sigcontext); + return TRAP_sig(sigcontext) ? TRAP_sig(sigcontext) : TRAP_ARM_PAGEFLT; #else return TRAP_ARM_UNKNOWN; /* unknown trap code */ #endif -- 2.17.1

1 0

[PATCH] imagehlp/tests: Add initial tests for CheckSumMappedFile
by Vijay Kiran Kamuju 27 Mar '19

27 Mar '19

Based on patch from Michael Müller <michael(a)fds-team.de> >From : Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/imagehlp/modify.c | 17 +-- dlls/imagehlp/tests/integrity.c | 226 +++++++++++++++++++++++++++++++- 2 files changed, 229 insertions(+), 14 deletions(-) diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c index debccc00f8..fbb2962cfe 100644 --- a/dlls/imagehlp/modify.c +++ b/dlls/imagehlp/modify.c @@ -89,27 +89,18 @@ PIMAGE_NT_HEADERS WINAPI CheckSumMappedFile( LPVOID BaseAddress, DWORD FileLength, LPDWORD HeaderSum, LPDWORD CheckSum) { - IMAGE_DOS_HEADER *dos = (IMAGE_DOS_HEADER *) BaseAddress; PIMAGE_NT_HEADERS32 Header32; PIMAGE_NT_HEADERS64 Header64; DWORD *ChecksumFile; DWORD CalcSum; DWORD HdrSum; - TRACE("(%p, %d, %p, %p)\n", - BaseAddress, FileLength, HeaderSum, CheckSum - ); - - CalcSum = (DWORD)CalcCheckSum(0, - BaseAddress, - (FileLength + 1) / sizeof(WORD)); - - if (dos->e_magic != IMAGE_DOS_SIGNATURE) - return NULL; + TRACE("(%p, %d, %p, %p)\n", BaseAddress, FileLength, HeaderSum, CheckSum); - Header32 = (IMAGE_NT_HEADERS32 *)((char *)dos + dos->e_lfanew); + CalcSum = (DWORD)CalcCheckSum(0, BaseAddress, (FileLength + 1) / sizeof(WORD)); + Header32 = (IMAGE_NT_HEADERS32 *)RtlImageNtHeader(BaseAddress); - if (Header32->Signature != IMAGE_NT_SIGNATURE) + if (!Header32) return NULL; if (Header32->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) diff --git a/dlls/imagehlp/tests/integrity.c b/dlls/imagehlp/tests/integrity.c index 3fa359f316..9a96bd32a9 100644 --- a/dlls/imagehlp/tests/integrity.c +++ b/dlls/imagehlp/tests/integrity.c @@ -26,8 +26,9 @@ #include "winerror.h" #include "winnt.h" #include "imagehlp.h" +#include "psapi.h" -static HMODULE hImageHlp; +static HMODULE hImageHlp, hPsapi, hNtdll; static char test_dll_path[MAX_PATH]; static BOOL (WINAPI *pImageAddCertificate)(HANDLE, LPWIN_CERTIFICATE, PDWORD); @@ -35,6 +36,11 @@ static BOOL (WINAPI *pImageEnumerateCertificates)(HANDLE, WORD, PDWORD, PDWORD, static BOOL (WINAPI *pImageGetCertificateData)(HANDLE, DWORD, LPWIN_CERTIFICATE, PDWORD); static BOOL (WINAPI *pImageGetCertificateHeader)(HANDLE, DWORD, LPWIN_CERTIFICATE); static BOOL (WINAPI *pImageRemoveCertificate)(HANDLE, DWORD); +static PIMAGE_NT_HEADERS (WINAPI *pCheckSumMappedFile)(PVOID, DWORD, PDWORD, PDWORD); + +static BOOL (WINAPI *pGetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD); + +static PIMAGE_NT_HEADERS (WINAPI *pRtlImageNtHeader)(PVOID); static const char test_cert_data[] = {0x30,0x82,0x02,0xE1,0x06,0x09,0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01,0x07,0x02 @@ -90,6 +96,27 @@ static const char test_cert_data[] = static const char test_cert_data_2[] = {0xDE,0xAD,0xBE,0xEF,0x01,0x02,0x03}; +static char test_pe_executable[] = +{ + 0x4d,0x5a,0x90,0x00,0x03,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0xff,0xff,0x00, + 0x00,0xb8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x80,0x00,0x00,0x00,0x0e,0x1f,0xba,0x0e,0x00,0xb4,0x09,0xcd,0x21,0xb8,0x01, + 0x4c,0xcd,0x21,0x54,0x68,0x69,0x73,0x20,0x70,0x72,0x6f,0x67,0x72,0x61,0x6d, + 0x20,0x63,0x61,0x6e,0x6e,0x6f,0x74,0x20,0x62,0x65,0x20,0x72,0x75,0x6e,0x20, + 0x69,0x6e,0x20,0x44,0x4f,0x53,0x20,0x6d,0x6f,0x64,0x65,0x2e,0x0d,0x0d,0x0a, + 0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x50,0x45,0x00,0x00,0x4c,0x01,0x0f, + 0x00,0xfd,0x38,0xc9,0x55,0x00,0x24,0x01,0x00,0xea,0x04,0x00,0x00,0xe0,0x00, + 0x07,0x01,0x0b,0x01,0x02,0x18,0x00,0x1a,0x00,0x00,0x00,0x2c,0x00,0x00,0x00, + 0x06,0x00,0x00,0xe0,0x14,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x30,0x00,0x00, + 0x00,0x00,0x40,0x00,0x00,0x10,0x00,0x00,0x00,0x02,0x00,0x00,0x04,0x00,0x00, + 0x00,0x01,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xc0, + 0x01,0x00,0x00,0x04,0x00,0x00,/* checksum */ 0x11,0xEF,0xCD,0xAB,0x03,0x00, + 0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x10,0x00,0x00, + 0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00 +}; + static BOOL copy_dll_file(void) { char sys_dir[MAX_PATH+15]; @@ -239,6 +266,190 @@ static void test_remove_certificate(int index) CloseHandle(hFile); } +static DWORD _get_checksum_offset(PVOID base, PIMAGE_NT_HEADERS *nt_header, DWORD *checksum) +{ + PIMAGE_NT_HEADERS32 Header32; + PIMAGE_NT_HEADERS64 Header64; + + + Header32 = pRtlImageNtHeader(base); + if (!Header32) + return 0; + + *nt_header = (PIMAGE_NT_HEADERS)Header32; + + if (Header32->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + { + *checksum = Header32->OptionalHeader.CheckSum; + return (char *)&Header32->OptionalHeader.CheckSum - (char *)base; + } + else if (Header32->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + { + Header64 = (IMAGE_NT_HEADERS64 *)Header32; + *checksum = Header64->OptionalHeader.CheckSum; + return (char *)&Header64->OptionalHeader.CheckSum - (char *)base; + } + + return 0; +} + +static void test_pe_checksum(void) +{ + DWORD checksum_orig, checksum_new, checksum_off, checksum_correct; + PIMAGE_NT_HEADERS nt_header; + PIMAGE_NT_HEADERS ret; + HMODULE quartz_data; + char* quartz_base; + MODULEINFO modinfo; + char buffer[20]; + BOOL ret_bool; + + if (!pCheckSumMappedFile) + { + win_skip("CheckSumMappedFile not supported, skipping tests\n"); + return; + } + + SetLastError(0xdeadbeef); + ret = pCheckSumMappedFile(NULL, 0, &checksum_orig, &checksum_new); + ok(!ret, "Expected CheckSumMappedFile to fail, got %p\n", ret); + ok(((GetLastError() == ERROR_INVALID_PARAMETER)||(GetLastError() == 0xdeadbeef)), + "Expected 0xdeadbeef (XP) or ERROR_INVALID_PARAMETER (Vista+), got %x\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pCheckSumMappedFile((void *)0xdeadbeef, 0, &checksum_orig, &checksum_new); + ok(!ret, "Expected CheckSumMappedFile to fail, got %p\n", ret); + ok(((GetLastError() == ERROR_INVALID_PARAMETER)||(GetLastError() == 0xdeadbeef)), + "Expected 0xdeadbeef (XP) or ERROR_INVALID_PARAMETER (Vista+), got %x\n", GetLastError()); + + /* basic checksum tests */ + memset(buffer, 0x11, sizeof(buffer)); + checksum_orig = checksum_new = 0xdeadbeef; + ret = pCheckSumMappedFile(buffer, sizeof(buffer), &checksum_orig, &checksum_new); + ok(ret == NULL, "Expected NULL, got %p\n", ret); + todo_wine ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); + todo_wine ok(checksum_new == 0xaabe, "Expected 0xaabe, got %x\n", checksum_new); + + memset(buffer, 0x22, sizeof(buffer)); + checksum_orig = checksum_new = 0xdeadbeef; + ret = pCheckSumMappedFile(buffer, sizeof(buffer), &checksum_orig, &checksum_new); + ok(ret == NULL, "Expected NULL, got %p\n", ret); + todo_wine ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); + todo_wine ok(checksum_new == 0x5569, "Expected 0x5569, got %x\n", checksum_new); + + memset(buffer, 0x22, sizeof(buffer)); + checksum_orig = checksum_new = 0xdeadbeef; + ret = pCheckSumMappedFile(buffer, 10, &checksum_orig, &checksum_new); + ok(ret == NULL, "Expected NULL, got %p\n", ret); + todo_wine ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); + todo_wine ok(checksum_new == 0xaab4, "Expected 0xaab4, got %x\n", checksum_new); + + memset(buffer, 0x22, sizeof(buffer)); + checksum_orig = checksum_new = 0xdeadbeef; + ret = pCheckSumMappedFile(buffer, 11, &checksum_orig, &checksum_new); + ok(ret == NULL, "Expected NULL, got %p\n", ret); + todo_wine ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); + todo_wine ok(checksum_new == 0xaad7, "Expected 0xaad7, got %x\n", checksum_new); + + /* test checksum of PE module */ + memset(buffer, 0x22, sizeof(buffer)); + checksum_orig = checksum_new = 0xdeadbeef; + ret = pCheckSumMappedFile(test_pe_executable, sizeof(test_pe_executable), + &checksum_orig, &checksum_new); + ok((char *)ret == test_pe_executable + 0x80, "Expected %p, got %p\n", test_pe_executable + 0x80, ret); + ok(checksum_orig == 0xabcdef11, "Expected 0xabcdef11, got %x\n", checksum_orig); + ok(checksum_new == 0xaa4, "Expected 0xaa4, got %x\n", checksum_new); + + if (!pGetModuleInformation) + { + win_skip("GetModuleInformation not supported, skipping tests\n"); + return; + } + + ret_bool = pGetModuleInformation(GetCurrentProcess(), GetModuleHandleA(NULL), + &modinfo, sizeof(modinfo)); + ok(ret_bool, "GetModuleInformation failed, error: %x\n", GetLastError()); + + SetLastError(0xdeadbeef); + checksum_orig = checksum_new = 0xdeadbeef; + ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, modinfo.SizeOfImage, &checksum_orig, &checksum_new); + ok(ret != NULL, "Expected CheckSumMappedFile to succeed\n"); + ok(GetLastError() == 0xdeadbeef, "Expected err=0xdeadbeef, got %x\n", GetLastError()); + ok(checksum_orig != 0xdeadbeef, "Expected orig checksum != 0xdeadbeef\n"); + ok(checksum_new != 0xdeadbeef, "Expected new checksum != 0xdeadbeef\n"); + + SetLastError(0xdeadbeef); + checksum_orig = checksum_new = 0xdeadbeef; + ret = pCheckSumMappedFile((char *)modinfo.lpBaseOfDll + 100, modinfo.SizeOfImage - 100, + &checksum_orig, &checksum_new); + ok(!ret, "Expected CheckSumMappedFile to fail, got %p\n", ret); + ok(GetLastError() == 0xdeadbeef, "Expected err=0xdeadbeef, got %x\n", GetLastError()); + todo_wine ok(checksum_orig == 0, "Expected 0, got %x\n", checksum_orig); + todo_wine ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); + + checksum_off = _get_checksum_offset(modinfo.lpBaseOfDll, &nt_header, &checksum_correct); + ok(checksum_off != 0, "Failed to get checksum offset\n"); + + checksum_orig = checksum_new = 0xdeadbeef; + ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, (char *)nt_header - (char *)modinfo.lpBaseOfDll, + &checksum_orig, &checksum_new); + ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p", ret); + ok((checksum_orig == 0) || (checksum_orig == checksum_correct), "Expected %x, got %x\n", checksum_correct, checksum_orig); + ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); + + checksum_orig = checksum_new = 0xdeadbeef; + ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, sizeof(IMAGE_DOS_HEADER), + &checksum_orig, &checksum_new); + ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p", ret); + ok((checksum_orig == 0) || (checksum_orig == checksum_correct), "Expected %x, got %x\n", checksum_correct, checksum_orig); + ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); + + checksum_orig = checksum_new = 0xdeadbeef; + ret = pCheckSumMappedFile(modinfo.lpBaseOfDll, 0, &checksum_orig, &checksum_new); + ok(!ret || (ret == nt_header), "Expected CheckSumMappedFile to fail, got %p", ret); + ok((checksum_orig == 0xdeadbeef) || (checksum_orig == checksum_correct), "Expected %x, got %x\n", checksum_correct, checksum_orig); + todo_wine ok((checksum_new == 0xdeadbeef) || (checksum_new != 0 && checksum_new != 0xdeadbeef), "Got unexpected value %x\n", checksum_new); + + checksum_orig = checksum_new = 0xdeadbeef; + ret = pCheckSumMappedFile((char *)modinfo.lpBaseOfDll + 1, 0, + &checksum_orig, &checksum_new); + ok(ret == NULL, "Expected NULL, got %p\n", ret); + ok((checksum_orig == 0) || (checksum_orig == 0xdeadbeef), "Expected 0, got %x\n", checksum_orig); + ok((checksum_new == 0) || (checksum_new == 0xdeadbeef), "Expected 0, got %x\n", checksum_new); + + quartz_data = LoadLibraryExA("quartz.dll", NULL, LOAD_LIBRARY_AS_DATAFILE); + if (!quartz_data) + { + skip("Failed to load quartz as datafile, skipping tests\n"); + return; + } + + quartz_base = (char *)((DWORD_PTR)quartz_data & ~1); + checksum_off = _get_checksum_offset(quartz_base, &nt_header, &checksum_correct); + ok(checksum_off != 0, "Failed to get checksum offset\n"); + + checksum_orig = checksum_new = 0xdeadbeef; + ret = pCheckSumMappedFile(quartz_base, (char *)nt_header - quartz_base, + &checksum_orig, &checksum_new); + ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); + ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); + ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); + + checksum_orig = checksum_new = 0xdeadbeef; + ret = pCheckSumMappedFile(quartz_base, sizeof(IMAGE_DOS_HEADER), &checksum_orig, &checksum_new); + ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); + ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); + ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); + + checksum_orig = checksum_new = 0xdeadbeef; + ret = pCheckSumMappedFile(quartz_base, 0, &checksum_orig, &checksum_new); + ok(ret == nt_header, "Expected %p, got %p\n", nt_header, ret); + ok(checksum_orig == checksum_correct, "Expected %x, got %x\n", checksum_correct, checksum_orig); + todo_wine ok(checksum_new != 0 && checksum_new != 0xdeadbeef, "Got unexpected value %x\n", checksum_new); + + FreeLibrary(quartz_data); +} + START_TEST(integrity) { DWORD file_size, file_size_orig, first, second; @@ -273,6 +484,15 @@ START_TEST(integrity) pImageGetCertificateData = (void *) GetProcAddress(hImageHlp, "ImageGetCertificateData"); pImageGetCertificateHeader = (void *) GetProcAddress(hImageHlp, "ImageGetCertificateHeader"); pImageRemoveCertificate = (void *) GetProcAddress(hImageHlp, "ImageRemoveCertificate"); + pCheckSumMappedFile = (void *) GetProcAddress(hImageHlp, "CheckSumMappedFile"); + + hPsapi = LoadLibraryA("psapi.dll"); + if (hPsapi) + pGetModuleInformation = (void *) GetProcAddress(hPsapi, "GetModuleInformation"); + + hNtdll = LoadLibraryA("ntdll.dll"); + if (hNtdll) + pRtlImageNtHeader = (void *) GetProcAddress(hNtdll, "RtlImageNtHeader"); first = test_add_certificate(test_cert_data, sizeof(test_cert_data)); test_get_certificate(test_cert_data, first); @@ -299,6 +519,10 @@ START_TEST(integrity) file_size = get_file_size(); ok(file_size == file_size_orig, "File size different after add and remove (old: %d; new: %d)\n", file_size_orig, file_size); + test_pe_checksum(); + + if (hPsapi) FreeLibrary(hPsapi); + if (hNtdll) FreeLibrary(hNtdll); FreeLibrary(hImageHlp); DeleteFileA(test_dll_path); } -- 2.21.0

2 1

[PATCH 2/2] wined3d: Also update the "src_texture_gl" pointer when using a staging texture in the blitter.
by Henri Verbeet 27 Mar '19

27 Mar '19

Astutely spotted by Józef Kucia. This fixes a regression introduced by commit 961a94ac046644004718c56bfeeb81740cb73793. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/surface.c | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 05bd55a89bd..92c6e475727 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7841,6 +7841,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl src_texture, src_sub_resource_idx, &upload_box); src_texture = staging_texture; + src_texture_gl = wined3d_texture_gl(src_texture); src_sub_resource_idx = 0; } else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 55d99abd589..5844b0c0b16 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13258,6 +13258,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli src_texture, src_sub_resource_idx, &upload_box); src_texture = staging_texture; + src_texture_gl = wined3d_texture_gl(src_texture); src_sub_resource_idx = 0; } else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 11d02551fd7..48ca35bb3b3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2213,6 +2213,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit src_texture, src_sub_resource_idx, &upload_box); src_texture = staging_texture; + src_texture_gl = wined3d_texture_gl(src_texture); src_sub_resource_idx = 0; } else -- 2.11.0

1 0

[PATCH 1/2] wined3d: Do not take "draw_rect" into account when comparing attachment sizes in ffp_blitter_clear().
by Henri Verbeet 27 Mar '19

27 Mar '19

The scissor rectangle and viewport shouldn't affect whether attachment sizes are equal. The Intel i965 driver will do a fast clear when the scissor rectangle overlaps the intersection of the attachments, and that behaviour is allowed by the OpenGL spec. This commit fixes failures in the d3d8 and d3d9 depth_buffer_test() tests on the Intel i965 driver. See also commit 0530f33cc1644cd782ee2028966721bddf28c5d4. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4d5b7770208..11d02551fd7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2052,12 +2052,11 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) { - BOOL have_previous_rect = FALSE, have_identical_size = TRUE; - struct wined3d_rendertarget_view *view; + struct wined3d_rendertarget_view *view, *previous = NULL; + BOOL have_identical_size = TRUE; struct wined3d_fb_state tmp_fb; unsigned int next_rt_count = 0; struct wined3d_blitter *next; - RECT previous_rect, rect; DWORD next_flags = 0; unsigned int i; @@ -2101,23 +2100,17 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de if (!(view = fb->render_targets[i])) continue; - SetRect(&rect, 0, 0, view->width, view->height); - IntersectRect(&rect, draw_rect, &rect); - if (have_previous_rect && !EqualRect(&previous_rect, &rect)) + if (previous && (previous->width != view->width || previous->height != view->height)) have_identical_size = FALSE; - previous_rect = rect; - have_previous_rect = TRUE; + previous = view; } if (flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) { view = fb->depth_stencil; - SetRect(&rect, 0, 0, view->width, view->height); - IntersectRect(&rect, draw_rect, &rect); - if (have_previous_rect && !EqualRect(&previous_rect, &rect)) + if (previous && (previous->width != view->width || previous->height != view->height)) have_identical_size = FALSE; - previous_rect = rect; - have_previous_rect = TRUE; + previous = view; } if (have_identical_size) -- 2.11.0

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 27 Mar '19

27 Mar '19

1 0

[PATCH 1/3] msi/tests: Separate and expand tests for MsiViewGetError().
by Zebediah Figura 27 Mar '19

27 Mar '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/db.c | 176 +++++++++++++++++++++++++++++++++----------- 1 file changed, 132 insertions(+), 44 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 9fbf43eaee..16b20e530b 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -879,45 +879,17 @@ static void test_viewmodify(void) r = run_query( hdb, 0, query ); ok(r == ERROR_SUCCESS, "query failed\n"); - /* check what the error function reports without doing anything */ - sz = 0; - /* passing NULL as the 3rd param make function to crash on older platforms */ - err = MsiViewGetErrorA( 0, NULL, &sz ); - ok(err == MSIDBERROR_INVALIDARG, "MsiViewGetError return\n"); - - /* open a view */ query = "SELECT * FROM `phone`"; r = MsiDatabaseOpenViewA(hdb, query, &hview); ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); - /* see what happens with a good hview and bad args */ - err = MsiViewGetErrorA( hview, NULL, NULL ); - ok(err == MSIDBERROR_INVALIDARG || err == MSIDBERROR_NOERROR, - "MsiViewGetError returns %u (expected -3)\n", err); - err = MsiViewGetErrorA( hview, buffer, NULL ); - ok(err == MSIDBERROR_INVALIDARG, "MsiViewGetError return\n"); - - /* see what happens with a zero length buffer */ - sz = 0; - buffer[0] = 'x'; - err = MsiViewGetErrorA( hview, buffer, &sz ); - ok(err == MSIDBERROR_MOREDATA, "MsiViewGetError return\n"); - ok(buffer[0] == 'x', "buffer cleared\n"); - ok(sz == 0, "size not zero\n"); - - /* ok this one is strange */ - sz = 0; - err = MsiViewGetErrorA( hview, NULL, &sz ); - ok(err == MSIDBERROR_NOERROR, "MsiViewGetError return\n"); - ok(sz == 0, "size not zero\n"); - - /* see if it really has an error */ - sz = sizeof buffer; - buffer[0] = 'x'; + /* check what the error function reports without doing anything */ + sz = sizeof(buffer); + strcpy(buffer, "x"); err = MsiViewGetErrorA( hview, buffer, &sz ); - ok(err == MSIDBERROR_NOERROR, "MsiViewGetError return\n"); - ok(buffer[0] == 0, "buffer not cleared\n"); - ok(sz == 0, "size not zero\n"); + ok(err == MSIDBERROR_NOERROR, "got %d\n", err); + ok(!buffer[0], "got \"%s\"\n", buffer); + ok(sz == 0, "got size %u\n", sz); r = MsiViewExecute(hview, 0); ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); @@ -933,12 +905,12 @@ static void test_viewmodify(void) r = MsiViewModify(hview, -1, hrec ); ok(r == ERROR_INVALID_DATA, "MsiViewModify failed\n"); - sz = sizeof buffer; - buffer[0] = 'x'; + sz = sizeof(buffer); + strcpy(buffer, "x"); err = MsiViewGetErrorA( hview, buffer, &sz ); - ok(err == MSIDBERROR_NOERROR, "MsiViewGetError return\n"); - ok(buffer[0] == 0, "buffer not cleared\n"); - ok(sz == 0, "size not zero\n"); + ok(err == MSIDBERROR_NOERROR, "got %d\n", err); + ok(!buffer[0], "got \"%s\"\n", buffer); + ok(sz == 0, "got size %u\n", sz); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -965,12 +937,12 @@ static void test_viewmodify(void) r = MsiViewModify(hview, MSIMODIFY_VALIDATE_NEW, hrec ); ok(r == ERROR_INVALID_DATA, "MsiViewModify failed %u\n", r); - sz = sizeof buffer; - buffer[0] = 'x'; + sz = sizeof(buffer); + strcpy(buffer, "x"); err = MsiViewGetErrorA( hview, buffer, &sz ); - ok(err == MSIDBERROR_DUPLICATEKEY, "MsiViewGetError returned %u\n", err); - ok(!strcmp(buffer, "id"), "expected \"id\" c, got \"%s\"\n", buffer); - ok(sz == 2, "size not 2\n"); + ok(err == MSIDBERROR_DUPLICATEKEY, "got %d\n", err); + ok(!strcmp(buffer, "id"), "got \"%s\"\n", buffer); + ok(sz == 2, "got size %u\n", sz); /* insert the same thing again */ r = MsiViewExecute(hview, 0); @@ -9109,6 +9081,121 @@ static void test_viewmodify_insert(void) DeleteFileA(msifile); } +static void test_view_get_error(void) +{ + MSIHANDLE view, rec, db = create_db(); + MSIDBERROR err; + char buffer[5]; + DWORD sz; + UINT r; + + r = run_query(db, 0, "CREATE TABLE `T` (`A` SHORT, `B` SHORT NOT NULL PRIMARY KEY `A`)"); + ok(!r, "got %u\n", r); + r = run_query(db, 0, "INSERT INTO `T` (`A`, `B`) VALUES (1, 2)"); + r = run_query(db, 0, "CREATE TABLE `_Validation` (" + "`Table` CHAR(32) NOT NULL, `Column` CHAR(32) NOT NULL, " + "`Nullable` CHAR(4) NOT NULL, `MinValue` INT, `MaxValue` INT, " + "`KeyTable` CHAR(255), `KeyColumn` SHORT, `Category` CHAR(32), " + "`Set` CHAR(255), `Description` CHAR(255) PRIMARY KEY `Table`, `Column`)"); + ok(!r, "got %u\n", r); + r = run_query(db, 0, "INSERT INTO `_Validation` (`Table`, `Column`, `Nullable`) VALUES ('T', 'A', 'N')"); + ok(!r, "got %u\n", r); + r = run_query(db, 0, "INSERT INTO `_Validation` (`Table`, `Column`, `Nullable`) VALUES ('T', 'B', 'N')"); + ok(!r, "got %u\n", r); + + r = MsiDatabaseOpenViewA(db, "SELECT * FROM `T`", &view); + ok(!r, "got %u\n", r); + + r = MsiViewExecute(view, 0); + ok(!r, "got %u\n", r); + + sz = 0; + err = MsiViewGetErrorA(0, NULL, &sz); + ok(err == MSIDBERROR_INVALIDARG, "got %d\n", err); + ok(sz == 0, "got size %u\n", sz); + + err = MsiViewGetErrorA(view, NULL, NULL); + ok(err == MSIDBERROR_INVALIDARG, "got %d\n", err); + + sz = 0; + err = MsiViewGetErrorA(view, NULL, &sz); + ok(err == MSIDBERROR_NOERROR, "got %d\n", err); + ok(sz == 0, "got size %u\n", sz); + + sz = 0; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(err == MSIDBERROR_MOREDATA, "got %d\n", err); + ok(!strcmp(buffer, "x"), "got \"%s\"\n", buffer); + ok(sz == 0, "got size %u\n", sz); + + sz = 1; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(err == MSIDBERROR_NOERROR, "got %d\n", err); + ok(!buffer[0], "got \"%s\"\n", buffer); + ok(sz == 0, "got size %u\n", sz); + + rec = MsiCreateRecord(2); + MsiRecordSetInteger(rec, 1, 1); + MsiRecordSetInteger(rec, 2, 2); + r = MsiViewModify(view, MSIMODIFY_VALIDATE_NEW, rec); + ok(r == ERROR_INVALID_DATA, "got %u\n", r); + + sz = 2; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(err == MSIDBERROR_DUPLICATEKEY, "got %d\n", err); + ok(!strcmp(buffer, "A"), "got \"%s\"\n", buffer); + ok(sz == 1, "got size %u\n", sz); + + sz = 2; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + todo_wine ok(err == MSIDBERROR_NOERROR, "got %d\n", err); + todo_wine ok(!buffer[0], "got \"%s\"\n", buffer); + todo_wine ok(sz == 0, "got size %u\n", sz); + + r = MsiViewModify(view, MSIMODIFY_VALIDATE_NEW, rec); + ok(r == ERROR_INVALID_DATA, "got %u\n", r); + + sz = 1; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(err == MSIDBERROR_MOREDATA, "got %d\n", err); + todo_wine ok(!buffer[0], "got \"%s\"\n", buffer); + ok(sz == 1, "got size %u\n", sz); + + sz = 1; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + todo_wine ok(err == MSIDBERROR_NOERROR, "got %d\n", err); + todo_wine ok(!buffer[0], "got \"%s\"\n", buffer); + todo_wine ok(sz == 0, "got size %u\n", sz); + + r = MsiViewModify(view, MSIMODIFY_VALIDATE_NEW, rec); + ok(r == ERROR_INVALID_DATA, "got %u\n", r); + + sz = 0; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(err == MSIDBERROR_MOREDATA, "got %d\n", err); + ok(!strcmp(buffer, "x"), "got \"%s\"\n", buffer); + ok(sz == 1, "got size %u\n", sz); + + sz = 0; + strcpy(buffer, "x"); + err = MsiViewGetErrorA(view, buffer, &sz); + ok(err == MSIDBERROR_MOREDATA, "got %d\n", err); + ok(!strcmp(buffer, "x"), "got \"%s\"\n", buffer); + todo_wine ok(sz == 0, "got size %u\n", sz); + + MsiCloseHandle(rec); + MsiCloseHandle(view); + MsiCloseHandle(db); + DeleteFileA(msifile); +} + START_TEST(db) { test_msidatabase(); @@ -9167,4 +9254,5 @@ START_TEST(db) test_primary_keys(); test_viewmodify_merge(); test_viewmodify_insert(); + test_view_get_error(); } -- 2.17.1

3 7