March 2010 - Wine-commits - list.winehq.org

Eric Pouech : dbghelp: Created a CPU method to map dwarf register number to codeview register number .
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: e2b62c91d5ca7217042595f2b044af715614e311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2b62c91d5ca7217042595f2b… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Mar 24 22:04:18 2010 +0100 dbghelp: Created a CPU method to map dwarf register number to codeview register number. --- dlls/dbghelp/cpu_i386.c | 47 +++++++++++++++++++++++++++++++++ dlls/dbghelp/cpu_ppc.c | 7 +++++ dlls/dbghelp/cpu_x86_64.c | 56 ++++++++++++++++++++++++++++++++++++++++ dlls/dbghelp/dbghelp_private.h | 3 ++ dlls/dbghelp/dwarf.c | 43 ++---------------------------- include/cvconst.h | 2 + 6 files changed, 118 insertions(+), 40 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index cf7e149..32d600c 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -404,10 +404,57 @@ done_err: return FALSE; } +static unsigned i386_map_dwarf_register(unsigned regno) +{ + unsigned reg; + + switch (regno) + { + case 0: reg = CV_REG_EAX; break; + case 1: reg = CV_REG_ECX; break; + case 2: reg = CV_REG_EDX; break; + case 3: reg = CV_REG_EBX; break; + case 4: reg = CV_REG_ESP; break; + case 5: reg = CV_REG_EBP; break; + case 6: reg = CV_REG_ESI; break; + case 7: reg = CV_REG_EDI; break; + case 8: reg = CV_REG_EIP; break; + case 9: reg = CV_REG_EFLAGS; break; + case 10: reg = CV_REG_CS; break; + case 11: reg = CV_REG_SS; break; + case 12: reg = CV_REG_DS; break; + case 13: reg = CV_REG_ES; break; + case 14: reg = CV_REG_FS; break; + case 15: reg = CV_REG_GS; break; + case 16: case 17: case 18: case 19: + case 20: case 21: case 22: case 23: + reg = CV_REG_ST0 + regno - 16; break; + case 24: reg = CV_REG_CTRL; break; + case 25: reg = CV_REG_STAT; break; + case 26: reg = CV_REG_TAG; break; +/* +reg: fiseg 27 +reg: fioff 28 +reg: foseg 29 +reg: fooff 30 +reg: fop 31 +*/ + case 32: case 33: case 34: case 35: + case 36: case 37: case 38: case 39: + reg = CV_REG_XMM0 + regno - 32; break; + case 40: reg = CV_REG_MXCSR; break; + default: + FIXME("Don't know how to map register %d\n", regno); + return 0; + } + return reg; +} + struct cpu cpu_i386 = { IMAGE_FILE_MACHINE_I386, 4, i386_get_addr, i386_stack_walk, NULL, + i386_map_dwarf_register, }; diff --git a/dlls/dbghelp/cpu_ppc.c b/dlls/dbghelp/cpu_ppc.c index 16e4a97..9a17aee 100644 --- a/dlls/dbghelp/cpu_ppc.c +++ b/dlls/dbghelp/cpu_ppc.c @@ -54,10 +54,17 @@ static BOOL ppc_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CON return FALSE; } +static unsigned ppc_map_dwarf_register(unsigned regno) +{ + FIXME("not done\n"); + return 0; +} + struct cpu cpu_ppc = { IMAGE_FILE_MACHINE_POWERPC, 4, ppc_get_addr, ppc_stack_walk, NULL, + ppc_map_dwarf_register, }; diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index fde771c..43af5e0 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -579,10 +579,66 @@ static void* x86_64_find_runtime_function(struct module* module, DWORD64 addr return NULL; } +static unsigned x86_64_map_dwarf_register(unsigned regno) +{ + unsigned reg; + + if (regno >= 17 && regno <= 24) + reg = CV_AMD64_XMM0 + regno - 17; + else if (regno >= 25 && regno <= 32) + reg = CV_AMD64_XMM8 + regno - 25; + else if (regno >= 33 && regno <= 40) + reg = CV_AMD64_ST0 + regno - 33; + else switch (regno) + { + case 0: reg = CV_AMD64_RAX; break; + case 1: reg = CV_AMD64_RDX; break; + case 2: reg = CV_AMD64_RCX; break; + case 3: reg = CV_AMD64_RBX; break; + case 4: reg = CV_AMD64_RSI; break; + case 5: reg = CV_AMD64_RDI; break; + case 6: reg = CV_AMD64_RBP; break; + case 7: reg = CV_AMD64_RSP; break; + case 8: reg = CV_AMD64_R8; break; + case 9: reg = CV_AMD64_R9; break; + case 10: reg = CV_AMD64_R10; break; + case 11: reg = CV_AMD64_R11; break; + case 12: reg = CV_AMD64_R12; break; + case 13: reg = CV_AMD64_R13; break; + case 14: reg = CV_AMD64_R14; break; + case 15: reg = CV_AMD64_R15; break; + case 16: reg = CV_AMD64_RIP; break; + case 49: reg = CV_AMD64_EFLAGS; break; + case 50: reg = CV_AMD64_ES; break; + case 51: reg = CV_AMD64_CS; break; + case 52: reg = CV_AMD64_SS; break; + case 53: reg = CV_AMD64_DS; break; + case 54: reg = CV_AMD64_FS; break; + case 55: reg = CV_AMD64_GS; break; + case 62: reg = CV_AMD64_TR; break; + case 63: reg = CV_AMD64_LDTR; break; + case 64: reg = CV_AMD64_MXCSR; break; + case 65: reg = CV_AMD64_CTRL; break; + case 66: reg = CV_AMD64_STAT; break; +/* + * 56-57 reserved + * 58 %fs.base + * 59 %gs.base + * 60-61 reserved + */ + default: + FIXME("Don't know how to map register %d\n", regno); + return 0; + } + return reg; +} + + struct cpu cpu_x86_64 = { IMAGE_FILE_MACHINE_AMD64, 8, x86_64_get_addr, x86_64_stack_walk, x86_64_find_runtime_function, + x86_64_map_dwarf_register, }; diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 70fb1b0..9f47b32 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -478,6 +478,9 @@ struct cpu /* module manipulation */ void* (*find_runtime_function)(struct module*, DWORD64 addr); + + /* dwarf dedicated information */ + unsigned (*map_dwarf_register)(unsigned regno); }; extern struct cpu* dbghelp_current_cpu; diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5513bed..e3c9ed9 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -629,49 +629,12 @@ static void dwarf2_load_one_entry(dwarf2_parse_context_t*, dwarf2_debug_info_t*, static unsigned dwarf2_map_register(int regno) { - unsigned reg; - - switch (regno) + if (regno == Wine_DW_no_register) { - case Wine_DW_no_register: FIXME("What the heck map reg 0x%x\n",regno); reg = 0; break; - case 0: reg = CV_REG_EAX; break; - case 1: reg = CV_REG_ECX; break; - case 2: reg = CV_REG_EDX; break; - case 3: reg = CV_REG_EBX; break; - case 4: reg = CV_REG_ESP; break; - case 5: reg = CV_REG_EBP; break; - case 6: reg = CV_REG_ESI; break; - case 7: reg = CV_REG_EDI; break; - case 8: reg = CV_REG_EIP; break; - case 9: reg = CV_REG_EFLAGS; break; - case 10: reg = CV_REG_CS; break; - case 11: reg = CV_REG_SS; break; - case 12: reg = CV_REG_DS; break; - case 13: reg = CV_REG_ES; break; - case 14: reg = CV_REG_FS; break; - case 15: reg = CV_REG_GS; break; - case 16: case 17: case 18: case 19: - case 20: case 21: case 22: case 23: - reg = CV_REG_ST0 + regno - 16; break; - case 24: reg = CV_REG_CTRL; break; - case 25: reg = CV_REG_STAT; break; - case 26: reg = CV_REG_TAG; break; -/* -reg: fiseg 27 -reg: fioff 28 -reg: foseg 29 -reg: fooff 30 -reg: fop 31 -*/ - case 32: case 33: case 34: case 35: - case 36: case 37: case 38: case 39: - reg = CV_REG_XMM0 + regno - 32; break; - case 40: reg = CV_REG_MXCSR; break; - default: - FIXME("Don't know how to map register %d\n", regno); + FIXME("What the heck map reg 0x%x\n",regno); return 0; } - return reg; + return dbghelp_current_cpu->map_dwarf_register(regno); } static enum location_error diff --git a/include/cvconst.h b/include/cvconst.h index 86dd3f1..1599a26 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -511,6 +511,8 @@ enum CV_HREG_e CV_AMD64_MM70 = CV_REG_MM70, CV_AMD64_MM71 = CV_REG_MM71, + CV_AMD64_XMM8 = 252, /* this includes XMM9 to XMM15 */ + CV_AMD64_RAX = 328, CV_AMD64_RBX = 329, CV_AMD64_RCX = 330,

1 0

Piotr Caban : msvcrt: Update msvcrt.spec.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: bf128642714fbd196dadc251684e40d851537249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf128642714fbd196dadc2516… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 24 22:38:24 2010 +0100 msvcrt: Update msvcrt.spec. --- dlls/msvcrt/msvcrt.spec | 583 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 583 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf128642714fbd196dadc…

1 0

Piotr Caban : msvcrt: Added strnlen implementation.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: c7aba97338445a230a8c3ef5878c132a78490264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7aba97338445a230a8c3ef58… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 24 22:39:28 2010 +0100 msvcrt: Added strnlen implementation. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 13 +++++++++++++ dlls/msvcrt/tests/string.c | 23 +++++++++++++++++++++++ 5 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ed283d9..7c1e100 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1389,7 +1389,7 @@ @ cdecl strncmp(str str long) msvcrt.strncmp @ cdecl strncpy(ptr str long) msvcrt.strncpy @ stub strncpy_s -@ stub strnlen +@ cdecl strnlen(str long) msvcrt.strnlen @ cdecl strpbrk(str str) msvcrt.strpbrk @ cdecl strrchr(str long) msvcrt.strrchr @ cdecl strspn(str str) msvcrt.strspn diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index cbfc6e2..f95f92b 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1373,7 +1373,7 @@ @ cdecl strncmp(str str long) msvcrt.strncmp @ cdecl strncpy(ptr str long) msvcrt.strncpy @ stub strncpy_s -@ stub strnlen +@ cdecl strnlen(str long) msvcrt.strnlen @ cdecl strpbrk(str str) msvcrt.strpbrk @ cdecl strrchr(str long) msvcrt.strrchr @ cdecl strspn(str str) msvcrt.strspn diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 058b9ae..988d48e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1327,7 +1327,7 @@ @ cdecl strncmp(str str long) ntdll.strncmp @ cdecl strncpy(ptr str long) ntdll.strncpy # stub strncpy_s -# stub strnlen +@ cdecl strnlen(str long) MSVCRT_strnlen @ cdecl strpbrk(str str) ntdll.strpbrk @ cdecl strrchr(str long) ntdll.strrchr @ cdecl strspn(str str) ntdll.strspn diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index a5f9a19..2a7c9af 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -314,3 +314,16 @@ MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) return ret; } + +/****************************************************************** + * strnlen (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT_strnlen(const char *s, MSVCRT_size_t maxlen) +{ + MSVCRT_size_t i; + + for(i=0; i<maxlen; i++) + if(!s[i]) break; + + return i; +} diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index a7b3404..6fd64d9 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -52,6 +52,7 @@ static int (__cdecl *pstrcat_s)(char *dst, size_t len, const char *src); static int (__cdecl *p_mbsnbcpy_s)(unsigned char * dst, size_t size, const unsigned char * src, size_t count); static int (__cdecl *p_wcscpy_s)(wchar_t *wcDest, size_t size, const wchar_t *wcSrc); static int (__cdecl *p_wcsupr_s)(wchar_t *str, size_t size); +static size_t (__cdecl *p_strnlen)(const char *, size_t); static int *p__mb_cur_max; static unsigned char *p_mbctype; @@ -911,6 +912,26 @@ static void test_strtol(void) ok(errno == ERANGE, "wrong errno %d\n", errno); } +static void test_strnlen(void) +{ + static const char str[] = "string"; + size_t res; + + if(!p_strnlen) { + win_skip("strnlen not found\n"); + return; + } + + res = p_strnlen(str, 20); + ok(res == 6, "Returned length = %d\n", (int)res); + + res = p_strnlen(str, 3); + ok(res == 3, "Returned length = %d\n", (int)res); + + res = p_strnlen(NULL, 0); + ok(res == 0, "Returned length = %d\n", (int)res); +} + START_TEST(string) { char mem[100]; @@ -930,6 +951,7 @@ START_TEST(string) p_mbsnbcpy_s = (void *)GetProcAddress( hMsvcrt,"_mbsnbcpy_s" ); p_wcscpy_s = (void *)GetProcAddress( hMsvcrt,"wcscpy_s" ); p_wcsupr_s = (void *)GetProcAddress( hMsvcrt,"_wcsupr_s" ); + p_strnlen = (void *)GetProcAddress( hMsvcrt,"strnlen" ); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -959,4 +981,5 @@ START_TEST(string) test_wcscpy_s(); test__wcsupr_s(); test_strtol(); + test_strnlen(); }

1 0

Christian Costa : d3dx9_36: Implement D3DXCreateEffectPool and ID3DXEffectPool interface.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: b5f7ca9ed9020a76b90225de03bf210051b856e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5f7ca9ed9020a76b90225de0… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Mar 25 08:41:00 2010 +0100 d3dx9_36: Implement D3DXCreateEffectPool and ID3DXEffectPool interface. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/effect.c | 81 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/effect.c | 15 ++++++++ include/d3dx9effect.h | 2 + 4 files changed, 99 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index fbcce68..e4d49e8 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -61,7 +61,7 @@ @ stub D3DXCreateEffectFromResourceExA @ stub D3DXCreateEffectFromResourceExW @ stub D3DXCreateEffectFromResourceW -@ stub D3DXCreateEffectPool +@ stdcall D3DXCreateEffectPool(ptr) @ stdcall D3DXCreateFontA(ptr long long long long long long long long long str ptr) @ stdcall D3DXCreateFontIndirectA(ptr ptr ptr) @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5999323..6c544d2 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -889,3 +889,84 @@ HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, return D3D_OK; } + +static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl; + +typedef struct ID3DXEffectPoolImpl { + const ID3DXEffectPoolVtbl *lpVtbl; + LONG ref; +} ID3DXEffectPoolImpl; + +/*** IUnknown methods ***/ +static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool* iface, REFIID riid, void** object) +{ + ID3DXEffectPoolImpl *This = (ID3DXEffectPoolImpl *)iface; + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_ID3DXEffectPool)) + { + This->lpVtbl->AddRef(iface); + *object = This; + return S_OK; + } + + WARN("Interface %s not found\n", debugstr_guid(riid)); + + return E_NOINTERFACE; +} + +static ULONG WINAPI ID3DXEffectPoolImpl_AddRef(ID3DXEffectPool* iface) +{ + ID3DXEffectPoolImpl *This = (ID3DXEffectPoolImpl *)iface; + + TRACE("(%p)->(): AddRef from %u\n", This, This->ref); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI ID3DXEffectPoolImpl_Release(ID3DXEffectPool* iface) +{ + ID3DXEffectPoolImpl *This = (ID3DXEffectPoolImpl *)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(): Release from %u\n", This, ref + 1); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl = +{ + /*** IUnknown methods ***/ + ID3DXEffectPoolImpl_QueryInterface, + ID3DXEffectPoolImpl_AddRef, + ID3DXEffectPoolImpl_Release +}; + +HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL* pool) +{ + ID3DXEffectPoolImpl* object; + + TRACE("(%p)\n", pool); + + if (!pool) + return D3DERR_INVALIDCALL; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXEffectImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->lpVtbl = &ID3DXEffectPool_Vtbl; + object->ref = 1; + + *pool = (LPD3DXEFFECTPOOL)object; + + return S_OK; +} diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 40a2f18..8b23536 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -47,6 +47,20 @@ static void test_create_effect(IDirect3DDevice9* device) effect->lpVtbl->Release(effect); } +static void test_create_effect_pool(void) +{ + HRESULT hr; + ID3DXEffectPool* pool; + + hr = D3DXCreateEffectPool(NULL); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3D_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateEffectPool(&pool); + ok(hr == S_OK, "Got result %x, expected 0 (S_OK)\n", hr); + + pool->lpVtbl->Release(pool); +} + START_TEST(effect) { HWND wnd; @@ -79,6 +93,7 @@ START_TEST(effect) } test_create_effect(device); + test_create_effect_pool(); IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index b372c25..eb8a9a8 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -278,6 +278,8 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) extern "C" { #endif +HRESULT WINAPI D3DXCreateEffectPool(LPD3DXEFFECTPOOL* pool); + HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, LPCVOID srcdata, UINT srcdatalen,

1 0

Christian Costa : d3dx9_36: Remove useless includes.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 978d51b29c4c9d02c82e0e859d76a4daa49fde97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=978d51b29c4c9d02c82e0e859… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Mar 25 08:41:06 2010 +0100 d3dx9_36: Remove useless includes. --- dlls/d3dx9_36/effect.c | 2 -- dlls/d3dx9_36/shader.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 6c544d2..7a26f64 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -22,8 +22,6 @@ #include "wine/unicode.h" #include "windef.h" #include "wingdi.h" -#include "d3dx9.h" -#include "d3dx9effect.h" #include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 9e74a42..1b888a7 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -22,8 +22,6 @@ #include "wine/unicode.h" #include "windef.h" #include "wingdi.h" -#include "d3dx9.h" -#include "d3dx9shader.h" #include "d3dx9_36_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx);

1 0

Christian Costa : d3dx9_36: Add stub for D3DXCreateEffectCompiler.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 947fe3a56471ca22969c038a8a3dcc1718145f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=947fe3a56471ca22969c038a8… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Mar 25 08:41:12 2010 +0100 d3dx9_36: Add stub for D3DXCreateEffectCompiler. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/effect.c | 13 ++++++ include/d3dx9effect.h | 86 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index e4d49e8..3e64218 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -47,7 +47,7 @@ @ stub D3DXCreateCubeTextureFromResourceW @ stub D3DXCreateCylinder @ stdcall D3DXCreateEffect(ptr ptr long ptr ptr long ptr ptr ptr) -@ stub D3DXCreateEffectCompiler +@ stdcall D3DXCreateEffectCompiler(ptr long ptr ptr long ptr ptr) @ stub D3DXCreateEffectCompilerFromFileA @ stub D3DXCreateEffectCompilerFromFileW @ stub D3DXCreateEffectCompilerFromResourceA diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7a26f64..ec775e4 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -888,6 +888,19 @@ HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, return D3D_OK; } +HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata, + UINT srcdatalen, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTCOMPILER* compiler, + LPD3DXBUFFER* parse_errors) +{ + FIXME("(%p, %u, %p, %p, %#x, %p, %p): stub\n", srcdata, srcdatalen, defines, include, flags, compiler, parse_errors); + + return E_NOTIMPL; +} + static const struct ID3DXEffectPoolVtbl ID3DXEffectPool_Vtbl; typedef struct ID3DXEffectPoolImpl { diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index eb8a9a8..9f06c2a 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -274,6 +274,84 @@ DECLARE_INTERFACE_(ID3DXEffect, ID3DXBaseEffect) STDMETHOD(SetRawValue)(THIS_ D3DXHANDLE parameter, LPCVOID data, UINT byte_offset, UINT bytes) PURE; }; +typedef struct ID3DXEffectCompiler *LPD3DXEFFECTCOMPILER; + +DEFINE_GUID(IID_ID3DXEffectCompiler, 0x51b8a949, 0x1a31, 0x47e6, 0xbe, 0xa0, 0x4b, 0x30, 0xdb, 0x53, 0xf1, 0xe0); + +#undef INTERFACE +#define INTERFACE ID3DXEffectCompiler + +DECLARE_INTERFACE_(ID3DXEffectCompiler, ID3DXBaseEffect) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID* object) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** ID3DXBaseEffect methods ***/ + STDMETHOD(GetDesc)(THIS_ D3DXEFFECT_DESC* desc) PURE; + STDMETHOD(GetParameterDesc)(THIS_ D3DXHANDLE parameter, D3DXPARAMETER_DESC* desc) PURE; + STDMETHOD(GetTechniqueDesc)(THIS_ D3DXHANDLE technique, D3DXTECHNIQUE_DESC* desc) PURE; + STDMETHOD(GetPassDesc)(THIS_ D3DXHANDLE pass, D3DXPASS_DESC* desc) PURE; + STDMETHOD(GetFunctionDesc)(THIS_ D3DXHANDLE shader, D3DXFUNCTION_DESC* desc) PURE; + STDMETHOD_(D3DXHANDLE, GetParameter)(THIS_ D3DXHANDLE parameter, UINT index) PURE; + STDMETHOD_(D3DXHANDLE, GetParameterByName)(THIS_ D3DXHANDLE parameter, LPCSTR name) PURE; + STDMETHOD_(D3DXHANDLE, GetParameterBySemantic)(THIS_ D3DXHANDLE parameter, LPCSTR semantic) PURE; + STDMETHOD_(D3DXHANDLE, GetParameterElement)(THIS_ D3DXHANDLE parameter, UINT index) PURE; + STDMETHOD_(D3DXHANDLE, GetTechnique)(THIS_ UINT index) PURE; + STDMETHOD_(D3DXHANDLE, GetTechniqueByName)(THIS_ LPCSTR name) PURE; + STDMETHOD_(D3DXHANDLE, GetPass)(THIS_ D3DXHANDLE technique, UINT index) PURE; + STDMETHOD_(D3DXHANDLE, GetPassByName)(THIS_ D3DXHANDLE technique, LPCSTR name) PURE; + STDMETHOD_(D3DXHANDLE, GetFunction)(THIS_ UINT index); + STDMETHOD_(D3DXHANDLE, GetFunctionByName)(THIS_ LPCSTR name); + STDMETHOD_(D3DXHANDLE, GetAnnotation)(THIS_ D3DXHANDLE object, UINT index) PURE; + STDMETHOD_(D3DXHANDLE, GetAnnotationByName)(THIS_ D3DXHANDLE object, LPCSTR name) PURE; + STDMETHOD(SetValue)(THIS_ D3DXHANDLE parameter, LPCVOID data, UINT bytes) PURE; + STDMETHOD(GetValue)(THIS_ D3DXHANDLE parameter, LPVOID data, UINT bytes) PURE; + STDMETHOD(SetBool)(THIS_ D3DXHANDLE parameter, BOOL b) PURE; + STDMETHOD(GetBool)(THIS_ D3DXHANDLE parameter, BOOL* b) PURE; + STDMETHOD(SetBoolArray)(THIS_ D3DXHANDLE parameter, CONST BOOL* b, UINT count) PURE; + STDMETHOD(GetBoolArray)(THIS_ D3DXHANDLE parameter, BOOL* b, UINT count) PURE; + STDMETHOD(SetInt)(THIS_ D3DXHANDLE parameter, INT n) PURE; + STDMETHOD(GetInt)(THIS_ D3DXHANDLE parameter, INT* n) PURE; + STDMETHOD(SetIntArray)(THIS_ D3DXHANDLE parameter, CONST INT* n, UINT count) PURE; + STDMETHOD(GetIntArray)(THIS_ D3DXHANDLE parameter, INT* n, UINT count) PURE; + STDMETHOD(SetFloat)(THIS_ D3DXHANDLE parameter, FLOAT f) PURE; + STDMETHOD(GetFloat)(THIS_ D3DXHANDLE parameter, FLOAT* f) PURE; + STDMETHOD(SetFloatArray)(THIS_ D3DXHANDLE parameter, CONST FLOAT* f, UINT count) PURE; + STDMETHOD(GetFloatArray)(THIS_ D3DXHANDLE parameter, FLOAT* f, UINT count) PURE; + STDMETHOD(SetVector)(THIS_ D3DXHANDLE parameter, CONST D3DXVECTOR4* vector) PURE; + STDMETHOD(GetVector)(THIS_ D3DXHANDLE parameter, D3DXVECTOR4* vector) PURE; + STDMETHOD(SetVectorArray)(THIS_ D3DXHANDLE parameter, CONST D3DXVECTOR4* vector, UINT count) PURE; + STDMETHOD(GetVectorArray)(THIS_ D3DXHANDLE parameter, D3DXVECTOR4* vector, UINT count) PURE; + STDMETHOD(SetMatrix)(THIS_ D3DXHANDLE parameter, CONST D3DXMATRIX* matrix) PURE; + STDMETHOD(GetMatrix)(THIS_ D3DXHANDLE parameter, D3DXMATRIX* matrix) PURE; + STDMETHOD(SetMatrixArray)(THIS_ D3DXHANDLE parameter, CONST D3DXMATRIX* matrix, UINT count) PURE; + STDMETHOD(GetMatrixArray)(THIS_ D3DXHANDLE parameter, D3DXMATRIX* matrix, UINT count) PURE; + STDMETHOD(SetMatrixPointerArray)(THIS_ D3DXHANDLE parameter, CONST D3DXMATRIX** matrix, UINT count) PURE; + STDMETHOD(GetMatrixPointerArray)(THIS_ D3DXHANDLE parameter, D3DXMATRIX** matrix, UINT count) PURE; + STDMETHOD(SetMatrixTranspose)(THIS_ D3DXHANDLE parameter, CONST D3DXMATRIX* matrix) PURE; + STDMETHOD(GetMatrixTranspose)(THIS_ D3DXHANDLE parameter, D3DXMATRIX* matrix) PURE; + STDMETHOD(SetMatrixTransposeArray)(THIS_ D3DXHANDLE parameter, CONST D3DXMATRIX* matrix, UINT count) PURE; + STDMETHOD(GetMatrixTransposeArray)(THIS_ D3DXHANDLE parameter, D3DXMATRIX* matrix, UINT count) PURE; + STDMETHOD(SetMatrixTransposePointerArray)(THIS_ D3DXHANDLE parameter, CONST D3DXMATRIX** matrix, UINT count) PURE; + STDMETHOD(GetMatrixTransposePointerArray)(THIS_ D3DXHANDLE parameter, D3DXMATRIX** matrix, UINT count) PURE; + STDMETHOD(SetString)(THIS_ D3DXHANDLE parameter, LPCSTR string) PURE; + STDMETHOD(GetString)(THIS_ D3DXHANDLE parameter, LPCSTR* string) PURE; + STDMETHOD(SetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9 texture) PURE; + STDMETHOD(GetTexture)(THIS_ D3DXHANDLE parameter, LPDIRECT3DBASETEXTURE9* texture) PURE; + STDMETHOD(SetPixelShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9 pshader) PURE; + STDMETHOD(GetPixelShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DPIXELSHADER9* pshader) PURE; + STDMETHOD(SetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 vshader) PURE; + STDMETHOD(GetVertexShader)(THIS_ D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9* vshader) PURE; + STDMETHOD(SetArrayRange)(THIS_ D3DXHANDLE parameter, UINT start, UINT end) PURE; + /*** ID3DXEffectCompiler methods ***/ + STDMETHOD(SetLiteral)(THIS_ D3DXHANDLE parameter, BOOL literal) PURE; + STDMETHOD(GetLiteral)(THIS_ D3DXHANDLE parameter, BOOL* literal) PURE; + STDMETHOD(CompileEffect)(THIS_ DWORD flags, LPD3DXBUFFER* effect, LPD3DXBUFFER* error_msgs) PURE; + STDMETHOD(CompileShader)(THIS_ D3DXHANDLE function, LPCSTR target, DWORD flags, LPD3DXBUFFER* shader, + LPD3DXBUFFER* error_msgs, LPD3DXCONSTANTTABLE* constant_table) PURE; +}; + #ifdef __cplusplus extern "C" { #endif @@ -290,6 +368,14 @@ HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, LPD3DXEFFECT* effect, LPD3DXBUFFER* compilation_errors); +HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata, + UINT srcdatalen, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTCOMPILER* compiler, + LPD3DXBUFFER* parse_errors); + #ifdef __cplusplus } #endif

1 0

Christian Costa : d3dx9_36: Implement D3DXCreateEffectEx and make D3DXCreateEffect use it.
by Alexandre Julliard 25 Mar '10

25 Mar '10

Module: wine Branch: master Commit: 39b60870ffc4f35fbbac08a7dd32f208b5b6cd40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b60870ffc4f35fbbac08a7d… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Mar 25 08:41:18 2010 +0100 d3dx9_36: Implement D3DXCreateEffectEx and make D3DXCreateEffect use it. --- dlls/d3dx9_36/effect.c | 39 ++++++++++++++++++++++++++++----------- include/d3dx9effect.h | 11 +++++++++++ 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ec775e4..4633d88 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -848,20 +848,21 @@ static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl = ID3DXEffectImpl_SetRawValue }; -HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, - LPCVOID srcdata, - UINT srcdatalen, - CONST D3DXMACRO* defines, - LPD3DXINCLUDE include, - DWORD flags, - LPD3DXEFFECTPOOL pool, - LPD3DXEFFECT* effect, - LPD3DXBUFFER* compilation_errors) +HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device, + LPCVOID srcdata, + UINT srcdatalen, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + LPCSTR skip_constants, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT* effect, + LPD3DXBUFFER* compilation_errors) { ID3DXEffectImpl* object; - FIXME("(%p, %p, %u, %p, %p, %#x, %p, %p, %p): semi-stub\n", device, srcdata, srcdatalen, defines, include, flags, - pool, effect, compilation_errors); + FIXME("(%p, %p, %u, %p, %p, %p, %#x, %p, %p, %p): semi-stub\n", device, srcdata, srcdatalen, defines, include, + skip_constants, flags, pool, effect, compilation_errors); if (!device || !srcdata) return D3DERR_INVALIDCALL; @@ -888,6 +889,22 @@ HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, return D3D_OK; } +HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, + LPCVOID srcdata, + UINT srcdatalen, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT* effect, + LPD3DXBUFFER* compilation_errors) +{ + TRACE("(%p, %p, %u, %p, %p, %#x, %p, %p, %p): Forwarded to D3DXCreateEffectEx\n", device, srcdata, srcdatalen, defines, + include, flags, pool, effect, compilation_errors); + + return D3DXCreateEffectEx(device, srcdata, srcdatalen, defines, include, NULL, flags, pool, effect, compilation_errors); +} + HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata, UINT srcdatalen, CONST D3DXMACRO* defines, diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index 9f06c2a..3bb2878 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -368,6 +368,17 @@ HRESULT WINAPI D3DXCreateEffect(LPDIRECT3DDEVICE9 device, LPD3DXEFFECT* effect, LPD3DXBUFFER* compilation_errors); +HRESULT WINAPI D3DXCreateEffectEx(LPDIRECT3DDEVICE9 device, + LPCVOID srcdata, + UINT srcdatalen, + CONST D3DXMACRO* defines, + LPD3DXINCLUDE include, + LPCSTR skip_constants, + DWORD flags, + LPD3DXEFFECTPOOL pool, + LPD3DXEFFECT* effect, + LPD3DXBUFFER* compilation_errors); + HRESULT WINAPI D3DXCreateEffectCompiler(LPCSTR srcdata, UINT srcdatalen, CONST D3DXMACRO* defines,

1 0

Austin English : cmd: Add testcases for goto.
by Alexandre Julliard 24 Mar '10

24 Mar '10

Module: wine Branch: master Commit: 27717a51278e0cb5e90d590206404c1b36b0309f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27717a51278e0cb5e90d59020… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Mar 23 22:45:49 2010 -0500 cmd: Add testcases for goto. --- programs/cmd/tests/test_builtins.cmd | 11 +++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index bae19b8..d596c18 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -59,3 +59,14 @@ if /i foo==FOO echo if /i seems to work if /i not foo==FOO echo if /i seems to be broken if /I foo==FOO echo if /I seems to work if /I not foo==FOO echo if /I seems to be broken + +echo -----------Testing GOTO----------- +if a==a goto dest1 +:dest1 +echo goto with no leading space worked +if b==b goto dest2 + :dest2 +echo goto with a leading space worked +if c==c goto dest3 + :dest3 +echo goto with a leading tab worked diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index ad50358..306953b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -40,3 +40,7 @@ Testing case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work if /I seems to work +-----------Testing GOTO----------- +goto with no leading space worked +goto with a leading space worked +goto with a leading tab worked

1 0

Jörg Höhle : include: Add some multimedia defines not present in win9x.
by Alexandre Julliard 24 Mar '10

24 Mar '10

Module: wine Branch: master Commit: b33152573f2b466a0b72c22911c8fbfb4fc462f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b33152573f2b466a0b72c2291… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Mar 23 21:52:28 2010 +0100 include: Add some multimedia defines not present in win9x. --- include/mmddk.h | 3 +++ include/mmsystem.h | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/mmddk.h b/include/mmddk.h index 826aefb..d3593b0 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -376,6 +376,9 @@ typedef JOYDEVMSGPROC *LPJOYDEVMSGPROC; #define MCI_RECT 7 #define MCI_CONSTANT 8 #define MCI_END_CONSTANT 9 +#define MCI_HWND 10 +#define MCI_HPAL 11 +#define MCI_HDC 12 #define MAKEMCIRESOURCE(wRet, wRes) MAKELRESULT((wRet), (wRes)) diff --git a/include/mmsystem.h b/include/mmsystem.h index d147bf3..4631762 100644 --- a/include/mmsystem.h +++ b/include/mmsystem.h @@ -657,6 +657,8 @@ DECL_WINELIB_TYPE_AW(LPMIDIOUTCAPS2) #define MOD_SQSYNTH 3 /* square wave internal synth */ #define MOD_FMSYNTH 4 /* FM internal synth */ #define MOD_MAPPER 5 /* MIDI mapper */ +#define MOD_WAVETABLE 6 /* hardware watetable internal synth */ +#define MOD_SWSYNTH 7 /* software synth */ #define MIDICAPS_VOLUME 0x0001 /* supports volume control */ #define MIDICAPS_LRVOLUME 0x0002 /* separate left-right volume control */

1 0

Vincent Povirk : wine.inf: Add some .NET Framework keys.
by Alexandre Julliard 24 Mar '10

24 Mar '10

Module: wine Branch: master Commit: 929bac964aaac575740f042bdb606412e8f88dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=929bac964aaac575740f042bd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 24 09:12:31 2010 -0500 wine.inf: Add some .NET Framework keys. --- tools/wine.inf.in | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 7476df7..66b966f 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -37,6 +37,7 @@ AddReg=\ CurrentVersion,\ Debugger,\ Desktop,\ + Dotnet,\ Metrics,\ DirectX,\ Fonts,\ @@ -61,6 +62,7 @@ AddReg=\ CurrentVersion,\ Debugger,\ Desktop,\ + Dotnet,\ Metrics,\ DirectX,\ Fonts,\ @@ -86,6 +88,7 @@ AddReg=\ CurrentVersion,\ Debugger,\ Desktop,\ + Dotnet,\ Metrics,\ DirectX,\ Fonts,\ @@ -463,6 +466,11 @@ HKCU,%Desktop%,"UserPreferenceMask",3,10,00,00,80 HKCU,%Desktop%,"LowPowerActive",,"0" HKCU,%Desktop%,"MenuShowDelay",2,"400" +[DotNet] +HKLM,Software\Microsoft\.NETFramework\policy\v1.0 +HKLM,Software\Microsoft\.NETFramework\policy\v2.0 +HKLM,Software\Microsoft\.NETFramework\policy\v3.0 + [Metrics] HKCU,%Metrics%,"ScrollWidth",2,"16" HKCU,%Metrics%,"ScrollHeight",2,"16"

1 0