wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

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

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

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 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 : 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

Nikolay Sivov : rpcrt4: Implement RPC_FC_CALLBACK_HANDLE handle type for NdrClientCall2().
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 2b40f9b01e45eed3c802062bba8369061a91003d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b40f9b01e45eed3c802062bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 6 01:19:29 2015 +0300 rpcrt4: Implement RPC_FC_CALLBACK_HANDLE handle type for NdrClientCall2(). --- dlls/rpcrt4/ndr_stubless.c | 6 +++++- dlls/rpcrt4/ndr_stubless.h | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 346cc59..cce0840 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -344,7 +344,11 @@ static PFORMAT_STRING client_get_handle( *phBinding = *pStubMsg->StubDesc->IMPLICIT_HANDLE_INFO.pPrimitiveHandle; break; case RPC_FC_CALLBACK_HANDLE: /* implicit callback */ - FIXME("RPC_FC_CALLBACK_HANDLE\n"); + TRACE("RPC_FC_CALLBACK_HANDLE\n"); + /* server calls callback procedures only in response to remote call, and most recent + binding handle is used. Calling back to a client can potentially result in another + callback with different current handle. */ + *phBinding = I_RpcGetCurrentCallHandle(); break; case RPC_FC_AUTO_HANDLE: /* implicit auto handle */ /* strictly speaking, it isn't necessary to set hBinding here diff --git a/dlls/rpcrt4/ndr_stubless.h b/dlls/rpcrt4/ndr_stubless.h index 61bc606..5b0add0 100644 --- a/dlls/rpcrt4/ndr_stubless.h +++ b/dlls/rpcrt4/ndr_stubless.h @@ -35,7 +35,8 @@ typedef struct _NDR_PROC_HEADER * RPC_FC_BIND_PRIMITIVE = 32 - Implicit handle using handle_t created by * calling application * RPC_FC_AUTO_HANDLE = 33 - Automatic handle - * RPC_FC_CALLBACK_HANDLE = 34 - undocumented + * RPC_FC_CALLBACK_HANDLE = 34 - Implicit handle used for a callback: current handle + * from last remote call */ unsigned char handle_type;

1 0

Daniel Lehman : wininet: Eat terminator on last chunk.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: c921deebf1c97a07a2c8424306e559693f1d1cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c921deebf1c97a07a2c842430… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Mar 5 12:45:26 2015 -0800 wininet: Eat terminator on last chunk. --- dlls/wininet/http.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 328882e..04cd281 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2763,8 +2763,19 @@ static DWORD start_next_chunk(chunked_stream_t *stream, http_request_t *req) if (req->contentLength == ~0u) req->contentLength = chunk_size; else req->contentLength += chunk_size; - if (!chunk_size) stream->end_of_data = TRUE; - return discard_chunked_eol(stream, req); + /* eat the rest of this line */ + if ((res = discard_chunked_eol(stream, req)) != ERROR_SUCCESS) + return res; + + /* if there's chunk data, return now */ + if (chunk_size) return ERROR_SUCCESS; + + /* otherwise, eat the terminator for this chunk */ + if ((res = discard_chunked_eol(stream, req)) != ERROR_SUCCESS) + return res; + + stream->end_of_data = TRUE; + return ERROR_SUCCESS; } remove_chunked_data(stream, 1); }

1 0

Francois Gouget : hal: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 0cd192230252492ffee94822c81dca66f3c9a609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cd192230252492ffee94822c… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 5 17:31:39 2015 +0100 hal: Remove unneeded NONAMELESSXXX directives. --- dlls/hal/hal.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index add9028..96bc895 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -23,9 +23,6 @@ #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h"

1 0

Francois Gouget : mountmgr.sys: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: 9cf7398394bc7e3a2a6753b8d8c676c2881c28ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf7398394bc7e3a2a6753b8d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 5 17:31:32 2015 +0100 mountmgr.sys: Remove unneeded NONAMELESSXXX directives. --- dlls/mountmgr.sys/device.c | 2 ++ dlls/mountmgr.sys/mountmgr.c | 1 - dlls/mountmgr.sys/mountmgr.h | 3 --- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 7ee4078..5003d4d 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -27,6 +27,8 @@ #include <stdio.h> #include <sys/time.h> +#define NONAMELESSUNION + #include "mountmgr.h" #include "winreg.h" #include "winuser.h" diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index d7bc8d7..10286dc 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -22,7 +22,6 @@ #include <unistd.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "mountmgr.h" #include "winreg.h" diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h index d1e814f..2f0db62 100644 --- a/dlls/mountmgr.sys/mountmgr.h +++ b/dlls/mountmgr.sys/mountmgr.h @@ -20,9 +20,6 @@ #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h"

1 0

Francois Gouget : d3dx9_36: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 06 Mar '15

06 Mar '15

Module: wine Branch: master Commit: f572279576b0016ca1d1ff2849ff9330da6cbbf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f572279576b0016ca1d1ff284… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 5 17:30:29 2015 +0100 d3dx9_36: Remove unneeded NONAMELESSXXX directives. --- dlls/d3dx9_36/shader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index c66936d..cdc470b 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -21,8 +21,6 @@ #include "config.h" #include "wine/port.h" -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "wine/debug.h" #include "wine/unicode.h" #include "windef.h"

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
78
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 March 2015