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

Eric Pouech : dbghelp: Don't try to hardwire the dwarf's "word size", but get it properly.
by Alexandre Julliard March 25, 2010

March 25, 2010

Module: wine Branch: master Commit: 8413810c6c2c3a132dcb5b85d8fffef24e617590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8413810c6c2c3a132dcb5b85d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Mar 24 22:04:06 2010 +0100 dbghelp: Don't try to hardwire the dwarf's "word size", but get it properly. --- dlls/dbghelp/dwarf.c | 48 ++++++++++++++++++++++-------------------------- 1 files changed, 22 insertions(+), 26 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index d8aff0f..ebf019d 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -189,7 +189,6 @@ typedef struct dwarf2_parse_context_s struct sparse_array debug_info_table; unsigned long load_offset; unsigned long ref_offset; - unsigned char word_size; struct symt* symt_cache[sc_num]; /* void, int1, int2, int4 */ } dwarf2_parse_context_t; @@ -197,6 +196,7 @@ typedef struct dwarf2_parse_context_s struct dwarf2_module_info_s { dwarf2_section_t debug_loc; + unsigned char word_size; }; #define loc_dwarf2_location_list (loc_user + 0) @@ -489,7 +489,8 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, { case DW_FORM_ref_addr: case DW_FORM_addr: - attr->u.uvalue = dwarf2_get_addr(data, ctx->word_size); + attr->u.uvalue = dwarf2_get_addr(data, + ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size); TRACE("addr<0x%lx>\n", attr->u.uvalue); break; @@ -922,7 +923,7 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, lctx.data = xloc.u.block.ptr; lctx.end_data = xloc.u.block.ptr + xloc.u.block.size; - lctx.word_size = ctx->word_size; + lctx.word_size = ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; err = compute_location(&lctx, loc, NULL, frame); if (err < 0) @@ -1957,7 +1958,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, traverse.data = sections[section_line].address + offset; traverse.end_data = traverse.data + 4; - traverse.word_size = ctx->word_size; + traverse.word_size = ctx->module->format_info[DFI_DWARF]->u.dwarf2_info->word_size; length = dwarf2_parse_u4(&traverse); traverse.end_data = sections[section_line].address + offset + length; @@ -2149,11 +2150,13 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, return FALSE; } + module->format_info[DFI_DWARF]->u.dwarf2_info->word_size = cu_ctx.word_size; + mod_ctx->word_size = cu_ctx.word_size; + pool_init(&ctx.pool, 65536); ctx.sections = sections; ctx.section = section_debug; ctx.module = module; - ctx.word_size = cu_ctx.word_size; ctx.thunks = thunks; ctx.load_offset = load_offset; ctx.ref_offset = comp_unit_start - sections[section_debug].address; @@ -2228,7 +2231,7 @@ static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE { lctx->data = ptr; lctx->end_data = ptr + len; - lctx->word_size = 4; /* FIXME word size !!! */ + lctx->word_size = modfmt->u.dwarf2_info->word_size; return TRUE; } ptr += len; @@ -2325,7 +2328,7 @@ static void dwarf2_location_compute(struct process* pcs, lctx.data = (const BYTE*)(ptr + 1); lctx.end_data = lctx.data + *ptr; - lctx.word_size = 4; /* FIXME !! */ + lctx.word_size = modfmt->u.dwarf2_info->word_size; } do_compute: /* now get the variable */ @@ -2350,7 +2353,6 @@ static void dwarf2_location_compute(struct process* pcs, static void dwarf2_module_remove(struct process* pcs, struct module_format* modfmt) { - HeapFree(GetProcessHeap(), 0, modfmt->u.dwarf2_info); HeapFree(GetProcessHeap(), 0, modfmt); } @@ -2381,7 +2383,7 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, dwarf2_section_t section[section_max]; dwarf2_traverse_context_t mod_ctx; struct image_section_map debug_sect, debug_str_sect, debug_abbrev_sect, - debug_line_sect, debug_loclist_sect; + debug_line_sect; BOOL ret = TRUE; struct module_format* dwarf2_modfmt; @@ -2415,29 +2417,23 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, mod_ctx.data = section[section_debug].address; mod_ctx.end_data = mod_ctx.data + section[section_debug].size; + mod_ctx.word_size = 0; /* will be correctly set later on */ - dwarf2_modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(*dwarf2_modfmt)); - if (!dwarf2_modfmt) return FALSE; + dwarf2_modfmt = HeapAlloc(GetProcessHeap(), 0, + sizeof(*dwarf2_modfmt) + sizeof(*dwarf2_modfmt->u.dwarf2_info)); + if (!dwarf2_modfmt) + { + ret = FALSE; + goto leave; + } dwarf2_modfmt->module = module; dwarf2_modfmt->remove = dwarf2_module_remove; dwarf2_modfmt->loc_compute = dwarf2_location_compute; - dwarf2_modfmt->u.dwarf2_info = NULL; + dwarf2_modfmt->u.dwarf2_info = (struct dwarf2_module_info_s*)(dwarf2_modfmt + 1); + dwarf2_modfmt->u.dwarf2_info->word_size = 0; /* will be correctly set later on */ dwarf2_modfmt->module->format_info[DFI_DWARF] = dwarf2_modfmt; - image_find_section(fmap, ".debug_loc", &debug_loclist_sect); - if (image_get_map_size(&debug_loclist_sect)) - { - /* initialize the dwarf2 specific info block for this module. - * As we'll need later the .debug_loc section content, we won't unmap this - * section upon existing this function - */ - dwarf2_modfmt->u.dwarf2_info = HeapAlloc(GetProcessHeap(), 0, - sizeof(*dwarf2_modfmt->u.dwarf2_info)); - if (!dwarf2_modfmt->u.dwarf2_info) goto leave; - dwarf2_modfmt->u.dwarf2_info->debug_loc.address = (const BYTE*)image_map_section(&debug_loclist_sect); - dwarf2_modfmt->u.dwarf2_info->debug_loc.size = image_get_map_size(&debug_loclist_sect); - } - else image_unmap_section(&debug_loclist_sect); + dwarf2_init_section(&dwarf2_modfmt->u.dwarf2_info->debug_loc, fmap, ".debug_loc", NULL); while (mod_ctx.data < mod_ctx.end_data) {

1 0

Eric Pouech : dbghelp: Fixed a couple of portability issues to 64bit platforms.
by Alexandre Julliard March 25, 2010

March 25, 2010

Module: wine Branch: master Commit: e6a08a1e15db1f62869c1c15c12687d3959e64e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6a08a1e15db1f62869c1c15c… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Mar 24 22:04:00 2010 +0100 dbghelp: Fixed a couple of portability issues to 64bit platforms. --- dlls/dbghelp/dwarf.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 2432f89..d8aff0f 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2213,7 +2213,7 @@ static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE unsigned long ip, dwarf2_traverse_context_t* lctx) { - DWORD beg, end; + DWORD_PTR beg, end; const BYTE* ptr = start; DWORD len; @@ -2240,7 +2240,7 @@ static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE static enum location_error loc_compute_frame(struct process* pcs, const struct module_format* modfmt, const struct symt_function* func, - DWORD ip, struct location* frame) + DWORD_PTR ip, struct location* frame) { struct symt** psym = NULL; struct location* pframe; @@ -2292,7 +2292,7 @@ static void dwarf2_location_compute(struct process* pcs, struct location* loc) { struct location frame; - DWORD ip; + DWORD_PTR ip; int err; dwarf2_traverse_context_t lctx;

1 0

Eric Pouech : dbghelp: In dwarf parsing, correctly get the size of addresses in location lists.
by Alexandre Julliard March 25, 2010

March 25, 2010

Module: wine Branch: master Commit: 403f41687e2b978c5382556cca1c2380fdb0c25b URL: http://source.winehq.org/git/wine.git/?a=commit;h=403f41687e2b978c5382556cc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Mar 24 22:04:12 2010 +0100 dbghelp: In dwarf parsing, correctly get the size of addresses in location lists. --- dlls/dbghelp/dwarf.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index ebf019d..5513bed 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2213,8 +2213,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, } static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE* start, - unsigned long ip, - dwarf2_traverse_context_t* lctx) + unsigned long ip, dwarf2_traverse_context_t* lctx) { DWORD_PTR beg, end; const BYTE* ptr = start; @@ -2222,8 +2221,8 @@ static BOOL dwarf2_lookup_loclist(const struct module_format* modfmt, const BYTE while (ptr < modfmt->u.dwarf2_info->debug_loc.address + modfmt->u.dwarf2_info->debug_loc.size) { - beg = dwarf2_get_u4(ptr); ptr += 4; - end = dwarf2_get_u4(ptr); ptr += 4; + beg = dwarf2_get_addr(ptr, modfmt->u.dwarf2_info->word_size); ptr += modfmt->u.dwarf2_info->word_size; + end = dwarf2_get_addr(ptr, modfmt->u.dwarf2_info->word_size); ptr += modfmt->u.dwarf2_info->word_size; if (!beg && !end) break; len = dwarf2_get_u2(ptr); ptr += 2;

1 0

Christian Costa : d3dx9_36: Remove useless includes.
by Alexandre Julliard March 25, 2010

March 25, 2010

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

Piotr Caban : msvcrt: Update msvcrt.spec.
by Alexandre Julliard March 25, 2010

March 25, 2010

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

Eric Pouech : dbghelp: Created a CPU method to map dwarf register number to codeview register number .
by Alexandre Julliard March 25, 2010

March 25, 2010

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

Christian Costa : d3dx9_36: Implement D3DXCreateEffectPool and ID3DXEffectPool interface.
by Alexandre Julliard March 25, 2010

March 25, 2010

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

Paul Vriens : msi/tests: Fix test failures on W2K with Windows Installer 2. x.
by Alexandre Julliard March 24, 2010

March 24, 2010

Module: wine Branch: master Commit: 05d0787d08d834d23b2eca09ca92fcb943ee5d21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05d0787d08d834d23b2eca09c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Mar 24 21:32:43 2010 +0100 msi/tests: Fix test failures on W2K with Windows Installer 2.x. --- dlls/msi/tests/install.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3d99fb9..0631a5e 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4572,6 +4572,7 @@ static void test_publish_publishproduct(void) CHAR keypath[MAX_PATH]; CHAR temp[MAX_PATH]; CHAR path[MAX_PATH]; + BOOL old_installer = FALSE; static const CHAR prodpath[] = "Software\\Microsoft\\Windows\\CurrentVersion" "\\Installer\\UserData\\%s\\Products" @@ -4609,6 +4610,22 @@ static void test_publish_publishproduct(void) sprintf(keypath, prodpath, usersid); res = RegOpenKeyA(HKEY_LOCAL_MACHINE, keypath, &hkey); + if (res == ERROR_FILE_NOT_FOUND) + { + res = RegOpenKeyA(HKEY_CURRENT_USER, cuprodpath, &hkey); + if (res == ERROR_SUCCESS) + { + win_skip("Windows Installer < 3.0 detected\n"); + RegCloseKey(hkey); + old_installer = TRUE; + goto currentuser; + } + else + { + win_skip("Install failed, no need to continue\n"); + return; + } + } ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); res = RegOpenKeyA(hkey, "InstallProperties", &props); @@ -4627,6 +4644,7 @@ static void test_publish_publishproduct(void) RegDeleteKeyA(hkey, ""); RegCloseKey(hkey); +currentuser: res = RegOpenKeyA(HKEY_CURRENT_USER, cuprodpath, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4634,7 +4652,8 @@ static void test_publish_publishproduct(void) CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052c94DA02821EECD05F2F"); CHECK_DEL_REG_DWORD(hkey, "Language", 1033); CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); - CHECK_DEL_REG_DWORD(hkey, "AuthorizedLUAApp", 0); + if (!old_installer) + CHECK_DEL_REG_DWORD(hkey, "AuthorizedLUAApp", 0); CHECK_DEL_REG_DWORD(hkey, "Assignment", 0); CHECK_DEL_REG_DWORD(hkey, "AdvertiseFlags", 0x184); CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0); @@ -4678,6 +4697,8 @@ static void test_publish_publishproduct(void) /* PublishProduct, machine */ r = MsiInstallProductA(msifile, "PUBLISH_PRODUCT=1 ALLUSERS=1"); + if (old_installer) + goto machprod; ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "File not installed\n"); @@ -4705,6 +4726,7 @@ static void test_publish_publishproduct(void) RegDeleteKeyA(hkey, ""); RegCloseKey(hkey); +machprod: res = RegOpenKeyA(HKEY_CLASSES_ROOT, machprod, &hkey); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); @@ -4712,7 +4734,8 @@ static void test_publish_publishproduct(void) CHECK_DEL_REG_STR(hkey, "PackageCode", "AC75740029052c94DA02821EECD05F2F"); CHECK_DEL_REG_DWORD(hkey, "Language", 1033); CHECK_DEL_REG_DWORD(hkey, "Version", 0x1010001); - CHECK_DEL_REG_DWORD(hkey, "AuthorizedLUAApp", 0); + if (!old_installer) + CHECK_DEL_REG_DWORD(hkey, "AuthorizedLUAApp", 0); todo_wine CHECK_DEL_REG_DWORD(hkey, "Assignment", 1); CHECK_DEL_REG_DWORD(hkey, "AdvertiseFlags", 0x184); CHECK_DEL_REG_DWORD(hkey, "InstanceType", 0);

1 0

Vincent Povirk : mscoree: Add a setting to access mono' s tracing functionality.
by Alexandre Julliard March 24, 2010

March 24, 2010

Module: wine Branch: master Commit: b8c7dec6b8ba8005b86ccf5b17ccaa0c6361e6ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8c7dec6b8ba8005b86ccf5b1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 24 13:35:57 2010 -0500 mscoree: Add a setting to access mono's tracing functionality. --- dlls/mscoree/mscoree_main.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index dcdc91a..f9d8070 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -144,6 +144,11 @@ __int32 WINAPI _CorExeMain(void) PROCESS_INFORMATION pi; WCHAR *mono_exe, *cmd_line; DWORD size, exit_code; + static const WCHAR WINE_MONO_TRACE[]={'W','I','N','E','_','M','O','N','O','_','T','R','A','C','E',0}; + static const WCHAR trace_switch_start[]={'"','-','-','t','r','a','c','e','=',0}; + static const WCHAR trace_switch_end[]={'"',' ',0}; + int trace_size; + WCHAR trace_setting[256]; if (!(mono_exe = get_mono_exe())) { @@ -151,7 +156,13 @@ __int32 WINAPI _CorExeMain(void) return -1; } + trace_size = GetEnvironmentVariableW(WINE_MONO_TRACE, trace_setting, sizeof(trace_setting)/sizeof(WCHAR)); + size = (lstrlenW(mono_exe) + lstrlenW(GetCommandLineW()) + 1) * sizeof(WCHAR); + + if (trace_size) + size += (trace_size + lstrlenW(trace_switch_start) + lstrlenW(trace_switch_end)) * sizeof(WCHAR); + if (!(cmd_line = HeapAlloc(GetProcessHeap(), 0, size))) { HeapFree(GetProcessHeap(), 0, mono_exe); @@ -160,6 +171,14 @@ __int32 WINAPI _CorExeMain(void) lstrcpyW(cmd_line, mono_exe); HeapFree(GetProcessHeap(), 0, mono_exe); + + if (trace_size) + { + lstrcatW(cmd_line, trace_switch_start); + lstrcatW(cmd_line, trace_setting); + lstrcatW(cmd_line, trace_switch_end); + } + lstrcatW(cmd_line, GetCommandLineW()); TRACE("new command line: %s\n", debugstr_w(cmd_line));

1 0

André Hentschel : winegcc: Make condition easier to read and look like the statement after the block.
by Alexandre Julliard March 24, 2010

March 24, 2010

Module: wine Branch: master Commit: 6c8af386384c7d26fb366754a76fe0bd4cc4bd51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c8af386384c7d26fb366754a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 24 20:16:27 2010 +0100 winegcc: Make condition easier to read and look like the statement after the block. --- tools/winegcc/winegcc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 396bcc8..a690754 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -441,8 +441,7 @@ no_compat_defines: { if (opts->use_msvcrt) { - if (gcc_defs) strarray_add(comp_args, "-isystem" INCLUDEDIR "/msvcrt"); - else strarray_add(comp_args, "-I" INCLUDEDIR "/msvcrt"); + strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/msvcrt" : "-I" INCLUDEDIR "/msvcrt" ); strarray_add(comp_args, "-D__MSVCRT__"); } strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/windows" : "-I" INCLUDEDIR "/windows" );

1 0