January 2014 - Wine-Commits

Michael Stefaniuc : dmscript: COM cleanup for IDirectMusicTrack8 from DirectMusicScriptTrack.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 7b3c6307151356eb52ec19e8cb5126f59d6236d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b3c6307151356eb52ec19e8c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 22:09:30 2014 +0100 dmscript: COM cleanup for IDirectMusicTrack8 from DirectMusicScriptTrack. --- dlls/dmscript/dmscript_private.h | 16 ------- dlls/dmscript/scripttrack.c | 85 ++++++++++++++++++++++++-------------- 2 files changed, 53 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b3c6307151356eb52ec1…

1 0

Michael Stefaniuc : dmscript/tests: Add COM tests for DirectMusicScriptTrack.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: a0c0e3670106d9b9963baa2250af1f99760b6faf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0c0e3670106d9b9963baa225… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Jan 12 23:04:41 2014 +0100 dmscript/tests: Add COM tests for DirectMusicScriptTrack. --- dlls/dmscript/tests/dmscript.c | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/dmscript/tests/dmscript.c b/dlls/dmscript/tests/dmscript.c index f9612fa..b2912a4 100644 --- a/dlls/dmscript/tests/dmscript.c +++ b/dlls/dmscript/tests/dmscript.c @@ -132,6 +132,49 @@ static void test_COM(void) while (IDirectMusicScript_Release(dms)); } +static void test_COM_scripttrack(void) +{ + IDirectMusicTrack *dmt; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, (IUnknown*)&dmt, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmt); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicScriptTrack create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmt, "dmt = %p\n", dmt); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dmt); + ok(hr == E_NOINTERFACE, "DirectMusicScriptTrack create failed: %08x, expected E_NOINTERFACE\n", + hr); + + /* Same refcount for all DirectMusicScriptTrack interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicScriptTrack, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicTrack, (void**)&dmt); + ok(hr == S_OK, "DirectMusicScriptTrack create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicTrack_AddRef(dmt); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicTrack_Release(dmt)); +} + START_TEST(dmscript) { CoInitialize(NULL); @@ -143,6 +186,7 @@ START_TEST(dmscript) return; } test_COM(); + test_COM_scripttrack(); CoUninitialize(); }

1 0

Alexandre Julliard : msvcrt: Return per-thread information also in lc_codepage_func and lc_handle_func.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: b88630a42d07bbdbe7710a5a2460be991761cde3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b88630a42d07bbdbe7710a5a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 14:02:44 2014 +0100 msvcrt: Return per-thread information also in lc_codepage_func and lc_handle_func. --- dlls/msvcrt/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 4e8467a..7a33376 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -613,7 +613,7 @@ int CDECL __lconv_init(void) */ LCID* CDECL ___lc_handle_func(void) { - return MSVCRT___lc_handle; + return get_locinfo()->lc_handle; } /********************************************************************* @@ -621,7 +621,7 @@ LCID* CDECL ___lc_handle_func(void) */ unsigned int CDECL ___lc_codepage_func(void) { - return MSVCRT___lc_codepage; + return get_locinfo()->lc_codepage; } /*********************************************************************

1 0

Alexandre Julliard : msvcp90: Call the appropriate secure function instead of duplicating the checks.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 0f81fcb02fbcaf19e3ec60bde76053e03163bc29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f81fcb02fbcaf19e3ec60bde… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 11:50:10 2014 +0100 msvcp90: Call the appropriate secure function instead of duplicating the checks. --- dlls/msvcp90/string.c | 56 ++++++++++----------------------------------- dlls/msvcp90/tests/misc.c | 17 ++++++++------ 2 files changed, 22 insertions(+), 51 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 97b0f40..f5a9fa7 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -109,14 +109,8 @@ MSVCP_size_t CDECL MSVCP_char_traits_char_length(const char *str) char* CDECL MSVCP_char_traits_char__Copy_s(char *dest, MSVCP_size_t size, const char *src, MSVCP_size_t count) { - if(!dest || !src || size<count) { - if(dest && size) - dest[0] = '\0'; - _invalid_parameter(NULL, NULL, NULL, 0, 0); - return dest; - } - - return memcpy(dest, src, count); + memcpy_s(dest, size, src, count); + return dest; } /* ?copy@?$char_traits(a)D@std@@SAPADPADPBDI(a)Z */ @@ -140,14 +134,8 @@ const char * CDECL MSVCP_char_traits_char_find( char* CDECL MSVCP_char_traits_char__Move_s(char *dest, MSVCP_size_t size, const char *src, MSVCP_size_t count) { - if(!dest || !src || size<count) { - if(dest && size) - dest[0] = '\0'; - _invalid_parameter(NULL, NULL, NULL, 0, 0); - return dest; - } - - return memmove(dest, src, count); + memmove_s(dest, size, src, count); + return dest; } /* ?move@?$char_traits(a)D@std@@SAPADPADPBDI(a)Z */ @@ -245,14 +233,8 @@ MSVCP_size_t CDECL MSVCP_char_traits_wchar_length(const wchar_t *str) wchar_t* CDECL MSVCP_char_traits_wchar__Copy_s(wchar_t *dest, MSVCP_size_t size, const wchar_t *src, MSVCP_size_t count) { - if(!dest || !src || size<count) { - if(dest && size) - dest[0] = '\0'; - _invalid_parameter(NULL, NULL, NULL, 0, 0); - return dest; - } - - return memcpy(dest, src, count * sizeof(wchar_t)); + memcpy_s(dest, size * sizeof(wchar_t), src, count * sizeof(wchar_t)); + return dest; } /* ?copy@?$char_traits(a)_W@std@@SAPA_WPA_WPB_WI(a)Z */ @@ -282,14 +264,8 @@ const wchar_t* CDECL MSVCP_char_traits_wchar_find( wchar_t* CDECL MSVCP_char_traits_wchar__Move_s(wchar_t *dest, MSVCP_size_t size, const wchar_t *src, MSVCP_size_t count) { - if(!dest || !src || size<count) { - if(dest && size) - dest[0] = '\0'; - _invalid_parameter(NULL, NULL, NULL, 0, 0); - return dest; - } - - return memmove(dest, src, count * sizeof(WCHAR)); + memmove_s(dest, size * sizeof(wchar_t), src, count * sizeof(wchar_t)); + return dest; } /* ?move@?$char_traits(a)_W@std@@SAPA_WPA_WPB_WI(a)Z */ @@ -404,12 +380,8 @@ MSVCP_size_t CDECL MSVCP_char_traits_short_length(const unsigned short *str) unsigned short * CDECL MSVCP_char_traits_short__Copy_s(unsigned short *dest, MSVCP_size_t size, const unsigned short *src, MSVCP_size_t count) { - if(size<count) { - _invalid_parameter(NULL, NULL, NULL, 0, 0); - return dest; - } - - return memcpy(dest, src, count * sizeof(unsigned short)); + memcpy_s(dest, size * sizeof(unsigned short), src, count * sizeof(unsigned short)); + return dest; } /* ?copy@?$char_traits(a)G@std@@SAPAGPAGPBGI(a)Z */ @@ -439,12 +411,8 @@ const unsigned short* CDECL MSVCP_char_traits_short_find( unsigned short* CDECL MSVCP_char_traits_short__Move_s(unsigned short *dest, MSVCP_size_t size, const unsigned short *src, MSVCP_size_t count) { - if(size<count) { - _invalid_parameter(NULL, NULL, NULL, 0, 0); - return dest; - } - - return memmove(dest, src, count * sizeof(unsigned short)); + memmove_s(dest, size * sizeof(unsigned short), src, count * sizeof(unsigned short)); + return dest; } /* ?move@?$char_traits(a)G@std@@SAPAGPAGPBGI(a)Z */ diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 445bb45..f294b2a 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -20,6 +20,7 @@ #include <locale.h> #include <wctype.h> #include <float.h> +#include <errno.h> #include <windef.h> #include <winbase.h> @@ -60,6 +61,7 @@ static void* (__cdecl *p_set_invalid_parameter_handler)(void*); static _locale_t (__cdecl *p__get_current_locale)(void); static void (__cdecl *p__free_locale)(_locale_t); static void (__cdecl *p_free)(void*); +static int * (__cdecl *p_errno)(void); static void (__cdecl *p_char_assign)(void*, const void*); static void (__cdecl *p_wchar_assign)(void*, const void*); @@ -196,7 +198,8 @@ static BOOL init(void) p__get_current_locale = (void*)GetProcAddress(msvcr, "_get_current_locale"); p__free_locale = (void*)GetProcAddress(msvcr, "_free_locale"); p_free = (void*)GetProcAddress(msvcr, "free"); - if(!p_set_invalid_parameter_handler || !p__get_current_locale || !p__free_locale || !p_free) { + p_errno = (void*)GetProcAddress(msvcr, "_errno"); + if(!p_set_invalid_parameter_handler || !p__get_current_locale || !p__free_locale || !p_free || !p_errno) { win_skip("Error setting tests environment\n"); return FALSE; } @@ -449,7 +452,7 @@ static void test_Copy_s(void) ok(dest[4] == '#', "dest[4] != '#'\n"); ok(!memcmp(dest, src, sizeof(char[4])), "dest = %s\n", dest); - errno = 0xdeadbeef; + *p_errno() = 0xdeadbeef; dest[0] = '#'; ret = p_Copy_s(dest, 3, src, 4); ok(ret == dest, "ret != dest\n"); @@ -457,21 +460,21 @@ static void test_Copy_s(void) ok(invalid_parameter==1, "invalid_parameter = %d\n", invalid_parameter); invalid_parameter = 0; - ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(*p_errno() == ERANGE, "errno = %d\n", *p_errno()); - errno = 0xdeadbeef; + *p_errno() = 0xdeadbeef; p_Copy_s(NULL, 32, src, 4); ok(invalid_parameter==1, "invalid_parameter = %d\n", invalid_parameter); invalid_parameter = 0; - ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(*p_errno() == EINVAL, "errno = %d\n", *p_errno()); - errno = 0xdeadbeef; + *p_errno() = 0xdeadbeef; p_Copy_s(dest, 32, NULL, 4); ok(invalid_parameter==1, "invalid_parameter = %d\n", invalid_parameter); invalid_parameter = 0; - ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(*p_errno() == EINVAL, "errno = %d\n", *p_errno()); } static void test_wctype(void)

1 0

Huw Davies : mshtml: Finish with the correct string.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 5ac8507a8ebaebb407aea439948a07e1ad9bbcea URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac8507a8ebaebb407aea4399… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 13 11:32:44 2014 +0000 mshtml: Finish with the correct string. --- dlls/mshtml/npplugin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index 57bb772..f5eb754 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -309,7 +309,7 @@ static BOOL get_elem_clsid(nsIDOMElement *elem, CLSID *clsid) ERR("GetAttribute failed: %08x\n", nsres); } - nsAString_Finish(&attr_str); + nsAString_Finish(&val_str); return ret; } @@ -557,7 +557,7 @@ static void check_codebase(HTMLInnerWindow *window, nsIDOMElement *nselem) ERR("GetAttribute failed: %08x\n", nsres); } - nsAString_Finish(&attr_str); + nsAString_Finish(&val_str); if(!uri) return;

1 0

Francois Gouget : riched20: Make ME_GetDITypeName() static.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 25e0f11ced51e9462fefe06da7e71d6423f50ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e0f11ced51e9462fefe06da… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 13 13:30:37 2014 +0100 riched20: Make ME_GetDITypeName() static. --- dlls/riched20/editor.h | 1 - dlls/riched20/list.c | 31 ++++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 40bf04c..ae8b81a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -95,7 +95,6 @@ ME_DisplayItem *ME_FindItemBackOrHere(ME_DisplayItem *di, ME_DIType nTypeOrClass ME_DisplayItem *ME_MakeDI(ME_DIType type) DECLSPEC_HIDDEN; void ME_DestroyDisplayItem(ME_DisplayItem *item) DECLSPEC_HIDDEN; void ME_DumpDocument(ME_TextBuffer *buffer) DECLSPEC_HIDDEN; -const char *ME_GetDITypeName(ME_DIType type) DECLSPEC_HIDDEN; /* string.c */ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index 7722fc9..a6b3c65 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -139,9 +139,24 @@ ME_DisplayItem *ME_FindItemFwd(ME_DisplayItem *di, ME_DIType nTypeOrClass) return NULL; } +static const char *ME_GetDITypeName(ME_DIType type) +{ + switch(type) + { + case diParagraph: return "diParagraph"; + case diRun: return "diRun"; + case diCell: return "diCell"; + case diTextStart: return "diTextStart"; + case diTextEnd: return "diTextEnd"; + case diStartRow: return "diStartRow"; + default: return "?"; + } +} + void ME_DestroyDisplayItem(ME_DisplayItem *item) { -/* TRACE("type=%s\n", ME_GetDITypeName(item->type)); */ + if (0) + TRACE("type=%s\n", ME_GetDITypeName(item->type)); if (item->type==diParagraph) { FREE_OBJ(item->member.para.pFmt); @@ -172,20 +187,6 @@ ME_DisplayItem *ME_MakeDI(ME_DIType type) return item; } -const char *ME_GetDITypeName(ME_DIType type) -{ - switch(type) - { - case diParagraph: return "diParagraph"; - case diRun: return "diRun"; - case diCell: return "diCell"; - case diTextStart: return "diTextStart"; - case diTextEnd: return "diTextEnd"; - case diStartRow: return "diStartRow"; - default: return "?"; - } -} - void ME_DumpDocument(ME_TextBuffer *buffer) { /* FIXME this is useless, */

1 0

Alexandre Julliard : makedep: Expand the winegcc target arguments into the generated rules.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: c7411e22bec85336ea3220944f3c067201bb2c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7411e22bec85336ea3220944… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 14:44:26 2014 +0100 makedep: Expand the winegcc target arguments into the generated rules. --- Make.vars.in | 4 ++-- tools/makedep.c | 28 +++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index 75cb1e6..9814b88 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -24,6 +24,7 @@ CPPFLAGS = @CPPFLAGS@ EXTRACFLAGS = @EXTRACFLAGS@ MSVCRTFLAGS = @BUILTINFLAG@ TARGETFLAGS = @TARGETFLAGS@ +UNWINDFLAGS = @UNWINDFLAGS@ LIBS = @LIBS@ BISON = @BISON@ FLEX = @FLEX@ @@ -59,12 +60,11 @@ WIDL = $(TOOLSDIR)/tools/widl/widl$(TOOLSEXT) WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) WMC = $(TOOLSDIR)/tools/wmc/wmc$(TOOLSEXT) WRC = $(TOOLSDIR)/tools/wrc/wrc$(TOOLSEXT) +WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc$(TOOLSEXT) LIBPORT = $(top_builddir)/libs/port/libwine_port.a LIBWPP = $(top_builddir)/libs/wpp/libwpp.a LIBWINE = -L$(top_builddir)/libs/wine -lwine LIBWINE_STATIC = $(top_builddir)/libs/wine/libwine_static.a -WINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) @UNWINDFLAGS@ -CROSSWINEGCC = $(TOOLSDIR)/tools/winegcc/winegcc -B$(TOOLSDIR)/tools/winebuild --sysroot=$(top_builddir) --lib-suffix=.cross.a SED_CMD = LC_ALL=C sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' LDRPATH_INSTALL = @LDRPATH_INSTALL@ LDRPATH_LOCAL = @LDRPATH_LOCAL@ diff --git a/tools/makedep.c b/tools/makedep.c index c968187..94609a2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -104,6 +104,7 @@ static const char *src_dir; static const char *top_src_dir; static const char *top_obj_dir; static const char *parent_dir; +static const char *tools_dir; static const char *makefile_name = "Makefile"; static const char *Separator = "### Dependencies"; static const char *input_file_name; @@ -497,6 +498,17 @@ static char *top_dir_path( const char *path ) /******************************************************************* + * tools_dir_path + */ +static char *tools_dir_path( const char *path ) +{ + if (tools_dir) return strmake( "%s/tools/%s", tools_dir, path ); + if (top_obj_dir) return strmake( "%s/tools/%s", top_obj_dir, path ); + return strmake( "tools/%s", path ); +} + + +/******************************************************************* * init_paths */ static void init_paths(void) @@ -504,6 +516,7 @@ static void init_paths(void) /* ignore redundant source paths */ if (src_dir && !strcmp( src_dir, "." )) src_dir = NULL; if (top_src_dir && top_obj_dir && !strcmp( top_src_dir, top_obj_dir )) top_src_dir = NULL; + if (tools_dir && top_obj_dir && !strcmp( tools_dir, top_obj_dir )) tools_dir = NULL; strarray_insert( &include_args, 0, strmake( "-I%s", top_dir_path( "include" ))); } @@ -1718,7 +1731,10 @@ static struct strarray output_sources(void) output_filenames( res_files ); output( "\n" ); output( "\t$(WINEGCC) -o $@" ); + output_filename( strmake( "-B%s", tools_dir_path( "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir )); output_filenames( targetflags ); + output_filenames( get_expanded_make_var_array( "UNWINDFLAGS" )); if (spec_file) { output( " -shared %s", spec_file ); @@ -1854,7 +1870,10 @@ static struct strarray output_sources(void) strarray_add( &clean_files, strmake( "%s%s", stripped, dllext )); output( "%s%s:\n", testmodule, dllext ); output( "\t$(WINEGCC) -o $@" ); + output_filename( strmake( "-B%s", tools_dir_path( "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir )); output_filenames( targetflags ); + output_filenames( get_expanded_make_var_array( "UNWINDFLAGS" )); output_filenames( appmode ); output_filenames( object_files ); output_filenames( res_files ); @@ -1863,7 +1882,10 @@ static struct strarray output_sources(void) output( "\n" ); output( "%s%s:\n", stripped, dllext ); output( "\t$(WINEGCC) -s -o $@" ); + output_filename( strmake( "-B%s", tools_dir_path( "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir )); output_filenames( targetflags ); + output_filenames( get_expanded_make_var_array( "UNWINDFLAGS" )); output_filename( strmake( "-Wb,-F,%s", testmodule )); output_filenames( appmode ); output_filenames( object_files ); @@ -1895,7 +1917,10 @@ static struct strarray output_sources(void) output_filenames( crossobj_files ); output_filenames( res_files ); output( "\n" ); - output( "\t$(CROSSWINEGCC) -o $@ -b %s", crosstarget ); + output( "\t$(WINEGCC) -o $@ -b %s", crosstarget ); + output_filename( strmake( "-B%s", tools_dir_path( "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir )); + output_filename( "--lib-suffix=.cross.a" ); output_filenames( crossobj_files ); output_filenames( res_files ); output_filenames( all_libs ); @@ -2104,6 +2129,7 @@ static void update_makefile( const char *path ) top_src_dir = get_expanded_make_variable( "top_srcdir" ); top_obj_dir = get_expanded_make_variable( "top_builddir" ); parent_dir = get_expanded_make_variable( "PARENTSRC" ); + tools_dir = get_expanded_make_variable( "TOOLSDIR" ); appmode = get_expanded_make_var_array( "APPMODE" ); dllflags = get_expanded_make_var_array( "DLLFLAGS" );

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 3ea6334222319ec44ec64000b85a6325e368eda9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea6334222319ec44ec64000b… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Jan 11 13:40:59 2014 +0200 po: Update Finnish translation. --- po/fi.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/fi.po b/po/fi.po index ac1c326..164a493 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-06-06 21:18+0300\n" +"PO-Revision-Date: 2014-01-11 13:40+0200\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: none\n" "Language: Finnish\n" @@ -10124,10 +10124,8 @@ msgid "Wine Explorer" msgstr "Winen Explorer" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "Käynnistys" +msgstr "Käynnistä" #: explorer.rc:34 winefile.rc:36 msgid "&Run..."

1 0

Alexandre Julliard : msvcp90: Add wrappers for functions that don' t exist in old msvcrt versions.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 645540beed24327a145b7571ba5fe6d58f890f48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645540beed24327a145b7571b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 12:52:17 2014 +0100 msvcp90: Add wrappers for functions that don't exist in old msvcrt versions. --- dlls/msvcp90/locale.c | 7 +++---- dlls/msvcp90/msvcp90.h | 7 +++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 0ae1d8d..263bb8c 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -20,7 +20,6 @@ #include <stdarg.h> -#include "msvcp90.h" #include "locale.h" #include "errno.h" #include "limits.h" @@ -29,14 +28,14 @@ #include "wchar.h" #include "wctype.h" #include "time.h" - -#include "wine/list.h" - #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "msvcp90.h" #include "wine/unicode.h" +#include "wine/list.h" #include "wine/debug.h" + WINE_DEFAULT_DEBUG_CHANNEL(msvcp); char* __cdecl _Getdays(void); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index b04faab..026a04d 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -515,3 +515,10 @@ typedef struct { double real; double imag; } complex_double; + +#if _MSVCP_VER < 80 +#define memcpy_s( dst, size, src, count ) (memcpy( (dst), (src), (count) ), 0) +#define memmove_s( dst, size, src, count ) (memmove( (dst), (src), (count) ), 0) +#define mbstowcs_s( ret, wcs, size, mbs, count ) (mbstowcs( (wcs), (mbs), (count) )) +#define hypotf( x, y ) ((float)hypot( (double)(x), (double)(y) )) +#endif

1 0

Alexandre Julliard : msvcp90: Remove parameter checks from functions that are only used for old msvcp versions.
by Alexandre Julliard Jan. 13, 2014

Jan. 13, 2014

Module: wine Branch: master Commit: 4d7255d2df5a9262970e532c3e078ea7cd75631a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d7255d2df5a9262970e532c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 13 11:50:36 2014 +0100 msvcp90: Remove parameter checks from functions that are only used for old msvcp versions. --- dlls/msvcp90/locale.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 45380d2..f428396 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9713,12 +9713,6 @@ size_t __cdecl mbsrtowcs(wchar_t *dst, const char **pstr, size_t n, mbstate_t *s wchar_t wc; const char *src; - if (!pstr) - { - *_errno() = EINVAL; - _invalid_parameter( NULL, NULL, NULL, 0, 0 ); - return -1; - } src = *pstr; if (!state) state = &local_state; @@ -9757,12 +9751,6 @@ size_t __cdecl wcsrtombs(char *dst, const wchar_t **pstr, size_t n, mbstate_t *s char buffer[MB_LEN_MAX]; size_t ret = 0; - if (!pstr) - { - *_errno() = EINVAL; - _invalid_parameter( NULL, NULL, NULL, 0, 0 ); - return -1; - } src = *pstr; while (!dst || n > ret)

1 0