November 2010 - Wine-Commits

Hans Leidekker : usp10: Add stub exports for the OpenType functions.
by Alexandre Julliard Nov. 18, 2010

Nov. 18, 2010

Module: wine Branch: master Commit: ba107a0de11e86c28fc17cca836af2d2c052696a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba107a0de11e86c28fc17cca8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 18 12:09:26 2010 +0100 usp10: Add stub exports for the OpenType functions. --- dlls/usp10/usp10.spec | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index 5e35870..5638140 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -6,17 +6,25 @@ @ stdcall ScriptCacheGetHeight(ptr ptr ptr) @ stdcall ScriptFreeCache(ptr) @ stdcall ScriptGetCMap(ptr ptr ptr long long ptr) +@ stub ScriptGetFontAlternateGlyphs +@ stub ScriptGetFontFeatureTags +@ stub ScriptGetFontLanguageTags @ stdcall ScriptGetFontProperties(long ptr ptr) +@ stub ScriptGetFontScriptTags @ stdcall ScriptGetGlyphABCWidth(ptr ptr long ptr) @ stdcall ScriptGetLogicalWidths(ptr long long ptr ptr ptr ptr) @ stdcall ScriptGetProperties(ptr long) @ stdcall ScriptIsComplex(wstr long long) @ stdcall ScriptItemize(wstr long long ptr ptr ptr ptr) +@ stub ScriptItemizeOpenType @ stdcall ScriptJustify(ptr ptr long long long ptr) @ stdcall ScriptLayout(long ptr ptr ptr) @ stdcall ScriptPlace(ptr ptr ptr long ptr ptr ptr ptr ptr) +@ stub ScriptPlaceOpenType +@ stub ScriptPositionSingleGlyph @ stdcall ScriptRecordDigitSubstitution(ptr ptr) @ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr) +@ stub ScriptShapeOpenType @ stdcall ScriptStringAnalyse(ptr ptr long long long long long ptr ptr ptr ptr ptr ptr) @ stdcall ScriptStringCPtoX(ptr long long ptr) @ stdcall ScriptStringFree(ptr) @@ -28,6 +36,7 @@ @ stdcall ScriptString_pLogAttr(ptr) @ stdcall ScriptString_pSize(ptr) @ stdcall ScriptString_pcOutChars(ptr) +@ stub ScriptSubstituteSingleGlyph @ stdcall ScriptTextOut(ptr ptr long long long ptr ptr ptr long ptr long ptr ptr ptr) @ stdcall ScriptXtoCP(long long long ptr ptr ptr ptr ptr ptr) @ stub UspAllocCache

1 0

Hans Leidekker : programs: Add a stub implementation of servicemodelreg.exe .
by Alexandre Julliard Nov. 18, 2010

Nov. 18, 2010

Module: wine Branch: master Commit: 1885c3d9e2f1148d6e79690c75073835948ac5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1885c3d9e2f1148d6e79690c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 18 12:09:11 2010 +0100 programs: Add a stub implementation of servicemodelreg.exe. --- configure | 1 + configure.ac | 1 + programs/servicemodelreg/Makefile.in | 8 ++++++++ programs/servicemodelreg/main.c | 33 +++++++++++++++++++++++++++++++++ tools/wine.inf.in | 1 + 5 files changed, 44 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7c5035a..11e9d71 100755 --- a/configure +++ b/configure @@ -15236,6 +15236,7 @@ wine_fn_config_program rundll.exe16 enable_win16 install wine_fn_config_program rundll32 enable_rundll32 install wine_fn_config_program sc enable_sc install wine_fn_config_program secedit enable_secedit install +wine_fn_config_program servicemodelreg enable_servicemodelreg install wine_fn_config_program services enable_services install wine_fn_config_program spoolsv enable_spoolsv install wine_fn_config_program start enable_start install diff --git a/configure.ac b/configure.ac index 598673d..ce708eb 100644 --- a/configure.ac +++ b/configure.ac @@ -2853,6 +2853,7 @@ WINE_CONFIG_PROGRAM(rundll.exe16,install,enable_win16) WINE_CONFIG_PROGRAM(rundll32,install) WINE_CONFIG_PROGRAM(sc,install) WINE_CONFIG_PROGRAM(secedit,install) +WINE_CONFIG_PROGRAM(servicemodelreg,install) WINE_CONFIG_PROGRAM(services,install) WINE_CONFIG_PROGRAM(spoolsv,install) WINE_CONFIG_PROGRAM(start,install) diff --git a/programs/servicemodelreg/Makefile.in b/programs/servicemodelreg/Makefile.in new file mode 100644 index 0000000..7f902e2 --- /dev/null +++ b/programs/servicemodelreg/Makefile.in @@ -0,0 +1,8 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +MODULE = servicemodelreg.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/servicemodelreg/main.c b/programs/servicemodelreg/main.c new file mode 100644 index 0000000..7db760e --- /dev/null +++ b/programs/servicemodelreg/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2010 Hans Leidekker for CodeWeavers + * + * 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 "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(servicemodelreg); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +} diff --git a/tools/wine.inf.in b/tools/wine.inf.in index aad4612..52e7810 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2604,6 +2604,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,Microsoft.NET\Framework\v1.1.4322,regsvcs.exe 10,Microsoft.NET\Framework\v2.0.50727,ngen.exe 10,Microsoft.NET\Framework\v2.0.50727,fusion.dll +10,Microsoft.NET\Framework\v3.0\windows communication foundation,servicemodelreg.exe 10,Microsoft.NET\Framework\v4.0.30319,ngen.exe 10,Microsoft.NET\Framework\v4.0.30319,fusion.dll 11,wbem,mofcomp.exe

1 0

Damjan Jovanovic : winemenubuilder: Deduplicate some file open associations .
by Alexandre Julliard Nov. 18, 2010

Nov. 18, 2010

Module: wine Branch: master Commit: eaf4307cd70bd532cf8bee146a3b79c30ebd5352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf4307cd70bd532cf8bee146… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Nov 18 11:52:10 2010 +0200 winemenubuilder: Deduplicate some file open associations. --- programs/winemenubuilder/winemenubuilder.c | 76 ++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 71aca92..324aab8 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -94,6 +94,7 @@ #include "wine/debug.h" #include "wine/library.h" #include "wine/list.h" +#include "wine/rbtree.h" WINE_DEFAULT_DEBUG_CHANNEL(menubuilder); @@ -161,6 +162,12 @@ struct xdg_mime_type struct list entry; }; +struct rb_string_entry +{ + char *string; + struct wine_rb_entry entry; +}; + DEFINE_GUID(CLSID_WICIcnsEncoder, 0x312fb6f1,0xb767,0x409d,0x8a,0x6d,0x0f,0xc1,0x54,0xd4,0xf0,0x5c); static char *xdg_config_dir; @@ -228,6 +235,43 @@ static char* heap_printf(const char *format, ...) return ret; } +static int winemenubuilder_rb_string_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct rb_string_entry *t = WINE_RB_ENTRY_VALUE(entry, const struct rb_string_entry, entry); + + return strcmp((char*)key, t->string); +} + +static void *winemenubuilder_rb_alloc(size_t size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static void *winemenubuilder_rb_realloc(void *ptr, size_t size) +{ + return HeapReAlloc(GetProcessHeap(), 0, ptr, size); +} + +static void winemenubuilder_rb_free(void *ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + +static void winemenubuilder_rb_destroy(struct wine_rb_entry *entry, void *context) +{ + struct rb_string_entry *t = WINE_RB_ENTRY_VALUE(entry, struct rb_string_entry, entry); + HeapFree(GetProcessHeap(), 0, t->string); + HeapFree(GetProcessHeap(), 0, t); +} + +static const struct wine_rb_functions winemenubuilder_rb_functions = +{ + winemenubuilder_rb_alloc, + winemenubuilder_rb_realloc, + winemenubuilder_rb_free, + winemenubuilder_rb_string_compare, +}; + static void write_xml_text(FILE *file, const char *text) { int i; @@ -2108,11 +2152,17 @@ static BOOL write_freedesktop_association_entry(const char *desktopPath, const c static BOOL generate_associations(const char *xdg_data_home, const char *packages_dir, const char *applications_dir) { static const WCHAR openW[] = {'o','p','e','n',0}; + struct wine_rb_tree mimeProgidTree; struct list *nativeMimeTypes = NULL; LSTATUS ret = 0; int i; BOOL hasChanged = FALSE; + if (wine_rb_init(&mimeProgidTree, &winemenubuilder_rb_functions)) + { + WINE_ERR("wine_rb_init failed\n"); + return FALSE; + } if (!build_native_mime_types(xdg_data_home, &nativeMimeTypes)) { WINE_ERR("could not build native MIME types\n"); @@ -2154,6 +2204,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package char *friendlyAppNameA = NULL; WCHAR *progIdW = NULL; char *progIdA = NULL; + char *mimeProgId = NULL; extensionA = wchars_to_utf8_chars(extensionW); if (extensionA == NULL) @@ -2265,6 +2316,30 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package else goto end; /* no progID => not a file type association */ + /* Do not allow duplicate ProgIDs for a MIME type, it causes unnecessary duplication in Open dialogs */ + mimeProgId = heap_printf("%s=>%s", mimeTypeA, progIdA); + if (mimeProgId) + { + struct rb_string_entry *entry; + if (wine_rb_get(&mimeProgidTree, mimeProgId)) + { + HeapFree(GetProcessHeap(), 0, mimeProgId); + goto end; + } + entry = HeapAlloc(GetProcessHeap(), 0, sizeof(struct rb_string_entry)); + if (!entry) + { + WINE_ERR("out of memory allocating rb_string_entry\n"); + goto end; + } + entry->string = mimeProgId; + if (wine_rb_put(&mimeProgidTree, mimeProgId, &entry->entry)) + { + WINE_ERR("error updating rb tree\n"); + goto end; + } + } + if (has_association_changed(extensionW, mimeTypeA, progIdW, friendlyAppNameA, friendlyDocNameW, openWithIconA)) { char *desktopPath = heap_printf("%s/wine-extension-%s.desktop", applications_dir, &extensionA[1]); @@ -2300,6 +2375,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package break; } + wine_rb_destroy(&mimeProgidTree, winemenubuilder_rb_destroy, NULL); free_native_mime_types(nativeMimeTypes); return hasChanged; }

1 0

Damjan Jovanovic : winemenubuilder: Update TODO.
by Alexandre Julliard Nov. 18, 2010

Nov. 18, 2010

Module: wine Branch: master Commit: 7b7893d3aa83967096b8f076858f17d8b3ce04e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7893d3aa83967096b8f0768… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Nov 18 11:41:24 2010 +0200 winemenubuilder: Update TODO. --- programs/winemenubuilder/winemenubuilder.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 55a2e2b..71aca92 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -52,9 +52,6 @@ * group. * Clean up fd.o menu icons and .directory files when the menu is deleted * in Windows. - * Generate icons for file open handlers to go into the "Open with..." - * list. What does Windows use, the default icon for the .EXE file? It's - * not in the registry. * Associate applications under HKCR\Applications to open any MIME type * (by associating with application/octet-stream, or how?). * Clean up fd.o MIME types when they are deleted in Windows, their icons

1 0

Hans Leidekker : rstrtmgr: Add stub implementations of RmEndSession and RmRestart.
by Alexandre Julliard Nov. 18, 2010

Nov. 18, 2010

Module: wine Branch: master Commit: b8c5a9c528800bcac57006f217c2e44b8f0b2a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8c5a9c528800bcac57006f21… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 18 12:08:58 2010 +0100 rstrtmgr: Add stub implementations of RmEndSession and RmRestart. --- dlls/rstrtmgr/main.c | 18 ++++++++++++++++++ dlls/rstrtmgr/rstrtmgr.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c index 8ac62ae..35e04a2 100644 --- a/dlls/rstrtmgr/main.c +++ b/dlls/rstrtmgr/main.c @@ -85,3 +85,21 @@ DWORD WINAPI RmStartSession(DWORD *sessionhandle, DWORD flags, WCHAR sessionkey[ FIXME("%p, %d, %p stub!\n", sessionhandle, flags, sessionkey); return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * RmRestart (rstrtmgr.@) + */ +DWORD WINAPI RmRestart(DWORD handle, DWORD flags, void *fnstatus) +{ + FIXME("%u, 0x%08x, %p stub!\n", handle, flags, fnstatus); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * RmEndSession (rstrtmgr.@) + */ +DWORD WINAPI RmEndSession(DWORD handle) +{ + FIXME("%u stub!\n", handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/rstrtmgr/rstrtmgr.spec b/dlls/rstrtmgr/rstrtmgr.spec index c943658..0e1ba79 100644 --- a/dlls/rstrtmgr/rstrtmgr.spec +++ b/dlls/rstrtmgr/rstrtmgr.spec @@ -1,12 +1,12 @@ @ stub RmAddFilter @ stub RmCancelCurrentTask -@ stub RmEndSession +@ stdcall RmEndSession(long) @ stub RmGetFilterList @ stdcall RmGetList(long ptr ptr ptr ptr) @ stub RmJoinSession @ stdcall RmRegisterResources(long long ptr long ptr long ptr) @ stub RmRemoveFilter @ stub RmReserveHeap -@ stub RmRestart +@ stdcall RmRestart(long long ptr) @ stub RmShutdown @ stdcall RmStartSession(ptr long ptr)

1 0

Hans Leidekker : msi: Install assemblies only if the component action request is set to INSTALLSTATE_LOCAL .
by Alexandre Julliard Nov. 18, 2010

Nov. 18, 2010

Module: wine Branch: master Commit: a4de41f36b67f73fb5727c2454b09ef14262286f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4de41f36b67f73fb5727c245… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 18 12:08:37 2010 +0100 msi: Install assemblies only if the component action request is set to INSTALLSTATE_LOCAL. --- dlls/msi/files.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 9aeaaf3..182e027 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -293,7 +293,8 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) } LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { - if (comp->Enabled && comp->assembly && !comp->assembly->installed) + if (comp->ActionRequest == INSTALLSTATE_LOCAL && comp->Enabled && + comp->assembly && !comp->assembly->installed) { rc = install_assembly( package, comp ); if (rc != ERROR_SUCCESS)

1 0

Andrew Eikum : shell32: Fix an off-by-one error that causes an infinite loop.
by Alexandre Julliard Nov. 18, 2010

Nov. 18, 2010

Module: wine Branch: master Commit: 2f05b5a6d981d54f272d193ea0bcd3a72144c88d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f05b5a6d981d54f272d193ea… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Nov 17 11:56:13 2010 -0600 shell32: Fix an off-by-one error that causes an infinite loop. --- dlls/shell32/shfldr_unixfs.c | 14 +++++++++-- dlls/shell32/tests/shlfolder.c | 47 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index 14bf900..628ab87 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -390,15 +390,23 @@ static BOOL UNIXFS_get_unix_path(LPCWSTR pszDosPath, char *pszCanonicalPath) /* Append the part relative to the drive symbolic link target. */ lstrcpyW(dospath, pszDosPath); dospath_end = dospath + lstrlenW(dospath); + /* search for the most valid UNIX path possible, then append missing + * path parts */ while(!(pszUnixPath = wine_get_unix_file_name(dospath))){ - if(has_failed) + if(has_failed){ *dospath_end = '/'; - else + --dospath_end; + }else has_failed = 1; - while(*dospath_end != '\\' && *dospath_end != '/') + while(*dospath_end != '\\' && *dospath_end != '/'){ --dospath_end; + if(dospath_end < dospath) + break; + } *dospath_end = '\0'; } + if(dospath_end < dospath) + return FALSE; strcat(szPath, pszUnixPath + cDriveSymlinkLen); HeapFree(GetProcessHeap(), 0, pszUnixPath); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 31ef752..ad52a72 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4062,6 +4062,7 @@ static void test_ParseDisplayNamePBC(void) {'F','i','l','e',' ','S','y','s','t','e','m',' ','B','i','n','d',' ','D','a','t','a',0}; WCHAR adirW[] = {'C',':','\\','f','s','b','d','d','i','r',0}; WCHAR afileW[] = {'C',':','\\','f','s','b','d','d','i','r','\\','f','i','l','e','.','t','x','t',0}; + WCHAR afile2W[] = {'C',':','\\','f','s','b','d','d','i','r','\\','s','\\','f','i','l','e','.','t','x','t',0}; const HRESULT exp_err = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); IShellFolder *psf; @@ -4091,6 +4092,9 @@ static void test_ParseDisplayNamePBC(void) hres = IShellFolder_ParseDisplayName(psf, NULL, NULL, afileW, NULL, &pidl, NULL); ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + hres = IShellFolder_ParseDisplayName(psf, NULL, NULL, afile2W, NULL, &pidl, NULL); + ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed with wrong error: 0x%08x\n", hres); /* fails on unknown dir with IBindCtx with no IFileSystemBindData */ hres = CreateBindCtx(0, &pbc); @@ -4102,6 +4106,9 @@ static void test_ParseDisplayNamePBC(void) hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afileW, NULL, &pidl, NULL); ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, "ParseDisplayName failed with wrong error: 0x%08x\n", hres); + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); + ok(hres == exp_err || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed with wrong error: 0x%08x\n", hres); /* unknown dir with IBindCtx with IFileSystemBindData */ hres = IBindCtx_RegisterObjectParam(pbc, wFileSystemBindData, (IUnknown*)&fsbd); @@ -4126,6 +4133,14 @@ static void test_ParseDisplayNamePBC(void) ILFree(pidl); } + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); + ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)){ + verify_pidl(pidl, afile2W); + ILFree(pidl); + } + /* set FIND_DATA struct to NULLs */ pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_nul; @@ -4145,6 +4160,14 @@ static void test_ParseDisplayNamePBC(void) ILFree(pidl); } + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); + ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)){ + verify_pidl(pidl, afile2W); + ILFree(pidl); + } + /* set FIND_DATA struct to junk */ pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_junk; @@ -4164,6 +4187,14 @@ static void test_ParseDisplayNamePBC(void) ILFree(pidl); } + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); + ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)){ + verify_pidl(pidl, afile2W); + ILFree(pidl); + } + /* set FIND_DATA struct to invalid data */ pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_invalid; @@ -4183,6 +4214,14 @@ static void test_ParseDisplayNamePBC(void) ILFree(pidl); } + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); + ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)){ + verify_pidl(pidl, afile2W); + ILFree(pidl); + } + /* set FIND_DATA struct to valid data */ pidl = (ITEMIDLIST*)0xdeadbeef; fsbdVtbl.GetFindData = fsbd_GetFindData_valid; @@ -4202,6 +4241,14 @@ static void test_ParseDisplayNamePBC(void) ILFree(pidl); } + hres = IShellFolder_ParseDisplayName(psf, NULL, pbc, afile2W, NULL, &pidl, NULL); + ok(hres == S_OK || broken(hres == E_FAIL) /* NT4 */, + "ParseDisplayName failed: 0x%08x\n", hres); + if(SUCCEEDED(hres)){ + verify_pidl(pidl, afile2W); + ILFree(pidl); + } + IBindCtx_Release(pbc); IShellFolder_Release(psf); }

1 0

Andreas Pflug : oledb32: Added conversions for R8, BOOL, DATE, DBTIMESTAMP.
by Alexandre Julliard Nov. 18, 2010

Nov. 18, 2010

Module: wine Branch: master Commit: afa90e325ec56733fd1c2079bc512136b6afeb01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa90e325ec56733fd1c2079b… Author: Andreas Pflug <pflug(a)pse-consulting.de> Date: Wed Nov 17 13:06:16 2010 +0100 oledb32: Added conversions for R8,BOOL,DATE,DBTIMESTAMP. --- dlls/oledb32/convert.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 9 ++++ 2 files changed, 129 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index f6f72d0..c98d0b2 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -120,13 +120,19 @@ static int get_length(DBTYPE type) case DBTYPE_I2: case DBTYPE_UI2: return 2; + case DBTYPE_BOOL: + return sizeof(VARIANT_BOOL); case DBTYPE_I4: case DBTYPE_UI4: case DBTYPE_R4: return 4; case DBTYPE_I8: case DBTYPE_UI8: + case DBTYPE_R8: + case DBTYPE_DATE: return 8; + case DBTYPE_DBTIMESTAMP: + return sizeof(DBTIMESTAMP); case DBTYPE_CY: return sizeof(CY); case DBTYPE_BSTR: @@ -299,6 +305,120 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, } break; } + case DBTYPE_R8: + { + DOUBLE *d=dst; + switch (src_type) + { + case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; + case DBTYPE_I1: hr = VarR8FromI1(*(signed char*)src, d); break; + case DBTYPE_I2: hr = VarR8FromI2(*(signed short*)src, d); break; + case DBTYPE_I4: hr = VarR8FromI4(*(signed int*)src, d); break; + case DBTYPE_I8: hr = VarR8FromI8(*(LONGLONG*)src, d); break; + case DBTYPE_UI1: hr = VarR8FromUI1(*(BYTE*)src, d); break; + case DBTYPE_UI2: hr = VarR8FromUI2(*(WORD*)src, d); break; + case DBTYPE_UI4: hr = VarR8FromUI4(*(DWORD*)src, d); break; + case DBTYPE_UI8: hr = VarR8FromUI8(*(ULONGLONG*)src, d); break; + case DBTYPE_R4: hr = VarR8FromR4(*(FLOAT*)src, d); break; + case DBTYPE_R8: *d = *(DOUBLE*)src; hr = S_OK; break; + case DBTYPE_CY: hr = VarR8FromCy(*(CY*)src, d); break; + case DBTYPE_DATE: hr = VarR8FromDate(*(DATE*)src, d); break; + case DBTYPE_BSTR: hr = VarR8FromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BOOL: hr = VarR8FromBool(*(VARIANT_BOOL*)src, d); break; + case DBTYPE_DECIMAL: hr = VarR8FromDec((DECIMAL*)src, d); break; + default: FIXME("Unimplemented conversion %04x -> R8\n", src_type); return E_NOTIMPL; + } + break; + } + case DBTYPE_BOOL: + { + VARIANT_BOOL *d=dst; + switch (src_type) + { + case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; + case DBTYPE_I1: hr = VarBoolFromI1(*(signed char*)src, d); break; + case DBTYPE_I2: hr = VarBoolFromI2(*(signed short*)src, d); break; + case DBTYPE_I4: hr = VarBoolFromI4(*(signed int*)src, d); break; + case DBTYPE_I8: hr = VarBoolFromI8(*(LONGLONG*)src, d); break; + case DBTYPE_UI1: hr = VarBoolFromUI1(*(BYTE*)src, d); break; + case DBTYPE_UI2: hr = VarBoolFromUI2(*(WORD*)src, d); break; + case DBTYPE_UI4: hr = VarBoolFromUI4(*(DWORD*)src, d); break; + case DBTYPE_UI8: hr = VarBoolFromUI8(*(ULONGLONG*)src, d); break; + case DBTYPE_R4: hr = VarBoolFromR4(*(FLOAT*)src, d); break; + case DBTYPE_R8: hr = VarBoolFromR8(*(DOUBLE*)src, d); break; + case DBTYPE_CY: hr = VarBoolFromCy(*(CY*)src, d); break; + case DBTYPE_DATE: hr = VarBoolFromDate(*(DATE*)src, d); break; + case DBTYPE_BSTR: hr = VarBoolFromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BOOL: *d = *(VARIANT_BOOL*)src; hr = S_OK; break; + case DBTYPE_DECIMAL: hr = VarBoolFromDec((DECIMAL*)src, d); break; + default: FIXME("Unimplemented conversion %04x -> BOOL\n", src_type); return E_NOTIMPL; + } + break; + } + case DBTYPE_DATE: + { + DATE *d=dst; + switch (src_type) + { + case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; + case DBTYPE_I1: hr = VarDateFromI1(*(signed char*)src, d); break; + case DBTYPE_I2: hr = VarDateFromI2(*(signed short*)src, d); break; + case DBTYPE_I4: hr = VarDateFromI4(*(signed int*)src, d); break; + case DBTYPE_I8: hr = VarDateFromI8(*(LONGLONG*)src, d); break; + case DBTYPE_UI1: hr = VarDateFromUI1(*(BYTE*)src, d); break; + case DBTYPE_UI2: hr = VarDateFromUI2(*(WORD*)src, d); break; + case DBTYPE_UI4: hr = VarDateFromUI4(*(DWORD*)src, d); break; + case DBTYPE_UI8: hr = VarDateFromUI8(*(ULONGLONG*)src, d); break; + case DBTYPE_R4: hr = VarDateFromR4(*(FLOAT*)src, d); break; + case DBTYPE_R8: hr = VarDateFromR8(*(DOUBLE*)src, d); break; + case DBTYPE_CY: hr = VarDateFromCy(*(CY*)src, d); break; + case DBTYPE_DATE: *d = *(DATE*)src; hr = S_OK; break; + case DBTYPE_BSTR: hr = VarDateFromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; + case DBTYPE_BOOL: hr = VarDateFromBool(*(VARIANT_BOOL*)src, d); break; + case DBTYPE_DECIMAL: hr = VarDateFromDec((DECIMAL*)src, d); break; + case DBTYPE_DBTIMESTAMP: + { + SYSTEMTIME st; + DBTIMESTAMP *ts=(DBTIMESTAMP*)src; + + st.wYear = ts->year; + st.wMonth = ts->month; + st.wDay = ts->day; + st.wHour = ts->hour; + st.wMinute = ts->minute; + st.wSecond = ts->second; + st.wMilliseconds = ts->fraction/1000000; + hr = (SystemTimeToVariantTime(&st, d) ? S_OK : E_FAIL); + break; + } + default: FIXME("Unimplemented conversion %04x -> DATE\n", src_type); return E_NOTIMPL; + } + break; + } + case DBTYPE_DBTIMESTAMP: + { + DBTIMESTAMP *d=dst; + switch (src_type) + { + case DBTYPE_EMPTY: memset(d, 0, sizeof(DBTIMESTAMP)); hr = S_OK; break; + case DBTYPE_DBTIMESTAMP: memcpy(d, src, sizeof(DBTIMESTAMP)); hr = S_OK; break; + case DBTYPE_DATE: + { + SYSTEMTIME st; + hr = (VariantTimeToSystemTime(*(double*)src, &st) ? S_OK : E_FAIL); + d->year = st.wYear; + d->month = st.wMonth; + d->day = st.wDay; + d->hour = st.wHour; + d->minute = st.wMinute; + d->second = st.wSecond; + d->fraction = st.wMilliseconds * 1000000; + break; + } + default: FIXME("Unimplemented conversion %04x -> DBTIMESTAMP\n", src_type); return E_NOTIMPL; + } + break; + } case DBTYPE_CY: { diff --git a/include/oledb.idl b/include/oledb.idl index 127df2b..4841165 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -40,6 +40,15 @@ typedef ULONG DBREFCOUNT; typedef ULONG DB_UPARAMS; typedef LONG DB_LPARAMS; typedef DWORD DBHASHVALUE; +typedef struct { + SHORT year; + USHORT month; + USHORT day; + USHORT hour; + USHORT minute; + USHORT second; + ULONG fraction; +} DBTIMESTAMP; #include "dbs.idl"

1 0

Piotr Caban : msvcrt: Update spec files.
by Alexandre Julliard Nov. 18, 2010

Nov. 18, 2010

Module: wine Branch: master Commit: bf446e7cfb0b488660ace79084feaf4550ecde51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf446e7cfb0b488660ace7908… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 17 23:41:38 2010 +0100 msvcrt: Update spec files. --- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcrt/msvcrt.spec | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index eaaf4f1..84a6512 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -495,7 +495,7 @@ @ cdecl _putch(long) msvcrt._putch @ cdecl _putenv(str) msvcrt._putenv @ cdecl _putw(long ptr) msvcrt._putw -@ stub _putwch +@ cdecl _putwch(long) msvcrt._putwch @ cdecl _putws(wstr) msvcrt._putws @ stub _pwctype @ cdecl _read(long ptr long) msvcrt._read diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index e4f1a20..d4b05b0 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -490,7 +490,7 @@ @ cdecl _putch(long) msvcrt._putch @ cdecl _putenv(str) msvcrt._putenv @ cdecl _putw(long ptr) msvcrt._putw -@ stub _putwch +@ cdecl _putwch(long) msvcrt._putwch @ cdecl _putws(wstr) msvcrt._putws @ extern _pwctype msvcrt._pwctype @ cdecl _read(long ptr long) msvcrt._read diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a0a29b2..c10f7de 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -434,7 +434,6 @@ # stub _free_dbg # stub _freea # stub _freea_s -# stub _fscanf_l @ varargs _fscanf_l(ptr str ptr) MSVCRT__fscanf_l @ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64

1 0

Piotr Caban : msvcrt: Move _initterm_e implementation (from msvcr90).
by Alexandre Julliard Nov. 18, 2010

Nov. 18, 2010

Module: wine Branch: master Commit: 2770155532ec79f1e05d9abf7d4cd6b2c5e3092e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2770155532ec79f1e05d9abf7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 17 23:42:29 2010 +0100 msvcrt: Move _initterm_e implementation (from msvcr90). --- dlls/msvcr90/msvcr90.c | 26 -------------------------- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/data.c | 25 +++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 2fff15a..dbe528f 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -30,8 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcr90); -typedef int (CDECL *_INITTERM_E_FN)(void); - /********************************************************************* * DllMain (MSVCR90.@) */ @@ -81,30 +79,6 @@ void * CDECL _encoded_null(void) } /********************************************************************* - * _initterm_e (MSVCR90.@) - * - * call an array of application initialization functions and report the return value - */ -int CDECL _initterm_e(_INITTERM_E_FN *table, _INITTERM_E_FN *end) -{ - int res = 0; - - TRACE("(%p, %p)\n", table, end); - - while (!res && table < end) { - if (*table) { - TRACE("calling %p\n", **table); - res = (**table)(); - if (res) - TRACE("function %p failed: 0x%x\n", *table, res); - - } - table++; - } - return res; -} - -/********************************************************************* * _invalid_parameter_noinfo (MSVCR90.@) */ void CDECL _invalid_parameter_noinfo(void) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c58637d..ea00630 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -571,7 +571,7 @@ @ cdecl _i64tow_s(int64 ptr long long) msvcrt._i64tow_s @ stub _initptd @ cdecl _initterm(ptr ptr) msvcrt._initterm -@ cdecl _initterm_e(ptr ptr) +@ cdecl _initterm_e(ptr ptr) msvcrt._initterm_e @ stub _inp @ stub _inpd @ stub _inpw diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 53dd114..1ea5b1b 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -132,6 +132,7 @@ MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **wblk) } typedef void (CDECL *_INITTERMFUN)(void); +typedef int (CDECL *_INITTERM_E_FN)(void); /*********************************************************************** * __p___argc (MSVCRT.@) @@ -396,6 +397,30 @@ void CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end) } /********************************************************************* + * _initterm_e (MSVCRT.@) + * + * call an array of application initialization functions and report the return value + */ +int CDECL _initterm_e(_INITTERM_E_FN *table, _INITTERM_E_FN *end) +{ + int res = 0; + + TRACE("(%p, %p)\n", table, end); + + while (!res && table < end) { + if (*table) { + TRACE("calling %p\n", **table); + res = (**table)(); + if (res) + TRACE("function %p failed: 0x%x\n", *table, res); + + } + table++; + } + return res; +} + +/********************************************************************* * __set_app_type (MSVCRT.@) */ void CDECL MSVCRT___set_app_type(int app_type) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c10f7de..63e3b71 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -518,7 +518,7 @@ @ cdecl _i64tow(int64 ptr long) ntdll._i64tow @ cdecl _i64tow_s(int64 ptr long long) _i64tow_s @ cdecl _initterm(ptr ptr) -# stub _initterm_e +@ cdecl _initterm_e(ptr ptr) @ stub _inp #(long) -i386 @ stub _inpd #(long) -i386 @ stub _inpw #(long) -i386

1 0