September 2013 - Wine-Commits

Henri Verbeet : wined3d: Avoid LPCSTR.
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: e9fbb6b0fd5e0ea6586e8c36851f0a80b128ef2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9fbb6b0fd5e0ea6586e8c368… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 19 10:16:48 2013 +0200 wined3d: Avoid LPCSTR. --- dlls/wined3d/wined3d_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 65597fa..58acc11 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -158,8 +158,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = hInstDLL; - wc.hIcon = LoadIconA(NULL, (LPCSTR)IDI_WINLOGO); - wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + wc.hIcon = LoadIconA(NULL, (const char *)IDI_WINLOGO); + wc.hCursor = LoadCursorA(NULL, (const char *)IDC_ARROW); wc.hbrBackground = NULL; wc.lpszMenuName = NULL; wc.lpszClassName = WINED3D_OPENGL_WINDOW_CLASS_NAME;

1 0

Henri Verbeet : ddraw: Verify that the surface is not a depth buffer in SetRenderTarget().
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: 8aae165fc2d3409fef8cf1bc9fa61f78d3df808d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aae165fc2d3409fef8cf1bc9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 19 10:16:47 2013 +0200 ddraw: Verify that the surface is not a depth buffer in SetRenderTarget(). This check is even more inconsistent between versions. Notice how the v2 interface is particularly broken because it never AddRef()'s the new iface. This check also seems to be the original source for the questionable behaviour in d3d_device_set_render_target() of storing the new iface before checking the result of the wined3d_device_set_render_target(). (In particular, SetRenderTargetTest() in tests/d3d.c tests for this behavious.) --- dlls/ddraw/device.c | 36 +++++++++++++++++++++++++++++++++--- 1 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index af343bb..f1b1346 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1821,12 +1821,13 @@ static HRESULT d3d_device_set_render_target(struct d3d_device *device, return DDERR_INVALIDPARAMS; } - IUnknown_AddRef(rt_iface); - IUnknown_Release(device->rt_iface); - device->rt_iface = rt_iface; if (FAILED(hr = wined3d_device_set_render_target(device->wined3d_device, 0, target->wined3d_surface, FALSE))) return hr; + + IUnknown_AddRef(rt_iface); + IUnknown_Release(device->rt_iface); + device->rt_iface = rt_iface; d3d_device_update_depth_stencil(device); return D3D_OK; @@ -1864,6 +1865,16 @@ static HRESULT d3d_device7_SetRenderTarget(IDirect3DDevice7 *iface, return DDERR_INVALIDPARAMS; } + if (target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { + WARN("Surface %p is a depth buffer.\n", target_impl); + IDirectDrawSurface7_AddRef(target); + IUnknown_Release(device->rt_iface); + device->rt_iface = (IUnknown *)target; + wined3d_mutex_unlock(); + return DDERR_INVALIDPIXELFORMAT; + } + hr = d3d_device_set_render_target(device, target_impl, (IUnknown *)target); wined3d_mutex_unlock(); return hr; @@ -1913,6 +1924,16 @@ static HRESULT WINAPI d3d_device3_SetRenderTarget(IDirect3DDevice3 *iface, return DDERR_INVALIDCAPS; } + if (target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { + WARN("Surface %p is a depth buffer.\n", target_impl); + IDirectDrawSurface4_AddRef(target); + IUnknown_Release(device->rt_iface); + device->rt_iface = (IUnknown *)target; + wined3d_mutex_unlock(); + return DDERR_INVALIDPIXELFORMAT; + } + if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) { WARN("Surface %p is not in video memory.\n", target_impl); @@ -1953,6 +1974,15 @@ static HRESULT WINAPI d3d_device2_SetRenderTarget(IDirect3DDevice2 *iface, return DDERR_INVALIDCAPS; } + if (target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER) + { + WARN("Surface %p is a depth buffer.\n", target_impl); + IUnknown_Release(device->rt_iface); + device->rt_iface = (IUnknown *)target; + wined3d_mutex_unlock(); + return DDERR_INVALIDPIXELFORMAT; + } + if (!(target_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY)) { WARN("Surface %p is not in video memory.\n", target_impl);

1 0

Henri Verbeet : ddraw: Verify that the surface is a render target in d3d_device_set_render_target ().
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: ed92369316da5260117927697cf0d14df5fa7a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed92369316da5260117927697… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 19 10:16:45 2013 +0200 ddraw: Verify that the surface is a render target in d3d_device_set_render_target(). --- dlls/ddraw/device.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3f3cb18..9ec9d1d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1819,6 +1819,13 @@ static HRESULT d3d_device_set_render_target(struct d3d_device *device, return DDERR_INVALIDCAPS; } + if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE)) + { + WARN("Surface %p is not a render target.\n", target); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + if (device->rt_iface == rt_iface) { TRACE("No-op SetRenderTarget operation, not doing anything\n");

1 0

Rico Schüller : d3dx9: Clamp register count for D3DXPC_MATRIX_COLUMNS.
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: ae95176c0d41cc1161cdfbf36325829ed33fc439 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae95176c0d41cc1161cdfbf36… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Sep 18 23:16:33 2013 +0200 d3dx9: Clamp register count for D3DXPC_MATRIX_COLUMNS. --- dlls/d3dx9_36/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 08c5aad..2ff967c 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -1137,7 +1137,7 @@ static UINT set(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, break; case D3DXPC_MATRIX_COLUMNS: - regcount = desc->Columns; + regcount = min(desc->RegisterCount, desc->Columns); if (inclass == D3DXPC_MATRIX_ROWS) rin = incol; else cin = incol; regsize = desc->Rows;

1 0

Dmitry Timoshkov : shlwapi/tests: Fix stream test failures under some win2000 versions.
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: b7e68ae3387f8a7e50d4d303c76698e029cea60f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7e68ae3387f8a7e50d4d303c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 19 16:09:41 2013 +0900 shlwapi/tests: Fix stream test failures under some win2000 versions. --- dlls/shlwapi/tests/istream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 67f467b..48f417f 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -222,8 +222,8 @@ static void test_stream_read_write(IStream *stream, DWORD mode) ret = stream->lpVtbl->Read(stream, buf, 2, &count); if (written != 0) { - ok(ret == S_OK, "IStream_Read error %#x (access %#x, written %u)\n", ret, mode, written); - if (mode == STGM_WRITE || mode == STGM_READWRITE) + ok(ret == S_OK || broken(ret == S_FALSE) /* win2000 */, "IStream_Read error %#x (access %#x, written %u)\n", ret, mode, written); + if (ret == S_OK && (mode == STGM_WRITE || mode == STGM_READWRITE)) { ok(count == 2, "expected 2, got %u\n", count); ok(buf[0] == 0x5e && buf[1] == 0xa7, "expected 5ea7, got %02x%02x\n", buf[0], buf[1]);

1 0

Bruno Jesus : ws2_32: Make getsockopt(SO_TYPE) convert the returned socket type.
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: e9bd764a7b82767941cac827843f02bd1bfc3d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9bd764a7b82767941cac8278… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Sep 18 17:36:25 2013 -0300 ws2_32: Make getsockopt(SO_TYPE) convert the returned socket type. --- dlls/ws2_32/socket.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8a790f3..2cb077e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2937,7 +2937,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_RCVBUF: case WS_SO_REUSEADDR: case WS_SO_SNDBUF: - case WS_SO_TYPE: if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; convert_sockopt(&level, &optname); @@ -3136,6 +3135,27 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return ret; } #endif + case WS_SO_TYPE: + { + if (!optlen || *optlen < sizeof(int) || !optval) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + if ( (fd = get_sock_fd( s, 0, NULL )) == -1) + return SOCKET_ERROR; + + if (getsockopt(fd, SOL_SOCKET, SO_TYPE, optval, (socklen_t *)optlen) != 0 ) + { + SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + ret = SOCKET_ERROR; + } + else + (*(int *)optval) = convert_socktype_u2w(*(int *)optval); + + release_sock_fd( s, fd ); + return ret; + } default: TRACE("Unknown SOL_SOCKET optname: 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT);

1 0

Ken Thomases : winemac: Use NSMouseInRect() instead of NSPointInRect() to compensate for Cocoa's off-by-one coordinate system.
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: 018d629b3cc6bf1d8424a73bbb00279223bfb323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=018d629b3cc6bf1d8424a73bb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Sep 18 13:53:21 2013 -0500 winemac: Use NSMouseInRect() instead of NSPointInRect() to compensate for Cocoa's off-by-one coordinate system. This matches what Cocoa does when determining how to handle an event so that, for example, our test if a click is in the window grow box corresponds to whether Cocoa will run an internal mouse-tracking loop to resize the window when we pass it the event. This fixes a problem where both Cocoa and user32 would try to run a resize loop and the cursor would get "stuck" resizing the window after the button was released. --- dlls/winemac.drv/cocoa_app.m | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 615a9ab..afe0608 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1550,7 +1550,7 @@ int macdrv_err_on; // Test if the click was in the window's content area. NSPoint nspoint = [self flippedMouseLocation:NSPointFromCGPoint(pt)]; NSRect contentRect = [window contentRectForFrameRect:[window frame]]; - process = NSPointInRect(nspoint, contentRect); + process = NSMouseInRect(nspoint, contentRect, NO); if (process && [window styleMask] & NSResizableWindowMask) { // Ignore clicks in the grow box (resize widget). @@ -1573,7 +1573,7 @@ int macdrv_err_on; NSMinY(contentRect), bounds.size.width, bounds.size.height); - process = !NSPointInRect(nspoint, growBox); + process = !NSMouseInRect(nspoint, growBox, NO); } } } @@ -1643,7 +1643,7 @@ int macdrv_err_on; // Only process the event if it was in the window's content area. NSPoint nspoint = [self flippedMouseLocation:NSPointFromCGPoint(pt)]; NSRect contentRect = [window contentRectForFrameRect:[window frame]]; - process = NSPointInRect(nspoint, contentRect); + process = NSMouseInRect(nspoint, contentRect, NO); } if (process)

1 0

Piotr Caban : msvcrt: Add _snwprintf_s_l implementation.
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: dadb2fdfa9f73ef49a71837c3a21483056950d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dadb2fdfa9f73ef49a71837c3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 19 10:31:07 2013 +0200 msvcrt: Add _snwprintf_s_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index efb9dcd..4323e45 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1300,7 +1300,7 @@ @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ varargs _snwprintf_l(ptr long wstr ptr) msvcrt._snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s -@ stub _snwprintf_s_l +@ varargs _snwprintf_s_l(ptr long long wstr ptr) msvcrt._snwprintf_s_l @ varargs _snwscanf(wstr long wstr) msvcrt._snwscanf @ varargs _snwscanf_l(wstr long wstr ptr) msvcrt._snwscanf_l @ varargs _snwscanf_s(wstr long wstr) msvcrt._snwscanf_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 9237669..57bd107 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1658,7 +1658,7 @@ @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ varargs _snwprintf_l(ptr long wstr ptr) msvcrt._snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s -@ stub _snwprintf_s_l +@ varargs _snwprintf_s_l(ptr long long wstr ptr) msvcrt._snwprintf_s_l @ varargs _snwscanf(wstr long wstr) msvcrt._snwscanf @ varargs _snwscanf_l(wstr long wstr ptr) msvcrt._snwscanf_l @ varargs _snwscanf_s(wstr long wstr) msvcrt._snwscanf_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 328d2dc..55f922a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -980,7 +980,7 @@ @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ varargs _snwprintf_l(ptr long wstr ptr) msvcrt._snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s -@ stub _snwprintf_s_l +@ varargs _snwprintf_s_l(ptr long long wstr ptr) msvcrt._snwprintf_s_l @ varargs _snwscanf(wstr long wstr) msvcrt._snwscanf @ varargs _snwscanf_l(wstr long wstr ptr) msvcrt._snwscanf_l @ varargs _snwscanf_s(wstr long wstr) msvcrt._snwscanf_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5e77362..3632599 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -955,7 +955,7 @@ @ varargs _snwprintf(ptr long wstr) msvcrt._snwprintf @ varargs _snwprintf_l(ptr long wstr ptr) msvcrt._snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) msvcrt._snwprintf_s -@ stub _snwprintf_s_l +@ varargs _snwprintf_s_l(ptr long long wstr ptr) msvcrt._snwprintf_s_l @ varargs _snwscanf(wstr long wstr) msvcrt._snwscanf @ varargs _snwscanf_l(wstr long wstr ptr) msvcrt._snwscanf_l @ varargs _snwscanf_s(wstr long wstr) msvcrt._snwscanf_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 90bd7ff..6089656 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -922,7 +922,7 @@ @ varargs _snwprintf(ptr long wstr) MSVCRT__snwprintf @ varargs _snwprintf_l(ptr long wstr ptr) MSVCRT__snwprintf_l @ varargs _snwprintf_s(ptr long long wstr) MSVCRT__snwprintf_s -# stub _snwprintf_s_l(ptr long long wstr ptr) +@ varargs _snwprintf_s_l(ptr long long wstr ptr) MSVCRT__snwprintf_s_l @ varargs _snwscanf(wstr long wstr) MSVCRT__snwscanf @ varargs _snwscanf_l(wstr long wstr ptr) MSVCRT__snwscanf_l @ varargs _snwscanf_s(wstr long wstr) MSVCRT__snwscanf_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 60eae92..d1e738f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -883,6 +883,20 @@ int CDECL MSVCRT__snwprintf_s( MSVCRT_wchar_t *str, unsigned int len, unsigned i } /********************************************************************* + * _snwprintf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT__snwprintf_s_l( MSVCRT_wchar_t *str, unsigned int len, unsigned int count, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ... ) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, locale); + retval = MSVCRT_vsnwprintf_s_l(str, len, count, format, locale, valist); + __ms_va_end(valist); + return retval; +} + +/********************************************************************* * sprintf (MSVCRT.@) */ int CDECL MSVCRT_sprintf( char *str, const char *format, ... )

1 0

Henri Verbeet : wined3d: Avoid LPVOID.
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: 5bd3bfff99f407024f1dfa7d7534dfecb5520f92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd3bfff99f407024f1dfa7d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 19 10:16:49 2013 +0200 wined3d: Avoid LPVOID. --- dlls/wined3d/wined3d_main.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 58acc11..a0ecfa7 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -506,18 +506,17 @@ void wined3d_unregister_window(HWND window) } /* At process attach */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - TRACE("WineD3D DLLMain Reason=%u\n", fdwReason); - - switch (fdwReason) + switch (reason) { case DLL_PROCESS_ATTACH: - return wined3d_dll_init(hInstDLL); + return wined3d_dll_init(inst); case DLL_PROCESS_DETACH: - if (lpv) break; - return wined3d_dll_destroy(hInstDLL); + if (!reserved) + return wined3d_dll_destroy(inst); + break; case DLL_THREAD_DETACH: if (!context_set_current(NULL))

1 0

Joško Nikolić : po: Update Croatian translation.
by Alexandre Julliard Sept. 19, 2013

Sept. 19, 2013

Module: wine Branch: master Commit: e5f61e6eaf479c086e935c7c4e44a7e33f689519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f61e6eaf479c086e935c7c4… Author: Joško Nikolić <josko.nikolic(a)fer.hr> Date: Thu Sep 19 04:32:44 2013 +0000 po: Update Croatian translation. --- po/hr.po | 506 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 259 insertions(+), 247 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5f61e6eaf479c086e935…

1 0