July 2008 - Wine-commits - list.winehq.org

James Hawkins : msi: Properly locate the published product in MsiConfigureProductEx.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 9518d7f8c70f71f5e1bb22be5b76971ca604fb65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9518d7f8c70f71f5e1bb22be5… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Jul 28 18:48:13 2008 -0500 msi: Properly locate the published product in MsiConfigureProductEx. --- dlls/msi/msi.c | 53 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index f3d6090..a2da999 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -45,6 +45,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); static const WCHAR installerW[] = {'\\','I','n','s','t','a','l','l','e','r',0}; +/* FIXME: user-managed installs not located */ +static UINT msi_locate_product(LPCWSTR szProduct, MSIINSTALLCONTEXT *context) +{ + HKEY hkey = NULL; + UINT r; + + *context = MSIINSTALLCONTEXT_NONE; + + r = MSIREG_OpenLocalClassesProductKey(szProduct, &hkey, FALSE); + if (r == ERROR_SUCCESS) + *context = MSIINSTALLCONTEXT_MACHINE; + else + { + r = MSIREG_OpenUserProductsKey(szProduct, &hkey, FALSE); + if (r == ERROR_SUCCESS) + *context = MSIINSTALLCONTEXT_USERUNMANAGED; + } + + RegCloseKey(hkey); + return ERROR_SUCCESS; +} + UINT WINAPI MsiOpenProductA(LPCSTR szProduct, MSIHANDLE *phProduct) { UINT r; @@ -346,6 +368,7 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, INSTALLSTATE eInstallState, LPCWSTR szCommandLine) { MSIPACKAGE* package = NULL; + MSIINSTALLCONTEXT context; UINT r; DWORD sz; WCHAR sourcepath[MAX_PATH]; @@ -367,25 +390,23 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, return ERROR_CALL_NOT_IMPLEMENTED; } - sz = sizeof(sourcepath); - MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, - MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, - &sz); + r = msi_locate_product(szProduct, &context); + if (r != ERROR_SUCCESS) + return r; - sz = sizeof(filename); - MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, - MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEW, filename, &sz); + if (context == MSIINSTALLCONTEXT_NONE) + return ERROR_UNKNOWN_PRODUCT; - lstrcatW(sourcepath,filename); + sz = sizeof(sourcepath); + MsiSourceListGetInfoW(szProduct, NULL, context, MSICODE_PRODUCT, + INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz); - /* - * ok 1, we need to find the msi file for this product. - * 2, find the source dir for the files - * 3, do the configure/install. - * 4, cleanupany runonce entry. - */ + sz = sizeof(filename); + MsiSourceListGetInfoW(szProduct, NULL, context, MSICODE_PRODUCT, + INSTALLPROPERTY_PACKAGENAMEW, filename, &sz); - r = MSI_OpenProductW( szProduct, &package ); + lstrcatW(sourcepath, filename); + r = MSI_OpenPackageW(sourcepath, &package); if (r != ERROR_SUCCESS) return r; @@ -395,7 +416,7 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, sz += lstrlenW(szCommandLine); commandline = msi_alloc(sz * sizeof(WCHAR)); - if (!commandline ) + if (!commandline) { r = ERROR_OUTOFMEMORY; goto end;

1 0

James Hawkins : msi: Handle the package context when unpublishing the product.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 38106ac23095db6e85097a66173ec7ca23b60bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=38106ac23095db6e85097a661… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Jul 28 18:46:32 2008 -0500 msi: Handle the package context when unpublishing the product. --- dlls/msi/action.c | 13 +++++++++++-- dlls/msi/msipriv.h | 2 ++ dlls/msi/registry.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5bb7008..68dd6f3 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4229,11 +4229,20 @@ static UINT msi_unpublish_product(MSIPACKAGE *package) goto done; MSIREG_DeleteProductKey(package->ProductCode); - MSIREG_DeleteUserProductKey(package->ProductCode); MSIREG_DeleteUserDataProductKey(package->ProductCode); - MSIREG_DeleteUserFeaturesKey(package->ProductCode); MSIREG_DeleteUninstallKey(package->ProductCode); + if (package->Context == MSIINSTALLCONTEXT_MACHINE) + { + MSIREG_DeleteLocalClassesProductKey(package->ProductCode); + MSIREG_DeleteLocalClassesFeaturesKey(package->ProductCode); + } + else + { + MSIREG_DeleteUserProductKey(package->ProductCode); + MSIREG_DeleteUserFeaturesKey(package->ProductCode); + } + upgrade = msi_dup_property(package, szUpgradeCode); if (upgrade) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 19abc3f..05df705 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -790,6 +790,8 @@ extern UINT MSIREG_DeleteLocalUserDataComponentKey(LPCWSTR szComponent); extern UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent); extern UINT MSIREG_DeleteUserUpgradeCodesKey(LPCWSTR szUpgradeCode); extern UINT MSIREG_OpenClassesUpgradeCodesKey(LPCWSTR szUpgradeCode, HKEY* key, BOOL create); +extern UINT MSIREG_DeleteLocalClassesProductKey(LPCWSTR szProductCode); +extern UINT MSIREG_DeleteLocalClassesFeaturesKey(LPCWSTR szProductCode); extern LPWSTR msi_reg_get_val_str( HKEY hkey, LPCWSTR name ); extern BOOL msi_reg_get_val_dword( HKEY hkey, LPCWSTR name, DWORD *val); diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index a12a825..9a4837b 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1088,6 +1088,23 @@ UINT MSIREG_OpenLocalClassesProductKey(LPCWSTR szProductCode, HKEY *key, BOOL cr return RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); } +UINT MSIREG_DeleteLocalClassesProductKey(LPCWSTR szProductCode) +{ + WCHAR squished_pc[GUID_SIZE]; + WCHAR keypath[0x200]; + + TRACE("%s\n", debugstr_w(szProductCode)); + + if (!squash_guid(szProductCode, squished_pc)) + return ERROR_FUNCTION_FAILED; + + TRACE("squished (%s)\n", debugstr_w(squished_pc)); + + sprintfW(keypath, szInstaller_LocalClassesProd_fmt, squished_pc); + + return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); +} + UINT MSIREG_OpenLocalClassesFeaturesKey(LPCWSTR szProductCode, HKEY *key, BOOL create) { WCHAR squished_pc[GUID_SIZE]; @@ -1108,6 +1125,23 @@ UINT MSIREG_OpenLocalClassesFeaturesKey(LPCWSTR szProductCode, HKEY *key, BOOL c return RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); } +UINT MSIREG_DeleteLocalClassesFeaturesKey(LPCWSTR szProductCode) +{ + WCHAR squished_pc[GUID_SIZE]; + WCHAR keypath[0x200]; + + TRACE("%s\n", debugstr_w(szProductCode)); + + if (!squash_guid(szProductCode, squished_pc)) + return ERROR_FUNCTION_FAILED; + + TRACE("squished (%s)\n", debugstr_w(squished_pc)); + + sprintfW(keypath, szInstaller_LocalClassesFeat_fmt, squished_pc); + + return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); +} + UINT MSIREG_OpenLocalManagedProductKey(LPCWSTR szProductCode, HKEY *key, BOOL create) { WCHAR squished_pc[GUID_SIZE];

1 0

Nikolay Sivov : gdiplus: GdipStringFormatGetGenericTypographic implemented.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 2e25db0409e2176775b19dc8ae84112941c916d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e25db0409e2176775b19dc8a… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 29 01:13:06 2008 +0400 gdiplus: GdipStringFormatGetGenericTypographic implemented. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/stringformat.c | 24 ++++++++++++++++++++++ dlls/gdiplus/tests/stringformat.c | 39 +++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 65 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index e3186a3..0579ebe 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -601,7 +601,7 @@ @ stdcall GdipShearMatrix(ptr long long long) @ stdcall GdipStartPathFigure(ptr) @ stdcall GdipStringFormatGetGenericDefault(ptr) -@ stub GdipStringFormatGetGenericTypographic +@ stdcall GdipStringFormatGetGenericTypographic(ptr) @ stub GdipTestControl @ stdcall GdipTransformMatrixPoints(ptr ptr long) @ stdcall GdipTransformMatrixPointsI(ptr ptr long) diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 4bd5bb3..1be075b 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -237,3 +237,27 @@ GpStatus WINGDIPAPI GdipCloneStringFormat(GDIPCONST GpStringFormat *format, GpSt return Ok; } + +/*FIXME: add zero tab stops number */ +GpStatus WINGDIPAPI GdipStringFormatGetGenericTypographic(GpStringFormat **format) +{ + GpStatus stat; + + if(!format) + return InvalidParameter; + + stat = GdipCreateStringFormat(StringFormatFlagsNoFitBlackBox | + StringFormatFlagsLineLimit | + StringFormatFlagsNoClip, LANG_NEUTRAL, format); + if(stat != Ok) + return stat; + + (*format)->digitlang = LANG_NEUTRAL; + (*format)->digitsub = StringDigitSubstituteUser; + (*format)->trimming = StringTrimmingNone; + (*format)->hkprefix = HotkeyPrefixNone; + (*format)->align = StringAlignmentNear; + (*format)->vertalign = StringAlignmentNear; + + return Ok; +} diff --git a/dlls/gdiplus/tests/stringformat.c b/dlls/gdiplus/tests/stringformat.c index 62372c9..ae93104 100644 --- a/dlls/gdiplus/tests/stringformat.c +++ b/dlls/gdiplus/tests/stringformat.c @@ -130,6 +130,44 @@ static void test_digitsubstitution(void) expect(Ok, stat); } +static void test_getgenerictypographic(void) +{ + GpStringFormat *format; + GpStatus stat; + INT flags; + INT n; + StringAlignment align, valign; + StringTrimming trimming; + StringDigitSubstitute digitsub; + LANGID digitlang; + + /* NULL arg */ + stat = GdipStringFormatGetGenericTypographic(NULL); + expect(InvalidParameter, stat); + + stat = GdipStringFormatGetGenericTypographic(&format); + expect(Ok, stat); + + GdipGetStringFormatFlags(format, &flags); + GdipGetStringFormatAlign(format, &align); + GdipGetStringFormatLineAlign(format, &valign); + GdipGetStringFormatHotkeyPrefix(format, &n); + GdipGetStringFormatTrimming(format, &trimming); + GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); + + expect((StringFormatFlagsNoFitBlackBox |StringFormatFlagsLineLimit | StringFormatFlagsNoClip), + flags); + expect(HotkeyPrefixNone, n); + expect(StringAlignmentNear, align); + expect(StringAlignmentNear, align); + expect(StringTrimmingNone, trimming); + expect(StringDigitSubstituteUser, digitsub); + expect(LANG_NEUTRAL, digitlang); + + stat = GdipDeleteStringFormat(format); + expect(Ok, stat); +} + START_TEST(stringformat) { struct GdiplusStartupInput gdiplusStartupInput; @@ -145,6 +183,7 @@ START_TEST(stringformat) test_constructor(); test_characterrange(); test_digitsubstitution(); + test_getgenerictypographic(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index ea4f200..963c9c6 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -435,6 +435,7 @@ GpStatus WINGDIPAPI GdipGetFontCollectionFamilyList(GpFontCollection*, INT, GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*); GpStatus WINGDIPAPI GdipStringFormatGetGenericDefault(GpStringFormat **); +GpStatus WINGDIPAPI GdipStringFormatGetGenericTypographic(GpStringFormat **); GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*); GpStatus WINGDIPAPI GdipGetStringFormatDigitSubstitution(GDIPCONST GpStringFormat*,LANGID*, StringDigitSubstitute*);

1 0

Nikolay Sivov : gdiplus: GdipSetStringFormatDigitSubstitution implemented.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 65a2274dc762869a3992d410e9519a47786af457 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65a2274dc762869a3992d410e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 29 01:12:59 2008 +0400 gdiplus: GdipSetStringFormatDigitSubstitution implemented. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/stringformat.c | 13 +++++++++++++ dlls/gdiplus/tests/stringformat.c | 13 +++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b121959..e3186a3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -586,7 +586,7 @@ @ stdcall GdipSetSmoothingMode(ptr long) @ stdcall GdipSetSolidFillColor(ptr ptr) @ stdcall GdipSetStringFormatAlign(ptr long) -@ stub GdipSetStringFormatDigitSubstitution +@ stdcall GdipSetStringFormatDigitSubstitution(ptr long long) @ stdcall GdipSetStringFormatFlags(ptr long) @ stdcall GdipSetStringFormatHotkeyPrefix(ptr long) @ stdcall GdipSetStringFormatLineAlign(ptr long) diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index 1ce6d0e..4bd5bb3 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -159,6 +159,19 @@ GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat *format, return Ok; } +/*FIXME: digit substitution actually not implemented, get/set only */ +GpStatus WINGDIPAPI GdipSetStringFormatDigitSubstitution(GpStringFormat *format, + LANGID language, StringDigitSubstitute substitute) +{ + if(!format) + return InvalidParameter; + + format->digitlang = language; + format->digitsub = substitute; + + return Ok; +} + GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat *format, INT hkpx) { diff --git a/dlls/gdiplus/tests/stringformat.c b/dlls/gdiplus/tests/stringformat.c index 833684e..62372c9 100644 --- a/dlls/gdiplus/tests/stringformat.c +++ b/dlls/gdiplus/tests/stringformat.c @@ -96,6 +96,8 @@ static void test_digitsubstitution(void) expect(InvalidParameter, stat); stat = GdipGetStringFormatDigitSubstitution(NULL, &digitlang, &digitsub); expect(InvalidParameter, stat); + stat = GdipSetStringFormatDigitSubstitution(NULL, LANG_NEUTRAL, StringDigitSubstituteNone); + expect(InvalidParameter, stat); /* try to get both and one by one */ stat = GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); @@ -113,6 +115,17 @@ static void test_digitsubstitution(void) expect(Ok, stat); expect(LANG_NEUTRAL, digitlang); + /* set/get */ + stat = GdipSetStringFormatDigitSubstitution(format, MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL), + StringDigitSubstituteUser); + expect(Ok, stat); + digitsub = StringDigitSubstituteNone; + digitlang = LANG_RUSSIAN; + stat = GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); + expect(Ok, stat); + expect(StringDigitSubstituteUser, digitsub); + expect(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL), digitlang); + stat = GdipDeleteStringFormat(format); expect(Ok, stat); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 723ec1d..ea4f200 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -445,6 +445,7 @@ GpStatus WINGDIPAPI GdipGetStringFormatMeasurableCharacterRangeCount( GDIPCONST GpStringFormat*, INT*); GpStatus WINGDIPAPI GdipGetStringFormatTrimming(GpStringFormat*,StringTrimming*); GpStatus WINGDIPAPI GdipSetStringFormatAlign(GpStringFormat*,StringAlignment); +GpStatus WINGDIPAPI GdipSetStringFormatDigitSubstitution(GpStringFormat*,LANGID,StringDigitSubstitute); GpStatus WINGDIPAPI GdipSetStringFormatHotkeyPrefix(GpStringFormat*,INT); GpStatus WINGDIPAPI GdipSetStringFormatLineAlign(GpStringFormat*,StringAlignment); GpStatus WINGDIPAPI GdipSetStringFormatMeasurableCharacterRanges(

1 0

Maarten Lankhorst : quartz: Fix support for files with multiple odml indexes.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 94ef37400ddd9f413b96549b2a37969cf9467a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ef37400ddd9f413b96549b2… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Jul 24 13:08:09 2008 -0700 quartz: Fix support for files with multiple odml indexes. --- dlls/quartz/avisplit.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 4eebc39..3f1625c 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -183,7 +183,7 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe /* End of file */ if (stream->index >= stream->entries) { - ERR("END OF STREAM ON %u\n", streamnumber); + TRACE("END OF STREAM ON %u\n", streamnumber); IMediaSample_Release(sample); return S_FALSE; } @@ -213,8 +213,8 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe /* End of file */ if (stream->index) { + TRACE("END OF STREAM ON %u\n", streamnumber); IMediaSample_Release(sample); - ERR("END OF STREAM ON %u\n", streamnumber); return S_FALSE; } @@ -502,6 +502,7 @@ static HRESULT AVISplitter_done_process(LPVOID iface) ResetEvent(stream->packet_queued); } + FIXME("All threads are now terminated\n"); return S_OK; } @@ -516,8 +517,7 @@ static HRESULT AVISplitter_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) static HRESULT AVISplitter_ProcessIndex(AVISplitterImpl *This, AVISTDINDEX **index, LONGLONG qwOffset, DWORD cb) { AVISTDINDEX *pIndex; - int x; - long rest; + int x, rest; *index = NULL; if (cb < sizeof(AVISTDINDEX)) @@ -531,12 +531,7 @@ static HRESULT AVISplitter_ProcessIndex(AVISplitterImpl *This, AVISTDINDEX **ind return E_OUTOFMEMORY; IAsyncReader_SyncRead(((PullPin *)This->Parser.ppPins[0])->pReader, qwOffset, cb, (BYTE *)pIndex); - pIndex = CoTaskMemRealloc(pIndex, pIndex->cb); - if (!pIndex) - return E_OUTOFMEMORY; - - IAsyncReader_SyncRead(((PullPin *)This->Parser.ppPins[0])->pReader, qwOffset, pIndex->cb, (BYTE *)pIndex); - rest = pIndex->cb - sizeof(AVISUPERINDEX) + sizeof(RIFFCHUNK) + sizeof(pIndex->aIndex[0]) * ANYSIZE_ARRAY; + rest = cb - sizeof(AVISUPERINDEX) + sizeof(RIFFCHUNK) + sizeof(pIndex->aIndex); TRACE("FOURCC: %s\n", debugstr_an((char *)&pIndex->fcc, 4)); TRACE("wLongsPerEntry: %hd\n", pIndex->wLongsPerEntry); @@ -552,7 +547,11 @@ static HRESULT AVISplitter_ProcessIndex(AVISplitterImpl *This, AVISTDINDEX **ind || rest < (pIndex->nEntriesInUse * sizeof(DWORD) * pIndex->wLongsPerEntry) || (pIndex->bIndexSubType != AVI_INDEX_SUB_DEFAULT)) { - FIXME("Invalid index chunk encountered\n"); + FIXME("Invalid index chunk encountered: %u/%u, %u/%u, %u/%u, %u/%u\n", + pIndex->bIndexType, AVI_INDEX_OF_CHUNKS, pIndex->wLongsPerEntry, 2, + rest, (pIndex->nEntriesInUse * sizeof(DWORD) * pIndex->wLongsPerEntry), + pIndex->bIndexSubType, AVI_INDEX_SUB_DEFAULT); + *index = NULL; return E_INVALIDARG; } @@ -814,7 +813,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE TRACE("dwSize: %u\n", pIndex->aIndex[x].dwSize); TRACE("dwDuration: %u (unreliable)\n", pIndex->aIndex[x].dwDuration); - AVISplitter_ProcessIndex(This, &stream->stdindex[nstdindex-1], pIndex->aIndex[x].qwOffset, pIndex->aIndex[x].dwSize); + AVISplitter_ProcessIndex(This, &stream->stdindex[x], pIndex->aIndex[x].qwOffset, pIndex->aIndex[x].dwSize); } break; }

1 0

Nikolay Sivov : gdiplus: Add a test that shows GdipCreateFontFromLogfontW problem with empty FaceName .
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 923918da9b8ee3d9085820c608e2ab01375807a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=923918da9b8ee3d9085820c60… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 29 01:12:33 2008 +0400 gdiplus: Add a test that shows GdipCreateFontFromLogfontW problem with empty FaceName. --- dlls/gdiplus/tests/font.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index ab0f814..8ce0ec6 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -96,6 +96,15 @@ static void test_logfont(void) GdipCreateFromHDC(hdc, &graphics); memset(&lfw, 0, sizeof(LOGFONTW)); memset(&lfw2, 0xff, sizeof(LOGFONTW)); + + /* empty FaceName */ + lfw.lfFaceName[0] = 0; + stat = GdipCreateFontFromLogfontW(hdc, &lfw, &font); + +todo_wine { + expect(NotTrueTypeFont, stat); +} + memcpy(&lfw.lfFaceName, arial, 6 * sizeof(WCHAR)); stat = GdipCreateFontFromLogfontW(hdc, &lfw, &font);

1 0

Nikolay Sivov : gdiplus: GdipGetStringFormatDigitSubstitution implemented.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 9ed8a2b624eb45fd01feebedb979eba2a51d6f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed8a2b624eb45fd01feebedb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 29 01:12:49 2008 +0400 gdiplus: GdipGetStringFormatDigitSubstitution implemented. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/stringformat.c | 14 +++++++++++ dlls/gdiplus/tests/stringformat.c | 47 +++++++++++++++++++++++++++++++++++++ include/gdiplusenums.h | 9 +++++++ include/gdiplusflat.h | 2 + 6 files changed, 75 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 2b54ec1..b121959 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -387,7 +387,7 @@ @ stdcall GdipGetSmoothingMode(ptr ptr) @ stdcall GdipGetSolidFillColor(ptr ptr) @ stdcall GdipGetStringFormatAlign(ptr ptr) -@ stub GdipGetStringFormatDigitSubstitution +@ stdcall GdipGetStringFormatDigitSubstitution(ptr ptr ptr) @ stdcall GdipGetStringFormatFlags(ptr ptr) @ stdcall GdipGetStringFormatHotkeyPrefix(ptr ptr) @ stdcall GdipGetStringFormatLineAlign(ptr ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 56df458..cb5f821 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -188,10 +188,12 @@ struct GpFont{ struct GpStringFormat{ INT attr; LANGID lang; + LANGID digitlang; StringAlignment align; StringTrimming trimming; HotkeyPrefix hkprefix; StringAlignment vertalign; + StringDigitSubstitute digitsub; }; struct GpFontCollection{ diff --git a/dlls/gdiplus/stringformat.c b/dlls/gdiplus/stringformat.c index c9361dc..1ce6d0e 100644 --- a/dlls/gdiplus/stringformat.c +++ b/dlls/gdiplus/stringformat.c @@ -43,7 +43,9 @@ GpStatus WINGDIPAPI GdipCreateStringFormat(INT attr, LANGID lang, (*format)->attr = attr; (*format)->lang = lang; + (*format)->digitlang = LANG_NEUTRAL; (*format)->trimming = StringTrimmingCharacter; + (*format)->digitsub = StringDigitSubstituteUser; return Ok; } @@ -79,6 +81,18 @@ GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat *format, return Ok; } +GpStatus WINGDIPAPI GdipGetStringFormatDigitSubstitution(GDIPCONST GpStringFormat *format, + LANGID *language, StringDigitSubstitute *substitute) +{ + if(!format) + return InvalidParameter; + + if(language) *language = format->digitlang; + if(substitute) *substitute = format->digitsub; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetStringFormatFlags(GDIPCONST GpStringFormat* format, INT* flags) { diff --git a/dlls/gdiplus/tests/stringformat.c b/dlls/gdiplus/tests/stringformat.c index 3f112e0..833684e 100644 --- a/dlls/gdiplus/tests/stringformat.c +++ b/dlls/gdiplus/tests/stringformat.c @@ -31,6 +31,8 @@ static void test_constructor(void) INT n; StringAlignment align, valign; StringTrimming trimming; + StringDigitSubstitute digitsub; + LANGID digitlang; stat = GdipCreateStringFormat(0, 0, &format); expect(Ok, stat); @@ -39,11 +41,14 @@ static void test_constructor(void) GdipGetStringFormatLineAlign(format, &valign); GdipGetStringFormatHotkeyPrefix(format, &n); GdipGetStringFormatTrimming(format, &trimming); + GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); expect(HotkeyPrefixNone, n); expect(StringAlignmentNear, align); expect(StringAlignmentNear, align); expect(StringTrimmingCharacter, trimming); + expect(StringDigitSubstituteUser, digitsub); + expect(LANG_NEUTRAL, digitlang); stat = GdipDeleteStringFormat(format); expect(Ok, stat); @@ -70,6 +75,47 @@ todo_wine expect(Ok, stat); } +static void test_digitsubstitution(void) +{ + GpStringFormat *format; + GpStatus stat; + StringDigitSubstitute digitsub; + LANGID digitlang; + + stat = GdipCreateStringFormat(0, LANG_RUSSIAN, &format); + expect(Ok, stat); + + /* NULL arguments */ + stat = GdipGetStringFormatDigitSubstitution(NULL, NULL, NULL); + expect(InvalidParameter, stat); + stat = GdipGetStringFormatDigitSubstitution(format, NULL, NULL); + expect(Ok, stat); + stat = GdipGetStringFormatDigitSubstitution(NULL, &digitlang, NULL); + expect(InvalidParameter, stat); + stat = GdipGetStringFormatDigitSubstitution(NULL, NULL, &digitsub); + expect(InvalidParameter, stat); + stat = GdipGetStringFormatDigitSubstitution(NULL, &digitlang, &digitsub); + expect(InvalidParameter, stat); + + /* try to get both and one by one */ + stat = GdipGetStringFormatDigitSubstitution(format, &digitlang, &digitsub); + expect(Ok, stat); + expect(StringDigitSubstituteUser, digitsub); + expect(LANG_NEUTRAL, digitlang); + + digitsub = StringDigitSubstituteNone; + stat = GdipGetStringFormatDigitSubstitution(format, NULL, &digitsub); + expect(Ok, stat); + expect(StringDigitSubstituteUser, digitsub); + + digitlang = LANG_RUSSIAN; + stat = GdipGetStringFormatDigitSubstitution(format, &digitlang, NULL); + expect(Ok, stat); + expect(LANG_NEUTRAL, digitlang); + + stat = GdipDeleteStringFormat(format); + expect(Ok, stat); +} START_TEST(stringformat) { @@ -85,6 +131,7 @@ START_TEST(stringformat) test_constructor(); test_characterrange(); + test_digitsubstitution(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 53401bd..bc52bd5 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -227,6 +227,14 @@ enum StringAlignment StringAlignmentFar = 2 }; +enum StringDigitSubstitute +{ + StringDigitSubstituteUser = 0, + StringDigitSubstituteNone = 1, + StringDigitSubstituteNational = 2, + StringDigitSubstituteTraditional = 3 +}; + enum StringFormatFlags { StringFormatFlagsDirectionRightToLeft = 0x00000001, @@ -346,6 +354,7 @@ typedef enum EmfType EmfType; typedef enum CompositingMode CompositingMode; typedef enum TextRenderingHint TextRenderingHint; typedef enum StringAlignment StringAlignment; +typedef enum StringDigitSubstitute StringDigitSubstitute; typedef enum StringTrimming StringTrimming; typedef enum FontStyle FontStyle; typedef enum StringFormatFlags StringFormatFlags; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 8b83c8e..723ec1d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -436,6 +436,8 @@ GpStatus WINGDIPAPI GdipCreateStringFormat(INT,LANGID,GpStringFormat**); GpStatus WINGDIPAPI GdipDeleteStringFormat(GpStringFormat*); GpStatus WINGDIPAPI GdipStringFormatGetGenericDefault(GpStringFormat **); GpStatus WINGDIPAPI GdipGetStringFormatAlign(GpStringFormat*,StringAlignment*); +GpStatus WINGDIPAPI GdipGetStringFormatDigitSubstitution(GDIPCONST GpStringFormat*,LANGID*, + StringDigitSubstitute*); GpStatus WINGDIPAPI GdipGetStringFormatFlags(GDIPCONST GpStringFormat*, INT*); GpStatus WINGDIPAPI GdipGetStringFormatHotkeyPrefix(GDIPCONST GpStringFormat*,INT*); GpStatus WINGDIPAPI GdipGetStringFormatLineAlign(GpStringFormat*,StringAlignment*);

1 0

Maarten Lankhorst : quartz: Pass InputPin as parameter to transform filter.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 89f4eeece3435eba38ef643d6c5dfb0d39f7348a URL: http://source.winehq.org/git/wine.git/?a=commit;h=89f4eeece3435eba38ef643d6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jul 22 05:35:28 2008 -0700 quartz: Pass InputPin as parameter to transform filter. --- dlls/quartz/acmwrapper.c | 33 ++++++++++++++++----------------- dlls/quartz/avidec.c | 18 ++++++------------ dlls/quartz/transform.c | 20 ++++++++++++-------- dlls/quartz/transform.h | 15 ++++++++------- 4 files changed, 42 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89f4eeece3435eba38ef6…

1 0

Maarten Lankhorst : quartz: Fix end of file handling when first request is already end of file.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: 6becc9e14b0b2f07cea727deea47b307bfa7ea2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6becc9e14b0b2f07cea727dee… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jul 22 08:04:20 2008 -0700 quartz: Fix end of file handling when first request is already end of file. --- dlls/quartz/avisplit.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index e712eb9..4eebc39 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -449,6 +449,8 @@ static HRESULT AVISplitter_first_request(LPVOID iface) have_sample = (hr == S_OK); if (FAILED(hr)) break; + if (hr == S_FALSE) + AVISplitter_SendEndOfFile(This, x); } /* FIXME: Don't do this for each pin that sent an EOF */ @@ -976,8 +978,9 @@ static HRESULT AVISplitter_InitializeStreams(AVISplitterImpl *This) frames /= stream->streamheader.dwRate; - TRACE("Duration: %d days, %d hours, %d minutes and %d seconds\n", (DWORD)(frames / 86400), - (DWORD)((frames % 86400) / 3600), (DWORD)((frames % 3600) / 60), (DWORD)(frames % 60)); + TRACE("Duration: %d days, %d hours, %d minutes and %d.%03u seconds\n", (DWORD)(frames / 86400), + (DWORD)((frames % 86400) / 3600), (DWORD)((frames % 3600) / 60), (DWORD)(frames % 60), + (DWORD)(This->Parser.mediaSeeking.llDuration/10000) % 1000); } return S_OK;

1 0

Maarten Lankhorst : quartz: Make transform filter return hresult from running/pausing.
by Alexandre Julliard 29 Jul '08

29 Jul '08

Module: wine Branch: master Commit: db2ccf43d4e9fc5ca1a418df6c9c83a054125dd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db2ccf43d4e9fc5ca1a418df6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jul 22 04:09:55 2008 -0700 quartz: Make transform filter return hresult from running/pausing. --- dlls/quartz/transform.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 322c76a..5c090c0 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -316,6 +316,7 @@ static HRESULT WINAPI TransformFilter_GetClassID(IBaseFilter * iface, CLSID * pC static HRESULT WINAPI TransformFilter_Stop(IBaseFilter * iface) { TransformFilterImpl *This = (TransformFilterImpl *)iface; + HRESULT hr = S_OK; TRACE("(%p/%p)\n", This, iface); @@ -323,29 +324,33 @@ static HRESULT WINAPI TransformFilter_Stop(IBaseFilter * iface) { This->state = State_Stopped; if (This->pFuncsTable->pfnProcessEnd) - This->pFuncsTable->pfnProcessEnd(This); + hr = This->pFuncsTable->pfnProcessEnd(This); } LeaveCriticalSection(&This->csFilter); - return S_OK; + return hr; } static HRESULT WINAPI TransformFilter_Pause(IBaseFilter * iface) { TransformFilterImpl *This = (TransformFilterImpl *)iface; + HRESULT hr; TRACE("(%p/%p)->()\n", This, iface); EnterCriticalSection(&This->csFilter); { if (This->state == State_Stopped) - IBaseFilter_Run(iface, -1); + hr = IBaseFilter_Run(iface, -1); + else + hr = S_OK; - This->state = State_Paused; + if (SUCCEEDED(hr)) + This->state = State_Paused; } LeaveCriticalSection(&This->csFilter); - return S_OK; + return hr; } static HRESULT WINAPI TransformFilter_Run(IBaseFilter * iface, REFERENCE_TIME tStart) @@ -361,12 +366,16 @@ static HRESULT WINAPI TransformFilter_Run(IBaseFilter * iface, REFERENCE_TIME tS { ((InputPin *)This->ppPins[0])->end_of_stream = 0; if (This->pFuncsTable->pfnProcessBegin) - This->pFuncsTable->pfnProcessBegin(This); - OutputPin_CommitAllocator((OutputPin *)This->ppPins[1]); + hr = This->pFuncsTable->pfnProcessBegin(This); + if (SUCCEEDED(hr)) + hr = OutputPin_CommitAllocator((OutputPin *)This->ppPins[1]); } - This->rtStreamStart = tStart; - This->state = State_Running; + if (SUCCEEDED(hr)) + { + This->rtStreamStart = tStart; + This->state = State_Running; + } } LeaveCriticalSection(&This->csFilter);

1 0