November 2014 - Wine-Commits

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

Nov. 12, 2014

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

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

Nov. 12, 2014

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 Nov. 12, 2014

Nov. 12, 2014

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

André Hentschel : avifil32: Simplify comparing two unsigned ints (PVS-Studio).
by Alexandre Julliard Nov. 12, 2014

Nov. 12, 2014

Module: wine Branch: master Commit: 066fd36ec3132c185aedaa348a38c963cfb835bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=066fd36ec3132c185aedaa348… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 11 21:20:46 2014 +0100 avifil32: Simplify comparing two unsigned ints (PVS-Studio). --- dlls/avifil32/avifile.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 6295c7b..5b65fd0 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -465,13 +465,12 @@ static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile *iface, DWORD fccType, LO This->ppStreams[nStream] != NULL) { /* ... so delete it now */ HeapFree(GetProcessHeap(), 0, This->ppStreams[nStream]); - - if (This->fInfo.dwStreams - nStream > 0) - memcpy(This->ppStreams + nStream, This->ppStreams + nStream + 1, - (This->fInfo.dwStreams - nStream) * sizeof(IAVIStreamImpl*)); + This->fInfo.dwStreams--; + if (nStream < This->fInfo.dwStreams) + memmove(&This->ppStreams[nStream], &This->ppStreams[nStream + 1], + (This->fInfo.dwStreams - nStream) * sizeof(This->ppStreams[0])); This->ppStreams[This->fInfo.dwStreams] = NULL; - This->fInfo.dwStreams--; This->fDirty = TRUE; /* This->fInfo will be updated further when asked for */

1 0

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

Nov. 12, 2014

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 Nov. 12, 2014

Nov. 12, 2014

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

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

Nov. 12, 2014

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 Nov. 12, 2014

Nov. 12, 2014

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

Piotr Caban : msvcrt: Initialize file descriptor critical section.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 0c4cb6ce5d411a60ec11e52d6481c4148344d067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4cb6ce5d411a60ec11e52d6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 11 15:58:03 2014 +0100 msvcrt: Initialize file descriptor critical section. --- dlls/msvcrt/file.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 5049605..0c83d15 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -380,7 +380,9 @@ static int msvcrt_set_fd(HANDLE hand, int flag, int fd) fdinfo->lookahead[0] = '\n'; fdinfo->lookahead[1] = '\n'; fdinfo->lookahead[2] = '\n'; - fdinfo->exflag = 0; + if(!(fdinfo->exflag & EF_CRIT_INIT)) + InitializeCriticalSection(&fdinfo->crit); + fdinfo->exflag = EF_CRIT_INIT; /* locate next free slot */ if (fd == MSVCRT_fdstart && fd == MSVCRT_fdend) @@ -1113,7 +1115,17 @@ void msvcrt_free_io(void) MSVCRT__fcloseall(); for(i=0; i<sizeof(MSVCRT___pioinfo)/sizeof(MSVCRT___pioinfo[0]); i++) + { + if(!MSVCRT___pioinfo[i]) + continue; + + for(j=0; j<MSVCRT_FD_BLOCK_SIZE; j++) + { + if(MSVCRT___pioinfo[i][j].exflag & EF_CRIT_INIT) + DeleteCriticalSection(&MSVCRT___pioinfo[i][j].crit); + } MSVCRT_free(MSVCRT___pioinfo[i]); + } for(j=0; j<MSVCRT_stream_idx; j++) {

1 0

Stefan Dösinger : d3d8/tests: Fix some wndproc comparison error messages.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 7b7516189dc542cc754507ddc4cdec18b498ad56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7516189dc542cc754507ddc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 10 23:08:24 2014 +0100 d3d8/tests: Fix some wndproc comparison error messages. --- dlls/d3d8/tests/device.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9153139..7468d13 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2311,8 +2311,7 @@ static void test_wndproc(void) (LONG_PTR)test_proc, proc); proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); - ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", - (LONG_PTR)test_proc, proc); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc); ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); @@ -2339,8 +2338,7 @@ static void test_wndproc(void) } proc = SetWindowLongPtrA(focus_window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); - ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", - (LONG_PTR)test_proc, proc); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc); ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); @@ -2459,8 +2457,7 @@ static void test_wndproc_windowed(void) (LONG_PTR)test_proc, proc); proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); - ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", - (LONG_PTR)test_proc, proc); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc); hr = reset_device(device, device_window, TRUE); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); @@ -2497,8 +2494,7 @@ static void test_wndproc_windowed(void) (LONG_PTR)test_proc, proc); proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); - ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", - (LONG_PTR)test_proc, proc); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc); hr = reset_device(device, focus_window, TRUE); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); @@ -2533,8 +2529,7 @@ static void test_wndproc_windowed(void) (LONG_PTR)test_proc, proc); proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); - ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", - (LONG_PTR)test_proc, proc); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc); hr = reset_device(device, device_window, TRUE); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); @@ -3208,8 +3203,7 @@ static void test_device_window_reset(void) ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); - ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", - (LONG_PTR)test_proc, proc); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc); hr = reset_device(device, device_window, FALSE); ok(SUCCEEDED(hr), "Failed to reset device.\n"); @@ -3227,8 +3221,7 @@ static void test_device_window_reset(void) ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); - ok(proc != (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", - (LONG_PTR)test_proc, proc); + ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc); ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);

1 0