wine-commits November 2014

wine-commits@winehq.org

2 participants
394 discussions

Stefan Dösinger : d3d9/tests: Allow passing a resolution to reset_device in d3d9ex.
by Alexandre Julliard 12 Nov '14

12 Nov '14

Module: wine Branch: master Commit: 32450ee61d641b5ca8a223ee83bf0e5386d98cec URL: http://source.winehq.org/git/wine.git/?a=commit;h=32450ee61d641b5ca8a223ee8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 12 00:18:06 2014 +0100 d3d9/tests: Allow passing a resolution to reset_device in d3d9ex. --- dlls/d3d9/tests/d3d9ex.c | 59 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 20 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index d93e591..bbb95b0 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -132,19 +132,27 @@ done: return device; } -static HRESULT reset_device(IDirect3DDevice9Ex *device, HWND device_window, BOOL windowed) +static HRESULT reset_device(IDirect3DDevice9Ex *device, const struct device_desc *desc) { D3DPRESENT_PARAMETERS present_parameters = {0}; - present_parameters.Windowed = windowed; - present_parameters.hDeviceWindow = device_window; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferWidth = 1024; - present_parameters.BackBufferHeight = 768; + present_parameters.BackBufferWidth = 640; + present_parameters.BackBufferHeight = 480; present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = NULL; + present_parameters.Windowed = TRUE; present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + if (desc) + { + present_parameters.BackBufferWidth = desc->width; + present_parameters.BackBufferHeight = desc->height; + present_parameters.hDeviceWindow = desc->device_window; + present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); + } + return IDirect3DDevice9_Reset(device, &present_parameters); } @@ -1110,7 +1118,7 @@ static void test_reset_resources(void) IDirect3DSurface9_Release(surface); } - hr = reset_device(device, window, TRUE); + hr = reset_device(device, NULL); ok(SUCCEEDED(hr), "Failed to reset device.\n"); hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &rt); @@ -1284,7 +1292,9 @@ static void test_lost_device(void) hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); - hr = reset_device(device, window, FALSE); + desc.width = 1024; + desc.height = 768; + hr = reset_device(device, &desc); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -1297,7 +1307,8 @@ static void test_lost_device(void) hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); ok(hr == S_PRESENT_OCCLUDED, "Got unexpected hr %#x.\n", hr); - hr = reset_device(device, window, TRUE); + desc.flags = 0; + hr = reset_device(device, &desc); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -1310,7 +1321,7 @@ static void test_lost_device(void) hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); todo_wine ok(hr == S_PRESENT_MODE_CHANGED, "Got unexpected hr %#x.\n", hr); - hr = reset_device(device, window, TRUE); + hr = reset_device(device, &desc); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -1349,7 +1360,8 @@ static void test_lost_device(void) hr = IDirect3DDevice9Ex_CheckDeviceState(device, NULL); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - hr = reset_device(device, window, FALSE); + desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &desc); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -1977,8 +1989,8 @@ static void test_wndproc_windowed(void) filter_messages = focus_window; device_desc.device_window = device_window; - device_desc.width = 640; - device_desc.height = 480; + device_desc.width = registry_mode.dmPelsWidth; + device_desc.height = registry_mode.dmPelsHeight; device_desc.flags = 0; if (!(device = create_device(focus_window, &device_desc))) { @@ -2002,7 +2014,8 @@ static void test_wndproc_windowed(void) filter_messages = NULL; - hr = reset_device(device, device_window, FALSE); + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); @@ -2012,7 +2025,8 @@ static void test_wndproc_windowed(void) proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc); - hr = reset_device(device, device_window, TRUE); + device_desc.flags = 0; + hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); @@ -2039,7 +2053,8 @@ static void test_wndproc_windowed(void) filter_messages = NULL; - hr = reset_device(device, focus_window, FALSE); + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); @@ -2049,7 +2064,8 @@ static void test_wndproc_windowed(void) proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc); - hr = reset_device(device, focus_window, TRUE); + device_desc.flags = 0; + hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); @@ -2074,7 +2090,8 @@ static void test_wndproc_windowed(void) filter_messages = NULL; - hr = reset_device(device, device_window, FALSE); + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); @@ -2084,7 +2101,8 @@ static void test_wndproc_windowed(void) proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc); - hr = reset_device(device, device_window, TRUE); + device_desc.flags = 0; + hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); proc = GetWindowLongPtrA(device_window, GWLP_WNDPROC); @@ -2197,7 +2215,8 @@ static void test_window_style(void) focus_rect.left, focus_rect.top, focus_rect.right, focus_rect.bottom, r.left, r.top, r.right, r.bottom, i); - hr = reset_device(device, device_window, TRUE); + device_desc.flags = 0; + hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); style = GetWindowLongA(device_window, GWL_STYLE);

1 0

Stefan Dösinger : d3d/tests: Test fog interpolation.
by Alexandre Julliard 12 Nov '14

12 Nov '14

Module: wine Branch: master Commit: 38548df04b8ae1a5a7f4bf2127bf45d9b5b1fdc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38548df04b8ae1a5a7f4bf212… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 12 00:18:05 2014 +0100 d3d/tests: Test fog interpolation. --- dlls/d3d8/tests/visual.c | 145 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 145 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 125 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 415 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38548df04b8ae1a5a7f4b…

1 0

Stefan Dösinger : ddraw/tests: Ddraw restores the mode settings from the registry.
by Alexandre Julliard 12 Nov '14

12 Nov '14

Module: wine Branch: master Commit: a6f7b213af164036efa89cbe7f217a8df484d6a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6f7b213af164036efa89cbe7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 12 00:18:04 2014 +0100 ddraw/tests: Ddraw restores the mode settings from the registry. --- dlls/ddraw/tests/ddraw1.c | 150 +++++++++++++++++++++++++++++++++++++++------- dlls/ddraw/tests/ddraw2.c | 150 +++++++++++++++++++++++++++++++++++++++------- dlls/ddraw/tests/ddraw4.c | 150 +++++++++++++++++++++++++++++++++++++++------- dlls/ddraw/tests/ddraw7.c | 150 +++++++++++++++++++++++++++++++++++++++------- 4 files changed, 508 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6f7b213af164036efa89…

1 0

Stefan Dösinger : ddraw/tests: Rename modes and rectangles in test_coop_level_mode_set.
by Alexandre Julliard 12 Nov '14

12 Nov '14

Module: wine Branch: master Commit: a04eb0c21b4107551196cfaf4b8b23265750db13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a04eb0c21b4107551196cfaf4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 12 00:18:03 2014 +0100 ddraw/tests: Rename modes and rectangles in test_coop_level_mode_set. --- dlls/ddraw/tests/ddraw1.c | 278 ++++++++++++++++++++++------------------ dlls/ddraw/tests/ddraw2.c | 320 ++++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw4.c | 320 ++++++++++++++++++++++++++-------------------- dlls/ddraw/tests/ddraw7.c | 320 ++++++++++++++++++++++++++-------------------- 4 files changed, 690 insertions(+), 548 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a04eb0c21b4107551196c…

1 0

Bruno Jesus : server: Store the time of the socket connection.
by Alexandre Julliard 12 Nov '14

12 Nov '14

Module: wine Branch: master Commit: 3591e5fd9fdf20d0aeb059d99c1f67817c5d3199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3591e5fd9fdf20d0aeb059d99… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 12 00:42:14 2014 -0200 server: Store the time of the socket connection. Based on a patch by Erich Hoover. --- server/sock.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/sock.c b/server/sock.c index e124ad6..7c0212e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -107,6 +107,7 @@ struct sock unsigned int message; /* message to send */ obj_handle_t wparam; /* message wparam (socket handle) */ int errors[FD_MAX_EVENTS]; /* event errors */ + timeout_t connect_time;/* time the socket was connected */ struct sock *deferred; /* socket that waits for a deferred accept */ struct async_queue *read_q; /* queue for asynchronous reads */ struct async_queue *write_q; /* queue for asynchronous writes */ @@ -401,6 +402,7 @@ static void sock_poll_event( struct fd *fd, int event ) /* we got connected */ sock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE; sock->state &= ~FD_CONNECT; + sock->connect_time = current_time; } } else if (sock->state & FD_WINE_LISTENING) @@ -618,6 +620,7 @@ static void init_sock(struct sock *sock) sock->window = 0; sock->message = 0; sock->wparam = 0; + sock->connect_time = 0; sock->deferred = NULL; sock->read_q = NULL; sock->write_q = NULL; @@ -725,6 +728,7 @@ static struct sock *accept_socket( obj_handle_t handle ) acceptsock->family = sock->family; acceptsock->window = sock->window; acceptsock->message = sock->message; + acceptsock->connect_time = current_time; if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event ); acceptsock->flags = sock->flags; if (!(acceptsock->fd = create_anonymous_fd( &sock_fd_ops, acceptfd, &acceptsock->obj, @@ -778,6 +782,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) acceptsock->family = sock->family; acceptsock->wparam = 0; acceptsock->deferred = NULL; + acceptsock->connect_time = current_time; release_object( acceptsock->fd ); acceptsock->fd = newfd;

1 0

Bruno Jesus : server: Add a missing socket protocol attribution.
by Alexandre Julliard 12 Nov '14

12 Nov '14

Module: wine Branch: master Commit: 8821967bd6f96c9b2100c34b55ca10a52ece87b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8821967bd6f96c9b2100c34b5… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 12 00:42:11 2014 -0200 server: Add a missing socket protocol attribution. The new socket has to inherit the information just like family and type. --- server/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/sock.c b/server/sock.c index 4adad0f..e124ad6 100644 --- a/server/sock.c +++ b/server/sock.c @@ -773,6 +773,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) acceptsock->hmask = 0; acceptsock->pmask = 0; acceptsock->polling = 0; + acceptsock->proto = sock->proto; acceptsock->type = sock->type; acceptsock->family = sock->family; acceptsock->wparam = 0;

1 0

Bruno Jesus : version: Handle NULL puLen parameter for VerQueryValueA/W.
by Alexandre Julliard 12 Nov '14

12 Nov '14

Module: wine Branch: master Commit: 395289a30a34608862be4617c979d43607c59e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=395289a30a34608862be4617c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Nov 12 00:03:59 2014 -0200 version: Handle NULL puLen parameter for VerQueryValueA/W. --- dlls/version/version.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index 9bc6ad1..58fd029 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -976,7 +976,7 @@ BOOL WINAPI VerQueryValueA( LPCVOID pBlock, LPCSTR lpSubBlock, len = WideCharToMultiByte(CP_ACP, 0, *lplpBuffer, -1, lpBufferA + pos, info->wLength - pos, NULL, NULL); *lplpBuffer = lpBufferA + pos; - *puLen = len; + if (puLen) *puLen = len; } return ret; } @@ -1036,7 +1036,7 @@ BOOL WINAPI VerQueryValueW( LPCVOID pBlock, LPCWSTR lpSubBlock, len = MultiByteToWideChar(CP_ACP, 0, *lplpBuffer, -1, lpBufferW + pos, max/sizeof(WCHAR) - pos ); *lplpBuffer = lpBufferW + pos; - *puLen = len; + if (puLen) *puLen = len; } return ret; }

1 0

Austin English : shell32: Add a stub for RegenerateUserEnvironment.
by Alexandre Julliard 12 Nov '14

12 Nov '14

Module: wine Branch: master Commit: 66662a87c0deb4aaa605d6a6486b439072f5055f URL: http://source.winehq.org/git/wine.git/?a=commit;h=66662a87c0deb4aaa605d6a64… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Nov 11 19:41:03 2014 -0600 shell32: Add a stub for RegenerateUserEnvironment. --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shlexec.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index f219c8f..e6858c8 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -324,7 +324,7 @@ @ stub RealShellExecuteExA @ stub RealShellExecuteExW @ stub RealShellExecuteW -@ stub RegenerateUserEnvironment +@ stdcall RegenerateUserEnvironment(ptr long) @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) @ stdcall SHAddToRecentDocs (long ptr) @ stdcall SHAppBarMessage(long ptr) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index a6bc5c8..2d9690a 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -2097,3 +2097,12 @@ void WINAPI OpenAs_RunDLLW(HWND hwnd, HINSTANCE hinst, LPCWSTR cmdline, int cmds { FIXME("%p, %p, %s, %d\n", hwnd, hinst, debugstr_w(cmdline), cmdshow); } + +/************************************************************************* + * RegenerateUserEnvironment [SHELL32.@] + */ +BOOL WINAPI RegenerateUserEnvironment(WCHAR *wunknown, BOOL bunknown) +{ + FIXME("stub: %p, %d\n", wunknown, bunknown); + return FALSE; +}

1 0

Piotr Caban : msvcrt: Use fd critical section in _close.
by Alexandre Julliard 11 Nov '14

11 Nov '14

Module: wine Branch: master Commit: afc6962a24a68e9ef105edd8733a1ea772af1a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afc6962a24a68e9ef105edd87… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 11 15:58:18 2014 +0100 msvcrt: Use fd critical section in _close. --- dlls/msvcrt/file.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 60dbd92..b0f8735 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -988,24 +988,23 @@ int CDECL MSVCRT__fflush_nolock(MSVCRT_FILE* file) */ int CDECL MSVCRT__close(int fd) { - HANDLE hand; + ioinfo *info = get_ioinfo(fd); int ret; LOCK_FILES(); - hand = msvcrt_fdtoh(fd); - TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (!msvcrt_is_valid_fd(fd)) { + TRACE(":fd (%d) handle (%p)\n", fd, info->handle); + if (!(info->wxflag & WX_OPEN)) { ret = -1; } else { + ret = CloseHandle(info->handle) ? 0 : -1; msvcrt_free_fd(fd); - ret = CloseHandle(hand) ? 0 : -1; if (ret) { WARN(":failed-last error (%d)\n",GetLastError()); msvcrt_set_errno(GetLastError()); } } UNLOCK_FILES(); - TRACE(":ok\n"); + release_ioinfo(info); return ret; }

1 0

Piotr Caban : msvcrt: Use fd critical section in _commit.
by Alexandre Julliard 11 Nov '14

11 Nov '14

Module: wine Branch: master Commit: 4508e665c075169eeea82641290afd6a3114ef05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4508e665c075169eeea826412… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 11 15:58:13 2014 +0100 msvcrt: Use fd critical section in _commit. --- dlls/msvcrt/file.c | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index e172231..60dbd92 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -257,6 +257,20 @@ static inline ioinfo* get_ioinfo_nolock(int fd) return ret + (fd%MSVCRT_FD_BLOCK_SIZE); } +static inline ioinfo* get_ioinfo(int fd) +{ + ioinfo *ret = get_ioinfo_nolock(fd); + if(ret->exflag & EF_CRIT_INIT) + EnterCriticalSection(&ret->crit); + return ret; +} + +static inline void release_ioinfo(ioinfo *info) +{ + if(info->exflag & EF_CRIT_INIT) + LeaveCriticalSection(&info->crit); +} + static inline MSVCRT_FILE* msvcrt_get_file(int i) { file_crit *ret; @@ -858,27 +872,37 @@ int CDECL MSVCRT__wunlink(const MSVCRT_wchar_t *path) */ int CDECL MSVCRT__commit(int fd) { - HANDLE hand = msvcrt_fdtoh(fd); + ioinfo *info = get_ioinfo(fd); + int ret; - TRACE(":fd (%d) handle (%p)\n",fd,hand); - if (hand == INVALID_HANDLE_VALUE) - return -1; + TRACE(":fd (%d) handle (%p)\n", fd, info->handle); - if (!FlushFileBuffers(hand)) + if (info->handle == INVALID_HANDLE_VALUE) + ret = -1; + else if (!FlushFileBuffers(info->handle)) { if (GetLastError() == ERROR_INVALID_HANDLE) { /* FlushFileBuffers fails for console handles * so we ignore this error. */ - return 0; + ret = 0; + } + else + { + TRACE(":failed-last error (%d)\n",GetLastError()); + msvcrt_set_errno(GetLastError()); + ret = -1; } - TRACE(":failed-last error (%d)\n",GetLastError()); - msvcrt_set_errno(GetLastError()); - return -1; } - TRACE(":ok\n"); - return 0; + else + { + TRACE(":ok\n"); + ret = 0; + } + + release_ioinfo(info); + return ret; } /* flush_all_buffers calls MSVCRT_fflush which calls flush_all_buffers */

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
40
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2014