wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Henri Verbeet : wined3d: Add support for geometry shaders to the GLSL shader backend.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: 9a27b0ad71acd52855eef1a710cb487ad677f37c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a27b0ad71acd52855eef1a71… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 14 23:05:59 2012 +0100 wined3d: Add support for geometry shaders to the GLSL shader backend. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/glsl_shader.c | 173 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/shader.c | 24 ++++++ dlls/wined3d/wined3d_private.h | 9 ++ 4 files changed, 204 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a27b0ad71acd52855eef…

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DLIGHT.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: db3b97debf850e615658e63240acca355f320963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db3b97debf850e615658e6324… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 14 23:05:58 2012 +0100 ddraw: Avoid LPDIRECT3DLIGHT. --- include/d3d.h | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index b9fdde9..4f1ffba 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -213,7 +213,7 @@ DECLARE_INTERFACE_(IDirect3D,IUnknown) /*** IDirect3D methods ***/ STDMETHOD(Initialize)(THIS_ REFIID riid) PURE; STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; - STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateLight)(THIS_ struct IDirect3DLight **light, IUnknown *outer) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport **viewport, IUnknown *outer) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lplpD3DDevice) PURE; @@ -259,7 +259,7 @@ DECLARE_INTERFACE_(IDirect3D2,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3D2 methods ***/ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; - STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateLight)(THIS_ struct IDirect3DLight **light, IUnknown *outer) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial2 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport2 **viewport, IUnknown *outer) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; @@ -307,7 +307,7 @@ DECLARE_INTERFACE_(IDirect3D3,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3D3 methods ***/ STDMETHOD(EnumDevices)(THIS_ LPD3DENUMDEVICESCALLBACK lpEnumDevicesCallback, LPVOID lpUserArg) PURE; - STDMETHOD(CreateLight)(THIS_ LPDIRECT3DLIGHT *lplpDirect3DLight, IUnknown *pUnkOuter) PURE; + STDMETHOD(CreateLight)(THIS_ struct IDirect3DLight **light, IUnknown *outer) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial3 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport3 **viewport, IUnknown *outer) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; @@ -662,9 +662,9 @@ DECLARE_INTERFACE_(IDirect3DViewport,IUnknown) STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; - STDMETHOD(AddLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(DeleteLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(NextLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight, LPDIRECT3DLIGHT *lplpDirect3DLight, DWORD dwFlags) PURE; + STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; }; #undef INTERFACE @@ -730,9 +730,9 @@ DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport) STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; - STDMETHOD(AddLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(DeleteLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(NextLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight, LPDIRECT3DLIGHT *lplpDirect3DLight, DWORD dwFlags) PURE; + STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; /*** IDirect3DViewport2 methods ***/ STDMETHOD(GetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; STDMETHOD(SetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; @@ -806,9 +806,9 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; - STDMETHOD(AddLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(DeleteLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight) PURE; - STDMETHOD(NextLight)(THIS_ LPDIRECT3DLIGHT lpDirect3DLight, LPDIRECT3DLIGHT *lplpDirect3DLight, DWORD dwFlags) PURE; + STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; + STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; /*** IDirect3DViewport2 methods ***/ STDMETHOD(GetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; STDMETHOD(SetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE;

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DDEVICE.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: 4dd685ecbe02b11657da16fc618718f5532f965f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dd685ecbe02b11657da16fc6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 14 23:05:57 2012 +0100 ddraw: Avoid LPDIRECT3DDEVICE. --- include/d3d.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 4bec630..b9fdde9 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -450,7 +450,7 @@ DECLARE_INTERFACE_(IDirect3DMaterial,IUnknown) STDMETHOD(Initialize)(THIS_ LPDIRECT3D lpDirect3D) PURE; STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; - STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE lpDirect3DDevice, LPD3DMATERIALHANDLE lpHandle) PURE; + STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice *device, D3DMATERIALHANDLE *handle) PURE; STDMETHOD(Reserve)(THIS) PURE; STDMETHOD(Unreserve)(THIS) PURE; }; @@ -571,7 +571,7 @@ DECLARE_INTERFACE_(IDirect3DTexture,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DTexture methods ***/ STDMETHOD(Initialize)(THIS_ struct IDirect3DDevice *device, IDirectDrawSurface *surface) PURE; - STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE lpDirect3DDevice, LPD3DTEXTUREHANDLE lpHandle) PURE; + STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice *device, D3DTEXTUREHANDLE *handle) PURE; STDMETHOD(PaletteChanged)(THIS_ DWORD dwStart, DWORD dwCount) PURE; STDMETHOD(Load)(THIS_ IDirect3DTexture *texture) PURE; STDMETHOD(Unload)(THIS) PURE; @@ -886,7 +886,7 @@ DECLARE_INTERFACE_(IDirect3DExecuteBuffer,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DExecuteBuffer methods ***/ - STDMETHOD(Initialize)(THIS_ LPDIRECT3DDEVICE lpDirect3DDevice, LPD3DEXECUTEBUFFERDESC lpDesc) PURE; + STDMETHOD(Initialize)(THIS_ struct IDirect3DDevice *device, D3DEXECUTEBUFFERDESC *desc) PURE; STDMETHOD(Lock)(THIS_ LPD3DEXECUTEBUFFERDESC lpDesc) PURE; STDMETHOD(Unlock)(THIS) PURE; STDMETHOD(SetExecuteData)(THIS_ LPD3DEXECUTEDATA lpData) PURE;

1 0

Henri Verbeet : ddraw: Avoid LPDIRECT3DDEVICE2.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: d3b739ff31a26829db3505ab5fa4dc6fad4095f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3b739ff31a26829db3505ab5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 14 23:05:56 2012 +0100 ddraw: Avoid LPDIRECT3DDEVICE2. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 5a8f576..4bec630 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -496,7 +496,7 @@ DECLARE_INTERFACE_(IDirect3DMaterial2,IUnknown) /*** IDirect3DMaterial2 methods ***/ STDMETHOD(SetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; STDMETHOD(GetMaterial)(THIS_ LPD3DMATERIAL lpMat) PURE; - STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE2 lpDirect3DDevice2, LPD3DMATERIALHANDLE lpHandle) PURE; + STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice2 *device, D3DMATERIALHANDLE *handle) PURE; }; #undef INTERFACE @@ -614,7 +614,7 @@ DECLARE_INTERFACE_(IDirect3DTexture2,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DTexture2 methods ***/ - STDMETHOD(GetHandle)(THIS_ LPDIRECT3DDEVICE2 lpDirect3DDevice2, LPD3DTEXTUREHANDLE lpHandle) PURE; + STDMETHOD(GetHandle)(THIS_ struct IDirect3DDevice2 *device, D3DTEXTUREHANDLE *handle) PURE; STDMETHOD(PaletteChanged)(THIS_ DWORD dwStart, DWORD dwCount) PURE; STDMETHOD(Load)(THIS_ IDirect3DTexture2 *texture) PURE; };

1 0

Detlef Riekenberg : netapi32/tests: Fix workstation test failures on XP.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 1e6ffc9c326b9b10fe80f68b50625c15e00c7a35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e6ffc9c326b9b10fe80f68b5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 13 23:50:15 2012 +0100 netapi32/tests: Fix workstation test failures on XP. --- dlls/netapi32/tests/wksta.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/tests/wksta.c b/dlls/netapi32/tests/wksta.c index 54c25e5..5d1d8ac 100644 --- a/dlls/netapi32/tests/wksta.c +++ b/dlls/netapi32/tests/wksta.c @@ -79,12 +79,17 @@ static void run_wkstausergetinfo_tests(void) LPWKSTA_USER_INFO_1 ui1 = NULL; LPWKSTA_USER_INFO_1101 ui1101 = NULL; DWORD dwSize; + NET_API_STATUS rc; /* Level 0 */ - ok(pNetWkstaUserGetInfo(NULL, 0, (LPBYTE *)&ui0) == NERR_Success, - "NetWkstaUserGetInfo is unsuccessful\n"); + rc = pNetWkstaUserGetInfo(NULL, 0, (LPBYTE *)&ui0); + if (rc == NERR_WkstaNotStarted) + { + skip("Workstation service not running\n"); + return; + } + ok(!rc && ui0, "got %d and %p (expected NERR_Success and != NULL\n", rc, ui0); - ok(ui0 != NULL, "ui0 is NULL\n"); /* This failure occurred when I ran sshd as service and didn't authenticate * Since the test dereferences ui0, the rest of this test is worthless */ @@ -168,7 +173,7 @@ static void run_wkstatransportenum_tests(void) /* final check: valid return, actually get data back */ apiReturn = pNetWkstaTransportEnum(NULL, 0, &bufPtr, MAX_PREFERRED_LENGTH, &entriesRead, &totalEntries, NULL); - ok(apiReturn == NERR_Success || apiReturn == ERROR_NETWORK_UNREACHABLE, + ok(apiReturn == NERR_Success || apiReturn == ERROR_NETWORK_UNREACHABLE || apiReturn == NERR_WkstaNotStarted, "NetWkstaTransportEnum returned %d\n", apiReturn); if (apiReturn == NERR_Success) { /* WKSTA_TRANSPORT_INFO_0 *transports = (WKSTA_TRANSPORT_INFO_0 *)bufPtr; */

1 0

Detlef Riekenberg : kernel32/tests: Fix 32-bit thread test failures on NT 5 .x 64bit.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 5c1e6cf7cdfd791e3ec98142979a1912b0e7da21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1e6cf7cdfd791e3ec981429… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 13 23:50:13 2012 +0100 kernel32/tests: Fix 32-bit thread test failures on NT 5.x 64bit. --- dlls/kernel32/tests/thread.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 19726af..76a7a33 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -961,16 +961,19 @@ static void test_SetThreadContext(void) ctx.ContextFlags = CONTEXT_FULL; SetLastError(0xdeadbeef); ret = GetThreadContext( thread, &ctx ); - ok( !ret, "GetThreadContext succeeded\n" ); - ok( GetLastError() == ERROR_GEN_FAILURE || broken(GetLastError() == ERROR_INVALID_HANDLE), /* win2k */ - "wrong error %u\n", GetLastError() ); + ok( (!ret && (GetLastError() == ERROR_GEN_FAILURE)) || + (!ret && broken(GetLastError() == ERROR_INVALID_HANDLE)) || /* win2k */ + broken(ret), /* 32bit application on NT 5.x 64bit */ + "got %d with %u (expected FALSE with ERROR_GEN_FAILURE)\n", + ret, GetLastError() ); SetLastError(0xdeadbeef); ret = SetThreadContext( thread, &ctx ); - ok( !ret, "SetThreadContext succeeded\n" ); - ok( GetLastError() == ERROR_GEN_FAILURE || GetLastError() == ERROR_ACCESS_DENIED || - broken(GetLastError() == ERROR_INVALID_HANDLE), /* win2k */ - "wrong error %u\n", GetLastError() ); + ok( (!ret && ((GetLastError() == ERROR_GEN_FAILURE) || (GetLastError() == ERROR_ACCESS_DENIED))) || + (!ret && broken(GetLastError() == ERROR_INVALID_HANDLE)) || /* win2k */ + broken(ret), /* 32bit application on NT 5.x 64bit */ + "got %d with %u (expected FALSE with ERROR_GEN_FAILURE or ERROR_ACCESS_DENIED)\n", + ret, GetLastError() ); CloseHandle( thread ); }

1 0

Detlef Riekenberg : netapi32/tests: Fix an access test failure on XP.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 1f0908984c5fb5d77570e9223e67078e853c8345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f0908984c5fb5d77570e9223… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 13 23:50:14 2012 +0100 netapi32/tests: Fix an access test failure on XP. --- dlls/netapi32/tests/access.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 9726c8d..a8c43c3 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -160,6 +160,7 @@ static void run_usergetinfo_tests(void) ok(rc == ERROR_BAD_NETPATH || rc == ERROR_NETWORK_UNREACHABLE || rc == RPC_S_SERVER_UNAVAILABLE || + rc == NERR_WkstaNotStarted || /* workstation service not running */ rc == RPC_S_INVALID_NET_ADDR, /* Some Win7 */ "Bad Network Path: rc=%d\n",rc); }

1 0

Nikolay Sivov : msi: Store object function pointers with type id.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: e87c3b4b005433a5c34f1048aae077de2b4a42fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e87c3b4b005433a5c34f1048a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 14 00:26:14 2012 -0500 msi: Store object function pointers with type id. --- dlls/msi/automation.c | 120 +++++++++++++++++++++++++++--------------------- 1 files changed, 67 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e87c3b4b005433a5c34f1…

1 0

Nikolay Sivov : msi: Cache ITypeInfo instances for automation objects instead of reloading every time .
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: e726b54c87b613ec727d675e883eb6f073bc6600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e726b54c87b613ec727d675e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 13 23:45:02 2012 -0500 msi: Cache ITypeInfo instances for automation objects instead of reloading every time. --- dlls/msi/automation.c | 196 ++++++++++++++++++++++++++++++++----------------- dlls/msi/msi_main.c | 1 + dlls/msi/msipriv.h | 14 +++- dlls/msi/script.c | 8 ++- 4 files changed, 147 insertions(+), 72 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e726b54c87b613ec727d6…

1 0

Jacek Caban : jscript: Use proper object as 'this' when function is called on an activation object.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 55f0663e3e5bc1c1a7cb460f4e75775f9cc0501b URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f0663e3e5bc1c1a7cb460f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 14 15:49:46 2012 +0100 jscript: Use proper object as 'this' when function is called on an activation object. --- dlls/jscript/engine.c | 12 ++++++++++++ dlls/jscript/object.c | 5 ++++- dlls/jscript/tests/lang.js | 6 ++++++ dlls/jscript/tests/run.c | 4 ++++ 4 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 44c8333..f4dcc0f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -292,6 +292,18 @@ HRESULT create_exec_ctx(script_ctx_t *script_ctx, IDispatch *this_obj, jsdisp_t ctx->ref = 1; ctx->is_global = is_global; + /* ECMA-262 3rd Edition 11.2.3.7 */ + if(this_obj) { + jsdisp_t *jsthis; + + jsthis = iface_to_jsdisp((IUnknown*)this_obj); + if(jsthis) { + if(jsthis->builtin_info->class == JSCLASS_GLOBAL || jsthis->builtin_info->class == JSCLASS_NONE) + this_obj = NULL; + jsdisp_release(jsthis); + } + } + if(this_obj) ctx->this_obj = this_obj; else if(script_ctx->host_global) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 34c572f..8047d3f 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> + #include "jscript.h" #include "wine/debug.h" @@ -51,7 +53,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u static const WCHAR regexpW[] = {'R','e','g','E','x','p',0}; static const WCHAR stringW[] = {'S','t','r','i','n','g',0}; /* Keep in sync with jsclass_t enum */ - static const WCHAR *names[] = {objectW, arrayW, booleanW, dateW, errorW, + static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, errorW, functionW, NULL, mathW, numberW, objectW, regexpW, stringW, objectW, objectW}; TRACE("\n"); @@ -62,6 +64,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u }else if(names[jsdisp->builtin_info->class]) { str = names[jsdisp->builtin_info->class]; }else { + assert(jsdisp->builtin_info->class != JSCLASS_NONE); FIXME("jdisp->builtin_info->class = %d\n", jsdisp->builtin_info->class); return E_FAIL; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index ffb5e2e..4f5f29c 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -56,6 +56,9 @@ ok(0 == false, "0 == false is false"); ok(1 != 2, "1 != 2 is false"); ok(false != 1, "false != 1 is false"); +ok(this === test, "this !== test"); +eval('ok(this === test, "this !== test");'); + var trueVar = true; ok(trueVar, "trueVar is not true"); @@ -71,6 +74,9 @@ function testFunc1(x, y) { ok(arguments.callee === testFunc1, "arguments.calee !== testFunc1"); ok(testFunc1.arguments === arguments, "testFunc1.arguments = " + testFunc1.arguments); + ok(this === test, "this !== test"); + eval('ok(this === test, "this !== test");'); + return true; } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index f0aff60..cacad25 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1815,6 +1815,10 @@ static BOOL run_tests(void) parse_script_a("testThis(this);"); parse_script_a("(function () { testThis(this); })();"); + parse_script_a("function x() { testThis(this); }; x();"); + parse_script_a("var t = {func: function () { ok(this === t, 'this !== t'); }}; with(t) { func(); }"); + parse_script_a("function x() { testThis(this); }; with({y: 1}) { x(); }"); + parse_script_a("(function () { function x() { testThis(this);} x(); })();"); SET_EXPECT(testobj_onlydispid_d); SET_EXPECT(testobj_onlydispid_i);

1 0

Piotr Caban : msvcp60: Added iostream tests.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: c0589a31e0e22e2efd4894656f8f2c5201ded6d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0589a31e0e22e2efd4894656… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:39:55 2012 +0100 msvcp60: Added iostream tests. --- dlls/msvcp60/tests/Makefile.in | 1 + dlls/msvcp60/tests/ios.c | 1626 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1627 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0589a31e0e22e2efd489…

1 0

Piotr Caban : msvcp60: Fixed basic_istream::getline(basic_string) implementation.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 43e8e008b2f41355051b71b43f61959ba784505b URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e8e008b2f41355051b71b43… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:39:41 2012 +0100 msvcp60: Fixed basic_istream::getline(basic_string) implementation. --- dlls/msvcp60/ios.c | 4 ++-- dlls/msvcp60/string.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 08a3848..02e903d 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7617,9 +7617,9 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( TRACE("(%p %p %c)\n", istream, str, delim); + basic_string_char_clear(str); if(basic_istream_char_sentry_create(istream, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); - basic_string_char_clear(str); c = basic_streambuf_char_sgetc(strbuf); for(; c!=(unsigned char)delim && c!=EOF; c = basic_streambuf_char_snextc(strbuf)) @@ -8909,9 +8909,9 @@ basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( TRACE("(%p %p %c)\n", istream, str, delim); + basic_string_wchar_clear(str); if(basic_istream_wchar_sentry_create(istream, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); - basic_string_wchar_clear(str); c = basic_streambuf_wchar_sgetc(strbuf); for(; c!=delim && c!=WEOF; c = basic_streambuf_wchar_snextc(strbuf)) diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 803cd33..d2e1c81 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -153,7 +153,8 @@ void __thiscall basic_string_char__Eos(basic_string_char *this, MSVCP_size_t len void basic_string_char_clear(basic_string_char *this) { - basic_string_char__Eos(this, 0); + if(this->ptr) + basic_string_char__Eos(this, 0); } /* ?_Tidy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEX_N@Z */ @@ -1865,7 +1866,8 @@ void __thiscall basic_string_wchar__Eos(basic_string_wchar *this, MSVCP_size_t l void basic_string_wchar_clear(basic_string_wchar *this) { - basic_string_wchar__Eos(this, 0); + if(this->ptr) + basic_string_wchar__Eos(this, 0); } /* ?_Tidy@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@AAEX_N@Z */

1 0

Piotr Caban : msvcp60: Fixed basic_istream::seekg implementation.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: a43840bcdf69050a7ae0f4ee3d1f0df883a60be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a43840bcdf69050a7ae0f4ee3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:39:31 2012 +0100 msvcp60: Fixed basic_istream::seekg implementation. --- dlls/msvcp60/ios.c | 36 ++++-------------------------------- 1 files changed, 4 insertions(+), 32 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 99493c4..08a3848 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7264,14 +7264,7 @@ basic_istream_char* __thiscall basic_istream_char_seekg(basic_istream_char *this fpos_int ret; basic_streambuf_char_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - - if(ret.off==-1 && ret.pos==0 && ret.state==0) - basic_ios_char_setstate(base, IOSTATE_failbit); - else - basic_ios_char_clear(base, IOSTATE_goodbit); - return this; - }else - basic_ios_char_clear(base, IOSTATE_goodbit); + } return this; } @@ -7290,14 +7283,7 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char fpos_int ret; basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - - if(ret.off==-1 && ret.pos==0 && ret.state==0) - basic_ios_char_setstate(base, IOSTATE_failbit); - else - basic_ios_char_clear(base, IOSTATE_goodbit); - return this; - }else - basic_ios_char_clear(base, IOSTATE_goodbit); + } return this; } @@ -8530,14 +8516,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t fpos_int ret; basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); - - if(ret.off==-1 && ret.pos==0 && ret.state==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); - else - basic_ios_wchar_clear(base, IOSTATE_goodbit); - return this; - }else - basic_ios_wchar_clear(base, IOSTATE_goodbit); + } return this; } @@ -8558,14 +8537,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch fpos_int ret; basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); - - if(ret.off==-1 && ret.pos==0 && ret.state==0) - basic_ios_wchar_setstate(base, IOSTATE_failbit); - else - basic_ios_wchar_clear(base, IOSTATE_goodbit); - return this; - }else - basic_ios_wchar_clear(base, IOSTATE_goodbit); + } return this; }

1 0

Piotr Caban : msvcp60: Fixed basic_istream::ipfx implementation.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 9796cf388c967fdf8c21a264cc186636177951be URL: http://source.winehq.org/git/wine.git/?a=commit;h=9796cf388c967fdf8c21a264c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:39:19 2012 +0100 msvcp60: Fixed basic_istream::ipfx implementation. --- dlls/msvcp60/ios.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index d243b1d..99493c4 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -6756,12 +6756,7 @@ static MSVCP_bool basic_istream_char__Ipfx(basic_istream_char *this, MSVCP_bool for(ch = basic_streambuf_char_sgetc(strbuf); ; ch = basic_streambuf_char_snextc(strbuf)) { - if(ch == EOF) { - basic_ios_char_setstate(base, IOSTATE_eofbit); - break; - } - - if(!ctype_char_is_ch(ctype, _SPACE|_BLANK, ch)) + if(ch==EOF || !ctype_char_is_ch(ctype, _SPACE|_BLANK, ch)) break; } } @@ -7985,12 +7980,7 @@ static MSVCP_bool basic_istream_wchar__Ipfx(basic_istream_wchar *this, MSVCP_boo for(ch = basic_streambuf_wchar_sgetc(strbuf); ; ch = basic_streambuf_wchar_snextc(strbuf)) { - if(ch == WEOF) { - basic_ios_wchar_setstate(base, IOSTATE_eofbit); - break; - } - - if(!ctype_wchar_is_ch(ctype, _SPACE|_BLANK, ch)) + if(ch==WEOF || !ctype_wchar_is_ch(ctype, _SPACE|_BLANK, ch)) break; } }

1 0

Piotr Caban : msvcp60: Fixed num_put::fput implementation.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 1cd95d4f828c066d5854c77845cbe8c9e97c72f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd95d4f828c066d5854c7784… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:39:08 2012 +0100 msvcp60: Fixed num_put::fput implementation. --- dlls/msvcp60/locale.c | 47 ----------------------------------------------- 1 files changed, 0 insertions(+), 47 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 2ed61de..a2a50df 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -5732,10 +5732,7 @@ static ostreambuf_iterator_char* num_put_char_fput(const num_put *this, ostreamb ostreambuf_iterator_char dest, ios_base *base, char fill, char *buf, MSVCP_size_t count) { numpunct_char *numpunct = numpunct_char_use_facet(&base->loc); - basic_string_char grouping_bstr; - const char *grouping; char *p, sep = *localeconv()->decimal_point; - int cur_group = 0, group_size = 0; int adjustfield = base->fmtfl & FMTFLAG_adjustfield; MSVCP_size_t pad; @@ -5750,25 +5747,6 @@ static ostreambuf_iterator_char* num_put_char_fput(const num_put *this, ostreamb } p--; - /* Add separators to number */ - numpunct_char_grouping(numpunct, &grouping_bstr); - grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; - - for(; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { - group_size++; - if(group_size == grouping[cur_group]) { - group_size = 0; - if(grouping[cur_group+1]) - cur_group++; - - memmove(p+1, p, buf+count-p); - *p = sep; - count++; - } - } - basic_string_char_dtor(&grouping_bstr); - /* Display number with padding */ if(count >= base->wide) pad = 0; @@ -6420,11 +6398,7 @@ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_ ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, char *buf, MSVCP_size_t count, numpunct_wchar *numpunct) { - basic_string_char grouping_bstr; - const char *grouping; char *p, dec_point = *localeconv()->decimal_point; - wchar_t sep; - int cur_group = 0, group_size = 0; int adjustfield = base->fmtfl & FMTFLAG_adjustfield; MSVCP_size_t i, pad; @@ -6436,25 +6410,6 @@ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_ } p--; - /* Add separators to number */ - numpunct_wchar_grouping(numpunct, &grouping_bstr); - grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : '\0'; - - for(; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { - group_size++; - if(group_size == grouping[cur_group]) { - group_size = 0; - if(grouping[cur_group+1]) - cur_group++; - - memmove(p+1, p, buf+count-p); - *p = '\0'; /* mark thousands separator positions */ - count++; - } - } - basic_string_char_dtor(&grouping_bstr); - /* Display number with padding */ if(count >= base->wide) pad = 0; @@ -6474,8 +6429,6 @@ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_ for(i=0; i<count; i++) { if(buf[i] == dec_point) num_put_wchar__Rep(this, &dest, dest, numpunct_wchar_decimal_point(numpunct), 1); - else if(!buf[i]) - num_put_wchar__Rep(this, &dest, dest, sep, 1); else num_put_wchar__Putc(this, &dest, dest, buf+i, 1); }

1 0

Piotr Caban : msvcp60: Fixed num_get class implementataion.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 8048d04e59ab2b7119c168e50781385441694aef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8048d04e59ab2b7119c168e50… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:38:54 2012 +0100 msvcp60: Fixed num_get class implementataion. --- dlls/msvcp60/ios.c | 17 +-- dlls/msvcp60/locale.c | 312 +++++++++---------------------------------------- dlls/msvcp60/msvcp.h | 5 +- 3 files changed, 68 insertions(+), 266 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8048d04e59ab2b7119c16…

1 0

Piotr Caban : msvcp60: Remove mutex class.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: b999c3e3070228aae404cc8b575c12add7a3c734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b999c3e3070228aae404cc8b5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:38:39 2012 +0100 msvcp60: Remove mutex class. --- dlls/msvcp60/ios.c | 5 ----- dlls/msvcp60/misc.c | 37 ------------------------------------- dlls/msvcp60/msvcp.h | 11 ----------- 3 files changed, 0 insertions(+), 53 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 5c2a1f4..eb5cbe0 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -1592,7 +1592,6 @@ static basic_streambuf_wchar* basic_streambuf_wchar_ctor_uninitialized(basic_str { TRACE("(%p %d)\n", this, uninitialized); this->vtable = &MSVCP_basic_streambuf_wchar_vtable; - mutex_ctor(&this->lock); return this; } @@ -1614,7 +1613,6 @@ static basic_streambuf_wchar* basic_streambuf_wchar_ctor(basic_streambuf_wchar * TRACE("(%p)\n", this); this->vtable = &MSVCP_basic_streambuf_wchar_vtable; - mutex_ctor(&this->lock); locale_ctor(&this->loc); basic_streambuf_wchar__Init_empty(this); @@ -1641,7 +1639,6 @@ void __thiscall basic_streambuf_wchar_dtor(basic_streambuf_wchar *this) { TRACE("(%p)\n", this); - mutex_dtor(&this->lock); locale_dtor(&this->loc); } @@ -1736,7 +1733,6 @@ void __thiscall basic_streambuf_wchar__Init(basic_streambuf_wchar *this, wchar_t static void basic_streambuf_wchar__Lock(basic_streambuf_wchar *this) { TRACE("(%p)\n", this); - mutex_lock(&this->lock); } /* ?_Pnavail@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IBEHXZ */ @@ -1847,7 +1843,6 @@ static streamsize basic_streambuf_wchar__Sgetn_s(basic_streambuf_wchar *this, wc static void basic_streambuf_wchar__Unlock(basic_streambuf_wchar *this) { TRACE("(%p)\n", this); - mutex_unlock(&this->lock); } /* ?eback@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@IBEPA_WXZ */ diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index 9c840b7..98eb9cf 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -27,43 +27,6 @@ #include "winbase.h" -/* ??0_Mutex@std@@QAE@XZ */ -/* ??0_Mutex@std@@QEAA@XZ */ -mutex* mutex_ctor(mutex *this) -{ - CRITICAL_SECTION *cs = MSVCRT_operator_new(sizeof(*cs)); - if(!cs) - throw_exception(EXCEPTION_BAD_ALLOC, NULL); - - InitializeCriticalSection(cs); - cs->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Mutex critical section"); - this->mutex = cs; - return this; -} - -/* ??1_Mutex@std@@QAE@XZ */ -/* ??1_Mutex@std@@QEAA@XZ */ -void mutex_dtor(mutex *this) -{ - ((CRITICAL_SECTION*)this->mutex)->DebugInfo->Spare[0] = 0; - DeleteCriticalSection(this->mutex); - MSVCRT_operator_delete(this->mutex); -} - -/* ?_Lock@_Mutex@std@@QAEXXZ */ -/* ?_Lock@_Mutex@std@@QEAAXXZ */ -void mutex_lock(mutex *this) -{ - EnterCriticalSection(this->mutex); -} - -/* ?_Unlock@_Mutex@std@@QAEXXZ */ -/* ?_Unlock@_Mutex@std@@QEAAXXZ */ -void mutex_unlock(mutex *this) -{ - LeaveCriticalSection(this->mutex); -} - static CRITICAL_SECTION lockit_cs; void init_lockit(void) { diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index 17cb6eb..ea52743 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -198,16 +198,6 @@ void free_lockit(void); _Lockit* __thiscall _Lockit_ctor_locktype(_Lockit*, int); void __thiscall _Lockit_dtor(_Lockit*); -/* class mutex */ -typedef struct { - void *mutex; -} mutex; - -mutex* mutex_ctor(mutex*); -void mutex_dtor(mutex*); -void mutex_lock(mutex*); -void mutex_unlock(mutex*); - typedef enum { FMTFLAG_skipws = 0x0001, FMTFLAG_unitbuf = 0x0002, @@ -331,7 +321,6 @@ int __thiscall basic_streambuf_char_sputc(basic_streambuf_char*, char); /* class basic_streambuf<wchar> */ typedef struct { const vtable_ptr *vtable; - mutex lock; wchar_t *rbuf; wchar_t *wbuf; wchar_t **prbuf;

1 0

Piotr Caban : msvcp60: Added basic_string tests.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 4b7333e227a2b69b9736d1d618fc03881d6ce102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b7333e227a2b69b9736d1d61… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:38:20 2012 +0100 msvcp60: Added basic_string tests. --- configure | 1 + configure.ac | 1 + dlls/msvcp60/string.c | 14 +- dlls/msvcp60/tests/Makefile.in | 9 + dlls/msvcp60/tests/string.c | 704 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 723 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b7333e227a2b69b9736d…

1 0

Piotr Caban : msvcp60: Fixed basic_string::c_str implementation.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 1c33835a53bc00d315f63721fa684d31b805fbb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c33835a53bc00d315f63721f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:37:54 2012 +0100 msvcp60: Fixed basic_string::c_str implementation. --- dlls/msvcp60/locale.c | 12 ++++++------ dlls/msvcp60/string.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index bbeb5a5..f350014 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -3970,7 +3970,7 @@ static int num_get__Getffld(const num_get *this, char *dest, istreambuf_iterator numpunct_wchar_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_wchar_thousands_sep(numpunct) : (wchar_t)0; + sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : (wchar_t)0; if(sep) basic_string_char_ctor(&groups_found); @@ -4124,7 +4124,7 @@ static int num_get__Getifld(const num_get *this, char *dest, istreambuf_iterator numpunct_wchar_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_wchar_thousands_sep(numpunct) : '\0'; + sep = grouping[0] ? numpunct_wchar_thousands_sep(numpunct) : '\0'; basefield = fmtflags & FMTFLAG_basefield; if(basefield == FMTFLAG_oct) @@ -5034,7 +5034,7 @@ static int num_get_char__Getffld(const num_get *this, char *dest, istreambuf_ite numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; if(sep) basic_string_char_ctor(&groups_found); @@ -5186,7 +5186,7 @@ static int num_get_char__Getifld(const num_get *this, char *dest, istreambuf_ite numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; basefield = fmtflags & FMTFLAG_basefield; if(basefield == FMTFLAG_oct) @@ -5949,7 +5949,7 @@ static ostreambuf_iterator_char* num_put_char_fput(const num_put *this, ostreamb /* Add separators to number */ numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; for(; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { group_size++; @@ -6032,7 +6032,7 @@ static ostreambuf_iterator_char* num_put_char__Iput(const num_put *this, ostream /* Add separators to number */ numpunct_char_grouping(numpunct, &grouping_bstr); grouping = basic_string_char_c_str(&grouping_bstr); - sep = grouping ? numpunct_char_thousands_sep(numpunct) : '\0'; + sep = grouping[0] ? numpunct_char_thousands_sep(numpunct) : '\0'; for(p=buf+count-1; p>buf && sep && grouping[cur_group]!=CHAR_MAX; p--) { group_size++; diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index ed4391c..69917dc 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -1666,7 +1666,7 @@ DEFINE_THISCALL_WRAPPER(basic_string_char_c_str, 4) const char* __thiscall basic_string_char_c_str(const basic_string_char *this) { TRACE("%p\n", this); - return this->ptr; + return this->ptr ? this->ptr : basic_string_char__Nullstr(); } /* ?size@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEIXZ */ @@ -3376,7 +3376,7 @@ DEFINE_THISCALL_WRAPPER(basic_string_wchar_c_str, 4) const wchar_t* __thiscall basic_string_wchar_c_str(const basic_string_wchar *this) { TRACE("%p\n", this); - return this->ptr; + return this->ptr ? this->ptr : basic_string_wchar__Nullstr(); } /* ?size@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QBEIXZ */

1 0

Piotr Caban : msvcp60: Fixed basic_filebuf<short> implementation.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 3b69e28a899bc9739fea1d446b4c0661d0b85bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b69e28a899bc9739fea1d446… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:37:42 2012 +0100 msvcp60: Fixed basic_filebuf<short> implementation. --- dlls/msvcp60/ios.c | 250 +++++++++++++++++-------------------------------- dlls/msvcp60/msvcp.h | 1 + 2 files changed, 88 insertions(+), 163 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b69e28a899bc9739fea1…

1 0

Piotr Caban : msvcp60: Fixed basic_filebuf<char> implementation.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 043fcc92be98c95d299503ea04accf4786266a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=043fcc92be98c95d299503ea0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:37:25 2012 +0100 msvcp60: Fixed basic_filebuf<char> implementation. --- dlls/msvcp60/ios.c | 225 ++++++++++++++++++--------------------------- dlls/msvcp60/locale.c | 4 - dlls/msvcp60/msvcp.h | 7 ++ dlls/msvcp60/msvcp60.spec | 8 +- 4 files changed, 99 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=043fcc92be98c95d29950…

1 0

Piotr Caban : msvcp90: Fixed basic_istream_char_read_uint64 tests.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: aa04ea700986d44b32d3c598837df6f14b707dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa04ea700986d44b32d3c5988… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 14 15:33:42 2012 +0100 msvcp90: Fixed basic_istream_char_read_uint64 tests. --- dlls/msvcp90/tests/ios.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index f0bc59e..0ae34d3 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -934,6 +934,12 @@ static void test_num_get_get_uint64(void) state = (IOSB_iostate)call_func1(p_ios_base_rdstate, &ss.basic_ios.base); next = (int)call_func1(p_basic_istream_char_get, &ss.base.base1); + if(state==IOSTATE_faileof && tests[i].val==~0) { + /* Maximal uint64 test is broken on 9.0.21022.8 */ + skip("basic_istream_char_read_uint64(MAX_UINT64) is broken\n"); + continue; + } + ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); ok(tests[i].val == val, "wrong val, expected = %lx%08lx found %lx%08lx\n", (unsigned long)(tests[i].val >> 32), (unsigned long)tests[i].val, (unsigned long)(val >> 32), (unsigned long)val);

1 0

Michael Stefaniuc : msvcp100: Avoid FALSE:TRUE conditional expressions.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: bdd9a6294de0d13f23ed21ca0073add417e12d0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdd9a6294de0d13f23ed21ca0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 14 12:29:59 2012 +0100 msvcp100: Avoid FALSE:TRUE conditional expressions. --- dlls/msvcp100/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp100/string.c b/dlls/msvcp100/string.c index 7faf95f..9771ace 100644 --- a/dlls/msvcp100/string.c +++ b/dlls/msvcp100/string.c @@ -189,7 +189,7 @@ static MSVCP_bool basic_string_char_inside( { char *cstr = basic_string_char_ptr(this); - return (ptr<cstr || ptr>=cstr+this->size) ? FALSE : TRUE; + return ptr>=cstr && ptr<cstr+this->size; } /* ?_Tidy@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@IAEX_NI@Z */ @@ -474,7 +474,7 @@ static MSVCP_bool basic_string_wchar_inside( { wchar_t *cstr = basic_string_wchar_ptr(this); - return (ptr<cstr || ptr>=cstr+this->size) ? FALSE : TRUE; + return ptr>=cstr && ptr<cstr+this->size; } /* ?_Tidy@?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@IAEX_NI@Z */

1 0

Michael Stefaniuc : oleaut32: Remove a superfluous TRUE: FALSE conditional expression.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 333c71730d05147d039a3b031c37f35198831224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=333c71730d05147d039a3b031… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 14 12:35:49 2012 +0100 oleaut32: Remove a superfluous TRUE:FALSE conditional expression. --- dlls/oleaut32/variant.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 8a77593..21a2758 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2252,7 +2252,7 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, } /* Zero is not a negative number */ - bNegative = pNumprs->dwOutFlags & NUMPRS_NEG && ul64 ? TRUE : FALSE; + bNegative = pNumprs->dwOutFlags & NUMPRS_NEG && ul64; TRACE("Integer value is 0x%s, bNeg %d\n", wine_dbgstr_longlong(ul64), bNegative);

1 0

Christian Costa : user32: Add tests for MapWindowPoints, ClientToScreen and ScreenToClient.
by Alexandre Julliard 14 Nov '12

14 Nov '12

Module: wine Branch: master Commit: 5267f8b7d99aed32fe15ee02b0bfdcf7b47edc53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5267f8b7d99aed32fe15ee02b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Nov 13 21:16:44 2012 +0100 user32: Add tests for MapWindowPoints, ClientToScreen and ScreenToClient. Based on a patch by Rico Schüller. --- dlls/user32/tests/win.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 223 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5267f8b7d99aed32fe15e…

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012