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

Piotr Caban : gdiplus: Don't use CoCreateInstance in decode_image_wic.
by Alexandre Julliard March 6, 2015

March 6, 2015

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

Daniel Lehman : wininet: Eat terminator on last chunk.
by Alexandre Julliard March 6, 2015

March 6, 2015

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

Nikolay Sivov : rpcrt4: Implement RPC_FC_CALLBACK_HANDLE handle type for NdrClientCall2().
by Alexandre Julliard March 6, 2015

March 6, 2015

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

Piotr Caban : gdiplus: Don't use CoCreateInstance in get_palette function.
by Alexandre Julliard March 6, 2015

March 6, 2015

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

Michael Stefaniuc : mmdevapi/tests: Remove an unused assignment ( PVS-Studio).
by Alexandre Julliard March 6, 2015

March 6, 2015

Module: wine Branch: master Commit: 5f28bbcda3be5ecd6fb87c115cdcc6106338f241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f28bbcda3be5ecd6fb87c115… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 09:59:34 2015 +0100 mmdevapi/tests: Remove an unused assignment (PVS-Studio). --- dlls/mmdevapi/tests/render.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index c6b8e90..3a48c8d 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1063,7 +1063,6 @@ static void test_clock(int share) last = pos; Sleep(100); - slept += 100; hr = IAudioClock_GetPosition(acl, &pos, NULL); ok(hr == S_OK, "GetPosition failed: %08x\n", hr);

1 0

Michael Stefaniuc : mmdevapi: Don't check for IID_IDirectSoundCapture8, it is just a define (PVS-Studio).
by Alexandre Julliard March 6, 2015

March 6, 2015

Module: wine Branch: master Commit: a514fe7642c2fabdf93f6ab93f1c89b7a345680a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a514fe7642c2fabdf93f6ab93… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:09:19 2015 +0100 mmdevapi: Don't check for IID_IDirectSoundCapture8, it is just a define (PVS-Studio). --- dlls/mmdevapi/devenum.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index a78e03d..1a5bf00 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -645,8 +645,7 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls IDirectSound_Release((IDirectSound*)*ppv); } } - else if (IsEqualIID(riid, &IID_IDirectSoundCapture) - || IsEqualIID(riid, &IID_IDirectSoundCapture8)) + else if (IsEqualIID(riid, &IID_IDirectSoundCapture)) { if (This->flow == eCapture) hr = CoCreateInstance(&CLSID_DirectSoundCapture8, NULL, clsctx, riid, ppv);

1 0

Michael Stefaniuc : wordpad: Simplify code that happened to work by chance (PVS-Studio).
by Alexandre Julliard March 6, 2015

March 6, 2015

Module: wine Branch: master Commit: 9e7135e00cde71324b75252aa966ed4d27ffe4d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e7135e00cde71324b75252aa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 6 10:20:12 2015 +0100 wordpad: Simplify code that happened to work by chance (PVS-Studio). --- programs/wordpad/wordpad.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index ec813a7..f1a7ceb 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -2482,55 +2482,50 @@ static LRESULT OnInitPopupMenu( HWND hWnd, WPARAM wParam ) MENUITEMINFOW mi; SendMessageW(hEditorWnd, EM_GETSEL, (WPARAM)&selFrom, (LPARAM)&selTo); - EnableMenuItem(hMenu, ID_EDIT_COPY, MF_BYCOMMAND|(selFrom == selTo) ? MF_GRAYED : MF_ENABLED); - EnableMenuItem(hMenu, ID_EDIT_CUT, MF_BYCOMMAND|(selFrom == selTo) ? MF_GRAYED : MF_ENABLED); + EnableMenuItem(hMenu, ID_EDIT_COPY, (selFrom == selTo) ? MF_GRAYED : MF_ENABLED); + EnableMenuItem(hMenu, ID_EDIT_CUT, (selFrom == selTo) ? MF_GRAYED : MF_ENABLED); pf.cbSize = sizeof(PARAFORMAT); SendMessageW(hwndEditor, EM_GETPARAFORMAT, 0, (LPARAM)&pf); CheckMenuItem(hMenu, ID_EDIT_READONLY, - MF_BYCOMMAND|(GetWindowLongW(hwndEditor, GWL_STYLE)&ES_READONLY ? MF_CHECKED : MF_UNCHECKED)); + (GetWindowLongW(hwndEditor, GWL_STYLE) & ES_READONLY) ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(hMenu, ID_EDIT_MODIFIED, - MF_BYCOMMAND|(SendMessageW(hwndEditor, EM_GETMODIFY, 0, 0) ? MF_CHECKED : MF_UNCHECKED)); + SendMessageW(hwndEditor, EM_GETMODIFY, 0, 0) ? MF_CHECKED : MF_UNCHECKED); if (pf.dwMask & PFM_ALIGNMENT) nAlignment = pf.wAlignment; - CheckMenuItem(hMenu, ID_ALIGN_LEFT, MF_BYCOMMAND|(nAlignment == PFA_LEFT) ? - MF_CHECKED : MF_UNCHECKED); - CheckMenuItem(hMenu, ID_ALIGN_CENTER, MF_BYCOMMAND|(nAlignment == PFA_CENTER) ? - MF_CHECKED : MF_UNCHECKED); - CheckMenuItem(hMenu, ID_ALIGN_RIGHT, MF_BYCOMMAND|(nAlignment == PFA_RIGHT) ? - MF_CHECKED : MF_UNCHECKED); - CheckMenuItem(hMenu, ID_BULLET, MF_BYCOMMAND | ((pf.wNumbering == PFN_BULLET) ? - MF_CHECKED : MF_UNCHECKED)); - EnableMenuItem(hMenu, ID_EDIT_UNDO, MF_BYCOMMAND|(SendMessageW(hwndEditor, EM_CANUNDO, 0, 0)) ? + CheckMenuItem(hMenu, ID_ALIGN_LEFT, (nAlignment == PFA_LEFT) ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(hMenu, ID_ALIGN_CENTER, (nAlignment == PFA_CENTER) ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(hMenu, ID_ALIGN_RIGHT, (nAlignment == PFA_RIGHT) ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(hMenu, ID_BULLET, ((pf.wNumbering == PFN_BULLET) ? MF_CHECKED : MF_UNCHECKED)); + EnableMenuItem(hMenu, ID_EDIT_UNDO, SendMessageW(hwndEditor, EM_CANUNDO, 0, 0) ? MF_ENABLED : MF_GRAYED); - EnableMenuItem(hMenu, ID_EDIT_REDO, MF_BYCOMMAND|(SendMessageW(hwndEditor, EM_CANREDO, 0, 0)) ? + EnableMenuItem(hMenu, ID_EDIT_REDO, SendMessageW(hwndEditor, EM_CANREDO, 0, 0) ? MF_ENABLED : MF_GRAYED); - CheckMenuItem(hMenu, ID_TOGGLE_TOOLBAR, MF_BYCOMMAND|(is_bar_visible(BANDID_TOOLBAR)) ? + CheckMenuItem(hMenu, ID_TOGGLE_TOOLBAR, is_bar_visible(BANDID_TOOLBAR) ? MF_CHECKED : MF_UNCHECKED); - CheckMenuItem(hMenu, ID_TOGGLE_FORMATBAR, MF_BYCOMMAND|(is_bar_visible(BANDID_FORMATBAR)) ? + CheckMenuItem(hMenu, ID_TOGGLE_FORMATBAR, is_bar_visible(BANDID_FORMATBAR) ? MF_CHECKED : MF_UNCHECKED); - CheckMenuItem(hMenu, ID_TOGGLE_STATUSBAR, MF_BYCOMMAND|IsWindowVisible(hwndStatus) ? + CheckMenuItem(hMenu, ID_TOGGLE_STATUSBAR, IsWindowVisible(hwndStatus) ? MF_CHECKED : MF_UNCHECKED); - CheckMenuItem(hMenu, ID_TOGGLE_RULER, MF_BYCOMMAND|(is_bar_visible(BANDID_RULER)) ? MF_CHECKED : MF_UNCHECKED); + CheckMenuItem(hMenu, ID_TOGGLE_RULER, is_bar_visible(BANDID_RULER) ? MF_CHECKED : MF_UNCHECKED); gt.flags = GTL_NUMCHARS; gt.codepage = 1200; textLength = SendMessageW(hEditorWnd, EM_GETTEXTLENGTHEX, (WPARAM)&gt, 0); - EnableMenuItem(hMenu, ID_FIND, MF_BYCOMMAND|(textLength ? MF_ENABLED : MF_GRAYED)); + EnableMenuItem(hMenu, ID_FIND, textLength ? MF_ENABLED : MF_GRAYED); mi.cbSize = sizeof(mi); mi.fMask = MIIM_DATA; GetMenuItemInfoW(hMenu, ID_FIND_NEXT, FALSE, &mi); - EnableMenuItem(hMenu, ID_FIND_NEXT, MF_BYCOMMAND|((textLength && mi.dwItemData) ? - MF_ENABLED : MF_GRAYED)); + EnableMenuItem(hMenu, ID_FIND_NEXT, (textLength && mi.dwItemData) ? MF_ENABLED : MF_GRAYED); - EnableMenuItem(hMenu, ID_REPLACE, MF_BYCOMMAND|(textLength ? MF_ENABLED : MF_GRAYED)); + EnableMenuItem(hMenu, ID_REPLACE, textLength ? MF_ENABLED : MF_GRAYED); return 0; }

1 0

Francois Gouget : hal: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 6, 2015

March 6, 2015

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 March 6, 2015

March 6, 2015

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 : ole32: Don't define NONAMELESSUNION in olestd.h. It' s not needed anyway.
by Alexandre Julliard March 6, 2015

March 6, 2015

Module: wine Branch: master Commit: fb908b3a956b8e064c54d73db690b2d5deae4d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb908b3a956b8e064c54d73db… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 5 17:01:54 2015 +0100 ole32: Don't define NONAMELESSUNION in olestd.h. It's not needed anyway. --- dlls/ole32/olestd.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/ole32/olestd.h b/dlls/ole32/olestd.h index 02a4d3b..fbc4442 100644 --- a/dlls/ole32/olestd.h +++ b/dlls/ole32/olestd.h @@ -19,10 +19,6 @@ #if !defined( __WINE_OLESTD_H_ ) #define __WINE_OLESTD_H_ -#if !defined(__cplusplus) && !defined( __TURBOC__) -#define NONAMELESSUNION /* use strict ANSI standard (for DVOBJ.H) */ -#endif - /* Clipboard format strings */ #define CF_EMBEDSOURCE "Embed Source" #define CF_EMBEDDEDOBJECT "Embedded Object"

1 0