wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Nikolay Sivov : msxml3: Support setting unlimited xml stream length for a reader.
by Alexandre Julliard 05 Oct '11

05 Oct '11

Module: wine Branch: master Commit: 393c232b053c829a477192734214393edc0f67dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=393c232b053c829a477192734… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 5 11:19:43 2011 -0500 msxml3: Support setting unlimited xml stream length for a reader. --- dlls/msxml3/saxreader.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 8498b8d..857083a 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2383,7 +2383,14 @@ static HRESULT internal_putProperty( return S_OK; } - FIXME("(%p)->(%s): unsupported property\n", This, debugstr_w(prop)); + if(!memcmp(prop, PropertyMaxXMLSizeW, sizeof(PropertyMaxXMLSizeW))) + { + if (V_VT(&value) == VT_I4 && V_I4(&value) == 0) return S_OK; + FIXME("(%p)->(%s): max-xml-size unsupported\n", This, debugstr_variant(&value)); + return E_NOTIMPL; + } + + FIXME("(%p)->(%s:%s): unsupported property\n", This, debugstr_w(prop), debugstr_variant(&value)); if(!memcmp(prop, PropertyCharsetW, sizeof(PropertyCharsetW))) return E_NOTIMPL; @@ -2397,9 +2404,6 @@ static HRESULT internal_putProperty( if(!memcmp(prop, PropertyMaxElementDepthW, sizeof(PropertyMaxElementDepthW))) return E_NOTIMPL; - if(!memcmp(prop, PropertyMaxXMLSizeW, sizeof(PropertyMaxXMLSizeW))) - return E_NOTIMPL; - if(!memcmp(prop, PropertySchemaDeclHandlerW, sizeof(PropertySchemaDeclHandlerW))) return E_NOTIMPL;

1 0

Nikolay Sivov : msxml3: Accept DTD prohibition feature.
by Alexandre Julliard 05 Oct '11

05 Oct '11

Module: wine Branch: master Commit: 165d1b5d70d44e2670e88e34f85c0aadab8fe25e URL: http://source.winehq.org/git/wine.git/?a=commit;h=165d1b5d70d44e2670e88e34f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 5 11:09:28 2011 -0500 msxml3: Accept DTD prohibition feature. --- dlls/msxml3/saxreader.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index b7cd432..8498b8d 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -217,6 +217,10 @@ static const WCHAR FeatureLexicalHandlerParEntitiesW[] = { '/','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 const WCHAR FeatureProhibitDTDW[] = { + 'p','r','o','h','i','b','i','t','-','d','t','d',0 +}; + static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL value) { if (value == VARIANT_TRUE) @@ -2634,6 +2638,12 @@ static HRESULT WINAPI saxxmlreader_putFeature( return set_feature_value(This, LexicalHandlerParEntities, value); } + if (!strcmpW(FeatureProhibitDTDW, feature)) + { + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); + return set_feature_value(This, ProhibitDTD, value); + } + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); return E_NOTIMPL; }

1 0

Nikolay Sivov : msxml3: Accept lexical handler parameter entities switch.
by Alexandre Julliard 05 Oct '11

05 Oct '11

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

Nikolay Sivov : msxml3: Accept disabled parameter entities feature.
by Alexandre Julliard 05 Oct '11

05 Oct '11

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 : gdi32: Display the depth of a bitmap rather than the total number colors.
by Alexandre Julliard 05 Oct '11

05 Oct '11

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

Huw Davies : winex11: Initialise the dib color table.
by Alexandre Julliard 05 Oct '11

05 Oct '11

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 04 Oct '11

04 Oct '11

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 04 Oct '11

04 Oct '11

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 04 Oct '11

04 Oct '11

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 : msacm32: Mark fall-through in switch statement.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: a051be53d25251f1d3208ebab67e0137d7c1ad2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a051be53d25251f1d3208ebab… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Oct 4 22:48:37 2011 +0100 msacm32: Mark fall-through in switch statement. --- dlls/msacm32/msacm32_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/msacm32_main.c b/dlls/msacm32/msacm32_main.c index d3160e3..6552812 100644 --- a/dlls/msacm32/msacm32_main.c +++ b/dlls/msacm32/msacm32_main.c @@ -87,6 +87,7 @@ DWORD WINAPI acmGetVersion(void) return 0x04000565; /* 4.0.1381 */ default: FIXME("%x not supported\n", version.dwPlatformId); + /* fall through */ case VER_PLATFORM_WIN32_WINDOWS: return 0x04030000; /* 4.3.0 */ }

1 0

← Newer
1
...
68
69
70
71
72
73
74
...
79
Older →

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 October 2011