November 2007 - Wine-commits

Tony Wasserka : d3dx8: Implement the C++ stuff of the D3DXVECTOR3 structure .
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: d320460765c16a990f4f6425c9a1483c08fe9046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d320460765c16a990f4f6425c… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Nov 9 18:54:12 2007 +0100 d3dx8: Implement the C++ stuff of the D3DXVECTOR3 structure. --- include/d3dx8math.h | 32 +++++++++++++ include/d3dx8math.inl | 118 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 148 insertions(+), 2 deletions(-) diff --git a/include/d3dx8math.h b/include/d3dx8math.h index 385599f..383c80c 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2007 David Adam + * Copyright (C) 2007 Tony Wasserka * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -60,7 +61,38 @@ typedef struct D3DXVECTOR2 FLOAT x, y; } D3DXVECTOR2, *LPD3DXVECTOR2; +#ifdef __cplusplus +typedef struct D3DXVECTOR3 : public D3DVECTOR +{ + D3DXVECTOR3(); + D3DXVECTOR3(CONST FLOAT *pf); + D3DXVECTOR3(CONST D3DVECTOR& v); + D3DXVECTOR3(FLOAT fx, FLOAT fy, FLOAT fz); + + operator FLOAT* (); + operator CONST FLOAT* () const; + + D3DXVECTOR3& operator += (CONST D3DXVECTOR3&); + D3DXVECTOR3& operator -= (CONST D3DXVECTOR3&); + D3DXVECTOR3& operator *= (FLOAT); + D3DXVECTOR3& operator /= (FLOAT); + + D3DXVECTOR3 operator + () const; + D3DXVECTOR3 operator - () const; + + D3DXVECTOR3 operator + (CONST D3DXVECTOR3&) const; + D3DXVECTOR3 operator - (CONST D3DXVECTOR3&) const; + D3DXVECTOR3 operator * (FLOAT) const; + D3DXVECTOR3 operator / (FLOAT) const; + + friend D3DXVECTOR3 operator * (FLOAT, CONST struct D3DXVECTOR3&); + + BOOL operator == (CONST D3DXVECTOR3&) const; + BOOL operator != (CONST D3DXVECTOR3&) const; +} D3DXVECTOR3, *LPD3DXVECTOR3; +#else /* !__cplusplus */ typedef struct _D3DVECTOR D3DXVECTOR3, *LPD3DXVECTOR3; +#endif /* !__cplusplus */ typedef struct D3DXVECTOR4 { diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 8c21f68..a2fd130 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -1,5 +1,6 @@ /* * Copyright (C) 2007 David Adam + * Copyright (C) 2007 Tony Wasserka * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -19,8 +20,6 @@ #ifndef __D3DX8MATH_INL__ #define __D3DX8MATH_INL__ -/*_______________D3DXCOLOR_____________________*/ - /* constructors & operators */ #ifdef __cplusplus @@ -124,8 +123,123 @@ inline BOOL D3DXVECTOR2::operator != (CONST D3DXVECTOR2& v) const return x != v.x || y != v.y; } +inline D3DXVECTOR3::D3DXVECTOR3() +{ +} + +inline D3DXVECTOR3::D3DXVECTOR3(CONST FLOAT *pf) +{ + if(!pf) return; + x = pf[0]; + y = pf[1]; + z = pf[2]; +} + +inline D3DXVECTOR3::D3DXVECTOR3(CONST D3DVECTOR& v) +{ + x = v.x; + y = v.y; + z = v.z; +} + +inline D3DXVECTOR3::D3DXVECTOR3(FLOAT fx, FLOAT fy, FLOAT fz) +{ + x = fx; + y = fy; + z = fz; +} + +inline D3DXVECTOR3::operator FLOAT* () +{ + return (FLOAT*)&x; +} + +inline D3DXVECTOR3::operator CONST FLOAT* () const +{ + return (CONST FLOAT*)&x; +} + +inline D3DXVECTOR3& D3DXVECTOR3::operator += (CONST D3DXVECTOR3& v) +{ + x += v.x; + y += v.y; + z += v.z; + return *this; +} + +inline D3DXVECTOR3& D3DXVECTOR3::operator -= (CONST D3DXVECTOR3& v) +{ + x -= v.x; + y -= v.y; + z -= v.z; + return *this; +} + +inline D3DXVECTOR3& D3DXVECTOR3::operator *= (FLOAT f) +{ + x *= f; + y *= f; + z *= f; + return *this; +} + +inline D3DXVECTOR3& D3DXVECTOR3::operator /= (FLOAT f) +{ + x /= f; + y /= f; + z /= f; + return *this; +} + +inline D3DXVECTOR3 D3DXVECTOR3::operator + () const +{ + return *this; +} + +inline D3DXVECTOR3 D3DXVECTOR3::operator - () const +{ + return D3DXVECTOR3(-x, -y, -z); +} + +inline D3DXVECTOR3 D3DXVECTOR3::operator + (CONST D3DXVECTOR3& v) const +{ + return D3DXVECTOR3(x + v.x, y + v.y, z + v.z); +} + +inline D3DXVECTOR3 D3DXVECTOR3::operator - (CONST D3DXVECTOR3& v) const +{ + return D3DXVECTOR3(x - v.x, y - v.y, z - v.z); +} + +inline D3DXVECTOR3 D3DXVECTOR3::operator * (FLOAT f) const +{ + return D3DXVECTOR3(x * f, y * f, z * f); +} + +inline D3DXVECTOR3 D3DXVECTOR3::operator / (FLOAT f) const +{ + return D3DXVECTOR3(x / f, y / f, z / f); +} + +inline D3DXVECTOR3 operator * (FLOAT f, CONST D3DXVECTOR3& v) +{ + return D3DXVECTOR3(f * v.x, f * v.y, f * v.z); +} + +inline BOOL D3DXVECTOR3::operator == (CONST D3DXVECTOR3& v) const +{ + return x == v.x && y == v.y && z == v.z; +} + +inline BOOL D3DXVECTOR3::operator != (CONST D3DXVECTOR3& v) const +{ + return x != v.x || y != v.y || z != v.z; +} + #endif /* __cplusplus */ +/*_______________D3DXCOLOR_____________________*/ + static inline D3DXCOLOR* D3DXColorAdd(D3DXCOLOR *pout, CONST D3DXCOLOR *pc1, CONST D3DXCOLOR *pc2) { if ( !pout || !pc1 || !pc2 ) return NULL;

1 0

Tony Wasserka : d3dx8: Implement the C++ stuff of the D3DXVECTOR2 structure .
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: 74750c3c6449c00ab6eafad189d234b1986c24be URL: http://source.winehq.org/git/wine.git/?a=commit;h=74750c3c6449c00ab6eafad18… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Fri Nov 9 18:04:40 2007 +0100 d3dx8: Implement the C++ stuff of the D3DXVECTOR2 structure. --- include/d3dx8math.h | 26 ++++++++++++ include/d3dx8math.inl | 105 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 0 deletions(-) diff --git a/include/d3dx8math.h b/include/d3dx8math.h index bd1dc4f..385599f 100644 --- a/include/d3dx8math.h +++ b/include/d3dx8math.h @@ -31,6 +31,32 @@ typedef struct D3DXVECTOR2 { +#ifdef __cplusplus + D3DXVECTOR2(); + D3DXVECTOR2(CONST FLOAT *pf); + D3DXVECTOR2(FLOAT fx, FLOAT fy); + + operator FLOAT* (); + operator CONST FLOAT* () const; + + D3DXVECTOR2& operator += (CONST D3DXVECTOR2&); + D3DXVECTOR2& operator -= (CONST D3DXVECTOR2&); + D3DXVECTOR2& operator *= (FLOAT); + D3DXVECTOR2& operator /= (FLOAT); + + D3DXVECTOR2 operator + () const; + D3DXVECTOR2 operator - () const; + + D3DXVECTOR2 operator + (CONST D3DXVECTOR2&) const; + D3DXVECTOR2 operator - (CONST D3DXVECTOR2&) const; + D3DXVECTOR2 operator * (FLOAT) const; + D3DXVECTOR2 operator / (FLOAT) const; + + friend D3DXVECTOR2 operator * (FLOAT, CONST D3DXVECTOR2&); + + BOOL operator == (CONST D3DXVECTOR2&) const; + BOOL operator != (CONST D3DXVECTOR2&) const; +#endif /* __cplusplus */ FLOAT x, y; } D3DXVECTOR2, *LPD3DXVECTOR2; diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index cdcea06..8c21f68 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -21,6 +21,111 @@ /*_______________D3DXCOLOR_____________________*/ +/* constructors & operators */ +#ifdef __cplusplus + +inline D3DXVECTOR2::D3DXVECTOR2() +{ +} + +inline D3DXVECTOR2::D3DXVECTOR2(CONST FLOAT *pf) +{ + if(!pf) return; + x = pf[0]; + y = pf[1]; +} + +inline D3DXVECTOR2::D3DXVECTOR2(FLOAT fx, FLOAT fy) +{ + x = fx; + y = fy; +} + +inline D3DXVECTOR2::operator FLOAT* () +{ + return (FLOAT*)&x; +} + +inline D3DXVECTOR2::operator CONST FLOAT* () const +{ + return (CONST FLOAT*)&x; +} + +inline D3DXVECTOR2& D3DXVECTOR2::operator += (CONST D3DXVECTOR2& v) +{ + x += v.x; + y += v.y; + return *this; +} + +inline D3DXVECTOR2& D3DXVECTOR2::operator -= (CONST D3DXVECTOR2& v) +{ + x -= v.x; + y -= v.y; + return *this; +} + +inline D3DXVECTOR2& D3DXVECTOR2::operator *= (FLOAT f) +{ + x *= f; + y *= f; + return *this; +} + +inline D3DXVECTOR2& D3DXVECTOR2::operator /= (FLOAT f) +{ + x /= f; + y /= f; + return *this; +} + +inline D3DXVECTOR2 D3DXVECTOR2::operator + () const +{ + return *this; +} + +inline D3DXVECTOR2 D3DXVECTOR2::operator - () const +{ + return D3DXVECTOR2(-x, -y); +} + +inline D3DXVECTOR2 D3DXVECTOR2::operator + (CONST D3DXVECTOR2& v) const +{ + return D3DXVECTOR2(x + v.x, y + v.y); +} + +inline D3DXVECTOR2 D3DXVECTOR2::operator - (CONST D3DXVECTOR2& v) const +{ + return D3DXVECTOR2(x - v.x, y - v.y); +} + +inline D3DXVECTOR2 D3DXVECTOR2::operator * (FLOAT f) const +{ + return D3DXVECTOR2(x * f, y * f); +} + +inline D3DXVECTOR2 D3DXVECTOR2::operator / (FLOAT f) const +{ + return D3DXVECTOR2(x / f, y / f); +} + +inline D3DXVECTOR2 operator * (FLOAT f, CONST D3DXVECTOR2& v) +{ + return D3DXVECTOR2(f * v.x, f * v.y); +} + +inline BOOL D3DXVECTOR2::operator == (CONST D3DXVECTOR2& v) const +{ + return x == v.x && y == v.y; +} + +inline BOOL D3DXVECTOR2::operator != (CONST D3DXVECTOR2& v) const +{ + return x != v.x || y != v.y; +} + +#endif /* __cplusplus */ + static inline D3DXCOLOR* D3DXColorAdd(D3DXCOLOR *pout, CONST D3DXCOLOR *pc1, CONST D3DXCOLOR *pc2) { if ( !pout || !pc1 || !pc2 ) return NULL;

1 0

Dmitry Timoshkov : winex11.drv: Get rid of unused variables.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: 1efd4c02e5cfc6dacfeff75287c89404804eab0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1efd4c02e5cfc6dacfeff7528… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Nov 12 14:59:31 2007 +0800 winex11.drv: Get rid of unused variables. --- dlls/winex11.drv/keyboard.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 31b4542..b38dd34 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -89,7 +89,6 @@ static int min_keycode, max_keycode, keysyms_per_keycode; static WORD keyc2vkey[256], keyc2scan[256]; static int NumLockMask, AltGrMask; /* mask in the XKeyEvent state */ -static int kcControl, kcAlt, kcShift, kcNumLock, kcCapsLock; /* keycodes */ static char KEYBOARD_MapDeadKeysym(KeySym keysym); @@ -1807,13 +1806,6 @@ void X11DRV_InitKeyboard(void) keyc2scan[keyc]=scan++; } - /* Now store one keycode for each modifier. Used to simulate keypresses. */ - kcControl = XKeysymToKeycode(display, XK_Control_L); - kcAlt = XKeysymToKeycode(display, XK_Alt_L); - if (!kcAlt) kcAlt = XKeysymToKeycode(display, XK_Meta_L); - kcShift = XKeysymToKeycode(display, XK_Shift_L); - kcNumLock = XKeysymToKeycode(display, XK_Num_Lock); - kcCapsLock = XKeysymToKeycode(display, XK_Caps_Lock); wine_tsx11_unlock(); }

1 0

Jacek Caban : shlwapi: Reimplement IUnknown_CPContainerInvokeParam on top of SHPackDispParams.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: f58d9a94faed2973a1746873c1027587a933b950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58d9a94faed2973a1746873c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 01:25:17 2007 +0100 shlwapi: Reimplement IUnknown_CPContainerInvokeParam on top of SHPackDispParams. --- dlls/shlwapi/ordinal.c | 63 ++++++++++-------------------------------------- 1 files changed, 13 insertions(+), 50 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 91f3199..8dc0ffa 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2986,64 +2986,27 @@ HRESULT WINAPIV IUnknown_CPContainerInvokeParam( HRESULT result; IConnectionPoint *iCP; IConnectionPointContainer *iCPC; + DISPPARAMS dispParams = {buffer, NULL, cParams, 0}; + va_list valist; if (!container) return E_NOINTERFACE; result = IUnknown_QueryInterface(container, &IID_IConnectionPointContainer,(LPVOID*) &iCPC); - if (SUCCEEDED(result)) - { - result = IConnectionPointContainer_FindConnectionPoint(iCPC, riid, &iCP); - IConnectionPointContainer_Release(iCPC); - } + if (FAILED(result)) + return result; - if (SUCCEEDED(result)) - { - ULONG cnt; - VARIANTARG *curvar = buffer+cParams-1; - DISPPARAMS dispParams = {buffer, NULL, cParams, 0}; - va_list valist; + result = IConnectionPointContainer_FindConnectionPoint(iCPC, riid, &iCP); + IConnectionPointContainer_Release(iCPC); + if(FAILED(result)) + return result; - va_start(valist, cParams); - for(cnt=cParams;cnt>0;cnt--,curvar--) /* backwards for some reason */ - { - enum VARENUM vt = va_arg(valist, enum VARENUM); - memset(curvar, 0, sizeof(*curvar)); - if (vt & VT_BYREF) - { - V_VT(curvar) = vt; - V_BYREF(curvar) = va_arg(valist, LPVOID); - } else - switch(vt) - { - case VT_BSTR: - V_VT(curvar) = vt; - V_BSTR(curvar) = va_arg(valist, BSTR); - break; - case VT_DISPATCH: - V_VT(curvar) = vt; - V_DISPATCH(curvar) = va_arg(valist, IDispatch*); - break; - case VT_BOOL: - V_VT(curvar) = vt; - V_BOOL(curvar) = va_arg(valist, int); - break; - case VT_UNKNOWN: - V_VT(curvar) = vt; - V_UNKNOWN(curvar) = va_arg(valist, IUnknown*); - break; - case VT_I4: - default: - V_VT(curvar) = VT_I4; - V_I4(curvar) = va_arg(valist, LONG); - break; - } - } - va_end(valist); + va_start(valist, cParams); + SHPackDispParamsV(&dispParams, buffer, cParams, valist); + va_end(valist); - result = SHLWAPI_InvokeByIID(iCP, riid, dispId, &dispParams); - IConnectionPoint_Release(iCP); - } + result = SHLWAPI_InvokeByIID(iCP, riid, dispId, &dispParams); + IConnectionPoint_Release(iCP); return result; }

1 0

Jacek Caban : shlwapi: Added SHPackDispParams test.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: 114e8485de7fb319f93b74eb0788e456287f46ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=114e8485de7fb319f93b74eb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 01:25:04 2007 +0100 shlwapi: Added SHPackDispParams test. --- dlls/shlwapi/tests/ordinal.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index c948274..f5286f0 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -23,6 +23,8 @@ #include "winbase.h" #include "winerror.h" #include "winuser.h" +#include "ole2.h" +#include "oaidl.h" /* Function ptrs for ordinal calls */ static HMODULE hShlwapi; @@ -33,6 +35,7 @@ static HANDLE (WINAPI *pSHAllocShared)(LPCVOID,DWORD,DWORD); static LPVOID (WINAPI *pSHLockShared)(HANDLE,DWORD); static BOOL (WINAPI *pSHUnlockShared)(LPVOID); static BOOL (WINAPI *pSHFreeShared)(HANDLE,DWORD); +static HRESULT(WINAPIV *pSHPackDispParams)(DISPPARAMS*,VARIANTARG*,UINT,...); static void test_GetAcceptLanguagesA(void) { HRESULT retval; @@ -431,6 +434,53 @@ static void test_GetShellSecurityDescriptor(void) } } +static void test_SHPackDispParams(void) +{ + DISPPARAMS params; + VARIANT vars[10]; + HRESULT hres; + + if(!pSHPackDispParams) + skip("SHPackSidpParams not available\n"); + + memset(&params, 0xc0, sizeof(params)); + memset(vars, 0xc0, sizeof(vars)); + hres = pSHPackDispParams(&params, vars, 1, VT_I4, 0xdeadbeef); + ok(hres == S_OK, "SHPackDispParams failed: %08x\n", hres); + ok(params.cArgs == 1, "params.cArgs = %d\n", params.cArgs); + ok(params.cNamedArgs == 0, "params.cNamedArgs = %d\n", params.cArgs); + ok(params.rgdispidNamedArgs == NULL, "params.rgdispidNamedArgs = %p\n", params.rgdispidNamedArgs); + ok(params.rgvarg == vars, "params.rgvarg = %p\n", params.rgvarg); + ok(V_VT(vars) == VT_I4, "V_VT(var) = %d\n", V_VT(vars)); + ok(V_DISPATCH(vars) == (void*)0xdeadbeef, "failed\n"); + + memset(&params, 0xc0, sizeof(params)); + hres = pSHPackDispParams(&params, NULL, 0, 0); + ok(hres == S_OK, "SHPackDispParams failed: %08x\n", hres); + ok(params.cArgs == 0, "params.cArgs = %d\n", params.cArgs); + ok(params.cNamedArgs == 0, "params.cNamedArgs = %d\n", params.cArgs); + ok(params.rgdispidNamedArgs == NULL, "params.rgdispidNamedArgs = %p\n", params.rgdispidNamedArgs); + ok(params.rgvarg == NULL, "params.rgvarg = %p\n", params.rgvarg); + + memset(vars, 0xc0, sizeof(vars)); + memset(&params, 0xc0, sizeof(params)); + hres = pSHPackDispParams(&params, vars, 4, VT_BSTR, (void*)0xdeadbeef, VT_EMPTY, 10, + VT_I4, 100, VT_DISPATCH, (void*)0xdeadbeef); + ok(hres == S_OK, "SHPackDispParams failed: %08x\n", hres); + ok(params.cArgs == 4, "params.cArgs = %d\n", params.cArgs); + ok(params.cNamedArgs == 0, "params.cNamedArgs = %d\n", params.cArgs); + ok(params.rgdispidNamedArgs == NULL, "params.rgdispidNamedArgs = %p\n", params.rgdispidNamedArgs); + ok(params.rgvarg == vars, "params.rgvarg = %p\n", params.rgvarg); + ok(V_VT(vars) == VT_DISPATCH, "V_VT(vars[0]) = %x\n", V_VT(vars)); + ok(V_I4(vars) == 0xdeadbeef, "V_I4(vars[0]) = %x\n", V_I4(vars)); + ok(V_VT(vars+1) == VT_I4, "V_VT(vars[1]) = %d\n", V_VT(vars+1)); + ok(V_I4(vars+1) == 100, "V_I4(vars[1]) = %x\n", V_I4(vars+1)); + ok(V_VT(vars+2) == VT_I4, "V_VT(vars[2]) = %d\n", V_VT(vars+2)); + ok(V_I4(vars+2) == 10, "V_I4(vars[2]) = %x\n", V_I4(vars+2)); + ok(V_VT(vars+3) == VT_BSTR, "V_VT(vars[3]) = %d\n", V_VT(vars+3)); + ok(V_BSTR(vars+3) == (void*)0xdeadbeef, "V_BSTR(vars[3]) = %p\n", V_BSTR(vars+3)); +} + START_TEST(ordinal) { hShlwapi = GetModuleHandleA("shlwapi.dll"); @@ -441,10 +491,12 @@ START_TEST(ordinal) pSHLockShared=(void*)GetProcAddress(hShlwapi,(char*)8); pSHUnlockShared=(void*)GetProcAddress(hShlwapi,(char*)9); pSHFreeShared=(void*)GetProcAddress(hShlwapi,(char*)10); + pSHPackDispParams=(void*)GetProcAddress(hShlwapi,(char*)282); test_GetAcceptLanguagesA(); test_SHSearchMapInt(); test_alloc_shared(); test_fdsa(); test_GetShellSecurityDescriptor(); + test_SHPackDispParams(); }

1 0

Jacek Caban : shlwapi: Added SHPackDispParams implementation.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: dabbe5c55bd6fa8f10f9ac35a5415a60e5153c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dabbe5c55bd6fa8f10f9ac35a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 01:24:49 2007 +0100 shlwapi: Added SHPackDispParams implementation. --- dlls/shlwapi/ordinal.c | 16 +++++++++++----- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 15b35a9..91f3199 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2850,13 +2850,19 @@ HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt, /************************************************************************* * @ [SHLWAPI.282] * - * This function seems to be a forward to SHPackDispParamsV (whatever THAT - * function does...). + * SHPackDispParams */ -HRESULT WINAPI SHPackDispParams(LPVOID w, LPVOID x, LPVOID y, LPVOID z) +HRESULT WINAPIV SHPackDispParams(DISPPARAMS *params, VARIANTARG *args, UINT cnt, ...) { - FIXME("%p %p %p %p\n", w, x, y, z); - return E_FAIL; + va_list valist; + HRESULT hres; + + va_start(valist, cnt); + + hres = SHPackDispParamsV(params, args, cnt, valist); + + va_end(valist); + return hres; } /************************************************************************* diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 8f8e8aa..45de674 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -279,7 +279,7 @@ 279 stdcall -noname SHInvokeDefaultCommand(ptr ptr ptr) 280 stdcall -noname SHRegGetIntW(ptr wstr long) 281 stdcall -noname SHPackDispParamsV(ptr ptr ptr ptr) -282 stdcall -noname SHPackDispParams(ptr ptr ptr ptr) +282 varargs -noname SHPackDispParams(ptr ptr long) 283 stub -noname IConnectionPoint_InvokeWithCancel 284 stdcall -noname IConnectionPoint_SimpleInvoke(ptr long ptr) 285 stdcall -noname IConnectionPoint_OnChanged(ptr long)

1 0

Jacek Caban : shlwapi: Added SHPackDispParamsV implementation.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: 54292f7da62fb1a6718772fda32305468c86fed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54292f7da62fb1a6718772fda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 01:24:30 2007 +0100 shlwapi: Added SHPackDispParamsV implementation. --- dlls/shlwapi/ordinal.c | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 7afd9b3..15b35a9 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2800,10 +2800,51 @@ HRESULT WINAPI SHInvokeDefaultCommand(HWND hWnd, IShellFolder* lpFolder, LPCITEM * * _SHPackDispParamsV */ -HRESULT WINAPI SHPackDispParamsV(LPVOID w, LPVOID x, LPVOID y, LPVOID z) +HRESULT WINAPI SHPackDispParamsV(DISPPARAMS *params, VARIANTARG *args, UINT cnt, va_list valist) { - FIXME("%p %p %p %p\n",w,x,y,z); - return E_FAIL; + VARIANTARG *iter; + + TRACE("(%p %p %u ...)\n", params, args, cnt); + + params->rgvarg = args; + params->rgdispidNamedArgs = NULL; + params->cArgs = cnt; + params->cNamedArgs = 0; + + iter = args+cnt; + + while(iter-- > args) { + V_VT(iter) = va_arg(valist, enum VARENUM); + + TRACE("vt=%d\n", V_VT(iter)); + + if(V_VT(iter) & VT_BYREF) { + V_BYREF(iter) = va_arg(valist, LPVOID); + } else { + switch(V_VT(iter)) { + case VT_I4: + V_I4(iter) = va_arg(valist, LONG); + break; + case VT_BSTR: + V_BSTR(iter) = va_arg(valist, BSTR); + break; + case VT_DISPATCH: + V_DISPATCH(iter) = va_arg(valist, IDispatch*); + break; + case VT_BOOL: + V_BOOL(iter) = va_arg(valist, int); + break; + case VT_UNKNOWN: + V_UNKNOWN(iter) = va_arg(valist, IUnknown*); + break; + default: + V_VT(iter) = VT_I4; + V_I4(iter) = va_arg(valist, LONG); + } + } + } + + return S_OK; } /*************************************************************************

1 0

Jacek Caban : hlink.idl: Added Hlink[Get|Set]SpecialReference declaration.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: cc253a2c5efd05112a8e2d30a3c70e8b7b803b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc253a2c5efd05112a8e2d30a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 01:23:59 2007 +0100 hlink.idl: Added Hlink[Get|Set]SpecialReference declaration. --- include/hlink.idl | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/hlink.idl b/include/hlink.idl index 7c5156e..6cd8438 100644 --- a/include/hlink.idl +++ b/include/hlink.idl @@ -36,6 +36,15 @@ cpp_quote("HRESULT WINAPI HlinkOnNavigate(IHlinkFrame*, IHlinkBrowseContext*, DW cpp_quote("HRESULT WINAPI HlinkIsShortcut(LPCWSTR);") cpp_quote("HRESULT WINAPI HlinkTranslateURL(LPCWSTR,DWORD,LPWSTR*);") +typedef enum _HLSR_NOREDEF10 { + HLSR_HOME, + HLSR_SEARCHPAGE, + HLSR_HISTORYFOLDER +} HLSR; + +cpp_quote("HRESULT WINAPI HlinkSetSpecialReference(ULONG uReference, LPCWSTR pwzReference);") +cpp_quote("HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference);") + cpp_quote("#define SID_SHlinkFrame IID_IHlinkFrame") /*****************************************************************************

1 0

Jacek Caban : mshtml: Reset focus after loading the page in edit mode.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: c49e894e9f650eb197563eec2a3116d7d4bc8275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c49e894e9f650eb197563eec2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 01:23:47 2007 +0100 mshtml: Reset focus after loading the page in edit mode. --- dlls/mshtml/editor.c | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 30 ++++++++++++++++++++++++------ dlls/mshtml/nsevents.c | 4 ++-- 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 51f5f26..827fa07 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -524,6 +524,7 @@ void handle_edit_event(HTMLDocument *This, nsIDOMEvent *event) void handle_edit_load(HTMLDocument *This) { + This->nscontainer->reset_focus = GetFocus(); get_editor_controller(This->nscontainer); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2a8627c..a35347e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -209,6 +209,7 @@ struct NSContainer { HWND hwnd; BSCallback *bscallback; /* hack */ + HWND reset_focus; /* hack */ }; typedef struct { diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9b8740d..00b98b2 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -81,6 +81,8 @@ static const WCHAR wszNsContainer[] = {'N','s','C','o','n','t','a','i','n','e',' static ATOM nscontainer_class; +#define WM_RESETFOCUS_HACK WM_USER+600 + static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { NSContainer *This; @@ -96,13 +98,25 @@ static LRESULT WINAPI nsembed_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP } switch(msg) { - case WM_SIZE: - TRACE("(%p)->(WM_SIZE)\n", This); + case WM_SIZE: + TRACE("(%p)->(WM_SIZE)\n", This); + + nsres = nsIBaseWindow_SetSize(This->window, + LOWORD(lParam), HIWORD(lParam), TRUE); + if(NS_FAILED(nsres)) + WARN("SetSize failed: %08x\n", nsres); + break; - nsres = nsIBaseWindow_SetSize(This->window, - LOWORD(lParam), HIWORD(lParam), TRUE); - if(NS_FAILED(nsres)) - WARN("SetSize failed: %08x\n", nsres); + case WM_RESETFOCUS_HACK: + /* + * FIXME + * Gecko grabs focus in edit mode and some apps don't like it. + * We should somehow prevent grabbing focus. + */ + if(This->reset_focus) { + SetFocus(This->reset_focus); + This->reset_focus = NULL; + } } return DefWindowProcW(hwnd, msg, wParam, lParam); @@ -1293,6 +1307,9 @@ static nsresult NSAPI nsEmbeddingSiteWindow_SetFocus(nsIEmbeddingSiteWindow *ifa TRACE("(%p)\n", This); + if(This->reset_focus) + PostMessageW(This->hwnd, WM_RESETFOCUS_HACK, 0, 0); + return nsIBaseWindow_SetFocus(This->window); } @@ -1558,6 +1575,7 @@ NSContainer *NSContainer_Create(HTMLDocument *doc, NSContainer *parent) ret->content_listener = NULL; ret->editor_controller = NULL; ret->editor = NULL; + ret->reset_focus = NULL; if(parent) nsIWebBrowserChrome_AddRef(NSWBCHROME(parent)); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index b61aec2..3c532f0 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -90,7 +90,7 @@ static nsresult NSAPI handle_blur(nsIDOMEventListener *iface, nsIDOMEvent *event TRACE("(%p)\n", This); - if(This->doc && This->doc->focus && !is_doc_child_focus(This)) { + if(!This->reset_focus && This->doc && This->doc->focus && !is_doc_child_focus(This)) { This->doc->focus = FALSE; notif_focus(This->doc); } @@ -104,7 +104,7 @@ static nsresult NSAPI handle_focus(nsIDOMEventListener *iface, nsIDOMEvent *even TRACE("(%p)\n", This); - if(This->doc && !This->doc->focus) { + if(!This->reset_focus && This->doc && !This->doc->focus) { This->doc->focus = TRUE; notif_focus(This->doc); }

1 0

Jacek Caban : mshtml: Remove nsIWebBrowserFocus_Activate useless call.
by Alexandre Julliard 12 Nov '07

12 Nov '07

Module: wine Branch: master Commit: e93be266c186e468e4b6d417a5875a85f43f21a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e93be266c186e468e4b6d417a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 01:24:12 2007 +0100 mshtml: Remove nsIWebBrowserFocus_Activate useless call. --- dlls/mshtml/olewnd.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/olewnd.c b/dlls/mshtml/olewnd.c index 613f71d..5ce3209 100644 --- a/dlls/mshtml/olewnd.c +++ b/dlls/mshtml/olewnd.c @@ -101,9 +101,6 @@ static HRESULT WINAPI OleInPlaceActiveObject_OnFrameWindowActivate(IOleInPlaceAc if(This->hostui) IDocHostUIHandler_OnFrameWindowActivate(This->hostui, fActivate); - if(fActivate && This->nscontainer) - nsIWebBrowserFocus_Activate(This->nscontainer->focus); - return S_OK; }

1 0