July 2015 - Wine-commits - list.winehq.org

Sebastian Lackner : ntdll/tests: Add tests for RtlDecompressBuffer.
by Alexandre Julliard 10 Jul '15

10 Jul '15

Module: wine Branch: master Commit: 0e7bd455716f6b9612d7b0115e42bcf16224879c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e7bd455716f6b9612d7b0115… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 10 06:41:24 2015 +0200 ntdll/tests: Add tests for RtlDecompressBuffer. --- dlls/ntdll/tests/rtl.c | 361 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 361 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e7bd455716f6b9612d7b…

1 0

Sebastian Lackner : ntdll/tests: Add tests for RtlDecompressFragment.
by Alexandre Julliard 10 Jul '15

10 Jul '15

Module: wine Branch: master Commit: db1e8a686e0fa0a80809418a54a658fce636ce70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db1e8a686e0fa0a80809418a5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jul 10 06:41:51 2015 +0200 ntdll/tests: Add tests for RtlDecompressFragment. --- dlls/ntdll/tests/rtl.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 89 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index a1b9327..4903790 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -94,6 +94,7 @@ static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG*, ULONG_PTR*); static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); static NTSTATUS (WINAPI *pRtlGetCompressionWorkSpaceSize)(USHORT, PULONG, PULONG); static NTSTATUS (WINAPI *pRtlDecompressBuffer)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, PULONG); +static NTSTATUS (WINAPI *pRtlDecompressFragment)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, ULONG, PULONG, PVOID); static NTSTATUS (WINAPI *pRtlCompressBuffer)(USHORT, const UCHAR*, ULONG, PUCHAR, ULONG, ULONG, PULONG, PVOID); static HMODULE hkernel32 = 0; @@ -144,6 +145,7 @@ static void InitFunctionPtrs(void) pLdrUnlockLoaderLock = (void *)GetProcAddress(hntdll, "LdrUnlockLoaderLock"); pRtlGetCompressionWorkSpaceSize = (void *)GetProcAddress(hntdll, "RtlGetCompressionWorkSpaceSize"); pRtlDecompressBuffer = (void *)GetProcAddress(hntdll, "RtlDecompressBuffer"); + pRtlDecompressFragment = (void *)GetProcAddress(hntdll, "RtlDecompressFragment"); pRtlCompressBuffer = (void *)GetProcAddress(hntdll, "RtlCompressBuffer"); } hkernel32 = LoadLibraryA("kernel32.dll"); @@ -1946,14 +1948,14 @@ static void test_RtlDecompressBuffer(void) } }; - static UCHAR buf[0x2000]; - NTSTATUS status; + static UCHAR buf[0x2000], workspace[0x1000]; + NTSTATUS status, expected_status; ULONG final_size; int i; - if (!pRtlDecompressBuffer) + if (!pRtlDecompressBuffer || !pRtlDecompressFragment) { - win_skip("RtlDecompressBuffer is not available\n"); + win_skip("RtlDecompressBuffer or RtlDecompressFragment is not available\n"); return; } @@ -2071,6 +2073,89 @@ static void test_RtlDecompressBuffer(void) ok(final_size == 0, "%d: got wrong final_size %u\n", i, final_size); ok(buf[0] == 0x11, "%d: buf[0] was modified\n", i); } + + /* test RtlDecompressFragment with offset = 0 */ + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, + test_lznt[i].compressed_size, 0, &final_size, workspace); + if (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT) + todo_wine + ok(status == STATUS_BAD_COMPRESSION_BUFFER, "%d: got wrong status 0x%08x\n", i, status); + else + ok(status == test_lznt[i].status, "%d: got wrong status 0x%08x\n", i, status); + if (!status) + { + ok(final_size == test_lznt[i].uncompressed_size, + "%d: got wrong final_size %u\n", i, final_size); + ok(!memcmp(buf, test_lznt[i].uncompressed, test_lznt[i].uncompressed_size), + "%d: got wrong decoded data\n", i); + ok(buf[test_lznt[i].uncompressed_size] == 0x11, + "%d: buf[%u] was modified\n", i, test_lznt[i].uncompressed_size); + } + + /* test RtlDecompressFragment with offset = 1 */ + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, + test_lznt[i].compressed_size, 1, &final_size, workspace); + if (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT) + todo_wine + ok(status == STATUS_BAD_COMPRESSION_BUFFER, "%d: got wrong status 0x%08x\n", i, status); + else + ok(status == test_lznt[i].status, "%d: got wrong status 0x%08x\n", i, status); + if (!status) + { + if (test_lznt[i].uncompressed_size == 0) + { + todo_wine + ok(final_size == 4095, "%d: got wrong final_size %u\n", i, final_size); + /* Buffer doesn't contain any useful value on Windows */ + ok(buf[4095] == 0x11, "%d: buf[4095] was modified\n", i); + } + else + { + ok(final_size == test_lznt[i].uncompressed_size - 1, + "%d: got wrong final_size %u\n", i, final_size); + ok(!memcmp(buf, test_lznt[i].uncompressed + 1, test_lznt[i].uncompressed_size - 1), + "%d: got wrong decoded data\n", i); + ok(buf[test_lznt[i].uncompressed_size - 1] == 0x11, + "%d: buf[%u] was modified\n", i, test_lznt[i].uncompressed_size - 1); + } + } + + /* test RtlDecompressFragment with offset = 4095 */ + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, + test_lznt[i].compressed_size, 4095, &final_size, workspace); + if (test_lznt[i].broken_flags & DECOMPRESS_BROKEN_FRAGMENT) + todo_wine + ok(status == STATUS_BAD_COMPRESSION_BUFFER, "%d: got wrong status 0x%08x\n", i, status); + else + ok(status == test_lznt[i].status, "%d: got wrong status 0x%08x\n", i, status); + if (!status) + { + todo_wine + ok(final_size == 1, "%d: got wrong final_size %u\n", i, final_size); + todo_wine + ok(buf[0] == 0, "%d: padding is not zero\n", i); + ok(buf[1] == 0x11, "%d: buf[1] was modified\n", i); + } + + /* test RtlDecompressFragment with offset = 4096 */ + final_size = 0xdeadbeef; + memset(buf, 0x11, sizeof(buf)); + status = pRtlDecompressFragment(COMPRESSION_FORMAT_LZNT1, buf, sizeof(buf), test_lznt[i].compressed, + test_lznt[i].compressed_size, 4096, &final_size, workspace); + expected_status = is_incomplete_chunk(test_lznt[i].compressed, test_lznt[i].compressed_size, TRUE) ? + test_lznt[i].status : STATUS_SUCCESS; + ok(status == expected_status, "%d: got wrong status 0x%08x, expected 0x%08x\n", i, status, expected_status); + if (!status) + { + ok(final_size == 0, "%d: got wrong final_size %u\n", i, final_size); + ok(buf[0] == 0x11, "%d: buf[4096] was modified\n", i); + } } }

1 0

Sebastian Lackner : user32/tests: Add tests for calling GetKeyState from thread without message queue.
by Alexandre Julliard 10 Jul '15

10 Jul '15

Module: wine Branch: master Commit: 6019da2355dee9adb1e0e9146dcabaf9b0248690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6019da2355dee9adb1e0e9146… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 8 13:31:08 2015 +0200 user32/tests: Add tests for calling GetKeyState from thread without message queue. --- dlls/user32/tests/input.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index cb130e8..83f99ad 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2427,6 +2427,70 @@ static void test_attach_input(void) DestroyWindow(Wnd2); } +static DWORD WINAPI get_key_state_thread(void *arg) +{ + HANDLE *semaphores = arg; + DWORD result; + + ReleaseSemaphore(semaphores[0], 1, NULL); + result = WaitForSingleObject(semaphores[1], 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + + result = GetKeyState('X'); + todo_wine + ok((result & 0x8000) || broken(!(result & 0x8000)), /* > Win 2003 */ + "expected that highest bit is set, got %x\n", result); + + ReleaseSemaphore(semaphores[0], 1, NULL); + result = WaitForSingleObject(semaphores[1], 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + + result = GetKeyState('X'); + ok(!(result & 0x8000), "expected that highest bit is unset, got %x\n", result); + + return 0; +} + +static void test_GetKeyState(void) +{ + HANDLE semaphores[2]; + HANDLE thread; + DWORD result; + HWND hwnd; + + semaphores[0] = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(semaphores[0] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + semaphores[1] = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(semaphores[1] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + + hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 10, 10, 200, 200, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "CreateWindowA failed %u\n", GetLastError()); + + thread = CreateThread(NULL, 0, get_key_state_thread, semaphores, 0, NULL); + ok(thread != NULL, "CreateThread failed %u\n", GetLastError()); + result = WaitForSingleObject(semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + + SetFocus(hwnd); + keybd_event('X', 0, 0, 0); + + ReleaseSemaphore(semaphores[1], 1, NULL); + result = WaitForSingleObject(semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + + keybd_event('X', 0, KEYEVENTF_KEYUP, 0); + + ReleaseSemaphore(semaphores[1], 1, NULL); + result = WaitForSingleObject(thread, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + CloseHandle(thread); + + DestroyWindow(hwnd); + CloseHandle(semaphores[0]); + CloseHandle(semaphores[1]); +} + START_TEST(input) { init_function_pointers(); @@ -2449,6 +2513,7 @@ START_TEST(input) test_keyboard_layout_name(); test_key_names(); test_attach_input(); + test_GetKeyState(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx();

1 0

Sebastian Lackner : server: Add fallback to desktop keystate in get_key_state wineserver call.
by Alexandre Julliard 10 Jul '15

10 Jul '15

Module: wine Branch: master Commit: 8723d3455eb78fb0321a94970b2b8f39262f65d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8723d3455eb78fb0321a94970… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Jul 8 13:31:14 2015 +0200 server: Add fallback to desktop keystate in get_key_state wineserver call. --- dlls/user32/tests/input.c | 1 - server/queue.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 83f99ad..d662d6f 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2437,7 +2437,6 @@ static DWORD WINAPI get_key_state_thread(void *arg) ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); result = GetKeyState('X'); - todo_wine ok((result & 0x8000) || broken(!(result & 0x8000)), /* > Win 2003 */ "expected that highest bit is set, got %x\n", result); diff --git a/server/queue.c b/server/queue.c index a19af02..13ca2b2 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2851,13 +2851,26 @@ DECL_HANDLER(get_key_state) } else { + unsigned char *keystate; if (!(thread = get_thread_from_id( req->tid ))) return; if (thread->queue) { if (req->key >= 0) reply->state = thread->queue->input->keystate[req->key & 0xff]; set_reply_data( thread->queue->input->keystate, size ); + release_object( thread ); + return; } release_object( thread ); + + /* fallback to desktop keystate */ + if (!(desktop = get_thread_desktop( current, 0 ))) return; + if (req->key >= 0) reply->state = desktop->keystate[req->key & 0xff] & ~0x40; + if ((keystate = set_reply_data_size( size ))) + { + unsigned int i; + for (i = 0; i < size; i++) keystate[i] = desktop->keystate[i] & ~0x40; + } + release_object( desktop ); } }

1 0

Austin English : davclnt: Add stub dll.
by Alexandre Julliard 10 Jul '15

10 Jul '15

Module: wine Branch: master Commit: b8fc901d5c970a8441cea981261d1790d0ce798c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8fc901d5c970a8441cea9812… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 7 11:28:35 2015 -0500 davclnt: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/davclnt/Makefile.in | 4 ++++ dlls/davclnt/davclnt.spec | 23 +++++++++++++++++++++++ dlls/davclnt/main.c | 40 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 70 insertions(+) diff --git a/configure b/configure index ebaa38c..91e1f67 100755 --- a/configure +++ b/configure @@ -1022,6 +1022,7 @@ enable_d3dx9_41 enable_d3dx9_42 enable_d3dx9_43 enable_d3dxof +enable_davclnt enable_dbgeng enable_dbghelp enable_dciman32 @@ -17197,6 +17198,7 @@ wine_fn_config_dll d3dx9_42 enable_d3dx9_42 wine_fn_config_dll d3dx9_43 enable_d3dx9_43 wine_fn_config_dll d3dxof enable_d3dxof clean,implib wine_fn_config_test dlls/d3dxof/tests d3dxof_test +wine_fn_config_dll davclnt enable_davclnt wine_fn_config_dll dbgeng enable_dbgeng implib wine_fn_config_dll dbghelp enable_dbghelp implib wine_fn_config_dll dciman32 enable_dciman32 implib diff --git a/configure.ac b/configure.ac index fa58592..3eaec29 100644 --- a/configure.ac +++ b/configure.ac @@ -2894,6 +2894,7 @@ WINE_CONFIG_DLL(d3dx9_42) WINE_CONFIG_DLL(d3dx9_43) WINE_CONFIG_DLL(d3dxof,,[clean,implib]) WINE_CONFIG_TEST(dlls/d3dxof/tests) +WINE_CONFIG_DLL(davclnt) WINE_CONFIG_DLL(dbgeng,,[implib]) WINE_CONFIG_DLL(dbghelp,,[implib]) WINE_CONFIG_DLL(dciman32,,[implib]) diff --git a/dlls/davclnt/Makefile.in b/dlls/davclnt/Makefile.in new file mode 100644 index 0000000..73af482 --- /dev/null +++ b/dlls/davclnt/Makefile.in @@ -0,0 +1,4 @@ +MODULE = davclnt.dll + +C_SRCS = \ + main.c diff --git a/dlls/davclnt/davclnt.spec b/dlls/davclnt/davclnt.spec new file mode 100644 index 0000000..996a595 --- /dev/null +++ b/dlls/davclnt/davclnt.spec @@ -0,0 +1,23 @@ +@ stub DavCancelConnectionsToServer +@ stub DavFreeUsedDiskSpace +@ stub DavGetDiskSpaceUsage +@ stub DavGetTheLockOwnerOfTheFile +@ stub DavInvalidateCache +@ stub DavRegisterAuthCallback +@ stub DavUnregisterAuthCallback +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stdcall -private DllMain(long long ptr) +@ stub NPAddConnection3 +@ stub NPAddConnection +@ stub NPCancelConnection +@ stub NPCloseEnum +@ stub NPEnumResource +@ stub NPFormatNetworkName +@ stub NPGetCaps +@ stub NPGetConnection +@ stub NPGetResourceInformation +@ stub NPGetResourceParent +@ stub NPGetUniversalName +@ stub NPGetUser +@ stub NPOpenEnum diff --git a/dlls/davclnt/main.c b/dlls/davclnt/main.c new file mode 100644 index 0000000..099b915 --- /dev/null +++ b/dlls/davclnt/main.c @@ -0,0 +1,40 @@ +/* + * WebDav Client + * + * Copyright 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0

Austin English : d3d11: Add a stub for D3D11CreateDeviceAndSwapChain.
by Alexandre Julliard 10 Jul '15

10 Jul '15

Module: wine Branch: master Commit: 9e94232711706fa07a10221436ab6c5095eb708b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e94232711706fa07a1022143… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 23 18:30:51 2014 -0600 d3d11: Add a stub for D3D11CreateDeviceAndSwapChain. --- dlls/d3d11/d3d11.spec | 2 +- dlls/d3d11/d3d11_main.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index 52d7bcb..2d6c877 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -3,7 +3,7 @@ @ stub D3D11CoreGetLayeredDeviceSize @ stub D3D11CoreRegisterLayers @ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) -@ stub D3D11CreateDeviceAndSwapChain +@ stdcall D3D11CreateDeviceAndSwapChain(ptr long ptr long ptr long long ptr ptr ptr ptr ptr) @ stub D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation @ stub D3DKMTCreateContext diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index ec8236f..8d8e20a 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -54,3 +54,15 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t flags, feature_levels, levels, sdk_version, device, feature_level, context); return E_OUTOFMEMORY; } + +HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, + HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, + UINT sdk_version, const DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, + ID3D11Device **device, D3D_FEATURE_LEVEL *feature_level, ID3D11DeviceContext **immediate_context) +{ + FIXME("adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %#x, sdk_version %u, " + "swapchain_desc %p, swapchain %p, device %p, feature_level %p, immediate_context %p stub!\n", + adapter, debug_d3d_driver_type(driver_type), swrast, flags, feature_levels, levels, sdk_version, + swapchain_desc, swapchain, device, feature_level, immediate_context); + return E_NOTIMPL; +}

1 0

Hans Leidekker : msi/tests: Avoid test failures on win2k3.
by Alexandre Julliard 10 Jul '15

10 Jul '15

Module: wine Branch: master Commit: b71075ad9bfdd19c9731521eb62c6eada0f96aa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b71075ad9bfdd19c9731521eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 10 12:53:55 2015 +0200 msi/tests: Avoid test failures on win2k3. --- dlls/msi/tests/install.c | 151 ++--------------------------------------------- 1 file changed, 5 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b71075ad9bfdd19c97315…

1 0

Matteo Bruni : d3d9/tests: Add a test for UpdateTexture.
by Alexandre Julliard 09 Jul '15

09 Jul '15

Module: wine Branch: master Commit: 76b1461d17bc8fa241eececda942c9d66c666dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b1461d17bc8fa241eececda… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 8 15:47:03 2015 +0200 d3d9/tests: Add a test for UpdateTexture. --- dlls/d3d9/tests/visual.c | 334 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 334 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=76b1461d17bc8fa241eec…

1 0

Matteo Bruni : d3d8/tests: Add a test for UpdateTexture.
by Alexandre Julliard 09 Jul '15

09 Jul '15

Module: wine Branch: master Commit: b2eac3a51d648faf3b723465e98f6e2782e13b0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2eac3a51d648faf3b723465e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 8 15:47:04 2015 +0200 d3d8/tests: Add a test for UpdateTexture. --- dlls/d3d8/tests/visual.c | 331 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 331 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b2eac3a51d648faf3b723…

1 0

Sebastian Lackner : ntdll/tests: Add tests for RtlCompressBuffer.
by Alexandre Julliard 09 Jul '15

09 Jul '15

Module: wine Branch: master Commit: 025ea11dc46706875965aa02f275717d558b3048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=025ea11dc46706875965aa02f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 9 03:04:57 2015 +0200 ntdll/tests: Add tests for RtlCompressBuffer. --- dlls/ntdll/tests/rtl.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 6 ++++ 2 files changed, 99 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index e8eb04a..0b64d95 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -92,6 +92,9 @@ static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ static NTSTATUS (WINAPI *pLdrAddRefDll)(ULONG, HMODULE); static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG*, ULONG_PTR*); static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); +static NTSTATUS (WINAPI *pRtlGetCompressionWorkSpaceSize)(USHORT, PULONG, PULONG); +static NTSTATUS (WINAPI *pRtlDecompressBuffer)(USHORT, PUCHAR, ULONG, const UCHAR*, ULONG, PULONG); +static NTSTATUS (WINAPI *pRtlCompressBuffer)(USHORT, const UCHAR*, ULONG, PUCHAR, ULONG, ULONG, PULONG, PVOID); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -139,6 +142,9 @@ static void InitFunctionPtrs(void) pLdrAddRefDll = (void *)GetProcAddress(hntdll, "LdrAddRefDll"); pLdrLockLoaderLock = (void *)GetProcAddress(hntdll, "LdrLockLoaderLock"); pLdrUnlockLoaderLock = (void *)GetProcAddress(hntdll, "LdrUnlockLoaderLock"); + pRtlGetCompressionWorkSpaceSize = (void *)GetProcAddress(hntdll, "RtlGetCompressionWorkSpaceSize"); + pRtlDecompressBuffer = (void *)GetProcAddress(hntdll, "RtlDecompressBuffer"); + pRtlCompressBuffer = (void *)GetProcAddress(hntdll, "RtlCompressBuffer"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -1599,6 +1605,92 @@ static void test_LdrLockLoaderLock(void) pLdrUnlockLoaderLock(0, magic); } +static void test_RtlCompressBuffer(void) +{ + ULONG compress_workspace, decompress_workspace; + static const UCHAR test_buffer[] = "WineWineWine"; + static UCHAR buf1[0x1000], buf2[0x1000]; + ULONG final_size, buf_size; + UCHAR *workspace = NULL; + NTSTATUS status; + + if (!pRtlCompressBuffer || !pRtlDecompressBuffer || !pRtlGetCompressionWorkSpaceSize) + { + win_skip("skipping RtlCompressBuffer tests, required functions not available\n"); + return; + } + + compress_workspace = decompress_workspace = 0xdeadbeef; + status = pRtlGetCompressionWorkSpaceSize(COMPRESSION_FORMAT_LZNT1, &compress_workspace, + &decompress_workspace); + todo_wine + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + ok(compress_workspace != 0, "got wrong compress_workspace %u\n", compress_workspace); + if (status == STATUS_SUCCESS) + { + workspace = HeapAlloc(GetProcessHeap(), 0, compress_workspace); + ok(workspace != NULL, "HeapAlloc failed %d\n", GetLastError()); + } + + /* test compression format / engine */ + final_size = 0xdeadbeef; + status = pRtlCompressBuffer(COMPRESSION_FORMAT_NONE, test_buffer, sizeof(test_buffer), + buf1, sizeof(buf1) - 1, 4096, &final_size, workspace); + todo_wine + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); + ok(final_size == 0xdeadbeef, "got wrong final_size %u\n", final_size); + + final_size = 0xdeadbeef; + status = pRtlCompressBuffer(COMPRESSION_FORMAT_DEFAULT, test_buffer, sizeof(test_buffer), + buf1, sizeof(buf1) - 1, 4096, &final_size, workspace); + todo_wine + ok(status == STATUS_INVALID_PARAMETER, "got wrong status 0x%08x\n", status); + ok(final_size == 0xdeadbeef, "got wrong final_size %u\n", final_size); + + final_size = 0xdeadbeef; + status = pRtlCompressBuffer(0xFF, test_buffer, sizeof(test_buffer), + buf1, sizeof(buf1) - 1, 4096, &final_size, workspace); + todo_wine + ok(status == STATUS_UNSUPPORTED_COMPRESSION, "got wrong status 0x%08x\n", status); + ok(final_size == 0xdeadbeef, "got wrong final_size %u\n", final_size); + + /* test compression */ + final_size = 0xdeadbeef; + memset(buf1, 0x11, sizeof(buf1)); + status = pRtlCompressBuffer(COMPRESSION_FORMAT_LZNT1, test_buffer, sizeof(test_buffer), + buf1, sizeof(buf1), 4096, &final_size, workspace); + todo_wine + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + todo_wine + ok((*(WORD *)buf1 & 0x7000) == 0x3000, "no chunk signature found %04x\n", *(WORD *)buf1); + todo_wine + ok(final_size < sizeof(test_buffer), "got wrong final_size %u\n", final_size); + + /* test decompression */ + buf_size = final_size; + final_size = 0xdeadbeef; + memset(buf2, 0x11, sizeof(buf2)); + status = pRtlDecompressBuffer(COMPRESSION_FORMAT_LZNT1, buf2, sizeof(buf2), + buf1, buf_size, &final_size); + todo_wine + ok(status == STATUS_SUCCESS, "got wrong status 0x%08x\n", status); + todo_wine + ok(final_size == sizeof(test_buffer), "got wrong final_size %u\n", final_size); + todo_wine + ok(!memcmp(buf2, test_buffer, sizeof(test_buffer)), "got wrong decoded data\n"); + ok(buf2[sizeof(test_buffer)] == 0x11, "too many bytes written\n"); + + /* buffer too small */ + final_size = 0xdeadbeef; + memset(buf1, 0x11, sizeof(buf1)); + status = pRtlCompressBuffer(COMPRESSION_FORMAT_LZNT1, test_buffer, sizeof(test_buffer), + buf1, 4, 4096, &final_size, workspace); + todo_wine + ok(status == STATUS_BUFFER_TOO_SMALL, "got wrong status 0x%08x\n", status); + + HeapFree(GetProcessHeap(), 0, workspace); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -1625,4 +1717,5 @@ START_TEST(rtl) test_RtlIpv4StringToAddress(); test_LdrAddRefDll(); test_LdrLockLoaderLock(); + test_RtlCompressBuffer(); } diff --git a/include/winnt.h b/include/winnt.h index d077005..68a33f3 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4829,6 +4829,12 @@ typedef struct _QUOTA_LIMITS_EX { #define FILE_256_BYTE_ALIGNMENT 0x000000ff #define FILE_512_BYTE_ALIGNMENT 0x000001ff +#define COMPRESSION_FORMAT_NONE 0 +#define COMPRESSION_FORMAT_DEFAULT 1 +#define COMPRESSION_FORMAT_LZNT1 2 +#define COMPRESSION_ENGINE_STANDARD 0 +#define COMPRESSION_ENGINE_MAXIMUM 256 + #define MAILSLOT_NO_MESSAGE ((DWORD)-1) #define MAILSLOT_WAIT_FOREVER ((DWORD)-1)

1 0