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

Marcus Meissner : kernel32: GetCurrentDirectoryW gets characters, not bytes.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: c1d262f66d435a65ec5a517fe6c817ea20e54636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1d262f66d435a65ec5a517fe… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Jun 26 09:01:27 2015 +0200 kernel32: GetCurrentDirectoryW gets characters, not bytes. --- dlls/kernel32/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 7cb245a..7a1dc11 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1911,7 +1911,7 @@ BOOL WINAPI GetVolumePathNameW(LPCWSTR filename, LPWSTR volumepathname, DWORD bu goto cleanup; } } - else if (GetCurrentDirectoryW( sizeof(cwdW), cwdW )) + else if (GetCurrentDirectoryW( sizeof(cwdW)/sizeof(cwdW[0]), cwdW )) { /* if the path is completely bogus then revert to the drive of the working directory */ fallbackpathW[0] = cwdW[0];

1 0

Gerald Pfeifer : oleaut32: Fix indentation in test_safearray.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: a767c8399b6c5a254463d0c2036cc2174a767dba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a767c8399b6c5a254463d0c20… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Jun 25 12:22:43 2015 +0200 oleaut32: Fix indentation in test_safearray. --- dlls/oleaut32/tests/safearray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 2a62977..dd9329a 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -709,7 +709,7 @@ static void test_safearray(void) return; for (i=0;i<sizeof(vttypes)/sizeof(vttypes[0]);i++) { - a = NULL; + a = NULL; hres = pSafeArrayAllocDescriptorEx(vttypes[i].vt,1,&a); ok(hres == S_OK, "SafeArrayAllocDescriptorEx gave hres 0x%x\n", hres); ok(a->fFeatures == vttypes[i].expflags,"SAADE(%d) resulted with flags %x, expected %x\n", vttypes[i].vt, a->fFeatures, vttypes[i].expflags);

1 0

Alistair Leslie-Hughes : dpnet: Don't return partially initialized object.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 817db8e361e20dfa3ba3b21ca62cfb0d61a9dba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=817db8e361e20dfa3ba3b21ca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 26 10:53:32 2015 +1000 dpnet: Don't return partially initialized object. --- dlls/dpnet/address.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index d2a05f6..4f3a59b 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -253,6 +253,8 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_Duplicate(IDirectPlay8Address *ifa if(hr != S_OK) { + IDirectPlay8Address_Release(dup); + dup = NULL; ERR("Failed to copy component: %s - 0x%08x\n", debugstr_w(entry->name), hr); break; }

1 0

Daniel Lehman : msvcp90: Set _Locimp vtable in _Locimp ctors (Valgrind).
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: c17c54318a552606ab6430770caf082c37346bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c17c54318a552606ab6430770… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Jun 22 17:43:56 2015 -0700 msvcp90: Set _Locimp vtable in _Locimp ctors (Valgrind). --- dlls/msvcp90/locale.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index b975741..9b85322 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9966,6 +9966,9 @@ istreambuf_iterator_char* __thiscall time_get_char_get_year(const time_get_char return call_time_get_char_do_get_year(this, ret, s, e, base, err, t); } +/* ??_7_Locimp(a)locale@std@@6B@ */ +extern const vtable_ptr MSVCP_locale__Locimp_vtable; + /* ??0_Locimp(a)locale@std@@AAE(a)_N@Z */ /* ??0_Locimp(a)locale@std@@AEAA(a)_N@Z */ DEFINE_THISCALL_WRAPPER(locale__Locimp_ctor_transparent, 8) @@ -9975,6 +9978,7 @@ locale__Locimp* __thiscall locale__Locimp_ctor_transparent(locale__Locimp *this, memset(this, 0, sizeof(locale__Locimp)); locale_facet_ctor_refs(&this->facet, 1); + this->facet.vtable = &MSVCP_locale__Locimp_vtable; this->transparent = transparent; locale_string_char_ctor_cstr(&this->name, "*"); return this; @@ -10001,6 +10005,7 @@ locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const _Lockit_ctor_locktype(&lock, _LOCK_LOCALE); memcpy(this, copy, sizeof(locale__Locimp)); locale_facet_ctor_refs(&this->facet, 1); + this->facet.vtable = &MSVCP_locale__Locimp_vtable; if(copy->facetvec) { this->facetvec = MSVCRT_operator_new(copy->facet_cnt*sizeof(locale_facet*)); if(!this->facetvec) { @@ -10560,11 +10565,6 @@ locale__Locimp* __cdecl locale__Locimp__Makeloc(const _Locinfo *locinfo, categor return locimp; } -/* ??_7_Locimp(a)locale@std@@6B@ */ -const vtable_ptr MSVCP_locale__Locimp_vtable[] = { - (vtable_ptr)THISCALL_NAME(locale__Locimp_vector_dtor) -}; - /* ??0locale(a)std@@AAE(a)PAV_Locimp@01@@Z */ /* ??0locale(a)std@@AEAA(a)PEAV_Locimp@01@@Z */ DEFINE_THISCALL_WRAPPER(locale_ctor_locimp, 8) @@ -11066,6 +11066,7 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s DEFINE_RTTI_DATA0(locale_facet, 0, ".?AVfacet(a)locale@std@@") +DEFINE_RTTI_DATA1(locale__Locimp, 0, &locale_facet_rtti_base_descriptor, ".?AV_Locimp(a)locale@std@@") DEFINE_RTTI_DATA1(collate_char, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate(a)D@std@@") DEFINE_RTTI_DATA1(collate_wchar, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate(a)_W@std@@") DEFINE_RTTI_DATA1(collate_short, 0, &locale_facet_rtti_base_descriptor, ".?AV?$collate(a)G@std@@") @@ -11102,6 +11103,13 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(locale_facet__Decref) #endif ); + __ASM_VTABLE(locale__Locimp, + VTABLE_ADD_FUNC(locale__Locimp_vector_dtor) +#if _MSVCP_VER >= 110 + VTABLE_ADD_FUNC(locale_facet__Incref) + VTABLE_ADD_FUNC(locale_facet__Decref) +#endif + ); __ASM_VTABLE(collate_char, VTABLE_ADD_FUNC(collate_char_vector_dtor) #if _MSVCP_VER >= 110 @@ -11425,6 +11433,7 @@ void init_locale(void *base) { #ifdef __x86_64__ init_locale_facet_rtti(base); + init_locale__Locimp_rtti(base); init_collate_char_rtti(base); init_collate_wchar_rtti(base); init_collate_short_rtti(base);

1 0

Alexandre Julliard : d3dcompiler_43: Add a helper function for register token to avoid compiler warnings.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 8a9483400ab6ca49360affe328c27007dc7f8bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a9483400ab6ca49360affe32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 26 18:26:46 2015 +0900 d3dcompiler_43: Add a helper function for register token to avoid compiler warnings. --- dlls/d3dcompiler_43/bytecodewriter.c | 131 +++++++++++------------------------ 1 file changed, 39 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a9483400ab6ca49360af…

1 0

Nikolay Sivov : dwrite: Properly reduce glyph count of effective run.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 872e569744ef63425600c35db1e2b402558a4a02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=872e569744ef63425600c35db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 25 11:10:39 2015 +0300 dwrite: Properly reduce glyph count of effective run. --- dlls/dwrite/layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 25e8eac..1094127 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -964,8 +964,8 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const /* trim from the left */ run->glyphcount = r->u.regular.run.glyphCount - r->u.regular.clustermap[start]; /* trim from the right */ - if (length < r->u.regular.descr.stringLength) - run->glyphcount -= r->u.regular.clustermap[start + length]; + if (start + length < r->u.regular.descr.stringLength - 1) + run->glyphcount -= r->u.regular.run.glyphCount - r->u.regular.clustermap[start + length]; } else run->glyphcount = 0;

1 0

Nikolay Sivov : dwrite: Fix clustermap shifting for effective run.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 9148e872918f40f091503fc000b47f01377e2144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9148e872918f40f091503fc00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 26 12:32:58 2015 +0300 dwrite: Fix clustermap shifting for effective run. --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 1094127..611a1e6 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -972,7 +972,7 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const /* cluster map needs to be shifted */ for (i = 0; i < length; i++) - run->clustermap[i] = r->u.regular.clustermap[start] - start; + run->clustermap[i] = r->u.regular.clustermap[start + i] - r->u.regular.clustermap[start]; list_add_tail(&layout->eruns, &run->entry);

1 0

Zhenbo Li : mshtml/tests: Added IHTMLXMLHttpRequest tests.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 295a8d8301e323451e2f8b95897cb51703f3bf73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=295a8d8301e323451e2f8b958… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Thu Jun 25 20:16:53 2015 +0800 mshtml/tests: Added IHTMLXMLHttpRequest tests. --- dlls/mshtml/tests/Makefile.in | 3 +- dlls/mshtml/tests/xmlhttprequest.c | 625 +++++++++++++++++++++++++++++++++++++ 2 files changed, 627 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=295a8d8301e323451e2f8…

1 0

Hugh McMaster : regsvr32: Clean up and update comments to reflect changes to the codebase.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: db4a8bf0ec45c5b8df622cf68560e2b928ee9c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db4a8bf0ec45c5b8df622cf68… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 26 20:04:22 2015 +1000 regsvr32: Clean up and update comments to reflect changes to the codebase. --- programs/regsvr32/regsvr32.c | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index c539095..449124f 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -4,6 +4,7 @@ * Copyright 2001 ReactOS project * Copyright 2001 Jurgen Van Gael [jurgen.vangael(a)student.kuleuven.ac.be] * Copyright 2002 Andriy Palamarchuk + * Copyright 2014, 2015 Hugh McMaster * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,30 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * This version deliberately differs in error handling compared to the - * windows version. - */ - -/* - * - * regsvr32 [/u] [/s] [/n] [/i[:cmdline]] dllname ... - * [/u] unregister server - * [/s] silent (no message boxes) - * [/i] Call DllInstall passing it an optional [cmdline]; - * when used with /u calls dll uninstall. - * [/n] Do not call DllRegisterServer; this option must be used with [/i] - * [/c] Console output (seems to be deprecated and ignored) - * - * Note the complication that this version may be passed unix format file names - * which might be mistaken for flags. Conveniently the Windows version - * requires each flag to be separate (e.g. no /su ) and so we will simply - * assume that anything longer than /. is a filename. - */ - -/** - * FIXME - currently receives command-line parameters in ASCII only and later - * converts to Unicode. Ideally the function should have wWinMain entry point - * and then work in Unicode only, but it seems Wine does not have necessary - * support. + * Windows version. */ #define WIN32_LEAN_AND_MEAN @@ -118,8 +96,8 @@ static void __cdecl output_write(UINT id, ...) * * Parameters: * strDll - name of the dll. - * procName - name of the procedure to load from dll - * pDllHanlde - output variable receives handle of the loaded dll. + * procName - name of the procedure to load from the dll. + * DllHandle - a variable that receives the handle of the loaded dll. */ static VOID *LoadProc(const WCHAR* strDll, const char* procName, HMODULE* DllHandle) { @@ -257,6 +235,11 @@ int wmain(int argc, WCHAR* argv[]) * the files (e.g. regsvr32 file1 /s file2 is silent even for file1). * For ease, we will not replicate that and will process the arguments * in order. + * + * Note the complication that this version may be passed Unix format filenames + * which could be mistaken for flags. The Windows version conveniently + * requires each flag to be separate (e.g. no /su), so we will simply + * assume that anything longer than /. is a filename. */ for(i = 1; i < argc; i++) { @@ -304,7 +287,7 @@ int wmain(int argc, WCHAR* argv[]) if (res) return res; - /* Confirmed. The windows version does stop on the first error.*/ + /* Confirmed. The Windows version stops on the first error. */ if (CallInstall) {

1 0

Alexandre Julliard : Release 1.7.46.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: ae6efa469bfaecade30e160d195d607bdcdcc6ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae6efa469bfaecade30e160d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 26 21:10:10 2015 +0900 Release 1.7.46. --- ANNOUNCE | 784 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 427 insertions(+), 380 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae6efa469bfaecade30e1…

1 0