February 2009 - Wine-Commits

Michael Stefaniuc : winemp3.acm: Remove superfluous pointer casts.
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: 8dfbaf67035449a51d58c49d884f695b0ec59d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dfbaf67035449a51d58c49d8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Feb 27 10:52:30 2009 +0100 winemp3.acm: Remove superfluous pointer casts. --- dlls/winemp3.acm/layer1.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winemp3.acm/layer1.c b/dlls/winemp3.acm/layer1.c index 16bc55c..392176a 100644 --- a/dlls/winemp3.acm/layer1.c +++ b/dlls/winemp3.acm/layer1.c @@ -146,12 +146,12 @@ int do_layer1(struct frame *fr,unsigned char *pcm_sample,int *pcm_point) I_step_two(fraction,balloc,scale_index,fr); if(single >= 0) { - clip += synth_1to1_mono(fr->mp,(real*)fraction[single],pcm_sample,pcm_point); + clip += synth_1to1_mono(fr->mp,fraction[single],pcm_sample,pcm_point); } else { int p1 = *pcm_point; - clip += synth_1to1(fr->mp,(real*)fraction[0],0,pcm_sample,&p1); - clip += synth_1to1(fr->mp,(real*)fraction[1],1,pcm_sample,pcm_point); + clip += synth_1to1(fr->mp,fraction[0],0,pcm_sample,&p1); + clip += synth_1to1(fr->mp,fraction[1],1,pcm_sample,pcm_point); } }

1 0

Paul Vriens : fusion/tests: Fix some test failures on .NET 1.x.
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: bc48bd95775b261f150314329f8a699c82f6c065 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc48bd95775b261f150314329… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Feb 27 10:04:26 2009 +0100 fusion/tests: Fix some test failures on .NET 1.x. --- dlls/fusion/tests/asmname.c | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 4592850..98004ea 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -417,7 +417,8 @@ static void test_CreateAssemblyNameObject(void) size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); - ok(hr == FUSION_E_INVALID_NAME, + ok(hr == FUSION_E_INVALID_NAME || + broken(hr == E_INVALIDARG), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); size = MAX_PATH; @@ -430,7 +431,8 @@ static void test_CreateAssemblyNameObject(void) hi = 0xbeefcace; lo = 0xcafebabe; hr = IAssemblyName_GetVersion(name, &hi, &lo); - ok(hr == FUSION_E_INVALID_NAME, + ok(hr == FUSION_E_INVALID_NAME || + broken(hr == S_OK), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); @@ -447,7 +449,8 @@ static void test_CreateAssemblyNameObject(void) size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); - ok(hr == FUSION_E_INVALID_NAME, + ok(hr == FUSION_E_INVALID_NAME || + broken(hr == S_OK), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); size = MAX_PATH; @@ -460,7 +463,8 @@ static void test_CreateAssemblyNameObject(void) hi = 0xbeefcace; lo = 0xcafebabe; hr = IAssemblyName_GetVersion(name, &hi, &lo); - ok(hr == FUSION_E_INVALID_NAME, + ok(hr == FUSION_E_INVALID_NAME || + broken(hr == S_OK), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); @@ -492,7 +496,8 @@ static void test_CreateAssemblyNameObject(void) hi = 0xbeefcace; lo = 0xcafebabe; hr = IAssemblyName_GetVersion(name, &hi, &lo); - ok(hr == FUSION_E_INVALID_NAME, + ok(hr == FUSION_E_INVALID_NAME || + broken(hr == S_OK), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); @@ -526,7 +531,8 @@ static void test_CreateAssemblyNameObject(void) hi = 0xbeefcace; lo = 0xcafebabe; hr = IAssemblyName_GetVersion(name, &hi, &lo); - ok(hr == FUSION_E_INVALID_NAME, + ok(hr == FUSION_E_INVALID_NAME || + broken(hr == S_OK), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); @@ -589,7 +595,8 @@ static void test_CreateAssemblyNameObject(void) hi = 0xbeefcace; lo = 0xcafebabe; hr = IAssemblyName_GetVersion(name, &hi, &lo); - ok(hr == FUSION_E_INVALID_NAME, + ok(hr == FUSION_E_INVALID_NAME || + broken(hr == S_OK), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); @@ -621,7 +628,8 @@ static void test_CreateAssemblyNameObject(void) hi = 0xbeefcace; lo = 0xcafebabe; hr = IAssemblyName_GetVersion(name, &hi, &lo); - ok(hr == FUSION_E_INVALID_NAME, + ok(hr == FUSION_E_INVALID_NAME || + broken(hr == S_OK), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); @@ -653,7 +661,8 @@ static void test_CreateAssemblyNameObject(void) hi = 0xbeefcace; lo = 0xcafebabe; hr = IAssemblyName_GetVersion(name, &hi, &lo); - ok(hr == FUSION_E_INVALID_NAME, + ok(hr == FUSION_E_INVALID_NAME || + broken(hr == S_OK), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); @@ -685,7 +694,8 @@ static void test_CreateAssemblyNameObject(void) hi = 0xbeefcace; lo = 0xcafebabe; hr = IAssemblyName_GetVersion(name, &hi, &lo); - ok(hr == FUSION_E_INVALID_NAME, + ok(hr == FUSION_E_INVALID_NAME || + broken(hr == S_OK), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo); @@ -720,7 +730,8 @@ static void test_CreateAssemblyNameObject(void) hi = 0xbeefcace; lo = 0xcafebabe; hr = IAssemblyName_GetVersion(name, &hi, &lo); - ok(hr == FUSION_E_INVALID_NAME, + ok(hr == FUSION_E_INVALID_NAME || + broken(hr == S_OK), /* .NET 1.x */ "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); ok(hi == 0, "Expected 0, got %08x\n", hi); ok(lo == 0, "Expected 0, got %08x\n", lo);

1 0

Paul Vriens : fusion/tests: Fix a few test failures on .NET 1.x.
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: c71348ff58e8e0a50ae0429b5376af97a43de1fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c71348ff58e8e0a50ae0429b5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Feb 27 09:51:15 2009 +0100 fusion/tests: Fix a few test failures on .NET 1.x. --- dlls/fusion/tests/asmname.c | 76 +++++++++++++++++++++++-------------------- 1 files changed, 41 insertions(+), 35 deletions(-) diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index a926b87..4592850 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -694,10 +694,51 @@ static void test_CreateAssemblyNameObject(void) IAssemblyName_Release(name); + /* invalid property */ + to_widechar(namestr, "wine, BadProp=42"); + name = NULL; + hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(name != NULL, "Expected non-NULL name\n"); + + size = MAX_PATH; + hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + todo_wine + { + ok_aw("wine", str); + ok(size == 5, "Expected 5, got %d\n", size); + } + + size = MAX_PATH; + str[0] = '\0'; + hr = IAssemblyName_GetName(name, &size, str); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok_aw("wine", str); + ok(size == 5, "Expected 5, got %d\n", size); + + hi = 0xbeefcace; + lo = 0xcafebabe; + hr = IAssemblyName_GetVersion(name, &hi, &lo); + ok(hr == FUSION_E_INVALID_NAME, + "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); + ok(hi == 0, "Expected 0, got %08x\n", hi); + ok(lo == 0, "Expected 0, got %08x\n", lo); + + test_assembly_name_props(name, winename); + + IAssemblyName_Release(name); + /* PublicKeyToken is not 16 chars long */ to_widechar(namestr, "wine, PublicKeyToken=567890abcdef"); name = (IAssemblyName *)0xdeadbeef; hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); + if (hr == S_OK && name != (IAssemblyName *)0xdeadbeef) + { + win_skip(".NET 1.x doesn't check PublicKeyToken correctly\n"); + IAssemblyName_Release(name); + return; + } ok(hr == FUSION_E_INVALID_NAME, "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); ok(name == (IAssemblyName *)0xdeadbeef, "Expected 0xdeadbeef, got %p\n", name); @@ -736,41 +777,6 @@ static void test_CreateAssemblyNameObject(void) ok(hr == FUSION_E_INVALID_NAME, "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); ok(name == (IAssemblyName *)0xdeadbeef, "Expected 0xdeadbeef, got %p\n", name); - - /* invalid property */ - to_widechar(namestr, "wine, BadProp=42"); - name = NULL; - hr = pCreateAssemblyNameObject(&name, namestr, CANOF_PARSE_DISPLAY_NAME, NULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(name != NULL, "Expected non-NULL name\n"); - - size = MAX_PATH; - hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - todo_wine - { - ok_aw("wine", str); - ok(size == 5, "Expected 5, got %d\n", size); - } - - size = MAX_PATH; - str[0] = '\0'; - hr = IAssemblyName_GetName(name, &size, str); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok_aw("wine", str); - ok(size == 5, "Expected 5, got %d\n", size); - - hi = 0xbeefcace; - lo = 0xcafebabe; - hr = IAssemblyName_GetVersion(name, &hi, &lo); - ok(hr == FUSION_E_INVALID_NAME, - "Expected FUSION_E_INVALID_NAME, got %08x\n", hr); - ok(hi == 0, "Expected 0, got %08x\n", hi); - ok(lo == 0, "Expected 0, got %08x\n", lo); - - test_assembly_name_props(name, winename); - - IAssemblyName_Release(name); } START_TEST(asmname)

1 0

Henri Verbeet : d3d10: Add the _D3D10_SHADER_MACRO struct.
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: 91f5b9a894ff3006b537e378fe84dfa56f2a87d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91f5b9a894ff3006b537e378f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 27 09:29:48 2009 +0100 d3d10: Add the _D3D10_SHADER_MACRO struct. --- include/d3d10shader.h | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 8c3e46e..9e625d9 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -82,4 +82,10 @@ typedef enum _D3D10_SHADER_VARIABLE_TYPE D3D10_SVT_FORCE_DWORD = 0x7fffffff } D3D10_SHADER_VARIABLE_TYPE, *LPD3D10_SHADER_VARIABLE_TYPE; +typedef struct _D3D10_SHADER_MACRO +{ + LPCSTR Name; + LPCSTR Definition; +} D3D10_SHADER_MACRO, *LPD3D10_SHADER_MACRO; + #endif /* __WINE_D3D10SHADER_H */

1 0

Henri Verbeet : d3d10: Add some code for parsing DXBC data.
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: 46f3102b936d1b3df90e093c63c0f8f3636e5958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46f3102b936d1b3df90e093c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 27 09:29:48 2009 +0100 d3d10: Add some code for parsing DXBC data. --- dlls/d3d10/d3d10_main.c | 10 ++++ dlls/d3d10/d3d10_private.h | 2 + dlls/d3d10/effect.c | 104 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index b13bb9f..88fd12b 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -2,6 +2,7 @@ * Direct3D 10 * * Copyright 2007 Andras Kovacs + * Copyright 2009 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -209,6 +210,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect) { struct d3d10_effect *object; + HRESULT hr; FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n", data, data_size, flags, device, effect_pool, effect); @@ -223,6 +225,14 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl object->vtbl = &d3d10_effect_vtbl; object->refcount = 1; + hr = d3d10_effect_parse(object, data, data_size); + if (FAILED(hr)) + { + ERR("Failed to parse effect\n"); + IUnknown_Release((IUnknown *)object); + return hr; + } + *effect = (ID3D10Effect *)object; TRACE("Created ID3D10Effect %p\n", object); diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index c73c840..05003cc 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -39,6 +39,8 @@ struct d3d10_effect LONG refcount; }; +HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T data_size); + /* D3D10Core */ HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, UINT flags, DWORD unknown0, ID3D10Device **device); diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 54ae6ea..b04fae4 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -24,6 +24,110 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); +#define MAKE_TAG(ch0, ch1, ch2, ch3) \ + ((DWORD)(ch0) | ((DWORD)(ch1) << 8) | \ + ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) +#define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') + +static inline void read_dword(const char **ptr, DWORD *d) +{ + memcpy(d, *ptr, sizeof(d)); + *ptr += sizeof(d); +} + +static inline void skip_dword_unknown(const char **ptr, unsigned int count) +{ + unsigned int i; + DWORD d; + + FIXME("Skipping %u unknown DWORDs:\n", count); + for (i = 0; i < count; ++i) + { + read_dword(ptr, &d); + FIXME("\t0x%08x\n", d); + } +} + +static inline void read_tag(const char **ptr, DWORD *t, char t_str[5]) +{ + read_dword(ptr, t); + memcpy(t_str, t, 4); + t_str[4] = '\0'; +} + +static HRESULT parse_dxbc(const char *data, SIZE_T data_size, + HRESULT (*chunk_handler)(const char *data, void *ctx), void *ctx) +{ + const char *ptr = data; + HRESULT hr = S_OK; + DWORD chunk_count; + DWORD total_size; + char tag_str[5]; + unsigned int i; + DWORD tag; + + read_tag(&ptr, &tag, tag_str); + TRACE("tag: %s\n", tag_str); + + if (tag != TAG_DXBC) + { + WARN("Wrong tag.\n"); + return E_FAIL; + } + + /* checksum? */ + skip_dword_unknown(&ptr, 4); + + skip_dword_unknown(&ptr, 1); + + read_dword(&ptr, &total_size); + TRACE("total size: %#x\n", total_size); + + read_dword(&ptr, &chunk_count); + TRACE("chunk count: %#x\n", chunk_count); + + for (i = 0; i < chunk_count; ++i) + { + DWORD chunk_offset; + + read_dword(&ptr, &chunk_offset); + TRACE("chunk %u at offset %#x\n", i, chunk_offset); + + hr = chunk_handler(data + chunk_offset, ctx); + if (FAILED(hr)) break; + } + + return hr; +} + +static HRESULT fx10_chunk_handler(const char *data, void *ctx) +{ + const char *ptr = data; + DWORD chunk_size; + char tag_str[5]; + DWORD tag; + + read_tag(&ptr, &tag, tag_str); + TRACE("tag: %s\n", tag_str); + + read_dword(&ptr, &chunk_size); + TRACE("chunk size: %#x\n", chunk_size); + + switch(tag) + { + default: + FIXME("Unhandled chunk %s\n", tag_str); + break; + } + + return S_OK; +} + +HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T data_size) +{ + return parse_dxbc(data, data_size, fx10_chunk_handler, This); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_effect_QueryInterface(ID3D10Effect *iface, REFIID riid, void **object)

1 0

Henri Verbeet : d3d10: Add an initial effect parser.
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: 04ad995cf6f7e28093d6fdad1e51556ae9848aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ad995cf6f7e28093d6fdad1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 27 09:29:48 2009 +0100 d3d10: Add an initial effect parser. --- dlls/d3d10/d3d10_private.h | 36 +++++- dlls/d3d10/effect.c | 317 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 352 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04ad995cf6f7e28093d6f…

1 0

Henri Verbeet : d3d10: Add the D3D10_SHADER flags.
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: e8c308d450c32ba82863f0cb1a73f37eeba7a8b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c308d450c32ba82863f0cb1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 27 09:29:48 2009 +0100 d3d10: Add the D3D10_SHADER flags. --- include/d3d10shader.h | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 8564c03..8c3e46e 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -22,6 +22,21 @@ #include "d3d10.h" +#define D3D10_SHADER_DEBUG 0x0001 +#define D3D10_SHADER_SKIP_VALIDATION 0x0002 +#define D3D10_SHADER_SKIP_OPTIMIZATION 0x0004 +#define D3D10_SHADER_PACK_MATRIX_ROW_MAJOR 0x0008 +#define D3D10_SHADER_PACK_MATRIX_COLUMN_MAJOR 0x0010 +#define D3D10_SHADER_PARTIAL_PRECISION 0x0020 +#define D3D10_SHADER_FORCE_VS_SOFTWARE_NO_OPT 0x0040 +#define D3D10_SHADER_FORCE_PS_SOFTWARE_NO_OPT 0x0080 +#define D3D10_SHADER_NO_PRESHADER 0x0100 +#define D3D10_SHADER_AVOID_FLOW_CONTROL 0x0200 +#define D3D10_SHADER_PREFER_FLOW_CONTROL 0x0300 +#define D3D10_SHADER_ENABLE_STRICTNESS 0x0400 +#define D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY 0x0800 +#define D3D10_SHADER_IEEE_STRICTNESS 0x1000 + typedef enum _D3D10_SHADER_VARIABLE_CLASS { D3D10_SVC_SCALAR,

1 0

Henri Verbeet : d3d10: Add the ID3D10EffectPass interface.
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: 2d870d2ffd11138ba859c01b0fb7d9607ff2c834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d870d2ffd11138ba859c01b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 27 09:29:48 2009 +0100 d3d10: Add the ID3D10EffectPass interface. --- include/d3d10effect.h | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index ce409ea..37d4bd1 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -99,6 +99,23 @@ typedef struct _D3D10_EFFECT_DESC UINT Techniques; } D3D10_EFFECT_DESC; +typedef struct _D3D10_PASS_DESC +{ + LPCSTR Name; + UINT Annotations; + BYTE *pIAInputSignature; + SIZE_T IAInputSignatureSize; + UINT StencilRef; + UINT SampleMask; + FLOAT BlendFactor[4]; +} D3D10_PASS_DESC; + +typedef struct _D3D10_PASS_SHADER_DESC +{ + struct ID3D10EffectShaderVariable *pShaderVariable; + UINT ShaderIndex; +} D3D10_PASS_SHADER_DESC; + DEFINE_GUID(IID_ID3D10EffectType, 0x4e9e1ddc, 0xcd9d, 0x4772, 0xa8, 0x37, 0x00, 0x18, 0x0b, 0x9b, 0x88, 0xfd); #define INTERFACE ID3D10EffectType @@ -241,6 +258,23 @@ DECLARE_INTERFACE_(ID3D10EffectPool, IUnknown) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10EffectPass, 0x5cfbeb89, 0x1a06, 0x46e0, 0xb2, 0x82, 0xe3, 0xf9, 0xbf, 0xa3, 0x6a, 0x54); + +#define INTERFACE ID3D10EffectPass +DECLARE_INTERFACE(ID3D10EffectPass) +{ + STDMETHOD_(BOOL, IsValid)(THIS) PURE; + STDMETHOD(GetDesc)(THIS_ D3D10_PASS_DESC *desc) PURE; + STDMETHOD(GetVertexShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *desc) PURE; + STDMETHOD(GetGeometryShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *desc) PURE; + STDMETHOD(GetPixelShaderDesc)(THIS_ D3D10_PASS_SHADER_DESC *desc) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByIndex)(THIS_ UINT index) PURE; + STDMETHOD_(struct ID3D10EffectVariable *, GetAnnotationByName)(THIS_ LPCSTR name) PURE; + STDMETHOD(Apply)(THIS_ UINT flags) PURE; + STDMETHOD(ComputeStateBlockMask)(THIS_ D3D10_STATE_BLOCK_MASK *mask) PURE; +}; +#undef INTERFACE + #ifdef __cplusplus extern "C" { #endif

1 0

Stefan Dösinger : wined3d: Create a common sampling function in GLSL.
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: 8781174a98082962e604f5fa2b8e180e0e73fbc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8781174a98082962e604f5fa2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Feb 25 17:06:05 2009 +0100 wined3d: Create a common sampling function in GLSL. This way the individual instruction handlers don't have to bother about the color correction, and there's now a single place to implement fixup dependent sampling writemask selection. --- dlls/wined3d/glsl_shader.c | 197 ++++++++++++++++++++++++-------------------- 1 files changed, 108 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8781174a98082962e604f…

1 0

Detlef Riekenberg : spoolss: Implement GetPrinterDriverDirectoryW.
by Alexandre Julliard Feb. 27, 2009

Feb. 27, 2009

Module: wine Branch: master Commit: 8f8dbcd82f3e716338810b424a2ab7787da738d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f8dbcd82f3e716338810b424… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Feb 27 05:31:23 2009 +0100 spoolss: Implement GetPrinterDriverDirectoryW. --- dlls/spoolss/router.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ dlls/spoolss/spoolss.spec | 2 +- 2 files changed, 56 insertions(+), 1 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index f4e8e96..28871b1 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -399,3 +399,58 @@ BOOL WINAPI EnumPortsW(LPWSTR pName, DWORD Level, LPBYTE pPorts, DWORD cbBuf, return (res == ROUTER_SUCCESS); } + +/****************************************************************** + * GetPrinterDriverDirectoryW (spoolss.@) + * + * Return the PATH for the Printer-Drivers + * + * PARAMS + * pName [I] Servername or NULL (local Computer) + * pEnvironment [I] Printing-Environment or NULL (Default) + * Level [I] Structure-Level (must be 1) + * pDriverDirectory [O] PTR to Buffer that receives the Result + * cbBuf [I] Size of Buffer at pDriverDirectory + * pcbNeeded [O] PTR to DWORD that receives the size in Bytes used / + * required for pDriverDirectory + * + * RETURNS + * Success: TRUE and in pcbNeeded the Bytes used in pDriverDirectory + * Failure: FALSE and in pcbNeeded the Bytes required for pDriverDirectory, + * if cbBuf is too small + * + * Native Values returned in pDriverDirectory on Success: + *| NT(Windows NT x86): "%winsysdir%\\spool\\DRIVERS\\w32x86" + *| NT(Windows x64): "%winsysdir%\\spool\\DRIVERS\\x64" + *| NT(Windows 4.0): "%winsysdir%\\spool\\DRIVERS\\win40" + *| win9x(Windows 4.0): "%winsysdir%" + * + * "%winsysdir%" is the Value from GetSystemDirectoryW() + * + */ +BOOL WINAPI GetPrinterDriverDirectoryW(LPWSTR pName, LPWSTR pEnvironment, + DWORD Level, LPBYTE pDriverDirectory, DWORD cbBuf, LPDWORD pcbNeeded) +{ + backend_t * pb; + DWORD res = ROUTER_UNKNOWN; + + TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(pName), + debugstr_w(pEnvironment), Level, pDriverDirectory, cbBuf, pcbNeeded); + + if (pcbNeeded) *pcbNeeded = 0; + + pb = backend_first(pName); + if (pb && pb->fpGetPrinterDriverDirectory) + res = pb->fpGetPrinterDriverDirectory(pName, pEnvironment, Level, + pDriverDirectory, cbBuf, pcbNeeded); + else + { + SetLastError(ERROR_PROC_NOT_FOUND); + } + + TRACE("got %u with %u (%u byte)\n", + res, GetLastError(), pcbNeeded ? *pcbNeeded : 0); + + return (res == ROUTER_SUCCESS); + +} diff --git a/dlls/spoolss/spoolss.spec b/dlls/spoolss/spoolss.spec index 2b5fc19..010b490 100644 --- a/dlls/spoolss/spoolss.spec +++ b/dlls/spoolss/spoolss.spec @@ -68,7 +68,7 @@ @ stub GetPrintProcessorDirectoryW @ stub GetPrinterDataExW @ stub GetPrinterDataW -@ stub GetPrinterDriverDirectoryW +@ stdcall GetPrinterDriverDirectoryW(wstr wstr long ptr long ptr) @ stub GetPrinterDriverExW @ stub GetPrinterDriverW @ stub GetPrinterW

1 0