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

Alexandre Julliard : winebuild: Add an option to use the C compiler to assemble files.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: 98e6a0da73ef87dacdcf0bcf0ca58c0091799968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98e6a0da73ef87dacdcf0bcf0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 13:19:29 2013 +0200 winebuild: Add an option to use the C compiler to assemble files. --- tools/winebuild/build.h | 1 + tools/winebuild/main.c | 7 +++++++ tools/winebuild/utils.c | 18 +++++++----------- tools/winebuild/winebuild.man.in | 4 ++++ 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index e943762..fa92764 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -358,6 +358,7 @@ extern const char *output_file_name; extern char **lib_path; extern struct strarray *as_command; +extern struct strarray *cc_command; extern struct strarray *ld_command; extern struct strarray *nm_command; extern char *cpu_option; diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index de526a9..a848a0c 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -85,6 +85,7 @@ static const char *output_file_source_name; static int fake_module; struct strarray *as_command = NULL; +struct strarray *cc_command = NULL; struct strarray *ld_command = NULL; struct strarray *nm_command = NULL; char *cpu_option = NULL; @@ -241,6 +242,7 @@ static const char usage_str[] = "Options:\n" " --as-cmd=AS Command to use for assembling (default: as)\n" " -b, --target=TARGET Specify target CPU and platform for cross-compiling\n" +" --cc-cmd=CC C compiler to use for assembling (default: fall back to --as-cmd)\n" " -d, --delay-lib=LIB Import the specified library in delayed mode\n" " -D SYM Ignored for C flags compatibility\n" " -e, --entry=FUNC Set the DLL entry point function (default: DllMain)\n" @@ -286,6 +288,7 @@ enum long_options_values LONG_OPT_EXE, LONG_OPT_IMPLIB, LONG_OPT_ASCMD, + LONG_OPT_CCCMD, LONG_OPT_EXTERNAL_SYMS, LONG_OPT_FAKE_MODULE, LONG_OPT_LARGE_ADDRESS_AWARE, @@ -307,6 +310,7 @@ static const struct option long_options[] = { "exe", 0, 0, LONG_OPT_EXE }, { "implib", 0, 0, LONG_OPT_IMPLIB }, { "as-cmd", 1, 0, LONG_OPT_ASCMD }, + { "cc-cmd", 1, 0, LONG_OPT_CCCMD }, { "external-symbols", 0, 0, LONG_OPT_EXTERNAL_SYMS }, { "fake-module", 0, 0, LONG_OPT_FAKE_MODULE }, { "large-address-aware", 0, 0, LONG_OPT_LARGE_ADDRESS_AWARE }, @@ -476,6 +480,9 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) case LONG_OPT_ASCMD: as_command = strarray_fromstring( optarg, " " ); break; + case LONG_OPT_CCCMD: + cc_command = strarray_fromstring( optarg, " " ); + break; case LONG_OPT_FAKE_MODULE: fake_module = 1; break; diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index d064572..2028b05 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -373,13 +373,15 @@ struct strarray *find_tool( const char *name, const char * const *names ) struct strarray *get_as_command(void) { - static int as_is_clang = 0; struct strarray *args; - if (!as_command) + if (cc_command) { - as_command = find_tool( "clang", NULL ); - if (as_command) as_is_clang = 1; + args = strarray_copy( cc_command ); + strarray_add( args, "-xassembler", "-c", NULL ); + if (force_pointer_size) + strarray_add_one( args, (force_pointer_size == 8) ? "-m64" : "-m32" ); + return args; } if (!as_command) @@ -393,13 +395,7 @@ struct strarray *get_as_command(void) args = strarray_copy( as_command ); - if (as_is_clang) - { - strarray_add( args, "-xassembler", "-c", NULL ); - if (force_pointer_size) - strarray_add_one( args, (force_pointer_size == 8) ? "-m64" : "-m32" ); - } - else if (force_pointer_size) + if (force_pointer_size) { switch (target_platform) { diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 59debd4..3762b74 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -67,6 +67,10 @@ Specify the target CPU and platform on which the generated code will be built. The target specification is in the standard autoconf format as returned by config.sub. .TP +.BI \--cc-cmd= cc-command +Specify the C compiler to use to compile assembly files; the default +is to instead use the assembler specified with \fB--as-cmd\fR. +.TP .BI \-d,\ --delay-lib= name Set the delayed import mode for the specified library, which must be one of the libraries imported with the \fB-l\fR option. Delayed mode

1 0

Alexandre Julliard : winegcc: Pass the C compiler name to winebuild.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: 3987913453fc8c723068997f8af7c6a66f72f0c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3987913453fc8c723068997f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 12:30:21 2013 +0200 winegcc: Pass the C compiler name to winebuild. --- tools/winegcc/winegcc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 65f066c..89ea310 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -940,6 +940,7 @@ static void build(struct options* opts) /* run winebuild to generate the .spec.o file */ spec_args = get_winebuild_args( opts ); + strarray_add( spec_args, strmake( "--cc-cmd=%s", build_tool_name( opts, "gcc", CC ))); spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size ));

1 0

Alexandre Julliard : oleaut32: Remove redundant declaration of CLSID_PSFactoryBuffer.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: 699eb85ce0128f12ca0e0cf26f755f03a6dc8e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=699eb85ce0128f12ca0e0cf26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 14:24:11 2013 +0200 oleaut32: Remove redundant declaration of CLSID_PSFactoryBuffer. --- dlls/oleaut32/oleaut.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 56eea1a..5af6d18 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -739,7 +739,6 @@ extern HRESULT WINAPI OLEAUTPS_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DEC extern BOOL WINAPI OLEAUTPS_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; extern HRESULT WINAPI OLEAUTPS_DllRegisterServer(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI OLEAUTPS_DllUnregisterServer(void) DECLSPEC_HIDDEN; -extern GUID const CLSID_PSFactoryBuffer DECLSPEC_HIDDEN; extern void _get_STDFONT_CF(LPVOID *); extern void _get_STDPIC_CF(LPVOID *);

1 0

Nozomi Kodama : d3dx9: Fix the case output = input in D3DXVec3Cross.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: b3dff5b3543e13962f3dde5a59738933b63c7ec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3dff5b3543e13962f3dde5a5… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Sat Jun 8 02:26:45 2013 -1000 d3dx9: Fix the case output = input in D3DXVec3Cross. --- dlls/d3dx9_36/tests/math.c | 3 +++ include/d3dx9math.inl | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 9d90662..5f92729 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1251,6 +1251,9 @@ static void D3DXVector3Test(void) expectedvec.x = -18.0f; expectedvec.y = 40.0f; expectedvec.z = -39.0f; D3DXVec3Cross(&gotvec,&u,&v); expect_vec3(expectedvec,gotvec); + expectedvec.x = -277.0f; expectedvec.y = -150.0f; expectedvec.z = -26.0f; + D3DXVec3Cross(&gotvec,&gotvec,&v); + expect_vec3(expectedvec,gotvec); /* Tests the case NULL */ funcpointer = D3DXVec3Cross(&gotvec,NULL,&v); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); diff --git a/include/d3dx9math.inl b/include/d3dx9math.inl index 5ee9a75..84c0c62 100644 --- a/include/d3dx9math.inl +++ b/include/d3dx9math.inl @@ -1029,10 +1029,13 @@ static inline D3DXVECTOR3* D3DXVec3Add(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1 static inline D3DXVECTOR3* D3DXVec3Cross(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) { + D3DXVECTOR3 temp; + if ( !pout || !pv1 || !pv2) return NULL; - pout->x = (pv1->y) * (pv2->z) - (pv1->z) * (pv2->y); - pout->y = (pv1->z) * (pv2->x) - (pv1->x) * (pv2->z); - pout->z = (pv1->x) * (pv2->y) - (pv1->y) * (pv2->x); + temp.x = (pv1->y) * (pv2->z) - (pv1->z) * (pv2->y); + temp.y = (pv1->z) * (pv2->x) - (pv1->x) * (pv2->z); + temp.z = (pv1->x) * (pv2->y) - (pv1->y) * (pv2->x); + *pout = temp; return pout; }

1 0

Austin English : api-ms-win-core-processthreads-l1-1-0: Add stub dll.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: 936cb4ce7e14e9dbcdf1ff2fa8ca65ceed7b33ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=936cb4ce7e14e9dbcdf1ff2fa… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jun 8 16:27:40 2013 -0500 api-ms-win-core-processthreads-l1-1-0: Add stub dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 + .../api-ms-win-core-processthreads-l1-1-0.spec | 49 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 55 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 3a551e8..3006070 100755 --- a/configure +++ b/configure @@ -15751,6 +15751,7 @@ wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 +wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index 57d76d9..680432c 100644 --- a/configure.ac +++ b/configure.ac @@ -2575,6 +2575,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/Makefile.in b/dlls/api-ms-win-core-processthreads-l1-1-0/Makefile.in new file mode 100644 index 0000000..e516731 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-core-processthreads-l1-1-0.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec new file mode 100644 index 0000000..0b16649 --- /dev/null +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec @@ -0,0 +1,49 @@ +@ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) kernel32.CreateProcessA +@ stub CreateProcessAsUserW +@ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW +@ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread +@ stub CreateRemoteThreadEx +@ stdcall CreateThread(ptr long ptr long long ptr) kernel32.CreateThread +@ stub DeleteProcThreadAttributeList +@ stdcall ExitProcess(long) kernel32.ExitProcess +@ stdcall ExitThread(long) kernel32.ExitThread +@ stdcall FlushProcessWriteBuffers() kernel32.FlushProcessWriteBuffers +@ stdcall -norelay GetCurrentProcess() kernel32.GetCurrentProcess +@ stdcall -norelay GetCurrentProcessId() kernel32.GetCurrentProcessId +@ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread +@ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId +@ stdcall GetExitCodeProcess(long ptr) kernel32.GetExitCodeProcess +@ stdcall GetExitCodeThread(long ptr) kernel32.GetExitCodeThread +@ stdcall GetPriorityClass(long) kernel32.GetPriorityClass +@ stdcall GetProcessId(long) kernel32.GetProcessId +@ stub GetProcessIdOfThread +@ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes +@ stdcall GetProcessVersion(long) kernel32.GetProcessVersion +@ stdcall GetStartupInfoW(ptr) kernel32.GetStartupInfoW +@ stdcall GetThreadId(ptr) kernel32.GetThreadId +@ stdcall GetThreadPriority(long) kernel32.GetThreadPriority +@ stdcall GetThreadPriorityBoost(long ptr) kernel32.GetThreadPriorityBoost +@ stub InitializeProcThreadAttributeList +@ stub OpenProcessToken +@ stdcall OpenThread(long long long) kernel32.OpenThread +@ stub OpenThreadToken +@ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId +@ stub QueryProcessAffinityUpdateMode +@ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC +@ stdcall ResumeThread(long) kernel32.ResumeThread +@ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass +@ stub SetProcessAffinityUpdateMode +@ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters +@ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority +@ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost +@ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee +@ stub SetThreadToken +@ stdcall SuspendThread(long) kernel32.SuspendThread +@ stdcall SwitchToThread() kernel32.SwitchToThread +@ stdcall TerminateProcess(long long) kernel32.TerminateProcess +@ stdcall TerminateThread(long long) kernel32.TerminateThread +@ stdcall TlsAlloc() kernel32.TlsAlloc +@ stdcall TlsFree(long) kernel32.TlsFree +@ stdcall TlsGetValue(long) kernel32.TlsGetValue +@ stdcall TlsSetValue(long ptr) kernel32.TlsSetValue +@ stub UpdateProcThreadAttribute diff --git a/tools/make_specfiles b/tools/make_specfiles index 002d252..1a57692 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -128,6 +128,7 @@ my @dll_groups = [ "kernel32", "api-ms-win-downlevel-normaliz-l1-1-0", + "api-ms-win-core-processthreads-l1-1-0", ], [ "ole32",

1 0

Jacek Caban : d3d9.h: Make include guard compatible with PSDK headers.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: a8535c3b23b4d645ccc7b1de7a643f2707f978dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8535c3b23b4d645ccc7b1de7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 10 11:56:18 2013 +0200 d3d9.h: Make include guard compatible with PSDK headers. --- include/d3d9.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d3d9.h b/include/d3d9.h index 0f52d09..382b241 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -17,8 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_D3D9_H -#define __WINE_D3D9_H +#ifndef _D3D9_H_ +#define _D3D9_H_ #ifndef DIRECT3D_VERSION #define DIRECT3D_VERSION 0x0900 @@ -2042,4 +2042,4 @@ IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion); #endif /* defined(__cplusplus) */ -#endif /* __WINE_D3D9_H */ +#endif /* _D3D9_H_ */

1 0

Hans Leidekker : winhttp/tests: Trace certificate errors.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: 4df4339f8ea82edf360dadb04b7cd2ab68d543c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df4339f8ea82edf360dadb04… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 10 14:24:25 2013 +0200 winhttp/tests: Trace certificate errors. --- dlls/winhttp/tests/winhttp.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 03de012..1aff505 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -789,6 +789,26 @@ static void test_WinHttpAddHeaders(void) } +static void CALLBACK cert_error(HINTERNET handle, DWORD_PTR ctx, DWORD status, LPVOID buf, DWORD len) +{ + DWORD flags = *(DWORD *)buf; + + if (!flags) + { + trace("WINHTTP_CALLBACK_STATUS_FLAG_SECURITY_CHANNEL_ERROR\n"); + return; + } +#define X(x) if (flags & x) trace("%s\n", #x); + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_REV_FAILED) + X(WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CERT) + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_REVOKED) + X(WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CA) + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_CN_INVALID) + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_DATE_INVALID) + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_WRONG_USAGE) +#undef X +} + static void test_secure_connection(void) { static const WCHAR google[] = {'w','w','w','.','g','o','o','g','l','e','.','c','o','m',0}; @@ -834,6 +854,8 @@ static void test_secure_connection(void) req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, WINHTTP_FLAG_SECURE); ok(req != NULL, "failed to open a request %u\n", GetLastError()); + WinHttpSetStatusCallback(req, cert_error, WINHTTP_CALLBACK_STATUS_SECURE_FAILURE, 0); + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); ok(ret, "failed to send request %u\n", GetLastError()); if (!ret)

1 0

Hans Leidekker : msi/tests: Move some tests around to avoid timeouts on the testbot.
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: b82a5ab27a19d605f1957be82808673aede809eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b82a5ab27a19d605f1957be82… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 10 18:58:30 2013 +0200 msi/tests: Move some tests around to avoid timeouts on the testbot. --- dlls/msi/tests/install.c | 565 +--------------------------- dlls/msi/tests/msi.c | 968 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 968 insertions(+), 565 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b82a5ab27a19d605f1957…

1 0

Francois Gouget : ddraw: Remove WINAPI on static functions where not needed .
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: 3cefe7766732fb3375c1db414e27e25f96d95149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cefe7766732fb3375c1db414… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 8 00:47:28 2013 +0200 ddraw: Remove WINAPI on static functions where not needed. --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5096a9c..086a483 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -764,7 +764,7 @@ static HRESULT WINAPI ddraw1_RestoreDisplayMode(IDirectDraw *iface) * (Probably others too, have to investigate) * *****************************************************************************/ -static HRESULT WINAPI ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, +static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, DWORD cooplevel, BOOL restore_mode_on_normal) { struct wined3d_surface *rt = NULL, *ds = NULL;

1 0

André Hentschel : ws2_32/tests: Don' t test functions directly when reporting WSAGetLastError().
by Alexandre Julliard 10 Jun '13

10 Jun '13

Module: wine Branch: master Commit: 749bb1db3594b300fccf78953ba325e9b9c786b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=749bb1db3594b300fccf78953… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 8 14:41:22 2013 +0200 ws2_32/tests: Don't test functions directly when reporting WSAGetLastError(). --- dlls/ws2_32/tests/sock.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ff0d538..758fa7e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3571,7 +3571,8 @@ static void test_events(int useMessages) goto end; } - ok(!set_blocking(src, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + ret = set_blocking(src, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); src2 = socket(AF_INET, SOCK_STREAM, 0); if (src2 == INVALID_SOCKET) @@ -3580,7 +3581,8 @@ static void test_events(int useMessages) goto end; } - ok(!set_blocking(src2, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + ret = set_blocking(src2, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); len = sizeof(BOOL); if (getsockopt(src, SOL_SOCKET, SO_OOBINLINE, (void *)&bret, &len) == SOCKET_ERROR) @@ -4013,7 +4015,8 @@ static void test_events(int useMessages) goto end; } - ok(!set_blocking(src, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + ret = set_blocking(src, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); ret = WSAAsyncSelect(src2, hWnd, WM_SOCKET, 0); if (ret) @@ -4022,7 +4025,8 @@ static void test_events(int useMessages) goto end; } - ok(!set_blocking(src2, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + ret = set_blocking(src2, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); } else { @@ -4033,7 +4037,8 @@ static void test_events(int useMessages) goto end; } - ok(!set_blocking(src, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + ret = set_blocking(src, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); ret = WSAEventSelect(src2, hEvent2, 0); if (ret) @@ -4042,7 +4047,8 @@ static void test_events(int useMessages) goto end; } - ok(!set_blocking(src2, TRUE), "set_blocking failed, error %d\n", WSAGetLastError()); + ret = set_blocking(src2, TRUE); + ok(!ret, "set_blocking failed, error %d\n", WSAGetLastError()); } end:

1 0