June 2011 - Wine-Commits - list.winehq.org

Jerome Leclanche : winhttp: Fix a warning when compiling --without-openssl.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: 66b075a0c9e968565c53ed2586bdd1c9ffe8d513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b075a0c9e968565c53ed258… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Mon Jun 20 07:01:47 2011 +0100 winhttp: Fix a warning when compiling --without-openssl. --- dlls/winhttp/net.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 02ba1af..ecaba3d 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -735,8 +735,6 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd ) { - int ret; - *recvd = 0; if (!netconn_connected( conn )) return FALSE; if (!len) return TRUE; @@ -744,6 +742,8 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd if (conn->secure) { #ifdef SONAME_LIBSSL + int ret; + if (flags & ~(MSG_PEEK | MSG_WAITALL)) FIXME("SSL_read does not support the following flags: %08x\n", flags);

1 0

Michael Stefaniuc : ddraw: Use unsafe_impl_from_IDirectDrawClipper for an app provided iface.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: 9e50efd89f0e072b668287633fdabfc7f2724eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e50efd89f0e072b668287633… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 20 11:22:55 2011 +0200 ddraw: Use unsafe_impl_from_IDirectDrawClipper for an app provided iface. --- dlls/ddraw/clipper.c | 9 +++++++++ dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 18 ++++++++++-------- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index b6e66f4..a8fd248 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -308,3 +308,12 @@ HRESULT ddraw_clipper_init(IDirectDrawClipperImpl *clipper) return DD_OK; } + +IDirectDrawClipperImpl *unsafe_impl_from_IDirectDrawClipper(IDirectDrawClipper *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &ddraw_clipper_vtbl); + + return impl_from_IDirectDrawClipper(iface); +} diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 9b88037..0ef1f30 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -366,6 +366,7 @@ struct IDirectDrawClipperImpl }; HRESULT ddraw_clipper_init(IDirectDrawClipperImpl *clipper) DECLSPEC_HIDDEN; +IDirectDrawClipperImpl *unsafe_impl_from_IDirectDrawClipper(IDirectDrawClipper *iface) DECLSPEC_HIDDEN; /***************************************************************************** * IDirectDrawPalette implementation structure diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index c0e7b25..1964df4 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3624,26 +3624,28 @@ static HRESULT WINAPI ddraw_surface1_GetClipper(IDirectDrawSurface *iface, IDire * DD_OK on success * *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_SetClipper(IDirectDrawSurface7 *iface, IDirectDrawClipper *Clipper) +static HRESULT WINAPI ddraw_surface7_SetClipper(IDirectDrawSurface7 *iface, + IDirectDrawClipper *iclipper) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface); + IDirectDrawClipperImpl *clipper = unsafe_impl_from_IDirectDrawClipper(iclipper); IDirectDrawClipperImpl *oldClipper = This->clipper; HWND clipWindow; HRESULT hr; - TRACE("iface %p, clipper %p.\n", iface, Clipper); + TRACE("iface %p, clipper %p.\n", iface, iclipper); EnterCriticalSection(&ddraw_cs); - if ((IDirectDrawClipperImpl *)Clipper == This->clipper) + if (clipper == This->clipper) { LeaveCriticalSection(&ddraw_cs); return DD_OK; } - This->clipper = (IDirectDrawClipperImpl *)Clipper; + This->clipper = clipper; - if (Clipper != NULL) - IDirectDrawClipper_AddRef(Clipper); + if (clipper != NULL) + IDirectDrawClipper_AddRef(iclipper); if(oldClipper) IDirectDrawClipper_Release(&oldClipper->IDirectDrawClipper_iface); @@ -3653,8 +3655,8 @@ static HRESULT WINAPI ddraw_surface7_SetClipper(IDirectDrawSurface7 *iface, IDir if (This->wined3d_swapchain) { clipWindow = NULL; - if(Clipper) { - IDirectDrawClipper_GetHWnd(Clipper, &clipWindow); + if(clipper) { + IDirectDrawClipper_GetHWnd(iclipper, &clipWindow); } if (clipWindow)

1 0

Michael Stefaniuc : ddraw: COM cleanup for the IDirectDrawClipper iface.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: 588ddee736fc2fc95acd91a01f3698c065d34f87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=588ddee736fc2fc95acd91a01… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 20 11:20:41 2011 +0200 ddraw: COM cleanup for the IDirectDrawClipper iface. --- dlls/ddraw/clipper.c | 70 ++++++++++++++++++++++---------------------- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 3 +- dlls/ddraw/surface.c | 2 +- 4 files changed, 38 insertions(+), 39 deletions(-) diff --git a/dlls/ddraw/clipper.c b/dlls/ddraw/clipper.c index c9290c8..b6e66f4 100644 --- a/dlls/ddraw/clipper.c +++ b/dlls/ddraw/clipper.c @@ -26,9 +26,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); -/***************************************************************************** - * IUnknown methods - *****************************************************************************/ +static inline IDirectDrawClipperImpl *impl_from_IDirectDrawClipper(IDirectDrawClipper *iface) +{ + return CONTAINING_RECORD(iface, IDirectDrawClipperImpl, IDirectDrawClipper_iface); +} /***************************************************************************** * IDirectDrawClipper::QueryInterface @@ -46,9 +47,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); * E_NOINTERFACE if the requested interface wasn't found. * *****************************************************************************/ -static HRESULT WINAPI IDirectDrawClipperImpl_QueryInterface( - LPDIRECTDRAWCLIPPER iface, REFIID riid, LPVOID* ppvObj -) { +static HRESULT WINAPI IDirectDrawClipperImpl_QueryInterface(IDirectDrawClipper *iface, REFIID riid, + void **ppvObj) +{ TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppvObj); @@ -69,9 +70,9 @@ static HRESULT WINAPI IDirectDrawClipperImpl_QueryInterface( * Increases the reference count of the interface, returns the new count * *****************************************************************************/ -static ULONG WINAPI IDirectDrawClipperImpl_AddRef( LPDIRECTDRAWCLIPPER iface ) +static ULONG WINAPI IDirectDrawClipperImpl_AddRef(IDirectDrawClipper *iface) { - IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; + IDirectDrawClipperImpl *This = impl_from_IDirectDrawClipper(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("%p increasing refcount to %u.\n", This, ref); @@ -86,8 +87,9 @@ static ULONG WINAPI IDirectDrawClipperImpl_AddRef( LPDIRECTDRAWCLIPPER iface ) * If the refcount is decreased to 0, the interface is destroyed. * *****************************************************************************/ -static ULONG WINAPI IDirectDrawClipperImpl_Release(IDirectDrawClipper *iface) { - IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; +static ULONG WINAPI IDirectDrawClipperImpl_Release(IDirectDrawClipper *iface) +{ + IDirectDrawClipperImpl *This = impl_from_IDirectDrawClipper(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("%p decreasing refcount to %u.\n", This, ref); @@ -118,10 +120,10 @@ static ULONG WINAPI IDirectDrawClipperImpl_Release(IDirectDrawClipper *iface) { * *****************************************************************************/ -static HRESULT WINAPI IDirectDrawClipperImpl_SetHwnd( - LPDIRECTDRAWCLIPPER iface, DWORD dwFlags, HWND hWnd -) { - IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; +static HRESULT WINAPI IDirectDrawClipperImpl_SetHwnd(IDirectDrawClipper *iface, DWORD dwFlags, + HWND hWnd) +{ + IDirectDrawClipperImpl *This = impl_from_IDirectDrawClipper(iface); HRESULT hr; TRACE("iface %p, flags %#x, window %p.\n", iface, dwFlags, hWnd); @@ -154,11 +156,10 @@ static HRESULT WINAPI IDirectDrawClipperImpl_SetHwnd( * RETURNS * Either DD_OK or DDERR_* ************************************************************************/ -static HRESULT WINAPI IDirectDrawClipperImpl_GetClipList( - LPDIRECTDRAWCLIPPER iface, LPRECT lpRect, LPRGNDATA lpClipList, - LPDWORD lpdwSize) +static HRESULT WINAPI IDirectDrawClipperImpl_GetClipList(IDirectDrawClipper *iface, RECT *lpRect, + RGNDATA *lpClipList, DWORD *lpdwSize) { - IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; + IDirectDrawClipperImpl *This = impl_from_IDirectDrawClipper(iface); HRESULT hr; TRACE("iface %p, rect %s, clip_list %p, clip_list_size %p.\n", @@ -184,10 +185,10 @@ static HRESULT WINAPI IDirectDrawClipperImpl_GetClipList( * RETURNS * Either DD_OK or DDERR_* *****************************************************************************/ -static HRESULT WINAPI IDirectDrawClipperImpl_SetClipList( - LPDIRECTDRAWCLIPPER iface,LPRGNDATA lprgn,DWORD dwFlag -) { - IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; +static HRESULT WINAPI IDirectDrawClipperImpl_SetClipList(IDirectDrawClipper *iface, RGNDATA *lprgn, + DWORD dwFlag) +{ + IDirectDrawClipperImpl *This = impl_from_IDirectDrawClipper(iface); HRESULT hr; TRACE("iface %p, clip_list %p, flags %#x.\n", iface, lprgn, dwFlag); @@ -209,10 +210,9 @@ static HRESULT WINAPI IDirectDrawClipperImpl_SetClipList( * Return values: * Always returns DD_OK; *****************************************************************************/ -static HRESULT WINAPI IDirectDrawClipperImpl_GetHWnd( - LPDIRECTDRAWCLIPPER iface, HWND* hWndPtr -) { - IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; +static HRESULT WINAPI IDirectDrawClipperImpl_GetHWnd(IDirectDrawClipper *iface, HWND *hWndPtr) +{ + IDirectDrawClipperImpl *This = impl_from_IDirectDrawClipper(iface); HRESULT hr; TRACE("iface %p, window %p.\n", iface, hWndPtr); @@ -237,12 +237,12 @@ static HRESULT WINAPI IDirectDrawClipperImpl_GetHWnd( * DD_OK on success * DDERR_ALREADYINITIALIZED if this interface isn't initialized already *****************************************************************************/ -static HRESULT WINAPI IDirectDrawClipperImpl_Initialize( - LPDIRECTDRAWCLIPPER iface, LPDIRECTDRAW lpDD, DWORD dwFlags -) { - IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; +static HRESULT WINAPI IDirectDrawClipperImpl_Initialize(IDirectDrawClipper *iface, + IDirectDraw *ddraw, DWORD dwFlags) +{ + IDirectDrawClipperImpl *This = impl_from_IDirectDrawClipper(iface); - TRACE("iface %p, ddraw %p, flags %#x.\n", iface, lpDD, dwFlags); + TRACE("iface %p, ddraw %p, flags %#x.\n", iface, ddraw, dwFlags); EnterCriticalSection(&ddraw_cs); if (This->initialized) @@ -268,9 +268,9 @@ static HRESULT WINAPI IDirectDrawClipperImpl_Initialize( * Return values: * DD_OK, because it's a stub *****************************************************************************/ -static HRESULT WINAPI IDirectDrawClipperImpl_IsClipListChanged( - LPDIRECTDRAWCLIPPER iface, BOOL* lpbChanged -) { +static HRESULT WINAPI IDirectDrawClipperImpl_IsClipListChanged(IDirectDrawClipper *iface, + BOOL *lpbChanged) +{ FIXME("iface %p, changed %p stub!\n", iface, lpbChanged); /* XXX What is safest? */ @@ -297,7 +297,7 @@ static const struct IDirectDrawClipperVtbl ddraw_clipper_vtbl = HRESULT ddraw_clipper_init(IDirectDrawClipperImpl *clipper) { - clipper->lpVtbl = &ddraw_clipper_vtbl; + clipper->IDirectDrawClipper_iface.lpVtbl = &ddraw_clipper_vtbl; clipper->ref = 1; clipper->wineD3DClipper = wined3d_clipper_create(); if (!clipper->wineD3DClipper) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 0474d19..f6d4191 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3997,7 +3997,7 @@ DirectDrawCreateClipper(DWORD Flags, } TRACE("Created clipper %p.\n", object); - *Clipper = (IDirectDrawClipper *) object; + *Clipper = &object->IDirectDrawClipper_iface; LeaveCriticalSection(&ddraw_cs); return DD_OK; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7a45d9f..9b88037 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -358,8 +358,7 @@ static inline IDirect3DDeviceImpl *device_from_device3(IDirect3DDevice3 *iface) *****************************************************************************/ struct IDirectDrawClipperImpl { - /* IUnknown fields */ - const IDirectDrawClipperVtbl *lpVtbl; + IDirectDrawClipper IDirectDrawClipper_iface; LONG ref; struct wined3d_clipper *wineD3DClipper; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 38be89c..c0e7b25 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3645,7 +3645,7 @@ static HRESULT WINAPI ddraw_surface7_SetClipper(IDirectDrawSurface7 *iface, IDir if (Clipper != NULL) IDirectDrawClipper_AddRef(Clipper); if(oldClipper) - IDirectDrawClipper_Release((IDirectDrawClipper *)oldClipper); + IDirectDrawClipper_Release(&oldClipper->IDirectDrawClipper_iface); hr = wined3d_surface_set_clipper(This->wined3d_surface, This->clipper ? This->clipper->wineD3DClipper : NULL);

1 0

Huw Davies : gdi32/tests: Add broken behaviour for nt4 sp3.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: 92b467cdf8612e017b97686b61840c5015b9becd URL: http://source.winehq.org/git/wine.git/?a=commit;h=92b467cdf8612e017b97686b6… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 20 09:57:27 2011 +0100 gdi32/tests: Add broken behaviour for nt4 sp3. --- dlls/gdi32/tests/bitmap.c | 108 +++++++++++++++++++++++--------------------- 1 files changed, 56 insertions(+), 52 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 5dedb1a..619c761 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1787,61 +1787,65 @@ static void test_GetDIBits_BI_BITFIELDS(void) ok(ret == 1, "GetDIBits failed\n"); if (dibinfo->bmiHeader.biBitCount > 8) { - ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS, + ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS || + broken( dibinfo->bmiHeader.biCompression == BI_RGB ), /* nt4 sp3 */ "compression is %u (%d bpp)\n", dibinfo->bmiHeader.biCompression, dibinfo->bmiHeader.biBitCount ); - ok( !bitmasks[0], "red mask is set\n" ); - ok( !bitmasks[1], "green mask is set\n" ); - ok( !bitmasks[2], "blue mask is set\n" ); - - /* test with NULL bits pointer and correct bpp */ - dibinfo->bmiHeader.biSizeImage = 0xdeadbeef; - ret = GetDIBits(hdc, hbm, 0, 1, NULL, dibinfo, DIB_RGB_COLORS); - ok(ret == 1, "GetDIBits failed\n"); - - ok( bitmasks[0] != 0, "red mask is not set\n" ); - ok( bitmasks[1] != 0, "green mask is not set\n" ); - ok( bitmasks[2] != 0, "blue mask is not set\n" ); - ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef, "size image not set\n" ); - - /* test with valid bits pointer */ - memset(dibinfo, 0, sizeof(dibinfo_buf)); - dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - ret = GetDIBits(hdc, hbm, 0, 1, NULL, dibinfo, DIB_RGB_COLORS); - ok(ret == 1, "GetDIBits failed ret %u err %u\n",ret,GetLastError()); - dibinfo->bmiHeader.biSizeImage = 0xdeadbeef; - ret = GetDIBits(hdc, hbm, 0, 1, bits, dibinfo, DIB_RGB_COLORS); - ok(ret == 1, "GetDIBits failed ret %u err %u\n",ret,GetLastError()); - - ok( bitmasks[0] != 0, "red mask is not set\n" ); - ok( bitmasks[1] != 0, "green mask is not set\n" ); - ok( bitmasks[2] != 0, "blue mask is not set\n" ); - ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef, "size image not set\n" ); - - /* now with bits and 0 lines */ - memset(dibinfo, 0, sizeof(dibinfo_buf)); - dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - dibinfo->bmiHeader.biSizeImage = 0xdeadbeef; - SetLastError(0xdeadbeef); - ret = GetDIBits(hdc, hbm, 0, 0, bits, dibinfo, DIB_RGB_COLORS); - ok(ret == 1, "GetDIBits failed ret %u err %u\n",ret,GetLastError()); - - ok( !bitmasks[0], "red mask is set\n" ); - ok( !bitmasks[1], "green mask is set\n" ); - ok( !bitmasks[2], "blue mask is set\n" ); - ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef, "size image not set\n" ); - - memset(bitmasks, 0, 3*sizeof(DWORD)); - dibinfo->bmiHeader.biSizeImage = 0xdeadbeef; - ret = GetDIBits(hdc, hbm, 0, 0, bits, dibinfo, DIB_RGB_COLORS); - ok(ret == 1, "GetDIBits failed ret %u err %u\n",ret,GetLastError()); - - ok( bitmasks[0] != 0, "red mask is not set\n" ); - ok( bitmasks[1] != 0, "green mask is not set\n" ); - ok( bitmasks[2] != 0, "blue mask is not set\n" ); - ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef, "size image not set\n" ); + if (dibinfo->bmiHeader.biCompression == BI_BITFIELDS) + { + ok( !bitmasks[0], "red mask is set\n" ); + ok( !bitmasks[1], "green mask is set\n" ); + ok( !bitmasks[2], "blue mask is set\n" ); + + /* test with NULL bits pointer and correct bpp */ + dibinfo->bmiHeader.biSizeImage = 0xdeadbeef; + ret = GetDIBits(hdc, hbm, 0, 1, NULL, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed\n"); + + ok( bitmasks[0] != 0, "red mask is not set\n" ); + ok( bitmasks[1] != 0, "green mask is not set\n" ); + ok( bitmasks[2] != 0, "blue mask is not set\n" ); + ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef, "size image not set\n" ); + + /* test with valid bits pointer */ + memset(dibinfo, 0, sizeof(dibinfo_buf)); + dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + ret = GetDIBits(hdc, hbm, 0, 1, NULL, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed ret %u err %u\n",ret,GetLastError()); + dibinfo->bmiHeader.biSizeImage = 0xdeadbeef; + ret = GetDIBits(hdc, hbm, 0, 1, bits, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed ret %u err %u\n",ret,GetLastError()); + + ok( bitmasks[0] != 0, "red mask is not set\n" ); + ok( bitmasks[1] != 0, "green mask is not set\n" ); + ok( bitmasks[2] != 0, "blue mask is not set\n" ); + ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef, "size image not set\n" ); + + /* now with bits and 0 lines */ + memset(dibinfo, 0, sizeof(dibinfo_buf)); + dibinfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + dibinfo->bmiHeader.biSizeImage = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetDIBits(hdc, hbm, 0, 0, bits, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed ret %u err %u\n",ret,GetLastError()); + + ok( !bitmasks[0], "red mask is set\n" ); + ok( !bitmasks[1], "green mask is set\n" ); + ok( !bitmasks[2], "blue mask is set\n" ); + ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef, "size image not set\n" ); + + memset(bitmasks, 0, 3*sizeof(DWORD)); + dibinfo->bmiHeader.biSizeImage = 0xdeadbeef; + ret = GetDIBits(hdc, hbm, 0, 0, bits, dibinfo, DIB_RGB_COLORS); + ok(ret == 1, "GetDIBits failed ret %u err %u\n",ret,GetLastError()); + + ok( bitmasks[0] != 0, "red mask is not set\n" ); + ok( bitmasks[1] != 0, "green mask is not set\n" ); + ok( bitmasks[2] != 0, "blue mask is not set\n" ); + ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef, "size image not set\n" ); + } } - else skip("not in 16 bpp BI_BITFIELDS mode, skipping that test\n"); + else skip("bitmap in colortable mode, skipping BI_BITFIELDS tests\n"); DeleteObject(hbm);

1 0

Huw Davies : gdi32/tests: Add some broken behaviours for winxp sp1 and win2003.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: 6e673e1ef0bd6a692e9831aea2caf8ad6fea057d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e673e1ef0bd6a692e9831aea… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 20 09:57:26 2011 +0100 gdi32/tests: Add some broken behaviours for winxp sp1 and win2003. --- dlls/gdi32/tests/dib.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index a3e6f25..69f241c 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -317,18 +317,24 @@ static const char *sha1_graphics_1[] = "7ddf19df5bbdf4475b6ec1bc042425e382502864", "144c9a846e5e37ac6efd5ed3a97ec231479e8fca", "c5ffc59048bf786b5646ad6226cd8633965de9ef", + "40fadc2d24c713b04ff96f7dc26e70e85f26c55e", "400a21caa01e015096ee1afcf1b54e7f8ec515bd", "0ff4b49797e30e3555aab45219adf449a9a560ff", + "280327328ca940c212ce24fe72e0b00014072767", "144c9a846e5e37ac6efd5ed3a97ec231479e8fca", "b85463875f755b85f1464b1b6275912bcbad6c9f", + "816f200969feecc788b61dfeecf05b1790984401", "a4964d8bbf80fe785f906bc0f7c5b113242a58fc", "a5d204cc7342d40b765ca042f8668e22601c4ff9", "adb2818f6d3845dd140bc0f9abdbaa89d2a8c3de", "0a76e0121facb103857130bc6e12185ad77fc3fa", + "02aede714773d654d0fc2f640afaa133ec718ad5", "13cc63972aee4f6ae27091a8af18de01f1d3a5da", "3bb745ccb08402ce6fac6ee26fb8d7aad2dba27e", + "b26699f62661e16a1dc452d24c88ce363a1f2998", "4d95c3d1e170f004c80aa8c52feafb8e0e90760e", "c14832e69ec3585c15987b3d69d5007236fa9814", + "e44ea620b0c47125a34193537ab9d219a52ad028", "d1e6091caa4482d3142df3b958606c41ebf4698e", "07c1116d8286fb665a1005de220eadc3d5999aaf", "4afb0649488f6e6f7d3a2b8bf438d82f2c88f4d1", @@ -738,7 +744,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh y += 25; } } - compare_hash_broken_todo(bmi, bits, sha1, "top-down 8888 dib brush patblt", dib_is_1bpp ? 1 : 0, dib_is_1bpp); + compare_hash_broken_todo(bmi, bits, sha1, "top-down 8888 dib brush patblt", dib_is_1bpp ? 2 : 0, dib_is_1bpp); memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush); @@ -768,7 +774,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh y += 25; } } - compare_hash_broken_todo(bmi, bits, sha1, "bottom-up 8888 dib brush patblt", dib_is_1bpp ? 1 : 0, dib_is_1bpp); + compare_hash_broken_todo(bmi, bits, sha1, "bottom-up 8888 dib brush patblt", dib_is_1bpp ? 2 : 0, dib_is_1bpp); memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush); @@ -798,7 +804,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh y += 25; } } - compare_hash_broken_todo(bmi, bits, sha1, "top-down 24 bpp brush patblt", dib_is_1bpp ? 1 : 0, dib_is_1bpp); + compare_hash_broken_todo(bmi, bits, sha1, "top-down 24 bpp brush patblt", dib_is_1bpp ? 2 : 0, dib_is_1bpp); memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush); @@ -868,7 +874,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh y += 25; } } - compare_hash_broken_todo(bmi, bits, sha1, "top-down 8 bpp dib brush patblt", dib_is_1bpp ? 1 : 0, dib_is_1bpp); + compare_hash_broken_todo(bmi, bits, sha1, "top-down 8 bpp dib brush patblt", dib_is_1bpp ? 2 : 0, dib_is_1bpp); memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush); @@ -893,7 +899,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh y += 25; } } - compare_hash_broken_todo(bmi, bits, sha1, "top-down 4 bpp dib brush patblt", dib_is_1bpp ? 1 : 0, dib_is_1bpp); + compare_hash_broken_todo(bmi, bits, sha1, "top-down 4 bpp dib brush patblt", dib_is_1bpp ? 2 : 0, dib_is_1bpp); memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush); @@ -922,7 +928,7 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh } } - compare_hash_broken_todo(bmi, bits, sha1, "top-down 1 bpp dib brush patblt", dib_is_1bpp ? 1 : 0, dib_is_1bpp); + compare_hash_broken_todo(bmi, bits, sha1, "top-down 1 bpp dib brush patblt", dib_is_1bpp ? 2 : 0, dib_is_1bpp); memset(bits, 0xcc, dib_size); SelectObject(hdc, orig_brush);

1 0

Jerome Leclanche : wininet: Fix a warning when compiling --without-openssl.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: f30616e2578977aefa2ae7cfc3659c03ad136c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f30616e2578977aefa2ae7cfc… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Mon Jun 20 06:16:31 2011 +0100 wininet: Fix a warning when compiling --without-openssl. --- dlls/wininet/netconnection.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 6c67f28..060acc6 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -656,10 +656,10 @@ int sock_get_error( int err ) */ DWORD NETCON_secure_connect(netconn_t *connection, LPWSTR hostname) { - void *ssl_s; DWORD res = ERROR_NOT_SUPPORTED; - #ifdef SONAME_LIBSSL + void *ssl_s; + /* can't connect if we are already connected */ if (connection->ssl_s) {

1 0

Piotr Caban : msvcrt: Avoid deadlock when _beginthread is executed inside loader critical section .
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: e5f68408ed7eca548986e590a3f231aabc6112b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f68408ed7eca548986e590a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jun 19 21:43:32 2011 +0200 msvcrt: Avoid deadlock when _beginthread is executed inside loader critical section. --- dlls/msvcrt/thread.c | 38 ++++++++++++++++---------------------- 1 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index 2486a3f..8d00e8b 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /********************************************************************/ typedef struct { - HANDLE is_ready, thread; + HANDLE thread; MSVCRT__beginthread_start_routine_t start_address; void *arglist; } _beginthread_trampoline_t; @@ -61,19 +61,12 @@ thread_data_t *msvcrt_get_thread_data(void) */ static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) { - _beginthread_trampoline_t local_trampoline, *trampoline = arg; + _beginthread_trampoline_t local_trampoline; thread_data_t *data = msvcrt_get_thread_data(); - if(!DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), - &trampoline->thread, 0, TRUE, DUPLICATE_SAME_ACCESS)) { - trampoline->thread = NULL; - SetEvent(&trampoline->is_ready); - return 0; - } - - memcpy(&local_trampoline, trampoline, sizeof(local_trampoline)); + memcpy(&local_trampoline,arg,sizeof(local_trampoline)); data->handle = local_trampoline.thread; - SetEvent(trampoline->is_ready); + MSVCRT_free(arg); local_trampoline.start_address(local_trampoline.arglist); return 0; @@ -87,35 +80,36 @@ MSVCRT_uintptr_t CDECL _beginthread( unsigned int stack_size, /* [in] Stack size for new thread or 0 */ void *arglist) /* [in] Argument list to be passed to new thread or NULL */ { - _beginthread_trampoline_t trampoline; + _beginthread_trampoline_t* trampoline; HANDLE thread; TRACE("(%p, %d, %p)\n", start_address, stack_size, arglist); - trampoline.is_ready = CreateEventW(NULL, FALSE, FALSE, NULL); - if(!trampoline.is_ready) { + trampoline = MSVCRT_malloc(sizeof(*trampoline)); + if(!trampoline) { *MSVCRT__errno() = MSVCRT_EAGAIN; return -1; } - trampoline.start_address = start_address; - trampoline.arglist = arglist; thread = CreateThread(NULL, stack_size, _beginthread_trampoline, - &trampoline, 0, NULL); + trampoline, CREATE_SUSPENDED, NULL); if(!thread) { + MSVCRT_free(trampoline); *MSVCRT__errno() = MSVCRT_EAGAIN; return -1; } - CloseHandle(thread); - WaitForSingleObject(trampoline.is_ready, INFINITE); - CloseHandle(trampoline.is_ready); + trampoline->thread = thread; + trampoline->start_address = start_address; + trampoline->arglist = arglist; - if(!trampoline.thread) { + if(ResumeThread(thread) == -1) { + MSVCRT_free(trampoline); *MSVCRT__errno() = MSVCRT_EAGAIN; return -1; } - return (MSVCRT_uintptr_t)trampoline.thread; + + return (MSVCRT_uintptr_t)thread; } /*********************************************************************

1 0

Jacek Caban : include: Don't use idl file for dxgitype.h.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: 82282185a99598da4f743d57dd946f2f01c82845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82282185a99598da4f743d57d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jun 18 15:08:08 2011 +0200 include: Don't use idl file for dxgitype.h. --- .gitignore | 1 - include/Makefile.in | 2 +- include/dxgi.idl | 4 +++- include/{dxgitype.idl => dxgitype.h} | 10 +++++++--- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 711a35d..6f999e1 100644 --- a/.gitignore +++ b/.gitignore @@ -171,7 +171,6 @@ include/docobj.h include/docobjectservice.h include/downloadmgr.h include/dxgi.h -include/dxgitype.h include/endpointvolume.h include/exdisp.h include/fusion.h diff --git a/include/Makefile.in b/include/Makefile.in index 7326dee..383b674 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -32,7 +32,6 @@ PUBLIC_IDL_H_SRCS = \ docobjectservice.idl \ downloadmgr.idl \ dxgi.idl \ - dxgitype.idl \ endpointvolume.idl \ exdisp.idl \ fusion.idl \ @@ -257,6 +256,7 @@ SRCDIR_INCLUDES = \ dxerr9.h \ dxfile.h \ dxgiformat.h \ + dxgitype.h \ dyngraph.idl \ errorrep.h \ errors.h \ diff --git a/include/dxgi.idl b/include/dxgi.idl index 8652a2c..6f36a56 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -16,7 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "dxgitype.idl"; +import "oaidl.idl"; +import "ocidl.idl"; +import "dxgitype.h"; const UINT _FACDXGI = 0x87a; diff --git a/include/dxgitype.idl b/include/dxgitype.h similarity index 96% rename from include/dxgitype.idl rename to include/dxgitype.h index 276881d..e89e055 100644 --- a/include/dxgitype.idl +++ b/include/dxgitype.h @@ -15,9 +15,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -import "oaidl.idl"; -import "ocidl.idl"; -import "dxgiformat.h"; + +#ifndef __dxgitype_h__ +#define __dxgitype_h__ + +#include "dxgiformat.h" typedef struct DXGI_SAMPLE_DESC { UINT Count; @@ -78,3 +80,5 @@ typedef struct DXGI_GAMMA_CONTROL { DXGI_RGB Offset; DXGI_RGB GammaCurve[1025]; } DXGI_GAMMA_CONTROL; + +#endif

1 0

Damjan Jovanovic : rpcrt4: Implement RpcProtseqVectorFree.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: acc112bad7a88252283d176334ccd18f5e0c66f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acc112bad7a88252283d17633… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Jun 19 18:06:08 2011 +0200 rpcrt4: Implement RpcProtseqVectorFree. --- dlls/rpcrt4/rpc_transport.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 4 ++-- include/rpcdce.h | 6 ++++++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 07a1e04..0ba9720 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -3124,3 +3124,39 @@ RPC_STATUS WINAPI RpcNetworkIsProtseqValidA(RPC_CSTR protseq) } return RPC_S_OUT_OF_MEMORY; } + +/*********************************************************************** + * RpcProtseqVectorFreeA (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcProtseqVectorFreeA(RPC_PROTSEQ_VECTORA **protseqs) +{ + TRACE("(%p)\n", protseqs); + + if (*protseqs) + { + int i; + for (i = 0; i < (*protseqs)->Count; i++) + HeapFree(GetProcessHeap(), 0, (*protseqs)->Protseq[i]); + HeapFree(GetProcessHeap(), 0, *protseqs); + *protseqs = NULL; + } + return RPC_S_OK; +} + +/*********************************************************************** + * RpcProtseqVectorFreeW (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcProtseqVectorFreeW(RPC_PROTSEQ_VECTORW **protseqs) +{ + TRACE("(%p)\n", protseqs); + + if (*protseqs) + { + int i; + for (i = 0; i < (*protseqs)->Count; i++) + HeapFree(GetProcessHeap(), 0, (*protseqs)->Protseq[i]); + HeapFree(GetProcessHeap(), 0, *protseqs); + *protseqs = NULL; + } + return RPC_S_OK; +} diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 598e60e..38d29e8 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -418,8 +418,8 @@ @ stub RpcObjectInqType @ stub RpcObjectSetInqFn @ stdcall RpcObjectSetType(ptr ptr) -@ stub RpcProtseqVectorFreeA -@ stub RpcProtseqVectorFreeW +@ stdcall RpcProtseqVectorFreeA(ptr) +@ stdcall RpcProtseqVectorFreeW(ptr) @ stdcall RpcRaiseException(long) @ stub RpcRegisterAsyncInfo @ stdcall RpcRevertToSelf() diff --git a/include/rpcdce.h b/include/rpcdce.h index 6b3bd3a..76994df 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -562,6 +562,12 @@ RPCRTAPI RPC_STATUS RPC_ENTRY #define RpcNetworkIsProtseqValid WINELIB_NAME_AW(RpcNetworkIsProtseqValid) RPCRTAPI RPC_STATUS RPC_ENTRY + RpcProtseqVectorFreeA( RPC_PROTSEQ_VECTORA** protseqs ); +RPCRTAPI RPC_STATUS RPC_ENTRY + RpcProtseqVectorFreeW( RPC_PROTSEQ_VECTORW** protseqs ); +#define RpcProtseqVectorFree WINELIB_NAME_AW(RpcProtseqVectorFree) + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcRevertToSelf( void ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcRevertToSelfEx( RPC_BINDING_HANDLE Binding );

1 0

Damjan Jovanovic : msvcrt: The time passed to utime functions can be NULL.
by Alexandre Julliard June 20, 2011

June 20, 2011

Module: wine Branch: master Commit: c28baa7b96aaf721478ef6899181d3133607c9dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c28baa7b96aaf721478ef6899… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Jun 20 06:27:41 2011 +0200 msvcrt: The time passed to utime functions can be NULL. --- dlls/msvcrt/file.c | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b3d1ddc..385771e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1477,10 +1477,15 @@ int CDECL _futime64(int fd, struct MSVCRT___utimbuf64 *t) */ int CDECL _futime32(int fd, struct MSVCRT___utimbuf32 *t) { - struct MSVCRT___utimbuf64 t64; - t64.actime = t->actime; - t64.modtime = t->modtime; - return _futime64( fd, &t64 ); + if (t) + { + struct MSVCRT___utimbuf64 t64; + t64.actime = t->actime; + t64.modtime = t->modtime; + return _futime64( fd, &t64 ); + } + else + return _futime64( fd, NULL ); } /********************************************************************* @@ -2402,10 +2407,15 @@ int CDECL _utime64(const char* path, struct MSVCRT___utimbuf64 *t) */ int CDECL _utime32(const char* path, struct MSVCRT___utimbuf32 *t) { - struct MSVCRT___utimbuf64 t64; - t64.actime = t->actime; - t64.modtime = t->modtime; - return _utime64( path, &t64 ); + if (t) + { + struct MSVCRT___utimbuf64 t64; + t64.actime = t->actime; + t64.modtime = t->modtime; + return _utime64( path, &t64 ); + } + else + return _utime64( path, NULL ); } /********************************************************************* @@ -2444,10 +2454,15 @@ int CDECL _wutime64(const MSVCRT_wchar_t* path, struct MSVCRT___utimbuf64 *t) */ int CDECL _wutime32(const MSVCRT_wchar_t* path, struct MSVCRT___utimbuf32 *t) { - struct MSVCRT___utimbuf64 t64; - t64.actime = t->actime; - t64.modtime = t->modtime; - return _wutime64( path, &t64 ); + if (t) + { + struct MSVCRT___utimbuf64 t64; + t64.actime = t->actime; + t64.modtime = t->modtime; + return _wutime64( path, &t64 ); + } + else + return _wutime64( path, NULL ); } /*********************************************************************

1 0