wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Alexandre Julliard : winegcc: Force importing msvcrt when using the Unicode hack for a Windows build.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 561a3e643ea8b35adfc032d3afa979c622fcec23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=561a3e643ea8b35adfc032d3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 19 13:59:54 2010 +0100 winegcc: Force importing msvcrt when using the Unicode hack for a Windows build. Based on a patch by Alexandre Goujon. --- tools/winegcc/winegcc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 852f105..396bcc8 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -704,7 +704,6 @@ static void build(struct options* opts) { strarray_addall(link_args, get_translator(opts)); strarray_add(link_args, opts->gui_app ? "-mwindows" : "-mconsole"); - if (opts->use_msvcrt) strarray_add(link_args, "-mno-cygwin"); if (opts->nodefaultlibs) strarray_add(link_args, "-nodefaultlibs"); } @@ -777,6 +776,7 @@ static void build(struct options* opts) break; } } + if (!opts->shared && (opts->use_msvcrt || opts->unicode_app)) strarray_add(link_args, "-lmsvcrt"); if (res_o_name) compile_resources_to_object( opts, resources, res_o_name );

1 0

Detlef Riekenberg : msvcr80: Forward _initterm_e to msvcr90.dll.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: c9abeb3704e3a13a7cca2e424a557ed613c5d2a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9abeb3704e3a13a7cca2e424… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 19 10:00:11 2010 +0100 msvcr80: Forward _initterm_e to msvcr90.dll. --- dlls/msvcr80/Makefile.in | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index cf78bad..31dae6a 100644 --- a/dlls/msvcr80/Makefile.in +++ b/dlls/msvcr80/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = msvcr80.dll IMPORTLIB = msvcr80 -IMPORTS = msvcrt kernel32 +IMPORTS = msvcrt msvcr90 kernel32 C_SRCS = \ msvcr80.c diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d2ee0fc..1a108d0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -529,7 +529,7 @@ @ stub _i64tow_s @ stub _initptd @ cdecl _initterm(ptr ptr) msvcrt._initterm -@ stub _initterm_e +@ cdecl _initterm_e(ptr ptr) msvcr90._initterm_e @ stub _inp @ stub _inpd @ stub _inpw

1 0

Detlef Riekenberg : msvcr90: Implement _initterm_e.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 40509127a44ff6ee052afa17f44337cfa5515641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40509127a44ff6ee052afa17f… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 19 12:28:53 2010 +0100 msvcr90: Implement _initterm_e. --- dlls/msvcr90/msvcr90.c | 32 ++++++++++++++++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 2 +- 2 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 4bef02c..e7baa6f 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -22,7 +22,15 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(msvcr90); + +typedef int (CDECL *_INITTERM_E_FN)(void); + +/********************************************************************* + * DllMain (MSVCR90.@) + */ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { switch (reason) @@ -35,3 +43,27 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) } return TRUE; } + + +/********************************************************************* + * _initterm_e (MSVCR90.@) + * + * call an array of application initialization functions and report the return value + */ +int CDECL _initterm_e(_INITTERM_E_FN *table, _INITTERM_E_FN *end) +{ + int res = 0; + + TRACE("(%p, %p)\n", table, end); + + while (!res && table < end) { + if (*table) { + res = (**table)(); + if (res) + TRACE("function %p failed: 0x%x\n", *table, res); + + } + table++; + } + return res; +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 27ad21d..32c4688 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -517,7 +517,7 @@ @ stub _i64tow_s @ stub _initptd @ cdecl _initterm(ptr ptr) msvcrt._initterm -@ stub _initterm_e +@ cdecl _initterm_e(ptr ptr) @ stub _inp @ stub _inpd @ stub _inpw

1 0

Christian Costa : d3dx9_36: Use %u to print unsigned integer.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 8da1d69c2278a61805c568fd50fe5a65a2c238e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da1d69c2278a61805c568fd5… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Mar 19 11:55:54 2010 +0100 d3dx9_36: Use %u to print unsigned integer. --- dlls/d3dx9_36/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index f0773b9..3ab4541 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -30,7 +30,7 @@ HRESULT WINAPI D3DXCreateTexture(LPDIRECT3DDEVICE9 pDevice, D3DPOOL pool, LPDIRECT3DTEXTURE9 *ppTexture) { - FIXME("(%p, %d, %d, %d, %x, %x, %x, %p): semi-stub\n", pDevice, width, height, miplevels, usage, format, + FIXME("(%p, %u, %u, %u, %x, %x, %x, %p): semi-stub\n", pDevice, width, height, miplevels, usage, format, pool, ppTexture); return IDirect3DDevice9_CreateTexture(pDevice, width, height, miplevels, usage, format, pool, ppTexture, NULL); @@ -52,7 +52,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, PALETTEENTRY* palette, LPDIRECT3DTEXTURE9* texture) { - FIXME("(%p, %p, %d, %d, %d, %d, %x, %x, %x, %d, %d, %x, %p, %p, %p): stub\n", device, srcdata, srcdatasize, width, + FIXME("(%p, %p, %u, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p): stub\n", device, srcdata, srcdatasize, width, height, miplevels, usage, format, pool, filter, mipfilter, colorkey, srcinfo, palette, texture); return E_NOTIMPL;

1 0

Christian Costa : d3dx9_36: Fix method name.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 312aa4996ec87ddc44a163944c8c07a37257679e URL: http://source.winehq.org/git/wine.git/?a=commit;h=312aa4996ec87ddc44a163944… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Mar 19 11:54:17 2010 +0100 d3dx9_36: Fix method name. --- dlls/d3dx9_36/shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index a87911e..23c3cdd 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -401,7 +401,7 @@ static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByName(ID3DXConstantT return NULL; } -static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantByElement(ID3DXConstantTable* iface, D3DXHANDLE constant, UINT index) +static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstantElement(ID3DXConstantTable* iface, D3DXHANDLE constant, UINT index) { ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface; @@ -583,7 +583,7 @@ static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl = ID3DXConstantTableImpl_GetSamplerIndex, ID3DXConstantTableImpl_GetConstant, ID3DXConstantTableImpl_GetConstantByName, - ID3DXConstantTableImpl_GetConstantByElement, + ID3DXConstantTableImpl_GetConstantElement, ID3DXConstantTableImpl_SetDefaults, ID3DXConstantTableImpl_SetValue, ID3DXConstantTableImpl_SetBool,

1 0

Christian Costa : d3dx9_36: Add missing GetSamplerIndex method to ID3DXConstantTable.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 441ee394958d6560292bc2ec84445c2ed5dd0308 URL: http://source.winehq.org/git/wine.git/?a=commit;h=441ee394958d6560292bc2ec8… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Mar 19 11:54:11 2010 +0100 d3dx9_36: Add missing GetSamplerIndex method to ID3DXConstantTable. --- dlls/d3dx9_36/shader.c | 10 ++++++++++ include/d3dx9shader.h | 3 +++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 10dc631..a87911e 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -374,6 +374,15 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable* return E_NOTIMPL; } +static UINT WINAPI ID3DXConstantTableImpl_GetSamplerIndex(LPD3DXCONSTANTTABLE iface, D3DXHANDLE constant) +{ + ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface; + + FIXME("(%p)->(%p): stub\n", This, constant); + + return (UINT)-1; +} + static D3DXHANDLE WINAPI ID3DXConstantTableImpl_GetConstant(ID3DXConstantTable* iface, D3DXHANDLE constant, UINT index) { ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface; @@ -571,6 +580,7 @@ static const struct ID3DXConstantTableVtbl ID3DXConstantTable_Vtbl = /*** ID3DXConstantTable methods ***/ ID3DXConstantTableImpl_GetDesc, ID3DXConstantTableImpl_GetConstantDesc, + ID3DXConstantTableImpl_GetSamplerIndex, ID3DXConstantTableImpl_GetConstant, ID3DXConstantTableImpl_GetConstantByName, ID3DXConstantTableImpl_GetConstantByElement, diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index 2fee386..30a57b0 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -129,6 +129,7 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer) /*** ID3DXConstantTable methods ***/ STDMETHOD(GetDesc)(THIS_ D3DXCONSTANTTABLE_DESC *pDesc) PURE; STDMETHOD(GetConstantDesc)(THIS_ D3DXHANDLE hConstant, D3DXCONSTANT_DESC *pConstantDesc, UINT *pCount) PURE; + STDMETHOD_(UINT, GetSamplerIndex)(THIS_ D3DXHANDLE hConstant) PURE; STDMETHOD_(D3DXHANDLE, GetConstant)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE; STDMETHOD_(D3DXHANDLE, GetConstantByName)(THIS_ D3DXHANDLE hConstant, LPCSTR pName) PURE; STDMETHOD_(D3DXHANDLE, GetConstantElement)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE; @@ -161,6 +162,7 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer) /*** ID3DXConstantTable methods ***/ #define ID3DXConstantTable_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a) #define ID3DXConstantTable_GetConstantDesc(p,a,b,c) (p)->lpVtbl->GetConstantDesc(p,a,b,c) +#define ID3DXConstantTable_GetSamplerIndex(p,a) (p)->lpVtbl->GetSamplerIndex(p,a) #define ID3DXConstantTable_GetConstant(p,a,b) (p)->lpVtbl->GetConstant(p,a,b) #define ID3DXConstantTable_GetConstantByName(p,a,b) (p)->lpVtbl->GetConstantByName(p,a,b) #define ID3DXConstantTable_GetConstantElement(p,a,b) (p)->lpVtbl->GetConstantElement(p,a,b) @@ -191,6 +193,7 @@ DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer) /*** ID3DXConstantTable methods ***/ #define ID3DXConstantTable_GetDesc(p,a) (p)->GetDesc(a) #define ID3DXConstantTable_GetConstantDesc(p,a,b,c) (p)->GetConstantDesc(a,b,c) +#define ID3DXConstantTable_GetSamplerIndex(p,a) (p)->GetConstantDesc(a) #define ID3DXConstantTable_GetConstant(p,a,b) (p)->GetConstant(a,b) #define ID3DXConstantTable_GetConstantByName(p,a,b) (p)->GetConstantByName(a,b) #define ID3DXConstantTable_GetConstantElement(p,a,b) (p)->GetConstantElement(a,b)

1 0

Christian Costa : d3dx9_36: Implement ID3DXConstantTableImpl_GetDesc + tests.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 70b79445f6f50202528c110a1465a55450871602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70b79445f6f50202528c110a1… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Mar 19 11:54:05 2010 +0100 d3dx9_36: Implement ID3DXConstantTableImpl_GetDesc + tests. --- dlls/d3dx9_36/shader.c | 30 +++++++++++++++++++++++++++--- dlls/d3dx9_36/tests/shader.c | 14 ++++++++++++-- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index b9deec1..10dc631 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -281,6 +281,7 @@ typedef struct ID3DXConstantTableImpl { LONG ref; LPVOID ctab; DWORD size; + D3DXCONSTANTTABLE_DESC desc; } ID3DXConstantTableImpl; /*** IUnknown methods ***/ @@ -353,9 +354,14 @@ static HRESULT WINAPI ID3DXConstantTableImpl_GetDesc(ID3DXConstantTable* iface, { ID3DXConstantTableImpl *This = (ID3DXConstantTableImpl *)iface; - FIXME("(%p)->(%p): stub\n", This, desc); + TRACE("(%p)->(%p)\n", This, desc); - return E_NOTIMPL; + if (!desc) + return D3DERR_INVALIDCALL; + + memcpy(desc, &This->desc, sizeof(This->desc)); + + return D3D_OK; } static HRESULT WINAPI ID3DXConstantTableImpl_GetConstantDesc(ID3DXConstantTable* iface, D3DXHANDLE constant, @@ -590,10 +596,11 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, DWORD flags, LPD3DXCONSTANTTABLE* constant_table) { - ID3DXConstantTableImpl* object; + ID3DXConstantTableImpl* object = NULL; HRESULT hr; LPCVOID data; UINT size; + D3DXSHADER_CONSTANTTABLE* ctab_header; FIXME("(%p, %x, %p): semi-stub\n", byte_code, flags, constant_table); @@ -614,6 +621,9 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, object->lpVtbl = &ID3DXConstantTable_Vtbl; object->ref = 1; + if (size < sizeof(D3DXSHADER_CONSTANTTABLE)) + goto error; + object->ctab = HeapAlloc(GetProcessHeap(), 0, size); if (!object->ctab) { @@ -624,9 +634,23 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, object->size = size; memcpy(object->ctab, data, object->size); + ctab_header = (D3DXSHADER_CONSTANTTABLE*)data; + if (ctab_header->Size != sizeof(D3DXSHADER_CONSTANTTABLE)) + goto error; + object->desc.Creator = ctab_header->Creator ? (LPCSTR)object->ctab + ctab_header->Creator : NULL; + object->desc.Version = ctab_header->Version; + object->desc.Constants = ctab_header->Constants; + *constant_table = (LPD3DXCONSTANTTABLE)object; return D3D_OK; + +error: + + HeapFree(GetProcessHeap(), 0, object->ctab); + HeapFree(GetProcessHeap(), 0, object); + + return D3DXERR_INVALIDDATA; } HRESULT WINAPI D3DXGetShaderConstantTable(CONST DWORD* byte_code, diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c index c49d089..255e84a 100644 --- a/dlls/d3dx9_36/tests/shader.c +++ b/dlls/d3dx9_36/tests/shader.c @@ -43,7 +43,7 @@ static const DWORD simple_ps[] = { static const DWORD shader_with_ctab[] = { 0xfffe0300, /* vs_3_0 */ 0x0002fffe, FCC_TEXT, 0x00000000, /* TEXT comment */ - 0x0008fffe, FCC_CTAB, 0x0000001c, 0x00000000, 0xfffe0300, 0x00000000, /* CTAB comment */ + 0x0008fffe, FCC_CTAB, 0x0000001c, 0x00000010, 0xfffe0300, 0x00000000, /* CTAB comment */ 0x00000000, 0x00000000, 0x00000000, 0x0004fffe, FCC_TEXT, 0x00000000, 0x00000000, 0x00000000, /* TEXT comment */ 0x0000ffff}; /* END */ @@ -120,6 +120,7 @@ static void test_get_shader_constant_table_ex(void) HRESULT hr; LPVOID data; DWORD size; + D3DXCONSTANTTABLE_DESC desc; hr = D3DXGetShaderConstantTableEx(NULL, 0, &constant_table); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); @@ -130,7 +131,7 @@ static void test_get_shader_constant_table_ex(void) /* With invalid CTAB data */ hr = D3DXGetShaderConstantTableEx(shader_with_invalid_ctab, 0, &constant_table); - todo_wine ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); + ok(hr == D3DXERR_INVALIDDATA, "Got result %x, expected %x (D3DXERR_INVALIDDATA)\n", hr, D3DXERR_INVALIDDATA); if (constant_table) ID3DXConstantTable_Release(constant_table); hr = D3DXGetShaderConstantTableEx(shader_with_ctab, 0, &constant_table); @@ -144,6 +145,15 @@ static void test_get_shader_constant_table_ex(void) data = ID3DXConstantTable_GetBufferPointer(constant_table); ok(!memcmp(data, shader_with_ctab + 6, size), "Retreived wrong CTAB data\n"); + hr = ID3DXConstantTable_GetDesc(constant_table, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = ID3DXConstantTable_GetDesc(constant_table, &desc); + ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK)\n", hr); + ok(desc.Creator == (LPCSTR)data + 0x10, "Got result %p, expected %p\n", desc.Creator, (LPCSTR)data + 0x10); + ok(desc.Version == D3DVS_VERSION(3, 0), "Got result %x, expected %x\n", desc.Version, D3DVS_VERSION(3, 0)); + ok(desc.Constants == 0, "Got result %x, expected 0\n", desc.Constants); + ID3DXConstantTable_Release(constant_table); } }

1 0

Jörg Höhle : midimap: Allow GetVolume by device identifier.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 104cc7c28e8cf7d75596f0c55ef056b6278fa6e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=104cc7c28e8cf7d75596f0c55… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Feb 20 12:54:48 2010 +0100 midimap: Allow GetVolume by device identifier. --- dlls/midimap/midimap.c | 1 - dlls/winmm/tests/midi.c | 5 +++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 833c2f7..0c54d45 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -446,7 +446,6 @@ static DWORD modUnprepare(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwPar static DWORD modGetVolume(MIDIMAPDATA* mom, DWORD* lpdwVolume) { - if (MIDIMAP_IsBadData(mom)) return MMSYSERR_ERROR; if (!lpdwVolume) return MMSYSERR_INVALPARAM; *lpdwVolume = 0xFFFFFFFF; /* tests show this initial value */ return MMSYSERR_NOERROR; diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 7ce402d..e531d04 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -230,6 +230,11 @@ static void test_midiOut_device(UINT udev, HWND hwnd) * real devices with the volume GUI SW-synth settings. */ if (!rc) trace("Current volume %x on device %d\n", ovolume, udev); + /* The W95 ESFM Synthesis device reports NOTENABLED although + * GetVolume by handle works and music plays. */ + rc = midiOutGetVolume((HMIDIOUT)udev, &ovolume); + ok((capsA.dwSupport & MIDICAPS_VOLUME) ? rc==MMSYSERR_NOERROR || broken(rc==MMSYSERR_NOTENABLED) : rc==MMSYSERR_NOTSUPPORTED, "midiOutGetVolume(dev=%d) rc=%s\n", udev, mmsys_error(rc)); + /* Tests with midiOutSetvolume show that the midi mapper forwards * the value to the real device, but Get initially always reports * FFFFFFFF. Therefore, a Get+SetVolume pair with the mapper is

1 0

Roderick Colenbrander : wined3d: Get rid of d3dfmt_get_conv in RealizePalette.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: fb8812db8945c23eeb6655cc94f6c36d7d15d05f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb8812db8945c23eeb6655cc9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Mar 18 23:59:02 2010 +0100 wined3d: Get rid of d3dfmt_get_conv in RealizePalette. --- dlls/wined3d/surface.c | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index de19c48..bdc7b1f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4355,19 +4355,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) if (This->resource.format_desc->format == WINED3DFMT_P8_UINT || This->resource.format_desc->format == WINED3DFMT_P8_UINT_A8_UNORM) { - int bpp; - GLenum format, internal, type; - CONVERT_TYPES convert; - - /* Check if we are using a RTL mode which uses texturing for uploads */ - BOOL use_texture = (wined3d_settings.rendertargetlock_mode == RTL_READTEX); - - /* Check if we have hardware palette conversion if we have convert is set to NO_CONVERSION */ - d3dfmt_get_conv(This, TRUE, use_texture, &format, &internal, &type, &convert, &bpp, FALSE); - - if((This->resource.usage & WINED3DUSAGE_RENDERTARGET) && (convert == NO_CONVERSION)) + IWineD3DDeviceImpl *device = This->resource.device; + if((This->resource.usage & WINED3DUSAGE_RENDERTARGET) && + device->blitter->color_fixup_supported(&device->adapter->gl_info, This->resource.format_desc->color_fixup)) { - IWineD3DDeviceImpl *device = This->resource.device; struct wined3d_context *context; /* Make sure the texture is up to date. This call doesn't do anything if the texture is already up to date. */ @@ -4378,7 +4369,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) /* Re-upload the palette */ context = context_acquire(device, NULL, CTXUSAGE_RESOURCELOAD); - d3dfmt_p8_upload_palette(iface, context->gl_info, convert); + d3dfmt_p8_upload_palette(iface, context->gl_info, NO_CONVERSION); context_release(context); } else { if(!(This->Flags & SFLAG_INSYSMEM)) {

1 0

Roderick Colenbrander : wined3d: Start moving paletted texture support to the blit_shader.
by Alexandre Julliard 19 Mar '10

19 Mar '10

Module: wine Branch: master Commit: 27a96e477aa8dfa84c33e8e7988f3f8e822ed10b URL: http://source.winehq.org/git/wine.git/?a=commit;h=27a96e477aa8dfa84c33e8e79… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Mar 18 23:11:55 2010 +0100 wined3d: Start moving paletted texture support to the blit_shader. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/surface.c | 25 +++++++++++++++++-------- dlls/wined3d/utils.c | 7 +++++-- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 28be889..b3d63b1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6808,7 +6808,7 @@ static void arbfp_blit_unset(IWineD3DDevice *iface) { LEAVE_GL(); } -static BOOL arbfp_blit_color_fixup_supported(struct color_fixup_desc fixup) +static BOOL arbfp_blit_color_fixup_supported(const struct wined3d_gl_info *gl_info, struct color_fixup_desc fixup) { enum complex_fixup complex_fixup; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f2de807..9b70eb3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3619,7 +3619,7 @@ static BOOL CheckSurfaceCapability(struct wined3d_adapter *adapter, const struct if (CheckDepthStencilCapability(adapter, adapter_format_desc, check_format_desc)) return TRUE; /* If opengl can't process the format natively, the blitter may be able to convert it */ - if (adapter->blitter->color_fixup_supported(check_format_desc->color_fixup)) + if (adapter->blitter->color_fixup_supported(&adapter->gl_info, check_format_desc->color_fixup)) { TRACE_(d3d_caps)("[OK]\n"); return TRUE; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index acc24e5..de19c48 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2078,14 +2078,13 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ Paletted Texture **************** */ - /* Use conversion when the paletted texture extension OR fragment shaders are available. When either - * of the two is available make sure texturing is requested as neither of the two works in - * conjunction with calls like glDraw-/glReadPixels. Further also use conversion in case of color keying. + /* Use conversion when the blit_shader backend supports it. It only supports this in case of + * texturing. Further also use conversion in case of color keying. * Paletted textures can be emulated using shaders but only do that for 2D purposes e.g. situations * in which the main render target uses p8. Some games like GTA Vice City use P8 for texturing which * conflicts with this. */ - if (!(gl_info->supported[EXT_PALETTED_TEXTURE] || (device->blitter->color_fixup_supported(This->resource.format_desc->color_fixup) + if (!((device->blitter->color_fixup_supported(gl_info, This->resource.format_desc->color_fixup) && device->render_targets && This == (IWineD3DSurfaceImpl*)device->render_targets[0])) || colorkey_active || !use_texturing) { @@ -2099,7 +2098,8 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *convert = CONVERT_PALETTED; } } - else if (!gl_info->supported[EXT_PALETTED_TEXTURE] && device->blitter->color_fixup_supported(This->resource.format_desc->color_fixup)) + /* TODO: this check is evil and should die (it basically checks which blitter backend is used) */ + else if (!gl_info->supported[EXT_PALETTED_TEXTURE] && device->blitter->color_fixup_supported(gl_info, This->resource.format_desc->color_fixup)) { *format = GL_ALPHA; *type = GL_UNSIGNED_BYTE; @@ -4062,7 +4062,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const dump_color_fixup_desc(This->resource.format_desc->color_fixup); } - if (!myDevice->blitter->color_fixup_supported(Src->resource.format_desc->color_fixup)) + if (!myDevice->blitter->color_fixup_supported(&myDevice->adapter->gl_info, Src->resource.format_desc->color_fixup)) { FIXME("Source format %s has an unsupported fixup:\n", debug_d3dformat(Src->resource.format_desc->format)); @@ -4993,7 +4993,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D d3dfmt_convert_surface(This->resource.allocatedMemory, mem, pitch, width, height, outpitch, convert, This); } else if (This->resource.format_desc->format == WINED3DFMT_P8_UINT - && (gl_info->supported[EXT_PALETTED_TEXTURE] || device->blitter->color_fixup_supported(This->resource.format_desc->color_fixup))) + && (device->blitter->color_fixup_supported(gl_info, This->resource.format_desc->color_fixup))) { d3dfmt_p8_upload_palette(iface, gl_info, convert); mem = This->resource.allocatedMemory; @@ -5206,8 +5206,10 @@ static void ffp_blit_unset(IWineD3DDevice *iface) LEAVE_GL(); } -static BOOL ffp_blit_color_fixup_supported(struct color_fixup_desc fixup) +static BOOL ffp_blit_color_fixup_supported(const struct wined3d_gl_info *gl_info, struct color_fixup_desc fixup) { + enum complex_fixup complex_fixup; + if (TRACE_ON(d3d_surface) && TRACE_ON(d3d)) { TRACE("Checking support for fixup:\n"); @@ -5221,6 +5223,13 @@ static BOOL ffp_blit_color_fixup_supported(struct color_fixup_desc fixup) return TRUE; } + complex_fixup = get_complex_fixup(fixup); + if(complex_fixup == COMPLEX_FIXUP_P8 && gl_info->supported[EXT_PALETTED_TEXTURE]) + { + TRACE("P8 fixup supported\n"); + return TRUE; + } + TRACE("[FAILED]\n"); return FALSE; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 19d5949..83585d3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1098,8 +1098,11 @@ static void apply_format_fixups(struct wined3d_gl_info *gl_info) gl_info->gl_formats[idx].heightscale = 1.5f; gl_info->gl_formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YV12); - idx = getFmtIdx(WINED3DFMT_P8_UINT); - gl_info->gl_formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); + if (gl_info->supported[EXT_PALETTED_TEXTURE] || gl_info->supported[ARB_FRAGMENT_PROGRAM]) + { + idx = getFmtIdx(WINED3DFMT_P8_UINT); + gl_info->gl_formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); + } if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 091e85d..cc0aca0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1169,7 +1169,7 @@ struct blit_shader HRESULT (*set_shader)(IWineD3DDevice *iface, const struct GlPixelFormatDesc *format_desc, GLenum textype, UINT width, UINT height); void (*unset_shader)(IWineD3DDevice *iface); - BOOL (*color_fixup_supported)(struct color_fixup_desc fixup); + BOOL (*color_fixup_supported)(const struct wined3d_gl_info *gl_info, struct color_fixup_desc fixup); }; extern const struct blit_shader ffp_blit DECLSPEC_HIDDEN;

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
92
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 March 2010