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

Piotr Caban : gdiplus: Fix animated gif frames composition.
by Alexandre Julliard 13 Mar '15

13 Mar '15

Module: wine Branch: master Commit: 821932dab90969c1c09a6b5021f9e43f7be1b26b URL: http://source.winehq.org/git/wine.git/?a=commit;h=821932dab90969c1c09a6b502… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 12 10:17:40 2015 +0100 gdiplus: Fix animated gif frames composition. --- dlls/gdiplus/gdiplus_private.h | 5 ++ dlls/gdiplus/image.c | 184 +++++++++++++++++++++++++++++++++++------ 2 files changed, 166 insertions(+), 23 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 0d62eef..065f5ed 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -42,6 +42,11 @@ #define VERSION_MAGIC 0xdbc01001 #define TENSION_CONST (0.3) +#define GIF_DISPOSE_UNSPECIFIED 0 +#define GIF_DISPOSE_DO_NOT_DISPOSE 1 +#define GIF_DISPOSE_RESTORE_TO_BKGND 2 +#define GIF_DISPOSE_RESTORE_TO_PREV 3 + COLORREF ARGB2COLORREF(ARGB color) DECLSPEC_HIDDEN; HBITMAP ARGB2BMP(ARGB color) DECLSPEC_HIDDEN; extern INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2, diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 409a3c6..4bce334 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3238,14 +3238,13 @@ static PropertyItem *get_gif_transparent_idx(IWICMetadataReader *reader) return index; } -static LONG get_gif_frame_delay(IWICBitmapFrameDecode *frame) +static LONG get_gif_frame_property(IWICBitmapFrameDecode *frame, const GUID *format, const WCHAR *property) { - static const WCHAR delayW[] = { 'D','e','l','a','y',0 }; HRESULT hr; IWICMetadataBlockReader *block_reader; IWICMetadataReader *reader; UINT block_count, i; - PropertyItem *delay; + PropertyItem *prop; LONG value = 0; hr = IWICBitmapFrameDecode_QueryInterface(frame, &IID_IWICMetadataBlockReader, (void **)&block_reader); @@ -3259,13 +3258,15 @@ static LONG get_gif_frame_delay(IWICBitmapFrameDecode *frame) hr = IWICMetadataBlockReader_GetReaderByIndex(block_reader, i, &reader); if (hr == S_OK) { - delay = get_property(reader, &GUID_MetadataFormatGCE, delayW); - if (delay) + prop = get_property(reader, format, property); + if (prop) { - if (delay->type == PropertyTagTypeShort && delay->length == 2) - value = *(SHORT *)delay->value; + if (prop->type == PropertyTagTypeByte && prop->length == 1) + value = *(BYTE *)prop->value; + else if (prop->type == PropertyTagTypeShort && prop->length == 2) + value = *(SHORT *)prop->value; - GdipFree(delay); + GdipFree(prop); } IWICMetadataReader_Release(reader); } @@ -3279,6 +3280,7 @@ static LONG get_gif_frame_delay(IWICBitmapFrameDecode *frame) static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UINT active_frame) { + static const WCHAR delayW[] = { 'D','e','l','a','y',0 }; HRESULT hr; IWICBitmapFrameDecode *frame; IWICMetadataBlockReader *block_reader; @@ -3307,7 +3309,7 @@ static void gif_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI hr = IWICBitmapDecoder_GetFrame(decoder, i, &frame); if (hr == S_OK) { - value[i] = get_gif_frame_delay(frame); + value[i] = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, delayW); IWICBitmapFrameDecode_Release(frame); } else value[i] = 0; @@ -3603,23 +3605,159 @@ static GpStatus select_frame_wic(GpImage *image, UINT active_frame) return Ok; } -static GpStatus select_frame_gif(GpImage *image, UINT active_frame) +static HRESULT get_gif_frame_rect(IWICBitmapFrameDecode *frame, + UINT *left, UINT *top, UINT *width, UINT *height) { - GpImage *new_image; - GpStatus status; + static const WCHAR leftW[] = {'L','e','f','t',0}; + static const WCHAR topW[] = {'T','o','p',0}; - status = decode_frame_wic(image->decoder, TRUE, active_frame, gif_metadata_reader, &new_image); - if(status != Ok) - return status; + *left = get_gif_frame_property(frame, &GUID_MetadataFormatIMD, leftW); + *top = get_gif_frame_property(frame, &GUID_MetadataFormatIMD, topW); - memcpy(&new_image->format, &image->format, sizeof(GUID)); - free_image_data(image); - if (image->type == ImageTypeBitmap) - *(GpBitmap *)image = *(GpBitmap *)new_image; - else if (image->type == ImageTypeMetafile) - *(GpMetafile *)image = *(GpMetafile *)new_image; - new_image->type = ~0; - GdipFree(new_image); + return IWICBitmapFrameDecode_GetSize(frame, width, height); +} + +static HRESULT blit_gif_frame(GpBitmap *bitmap, IWICBitmapFrameDecode *frame, BOOL first_frame) +{ + UINT i, j, left, top, width, height; + IWICBitmapSource *source; + BYTE *new_bits; + HRESULT hr; + + hr = get_gif_frame_rect(frame, &left, &top, &width, &height); + if(FAILED(hr)) + return hr; + + hr = WICConvertBitmapSource(&GUID_WICPixelFormat32bppBGRA, (IWICBitmapSource*)frame, &source); + if(FAILED(hr)) + return hr; + + new_bits = GdipAlloc(width*height*4); + if(!new_bits) + return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(source, NULL, width*4, width*height*4, new_bits); + IWICBitmapSource_Release(source); + if(FAILED(hr)) { + GdipFree(new_bits); + return hr; + } + + for(i=0; i<height && i+top<bitmap->height; i++) { + for(j=0; j<width && j+left<bitmap->width; j++) { + DWORD *src = (DWORD*)(new_bits+i*width*4+j*4); + DWORD *dst = (DWORD*)(bitmap->bits+(i+top)*bitmap->stride+(j+left)*4); + + if(first_frame || *src>>24 != 0) + *dst = *src; + } + } + GdipFree(new_bits); + return hr; +} + +static DWORD get_gif_background_color(GpBitmap *bitmap) +{ + BYTE bgcolor_idx = 0; + UINT i; + + for(i=0; i<bitmap->prop_count; i++) { + if(bitmap->prop_item[i].id == PropertyTagIndexBackground) { + bgcolor_idx = *(BYTE*)bitmap->prop_item[i].value; + break; + } + } + + for(i=0; i<bitmap->prop_count; i++) { + if(bitmap->prop_item[i].id == PropertyTagIndexTransparent) { + BYTE transparent_idx; + transparent_idx = *(BYTE*)bitmap->prop_item[i].value; + + if(transparent_idx == bgcolor_idx) + return 0; + } + } + + for(i=0; i<bitmap->prop_count; i++) { + if(bitmap->prop_item[i].id == PropertyTagGlobalPalette) { + if(bitmap->prop_item[i].length/3 > bgcolor_idx) { + BYTE *color = ((BYTE*)bitmap->prop_item[i].value)+bgcolor_idx*3; + return color[2] + (color[1]<<8) + (color[0]<<16) + (0xff<<24); + } + break; + } + } + + FIXME("can't get gif background color\n"); + return 0xffffffff; +} + +static GpStatus select_frame_gif(GpImage* image, UINT active_frame) +{ + static const WCHAR disposalW[] = {'D','i','s','p','o','s','a','l',0}; + + GpBitmap *bitmap = (GpBitmap*)image; + IWICBitmapFrameDecode *frame; + int cur_frame=0, disposal; + BOOL bgcolor_set = FALSE; + DWORD bgcolor = 0; + HRESULT hr; + + if(active_frame > image->current_frame) { + hr = IWICBitmapDecoder_GetFrame(bitmap->image.decoder, image->current_frame, &frame); + if(FAILED(hr)) + return hresult_to_status(hr); + disposal = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, disposalW); + IWICBitmapFrameDecode_Release(frame); + + if(disposal == GIF_DISPOSE_RESTORE_TO_BKGND) + cur_frame = image->current_frame; + else if(disposal != GIF_DISPOSE_RESTORE_TO_PREV) + cur_frame = image->current_frame+1; + } + + while(cur_frame != active_frame) { + hr = IWICBitmapDecoder_GetFrame(bitmap->image.decoder, cur_frame, &frame); + if(FAILED(hr)) + return hresult_to_status(hr); + disposal = get_gif_frame_property(frame, &GUID_MetadataFormatGCE, disposalW); + + if(disposal==GIF_DISPOSE_UNSPECIFIED || disposal==GIF_DISPOSE_DO_NOT_DISPOSE) { + hr = blit_gif_frame(bitmap, frame, cur_frame==0); + if(FAILED(hr)) + return hresult_to_status(hr); + }else if(disposal == GIF_DISPOSE_RESTORE_TO_BKGND) { + UINT left, top, width, height, i, j; + + if(!bgcolor_set) { + bgcolor = get_gif_background_color(bitmap); + bgcolor_set = TRUE; + } + + hr = get_gif_frame_rect(frame, &left, &top, &width, &height); + if(FAILED(hr)) + return hresult_to_status(hr); + for(i=top; i<top+height && i<bitmap->height; i++) { + DWORD *bits = (DWORD*)(bitmap->bits+i*bitmap->stride); + for(j=left; j<left+width && j<bitmap->width; j++) + bits[j] = bgcolor; + } + } + + IWICBitmapFrameDecode_Release(frame); + cur_frame++; + } + + hr = IWICBitmapDecoder_GetFrame(bitmap->image.decoder, active_frame, &frame); + if(FAILED(hr)) + return hresult_to_status(hr); + + hr = blit_gif_frame(bitmap, frame, cur_frame==0); + IWICBitmapFrameDecode_Release(frame); + if(FAILED(hr)) + return hresult_to_status(hr); + + image->current_frame = active_frame; return Ok; }

1 0

Bruno Jesus : ws2_32/tests: Add more select() tests related to OOB handling.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 04154074049bac07c687d1d84211aeb55d2feb99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04154074049bac07c687d1d84… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Mar 12 03:44:22 2015 -0300 ws2_32/tests: Add more select() tests related to OOB handling. --- dlls/ws2_32/tests/sock.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 4abf7d5..ec4b563 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3614,7 +3614,7 @@ static void test_select(void) /* When OOB data is received the socket is set in the except descriptor */ ret = send(fdWrite, "A", 1, MSG_OOB); - ok(ret == 1, "expected 4, got %d\n", ret); + ok(ret == 1, "expected 1, got %d\n", ret); FD_ZERO_ALL(); FD_SET_ALL(fdListen); FD_SET(fdRead, &readfds); @@ -3629,6 +3629,28 @@ todo_wine ok(ret == 1, "expected 1, got %d\n", ret); ok(tmp_buf[0] == 'A', "expected 'A', got 0x%02X\n", tmp_buf[0]); + /* If the socket is OOBINLINED it will not receive the OOB in except fds */ + ret = 1; + ret = setsockopt(fdRead, SOL_SOCKET, SO_OOBINLINE, (char*) &ret, sizeof(ret)); + ok(ret == 0, "expected 0, got %d\n", ret); + ret = send(fdWrite, "A", 1, MSG_OOB); + ok(ret == 1, "expected 1, got %d\n", ret); + FD_ZERO_ALL(); + FD_SET_ALL(fdListen); + FD_SET(fdRead, &readfds); + FD_SET(fdRead, &exceptfds); + ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(FD_ISSET(fdRead, &readfds), "fdRead socket is not in the set\n"); + tmp_buf[0] = 0xAF; + SetLastError(0xdeadbeef); + ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), MSG_OOB); + ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); /* can't recv with MSG_OOB if OOBINLINED */ + ok(GetLastError() == WSAEINVAL, "expected 10022, got %d\n", GetLastError()); + ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), 0); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(tmp_buf[0] == 'A', "expected 'A', got 0x%02X\n", tmp_buf[0]); + /* When the connection is closed the socket is set in the read descriptor */ ret = closesocket(fdRead); ok(ret == 0, "expected 0, got %d\n", ret);

1 0

Henri Verbeet : d3d10core: Implement d3d10_depthstencil_view_SetPrivateDataInterface().
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: c3fab65647dc7652fef18d5a1b94bccf7e37be0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3fab65647dc7652fef18d5a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 12 10:08:32 2015 +0100 d3d10core: Implement d3d10_depthstencil_view_SetPrivateDataInterface(). --- dlls/d3d10core/view.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index c11dfee..2957a3d 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -449,9 +449,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_SetPrivateData(ID3D10De static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_SetPrivateDataInterface(ID3D10DepthStencilView *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_depthstencil_view *view = impl_from_ID3D10DepthStencilView(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&view->private_store, guid, data); } /* ID3D10View methods */

1 0

Henri Verbeet : d3d10core: Implement d3d10_rendertarget_view_SetPrivateData().
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 3c65bff802c600a2b620c6d1fd50e3cef2b525ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c65bff802c600a2b620c6d1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 12 10:08:34 2015 +0100 d3d10core: Implement d3d10_rendertarget_view_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/view.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index a8a44a0..3678a45 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -154,6 +154,7 @@ struct d3d10_rendertarget_view ID3D10RenderTargetView ID3D10RenderTargetView_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_rendertarget_view *wined3d_view; D3D10_RENDER_TARGET_VIEW_DESC desc; ID3D10Resource *resource; diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 2957a3d..d261d79 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -652,6 +652,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rendertarget_view_Release(ID3D10RenderTarge wined3d_rendertarget_view_decref(This->wined3d_view); ID3D10Resource_Release(This->resource); ID3D10Device1_Release(This->device); + wined3d_private_store_cleanup(&This->private_store); HeapFree(GetProcessHeap(), 0, This); } @@ -682,10 +683,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_GetPrivateData(ID3D10Re static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateData(ID3D10RenderTargetView *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&view->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateDataInterface(ID3D10RenderTargetView *iface, @@ -836,6 +839,7 @@ HRESULT d3d10_rendertarget_view_init(struct d3d10_rendertarget_view *view, struc return hr; } + wined3d_private_store_init(&view->private_store); view->resource = resource; ID3D10Resource_AddRef(resource); view->device = &device->ID3D10Device1_iface;

1 0

Henri Verbeet : d3d10core: Implement d3d10_depthstencil_view_GetPrivateData().
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: c81446a7cc46eedfdb2c3acdbe08f3ccbe4e9590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c81446a7cc46eedfdb2c3acdb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 12 10:08:33 2015 +0100 d3d10core: Implement d3d10_depthstencil_view_GetPrivateData(). --- dlls/d3d10core/view.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index d261d79..97fd495 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -429,10 +429,12 @@ static void STDMETHODCALLTYPE d3d10_depthstencil_view_GetDevice(ID3D10DepthStenc static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_GetPrivateData(ID3D10DepthStencilView *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_depthstencil_view *view = impl_from_ID3D10DepthStencilView(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&view->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_view_SetPrivateData(ID3D10DepthStencilView *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_rendertarget_view_SetPrivateDataInterface().
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 656be74d13f2cf983c6c62a15088b93bb169d5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=656be74d13f2cf983c6c62a15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 12 10:08:35 2015 +0100 d3d10core: Implement d3d10_rendertarget_view_SetPrivateDataInterface(). --- dlls/d3d10core/view.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 97fd495..2b85161 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -696,9 +696,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateData(ID3D10Re static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateDataInterface(ID3D10RenderTargetView *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&view->private_store, guid, data); } /* ID3D10View methods */

1 0

Henri Verbeet : d3d10core: Implement d3d10_rendertarget_view_GetPrivateData().
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 57c76e10e0cc07316eb614500de344bc6d0ecbc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c76e10e0cc07316eb614500… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 12 10:08:36 2015 +0100 d3d10core: Implement d3d10_rendertarget_view_GetPrivateData(). --- dlls/d3d10core/view.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 2b85161..3576e4a 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -676,10 +676,12 @@ static void STDMETHODCALLTYPE d3d10_rendertarget_view_GetDevice(ID3D10RenderTarg static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_GetPrivateData(ID3D10RenderTargetView *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_rendertarget_view *view = impl_from_ID3D10RenderTargetView(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&view->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_rendertarget_view_SetPrivateData(ID3D10RenderTargetView *iface,

1 0

Francois Gouget : gphoto2.ds: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: e815da3c1a4d291d777bfea9411d0cdd53fc3f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e815da3c1a4d291d777bfea94… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 12 10:38:34 2015 +0100 gphoto2.ds: Remove unneeded NONAMELESSXXX directives. --- dlls/gphoto2.ds/capability.c | 3 --- dlls/gphoto2.ds/ui.c | 2 -- 2 files changed, 5 deletions(-) diff --git a/dlls/gphoto2.ds/capability.c b/dlls/gphoto2.ds/capability.c index 34d081e..fcc1e52 100644 --- a/dlls/gphoto2.ds/capability.c +++ b/dlls/gphoto2.ds/capability.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "config.h" #include <stdarg.h> diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index d663552..c521e3e 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -24,8 +24,6 @@ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "gphoto2_i.h" #include "winuser.h" #include "winnls.h"

1 0

Francois Gouget : hhctrl.ocx: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: e96ab17ec1ff356564f558589b0353866ab7a830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e96ab17ec1ff356564f558589… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 12 10:38:59 2015 +0100 hhctrl.ocx: Remove unneeded NONAMELESSXXX directives. --- dlls/hhctrl.ocx/content.c | 1 - dlls/hhctrl.ocx/index.c | 3 --- dlls/hhctrl.ocx/search.c | 3 --- 3 files changed, 7 deletions(-) diff --git a/dlls/hhctrl.ocx/content.c b/dlls/hhctrl.ocx/content.c index 28bda11..6a7c8f8 100644 --- a/dlls/hhctrl.ocx/content.c +++ b/dlls/hhctrl.ocx/content.c @@ -18,7 +18,6 @@ */ #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "hhctrl.h" #include "stream.h" diff --git a/dlls/hhctrl.ocx/index.c b/dlls/hhctrl.ocx/index.c index af1efb8..8b80ce2 100644 --- a/dlls/hhctrl.ocx/index.c +++ b/dlls/hhctrl.ocx/index.c @@ -17,9 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "hhctrl.h" #include "stream.h" diff --git a/dlls/hhctrl.ocx/search.c b/dlls/hhctrl.ocx/search.c index 571cdd6..287e6d0 100644 --- a/dlls/hhctrl.ocx/search.c +++ b/dlls/hhctrl.ocx/search.c @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "hhctrl.h" #include "stream.h"

1 0

Francois Gouget : inetcpl.cpl: Remove uneeded NONAMELESSUNION directives.
by Alexandre Julliard 12 Mar '15

12 Mar '15

Module: wine Branch: master Commit: 5e93b026627e50fcae1bb61d0fc0fe769eb14d60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e93b026627e50fcae1bb61d0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 12 10:39:09 2015 +0100 inetcpl.cpl: Remove uneeded NONAMELESSUNION directives. --- dlls/inetcpl.cpl/content.c | 2 -- dlls/inetcpl.cpl/general.c | 2 -- dlls/inetcpl.cpl/security.c | 1 - 3 files changed, 5 deletions(-) diff --git a/dlls/inetcpl.cpl/content.c b/dlls/inetcpl.cpl/content.c index 8fb1729..d71c8b2 100644 --- a/dlls/inetcpl.cpl/content.c +++ b/dlls/inetcpl.cpl/content.c @@ -19,8 +19,6 @@ * */ -#define NONAMELESSUNION - #include <stdarg.h> #include <windef.h> #include <winbase.h> diff --git a/dlls/inetcpl.cpl/general.c b/dlls/inetcpl.cpl/general.c index 42948ea..0691579 100644 --- a/dlls/inetcpl.cpl/general.c +++ b/dlls/inetcpl.cpl/general.c @@ -19,8 +19,6 @@ * */ -#define NONAMELESSUNION - #include <stdarg.h> #include <windef.h> #include <winbase.h> diff --git a/dlls/inetcpl.cpl/security.c b/dlls/inetcpl.cpl/security.c index 48c4876..6d79057 100644 --- a/dlls/inetcpl.cpl/security.c +++ b/dlls/inetcpl.cpl/security.c @@ -21,7 +21,6 @@ #define COBJMACROS #define CONST_VTABLE -#define NONAMELESSUNION #include <stdarg.h> #include <windef.h>

1 0