December 2008 - Wine-Commits

Francois Gouget : devenum: Make the Romanian translation LANG_NEUTRAL.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 579b8649a180c1fb18bb05e199667c8ea8df32b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=579b8649a180c1fb18bb05e19… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Dec 17 10:29:28 2008 +0100 devenum: Make the Romanian translation LANG_NEUTRAL. --- dlls/devenum/devenum.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/devenum/devenum.rc b/dlls/devenum/devenum.rc index 9313984..c5ad0fc 100644 --- a/dlls/devenum/devenum.rc +++ b/dlls/devenum/devenum.rc @@ -126,7 +126,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL } STRINGTABLE DISCARDABLE -LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL { 7 "DirectSound implicit" 8 "DirectSound: %s"

1 0

Paul Vriens : setupapi/tests: Fix a test failure on Vista ( and skip some tests).
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 6c72061507b39be8c3c535ec09a3a4b5679be500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c72061507b39be8c3c535ec0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 17 12:30:30 2008 +0100 setupapi/tests: Fix a test failure on Vista (and skip some tests). --- dlls/setupapi/tests/misc.c | 16 ++++++++++++++-- include/setupapi.h | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 7d0d2ea..60960b2 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -160,8 +160,9 @@ static void test_SetupCopyOEMInf(void) res = pSetupCopyOEMInfA("", NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); ok(GetLastError() == ERROR_FILE_NOT_FOUND || - GetLastError() == ERROR_BAD_PATHNAME, /* Win98 */ - "Expected ERROR_FILE_NOT_FOUND or ERROR_BAD_PATHNAME, got %d\n", GetLastError()); + GetLastError() == ERROR_BAD_PATHNAME || /* Win98 */ + GetLastError() == ERROR_INVALID_PARAMETER, /* Vista, W2K8 */ + "Unexpected error : %d\n", GetLastError()); /* try a relative nonexistent SourceInfFileName */ SetLastError(0xdeadbeef); @@ -196,6 +197,17 @@ static void test_SetupCopyOEMInf(void) SetLastError(0xdeadbeef); res = pSetupCopyOEMInfA(tmpfile, NULL, 0, SP_COPY_NOOVERWRITE, NULL, 0, NULL, NULL); ok(res == FALSE, "Expected FALSE, got %d\n", res); + if (GetLastError() == ERROR_WRONG_INF_TYPE) + { + /* FIXME: + * Vista needs a [Manufacturer] entry in the inf file. Doing this will give some + * popups during the installation though as it also needs a catalog file (signed?). + */ + win_skip("Needs a different inf file on Vista/W2K8\n"); + DeleteFile(tmpfile); + return; + } + ok(GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_FILE_EXISTS, /* Win98 */ "Expected ERROR_FILE_NOT_FOUND or ERROR_FILE_EXISTS, got %d\n", GetLastError()); diff --git a/include/setupapi.h b/include/setupapi.h index 88c35eb..0e9cbbb 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1214,6 +1214,7 @@ DECL_WINELIB_SETUPAPI_TYPE_AW(PSP_INF_SIGNER_INFO) #define ERROR_SET_SYSTEM_RESTORE_POINT (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x236) #define ERROR_INCORRECTLY_COPIED_INF (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x237) #define ERROR_SCE_DISABLED (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x238) +#define ERROR_WRONG_INF_TYPE (APPLICATION_ERROR_MASK|ERROR_SEVERITY_ERROR|0x24A) #define ERROR_NO_DEFAULT_INTERFACE_DEVICE ERROR_NO_DEFAULT_DEVICE_INTERFACE #define ERROR_INTERFACE_DEVICE_ACTIVE ERROR_DEVICE_INTERFACE_ACTIVE #define ERROR_INTERFACE_DEVICE_REMOVED ERROR_DEVICE_INTERFACE_REMOVED

1 0

Francois Gouget : winapi_check: Extend support for '-arch=xxx' in spec files.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 5e3e05e04302cb57a48cf4408689bfeddeec3930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3e05e04302cb57a48cf4408… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 17 10:28:29 2008 +0100 winapi_check: Extend support for '-arch=xxx' in spec files. --- tools/winapi/winapi.pm | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index 87339ac..f5279e1 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -279,9 +279,10 @@ sub parse_spec_file($$) { } my $ordinal; + my $ARCHES="alpha|i386|powerpc|sparc|x86_64"; if(/^(\d+|@)\s+ (pascal|stdcall|cdecl|varargs)\s+ - ((?:(?:-arch=(?:i386|x86_64)|-noname|-norelay|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*$\s*(.*?)\s*$\s*(\S*)$/x) + ((?:(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*$\s*(.*?)\s*$\s*(\S*)$/x) { my $calling_convention = $2; my $flags = $3; @@ -396,7 +397,7 @@ sub parse_spec_file($$) { } } } - } elsif(/^(\d+|@)\s+stub(?:\s+(-noname|-norelay|-i386|-ret16|-ret64|-private))?\s+(\S+)$/) { + } elsif(/^(\d+|@)\s+stub(?:\s+(-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-i386|-ret16|-ret64|-private))?\s+(\S+)$/) { $ordinal = $1; my $flags = $2;

1 0

Francois Gouget : wined3d: Fix double const.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: cf7c8a24258d6c94841927185512c98824351c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7c8a24258d6c94841927185… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 17 10:27:35 2008 +0100 wined3d: Fix double const. --- dlls/wined3d/gl_compat.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c index d9d6276..466b003 100644 --- a/dlls/wined3d/gl_compat.c +++ b/dlls/wined3d/gl_compat.c @@ -92,7 +92,7 @@ static void WINE_GLAPI wine_glMultiTexCoord4fvARB(GLenum target, const GLfloat * glTexCoord4fv(v); } -static void WINE_GLAPI wine_glMultiTexCoord2svARB(GLenum target, const const GLshort *v) { +static void WINE_GLAPI wine_glMultiTexCoord2svARB(GLenum target, const GLshort *v) { if(target != GL_TEXTURE0) { ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported\n"); return; @@ -100,7 +100,7 @@ static void WINE_GLAPI wine_glMultiTexCoord2svARB(GLenum target, const const GLs glTexCoord2sv(v); } -static void WINE_GLAPI wine_glMultiTexCoord4svARB(GLenum target, const const GLshort *v) { +static void WINE_GLAPI wine_glMultiTexCoord4svARB(GLenum target, const GLshort *v) { if(target != GL_TEXTURE0) { ERR("Texture unit > 0 used, but GL_ARB_multitexture is not supported\n"); return;

1 0

Francois Gouget : rpcrt4/tests: Fix the trailing '\n' in an ok() call.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 6e483affcf2bd04e8807e194bc9b624dd001e08e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e483affcf2bd04e8807e194b… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 17 10:26:47 2008 +0100 rpcrt4/tests: Fix the trailing '\n' in an ok() call. --- dlls/rpcrt4/tests/rpc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 796e408..069ead1 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -400,7 +400,7 @@ static void test_towers(void) broken(ret != RPC_S_OK), /* win2k, indeterminate */ "TowerExplode failed with error %ld\n", ret); /* Windows XP SP3 sets address to NULL */ - ok(!address || !strcmp(address, ""), "address was \"%s\" instead of \"\"\n or NULL (XP SP3)", address); + ok(!address || !strcmp(address, ""), "address was \"%s\" instead of \"\" or NULL (XP SP3)\n", address); I_RpcFree(address); I_RpcFree(tower);

1 0

Francois Gouget : msvcrt/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: 9a911f5443b736bd6b611c0852a5887314aaab52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a911f5443b736bd6b611c085… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 17 10:26:25 2008 +0100 msvcrt/tests: Add a trailing '\n' to an ok() call. --- dlls/msvcrt/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 6f3fc85..38f16c1 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -335,7 +335,7 @@ static void test_asciimode2(void) fclose(fp); fp = fopen("ascii2.tst", "rt"); - ok(getc(fp) == '0', "first char not 0"); + ok(getc(fp) == '0', "first char not 0\n"); memset(ibuf, 0, sizeof(ibuf)); i = fread(ibuf, 1, sizeof(ibuf), fp); ok(i == sizeof(ibuf), "fread i %d != sizeof(ibuf) %d\n", i, sizeof(ibuf));

1 0

Francois Gouget : dmloader: Add a trailing '\n' to a Wine trace.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: fae2edb91e1c3c48465ea2ed8bc7d80250baf51c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae2edb91e1c3c48465ea2ed8… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 17 10:26:40 2008 +0100 dmloader: Add a trailing '\n' to a Wine trace. --- dlls/dmloader/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index f97a230..059760a 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -26,7 +26,7 @@ static HRESULT DMUSIC_GetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pCl static HRESULT DMUSIC_SetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache); static HRESULT DMUSIC_CopyDescriptor (LPDMUS_OBJECTDESC pDst, LPDMUS_OBJECTDESC pSrc) { - TRACE(": copy \n%s", debugstr_DMUS_OBJECTDESC(pSrc)); + TRACE(": copy \n%s\n", debugstr_DMUS_OBJECTDESC(pSrc)); /* copy field by field */ if (pSrc->dwValidData & DMUS_OBJ_CLASS) pDst->guidClass = pSrc->guidClass; if (pSrc->dwValidData & DMUS_OBJ_OBJECT) pDst->guidObject = pSrc->guidObject;

1 0

Francois Gouget : wrc: Add a trailing '\n' to some warning and error messages.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: bfa7fded98ba4e2b77c57c7fcb4dd9ff72fdaff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa7fded98ba4e2b77c57c7fc… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 17 10:26:15 2008 +0100 wrc: Add a trailing '\n' to some warning and error messages. --- tools/wrc/newstruc.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/wrc/newstruc.c b/tools/wrc/newstruc.c index e35c332..ec9abc4 100644 --- a/tools/wrc/newstruc.c +++ b/tools/wrc/newstruc.c @@ -745,21 +745,21 @@ static void handle_ani_icon(riff_tag_t *rtp, enum res_e type, int isswapped) if(type == res_anicur && ctype != 2 && !once) { - parser_warning("Animated cursor contains invalid \"icon\" tag cursor-file (%d->%s)", + parser_warning("Animated cursor contains invalid \"icon\" tag cursor-file (%d->%s)\n", ctype, ctype == 1 ? "icontype" : "?"); once++; } else if(type == res_aniico && ctype != 1 && !once) { - parser_warning("Animated icon contains invalid \"icon\" tag icon-file (%d->%s)", + parser_warning("Animated icon contains invalid \"icon\" tag icon-file (%d->%s)\n", ctype, ctype == 2 ? "cursortype" : "?"); once++; } else if(ctype != 1 && ctype != 2 && !once) { - parser_warning("Animated %s contains invalid \"icon\" tag file-type (%d; neither icon nor cursor)", anistr, ctype); + parser_warning("Animated %s contains invalid \"icon\" tag file-type (%d; neither icon nor cursor)\n", anistr, ctype); once++; } @@ -811,7 +811,7 @@ static void handle_ani_list(riff_tag_t *lst, enum res_e type, int isswapped) rtp = NEXT_TAG(rtp); } else - internal_error(__FILE__, __LINE__, "Unknown tag \"%c%c%c%c\" in RIFF file", + internal_error(__FILE__, __LINE__, "Unknown tag \"%c%c%c%c\" in RIFF file\n", isprint(rtp->tag[0]) ? rtp->tag[0] : '.', isprint(rtp->tag[1]) ? rtp->tag[1] : '.', isprint(rtp->tag[2]) ? rtp->tag[2] : '.', @@ -921,7 +921,7 @@ ani_curico_t *new_ani_curico(enum res_e type, raw_data_t *rd, int *memopt) rtp = NEXT_TAG(rtp); } else - internal_error(__FILE__, __LINE__, "Unknown tag \"%c%c%c%c\" in RIFF file", + internal_error(__FILE__, __LINE__, "Unknown tag \"%c%c%c%c\" in RIFF file\n", isprint(rtp->tag[0]) ? rtp->tag[0] : '.', isprint(rtp->tag[1]) ? rtp->tag[1] : '.', isprint(rtp->tag[2]) ? rtp->tag[2] : '.',

1 0

Maarten Lankhorst : ntoskrnl.exe/winedevice: Make wine_ntoskrnl_main_loop CDECL.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: f00beab5c4d1ca106500912c69f618770d369371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f00beab5c4d1ca106500912c6… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Dec 16 15:36:59 2008 +0100 ntoskrnl.exe/winedevice: Make wine_ntoskrnl_main_loop CDECL. --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- programs/winedevice/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a669d3b..227e393 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -191,7 +191,7 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, /*********************************************************************** * wine_ntoskrnl_main_loop (Not a Windows API) */ -NTSTATUS wine_ntoskrnl_main_loop( HANDLE stop_event ) +NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) { HANDLE manager = get_device_manager(); obj_handle_t ioctl = 0; diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 7afe97e..5677e19 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winedevice); WINE_DECLARE_DEBUG_CHANNEL(relay); -extern NTSTATUS wine_ntoskrnl_main_loop( HANDLE stop_event ); +extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); static WCHAR *driver_name; static SERVICE_STATUS_HANDLE service_handle;

1 0

Maarten Lankhorst : gdi32/user32: Make __wine_make_gdi_object_system CDECL.
by Alexandre Julliard Dec. 17, 2008

Dec. 17, 2008

Module: wine Branch: master Commit: a411f25d85c1048eb9f0c287cf066ce9db7eaadd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a411f25d85c1048eb9f0c287c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Dec 16 15:38:49 2008 +0100 gdi32/user32: Make __wine_make_gdi_object_system CDECL. --- dlls/gdi32/gdiobj.c | 2 +- dlls/user32/sysparams.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 910f49b..906cd2a 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -442,7 +442,7 @@ static const struct DefaultFontInfo default_fonts[] = * For a description of the GDI object magics and their flags, * see "Undocumented Windows" (wrong about the OBJECT_NOSYSTEM flag, though). */ -void __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set) +void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set) { GDIOBJHDR *ptr = GDI_GetObjPtr( handle, MAGIC_DONTCARE ); diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 5c3bec5..4e48299 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -368,7 +368,7 @@ static const WORD wPattern55AA[] = { 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xa HBRUSH SYSCOLOR_55AABrush = 0; -extern void __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); +extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); /* This function is a copy of the one in objects/font.c */

1 0