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

Francois Gouget : shell32/tests: Remove spaces before '\n'.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 1cc79eaef74a6073b936cdb65fe7e06ff8384f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc79eaef74a6073b936cdb65… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:23:44 2010 +0100 shell32/tests: Remove spaces before '\n'. --- dlls/shell32/tests/shlexec.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index ffdf393..ef69e19 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -878,7 +878,7 @@ static void test_lpFile_parsed(void) rc=shell_execute(NULL, fileA, NULL, NULL); todo_wine { ok(rc>32, - "expected success (33), got %s (%d), lpFile: %s \n", + "expected success (33), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); } @@ -888,7 +888,7 @@ static void test_lpFile_parsed(void) sprintf(fileA, testfile, tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); ok(rc>32 || broken(rc == 2) /* Win95/NT4 */, - "expected success (33), got %s (%d), lpFile: %s \n", + "expected success (33), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); @@ -897,7 +897,7 @@ static void test_lpFile_parsed(void) sprintf(fileA, testfile, tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); ok(rc==2, - "expected failure (2), got %s (%d), lpFile: %s \n", + "expected failure (2), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); @@ -907,7 +907,7 @@ static void test_lpFile_parsed(void) rc=shell_execute(NULL, fileA, NULL, NULL); todo_wine { ok(rc>32 || broken(rc == 2) /* Win9x/2000 */, - "expected success (33), got %s (%d), lpFile: %s \n", + "expected success (33), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); } @@ -917,7 +917,7 @@ static void test_lpFile_parsed(void) sprintf(fileA, testfile, tmpdir); rc=shell_execute(NULL, fileA, NULL, NULL); ok(rc>32, - "expected success (33), got %s (%d), lpFile: %s \n", + "expected success (33), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); @@ -927,7 +927,7 @@ static void test_lpFile_parsed(void) rc=shell_execute(NULL, fileA, NULL, NULL); todo_wine { ok(rc==2, - "expected failure (2), got %s (%d), lpFile: %s \n", + "expected failure (2), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); } @@ -938,7 +938,7 @@ static void test_lpFile_parsed(void) rc=shell_execute(NULL, fileA, NULL, NULL); todo_wine { ok(rc==2, - "expected failure (2), got %s (%d), lpFile: %s \n", + "expected failure (2), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); } @@ -948,7 +948,7 @@ static void test_lpFile_parsed(void) sprintf(fileA, testfile, shorttmpdir); rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, NULL, fileA, NULL, NULL); ok(rc>32, - "expected success (33), got %s (%d), lpFile: %s \n", + "expected success (33), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); @@ -957,7 +957,7 @@ static void test_lpFile_parsed(void) sprintf(fileA, testfile, shorttmpdir); rc=shell_execute_ex(SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI, NULL, fileA, NULL, NULL); ok(rc>32 || broken(rc == 2) /* Win95/NT4 */, - "expected success (33), got %s (%d), lpFile: %s \n", + "expected success (33), got %s (%d), lpFile: %s\n", rc > 32 ? "success" : "failure", rc, fileA ); }

1 0

Francois Gouget : Assorted spelling and case fixes.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 3428b94a8d8db96ff157c3c9144679ef9946898a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3428b94a8d8db96ff157c3c91… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:24:53 2010 +0100 Assorted spelling and case fixes. --- dlls/d3dx9_36/tests/shader.c | 2 +- dlls/inetcomm/tests/mimeintl.c | 2 +- dlls/kernel32/tests/path.c | 2 +- dlls/mmdevapi/tests/propstore.c | 2 +- dlls/mmdevapi/tests/render.c | 4 ++-- dlls/msdaps/row_server.c | 8 ++++---- dlls/mshtml/view.c | 2 +- dlls/msvfw32/mciwnd.c | 2 +- dlls/oleaut32/tests/dispatch.c | 2 +- dlls/oleaut32/tests/olefont.c | 5 +++-- dlls/qedit/samplegrabber.c | 2 +- dlls/quartz/tests/dsoundrender.c | 2 +- dlls/shlwapi/ordinal.c | 2 +- dlls/shlwapi/tests/ordinal.c | 4 ++-- dlls/shlwapi/url.c | 2 +- dlls/urlmon/urlmon_urlmon.idl | 2 +- dlls/urlmon/usrmarshal.c | 2 +- dlls/user32/tests/combo.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- dlls/winmm/winmm.c | 2 +- include/amaudio.h | 2 +- include/devpkey.h | 2 +- include/devpropdef.h | 2 +- include/propkey.h | 2 +- 24 files changed, 31 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3428b94a8d8db96ff157c…

1 0

Eric Pouech : dbghelp: Added helper to image_file_map to map also directory out of PE executables .
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 2ed8b9f6b6aac5580d2ce5dd064e8bf26272bb9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed8b9f6b6aac5580d2ce5dd0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 20 09:47:18 2010 +0100 dbghelp: Added helper to image_file_map to map also directory out of PE executables. --- dlls/dbghelp/dbghelp_private.h | 3 +++ dlls/dbghelp/pe_module.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 5ea2e82..42234ee 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -570,6 +570,9 @@ extern struct module* DWORD64 base, DWORD64 size); extern BOOL pe_load_debug_info(const struct process* pcs, struct module* module); +extern const char* pe_map_directory(struct module* module, int dirno, DWORD* size); +extern void pe_unmap_directoy(struct module* module, int dirno); + /* source.c */ extern unsigned source_new(struct module* module, const char* basedir, const char* source); extern const char* source_get(const struct module* module, unsigned idx); diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 63a2b9a..61b8c5e 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -257,6 +257,35 @@ static void pe_unmap_file(struct image_file_map* fmap) } } +/****************************************************************** + * pe_map_directory + * + * Maps a directory content out of a PE file + */ +const char* pe_map_directory(struct module* module, int dirno, DWORD* size) +{ + IMAGE_NT_HEADERS* nth; + void* mapping; + + if (module->type != DMT_PE || !module->format_info[DFI_PE]) return NULL; + if (dirno >= IMAGE_NUMBEROF_DIRECTORY_ENTRIES || + !(mapping = pe_map_full(&module->format_info[DFI_PE]->u.pe_info->fmap, &nth))) + return NULL; + if (size) *size = nth->OptionalHeader.DataDirectory[dirno].Size; + return RtlImageRvaToVa(nth, mapping, + nth->OptionalHeader.DataDirectory[dirno].VirtualAddress, NULL); +} + +/****************************************************************** + * pe_unmap_directory + * + * Unmaps a directory content + */ +void pe_unmap_directory(struct image_file_map* fmap, int dirno) +{ + pe_unmap_full(fmap); +} + static void pe_module_remove(struct process* pcs, struct module_format* modfmt) { pe_unmap_file(&modfmt->u.pe_info->fmap);

1 0

Eric Pouech : dbghelp: Implemented SymFunctionTableAccess.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: bf97b03db5daea7d0d622fa21d2a40875fe259f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf97b03db5daea7d0d622fa21… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 20 09:47:24 2010 +0100 dbghelp: Implemented SymFunctionTableAccess. --- dlls/dbghelp/cpu_i386.c | 1 + dlls/dbghelp/cpu_ppc.c | 1 + dlls/dbghelp/cpu_x86_64.c | 30 ++++++++++++++++++++++++++++++ dlls/dbghelp/dbghelp_private.h | 3 +++ dlls/dbghelp/module.c | 23 +++++++++++++++++++++++ dlls/dbghelp/symbol.c | 18 ------------------ 6 files changed, 58 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index f3de652..47610e6 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -409,4 +409,5 @@ struct cpu cpu_i386 = { 4, i386_get_addr, i386_stack_walk, + NULL, }; diff --git a/dlls/dbghelp/cpu_ppc.c b/dlls/dbghelp/cpu_ppc.c index fca5ec7..6efa3f8 100644 --- a/dlls/dbghelp/cpu_ppc.c +++ b/dlls/dbghelp/cpu_ppc.c @@ -59,4 +59,5 @@ struct cpu cpu_ppc = { 4, ppc_get_addr, ppc_stack_walk, + NULL, }; diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c index cd0e32c..a56a800 100644 --- a/dlls/dbghelp/cpu_x86_64.c +++ b/dlls/dbghelp/cpu_x86_64.c @@ -124,9 +124,39 @@ done_err: return FALSE; } +static void* x86_64_find_runtime_function(struct module* module, DWORD64 addr) +{ +#ifdef __x86_64__ + RUNTIME_FUNCTION* rtf; + ULONG size; + int min, max; + + rtf = (RUNTIME_FUNCTION*)pe_map_directory(module, IMAGE_DIRECTORY_ENTRY_EXCEPTION, &size); + if (rtf) for (min = 0, max = size / sizeof(*rtf); min <= max; ) + { + int pos = (min + max) / 2; + if (addr < module->module.BaseOfImage + rtf[pos].BeginAddress) max = pos - 1; + else if (addr >= module->module.BaseOfImage + rtf[pos].EndAddress) min = pos + 1; + else + { + rtf += pos; + while (rtf->UnwindData & 1) /* follow chained entry */ + { + FIXME("RunTime_Function outside IMAGE_DIRECTORY_ENTRY_EXCEPTION unimplemented yet!\n"); + /* we need to read into the other process */ + /* rtf = (RUNTIME_FUNCTION*)(module->module.BaseOfImage + (rtf->UnwindData & ~1)); */ + } + return rtf; + } + } +#endif + return NULL; +} + struct cpu cpu_x86_64 = { IMAGE_FILE_MACHINE_AMD64, 8, x86_64_get_addr, x86_64_stack_walk, + x86_64_find_runtime_function, }; diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 42234ee..54b7272 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -475,6 +475,9 @@ struct cpu /* stack manipulation */ BOOL (*stack_walk)(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame); + + /* module manipulation */ + void* (*find_runtime_function)(struct module*, DWORD64 addr); }; extern struct cpu* dbghelp_current_cpu; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 250c5a5..eadc67a 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1087,3 +1087,26 @@ BOOL WINAPI SymRefreshModuleList(HANDLE hProcess) return refresh_module_list(pcs); } + +/*********************************************************************** + * SymFunctionTableAccess (DBGHELP.@) + */ +PVOID WINAPI SymFunctionTableAccess(HANDLE hProcess, DWORD AddrBase) +{ + return SymFunctionTableAccess64(hProcess, AddrBase); +} + +/*********************************************************************** + * SymFunctionTableAccess64 (DBGHELP.@) + */ +PVOID WINAPI SymFunctionTableAccess64(HANDLE hProcess, DWORD64 AddrBase) +{ + struct process* pcs = process_find_by_handle(hProcess); + struct module* module; + + if (!pcs || !dbghelp_current_cpu->find_runtime_function) return NULL; + module = module_find_by_addr(pcs, AddrBase, DMT_UNKNOWN); + if (!module) return NULL; + + return dbghelp_current_cpu->find_runtime_function(module, AddrBase); +} diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 650f6a2..fa9459e 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1794,24 +1794,6 @@ BOOL WINAPI SymGetLineNext(HANDLE hProcess, PIMAGEHLP_LINE Line) } /*********************************************************************** - * SymFunctionTableAccess (DBGHELP.@) - */ -PVOID WINAPI SymFunctionTableAccess(HANDLE hProcess, DWORD AddrBase) -{ - WARN("(%p, 0x%08x): stub\n", hProcess, AddrBase); - return NULL; -} - -/*********************************************************************** - * SymFunctionTableAccess64 (DBGHELP.@) - */ -PVOID WINAPI SymFunctionTableAccess64(HANDLE hProcess, DWORD64 AddrBase) -{ - WARN("(%p, %s): stub\n", hProcess, wine_dbgstr_longlong(AddrBase)); - return NULL; -} - -/*********************************************************************** * SymUnDName (DBGHELP.@) */ BOOL WINAPI SymUnDName(PIMAGEHLP_SYMBOL sym, PSTR UnDecName, DWORD UnDecNameLength)

1 0

Eric Pouech : dbghelp: Removed the not-useful start_data field out of dwarf2_traverse_context_t.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: d822aaff926cd7008864c9a6f76ca1fe3560203a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d822aaff926cd7008864c9a6f… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 20 09:47:54 2010 +0100 dbghelp: Removed the not-useful start_data field out of dwarf2_traverse_context_t. --- dlls/dbghelp/dwarf.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 199b3bb..2432f89 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -167,7 +167,6 @@ enum dwarf2_sections {section_debug, section_string, section_abbrev, section_lin typedef struct dwarf2_traverse_context_s { const unsigned char* data; - const unsigned char* start_data; const unsigned char* end_data; unsigned char word_size; } dwarf2_traverse_context_t; @@ -1957,12 +1956,11 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, return FALSE; traverse.data = sections[section_line].address + offset; - traverse.start_data = traverse.data; traverse.end_data = traverse.data + 4; traverse.word_size = ctx->word_size; length = dwarf2_parse_u4(&traverse); - traverse.end_data = traverse.start_data + length; + traverse.end_data = sections[section_line].address + offset + length; version = dwarf2_parse_u2(&traverse); header_len = dwarf2_parse_u4(&traverse); @@ -2130,7 +2128,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, BOOL ret = FALSE; cu_length = dwarf2_parse_u4(mod_ctx); - cu_ctx.data = cu_ctx.start_data = mod_ctx->data; + cu_ctx.data = mod_ctx->data; cu_ctx.end_data = mod_ctx->data + cu_length; mod_ctx->data += cu_length; cu_version = dwarf2_parse_u2(&cu_ctx); @@ -2162,8 +2160,7 @@ static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, memset(ctx.symt_cache, 0, sizeof(ctx.symt_cache)); ctx.symt_cache[sc_void] = &symt_new_basic(module, btVoid, "void", 0)->symt; - abbrev_ctx.start_data = sections[section_abbrev].address + cu_abbrev_offset; - abbrev_ctx.data = abbrev_ctx.start_data; + abbrev_ctx.data = sections[section_abbrev].address + cu_abbrev_offset; abbrev_ctx.end_data = sections[section_abbrev].address + sections[section_abbrev].size; abbrev_ctx.word_size = cu_ctx.word_size; dwarf2_parse_abbrev_set(&abbrev_ctx, &ctx.abbrev_table, &ctx.pool); @@ -2416,10 +2413,9 @@ BOOL dwarf2_parse(struct module* module, unsigned long load_offset, TRACE("Loading Dwarf2 information for %s\n", debugstr_w(module->module.ModuleName)); - mod_ctx.start_data = mod_ctx.data = section[section_debug].address; + mod_ctx.data = section[section_debug].address; mod_ctx.end_data = mod_ctx.data + section[section_debug].size; - dwarf2_modfmt = HeapAlloc(GetProcessHeap(), 0, sizeof(*dwarf2_modfmt)); if (!dwarf2_modfmt) return FALSE; dwarf2_modfmt->module = module;

1 0

Eric Pouech : dbghelp: Fix local/parameters enumeration on 64bit platforms.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 375d158da75660535ff90e36a62e468d00c6463d URL: http://source.winehq.org/git/wine.git/?a=commit;h=375d158da75660535ff90e36a… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 20 09:48:07 2010 +0100 dbghelp: Fix local/parameters enumeration on 64bit platforms. --- dlls/dbghelp/symbol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index fa9459e..e53b583 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1016,7 +1016,7 @@ static BOOL symt_enum_locals(struct process* pcs, const char* mask, { struct module_pair pair; struct symt_ht* sym; - DWORD pc = pcs->ctx_frame.InstructionOffset; + DWORD_PTR pc = pcs->ctx_frame.InstructionOffset; se->sym_info->SizeOfStruct = sizeof(*se->sym_info); se->sym_info->MaxNameLen = sizeof(se->buffer) - sizeof(SYMBOL_INFO);

1 0

Eric Pouech : dbghelp: Properly bail out if get an error while reading ELF header.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 4c3361e39e636eec51c1651460d2b72c4a139007 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3361e39e636eec51c165146… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Mar 20 09:48:13 2010 +0100 dbghelp: Properly bail out if get an error while reading ELF header. --- dlls/dbghelp/elf_module.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 573a040..e0fab9c 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -272,7 +272,12 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) lseek(fmap->u.elf.fd, fmap->u.elf.elfhdr.e_shoff, SEEK_SET); for (i = 0; i < fmap->u.elf.elfhdr.e_shnum; i++) { - read(fmap->u.elf.fd, &fmap->u.elf.sect[i].shdr, sizeof(fmap->u.elf.sect[i].shdr)); + if (read(fmap->u.elf.fd, &fmap->u.elf.sect[i].shdr, sizeof(fmap->u.elf.sect[i].shdr)) != sizeof(fmap->u.elf.sect[i].shdr)) + { + HeapFree(GetProcessHeap, 0, fmap->u.elf.sect); + fmap->u.elf.sect = NULL; + goto done; + } fmap->u.elf.sect[i].mapped = IMAGE_NO_MAP; }

1 0

Vincent Povirk : ole32: Check the small block size limit of storage files.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 49a817c064e73e60173914306dd81d95690f3923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a817c064e73e60173914306… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 20 14:28:09 2010 -0500 ole32: Check the small block size limit of storage files. This value is stored in the storage file header. We currently hard-code it to 0x1000. I don't expect to see files in the wild with other values, but according to MS this is a valid configuration. For now, just fail if we see another value. I've also upgraded the message for unexpected values in storage file headers to a fixme, since they are valid according to MS. --- dlls/ole32/storage32.c | 18 +++++++++++++++--- dlls/ole32/storage32.h | 4 ++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a15e3db..e1ba8a3 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2665,6 +2665,7 @@ static HRESULT StorageImpl_Construct( This->bigBlockDepotCount = 1; This->bigBlockDepotStart[0] = 0; This->rootStartBlock = 1; + This->smallBlockLimit = LIMIT_TO_USE_SMALL_BLOCK; This->smallBlockDepotStart = BLOCK_END_OF_CHAIN; This->bigBlockSizeBits = DEF_BIG_BLOCK_SIZE_BITS; This->smallBlockSizeBits = DEF_SMALL_BLOCK_SIZE_BITS; @@ -3352,6 +3353,11 @@ static HRESULT StorageImpl_LoadFileHeader( StorageUtl_ReadDWord( headerBigBlock, + OFFSET_SMALLBLOCKLIMIT, + &This->smallBlockLimit); + + StorageUtl_ReadDWord( + headerBigBlock, OFFSET_SBDEPOTSTART, &This->smallBlockDepotStart); @@ -3384,9 +3390,11 @@ static HRESULT StorageImpl_LoadFileHeader( * blocks, just make sure they are what we're expecting. */ if ((This->bigBlockSize != MIN_BIG_BLOCK_SIZE && This->bigBlockSize != MAX_BIG_BLOCK_SIZE) || - This->smallBlockSize != DEF_SMALL_BLOCK_SIZE) + This->smallBlockSize != DEF_SMALL_BLOCK_SIZE || + This->smallBlockLimit != LIMIT_TO_USE_SMALL_BLOCK) { - WARN("Broken OLE storage file\n"); + FIXME("Broken OLE storage file? bigblock=0x%x, smallblock=0x%x, sblimit=0x%x\n", + This->bigBlockSize, This->smallBlockSize, This->smallBlockLimit); hr = STG_E_INVALIDHEADER; } else @@ -3440,7 +3448,6 @@ static void StorageImpl_SaveFileHeader( StorageUtl_WriteWord(headerBigBlock, 0x18, 0x3b); StorageUtl_WriteWord(headerBigBlock, 0x1a, 0x3); StorageUtl_WriteWord(headerBigBlock, 0x1c, (WORD)-2); - StorageUtl_WriteDWord(headerBigBlock, 0x38, (DWORD)0x1000); } /* @@ -3468,6 +3475,11 @@ static void StorageImpl_SaveFileHeader( StorageUtl_WriteDWord( headerBigBlock, + OFFSET_SMALLBLOCKLIMIT, + This->smallBlockLimit); + + StorageUtl_WriteDWord( + headerBigBlock, OFFSET_SBDEPOTSTART, This->smallBlockDepotStart); diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index dfa5d1a..98ec6d1 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -46,6 +46,7 @@ static const ULONG OFFSET_BIGBLOCKSIZEBITS = 0x0000001e; static const ULONG OFFSET_SMALLBLOCKSIZEBITS = 0x00000020; static const ULONG OFFSET_BBDEPOTCOUNT = 0x0000002C; static const ULONG OFFSET_ROOTSTARTBLOCK = 0x00000030; +static const ULONG OFFSET_SMALLBLOCKLIMIT = 0x00000038; static const ULONG OFFSET_SBDEPOTSTART = 0x0000003C; static const ULONG OFFSET_SBDEPOTCOUNT = 0x00000040; static const ULONG OFFSET_EXTBBDEPOTSTART = 0x00000044; @@ -97,6 +98,8 @@ static const ULONG DIRENTRY_NULL = 0xFFFFFFFF; #define STGTY_ROOT 0x05 #define COUNT_BBDEPOTINHEADER 109 + +/* FIXME: This value is stored in the header, but we hard-code it to 0x1000. */ #define LIMIT_TO_USE_SMALL_BLOCK 0x1000 #define STGM_ACCESS_MODE(stgm) ((stgm)&0x0000f) @@ -351,6 +354,7 @@ struct StorageImpl ULONG smallBlockSize; ULONG bigBlockDepotCount; ULONG rootStartBlock; + ULONG smallBlockLimit; ULONG smallBlockDepotStart; ULONG extBigBlockDepotStart; ULONG extBigBlockDepotCount;

1 0

Francois Gouget : winemapi: Add a trailing '\n' to FIXME()s.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: c61732c33cff56fb667bda8ffc45ca7da7590d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c61732c33cff56fb667bda8ff… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:23:18 2010 +0100 winemapi: Add a trailing '\n' to FIXME()s. --- dlls/winemapi/main.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winemapi/main.c b/dlls/winemapi/main.c index 5b6faef..a954ab7 100644 --- a/dlls/winemapi/main.c +++ b/dlls/winemapi/main.c @@ -43,28 +43,28 @@ ULONG WINAPI MAPIAddress(LHANDLE session, ULONG_PTR uiparam, LPSTR caption, ULONG editfields, LPSTR labels, ULONG nRecips, lpMapiRecipDesc lpRecips, FLAGS flags, ULONG reserved, LPULONG newRecips, lpMapiRecipDesc * lppNewRecips) { - FIXME("(stub)"); + FIXME("(stub)\n"); return MAPI_E_NOT_SUPPORTED; } ULONG WINAPI MAPIDeleteMail(LHANDLE session, ULONG_PTR uiparam, LPSTR msg_id, FLAGS flags, ULONG reserved) { - FIXME("(stub)"); + FIXME("(stub)\n"); return MAPI_E_NOT_SUPPORTED; } ULONG WINAPI MAPIDetails(LHANDLE session, ULONG_PTR uiparam, lpMapiRecipDesc recip, FLAGS flags, ULONG reserved) { - FIXME("(stub)"); + FIXME("(stub)\n"); return MAPI_E_NOT_SUPPORTED; } ULONG WINAPI MAPIFindNext(LHANDLE session, ULONG_PTR uiparam, LPSTR msg_type, LPSTR seed_msg_id, FLAGS flags, ULONG reserved, LPSTR msg_id) { - FIXME("(stub)"); + FIXME("(stub)\n"); return MAPI_E_NOT_SUPPORTED; } @@ -92,20 +92,20 @@ ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags, ULONG WINAPI MAPIReadMail(LHANDLE session, ULONG_PTR uiparam, LPSTR msg_id, FLAGS flags, ULONG reserved, lpMapiMessage msg) { - FIXME("(stub)"); + FIXME("(stub)\n"); return MAPI_E_NOT_SUPPORTED; } ULONG WINAPI MAPIResolveName(LHANDLE session, ULONG_PTR uiparam, LPSTR name, FLAGS flags, ULONG reserved, lpMapiRecipDesc *recip) { - FIXME("(stub)"); + FIXME("(stub)\n"); return MAPI_E_NOT_SUPPORTED; } ULONG WINAPI MAPISaveMail(LHANDLE session, ULONG_PTR uiparam, lpMapiMessage msg, FLAGS flags, ULONG reserved, LPSTR msg_id) { - FIXME("(stub)"); + FIXME("(stub)\n"); return MAPI_E_NOT_SUPPORTED; }

1 0

Francois Gouget : rsaenh: Use NULL instead of casting 0.
by Alexandre Julliard 22 Mar '10

22 Mar '10

Module: wine Branch: master Commit: 716d6dcce08ac5b73de6ca9381d1cf0ebf40632c URL: http://source.winehq.org/git/wine.git/?a=commit;h=716d6dcce08ac5b73de6ca938… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 20 15:23:49 2010 +0100 rsaenh: Use NULL instead of casting 0. --- dlls/rsaenh/sha2.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/rsaenh/sha2.c b/dlls/rsaenh/sha2.c index 559323c..d15e6fb 100644 --- a/dlls/rsaenh/sha2.c +++ b/dlls/rsaenh/sha2.c @@ -273,7 +273,7 @@ static const char sha2_hex_digits[] = "0123456789abcdef"; /*** SHA-256: *********************************************************/ void SHA256_Init(SHA256_CTX* context) { - if (context == (SHA256_CTX*)0) { + if (context == NULL) { return; } MEMCPY_BCOPY(context->state, sha256_initial_hash_value, SHA256_DIGEST_LENGTH); @@ -465,7 +465,7 @@ void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) { } /* Sanity check: */ - assert(context != (SHA256_CTX*)0 && data != (sha2_byte*)0); + assert(context != NULL && data != NULL); usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH; if (usedspace > 0) { @@ -509,10 +509,10 @@ void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) { unsigned int usedspace; /* Sanity check: */ - assert(context != (SHA256_CTX*)0); + assert(context != NULL); /* If no digest buffer is passed, we don't bother doing this: */ - if (digest != (sha2_byte*)0) { + if (digest != NULL) { usedspace = (context->bitcount >> 3) % SHA256_BLOCK_LENGTH; #ifndef WORDS_BIGENDIAN /* Convert FROM host byte order */ @@ -572,9 +572,9 @@ char *SHA256_End(SHA256_CTX* context, char buffer[]) { int i; /* Sanity check: */ - assert(context != (SHA256_CTX*)0); + assert(context != NULL); - if (buffer != (char*)0) { + if (buffer != NULL) { SHA256_Final(digest, context); for (i = 0; i < SHA256_DIGEST_LENGTH; i++) { @@ -601,7 +601,7 @@ char* SHA256_Data(const sha2_byte* data, size_t len, char digest[SHA256_DIGEST_S /*** SHA-512: *********************************************************/ void SHA512_Init(SHA512_CTX* context) { - if (context == (SHA512_CTX*)0) { + if (context == NULL) { return; } MEMCPY_BCOPY(context->state, sha512_initial_hash_value, SHA512_DIGEST_LENGTH); @@ -787,7 +787,7 @@ void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) { } /* Sanity check: */ - assert(context != (SHA512_CTX*)0 && data != (sha2_byte*)0); + assert(context != NULL && data != NULL); usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH; if (usedspace > 0) { @@ -871,10 +871,10 @@ void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) { sha2_word64 *d = (sha2_word64*)digest; /* Sanity check: */ - assert(context != (SHA512_CTX*)0); + assert(context != NULL); /* If no digest buffer is passed, we don't bother doing this: */ - if (digest != (sha2_byte*)0) { + if (digest != NULL) { SHA512_Last(context); /* Save the hash data for output: */ @@ -901,9 +901,9 @@ char *SHA512_End(SHA512_CTX* context, char buffer[]) { int i; /* Sanity check: */ - assert(context != (SHA512_CTX*)0); + assert(context != NULL); - if (buffer != (char*)0) { + if (buffer != NULL) { SHA512_Final(digest, context); for (i = 0; i < SHA512_DIGEST_LENGTH; i++) { @@ -930,7 +930,7 @@ char* SHA512_Data(const sha2_byte* data, size_t len, char digest[SHA512_DIGEST_S /*** SHA-384: *********************************************************/ void SHA384_Init(SHA384_CTX* context) { - if (context == (SHA384_CTX*)0) { + if (context == NULL) { return; } MEMCPY_BCOPY(context->state, sha384_initial_hash_value, SHA512_DIGEST_LENGTH); @@ -946,10 +946,10 @@ void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) { sha2_word64 *d = (sha2_word64*)digest; /* Sanity check: */ - assert(context != (SHA384_CTX*)0); + assert(context != NULL); /* If no digest buffer is passed, we don't bother doing this: */ - if (digest != (sha2_byte*)0) { + if (digest != NULL) { SHA512_Last((SHA512_CTX*)context); /* Save the hash data for output: */ @@ -976,9 +976,9 @@ char *SHA384_End(SHA384_CTX* context, char buffer[]) { int i; /* Sanity check: */ - assert(context != (SHA384_CTX*)0); + assert(context != NULL); - if (buffer != (char*)0) { + if (buffer != NULL) { SHA384_Final(digest, context); for (i = 0; i < SHA384_DIGEST_LENGTH; i++) {

1 0