April 2011 - Wine-commits - list.winehq.org

Francois Gouget : winemine: Fix and standardize the menus.
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: 2b431508287a9b6c55124ea0342b33446be67e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b431508287a9b6c55124ea03… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 13 09:52:16 2011 +0200 winemine: Fix and standardize the menus. --- po/ar.po | 24 ++++++++++++------------ po/bg.po | 24 ++++++++++++------------ po/ca.po | 24 ++++++++++++------------ po/cs.po | 27 ++++++++++++++------------- po/da.po | 27 ++++++++++++++------------- po/de.po | 27 ++++++++++++++------------- po/el.po | 24 ++++++++++++------------ po/en.po | 24 ++++++++++++------------ po/en_US.po | 28 ++++++++++++++-------------- po/eo.po | 24 ++++++++++++------------ po/es.po | 27 ++++++++++++++------------- po/fa.po | 24 ++++++++++++------------ po/fi.po | 27 ++++++++++++++------------- po/fr.po | 27 ++++++++++++++------------- po/he.po | 27 ++++++++++++++------------- po/hi.po | 24 ++++++++++++------------ po/hu.po | 25 ++++++++++++------------- po/it.po | 27 ++++++++++++++------------- po/ja.po | 27 ++++++++++++++------------- po/ko.po | 27 ++++++++++++++------------- po/lt.po | 27 ++++++++++++++------------- po/ml.po | 24 ++++++++++++------------ po/nb_NO.po | 27 ++++++++++++++------------- po/nl.po | 27 ++++++++++++++------------- po/or.po | 24 ++++++++++++------------ po/pa.po | 24 ++++++++++++------------ po/pl.po | 27 ++++++++++++++------------- po/pt_BR.po | 27 ++++++++++++++------------- po/pt_PT.po | 27 ++++++++++++++------------- po/rm.po | 24 ++++++++++++------------ po/ro.po | 27 ++++++++++++++------------- po/ru.po | 27 ++++++++++++++------------- po/sk.po | 24 ++++++++++++------------ po/sl.po | 27 ++++++++++++++------------- po/sr_RS(a)cyrillic.po | 24 ++++++++++++------------ po/sr_RS(a)latin.po | 24 ++++++++++++------------ po/sv.po | 27 ++++++++++++++------------- po/te.po | 24 ++++++++++++------------ po/th.po | 24 ++++++++++++------------ po/tr.po | 27 ++++++++++++++------------- po/uk.po | 27 ++++++++++++++------------- po/wa.po | 24 ++++++++++++------------ po/wine.pot | 24 ++++++++++++------------ po/zh_CN.po | 27 ++++++++++++++------------- po/zh_TW.po | 27 ++++++++++++++------------- programs/winemine/winemine.rc | 9 +++++---- 46 files changed, 595 insertions(+), 571 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b431508287a9b6c55124…

1 0

Austin English : ole32: Remove extraneous parentheses (LLVM/Clang).
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: 85b5a869e8d0892731da130cead01219a327da58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b5a869e8d0892731da130ce… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 12 17:42:36 2011 -0500 ole32: Remove extraneous parentheses (LLVM/Clang). --- dlls/ole32/compositemoniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index f7d6ee6..4aa8b7f 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -841,7 +841,7 @@ CompositeMonikerImpl_CommonPrefixWith(IMoniker* iface, IMoniker* pmkOther, IMoniker_IsSystemMoniker(pmkOther,&mkSys); - if((mkSys==MKSYS_GENERICCOMPOSITE)){ + if(mkSys==MKSYS_GENERICCOMPOSITE){ IMoniker_Enum(iface,TRUE,&enumMoniker1); IMoniker_Enum(pmkOther,TRUE,&enumMoniker2);

1 0

Austin English : comctl32: Remove extraneous parentheses (LLVM/Clang).
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: 49538a4b311a9fde2a55aa9873dce206187e745b URL: http://source.winehq.org/git/wine.git/?a=commit;h=49538a4b311a9fde2a55aa987… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 12 18:27:11 2011 -0500 comctl32: Remove extraneous parentheses (LLVM/Clang). --- dlls/comctl32/syslink.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 9340fc6..573619e 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -529,7 +529,7 @@ static PDOC_ITEM SYSLINK_GetFocusLink (const SYSLINK_INFO *infoPtr, int *LinkId) while(Current != NULL) { - if((Current->Type == slLink)) + if(Current->Type == slLink) { if(Current->u.Link.state & LIS_FOCUSED) {

1 0

Austin English : winex11.drv: Remove extraneous parentheses (LLVM/Clang).
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: 846ba03867c529e8d98fa15ca2847d36fc56f3b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=846ba03867c529e8d98fa15ca… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 12 16:59:34 2011 -0500 winex11.drv: Remove extraneous parentheses (LLVM/Clang). --- dlls/winex11.drv/graphics.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index 8236759..ac5ea62 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -534,7 +534,7 @@ X11DRV_DrawArc( X11DRV_PDEVICE *physDev, INT left, INT top, INT right, if (!width) width = 1; if(physDev->pen.style == PS_NULL) width = 0; - if ((physDev->pen.style == PS_INSIDEFRAME)) + if (physDev->pen.style == PS_INSIDEFRAME) { if (2*width > (rc.right-rc.left)) width=(rc.right-rc.left + 1)/2; if (2*width > (rc.bottom-rc.top)) width=(rc.bottom-rc.top + 1)/2; @@ -709,7 +709,7 @@ X11DRV_Ellipse( X11DRV_PDEVICE *physDev, INT left, INT top, INT right, INT botto if (!width) width = 1; if(physDev->pen.style == PS_NULL) width = 0; - if ((physDev->pen.style == PS_INSIDEFRAME)) + if (physDev->pen.style == PS_INSIDEFRAME) { if (2*width > (rc.right-rc.left)) width=(rc.right-rc.left + 1)/2; if (2*width > (rc.bottom-rc.top)) width=(rc.bottom-rc.top + 1)/2; @@ -769,7 +769,7 @@ X11DRV_Rectangle(X11DRV_PDEVICE *physDev, INT left, INT top, INT right, INT bott if (!width) width = 1; if(physDev->pen.style == PS_NULL) width = 0; - if ((physDev->pen.style == PS_INSIDEFRAME)) + if (physDev->pen.style == PS_INSIDEFRAME) { if (2*width > (rc.right-rc.left)) width=(rc.right-rc.left + 1)/2; if (2*width > (rc.bottom-rc.top)) width=(rc.bottom-rc.top + 1)/2; @@ -850,7 +850,7 @@ X11DRV_RoundRect( X11DRV_PDEVICE *physDev, INT left, INT top, INT right, if (!width) width = 1; if(physDev->pen.style == PS_NULL) width = 0; - if ((physDev->pen.style == PS_INSIDEFRAME)) + if (physDev->pen.style == PS_INSIDEFRAME) { if (2*width > (rc.right-rc.left)) width=(rc.right-rc.left + 1)/2; if (2*width > (rc.bottom-rc.top)) width=(rc.bottom-rc.top + 1)/2;

1 0

Austin English : winealsa.drv: Remove extraneous parentheses (LLVM/Clang).
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: aca610778567e544b52b80400276afc75cf289f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca610778567e544b52b80400… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 12 17:42:20 2011 -0500 winealsa.drv: Remove extraneous parentheses (LLVM/Clang). --- dlls/winealsa.drv/alsa.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index dc0ef29..e2eca5a 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -128,7 +128,7 @@ int ALSA_AddRingMessage(ALSA_MSG_RING* omr, enum win_wm_message msg, DWORD_PTR p HANDLE hEvent = NULL; EnterCriticalSection(&omr->msg_crst); - if ((omr->msg_toget == ((omr->msg_tosave + 1) % omr->ring_buffer_size))) + if (omr->msg_toget == ((omr->msg_tosave + 1) % omr->ring_buffer_size)) { int old_ring_buffer_size = omr->ring_buffer_size; omr->ring_buffer_size += ALSA_RING_BUFFER_INCREMENT;

1 0

Austin English : quartz: Remove extraneous parentheses (LLVM/Clang).
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: 376bbd1eccb5e47590441b4a4d9e61afc3636772 URL: http://source.winehq.org/git/wine.git/?a=commit;h=376bbd1eccb5e47590441b4a4… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 12 17:42:54 2011 -0500 quartz: Remove extraneous parentheses (LLVM/Clang). --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 05b6e47..cf38ed9 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -94,7 +94,7 @@ static int EventsQueue_Destroy(EventsQueue* omr) static int EventsQueue_PutEvent(EventsQueue* omr, const Event* evt) { EnterCriticalSection(&omr->msg_crst); - if ((omr->msg_toget == ((omr->msg_tosave + 1) % omr->ring_buffer_size))) + if (omr->msg_toget == ((omr->msg_tosave + 1) % omr->ring_buffer_size)) { int old_ring_buffer_size = omr->ring_buffer_size; omr->ring_buffer_size += EVENTS_RING_BUFFER_INCREMENT;

1 0

Austin English : wineoss.drv: Remove extraneous parentheses (LLVM/Clang).
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: 17adb6c408ca573a5705f12c45e6e1758670b514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17adb6c408ca573a5705f12c4… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 12 17:43:15 2011 -0500 wineoss.drv: Remove extraneous parentheses (LLVM/Clang). --- dlls/wineoss.drv/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 0e27e21..4a8ee0f 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -1318,7 +1318,7 @@ static int OSS_AddRingMessage(OSS_MSG_RING* omr, enum win_wm_message msg, DWORD HANDLE hEvent = INVALID_HANDLE_VALUE; EnterCriticalSection(&omr->msg_crst); - if ((omr->msg_toget == ((omr->msg_tosave + 1) % omr->ring_buffer_size))) + if (omr->msg_toget == ((omr->msg_tosave + 1) % omr->ring_buffer_size)) { int old_ring_buffer_size = omr->ring_buffer_size; omr->ring_buffer_size += OSS_RING_BUFFER_INCREMENT;

1 0

Rex Tsai : wininet: Added stub for option DATA_SEND_TIMEOUT.
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: b7582991de7c5d021d9582b69a84d2cef827ef34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7582991de7c5d021d9582b69… Author: Rex Tsai <chihchun(a)kalug.linux.org.tw> Date: Tue Apr 12 23:44:42 2011 +0800 wininet: Added stub for option DATA_SEND_TIMEOUT. --- dlls/wininet/internet.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 9b37e58..d671484 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2594,9 +2594,10 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, break; case INTERNET_OPTION_SEND_TIMEOUT: case INTERNET_OPTION_RECEIVE_TIMEOUT: + case INTERNET_OPTION_DATA_SEND_TIMEOUT: { ULONG timeout = *(ULONG *)lpBuffer; - FIXME("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT %d\n", timeout); + FIXME("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT/DATA_SEND_TIMEOUT %d\n", timeout); break; } case INTERNET_OPTION_CONNECT_RETRIES:

1 0

Henri Verbeet : wined3d: Get rid of the swapchain destroy callback.
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: d2e665230ac30da62015dcae69e06501e7fe3c94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e665230ac30da62015dcae6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 12 18:28:39 2011 +0200 wined3d: Get rid of the swapchain destroy callback. --- dlls/d3d8/device.c | 11 ++--------- dlls/d3d9/device.c | 11 ++--------- dlls/ddraw/ddraw.c | 22 +++++++--------------- dlls/ddraw/ddraw_private.h | 3 --- dlls/ddraw/surface.c | 8 +++++--- dlls/dxgi/swapchain.c | 9 +-------- dlls/wined3d/device.c | 10 +++++----- include/wine/wined3d.idl | 3 --- 8 files changed, 22 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2e665230ac30da62015d…

1 0

Henri Verbeet : wined3d: Remove IWineD3DSwapChain::Destroy() from the public interface.
by Alexandre Julliard 13 Apr '11

13 Apr '11

Module: wine Branch: master Commit: 3068ae9e83725d58716c64451426f3cd06c32018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3068ae9e83725d58716c64451… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 12 18:28:40 2011 +0200 wined3d: Remove IWineD3DSwapChain::Destroy() from the public interface. --- dlls/wined3d/swapchain.c | 20 +++++++++----------- include/wine/wined3d.idl | 2 -- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6db92d6..a44407f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -26,15 +26,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(fps); /* Do not call while under the GL lock. */ -static void WINAPI IWineD3DBaseSwapChainImpl_Destroy(IWineD3DSwapChain *iface) +static void swapchain_cleanup(IWineD3DSwapChainImpl *swapchain) { - IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)iface; WINED3DDISPLAYMODE mode; UINT i; - TRACE("Destroying swapchain %p.\n", iface); + TRACE("Destroying swapchain %p.\n", swapchain); - IWineD3DSwapChain_SetGammaRamp(iface, 0, &swapchain->orig_gamma); + IWineD3DSwapChain_SetGammaRamp((IWineD3DSwapChain *)swapchain, 0, &swapchain->orig_gamma); /* Release the swapchain's draw buffers. Make sure swapchain->back_buffers[0] * is the last buffer to be destroyed, FindContext() depends on that. */ @@ -64,6 +63,7 @@ static void WINAPI IWineD3DBaseSwapChainImpl_Destroy(IWineD3DSwapChain *iface) { context_destroy(swapchain->device, swapchain->context[i]); } + HeapFree(GetProcessHeap(), 0, swapchain->context); /* Restore the screen resolution if we rendered in fullscreen. * This will restore the screen resolution to what it was before creating @@ -79,10 +79,6 @@ static void WINAPI IWineD3DBaseSwapChainImpl_Destroy(IWineD3DSwapChain *iface) mode.Format = swapchain->orig_fmt; IWineD3DDevice_SetDisplayMode((IWineD3DDevice *)swapchain->device, 0, &mode); } - - swapchain->parent_ops->wined3d_object_destroyed(swapchain->parent); - HeapFree(GetProcessHeap(), 0, swapchain->context); - HeapFree(GetProcessHeap(), 0, swapchain); } static HRESULT WINAPI IWineD3DBaseSwapChainImpl_QueryInterface(IWineD3DSwapChain *iface, REFIID riid, void **object) @@ -123,7 +119,11 @@ static ULONG WINAPI IWineD3DBaseSwapChainImpl_Release(IWineD3DSwapChain *iface) TRACE("%p decreasing refcount to %u.\n", swapchain, refcount); if (!refcount) - IWineD3DBaseSwapChainImpl_Destroy(iface); + { + swapchain_cleanup(swapchain); + swapchain->parent_ops->wined3d_object_destroyed(swapchain->parent); + HeapFree(GetProcessHeap(), 0, swapchain); + } return refcount; } @@ -658,7 +658,6 @@ static const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl = IWineD3DBaseSwapChainImpl_Release, /* IWineD3DSwapChain */ IWineD3DBaseSwapChainImpl_GetParent, - IWineD3DBaseSwapChainImpl_Destroy, IWineD3DBaseSwapChainImpl_GetDevice, IWineD3DSwapChainImpl_Present, IWineD3DSwapChainImpl_SetDestWindowOverride, @@ -847,7 +846,6 @@ static const IWineD3DSwapChainVtbl IWineGDISwapChain_Vtbl = IWineD3DBaseSwapChainImpl_Release, /* IWineD3DSwapChain */ IWineD3DBaseSwapChainImpl_GetParent, - IWineD3DBaseSwapChainImpl_Destroy, IWineD3DBaseSwapChainImpl_GetDevice, IWineGDISwapChainImpl_Present, IWineGDISwapChainImpl_SetDestWindowOverride, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 3e375a1..fff763d 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2332,8 +2332,6 @@ interface IWineD3DVolume : IWineD3DResource ] interface IWineD3DSwapChain : IWineD3DBase { - void Destroy( - ); HRESULT GetDevice( [out] IWineD3DDevice **device );

1 0