wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Henri Verbeet : ddraw: Avoid LPDIRECT3D7.
by Alexandre Julliard 16 Nov '12

16 Nov '12

Module: wine Branch: master Commit: 0fa127b1fabee80a179508a21e83a95420697c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa127b1fabee80a179508a21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 16 00:29:50 2012 +0100 ddraw: Avoid LPDIRECT3D7. --- dlls/ddraw/tests/d3d.c | 2 +- include/d3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 73317a8..6f4416c 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -30,7 +30,7 @@ #include "unknwn.h" static IDirectDraw7 *lpDD; -static LPDIRECT3D7 lpD3D = NULL; +static IDirect3D7 *lpD3D; static IDirectDrawSurface7 *lpDDS; static IDirectDrawSurface7 *lpDDSdepth; static IDirect3DDevice7 *lpD3DDevice; diff --git a/include/d3d.h b/include/d3d.h index 4f1ffba..d321846 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1299,7 +1299,7 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMPIXELFORMATSCALLBACK lpD3DEnumPixelProc, LPVOID lpArg) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; - STDMETHOD(GetDirect3D)(THIS_ LPDIRECT3D7 *lplpDirect3D3) PURE; + STDMETHOD(GetDirect3D)(THIS_ IDirect3D7 **d3d) PURE; STDMETHOD(SetRenderTarget)(THIS_ IDirectDrawSurface7 *surface, DWORD flags) PURE; STDMETHOD(GetRenderTarget)(THIS_ IDirectDrawSurface7 **surface) PURE; STDMETHOD(Clear)(THIS_ DWORD dwCount,LPD3DRECT lpRects,DWORD dwFlags,D3DCOLOR dwColor,D3DVALUE dvZ,DWORD dwStencil) PURE;

1 0

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

15 Nov '12

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 15 Nov '12

15 Nov '12

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 15 Nov '12

15 Nov '12

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 : advapi32: Avoid a buffer overflow in CredUnmarshalCredentialW.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: bff64e8578d54fa27ee9667d70812c72b8db4d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff64e8578d54fa27ee9667d7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:12:22 2012 +0100 advapi32: Avoid a buffer overflow in CredUnmarshalCredentialW. Spotted by Stefan Leichter. --- dlls/advapi32/cred.c | 7 +++++-- dlls/advapi32/tests/cred.c | 8 ++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/cred.c b/dlls/advapi32/cred.c index b2597b6..b735821 100644 --- a/dlls/advapi32/cred.c +++ b/dlls/advapi32/cred.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <time.h> +#include <limits.h> #ifdef __APPLE__ # include <Security/SecKeychain.h> @@ -2102,7 +2103,7 @@ static BOOL cred_decode( const WCHAR *cred, unsigned int len, char *buf ) */ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVOID *out ) { - unsigned int len, buflen, size; + unsigned int len, buflen; TRACE("%s, %p, %p\n", debugstr_w(cred), type, out); @@ -2134,8 +2135,10 @@ BOOL WINAPI CredUnmarshalCredentialW( LPCWSTR cred, PCRED_MARSHAL_TYPE type, PVO case UsernameTargetCredential: { USERNAME_TARGET_CREDENTIAL_INFO *target; + ULONGLONG size = 0; - if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || !size || size % sizeof(WCHAR)) + if (len < 9 || !cred_decode( cred + 3, 6, (char *)&size ) || + !size || size % sizeof(WCHAR) || size > INT_MAX) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; diff --git a/dlls/advapi32/tests/cred.c b/dlls/advapi32/tests/cred.c index 3d37a3c..83212c5 100644 --- a/dlls/advapi32/tests/cred.c +++ b/dlls/advapi32/tests/cred.c @@ -670,6 +670,14 @@ static void test_CredUnmarshalCredentialA(void) ok( username->UserName != NULL, "UserName is NULL\n" ); ok( !lstrcmpW( username->UserName, testW ), "got %s\n", wine_dbgstr_w(username->UserName) ); pCredFree( username ); + + type = 0; + username = NULL; + SetLastError( 0xdeadbeef ); + ret = pCredUnmarshalCredentialA( "@@CA-----0BQZAMHA0BA", &type, (void **)&username ); + error = GetLastError(); + ok( !ret, "unexpected success\n" ); + ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); } static void test_CredIsMarshaledCredentialA(void)

1 0

Hans Leidekker : windowscodecs: GetThumbnail should be supported for ICO frames.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: 6395af1ae7b0cc5f2f1f82796502e2a605bc5a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6395af1ae7b0cc5f2f1f82796… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:10:31 2012 +0100 windowscodecs: GetThumbnail should be supported for ICO frames. --- dlls/windowscodecs/icoformat.c | 4 ++-- dlls/windowscodecs/tests/icoformat.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 6cccc3e..4e83ec0 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -200,8 +200,8 @@ static HRESULT WINAPI IcoFrameDecode_GetColorContexts(IWICBitmapFrameDecode *ifa static HRESULT WINAPI IcoFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface, IWICBitmapSource **ppIThumbnail) { - TRACE("(%p,%p)\n", iface, ppIThumbnail); - return WINCODEC_ERR_CODECNOTHUMBNAIL; + FIXME("(%p,%p)\n", iface, ppIThumbnail); + return E_NOTIMPL; } static const IWICBitmapFrameDecodeVtbl IcoFrameDecode_Vtbl = { diff --git a/dlls/windowscodecs/tests/icoformat.c b/dlls/windowscodecs/tests/icoformat.c index 3974dfc..e9c0a48 100644 --- a/dlls/windowscodecs/tests/icoformat.c +++ b/dlls/windowscodecs/tests/icoformat.c @@ -134,9 +134,16 @@ static void test_bad_icondirentry_size(void) if (SUCCEEDED(hr)) { UINT width = 0, height = 0; + IWICBitmapSource *thumbnail = NULL; + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); ok(hr == S_OK, "GetFrameSize failed, hr=%x\n", hr); ok(width == 16 && height == 16, "framesize=%ux%u\n", width, height); + + hr = IWICBitmapFrameDecode_GetThumbnail(framedecode, &thumbnail); + todo_wine ok(hr == S_OK, "GetThumbnail failed, hr=%x\n", hr); + + if (thumbnail) IWICBitmapSource_Release(thumbnail); IWICBitmapFrameDecode_Release(framedecode); }

1 0

Hans Leidekker : windowscodecs: Add tests for IWICColorContext.
by Alexandre Julliard 15 Nov '12

15 Nov '12

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

Hans Leidekker : windowscodecs: Implement IWICColorContext::GetProfileBytes .
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: ffa558bbaa3f28dd9c50222fadcdeaadbf9a3902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa558bbaa3f28dd9c50222fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:09:15 2012 +0100 windowscodecs: Implement IWICColorContext::GetProfileBytes. --- dlls/windowscodecs/colorcontext.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index ba23387..5434fc6 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -151,8 +151,18 @@ static HRESULT WINAPI ColorContext_GetType(IWICColorContext *iface, static HRESULT WINAPI ColorContext_GetProfileBytes(IWICColorContext *iface, UINT cbBuffer, BYTE *pbBuffer, UINT *pcbActual) { - FIXME("(%p,%u,%p,%p)\n", iface, cbBuffer, pbBuffer, pcbActual); - return E_NOTIMPL; + ColorContext *This = impl_from_IWICColorContext(iface); + TRACE("(%p,%u,%p,%p)\n", iface, cbBuffer, pbBuffer, pcbActual); + + if (This->type != WICColorContextProfile) + return WINCODEC_ERR_NOTINITIALIZED; + + if (cbBuffer >= This->profile_len && pbBuffer) + memcpy(pbBuffer, This->profile, This->profile_len); + + *pcbActual = This->profile_len; + + return S_OK; } static HRESULT WINAPI ColorContext_GetExifColorSpace(IWICColorContext *iface,

1 0

Hans Leidekker : windowscodecs: Implement IWICColorContext:: GetExifColorSpace.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: da7c8c6331b93dc2b6ed5ec27f520fbf0099e027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7c8c6331b93dc2b6ed5ec27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:08:47 2012 +0100 windowscodecs: Implement IWICColorContext::GetExifColorSpace. --- dlls/windowscodecs/colorcontext.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index 5c8e4db..ba23387 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -158,8 +158,11 @@ static HRESULT WINAPI ColorContext_GetProfileBytes(IWICColorContext *iface, static HRESULT WINAPI ColorContext_GetExifColorSpace(IWICColorContext *iface, UINT *pValue) { - FIXME("(%p,%p)\n", iface, pValue); - return E_NOTIMPL; + ColorContext *This = impl_from_IWICColorContext(iface); + TRACE("(%p,%p)\n", iface, pValue); + + *pValue = This->exif_color_space; + return S_OK; } static const IWICColorContextVtbl ColorContext_Vtbl = {

1 0

Hans Leidekker : windowscodecs: Implement IWICColorContext:: InitializeFromExifColorSpace.
by Alexandre Julliard 15 Nov '12

15 Nov '12

Module: wine Branch: master Commit: a7f0c14bef80e047ed209d8bf4589f59bc8e4d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f0c14bef80e047ed209d8bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:08:21 2012 +0100 windowscodecs: Implement IWICColorContext::InitializeFromExifColorSpace. --- dlls/windowscodecs/colorcontext.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index 2678fc2..5c8e4db 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -39,6 +39,7 @@ typedef struct ColorContext { WICColorContextType type; BYTE *profile; UINT profile_len; + UINT exif_color_space; } ColorContext; static inline ColorContext *impl_from_IWICColorContext(IWICColorContext *iface) @@ -125,8 +126,16 @@ static HRESULT WINAPI ColorContext_InitializeFromMemory(IWICColorContext *iface, static HRESULT WINAPI ColorContext_InitializeFromExifColorSpace(IWICColorContext *iface, UINT value) { - FIXME("(%p,%u)\n", iface, value); - return E_NOTIMPL; + ColorContext *This = impl_from_IWICColorContext(iface); + TRACE("(%p,%u)\n", iface, value); + + if (This->type != WICColorContextUninitialized && This->type != WICColorContextExifColorSpace) + return WINCODEC_ERR_WRONGSTATE; + + This->exif_color_space = value; + This->type = WICColorContextExifColorSpace; + + return S_OK; } static HRESULT WINAPI ColorContext_GetType(IWICColorContext *iface, @@ -177,6 +186,7 @@ HRESULT ColorContext_Create(IWICColorContext **colorcontext) This->type = 0; This->profile = NULL; This->profile_len = 0; + This->exif_color_space = ~0u; *colorcontext = &This->IWICColorContext_iface;

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012