November 2012 - Wine-Commits

Huw Davies : winspool: Pre-1. 6 versions of CUPS can leave behind a file when cupsGetPDD3 fails, so clear up afterwards.
by Alexandre Julliard Nov. 16, 2012

Nov. 16, 2012

Module: wine Branch: master Commit: 02d41b7b1a605dfbb42f2d13225dc05549bf61f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02d41b7b1a605dfbb42f2d132… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 16 09:53:14 2012 +0000 winspool: Pre-1.6 versions of CUPS can leave behind a file when cupsGetPDD3 fails, so clear up afterwards. --- dlls/winspool.drv/info.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index af336cb..172f892 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -833,11 +833,14 @@ static BOOL get_cups_ppd( const char *printer_name, const WCHAR *ppd ) http_status = cupsGetPPD3_wrapper( 0, printer_name, &modtime, unix_name, strlen( unix_name ) + 1 ); + + if (http_status != HTTP_OK) unlink( unix_name ); HeapFree( GetProcessHeap(), 0, unix_name ); if (http_status == HTTP_OK) return TRUE; - TRACE( "failed to get ppd for printer %s from cups, calling fallback\n", debugstr_a(printer_name) ); + TRACE( "failed to get ppd for printer %s from cups (status %d), calling fallback\n", + debugstr_a(printer_name), http_status ); return get_fallback_ppd( printer_name, ppd ); }

1 0

Christian Inci : wined3d: Add support for nVidia GT 640M.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: 83ed5efb31ea142a44d5649c81c6dec63aa0fa96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ed5efb31ea142a44d5649c8… Author: Christian Inci <chris.pcguy.inci(a)gmail.com> Date: Wed Nov 14 03:46:46 2012 +0100 wined3d: Add support for nVidia GT 640M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6060a48..58dc0da 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1110,6 +1110,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX570, "NVIDIA GeForce GTX 570", DRIVER_NVIDIA_GEFORCE6, 1280}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX580, "NVIDIA GeForce GTX 580", DRIVER_NVIDIA_GEFORCE6, 1536}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT630M, "NVIDIA GeForce GT 630M", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT640M, "NVIDIA GeForce GT 640M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT650M, "NVIDIA GeForce GT 650M", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, @@ -1512,6 +1513,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ {"GT 650M", CARD_NVIDIA_GEFORCE_GT650M}, /* Geforce 600 - midend mobile */ + {"GT 640M", CARD_NVIDIA_GEFORCE_GT640M}, /* Geforce 600 - midend mobile */ {"GT 630M", CARD_NVIDIA_GEFORCE_GT630M}, /* Geforce 600 - midend mobile */ {"GTX 580", CARD_NVIDIA_GEFORCE_GTX580}, /* Geforce 500 - highend */ {"GTX 570", CARD_NVIDIA_GEFORCE_GTX570}, /* Geforce 500 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e026f74..ec7c3bf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1434,6 +1434,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX570 = 0x1081, CARD_NVIDIA_GEFORCE_GTX580 = 0x1080, CARD_NVIDIA_GEFORCE_GT630M = 0x0de9, + CARD_NVIDIA_GEFORCE_GT640M = 0x0fd2, CARD_NVIDIA_GEFORCE_GT650M = 0x0fd1, CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180,

1 0

Marcus Meissner : wininet: Move freeing netconn into create_netconn_socket (Coverity).
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: 02a80554f833a86851bccd80b0ca21246d4cba05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02a80554f833a86851bccd80b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Nov 14 19:59:31 2012 +0100 wininet: Move freeing netconn into create_netconn_socket (Coverity). --- dlls/wininet/netconnection.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index b746b54..2abb676 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -655,7 +655,6 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t if (!res) { closesocket(netconn->socketFD); - heap_free(netconn); return ERROR_INTERNET_CANNOT_CONNECT; } else if (res > 0) @@ -674,10 +673,8 @@ static DWORD create_netconn_socket(server_t *server, netconn_t *netconn, DWORD t ioctlsocket(netconn->socketFD, FIONBIO, &flag); } } - if(result == -1) { - heap_free(netconn); + if(result == -1) return sock_get_error(errno); - } #ifdef TCP_NODELAY flag = 1; @@ -717,9 +714,13 @@ DWORD create_netconn(BOOL useSSL, server_t *server, DWORD security_flags, BOOL m list_init(&netconn->pool_entry); result = create_netconn_socket(server, netconn, timeout); + if (result != ERROR_SUCCESS) { + heap_free(netconn); + return result; + } + server_addref(server); netconn->server = server; - *ret = netconn; return result; }

1 0

Piotr Caban : urlmon: Update reference counter in bsc_from_bctx.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: c29c639cce45ee5967f14bc9ff240c726ad1a1db URL: http://source.winehq.org/git/wine.git/?a=commit;h=c29c639cce45ee5967f14bc9f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 15 15:51:08 2012 +0100 urlmon: Update reference counter in bsc_from_bctx. --- dlls/urlmon/bindctx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 00f6844..b2d2776 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -83,6 +83,7 @@ IBindStatusCallback *bsc_from_bctx(IBindCtx *bctx) if(holder->callback) { IBindStatusCallback_Release(bsc); bsc = holder->callback; + IBindStatusCallback_AddRef(bsc); } IBindStatusCallbackEx_Release(&holder->IBindStatusCallbackEx_iface);

1 0

Hans Leidekker : windowscodecs: Implement IWICColorContext:: InitializeFromMemory.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: 7712c0e8cd7061e6abf3ab5ab1049b55e8949f8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7712c0e8cd7061e6abf3ab5ab… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:07:49 2012 +0100 windowscodecs: Implement IWICColorContext::InitializeFromMemory. --- dlls/windowscodecs/colorcontext.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index 1c772c0..2678fc2 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -37,6 +37,8 @@ typedef struct ColorContext { IWICColorContext IWICColorContext_iface; LONG ref; WICColorContextType type; + BYTE *profile; + UINT profile_len; } ColorContext; static inline ColorContext *impl_from_IWICColorContext(IWICColorContext *iface) @@ -86,6 +88,7 @@ static ULONG WINAPI ColorContext_Release(IWICColorContext *iface) if (ref == 0) { + HeapFree(GetProcessHeap(), 0, This->profile); HeapFree(GetProcessHeap(), 0, This); } @@ -102,8 +105,21 @@ static HRESULT WINAPI ColorContext_InitializeFromFilename(IWICColorContext *ifac static HRESULT WINAPI ColorContext_InitializeFromMemory(IWICColorContext *iface, const BYTE *pbBuffer, UINT cbBufferSize) { - FIXME("(%p,%p,%u)\n", iface, pbBuffer, cbBufferSize); - return E_NOTIMPL; + ColorContext *This = impl_from_IWICColorContext(iface); + TRACE("(%p,%p,%u)\n", iface, pbBuffer, cbBufferSize); + + if (This->type != WICColorContextUninitialized) + return WINCODEC_ERR_WRONGSTATE; + + HeapFree(GetProcessHeap(), 0, This->profile); + if (!(This->profile = HeapAlloc(GetProcessHeap(), 0, cbBufferSize))) + return E_OUTOFMEMORY; + + memcpy(This->profile, pbBuffer, cbBufferSize); + This->profile_len = cbBufferSize; + This->type = WICColorContextProfile; + + return S_OK; } static HRESULT WINAPI ColorContext_InitializeFromExifColorSpace(IWICColorContext *iface, @@ -159,6 +175,8 @@ HRESULT ColorContext_Create(IWICColorContext **colorcontext) This->IWICColorContext_iface.lpVtbl = &ColorContext_Vtbl; This->ref = 1; This->type = 0; + This->profile = NULL; + This->profile_len = 0; *colorcontext = &This->IWICColorContext_iface;

1 0

Hans Leidekker : windowscodecs: Implement IWICColorContext::GetType.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: c9acbecdf0780c3bcb61a6dae48ab6345994c376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9acbecdf0780c3bcb61a6dae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:07:23 2012 +0100 windowscodecs: Implement IWICColorContext::GetType. --- dlls/windowscodecs/colorcontext.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index 9517988..1c772c0 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -36,6 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); typedef struct ColorContext { IWICColorContext IWICColorContext_iface; LONG ref; + WICColorContextType type; } ColorContext; static inline ColorContext *impl_from_IWICColorContext(IWICColorContext *iface) @@ -115,8 +116,11 @@ static HRESULT WINAPI ColorContext_InitializeFromExifColorSpace(IWICColorContext static HRESULT WINAPI ColorContext_GetType(IWICColorContext *iface, WICColorContextType *pType) { - FIXME("(%p,%p)\n", iface, pType); - return E_NOTIMPL; + ColorContext *This = impl_from_IWICColorContext(iface); + TRACE("(%p,%p)\n", iface, pType); + + *pType = This->type; + return S_OK; } static HRESULT WINAPI ColorContext_GetProfileBytes(IWICColorContext *iface, @@ -154,6 +158,7 @@ HRESULT ColorContext_Create(IWICColorContext **colorcontext) This->IWICColorContext_iface.lpVtbl = &ColorContext_Vtbl; This->ref = 1; + This->type = 0; *colorcontext = &This->IWICColorContext_iface;

1 0

Hans Leidekker : windowscodecs: Implement WICCreateColorContext_Proxy.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: 1b762afa63ec6541425ae827090cde03ee152997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b762afa63ec6541425ae8270… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:06:10 2012 +0100 windowscodecs: Implement WICCreateColorContext_Proxy. --- dlls/windowscodecs/proxy.c | 7 +++++++ dlls/windowscodecs/windowscodecs.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 4ee12c2..2f727b4 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -620,6 +620,13 @@ HRESULT WINAPI IWICStream_InitializeFromMemory_Proxy_W(IWICStream *iface, return IWICStream_InitializeFromMemory(iface, pbBuffer, cbBufferSize); } +HRESULT WINAPI WICCreateColorContext_Proxy(IWICImagingFactory *iface, IWICColorContext **ppIWICColorContext) +{ + TRACE("%p, %p\n", iface, ppIWICColorContext); + + return IWICImagingFactory_CreateColorContext(iface, ppIWICColorContext); +} + HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT SDKVersion, IWICImagingFactory **ppIImagingFactory) { TRACE("%x, %p\n", SDKVersion, ppIImagingFactory); diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 453a84e..3d70084 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -106,7 +106,7 @@ @ stdcall IWICStream_InitializeFromMemory_Proxy(ptr ptr long) IWICStream_InitializeFromMemory_Proxy_W @ stdcall WICConvertBitmapSource(ptr ptr ptr) @ stub WICCreateBitmapFromSection -@ stub WICCreateColorContext_Proxy +@ stdcall WICCreateColorContext_Proxy(ptr ptr) @ stdcall WICCreateImagingFactory_Proxy(long ptr) @ stub WICGetMetadataContentSize @ stub WICMapGuidToShortName

1 0

Dmitry Timoshkov : fonts: Update 10-pixel cyrillic bitmaps for Tahoma.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: e070173ac6316cd9afc2755087d8e6b95b6cdafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e070173ac6316cd9afc275508… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 15 16:44:43 2012 +0800 fonts: Update 10-pixel cyrillic bitmaps for Tahoma. --- fonts/tahoma.sfd | 352 ++++++++++++++++++++++++++++-------------------------- fonts/tahoma.ttf | Bin 101036 -> 101052 bytes 2 files changed, 180 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e070173ac6316cd9afc27…

1 0

Alexandre Julliard : winex11: Move the screen saver support to a new SystemParametersInfo entry point.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: 67d16ddee3ba20ea0aa794a4153fcbbb67869a66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d16ddee3ba20ea0aa794a41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 15 17:46:37 2012 +0100 winex11: Move the screen saver support to a new SystemParametersInfo entry point. --- dlls/winex11.drv/winex11.drv.spec | 3 +- dlls/winex11.drv/x11drv_main.c | 58 +++++++++++++++++++----------------- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index db3e4f5..f14be21 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -19,8 +19,6 @@ @ cdecl GetCursorPos(ptr) X11DRV_GetCursorPos @ cdecl SetCursorPos(long long) X11DRV_SetCursorPos @ cdecl ClipCursor(ptr) X11DRV_ClipCursor -@ cdecl GetScreenSaveActive() X11DRV_GetScreenSaveActive -@ cdecl SetScreenSaveActive(long) X11DRV_SetScreenSaveActive @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) X11DRV_ChangeDisplaySettingsEx @ cdecl EnumDisplayMonitors(long ptr ptr long) X11DRV_EnumDisplayMonitors @ cdecl EnumDisplaySettingsEx(ptr long ptr long) X11DRV_EnumDisplaySettingsEx @@ -54,6 +52,7 @@ @ cdecl WindowMessage(long long long long) X11DRV_WindowMessage @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) X11DRV_WindowPosChanging @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) X11DRV_WindowPosChanged +@ cdecl SystemParametersInfo(long long ptr long) X11DRV_SystemParametersInfo # WinTab32 @ cdecl AttachEventQueueToTablet(long) X11DRV_AttachEventQueueToTablet diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 3ff4233..ef6b1a9 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -696,35 +696,39 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return ret; } -/*********************************************************************** - * GetScreenSaveActive (X11DRV.@) - * - * Returns the active status of the screen saver - */ -BOOL CDECL X11DRV_GetScreenSaveActive(void) -{ - int timeout, temp; - XGetScreenSaver(gdi_display, &timeout, &temp, &temp, &temp); - return timeout != 0; -} /*********************************************************************** - * SetScreenSaveActive (X11DRV.@) - * - * Activate/Deactivate the screen saver + * SystemParametersInfo (X11DRV.@) */ -void CDECL X11DRV_SetScreenSaveActive(BOOL bActivate) +BOOL CDECL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, UINT flags ) { - int timeout, interval, prefer_blanking, allow_exposures; - static int last_timeout = 15 * 60; - - XLockDisplay( gdi_display ); - XGetScreenSaver(gdi_display, &timeout, &interval, &prefer_blanking, - &allow_exposures); - if (timeout) last_timeout = timeout; - - timeout = bActivate ? last_timeout : 0; - XSetScreenSaver(gdi_display, timeout, interval, prefer_blanking, - allow_exposures); - XUnlockDisplay( gdi_display ); + switch (action) + { + case SPI_GETSCREENSAVEACTIVE: + if (ptr_param) + { + int timeout, temp; + XGetScreenSaver(gdi_display, &timeout, &temp, &temp, &temp); + *(BOOL *)ptr_param = timeout != 0; + return TRUE; + } + break; + case SPI_SETSCREENSAVEACTIVE: + { + int timeout, interval, prefer_blanking, allow_exposures; + static int last_timeout = 15 * 60; + + XLockDisplay( gdi_display ); + XGetScreenSaver(gdi_display, &timeout, &interval, &prefer_blanking, + &allow_exposures); + if (timeout) last_timeout = timeout; + + timeout = int_param ? last_timeout : 0; + XSetScreenSaver(gdi_display, timeout, interval, prefer_blanking, + allow_exposures); + XUnlockDisplay( gdi_display ); + } + break; + } + return FALSE; /* let user32 handle it */ }

1 0

Hans Leidekker : windowscodecs: Add tests for IWICColorContext.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: b671f2573e265e63fd68212f0113dde0af43ab99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b671f2573e265e63fd68212f0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:09:48 2012 +0100 windowscodecs: Add tests for IWICColorContext. --- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/pngformat.c | 469 ++++++++++++++++++++++++++++++++++ 2 files changed, 470 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b671f2573e265e63fd682…

1 0