June 2006 - Wine-commits - list.winehq.org

Eric Pouech : dbghelp: Dwarf2 & AT_byte_size.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 24743774e8fbe08a1742442e5fc39e63e098cc7c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=24743774e8fbe08a1742442… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 18 21:30:49 2006 +0200 dbghelp: Dwarf2 & AT_byte_size. - AT_byte_size can be larger than a single byte (especially for enums) - added missing enumeration type parsing --- dlls/dbghelp/dwarf.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 053f662..3ddefe1 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2,6 +2,7 @@ * File dwarf.c - read dwarf2 information from the ELF modules * * Copyright (C) 2005, Raphael Junqueira + * Copyright (C) 2006, Eric Pouech * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -489,6 +490,9 @@ typedef struct dwarf2_parse_context_s { unsigned char level; } dwarf2_parse_context_t; +/* forward declarations */ +static struct symt_enum* dwarf2_parse_enumeration_type(struct module* module, dwarf2_abbrev_entry_t* entry, dwarf2_parse_context_t* ctx); + static unsigned char dwarf2_parse_byte(dwarf2_parse_context_t* ctx) { unsigned char uvalue = *(const unsigned char*) ctx->data; @@ -908,7 +912,7 @@ static struct symt_basic* dwarf2_parse_b TRACE("found name %s\n", name); break; case DW_AT_byte_size: - size = dwarf2_parse_byte(ctx); + size = dwarf2_parse_attr_as_data(attr, ctx); break; case DW_AT_encoding: encoding = dwarf2_parse_byte(ctx); @@ -992,7 +996,7 @@ static struct symt_pointer* dwarf2_parse for (attr = entry->attrs; NULL != attr; attr = attr->next) { switch (attr->attribute) { case DW_AT_byte_size: - size = dwarf2_parse_byte(ctx); + size = dwarf2_parse_attr_as_data(attr, ctx); break; case DW_AT_type: { @@ -1314,6 +1318,12 @@ static void dwarf2_parse_udt_members(str case DW_TAG_member: dwarf2_parse_udt_member(module, entry, ctx, symt); break; + case DW_TAG_enumeration_type: + { + struct symt_enum* symt = dwarf2_parse_enumeration_type(module, entry, ctx); + dwarf2_add_symt_ref(module, entry_ref, &symt->symt); + } + break; default: { dwarf2_abbrev_entry_attr_t* attr; @@ -1349,7 +1359,7 @@ static struct symt_udt* dwarf2_parse_cla TRACE("found name %s\n", name); break; case DW_AT_byte_size: - size = dwarf2_parse_byte(ctx); + size = dwarf2_parse_attr_as_data(attr, ctx); break; case DW_AT_decl_file: case DW_AT_decl_line: @@ -1389,7 +1399,7 @@ static struct symt_udt* dwarf2_parse_str TRACE("found name %s\n", name); break; case DW_AT_byte_size: - size = dwarf2_parse_byte(ctx); + size = dwarf2_parse_attr_as_data(attr, ctx); break; case DW_AT_decl_file: case DW_AT_decl_line: @@ -1429,7 +1439,7 @@ static struct symt_udt* dwarf2_parse_uni TRACE("found name %s\n", name); break; case DW_AT_byte_size: - size = dwarf2_parse_byte(ctx); + size = dwarf2_parse_attr_as_data(attr, ctx); break; case DW_AT_decl_file: case DW_AT_decl_line:

1 0

Juan Lang : crypt32: Encode/decode CRL issuing dist points.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: cb2e21ffb404a5a7f04af343f0dda26a89d7bfb3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cb2e21ffb404a5a7f04af34… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Jun 19 15:12:51 2006 -0700 crypt32: Encode/decode CRL issuing dist points. --- dlls/crypt32/decode.c | 49 +++++++++ dlls/crypt32/encode.c | 95 ++++++++++++++++++ dlls/crypt32/tests/encode.c | 230 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 374 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=cb2e21ffb404a5a7f04…

1 0

Jason Green : wined3d: Fix DEF instructions in GLSL for non-Nvidia platforms.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 99c855e6aecdcbe501920523aff73382bb3e8cc6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=99c855e6aecdcbe50192052… Author: Jason Green <jave27(a)gmail.com> Date: Mon Jun 19 17:53:13 2006 -0400 wined3d: Fix DEF instructions in GLSL for non-Nvidia platforms. - NVidia allows "const vec4 = {1.0, 2.0, 3.0, 4.0};", even though that's not part of the spec. - It should be "const vec4 = vecr4(1.0, 2.0, 3.0, 4.0);" - This patch fixes this for D3DSIO_DEF and D3DSIO_DEFI. --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 91961eb..c85b0c9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1061,7 +1061,7 @@ void shader_glsl_def(SHADER_OPCODE_ARG* const char* prefix = pshader? "PC":"VC"; shader_addline(arg->buffer, - "const vec4 %s%lu = { %f, %f, %f, %f };\n", prefix, reg, + "const vec4 %s%lu = vec4(%f, %f, %f, %f);\n", prefix, reg, *((const float *)(arg->src + 0)), *((const float *)(arg->src + 1)), *((const float *)(arg->src + 2)), @@ -1077,7 +1077,7 @@ void shader_glsl_defi(SHADER_OPCODE_ARG* DWORD reg = arg->dst & D3DSP_REGNUM_MASK; shader_addline(arg->buffer, - "const ivec4 I%lu = { %ld, %ld, %ld, %ld };\n", reg, + "const ivec4 I%lu = ivec4(%ld, %ld, %ld, %ld);\n", reg, (long)arg->src[0], (long)arg->src[1], (long)arg->src[2], (long)arg->src[3]);

1 0

Jason Green : wined3d: Move D3DSIO_DEF instruction for ARB shaders into arb_program_shader.c.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 0b09ecb29193de406ee51c365974146355b79d2c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0b09ecb29193de406ee51c3… Author: Jason Green <jave27(a)gmail.com> Date: Mon Jun 19 17:53:38 2006 -0400 wined3d: Move D3DSIO_DEF instruction for ARB shaders into arb_program_shader.c. --- dlls/wined3d/arb_program_shader.c | 17 +++++++++++++++++ dlls/wined3d/baseshader.c | 16 ---------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a763196..ec6cb14 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -144,4 +144,21 @@ void shader_generate_arb_declarations( This->baseShader.limits.constant_float - 1); } +/** Process the D3DSIO_DEF opcode into an ARB string - creates a local vec4 + * float constant, and stores it's usage on the regmaps. */ +void shader_hw_def(SHADER_OPCODE_ARG* arg) { + + DWORD reg = arg->dst & D3DSP_REGNUM_MASK; + + shader_addline(arg->buffer, + "PARAM C%lu = { %f, %f, %f, %f };\n", reg, + *((const float *)(arg->src + 0)), + *((const float *)(arg->src + 1)), + *((const float *)(arg->src + 2)), + *((const float *)(arg->src + 3)) ); + + arg->reg_maps->constantsF[reg] = 1; +} + + /* TODO: Add more ARB_[vertex/fragment]_program specific code here */ diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 004a0ef..9f0b88c 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -823,22 +823,6 @@ void shader_dump_ins_modifiers(const DWO FIXME("_unrecognized_modifier(%#lx)", mmask >> D3DSP_DSTMOD_SHIFT); } -/** Process the D3DSIO_DEF opcode into an ARB string - creates a local vec4 - * float constant, and stores it's usage on the regmaps. */ -void shader_hw_def(SHADER_OPCODE_ARG* arg) { - - DWORD reg = arg->dst & D3DSP_REGNUM_MASK; - - shader_addline(arg->buffer, - "PARAM C%lu = { %f, %f, %f, %f };\n", reg, - *((const float *)(arg->src + 0)), - *((const float *)(arg->src + 1)), - *((const float *)(arg->src + 2)), - *((const float *)(arg->src + 3)) ); - - arg->reg_maps->constantsF[reg] = 1; -} - /* First pass: trace shader, initialize length and version */ void shader_trace_init( IWineD3DBaseShader *iface,

1 0

Ge van Geldorp : kernel32: "base" is a pointer in 16-bit global heap.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: d9157a3586424e09e8235fbac879096a336065a2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d9157a3586424e09e8235fb… Author: Ge van Geldorp <ge(a)gse.nl> Date: Tue Jun 20 09:34:48 2006 +0200 kernel32: "base" is a pointer in 16-bit global heap. --- dlls/kernel/global16.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel/global16.c b/dlls/kernel/global16.c index d0932af..2bf2c49 100644 --- a/dlls/kernel/global16.c +++ b/dlls/kernel/global16.c @@ -50,7 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(global); /* Global arena block */ typedef struct { - DWORD base; /* Base address (0 if discarded) */ + DWORD_PTR base; /* Base address (0 if discarded) */ DWORD size; /* Size in bytes (0 indicates a free block) */ HGLOBAL16 handle; /* Handle for this block */ HGLOBAL16 hOwner; /* Owner of this block */ @@ -155,7 +155,7 @@ HGLOBAL16 GLOBAL_CreateBlock( WORD flags /* Fill the arena block */ - pArena->base = (DWORD)ptr; + pArena->base = (DWORD_PTR)ptr; pArena->size = GetSelectorLimit16(sel) + 1; pArena->handle = (flags & GMEM_MOVEABLE) ? sel - 1 : sel; pArena->hOwner = hOwner;

1 0

James Hawkins : tools/wine.inf: Add d3d8.dll to the fake dlls list.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: ce24c2a8a706cb016c2aaef7deb629e4ba7cca93 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ce24c2a8a706cb016c2aaef… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jun 20 01:07:46 2006 -0700 tools/wine.inf: Add d3d8.dll to the fake dlls list. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index f822c1f..4f922df 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2121,6 +2121,7 @@ HKLM,%CurrentVersion%\Telephony\Country 11,,comdlg32.dll 11,,control.exe 11,,crypt32.dll +11,,d3d8.dll 11,,dbghelp.dll 11,,ddraw.dll 11,,gdi32.dll

1 0

Ge van Geldorp : winedbg: Added x86_64 support.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: e08a176007b0bb0589b05df41387b96928e641ee URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e08a176007b0bb0589b05df… Author: Ge van Geldorp <ge(a)gse.nl> Date: Tue Jun 20 09:34:43 2006 +0200 winedbg: Added x86_64 support. --- programs/winedbg/Makefile.in | 1 programs/winedbg/be_x86_64.c | 154 ++++++++++++++++++++++++++++++++++++++++++ programs/winedbg/gdbproxy.c | 27 +++++++ programs/winedbg/winedbg.c | 4 + 4 files changed, 186 insertions(+), 0 deletions(-) create mode 100644 programs/winedbg/be_x86_64.c diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index eb2b6a4..cbfec6f 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ be_alpha.c \ be_i386.c \ be_ppc.c \ + be_x86_64.c \ break.c \ db_disasm.c \ display.c \ diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c new file mode 100644 index 0000000..0c90609 --- /dev/null +++ b/programs/winedbg/be_x86_64.c @@ -0,0 +1,154 @@ +/* + * Debugger x86_64 specific functions + * + * Copyright 2004 Vincent B�ron + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "debugger.h" + +#if defined(__x86_64__) + +static unsigned be_x86_64_get_addr(HANDLE hThread, const CONTEXT* ctx, + enum be_cpu_addr bca, ADDRESS* addr) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static void be_x86_64_single_step(CONTEXT* ctx, unsigned enable) +{ + dbg_printf("not done\n"); +} + +static void be_x86_64_print_context(HANDLE hThread, const CONTEXT* ctx) +{ + dbg_printf("Context printing for x86_64 not done yet\n"); +} + +static void be_x86_64_print_segment_info(HANDLE hThread, const CONTEXT* ctx) +{ +} + +static struct dbg_internal_var be_x86_64_ctx[] = +{ + {0, NULL, 0, dbg_itype_none} +}; + +static const struct dbg_internal_var* be_x86_64_init_registers(CONTEXT* ctx) +{ + dbg_printf("not done\n"); + return be_x86_64_ctx; +} + +static unsigned be_x86_64_is_step_over_insn(void* insn) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static unsigned be_x86_64_is_function_return(void* insn) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static unsigned be_x86_64_is_break_insn(void* insn) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static unsigned be_x86_64_is_func_call(void* insn, void** insn_callee) +{ + return FALSE; +} + +static void be_x86_64_disasm_one_insn(ADDRESS* addr, int display) +{ + dbg_printf("Disasm NIY\n"); +} + +static unsigned be_x86_64_insert_Xpoint(HANDLE hProcess, const struct be_process_io* pio, + CONTEXT* ctx, enum be_xpoint_type type, + void* addr, unsigned long* val, unsigned size) +{ + dbg_printf("not done\n"); + return 0; +} + +static unsigned be_x86_64_remove_Xpoint(HANDLE hProcess, const struct be_process_io* pio, + CONTEXT* ctx, enum be_xpoint_type type, + void* addr, unsigned long val, unsigned size) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static unsigned be_x86_64_is_watchpoint_set(const CONTEXT* ctx, unsigned idx) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static void be_x86_64_clear_watchpoint(CONTEXT* ctx, unsigned idx) +{ + dbg_printf("not done\n"); +} + +static int be_x86_64_adjust_pc_for_break(CONTEXT* ctx, BOOL way) +{ + dbg_printf("not done\n"); + return 0; +} + +static int be_x86_64_fetch_integer(const struct dbg_lvalue* lvalue, unsigned size, + unsigned ext_sign, LONGLONG* ret) +{ + dbg_printf("not done\n"); + return FALSE; +} + +static int be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, + long double* ret) +{ + dbg_printf("not done\n"); + return FALSE; +} + +struct backend_cpu be_x86_64 = +{ + be_cpu_linearize, + be_cpu_build_addr, + be_x86_64_get_addr, + be_x86_64_single_step, + be_x86_64_print_context, + be_x86_64_print_segment_info, + be_x86_64_init_registers, + be_x86_64_is_step_over_insn, + be_x86_64_is_function_return, + be_x86_64_is_break_insn, + be_x86_64_is_func_call, + be_x86_64_disasm_one_insn, + be_x86_64_insert_Xpoint, + be_x86_64_remove_Xpoint, + be_x86_64_is_watchpoint_set, + be_x86_64_clear_watchpoint, + be_x86_64_adjust_pc_for_break, + be_x86_64_fetch_integer, + be_x86_64_fetch_float, +}; +#endif diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 5e4cf29..45a4522 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -338,6 +338,33 @@ static size_t cpu_register_map[] = { FIELD_OFFSET(CONTEXT, Fpcr), FIELD_OFFSET(CONTEXT, SoftFpcr), }; +#elif defined(__x86_64__) +static size_t cpu_register_map[] = { + FIELD_OFFSET(CONTEXT, Rax), + FIELD_OFFSET(CONTEXT, Rbx), + FIELD_OFFSET(CONTEXT, Rcx), + FIELD_OFFSET(CONTEXT, Rdx), + FIELD_OFFSET(CONTEXT, Rsi), + FIELD_OFFSET(CONTEXT, Rdi), + FIELD_OFFSET(CONTEXT, Rbp), + FIELD_OFFSET(CONTEXT, Rsp), + FIELD_OFFSET(CONTEXT, R8), + FIELD_OFFSET(CONTEXT, R9), + FIELD_OFFSET(CONTEXT, R10), + FIELD_OFFSET(CONTEXT, R11), + FIELD_OFFSET(CONTEXT, R12), + FIELD_OFFSET(CONTEXT, R13), + FIELD_OFFSET(CONTEXT, R14), + FIELD_OFFSET(CONTEXT, R15), + FIELD_OFFSET(CONTEXT, Rip), + FIELD_OFFSET(CONTEXT, EFlags), + FIELD_OFFSET(CONTEXT, SegCs), + FIELD_OFFSET(CONTEXT, SegSs), + FIELD_OFFSET(CONTEXT, SegDs), + FIELD_OFFSET(CONTEXT, SegEs), + FIELD_OFFSET(CONTEXT, SegFs), + FIELD_OFFSET(CONTEXT, SegGs), +}; #else # error Define the registers map for your CPU #endif diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 8e317c5..5810c78 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -479,6 +479,8 @@ #elif __powerpc__ extern struct backend_cpu be_ppc; #elif __ALPHA__ extern struct backend_cpu be_alpha; +#elif __x86_64__ +extern struct backend_cpu be_x86_64; #else # error CPU unknown #endif @@ -495,6 +497,8 @@ #elif __powerpc__ be_cpu = &be_ppc; #elif __ALPHA__ be_cpu = &be_alpha; +#elif __x86_64__ + be_cpu = &be_x86_64; #else # error CPU unknown #endif

1 0

Mikołaj Zalewski : shell32: Remove the now unused SHELL_ConfirmDialog.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 6352734eaeb635f23314af2778ed196d680d2b35 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6352734eaeb635f23314af2… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Jun 20 09:48:37 2006 +0200 shell32: Remove the now unused SHELL_ConfirmDialog. --- dlls/shell32/shlfileop.c | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 055b91d..5b650e7 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -95,23 +95,6 @@ static BOOL SHELL_ConfirmIDs(int nKindOf return FALSE; } -BOOL SHELL_ConfirmDialog(int nKindOfDialog, LPCSTR szDir) -{ - CHAR szCaption[255], szText[255], szBuffer[MAX_PATH + 256]; - SHELL_ConfirmIDstruc ids; - - if (!SHELL_ConfirmIDs(nKindOfDialog, &ids)) - return FALSE; - - LoadStringA(shell32_hInstance, ids.caption_resource_id, szCaption, sizeof(szCaption)); - LoadStringA(shell32_hInstance, ids.text_resource_id, szText, sizeof(szText)); - - FormatMessageA(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - szText, 0, 0, szBuffer, sizeof(szBuffer), (va_list*)&szDir); - - return (IDOK == MessageBoxA(GetActiveWindow(), szBuffer, szCaption, MB_OKCANCEL | MB_ICONEXCLAMATION)); -} - BOOL SHELL_ConfirmDialogW(int nKindOfDialog, LPCWSTR szDir) { WCHAR szCaption[255], szText[255], szBuffer[MAX_PATH + 256];

1 0

Mikołaj Zalewski : shell32: Use SHELL_ConfirmDialogW when deleting multiple files.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 529346e8f4c3c2d73466681ebe0a898d1d695a2c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=529346e8f4c3c2d73466681… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Jun 20 09:47:11 2006 +0200 shell32: Use SHELL_ConfirmDialogW when deleting multiple files. --- dlls/shell32/shell32_main.h | 2 +- dlls/shell32/shfldr_fs.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 7ead345..32d002f 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -149,7 +149,7 @@ #define ASK_OVERWRITE_FILE 5 BOOL SHELL_DeleteDirectoryW(LPCWSTR pwszDir, BOOL bShowUI); BOOL SHELL_DeleteFileW(LPCWSTR pwszFile, BOOL bShowUI); -BOOL SHELL_ConfirmDialog(int nKindOfDialog, LPCSTR szDir); +BOOL SHELL_ConfirmDialogW(int nKindOfDialog, LPCWSTR szDir); /* 16-bit functions */ void WINAPI DragAcceptFiles16(HWND16 hWnd, BOOL16 b); diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 1ac8d0f..d683007 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -1172,10 +1172,11 @@ ISFHelper_fnDeleteItems (ISFHelper * ifa /* deleting multiple items so give a slightly different warning */ if (cidl != 1) { - char tmp[8]; + WCHAR tmp[8]; + static const WCHAR format[] = {'%','d',0}; - snprintf (tmp, sizeof (tmp), "%d", cidl); - if (!SHELL_ConfirmDialog(ASK_DELETE_MULTIPLE_ITEM, tmp)) + wnsprintfW (tmp, sizeof(tmp)/sizeof(tmp[0]), format, cidl); + if (!SHELL_ConfirmDialogW(ASK_DELETE_MULTIPLE_ITEM, tmp)) return E_FAIL; bConfirm = FALSE; }

1 0

Juan Lang : crypt32: Simplify CRL creation.
by Alexandre Julliard 20 Jun '06

20 Jun '06

Module: wine Branch: refs/heads/master Commit: 13e006a715376f76241471f7af4599642c47b3bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=13e006a715376f76241471f… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Jun 19 14:11:37 2006 -0700 crypt32: Simplify CRL creation. Decoding already handles signed and unsigned CRLs, so don't duplicate that in CertCreateCRLContext. --- dlls/crypt32/crl.c | 25 +++---------------------- 1 files changed, 3 insertions(+), 22 deletions(-) diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index dd2918c..08bb139 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -32,7 +32,6 @@ PCCRL_CONTEXT WINAPI CertCreateCRLContex { PCRL_CONTEXT crl = NULL; BOOL ret; - PCERT_SIGNED_CONTENT_INFO signedCrl = NULL; PCRL_INFO crlInfo = NULL; DWORD size = 0; @@ -44,27 +43,9 @@ PCCRL_CONTEXT WINAPI CertCreateCRLContex SetLastError(E_INVALIDARG); return NULL; } - /* First try to decode it as a signed crl. */ - ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT, pbCrlEncoded, - cbCrlEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&signedCrl, &size); - if (ret) - { - size = 0; - ret = CryptDecodeObjectEx(dwCertEncodingType, - X509_CERT_CRL_TO_BE_SIGNED, signedCrl->ToBeSigned.pbData, - signedCrl->ToBeSigned.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, - (BYTE *)&crlInfo, &size); - LocalFree(signedCrl); - } - /* Failing that, try it as an unsigned crl */ - if (!ret) - { - size = 0; - ret = CryptDecodeObjectEx(dwCertEncodingType, - X509_CERT_CRL_TO_BE_SIGNED, pbCrlEncoded, cbCrlEncoded, - CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, - (BYTE *)&crlInfo, &size); - } + ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT_CRL_TO_BE_SIGNED, + pbCrlEncoded, cbCrlEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, + (BYTE *)&crlInfo, &size); if (ret) { BYTE *data = NULL;

1 0