September 2013 - Wine-Commits

Dmitry Timoshkov : kernel32/tests: Add FILE_APPEND_DATA case to the file access tests.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 96c6ad4aa73a202f87349b924c4e2421fc2e73a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c6ad4aa73a202f87349b924… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 20 16:01:26 2013 +0900 kernel32/tests: Add FILE_APPEND_DATA case to the file access tests. --- dlls/kernel32/tests/file.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 288fc5e..a428672 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3903,6 +3903,9 @@ static void test_file_access(void) { FILE_READ_DATA | FILE_WRITE_DATA, 0, 0, 0 }, { FILE_WRITE_DATA, 0, 0, ERROR_ACCESS_DENIED }, { FILE_READ_DATA, 0, ERROR_ACCESS_DENIED, 0 }, + { FILE_APPEND_DATA, 0, 0, ERROR_ACCESS_DENIED }, + { FILE_READ_DATA | FILE_APPEND_DATA, 0, 0, 0 }, + { FILE_WRITE_DATA | FILE_APPEND_DATA, 0, 0, ERROR_ACCESS_DENIED }, { 0, 0, ERROR_ACCESS_DENIED, ERROR_ACCESS_DENIED }, }; char path[MAX_PATH], fname[MAX_PATH]; @@ -3938,6 +3941,17 @@ static void test_file_access(void) } else { + /* FIXME: remove once Wine is fixed */ + if (!ret && (td[i].access & FILE_APPEND_DATA)) + { +todo_wine + ok(ret, "%d: WriteFile error %d\n", i, GetLastError()); +todo_wine + ok(bytes == 2, "%d: expected 2, got %u\n", i, bytes); + CloseHandle(hfile); + continue; + } + ok(ret, "%d: WriteFile error %d\n", i, GetLastError()); ok(bytes == 2, "%d: expected 2, got %u\n", i, bytes); }

1 0

Bruno Jesus : server: Fix a comment.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: c52eb217548146c8f3810e0d4a4d7be470273aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52eb217548146c8f3810e0d4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Sep 21 14:42:25 2013 -0300 server: Fix a comment. --- server/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/sock.c b/server/sock.c index 145e2a7..1a3a8f7 100644 --- a/server/sock.c +++ b/server/sock.c @@ -785,7 +785,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) return TRUE; } -/* set the last error depending on errno */ +/* return an errno value mapped to a WSA error */ static int sock_get_error( int err ) { switch (err)

1 0

Jacek Caban : appwiz.cpl: Allow cancelling download of addons.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: 2c9774f002521adc6da7bd07274052f111536697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c9774f002521adc6da7bd072… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 20 16:36:19 2013 +0200 appwiz.cpl: Allow cancelling download of addons. --- dlls/appwiz.cpl/addons.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index be6fb6d..b278a4a 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -106,6 +106,7 @@ static const addon_info_t *addon; static HWND install_dialog = NULL; static LPWSTR url = NULL; +static IBinding *dwl_binding; static WCHAR * (CDECL *p_wine_get_dos_file_name)(const char*); static const WCHAR kernel32_dllW[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; @@ -185,6 +186,8 @@ static enum install_res install_file(const WCHAR *file_name) { ULONG res; + EnableWindow(GetDlgItem(install_dialog, IDCANCEL), 0); + res = MsiInstallProductW(file_name, NULL); if(res != ERROR_SUCCESS) { ERR("MsiInstallProduct failed: %u\n", res); @@ -437,6 +440,10 @@ static HRESULT WINAPI InstallCallback_OnStartBinding(IBindStatusCallback *iface, DWORD dwReserved, IBinding *pib) { set_status(IDS_DOWNLOADING); + + IBinding_AddRef(pib); + dwl_binding = pib; + return S_OK; } @@ -468,8 +475,16 @@ static HRESULT WINAPI InstallCallback_OnProgress(IBindStatusCallback *iface, ULO static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface, HRESULT hresult, LPCWSTR szError) { + if(dwl_binding) { + IBinding_Release(dwl_binding); + dwl_binding = NULL; + } + if(FAILED(hresult)) { - ERR("Binding failed %08x\n", hresult); + if(hresult == E_ABORT) + TRACE("Binding aborted\n"); + else + ERR("Binding failed %08x\n", hresult); return S_OK; } @@ -660,13 +675,14 @@ static INT_PTR CALLBACK installer_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARA case WM_COMMAND: switch(wParam) { case IDCANCEL: + if(dwl_binding) + IBinding_Abort(dwl_binding); EndDialog(hwnd, 0); return FALSE; case ID_DWL_INSTALL: ShowWindow(GetDlgItem(hwnd, ID_DWL_PROGRESS), SW_SHOW); EnableWindow(GetDlgItem(hwnd, ID_DWL_INSTALL), 0); - EnableWindow(GetDlgItem(hwnd, IDCANCEL), 0); /* FIXME */ CloseHandle( CreateThread(NULL, 0, download_proc, NULL, 0, NULL)); return FALSE; }

1 0

Stefan Dösinger : wined3d: Pass the destination pitch to format conversion functions.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: 24fbe9f2ecfdac12dcf7af49f03d7624d6c77494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24fbe9f2ecfdac12dcf7af49f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 20 13:04:49 2013 +0200 wined3d: Pass the destination pitch to format conversion functions. The relation between src and dst pitches is not correct if the source pitch is padded to match pitch alignment requirements. --- dlls/wined3d/surface.c | 2 +- dlls/wined3d/utils.c | 77 +++++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 43 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24fbe9f2ecfdac12dcf7a…

1 0

Sebastian Lackner : d3d9/tests: Implemented tests for IDirect3DSwapChain9Ex_GetDisplayModeEx.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: 0fb3aaac1044ee0020ddf7654f838ed008dd0bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb3aaac1044ee0020ddf7654… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 19 20:14:28 2013 +0200 d3d9/tests: Implemented tests for IDirect3DSwapChain9Ex_GetDisplayModeEx. --- dlls/d3d9/tests/d3d9ex.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index d175d4e..bf331a5 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -322,6 +322,96 @@ static void test_get_adapter_luid(void) IDirect3D9Ex_Release(d3d9ex); } +static void test_swapchain_get_displaymode_ex(void) +{ + IDirect3DSwapChain9 *swapchain = NULL; + IDirect3DSwapChain9Ex *swapchainEx = NULL; + IDirect3DDevice9Ex *device; + D3DDISPLAYMODE mode; + D3DDISPLAYMODEEX mode_ex; + D3DDISPLAYROTATION rotation; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping swapchain GetDisplayModeEx tests.\n"); + goto out; + } + + /* Get the implicit swapchain */ + hr = IDirect3DDevice9Ex_GetSwapChain(device, 0, &swapchain); + if (FAILED(hr)) + { + skip("Failed to get the implicit swapchain, skipping swapchain GetDisplayModeEx tests.\n"); + goto out; + } + + hr = IDirect3DSwapChain9_QueryInterface(swapchain, &IID_IDirect3DSwapChain9Ex, (void **)&swapchainEx); + IDirect3DSwapChain9_Release(swapchain); + if (FAILED(hr)) + { + skip("Failed to QI for IID_IDirect3DSwapChain9Ex, skipping swapchain GetDisplayModeEx tests.\n"); + goto out; + } + + /* invalid size */ + memset(&mode_ex, 0, sizeof(mode_ex)); + hr = IDirect3DSwapChain9Ex_GetDisplayModeEx(swapchainEx, &mode_ex, &rotation); + ok(hr == D3DERR_INVALIDCALL, "GetDisplayModeEx returned %#x instead of D3DERR_INVALIDCALL.\n", hr); + + mode_ex.Size = sizeof(D3DDISPLAYMODEEX); + rotation = (D3DDISPLAYROTATION)0xdeadbeef; + /* valid count and valid size */ + hr = IDirect3DSwapChain9Ex_GetDisplayModeEx(swapchainEx, &mode_ex, &rotation); + ok(SUCCEEDED(hr), "GetDisplayModeEx failed, hr %#x.\n", hr); + + /* compare what GetDisplayMode returns with what GetDisplayModeEx returns */ + hr = IDirect3DSwapChain9Ex_GetDisplayMode(swapchainEx, &mode); + ok(SUCCEEDED(hr), "GetDisplayMode failed, hr %#x.\n", hr); + + ok(mode_ex.Size == sizeof(D3DDISPLAYMODEEX), "Size is %d.\n", mode_ex.Size); + ok(mode_ex.Width == mode.Width, "Width is %d instead of %d.\n", mode_ex.Width, mode.Width); + ok(mode_ex.Height == mode.Height, "Height is %d instead of %d.\n", mode_ex.Height, mode.Height); + ok(mode_ex.RefreshRate == mode.RefreshRate, "RefreshRate is %d instead of %d.\n", + mode_ex.RefreshRate, mode.RefreshRate); + ok(mode_ex.Format == mode.Format, "Format is %x instead of %x.\n", mode_ex.Format, mode.Format); + /* Don't know yet how to test for ScanLineOrdering, just testing that it + * is set to a value by GetDisplayModeEx(). */ + ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0.\n"); + /* Don't know how to compare the rotation in this case, test that it is set */ + ok(rotation != (D3DDISPLAYROTATION)0xdeadbeef, "rotation is %d, expected != 0xdeadbeef.\n", rotation); + + trace("GetDisplayModeEx returned Width = %d, Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d.\n", + mode_ex.Width, mode_ex.Height, mode_ex.RefreshRate, mode_ex.Format, mode_ex.ScanLineOrdering, rotation); + + /* test GetDisplayModeEx with null pointer for D3DDISPLAYROTATION */ + memset(&mode_ex, 0, sizeof(mode_ex)); + mode_ex.Size = sizeof(D3DDISPLAYMODEEX); + + hr = IDirect3DSwapChain9Ex_GetDisplayModeEx(swapchainEx, &mode_ex, NULL); + ok(SUCCEEDED(hr), "GetDisplayModeEx failed, hr %#x.\n", hr); + + ok(mode_ex.Size == sizeof(D3DDISPLAYMODEEX), "Size is %d.\n", mode_ex.Size); + ok(mode_ex.Width == mode.Width, "Width is %d instead of %d.\n", mode_ex.Width, mode.Width); + ok(mode_ex.Height == mode.Height, "Height is %d instead of %d.\n", mode_ex.Height, mode.Height); + ok(mode_ex.RefreshRate == mode.RefreshRate, "RefreshRate is %d instead of %d.\n", + mode_ex.RefreshRate, mode.RefreshRate); + ok(mode_ex.Format == mode.Format, "Format is %x instead of %x.\n", mode_ex.Format, mode.Format); + /* Don't know yet how to test for ScanLineOrdering, just testing that it + * is set to a value by GetDisplayModeEx(). */ + ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0.\n"); + + IDirect3DSwapChain9Ex_Release(swapchainEx); + +out: + if (device) + IDirect3DDevice9Ex_Release(device); + DestroyWindow(window); +} + static void test_get_adapter_displaymode_ex(void) { HWND window = create_window(); @@ -1015,6 +1105,7 @@ START_TEST(d3d9ex) test_qi_base_to_ex(); test_qi_ex_to_base(); + test_swapchain_get_displaymode_ex(); test_get_adapter_luid(); test_get_adapter_displaymode_ex(); test_texture_sysmem_create();

1 0

Ken Thomases : winex11: Don' t trace a garbage value or read past end of caller' s array in X11DRV_wglChoosePixelFormatARB().
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: cf973bd28dfc3bb2b274ce2de72ec6848767b29b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf973bd28dfc3bb2b274ce2de… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Sep 19 20:37:16 2013 -0500 winex11: Don't trace a garbage value or read past end of caller's array in X11DRV_wglChoosePixelFormatARB(). --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index e28302e..3e8480b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2520,7 +2520,7 @@ static BOOL X11DRV_wglChoosePixelFormatARB( HDC hdc, const int *piAttribIList, c { piFormats[pfmt_it++] = i + 1; TRACE("at %d/%d found FBCONFIG_ID 0x%x (%d)\n", - it + 1, nCfgs, fmt_id, piFormats[pfmt_it]); + it + 1, nCfgs, fmt_id, i + 1); break; } }

1 0

Henri Verbeet : d3dx9: Avoid CONST.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: 49a3dbc453783b0c7c118726eaa331f5e918653e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a3dbc453783b0c7c118726e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 20 10:41:46 2013 +0200 d3dx9: Avoid CONST. --- dlls/d3dx9_36/effect.c | 2 +- dlls/d3dx9_36/line.c | 17 +++++------ dlls/d3dx9_36/mesh.c | 66 ++++++++++++++++++++--------------------------- dlls/d3dx9_36/skin.c | 15 ++++++---- dlls/d3dx9_36/sprite.c | 20 +++++++------- dlls/d3dx9_36/surface.c | 6 ++-- 6 files changed, 59 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=49a3dbc453783b0c7c118…

1 0

Frédéric Delanoy : winecfg: Use BOOL type where appropriate.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: e0bb0adee592f56d29af0f519d424d7b862a35f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0bb0adee592f56d29af0f519… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Sep 19 09:59:44 2013 +0200 winecfg: Use BOOL type where appropriate. --- programs/winecfg/libraries.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 3b50203..660737b 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -198,7 +198,7 @@ static int compare_dll( const void *ptr1, const void *ptr2 ) } /* check if dll is recommended as builtin only */ -static inline int is_builtin_only( const char *name ) +static inline BOOL is_builtin_only( const char *name ) { const char *ext = strrchr( name, '.' ); @@ -214,7 +214,7 @@ static inline int is_builtin_only( const char *name ) } /* check if dll should be offered in the drop-down list */ -static int show_dll_in_list( const char *name ) +static BOOL show_dll_in_list( const char *name ) { const char *ext = strrchr( name, '.' );

1 0

Dmitry Timoshkov : kernel32/tests: Add 0-length read tests for a pipe.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: 70930fa12cf9d6d8240af3e842260e6f7e38cd73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70930fa12cf9d6d8240af3e84… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 18 15:54:32 2013 +0900 kernel32/tests: Add 0-length read tests for a pipe. --- dlls/kernel32/tests/pipe.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 923c0e7..07e82a8 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -21,6 +21,8 @@ #include <stdarg.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> #include <winsock.h> @@ -1855,6 +1857,54 @@ static void test_readfileex_pending(void) ok(completion_errorcode == 0, "completion called with error %x\n", completion_errorcode); ok(completion_lpoverlapped == &overlapped, "completion called with wrong overlapped pointer\n"); + num_bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(INVALID_HANDLE_VALUE, read_buf, 0, &num_bytes, NULL); +todo_wine + ok(!ret, "ReadFile should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError()); + ok(num_bytes == 0, "expected 0, got %u\n", num_bytes); + + S(U(overlapped)).Offset = 0; + S(U(overlapped)).OffsetHigh = 0; + overlapped.Internal = -1; + overlapped.InternalHigh = -1; + overlapped.hEvent = event; + num_bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(server, read_buf, 0, &num_bytes, &overlapped); +todo_wine + ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); + ok(num_bytes == 0, "bytes %u\n", num_bytes); +todo_wine + ok((NTSTATUS)overlapped.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %#lx\n", overlapped.Internal); + ok(overlapped.InternalHigh == -1, "expected -1, got %lu\n", overlapped.InternalHigh); + + wait = WaitForSingleObject(event, 100); +todo_wine + ok(wait == WAIT_TIMEOUT, "WaitForSingleObject returned %x\n", wait); + + num_bytes = 0xdeadbeef; + ret = WriteFile(client, test_string, 1, &num_bytes, NULL); + ok(ret, "WriteFile failed\n"); + ok(num_bytes == 1, "bytes %u\n", num_bytes); + + wait = WaitForSingleObject(event, 0); + ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", wait); + + ok(num_bytes == 1, "bytes %u\n", num_bytes); +todo_wine + ok((NTSTATUS)overlapped.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", overlapped.Internal); +todo_wine + ok(overlapped.InternalHigh == 0, "expected 0, got %lu\n", overlapped.InternalHigh); + + /* read the pending byte and clear the pipe */ + num_bytes = 0xdeadbeef; + ret = ReadFile(server, read_buf, 1, &num_bytes, &overlapped); + ok(ret, "ReadFile failed\n"); + ok(num_bytes == 1, "bytes %u\n", num_bytes); + CloseHandle(client); CloseHandle(server); CloseHandle(event);

1 0

Dmitry Timoshkov : kernel32/tests: Add 0-length read tests for a mailslot.
by Alexandre Julliard Sept. 20, 2013

Sept. 20, 2013

Module: wine Branch: master Commit: 0c024503dbf22310cc276f6e197d6ba614079138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c024503dbf22310cc276f6e1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 18 15:53:50 2013 +0900 kernel32/tests: Add 0-length read tests for a mailslot. --- dlls/kernel32/tests/mailslot.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index fb3ec34..ca0b108 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -77,6 +77,24 @@ static int mailslot_test(void) ok( hSlot != INVALID_HANDLE_VALUE , "valid mailslot failed\n"); /* try and read/write to it */ + count = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(INVALID_HANDLE_VALUE, buffer, 0, &count, NULL); +todo_wine + ok(!ret, "ReadFile should fail\n"); +todo_wine + ok(GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError()); + ok(count == 0, "expected 0, got %u\n", count); + + count = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(hSlot, buffer, 0, &count, NULL); +todo_wine + ok(!ret, "ReadFile should fail\n"); +todo_wine + ok(GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError()); + ok(count == 0, "expected 0, got %u\n", count); + count = 0; memset(buffer, 0, sizeof buffer); ret = ReadFile( hSlot, buffer, sizeof buffer, &count, NULL);

1 0