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

Eric Pouech : mci: Fix some mciSendString quirks.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 6f03b0c021d5439d6a2c1610437c12877de8bcef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6f03b0c021d5439d6a2c161… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sun Jun 25 16:04:19 2006 +0200 mci: Fix some mciSendString quirks. Really check in MCI open string commands if the name we have is a device (and no longer rely on bad heuristics for it). --- dlls/winmm/mci.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 156cbaf..b981ab0 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1285,6 +1285,7 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpst /* Determine devType from open */ if (!strcmpW(verb, wszOpen)) { LPWSTR devType, tmp; + WCHAR buf[128]; /* case dev == 'new' has to be handled */ if (!strcmpW(dev, wszNew)) { @@ -1310,8 +1311,9 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpst devType = str_dup_upper(devType); dwFlags |= MCI_OPEN_ELEMENT; data[3] = (DWORD)dev; - } else if (strchrW(dev, '.') == NULL) { - tmp = strchrW(dev,' '); + } else if (DRIVER_GetLibName(dev, wszMci, buf, sizeof(buf))) { + /* this is the name of a mci driver's type */ + tmp = strchrW(dev, ' '); if (tmp) *tmp = '\0'; data[2] = (DWORD)dev; devType = str_dup_upper(dev); @@ -1326,7 +1328,6 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpst if (tmp) *tmp = ' '; /* dwFlags and data[2] will be correctly set in ParseOpt loop */ } else { - WCHAR buf[32]; if ((dwRet = MCI_GetDevTypeFromFileName(dev, buf, sizeof(buf)))) goto errCleanUp;

1 0

Eric Pouech : dbghelp: Dwarf & thunks.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: e9910fee66789d9a069f993fc6dbc2e739340188 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e9910fee66789d9a069f993… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Sat Jun 24 09:50:10 2006 +0200 dbghelp: Dwarf & thunks. - added the elf_is_in_thunk_area() function to locate an address within the known thunk area of Wine's builtin modules - now passing this thunk information to the dwarf parser so that it can drop functions from the thunk areas (as dwarf symbols), so that those functions can be later on marked as thunks in dbghelp internals --- dlls/dbghelp/dbghelp_private.h | 4 +++- dlls/dbghelp/dwarf.c | 14 +++++++++++++- dlls/dbghelp/elf_module.c | 41 ++++++++++++++++++++++++++-------------- 3 files changed, 43 insertions(+), 16 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 6af37ee..50a38a4 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -375,7 +375,8 @@ extern struct module* elf_load_module(struct process* pcs, const char* name, unsigned long); extern BOOL elf_read_wine_loader_dbg_info(struct process* pcs); extern BOOL elf_synchronize_module_list(struct process* pcs); - +struct elf_thunk_area; +extern int elf_is_in_thunk_area(unsigned long addr, const struct elf_thunk_area* thunks); extern DWORD WINAPI addr_to_linear(HANDLE hProcess, HANDLE hThread, ADDRESS* addr); /* module.c */ @@ -432,6 +433,7 @@ extern BOOL stabs_parse(struct m /* dwarf.c */ extern BOOL dwarf2_parse(struct module* module, unsigned long load_offset, + const struct elf_thunk_area* thunks, const unsigned char* debug, unsigned int debug_size, const unsigned char* abbrev, unsigned int abbrev_size, const unsigned char* str, unsigned int str_size, diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 18bf253..ec3a5e6 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -170,6 +170,7 @@ typedef struct dwarf2_parse_context_s { struct pool pool; struct module* module; + const struct elf_thunk_area*thunks; struct sparse_array abbrev_table; struct sparse_array debug_info_table; unsigned char word_size; @@ -1255,6 +1256,13 @@ static struct symt* dwarf2_parse_subprog if (!dwarf2_find_attribute(di, DW_AT_low_pc, &low_pc)) low_pc.uvalue = 0; if (!dwarf2_find_attribute(di, DW_AT_high_pc, &high_pc)) high_pc.uvalue = 0; + /* As functions (defined as inline assembly) get debug info with dwarf + * (not the case for stabs), we just drop Wine's thunks here... + * Actual thunks will be created in elf_module from the symbol table + */ + if (elf_is_in_thunk_area(ctx->module->module.BaseOfImage + low_pc.uvalue, + ctx->thunks) >= 0) + return NULL; if (!dwarf2_find_attribute(di, DW_AT_declaration, &is_decl)) is_decl.uvalue = 0; if (!dwarf2_find_attribute(di, DW_AT_inline, &inline_flags)) inline_flags.uvalue = 0; dwarf2_find_name(ctx, di, &name, "subprogram"); @@ -1558,6 +1566,7 @@ static void dwarf2_parse_line_numbers(co static BOOL dwarf2_parse_compilation_unit(const dwarf2_section_t* sections, const dwarf2_comp_unit_t* comp_unit, struct module* module, + const struct elf_thunk_area* thunks, const unsigned char* comp_unit_cursor) { dwarf2_parse_context_t ctx; @@ -1583,6 +1592,7 @@ static BOOL dwarf2_parse_compilation_uni pool_init(&ctx.pool, 65536); ctx.module = module; ctx.word_size = comp_unit->word_size; + ctx.thunks = thunks; traverse.sections = sections; traverse.section = section_debug; @@ -1634,6 +1644,7 @@ static BOOL dwarf2_parse_compilation_uni } BOOL dwarf2_parse(struct module* module, unsigned long load_offset, + const struct elf_thunk_area* thunks, const unsigned char* debug, unsigned int debug_size, const unsigned char* abbrev, unsigned int abbrev_size, const unsigned char* str, unsigned int str_size, @@ -1663,7 +1674,8 @@ BOOL dwarf2_parse(struct module* module, comp_unit.abbrev_offset = *(unsigned long*) comp_unit_stream->abbrev_offset; comp_unit.word_size = *(unsigned char*) comp_unit_stream->word_size; - dwarf2_parse_compilation_unit(section, &comp_unit, module, comp_unit_cursor); + dwarf2_parse_compilation_unit(section, &comp_unit, module, + thunks, comp_unit_cursor); comp_unit_cursor += comp_unit.length + sizeof(unsigned); } module->module.SymType = SymDia; diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index b2f584b..495dcba 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -125,7 +125,7 @@ struct symtab_elt unsigned used; }; -struct thunk_area +struct elf_thunk_area { const char* symname; THUNK_ORDINAL ordinal; @@ -250,13 +250,32 @@ static void elf_unmap_file(struct elf_fi } /****************************************************************** + * elf_is_in_thunk_area + * + * Check whether an address lies within one of the thunk area we + * know of. + */ +int elf_is_in_thunk_area(unsigned long addr, + const struct elf_thunk_area* thunks) +{ + unsigned i; + + for (i = 0; thunks[i].symname; i++) + { + if (addr >= thunks[i].rva_start && addr < thunks[i].rva_end) + return i; + } + return -1; +} + +/****************************************************************** * elf_hash_symtab * * creating an internal hash table to ease use ELF symtab information lookup */ static void elf_hash_symtab(struct module* module, struct pool* pool, struct hash_table* ht_symtab, struct elf_file_map* fmap, - int symtab_idx, struct thunk_area* thunks) + int symtab_idx, struct elf_thunk_area* thunks) { int i, j, nsym; const char* strp; @@ -503,7 +522,7 @@ static void elf_finish_stabs_info(struct * creating the thunk objects for a wine native DLL */ static int elf_new_wine_thunks(struct module* module, struct hash_table* ht_symtab, - unsigned num_areas, struct thunk_area* thunks) + const struct elf_thunk_area* thunks) { int j; struct hash_table_iter hti; @@ -518,13 +537,8 @@ static int elf_new_wine_thunks(struct mo addr = module->elf_info->elf_addr + ste->symp->st_value; - for (j = 0; j < num_areas; j++) - { - if (ste->symp->st_value >= thunks[j].rva_start && - ste->symp->st_value < thunks[j].rva_end) - break; - } - if (j < num_areas) /* thunk found */ + j = elf_is_in_thunk_area(ste->symp->st_value, thunks); + if (j >= 0) /* thunk found */ { symt_new_thunk(module, ste->compiland, ste->ht_elt.name, thunks[j].ordinal, addr, ste->symp->st_size); @@ -767,7 +781,7 @@ static BOOL elf_load_debug_info_from_map int symtab_sect, dynsym_sect, stab_sect, stabstr_sect; int debug_sect, debug_str_sect, debug_abbrev_sect, debug_line_sect; int debuglink_sect; - struct thunk_area thunks[] = + struct elf_thunk_area thunks[] = { {"__wine_spec_import_thunks", THUNK_ORDINAL_NOTYPE, 0, 0}, /* inter DLL calls */ {"__wine_spec_delayed_import_loaders", THUNK_ORDINAL_LOAD, 0, 0}, /* delayed inter DLL calls */ @@ -883,7 +897,7 @@ static BOOL elf_load_debug_info_from_map if (dw2_debug != NO_MAP && NO_MAP != dw2_debug_abbrev && dw2_debug_str != NO_MAP) { /* OK, now just parse dwarf2 debug infos. */ - lret = dwarf2_parse(module, module->elf_info->elf_addr, + lret = dwarf2_parse(module, module->elf_info->elf_addr, thunks, dw2_debug, fmap->sect[debug_sect].shdr.sh_size, dw2_debug_abbrev, fmap->sect[debug_abbrev_sect].shdr.sh_size, dw2_debug_str, fmap->sect[debug_str_sect].shdr.sh_size, @@ -930,8 +944,7 @@ static BOOL elf_load_debug_info_from_map { /* add the thunks for native libraries */ if (!(dbghelp_options & SYMOPT_PUBLICS_ONLY)) - elf_new_wine_thunks(module, ht_symtab, - sizeof(thunks) / sizeof(thunks[0]), thunks); + elf_new_wine_thunks(module, ht_symtab, thunks); } /* add all the public symbols from symtab */ if (elf_new_public_symbols(module, ht_symtab) && !ret) ret = TRUE;

1 0

Eric Pouech : dbghelp: Elf for wine and spec definitions.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: f939b0853dde0f63ebd17a67806a4a8c9f5b397a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f939b0853dde0f63ebd17a6… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jun 23 21:45:52 2006 +0200 dbghelp: Elf for wine and spec definitions. Enhancement over previous fix (we don't need to insert NOTYPE symbols in our public symbol table, so drop them as early as possible). --- dlls/dbghelp/elf_module.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index c1f8296..b2f584b 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -291,21 +291,25 @@ static void elf_hash_symtab(struct modul symname = strp + symp->st_name; - if (ELF32_ST_TYPE(symp->st_info) == STT_FILE) + /* handle some specific symtab (that we'll throw away when done) */ + switch (ELF32_ST_TYPE(symp->st_info)) { + case STT_FILE: compiland = symname ? symt_new_compiland(module, source_new(module, NULL, symname)) : NULL; continue; - } - for (j = 0; thunks[j].symname; j++) - { - if (!strcmp(symname, thunks[j].symname)) + case STT_NOTYPE: + /* we are only interested in wine markers inserted by winebuild */ + for (j = 0; thunks[j].symname; j++) { - thunks[j].rva_start = symp->st_value; - thunks[j].rva_end = symp->st_value + symp->st_size; - break; + if (!strcmp(symname, thunks[j].symname)) + { + thunks[j].rva_start = symp->st_value; + thunks[j].rva_end = symp->st_value + symp->st_size; + break; + } } + continue; } - if (thunks[j].symname) continue; /* FIXME: we don't need to handle them (GCC internals) * Moreover, they screw up our symbol lookup :-/ @@ -550,9 +554,6 @@ static int elf_new_wine_thunks(struct mo ELF32_ST_BIND(ste->symp->st_info) == STB_LOCAL, addr, ste->symp->st_size, NULL); break; - case STT_NOTYPE: - /* at least winebuild specific symbols */ - break; default: FIXME("Shouldn't happen\n"); break; @@ -612,11 +613,10 @@ static int elf_new_public_symbols(struct hash_table_iter_init(symtab, &hti, NULL); while ((ste = hash_table_iter_up(&hti))) { - if (ELF32_ST_TYPE(ste->symp->st_info) != STT_NOTYPE) - symt_new_public(module, ste->compiland, ste->ht_elt.name, - module->elf_info->elf_addr + ste->symp->st_value, - ste->symp->st_size, TRUE /* FIXME */, - ELF32_ST_TYPE(ste->symp->st_info) == STT_FUNC); + symt_new_public(module, ste->compiland, ste->ht_elt.name, + module->elf_info->elf_addr + ste->symp->st_value, + ste->symp->st_size, TRUE /* FIXME */, + ELF32_ST_TYPE(ste->symp->st_info) == STT_FUNC); } return TRUE; }

1 0

Andrey Turkin : msi: Disable some path validity checks in MsiSetTargetPath.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 2ad04cae39b1e298ae722c99851b245902fc5b6f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2ad04cae39b1e298ae722c9… Author: Andrey Turkin <pancha(a)Mail.nnov.ru> Date: Sun Jun 25 16:05:20 2006 +0400 msi: Disable some path validity checks in MsiSetTargetPath. --- dlls/msi/install.c | 14 ++------------ dlls/msi/tests/package.c | 6 ------ 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 01ce696..5eaf10b 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -336,24 +336,14 @@ UINT MSI_SetTargetPathW(MSIPACKAGE *pack attrib = GetFileAttributesW(szFolderPath); if ( attrib != INVALID_FILE_ATTRIBUTES && - (!(attrib & FILE_ATTRIBUTE_DIRECTORY) || - attrib & FILE_ATTRIBUTE_OFFLINE || - attrib & FILE_ATTRIBUTE_READONLY)) + (attrib & FILE_ATTRIBUTE_OFFLINE || + attrib & FILE_ATTRIBUTE_READONLY)) /* actually native MSI tests writeability by making temporary files at each drive */ return ERROR_FUNCTION_FAILED; path = resolve_folder(package,szFolder,FALSE,FALSE,&folder); if (!path) return ERROR_DIRECTORY; - if (attrib == INVALID_FILE_ATTRIBUTES) - { - if (!CreateDirectoryW(szFolderPath,NULL)) - { - msi_free( path ); - return ERROR_FUNCTION_FAILED; - } - RemoveDirectoryW(szFolderPath); - } msi_free(folder->Property); folder->Property = build_directory_name(2, szFolderPath, NULL); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index fae0405..f020408 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -404,14 +404,10 @@ static void test_settargetpath(void) { sprintf( tempdir, "%s\\subdir", buffer ); r = MsiSetTargetPath( hpkg, "TARGETDIR", buffer ); - todo_wine { ok( r == ERROR_SUCCESS, "MsiSetTargetPath on file returned %d\n", r ); - } r = MsiSetTargetPath( hpkg, "TARGETDIR", tempdir ); - todo_wine { ok( r == ERROR_SUCCESS, "MsiSetTargetPath on 'subdir' of file returned %d\n", r ); - } DeleteFile( buffer ); @@ -422,9 +418,7 @@ static void test_settargetpath(void) ok ( r == INVALID_FILE_ATTRIBUTES, "file/directory exists after MsiSetTargetPath. Attributes: %08X\n", r ); r = MsiSetTargetPath( hpkg, "TARGETDIR", tempdir ); - todo_wine { ok( r == ERROR_SUCCESS, "MsiSetTargetPath on subsubdir returned %d\n", r ); - } } else { trace("GetTempFileName failed, cannot do some tests\n"); }

1 0

Ivan Leo : amstream: Implement IAMMultiMediaStreamImpl_OpenFile and IAMMultiMediaStreamImpl_OpenMoniker .
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 27bfdc2a022b1dba59c5e5cca64e319d13526695 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=27bfdc2a022b1dba59c5e5c… Author: Ivan Leo <ivanleo(a)gmail.com> Date: Sat Jun 24 20:08:58 2006 +0100 amstream: Implement IAMMultiMediaStreamImpl_OpenFile and IAMMultiMediaStreamImpl_OpenMoniker. --- dlls/amstream/amstream.c | 70 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 87e7a7b..d17b456 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -2,6 +2,7 @@ * Implementation of IAMMultiMediaStream Interface * * Copyright 2004 Christian Costa + * Copyright 2006 Ivan Leo Puoti * * This file contains the (internal) driver registration functions, * driver enumeration APIs and DirectDraw creation functions. @@ -38,6 +39,8 @@ typedef struct { IAMMultiMediaStream lpVtbl; LONG ref; IGraphBuilder* pFilterGraph; + IPin* ipin; + IGraphBuilder* GraphBuilder; ULONG nbStreams; IMediaStream** pStreams; STREAM_TYPE StreamType; @@ -280,11 +283,67 @@ static HRESULT WINAPI IAMMultiMediaStrea static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenFile(IAMMultiMediaStream* iface, LPCWSTR pszFileName, DWORD dwFlags) { + HRESULT ret; IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; + IFileSourceFilter *SourceFilter; + IBaseFilter *BaseFilter; + IEnumPins *EnumPins; + IPin *ipin; + PIN_DIRECTION pin_direction; - FIXME("(%p/%p)->(%s,%lx) stub!\n", This, iface, debugstr_w(pszFileName), dwFlags); + TRACE("(%p/%p)->(%s,%lx)\n", This, iface, debugstr_w(pszFileName), dwFlags); - return E_NOTIMPL; + ret = CoCreateInstance(&CLSID_AsyncReader, NULL, CLSCTX_INPROC_SERVER, &IID_IFileSourceFilter, (void**)&SourceFilter); + if(ret != S_OK) + return ret; + + ret = IFileSourceFilter_Load(SourceFilter, pszFileName, NULL); + if(ret != S_OK) + { + IFileSourceFilter_Release(SourceFilter); + return ret; + } + + ret = IFileSourceFilter_QueryInterface(SourceFilter, &IID_IBaseFilter, (void**)&BaseFilter); + if(ret != S_OK) + { + IFileSourceFilter_Release(SourceFilter); + return ret; + } + + ret = IBaseFilter_EnumPins(BaseFilter, &EnumPins); + if(ret != S_OK) + { + goto end; + } + + ret = IEnumPins_Next(EnumPins, 1, &ipin, NULL); + if(ret == S_OK) + { + ret = IPin_QueryDirection(ipin, &pin_direction); + IEnumPins_Release(EnumPins); + if(ret == S_OK && pin_direction == PINDIR_OUTPUT) + This->ipin = ipin; + else + goto end; + } + else + { + IEnumPins_Release(EnumPins); + goto end; + } + + ret = IFilterGraph_QueryInterface(This->pFilterGraph, &IID_IGraphBuilder, (void**)&This->GraphBuilder); + if(ret != S_OK) + { + goto end; + } + + ret = IGraphBuilder_AddSourceFilter(This->GraphBuilder, pszFileName, pszFileName, &BaseFilter); + end: + IBaseFilter_Release(BaseFilter); + IFileSourceFilter_Release(SourceFilter); + return ret; } static HRESULT WINAPI IAMMultiMediaStreamImpl_OpenMoniker(IAMMultiMediaStream* iface, IBindCtx* pCtx, IMoniker* pMoniker, DWORD dwFlags) @@ -300,9 +359,12 @@ static HRESULT WINAPI IAMMultiMediaStrea { IAMMultiMediaStreamImpl *This = (IAMMultiMediaStreamImpl *)iface; - FIXME("(%p/%p)->(%lx) stub!\n", This, iface, dwFlags); + FIXME("(%p/%p)->(%lx)\n", This, iface, dwFlags); - return E_NOTIMPL; + if(dwFlags != AMMSF_NOCLOCK) + return E_INVALIDARG; + + return IGraphBuilder_Render(This->GraphBuilder, This->ipin); } static const IAMMultiMediaStreamVtbl AM_Vtbl =

1 0

Ivan Leo : advapi32/tests: Fix a crash when ConvertSidToStringSidA isn' t available.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 81745f1c41188fe77c95012ea0c0b24bb91b1b53 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=81745f1c41188fe77c95012… Author: Ivan Leo <ivanleo(a)gmail.com> Date: Sat Jun 24 22:36:40 2006 +0100 advapi32/tests: Fix a crash when ConvertSidToStringSidA isn't available. --- dlls/advapi32/tests/security.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f4b43a1..fe573ea 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -706,6 +706,9 @@ static void test_token_attr(void) DWORD i, GLE; LPSTR SidString; + if(!pConvertSidToStringSidA) + return; + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &Token); GLE = GetLastError(); ok(ret || (GLE == ERROR_CALL_NOT_IMPLEMENTED),

1 0

Mikołaj Zalewski : user: user32_Pl.rc: Fix the capitalization of OK.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 1ad6c1b93c4ce6277cefe18feef11be2f4e5f47e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1ad6c1b93c4ce6277cefe18… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat Jun 24 18:59:07 2006 +0200 user: user32_Pl.rc: Fix the capitalization of OK. --- dlls/user/resources/user32_Pl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user/resources/user32_Pl.rc b/dlls/user/resources/user32_Pl.rc index d5718a7..a33b380 100644 --- a/dlls/user/resources/user32_Pl.rc +++ b/dlls/user/resources/user32_Pl.rc @@ -53,7 +53,7 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_ BEGIN ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX - PUSHBUTTON "Ok", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Anuluj", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Zaniechaj", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "&Pon�w pr�b�", 4, 160, 56, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP

1 0

Vijay Kiran Kamuju : ntdll: Add UZT timezone info.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: ee87f039e1e371b577f7f66072052013e101ca31 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ee87f039e1e371b577f7f66… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Jun 23 12:42:05 2006 -0400 ntdll: Add UZT timezone info. --- dlls/ntdll/time.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index ed6bcf2..961ecad 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -391,7 +391,9 @@ static const struct tagTZ_INFO TZ_INFO[] {'P','h','i','l','i','p','p','i','n','e',' ','T','i','m','e','\0'}, -480, 0}, {"NOVST", {'N','o','v','o','s','i','b','i','r','s','k',' ','S','u','m','m','e','r', - ' ','T','i','m','e','\0'}, -480, 1} + ' ','T','i','m','e','\0'}, -480, 1}, + {"UZT", + {'U','z','b','e','k','i','s','t','h','a','n',' ','T','i','m','e','\0'}, -300, 0} }; #define TICKSPERSEC 10000000

1 0

Francois Gouget : Assorted spelling, case and grammar fixes.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 9bfbfcbeb4121c5cf6c590d173c3da60bb238829 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9bfbfcbeb4121c5cf6c590d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 23 18:18:02 2006 +0200 Assorted spelling, case and grammar fixes. --- dlls/ddraw/clipper.c | 4 + dlls/ddraw/ddraw.c | 126 +++++++++++++++++++++--------------------- dlls/ddraw/ddraw_private.h | 8 +-- dlls/ddraw/device.c | 70 ++++++++++++----------- dlls/ddraw/direct3d.c | 22 ++++--- dlls/ddraw/executebuffer.c | 2 - dlls/ddraw/gamma.c | 2 - dlls/ddraw/main.c | 8 +-- dlls/ddraw/surface.c | 44 +++++++-------- dlls/ddraw/tests/d3d.c | 2 - dlls/ddraw/utils.c | 10 ++- dlls/ddraw/vertexbuffer.c | 4 + dlls/ddraw/viewport.c | 2 - dlls/shell32/shlfolder.c | 2 - dlls/wined3d/device.c | 2 - dlls/wined3d/stateblock.c | 2 - dlls/wined3d/surface_gdi.c | 2 - dlls/wined3d/utils.c | 2 - programs/winefile/resource.h | 2 - 19 files changed, 158 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=9bfbfcbeb4121c5cf6c…

1 0

Francois Gouget : shell32: Fix computation of default verb.
by Alexandre Julliard 26 Jun '06

26 Jun '06

Module: wine Branch: refs/heads/master Commit: 9607151e38b4e6b24195907a664b2351919c2974 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9607151e38b4e6b24195907… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jun 23 18:32:38 2006 +0200 shell32: Fix computation of default verb. Compute the default verb as documented on MSDN instead of blindly assuming it is 'open'. This fixes the WordViewer association in some cases. --- dlls/shell32/classes.c | 88 +++++++++++++++++++++++++++++++++++-------- dlls/shell32/shell32_main.h | 1 dlls/shell32/shlexec.c | 25 +++++++----- 3 files changed, 87 insertions(+), 27 deletions(-) diff --git a/dlls/shell32/classes.c b/dlls/shell32/classes.c index eb9d9e9..f6db0dc 100644 --- a/dlls/shell32/classes.c +++ b/dlls/shell32/classes.c @@ -117,30 +117,86 @@ BOOL HCR_MapTypeToValueA(LPCSTR szExtens return TRUE; } +static const WCHAR swShell[] = {'s','h','e','l','l','\\',0}; +static const WCHAR swOpen[] = {'o','p','e','n',0}; +static const WCHAR swCommand[] = {'\\','c','o','m','m','a','n','d',0}; + +BOOL HCR_GetDefaultVerbW( HKEY hkeyClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ) +{ + WCHAR sTemp[MAX_PATH]; + LONG size; + HKEY hkey; + + TRACE("%p %s %p\n", hkeyClass, debugstr_w(szVerb), szDest); + + if (szVerb) + { + lstrcpynW(szDest, szVerb, len); + return TRUE; + } + + size=len; + *szDest='\0'; + if (!RegQueryValueW(hkeyClass, swShell, szDest, &size) && *szDest) + { + /* The MSDN says to first try the default verb */ + lstrcpyW(sTemp, swShell); + lstrcatW(sTemp, szDest); + lstrcatW(sTemp, swCommand); + if (!RegOpenKeyExW(hkeyClass, sTemp, 0, 0, &hkey)) + { + RegCloseKey(hkey); + TRACE("default verb=%s\n", debugstr_w(szDest)); + return TRUE; + } + } + + /* then fallback to 'open' */ + lstrcpyW(sTemp, swShell); + lstrcatW(sTemp, swOpen); + lstrcatW(sTemp, swCommand); + if (!RegOpenKeyExW(hkeyClass, sTemp, 0, 0, &hkey)) + { + RegCloseKey(hkey); + lstrcpynW(szDest, swOpen, len); + TRACE("default verb=open\n"); + return TRUE; + } + + /* and then just use the first verb on Windows >= 2000 */ + if (!RegEnumKeyW(hkeyClass, 0, szDest, len) && *szDest) + { + TRACE("default verb=first verb=%s\n", debugstr_w(szDest)); + return TRUE; + } + + TRACE("no default verb!\n"); + return FALSE; +} BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ) { - static const WCHAR swShell[] = {'s','h','e','l','l','\\',0}; - static const WCHAR swCommand[] = {'\\','c','o','m','m','a','n','d',0}; - BOOL ret = FALSE; + WCHAR sTempVerb[MAX_PATH]; + BOOL ret; TRACE("%p %s %s %p\n", hkeyClass, debugstr_w(szClass), debugstr_w(szVerb), szDest); if (szClass) RegOpenKeyExW(HKEY_CLASSES_ROOT, szClass, 0, 0x02000000, &hkeyClass); - - if (hkeyClass) - { - WCHAR sTemp[MAX_PATH]; - lstrcpyW(sTemp, swShell); - lstrcatW(sTemp, szVerb); - lstrcatW(sTemp, swCommand); - - ret = (ERROR_SUCCESS == SHGetValueW(hkeyClass, sTemp, NULL, NULL, szDest, &len)); - - if (szClass) - RegCloseKey(hkeyClass); - } + if (!hkeyClass) + return FALSE; + ret = FALSE; + + if (HCR_GetDefaultVerbW(hkeyClass, szVerb, sTempVerb, sizeof(sTempVerb))) + { + WCHAR sTemp[MAX_PATH]; + lstrcpyW(sTemp, swShell); + lstrcatW(sTemp, sTempVerb); + lstrcatW(sTemp, swCommand); + ret = (ERROR_SUCCESS == SHGetValueW(hkeyClass, sTemp, NULL, NULL, szDest, &len)); + } + if (szClass) + RegCloseKey(hkeyClass); TRACE("-- %s\n", debugstr_w(szDest) ); return ret; diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 32d002f..e13c850 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -57,6 +57,7 @@ INT SIC_GetIconIndex (LPCWSTR sSourceFil /* Classes Root */ BOOL HCR_MapTypeToValueW(LPCWSTR szExtension, LPWSTR szFileType, LONG len, BOOL bPrependDot); +BOOL HCR_GetDefaultVerbW( HKEY hkeyClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ); BOOL HCR_GetExecuteCommandW( HKEY hkeyClass, LPCWSTR szClass, LPCWSTR szVerb, LPWSTR szDest, DWORD len ); BOOL HCR_GetDefaultIconW(LPCWSTR szClass, LPWSTR szDest, DWORD len, int* picon_idx); BOOL HCR_GetDefaultIconFromGUIDW(REFIID riid, LPWSTR szDest, DWORD len, int* picon_idx); diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index f626b1d..955f323 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -426,10 +426,18 @@ end: static UINT SHELL_FindExecutableByOperation(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation, LPWSTR key, LPWSTR filetype, LPWSTR command, LONG commandlen) { static const WCHAR wCommand[] = {'\\','c','o','m','m','a','n','d',0}; + HKEY hkeyClass; + WCHAR verb[MAX_PATH]; + + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, filetype, 0, 0x02000000, &hkeyClass)) + return 31; /* default - 'No association was found' */ + if (!HCR_GetDefaultVerbW(hkeyClass, lpOperation, verb, sizeof(verb))) + return 31; /* default - 'No association was found' */ + RegCloseKey(hkeyClass); /* Looking for ...buffer\shell\<verb>\command */ strcatW(filetype, wszShell); - strcatW(filetype, lpOperation); + strcatW(filetype, verb); strcatW(filetype, wCommand); if (RegQueryValueW(HKEY_CLASSES_ROOT, filetype, command, @@ -508,10 +516,10 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath if (key) *key = '\0'; /* trap NULL parameters on entry */ - if ((lpFile == NULL) || (lpResult == NULL) || (lpOperation == NULL)) + if ((lpFile == NULL) || (lpResult == NULL)) { - WARN("(lpFile=%s,lpResult=%s,lpOperation=%s): NULL parameter\n", - debugstr_w(lpFile), debugstr_w(lpOperation), debugstr_w(lpResult)); + WARN("(lpFile=%s,lpResult=%s): NULL parameter\n", + debugstr_w(lpFile), debugstr_w(lpResult)); return 2; /* File not found. Close enough, I guess. */ } @@ -1292,7 +1300,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW ULONG cmask=(sei_tmp.fMask & SEE_MASK_CLASSALL); HCR_GetExecuteCommandW((cmask == SEE_MASK_CLASSKEY) ? sei_tmp.hkeyClass : NULL, (cmask == SEE_MASK_CLASSNAME) ? sei_tmp.lpClass: NULL, - (sei_tmp.lpVerb) ? sei_tmp.lpVerb : wszOpen, + sei_tmp.lpVerb, wszParameters, sizeof(wszParameters)/sizeof(WCHAR)); /* FIXME: get the extension of lpFile, check if it fits to the lpClass */ @@ -1332,7 +1340,7 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW if (attribs != INVALID_FILE_ATTRIBUTES && (attribs & FILE_ATTRIBUTE_DIRECTORY) && HCR_GetExecuteCommandW(0, wszFolder, - sei_tmp.lpVerb?sei_tmp.lpVerb:wszOpen, + sei_tmp.lpVerb, buffer, sizeof(buffer))) { SHELL_ArgifyW(wszApplicationName, dwApplicationNameLen, buffer, target, sei_tmp.lpIDList, NULL); @@ -1427,11 +1435,6 @@ BOOL SHELL_execute( LPSHELLEXECUTEINFOW strcatW(wcmd, wszParameters); } - /* We set the default to open, and that should generally work. - But that is not really the way the MS docs say to do it. */ - if (!sei_tmp.lpVerb) - sei_tmp.lpVerb = wszOpen; - retval = execfunc(wcmd, NULL, FALSE, &sei_tmp, sei); if (retval > 32) { HeapFree(GetProcessHeap(), 0, wszApplicationName);

1 0