March 2015 - Wine-commits - list.winehq.org

Piotr Caban : windowscodecs: Add helper to create internal COM classes without CoCreateInstance call if possible.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: df9ec3c1785b2b9290611a0e712eb4c98fc55caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9ec3c1785b2b9290611a0e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 6 11:20:16 2015 +0100 windowscodecs: Add helper to create internal COM classes without CoCreateInstance call if possible. --- dlls/windowscodecs/clsfactory.c | 11 +++++++++++ dlls/windowscodecs/info.c | 13 +++++-------- dlls/windowscodecs/tests/gifformat.c | 12 ++++++++++++ dlls/windowscodecs/wincodecs_private.h | 2 ++ 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index 614a5d1..a862338 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -202,3 +202,14 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) TRACE("<-- %08X\n", ret); return ret; } + +HRESULT create_instance(CLSID *clsid, const IID *iid, void **ppv) +{ + int i; + + for (i=0; wic_classes[i].classid; i++) + if (IsEqualCLSID(wic_classes[i].classid, clsid)) + return wic_classes[i].constructor(iid, ppv); + + return CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, iid, ppv); +} diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index f532ad1..2cb64d4 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -623,8 +623,7 @@ static HRESULT WINAPI BitmapDecoderInfo_CreateInstance(IWICBitmapDecoderInfo *if TRACE("(%p,%p)\n", iface, ppIBitmapDecoder); - return CoCreateInstance(&This->clsid, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICBitmapDecoder, (void**)ppIBitmapDecoder); + return create_instance(&This->clsid, &IID_IWICBitmapDecoder, (void**)ppIBitmapDecoder); } static const IWICBitmapDecoderInfoVtbl BitmapDecoderInfo_Vtbl = { @@ -917,8 +916,7 @@ static HRESULT WINAPI BitmapEncoderInfo_CreateInstance(IWICBitmapEncoderInfo *if TRACE("(%p,%p)\n", iface, ppIBitmapEncoder); - return CoCreateInstance(&This->clsid, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICBitmapEncoder, (void**)ppIBitmapEncoder); + return create_instance(&This->clsid, &IID_IWICBitmapEncoder, (void**)ppIBitmapEncoder); } static const IWICBitmapEncoderInfoVtbl BitmapEncoderInfo_Vtbl = { @@ -1125,8 +1123,8 @@ static HRESULT WINAPI FormatConverterInfo_CreateInstance(IWICFormatConverterInfo TRACE("(%p,%p)\n", iface, ppIFormatConverter); - return CoCreateInstance(&This->clsid, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICFormatConverter, (void**)ppIFormatConverter); + return create_instance(&This->clsid, &IID_IWICFormatConverter, + (void**)ppIFormatConverter); } static BOOL ConverterSupportsFormat(IWICFormatConverterInfo *iface, const WCHAR *formatguid) @@ -1871,8 +1869,7 @@ static HRESULT WINAPI MetadataReaderInfo_CreateInstance(IWICMetadataReaderInfo * TRACE("(%p,%p)\n", iface, reader); - return CoCreateInstance(&This->clsid, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICMetadataReader, (void **)reader); + return create_instance(&This->clsid, &IID_IWICMetadataReader, (void **)reader); } static const IWICMetadataReaderInfoVtbl MetadataReaderInfo_Vtbl = { diff --git a/dlls/windowscodecs/tests/gifformat.c b/dlls/windowscodecs/tests/gifformat.c index 6924ae8..2925911 100644 --- a/dlls/windowscodecs/tests/gifformat.c +++ b/dlls/windowscodecs/tests/gifformat.c @@ -25,6 +25,8 @@ #include "wincodec.h" #include "wine/test.h" +HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT, IWICImagingFactory**); + static const char gif_global_palette[] = { /* LSD */'G','I','F','8','7','a',0x01,0x00,0x01,0x00,0xa1,0x02,0x00, /* palette */0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c, @@ -344,4 +346,14 @@ START_TEST(gifformat) IWICImagingFactory_Release(factory); CoUninitialize(); + + /* run the same tests with no COM initialization */ + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); + ok(hr == S_OK, "WICCreateImagingFactory_Proxy error %#x\n", hr); + + test_global_gif_palette(); + test_global_gif_palette_2frames(); + test_local_gif_palette(); + + IWICImagingFactory_Release(factory); } diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index f6ac785..a2f3ded 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -67,6 +67,8 @@ DECLARE_INTERFACE_(IMILUnknown2,IUnknown) }; #undef INTERFACE +HRESULT create_instance(CLSID *clsid, const IID *iid, void **ppv) DECLSPEC_HIDDEN; + typedef HRESULT(*class_constructor)(REFIID,void**); extern HRESULT FormatConverter_CreateInstance(REFIID riid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT ComponentFactory_CreateInstance(REFIID riid, void** ppv) DECLSPEC_HIDDEN;

1 0

Piotr Caban : gdiplus: Don't use CoCreateInstance in decode_image_wic.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: b03c60d85c07553b36e8ec63bd973fcea4eb8e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b03c60d85c07553b36e8ec63b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 6 11:20:33 2015 +0100 gdiplus: Don't use CoCreateInstance in decode_image_wic. --- dlls/gdiplus/image.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index e6921f5..e2342d5 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -40,6 +40,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT, IWICImagingFactory**); + #define PIXELFORMATBPP(x) ((x) ? ((x) >> 8) & 255 : 24) static const struct @@ -3403,12 +3405,13 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI typedef void (*metadata_reader_func)(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT frame); -static GpStatus decode_image_wic(IStream *stream, GDIPCONST CLSID *clsid, +static GpStatus decode_image_wic(IStream *stream, REFGUID container, UINT active_frame, metadata_reader_func metadata_reader, GpImage **image) { GpStatus status=Ok; GpBitmap *bitmap; HRESULT hr; + IWICImagingFactory *factory; IWICBitmapDecoder *decoder; IWICBitmapFrameDecode *frame; IWICBitmapSource *source=NULL; @@ -3423,12 +3426,13 @@ static GpStatus decode_image_wic(IStream *stream, GDIPCONST CLSID *clsid, WICRect wrc; HRESULT initresult; - TRACE("%p,%s,%u,%p\n", stream, wine_dbgstr_guid(clsid), active_frame, image); + TRACE("%p,%s,%u,%p\n", stream, wine_dbgstr_guid(container), active_frame, image); initresult = CoInitialize(NULL); - - hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICBitmapDecoder, (void**)&decoder); + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); + if (FAILED(hr)) goto end; + hr = IWICImagingFactory_CreateDecoder(factory, container, NULL, &decoder); + IWICImagingFactory_Release(factory); if (FAILED(hr)) goto end; hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnLoad); @@ -3571,7 +3575,7 @@ end: static GpStatus decode_image_icon(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { - return decode_image_wic(stream, &CLSID_WICIcoDecoder, active_frame, NULL, image); + return decode_image_wic(stream, &GUID_ContainerFormatIco, active_frame, NULL, image); } static GpStatus decode_image_bmp(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) @@ -3579,7 +3583,7 @@ static GpStatus decode_image_bmp(IStream* stream, REFCLSID clsid, UINT active_fr GpStatus status; GpBitmap* bitmap; - status = decode_image_wic(stream, &CLSID_WICBmpDecoder, active_frame, NULL, image); + status = decode_image_wic(stream, &GUID_ContainerFormatBmp, active_frame, NULL, image); bitmap = (GpBitmap*)*image; @@ -3594,22 +3598,22 @@ static GpStatus decode_image_bmp(IStream* stream, REFCLSID clsid, UINT active_fr static GpStatus decode_image_jpeg(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { - return decode_image_wic(stream, &CLSID_WICJpegDecoder, active_frame, NULL, image); + return decode_image_wic(stream, &GUID_ContainerFormatJpeg, active_frame, NULL, image); } static GpStatus decode_image_png(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { - return decode_image_wic(stream, &CLSID_WICPngDecoder, active_frame, NULL, image); + return decode_image_wic(stream, &GUID_ContainerFormatPng, active_frame, NULL, image); } static GpStatus decode_image_gif(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { - return decode_image_wic(stream, &CLSID_WICGifDecoder, active_frame, gif_metadata_reader, image); + return decode_image_wic(stream, &GUID_ContainerFormatGif, active_frame, gif_metadata_reader, image); } static GpStatus decode_image_tiff(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image) { - return decode_image_wic(stream, &CLSID_WICTiffDecoder, active_frame, NULL, image); + return decode_image_wic(stream, &GUID_ContainerFormatTiff, active_frame, NULL, image); } static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid, UINT active_frame, GpImage **image)

1 0

Piotr Caban : gdiplus: Don't use CoCreateInstance in get_palette function.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: afe342284967c1043ea4b465098797a94c553f6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe342284967c1043ea4b4650… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 6 11:20:43 2015 +0100 gdiplus: Don't use CoCreateInstance in get_palette function. --- dlls/gdiplus/image.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index e2342d5..ca5f165 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -71,8 +71,7 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT IWICPalette *wic_palette; ColorPalette *palette = NULL; - hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICImagingFactory, (void **)&factory); + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); if (hr != S_OK) return NULL; hr = IWICImagingFactory_CreatePalette(factory, &wic_palette); @@ -3181,8 +3180,7 @@ static PropertyItem *get_gif_palette(IWICBitmapDecoder *decoder, IWICMetadataRea if (!get_bool_property(reader, &GUID_MetadataFormatLSD, global_flagW)) return NULL; - hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICImagingFactory, (void **)&factory); + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); if (hr != S_OK) return NULL; hr = IWICImagingFactory_CreatePalette(factory, &palette); @@ -3424,11 +3422,9 @@ static GpStatus decode_image_wic(IStream *stream, REFGUID container, UINT width, height, frame_count; BitmapData lockeddata; WICRect wrc; - HRESULT initresult; TRACE("%p,%s,%u,%p\n", stream, wine_dbgstr_guid(container), active_frame, image); - initresult = CoInitialize(NULL); hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); if (FAILED(hr)) goto end; hr = IWICImagingFactory_CreateDecoder(factory, container, NULL, &decoder); @@ -3544,8 +3540,6 @@ static GpStatus decode_image_wic(IStream *stream, REFGUID container, IWICBitmapDecoder_Release(decoder); end: - if (SUCCEEDED(initresult)) CoUninitialize(); - if (FAILED(hr) && status == Ok) status = hresult_to_status(hr); if (status == Ok)

1 0

Piotr Caban : gdiplus: Don't use CoCreateInstance in encode_image_wic.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 4c6427d08044a2d2792dd77deb3c0bec692ff269 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6427d08044a2d2792dd77de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 6 11:20:57 2015 +0100 gdiplus: Don't use CoCreateInstance in encode_image_wic. --- dlls/gdiplus/image.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index ca5f165..a7f4385 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3875,11 +3875,12 @@ GpStatus WINGDIPAPI GdipSaveImageToFile(GpImage *image, GDIPCONST WCHAR* filenam * These functions encode an image in different image file formats. */ -static GpStatus encode_image_WIC(GpImage *image, IStream* stream, - GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) +static GpStatus encode_image_wic(GpImage *image, IStream* stream, + REFGUID container, GDIPCONST EncoderParameters* params) { GpStatus stat; GpBitmap *bitmap; + IWICImagingFactory *factory; IWICBitmapEncoder *encoder; IWICBitmapFrameEncode *frameencode; IPropertyBag2 *encoderoptions; @@ -3890,7 +3891,6 @@ static GpStatus encode_image_WIC(GpImage *image, IStream* stream, WICPixelFormatGUID wicformat; GpRect rc; BitmapData lockeddata; - HRESULT initresult; UINT i; if (image->type != ImageTypeBitmap) @@ -3906,15 +3906,13 @@ static GpStatus encode_image_WIC(GpImage *image, IStream* stream, rc.Width = width; rc.Height = height; - initresult = CoInitialize(NULL); - - hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICBitmapEncoder, (void**)&encoder); + hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); + if (FAILED(hr)) + return hresult_to_status(hr); + hr = IWICImagingFactory_CreateEncoder(factory, container, NULL, &encoder); + IWICImagingFactory_Release(factory); if (FAILED(hr)) - { - if (SUCCEEDED(initresult)) CoUninitialize(); return hresult_to_status(hr); - } hr = IWICBitmapEncoder_Initialize(encoder, stream, WICBitmapEncoderNoCache); @@ -4009,34 +4007,31 @@ static GpStatus encode_image_WIC(GpImage *image, IStream* stream, hr = IWICBitmapEncoder_Commit(encoder); IWICBitmapEncoder_Release(encoder); - - if (SUCCEEDED(initresult)) CoUninitialize(); - return hresult_to_status(hr); } static GpStatus encode_image_BMP(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) { - return encode_image_WIC(image, stream, &CLSID_WICBmpEncoder, params); + return encode_image_wic(image, stream, &GUID_ContainerFormatBmp, params); } static GpStatus encode_image_tiff(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) { - return encode_image_WIC(image, stream, &CLSID_WICTiffEncoder, params); + return encode_image_wic(image, stream, &GUID_ContainerFormatTiff, params); } static GpStatus encode_image_png(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) { - return encode_image_WIC(image, stream, &CLSID_WICPngEncoder, params); + return encode_image_wic(image, stream, &GUID_ContainerFormatPng, params); } static GpStatus encode_image_jpeg(GpImage *image, IStream* stream, GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) { - return encode_image_WIC(image, stream, &CLSID_WICJpegEncoder, params); + return encode_image_wic(image, stream, &GUID_ContainerFormatJpeg, params); } /*****************************************************************************

1 0

Mark Harmstone : uxtheme: Assume imagecount to be 1 if unspecified.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: b12f73a591652614b36e3273c4aae33a76032f3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b12f73a591652614b36e3273c… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Feb 28 20:22:27 2015 +0000 uxtheme: Assume imagecount to be 1 if unspecified. --- dlls/uxtheme/draw.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index d6225d2..3ef8d81 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -257,6 +257,9 @@ static HRESULT UXTHEME_LoadImage(HTHEME hTheme, HDC hdc, int iPartId, int iState imagenum = max (min (imagecount, iStateId), 1) - 1; GetObjectW(*hBmp, sizeof(bmp), &bmp); + + if(imagecount < 1) imagecount = 1; + if(imagelayout == IL_VERTICAL) { int height = bmp.bmHeight/imagecount; bmpRect->left = 0;

1 0

Alistair Leslie-Hughes : dpnet: Add check for mismatched string lengths.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: a5d3125395bd92b1010b4df585327d4043d86651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d3125395bd92b1010b4df58… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 3 08:38:23 2015 +1100 dpnet: Add check for mismatched string lengths. --- dlls/dpnet/address.c | 40 +++++++++++++++++++++++++++++++++------- dlls/dpnet/tests/address.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 7 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 2062bc4..5eea0cb 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -382,11 +382,43 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * struct component *entry; BOOL found = FALSE; - TRACE("(%p, %s, %p, %u, %x): stub\n", This, debugstr_w(pwszName), lpvData, dwDataSize, dwDataType); + TRACE("(%p, %s, %p, %u, %x)\n", This, debugstr_w(pwszName), lpvData, dwDataSize, dwDataType); if (NULL == lpvData) return DPNERR_INVALIDPOINTER; + switch (dwDataType) + { + case DPNA_DATATYPE_DWORD: + if (sizeof(DWORD) != dwDataSize) + { + WARN("Invalid DWORD size, returning DPNERR_INVALIDPARAM\n"); + return DPNERR_INVALIDPARAM; + } + break; + case DPNA_DATATYPE_GUID: + if (sizeof(GUID) != dwDataSize) + { + WARN("Invalid GUID size, returning DPNERR_INVALIDPARAM\n"); + return DPNERR_INVALIDPARAM; + } + break; + case DPNA_DATATYPE_STRING: + if (((strlenW((WCHAR*)lpvData)+1)*sizeof(WCHAR)) != dwDataSize) + { + WARN("Invalid STRING size, returning DPNERR_INVALIDPARAM\n"); + return DPNERR_INVALIDPARAM; + } + break; + case DPNA_DATATYPE_STRING_ANSI: + if ((strlen((const CHAR*)lpvData)+1) != dwDataSize) + { + WARN("Invalid ASCII size, returning DPNERR_INVALIDPARAM\n"); + return DPNERR_INVALIDPARAM; + } + break; + } + LIST_FOR_EACH_ENTRY(entry, &This->components, struct component, entry) { if (lstrcmpW(pwszName, entry->name) == 0) @@ -411,16 +443,10 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * switch (dwDataType) { case DPNA_DATATYPE_DWORD: - if (sizeof(DWORD) != dwDataSize) - return DPNERR_INVALIDPARAM; - entry->data.value = *(DWORD*)lpvData; TRACE("(%p, %u): DWORD Type -> %u\n", lpvData, dwDataSize, *(const DWORD*) lpvData); break; case DPNA_DATATYPE_GUID: - if (sizeof(GUID) != dwDataSize) - return DPNERR_INVALIDPARAM; - entry->data.guid = *(GUID*)lpvData; TRACE("(%p, %u): GUID Type -> %s\n", lpvData, dwDataSize, debugstr_guid(lpvData)); break; diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index bad4fa4..53633c2 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -71,6 +71,7 @@ static void address_addcomponents(void) { static const WCHAR UNKNOWN[] = { 'u','n','k','n','o','w','n',0 }; static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; + static const char testing[] = "testing"; HRESULT hr; IDirectPlay8Address *localaddr = NULL; @@ -85,6 +86,7 @@ static void address_addcomponents(void) DWORD namelen = 0; DWORD bufflen = 0; DWORD port = 8888; + WCHAR buffer[256]; /* We can add any Component to the Address interface not just the predefined ones. */ hr = IDirectPlay8Address_AddComponent(localaddr, UNKNOWN, &IID_Random, sizeof(GUID), DPNA_DATATYPE_GUID); @@ -93,9 +95,39 @@ static void address_addcomponents(void) hr = IDirectPlay8Address_AddComponent(localaddr, UNKNOWN, &IID_Random, sizeof(GUID)+1, DPNA_DATATYPE_GUID); ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost)+2, DPNA_DATATYPE_STRING); + ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost)/2, DPNA_DATATYPE_STRING); + ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, testing, sizeof(testing)+2, DPNA_DATATYPE_STRING_ANSI); + ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + + /* Show that on error, nothing is added. */ + size = sizeof(buffer); + hr = IDirectPlay8Address_GetComponentByName(localaddr, DPNA_KEY_HOSTNAME, buffer, &size, &type); + ok(hr == DPNERR_DOESNOTEXIST, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, testing, sizeof(testing), DPNA_DATATYPE_STRING_ANSI); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD)+2, DPNA_DATATYPE_DWORD); + ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost), DPNA_DATATYPE_STRING); ok(hr == S_OK, "got 0x%08x\n", hr); + /* The information doesn't get removed when invalid parameters are used.*/ + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_HOSTNAME, &localhost, sizeof(localhost)+2, DPNA_DATATYPE_STRING); + ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr); + + size = sizeof(buffer); + hr = IDirectPlay8Address_GetComponentByName(localaddr, DPNA_KEY_HOSTNAME, buffer, &size, &type); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(type == DPNA_DATATYPE_STRING, "incorrect type %d\n", type); + todo_wine ok(!lstrcmpW(buffer, localhost), "Invalid string: %s\n", wine_dbgstr_w(buffer)); + hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD)+2, DPNA_DATATYPE_DWORD); ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr);

1 0

Alistair Leslie-Hughes : dpnet: Free previous allocated data.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 4299da0d7c66d460e16ffa5f9bb03bc88627d99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4299da0d7c66d460e16ffa5f9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 3 08:43:55 2015 +1100 dpnet: Free previous allocated data. --- dlls/dpnet/address.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 5eea0cb..6c91f48 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -426,6 +426,13 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * TRACE("Found %s\n", debugstr_w(pwszName)); found = TRUE; + if(entry->type == DPNA_DATATYPE_STRING_ANSI) + heap_free(entry->data.ansi); + else if(entry->type == DPNA_DATATYPE_STRING) + heap_free(entry->data.string); + else if(entry->type == DPNA_DATATYPE_BINARY) + heap_free(entry->data.binary); + break; } } @@ -451,20 +458,14 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * TRACE("(%p, %u): GUID Type -> %s\n", lpvData, dwDataSize, debugstr_guid(lpvData)); break; case DPNA_DATATYPE_STRING: - heap_free(entry->data.string); - entry->data.string = heap_strdupW((WCHAR*)lpvData); TRACE("(%p, %u): STRING Type -> %s\n", lpvData, dwDataSize, debugstr_w((WCHAR*)lpvData)); break; case DPNA_DATATYPE_STRING_ANSI: - heap_free(entry->data.ansi); - entry->data.ansi = heap_strdupA((CHAR*)lpvData); TRACE("(%p, %u): ANSI STRING Type -> %s\n", lpvData, dwDataSize, (const CHAR*) lpvData); break; case DPNA_DATATYPE_BINARY: - heap_free(entry->data.binary); - entry->data.binary = heap_alloc(dwDataSize); memcpy(entry->data.binary, lpvData, dwDataSize); TRACE("(%p, %u): BINARY Type\n", lpvData, dwDataSize);

1 0

Alistair Leslie-Hughes : dpnet: Always update type since it might change.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: b779dee768f5523942843b8f0db8c735f6144d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b779dee768f5523942843b8f0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 5 19:53:03 2015 +1100 dpnet: Always update type since it might change. --- dlls/dpnet/address.c | 2 +- dlls/dpnet/tests/address.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 6c91f48..ba644a2 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -442,7 +442,6 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * /* Create a new one */ entry = heap_alloc(sizeof(struct component)); entry->name = heap_strdupW(pwszName); - entry->type = dwDataType; list_add_tail(&This->components, &entry->entry); } @@ -472,6 +471,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * break; } + entry->type = dwDataType; entry->size = dwDataSize; return DPN_OK; diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index 53633c2..b557da2 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -125,7 +125,7 @@ static void address_addcomponents(void) size = sizeof(buffer); hr = IDirectPlay8Address_GetComponentByName(localaddr, DPNA_KEY_HOSTNAME, buffer, &size, &type); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(type == DPNA_DATATYPE_STRING, "incorrect type %d\n", type); + ok(type == DPNA_DATATYPE_STRING, "incorrect type %d\n", type); todo_wine ok(!lstrcmpW(buffer, localhost), "Invalid string: %s\n", wine_dbgstr_w(buffer)); hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD)+2, DPNA_DATATYPE_DWORD);

1 0

Alistair Leslie-Hughes : dpnet: Correct usage of memcpy in GetComponentByName.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 63c7fd2a63bbd8dde831d648f1dffc6686e3f2ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=63c7fd2a63bbd8dde831d648f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 6 09:05:56 2015 +1100 dpnet: Correct usage of memcpy in GetComponentByName. --- dlls/dpnet/address.c | 6 +++--- dlls/dpnet/tests/address.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index ba644a2..defd894 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -348,13 +348,13 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_GetComponentByName(IDirectPlay8Add memcpy(pvBuffer, &entry->data.guid, sizeof(GUID)); break; case DPNA_DATATYPE_STRING: - memcpy(pvBuffer, &entry->data.string, entry->size); + memcpy(pvBuffer, entry->data.string, entry->size); break; case DPNA_DATATYPE_STRING_ANSI: - memcpy(pvBuffer, &entry->data.ansi, entry->size); + memcpy(pvBuffer, entry->data.ansi, entry->size); break; case DPNA_DATATYPE_BINARY: - memcpy(pvBuffer, &entry->data.binary, entry->size); + memcpy(pvBuffer, entry->data.binary, entry->size); break; } diff --git a/dlls/dpnet/tests/address.c b/dlls/dpnet/tests/address.c index b557da2..077f99e 100644 --- a/dlls/dpnet/tests/address.c +++ b/dlls/dpnet/tests/address.c @@ -126,7 +126,7 @@ static void address_addcomponents(void) hr = IDirectPlay8Address_GetComponentByName(localaddr, DPNA_KEY_HOSTNAME, buffer, &size, &type); ok(hr == S_OK, "got 0x%08x\n", hr); ok(type == DPNA_DATATYPE_STRING, "incorrect type %d\n", type); - todo_wine ok(!lstrcmpW(buffer, localhost), "Invalid string: %s\n", wine_dbgstr_w(buffer)); + ok(!lstrcmpW(buffer, localhost), "Invalid string: %s\n", wine_dbgstr_w(buffer)); hr = IDirectPlay8Address_AddComponent(localaddr, DPNA_KEY_PORT, &port, sizeof(DWORD)+2, DPNA_DATATYPE_DWORD); ok(hr == DPNERR_INVALIDPARAM, "got 0x%08x\n", hr);

1 0

Michael Stefaniuc : gdi32: Remove double parentheses, not a misplaced pair (PVS-Studio).
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 8293cf33e0e237aeee9dacc8896f3816c6cf3e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8293cf33e0e237aeee9dacc88… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 09:58:11 2015 +0100 gdi32: Remove double parentheses, not a misplaced pair (PVS-Studio). --- dlls/gdi32/dibdrv/objects.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index bc8b60d..f954def 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1307,8 +1307,8 @@ static HRGN create_miter_region( dibdrv_physdev *pdev, const POINT *pt, pt_1 = face_1->start; pt_2 = face_2->end; - a = (double)((pt_2.x * face_2->dy - pt_2.y * face_2->dx)) / det; - b = (double)((pt_1.x * face_1->dy - pt_1.y * face_1->dx)) / det; + a = (double)(pt_2.x * face_2->dy - pt_2.y * face_2->dx) / det; + b = (double)(pt_1.x * face_1->dy - pt_1.y * face_1->dx) / det; x = a * face_1->dx - b * face_2->dx; y = a * face_1->dy - b * face_2->dy;

1 0