wine-commits February 2013

wine-commits@winehq.org

2 participants
459 discussions

Francois Gouget : ws2_32/tests: Fix the GetAcceptExSockaddrs() test.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: 867615419e7ff3aac203743a03fdb661e28089b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=867615419e7ff3aac203743a0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 15 11:34:00 2013 +0100 ws2_32/tests: Fix the GetAcceptExSockaddrs() test. --- dlls/ws2_32/tests/sock.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ebde182..804c66b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4771,6 +4771,7 @@ static void test_AcceptEx(void) ok(!iret, "getsockopt failed %d\n", WSAGetLastError()); ok(connect_time == ~0u, "unexpected connect time %u\n", connect_time); + /* AcceptEx() still won't complete until we send data */ iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); @@ -4786,6 +4787,13 @@ static void test_AcceptEx(void) iret = getsockname( connector, (struct sockaddr *)&peerAddress, &remoteSize); ok( !iret, "getsockname failed.\n"); + /* AcceptEx() could complete any time now */ + iret = send(connector, buffer, 1, 0); + ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); + + dwret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + /* Check if the buffer from AcceptEx is decoded correctly */ pGetAcceptExSockaddrs(buffer, 2, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, (struct sockaddr **)&readBindAddress, &localSize, @@ -4805,12 +4813,6 @@ static void test_AcceptEx(void) "Remote socket port is different: %d != %d\n", readRemoteAddress->sin_port, peerAddress.sin_port); - iret = send(connector, buffer, 1, 0); - ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); - - dwret = WaitForSingleObject(overlapped.hEvent, 1000); - ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); - bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); ok(bytesReturned == 1, "bytesReturned isn't supposed to be %d\n", bytesReturned);

1 0

Roman Dadkov : ole32/tests: Add test for OleRun.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: 665717ae75e01817da468055c30dfa9c7f09e6aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=665717ae75e01817da468055c… Author: Roman Dadkov <romand(a)etersoft.ru> Date: Wed Feb 13 18:03:53 2013 +0400 ole32/tests: Add test for OleRun. --- dlls/ole32/tests/ole2.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 4ef6638..ef3a0a6 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1926,6 +1926,14 @@ static const IUnknownVtbl UnknownVtbl = static IUnknown unknown = { &UnknownVtbl }; +static void test_OleRun(void) +{ + HRESULT hr; + + hr = OleRun(&unknown); + ok(hr == S_OK, "OleRun failed 0x%08x\n", hr); +} + static void test_OleLockRunning(void) { HRESULT hr; @@ -1984,6 +1992,7 @@ START_TEST(ole2) test_data_cache(); test_default_handler(); test_runnable(); + test_OleRun(); test_OleLockRunning(); test_OleDraw();

1 0

Francois Gouget : d3d11: Make debug_d3d_driver_type() static.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: aaabd02cffc1789a39c0bf7819cf2082db660a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaabd02cffc1789a39c0bf781… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 15 11:13:48 2013 +0100 d3d11: Make debug_d3d_driver_type() static. --- dlls/d3d11/d3d11_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 4091bca..b5bf8cd 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -const char *debug_d3d_driver_type(D3D_DRIVER_TYPE driver_type) +static const char *debug_d3d_driver_type(D3D_DRIVER_TYPE driver_type) { switch(driver_type) {

1 0

Jacek Caban : vbscript: Added support for a few more constants.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: 97f2912965fae9aa33f10308ef5dc551c9f086b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f2912965fae9aa33f10308e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 15 10:29:42 2013 +0100 vbscript: Added support for a few more constants. --- dlls/vbscript/global.c | 32 ++++---------------------------- dlls/vbscript/tests/api.vbs | 9 +++++++++ dlls/vbscript/vbdisp.c | 11 ++++++++--- 3 files changed, 21 insertions(+), 31 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 39b75ab..1a3dae7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1771,30 +1771,6 @@ static HRESULT Global_vbVerticalTab(vbdisp_t *This, VARIANT *arg, unsigned args_ return E_NOTIMPL; } -static HRESULT Global_vbMsgBoxHelpButton(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbMsgBoxSetForeground(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbMsgBoxRight(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbMsgBoxRtlReading(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBUSESYSTEM, NULL, BP_GET, 0}, {DISPID_GLOBAL_USESYSTEMDAYOFWEEK, NULL, BP_GET, 0}, @@ -1984,10 +1960,10 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_EXECUTE, Global_Execute, 0, 1}, {DISPID_GLOBAL_EXECUTEGLOBAL, Global_ExecuteGlobal, 0, 1}, {DISPID_GLOBAL_GETREF, Global_GetRef, 0, 1}, - {DISPID_GLOBAL_VBMSGBOXHELPBUTTON, Global_vbMsgBoxHelpButton, BP_GET}, - {DISPID_GLOBAL_VBMSGBOXSETFOREGROUND, Global_vbMsgBoxSetForeground, BP_GET}, - {DISPID_GLOBAL_VBMSGBOXRIGHT, Global_vbMsgBoxRight, BP_GET}, - {DISPID_GLOBAL_VBMSGBOXRTLREADING, Global_vbMsgBoxRtlReading, BP_GET} + {DISPID_GLOBAL_VBMSGBOXHELPBUTTON, NULL, BP_GET, MB_HELP}, + {DISPID_GLOBAL_VBMSGBOXSETFOREGROUND, NULL, BP_GET, MB_SETFOREGROUND}, + {DISPID_GLOBAL_VBMSGBOXRIGHT, NULL, BP_GET, MB_RIGHT}, + {DISPID_GLOBAL_VBMSGBOXRTLREADING, NULL, BP_GET, MB_RTLREADING} }; HRESULT init_global(script_ctx_t *ctx) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 966b256..6472b95 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -43,6 +43,11 @@ Sub TestConstant(name, val, exval) Call ok(getVT(val) = "VT_I2*", "getVT(" & name & ") = " & getVT(val)) End Sub +Sub TestConstantI4(name, val, exval) + Call ok(val = exval, name & " = " & val & " expected " & exval) + Call ok(getVT(val) = "VT_I4*", "getVT(" & name & ") = " & getVT(val)) +End Sub + TestConstant "vbEmpty", vbEmpty, 0 TestConstant "vbNull", vbNull, 1 TestConstant "vbLong", vbLong, 3 @@ -76,6 +81,10 @@ TestConstant "vbFirstFourDays", vbFirstFourDays, 2 TestConstant "vbFirstFullWeek", vbFirstFullWeek, 3 TestConstant "vbTrue", vbTrue, -1 TestConstant "vbFalse", vbFalse, 0 +TestConstantI4 "vbMsgBoxHelpButton", vbMsgBoxHelpButton, 16384 +TestConstantI4 "vbMsgBoxSetForeground", vbMsgBoxSetForeground, 65536 +TestConstantI4 "vbMsgBoxRight", vbMsgBoxRight, 524288 +TestConstantI4 "vbMsgBoxRtlReading", vbMsgBoxRtlReading, 1048576 Sub TestCStr(arg, exval) dim x diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index b37caf6..843d5c8 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -150,9 +150,14 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f break; case DISPATCH_PROPERTYGET|DISPATCH_METHOD: if(!prop->proc && prop->flags == BP_GET) { - assert((INT16)prop->min_args == prop->min_args); - V_VT(res) = VT_I2; - V_I2(res) = prop->min_args; + int val = prop->min_args; + if(val < 0x4000) { + V_VT(res) = VT_I2; + V_I2(res) = val; + }else { + V_VT(res) = VT_I4; + V_I4(res) = val; + } return S_OK; } break;

1 0

Dmitry Timoshkov : kernel32: There is no need for lock/ unlock heap in GlobalAlloc.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: 70c21c8e6c5b6f7f0b543a704b292824ca0a307b URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c21c8e6c5b6f7f0b543a704… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 15 16:40:43 2013 +0800 kernel32: There is no need for lock/unlock heap in GlobalAlloc. --- dlls/kernel32/heap.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index b74763f..e0b86e5 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -370,8 +370,6 @@ HGLOBAL WINAPI GlobalAlloc( return 0; } - RtlLockHeap(GetProcessHeap()); - pintern = HeapAlloc(GetProcessHeap(), 0, sizeof(GLOBAL32_INTERN)); if (pintern) { @@ -400,7 +398,6 @@ HGLOBAL WINAPI GlobalAlloc( pintern->Pointer = NULL; } - RtlUnlockHeap(GetProcessHeap()); if (!pintern) return 0; TRACE( "(flags=%04x) returning handle %p pointer %p\n", flags, INTERN_TO_HANDLE(pintern), pintern->Pointer );

1 0

Dmitry Timoshkov : gdi32: SelectClipPath should update actual clipping region for a EMF DC.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: wine Branch: master Commit: e069662c0c8d76f3935c20bca255f1e4fec057da URL: http://source.winehq.org/git/wine.git/?a=commit;h=e069662c0c8d76f3935c20bca… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 15 13:06:33 2013 +0800 gdi32: SelectClipPath should update actual clipping region for a EMF DC. --- dlls/gdi32/enhmfdrv/dc.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 3af7ef4..389dc38 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -159,7 +159,6 @@ INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT botto { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pExcludeClipRect ); EMREXCLUDECLIPRECT emr; - BOOL ret; emr.emr.iType = EMR_EXCLUDECLIPRECT; emr.emr.nSize = sizeof(emr); @@ -167,15 +166,14 @@ INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT botto emr.rclClip.top = top; emr.rclClip.right = right; emr.rclClip.bottom = bottom; - ret = EMFDRV_WriteRecord( dev, &emr.emr ); - return ret ? next->funcs->pExcludeClipRect( next, left, top, right, bottom ) : ERROR; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR; + return next->funcs->pExcludeClipRect( next, left, top, right, bottom ); } INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pIntersectClipRect ); EMRINTERSECTCLIPRECT emr; - BOOL ret; emr.emr.iType = EMR_INTERSECTCLIPRECT; emr.emr.nSize = sizeof(emr); @@ -183,22 +181,21 @@ INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bot emr.rclClip.top = top; emr.rclClip.right = right; emr.rclClip.bottom = bottom; - ret = EMFDRV_WriteRecord( dev, &emr.emr ); - return ret ? next->funcs->pIntersectClipRect( next, left, top, right, bottom ) : ERROR; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR; + return next->funcs->pIntersectClipRect( next, left, top, right, bottom ); } INT EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) { PHYSDEV next = GET_NEXT_PHYSDEV( dev, pOffsetClipRgn ); EMROFFSETCLIPRGN emr; - BOOL ret; emr.emr.iType = EMR_OFFSETCLIPRGN; emr.emr.nSize = sizeof(emr); emr.ptlOffset.x = x; emr.ptlOffset.y = y; - ret = EMFDRV_WriteRecord( dev, &emr.emr ); - return ret ? next->funcs->pOffsetClipRgn( next, x, y ) : ERROR; + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return ERROR; + return next->funcs->pOffsetClipRgn( next, x, y ); } INT EMFDRV_ExtSelectClipRgn( PHYSDEV dev, HRGN hrgn, INT mode ) @@ -477,13 +474,15 @@ BOOL EMFDRV_FlattenPath( PHYSDEV dev ) BOOL EMFDRV_SelectClipPath( PHYSDEV dev, INT iMode ) { + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectClipPath ); EMRSELECTCLIPPATH emr; emr.emr.iType = EMR_SELECTCLIPPATH; emr.emr.nSize = sizeof(emr); emr.iMode = iMode; - return EMFDRV_WriteRecord( dev, &emr.emr ); + if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE; + return next->funcs->pSelectClipPath( next, iMode ); } BOOL EMFDRV_StrokeAndFillPath( PHYSDEV dev )

1 0

Francois Gouget : winetest: Ignore the time it took to run the tests.
by Alexandre Julliard 15 Feb '13

15 Feb '13

Module: tools Branch: master Commit: 36855cf5572b8c88251b896ada35d4a3578eb4c6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=36855cf5572b8c88251b896a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 15 11:18:17 2013 +0100 winetest: Ignore the time it took to run the tests. --- winetest/dissect | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 605292d..f2e18a2 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -288,7 +288,7 @@ while (<IN>) { if ($failed) { $class .= " failed"; } elsif ($todo) { $class .= " todo"; } $testbox->{data} .= sprintf "<div class=\"%s\">%s</div>\n", $class, escapeHTML($_); - } elsif (/$dll:$unit done $(-?\d+)$\r?$/) { + } elsif (/$dll:$unit done $(-?\d+)$(?:\r?$| in)/) { chomp; # current test ended if ($lines==0 || $1 < 0) { $result = "failed $1 - -";

1 0

Henri Verbeet : configure: Include Xlib.h before Xrandr.h.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: e89edd60fefafd6440b155b49d43b06b7d7b778f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e89edd60fefafd6440b155b49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 14 21:16:11 2013 +0100 configure: Include Xlib.h before Xrandr.h. --- configure | 1 + configure.ac | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 2998c6a..223ec5d 100755 --- a/configure +++ b/configure @@ -8824,6 +8824,7 @@ _ACEOF cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include <X11/Xlib.h> #include <X11/extensions/Xrandr.h> int main () diff --git a/configure.ac b/configure.ac index d6fccaa..fd7d0b7 100644 --- a/configure.ac +++ b/configure.ac @@ -1076,8 +1076,8 @@ then AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h> #include <X11/extensions/Xrandr.h>]], [[static typeof(XRRSetScreenConfigAndRate) * func; if (func) return 0;]])], [WINE_CHECK_SONAME(Xrandr,XRRQueryExtension, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/extensions/Xrandr.h>]], - [[static typeof(XRRGetScreenResources) *f; if (f) return 0;]])], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h> +#include <X11/extensions/Xrandr.h>]], [[static typeof(XRRGetScreenResources) *f; if (f) return 0;]])], [AC_DEFINE(HAVE_XRRGETSCREENRESOURCES, 1, [Define if Xrandr has the XRRGetScreenResources function])])],, [$X_LIBS $XLIB $X_EXTRA_LIBS])])

1 0

Alexandre Julliard : wtsapi32: Remove an unnecessary DllMain entry point.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 102f5085efc5d9ac9e3190c721c08a2eeb917e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=102f5085efc5d9ac9e3190c72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:37:37 2013 +0100 wtsapi32: Remove an unnecessary DllMain entry point. --- dlls/wtsapi32/wtsapi32.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index c25f75b..898b95d 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -26,25 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_PROCESS_ATTACH: - { - DisableThreadLibraryCalls(hinstDLL); - break; - } - case DLL_PROCESS_DETACH: - { - break; - } - } - - return TRUE; -} - /************************************************************ * WTSCloseServer (WTSAPI32.@) */

1 0

Alexandre Julliard : usp10: Remove an unnecessary DllMain entry point.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 6af3e91cf893de730cdd8059ce75c9b521fe79ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6af3e91cf893de730cdd8059c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:37:25 2013 +0100 usp10: Remove an unnecessary DllMain entry point. --- dlls/usp10/usp10.c | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0b14e9e..8bfe156 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -999,23 +999,6 @@ int USP10_FindGlyphInLogClust(const WORD* pwLogClust, int cChars, WORD target) } /*********************************************************************** - * DllMain - * - */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - switch(fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -} - -/*********************************************************************** * ScriptFreeCache (USP10.@) * * Free a script cache.

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
46
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 February 2013