wine-commits January 2010

wine-commits@winehq.org

3 participants
615 discussions

Huw Davies : include: Add the ability to initialize oledb constants independently of the INITGUID define by defining DBINITCONSTANTS instead .
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 10f6d5c1fa7ec140a2e5cf4a46d3b61f289d8a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f6d5c1fa7ec140a2e5cf4a4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 15 16:28:37 2010 +0000 include: Add the ability to initialize oledb constants independently of the INITGUID define by defining DBINITCONSTANTS instead. --- include/dbs.idl | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index a2ed656..8ca2e2a 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -183,10 +183,27 @@ enum DBSTATUSENUM DBSTATUS_S_DEFAULT = 13 }; -cpp_quote("DEFINE_GUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") -cpp_quote("DEFINE_GUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") -cpp_quote("DEFINE_GUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") -cpp_quote("DEFINE_GUID(DBGUID_STREAM, 0xc8b522f9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("#ifdef DBINITCONSTANTS") +cpp_quote("#ifdef __cplusplus") +cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\") +cpp_quote(" EXTERN_C const GUID name DECLSPEC_HIDDEN; \\") +cpp_quote(" EXTERN_C const GUID name = \\") +cpp_quote(" { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }") +cpp_quote("#else") +cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\") +cpp_quote(" const GUID name DECLSPEC_HIDDEN; \\") +cpp_quote(" const GUID name = \\") +cpp_quote(" { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }") +cpp_quote("#endif") +cpp_quote("#else") +cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\") +cpp_quote(" EXTERN_C const GUID name DECLSPEC_HIDDEN") +cpp_quote("#endif") + +cpp_quote("DEFINE_DBGUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBGUID_STREAM, 0xc8b522f9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") typedef struct tagDBCOLUMNACCESS {

1 0

Kusanagi Kouichi : user32: Add definitions for EM_GETIMESTATUS and EM_SETIMESTATUS.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: cc669af6ba98bd20c42007a05159e8054c6bc558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc669af6ba98bd20c42007a05… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Fri Jan 15 22:22:28 2010 +0900 user32: Add definitions for EM_GETIMESTATUS and EM_SETIMESTATUS. --- include/winuser.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 91fca34..1a0ea5a 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -970,6 +970,14 @@ WINUSERAPI BOOL WINAPI SetSysColors(INT,const INT*,const COLORREF*); /* a name change since win95 */ #define EM_SETLIMITTEXT EM_LIMITTEXT +/* IMESTATUS type */ +#define EMSIS_COMPOSITIONSTRING 1 + +/* IMESTATUS type specific data */ +#define EIMES_GETCOMPSTRATONCE 0x0001 +#define EIMES_CANCELCOMPSTRINFOCUS 0x0002 +#define EIMES_COMPLETECOMPSTRKILLFOCUS 0x0004 + /* EDITWORDBREAKPROC code values */ #define WB_LEFT 0 #define WB_RIGHT 1

1 0

Christian Costa : d3drm: Add definitions for IDirect3DRMFrame3.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: e95645d897ef294990663e3aaa9b180117a09719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95645d897ef294990663e3aa… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 15 11:37:20 2010 +0100 d3drm: Add definitions for IDirect3DRMFrame3. --- include/d3drmdef.h | 11 ++ include/d3drmobj.h | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 310 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e95645d897ef294990663…

1 0

Christian Costa : d3drm: Add definitions for IDirect3DRMFrame2.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 2f5cca9481f7d82a73269e62e6798d9252850a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5cca9481f7d82a73269e62e… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 15 11:37:13 2010 +0100 d3drm: Add definitions for IDirect3DRMFrame2. --- include/d3drmdef.h | 18 ++++ include/d3drmobj.h | 280 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 298 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f5cca9481f7d82a73269…

1 0

Christian Costa : d3drm: Add definitions for IDirect3DRMFrame.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 547eb0367ac4959a66c5de81a3d617bdf212661e URL: http://source.winehq.org/git/wine.git/?a=commit;h=547eb0367ac4959a66c5de81a… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 15 11:37:07 2010 +0100 d3drm: Add definitions for IDirect3DRMFrame. --- include/d3drmdef.h | 37 ++++++++ include/d3drmobj.h | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 269 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=547eb0367ac4959a66c5d…

1 0

Christian Costa : d3drm: Add definitions for IDirect3DRMViewport2.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 3246b65ce549f94003d76dd4cb2b7b411594bec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3246b65ce549f94003d76dd4c… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 15 11:37:00 2010 +0100 d3drm: Add definitions for IDirect3DRMViewport2. --- include/d3drmobj.h | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 148 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3246b65ce549f94003d76…

1 0

Christian Costa : d3drm: Add definitions for IDirect3DRMViewport.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: ef527d81eb12ac7d743d28db2607fd041cf56bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef527d81eb12ac7d743d28db2… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 15 11:36:54 2010 +0100 d3drm: Add definitions for IDirect3DRMViewport. --- include/d3drmdef.h | 16 ++++++ include/d3drmobj.h | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef527d81eb12ac7d743d2…

1 0

Christian Costa : msvcr71: Add forward to msvcrt for ?swprintf@@ YAHPAGIPBGZZ and ?vswprintf@@YAHPAGIPBGPAD@Z.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 6c9cd6cb402e48a94375503dc5528dfdf748963f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c9cd6cb402e48a94375503dc… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 15 11:34:52 2010 +0100 msvcr71: Add forward to msvcrt for ?swprintf@@YAHPAGIPBGZZ and ?vswprintf@@YAHPAGIPBGPAD@Z. --- dlls/msvcr71/msvcr71.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 2a35217..d4323b3 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -42,11 +42,11 @@ @ cdecl ?set_new_handler@@YAP6AXXZP6AXXZ@Z(ptr) msvcrt.?set_new_handler@@YAP6AXXZP6AXXZ@Z @ cdecl ?set_terminate@@YAP6AXXZP6AXXZ@Z(ptr) msvcrt.?set_terminate@@YAP6AXXZP6AXXZ@Z @ cdecl ?set_unexpected@@YAP6AXXZP6AXXZ@Z(ptr) msvcrt.?set_unexpected@@YAP6AXXZP6AXXZ@Z -@ stub ?swprintf@@YAHPAGIPBGZZ +@ varargs ?swprintf@@YAHPAGIPBGZZ(ptr long wstr) msvcrt._snwprintf @ stub ?swprintf@@YAHPA_WIPB_WZZ @ cdecl ?terminate@@YAXXZ() msvcrt.?terminate@@YAXXZ @ cdecl ?unexpected@@YAXXZ() msvcrt.?unexpected@@YAXXZ -@ stub ?vswprintf@@YAHPAGIPBGPAD@Z +@ cdecl ?vswprintf@@YAHPAGIPBGPAD@Z(ptr long wstr ptr) msvcrt._vsnwprintf @ stub ?vswprintf@@YAHPA_WIPB_WPAD@Z @ cdecl -i386 ?what@exception@@UBEPBDXZ() msvcrt.?what@exception@@UBEPBDXZ @ cdecl $I10_OUTPUT() msvcrt.$I10_OUTPUT

1 0

Paul Vriens : user32/tests: Run tests again on Win95.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: 5da7043c521ad0fe44dfd0ef09c6034e25b93cb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da7043c521ad0fe44dfd0ef0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jan 15 09:31:28 2010 +0100 user32/tests: Run tests again on Win95. --- dlls/user32/tests/win.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 34ff9d0..7bf498e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -52,6 +52,7 @@ static BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static int (WINAPI *pGetWindowRgnBox)(HWND,LPRECT); +static BOOL (WINAPI *pGetGUIThreadInfo)(DWORD, GUITHREADINFO*); static BOOL test_lbuttondown_flag; static HWND hwndMessage; @@ -2707,12 +2708,15 @@ static LRESULT CALLBACK test_capture_4_proc(HWND hWnd, UINT msg, WPARAM wParam, case WM_CAPTURECHANGED: /* now try to release capture from menu. this should fail */ - memset(&gti, 0, sizeof(GUITHREADINFO)); - gti.cbSize = sizeof(GUITHREADINFO); - status = GetGUIThreadInfo(GetCurrentThreadId(), &gti); - ok(status, "GetGUIThreadInfo() failed!\n"); + if (pGetGUIThreadInfo) + { + memset(&gti, 0, sizeof(GUITHREADINFO)); + gti.cbSize = sizeof(GUITHREADINFO); + status = pGetGUIThreadInfo(GetCurrentThreadId(), &gti); + ok(status, "GetGUIThreadInfo() failed!\n"); + ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); + } cap_wnd = GetCapture(); - ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); /* check that re-setting the capture for the menu fails */ set_cap_wnd = SetCapture(cap_wnd); @@ -2727,11 +2731,14 @@ static LRESULT CALLBACK test_capture_4_proc(HWND hWnd, UINT msg, WPARAM wParam, ok(!status, "ReleaseCapture should have failed!\n"); /* check that thread info did not change */ - memset(&gti, 0, sizeof(GUITHREADINFO)); - gti.cbSize = sizeof(GUITHREADINFO); - status = GetGUIThreadInfo(GetCurrentThreadId(), &gti); - ok(status, "GetGUIThreadInfo() failed!\n"); - ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); + if (pGetGUIThreadInfo) + { + memset(&gti, 0, sizeof(GUITHREADINFO)); + gti.cbSize = sizeof(GUITHREADINFO); + status = pGetGUIThreadInfo(GetCurrentThreadId(), &gti); + ok(status, "GetGUIThreadInfo() failed!\n"); + ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); + } /* verify that no capture change took place */ cap_wnd2 = GetCapture(); @@ -2755,6 +2762,10 @@ static void test_capture_4(void) HWND hwnd; WNDCLASSA wclass; HINSTANCE hInstance = GetModuleHandleA( NULL ); + + if (!pGetGUIThreadInfo) + win_skip("GetGUIThreadInfo is not available\n"); + wclass.lpszClassName = "TestCapture4Class"; wclass.style = CS_HREDRAW | CS_VREDRAW; wclass.lpfnWndProc = test_capture_4_proc; @@ -5881,6 +5892,7 @@ START_TEST(win) pGetMonitorInfoA = (void *)GetProcAddress( user32, "GetMonitorInfoA" ); pMonitorFromPoint = (void *)GetProcAddress( user32, "MonitorFromPoint" ); pGetWindowRgnBox = (void *)GetProcAddress( user32, "GetWindowRgnBox" ); + pGetGUIThreadInfo = (void *)GetProcAddress( user32, "GetGUIThreadInfo" ); if (!RegisterWindowClasses()) assert(0);

1 0

Piotr Caban : jscript: Make Array.join generic.
by Alexandre Julliard 18 Jan '10

18 Jan '10

Module: wine Branch: master Commit: db137cc975cd05451f5235ebe948fc640204be84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db137cc975cd05451f5235ebe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 15 08:17:50 2010 +0100 jscript: Make Array.join generic. --- dlls/jscript/array.c | 16 +++++++--------- dlls/jscript/tests/api.js | 11 +++++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index bb54493..5acfa01 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -342,20 +342,18 @@ static HRESULT array_join(script_ctx_t *ctx, DispatchEx *array, DWORD length, co } /* ECMA-262 3rd Edition 15.4.4.5 */ -static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, +static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { + DispatchEx *jsthis; DWORD length; HRESULT hres; TRACE("\n"); - if(is_vclass(jsthis, JSCLASS_ARRAY)) { - length = array_from_vdisp(jsthis)->length; - }else { - FIXME("dispid is not Array\n"); - return E_NOTIMPL; - } + hres = get_length(ctx, vthis, ei, &jsthis, &length); + if(FAILED(hres)) + return hres; if(arg_cnt(dp)) { BSTR sep; @@ -364,11 +362,11 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPA if(FAILED(hres)) return hres; - hres = array_join(ctx, jsthis->u.jsdisp, length, sep, retv, ei, caller); + hres = array_join(ctx, jsthis, length, sep, retv, ei, caller); SysFreeString(sep); }else { - hres = array_join(ctx, jsthis->u.jsdisp, length, default_separatorW, retv, ei, caller); + hres = array_join(ctx, jsthis, length, default_separatorW, retv, ei, caller); } return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 69deab2..40193a7 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -654,6 +654,16 @@ ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); tmp = arr.toString("test"); ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); +arr = new Object(); +arr.length = 3; +arr[0] = "aa"; +arr[2] = 2; +arr[7] = 3; +arr.join = Array.prototype.join; +tmp = arr.join(","); +ok(arr.length === 3, "arr.length = " + arr.length); +ok(tmp === "aa,,2", "tmp = " + tmp); + arr = [5,true,2,-1,3,false,"2.5"]; tmp = arr.sort(function(x,y) { return y-x; }); ok(tmp === arr, "tmp !== arr"); @@ -1880,6 +1890,7 @@ testArrayHostThis("slice"); testArrayHostThis("splice"); testArrayHostThis("unshift"); testArrayHostThis("reverse"); +testArrayHostThis("join"); function testObjectInherit(obj, constr, ts, tls, vo) { ok(obj instanceof Object, "obj is not instance of Object");

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
62
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 January 2010