November 2006 - Wine-commits

Stefan Leichter : msi: Added stub for MsiGetFeatureValidStatesA/W.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 723abff804e7c15d4daff4140a3679947a3b6d47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=723abff804e7c15d4daff4140… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Tue Nov 7 19:47:05 2006 +0100 msi: Added stub for MsiGetFeatureValidStatesA/W. --- dlls/msi/install.c | 29 +++++++++++++++++++++++++++++ dlls/msi/msi.spec | 4 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index fdec30c..ff6e21f 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -827,3 +827,32 @@ UINT WINAPI MsiSetInstallLevel(MSIHANDLE return r; } + +/*********************************************************************** + * MsiGetFeatureValidStatesW (MSI.@) + */ +UINT WINAPI MsiGetFeatureValidStatesW(MSIHANDLE hInstall, LPCWSTR szFeature, + DWORD* pInstallState) +{ + if(pInstallState) *pInstallState = 1<<INSTALLSTATE_LOCAL; + FIXME("%ld %s %p stub returning %d\n", + hInstall, debugstr_w(szFeature), pInstallState, pInstallState ? *pInstallState : 0); + + return ERROR_SUCCESS; +} + +/*********************************************************************** + * MsiGetFeatureValidStatesA (MSI.@) + */ +UINT WINAPI MsiGetFeatureValidStatesA(MSIHANDLE hInstall, LPCSTR szFeature, + DWORD* pInstallState) +{ + UINT ret; + LPWSTR szwFeature = strdupAtoW(szFeature); + + ret = MsiGetFeatureValidStatesW(hInstall, szwFeature, pInstallState); + + msi_free(szwFeature); + + return ret; +} diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 295ba7b..1bc1aef 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -54,8 +54,8 @@ 58 stdcall MsiGetFeatureStateW(long wstr ptr ptr) 59 stdcall MsiGetFeatureUsageA(str str ptr ptr) 60 stdcall MsiGetFeatureUsageW(wstr wstr ptr ptr) -61 stub MsiGetFeatureValidStatesA -62 stub MsiGetFeatureValidStatesW +61 stdcall MsiGetFeatureValidStatesA(long str ptr) +62 stdcall MsiGetFeatureValidStatesW(long wstr ptr) 63 stdcall MsiGetLanguage(long) 64 stdcall MsiGetMode(long long) 65 stdcall MsiGetProductCodeA(str str)

1 0

Andrew Talbot : oleaut32: Cast-qual warnings fix.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 501e2dcc996509b5303965933aec3d751a1cc500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=501e2dcc996509b5303965933… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Nov 7 21:55:29 2006 +0000 oleaut32: Cast-qual warnings fix. --- dlls/oleaut32/varformat.c | 8 ++++---- dlls/oleaut32/vartype.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 0abc78c..f8ccfd3 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -1858,7 +1858,7 @@ static HRESULT VARIANT_FormatString(LPVA LPBYTE rgbTok, ULONG dwFlags, BSTR *pbstrOut, LCID lcid) { - static const WCHAR szEmpty[] = { '\0' }; + static WCHAR szEmpty[] = { '\0' }; WCHAR buff[256], *pBuff = buff; WCHAR *pSrc; FMT_HEADER *header = (FMT_HEADER*)rgbTok; @@ -1878,7 +1878,7 @@ static HRESULT VARIANT_FormatString(LPVA if (V_TYPE(pVarIn) == VT_EMPTY || V_TYPE(pVarIn) == VT_NULL) { strHeader = (FMT_STRING_HEADER*)(rgbTok + FmtGetNegative(header)); - V_BSTR(&vStr) = (WCHAR*)szEmpty; + V_BSTR(&vStr) = szEmpty; } else { @@ -2131,7 +2131,7 @@ HRESULT WINAPI VarFormat(LPVARIANT pVarI */ HRESULT WINAPI VarFormatDateTime(LPVARIANT pVarIn, INT nFormat, ULONG dwFlags, BSTR *pbstrOut) { - static const WCHAR szEmpty[] = { '\0' }; + static WCHAR szEmpty[] = { '\0' }; const BYTE* lpFmt = NULL; TRACE("(%p->(%s%s),%d,0x%08x,%p)\n", pVarIn, debugstr_VT(pVarIn), @@ -2148,7 +2148,7 @@ HRESULT WINAPI VarFormatDateTime(LPVARIA case 3: lpFmt = fmtLongTime; break; case 4: lpFmt = fmtShortTime; break; } - return VarFormatFromTokens(pVarIn, (LPWSTR)szEmpty, (BYTE*)lpFmt, dwFlags, + return VarFormatFromTokens(pVarIn, szEmpty, (BYTE*)lpFmt, dwFlags, pbstrOut, LOCALE_USER_DEFAULT); } diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index f379517..57239a4 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -114,7 +114,7 @@ static HRESULT VARIANT_NumberFromBstr(OL static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut, VARTYPE vt, DWORD dwFlags) { - static const DISPPARAMS emptyParams = { NULL, NULL, 0, 0 }; + static DISPPARAMS emptyParams = { NULL, NULL, 0, 0 }; VARIANTARG srcVar, dstVar; HRESULT hRet; @@ -123,7 +123,7 @@ static HRESULT VARIANT_FromDisp(IDispatc /* Get the default 'value' property from the IDispatch */ hRet = IDispatch_Invoke(pdispIn, DISPID_VALUE, &IID_NULL, lcid, DISPATCH_PROPERTYGET, - (DISPPARAMS*)&emptyParams, &srcVar, NULL, NULL); + &emptyParams, &srcVar, NULL, NULL); if (SUCCEEDED(hRet)) {

1 0

Mike McCormack : comctl32: Fix a regression in ImageList_AddMasked().
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 7486f47b1971a40d5ef4fe56f099143053e4d96f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7486f47b1971a40d5ef4fe56f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Nov 8 18:27:56 2006 +0900 comctl32: Fix a regression in ImageList_AddMasked(). --- dlls/comctl32/imagelist.c | 90 ++++++++++++++++++--------------------------- 1 files changed, 36 insertions(+), 54 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 1cc886e..36fe384 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -331,7 +331,7 @@ INT WINAPI ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask) { HDC hdcMask, hdcBitmap; - INT nIndex, nImageCount; + INT i, nIndex, nImageCount; BITMAP bmp; HBITMAP hOldBitmap; HBITMAP hMaskBitmap=0; @@ -356,69 +356,51 @@ ImageList_AddMasked (HIMAGELIST himl, HB himl->cCurImage += nImageCount; hdcBitmap = CreateCompatibleDC(0); + hOldBitmap = SelectObject(hdcBitmap, hBitmap); + /* Create a temp Mask so we can remove the background of the Image */ + hdcMask = CreateCompatibleDC(0); + hMaskBitmap = CreateBitmap(bmp.bmWidth, bmp.bmHeight, 1, 1, NULL); + SelectObject(hdcMask, hMaskBitmap); - hOldBitmap = SelectObject(hdcBitmap, hBitmap); - if(himl->hbmMask) - { - hdcMask = himl->hdcMask; - imagelist_point_from_index( himl, nIndex, &pt ); - } - else - { - /* - Create a temp Mask so we can remove the background of - the Image (Windows does this even if there is no mask) - */ - hdcMask = CreateCompatibleDC(0); - hMaskBitmap = CreateBitmap(bmp.bmWidth, bmp.bmHeight, 1, 1, NULL); - SelectObject(hdcMask, hMaskBitmap); - imagelist_point_from_index( himl, 0, &pt ); - } /* create monochrome image to the mask bitmap */ - bkColor = (clrMask != CLR_DEFAULT) ? clrMask : - GetPixel (hdcBitmap, 0, 0); + bkColor = (clrMask != CLR_DEFAULT) ? clrMask : GetPixel (hdcBitmap, 0, 0); SetBkColor (hdcBitmap, bkColor); - BitBlt (hdcMask, - pt.x, pt.y, bmp.bmWidth, bmp.bmHeight, - hdcBitmap, 0, 0, - SRCCOPY); + BitBlt (hdcMask, 0, 0, bmp.bmWidth, bmp.bmHeight, hdcBitmap, 0, 0, SRCCOPY); SetBkColor(hdcBitmap, RGB(255,255,255)); - /*Remove the background from the image - */ + /* - WINDOWS BUG ALERT!!!!!! - The statement below should not be done in common practice - but this is how ImageList_AddMasked works in Windows. - It overwrites the original bitmap passed, this was discovered - by using the same bitmap to iterate the different styles - on windows where it failed (BUT ImageList_Add is OK) - This is here in case some apps rely on this bug - */ - BitBlt(hdcBitmap, - 0, 0, bmp.bmWidth, bmp.bmHeight, - hdcMask, - pt.x, pt.y, - 0x220326); /* NOTSRCAND */ - /* Copy result to the imagelist - */ - imagelist_point_from_index( himl, nIndex, &pt ); - BitBlt (himl->hdcImage, - pt.x, pt.y, bmp.bmWidth, bmp.bmHeight, - hdcBitmap, - 0, 0, - SRCCOPY); - /* Clean up - */ - SelectObject(hdcBitmap, hOldBitmap); - DeleteDC(hdcBitmap); - if(!himl->hbmMask) + * Remove the background from the image + * + * WINDOWS BUG ALERT!!!!!! + * The statement below should not be done in common practice + * but this is how ImageList_AddMasked works in Windows. + * It overwrites the original bitmap passed, this was discovered + * by using the same bitmap to iterate the different styles + * on windows where it failed (BUT ImageList_Add is OK) + * This is here in case some apps rely on this bug + * + * Blt mode 0x220326 is NOTSRCAND + */ + BitBlt(hdcBitmap, 0, 0, bmp.bmWidth, bmp.bmHeight, hdcMask, 0, 0, 0x220326); + + /* Copy result to the imagelist */ + for (i=0; i<nImageCount; i++) { - DeleteObject(hMaskBitmap); - DeleteDC(hdcMask); + imagelist_point_from_index( himl, nIndex + i, &pt ); + BitBlt(himl->hdcImage, pt.x, pt.y, himl->cx, bmp.bmHeight, + hdcBitmap, i*himl->cx, 0, SRCCOPY); + BitBlt(himl->hdcMask, pt.x, pt.y, himl->cx, bmp.bmHeight, + hdcMask, i*himl->cx, 0, SRCCOPY); } + /* Clean up */ + SelectObject(hdcBitmap, hOldBitmap); + DeleteDC(hdcBitmap); + DeleteObject(hMaskBitmap); + DeleteDC(hdcMask); + return nIndex; }

1 0

Michael Stefaniuc : rpcproxy.h: Use LONG/ ULONG for Win64 compatibility instead of long and unsigned long.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: e9ae478c14a9a075fe95a5f2b66353fb94830f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ae478c14a9a075fe95a5f2b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 7 22:02:27 2006 +0100 rpcproxy.h: Use LONG/ULONG for Win64 compatibility instead of long and unsigned long. --- dlls/rpcrt4/tests/cstub.c | 12 ++++++------ include/rpcproxy.h | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 0377092..b90c948 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -516,7 +516,7 @@ #undef VTBL_TEST_NOT_CHANGE_TO #undef VTBL_TEST_CHANGE_TO #undef VTBL_TEST_ZERO - ok(PSFactoryBuffer.RefCount == 1, "ref count %ld\n", PSFactoryBuffer.RefCount); + ok(PSFactoryBuffer.RefCount == 1, "ref count %d\n", PSFactoryBuffer.RefCount); return ppsf; } @@ -608,7 +608,7 @@ static void test_CreateStub(IPSFactoryBu CInterfaceStubHeader *header = ((CInterfaceStubHeader *)cstd_stub->lpVtbl) - 1; ok(IsEqualIID(header->piid, &IID_if1), "header iid differs\n"); - ok(cstd_stub->RefCount == 1, "ref count %ld\n", cstd_stub->RefCount); + ok(cstd_stub->RefCount == 1, "ref count %d\n", cstd_stub->RefCount); /* 0xdeadbeef returned from create_stub_test_QI */ ok(cstd_stub->pvServerObject == (void*)0xdeadbeef, "pvServerObject %p\n", cstd_stub->pvServerObject); ok(cstd_stub->pPSFactory == ppsf, "pPSFactory %p\n", cstd_stub->pPSFactory); @@ -780,21 +780,21 @@ static void test_Release(IPSFactoryBuffe facbuf_refs = PSFactoryBuffer.RefCount; /* This shows that NdrCStdStubBuffer_Release doesn't call Disconnect */ - ok(cstd_stub->RefCount == 1, "ref count %ld\n", cstd_stub->RefCount); + ok(cstd_stub->RefCount == 1, "ref count %d\n", cstd_stub->RefCount); connect_test_orig_release_called = 0; IRpcStubBuffer_Release(pstub); todo_wine { ok(connect_test_orig_release_called == 0, "release called %d\n", connect_test_orig_release_called); } - ok(PSFactoryBuffer.RefCount == facbuf_refs - 1, "factory buffer refs %ld orig %d\n", PSFactoryBuffer.RefCount, facbuf_refs); + ok(PSFactoryBuffer.RefCount == facbuf_refs - 1, "factory buffer refs %d orig %d\n", PSFactoryBuffer.RefCount, facbuf_refs); /* This shows that NdrCStdStubBuffer_Release calls Release on its 2nd arg, rather than on This->pPSFactory (which are usually the same and indeed it's odd that _Release requires this 2nd arg). */ pstub = create_stub(ppsf, &IID_if1, obj, S_OK); - ok(PSFactoryBuffer.RefCount == facbuf_refs, "factory buffer refs %ld orig %d\n", PSFactoryBuffer.RefCount, facbuf_refs); + ok(PSFactoryBuffer.RefCount == facbuf_refs, "factory buffer refs %d orig %d\n", PSFactoryBuffer.RefCount, facbuf_refs); NdrCStdStubBuffer_Release(pstub, (IPSFactoryBuffer*)pretend_psfacbuf); ok(release_test_psfacbuf_release_called == 1, "pretend_psfacbuf_release called %d\n", release_test_psfacbuf_release_called); - ok(PSFactoryBuffer.RefCount == facbuf_refs, "factory buffer refs %ld orig %d\n", PSFactoryBuffer.RefCount, facbuf_refs); + ok(PSFactoryBuffer.RefCount == facbuf_refs, "factory buffer refs %d orig %d\n", PSFactoryBuffer.RefCount, facbuf_refs); } static HRESULT WINAPI delegating_invoke_test_QI(ITypeLib *pUnk, REFIID iid, void** ppv) diff --git a/include/rpcproxy.h b/include/rpcproxy.h index a4adc02..1ebc5d8 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -91,7 +91,7 @@ typedef struct tagCInterfaceStubHeader { const IID *piid; const MIDL_SERVER_INFO *pServerInfo; - unsigned long DispatchTableCount; + ULONG DispatchTableCount; const PRPC_STUB_FUNCTION *pDispatchTable; } CInterfaceStubHeader; @@ -104,7 +104,7 @@ typedef struct tagCInterfaceStubVtbl typedef struct tagCStdStubBuffer { const IRpcStubBufferVtbl *lpVtbl; - long RefCount; + LONG RefCount; struct IUnknown *pvServerObject; const struct ICallFactoryVtbl *pCallFactoryVtbl; const IID *pAsyncIID; @@ -114,9 +114,9 @@ typedef struct tagCStdStubBuffer typedef struct tagCStdPSFactoryBuffer { const IPSFactoryBufferVtbl *lpVtbl; - long RefCount; + LONG RefCount; const ProxyFileInfo **pProxyFileList; - long Filler1; + LONG Filler1; } CStdPSFactoryBuffer; #define STUB_FORWARDING_FUNCTION NdrStubForwardingFunction @@ -180,7 +180,7 @@ RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY NdrStubInitializePartial( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDescriptor, IRpcChannelBuffer *pRpcChannelBuffer, - unsigned long RequestedBufferSize ); + ULONG RequestedBufferSize ); void __RPC_STUB NdrStubForwardingFunction( IRpcStubBuffer *This, IRpcChannelBuffer *pChannel, PRPC_MESSAGE pMsg, DWORD *pdwStubPhase ); RPCRTAPI void RPC_ENTRY

1 0

Michael Stefaniuc : rpcrt4: For Win64 compatibility use a temp variable of the right type in ComputeVariance ().
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 4e2b462d4f6c8058be382575da656f7cd7909ac9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2b462d4f6c8058be382575d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Nov 7 22:01:45 2006 +0100 rpcrt4: For Win64 compatibility use a temp variable of the right type in ComputeVariance(). --- dlls/rpcrt4/ndr_misc.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_misc.h b/dlls/rpcrt4/ndr_misc.h index a1560b9..b5c3d88 100644 --- a/dlls/rpcrt4/ndr_misc.h +++ b/dlls/rpcrt4/ndr_misc.h @@ -41,8 +41,13 @@ static inline PFORMAT_STRING ComputeConf static inline PFORMAT_STRING ComputeVariance(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, ULONG def) { + PFORMAT_STRING ret; + ULONG_PTR ActualCount = pStubMsg->ActualCount; + pStubMsg->Offset = 0; - return ComputeConformanceOrVariance(pStubMsg, pMemory, pFormat, def, &pStubMsg->ActualCount); + ret = ComputeConformanceOrVariance(pStubMsg, pMemory, pFormat, def, &ActualCount); + pStubMsg->ActualCount = (ULONG)ActualCount; + return ret; } typedef unsigned char* (WINAPI *NDR_MARSHALL) (PMIDL_STUB_MESSAGE, unsigned char*, PFORMAT_STRING);

1 0

Hwang YunSong(황윤성) : winhelp: Updated Korean resource.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 4a654758e2e46e5b83c09ebdfb0bb2c32da5f76e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a654758e2e46e5b83c09ebdf… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Tue Nov 7 17:02:30 2006 +0900 winhelp: Updated Korean resource. --- programs/winhelp/Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winhelp/Ko.rc b/programs/winhelp/Ko.rc index 2486516..4db5070 100644 --- a/programs/winhelp/Ko.rc +++ b/programs/winhelp/Ko.rc @@ -64,8 +64,8 @@ STID_CONTENTS, "��(&C)" STID_SEARCH, "ã��(&S)" STID_BACK, "�ڷ�(&B)" STID_HISTORY, "��丮(&H)" -STID_TOPICS, "&Topics" +STID_TOPICS, "��(&T)" STID_ALL_FILES, "�� (*.*)" STID_HELP_FILES_HLP, "�� (*.hlp)" -STID_FILE_NOT_FOUND_s "Cannot find '%s'. Do you want to find this file yourself?" +STID_FILE_NOT_FOUND_s "%s�� ã�� ϴ�'. �� ã�ڽ��ϱ�?" }

1 0

Alex Villacís Lasso : oleaut32: variant - allow conversion of VT_DISPATCH into VT_BSTR in VarCat.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 3f593aa62264b2699f0ef14f5594e473a840b764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f593aa62264b2699f0ef14f5… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Nov 6 16:58:03 2006 -0500 oleaut32: variant - allow conversion of VT_DISPATCH into VT_BSTR in VarCat. --- dlls/oleaut32/variant.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 873011a..be5ced4 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2478,7 +2478,7 @@ HRESULT WINAPI VarCat(LPVARIANT left, LP leftvt == VT_UI8 || leftvt == VT_INT || leftvt == VT_UINT || leftvt == VT_EMPTY || leftvt == VT_NULL || leftvt == VT_DATE || - leftvt == VT_DECIMAL) + leftvt == VT_DECIMAL || leftvt == VT_DISPATCH) && (rightvt == VT_I2 || rightvt == VT_I4 || rightvt == VT_R4 || rightvt == VT_R8 || @@ -2489,7 +2489,7 @@ HRESULT WINAPI VarCat(LPVARIANT left, LP rightvt == VT_UI8 || rightvt == VT_INT || rightvt == VT_UINT || rightvt == VT_EMPTY || rightvt == VT_NULL || rightvt == VT_DATE || - rightvt == VT_DECIMAL)) + rightvt == VT_DECIMAL || rightvt == VT_DISPATCH)) resultvt = VT_BSTR; else if (rightvt == VT_ERROR && leftvt < VT_VOID) hres = DISP_E_TYPEMISMATCH;

1 0

Alex Villacís Lasso : oleaut32: olepicture - Support multiple redundant headers before picture data.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: a7128fbc4deadb2ee713d92746a6219725d13b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7128fbc4deadb2ee713d9274… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Nov 6 16:47:25 2006 -0500 oleaut32: olepicture - Support multiple redundant headers before picture data. --- dlls/oleaut32/olepicture.c | 55 +++++++++++++++++++++++-------------- dlls/oleaut32/tests/olepicture.c | 47 ++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index f178575..6485c7d 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1400,6 +1400,7 @@ static HRESULT WINAPI OLEPictureImpl_Loa BOOL headerisdata = FALSE; BOOL statfailed = FALSE; ULONG xread, toread; + ULONG headerread; BYTE *xbuf; DWORD header[2]; WORD magic; @@ -1431,31 +1432,43 @@ static HRESULT WINAPI OLEPictureImpl_Loa /* we will read at least 8 byte ... just right below */ statstg.cbSize.QuadPart = 8; } - hr=IStream_Read(pStm,header,8,&xread); - if (hr || xread!=8) { - FIXME("Failure while reading picture header (hr is %x, nread is %d).\n",hr,xread); - return hr; - } + toread = 0; + headerread = 0; headerisdata = FALSE; - xread = 0; - if (!memcmp(&(header[0]),"lt\0\0", 4) && (header[1] <= statstg.cbSize.QuadPart-8)) { - toread = header[1]; - } else { - if (!memcmp(&(header[0]), "GIF8", 4) || /* GIF header */ - !memcmp(&(header[0]), "BM", 2) || /* BMP header */ - !memcmp(&(header[0]), "\xff\xd8", 2) || /* JPEG header */ - (header[1] > statstg.cbSize.QuadPart)|| /* invalid size */ - (header[1]==0) - ) {/* Incorrect header, assume none. */ - headerisdata = TRUE; - toread = statstg.cbSize.QuadPart-8; - xread = 8; - } else { - FIXME("Unknown stream header magic: %08x\n", header[0]); + do { + hr=IStream_Read(pStm,header,8,&xread); + if (hr || xread!=8) { + FIXME("Failure while reading picture header (hr is %x, nread is %d).\n",hr,xread); + return hr; + } + headerread += xread; + xread = 0; + + if (!memcmp(&(header[0]),"lt\0\0", 4) && (statfailed || (header[1] + headerread <= statstg.cbSize.QuadPart))) { + if (toread != 0 && toread != header[1]) + FIXME("varying lengths of image data (prev=%u curr=%u), only last one will be used\n", + toread, header[1]); toread = header[1]; + if (toread == 0) break; + } else { + if (!memcmp(&(header[0]), "GIF8", 4) || /* GIF header */ + !memcmp(&(header[0]), "BM", 2) || /* BMP header */ + !memcmp(&(header[0]), "\xff\xd8", 2) || /* JPEG header */ + (header[1] > statstg.cbSize.QuadPart)|| /* invalid size */ + (header[1]==0) + ) {/* Found start of bitmap data */ + headerisdata = TRUE; + if (toread == 0) + toread = statstg.cbSize.QuadPart-8; + else toread -= 8; + xread = 8; + } else { + FIXME("Unknown stream header magic: %08x\n", header[0]); + toread = header[1]; + } } - } + } while (!headerisdata); if (statfailed) { /* we don't know the size ... read all we get */ int sizeinc = 4096; diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 6eb7723..8e653ce 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -190,6 +190,8 @@ test_pic(const unsigned char *imgdata, u HRESULT hres; LARGE_INTEGER seekto; ULARGE_INTEGER newpos1; + DWORD * header; + unsigned int i; /* Let the fun begin */ hglob = GlobalAlloc (0, imgsize); @@ -203,10 +205,55 @@ test_pic(const unsigned char *imgdata, u hres = IStream_Seek(stream,seekto,SEEK_CUR,&newpos1); ok (hres == S_OK, "istream seek failed? doubt it... hres 0x%08x\n", hres); test_pic_with_stream(stream, imgsize); + + IStream_Release(stream); /* again with Non Statable and Non Seekable stream */ stream = (LPSTREAM)NoStatStreamImpl_Construct(hglob); test_pic_with_stream(stream, 0); + + IStream_Release(stream); + + /* free memory */ + GlobalUnlock(hglob); + GlobalFree(hglob); + + /* more fun!!! */ + hglob = GlobalAlloc (0, imgsize + 8 * (2 * sizeof(DWORD))); + data = GlobalLock (hglob); + header = (DWORD *)data; + + /* multiple copies of header */ + memcpy(data,"lt\0\0",4); + header[1] = imgsize; + memcpy(&(header[2]), header, 2 * sizeof(DWORD)); + memcpy(&(header[4]), header, 4 * sizeof(DWORD)); + memcpy(&(header[8]), header, 8 * sizeof(DWORD)); + + memcpy(data + 8 * (2 * sizeof(DWORD)), imgdata, imgsize); + + for (i = 1; i <= 8; i++) { + hres = CreateStreamOnHGlobal (hglob, FALSE, &stream); + ok (hres == S_OK, "createstreamonhglobal failed? doubt it... hres 0x%08x\n", hres); + + memset(&seekto,0,sizeof(seekto)); + seekto.u.LowPart = (8 - i) * (2 * sizeof(DWORD)); + hres = IStream_Seek(stream,seekto,SEEK_CUR,&newpos1); + ok (hres == S_OK, "istream seek failed? doubt it... hres 0x%08x\n", hres); + test_pic_with_stream(stream, imgsize); + + IStream_Release(stream); + + /* again with Non Statable and Non Seekable stream */ + stream = (LPSTREAM)NoStatStreamImpl_Construct(hglob); + test_pic_with_stream(stream, 0); + + IStream_Release(stream); + } + + /* free memory */ + GlobalUnlock(hglob); + GlobalFree(hglob); } static void test_empty_image(void) {

1 0

Peter Oberndorfer : dbghelp: Initialize BOOL elements with FALSE instead of 0.
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 2b06143031ed09e51d84a4e03fc2aa918a303fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b06143031ed09e51d84a4e03… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Nov 6 20:05:38 2006 +0100 dbghelp: Initialize BOOL elements with FALSE instead of 0. --- dlls/dbghelp/module.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index db725b8..ec3c70c 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -136,8 +136,8 @@ struct module* module_new(struct process module->module.LineNumbers = FALSE; module->module.GlobalSymbols = FALSE; module->module.TypeInfo = FALSE; - module->module.SourceIndexed = 0; - module->module.Publics = 0; + module->module.SourceIndexed = FALSE; + module->module.Publics = FALSE; module->type = type; module->is_virtual = virtual ? TRUE : FALSE;

1 0

Peter Oberndorfer : dbghelp: Make dwarf2 parser only report file numbers when at least one compilation unit really has numbers .
by Alexandre Julliard 08 Nov '06

08 Nov '06

Module: wine Branch: master Commit: 05368de685faa3d5c8695ca6f3b5970688ae8ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05368de685faa3d5c8695ca6f… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Mon Nov 6 20:05:34 2006 +0100 dbghelp: Make dwarf2 parser only report file numbers when at least one compilation unit really has numbers. --- dlls/dbghelp/dwarf.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index b68824b..4253413 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1581,7 +1581,7 @@ static void dwarf2_set_line_number(struc symt_add_func_line(module, func, *psrc, line, address - func->address); } -static void dwarf2_parse_line_numbers(const dwarf2_section_t* sections, +static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, dwarf2_parse_context_t* ctx, const char* compile_dir, unsigned long offset) @@ -1598,7 +1598,7 @@ static void dwarf2_parse_line_numbers(co /* section with line numbers stripped */ if (sections[section_line].address == NO_MAP) - return; + return FALSE; traverse.data = sections[section_line].address + offset; traverse.start_data = traverse.data; @@ -1754,6 +1754,7 @@ static void dwarf2_parse_line_numbers(co } } } + return TRUE; } static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, @@ -1828,7 +1829,8 @@ static BOOL dwarf2_parse_compilation_uni } if (dwarf2_find_attribute(&ctx, di, DW_AT_stmt_list, &stmt_list)) { - dwarf2_parse_line_numbers(sections, &ctx, comp_dir.u.string, stmt_list.u.uvalue); + if (dwarf2_parse_line_numbers(sections, &ctx, comp_dir.u.string, stmt_list.u.uvalue)) + module->module.LineNumbers = TRUE; } ret = TRUE; } @@ -1875,7 +1877,6 @@ BOOL dwarf2_parse(struct module* module, module->module.SymType = SymDia; module->module.CVSig = 'D' | ('W' << 8) | ('A' << 16) | ('R' << 24); /* FIXME: we could have a finer grain here */ - module->module.LineNumbers = TRUE; module->module.GlobalSymbols = TRUE; module->module.TypeInfo = TRUE; module->module.SourceIndexed = TRUE;

1 0