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

Alexandre Julliard : Release 0.9.16.
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: 22eeeb146798bb022dd9e19c4de144367b853dd8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22eeeb146798bb022dd9e19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 21 18:21:12 2006 +0200 Release 0.9.16. --- ANNOUNCE | 14 ChangeLog | 2135 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 configure | 18 - 4 files changed, 2152 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=22eeeb146798bb022dd…

1 0

Tag wine-0.9.16 : Alexandre Julliard : Release 0.9.16
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/tags/wine-0.9.16 Tag: 38b43cae82e288557d7119e988d1d22f9799d553 URL: http://source.winehq.org/git/?p=wine.git;a=tag;h=38b43cae82e288557d7119e988… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 21 18:21:12 2006 +0200 Release 0.9.16

1 0

Alexandre Julliard : oleview: Delete the symlink from git.
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: ccfaaa1f7b45a6203747f5aa8ca4ee254bf9d93c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ccfaaa1f7b45a6203747f5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 21 18:16:18 2006 +0200 oleview: Delete the symlink from git. --- programs/oleview/.gitignore | 1 + programs/oleview/oleview | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) delete mode 120000 programs/oleview/oleview diff --git a/programs/oleview/.gitignore b/programs/oleview/.gitignore index 8cc2438..de06edf 100644 --- a/programs/oleview/.gitignore +++ b/programs/oleview/.gitignore @@ -1,3 +1,4 @@ Makefile +oleview rsrc.res toolbar.bmp diff --git a/programs/oleview/oleview b/programs/oleview/oleview deleted file mode 120000 index 82c8632..0000000 --- a/programs/oleview/oleview +++ /dev/null @@ -1 +0,0 @@ -../../tools/winewrapper \ No newline at end of file

1 0

Alexandre Julliard : Updated the AUTHORS list and converted it to utf-8.
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: 13574d919d7909f4968fc7f71f4e3f804c2acf20 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=13574d919d7909f4968fc7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 21 14:59:02 2006 +0200 Updated the AUTHORS list and converted it to utf-8. --- AUTHORS | 140 +++++++++++++++++++++++++++++++++---------- dlls/shell32/shell32_main.c | 4 + 2 files changed, 111 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=13574d919d7909f4968…

1 0

Francois Gouget : tools: Fix mkinstalldirs.
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: fb7afa42693f5304d8f827ceebeba2d6359d4e5e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fb7afa42693f5304d8f827c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 15 18:05:07 2006 +0200 tools: Fix mkinstalldirs. We cannot trust 'mkdir -p' to set the proper permissions on parent directories. So create them manually. Fix handling of paths containing spaces. Properly prefix the path with './' if it starts with a '-'. Stop trying to create a path after the first error. --- tools/mkinstalldirs | 68 +++++++++++++++++++++++++-------------------------- 1 files changed, 33 insertions(+), 35 deletions(-) diff --git a/tools/mkinstalldirs b/tools/mkinstalldirs index 8ab885e..ec700bd 100755 --- a/tools/mkinstalldirs +++ b/tools/mkinstalldirs @@ -46,47 +46,45 @@ case $dirmode in exec mkdir -p -- "$@" fi ;; *) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - fi ;; + # We cannot trust mkdir to set the proper permissions on + # parent directories. So create them manually. + ;; esac for file do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift + case "$file" in + /* ) pathcomp="/" ;; + -* ) pathcomp="./" ;; + * ) pathcomp="" ;; + esac - pathcomp= - for d + saved_IFS="$IFS" + IFS="/" + for d in $file do - pathcomp="$pathcomp$d" - case "$pathcomp" in - -* ) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp="$pathcomp/" + IFS="$saved_IFS" + if test -n "$d"; then + pathcomp="$pathcomp$d" + if test ! -d "$pathcomp"; then + echo "mkdir $pathcomp" + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then + errstatus=$lasterr + break + elif test -n "$dirmode"; then + echo "chmod $dirmode $pathcomp" + lasterr="" + chmod "$dirmode" "$pathcomp" || lasterr=$? + if test -n "$lasterr"; then + errstatus=$lasterr + break + fi + fi + fi + pathcomp="$pathcomp/" + fi done done

1 0

James Hawkins : msi: Fix handling of the no-op identifier in the Directory table.
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: a1910e11bb4608469d2e70da7c00c651c0e12360 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a1910e11bb4608469d2e70d… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jun 20 15:46:41 2006 -0700 msi: Fix handling of the no-op identifier in the Directory table. --- dlls/msi/action.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 63eb9c7..a953da4 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1421,6 +1421,7 @@ static MSIFOLDER *load_folder( MSIPACKAG ' ','=',' ','\'','%','s','\'', 0}; static const WCHAR szDot[] = { '.',0 }; + static WCHAR szEmpty[] = { 0 }; LPWSTR p, tgt_short, tgt_long, src_short, src_long; LPCWSTR parent; MSIRECORD *row; @@ -1454,11 +1455,11 @@ static MSIFOLDER *load_folder( MSIPACKAG tgt_long = folder_split_path( tgt_short, '|' ); src_long = folder_split_path( src_short, '|' ); - /* check for root dirs */ + /* check for no-op dirs */ if (!lstrcmpW(szDot, tgt_short)) - tgt_short = NULL; - if (!lstrcmpW(szDot, tgt_long)) - tgt_long = NULL; + tgt_short = szEmpty; + if (!lstrcmpW(szDot, src_short)) + src_short = szEmpty; if (!tgt_long) tgt_long = tgt_short;

1 0

Louis. Lenders : msvcrt: Fix a crash in _strdup.
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: 6d4a811cd56140b9915021cd9014c3f68d854948 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6d4a811cd56140b9915021c… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Jun 21 09:55:11 2006 +0100 msvcrt: Fix a crash in _strdup. --- dlls/msvcrt/string.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index c3a0c95..6dfce9a 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -50,9 +50,13 @@ char* msvcrt_strndup(const char* buf, un */ char* CDECL _strdup(const char* str) { - char * ret = MSVCRT_malloc(strlen(str)+1); - if (ret) strcpy( ret, str ); - return ret; + if(str) + { + char * ret = MSVCRT_malloc(strlen(str)+1); + if (ret) strcpy( ret, str ); + return ret; + } + else return 0; } /*********************************************************************

1 0

Louis. Lenders : msvcrt: Add simple test for _strdup(0).
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: 6f1ab505ace36247b855c3b2d2f1c94c781f166e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6f1ab505ace36247b855c3b… Author: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Jun 21 10:03:26 2006 +0100 msvcrt: Add simple test for _strdup(0). --- dlls/msvcrt/tests/string.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 9ed4e3b..c0857a2 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -99,6 +99,14 @@ static void test_mbsspn( void) ok( ret==0, "_mbsspn returns %d should be 0\n", ret); } +static void test_strdup(void) +{ + char *str; + str = _strdup( 0 ); + ok( str == 0, "strdup returns %s should be 0\n", str); + free( str ); +} + START_TEST(string) { void *mem; @@ -125,4 +133,6 @@ START_TEST(string) test_ismbblead(); /* test _mbsspn */ test_mbsspn(); + /* test _strdup */ + test_strdup(); }

1 0

Paul Vriens : uxtheme/tests: Extra testing for GetLastError.
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: 739f4187eb8380a16fd4a4e5011105ba465317e3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=739f4187eb8380a16fd4a4e… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Wed Jun 21 11:37:20 2006 +0200 uxtheme/tests: Extra testing for GetLastError. --- dlls/uxtheme/tests/system.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 3aa5582..579c399 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -97,7 +97,12 @@ static void test_SetWindowTheme(void) SetLastError(0xdeadbeef); hRes = pSetWindowTheme(NULL, NULL, NULL); todo_wine + { ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08lx\n", hRes); + ok( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08lx\n", + GetLastError()); + } /* Only do the bare minumum to get a valid hwnd */ hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL); @@ -106,6 +111,9 @@ static void test_SetWindowTheme(void) SetLastError(0xdeadbeef); hRes = pSetWindowTheme(hWnd, NULL, NULL); ok( hRes == S_OK, "Expected S_OK, got 0x%08lx\n", hRes); + ok( GetLastError() == 0xdeadbeef, + "Expected 0xdeadbeef, got 0x%08lx\n", + GetLastError()); } static void test_OpenThemeData(void) @@ -118,7 +126,6 @@ static void test_OpenThemeData(void) WCHAR szButtonClassList[] = {'B','u','t','t','o','n', 0 }; WCHAR szClassList[] = {'B','u','t','t','o','n',';','L','i','s','t','B','o','x', 0 }; - SetLastError(0xdeadbeef); bThemeActive = pIsThemeActive(); /* All NULL */

1 0

Andrew Ziem : msvcrt: Fix _initterm, with tests.
by Alexandre Julliard 21 Jun '06

21 Jun '06

Module: wine Branch: refs/heads/master Commit: 2132eb549074b35768a8023c7e5a9dde234b8131 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2132eb549074b35768a8023… Author: Andrew Ziem <ahziem1(a)mailbolt.com> Date: Tue Jun 13 22:51:13 2006 -0600 msvcrt: Fix _initterm, with tests. --- dlls/msvcrt/data.c | 4 ++ dlls/msvcrt/tests/.gitignore | 1 + dlls/msvcrt/tests/Makefile.in | 1 + dlls/msvcrt/tests/data.c | 73 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 1 deletions(-) create mode 100644 dlls/msvcrt/tests/data.c diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 1c4b8a7..2511970 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -342,6 +342,7 @@ void CDECL __wgetmainargs(int *argc, MSV unsigned int CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end) { _INITTERMFUN* current = start; + unsigned int count=0; TRACE("(%p,%p)\n",start,end); while (current<end) @@ -351,10 +352,11 @@ unsigned int CDECL _initterm(_INITTERMFU TRACE("Call init function %p\n",*current); (**current)(); TRACE("returned\n"); + count++; } current++; } - return 0; + return count; } /********************************************************************* diff --git a/dlls/msvcrt/tests/.gitignore b/dlls/msvcrt/tests/.gitignore index 2980711..f07f5c9 100644 --- a/dlls/msvcrt/tests/.gitignore +++ b/dlls/msvcrt/tests/.gitignore @@ -1,5 +1,6 @@ Makefile cpp.ok +data.ok dir.ok environ.ok file.ok diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in index 9569f1e..38ddf05 100644 --- a/dlls/msvcrt/tests/Makefile.in +++ b/dlls/msvcrt/tests/Makefile.in @@ -9,6 +9,7 @@ EXTRAINCL = -I$(TOPSRCDIR)/include/msvcr CTESTS = \ cpp.c \ + data.c \ dir.c \ environ.c \ file.c \ diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c new file mode 100644 index 0000000..c8eee75 --- /dev/null +++ b/dlls/msvcrt/tests/data.c @@ -0,0 +1,73 @@ +/* + * Tests msvcrt/data.c + * + * Copyright 2006 Andrew Ziem + * + * 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 "msvcrt.h" +#include "wine/test.h" +#include <stdarg.h> +#include <stdlib.h> +#include <stdio.h> +#include <fcntl.h> +#include <sys/stat.h> +#include <io.h> +#include <windef.h> +#include <winbase.h> +#include <winnls.h> +#include <process.h> +#include <errno.h> + +typedef void (*_INITTERMFUN)(void); +extern unsigned int CDECL _initterm(_INITTERMFUN *start,_INITTERMFUN *end); + +static int callbacked; + +void initcallback(void) +{ + callbacked++; +} + +#define initterm_test(start, end, expected) \ + callbacked = 0; \ + rc = _initterm(start, end); \ + ok(expected == rc, "_initterm: return result mismatch: got %i, expected %i\n", rc, expected); \ + ok(expected == callbacked,"_initterm: callbacks count mismatch: got %i, expected %i\n", callbacked, expected); + +void test_initterm(void) +{ + int i; + int rc; + static _INITTERMFUN callbacks[4]; + + for (i = 0; i < 4; i++) + { + callbacks[i] = initcallback; + } + + initterm_test(&callbacks[0], &callbacks[1], 1); + initterm_test(&callbacks[0], &callbacks[2], 2); + initterm_test(&callbacks[0], &callbacks[3], 3); + + callbacks[1] = NULL; + initterm_test(&callbacks[0], &callbacks[3], 2); +} + +START_TEST(data) +{ + test_initterm(); +}

1 0