October 2011 - Wine-commits

Nikolay Sivov : msxml3: Accept disabling of external entities loading.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: ad336be675ed9a1c95fa4f441040c95c92bc5b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad336be675ed9a1c95fa4f441… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 4 16:27:39 2011 -0500 msxml3: Accept disabling of external entities loading. --- dlls/msxml3/saxreader.c | 48 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index fca390a..0460533 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -49,6 +49,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 +enum ReaderFeatures +{ + ExhaustiveErrors = 1 << 1, + ExternalGeneralEntities = 1 << 2, + ExternalParameterEntities = 1 << 3, + ForcedResync = 1 << 4, + NamespacePrefixes = 1 << 5, + Namespace = 1 << 6, + ParameterEntities = 1 << 7, + PreserveSystemIndentifiers = 1 << 8, + ProhibitDTD = 1 << 9, + SchemaValidation = 1 << 10, + ServerHttpRequest = 1 << 11, + SuppressValidationfatalError = 1 << 12, + UseInlineSchema = 1 << 13, + UseSchemaLocation = 1 << 14 +}; + struct bstrpool { BSTR *pool; @@ -72,6 +90,7 @@ typedef struct _saxreader xmlSAXHandler sax; BOOL isParsing; struct bstrpool pool; + enum ReaderFeatures features; } saxreader; typedef struct _saxlocator @@ -180,6 +199,23 @@ static const WCHAR PropertyXMLDeclVersionW[] = { 'x','m','l','d','e','c','l','-','v','e','r','s','i','o','n',0 }; +/* feature names */ +static const WCHAR FeatureExternalGeneralEntitiesW[] = { + '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','-','g','e','n','e','r','a','l', + '-','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) + reader->features |= feature; + else + reader->features &= ~feature; + + return S_OK; +} + static inline BOOL has_content_handler(const saxlocator *locator) { return (locator->vbInterface && locator->saxreader->vbcontentHandler) || @@ -2568,12 +2604,17 @@ static HRESULT WINAPI saxxmlreader_getFeature( static HRESULT WINAPI saxxmlreader_putFeature( IVBSAXXMLReader* iface, - const WCHAR *pFeature, - VARIANT_BOOL vfValue) + const WCHAR *feature, + VARIANT_BOOL value) { saxreader *This = impl_from_IVBSAXXMLReader( iface ); - FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(pFeature), vfValue); + TRACE("(%p)->(%s %x)\n", This, debugstr_w(feature), value); + + if (!strcmpW(FeatureExternalGeneralEntitiesW, feature) && value == VARIANT_FALSE) + return set_feature_value(This, ExternalGeneralEntities, value); + + FIXME("(%p)->(%s %x) stub\n", This, debugstr_w(feature), value); return E_NOTIMPL; } @@ -2964,6 +3005,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->pool.pool = NULL; reader->pool.index = 0; reader->pool.len = 0; + reader->features = 0; memset(&reader->sax, 0, sizeof(xmlSAXHandler)); reader->sax.initialized = XML_SAX2_MAGIC;

1 0

Vincent Povirk : gdiplus: Fix pointer math for the 64-bit tests.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: 203d29d93aebce08548c38c0d2d3b9d41d114cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=203d29d93aebce08548c38c0d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 4 14:11:06 2011 -0500 gdiplus: Fix pointer math for the 64-bit tests. --- dlls/gdiplus/gdiplus.c | 2 +- dlls/gdiplus/image.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 8026f6e..9c3478b 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -407,7 +407,7 @@ BOOL lengthen_path(GpPath *path, INT len) void convert_32bppARGB_to_32bppPARGB(UINT width, UINT height, BYTE *dst_bits, INT dst_stride, const BYTE *src_bits, INT src_stride) { - UINT x, y; + INT x, y; for (y=0; y<height; y++) { const BYTE *src=src_bits+y*src_stride; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 4ae1d64..ce14ef6 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1404,7 +1404,7 @@ GpStatus WINGDIPAPI GdipCreateHBITMAPFromBitmap(GpBitmap* bitmap, if (result) { lockeddata.Stride = -width * 4; - lockeddata.Scan0 = bits - (lockeddata.Stride * (height - 1)); + lockeddata.Scan0 = bits + (width * 4 * (height - 1)); stat = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead|ImageLockModeUserInputBuf, PixelFormat32bppPARGB, &lockeddata);

1 0

Nikolay Sivov : kernel32/tests: Move CompareStringA data to a table.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: 17af6e394a1747ea54ce2abe7012ea77e806b789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17af6e394a1747ea54ce2abe7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 2 01:40:59 2011 +0400 kernel32/tests: Move CompareStringA data to a table. --- dlls/kernel32/tests/locale.c | 141 +++++++++++++++-------------------------- 1 files changed, 52 insertions(+), 89 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index e13247e..f5b77f7 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1135,12 +1135,63 @@ static void test_GetNumberFormatA(void) } } +struct comparestringa_entry { + LCID lcid; + DWORD flags; + const char *first; + int first_len; + const char *second; + int second_len; + int ret; +}; + +static const struct comparestringa_entry comparestringa_data[] = { + { LOCALE_SYSTEM_DEFAULT, 0, "EndDialog", -1, "_Property", -1, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "osp_vba.sreg0070", -1, "_IEWWBrowserComp", -1, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "r", -1, "\\", -1, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "osp_vba.sreg0031", -1, "OriginalDatabase", -1, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "AAA", -1, "aaa", -1, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "AAA", -1, "aab", -1, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "AAA", -1, "Aab", -1, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, ".AAA", -1, "Aab", -1, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, ".AAA", -1, "A.ab", -1, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "aa", -1, "AB", -1, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "aa", -1, "Aab", -1, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "aB", -1, "Aab", -1, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "Ba", -1, "bab", -1, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "{100}{83}{71}{71}{71}", -1, "Global_DataAccess_JRO", -1, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "a", -1, "{", -1, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "A", -1, "{", -1, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "3.5", 0, "4.0", -1, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "3.5", -1, "4.0", -1, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "3.520.4403.2", -1, "4.0.2927.10", -1, CSTR_LESS_THAN }, + /* hyphen and apostrophe are treated differently depending on whether SORT_STRINGSORT specified or not */ + { LOCALE_SYSTEM_DEFAULT, 0, "-o", -1, "/m", -1, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "/m", -1, "-o", -1, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "-o", -1, "/m", -1, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "/m", -1, "-o", -1, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "'o", -1, "/m", -1, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "/m", -1, "'o", -1, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "'o", -1, "/m", -1, CSTR_LESS_THAN }, + { LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "/m", -1, "'o", -1, CSTR_GREATER_THAN }, + { LOCALE_SYSTEM_DEFAULT, 0, "aLuZkUtZ", 8, "aLuZkUtZ", 9, CSTR_EQUAL }, + { LOCALE_SYSTEM_DEFAULT, 0, "aLuZkUtZ", 7, "aLuZkUtZ\0A", 10, CSTR_LESS_THAN } +}; static void test_CompareStringA(void) { - int ret; + int ret, i; LCID lcid = MAKELCID(MAKELANGID(LANG_FRENCH, SUBLANG_DEFAULT), SORT_DEFAULT); + for (i = 0; i < sizeof(comparestringa_data)/sizeof(struct comparestringa_entry); i++) + { + const struct comparestringa_entry *entry = &comparestringa_data[i]; + + ret = CompareStringA(entry->lcid, entry->flags, entry->first, entry->first_len, + entry->second, entry->second_len); + ok(ret == entry->ret, "%d: got %d, expected %d\n", i, ret, entry->ret); + } + ret = CompareStringA(lcid, NORM_IGNORECASE, "Salut", -1, "Salute", -1); ok (ret== 1, "(Salut/Salute) Expected 1, got %d\n", ret); @@ -1189,89 +1240,6 @@ static void test_CompareStringA(void) ret = lstrcmpA(NULL, ""); ok (ret == -1 || broken(ret == -2) /* win9x */, "lstrcmpA(NULL, \"\") should return -1, got %d\n", ret); - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT,0,"EndDialog",-1,"_Property",-1); - ok( ret == 3, "EndDialog vs _Property ... expected 3, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT,0,"osp_vba.sreg0070",-1,"_IEWWBrowserComp",-1); - ok( ret == 3, "osp_vba.sreg0070 vs _IEWWBrowserComp ... expected 3, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT,0,"r",-1,"\\",-1); - ok( ret == 3, "r vs \\ ... expected 3, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT,0,"osp_vba.sreg0031", -1, "OriginalDatabase", -1 ); - ok( ret == 3, "osp_vba.sreg0031 vs OriginalDatabase ... expected 3, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "AAA", -1, "aaa", -1 ); - ok( ret == 3, "AAA vs aaa expected 3, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "AAA", -1, "aab", -1 ); - ok( ret == 1, "AAA vs aab expected 1, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "AAA", -1, "Aab", -1 ); - ok( ret == 1, "AAA vs Aab expected 1, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, ".AAA", -1, "Aab", -1 ); - ok( ret == 1, ".AAA vs Aab expected 1, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, ".AAA", -1, "A.ab", -1 ); - ok( ret == 1, ".AAA vs A.ab expected 1, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "aa", -1, "AB", -1 ); - ok( ret == 1, "aa vs AB expected 1, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "aa", -1, "Aab", -1 ); - ok( ret == 1, "aa vs Aab expected 1, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "aB", -1, "Aab", -1 ); - ok( ret == 3, "aB vs Aab expected 3, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "Ba", -1, "bab", -1 ); - ok( ret == 1, "Ba vs bab expected 1, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "{100}{83}{71}{71}{71}", -1, "Global_DataAccess_JRO", -1 ); - ok( ret == 1, "{100}{83}{71}{71}{71} vs Global_DataAccess_JRO expected 1, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "a", -1, "{", -1 ); - ok( ret == 3, "a vs { expected 3, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "A", -1, "{", -1 ); - ok( ret == 3, "A vs { expected 3, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "3.5", 0, "4.0", -1 ); - ok(ret == 1, "3.5/0 vs 4.0/-1 expected 1, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "3.5", -1, "4.0", -1 ); - ok(ret == 1, "3.5 vs 4.0 expected 1, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "3.520.4403.2", -1, "4.0.2927.10", -1 ); - ok(ret == 1, "3.520.4403.2 vs 4.0.2927.10 expected 1, got %d\n", ret); - - /* hyphen and apostrophe are treated differently depending on - * whether SORT_STRINGSORT specified or not - */ - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "-o", -1, "/m", -1 ); - ok(ret == 3, "-o vs /m expected 3, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "/m", -1, "-o", -1 ); - ok(ret == 1, "/m vs -o expected 1, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "-o", -1, "/m", -1 ); - ok(ret == 1, "-o vs /m expected 1, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "/m", -1, "-o", -1 ); - ok(ret == 3, "/m vs -o expected 3, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "'o", -1, "/m", -1 ); - ok(ret == 3, "'o vs /m expected 3, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "/m", -1, "'o", -1 ); - ok(ret == 1, "/m vs 'o expected 1, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "'o", -1, "/m", -1 ); - ok(ret == 1, "'o vs /m expected 1, got %d\n", ret); - - ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, SORT_STRINGSORT, "/m", -1, "'o", -1 ); - ok(ret == 3, "/m vs 'o expected 3, got %d\n", ret); if (0) { /* this requires collation table patch to make it MS compatible */ ret = CompareStringA(LOCALE_SYSTEM_DEFAULT, 0, "'o", -1, "-o", -1 ); @@ -1311,11 +1279,6 @@ static void test_CompareStringA(void) ok(ret == 1, "-m vs `o expected 1, got %d\n", ret); } - ret = CompareStringA(LOCALE_USER_DEFAULT, 0, "aLuZkUtZ", 8, "aLuZkUtZ", 9); - ok(ret == 2, "aLuZkUtZ vs aLuZkUtZ\\0 expected 2, got %d\n", ret); - - ret = CompareStringA(LOCALE_USER_DEFAULT, 0, "aLuZkUtZ", 7, "aLuZkUtZ\0A", 10); - ok(ret == 1, "aLuZkUtZ vs aLuZkUtZ\\0A expected 1, got %d\n", ret); /* WinXP handles embedded NULLs differently than earlier versions */ ret = CompareStringA(LOCALE_USER_DEFAULT, 0, "aLuZkUtZ", 8, "aLuZkUtZ\0A", 10);

1 0

Andrew Eikum : winmm: Handle DRV_QUERYMAPPABLE in waveXxxMessage.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: e19be58e90a5707acbb317af0ffa6e7464d51ab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e19be58e90a5707acbb317af0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Oct 4 08:24:27 2011 -0500 winmm: Handle DRV_QUERYMAPPABLE in waveXxxMessage. --- dlls/winmm/tests/wave.c | 6 ++++++ dlls/winmm/waveform.c | 4 ++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 921216b..6405cf8 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -30,6 +30,7 @@ #include "winnls.h" #include "mmsystem.h" #define NOBITMAP +#include "mmddk.h" #include "mmreg.h" #include "ks.h" #include "ksguid.h" @@ -891,6 +892,11 @@ static void wave_out_test_device(UINT_PTR device) "waveOutGetDevCapsW(%s): unexpected return value %s\n", dev_name(device),wave_out_error(rc)); + rc=waveOutMessage((HWAVEOUT)device, DRV_QUERYMAPPABLE, 0, 0); + ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_NOTSUPPORTED, + "DRV_QUERYMAPPABLE(%s): unexpected return value %s\n", + dev_name(device),wave_out_error(rc)); + nameA=NULL; rc=waveOutMessage((HWAVEOUT)device, DRV_QUERYDEVICEINTERFACESIZE, (DWORD_PTR)&size, 0); diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 0aa6320..658fd24 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2780,6 +2780,8 @@ UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, (DWORD_PTR*)dwParam1, TRUE); case DRV_QUERYFUNCTIONINSTANCEID: return WINMM_QueryInstanceID(HandleToULong(hWaveOut), (WCHAR*)dwParam1, dwParam2, TRUE); + case DRV_QUERYMAPPABLE: + return MMSYSERR_NOERROR; } return MMSYSERR_NOTSUPPORTED; @@ -3152,6 +3154,8 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, (DWORD_PTR*)dwParam1, FALSE); case DRV_QUERYFUNCTIONINSTANCEID: return WINMM_QueryInstanceID(HandleToULong(hWaveIn), (WCHAR*)dwParam1, dwParam2, FALSE); + case DRV_QUERYMAPPABLE: + return MMSYSERR_NOERROR; } return MMSYSERR_NOTSUPPORTED;

1 0

Marcus Meissner : dsound: Make a function static, remove a no longer used array.
by Alexandre Julliard 04 Oct '11

04 Oct '11

Module: wine Branch: master Commit: 1533965e8cff7a1908c3fc626e08ec8b4b786801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1533965e8cff7a1908c3fc626… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Oct 4 02:38:06 2011 +0200 dsound: Make a function static, remove a no longer used array. --- dlls/dsound/capture.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 7569254..61a8228 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -822,8 +822,6 @@ static HRESULT IDirectSoundCaptureBufferImpl_Create( /******************************************************************************* * DirectSoundCaptureDevice */ -DirectSoundCaptureDevice * DSOUND_capture[MAXWAVEDRIVERS]; - static HRESULT DirectSoundCaptureDevice_Create( DirectSoundCaptureDevice ** ppDevice) { @@ -880,8 +878,8 @@ static ULONG DirectSoundCaptureDevice_Release( return ref; } -void CALLBACK DSOUND_capture_timer(UINT timerID, UINT msg, DWORD_PTR user, - DWORD_PTR dw1, DWORD_PTR dw2) +static void CALLBACK DSOUND_capture_timer(UINT timerID, UINT msg, DWORD_PTR user, + DWORD_PTR dw1, DWORD_PTR dw2) { DirectSoundCaptureDevice *device = (DirectSoundCaptureDevice*)user; UINT32 packet_frames, packet_bytes, avail_bytes;

1 0

Alexandre Julliard : winex11: Force alpha channel to 0 when doing color conversion in PutImage.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 8abe262fd2c18b2b15053090d4426132101cffab URL: http://source.winehq.org/git/wine.git/?a=commit;h=8abe262fd2c18b2b15053090d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 3 16:47:31 2011 -0500 winex11: Force alpha channel to 0 when doing color conversion in PutImage. --- dlls/winex11.drv/xrender.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index c039468..33ad4bd 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -249,6 +249,11 @@ static CRITICAL_SECTION xrender_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; #define NATIVE_BYTE_ORDER LSBFirst #endif +static BOOL has_alpha( enum wxr_format format ) +{ + return (format == WXR_FORMAT_A8R8G8B8 || format == WXR_FORMAT_B8G8R8A8); +} + static enum wxr_format get_format_without_alpha( enum wxr_format format ) { switch (format) @@ -2514,7 +2519,7 @@ static void xrender_stretch_blit( struct xrender_physdev *physdev_src, struct xr } -static void xrender_put_image( Pixmap src_pixmap, Picture src_pict, HRGN clip, +static void xrender_put_image( Pixmap src_pixmap, Picture src_pict, Picture mask_pict, HRGN clip, XRenderPictFormat *dst_format, struct xrender_physdev *physdev, Drawable drawable, struct bitblt_coords *src, struct bitblt_coords *dst, BOOL use_repeat ) @@ -2561,7 +2566,7 @@ static void xrender_put_image( Pixmap src_pixmap, Picture src_pict, HRGN clip, if (dst->width < 0) x_dst += dst->width + 1; if (dst->height < 0) y_dst += dst->height + 1; - xrender_blit( PictOpSrc, src_pict, 0, dst_pict, x_src, y_src, x_dst, y_dst, + xrender_blit( PictOpSrc, src_pict, mask_pict, dst_pict, x_src, y_src, x_dst, y_dst, xscale, yscale, abs( dst->width ), abs( dst->height )); if (drawable) @@ -2655,7 +2660,7 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA enum wxr_format src_format, dst_format; XRenderPictFormat *pict_format; Pixmap src_pixmap; - Picture src_pict; + Picture src_pict, mask_pict = 0; BOOL use_repeat; if (!X11DRV_XRender_Installed) goto x11drv_fallback; @@ -2686,6 +2691,8 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA if (!bits) return ERROR_SUCCESS; /* just querying the format */ + if (!has_alpha( src_format ) && has_alpha( dst_format )) mask_pict = get_no_alpha_mask(); + ret = create_image_pixmap( info, bits, src, src_format, &src_pixmap, &src_pict, &use_repeat ); if (!ret) { @@ -2698,8 +2705,8 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA X11DRV_DIB_Lock( bitmap, DIB_Status_GdiMod ); - xrender_put_image( src_pixmap, src_pict, rgn, pict_formats[dst_format], - NULL, bitmap->pixmap, src, dst, use_repeat ); + xrender_put_image( src_pixmap, src_pict, mask_pict, rgn, + pict_formats[dst_format], NULL, bitmap->pixmap, src, dst, use_repeat ); X11DRV_DIB_Unlock( bitmap, TRUE ); DeleteObject( rgn ); @@ -2728,7 +2735,7 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA tmp.visrect.bottom - tmp.visrect.top, physdev->x11dev->depth ); wine_tsx11_unlock(); - xrender_put_image( src_pixmap, src_pict, NULL, physdev->pict_format, + xrender_put_image( src_pixmap, src_pict, mask_pict, NULL, physdev->pict_format, NULL, tmp_pixmap, src, &tmp, use_repeat ); execute_rop( physdev->x11dev, tmp_pixmap, gc, &dst->visrect, rop ); @@ -2739,7 +2746,7 @@ static DWORD xrenderdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMA restore_clipping_region( physdev->x11dev, clip_data ); } - else xrender_put_image( src_pixmap, src_pict, clip, + else xrender_put_image( src_pixmap, src_pict, mask_pict, clip, physdev->pict_format, physdev, 0, src, dst, use_repeat ); X11DRV_UnlockDIBSection( physdev->x11dev, TRUE );

1 0

Francois Gouget : kernel32: Reset LastError if GetModuleFileName() succeeds .
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 8e67930bd7a1db8438cca50e8bd9269d80887c84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e67930bd7a1db8438cca50e8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 3 23:38:29 2011 +0200 kernel32: Reset LastError if GetModuleFileName() succeeds. --- dlls/kernel32/module.c | 3 +++ dlls/kernel32/tests/module.c | 8 ++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 8ee0fcd..1b0b23f 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -648,7 +648,10 @@ DWORD WINAPI GetModuleFileNameW( HMODULE hModule, LPWSTR lpFileName, DWORD size len = min(size, pldr->FullDllName.Length / sizeof(WCHAR)); memcpy(lpFileName, pldr->FullDllName.Buffer, len * sizeof(WCHAR)); if (len < size) + { lpFileName[len] = '\0'; + SetLastError( 0 ); + } else SetLastError( ERROR_INSUFFICIENT_BUFFER ); } diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 01fa448..07d5892 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -44,13 +44,21 @@ static void testGetModuleFileName(const char* name) /* first test, with enough space in buffer */ memset(bufA, '-', sizeof(bufA)); + SetLastError(0xdeadbeef); len1A = GetModuleFileNameA(hMod, bufA, sizeof(bufA)); + ok(GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), /* <= XP SP3 */ + "LastError was not reset: %u\n", GetLastError()); ok(len1A > 0, "Getting module filename for handle %p\n", hMod); if (is_unicode_enabled) { memset(bufW, '-', sizeof(bufW)); + SetLastError(0xdeadbeef); len1W = GetModuleFileNameW(hMod, bufW, sizeof(bufW) / sizeof(WCHAR)); + ok(GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), /* <= XP SP3 */ + "LastError was not reset: %u\n", GetLastError()); ok(len1W > 0, "Getting module filename for handle %p\n", hMod); }

1 0

Francois Gouget : kernel32/tests: Check what happens if QueryDosDeviceA() is given an insufficient buffer.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: db882bfb5d2f24b427019a11ccd463fc92f50282 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db882bfb5d2f24b427019a11c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 3 23:39:10 2011 +0200 kernel32/tests: Check what happens if QueryDosDeviceA() is given an insufficient buffer. --- dlls/kernel32/tests/volume.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 6f0fd67..2755af5 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -44,6 +44,12 @@ static void test_query_dos_deviceA(void) DWORD ret, ret2, buflen=32768; BOOL found = FALSE; + /* callers must guess the buffer size */ + SetLastError(0xdeadbeef); + ret = QueryDosDeviceA( NULL, NULL, 0 ); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "QueryDosDeviceA(no buffer): returned %u, le=%u\n", ret, GetLastError()); + buffer = HeapAlloc( GetProcessHeap(), 0, buflen ); SetLastError(0xdeadbeef); ret = QueryDosDeviceA( NULL, buffer, buflen );

1 0

Nikolay Sivov : comctl32/treeview: Free checkbox imagelist when control is about to be killed.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 1bc331f31f44a382a7f909d79da794d28c233fd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc331f31f44a382a7f909d79… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Oct 1 23:29:10 2011 +0400 comctl32/treeview: Free checkbox imagelist when control is about to be killed. --- dlls/comctl32/tests/treeview.c | 22 ++++++++++++++++++---- dlls/comctl32/treeview.c | 34 ++++++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index fd4a6ce..c99d480 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -658,7 +658,7 @@ static void test_get_set_bkcolor(void) static void test_get_set_imagelist(void) { - HIMAGELIST hImageList = NULL; + HIMAGELIST himl; HWND hTree; hTree = create_treeview_control(0); @@ -667,9 +667,9 @@ static void test_get_set_imagelist(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); /* Test a NULL HIMAGELIST */ - SendMessage( hTree, TVM_SETIMAGELIST, TVSIL_NORMAL, (LPARAM)hImageList ); - hImageList = (HIMAGELIST)SendMessage( hTree, TVM_GETIMAGELIST, TVSIL_NORMAL, 0 ); - ok(hImageList == NULL, "NULL image list, reported as 0x%p, expected 0.\n", hImageList); + SendMessage( hTree, TVM_SETIMAGELIST, TVSIL_NORMAL, 0 ); + himl = (HIMAGELIST)SendMessage( hTree, TVM_GETIMAGELIST, TVSIL_NORMAL, 0 ); + ok(himl == NULL, "NULL image list, reported as %p, expected 0.\n", himl); /* TODO: Test an actual image list */ @@ -1607,6 +1607,7 @@ static void test_htreeitem_layout(void) static void test_TVS_CHECKBOXES(void) { + HIMAGELIST himl; TVITEMA item; HWND hTree; DWORD ret; @@ -1614,6 +1615,9 @@ static void test_TVS_CHECKBOXES(void) hTree = create_treeview_control(0); fill_tree(hTree); + himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl == NULL, "got %p\n", himl); + item.hItem = hRoot; item.mask = TVIF_STATE; item.state = INDEXTOSTATEIMAGEMASK(1); @@ -1632,6 +1636,8 @@ static void test_TVS_CHECKBOXES(void) /* enabling check boxes set all items to 1 state image index */ SetWindowLongA(hTree, GWL_STYLE, GetWindowLongA(hTree, GWL_STYLE) | TVS_CHECKBOXES); + himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl != NULL, "got %p\n", himl); item.hItem = hRoot; item.mask = TVIF_STATE; @@ -1652,8 +1658,16 @@ static void test_TVS_CHECKBOXES(void) DestroyWindow(hTree); /* the same, but initially created with TVS_CHECKBOXES */ + hTree = create_treeview_control(0); + fill_tree(hTree); + himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + ok(himl == NULL, "got %p\n", himl); + DestroyWindow(hTree); + hTree = create_treeview_control(TVS_CHECKBOXES); fill_tree(hTree); + himl = (HIMAGELIST)SendMessageA(hTree, TVM_GETIMAGELIST, TVSIL_STATE, 0); + todo_wine ok(himl == NULL, "got %p\n", himl); item.hItem = hRoot; item.mask = TVIF_STATE; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 02b5a7f..c5f3bb3 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -66,6 +66,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(treeview); +enum StateListType +{ + OriginInternal, + OriginUser +}; + /* internal structures */ typedef struct _TREEITEM /* HTREEITEM is a _TREEINFO *. */ @@ -156,6 +162,7 @@ typedef struct tagTREEVIEW_INFO HIMAGELIST himlState; int stateImageHeight; int stateImageWidth; + enum StateListType statehimlType; HDPA items; DWORD lastKeyPressTimestamp; @@ -1756,22 +1763,21 @@ TREEVIEW_NaturalHeight(const TREEVIEW_INFO *infoPtr) } static LRESULT -TREEVIEW_SetImageList(TREEVIEW_INFO *infoPtr, WPARAM wParam, HIMAGELIST himlNew) +TREEVIEW_SetImageList(TREEVIEW_INFO *infoPtr, UINT type, HIMAGELIST himlNew) { HIMAGELIST himlOld = 0; int oldWidth = infoPtr->normalImageWidth; int oldHeight = infoPtr->normalImageHeight; + TRACE("%u,%p\n", type, himlNew); - TRACE("%lx,%p\n", wParam, himlNew); - - switch (wParam) + switch (type) { case TVSIL_NORMAL: himlOld = infoPtr->himlNormal; infoPtr->himlNormal = himlNew; - if (himlNew != NULL) + if (himlNew) ImageList_GetIconSize(himlNew, &infoPtr->normalImageWidth, &infoPtr->normalImageHeight); else @@ -1786,9 +1792,12 @@ TREEVIEW_SetImageList(TREEVIEW_INFO *infoPtr, WPARAM wParam, HIMAGELIST himlNew) himlOld = infoPtr->himlState; infoPtr->himlState = himlNew; - if (himlNew != NULL) + if (himlNew) + { ImageList_GetIconSize(himlNew, &infoPtr->stateImageWidth, &infoPtr->stateImageHeight); + infoPtr->statehimlType = OriginUser; + } else { infoPtr->stateImageWidth = 0; @@ -1796,6 +1805,9 @@ TREEVIEW_SetImageList(TREEVIEW_INFO *infoPtr, WPARAM wParam, HIMAGELIST himlNew) } break; + + default: + ERR("unknown imagelist type %u\n", type); } if (oldWidth != infoPtr->normalImageWidth || @@ -4950,7 +4962,7 @@ TREEVIEW_MouseWheel(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) /* Create/Destroy *******************************************************/ static void -initialize_checkboxes(TREEVIEW_INFO *infoPtr) +TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) { RECT rc; HBITMAP hbm, hbmOld; @@ -4958,6 +4970,7 @@ initialize_checkboxes(TREEVIEW_INFO *infoPtr) int nIndex; infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); + infoPtr->statehimlType = OriginInternal; hdcScreen = GetDC(0); @@ -5089,7 +5102,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) hwnd, 0, 0, 0); if (infoPtr->dwStyle & TVS_CHECKBOXES) - initialize_checkboxes(infoPtr); + TREEVIEW_InitCheckboxes(infoPtr); /* Make sure actual scrollbar state is consistent with uInternalStatus */ ShowScrollBar(hwnd, SB_VERT, FALSE); @@ -5121,10 +5134,11 @@ TREEVIEW_Destroy(TREEVIEW_INFO *infoPtr) CloseThemeData (GetWindowTheme (infoPtr->hwnd)); + if (infoPtr->statehimlType == OriginInternal) + ImageList_Destroy(infoPtr->himlState); /* Deassociate treeview from the window before doing anything drastic. */ SetWindowLongPtrW(infoPtr->hwnd, 0, 0); - DeleteObject(infoPtr->hDefaultFont); DeleteObject(infoPtr->hBoldFont); DeleteObject(infoPtr->hUnderlineFont); @@ -5459,7 +5473,7 @@ TREEVIEW_StyleChanged(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { if (dwNewStyle & TVS_CHECKBOXES) { - initialize_checkboxes(infoPtr); + TREEVIEW_InitCheckboxes(infoPtr); TRACE("checkboxes enabled\n"); /* set all items to state image index 1 */

1 0

Marcus Meissner : dibdrv: Mark get_rop_codes as hidden.
by Alexandre Julliard 03 Oct '11

03 Oct '11

Module: wine Branch: master Commit: 9437705c2a9321daab2e3394cf177527744a2518 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9437705c2a9321daab2e3394c… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Oct 3 13:25:34 2011 +0200 dibdrv: Mark get_rop_codes as hidden. --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 21549f8..5f9a31e 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -177,7 +177,7 @@ typedef struct DWORD octant; } bres_params; -extern void get_rop_codes(INT rop, struct rop_codes *codes); +extern void get_rop_codes(INT rop, struct rop_codes *codes) DECLSPEC_HIDDEN; extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN; extern void reset_dash_origin(dibdrv_physdev *pdev) DECLSPEC_HIDDEN;

1 0