August 2010 - Wine-Commits - list.winehq.org

Alexandre Julliard : winebuild: Add support for specifying thiscall calling convention.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: b116040771d85595f50e3b0eba526fcb3a98c96c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b116040771d85595f50e3b0eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 15:20:00 2010 +0200 winebuild: Add support for specifying thiscall calling convention. --- tools/winebuild/build.h | 1 + tools/winebuild/import.c | 1 + tools/winebuild/parser.c | 13 +++++++++++++ tools/winebuild/spec32.c | 2 ++ tools/winebuild/winebuild.man.in | 5 +++++ 5 files changed, 22 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 85b8427..ef91961 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -47,6 +47,7 @@ typedef enum TYPE_STDCALL, /* stdcall function (Win32) */ TYPE_CDECL, /* cdecl function (Win32) */ TYPE_VARARGS, /* varargs function (Win32) */ + TYPE_THISCALL, /* thiscall function (Win32 on i386) */ TYPE_EXTERN, /* external symbol (Win32) */ TYPE_NBTYPES } ORD_TYPE; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index a221a9d..6a77a3f 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -457,6 +457,7 @@ static void check_undefined_exports( DLLSPEC *spec ) case TYPE_STDCALL: case TYPE_CDECL: case TYPE_VARARGS: + case TYPE_THISCALL: if (link_ext_symbols) { odp->flags |= FLAG_EXT_LINK; diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index f48471c..459bf97 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -56,6 +56,7 @@ static const char * const TypeNames[TYPE_NBTYPES] = "stdcall", /* TYPE_STDCALL */ "cdecl", /* TYPE_CDECL */ "varargs", /* TYPE_VARARGS */ + "thiscall", /* TYPE_THISCALL */ "extern" /* TYPE_EXTERN */ }; @@ -235,6 +236,11 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) error( "'stdcall' not supported for Win16\n" ); return 0; } + if (!is_win32 && odp->type == TYPE_THISCALL) + { + error( "'thiscall' not supported for Win16\n" ); + return 0; + } if (is_win32 && odp->type == TYPE_PASCAL) { error( "'pascal' not supported for Win32\n" ); @@ -325,6 +331,12 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) odp->flags |= FLAG_FORWARD; } } + if (target_cpu == CPU_x86 && odp->type == TYPE_THISCALL && !(odp->flags & FLAG_FORWARD)) + { + char *link_name = strmake( "__thiscall_%s", odp->link_name ); + free( odp->link_name ); + odp->link_name = link_name; + } return 1; } @@ -524,6 +536,7 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec ) case TYPE_STDCALL: case TYPE_VARARGS: case TYPE_CDECL: + case TYPE_THISCALL: if (!parse_spec_export( odp, spec )) goto error; break; case TYPE_ABS: diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 3152660..cf0b76e 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -246,6 +246,7 @@ void output_exports( DLLSPEC *spec ) case TYPE_STDCALL: case TYPE_VARARGS: case TYPE_CDECL: + case TYPE_THISCALL: if (odp->flags & FLAG_FORWARD) { output( "\t%s .L__wine_spec_forwards+%u\n", get_asm_ptr_keyword(), fwd_size ); @@ -816,6 +817,7 @@ void output_def_file( DLLSPEC *spec, int include_private ) /* fall through */ case TYPE_VARARGS: case TYPE_CDECL: + case TYPE_THISCALL: /* try to reduce output */ if(strcmp(name, odp->link_name) || (odp->flags & FLAG_FORWARD)) output( "=%s", odp->link_name ); diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 5ea9465..fb554f7 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -325,6 +325,11 @@ for a Win16 or Win32 function using the C calling convention .B varargs for a Win16 or Win32 function using the C calling convention with a variable number of arguments +.TP +.B thiscall +for a Win32 function using the +.I thiscall +calling convention (first parameter in %ecx register on i386) .RE .PP .I args

1 0

Alexandre Julliard : winapi: Add support for the thiscall keyword.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: f756821df3dd332705018e81bac4e41129f1525a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f756821df3dd332705018e81b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 16:34:35 2010 +0200 winapi: Add support for the thiscall keyword. --- tools/winapi/winapi.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index dcd9268..928476d 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -281,7 +281,7 @@ sub parse_spec_file($$) { my $ordinal; my $ARCHES="alpha|i386|powerpc|sparc|win32|win64|x86_64"; if(/^(\d+|@)\s+ - (cdecl|pascal|stdcall|varargs)\s+ + (cdecl|pascal|stdcall|varargs|thiscall)\s+ ((?:(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-ordinal|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*$\s*(.*?)\s*$\s*(\S*)$/x) { my $calling_convention = $2;

1 0

Jerome Leclanche : winepath: Add a -0 option to use null character as separator.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 8c50936d30d6e1a83619f8fb8a273e9ceb9ebe3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c50936d30d6e1a83619f8fb8… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Mon Aug 23 15:32:29 2010 +0100 winepath: Add a -0 option to use null character as separator. --- programs/winepath/winepath.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index 1645ee9..c4a50fb 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -34,7 +34,8 @@ enum { SHORTFORMAT = 1, LONGFORMAT = 2, UNIXFORMAT = 4, - WINDOWSFORMAT = 8 + WINDOWSFORMAT = 8, + PRINT0 = 16, }; static const char progname[] = "winepath"; @@ -53,6 +54,7 @@ static int option(int shortopt, const WCHAR *longopt) " directory to the long format\n" " -s, --short converts the long Windows path of an existing file or\n" " directory to the short format\n" + " -0 separate output with \\0 character, instead of a newline\n" " -h, --help output this help message and exit\n" " -v, --version output version information and exit\n" "\n" @@ -76,6 +78,8 @@ static int option(int shortopt, const WCHAR *longopt) return UNIXFORMAT; case 'w': return WINDOWSFORMAT; + case '0': + return PRINT0; } fprintf(stderr, "%s: invalid option ", progname); @@ -148,8 +152,18 @@ int wmain(int argc, WCHAR *argv[]) char path[MAX_PATH]; int outputformats; int i; + int separator; outputformats = parse_options(argv); + + if (outputformats & PRINT0) + { + separator = '\0'; + outputformats ^= PRINT0; + } + else + separator = '\n'; + if (outputformats == 0) outputformats = UNIXFORMAT; @@ -181,12 +195,12 @@ int wmain(int argc, WCHAR *argv[]) if (outputformats & LONGFORMAT) { if (GetLongPathNameW(argv[i], dos_pathW, MAX_PATH)) WideCharToMultiByte(CP_UNIXCP, 0, dos_pathW, -1, path, MAX_PATH, NULL, NULL); - printf("%s\n", path); + printf("%s%c", path, separator); } if (outputformats & SHORTFORMAT) { if (GetShortPathNameW(argv[i], dos_pathW, MAX_PATH)) WideCharToMultiByte(CP_UNIXCP, 0, dos_pathW, -1, path, MAX_PATH, NULL, NULL); - printf("%s\n", path); + printf("%s%c", path, separator); } if (outputformats & UNIXFORMAT) { WCHAR *ntpath, *tail; @@ -205,11 +219,11 @@ int wmain(int argc, WCHAR *argv[]) if (tail) { WideCharToMultiByte(CP_UNIXCP, 0, tail+1, -1, path, MAX_PATH, NULL, NULL); - printf("%s/%s\n", unix_name, path); + printf("%s/%s%c", unix_name, path, separator); } else { - printf("%s\n", unix_name); + printf("%s%c", unix_name, separator); } HeapFree( GetProcessHeap(), 0, unix_name ); break; @@ -257,7 +271,7 @@ int wmain(int argc, WCHAR *argv[]) if ((windows_name = wine_get_dos_file_name_ptr(unix_name))) { WideCharToMultiByte(CP_UNIXCP, 0, windows_name, -1, path, MAX_PATH, NULL, NULL); - printf("%s\n", path); + printf("%s%c", path, separator); HeapFree( GetProcessHeap(), 0, windows_name ); } else printf( "\n" );

1 0

Francois Gouget : msvcp90: Remove the msvcp90 debug channel where unused.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 57877b2487932ec3cc780829a50ce2a6f612c6be URL: http://source.winehq.org/git/wine.git/?a=commit;h=57877b2487932ec3cc780829a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:04:51 2010 +0200 msvcp90: Remove the msvcp90 debug channel where unused. --- dlls/msvcp90/memory.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/memory.c b/dlls/msvcp90/memory.c index acbdda7..7dac503 100644 --- a/dlls/msvcp90/memory.c +++ b/dlls/msvcp90/memory.c @@ -25,8 +25,7 @@ #include "windef.h" #include "winbase.h" -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); + /* ?address@?$allocator(a)D@std@@QBEPADAAD(a)Z */ /* ?address@?$allocator(a)D@std@@QEBAPEADAEAD(a)Z */

1 0

Francois Gouget : shell32/tests: Remove spaces before '\n's in traces.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: c15308f8690a7eb47ada0f1f7f9df4c8a321229c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c15308f8690a7eb47ada0f1f7… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:04:07 2010 +0200 shell32/tests: Remove spaces before '\n's in traces. --- dlls/shell32/tests/shlfolder.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index dd58b09..e21b44d 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2502,7 +2502,7 @@ static void test_ShellItemCompare(void) } if(failed) { - skip("Failed to create all shellitems. \n"); + skip("Failed to create all shellitems.\n"); goto cleanup; } @@ -2520,7 +2520,7 @@ static void test_ShellItemCompare(void) if(failed) { - skip("Failed to create shellitems. \n"); + skip("Failed to create shellitems.\n"); goto cleanup; } @@ -3550,7 +3550,7 @@ static void test_GetUIObject(void) ok(res, "Failed (last error: %d).\n", GetLastError()); ok( (mii.wID <= id_upper_limit) || (mii.fType & MFT_SEPARATOR), - "Got non-separator ID out of range: %d (type: %x) \n", mii.wID, mii.fType); + "Got non-separator ID out of range: %d (type: %x)\n", mii.wID, mii.fType); if(!(mii.fType & MFT_SEPARATOR)) max_id_check = (mii.wID>max_id_check)?mii.wID:max_id_check; }

1 0

Francois Gouget : ws2_32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: d8cb2a0c381bc3a5e0c2f4d4e08e6a74552766ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8cb2a0c381bc3a5e0c2f4d4e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:01:36 2010 +0200 ws2_32/tests: Add a trailing '\n' to an ok() call. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index dba26e9..e61d550 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3665,7 +3665,7 @@ static void test_ConnectEx(void) buffer[4] = 0; ok(bytesReturned == 3, "Didn't get all sent data, got only %d\n", bytesReturned); ok(buffer[0] == '1' && buffer[1] == '2' && buffer[2] == '3', - "Failed to get the right data, expected '123', got '%s'", buffer); + "Failed to get the right data, expected '123', got '%s'\n", buffer); closesocket(connector); connector = socket(AF_INET, SOCK_STREAM, 0);

1 0

Francois Gouget : ipconfig: Remove the ipconfig debug channel where unused.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 0e51433d79c07533e31a47ce065078412d0ce979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e51433d79c07533e31a47ce0… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:04:30 2010 +0200 ipconfig: Remove the ipconfig debug channel where unused. --- programs/ipconfig/ipconfig.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index ccaa78c..da63acd 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -21,13 +21,10 @@ #include <windows.h> #include <iphlpapi.h> -#include <wine/debug.h> #include <wine/unicode.h> #include "ipconfig.h" -WINE_DEFAULT_DEBUG_CHANNEL(ipconfig); - static int ipconfig_vprintfW(const WCHAR *msg, va_list va_args) { int wlen;

1 0

Francois Gouget : shell32/tests: Remove unneeded NULL pointer casts.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: a879046f637a69e62f18ff7b1b48643e052ceb2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a879046f637a69e62f18ff7b1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:04:01 2010 +0200 shell32/tests: Remove unneeded NULL pointer casts. --- dlls/shell32/tests/shlfolder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 3fae215..dd58b09 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2901,8 +2901,8 @@ static void test_SHGetItemFromObject(void) if(0) { /* Crashes with Windows 7 */ - hres = pSHGetItemFromObject((IUnknown*)psfdesktop, &IID_IUnknown, (void**)NULL); - hres = pSHGetItemFromObject(NULL, &IID_IUnknown, (void**)NULL); + hres = pSHGetItemFromObject((IUnknown*)psfdesktop, &IID_IUnknown, NULL); + hres = pSHGetItemFromObject(NULL, &IID_IUnknown, NULL); hres = pSHGetItemFromObject((IUnknown*)psfdesktop, NULL, (void**)&punk); }

1 0

Francois Gouget : ws2_32: Add a trailing '\n' to a TRACE() call.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: 21541da0bba481da17c10dab93bf8c737380ff52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21541da0bba481da17c10dab9… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:02:21 2010 +0200 ws2_32: Add a trailing '\n' to a TRACE() call. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index acd3f6e..82d157c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3589,7 +3589,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, /* After a ConnectEx call succeeds, the socket can't be used with half of the * normal winsock functions on windows. We don't have that problem. */ case WS_SO_UPDATE_CONNECT_CONTEXT: - TRACE("Ignoring SO_UPDATE_CONNECT_CONTEXT, since our sockets are normal"); + TRACE("Ignoring SO_UPDATE_CONNECT_CONTEXT, since our sockets are normal\n"); return 0; /* SO_OPENTYPE does not require a valid socket handle. */

1 0

Francois Gouget : explorerframe/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Aug. 24, 2010

Aug. 24, 2010

Module: wine Branch: master Commit: dc6428f350acb7a20eab22ad1524c27c3c091c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc6428f350acb7a20eab22ad1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:01:27 2010 +0200 explorerframe/tests: Add a trailing '\n' to an ok() call. --- dlls/explorerframe/tests/nstc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 83ec748..5142d84 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -1324,7 +1324,7 @@ static void test_basics(void) psia = (void*)0xdeadbeef; hr = INameSpaceTreeControl_GetSelectedItems(pnstc, &psia); ok(hr == E_FAIL, "Got 0x%08x\n", hr); - ok(psia == (void*)0xdeadbeef, "Got %p", psia); + ok(psia == (void*)0xdeadbeef, "Got %p\n", psia); hr = INameSpaceTreeControl_AppendRoot(pnstc, psitestdir2, SHCONTF_FOLDERS, 0, NULL); ok(hr == S_OK, "Got (0x%08x)\n", hr);

1 0