August 2010 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Added Gecko64 support.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 0b1530545f74e9a75bb2b47a87f44cd13553e223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b1530545f74e9a75bb2b47a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 25 14:22:39 2010 +0200 mshtml: Added Gecko64 support. --- dlls/mshtml/install.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 65faa5a..1079713 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -49,6 +49,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #ifdef __i386__ #define GECKO_ARCH "x86" +#elif defined(__x86_64__) +#define GECKO_ARCH "x86_64" #else #define GECKO_ARCH "" #endif

1 0

Alexandre Julliard : explorerframe/tests: Initialize cbstate to a dummy value to make sure it's being set properly.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 8447ecc59177899775b8226cb90a0c3b8689f8ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8447ecc59177899775b8226cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 25 14:44:12 2010 +0200 explorerframe/tests: Initialize cbstate to a dummy value to make sure it's being set properly. --- dlls/explorerframe/tests/nstc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 5142d84..d5dd5cd 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -1662,6 +1662,7 @@ static void test_basics(void) todo_wine { + cbstate = -1; hr = INameSpaceTreeControl_GetItemCustomState(pnstc, psitestdir, &cbstate); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(cbstate == BST_UNCHECKED || broken(cbstate == BST_CHECKED /* Vista x64 */), @@ -1670,6 +1671,7 @@ static void test_basics(void) hr = INameSpaceTreeControl_SetItemCustomState(pnstc, psitestdir, BST_CHECKED); ok(hr == S_OK, "Got 0x%08x\n", hr); + cbstate = -1; hr = INameSpaceTreeControl_GetItemCustomState(pnstc, psitestdir, &cbstate); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(cbstate == BST_CHECKED, "Got %d\n", cbstate); @@ -1677,6 +1679,7 @@ static void test_basics(void) hr = INameSpaceTreeControl_SetItemCustomState(pnstc, psitestdir, 0xFFF); ok(hr == S_OK, "Got 0x%08x\n", hr); + cbstate = -1; hr = INameSpaceTreeControl_GetItemCustomState(pnstc, psitestdir, &cbstate); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(cbstate == 0xF, "Got %d\n", cbstate);

1 0

Nikolay Sivov : oleaut32/olepicture: Remove out pointer check in OleCreatePictureIndirect, it should crash.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: f7b2add8d934c048826df94bc7ea322052ead1cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b2add8d934c048826df94bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 24 22:36:38 2010 +0400 oleaut32/olepicture: Remove out pointer check in OleCreatePictureIndirect, it should crash. --- dlls/oleaut32/olepicture.c | 15 +++------------ dlls/oleaut32/tests/olepicture.c | 10 +++++++++- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index bd93ffa..aaab2a1 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2142,25 +2142,16 @@ static const IConnectionPointContainerVtbl OLEPictureImpl_IConnectionPointContai * OleCreatePictureIndirect (OLEAUT32.419) */ HRESULT WINAPI OleCreatePictureIndirect(LPPICTDESC lpPictDesc, REFIID riid, - BOOL fOwn, LPVOID *ppvObj ) + BOOL Own, void **ppvObj ) { OLEPictureImpl* newPict; HRESULT hr; - TRACE("(%p,%s,%d,%p)\n", lpPictDesc, debugstr_guid(riid), fOwn, ppvObj); - - /* - * Sanity check - */ - if (ppvObj==0) - return E_POINTER; + TRACE("(%p,%s,%d,%p)\n", lpPictDesc, debugstr_guid(riid), Own, ppvObj); *ppvObj = NULL; - /* - * Try to construct a new instance of the class. - */ - newPict = OLEPictureImpl_Construct(lpPictDesc, fOwn); + newPict = OLEPictureImpl_Construct(lpPictDesc, Own); if (newPict == NULL) return E_OUTOFMEMORY; diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 9ab2515..03d47db 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -481,10 +481,10 @@ static void test_Invoke(void) static void test_OleCreatePictureIndirect(void) { + OLE_HANDLE handle; IPicture *pict; HRESULT hr; short type; - OLE_HANDLE handle; if(!pOleCreatePictureIndirect) { @@ -492,13 +492,21 @@ static void test_OleCreatePictureIndirect(void) return; } +if (0) +{ + /* crashes on native */ + hr = pOleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, NULL); +} + hr = pOleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void**)&pict); ok(hr == S_OK, "hr %08x\n", hr); + type = PICTYPE_NONE; hr = IPicture_get_Type(pict, &type); ok(hr == S_OK, "hr %08x\n", hr); ok(type == PICTYPE_UNINITIALIZED, "type %d\n", type); + handle = 0xdeadbeef; hr = IPicture_get_Handle(pict, &handle); ok(hr == S_OK, "hr %08x\n", hr); ok(handle == 0, "handle %08x\n", handle);

1 0

Nikolay Sivov : oleaut32/olepicture: Fix a typo in height conversion.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: b8f99cabb442882bc263de3af0d888ec647e0ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f99cabb442882bc263de3af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 24 22:29:12 2010 +0400 oleaut32/olepicture: Fix a typo in height conversion. --- dlls/oleaut32/olepicture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 4dd25fb..bd93ffa 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -215,8 +215,8 @@ static void OLEPictureImpl_SetBitmap(OLEPictureImpl *This) /* Should we use GetBitmapDimension if available? */ hdcRef = CreateCompatibleDC(0); - This->himetricWidth = xpixels_to_himetric(bm.bmWidth, hdcRef); - This->himetricHeight = xpixels_to_himetric(bm.bmHeight, hdcRef); + This->himetricWidth = xpixels_to_himetric(bm.bmWidth, hdcRef); + This->himetricHeight = ypixels_to_himetric(bm.bmHeight, hdcRef); DeleteDC(hdcRef); }

1 0

Damjan Jovanovic : winemenubuilder: Parse ICO headers in a separate function.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 6b39897765e13fb802158487c4052321270a19e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b39897765e13fb802158487c… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Aug 24 15:04:54 2010 +0200 winemenubuilder: Parse ICO headers in a separate function. --- programs/winemenubuilder/winemenubuilder.c | 56 ++++++++++++++-------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 88676cd..dcf13ac 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -631,19 +631,15 @@ static HRESULT open_module_icon(LPCWSTR szFileName, int nIndex, IStream **ppStre return hr; } -static HRESULT write_native_icon(IStream *iconStream, const char *icon_name, LPCWSTR szFileName) +static HRESULT read_ico_direntries(IStream *icoStream, ICONDIRENTRY **ppIconDirEntries, int *numEntries) { ICONDIR iconDir; - ICONDIRENTRY *pIconDirEntry = NULL; - int nMax = 0, nMaxBits = 0; - int nIndex = 0; - void *pIcon = NULL; - int i; ULONG bytesRead; - LARGE_INTEGER position; HRESULT hr; - hr = IStream_Read(iconStream, &iconDir, sizeof(ICONDIR), &bytesRead); + *ppIconDirEntries = NULL; + + hr = IStream_Read(icoStream, &iconDir, sizeof(ICONDIR), &bytesRead); if (FAILED(hr) || bytesRead != sizeof(ICONDIR) || (iconDir.idReserved != 0) || (iconDir.idType != 1)) { @@ -651,20 +647,41 @@ static HRESULT write_native_icon(IStream *iconStream, const char *icon_name, LPC hr = E_FAIL; goto end; } + *numEntries = iconDir.idCount; - if ((pIconDirEntry = HeapAlloc(GetProcessHeap(), 0, iconDir.idCount * sizeof (ICONDIRENTRY))) == NULL) + if ((*ppIconDirEntries = HeapAlloc(GetProcessHeap(), 0, sizeof(ICONDIRENTRY)*iconDir.idCount)) == NULL) { hr = E_OUTOFMEMORY; goto end; } - hr = IStream_Read(iconStream, pIconDirEntry, sizeof(ICONDIRENTRY)*iconDir.idCount, &bytesRead); + hr = IStream_Read(icoStream, *ppIconDirEntries, sizeof(ICONDIRENTRY)*iconDir.idCount, &bytesRead); if (FAILED(hr) || bytesRead != sizeof(ICONDIRENTRY)*iconDir.idCount) { if (SUCCEEDED(hr)) hr = E_FAIL; goto end; } - for (i = 0; i < iconDir.idCount; i++) +end: + if (FAILED(hr)) + HeapFree(GetProcessHeap(), 0, *ppIconDirEntries); + return hr; +} + +static HRESULT write_native_icon(IStream *iconStream, const char *icon_name, LPCWSTR szFileName) +{ + ICONDIRENTRY *pIconDirEntry = NULL; + int numEntries; + int nMax = 0, nMaxBits = 0; + int nIndex = 0; + int i; + LARGE_INTEGER position; + HRESULT hr; + + hr = read_ico_direntries(iconStream, &pIconDirEntry, &numEntries); + if (FAILED(hr)) + goto end; + + for (i = 0; i < numEntries; i++) { WINE_TRACE("[%d]: %d x %d @ %d\n", i, pIconDirEntry[i].bWidth, pIconDirEntry[i].bHeight, pIconDirEntry[i].wBitCount); if (pIconDirEntry[i].wBitCount >= nMaxBits && @@ -677,22 +694,6 @@ static HRESULT write_native_icon(IStream *iconStream, const char *icon_name, LPC } WINE_TRACE("Selected: %d\n", nIndex); - if ((pIcon = HeapAlloc(GetProcessHeap(), 0, pIconDirEntry[nIndex].dwBytesInRes)) == NULL) - { - hr = E_OUTOFMEMORY; - goto end; - } - position.QuadPart = pIconDirEntry[nIndex].dwImageOffset; - hr = IStream_Seek(iconStream, position, STREAM_SEEK_SET, NULL); - if (FAILED(hr)) - goto end; - hr = IStream_Read(iconStream, pIcon, pIconDirEntry[nIndex].dwBytesInRes, &bytesRead); - if (FAILED(hr) || bytesRead != pIconDirEntry[nIndex].dwBytesInRes) - { - if (SUCCEEDED(hr)) hr = E_FAIL; - goto end; - } - position.QuadPart = 0; hr = IStream_Seek(iconStream, position, STREAM_SEEK_SET, NULL); if (FAILED(hr)) @@ -700,7 +701,6 @@ static HRESULT write_native_icon(IStream *iconStream, const char *icon_name, LPC hr = convert_to_native_icon(iconStream, &nIndex, 1, &CLSID_WICPngEncoder, icon_name, szFileName); end: - HeapFree(GetProcessHeap(), 0, pIcon); HeapFree(GetProcessHeap(), 0, pIconDirEntry); return hr; }

1 0

Vincent Povirk : windowscodecs: Handle TIFF' s with RowsPerStrip greater than Height.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: c37f6fb196b11cbb03e649e251d74d07ee1dd72a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c37f6fb196b11cbb03e649e25… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 29 11:47:49 2010 -0500 windowscodecs: Handle TIFF's with RowsPerStrip greater than Height. --- dlls/windowscodecs/tiffformat.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index fe1fb00..645cfb0 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -361,6 +361,8 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) ret = pTIFFGetField(tiff, TIFFTAG_ROWSPERSTRIP, &decode_info->tile_height); if (ret) { + if (decode_info->tile_height > decode_info->height) + decode_info->tile_height = decode_info->height; decode_info->tile_width = decode_info->width; decode_info->tile_stride = ((decode_info->bpp * decode_info->tile_width + 7)/8); decode_info->tile_size = decode_info->tile_height * decode_info->tile_stride;

1 0

Vincent Povirk : windowscodecs: Handle WhiteIsZero TIFF images.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 4cedec597530ad8557fbf2c1d2cbff3ab1237274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cedec597530ad8557fbf2c1d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 29 11:27:31 2010 -0500 windowscodecs: Handle WhiteIsZero TIFF images. --- dlls/windowscodecs/tiffformat.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 58515c5..fe1fb00 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -205,6 +205,7 @@ typedef struct { int planar; int indexed; int reverse_bgr; + int invert_grayscale; UINT width, height; UINT tile_width, tile_height; UINT tile_stride; @@ -230,6 +231,7 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) decode_info->indexed = 0; decode_info->reverse_bgr = 0; + decode_info->invert_grayscale = 0; ret = pTIFFGetField(tiff, TIFFTAG_PHOTOMETRIC, &photometric); if (!ret) @@ -262,6 +264,8 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) switch(photometric) { + case 0: /* WhiteIsZero */ + decode_info->invert_grayscale = 1; case 1: /* BlackIsZero */ if (samples != 1) { @@ -331,7 +335,6 @@ static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) return E_FAIL; } break; - case 0: /* WhiteIsZero */ case 4: /* Transparency mask */ case 5: /* CMYK */ case 6: /* YCbCr */ @@ -759,6 +762,22 @@ static HRESULT TiffFrameDecode_ReadTile(TiffFrameDecode *This, UINT tile_x, UINT } } + if (hr == S_OK && This->decode_info.invert_grayscale) + { + BYTE *byte, *end; + + if (This->decode_info.samples != 1) + { + ERR("cannot invert grayscale image with %u samples\n", This->decode_info.samples); + return E_FAIL; + } + + end = This->cached_tile+This->decode_info.tile_size; + + for (byte = This->cached_tile; byte != end; byte++) + *byte = ~(*byte); + } + if (hr == S_OK) { This->cached_tile_x = tile_x;

1 0

Alexandre Julliard : oleaut32: Implement DispCallFunc for x86_64.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 21abfc53550651d7d224ae375e153f32fb155539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21abfc53550651d7d224ae375… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 25 14:23:31 2010 +0200 oleaut32: Implement DispCallFunc for x86_64. --- dlls/oleaut32/typelib.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 118 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 2fc3f47..2005edc 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5768,7 +5768,47 @@ _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args) { TRACE("returns %08x\n",res); return res; } -#endif /* __i386__ */ + +#elif defined(__x86_64__) + +extern DWORD_PTR CDECL call_method( void *func, int nb_args, const DWORD_PTR *args ); +__ASM_GLOBAL_FUNC( call_method, + "pushq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") + "movq %rsp,%rbp\n\t" + __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") + "pushq %rsi\n\t" + __ASM_CFI(".cfi_rel_offset %rsi,-8\n\t") + "pushq %rdi\n\t" + __ASM_CFI(".cfi_rel_offset %rdi,-16\n\t") + "movq %rcx,%rax\n\t" + "movq $4,%rcx\n\t" + "cmp %rcx,%rdx\n\t" + "cmovgq %rdx,%rcx\n\t" + "leaq 0(,%rcx,8),%rdx\n\t" + "subq %rdx,%rsp\n\t" + "andq $~15,%rsp\n\t" + "movq %rsp,%rdi\n\t" + "movq %r8,%rsi\n\t" + "rep; movsq\n\t" + "movq 0(%rsp),%rcx\n\t" + "movq 8(%rsp),%rdx\n\t" + "movq 16(%rsp),%r8\n\t" + "movq 24(%rsp),%r9\n\t" + "callq *%rax\n\t" + "leaq -16(%rbp),%rsp\n\t" + "popq %rdi\n\t" + __ASM_CFI(".cfi_same_value %rdi\n\t") + "popq %rsi\n\t" + __ASM_CFI(".cfi_same_value %rsi\n\t") + __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") + "popq %rbp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -8\n\t") + __ASM_CFI(".cfi_same_value %rbp\n\t") + "ret") + +#endif /* __x86_64__ */ static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt) { @@ -6025,6 +6065,83 @@ DispCallFunc( } HeapFree(GetProcessHeap(),0,args); return S_OK; + +#elif defined(__x86_64__) + int argspos; + UINT i; + DWORD_PTR *args, ret; + + TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", + pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, + pvargResult, V_VT(pvargResult)); + + if (cc != CC_STDCALL && cc != CC_CDECL) + { + FIXME("unsupported calling convention %d\n",cc); + return E_INVALIDARG; + } + + /* maximum size for an argument is sizeof(VARIANT) */ + args = HeapAlloc( GetProcessHeap(), 0, sizeof(VARIANT) * cActuals + sizeof(DWORD_PTR) ); + + argspos = 0; + if (pvInstance) + { + args[0] = (DWORD_PTR)pvInstance; /* the This pointer is always the first parameter */ + argspos++; + } + + for (i = 0; i < cActuals; i++) + { + VARIANT *arg = prgpvarg[i]; + + switch (prgvt[i]) + { + case VT_R4: + case VT_R8: + case VT_DATE: + FIXME(" floating point not supported properly\n" ); + memcpy( &args[argspos], &V_R8(arg), sizeof(V_R8(arg)) ); + argspos++; + break; + case VT_DECIMAL: + memcpy( &args[argspos], &V_DECIMAL(arg), sizeof(V_DECIMAL(arg)) ); + argspos += sizeof(V_DECIMAL(arg)) / sizeof(DWORD_PTR); + break; + case VT_VARIANT: + memcpy( &args[argspos], arg, sizeof(*arg) ); + argspos += sizeof(*arg) / sizeof(DWORD_PTR); + break; + case VT_RECORD: + FIXME("VT_RECORD not implemented\n"); + /* fall through */ + default: + args[argspos++] = V_UI8(arg); + break; + } + TRACE("arg %u: type %d\n",i,prgvt[i]); + dump_Variant(arg); + } + + if (pvInstance) + { + FARPROC *vtable = *(FARPROC**)pvInstance; + ret = call_method(vtable[oVft/sizeof(void *)], argspos, args); + } + else + /* if we aren't invoking an object then the function pointer is stored + * in oVft */ + ret = call_method((FARPROC)oVft, argspos, args); + + if (pvargResult && (vtReturn != VT_EMPTY)) + { + TRACE("Method returned 0x%lx\n",ret); + V_VT(pvargResult) = vtReturn; + V_UI8(pvargResult) = ret; + } + HeapFree(GetProcessHeap(),0,args); + return S_OK; + #else FIXME( "(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d)): not implemented for this CPU\n", pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult));

1 0

Alexandre Julliard : oleaut32: Simplify the i386 implementation of DispCallFunc.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 3c380daa59c9ffaac6e805cba79165add7a8add9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c380daa59c9ffaac6e805cba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 25 14:04:31 2010 +0200 oleaut32: Simplify the i386 implementation of DispCallFunc. --- dlls/oleaut32/typelib.c | 90 +++++++++++++++++++++------------------------- 1 files changed, 41 insertions(+), 49 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index da0d43d..2fc3f47 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5706,7 +5706,7 @@ static HRESULT WINAPI ITypeInfo_fnGetIDsOfNames( ITypeInfo2 *iface, #ifdef __i386__ -extern DWORD CDECL call_method( void *func, int nb_args, const DWORD *args ); +extern LONGLONG CDECL call_method( void *func, int nb_args, const DWORD *args ); __ASM_GLOBAL_FUNC( call_method, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") @@ -5768,33 +5768,6 @@ _invoke(FARPROC func,CALLCONV callconv, int nrargs, DWORD *args) { TRACE("returns %08x\n",res); return res; } - -/* The size of the argument on the stack in DWORD units (in all x86 call - * convetions the arguments on the stack are DWORD-aligned) - */ -static 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; - } -} #endif /* __i386__ */ static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt) @@ -5976,26 +5949,23 @@ DispCallFunc( VARTYPE* prgvt, VARIANTARG** prgpvarg, VARIANT* pvargResult) { #ifdef __i386__ - int argsize, argspos; + int argspos; UINT i; DWORD *args; - HRESULT hres; + LONGLONG ret; TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", pvInstance, oVft, cc, vtReturn, cActuals, prgvt, prgpvarg, pvargResult, V_VT(pvargResult)); - argsize = 0; - if (pvInstance) - argsize++; /* for This pointer */ - - for (i=0;i<cActuals;i++) + if (cc != CC_STDCALL && cc != CC_CDECL) { - TRACE("arg %u: type %d, size %d\n",i,prgvt[i],_dispargsize(prgvt[i])); - dump_Variant(prgpvarg[i]); - argsize += _dispargsize(prgvt[i]); + FIXME("unsupported calling convention %d\n",cc); + return E_INVALIDARG; } - args = HeapAlloc(GetProcessHeap(),0,sizeof(DWORD)*argsize); + + /* maximum size for an argument is sizeof(VARIANT) */ + args = HeapAlloc( GetProcessHeap(), 0, sizeof(VARIANT) * cActuals + sizeof(DWORD) ); argspos = 0; if (pvInstance) @@ -6007,29 +5977,51 @@ DispCallFunc( for (i=0;i<cActuals;i++) { VARIANT *arg = prgpvarg[i]; - TRACE("Storing arg %u (%d as %d)\n",i,V_VT(arg),prgvt[i]); - if (prgvt[i] == VT_VARIANT) - memcpy(&args[argspos], arg, _dispargsize(prgvt[i]) * sizeof(DWORD)); - else - memcpy(&args[argspos], &V_NONE(arg), _dispargsize(prgvt[i]) * sizeof(DWORD)); - argspos += _dispargsize(prgvt[i]); + + switch (prgvt[i]) + { + case VT_I8: + case VT_UI8: + case VT_R8: + case VT_DATE: + case VT_CY: + memcpy( &args[argspos], &V_I8(arg), sizeof(V_I8(arg)) ); + argspos += sizeof(V_I8(arg)) / sizeof(DWORD); + break; + case VT_DECIMAL: + memcpy( &args[argspos], &V_DECIMAL(arg), sizeof(V_DECIMAL(arg)) ); + argspos += sizeof(V_DECIMAL(arg)) / sizeof(DWORD); + break; + case VT_VARIANT: + memcpy( &args[argspos], arg, sizeof(*arg) ); + argspos += sizeof(*arg) / sizeof(DWORD); + break; + case VT_RECORD: + FIXME("VT_RECORD not implemented\n"); + /* fall through */ + default: + args[argspos++] = V_UI4(arg); + break; + } + TRACE("arg %u: type %d\n",i,prgvt[i]); + dump_Variant(arg); } if (pvInstance) { FARPROC *vtable = *(FARPROC**)pvInstance; - hres = _invoke(vtable[oVft/sizeof(void *)], cc, argsize, args); + ret = call_method(vtable[oVft/sizeof(void *)], argspos, args); } else /* if we aren't invoking an object then the function pointer is stored * in oVft */ - hres = _invoke((FARPROC)oVft, cc, argsize, args); + ret = call_method((FARPROC)oVft, argspos, args); if (pvargResult && (vtReturn != VT_EMPTY)) { - TRACE("Method returned 0x%08x\n",hres); + TRACE("Method returned %s\n",wine_dbgstr_longlong(ret)); V_VT(pvargResult) = vtReturn; - V_UI4(pvargResult) = hres; + V_UI8(pvargResult) = ret; } HeapFree(GetProcessHeap(),0,args); return S_OK;

1 0

Damjan Jovanovic : winemenubuilder: Write all frames, in the given format, to the native icon.
by Alexandre Julliard Aug. 25, 2010

Aug. 25, 2010

Module: wine Branch: master Commit: 85d8c1da1e679e81f50b1e1769457de01088fd7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=85d8c1da1e679e81f50b1e176… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Aug 24 15:04:07 2010 +0200 winemenubuilder: Write all frames, in the given format, to the native icon. --- programs/winemenubuilder/winemenubuilder.c | 155 +++++++++++++++------------- 1 files changed, 84 insertions(+), 71 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 6136701..88676cd 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -305,24 +305,21 @@ static WCHAR* utf8_chars_to_wchars(LPCSTR string) * FIXME: should not use stdio */ -static BOOL SaveIconStreamAsPNG(IStream *icoFile, int index, const char *pngFileName, LPCWSTR commentW) +static HRESULT convert_to_native_icon(IStream *icoFile, int *indeces, int numIndeces, + const CLSID *outputFormat, const char *outputFileName, LPCWSTR commentW) { - WCHAR *dosPNGFileName = NULL; + WCHAR *dosOutputFileName = NULL; IWICImagingFactory *factory = NULL; IWICBitmapDecoder *decoder = NULL; - IWICBitmapFrameDecode *sourceFrame = NULL; - IWICBitmapSource *sourceBitmap = NULL; IWICBitmapEncoder *encoder = NULL; IStream *outputFile = NULL; - IWICBitmapFrameEncode *dstFrame = NULL; - IPropertyBag2 *options = NULL; - UINT width, height; + int i; HRESULT hr = E_FAIL; - dosPNGFileName = wine_get_dos_file_name(pngFileName); - if (dosPNGFileName == NULL) + dosOutputFileName = wine_get_dos_file_name(outputFileName); + if (dosOutputFileName == NULL) { - WINE_ERR("error converting %s to DOS file name\n", pngFileName); + WINE_ERR("error converting %s to DOS file name\n", outputFileName); goto end; } hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, @@ -339,26 +336,14 @@ static BOOL SaveIconStreamAsPNG(IStream *icoFile, int index, const char *pngFile WINE_ERR("error 0x%08X creating IWICBitmapDecoder\n", hr); goto end; } - hr = IWICBitmapDecoder_GetFrame(decoder, index, &sourceFrame); - if (FAILED(hr)) - { - WINE_ERR("error 0x%08X getting frame %d\n", hr, index); - goto end; - } - hr = WICConvertBitmapSource(&GUID_WICPixelFormat32bppBGRA, (IWICBitmapSource*)sourceFrame, &sourceBitmap); - if (FAILED(hr)) - { - WINE_ERR("error 0x%08X converting bitmap to 32bppBGRA\n", hr); - goto end; - } - hr = CoCreateInstance(&CLSID_WICPngEncoder, NULL, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(outputFormat, NULL, CLSCTX_INPROC_SERVER, &IID_IWICBitmapEncoder, (void**)&encoder); if (FAILED(hr)) { WINE_ERR("error 0x%08X creating bitmap encoder\n", hr); goto end; } - hr = SHCreateStreamOnFileW(dosPNGFileName, STGM_CREATE | STGM_WRITE, &outputFile); + hr = SHCreateStreamOnFileW(dosOutputFileName, STGM_CREATE | STGM_WRITE, &outputFile); if (FAILED(hr)) { WINE_ERR("error 0x%08X creating output file\n", hr); @@ -370,63 +355,96 @@ static BOOL SaveIconStreamAsPNG(IStream *icoFile, int index, const char *pngFile WINE_ERR("error 0x%08X initializing encoder\n", hr); goto end; } - hr = IWICBitmapEncoder_CreateNewFrame(encoder, &dstFrame, &options); - if (FAILED(hr)) - { - WINE_ERR("error 0x%08X creating encoder frame\n", hr); - goto end; - } - hr = IWICBitmapFrameEncode_Initialize(dstFrame, options); - if (FAILED(hr)) - { - WINE_ERR("error 0x%08X initializing encoder frame\n", hr); - goto end; - } - hr = IWICBitmapSource_GetSize(sourceBitmap, &width, &height); - if (FAILED(hr)) - { - WINE_ERR("error 0x%08X getting source bitmap size\n", hr); - goto end; - } - hr = IWICBitmapFrameEncode_SetSize(dstFrame, width, height); - if (FAILED(hr)) - { - WINE_ERR("error 0x%08X setting destination bitmap size\n", hr); - goto end; - } - hr = IWICBitmapFrameEncode_SetResolution(dstFrame, 96, 96); - if (FAILED(hr)) + + for (i = 0; i < numIndeces; i++) { - WINE_ERR("error 0x%08X setting destination bitmap resolution\n", hr); - goto end; + IWICBitmapFrameDecode *sourceFrame = NULL; + IWICBitmapSource *sourceBitmap = NULL; + IWICBitmapFrameEncode *dstFrame = NULL; + IPropertyBag2 *options = NULL; + UINT width, height; + + hr = IWICBitmapDecoder_GetFrame(decoder, indeces[i], &sourceFrame); + if (FAILED(hr)) + { + WINE_ERR("error 0x%08X getting frame %d\n", hr, indeces[i]); + goto endloop; + } + hr = WICConvertBitmapSource(&GUID_WICPixelFormat32bppBGRA, (IWICBitmapSource*)sourceFrame, &sourceBitmap); + if (FAILED(hr)) + { + WINE_ERR("error 0x%08X converting bitmap to 32bppBGRA\n", hr); + goto endloop; + } + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &dstFrame, &options); + if (FAILED(hr)) + { + WINE_ERR("error 0x%08X creating encoder frame\n", hr); + goto endloop; + } + hr = IWICBitmapFrameEncode_Initialize(dstFrame, options); + if (FAILED(hr)) + { + WINE_ERR("error 0x%08X initializing encoder frame\n", hr); + goto endloop; + } + hr = IWICBitmapSource_GetSize(sourceBitmap, &width, &height); + if (FAILED(hr)) + { + WINE_ERR("error 0x%08X getting source bitmap size\n", hr); + goto endloop; + } + hr = IWICBitmapFrameEncode_SetSize(dstFrame, width, height); + if (FAILED(hr)) + { + WINE_ERR("error 0x%08X setting destination bitmap size\n", hr); + goto endloop; + } + hr = IWICBitmapFrameEncode_SetResolution(dstFrame, 96, 96); + if (FAILED(hr)) + { + WINE_ERR("error 0x%08X setting destination bitmap resolution\n", hr); + goto endloop; + } + hr = IWICBitmapFrameEncode_WriteSource(dstFrame, sourceBitmap, NULL); + if (FAILED(hr)) + { + WINE_ERR("error 0x%08X copying bitmaps\n", hr); + goto endloop; + } + hr = IWICBitmapFrameEncode_Commit(dstFrame); + if (FAILED(hr)) + { + WINE_ERR("error 0x%08X committing frame\n", hr); + goto endloop; + } + endloop: + if (sourceFrame) + IWICBitmapFrameDecode_Release(sourceFrame); + if (sourceBitmap) + IWICBitmapSource_Release(sourceBitmap); + if (dstFrame) + IWICBitmapFrameEncode_Release(dstFrame); } - hr = IWICBitmapFrameEncode_WriteSource(dstFrame, sourceBitmap, NULL); + + hr = IWICBitmapEncoder_Commit(encoder); if (FAILED(hr)) { - WINE_ERR("error 0x%08X copying bitmaps\n", hr); + WINE_ERR("error 0x%08X committing encoder\n", hr); goto end; } - IWICBitmapFrameEncode_Commit(dstFrame); - IWICBitmapEncoder_Commit(encoder); - hr = S_OK; end: - HeapFree(GetProcessHeap(), 0, dosPNGFileName); + HeapFree(GetProcessHeap(), 0, dosOutputFileName); if (factory) IWICImagingFactory_Release(factory); if (decoder) IWICBitmapDecoder_Release(decoder); - if (sourceFrame) - IWICBitmapFrameDecode_Release(sourceFrame); - if (sourceBitmap) - IWICBitmapSource_Release(sourceBitmap); if (encoder) IWICBitmapEncoder_Release(encoder); if (outputFile) IStream_Release(outputFile); - if (dstFrame) - IWICBitmapFrameEncode_Release(dstFrame); - return SUCCEEDED(hr); + return hr; } static IStream *add_module_icons_to_stream(HMODULE hModule, GRPICONDIR *grpIconDir) @@ -679,12 +697,7 @@ static HRESULT write_native_icon(IStream *iconStream, const char *icon_name, LPC hr = IStream_Seek(iconStream, position, STREAM_SEEK_SET, NULL); if (FAILED(hr)) goto end; - if (!SaveIconStreamAsPNG(iconStream, nIndex, icon_name, szFileName)) - { - hr = E_FAIL; - goto end; - } - hr = S_OK; + hr = convert_to_native_icon(iconStream, &nIndex, 1, &CLSID_WICPngEncoder, icon_name, szFileName); end: HeapFree(GetProcessHeap(), 0, pIcon);

1 0