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

Rico Schüller : d3dx9: Implement ID3DXEffect::EndPass( ).
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: bc59705acac5f67a834c6e4ed4338c1db8b1f532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc59705acac5f67a834c6e4ed… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jun 27 11:58:38 2011 +0200 d3dx9: Implement ID3DXEffect::EndPass(). --- dlls/d3dx9_36/effect.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b11d3d1..756163a 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2873,13 +2873,21 @@ static HRESULT WINAPI ID3DXEffectImpl_CommitChanges(ID3DXEffect* iface) return E_NOTIMPL; } -static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect* iface) +static HRESULT WINAPI ID3DXEffectImpl_EndPass(ID3DXEffect *iface) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("iface %p\n", This); - return E_NOTIMPL; + if (This->active_pass) + { + This->active_pass = NULL; + return D3D_OK; + } + + WARN("Invalid call.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXEffectImpl_End(ID3DXEffect* iface)

1 0

Rico Schüller : d3dx9: Implement ID3DXEffect:: SetTechnique().
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: b7919e65fdcf3c266a95898376660fa934635dfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7919e65fdcf3c266a9589837… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jun 27 11:58:35 2011 +0200 d3dx9: Implement ID3DXEffect::SetTechnique(). --- dlls/d3dx9_36/effect.c | 29 ++++++++++++++++++++++++++--- 1 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0f9d413..b11d3d1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2747,13 +2747,36 @@ static HRESULT WINAPI ID3DXEffectImpl_GetPool(ID3DXEffect *iface, LPD3DXEFFECTPO return S_OK; } -static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect* iface, D3DXHANDLE technique) +static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect *iface, D3DXHANDLE technique) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); + struct ID3DXBaseEffectImpl *base = impl_from_ID3DXBaseEffect(This->base_effect); + struct d3dx_technique *tech = is_valid_technique(base, technique); - FIXME("(%p)->(%p): stub\n", This, technique); + TRACE("iface %p, technique %p\n", This, technique); - return E_NOTIMPL; + if (!tech) tech = get_technique_struct(iface->lpVtbl->GetTechniqueByName(iface, technique)); + + if (tech) + { + UINT i; + + for (i = 0; i < base->technique_count; ++i) + { + struct d3dx_technique *t = get_technique_struct(base->technique_handles[i]); + + if (tech == t) + { + This->active_technique = get_technique_handle(t); + TRACE("Technique %u (%p)\n", i, tech); + return D3D_OK; + } + } + } + + WARN("Invalid argument supplied.\n"); + + return D3DERR_INVALIDCALL; } static D3DXHANDLE WINAPI ID3DXEffectImpl_GetCurrentTechnique(ID3DXEffect *iface)

1 0

Rico Schüller : d3dx9: Fix light range spelling.
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: f37302ed8a82f7e07e9d38e667e1e16160e22334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f37302ed8a82f7e07e9d38e66… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jun 27 11:58:11 2011 +0200 d3dx9: Fix light range spelling. --- dlls/d3dx9_36/effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3265037..4b320fd 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -337,7 +337,7 @@ state_table[] = {SC_LIGHT, LT_AMBIENT, "LightAmbient"}, {SC_LIGHT, LT_POSITION, "LightPosition"}, {SC_LIGHT, LT_DIRECTION, "LightDirection"}, - {SC_LIGHT, LT_RANGE, "LighRange"}, + {SC_LIGHT, LT_RANGE, "LightRange"}, {SC_LIGHT, LT_FALLOFF, "LightFallOff"}, {SC_LIGHT, LT_ATTENUATION0, "LightAttenuation0"}, {SC_LIGHT, LT_ATTENUATION1, "LightAttenuation1"},

1 0

Jacek Caban : include: Added wpcapi.idl.
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: 811c3591c801d52a363e7ce2aee9a7c298f12284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=811c3591c801d52a363e7ce2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 24 19:37:16 2011 +0200 include: Added wpcapi.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/wpcapi.idl | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index aa3abb0..aa73888 100644 --- a/.gitignore +++ b/.gitignore @@ -243,6 +243,7 @@ include/wine/itss.h include/wine/svcctl.h include/wine/winedxgi.h include/winsxs.h +include/wpcapi.h include/wtypes.h include/wuapi.h include/xmllite.h diff --git a/include/Makefile.in b/include/Makefile.in index 383b674..9c94a23 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -99,6 +99,7 @@ PUBLIC_IDL_H_SRCS = \ wine/itss.idl \ wine/svcctl.idl \ winsxs.idl \ + wpcapi.idl \ wtypes.idl \ wuapi.idl \ xmllite.idl diff --git a/include/wpcapi.idl b/include/wpcapi.idl new file mode 100644 index 0000000..19c5256 --- /dev/null +++ b/include/wpcapi.idl @@ -0,0 +1,107 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * 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"; + +[ + uuid(8fdf6ca1-0189-47e4-b670-1a8a4636e340), + object +] +interface IWPCSettings : IUnknown +{ + HRESULT IsLoggingRequired( + [out] BOOL *pfRequired); + + HRESULT GetLastSettingsChangeTime( + [out] SYSTEMTIME *pTime) ; + + HRESULT GetRestrictions( + [out] DWORD *pdwRestrictions); +} + +[ + uuid(95e87780-e158-489e-b452-bbb850790715), + object +] +interface IWPCGamesSettings : IWPCSettings +{ + HRESULT IsBlocked( + [in] GUID guidAppID, + [out] DWORD *pdwReasons); +} + +[ + uuid(ffccbdb8-0992-4c30-b0f1-1cbb09c240aa), + object +] +interface IWPCWebSettings : IWPCSettings +{ + typedef enum tagWPCFLAG_WEB_SETTING { + WPCFLAG_WEB_SETTING_NOTBLOCKED = 0, + WPCFLAG_WEB_SETTING_DOWNLOADSBLOCKED = 1 + } WPCFLAG_WEB_SETTING; + + HRESULT GetSettings( + [out] DWORD *pdwSettings); + + HRESULT RequestURLOverride( + [in] HWND hWnd, + [in] LPCWSTR pcszURL, + [in] DWORD cURLs, + [in] LPCWSTR *ppcszSubURLs, + [out] BOOL *pfChanged); +} + +typedef enum tagWPCFLAG_VISIBILITY { + WPCFLAG_WPC_VISIBLE = 0, + WPCFLAG_WPC_HIDDEN = 1 +} WPCFLAG_VISIBILITY; + +[ + uuid(4FF40A0F-3F3B-4d7c-A41B-4F39D7B44D05), + object +] +interface IWindowsParentalControlsCore : IUnknown +{ + HRESULT GetVisibility( + [out] WPCFLAG_VISIBILITY *peVisibility) ; + + HRESULT GetUserSettings( + [in] LPCWSTR pcszSID, + [out] IWPCSettings **ppSettings); + + HRESULT GetWebSettings( + [in] LPCWSTR pcszSID, + [out] IWPCWebSettings **ppSettings); + + HRESULT GetWebFilterInfo( + [out] GUID *pguidID, + [in] LPWSTR *ppszName); +} + +[ + uuid(4ff40a0f-3f3b-4d7c-a41b-4f39d7b44d05), + object +] +interface IWindowsParentalControls : IWindowsParentalControlsCore +{ + HRESULT GetGamesSettings( + [in] LPCWSTR pcszSID, + [out] IWPCGamesSettings **ppSettings) ; +}

1 0

Huw Davies : gdi32: Fix the 8 bpp generated colour table.
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: bc653ce20485c0e76fa16cddbf463c525b878bfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc653ce20485c0e76fa16cddb… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 27 13:26:42 2011 +0100 gdi32: Fix the 8 bpp generated colour table. --- dlls/gdi32/dib.c | 25 ++++++++----------------- dlls/gdi32/tests/bitmap.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 07aa609..962a1aa 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -456,7 +456,7 @@ static const RGBQUAD DefLogPaletteQuads[20] = { /* Copy of Default Logical Palet { 0xf0, 0xfb, 0xff, 0x00 }, { 0xa4, 0xa0, 0xa0, 0x00 }, { 0x80, 0x80, 0x80, 0x00 }, - { 0x00, 0x00, 0xf0, 0x00 }, + { 0x00, 0x00, 0xff, 0x00 }, { 0x00, 0xff, 0x00, 0x00 }, { 0x00, 0xff, 0xff, 0x00 }, { 0xff, 0x00, 0x00, 0x00 }, @@ -639,24 +639,15 @@ INT WINAPI GetDIBits( break; case 8: - { - INT r, g, b; - RGBQUAD *color; - memcpy(rgbQuads, DefLogPaletteQuads, 10 * sizeof(RGBQUAD)); memcpy(rgbQuads + 246, DefLogPaletteQuads + 10, 10 * sizeof(RGBQUAD)); - color = rgbQuads + 10; - for(r = 0; r <= 5; r++) /* FIXME */ - for(g = 0; g <= 5; g++) - for(b = 0; b <= 5; b++) { - color->rgbRed = (r * 0xff) / 5; - color->rgbGreen = (g * 0xff) / 5; - color->rgbBlue = (b * 0xff) / 5; - color->rgbReserved = 0; - color++; - } - } - + for (i = 10; i < 246; i++) + { + rgbQuads[i].rgbRed = (i & 0x07) << 5; + rgbQuads[i].rgbGreen = (i & 0x38) << 2; + rgbQuads[i].rgbBlue = i & 0xc0; + rgbQuads[i].rgbReserved = 0; + } } } diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index d21d502..e107d7b 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1534,6 +1534,7 @@ static void test_GetDIBits(void) BYTE buf[1024]; char bi_buf[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 256]; BITMAPINFO *bi = (BITMAPINFO *)bi_buf; + PALETTEENTRY pal_ents[32]; hdc = GetDC(0); @@ -1722,6 +1723,50 @@ todo_wine for (i = 2; i < 256; i++) ok(((WORD*)bi->bmiColors)[i] == 0xAAAA, "Color %d is %d\n", i, ((WORD*)bi->bmiColors)[i]); + /* retrieve 8-bit DIB data */ + memset(bi, 0, sizeof(*bi)); + bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bi->bmiHeader.biWidth = bm.bmWidth; + bi->bmiHeader.biHeight = bm.bmHeight; + bi->bmiHeader.biPlanes = 1; + bi->bmiHeader.biBitCount = 8; + bi->bmiHeader.biCompression = BI_RGB; + bi->bmiHeader.biSizeImage = 0; + memset(bi->bmiColors, 0xAA, sizeof(RGBQUAD) * 256); + memset(buf, 0xAA, sizeof(buf)); + SetLastError(0xdeadbeef); + lines = GetDIBits(hdc, hbmp, 0, bm.bmHeight, buf, bi, DIB_RGB_COLORS); + ok(lines == bm.bmHeight, "GetDIBits copied %d lines of %d, error %u\n", + lines, bm.bmHeight, GetLastError()); + + GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, 32, pal_ents ); + + for (i = 0; i < 256; i++) + { + RGBQUAD expect; + + if (i < 10 || i >= 246) + { + int entry = i < 10 ? i : i - 236; + expect.rgbRed = pal_ents[entry].peRed; + expect.rgbGreen = pal_ents[entry].peGreen; + expect.rgbBlue = pal_ents[entry].peBlue; + } + else + { + expect.rgbRed = (i & 0x07) << 5; + expect.rgbGreen = (i & 0x38) << 2; + expect.rgbBlue = i & 0xc0; + } + expect.rgbReserved = 0; + + ok(!memcmp(bi->bmiColors + i, &expect, sizeof(expect)), + "expected bmiColors[%d] %x %x %x %x - got %x %x %x %x\n", i, + expect.rgbRed, expect.rgbGreen, expect.rgbBlue, expect.rgbReserved, + bi->bmiColors[i].rgbRed, bi->bmiColors[i].rgbGreen, + bi->bmiColors[i].rgbBlue, bi->bmiColors[i].rgbReserved); + } + /* retrieve 24-bit DIB data */ memset(bi, 0, sizeof(*bi)); bi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);

1 0

Jacek Caban : widl: Insert standard windows.h and ole2. h includes to generated headers.
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: 63d5462ced7e8ed936beb723e80fd40155880d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d5462ced7e8ed936beb723e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 24 19:34:54 2011 +0200 widl: Insert standard windows.h and ole2.h includes to generated headers. --- tools/widl/header.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 9d12696..4dee484 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1338,6 +1338,11 @@ void write_header(const statement_list_t *stmts) fprintf(header, "#include <rpc.h>\n" ); fprintf(header, "#include <rpcndr.h>\n\n" ); + fprintf(header, "#if !defined(COM_NO_WINDOWS_H) && !defined(__WINESRC__)\n"); + fprintf(header, "#include <windows.h>\n"); + fprintf(header, "#include <ole2.h>\n"); + fprintf(header, "#endif\n\n"); + fprintf(header, "#ifndef __WIDL_%s\n", header_token); fprintf(header, "#define __WIDL_%s\n\n", header_token);

1 0

Rico Schüller : d3dx9: Implement ID3DXEffect:: GetCurrentTechnique().
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: 69c3b4baf6736550a6936cfdc386729eabf16367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69c3b4baf6736550a6936cfdc… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Jun 27 11:58:30 2011 +0200 d3dx9: Implement ID3DXEffect::GetCurrentTechnique(). --- dlls/d3dx9_36/effect.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 79b53b1..0f9d413 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2756,13 +2756,13 @@ static HRESULT WINAPI ID3DXEffectImpl_SetTechnique(ID3DXEffect* iface, D3DXHANDL return E_NOTIMPL; } -static D3DXHANDLE WINAPI ID3DXEffectImpl_GetCurrentTechnique(ID3DXEffect* iface) +static D3DXHANDLE WINAPI ID3DXEffectImpl_GetCurrentTechnique(ID3DXEffect *iface) { struct ID3DXEffectImpl *This = impl_from_ID3DXEffect(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("iface %p\n", This); - return NULL; + return This->active_technique; } static HRESULT WINAPI ID3DXEffectImpl_ValidateTechnique(ID3DXEffect* iface, D3DXHANDLE technique)

1 0

Marcus Meissner : dmstyle: Reverse NULL check and deref (Coverity).
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: e4d63f77114466ca808bbec3eba3821dd940b23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4d63f77114466ca808bbec3e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 16:57:51 2011 +0200 dmstyle: Reverse NULL check and deref (Coverity). --- dlls/dmstyle/style.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index eb6e77c..547025e 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -730,11 +730,11 @@ static HRESULT IDirectMusicStyle8Impl_IPersistStream_ParsePatternList (LPPERSIST TRACE_(dmfile)(": Pattern chunk\n"); /** alloc new motif entry */ pNewMotif = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_STYLE_MOTIF)); - list_add_tail (&This->Motifs, &pNewMotif->entry); if (NULL == pNewMotif) { ERR(": no more memory\n"); return E_OUTOFMEMORY; } + list_add_tail (&This->Motifs, &pNewMotif->entry); IStream_Read (pStm, &pNewMotif->pattern, Chunk.dwSize, NULL); /** TODO trace pattern */

1 0

Marcus Meissner : msi: Remove superflous NULL check (Coverity).
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: 90970651d3b20ea88018080bec81a65a4fb3b8ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=90970651d3b20ea88018080be… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 26 17:24:25 2011 +0200 msi: Remove superflous NULL check (Coverity). --- dlls/msi/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 2eb7983..f49feda 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -283,7 +283,7 @@ static LPWSTR msi_dialog_get_style( LPCWSTR p, LPCWSTR *rest ) return NULL; } - if (!p || !q) + if (!q) return NULL; *rest = ++q;

1 0

Huw Davies : gdi32: Simplify colour table generation.
by Alexandre Julliard June 27, 2011

June 27, 2011

Module: wine Branch: master Commit: 163dfd148b3e5972a4e2c3d2ef82b3107c2533f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=163dfd148b3e5972a4e2c3d2e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 27 13:26:41 2011 +0100 gdi32: Simplify colour table generation. --- dlls/gdi32/dib.c | 266 ++++++++++++++++++------------------------------------ 1 files changed, 89 insertions(+), 177 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=163dfd148b3e5972a4e2c…

1 0