October 2011 - Wine-Commits

Nikolay Sivov : msxml3: Support setting namespaces feature to default value .
by Alexandre Julliard Oct. 5, 2011

Oct. 5, 2011

Module: wine Branch: master Commit: 3d3786c2fab1bada769801ab43dd8ae141caa9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d3786c2fab1bada769801ab4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 5 13:29:37 2011 -0500 msxml3: Support setting namespaces feature to default value. --- dlls/msxml3/saxreader.c | 27 ++++++++++++++++++++---- dlls/msxml3/tests/saxreader.c | 45 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index b771802..d3f2ec0 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -56,7 +56,7 @@ enum ReaderFeatures ExternalParameterEntities = 1 << 3, ForcedResync = 1 << 4, NamespacePrefixes = 1 << 5, - Namespace = 1 << 6, + Namespaces = 1 << 6, ParameterEntities = 1 << 7, PreserveSystemIndentifiers = 1 << 8, ProhibitDTD = 1 << 9, @@ -221,6 +221,11 @@ static const WCHAR FeatureProhibitDTDW[] = { 'p','r','o','h','i','b','i','t','-','d','t','d',0 }; +static const WCHAR FeatureNamespacesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', + '/','n','a','m','e','s','p','a','c','e','s',0 +}; + static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL value) { if (value == VARIANT_TRUE) @@ -231,6 +236,12 @@ static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures f return S_OK; } +static inline HRESULT get_feature_value(const saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL *value) +{ + *value = reader->features & feature ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; +} + static inline BOOL has_content_handler(const saxlocator *locator) { return (locator->vbInterface && locator->saxreader->vbcontentHandler) || @@ -2616,12 +2627,15 @@ static HRESULT WINAPI saxxmlreader_Invoke( /*** IVBSAXXMLReader methods ***/ static HRESULT WINAPI saxxmlreader_getFeature( IVBSAXXMLReader* iface, - const WCHAR *pFeature, - VARIANT_BOOL *pValue) + const WCHAR *feature, + VARIANT_BOOL *value) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); - FIXME("(%p)->(%s %p) stub\n", This, debugstr_w(pFeature), pValue); + if (!strcmpW(FeatureNamespacesW, feature)) + return get_feature_value(This, Namespaces, value); + + FIXME("(%p)->(%s %p) stub\n", This, debugstr_w(feature), value); return E_NOTIMPL; } @@ -2652,6 +2666,9 @@ static HRESULT WINAPI saxxmlreader_putFeature( return set_feature_value(This, ProhibitDTD, value); } + if (!strcmpW(FeatureNamespacesW, feature) && value == VARIANT_TRUE) + return set_feature_value(This, Namespaces, value); + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); return E_NOTIMPL; } @@ -3043,7 +3060,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->pool.pool = NULL; reader->pool.index = 0; reader->pool.len = 0; - reader->features = 0; + reader->features = Namespaces; memset(&reader->sax, 0, sizeof(xmlSAXHandler)); reader->sax.initialized = XML_SAX2_MAGIC; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index b5477d9..6493776 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1267,6 +1267,50 @@ static void test_saxreader_properties(void) free_bstrs(); } +struct feature_ns_entry_t { + const GUID *guid; + const char *clsid; + VARIANT_BOOL value; +}; + +static const struct feature_ns_entry_t feature_ns_entry_data[] = { + { &CLSID_SAXXMLReader, "CLSID_SAXXMLReader", VARIANT_TRUE }, + { &CLSID_SAXXMLReader30, "CLSID_SAXXMLReader30", VARIANT_TRUE }, + { &CLSID_SAXXMLReader40, "CLSID_SAXXMLReader40", VARIANT_TRUE }, + { &CLSID_SAXXMLReader60, "CLSID_SAXXMLReader60", VARIANT_TRUE }, + { 0 } +}; + +static void test_saxreader_features(void) +{ + const struct feature_ns_entry_t *entry = feature_ns_entry_data; + ISAXXMLReader *reader; + + while (entry->guid) + { + VARIANT_BOOL value; + HRESULT hr; + + hr = CoCreateInstance(entry->guid, NULL, CLSCTX_INPROC_SERVER, &IID_ISAXXMLReader, (void**)&reader); + if (hr != S_OK) + { + win_skip("can't create %s instance\n", entry->clsid); + entry++; + continue; + } + + value = 0xc; + hr = ISAXXMLReader_getFeature(reader, _bstr_("http://xml.org/sax/features/namespaces"), &value); + EXPECT_HR(hr, S_OK); + + ok(entry->value == value, "%s: got wrong default value %x, expected %x\n", entry->clsid, value, entry->value); + + ISAXXMLReader_Release(reader); + + entry++; + } +} + /* UTF-8 data with UTF-8 BOM and UTF-16 in prolog */ static const CHAR UTF8BOMTest[] = "\xEF\xBB\xBF<?xml version = \"1.0\" encoding = \"UTF-16\"?>\n" @@ -2317,6 +2361,7 @@ START_TEST(saxreader) test_saxreader(); test_saxreader_properties(); + test_saxreader_features(); test_encoding(); /* MXXMLWriter tests */

1 0

Andrew Eikum : winecfg: Reload winmm for each sound test.
by Alexandre Julliard Oct. 5, 2011

Oct. 5, 2011

Module: wine Branch: master Commit: b07a82c01dc0422719a98f20471f240b35d9e5db URL: http://source.winehq.org/git/wine.git/?a=commit;h=b07a82c01dc0422719a98f204… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Oct 5 13:39:46 2011 -0500 winecfg: Reload winmm for each sound test. Also localize the error dialog while we're in there. --- po/ar.po | 70 ++++++++++++++++++++++------------------- po/bg.po | 70 ++++++++++++++++++++++------------------- po/ca.po | 70 ++++++++++++++++++++++------------------- po/cs.po | 70 ++++++++++++++++++++++------------------- po/da.po | 71 ++++++++++++++++++++++------------------- po/de.po | 71 ++++++++++++++++++++++------------------- po/el.po | 70 ++++++++++++++++++++++------------------- po/en.po | 70 ++++++++++++++++++++++------------------- po/en_US.po | 70 ++++++++++++++++++++++------------------- po/eo.po | 70 ++++++++++++++++++++++------------------- po/es.po | 70 ++++++++++++++++++++++------------------- po/fa.po | 70 ++++++++++++++++++++++------------------- po/fi.po | 70 ++++++++++++++++++++++------------------- po/fr.po | 71 ++++++++++++++++++++++------------------- po/he.po | 70 ++++++++++++++++++++++------------------- po/hi.po | 70 ++++++++++++++++++++++------------------- po/hu.po | 70 ++++++++++++++++++++++------------------- po/it.po | 71 ++++++++++++++++++++++------------------- po/ja.po | 71 ++++++++++++++++++++++------------------- po/ko.po | 71 ++++++++++++++++++++++------------------- po/lt.po | 71 ++++++++++++++++++++++------------------- po/ml.po | 70 ++++++++++++++++++++++------------------- po/nb_NO.po | 71 ++++++++++++++++++++++------------------- po/nl.po | 71 ++++++++++++++++++++++------------------- po/or.po | 70 ++++++++++++++++++++++------------------- po/pa.po | 70 ++++++++++++++++++++++------------------- po/pl.po | 71 ++++++++++++++++++++++------------------- po/pt_BR.po | 71 ++++++++++++++++++++++------------------- po/pt_PT.po | 71 ++++++++++++++++++++++------------------- po/rm.po | 70 ++++++++++++++++++++++------------------- po/ro.po | 70 ++++++++++++++++++++++------------------- po/ru.po | 71 ++++++++++++++++++++++------------------- po/sk.po | 70 ++++++++++++++++++++++------------------- po/sl.po | 71 ++++++++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 70 ++++++++++++++++++++++------------------- po/sr_RS(a)latin.po | 70 ++++++++++++++++++++++------------------- po/sv.po | 71 ++++++++++++++++++++++------------------- po/te.po | 70 ++++++++++++++++++++++------------------- po/th.po | 70 ++++++++++++++++++++++------------------- po/tr.po | 70 ++++++++++++++++++++++------------------- po/uk.po | 70 ++++++++++++++++++++++------------------- po/wa.po | 70 ++++++++++++++++++++++------------------- po/wine.pot | 70 ++++++++++++++++++++++------------------- po/zh_CN.po | 70 ++++++++++++++++++++++------------------- po/zh_TW.po | 70 ++++++++++++++++++++++------------------- programs/winecfg/Makefile.in | 2 +- programs/winecfg/audio.c | 37 ++++++++++++++++++++- programs/winecfg/resource.h | 2 + programs/winecfg/winecfg.rc | 2 + 49 files changed, 1720 insertions(+), 1488 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b07a82c01dc0422719a98…

1 0

Nikolay Sivov : msxml3: Accept lexical handler parameter entities switch.
by Alexandre Julliard Oct. 5, 2011

Oct. 5, 2011

Module: wine Branch: master Commit: cc4c6946238300979fc421a79f9f6b8800979b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc4c6946238300979fc421a79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 5 09:37:40 2011 -0500 msxml3: Accept lexical handler parameter entities switch. --- dlls/msxml3/saxreader.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 77373f1..b7cd432 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -64,7 +64,8 @@ enum ReaderFeatures ServerHttpRequest = 1 << 11, SuppressValidationfatalError = 1 << 12, UseInlineSchema = 1 << 13, - UseSchemaLocation = 1 << 14 + UseSchemaLocation = 1 << 14, + LexicalHandlerParEntities = 1 << 15 }; struct bstrpool @@ -211,6 +212,11 @@ static const WCHAR FeatureExternalParameterEntitiesW[] = { '/','e','x','t','e','r','n','a','l','-','p','a','r','a','m','e','t','e','r','-','e','n','t','i','t','i','e','s',0 }; +static const WCHAR FeatureLexicalHandlerParEntitiesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', + '/','l','e','x','i','c','a','l','-','h','a','n','d','l','e','r','/','p','a','r','a','m','e','t','e','r','-','e','n','t','i','t','i','e','s',0 +}; + static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL value) { if (value == VARIANT_TRUE) @@ -2622,6 +2628,12 @@ static HRESULT WINAPI saxxmlreader_putFeature( if (!strcmpW(FeatureExternalParameterEntitiesW, feature) && value == VARIANT_FALSE) return set_feature_value(This, ExternalParameterEntities, value); + if (!strcmpW(FeatureLexicalHandlerParEntitiesW, feature)) + { + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); + return set_feature_value(This, LexicalHandlerParEntities, value); + } + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); return E_NOTIMPL; }

1 0

Huw Davies : gdi32: Display the depth of a bitmap rather than the total number colors.
by Alexandre Julliard Oct. 5, 2011

Oct. 5, 2011

Module: wine Branch: master Commit: 9969b8dec1e08e5645a013627e0b696abb774fc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9969b8dec1e08e5645a013627… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 5 09:11:20 2011 -0500 gdi32: Display the depth of a bitmap rather than the total number colors. --- dlls/gdi32/bitmap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 9c77016..7c8fa54 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -332,8 +332,8 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) if (bm.bmBits) SetBitmapBits( hbitmap, bm.bmHeight * bm.bmWidthBytes, bm.bmBits ); - TRACE("%dx%d, %d colors returning %p\n", bm.bmWidth, bm.bmHeight, - 1 << (bm.bmPlanes * bm.bmBitsPixel), hbitmap); + TRACE("%dx%d, bpp %d planes %d: returning %p\n", bm.bmWidth, bm.bmHeight, + bm.bmBitsPixel, bm.bmPlanes, hbitmap); return hbitmap; }

1 0

Nikolay Sivov : msxml3: Accept disabled parameter entities feature.
by Alexandre Julliard Oct. 5, 2011

Oct. 5, 2011

Module: wine Branch: master Commit: 1bd501ab3e4a09e2acd6b996643137f649a9f4bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd501ab3e4a09e2acd6b9966… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 5 09:20:32 2011 -0500 msxml3: Accept disabled parameter entities feature. --- dlls/msxml3/saxreader.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 0460533..77373f1 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -206,6 +206,11 @@ static const WCHAR FeatureExternalGeneralEntitiesW[] = { '-','e','n','t','i','t','i','e','s',0 }; +static const WCHAR FeatureExternalParameterEntitiesW[] = { + 'h','t','t','p',':','/','/','x','m','l','.','o','r','g','/','s','a','x','/','f','e','a','t','u','r','e','s', + '/','e','x','t','e','r','n','a','l','-','p','a','r','a','m','e','t','e','r','-','e','n','t','i','t','i','e','s',0 +}; + static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL value) { if (value == VARIANT_TRUE) @@ -2614,6 +2619,9 @@ static HRESULT WINAPI saxxmlreader_putFeature( if (!strcmpW(FeatureExternalGeneralEntitiesW, feature) && value == VARIANT_FALSE) return set_feature_value(This, ExternalGeneralEntities, value); + if (!strcmpW(FeatureExternalParameterEntitiesW, feature) && value == VARIANT_FALSE) + return set_feature_value(This, ExternalParameterEntities, value); + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); return E_NOTIMPL; }

1 0

Huw Davies : winex11: Initialise the dib color table.
by Alexandre Julliard Oct. 5, 2011

Oct. 5, 2011

Module: wine Branch: master Commit: 82f4538c552bebd361cc9a8ecfa0e37b9c2db2b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f4538c552bebd361cc9a8ec… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 17:48:23 2011 -0500 winex11: Initialise the dib color table. --- dlls/winex11.drv/mouse.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 0ba57d1..033f94c 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -726,6 +726,15 @@ static Cursor create_xcursor_cursor( HDC hdc, const ICONINFOEXW *iinfo, HANDLE i goto cleanup; } info->bmiHeader.biBitCount = 1; + info->bmiColors[0].rgbRed = 0; + info->bmiColors[0].rgbGreen = 0; + info->bmiColors[0].rgbBlue = 0; + info->bmiColors[0].rgbReserved = 0; + info->bmiColors[1].rgbRed = 0xff; + info->bmiColors[1].rgbGreen = 0xff; + info->bmiColors[1].rgbBlue = 0xff; + info->bmiColors[1].rgbReserved = 0; + mask_size = ((width + 31) / 32 * 4) * height; /* width_bytes * height */ info->bmiHeader.biSizeImage = mask_size; hbmMask = CreateDIBSection( hdc, info, DIB_RGB_COLORS, (VOID **) &mask_bits, NULL, 0);

1 0

Thomas Faber : kernel32/tests: Fix MSVC build in console.c.
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: fc2dcd04ab34f56701b144762b1a9f673a81d895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2dcd04ab34f56701b144762… Author: Thomas Faber <thfabba(a)gmx.de> Date: Tue Oct 4 23:10:08 2011 +0200 kernel32/tests: Fix MSVC build in console.c. --- dlls/kernel32/tests/console.c | 316 ++++++++++++++++++++-------------------- 1 files changed, 158 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fc2dcd04ab34f56701b14…

1 0

Thomas Faber : kernel32/tests: Fix MSVC build in file.c and pipe.c.
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: bcbaefe8b51d0fad238579d1076111e19a5fa8a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcbaefe8b51d0fad238579d10… Author: Thomas Faber <thfabba(a)gmx.de> Date: Tue Oct 4 22:45:49 2011 +0200 kernel32/tests: Fix MSVC build in file.c and pipe.c. --- dlls/kernel32/tests/file.c | 2 +- dlls/kernel32/tests/pipe.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3ed3f66..772e439 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -38,7 +38,7 @@ static BOOL (WINAPI *pReplaceFileA)(LPCSTR, LPCSTR, LPCSTR, DWORD, LPVOID, LPVOI static BOOL (WINAPI *pReplaceFileW)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, LPVOID, LPVOID); static UINT (WINAPI *pGetSystemWindowsDirectoryA)(LPSTR, UINT); static BOOL (WINAPI *pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD); -static DWORD WINAPI (*pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); +static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); /* keep filename and filenameW the same */ static const char filename[] = "testfile.xxx"; diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 890a50e..ab85ad5 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -36,7 +36,7 @@ static HANDLE alarm_event; static BOOL (WINAPI *pDuplicateTokenEx)(HANDLE,DWORD,LPSECURITY_ATTRIBUTES, SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); -static DWORD WINAPI (*pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); +static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); static BOOL user_apc_ran; static void CALLBACK user_apc(ULONG_PTR param)

1 0

Andrew Talbot : mshtml: Mark some fall-throughs in switch statements.
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: 76a6404c2660c8cbf0249901c7bce76c01ac5a60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a6404c2660c8cbf0249901c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Oct 4 22:48:41 2011 +0100 mshtml: Mark some fall-throughs in switch statements. --- dlls/mshtml/dispex.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 44d0911..75b3f87 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -559,6 +559,7 @@ static HRESULT function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR case DISPATCH_METHOD|DISPATCH_PROPERTYGET: if(!res) return E_INVALIDARG; + /* fall through */ case DISPATCH_METHOD: hres = typeinfo_invoke(This->obj, This->info, flags, params, res, ei); break; @@ -611,6 +612,7 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, case DISPATCH_METHOD|DISPATCH_PROPERTYGET: if(!res) return E_INVALIDARG; + /* fall through */ case DISPATCH_METHOD: hres = typeinfo_invoke(This, func, flags, dp, res, ei); break; @@ -653,6 +655,7 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, } default: FIXME("Unimplemented flags %x\n", flags); + /* fall through */ case DISPATCH_PROPERTYPUT: hres = E_NOTIMPL; } @@ -932,6 +935,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc case DISPATCH_METHOD|DISPATCH_PROPERTYGET: if(!pvarRes) return E_INVALIDARG; + /* fall through */ case DISPATCH_METHOD: { DISPID named_arg = DISPID_THIS; DISPPARAMS dp = {NULL, &named_arg, 0, 1};

1 0

Andrew Talbot : mapi32: Mark some fall-throughs in a switch statement.
by Alexandre Julliard Oct. 4, 2011

Oct. 4, 2011

Module: wine Branch: master Commit: 203085dcee5c9af56f32d7d13a460fb10b342b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=203085dcee5c9af56f32d7d13… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Oct 4 22:48:33 2011 +0100 mapi32: Mark some fall-throughs in a switch statement. --- dlls/mapi32/prop.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 75c1b1e..5173412 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -221,31 +221,39 @@ ULONG WINAPI UlPropSize(LPSPropValue lpProp) switch (PROP_TYPE(lpProp->ulPropTag)) { case PT_MV_I2: ulRet = lpProp->Value.MVi.cValues; + /* fall through */ case PT_BOOLEAN: case PT_I2: ulRet *= sizeof(USHORT); break; case PT_MV_I4: ulRet = lpProp->Value.MVl.cValues; + /* fall through */ case PT_ERROR: case PT_I4: ulRet *= sizeof(LONG); break; case PT_MV_I8: ulRet = lpProp->Value.MVli.cValues; + /* fall through */ case PT_I8: ulRet *= sizeof(LONG64); break; case PT_MV_R4: ulRet = lpProp->Value.MVflt.cValues; + /* fall through */ case PT_R4: ulRet *= sizeof(float); break; case PT_MV_APPTIME: case PT_MV_R8: ulRet = lpProp->Value.MVdbl.cValues; + /* fall through */ case PT_APPTIME: case PT_R8: ulRet *= sizeof(double); break; case PT_MV_CURRENCY: ulRet = lpProp->Value.MVcur.cValues; + /* fall through */ case PT_CURRENCY: ulRet *= sizeof(CY); break; case PT_MV_SYSTIME: ulRet = lpProp->Value.MVft.cValues; + /* fall through */ case PT_SYSTIME: ulRet *= sizeof(FILETIME); break; case PT_MV_CLSID: ulRet = lpProp->Value.MVguid.cValues; + /* fall through */ case PT_CLSID: ulRet *= sizeof(GUID); break; case PT_MV_STRING8: ulRet = 0u;

1 0