September 2008 - Wine-commits

Alexandre Julliard : widl: Make the exception handling macros more general and use the same code everywhere .
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: 3bdaba2a933b9507066be0508e2194d30dddd312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bdaba2a933b9507066be0508… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 15 14:05:26 2008 +0200 widl: Make the exception handling macros more general and use the same code everywhere. --- tools/widl/client.c | 8 +++ tools/widl/proxy.c | 125 ++++++++++++------------------------------------- tools/widl/server.c | 63 +++++-------------------- tools/widl/typegen.c | 105 ++++++++++++++++++++++++++++++++++++++++++ tools/widl/typegen.h | 1 + 5 files changed, 157 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bdaba2a933b9507066be…

1 0

Alexandre Julliard : widl: Infrastructure for adding a prefix to local variable references.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: bf011b0f53a12bd4be95ebde86c5d02ca1b73b76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf011b0f53a12bd4be95ebde8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 15 16:46:01 2008 +0200 widl: Infrastructure for adding a prefix to local variable references. --- tools/widl/client.c | 8 ++-- tools/widl/expr.c | 44 ++++++++++-------- tools/widl/expr.h | 3 +- tools/widl/header.c | 4 +- tools/widl/proxy.c | 36 +++++++------- tools/widl/server.c | 16 +++--- tools/widl/typegen.c | 125 +++++++++++++++++++++++++------------------------- tools/widl/typegen.h | 10 ++-- 8 files changed, 127 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf011b0f53a12bd4be95e…

1 0

Alexandre Julliard : widl: Separate declaration and initialisation for indirect arguments.
by Alexandre Julliard 16 Sep '08

16 Sep '08

Module: wine Branch: master Commit: b8fb66c71add073cfd05fdac7f0ca479edb57ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8fb66c71add073cfd05fdac7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 15 16:46:33 2008 +0200 widl: Separate declaration and initialisation for indirect arguments. --- tools/widl/typegen.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 3d382d2..61aaf2a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -344,8 +344,11 @@ void print(FILE *file, int indent, const char *format, va_list va) static void write_var_init(FILE *file, int indent, const type_t *t, const char *n, const char *local_var_prefix) { if (decl_indirect(t)) + { print_file(file, indent, "MIDL_memset(&%s%s, 0, sizeof(%s%s));\n", local_var_prefix, n, local_var_prefix, n); + print_file(file, indent, "%s_p_%s = &%s%s;\n", local_var_prefix, n, local_var_prefix, n); + } else if (is_ptr(t) || is_array(t)) print_file(file, indent, "%s%s = 0;\n", local_var_prefix, n); } @@ -3204,8 +3207,7 @@ void declare_stub_args( FILE *file, int indent, const func_t *func ) fprintf(file, ";\n"); if (decl_indirect(var->type)) - print_file(file, indent, "void *_p_%s = &%s;\n", - var->name, var->name); + print_file(file, indent, "void *_p_%s;\n", var->name); } } }

1 0

Nicolas Le Cam : comctl32: Fix a failing test for some platforms.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: af78a7bfe4eea408033e75dbfe51895b5cfeecc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af78a7bfe4eea408033e75dbf… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon Sep 15 03:06:03 2008 +0200 comctl32: Fix a failing test for some platforms. --- dlls/comctl32/tests/monthcal.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 70d37c6..26c1bc1 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -50,9 +50,9 @@ static const struct message create_parent_window_seq[] = { { WM_NCCREATE, sent }, { WM_NCCALCSIZE, sent|wparam, 0 }, { WM_CREATE, sent }, - { WM_QUERYNEWPALETTE, sent|optional }, { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, + { WM_QUERYNEWPALETTE, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent|wparam, 1 }, @@ -383,8 +383,9 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP LRESULT ret; struct message msg; - /* do not log painting messages */ - if (message != WM_PAINT && + /* log system messages, except for painting */ + if (message < WM_USER && + message != WM_PAINT && message != WM_ERASEBKGND && message != WM_NCPAINT && message != WM_NCHITTEST &&

1 0

Rob Shearman : d3d9: Fix type used to store return value in IDirect3DDevice9Impl_GetNPatchMode.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: f6813e55c54992cc598c2beb26fdadfbfc313637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6813e55c54992cc598c2beb2… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Sep 15 11:06:09 2008 +0100 d3d9: Fix type used to store return value in IDirect3DDevice9Impl_GetNPatchMode. It should be a float, not an HRESULT. --- dlls/d3d9/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b12e562..8aab230 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1168,13 +1168,13 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetNPatchMode(LPDIRECT3DDEVICE9EX i static float WINAPI IDirect3DDevice9Impl_GetNPatchMode(LPDIRECT3DDEVICE9EX iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - HRESULT hr; + float ret; TRACE("(%p) Relay\n" , This); EnterCriticalSection(&d3d9_cs); - hr = IWineD3DDevice_GetNPatchMode(This->WineD3DDevice); + ret = IWineD3DDevice_GetNPatchMode(This->WineD3DDevice); LeaveCriticalSection(&d3d9_cs); - return hr; + return ret; } static HRESULT WINAPI IDirect3DDevice9Impl_DrawPrimitive(LPDIRECT3DDEVICE9EX iface, D3DPRIMITIVETYPE PrimitiveType, UINT StartVertex, UINT PrimitiveCount) {

1 0

Vitaliy Margolen : dinput: Implement DIPROP_KEYNAME property for keyboard device.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: d939367ac8fc1e7c7461008c86557fd870c4fbe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d939367ac8fc1e7c7461008c8… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Sep 14 12:51:23 2008 -0600 dinput: Implement DIPROP_KEYNAME property for keyboard device. Based on patch from Sergey Khodych. --- dlls/dinput/keyboard.c | 40 ++++++++++++++++++++++++++++++++++++++-- include/dinput.h | 7 +++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index e0f76fa..b851b95 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -430,6 +430,42 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface return DI_OK; } +/****************************************************************************** + * GetProperty : Retrieves information about the input device. + */ +static HRESULT WINAPI SysKeyboardAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, + REFGUID rguid, LPDIPROPHEADER pdiph) +{ + TRACE("(%p) %s,%p\n", iface, debugstr_guid(rguid), pdiph); + _dump_DIPROPHEADER(pdiph); + + if (HIWORD(rguid)) return DI_OK; + + switch (LOWORD(rguid)) + { + case (DWORD)DIPROP_KEYNAME: + { + HRESULT hr; + LPDIPROPSTRING ps = (LPDIPROPSTRING)pdiph; + DIDEVICEOBJECTINSTANCEW didoi; + + if (pdiph->dwSize != sizeof(DIPROPSTRING)) + return DIERR_INVALIDPARAM; + + didoi.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW); + + hr = SysKeyboardWImpl_GetObjectInfo((LPDIRECTINPUTDEVICE8W)iface , &didoi, + ps->diph.dwObj, ps->diph.dwHow); + if (hr == DI_OK) + memcpy(ps->wsz, didoi.tszName, sizeof(ps->wsz)); + return hr; + } + default: + return IDirectInputDevice2AImpl_GetProperty( iface, rguid, pdiph ); + } + return DI_OK; +} + static const IDirectInputDevice8AVtbl SysKeyboardAvt = { IDirectInputDevice2AImpl_QueryInterface, @@ -437,7 +473,7 @@ static const IDirectInputDevice8AVtbl SysKeyboardAvt = IDirectInputDevice2AImpl_Release, SysKeyboardAImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, - IDirectInputDevice2AImpl_GetProperty, + SysKeyboardAImpl_GetProperty, IDirectInputDevice2AImpl_SetProperty, IDirectInputDevice2AImpl_Acquire, IDirectInputDevice2AImpl_Unacquire, @@ -479,7 +515,7 @@ static const IDirectInputDevice8WVtbl SysKeyboardWvt = XCAST(Release)IDirectInputDevice2AImpl_Release, XCAST(GetCapabilities)SysKeyboardAImpl_GetCapabilities, IDirectInputDevice2WImpl_EnumObjects, - XCAST(GetProperty)IDirectInputDevice2AImpl_GetProperty, + XCAST(GetProperty)SysKeyboardAImpl_GetProperty, XCAST(SetProperty)IDirectInputDevice2AImpl_SetProperty, XCAST(Acquire)IDirectInputDevice2AImpl_Acquire, XCAST(Unacquire)IDirectInputDevice2AImpl_Unacquire, diff --git a/include/dinput.h b/include/dinput.h index 3ee9ab7..44b20fd 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -725,6 +725,12 @@ typedef struct DIPROPGUIDANDPATH { } DIPROPGUIDANDPATH, *LPDIPROPGUIDANDPATH; typedef const DIPROPGUIDANDPATH *LPCDIPROPGUIDANDPATH; +typedef struct DIPROPSTRING { + DIPROPHEADER diph; + WCHAR wsz[MAX_PATH]; +} DIPROPSTRING, *LPDIPROPSTRING; +typedef const DIPROPSTRING *LPCDIPROPSTRING; + /* special property GUIDs */ #ifdef __cplusplus #define MAKEDIPROP(prop) (*(const GUID *)(prop)) @@ -755,6 +761,7 @@ typedef const DIPROPGUIDANDPATH *LPCDIPROPGUIDANDPATH; #define DIPROP_CALIBRATION MAKEDIPROP(11) #define DIPROP_GUIDANDPATH MAKEDIPROP(12) +#define DIPROP_KEYNAME MAKEDIPROP(20) typedef struct DIDEVCAPS_DX3 { DWORD dwSize;

1 0

Vitaliy Margolen : dinput: Replace strdup with HeapAlloc.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 5085d4cd35b314bacb4e9eb491a45de513ca2d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5085d4cd35b314bacb4e9eb49… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Sep 14 11:05:55 2008 -0600 dinput: Replace strdup with HeapAlloc. --- dlls/dinput/joystick_linuxinput.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index a7c9c63..6b3a186 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -264,14 +264,18 @@ static void find_joydevs(void) ) ) { - joydev.device = strdup(buf); + if (!(joydev.device = HeapAlloc(GetProcessHeap(), 0, strlen(buf) + 1))) { + close(fd); + continue; + } + strcpy(joydev.device, buf); - if (-1!=ioctl(fd, EVIOCGNAME(MAX_PATH-1), buf)) { - buf[MAX_PATH-1] = 0; - joydev.name = strdup(buf); - } else { + buf[MAX_PATH - 1] = 0; + if (ioctl(fd, EVIOCGNAME(MAX_PATH - 1), buf) != -1 && + (joydev.name = HeapAlloc(GetProcessHeap(), 0, strlen(buf) + 1))) + strcpy(joydev.name, buf); + else joydev.name = joydev.device; - } joydev.guid = DInput_Wine_Joystick_Base_GUID; joydev.guid.Data3 += have_joydevs;

1 0

Mikołaj Zalewski : oleaut32: Add some missing simple types to _argsize and _xsize.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: cc86f6890fd01f6843d7a7b5ecce3ed2f0b08857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc86f6890fd01f6843d7a7b5e… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Sep 12 22:04:00 2008 +0200 oleaut32: Add some missing simple types to _argsize and _xsize. --- dlls/oleaut32/tmarshal.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 9f26a30..0123e52 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -511,6 +511,7 @@ static const IRpcProxyBufferVtbl tmproxyvtable = { static int _argsize(TYPEDESC *tdesc, ITypeInfo *tinfo) { switch (tdesc->vt) { + case VT_I8: case VT_UI8: return 8/sizeof(DWORD); case VT_R8: @@ -519,6 +520,8 @@ _argsize(TYPEDESC *tdesc, ITypeInfo *tinfo) { return sizeof(CY)/sizeof(DWORD); case VT_DATE: return sizeof(DATE)/sizeof(DWORD); + case VT_DECIMAL: + return (sizeof(DECIMAL)+3)/sizeof(DWORD); case VT_VARIANT: return (sizeof(VARIANT)+3)/sizeof(DWORD); default: @@ -532,8 +535,11 @@ _xsize(const TYPEDESC *td, ITypeInfo *tinfo) { switch (td->vt) { case VT_DATE: return sizeof(DATE); + case VT_CY: + return sizeof(CY); + /* FIXME: VT_BOOL should return 2? */ case VT_VARIANT: - return sizeof(VARIANT)+3; + return sizeof(VARIANT)+3; /* FIXME: why the +3? */ case VT_CARRAY: { int i, arrsize = 1; const ARRAYDESC *adesc = td->u.lpadesc; @@ -544,6 +550,7 @@ _xsize(const TYPEDESC *td, ITypeInfo *tinfo) { } case VT_UI8: case VT_I8: + case VT_R8: return 8; case VT_UI2: case VT_I2:

1 0

Mikołaj Zalewski : oleaut32: Make _argsize and _xsize receive the full TYPEDESC and parent ITypeInfo, use a different function in IDispatch code.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 8b36e71590690330d24831472e072d3ef46b4249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b36e71590690330d24831472… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Sep 12 22:04:00 2008 +0200 oleaut32: Make _argsize and _xsize receive the full TYPEDESC and parent ITypeInfo, use a different function in IDispatch code. --- dlls/oleaut32/tmarshal.c | 33 +++++++++++++++++---------------- dlls/oleaut32/typelib.c | 37 +++++++++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 22 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 97500bf..9f26a30 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -508,9 +508,9 @@ static const IRpcProxyBufferVtbl tmproxyvtable = { }; /* how much space do we use on stack in DWORD steps. */ -int -_argsize(DWORD vt) { - switch (vt) { +static int +_argsize(TYPEDESC *tdesc, ITypeInfo *tinfo) { + switch (tdesc->vt) { case VT_UI8: return 8/sizeof(DWORD); case VT_R8: @@ -526,8 +526,9 @@ _argsize(DWORD vt) { } } +/* how much space do we use on the heap (in bytes) */ static int -_xsize(const TYPEDESC *td) { +_xsize(const TYPEDESC *td, ITypeInfo *tinfo) { switch (td->vt) { case VT_DATE: return sizeof(DATE); @@ -539,7 +540,7 @@ _xsize(const TYPEDESC *td) { for (i=0;i<adesc->cDims;i++) arrsize *= adesc->rgbounds[i].cElements; - return arrsize*_xsize(&adesc->tdescElem); + return arrsize*_xsize(&adesc->tdescElem, tinfo); } case VT_UI8: case VT_I8: @@ -843,7 +844,7 @@ serialize_param( if (debugout) TRACE_(olerelay)("(vt %s)",debugstr_vt(adesc->tdescElem.vt)); if (debugout) TRACE_(olerelay)("["); for (i=0;i<arrsize;i++) { - hres = serialize_param(tinfo, writeit, debugout, dealloc, &adesc->tdescElem, (DWORD*)((LPBYTE)arg+i*_xsize(&adesc->tdescElem)), buf); + hres = serialize_param(tinfo, writeit, debugout, dealloc, &adesc->tdescElem, (DWORD*)((LPBYTE)arg+i*_xsize(&adesc->tdescElem, tinfo)), buf); if (hres) return hres; if (debugout && (i<arrsize-1)) TRACE_(olerelay)(","); @@ -1092,7 +1093,7 @@ deserialize_param( if (alloc) { /* Allocate space for the referenced struct */ if (derefhere) - *arg=(DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,_xsize(tdesc->u.lptdesc)); + *arg=(DWORD)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,_xsize(tdesc->u.lptdesc, tinfo)); } if (derefhere) return deserialize_param(tinfo, readit, debugout, alloc, tdesc->u.lptdesc, (LPDWORD)*arg, buf); @@ -1207,7 +1208,7 @@ deserialize_param( debugout, alloc, &adesc->tdescElem, - (DWORD*)((LPBYTE)(arg)+i*_xsize(&adesc->tdescElem)), + (DWORD*)((LPBYTE)(arg)+i*_xsize(&adesc->tdescElem, tinfo)), buf ); return S_OK; @@ -1407,7 +1408,7 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) } /* No need to marshal other data than FIN and any VT_PTR. */ if (!is_in_elem(elem) && (elem->tdesc.vt != VT_PTR)) { - xargs+=_argsize(elem->tdesc.vt); + xargs+=_argsize(&elem->tdesc, tinfo); if (relaydeb) TRACE_(olerelay)("[out]"); continue; } @@ -1425,7 +1426,7 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) ERR("Failed to serialize param, hres %x\n",hres); break; } - xargs+=_argsize(elem->tdesc.vt); + xargs+=_argsize(&elem->tdesc, tinfo); } if (relaydeb) TRACE_(olerelay)(")"); @@ -1466,7 +1467,7 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) } /* No need to marshal other data than FOUT and any VT_PTR */ if (!is_out_elem(elem) && (elem->tdesc.vt != VT_PTR)) { - xargs += _argsize(elem->tdesc.vt); + xargs += _argsize(&elem->tdesc, tinfo); if (relaydeb) TRACE_(olerelay)("[in]"); continue; } @@ -1484,7 +1485,7 @@ xCall(LPVOID retptr, int method, TMProxyImpl *tpinfo /*, args */) status = hres; break; } - xargs += _argsize(elem->tdesc.vt); + xargs += _argsize(&elem->tdesc, tinfo); } hres = xbuf_get(&buf, (LPBYTE)&remoteresult, sizeof(DWORD)); @@ -1725,7 +1726,7 @@ static HRESULT init_proxy_entry_point(TMProxyImpl *proxy, unsigned int num) /* some args take more than 4 byte on the stack */ nrofargs = 0; for (j=0;j<fdesc->cParams;j++) - nrofargs += _argsize(fdesc->lprgelemdescParam[j].tdesc.vt); + nrofargs += _argsize(&fdesc->lprgelemdescParam[j].tdesc, proxy->tinfo); #ifdef __i386__ if (fdesc->callconv != CC_STDCALL) { @@ -2055,7 +2056,7 @@ TMStubImpl_Invoke( /*dump_FUNCDESC(fdesc);*/ nrofargs = 0; for (i=0;i<fdesc->cParams;i++) - nrofargs += _argsize(fdesc->lprgelemdescParam[i].tdesc.vt); + nrofargs += _argsize(&fdesc->lprgelemdescParam[i].tdesc, tinfo); args = HeapAlloc(GetProcessHeap(),0,(nrofargs+1)*sizeof(DWORD)); if (!args) { @@ -2077,7 +2078,7 @@ TMStubImpl_Invoke( xargs, &buf ); - xargs += _argsize(elem->tdesc.vt); + xargs += _argsize(&elem->tdesc, tinfo); if (hres) { ERR("Failed to deserialize param %s, hres %x\n",relaystr(names[i+1]),hres); break; @@ -2123,7 +2124,7 @@ TMStubImpl_Invoke( xargs, &buf ); - xargs += _argsize(elem->tdesc.vt); + xargs += _argsize(&elem->tdesc, tinfo); if (hres) { ERR("Failed to stuballoc param, hres %x\n",hres); break; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9c7ef98..fb57292 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5483,7 +5483,32 @@ _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args) { return res; } -extern int _argsize(DWORD vt); +/* The size of the argument on the stack in DWORD units (in all x86 call + * convetions the arguments on the stack are DWORD-aligned) + */ +int _dispargsize(VARTYPE vt) +{ + switch (vt) { + case VT_I8: + case VT_UI8: + return 8/sizeof(DWORD); + case VT_R8: + return sizeof(double)/sizeof(DWORD); + case VT_DECIMAL: + return (sizeof(DECIMAL)+3)/sizeof(DWORD); + case VT_CY: + return sizeof(CY)/sizeof(DWORD); + case VT_DATE: + return sizeof(DATE)/sizeof(DWORD); + case VT_VARIANT: + return (sizeof(VARIANT)+3)/sizeof(DWORD); + case VT_RECORD: + FIXME("VT_RECORD not implemented\n"); + return 1; + default: + return 1; + } +} static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt) { @@ -5671,9 +5696,9 @@ DispCallFunc( for (i=0;i<cActuals;i++) { - TRACE("arg %d: type %d, size %d\n",i,prgvt[i],_argsize(prgvt[i])); + TRACE("arg %d: type %d, size %d\n",i,prgvt[i],_dispargsize(prgvt[i])); dump_Variant(prgpvarg[i]); - argsize += _argsize(prgvt[i]); + argsize += _dispargsize(prgvt[i]); } args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*argsize); @@ -5689,10 +5714,10 @@ DispCallFunc( VARIANT *arg = prgpvarg[i]; TRACE("Storing arg %d (%d as %d)\n",i,V_VT(arg),prgvt[i]); if (prgvt[i] == VT_VARIANT) - memcpy(&args[argspos], arg, _argsize(prgvt[i]) * sizeof(DWORD)); + memcpy(&args[argspos], arg, _dispargsize(prgvt[i]) * sizeof(DWORD)); else - memcpy(&args[argspos], &V_NONE(arg), _argsize(prgvt[i]) * sizeof(DWORD)); - argspos += _argsize(prgvt[i]); + memcpy(&args[argspos], &V_NONE(arg), _dispargsize(prgvt[i]) * sizeof(DWORD)); + argspos += _dispargsize(prgvt[i]); } if (pvInstance)

1 0

John Klehm : gdiplus: Stub implementation of GdipGetImageDecoders and GdipGetImageDecodersSize.
by Alexandre Julliard 15 Sep '08

15 Sep '08

Module: wine Branch: master Commit: 294c160c36e699ff30d2b56850d18a629c256f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=294c160c36e699ff30d2b5685… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Fri Sep 12 19:40:28 2008 -0500 gdiplus: Stub implementation of GdipGetImageDecoders and GdipGetImageDecodersSize. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/image.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 5de555a..dbe7c76 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -281,8 +281,8 @@ @ stub GdipGetHemfFromMetafile @ stub GdipGetImageAttributesAdjustedPalette @ stdcall GdipGetImageBounds(ptr ptr ptr) -@ stub GdipGetImageDecoders -@ stub GdipGetImageDecodersSize +@ stdcall GdipGetImageDecoders(long long ptr) +@ stdcall GdipGetImageDecodersSize(ptr ptr) @ stdcall GdipGetImageDimension(ptr ptr ptr) @ stdcall GdipGetImageEncoders(long long ptr) @ stdcall GdipGetImageEncodersSize(ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 2f35f27..2172b51 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1277,6 +1277,35 @@ static const ImageCodecInfo codecs[NUM_ENCODERS_SUPPORTED] = }; /***************************************************************************** + * GdipGetImageDecodersSize [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetImageDecodersSize(UINT *numDecoders, UINT *size) +{ + FIXME("%p %p stub!\n", numDecoders, size); + + if (!numDecoders || !size) + return InvalidParameter; + + *numDecoders = 0; + *size = 0; + + return Ok; +} + +/***************************************************************************** + * GdipGetImageDecoders [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetImageDecoders(UINT numDecoders, UINT size, ImageCodecInfo *decoders) +{ + FIXME("%u %u %p stub!\n", numDecoders, size, decoders); + + if (!decoders) + return GenericError; + + return NotImplemented; +} + +/***************************************************************************** * GdipGetImageEncodersSize [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipGetImageEncodersSize(UINT *numEncoders, UINT *size)

1 0