December 2013 - Wine-Commits

Alexandre Julliard : winebuild: Fix path separator for Cygwin.
by Alexandre Julliard Dec. 23, 2013

Dec. 23, 2013

Module: wine Branch: master Commit: c2d0907923ccbe1611f630fdefdf1f8a18840b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d0907923ccbe1611f630fde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 21 20:49:16 2013 +0100 winebuild: Fix path separator for Cygwin. --- tools/winebuild/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index f665e31..566911f 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -39,7 +39,7 @@ #include "build.h" -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__CYGWIN__) # define PATH_SEPARATOR ';' #else # define PATH_SEPARATOR ':'

1 0

Frédéric Delanoy : hlink/tests: Constify some character strings.
by Alexandre Julliard Dec. 23, 2013

Dec. 23, 2013

Module: wine Branch: master Commit: 4849e578662bd57d5ba7d804ba25170c095c0e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4849e578662bd57d5ba7d804b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 21 14:32:25 2013 +0100 hlink/tests: Constify some character strings. --- dlls/hlink/tests/hlink.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 91f7c4a..f4e3d5c 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1719,8 +1719,8 @@ static void test_HashLink(void) } } -static WCHAR site_monikerW[] = {'S','I','T','E','_','M','O','N','I','K','E','R',0}; -static WCHAR ref_monikerW[] = {'R','E','F','_','M','O','N','I','K','E','R',0}; +static const WCHAR site_monikerW[] = {'S','I','T','E','_','M','O','N','I','K','E','R',0}; +static const WCHAR ref_monikerW[] = {'R','E','F','_','M','O','N','I','K','E','R',0}; static HRESULT WINAPI hls_test_Moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMoniker *toLeft, REFIID riid, void **obj)

1 0

Dmitry Timoshkov : taskschd: Add new dll.
by Alexandre Julliard Dec. 23, 2013

Dec. 23, 2013

Module: wine Branch: master Commit: 73edf08041318899da0e5ae3de533cfa83cf819d URL: http://source.winehq.org/git/wine.git/?a=commit;h=73edf08041318899da0e5ae3d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 23 16:37:49 2013 +0900 taskschd: Add new dll. --- configure | 2 + configure.ac | 1 + dlls/taskschd/Makefile.in | 6 +++++ dlls/taskschd/taskschd.c | 48 +++++++++++++++++++++++++++++++++++++++++++ dlls/taskschd/taskschd.spec | 5 ++++ 5 files changed, 62 insertions(+), 0 deletions(-) diff --git a/configure b/configure index b18d271..f9b91aa 100755 --- a/configure +++ b/configure @@ -1190,6 +1190,7 @@ enable_svrapi enable_sxs enable_t2embed enable_tapi32 +enable_taskschd enable_traffic enable_twain_32 enable_unicows @@ -17236,6 +17237,7 @@ wine_fn_config_test dlls/sxs/tests sxs_test wine_fn_config_dll system.drv16 enable_win16 wine_fn_config_dll t2embed enable_t2embed wine_fn_config_dll tapi32 enable_tapi32 implib +wine_fn_config_dll taskschd enable_taskschd wine_fn_config_dll toolhelp.dll16 enable_win16 wine_fn_config_dll traffic enable_traffic wine_fn_config_dll twain.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index d80a2bc..94b1e29 100644 --- a/configure.ac +++ b/configure.ac @@ -3192,6 +3192,7 @@ WINE_CONFIG_TEST(dlls/sxs/tests) WINE_CONFIG_DLL(system.drv16,enable_win16) WINE_CONFIG_DLL(t2embed) WINE_CONFIG_DLL(tapi32,,[implib]) +WINE_CONFIG_DLL(taskschd) WINE_CONFIG_DLL(toolhelp.dll16,enable_win16) WINE_CONFIG_DLL(traffic) WINE_CONFIG_DLL(twain.dll16,enable_win16) diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in new file mode 100644 index 0000000..39e6c5b --- /dev/null +++ b/dlls/taskschd/Makefile.in @@ -0,0 +1,6 @@ +MODULE = taskschd.dll + +C_SRCS = \ + taskschd.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/taskschd/taskschd.c b/dlls/taskschd/taskschd.c new file mode 100644 index 0000000..241db94 --- /dev/null +++ b/dlls/taskschd/taskschd.c @@ -0,0 +1,48 @@ +/* + * Task Scheduler + * + * Copyright 2013 Dmitry Timoshkov + * + * 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 <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(taskschd); + +/****************************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + break; + } + return TRUE; +} diff --git a/dlls/taskschd/taskschd.spec b/dlls/taskschd/taskschd.spec new file mode 100644 index 0000000..b79e689 --- /dev/null +++ b/dlls/taskschd/taskschd.spec @@ -0,0 +1,5 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllGetVersion +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

Sebastian Lackner : ntdll: Allow passing NULL buffer to printf functions.
by Alexandre Julliard Dec. 23, 2013

Dec. 23, 2013

Module: wine Branch: master Commit: 3c2dc4a7b3d5187307edc678b805b4c64ab16351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c2dc4a7b3d5187307edc678b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Dec 20 05:56:40 2013 +0100 ntdll: Allow passing NULL buffer to printf functions. --- dlls/ntdll/printf.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index e09833a..65dc62d 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -75,16 +75,17 @@ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) if( out->unicode ) { LPWSTR p = out->buf.W + out->used; + out->used += len; + if (!out->buf.W) + return len; if( space >= len ) { memcpy( p, str, len*sizeof(WCHAR) ); - out->used += len; return len; } if( space > 0 ) memcpy( p, str, space*sizeof(WCHAR) ); - out->used += len; } else { @@ -92,14 +93,16 @@ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) ULONG n; RtlUnicodeToMultiByteSize( &n, str, len * sizeof(WCHAR) ); + out->used += n; + + if (!out->buf.A) + return len; if( space >= n ) { RtlUnicodeToMultiByteN( p, n, NULL, str, len * sizeof(WCHAR) ); - out->used += n; return len; } if (space > 0) RtlUnicodeToMultiByteN( p, space, NULL, str, len * sizeof(WCHAR) ); - out->used += n; } return -1; } @@ -113,16 +116,17 @@ static inline int pf_output_stringA( pf_output *out, LPCSTR str, int len ) if( !out->unicode ) { LPSTR p = out->buf.A + out->used; + out->used += len; + if (!out->buf.A) + return len; if( space >= len ) { memcpy( p, str, len ); - out->used += len; return len; } if( space > 0 ) memcpy( p, str, space ); - out->used += len; } else { @@ -130,14 +134,16 @@ static inline int pf_output_stringA( pf_output *out, LPCSTR str, int len ) ULONG n; RtlMultiByteToUnicodeSize( &n, str, len ); + out->used += n / sizeof(WCHAR); + + if (!out->buf.W) + return len; if (space >= n / sizeof(WCHAR)) { RtlMultiByteToUnicodeN( p, n, NULL, str, len ); - out->used += n / sizeof(WCHAR); return len; } if (space > 0) RtlMultiByteToUnicodeN( p, space * sizeof(WCHAR), NULL, str, len ); - out->used += n / sizeof(WCHAR); } return -1; }

1 0

Alexandre Julliard : msvcp100: Implement _Locinfo::_Getname.
by Alexandre Julliard Dec. 23, 2013

Dec. 23, 2013

Module: wine Branch: master Commit: 91356c3bedccc379c6457a83a7895050f1ce5b1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=91356c3bedccc379c6457a83a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 21 17:57:46 2013 +0100 msvcp100: Implement _Locinfo::_Getname. --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp90/locale.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 92c99d7..12463af 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -908,8 +908,8 @@ @ cdecl -arch=win64 ?_Getlconv(a)_Locinfo@std@@QEBAPEBUlconv@@XZ(ptr) _Locinfo__Getlconv @ thiscall -arch=win32 ?_Getmonths(a)_Locinfo@std@@QBEPBDXZ(ptr) _Locinfo__Getmonths @ cdecl -arch=win64 ?_Getmonths(a)_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getmonths -@ stub -arch=win32 ?_Getname(a)_Locinfo@std@@QBEPBDXZ -@ stub -arch=win64 ?_Getname(a)_Locinfo@std@@QEBAPEBDXZ +@ thiscall -arch=win32 ?_Getname(a)_Locinfo@std@@QBEPBDXZ(ptr) _Locinfo__Getname +@ cdecl -arch=win64 ?_Getname(a)_Locinfo@std@@QEBAPEBDXZ(ptr) _Locinfo__Getname @ cdecl -arch=arm ?_Getpfirst(a)_Container_base12@std@@QBAPAPAU_Iterator_base12(a)2@XZ(ptr) _Container_base12__Getpfirst @ thiscall -arch=i386 ?_Getpfirst(a)_Container_base12@std@@QBEPAPAU_Iterator_base12(a)2@XZ(ptr) _Container_base12__Getpfirst @ cdecl -arch=win64 ?_Getpfirst(a)_Container_base12@std@@QEBAPEAPEAU_Iterator_base12(a)2@XZ(ptr) _Container_base12__Getpfirst diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 3d9871c..d31f301 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1331,8 +1331,8 @@ @ thiscall -arch=i386 ?_Getmonths(a)_Locinfo@std@@QBEPBDXZ(ptr) msvcp90.?_Getmonths(a)_Locinfo@std@@QBEPBDXZ @ cdecl -arch=win64 ?_Getmonths(a)_Locinfo@std@@QEBAPEBDXZ(ptr) msvcp90.?_Getmonths(a)_Locinfo@std@@QEBAPEBDXZ @ stub -arch=arm ?_Getname(a)_Locinfo@std@@QBAPBDXZ -@ stub -arch=i386 ?_Getname(a)_Locinfo@std@@QBEPBDXZ -@ stub -arch=win64 ?_Getname(a)_Locinfo@std@@QEBAPEBDXZ +@ thiscall -arch=win32 ?_Getname(a)_Locinfo@std@@QBEPBDXZ(ptr) msvcp100.?_Getname(a)_Locinfo@std@@QBEPBDXZ +@ cdecl -arch=win64 ?_Getname(a)_Locinfo@std@@QEBAPEBDXZ(ptr) msvcp100.?_Getname(a)_Locinfo@std@@QEBAPEBDXZ @ cdecl -arch=arm ?_Getpfirst(a)_Container_base12@std@@QBAPAPAU_Iterator_base12(a)2@XZ(ptr) msvcp100.?_Getpfirst(a)_Container_base12@std@@QBAPAPAU_Iterator_base12(a)2@XZ @ thiscall -arch=i386 ?_Getpfirst(a)_Container_base12@std@@QBEPAPAU_Iterator_base12(a)2@XZ(ptr) msvcp100.?_Getpfirst(a)_Container_base12@std@@QBEPAPAU_Iterator_base12(a)2@XZ @ cdecl -arch=win64 ?_Getpfirst(a)_Container_base12@std@@QEBAPEAPEAU_Iterator_base12(a)2@XZ(ptr) msvcp100.?_Getpfirst(a)_Container_base12@std@@QEBAPEAPEAU_Iterator_base12(a)2@XZ diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 5fdf890..08cc893 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9454,6 +9454,16 @@ basic_string_char* __thiscall locale_name(const locale *this, basic_string_char return ret; } +#else + +/* ?_Getname(a)_Locinfo@std@@QBEPBDXZ */ +/* ?_Getname(a)_Locinfo@std@@QEBAPEBDXZ */ +DEFINE_THISCALL_WRAPPER(_Locinfo__Getname, 4) +const char * __thiscall _Locinfo__Getname( const _Locinfo *this ) +{ + return locale_string_char_c_str( &this->newlocname ); +} + #endif /* _MSVCP_VER < 100 */ /* wctrans */

1 0

Frédéric Delanoy : comcat/tests: Constify some character strings.
by Alexandre Julliard Dec. 23, 2013

Dec. 23, 2013

Module: wine Branch: master Commit: 4ef6d4a6add74d231ea3a9fe35fb96a5991cabeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ef6d4a6add74d231ea3a9fe3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 21 14:32:20 2013 +0100 comcat/tests: Constify some character strings. --- dlls/comcat/tests/comcat.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comcat/tests/comcat.c b/dlls/comcat/tests/comcat.c index f78e234..ff5b51a 100644 --- a/dlls/comcat/tests/comcat.c +++ b/dlls/comcat/tests/comcat.c @@ -65,15 +65,15 @@ static void do_enum(void) GUID the_cat[1]; GUID wanted_guid; ULONG fetched = -1; - - static WCHAR szCatID[] = { + + static const WCHAR szCatID[] = { '{', 'd','e','a','d','c','a','f','e', '-','0','0','0','0','-','0','0','0','0', '-','0','0','0','0', '-','0','0','0','0','0','0','0','0','0','0','0','0', '}',0}; - static WCHAR szGuid[] = { + static const WCHAR szGuid[] = { '{', 'd','e','a','d','c','a','f','e','-', 'b','e','e','d','-',

1 0

Andrey Gusev : d3d8: Added missing hyphen in WARN message.
by Alexandre Julliard Dec. 23, 2013

Dec. 23, 2013

Module: wine Branch: master Commit: fe57612c1cf1e4b54fe74b6f406c7bf4ad4454f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe57612c1cf1e4b54fe74b6f4… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Dec 22 12:01:05 2013 +0200 d3d8: Added missing hyphen in WARN message. --- dlls/d3d8/shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index f7096bb..7d61fd6 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -95,7 +95,7 @@ HRESULT d3d8_vertex_shader_init(struct d3d8_vertex_shader *shader, struct d3d8_d if (reg == D3DVSDE_NORMAL && type != D3DVSDT_FLOAT3 && !byte_code) { - WARN("Attempt to use a non-FLOAT3 normal with the fixed function function\n"); + WARN("Attempt to use a non-FLOAT3 normal with the fixed-function function\n"); return D3DERR_INVALIDCALL; } }

1 0

Alexandre Julliard : Wine release 1.7.9
by Alexandre Julliard Dec. 20, 2013

Dec. 20, 2013

Module: website Branch: master Commit: 5c2216ce2e7f1706bcec8e3140a1f11a72864044 URL: http://source.winehq.org/git/website.git/?a=commit;h=5c2216ce2e7f1706bcec8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 20 19:42:24 2013 +0100 Wine release 1.7.9 --- news/en/2013122001.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2013122001.xml b/news/en/2013122001.xml new file mode 100644 index 0000000..0fe38da --- /dev/null +++ b/news/en/2013122001.xml @@ -0,0 +1,15 @@ +<news> +<date>December 20, 2013</date> +<title>Wine 1.7.9 Released</title> +<body> + The Wine development release 1.7.9 is now available. + <a href="{$root}/announce/1.7.9">What's new</a> in this release: +<ul> + <li>Improved window moving/resizing in the Mac driver.</li> + <li>Some DirectDraw palette fixes.</li> + <li>Reduced code duplication between C++ runtime versions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.9.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.7.9 : Alexandre Julliard : Release 1.7.9
by Alexandre Julliard Dec. 20, 2013

Dec. 20, 2013

Module: wine Branch: refs/tags/wine-1.7.9 Tag: 73f7b89403f473ead1a2873af2303517f66b61cc URL: http://source.winehq.org/git/wine.git/?a=tag;h=73f7b89403f473ead1a2873af230… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 20 19:34:52 2013 +0100 Release 1.7.9

1 0

Alexandre Julliard : Release 1.7.9.
by Alexandre Julliard Dec. 20, 2013

Dec. 20, 2013

Module: wine Branch: master Commit: 12f43584739fd4df5ca86a320bd9fd09fe3b64b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12f43584739fd4df5ca86a320… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 20 19:34:52 2013 +0100 Release 1.7.9. --- ANNOUNCE | 558 ++++++++++++++++++++++++++++--------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 267 insertions(+), 312 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12f43584739fd4df5ca86…

1 0