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

Aric Stewart : gdi32: Fall back on uniscribe for complex scripts.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 0a29308e87780a7f0f6c5504ad80768443166cbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a29308e87780a7f0f6c5504a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 6 07:43:07 2011 -0500 gdi32: Fall back on uniscribe for complex scripts. --- dlls/gdi32/bidi.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 297ce86..9b8f758 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -359,6 +359,7 @@ BOOL BIDI_Reorder( WORD *chartype; BYTE *levels; unsigned i, done, glyph_i; + BOOL is_complex; int maxItems; int nItems; @@ -404,11 +405,20 @@ BOOL BIDI_Reorder( if (lpOutString) memcpy(lpOutString, lpString, uCount * sizeof(WCHAR)); + is_complex = FALSE; + for (i = 0; i < uCount && !is_complex; i++) + { + if ((lpString[i] >= 0x900 && lpString[i] <= 0xfff) || + (lpString[i] >= 0x1cd0 && lpString[i] <= 0x1cff) || + (lpString[i] >= 0xa840 && lpString[i] <= 0xa8ff)) + is_complex = TRUE; + } + /* Verify reordering will be required */ if ((WINE_GCPW_FORCE_RTL == (dwWineGCP_Flags&WINE_GCPW_DIR_MASK)) || ((dwWineGCP_Flags&WINE_GCPW_DIR_MASK) == WINE_GCPW_LOOSE_RTL)) State.uBidiLevel = 1; - else + else if (!is_complex) { done = 1; classify(lpString, chartype, uCount);

1 0

Michael Stefaniuc : inetcomm: COM cleanup for the IMimeInternational iface.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: ef4d631b198580ed1af7b50b5ba807e121f85a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef4d631b198580ed1af7b50b5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 5 23:43:04 2011 +0200 inetcomm: COM cleanup for the IMimeInternational iface. --- dlls/inetcomm/mimeintl.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/inetcomm/mimeintl.c b/dlls/inetcomm/mimeintl.c index 187f1c5..1b15251 100644 --- a/dlls/inetcomm/mimeintl.c +++ b/dlls/inetcomm/mimeintl.c @@ -49,7 +49,7 @@ typedef struct typedef struct { - const IMimeInternationalVtbl *lpVtbl; + IMimeInternational IMimeInternational_iface; LONG refs; CRITICAL_SECTION cs; @@ -58,9 +58,9 @@ typedef struct HCHARSET default_charset; } internat_impl; -static inline internat_impl *impl_from_IMimeInternational( IMimeInternational *iface ) +static inline internat_impl *impl_from_IMimeInternational(IMimeInternational *iface) { - return (internat_impl *)((char*)iface - FIELD_OFFSET(internat_impl, lpVtbl)); + return CONTAINING_RECORD(iface, internat_impl, IMimeInternational_iface); } static inline HRESULT get_mlang(IMultiLanguage **ml) @@ -524,7 +524,7 @@ static internat_impl *global_internat; HRESULT MimeInternational_Construct(IMimeInternational **internat) { global_internat = HeapAlloc(GetProcessHeap(), 0, sizeof(*global_internat)); - global_internat->lpVtbl = &mime_internat_vtbl; + global_internat->IMimeInternational_iface.lpVtbl = &mime_internat_vtbl; global_internat->refs = 0; InitializeCriticalSection(&global_internat->cs); @@ -532,7 +532,7 @@ HRESULT MimeInternational_Construct(IMimeInternational **internat) global_internat->next_charset_handle = 0; global_internat->default_charset = NULL; - *internat = (IMimeInternational*)&global_internat->lpVtbl; + *internat = &global_internat->IMimeInternational_iface; IMimeInternational_AddRef(*internat); return S_OK; @@ -542,7 +542,7 @@ HRESULT WINAPI MimeOleGetInternat(IMimeInternational **internat) { TRACE("(%p)\n", internat); - *internat = (IMimeInternational *)&global_internat->lpVtbl; + *internat = &global_internat->IMimeInternational_iface; IMimeInternational_AddRef(*internat); return S_OK; }

1 0

Michael Stefaniuc : shell32: COM cleanup for the IContextMenu2 iface.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: c40a6eee4c56da1b3002ed35ffde07511ee3d5f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c40a6eee4c56da1b3002ed35f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 5 23:47:45 2011 +0200 shell32: COM cleanup for the IContextMenu2 iface. --- dlls/shell32/shv_item_cmenu.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index bf00e70..62c4c7f 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -46,7 +46,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); * IContextMenu Implementation */ typedef struct -{ const IContextMenu2Vtbl *lpVtbl; +{ + IContextMenu2 IContextMenu2_iface; LONG ref; IShellFolder* pSFParent; LPITEMIDLIST pidl; /* root pidl */ @@ -55,6 +56,11 @@ typedef struct BOOL bAllValues; } ItemCmImpl; +static inline ItemCmImpl *impl_from_IContextMenu2(IContextMenu2 *iface) +{ + return CONTAINING_RECORD(iface, ItemCmImpl, IContextMenu2_iface); +} + static const IContextMenu2Vtbl cmvt; @@ -86,7 +92,7 @@ IContextMenu2 *ISvItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl UINT u; cm = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ItemCmImpl)); - cm->lpVtbl = &cmvt; + cm->IContextMenu2_iface.lpVtbl = &cmvt; cm->ref = 1; cm->pidl = ILClone(pidl); cm->pSFParent = pSFParent; @@ -104,7 +110,7 @@ IContextMenu2 *ISvItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl TRACE("(%p)->()\n",cm); - return (IContextMenu2*)cm; + return &cm->IContextMenu2_iface; } /************************************************************************** @@ -112,7 +118,7 @@ IContextMenu2 *ISvItemCm_Constructor(LPSHELLFOLDER pSFParent, LPCITEMIDLIST pidl */ static HRESULT WINAPI ISvItemCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); @@ -144,7 +150,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryInterface(IContextMenu2 *iface, REFIID ri */ static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(count=%u)\n", This, refCount - 1); @@ -157,7 +163,7 @@ static ULONG WINAPI ISvItemCm_fnAddRef(IContextMenu2 *iface) */ static ULONG WINAPI ISvItemCm_fnRelease(IContextMenu2 *iface) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(count=%i)\n", This, refCount + 1); @@ -217,7 +223,7 @@ static HRESULT WINAPI ISvItemCm_fnQueryContextMenu( UINT idCmdLast, UINT uFlags) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); INT uIDMax; TRACE("(%p)->(hmenu=%p indexmenu=%x cmdfirst=%x cmdlast=%x flags=%x )\n",This, hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); @@ -499,7 +505,7 @@ static HRESULT WINAPI ISvItemCm_fnInvokeCommand( IContextMenu2 *iface, LPCMINVOKECOMMANDINFO lpcmi) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); if (lpcmi->cbSize != sizeof(CMINVOKECOMMANDINFO)) FIXME("Is an EX structure\n"); @@ -575,7 +581,7 @@ static HRESULT WINAPI ISvItemCm_fnGetCommandString( LPSTR lpszName, UINT uMaxNameLen) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); HRESULT hr = E_INVALIDARG; @@ -630,7 +636,7 @@ static HRESULT WINAPI ISvItemCm_fnHandleMenuMsg( WPARAM wParam, LPARAM lParam) { - ItemCmImpl *This = (ItemCmImpl *)iface; + ItemCmImpl *This = impl_from_IContextMenu2(iface); TRACE("(%p)->(msg=%x wp=%lx lp=%lx)\n",This, uMsg, wParam, lParam);

1 0

Henri Verbeet : d3d9: Just return the resource type in IDirect3DResource8:: GetType() implementations.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: dbc0e72d17fc5c226d961f7ed3c8a9a224a357f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbc0e72d17fc5c226d961f7ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jun 5 22:48:54 2011 +0200 d3d9: Just return the resource type in IDirect3DResource8::GetType() implementations. --- dlls/d3d9/cubetexture.c | 9 +-------- dlls/d3d9/texture.c | 9 +-------- dlls/d3d9/volumetexture.c | 9 +-------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 1f5e27b8..a4b07f0 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -197,16 +197,9 @@ static void WINAPI IDirect3DCubeTexture9Impl_PreLoad(IDirect3DCubeTexture9 *ifac static D3DRESOURCETYPE WINAPI IDirect3DCubeTexture9Impl_GetType(IDirect3DCubeTexture9 *iface) { - IDirect3DCubeTexture9Impl *This = impl_from_IDirect3DCubeTexture9(iface); - D3DRESOURCETYPE ret; - TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - ret = wined3d_texture_get_type(This->wined3d_texture); - wined3d_mutex_unlock(); - - return ret; + return D3DRTYPE_CUBETEXTURE; } /* IDirect3DCubeTexture9 IDirect3DBaseTexture9 Interface follow: */ diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index d1df0f5..970028b 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -192,16 +192,9 @@ static void WINAPI IDirect3DTexture9Impl_PreLoad(IDirect3DTexture9 *iface) static D3DRESOURCETYPE WINAPI IDirect3DTexture9Impl_GetType(IDirect3DTexture9 *iface) { - IDirect3DTexture9Impl *This = impl_from_IDirect3DTexture9(iface); - HRESULT ret; - TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - ret = wined3d_texture_get_type(This->wined3d_texture); - wined3d_mutex_unlock(); - - return ret; + return D3DRTYPE_TEXTURE; } /* IDirect3DTexture9 IDirect3DBaseTexture9 Interface follow: */ diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index 9528e9b..d5a1bcc 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -192,16 +192,9 @@ static void WINAPI IDirect3DVolumeTexture9Impl_PreLoad(IDirect3DVolumeTexture9 * static D3DRESOURCETYPE WINAPI IDirect3DVolumeTexture9Impl_GetType(IDirect3DVolumeTexture9 *iface) { - IDirect3DVolumeTexture9Impl *This = impl_from_IDirect3DVolumeTexture9(iface); - D3DRESOURCETYPE type; - TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - type = wined3d_texture_get_type(This->wined3d_texture); - wined3d_mutex_unlock(); - - return type; + return D3DRTYPE_VOLUMETEXTURE; } static DWORD WINAPI IDirect3DVolumeTexture9Impl_SetLOD(IDirect3DVolumeTexture9 *iface, DWORD LODNew)

1 0

Austin English : ntoskrnl.exe: add a stub for IoSetThreadHardErrorMode.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: cd22aa18a628358d64c655d21f9d5f380304ab1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd22aa18a628358d64c655d21… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jun 5 15:48:37 2011 -0500 ntoskrnl.exe: add a stub for IoSetThreadHardErrorMode. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3f86cdc..b283a2f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1628,6 +1628,16 @@ NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE processid, PEPROCESS *process) return STATUS_NOT_IMPLEMENTED; } + +/***************************************************** + * IoSetThreadHardErrorMode (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI IoSetThreadHardErrorMode(BOOLEAN EnableHardErrors) +{ + FIXME("stub\n"); + return FALSE; +} + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 1456fbe..8fff636 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -456,7 +456,7 @@ @ stub IoSetShareAccess @ stub IoSetStartIoAttributes @ stub IoSetSystemPartition -@ stub IoSetThreadHardErrorMode +@ stdcall IoSetThreadHardErrorMode(long) @ stub IoSetTopLevelIrp @ stub IoStartNextPacket @ stub IoStartNextPacketByKey

1 0

Michael Stefaniuc : advapi32: Remove wrong "is NULL and error out" code ( coccicheck).
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: b856884c3b27219302598536a05d49fa749c19c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b856884c3b27219302598536a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jun 5 23:33:47 2011 +0200 advapi32: Remove wrong "is NULL and error out" code (coccicheck). --- dlls/advapi32/crypt.c | 5 ----- dlls/advapi32/tests/crypt.c | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index a6f8bc1..26fda66 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -1420,11 +1420,6 @@ BOOL WINAPI CryptGenKey (HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYPTKE TRACE("(0x%lx, %d, %08x, %p)\n", hProv, Algid, dwFlags, phKey); - if (!prov) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } if (!phKey || !prov || prov->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 865ffa4..1180275 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -238,6 +238,9 @@ static void test_incorrect_api_usage(void) if (!result) return; pCryptDestroyHash(hHash); + result = pCryptGenKey(0, CALG_RC4, 0, &hKey); + ok (!result && GetLastError() == ERROR_INVALID_PARAMETER, "%d\n", GetLastError()); + result = pCryptGenKey(hProv, CALG_RC4, 0, &hKey); ok (result, "%d\n", GetLastError()); if (!result) return;

1 0

Michael Stefaniuc : dxgi: COM cleanup for the IDXGIOutput iface.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 125b949545e19725740eed41390a092c6ca21d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=125b949545e19725740eed413… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 6 10:21:49 2011 +0200 dxgi: COM cleanup for the IDXGIOutput iface. --- dlls/dxgi/adapter.c | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/output.c | 15 ++++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 7cd808f..d4f757b 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -228,7 +228,7 @@ HRESULT dxgi_adapter_init(struct dxgi_adapter *adapter, IWineDXGIFactory *parent return E_OUTOFMEMORY; } dxgi_output_init(output, adapter); - adapter->output = (IDXGIOutput *)output; + adapter->output = &output->IDXGIOutput_iface; return S_OK; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index cb472f3..741e3e3 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -102,7 +102,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l /* IDXGIOutput */ struct dxgi_output { - const struct IDXGIOutputVtbl *vtbl; + IDXGIOutput IDXGIOutput_iface; LONG refcount; struct dxgi_adapter *adapter; }; diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 5ab7992..acc9f25 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -23,6 +23,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); +static inline struct dxgi_output *impl_from_IDXGIOutput(IDXGIOutput *iface) +{ + return CONTAINING_RECORD(iface, struct dxgi_output, IDXGIOutput_iface); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput *iface, REFIID riid, void **object) @@ -46,7 +51,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput *iface, static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput *iface) { - struct dxgi_output *This = (struct dxgi_output *)iface; + struct dxgi_output *This = impl_from_IDXGIOutput(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -56,7 +61,7 @@ static ULONG STDMETHODCALLTYPE dxgi_output_AddRef(IDXGIOutput *iface) static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput *iface) { - struct dxgi_output *This = (struct dxgi_output *)iface; + struct dxgi_output *This = impl_from_IDXGIOutput(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u.\n", This, refcount); @@ -98,7 +103,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetPrivateData(IDXGIOutput *iface, static HRESULT STDMETHODCALLTYPE dxgi_output_GetParent(IDXGIOutput *iface, REFIID riid, void **parent) { - struct dxgi_output *This = (struct dxgi_output *)iface; + struct dxgi_output *This = impl_from_IDXGIOutput(iface); TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); @@ -117,7 +122,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDesc(IDXGIOutput *iface, DXGI_OU static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *iface, DXGI_FORMAT format, UINT flags, UINT *mode_count, DXGI_MODE_DESC *desc) { - struct dxgi_output *This = (struct dxgi_output *)iface; + struct dxgi_output *This = impl_from_IDXGIOutput(iface); enum wined3d_format_id wined3d_format; struct wined3d *wined3d; UINT i; @@ -279,7 +284,7 @@ static const struct IDXGIOutputVtbl dxgi_output_vtbl = void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *adapter) { - output->vtbl = &dxgi_output_vtbl; + output->IDXGIOutput_iface.lpVtbl = &dxgi_output_vtbl; output->refcount = 1; output->adapter = adapter; }

1 0

Henri Verbeet : d3d8: Just return the resource type in IDirect3DResource8:: GetType() implementations.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: c866eab73050dbc9bb517530f05c1c76c99123d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c866eab73050dbc9bb517530f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jun 5 22:48:53 2011 +0200 d3d8: Just return the resource type in IDirect3DResource8::GetType() implementations. There's no need to ask wined3d, since it's constant for a given implementation. --- dlls/d3d8/cubetexture.c | 9 +-------- dlls/d3d8/texture.c | 9 +-------- dlls/d3d8/volumetexture.c | 9 +-------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 5915c54..304508b 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -194,16 +194,9 @@ static void WINAPI IDirect3DCubeTexture8Impl_PreLoad(IDirect3DCubeTexture8 *ifac static D3DRESOURCETYPE WINAPI IDirect3DCubeTexture8Impl_GetType(IDirect3DCubeTexture8 *iface) { - IDirect3DCubeTexture8Impl *This = impl_from_IDirect3DCubeTexture8(iface); - D3DRESOURCETYPE type; - TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - type = wined3d_texture_get_type(This->wined3d_texture); - wined3d_mutex_unlock(); - - return type; + return D3DRTYPE_CUBETEXTURE; } /* IDirect3DCubeTexture8 IDirect3DBaseTexture8 Interface follow: */ diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 1b9db9d..20cb6ed 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -192,16 +192,9 @@ static void WINAPI IDirect3DTexture8Impl_PreLoad(IDirect3DTexture8 *iface) static D3DRESOURCETYPE WINAPI IDirect3DTexture8Impl_GetType(IDirect3DTexture8 *iface) { - IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(iface); - D3DRESOURCETYPE type; - TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - type = wined3d_texture_get_type(This->wined3d_texture); - wined3d_mutex_unlock(); - - return type; + return D3DRTYPE_TEXTURE; } /* IDirect3DTexture8 IDirect3DBaseTexture8 Interface follow: */ diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 08e3680..df95401 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -192,16 +192,9 @@ static void WINAPI IDirect3DVolumeTexture8Impl_PreLoad(IDirect3DVolumeTexture8 * static D3DRESOURCETYPE WINAPI IDirect3DVolumeTexture8Impl_GetType(IDirect3DVolumeTexture8 *iface) { - IDirect3DVolumeTexture8Impl *This = impl_from_IDirect3DVolumeTexture8(iface); - D3DRESOURCETYPE type; - TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - type = wined3d_texture_get_type(This->wined3d_texture); - wined3d_mutex_unlock(); - - return type; + return D3DRTYPE_VOLUMETEXTURE; } /* IDirect3DVolumeTexture8 IDirect3DBaseTexture8 Interface follow: */

1 0

Henri Verbeet : wined3d: Don't clamp vertex depth values.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 708d94212b4a6419f15200c1c9c5b79c5264903d URL: http://source.winehq.org/git/wine.git/?a=commit;h=708d94212b4a6419f15200c1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jun 5 22:48:50 2011 +0200 wined3d: Don't clamp vertex depth values. Since we report D3DPMISCCAPS_CLIPTLVERTS. --- dlls/d3d8/tests/visual.c | 10 +++++----- dlls/d3d9/tests/visual.c | 10 +++++----- dlls/ddraw/tests/visual.c | 10 +++++----- dlls/wined3d/state.c | 19 +++---------------- 4 files changed, 18 insertions(+), 31 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 1e48c03..ae8276d 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1416,15 +1416,15 @@ static void depth_clamp_test(IDirect3DDevice8 *device) if (caps.PrimitiveMiscCaps & D3DPMISCCAPS_CLIPTLVERTS) { color = getPixelColor(device, 75, 75); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 150, 150); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); } else { diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e6cab39..3773ad7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10613,15 +10613,15 @@ static void depth_clamp_test(IDirect3DDevice9 *device) if (caps.PrimitiveMiscCaps & D3DPMISCCAPS_CLIPTLVERTS) { color = getPixelColor(device, 75, 75); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 150, 150); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); } else { diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 5eec1c8..b6c8006 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -2901,15 +2901,15 @@ static void depth_clamp_test(IDirect3DDevice7 *device) ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); color = getPixelColor(device, 75, 75); - todo_wine ok(color_match(color, 0x00ffffff, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00ffffff, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 150, 150); - todo_wine ok(color_match(color, 0x00ffffff, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00ffffff, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00002b7f, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00002b7f, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x00f9e814, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00f9e814, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); color = getPixelColor(device, 320, 330); - todo_wine ok(color_match(color, 0x00f9e814, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); + ok(color_match(color, 0x00f9e814, 1) || color_match(color, 0x0000ff00, 1), "color 0x%08x.\n", color); vp.dvMinZ = 0.0; vp.dvMaxZ = 1.0; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a2c197b..6c6ae3a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -486,7 +486,6 @@ static void state_alpha(DWORD state, struct wined3d_stateblock *stateblock, stru static void state_clipping(DWORD state_id, struct wined3d_stateblock *stateblock, struct wined3d_context *context) { - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_state *state = &stateblock->state; DWORD enable = 0xFFFFFFFF; DWORD disable = 0x00000000; @@ -520,23 +519,11 @@ static void state_clipping(DWORD state_id, struct wined3d_stateblock *stateblock { enable = state->render_states[WINED3DRS_CLIPPLANEENABLE]; disable = ~state->render_states[WINED3DRS_CLIPPLANEENABLE]; - if (gl_info->supported[ARB_DEPTH_CLAMP]) - { - glDisable(GL_DEPTH_CLAMP); - checkGLcall("glDisable(GL_DEPTH_CLAMP)"); - } - } else { + } + else + { disable = 0xffffffff; enable = 0x00; - if (gl_info->supported[ARB_DEPTH_CLAMP]) - { - glEnable(GL_DEPTH_CLAMP); - checkGLcall("glEnable(GL_DEPTH_CLAMP)"); - } - else - { - FIXME("Clipping disabled, but ARB_depth_clamp isn't supported.\n"); - } } if (enable & WINED3DCLIPPLANE0) { glEnable(GL_CLIP_PLANE0); checkGLcall("glEnable(clip plane 0)"); }

1 0

Marko Nikolic : comctl32/tests: Removed sign comparison warning in imagelist tests.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 7399177f0bb408fa7fb84ec2b77a8f97bbb1ee2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7399177f0bb408fa7fb84ec2b… Author: Marko Nikolic <grkoma(a)gmail.com> Date: Sun Jun 5 15:35:32 2011 +0200 comctl32/tests: Removed sign comparison warning in imagelist tests. --- dlls/comctl32/tests/imagelist.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index cc98a17..46b3595 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -893,7 +893,8 @@ static void image_list_init(HIMAGELIST himl) { HBITMAP hbm; char comment[16]; - INT n = 1, i; + INT n = 1; + DWORD i; static const struct test_data { BYTE grey; @@ -1757,15 +1758,15 @@ static void test_iconsize(void) ok(!ret, "got %d\n", ret); /* doesn't touch return pointers */ - cx = 0xdeadbeef; + cx = 0x1abe11ed; ret = ImageList_GetIconSize(himl, &cx, NULL); ok(!ret, "got %d\n", ret); - ok(cx == 0xdeadbeef, "got %d\n", cx); + ok(cx == 0x1abe11ed, "got %d\n", cx); - cy = 0xdeadbeef; + cy = 0x1abe11ed; ret = ImageList_GetIconSize(himl, NULL, &cy); ok(!ret, "got %d\n", ret); - ok(cy == 0xdeadbeef, "got %d\n", cy); + ok(cy == 0x1abe11ed, "got %d\n", cy); ImageList_Destroy(himl); }

1 0