wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Piotr Caban : oleaut32: Update TypeInfo flags when object inherits IDispatch.
by Alexandre Julliard 25 Feb '10

25 Feb '10

Module: wine Branch: master Commit: ccdafdb9c3da7ba19e543e2efd589e7f28dd99c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccdafdb9c3da7ba19e543e2ef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 25 15:08:11 2010 +0100 oleaut32: Update TypeInfo flags when object inherits IDispatch. --- dlls/oleaut32/tests/typelib.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib2.c | 20 +++++++++++++++++--- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 40423f3..5aee88d 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -973,6 +973,7 @@ static void test_CreateTypeLib(void) { static OLECHAR typelibW[] = {'t','y','p','e','l','i','b',0}; static OLECHAR interface1W[] = {'i','n','t','e','r','f','a','c','e','1',0}; static OLECHAR interface2W[] = {'i','n','t','e','r','f','a','c','e','2',0}; + static OLECHAR dualW[] = {'d','u','a','l',0}; static OLECHAR coclassW[] = {'c','o','c','l','a','s','s',0}; static WCHAR defaultW[] = {'d','e','f','a','u','l','t',0x3213,0}; static OLECHAR func1W[] = {'f','u','n','c','1',0}; @@ -987,7 +988,7 @@ static void test_CreateTypeLib(void) { ICreateTypeLib2 *createtl; ICreateTypeInfo *createti; ITypeLib *tl, *stdole; - ITypeInfo *interface1, *interface2, *unknown, *ti; + ITypeInfo *interface1, *interface2, *unknown, *dispatch, *ti; FUNCDESC funcdesc; ELEMDESC elemdesc[5]; PARAMDESCEX paramdescex; @@ -1008,6 +1009,9 @@ static void test_CreateTypeLib(void) { hres = ITypeLib_GetTypeInfoOfGuid(stdole, &IID_IUnknown, &unknown); ok(hres == S_OK, "got %08x\n", hres); + hres = ITypeLib_GetTypeInfoOfGuid(stdole, &IID_IDispatch, &dispatch); + ok(hres == S_OK, "got %08x\n", hres); + GetTempFileNameA(".", "tlb", 0, filename); MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, MAX_PATH); @@ -1309,6 +1313,37 @@ static void test_CreateTypeLib(void) { ICreateTypeInfo_Release(createti); + hres = ICreateTypeLib_CreateTypeInfo(createtl, dualW, TKIND_INTERFACE, &createti); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_AddRefTypeInfo(createti, dispatch, &hreftype); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_AddImplType(createti, 0, hreftype); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeInfo_QueryInterface(createti, &IID_ITypeInfo, (void**)&ti); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeInfo_GetTypeAttr(ti, &typeattr); + ok(hres == S_OK, "got %08x\n", hres); + ok(typeattr->cbSizeInstance == 4, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); + ok(typeattr->typekind == 3, "typekind = %d\n", typeattr->typekind); + ok(typeattr->cFuncs == 0, "cFuncs = %d\n", typeattr->cFuncs); + ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); + ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); + ok(typeattr->cbSizeVft == 28, "cbSizeVft = %d\n", typeattr->cbSizeVft); + ok(typeattr->cbAlignment == 4, "cbAlignment = %d\n", typeattr->cbAlignment); + ok(typeattr->wTypeFlags == TYPEFLAG_FDISPATCHABLE, "wTypeFlags = %d\n", typeattr->wTypeFlags); + ok(typeattr->wMajorVerNum == 0, "wMajorVerNum = %d\n", typeattr->wMajorVerNum); + ok(typeattr->wMinorVerNum == 0, "wMinorVerNum = %d\n", typeattr->wMinorVerNum); + + ITypeInfo_ReleaseTypeAttr(ti, typeattr); + + ITypeInfo_Release(ti); + + ICreateTypeInfo_Release(createti); + hres = ITypeInfo_GetTypeAttr(interface1, &typeattr); ok(hres == S_OK, "got %08x\n", hres); ok(typeattr->cbSizeInstance == 4, "cbSizeInstance = %d\n", typeattr->cbSizeInstance); @@ -1348,6 +1383,7 @@ static void test_CreateTypeLib(void) { ITypeInfo_Release(interface2); ITypeInfo_Release(interface1); + ITypeInfo_Release(dispatch); ITypeInfo_Release(unknown); ITypeLib_Release(tl); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index ca4bda7..de84e4a 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -170,6 +170,9 @@ typedef struct tagICreateTypeLib2Impl char *typelib_segment_data[MSFT_SEG_MAX]; int typelib_segment_block_length[MSFT_SEG_MAX]; + int typelib_guids; /* Number of defined typelib guids */ + int typeinfo_guids; /* Number of defined typeinfo guids */ + INT typelib_typeinfo_offsets[0x200]; /* Hope that's enough. */ INT *typelib_namehash_segment; @@ -1547,7 +1550,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( WCHAR name[MAX_PATH], *p; TLIBATTR *tlibattr; TYPEATTR *typeattr; - MSFT_GuidEntry guid; + MSFT_GuidEntry guid, *check_guid; MSFT_ImpInfo impinfo; int guid_offset, import_offset; DWORD len; @@ -1559,7 +1562,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( return hres; guid.guid = tlibattr->guid; - guid.hreftype = 2; + guid.hreftype = This->typelib->typelib_guids*12+2; guid.next_hash = -1; guid_offset = ctl2_alloc_guid(This->typelib, &guid); @@ -1568,6 +1571,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( return E_OUTOFMEMORY; } + check_guid = (MSFT_GuidEntry*)&This->typelib->typelib_segment_data[MSFT_SEG_GUID][guid_offset]; + if(check_guid->hreftype == guid.hreftype) + This->typelib->typelib_guids++; + /* Get import file name */ /* Check HKEY_CLASSES_ROOT\TypeLib\{GUID}\{Ver}\0\win32 */ len = MAX_PATH; @@ -1599,7 +1606,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( return hres; guid.guid = typeattr->guid; - guid.hreftype = 1; + guid.hreftype = This->typelib->typeinfo_guids*12+1; guid.next_hash = -1; ITypeInfo_ReleaseTypeAttr(pTInfo, typeattr); @@ -1607,6 +1614,10 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( if(guid_offset == -1) return E_OUTOFMEMORY; + check_guid = (MSFT_GuidEntry*)&This->typelib->typelib_segment_data[MSFT_SEG_GUID][guid_offset]; + if(check_guid->hreftype == guid.hreftype) + This->typelib->typeinfo_guids++; + /* Allocate importinfo */ impinfo.flags = ((This->typeinfo->typekind&0xf)<<24) | MSFT_IMPINFO_OFFSET_IS_GUID; impinfo.oImpFile = import_offset; @@ -2316,6 +2327,9 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( if(FAILED(hres)) return hres; + if(!memcmp(&typeattr->guid, &IID_IDispatch, sizeof(IDispatch))) + This->typeinfo->flags |= TYPEFLAG_FDISPATCHABLE; + This->typeinfo->datatype2 += (typeattr->cFuncs<<16) + 1; ITypeInfo_ReleaseTypeAttr(cur, typeattr);

1 0

Piotr Caban : oleaut32: Added ITypeLib2_GetDocumentation implementation.
by Alexandre Julliard 25 Feb '10

25 Feb '10

Module: wine Branch: master Commit: 247b11e046d666cf1614348ea227efc262cfff57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=247b11e046d666cf1614348ea… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 25 15:22:52 2010 +0100 oleaut32: Added ITypeLib2_GetDocumentation implementation. --- dlls/oleaut32/tests/typelib.c | 26 ++++++++++++ dlls/oleaut32/typelib2.c | 88 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 111 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 1582bb2..40423f3 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -970,6 +970,7 @@ if(use_midl_tlb) { static void test_CreateTypeLib(void) { static const WCHAR stdoleW[] = {'s','t','d','o','l','e','2','.','t','l','b',0}; + static OLECHAR typelibW[] = {'t','y','p','e','l','i','b',0}; static OLECHAR interface1W[] = {'i','n','t','e','r','f','a','c','e','1',0}; static OLECHAR interface2W[] = {'i','n','t','e','r','f','a','c','e','2',0}; static OLECHAR coclassW[] = {'c','o','c','l','a','s','s',0}; @@ -994,6 +995,8 @@ static void test_CreateTypeLib(void) { TYPEATTR *typeattr; TLIBATTR *libattr; HREFTYPE hreftype; + BSTR name, docstring, helpfile; + DWORD helpcontext; int impltypeflags; HRESULT hres; @@ -1024,6 +1027,29 @@ static void test_CreateTypeLib(void) { ITypeLib_ReleaseTLibAttr(tl, libattr); + name = (BSTR)0xdeadbeef; + hres = ITypeLib_GetDocumentation(tl, -1, &name, &docstring, &helpcontext, &helpfile); + ok(hres == S_OK, "got %08x\n", hres); + ok(name == NULL, "name != NULL\n"); + ok(docstring == NULL, "docstring != NULL\n"); + ok(helpcontext == 0, "helpcontext != 0\n"); + ok(helpfile == NULL, "helpfile != NULL\n"); + + hres = ITypeLib_GetDocumentation(tl, 0, &name, NULL, NULL, NULL); + ok(hres == TYPE_E_ELEMENTNOTFOUND, "got %08x\n", hres); + + hres = ICreateTypeLib_SetName(createtl, typelibW); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeLib_GetDocumentation(tl, -1, NULL, NULL, NULL, NULL); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeLib_GetDocumentation(tl, -1, &name, NULL, NULL, NULL); + ok(hres == S_OK, "got %08x\n", hres); + ok(!memcmp(name, typelibW, sizeof(typelibW)), "name = %s\n", wine_dbgstr_w(name)); + + SysFreeString(name); + ITypeLib_Release(tl); hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 0f7f18b..ca4bda7 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -396,6 +396,27 @@ static int ctl2_encode_name( } /**************************************************************************** + * ctl2_decode_name + * + * Converts string stored in typelib data to unicode. + */ +static void ctl2_decode_name( + char *data, /* [I] String to be decoded */ + WCHAR **string) /* [O] Decoded string */ +{ + int i, length; + static WCHAR converted_string[0x104]; + + length = data[0]; + + for(i=0; i<length; i++) + converted_string[i] = data[i+4]; + converted_string[length] = '\0'; + + *string = converted_string; +} + +/**************************************************************************** * ctl2_encode_string * * Encodes a string to a form suitable for storing into a type library or @@ -443,7 +464,7 @@ static void ctl2_decode_string( static WCHAR converted_string[0x104]; length = data[0] + (data[1]<<8); - if(length & 1) + if((length&0x3) == 1) length >>= 2; for(i=0; i<length; i++) @@ -4314,10 +4335,71 @@ static HRESULT WINAPI ITypeLib2_fnGetDocumentation( BSTR* pBstrHelpFile) { ICreateTypeLib2Impl *This = impl_from_ITypeLib2(iface); + WCHAR *string; - FIXME("(%p,%d,%p,%p,%p,%p), stub!\n", This, index, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + TRACE("(%p,%d,%p,%p,%p,%p)\n", This, index, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); - return E_OUTOFMEMORY; + if(index != -1) { + ICreateTypeInfo2Impl *iter; + + for(iter=This->typeinfos; iter!=NULL && index!=0; iter=iter->next_typeinfo) + index--; + + if(!iter) + return TYPE_E_ELEMENTNOTFOUND; + + return ITypeInfo_GetDocumentation((ITypeInfo*)iter->lpVtblTypeInfo2, + -1, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + } + + if(pBstrName) { + if(This->typelib_header.NameOffset == -1) + *pBstrName = NULL; + else { + MSFT_NameIntro *name = (MSFT_NameIntro*)&This-> + typelib_segment_data[MSFT_SEG_NAME][This->typelib_header.NameOffset]; + + ctl2_decode_name((char*)&name->namelen, &string); + + *pBstrName = SysAllocString(string); + if(!*pBstrName) + return E_OUTOFMEMORY; + } + } + + if(pBstrDocString) { + if(This->typelib_header.helpstring == -1) + *pBstrDocString = NULL; + else { + ctl2_decode_string(&This->typelib_segment_data[MSFT_SEG_STRING][This->typelib_header.helpstring], &string); + + *pBstrDocString = SysAllocString(string); + if(!*pBstrDocString) { + if(pBstrName) SysFreeString(*pBstrName); + return E_OUTOFMEMORY; + } + } + } + + if(pdwHelpContext) + *pdwHelpContext = This->typelib_header.helpcontext; + + if(pBstrHelpFile) { + if(This->typelib_header.helpfile == -1) + *pBstrHelpFile = NULL; + else { + ctl2_decode_string(&This->typelib_segment_data[MSFT_SEG_STRING][This->typelib_header.helpfile], &string); + + *pBstrHelpFile = SysAllocString(string); + if(!*pBstrHelpFile) { + if(pBstrName) SysFreeString(*pBstrName); + if(pBstrDocString) SysFreeString(*pBstrDocString); + return E_OUTOFMEMORY; + } + } + } + + return S_OK; } /******************************************************************************

1 0

Piotr Caban : oleaut32: Added ITypeLib2_GetLibAttr implementation.
by Alexandre Julliard 25 Feb '10

25 Feb '10

Module: wine Branch: master Commit: 177d7aac3d3f400cf32aee8a5b175b3674b77db0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177d7aac3d3f400cf32aee8a5… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Feb 25 15:07:13 2010 +0100 oleaut32: Added ITypeLib2_GetLibAttr implementation. --- dlls/oleaut32/tests/typelib.c | 16 ++++++++++++++++ dlls/oleaut32/typelib2.c | 27 +++++++++++++++++++++++---- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index aaaaceb..1582bb2 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -992,6 +992,7 @@ static void test_CreateTypeLib(void) { PARAMDESCEX paramdescex; TYPEDESC typedesc1, typedesc2; TYPEATTR *typeattr; + TLIBATTR *libattr; HREFTYPE hreftype; int impltypeflags; HRESULT hres; @@ -1010,6 +1011,21 @@ static void test_CreateTypeLib(void) { hres = CreateTypeLib2(SYS_WIN32, filenameW, &createtl); ok(hres == S_OK, "got %08x\n", hres); + hres = ICreateTypeLib_QueryInterface(createtl, &IID_ITypeLib, (void**)&tl); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeLib_GetLibAttr(tl, &libattr); + ok(hres == S_OK, "got %08x\n", hres); + + ok(libattr->syskind == SYS_WIN32, "syskind = %d\n", libattr->syskind); + ok(libattr->wMajorVerNum == 0, "wMajorVer = %d\n", libattr->wMajorVerNum); + ok(libattr->wMinorVerNum == 0, "wMinorVerNum = %d\n", libattr->wMinorVerNum); + ok(libattr->wLibFlags == 0, "wLibFlags = %d\n", libattr->wLibFlags); + + ITypeLib_ReleaseTLibAttr(tl, libattr); + + ITypeLib_Release(tl); + hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); ok(hres == S_OK, "got %08x\n", hres); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 03db7b5..0f7f18b 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -4260,9 +4260,28 @@ static HRESULT WINAPI ITypeLib2_fnGetLibAttr( { ICreateTypeLib2Impl *This = impl_from_ITypeLib2(iface); - FIXME("(%p,%p), stub!\n", This, ppTLibAttr); + TRACE("(%p,%p)\n", This, ppTLibAttr); - return E_OUTOFMEMORY; + if(!ppTLibAttr) + return E_INVALIDARG; + + *ppTLibAttr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TLIBATTR)); + if(!*ppTLibAttr) + return E_OUTOFMEMORY; + + if(This->typelib_header.posguid != -1) { + MSFT_GuidEntry *guid; + + guid = (MSFT_GuidEntry*)&This->typelib_segment_data[MSFT_SEG_GUID][This->typelib_header.posguid]; + (*ppTLibAttr)->guid = guid->guid; + } + + (*ppTLibAttr)->lcid = This->typelib_header.lcid; + (*ppTLibAttr)->syskind = This->typelib_header.varflags&0x3; + (*ppTLibAttr)->wMajorVerNum = This->typelib_header.version&0xffff; + (*ppTLibAttr)->wMinorVerNum = This->typelib_header.version>>16; + (*ppTLibAttr)->wLibFlags = This->typelib_header.flags; + return S_OK; } /****************************************************************************** @@ -4366,9 +4385,9 @@ static void WINAPI ITypeLib2_fnReleaseTLibAttr( ITypeLib2 * iface, TLIBATTR* pTLibAttr) { - ICreateTypeLib2Impl *This = impl_from_ITypeLib2(iface); + TRACE("(%p,%p)\n", iface, pTLibAttr); - FIXME("(%p,%p), stub!\n", This, pTLibAttr); + HeapFree(GetProcessHeap(), 0, pTLibAttr); } /******************************************************************************

1 0

Huw Davies : oleaut32: Correctly marshal NULL interface ptrs.
by Alexandre Julliard 25 Feb '10

25 Feb '10

Module: wine Branch: master Commit: 522a00e69a4a2481e2b066f0fcc71227a74848b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=522a00e69a4a2481e2b066f0f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 25 13:48:22 2010 +0000 oleaut32: Correctly marshal NULL interface ptrs. --- dlls/oleaut32/tests/usrmarshal.c | 24 ++++++++++++++++++++++ dlls/oleaut32/usrmarshal.c | 41 +++++++++++++++++++++++++------------- 2 files changed, 51 insertions(+), 14 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index b5cdc1e..9275837 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1427,6 +1427,30 @@ static void test_marshal_VARIANT(void) } HeapFree(GetProcessHeap(), 0, oldbuffer); + /*** NULL UNKNOWN ***/ + VariantInit(&v); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = NULL; + + rpcMsg.BufferLength = stubMsg.BufferLength = VARIANT_UserSize(&umcb.Flags, 0, &v); + ok(stubMsg.BufferLength >= 24, "size %d\n", stubMsg.BufferLength); + buffer = rpcMsg.Buffer = stubMsg.Buffer = stubMsg.BufferStart = alloc_aligned(stubMsg.BufferLength, &oldbuffer); + stubMsg.BufferEnd = stubMsg.Buffer + stubMsg.BufferLength; + memset(buffer, 0xcc, stubMsg.BufferLength); + next = VARIANT_UserMarshal(&umcb.Flags, buffer, &v); + wirev = (DWORD*)buffer; + check_variant_header(wirev, &v, next - buffer); + wirev += 5; + ok(*wirev == 0, "wv[5] %08x\n", *wirev); + + VariantInit(&v2); + stubMsg.Buffer = buffer; + next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); + ok(V_VT(&v) == V_VT(&v2), "got vt %d expect %d\n", V_VT(&v), V_VT(&v2)); + ok(V_UNKNOWN(&v2) == NULL, "got %p expect NULL\n", V_UNKNOWN(&v2)); + VARIANT_UserFree(&umcb.Flags, &v2); + HeapFree(GetProcessHeap(), 0, oldbuffer); + /*** UNKNOWN BYREF ***/ heap_unknown = HeapAlloc(GetProcessHeap(), 0, sizeof(*heap_unknown)); heap_unknown->lpVtbl = &HeapUnknown_Vtbl; diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 202cf84..402794c 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -256,20 +256,21 @@ static unsigned int get_type_alignment(ULONG *pFlags, VARTYPE vt) static unsigned interface_variant_size(const ULONG *pFlags, REFIID riid, IUnknown *punk) { - ULONG size; - HRESULT hr; - /* find the buffer size of the marshalled dispatch interface */ - hr = CoGetMarshalSizeMax(&size, riid, punk, LOWORD(*pFlags), NULL, MSHLFLAGS_NORMAL); - if (FAILED(hr)) { - if (!punk) - WARN("NULL dispatch pointer\n"); - else - ERR("Dispatch variant buffer size calculation failed, HRESULT=0x%x\n", hr); - return 0; - } - size += sizeof(ULONG); /* we have to store the buffersize in the stream */ - TRACE("wire-size extra of dispatch variant is %d\n", size); - return size; + ULONG size = 0; + HRESULT hr; + + if (punk) + { + hr = CoGetMarshalSizeMax(&size, riid, punk, LOWORD(*pFlags), NULL, MSHLFLAGS_NORMAL); + if (FAILED(hr)) + { + ERR("interface variant buffer size calculation failed, HRESULT=0x%x\n", hr); + return 0; + } + } + size += sizeof(ULONG); /* we have to store the buffersize in the stream */ + TRACE("wire-size extra of interface variant is %d\n", size); + return size; } static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) @@ -322,6 +323,12 @@ static unsigned char* interface_variant_marshal(const ULONG *pFlags, unsigned ch TRACE("pFlags=%d, Buffer=%p, pUnk=%p\n", *pFlags, Buffer, punk); + if(!punk) + { + memset(Buffer, 0, sizeof(ULONG)); + return Buffer + sizeof(ULONG); + } + oldpos = Buffer; /* CoMarshalInterface needs a stream, whereas at this level we are operating in terms of buffers. @@ -378,6 +385,12 @@ static unsigned char *interface_variant_unmarshal(const ULONG *pFlags, unsigned memcpy(&size, Buffer, sizeof(ULONG)); TRACE("buffersize=%d\n", size); + if(!size) + { + *ppunk = NULL; + return Buffer + sizeof(ULONG); + } + working_mem = GlobalAlloc(0, size); if (!working_mem) return oldpos;

1 0

Vincent Povirk : gdiplus: Stub GdipGetRegionScansCount.
by Alexandre Julliard 25 Feb '10

25 Feb '10

Module: wine Branch: master Commit: 10990f5898f4f04fda5c9fcd9cfee2fa4903f87a URL: http://source.winehq.org/git/wine.git/?a=commit;h=10990f5898f4f04fda5c9fcd9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 24 17:36:54 2010 -0600 gdiplus: Stub GdipGetRegionScansCount. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/region.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 2859f5b..e6cea5a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -381,7 +381,7 @@ @ stdcall GdipGetRegionDataSize(ptr ptr) @ stdcall GdipGetRegionHRgn(ptr ptr ptr) @ stub GdipGetRegionScans -@ stub GdipGetRegionScansCount +@ stdcall GdipGetRegionScansCount(ptr ptr ptr) @ stub GdipGetRegionScansI @ stub GdipGetRenderingOrigin @ stdcall GdipGetSmoothingMode(ptr ptr) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index eab9b8f..decaaf9 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -1306,3 +1306,15 @@ GpStatus WINGDIPAPI GdipTranslateRegionI(GpRegion *region, INT dx, INT dy) return GdipTranslateRegion(region, (REAL)dx, (REAL)dy); } + +GpStatus WINGDIPAPI GdipGetRegionScansCount(GpRegion *region, UINT *count, GpMatrix *matrix) +{ + static int calls; + + TRACE("(%p, %p, %p)\n", region, count, matrix); + + if (!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +}

1 0

Vincent Povirk : gdiplus: Stub GdipGetImageItemData.
by Alexandre Julliard 25 Feb '10

25 Feb '10

Module: wine Branch: master Commit: ab124aa6b83eb5c520711d8fa98cd3b55694b9be URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab124aa6b83eb5c520711d8fa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 24 17:25:49 2010 -0600 gdiplus: Stub GdipGetImageItemData. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 1da91d3..2859f5b 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -290,7 +290,7 @@ @ stdcall GdipGetImageGraphicsContext(ptr ptr) @ stdcall GdipGetImageHeight(ptr ptr) @ stdcall GdipGetImageHorizontalResolution(ptr ptr) -@ stub GdipGetImageItemData +@ stdcall GdipGetImageItemData(ptr ptr) @ stdcall GdipGetImagePalette(ptr ptr long) @ stdcall GdipGetImagePaletteSize(ptr ptr) @ stdcall GdipGetImagePixelFormat(ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index bd480c2..bb2f7ff 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1860,6 +1860,18 @@ GpStatus WINGDIPAPI GdipFindFirstImageItem(GpImage *image, ImageItemData* item) return NotImplemented; } +GpStatus WINGDIPAPI GdipGetImageItemData(GpImage *image, ImageItemData *item) +{ + static int calls; + + TRACE("(%p,%p)\n", image, item); + + if (!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetImageBounds(GpImage *image, GpRectF *srcRect, GpUnit *srcUnit) {

1 0

Vincent Povirk : gdiplus: Free the attached HBITMAP when destroying Bitmap objects.
by Alexandre Julliard 25 Feb '10

25 Feb '10

Module: wine Branch: master Commit: f62560f76c532dcbcee158434c3649ad08342bf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f62560f76c532dcbcee158434… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 24 17:01:39 2010 -0600 gdiplus: Free the attached HBITMAP when destroying Bitmap objects. --- dlls/gdiplus/image.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1d48a0b..bd480c2 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1837,6 +1837,7 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) { GdipFree(((GpBitmap*)image)->bitmapbits); DeleteDC(((GpBitmap*)image)->hdc); + DeleteObject(((GpBitmap*)image)->hbitmap); } GdipFree(image->palette_entries); GdipFree(image);

1 0

Dylan Smith : wordpad: Show page numbers in statusbar for print preview.
by Alexandre Julliard 25 Feb '10

25 Feb '10

Module: wine Branch: master Commit: bb58537e951382d46ac62fdc04561b04bc78fd53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb58537e951382d46ac62fdc0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Feb 25 01:50:01 2010 -0500 wordpad: Show page numbers in statusbar for print preview. --- programs/wordpad/Da.rc | 2 ++ programs/wordpad/De.rc | 2 ++ programs/wordpad/En.rc | 2 ++ programs/wordpad/Fr.rc | 2 ++ programs/wordpad/Hu.rc | 2 ++ programs/wordpad/It.rc | 2 ++ programs/wordpad/Ja.rc | 2 ++ programs/wordpad/Ko.rc | 4 +++- programs/wordpad/Lt.rc | 2 ++ programs/wordpad/Nl.rc | 2 ++ programs/wordpad/No.rc | 2 ++ programs/wordpad/Pl.rc | 2 ++ programs/wordpad/Pt.rc | 2 ++ programs/wordpad/Ru.rc | 2 ++ programs/wordpad/Si.rc | 2 ++ programs/wordpad/Sv.rc | 2 ++ programs/wordpad/Tr.rc | 2 ++ programs/wordpad/Uk.rc | 2 ++ programs/wordpad/Zh.rc | 2 ++ programs/wordpad/print.c | 22 ++++++++++++++++++++++ programs/wordpad/wordpad.c | 2 +- programs/wordpad/wordpad.h | 4 +++- 22 files changed, 65 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb58537e951382d46ac62…

1 0

Dmitry Timoshkov : gdi32: Fix the DeleteDC test failures under Win9x.
by Alexandre Julliard 25 Feb '10

25 Feb '10

Module: wine Branch: master Commit: 2f7053e6c040c4a491fbfbdbdd3f1c63c7240823 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f7053e6c040c4a491fbfbdbd… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Feb 25 13:17:44 2010 +0800 gdi32: Fix the DeleteDC test failures under Win9x. --- dlls/gdi32/tests/dc.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 43c2480..193832c 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -347,7 +347,7 @@ static void test_DeleteDC(void) ret = DeleteDC(hdc); ok(ret, "DeleteDC failed\n"); ret = GetObjectType(hdc); - ok(!ret, "GetObjectType should fail for a deleted DC\n"); + ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n"); hdc = GetWindowDC(hwnd); ok(hdc != 0, "GetDC failed\n"); @@ -356,7 +356,7 @@ static void test_DeleteDC(void) ret = DeleteDC(hdc); ok(ret, "DeleteDC failed\n"); ret = GetObjectType(hdc); - ok(!ret, "GetObjectType should fail for a deleted DC\n"); + ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n"); DestroyWindow(hwnd); @@ -371,7 +371,7 @@ static void test_DeleteDC(void) ret = DeleteDC(hdc); ok(ret, "DeleteDC failed\n"); ret = GetObjectType(hdc); - ok(!ret, "GetObjectType should fail for a deleted DC\n"); + ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n"); hdc = GetWindowDC(hwnd); ok(hdc != 0, "GetDC failed\n"); @@ -380,7 +380,7 @@ static void test_DeleteDC(void) ret = DeleteDC(hdc); ok(ret, "DeleteDC failed\n"); ret = GetObjectType(hdc); - ok(!ret, "GetObjectType should fail for a deleted DC\n"); + ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n"); /* CS_CLASSDC */ memset(&cls, 0, sizeof(cls)); @@ -418,7 +418,7 @@ static void test_DeleteDC(void) ret = DeleteDC(hdc); ok(ret, "DeleteDC failed\n"); ret = GetObjectType(hdc); - ok(!ret, "GetObjectType should fail for a deleted DC\n"); + ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n"); DestroyWindow(hwnd); @@ -466,13 +466,10 @@ todo_wine ret = DeleteDC(hdc); ok(ret, "DeleteDC failed\n"); ret = GetObjectType(hdc); - ok(!ret, "GetObjectType should fail for a deleted DC\n"); + ok(!ret || broken(ret) /* win9x */, "GetObjectType should fail for a deleted DC\n"); DestroyWindow(hwnd); - ret = GetObjectType(hdc_test); - ok(!ret, "GetObjectType should fail for a deleted DC\n"); - ret = UnregisterClassA("Wine own DC", GetModuleHandle(NULL)); ok(ret, "UnregisterClassA failed\n"); }

1 0

Reece Dunn : ole32: Fix the HGLOBAL stream Seek implementation.
by Alexandre Julliard 25 Feb '10

25 Feb '10

Module: wine Branch: master Commit: f08206b31f0bff94ffec8ff4d4eee646d78ffbfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08206b31f0bff94ffec8ff4d… Author: Reece Dunn <msclrhd(a)gmail.com> Date: Thu Feb 25 09:14:37 2010 +0000 ole32: Fix the HGLOBAL stream Seek implementation. --- dlls/ole32/hglobalstream.c | 21 ++++++++++++++------- dlls/ole32/tests/hglobalstream.c | 14 -------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index c43d499..5742f99 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -365,11 +365,18 @@ static HRESULT WINAPI HGLOBALStreamImpl_Seek( { HGLOBALStreamImpl* const This=(HGLOBALStreamImpl*)iface; - ULARGE_INTEGER newPosition; + ULARGE_INTEGER newPosition = This->currentPosition; + HRESULT hr = S_OK; TRACE("(%p, %x%08x, %d, %p)\n", iface, dlibMove.u.HighPart, dlibMove.u.LowPart, dwOrigin, plibNewPosition); + if (dlibMove.u.LowPart >= 0x80000000) + { + hr = STG_E_SEEKERROR; + goto end; + } + /* * The file pointer is moved depending on the given "function" * parameter. @@ -381,13 +388,13 @@ static HRESULT WINAPI HGLOBALStreamImpl_Seek( newPosition.u.LowPart = 0; break; case STREAM_SEEK_CUR: - newPosition = This->currentPosition; break; case STREAM_SEEK_END: newPosition = This->streamSize; break; default: - return STG_E_INVALIDFUNCTION; + hr = STG_E_SEEKERROR; + goto end; } /* @@ -395,14 +402,14 @@ static HRESULT WINAPI HGLOBALStreamImpl_Seek( * If the file pointer ends-up after the end of the stream, the next Write operation will * make the file larger. This is how it is documented. */ - if (dlibMove.QuadPart < 0 && newPosition.QuadPart < -dlibMove.QuadPart) return STG_E_INVALIDFUNCTION; - - newPosition.QuadPart += dlibMove.QuadPart; + newPosition.u.HighPart = 0; + newPosition.u.LowPart += dlibMove.QuadPart; +end: if (plibNewPosition) *plibNewPosition = newPosition; This->currentPosition = newPosition; - return S_OK; + return hr; } /*** diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index d95a7c4..1fed237 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -97,11 +97,8 @@ static void test_streamonhglobal(IStream *pStream) ll.u.HighPart = 0; ll.u.LowPart = 123; hr = IStream_Seek(pStream, ll, STREAM_SEEK_END+1, &ull); - todo_wine ok(hr == STG_E_SEEKERROR, "IStream_Seek should have returned STG_E_SEEKERROR instead of 0x%08x\n", hr); - todo_wine ok(ull.u.LowPart == sizeof(data), "should have set LowPart to %d instead of %d\n", sizeof(data), ull.u.LowPart); - todo_wine ok(ull.u.HighPart == 0, "should not have changed HighPart, got %d\n", ull.u.HighPart); /* IStream_Seek -- valid position argument (seek to beginning) */ @@ -135,11 +132,8 @@ static void test_streamonhglobal(IStream *pStream) ll.u.HighPart = -1; ll.u.LowPart = 0; hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); - todo_wine ok_ole_success(hr, "IStream_Seek"); - todo_wine ok(ull.u.LowPart == sizeof(data), "should have set LowPart to %d instead of %d\n", sizeof(data), ull.u.LowPart); - todo_wine ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); /* IStream_Seek -- ignore HighPart in the move value (seek to beginning) */ @@ -153,11 +147,8 @@ static void test_streamonhglobal(IStream *pStream) ll.u.HighPart = -1; ll.u.LowPart = 0; hr = IStream_Seek(pStream, ll, STREAM_SEEK_SET, &ull); - todo_wine ok_ole_success(hr, "IStream_Seek"); - todo_wine ok(ull.u.LowPart == 0, "should have set LowPart to 0 instead of %d\n", ull.u.LowPart); - todo_wine ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); /* IStream_Seek -- invalid LowPart value (seek from current position) */ @@ -171,9 +162,7 @@ static void test_streamonhglobal(IStream *pStream) ll.u.HighPart = 0; ll.u.LowPart = 0x80000000; hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); - todo_wine ok(hr == STG_E_SEEKERROR, "IStream_Seek should have returned STG_E_SEEKERROR instead of 0x%08x\n", hr); - todo_wine ok(ull.u.LowPart == sizeof(data), "should have set LowPart to %d instead of %d\n", sizeof(data), ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); @@ -188,9 +177,7 @@ static void test_streamonhglobal(IStream *pStream) ll.u.HighPart = 0; ll.u.LowPart = 0x80000000; hr = IStream_Seek(pStream, ll, STREAM_SEEK_SET, &ull); - todo_wine ok(hr == STG_E_SEEKERROR, "IStream_Seek should have returned STG_E_SEEKERROR instead of 0x%08x\n", hr); - todo_wine ok(ull.u.LowPart == sizeof(data), "should have set LowPart to %d instead of %d\n", sizeof(data), ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); @@ -237,7 +224,6 @@ static void test_streamonhglobal(IStream *pStream) hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); ok_ole_success(hr, "IStream_Seek"); ok(ull.u.LowPart == 0x00000007, "should have set LowPart to 0x00000007 instead of %08x\n", ull.u.LowPart); - todo_wine ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart); hr = IStream_Commit(pStream, STGC_DEFAULT);

1 0

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 February 2010