November 2014 - Wine-Commits

Michael Stefaniuc : mciwave: Simplify the check for an empty string ( PVS-Studio).
by Alexandre Julliard Nov. 12, 2014

Nov. 12, 2014

Module: wine Branch: master Commit: 2ab0bbafe0f8287fd7a77d9dd7cc6daa28d5441a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ab0bbafe0f8287fd7a77d9dd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 12 15:22:05 2014 +0100 mciwave: Simplify the check for an empty string (PVS-Studio). --- dlls/mciwave/mciwave.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 4f24169..c7992fb 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -444,7 +444,7 @@ static DWORD create_tmp_file(HMMIO* hFile, LPWSTR* pszTmpFileName) TRACE("%s!\n", debugstr_w(*pszTmpFileName)); - if (*pszTmpFileName && (strlenW(*pszTmpFileName) > 0)) { + if (*pszTmpFileName && (*pszTmpFileName)[0]) { *hFile = mmioOpenW(*pszTmpFileName, NULL, MMIO_ALLOCBUF | MMIO_READWRITE | MMIO_CREATE); @@ -470,7 +470,7 @@ static LRESULT WAVE_mciOpenFile(WINE_MCIWAVE* wmw, LPCWSTR filename) HeapFree(GetProcessHeap(), 0, wmw->lpFileName); wmw->lpFileName = fn; - if (strlenW(filename) > 0) { + if (filename[0]) { /* FIXME : what should be done if wmw->hFile is already != 0, or the driver is playin' */ TRACE("MCI_OPEN_ELEMENT %s!\n", debugstr_w(filename));

1 0

Michael Stefaniuc : gameux: Simplify the check for an empty string ( PVS-Studio).
by Alexandre Julliard Nov. 12, 2014

Nov. 12, 2014

Module: wine Branch: master Commit: 35b24f1ab55f66f01ae402aaa8e18632a92cebef URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b24f1ab55f66f01ae402aaa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 12 15:19:58 2014 +0100 gameux: Simplify the check for an empty string (PVS-Studio). --- dlls/gameux/gamestatistics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index f49d73a..7c95065 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -180,7 +180,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) { IXMLDOMElement *categoryElement = NULL; - if(lstrlenW(stats->categories[i].sName)==0) + if(!stats->categories[i].sName[0]) continue; V_VT(&vValue) = VT_INT; @@ -218,7 +218,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) { for(j=0; j<MAX_STATS_PER_CATEGORY; ++j) { - if(lstrlenW(stats->categories[i].stats[j].sName)==0) + if(!stats->categories[i].stats[j].sName[0]) continue; V_VT(&vValue) = VT_INT;

1 0

Hans Leidekker : server: Set the security descriptor of named pipe objects.
by Alexandre Julliard Nov. 12, 2014

Nov. 12, 2014

Module: wine Branch: master Commit: b31ed58b96ecc5d8efc4ea4986333612070be184 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b31ed58b96ecc5d8efc4ea498… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 12 11:25:23 2014 +0100 server: Set the security descriptor of named pipe objects. --- dlls/ntdll/file.c | 19 +++++++++++++++---- include/wine/server_protocol.h | 10 ++++------ server/named_pipe.c | 21 +++++++++++++++++---- server/protocol.def | 3 +-- server/request.h | 18 ++++++++---------- server/trace.c | 4 +--- 6 files changed, 46 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b31ed58b96ecc5d8efc4e…

1 0

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

Nov. 12, 2014

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

Hans Leidekker : odbc32: Add a version resource.
by Alexandre Julliard Nov. 12, 2014

Nov. 12, 2014

Module: wine Branch: master Commit: 6985bbdf6565bb385d3963a68b2f2a32613ca0d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6985bbdf6565bb385d3963a68… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 12 11:31:36 2014 +0100 odbc32: Add a version resource. --- dlls/odbc32/Makefile.in | 2 ++ dlls/odbc32/rsrc.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in index 79443ec..e7f31ac 100644 --- a/dlls/odbc32/Makefile.in +++ b/dlls/odbc32/Makefile.in @@ -4,3 +4,5 @@ IMPORTS = advapi32 C_SRCS = \ proxyodbc.c + +RC_SRCS = rsrc.rc diff --git a/dlls/odbc32/rsrc.rc b/dlls/odbc32/rsrc.rc new file mode 100644 index 0000000..b8fad8f --- /dev/null +++ b/dlls/odbc32/rsrc.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2014 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine ODBC Library" +#define WINE_FILENAME_STR "odbc32.dll" +#define WINE_FILEVERSION 3,520,6301,0 +#define WINE_FILEVERSION_STR "3.520.6301.0" +#define WINE_PRODUCTVERSION 3,520,6301,0 +#define WINE_PRODUCTVERSION_STR "3.520.6301.0" + +#include "wine/wine_common_ver.rc"

1 0

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

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

Nov. 11, 2014

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

Piotr Caban : msvcrt: Rename msvcrt_get_ioinfo function.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 1d791f5db243362d9cad02b8cd279e98056bfb34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d791f5db243362d9cad02b8c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 11 15:58:08 2014 +0100 msvcrt: Rename msvcrt_get_ioinfo function. --- dlls/msvcrt/file.c | 98 +++++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d791f5db243362d9cad0…

1 0

Stefan Dösinger : d3d9/tests: Allow passing a resolution to reset_device.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 6ad7d50958f6312d33c5e90195318ff96e42a42d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad7d50958f6312d33c5e9019… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 10 23:08:25 2014 +0100 d3d9/tests: Allow passing a resolution to reset_device. --- dlls/d3d9/tests/device.c | 83 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 56 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ad7d50958f6312d33c5e…

1 0

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

Nov. 11, 2014

Module: wine Branch: master Commit: 5e369853f10f52d6f4d8c6ee16ae25020eea6b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e369853f10f52d6f4d8c6ee1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 10 23:08:23 2014 +0100 d3d9/tests: Fix some wndproc comparison error messages. --- dlls/d3d9/tests/d3d9ex.c | 15 +++++---------- dlls/d3d9/tests/device.c | 21 +++++++-------------- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index bc60fcc..d93e591 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1869,8 +1869,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 = IDirect3DDevice9Ex_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); @@ -1897,8 +1896,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 = IDirect3DDevice9Ex_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); @@ -2012,8 +2010,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); @@ -2050,8 +2047,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); @@ -2086,8 +2082,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); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d3618e2..28dc52e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3260,8 +3260,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 = IDirect3DDevice9_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); @@ -3288,8 +3287,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 = IDirect3DDevice9_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); @@ -3408,8 +3406,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); @@ -3446,8 +3443,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); @@ -3482,8 +3478,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); @@ -4122,8 +4117,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"); @@ -4141,8 +4135,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 = IDirect3DDevice9_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref);

1 0

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

Nov. 11, 2014

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

Jacek Caban : mshtml: Ignore query and hash parts in res protocol handler.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 83ceee7424064805b133dc4c2f65b3f791539c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ceee7424064805b133dc4c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 11 11:37:22 2014 +0100 mshtml: Ignore query and hash parts in res protocol handler. --- dlls/mshtml/protocol.c | 8 +++++++- dlls/mshtml/tests/protocol.c | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index c8f8d08..2499db4 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -594,9 +594,9 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, DWORD grfPI, HANDLE_PTR dwReserved) { ResProtocol *This = ResProtocol_from_IInternetProtocol(iface); + WCHAR *url_dll, *url_file, *url, *mime, *res_type = (LPWSTR)RT_HTML, *ptr; DWORD grfBINDF = 0, len; BINDINFO bindinfo; - LPWSTR url_dll, url_file, url, mime, res_type = (LPWSTR)RT_HTML; HMODULE hdll; HRSRC src; HRESULT hres; @@ -646,6 +646,12 @@ static HRESULT WINAPI ResProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, res_type = MAKEINTRESOURCEW(RT_HTML); } + /* Ignore query and hash parts. */ + if((ptr = strchrW(url_file, '?'))) + *ptr = 0; + if((ptr = strchrW(url_file, '#'))) + *ptr = 0; + hdll = LoadLibraryExW(url_dll, NULL, LOAD_LIBRARY_AS_DATAFILE); if(!hdll) { WARN("Could not open dll: %s\n", debugstr_w(url_dll)); diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 3c3b58b..49743d5 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -601,6 +601,13 @@ static void test_res_protocol(void) test_res_url("/jstest.html"); test_res_url("/Test/res.html"); test_res_url("/test/dir/dir2/res.html"); + + if(GetProcAddress(LoadLibraryA("urlmon.dll"), "CreateUri")) { + test_res_url("/test/dir/dir2/res.html?query_part"); + test_res_url("/test/dir/dir2/res.html#hash_part"); + }else { + win_skip("IUri not supported\n"); + } } static void do_test_about_protocol(IClassFactory *factory, DWORD bf)

1 0

Sebastian Lackner : d3dx9_36/tests: Add tests for D3DXCreatePolygon.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: b8814764aa7c4fe803a25b55dfe51d256e139c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8814764aa7c4fe803a25b55d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 31 10:56:42 2014 +0100 d3dx9_36/tests: Add tests for D3DXCreatePolygon. Based on a patch by David Adam. --- dlls/d3dx9_36/tests/mesh.c | 155 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 155 insertions(+) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 17c5d9c..2a617f5 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2600,6 +2600,160 @@ end: DestroyWindow(wnd); } +static BOOL compute_polygon(struct mesh *mesh, float length, unsigned int sides) +{ + unsigned int i; + float scale; + + if (!new_mesh(mesh, sides + 1, sides)) + return FALSE; + + scale = 0.5f * length / sinf(D3DX_PI / sides); + + mesh->vertices[0].position.x = 0.0f; + mesh->vertices[0].position.y = 0.0f; + mesh->vertices[0].position.z = 0.0f; + mesh->vertices[0].normal.x = 0.0f; + mesh->vertices[0].normal.y = 0.0f; + mesh->vertices[0].normal.z = 1.0f; + + for (i = 0; i < sides; ++i) + { + mesh->vertices[i + 1].position.x = cosf(2.0f * D3DX_PI * i / sides) * scale; + mesh->vertices[i + 1].position.y = sinf(2.0f * D3DX_PI * i / sides) * scale; + mesh->vertices[i + 1].position.z = 0.0f; + mesh->vertices[i + 1].normal.x = 0.0f; + mesh->vertices[i + 1].normal.y = 0.0f; + mesh->vertices[i + 1].normal.z = 1.0f; + + mesh->faces[i][0] = 0; + mesh->faces[i][1] = i + 1; + mesh->faces[i][2] = i + 2; + } + + mesh->faces[sides - 1][2] = 1; + + return TRUE; +} + +static void test_polygon(IDirect3DDevice9 *device, float length, unsigned int sides) +{ + HRESULT hr; + ID3DXMesh *polygon; + struct mesh mesh; + char name[64]; + + hr = D3DXCreatePolygon(device, length, sides, &polygon, NULL); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + if (hr != D3D_OK) + { + skip("Couldn't create polygon\n"); + return; + } + + if (!compute_polygon(&mesh, length, sides)) + { + skip("Couldn't create mesh\n"); + polygon->lpVtbl->Release(polygon); + return; + } + + mesh.fvf = D3DFVF_XYZ | D3DFVF_NORMAL; + + sprintf(name, "polygon (%g, %d)", length, sides); + compare_mesh(name, polygon, &mesh); + + free_mesh(&mesh); + + polygon->lpVtbl->Release(polygon); +} + +static void D3DXCreatePolygonTest(void) +{ + HRESULT hr; + HWND wnd; + IDirect3D9 *d3d; + IDirect3DDevice9 *device; + D3DPRESENT_PARAMETERS d3dpp; + ID3DXMesh *polygon; + ID3DXBuffer *adjacency; + DWORD (*buffer)[3], buffer_size; + unsigned int i; + + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, + 640, 480, NULL, NULL, NULL, NULL))) + { + skip("Couldn't create application window\n"); + return; + } + if (!(d3d = Direct3DCreate9(D3D_SDK_VERSION))) + { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(wnd); + return; + } + + memset(&d3dpp, 0, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &device); + if (FAILED(hr)) + { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + return; + } + + hr = D3DXCreatePolygon(device, 2.0f, 11, NULL, &adjacency); + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); + + hr = D3DXCreatePolygon(NULL, 2.0f, 11, &polygon, &adjacency); + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); + + hr = D3DXCreatePolygon(device, -2.0f, 11, &polygon, &adjacency); + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); + + polygon = (void *)0xdeadbeef; + adjacency = (void *)0xdeadbeef; + hr = D3DXCreatePolygon(device, 2.0f, 0, &polygon, &adjacency); + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); + ok(polygon == (void *)0xdeadbeef, "Polygon was changed to %p\n", polygon); + ok(adjacency == (void *)0xdeadbeef, "Adjacency was changed to %p\n", adjacency); + + hr = D3DXCreatePolygon(device, 2.0f, 2, &polygon, &adjacency); + ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, received %#x\n", hr); + + adjacency = NULL; + hr = D3DXCreatePolygon(device, 3.0f, 11, &polygon, &adjacency); + ok(hr == D3D_OK, "Expected D3D_OK, received %#x\n", hr); + + buffer_size = ID3DXBuffer_GetBufferSize(adjacency); + ok(buffer_size == 33 * sizeof(DWORD), "Wrong adjacency buffer size %u\n", buffer_size); + + buffer = ID3DXBuffer_GetBufferPointer(adjacency); + for (i = 0; i < 11; ++i) + { + ok(buffer[i][0] == (i + 10) % 11, "Wrong adjacency[%d][0] = %u\n", i, buffer[i][0]); + ok(buffer[i][1] == ~0U, "Wrong adjacency[%d][1] = %u\n", i, buffer[i][1]); + ok(buffer[i][2] == (i + 1) % 11, "Wrong adjacency[%d][2] = %u\n", i, buffer[i][2]); + } + + polygon->lpVtbl->Release(polygon); + ID3DXBuffer_Release(adjacency); + + test_polygon(device, 2.0f, 3); + test_polygon(device, 10.0f, 3); + test_polygon(device, 10.0f, 5); + test_polygon(device, 10.0f, 10); + test_polygon(device, 20.0f, 10); + + IDirect3DDevice9_Release(device); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); +} + struct sincos_table { float *sin; @@ -10458,6 +10612,7 @@ START_TEST(mesh) D3DXCreateMeshFVFTest(); D3DXLoadMeshTest(); D3DXCreateBoxTest(); + D3DXCreatePolygonTest(); D3DXCreateSphereTest(); D3DXCreateCylinderTest(); D3DXCreateTextTest();

1 0

Sebastian Lackner : d3dx9_36: Implement D3DXCreatePolygon.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 0cde50d2235015d5123dbbc3928dcef1ba757701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cde50d2235015d5123dbbc39… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 31 09:43:40 2014 +0100 d3dx9_36: Implement D3DXCreatePolygon. Based on a patch by David Adam. --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- include/d3dx9shape.h | 2 ++ 22 files changed, 110 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0cde50d2235015d5123db…

1 0

Piotr Caban : user32: Move IME window procedure to user32.
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 3be5c16b4da8ba07859081007533a744b1ba0ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be5c16b4da8ba07859081007… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 10 13:46:18 2014 +0100 user32: Move IME window procedure to user32. --- dlls/imm32/imm.c | 105 ++++++----------------------------------- dlls/imm32/imm32.spec | 4 ++ dlls/user32/class.c | 1 + dlls/user32/controls.h | 4 ++ dlls/user32/misc.c | 116 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/user32/tests/class.c | 11 ++--- dlls/user32/user_main.c | 6 +++ dlls/user32/winproc.c | 1 + 8 files changed, 146 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3be5c16b4da8ba0785908…

1 0

Michael Stefaniuc : riched20/tests: Simplify the check for an empty string (PVS-Studio).
by Alexandre Julliard Nov. 11, 2014

Nov. 11, 2014

Module: wine Branch: master Commit: 5ce384e1917b1b0a1c42fc81a8b83cc15cb55362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ce384e1917b1b0a1c42fc81a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 10 23:44:08 2014 +0100 riched20/tests: Simplify the check for an empty string (PVS-Studio). --- dlls/riched20/tests/editor.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5ad063e..244f065 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3736,9 +3736,8 @@ static void test_EM_SETTEXTEX(void) ok (result == 1, "EM_SETTEXTEX returned %d, instead of 1\n",result); - ok(lstrlenW(buf) == 0, - "EM_SETTEXTEX with NULL lParam should clear rich edit.\n"); - + ok(!buf[0], "EM_SETTEXTEX with NULL lParam should clear rich edit.\n"); + /* put some text back: !ST_SELECTION && Unicode && !\rtf */ setText.flags = 0; SendMessageA(hwndRichEdit, EM_SETTEXTEX, (WPARAM)&setText, (LPARAM)TestItem1); @@ -5225,8 +5224,7 @@ static void test_EM_STREAMIN(void) result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); ok (result == 0, "EM_STREAMIN: Test 2 returned %ld, expected 0\n", result); - ok (strlen(buffer) == 0, - "EM_STREAMIN: Test 2 set wrong text: Result: %s\n",buffer); + ok(!buffer[0], "EM_STREAMIN: Test 2 set wrong text: Result: %s\n",buffer); ok(es.dwError == -16, "EM_STREAMIN: Test 2 set error %d, expected %d\n", es.dwError, -16); es.dwCookie = (DWORD_PTR)&streamText3; @@ -5237,8 +5235,7 @@ static void test_EM_STREAMIN(void) result = SendMessageA(hwndRichEdit, WM_GETTEXT, 1024, (LPARAM)buffer); ok (result == 0, "EM_STREAMIN: Test 3 returned %ld, expected 0\n", result); - ok (strlen(buffer) == 0, - "EM_STREAMIN: Test 3 set wrong text: Result: %s\n",buffer); + ok(!buffer[0], "EM_STREAMIN: Test 3 set wrong text: Result: %s\n",buffer); ok(es.dwError == -16, "EM_STREAMIN: Test 3 set error %d, expected %d\n", es.dwError, -16); es.dwCookie = (DWORD_PTR)&streamTextUTF8BOM;

1 0