October 2009 - Wine-commits

Alexandre Julliard : kernel32: Move the k32 kernel32-> user32 helpers to thunk.c.
by Alexandre Julliard 08 Oct '09

08 Oct '09

Module: wine Branch: master Commit: 65bc15998dd07d8cce713392f324ec0faecc4aa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65bc15998dd07d8cce713392f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 20:27:25 2009 +0200 kernel32: Move the k32 kernel32->user32 helpers to thunk.c. --- dlls/kernel32/kernel32.spec | 14 +++--- dlls/kernel32/string.c | 106 ------------------------------------------- dlls/kernel32/thunk.c | 97 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 113 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2fc1d14..169ba37 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -17,13 +17,13 @@ 7 stdcall -noname -i386 -register VxDCall6(long) VxDCall 8 stdcall -noname -i386 -register VxDCall7(long) VxDCall 9 stdcall -noname -i386 -register VxDCall8(long) VxDCall - 10 stdcall -noname k32CharToOemA(str ptr) - 11 stdcall -noname k32CharToOemBuffA(str ptr long) - 12 stdcall -noname k32OemToCharA(ptr ptr) - 13 stdcall -noname k32OemToCharBuffA(ptr ptr long) - 14 stdcall -noname k32LoadStringA(long long ptr long) - 15 varargs -noname k32wsprintfA(str str) - 16 stdcall -noname k32wvsprintfA(ptr str ptr) + 10 stdcall -noname -i386 k32CharToOemA(str ptr) + 11 stdcall -noname -i386 k32CharToOemBuffA(str ptr long) + 12 stdcall -noname -i386 k32OemToCharA(ptr ptr) + 13 stdcall -noname -i386 k32OemToCharBuffA(ptr ptr long) + 14 stdcall -noname -i386 k32LoadStringA(long long ptr long) + 15 varargs -noname -i386 k32wsprintfA(str str) + 16 stdcall -noname -i386 k32wvsprintfA(ptr str ptr) 17 stdcall -noname -i386 -register CommonUnimpStub() 18 stdcall -noname GetProcessDword(long long) 19 stub -noname ThunkTheTemplateHandle diff --git a/dlls/kernel32/string.c b/dlls/kernel32/string.c index c584bf7..120c868 100644 --- a/dlls/kernel32/string.c +++ b/dlls/kernel32/string.c @@ -30,116 +30,10 @@ #define WINE_NO_INLINE_STRING #include "windef.h" #include "winbase.h" -#include "wine/winbase16.h" #include "wine/unicode.h" #include "wine/exception.h" -static INT (WINAPI *pLoadStringA)(HINSTANCE, UINT, LPSTR, INT); -static INT (WINAPI *pwvsprintfA)(LPSTR, LPCSTR, __ms_va_list); - - -/*********************************************************************** - * Helper for k32 family functions - */ -static void *user32_proc_address(const char *proc_name) -{ - static HMODULE hUser32; - - if(!hUser32) hUser32 = LoadLibraryA("user32.dll"); - return GetProcAddress(hUser32, proc_name); -} - - -/*********************************************************************** - * k32CharToOemBuffA (KERNEL32.11) - */ -BOOL WINAPI k32CharToOemBuffA(LPCSTR s, LPSTR d, DWORD len) -{ - WCHAR *bufW; - - if ((bufW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) - { - MultiByteToWideChar( CP_ACP, 0, s, len, bufW, len ); - WideCharToMultiByte( CP_OEMCP, 0, bufW, len, d, len, NULL, NULL ); - HeapFree( GetProcessHeap(), 0, bufW ); - } - return TRUE; -} - - -/*********************************************************************** - * k32CharToOemA (KERNEL32.10) - */ -BOOL WINAPI k32CharToOemA(LPCSTR s, LPSTR d) -{ - if (!s || !d) return TRUE; - return k32CharToOemBuffA( s, d, strlen(s) + 1 ); -} - - -/*********************************************************************** - * k32OemToCharBuffA (KERNEL32.13) - */ -BOOL WINAPI k32OemToCharBuffA(LPCSTR s, LPSTR d, DWORD len) -{ - WCHAR *bufW; - - if ((bufW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) - { - MultiByteToWideChar( CP_OEMCP, 0, s, len, bufW, len ); - WideCharToMultiByte( CP_ACP, 0, bufW, len, d, len, NULL, NULL ); - HeapFree( GetProcessHeap(), 0, bufW ); - } - return TRUE; -} - - -/*********************************************************************** - * k32OemToCharA (KERNEL32.12) - */ -BOOL WINAPI k32OemToCharA(LPCSTR s, LPSTR d) -{ - return k32OemToCharBuffA( s, d, strlen(s) + 1 ); -} - - -/********************************************************************** - * k32LoadStringA (KERNEL32.14) - */ -INT WINAPI k32LoadStringA(HINSTANCE instance, UINT resource_id, - LPSTR buffer, INT buflen) -{ - if(!pLoadStringA) pLoadStringA = user32_proc_address("LoadStringA"); - return pLoadStringA(instance, resource_id, buffer, buflen); -} - - -/*********************************************************************** - * k32wvsprintfA (KERNEL32.16) - */ -INT WINAPI k32wvsprintfA(LPSTR buffer, LPCSTR spec, __ms_va_list args) -{ - if(!pwvsprintfA) pwvsprintfA = user32_proc_address("wvsprintfA"); - return (*pwvsprintfA)(buffer, spec, args); -} - - -/*********************************************************************** - * k32wsprintfA (KERNEL32.15) - */ -INT WINAPIV k32wsprintfA(LPSTR buffer, LPCSTR spec, ...) -{ - __ms_va_list args; - INT res; - - __ms_va_start(args, spec); - res = k32wvsprintfA(buffer, spec, args); - __ms_va_end(args); - return res; -} - - /*********************************************************************** * lstrcatA (KERNEL32.@) * lstrcat (KERNEL32.@) diff --git a/dlls/kernel32/thunk.c b/dlls/kernel32/thunk.c index 5befee5..78ba2f7 100644 --- a/dlls/kernel32/thunk.c +++ b/dlls/kernel32/thunk.c @@ -2176,6 +2176,103 @@ DWORD WINAPI _KERNEL32_99(DWORD x) } +/*********************************************************************** + * Helper for k32 family functions + */ +static void *user32_proc_address(const char *proc_name) +{ + static HMODULE hUser32; + + if(!hUser32) hUser32 = LoadLibraryA("user32.dll"); + return GetProcAddress(hUser32, proc_name); +} + +/*********************************************************************** + * k32CharToOemBuffA (KERNEL32.11) + */ +BOOL WINAPI k32CharToOemBuffA(LPCSTR s, LPSTR d, DWORD len) +{ + WCHAR *bufW; + + if ((bufW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + MultiByteToWideChar( CP_ACP, 0, s, len, bufW, len ); + WideCharToMultiByte( CP_OEMCP, 0, bufW, len, d, len, NULL, NULL ); + HeapFree( GetProcessHeap(), 0, bufW ); + } + return TRUE; +} + +/*********************************************************************** + * k32CharToOemA (KERNEL32.10) + */ +BOOL WINAPI k32CharToOemA(LPCSTR s, LPSTR d) +{ + if (!s || !d) return TRUE; + return k32CharToOemBuffA( s, d, strlen(s) + 1 ); +} + +/*********************************************************************** + * k32OemToCharBuffA (KERNEL32.13) + */ +BOOL WINAPI k32OemToCharBuffA(LPCSTR s, LPSTR d, DWORD len) +{ + WCHAR *bufW; + + if ((bufW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + MultiByteToWideChar( CP_OEMCP, 0, s, len, bufW, len ); + WideCharToMultiByte( CP_ACP, 0, bufW, len, d, len, NULL, NULL ); + HeapFree( GetProcessHeap(), 0, bufW ); + } + return TRUE; +} + +/*********************************************************************** + * k32OemToCharA (KERNEL32.12) + */ +BOOL WINAPI k32OemToCharA(LPCSTR s, LPSTR d) +{ + return k32OemToCharBuffA( s, d, strlen(s) + 1 ); +} + +/********************************************************************** + * k32LoadStringA (KERNEL32.14) + */ +INT WINAPI k32LoadStringA(HINSTANCE instance, UINT resource_id, + LPSTR buffer, INT buflen) +{ + static INT (WINAPI *pLoadStringA)(HINSTANCE, UINT, LPSTR, INT); + + if(!pLoadStringA) pLoadStringA = user32_proc_address("LoadStringA"); + return pLoadStringA(instance, resource_id, buffer, buflen); +} + +/*********************************************************************** + * k32wvsprintfA (KERNEL32.16) + */ +INT WINAPI k32wvsprintfA(LPSTR buffer, LPCSTR spec, __ms_va_list args) +{ + static INT (WINAPI *pwvsprintfA)(LPSTR, LPCSTR, __ms_va_list); + + if(!pwvsprintfA) pwvsprintfA = user32_proc_address("wvsprintfA"); + return (*pwvsprintfA)(buffer, spec, args); +} + +/*********************************************************************** + * k32wsprintfA (KERNEL32.15) + */ +INT WINAPIV k32wsprintfA(LPSTR buffer, LPCSTR spec, ...) +{ + __ms_va_list args; + INT res; + + __ms_va_start(args, spec); + res = k32wvsprintfA(buffer, spec, args); + __ms_va_end(args); + return res; +} + /********************************************************************** * Catch (KERNEL.55) *

1 0

Alexandre Julliard : kernel32: Don' t export the large integer functions on 64-bit.
by Alexandre Julliard 08 Oct '09

08 Oct '09

Module: wine Branch: master Commit: 21df49c8b57acc9ea8c5abc3604d2cd7cc08df56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21df49c8b57acc9ea8c5abc36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 21:24:37 2009 +0200 kernel32: Don't export the large integer functions on 64-bit. --- dlls/kernel32/kernel32.spec | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 169ba37..c97aa28 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -79,20 +79,20 @@ 69 stdcall -noname K32WOWGetVDMPointerUnfix(long) 70 stdcall -noname K32WOWGetDescriptor(long long) 71 stub -noname IsThreadId - 72 stdcall -noname -ret64 K32RtlLargeIntegerAdd(long long long long) ntdll.RtlLargeIntegerAdd - 73 stdcall -noname -ret64 K32RtlEnlargedIntegerMultiply(long long) ntdll.RtlEnlargedIntegerMultiply - 74 stdcall -noname -ret64 K32RtlEnlargedUnsignedMultiply(long long) ntdll.RtlEnlargedUnsignedMultiply - 75 stdcall -noname K32RtlEnlargedUnsignedDivide(long long long ptr) ntdll.RtlEnlargedUnsignedDivide - 76 stdcall -noname -ret64 K32RtlExtendedLargeIntegerDivide(long long long ptr) ntdll.RtlExtendedLargeIntegerDivide - 77 stdcall -noname -ret64 K32RtlExtendedMagicDivide(long long long long long) ntdll.RtlExtendedMagicDivide - 78 stdcall -noname -ret64 K32RtlExtendedIntegerMultiply(long long long) ntdll.RtlExtendedIntegerMultiply - 79 stdcall -noname -ret64 K32RtlLargeIntegerShiftLeft(long long long) ntdll.RtlLargeIntegerShiftLeft - 80 stdcall -noname -ret64 K32RtlLargeIntegerShiftRight(long long long) ntdll.RtlLargeIntegerShiftRight - 81 stdcall -noname -ret64 K32RtlLargeIntegerArithmeticShift(long long long) ntdll.RtlLargeIntegerArithmeticShift - 82 stdcall -noname -ret64 K32RtlLargeIntegerNegate(long long) ntdll.RtlLargeIntegerNegate - 83 stdcall -noname -ret64 K32RtlLargeIntegerSubtract(long long long long) ntdll.RtlLargeIntegerSubtract - 84 stdcall -noname -ret64 K32RtlConvertLongToLargeInteger(long) ntdll.RtlConvertLongToLargeInteger - 85 stdcall -noname -ret64 K32RtlConvertUlongToLargeInteger(long) ntdll.RtlConvertUlongToLargeInteger + 72 stdcall -noname -arch=win32 -ret64 K32RtlLargeIntegerAdd(long long long long) ntdll.RtlLargeIntegerAdd + 73 stdcall -noname -arch=win32 -ret64 K32RtlEnlargedIntegerMultiply(long long) ntdll.RtlEnlargedIntegerMultiply + 74 stdcall -noname -arch=win32 -ret64 K32RtlEnlargedUnsignedMultiply(long long) ntdll.RtlEnlargedUnsignedMultiply + 75 stdcall -noname -arch=win32 K32RtlEnlargedUnsignedDivide(long long long ptr) ntdll.RtlEnlargedUnsignedDivide + 76 stdcall -noname -arch=win32 -ret64 K32RtlExtendedLargeIntegerDivide(long long long ptr) ntdll.RtlExtendedLargeIntegerDivide + 77 stdcall -noname -arch=win32 -ret64 K32RtlExtendedMagicDivide(long long long long long) ntdll.RtlExtendedMagicDivide + 78 stdcall -noname -arch=win32 -ret64 K32RtlExtendedIntegerMultiply(long long long) ntdll.RtlExtendedIntegerMultiply + 79 stdcall -noname -arch=win32 -ret64 K32RtlLargeIntegerShiftLeft(long long long) ntdll.RtlLargeIntegerShiftLeft + 80 stdcall -noname -arch=win32 -ret64 K32RtlLargeIntegerShiftRight(long long long) ntdll.RtlLargeIntegerShiftRight + 81 stdcall -noname -arch=win32 -ret64 K32RtlLargeIntegerArithmeticShift(long long long) ntdll.RtlLargeIntegerArithmeticShift + 82 stdcall -noname -arch=win32 -ret64 K32RtlLargeIntegerNegate(long long) ntdll.RtlLargeIntegerNegate + 83 stdcall -noname -arch=win32 -ret64 K32RtlLargeIntegerSubtract(long long long long) ntdll.RtlLargeIntegerSubtract + 84 stdcall -noname -arch=win32 -ret64 K32RtlConvertLongToLargeInteger(long) ntdll.RtlConvertLongToLargeInteger + 85 stdcall -noname -arch=win32 -ret64 K32RtlConvertUlongToLargeInteger(long) ntdll.RtlConvertUlongToLargeInteger 86 stdcall @(ptr) _KERNEL32_86 87 stdcall -noname -i386 SSOnBigStack() 88 varargs -noname -i386 SSCall(long long ptr)

1 0

Ge van Geldorp : kernel32/tests: Check last error before calling lstrcmpA() since it may reset GLE.
by Alexandre Julliard 08 Oct '09

08 Oct '09

Module: wine Branch: master Commit: 55423d8df2051e92c05c14a6d61d0418f103164e URL: http://source.winehq.org/git/wine.git/?a=commit;h=55423d8df2051e92c05c14a6d… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Wed Oct 7 16:15:34 2009 +0200 kernel32/tests: Check last error before calling lstrcmpA() since it may reset GLE. --- dlls/kernel32/tests/codepage.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 61d0c33..402e4bf 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -131,8 +131,10 @@ static void test_negative_source_length(void) SetLastError( 0xdeadbeef ); memset(buf,'x',sizeof(buf)); len = WideCharToMultiByte(CP_ACP, 0, foobarW, -2002, buf, 10, NULL, NULL); - ok(len == 7 && !lstrcmpA(buf, "foobar") && GetLastError() == 0xdeadbeef, + ok(len == 7 && GetLastError() == 0xdeadbeef, "WideCharToMultiByte(-2002): len=%d error=%u\n", len, GetLastError()); + ok(!lstrcmpA(buf, "foobar"), + "WideCharToMultiByte(-2002): expected \"foobar\" got \"%s\"\n", buf); SetLastError( 0xdeadbeef ); memset(bufW,'x',sizeof(bufW));

1 0

Juan Lang : winhttp: Set callbacks needed by OpenSSL for multithreaded use.
by Alexandre Julliard 08 Oct '09

08 Oct '09

Module: wine Branch: master Commit: 2f09686f6b22c4e8064ac17cdbb708b6ebc898ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f09686f6b22c4e8064ac17cd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 7 08:36:04 2009 -0700 winhttp: Set callbacks needed by OpenSSL for multithreaded use. --- dlls/winhttp/net.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 7ab9944..6e54348 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -111,11 +111,29 @@ MAKE_FUNCPTR( SSL_get_peer_certificate ); MAKE_FUNCPTR( SSL_CTX_set_default_verify_paths ); MAKE_FUNCPTR( BIO_new_fp ); +MAKE_FUNCPTR( CRYPTO_num_locks ); +MAKE_FUNCPTR( CRYPTO_set_id_callback ); +MAKE_FUNCPTR( CRYPTO_set_locking_callback ); MAKE_FUNCPTR( ERR_get_error ); MAKE_FUNCPTR( ERR_error_string ); MAKE_FUNCPTR( i2d_X509 ); #undef MAKE_FUNCPTR +static CRITICAL_SECTION *ssl_locks; + +static unsigned long ssl_thread_id(void) +{ + return GetCurrentThreadId(); +} + +static void ssl_lock_callback(int mode, int type, const char *file, int line) +{ + if (mode & CRYPTO_LOCK) + EnterCriticalSection( &ssl_locks[type] ); + else + LeaveCriticalSection( &ssl_locks[type] ); +} + #endif /* translate a unix error code into a winsock error code */ @@ -187,6 +205,10 @@ static int sock_get_error( int err ) BOOL netconn_init( netconn_t *conn, BOOL secure ) { +#if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) + int i; +#endif + conn->socket = -1; if (!secure) return TRUE; @@ -245,6 +267,9 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) return FALSE; \ } LOAD_FUNCPTR( BIO_new_fp ); + LOAD_FUNCPTR( CRYPTO_num_locks ); + LOAD_FUNCPTR( CRYPTO_set_id_callback ); + LOAD_FUNCPTR( CRYPTO_set_locking_callback ); LOAD_FUNCPTR( ERR_get_error ); LOAD_FUNCPTR( ERR_error_string ); LOAD_FUNCPTR( i2d_X509 ); @@ -263,6 +288,20 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LeaveCriticalSection( &init_ssl_cs ); return FALSE; } + + pCRYPTO_set_id_callback(ssl_thread_id); + ssl_locks = HeapAlloc(GetProcessHeap(), 0, + pCRYPTO_num_locks() * sizeof(HANDLE)); + if (!ssl_locks) + { + set_last_error( ERROR_OUTOFMEMORY ); + LeaveCriticalSection( &init_ssl_cs ); + return FALSE; + } + for (i = 0; i < pCRYPTO_num_locks(); i++) + InitializeCriticalSection( &ssl_locks[i] ); + pCRYPTO_set_locking_callback(ssl_lock_callback); + LeaveCriticalSection( &init_ssl_cs ); #else WARN("SSL support not compiled in.\n"); @@ -276,7 +315,17 @@ void netconn_unload( void ) { #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) if (libcrypto_handle) + { + if (ssl_locks) + { + int i; + + for (i = 0; i < pCRYPTO_num_locks(); i++) + DeleteCriticalSection( &ssl_locks[i] ); + HeapFree( GetProcessHeap(), 0, ssl_locks ); + } wine_dlclose( libcrypto_handle, NULL, 0 ); + } if (libssl_handle) { if (ctx)

1 0

Stefan Dösinger : d3d9: Reduce the YUV test precision.
by Alexandre Julliard 08 Oct '09

08 Oct '09

Module: wine Branch: master Commit: fcd0bc8f54f16d9c7ae9a4d2d5e7752cd832ca9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd0bc8f54f16d9c7ae9a4d2d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 2 16:53:58 2009 +0200 d3d9: Reduce the YUV test precision. --- dlls/d3d9/tests/visual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 092cbe9..f12983d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9754,11 +9754,11 @@ static void yuv_color_test(IDirect3DDevice9 *device) { * differently, so we need a max diff of 16 */ color = getPixelColor(device, 40, 240); - ok(color_match(color, ref_color_left, 16), + ok(color_match(color, ref_color_left, 18), "Input 0x%08x: Got color 0x%08x for pixel 1/1, expected 0x%08x, format %s\n", test_data[i].in, color, ref_color_left, fmt_string); color = getPixelColor(device, 600, 240); - ok(color_match(color, ref_color_right, 16), + ok(color_match(color, ref_color_right, 18), "Input 0x%08x: Got color 0x%08x for pixel 2/1, expected 0x%08x, format %s\n", test_data[i].in, color, ref_color_right, fmt_string); }

1 0

Stefan Dösinger : wined3d: Don't write to result. color in arb_add_sRGB_correction.
by Alexandre Julliard 08 Oct '09

08 Oct '09

Module: wine Branch: master Commit: 7f6ae94c0ad0590b5be1cbef49495523ca3abbfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f6ae94c0ad0590b5be1cbef4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 7 16:54:49 2009 +0200 wined3d: Don't write to result.color in arb_add_sRGB_correction. add_sRGB_correction and the generate_pshader function generate the same MOV. There's no need to do it in two places. --- dlls/wined3d/arb_program_shader.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f1218ad..c3d0a1a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3137,7 +3137,6 @@ static void arbfp_add_sRGB_correction(struct wined3d_shader_buffer *buffer, cons * not allocated from one of our registers that were used earlier. */ } - shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); /* [0.0;1.0] clamping. Not needed, this is done implicitly */ } @@ -3513,7 +3512,9 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, struct if(args->super.srgb_correction) { arbfp_add_sRGB_correction(buffer, fragcolor, srgbtmp[0], srgbtmp[1], srgbtmp[2], srgbtmp[3], priv_ctx.target_version >= NV2); - } else if(reg_maps->shader_version.major < 2) { + } + + if(strcmp(fragcolor, "result.color")) { shader_addline(buffer, "MOV result.color, %s;\n", fragcolor); } shader_addline(buffer, "END\n"); @@ -5776,6 +5777,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi if(settings->sRGB_write) { shader_addline(&buffer, "MAD ret, fragment.color.secondary, specular_enable, %s;\n", final_combiner_src); arbfp_add_sRGB_correction(&buffer, "ret", "arg0", "arg1", "arg2", "tempreg", FALSE); + shader_addline(&buffer, "MOV result.color, ret;\n"); } else { shader_addline(&buffer, "MAD result.color, fragment.color.secondary, specular_enable, %s;\n", final_combiner_src); }

1 0

Stefan Dösinger : wined3d: Split the clip_parameters[2 ] array.
by Alexandre Julliard 08 Oct '09

08 Oct '09

Module: wine Branch: master Commit: ed2860f7896a7b7a8b38b855b69574ecf9e5850c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed2860f7896a7b7a8b38b855b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 6 20:48:23 2009 +0200 wined3d: Split the clip_parameters[2] array. --- dlls/wined3d/arb_program_shader.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c3d0a1a..691792d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -158,7 +158,8 @@ struct arb_vs_compile_args struct { WORD bools; - char clip_control[2]; + char clip_texcoord; + char clipplane_mask; } boolclip; DWORD boolclip_compare; }; @@ -2926,14 +2927,14 @@ static void vshader_add_footer(IWineD3DVertexShaderImpl *This, struct wined3d_sh shader_addline(buffer, "DP4 result.clip[%u].x, TMP_OUT, state.clip[%u].plane;\n", i, i); } } - else if(args->boolclip.clip_control[0]) + else if(args->boolclip.clip_texcoord) { unsigned int cur_clip = 0; char component[4] = {'x', 'y', 'z', 'w'}; for(i = 0; i < GL_LIMITS(clipplanes); i++) { - if(args->boolclip.clip_control[1] & (1 << i)) + if(args->boolclip.clipplane_mask & (1 << i)) { shader_addline(buffer, "DP4 TA.%c, TMP_OUT, state.clip[%u].plane;\n", component[cur_clip++], i); @@ -2955,7 +2956,7 @@ static void vshader_add_footer(IWineD3DVertexShaderImpl *This, struct wined3d_sh break; } shader_addline(buffer, "MOV result.texcoord[%u], TA;\n", - args->boolclip.clip_control[0] - 1); + args->boolclip.clip_texcoord - 1); } /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c @@ -4192,25 +4193,25 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW struct arb_pshader_private *shader_priv = ps->baseShader.backend_data; args->ps_signature = shader_priv->input_signature_idx; - args->boolclip.clip_control[0] = shader_priv->clipplane_emulation + 1; + args->boolclip.clip_texcoord = shader_priv->clipplane_emulation + 1; } else { args->ps_signature = ~0; if(!dev->vs_clipping) { - args->boolclip.clip_control[0] = ffp_clip_emul(stateblock) ? GL_LIMITS(texture_stages) : 0; + args->boolclip.clip_texcoord = ffp_clip_emul(stateblock) ? GL_LIMITS(texture_stages) : 0; } - /* Otherwise: Setting boolclip_compare set clip_control[0] to 0 */ + /* Otherwise: Setting boolclip_compare set clip_texcoord to 0 */ } - if(args->boolclip.clip_control[0]) + if(args->boolclip.clip_texcoord) { if(stateblock->renderState[WINED3DRS_CLIPPING]) { - args->boolclip.clip_control[1] = stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]; + args->boolclip.clipplane_mask = stateblock->renderState[WINED3DRS_CLIPPLANEENABLE]; } - /* clip_control[1] was set to 0 by setting boolclip_compare to 0 */ + /* clipplane_mask was set to 0 by setting boolclip_compare to 0 */ } /* This forces all local boolean constants to 1 to make them stateblock independent */

1 0

Stefan Dösinger : wined3d: Don' t reserve clipping constants needlessly.
by Alexandre Julliard 08 Oct '09

08 Oct '09

Module: wine Branch: master Commit: 8a68f418dbea0967003818e5bbac10e5ffc22512 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a68f418dbea0967003818e5b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 6 20:59:44 2009 +0200 wined3d: Don't reserve clipping constants needlessly. --- dlls/wined3d/arb_program_shader.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 691792d..39bd0b5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -648,8 +648,15 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s if(reg_maps->constf[idx] & (1 << shift)) highest_constf = i; } - clip_limit = GL_LIMITS(clipplanes); - if(ctx->target_version == ARB) clip_limit = min(clip_limit, 4); + if(use_nv_clip(gl_info) && ctx->target_version >= NV2) + { + clip_limit = GL_LIMITS(clipplanes); + } + else + { + unsigned int mask = ctx->cur_vs_args->boolclip.clipplane_mask; + clip_limit = min(count_bits(mask), 4); + } *num_clipplanes = min(clip_limit, max_constantsF - highest_constf - 1); max_constantsF -= *num_clipplanes; if(*num_clipplanes < clip_limit)

1 0

Alexandre Julliard : kernel32: Move the 16-bit string functions to kernel16 .c.
by Alexandre Julliard 08 Oct '09

08 Oct '09

Module: wine Branch: master Commit: 3b1186de5aeabd261e70dab8b78a730030075ca1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b1186de5aeabd261e70dab8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 17:14:10 2009 +0200 kernel32: Move the 16-bit string functions to kernel16.c. --- dlls/kernel32/kernel16.c | 129 +++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/string.c | 145 ---------------------------------------------- 2 files changed, 129 insertions(+), 145 deletions(-) diff --git a/dlls/kernel32/kernel16.c b/dlls/kernel32/kernel16.c index c5683db..795baab 100644 --- a/dlls/kernel32/kernel16.c +++ b/dlls/kernel32/kernel16.c @@ -86,6 +86,135 @@ BOOL WINAPI KERNEL_DllEntryPoint( DWORD reasion, HINSTANCE16 inst, WORD ds, } /*********************************************************************** + * Reserved1 (KERNEL.77) + */ +SEGPTR WINAPI KERNEL_AnsiNext16(SEGPTR current) +{ + return (*(char *)MapSL(current)) ? current + 1 : current; +} + +/*********************************************************************** + * Reserved2(KERNEL.78) + */ +SEGPTR WINAPI KERNEL_AnsiPrev16( SEGPTR start, SEGPTR current ) +{ + return (current==start)?start:current-1; +} + +/*********************************************************************** + * Reserved3 (KERNEL.79) + */ +SEGPTR WINAPI KERNEL_AnsiUpper16( SEGPTR strOrChar ) +{ + /* uppercase only one char if strOrChar < 0x10000 */ + if (HIWORD(strOrChar)) + { + char *s = MapSL(strOrChar); + while (*s) + { + *s = toupper(*s); + s++; + } + return strOrChar; + } + else return toupper((char)strOrChar); +} + +/*********************************************************************** + * Reserved4 (KERNEL.80) + */ +SEGPTR WINAPI KERNEL_AnsiLower16( SEGPTR strOrChar ) +{ + /* lowercase only one char if strOrChar < 0x10000 */ + if (HIWORD(strOrChar)) + { + char *s = MapSL(strOrChar); + while (*s) + { + *s = tolower(*s); + s++; + } + return strOrChar; + } + else return tolower((char)strOrChar); +} + +/*********************************************************************** + * Reserved5 (KERNEL.87) + */ +INT16 WINAPI KERNEL_lstrcmp16( LPCSTR str1, LPCSTR str2 ) +{ + return (INT16)strcmp( str1, str2 ); +} + +/*********************************************************************** + * lstrcpy (KERNEL.88) + */ +SEGPTR WINAPI lstrcpy16( SEGPTR dst, LPCSTR src ) +{ + if (!lstrcpyA( MapSL(dst), src )) dst = 0; + return dst; +} + +/*********************************************************************** + * lstrcat (KERNEL.89) + */ +SEGPTR WINAPI lstrcat16( SEGPTR dst, LPCSTR src ) +{ + /* Windows does not check for NULL pointers here, so we don't either */ + strcat( MapSL(dst), src ); + return dst; +} + +/*********************************************************************** + * lstrlen (KERNEL.90) + */ +INT16 WINAPI lstrlen16( LPCSTR str ) +{ + return (INT16)lstrlenA( str ); +} + +/*********************************************************************** + * hmemcpy (KERNEL.348) + */ +void WINAPI hmemcpy16( LPVOID dst, LPCVOID src, LONG count ) +{ + memcpy( dst, src, count ); +} + +/*********************************************************************** + * lstrcpyn (KERNEL.353) + */ +SEGPTR WINAPI lstrcpyn16( SEGPTR dst, LPCSTR src, INT16 n ) +{ + lstrcpynA( MapSL(dst), src, n ); + return dst; +} + +/*********************************************************************** + * lstrcatn (KERNEL.352) + */ +SEGPTR WINAPI lstrcatn16( SEGPTR dst, LPCSTR src, INT16 n ) +{ + LPSTR p = MapSL(dst); + LPSTR start = p; + + while (*p) p++; + if ((n -= (p - start)) <= 0) return dst; + lstrcpynA( p, src, n ); + return dst; +} + +/*********************************************************************** + * UnicodeToAnsi (KERNEL.434) + */ +INT16 WINAPI UnicodeToAnsi16( LPCWSTR src, LPSTR dst, INT16 codepage ) +{ + if ( codepage == -1 ) codepage = CP_ACP; + return WideCharToMultiByte( codepage, 0, src, -1, dst, 0x7fffffff, NULL, NULL ); +} + +/*********************************************************************** * EnableDos (KERNEL.41) * DisableDos (KERNEL.42) * GetLastDiskChange (KERNEL.98) diff --git a/dlls/kernel32/string.c b/dlls/kernel32/string.c index 1f606fd..c584bf7 100644 --- a/dlls/kernel32/string.c +++ b/dlls/kernel32/string.c @@ -141,26 +141,6 @@ INT WINAPIV k32wsprintfA(LPSTR buffer, LPCSTR spec, ...) /*********************************************************************** - * hmemcpy (KERNEL.348) - */ -void WINAPI hmemcpy16( LPVOID dst, LPCVOID src, LONG count ) -{ - memcpy( dst, src, count ); -} - - -/*********************************************************************** - * lstrcat (KERNEL.89) - */ -SEGPTR WINAPI lstrcat16( SEGPTR dst, LPCSTR src ) -{ - /* Windows does not check for NULL pointers here, so we don't either */ - strcat( MapSL(dst), src ); - return dst; -} - - -/*********************************************************************** * lstrcatA (KERNEL32.@) * lstrcat (KERNEL32.@) */ @@ -200,31 +180,6 @@ LPWSTR WINAPI lstrcatW( LPWSTR dst, LPCWSTR src ) /*********************************************************************** - * lstrcatn (KERNEL.352) - */ -SEGPTR WINAPI lstrcatn16( SEGPTR dst, LPCSTR src, INT16 n ) -{ - LPSTR p = MapSL(dst); - LPSTR start = p; - - while (*p) p++; - if ((n -= (p - start)) <= 0) return dst; - lstrcpynA( p, src, n ); - return dst; -} - - -/*********************************************************************** - * lstrcpy (KERNEL.88) - */ -SEGPTR WINAPI lstrcpy16( SEGPTR dst, LPCSTR src ) -{ - if (!lstrcpyA( MapSL(dst), src )) dst = 0; - return dst; -} - - -/*********************************************************************** * lstrcpyA (KERNEL32.@) * lstrcpy (KERNEL32.@) */ @@ -265,16 +220,6 @@ LPWSTR WINAPI lstrcpyW( LPWSTR dst, LPCWSTR src ) /*********************************************************************** - * lstrcpyn (KERNEL.353) - */ -SEGPTR WINAPI lstrcpyn16( SEGPTR dst, LPCSTR src, INT16 n ) -{ - lstrcpynA( MapSL(dst), src, n ); - return dst; -} - - -/*********************************************************************** * lstrcpynA (KERNEL32.@) * lstrcpyn (KERNEL32.@) * @@ -344,15 +289,6 @@ LPWSTR WINAPI lstrcpynW( LPWSTR dst, LPCWSTR src, INT n ) /*********************************************************************** - * lstrlen (KERNEL.90) - */ -INT16 WINAPI lstrlen16( LPCSTR str ) -{ - return (INT16)lstrlenA( str ); -} - - -/*********************************************************************** * lstrlenA (KERNEL32.@) * lstrlen (KERNEL32.@) */ @@ -391,84 +327,3 @@ INT WINAPI lstrlenW( LPCWSTR str ) __ENDTRY return ret; } - - -/*********************************************************************** - * UnicodeToAnsi (KERNEL.434) - */ -INT16 WINAPI UnicodeToAnsi16( LPCWSTR src, LPSTR dst, INT16 codepage ) -{ - if ( codepage == -1 ) codepage = CP_ACP; - return WideCharToMultiByte( codepage, 0, src, -1, dst, 0x7fffffff, NULL, NULL ); -} - - -/*************************************************************************** - * - * Win 2.x string functions now moved to USER - * - * We rather want to implement them here instead of doing Callouts - */ - -/*********************************************************************** - * Reserved1 (KERNEL.77) - */ -SEGPTR WINAPI KERNEL_AnsiNext16(SEGPTR current) -{ - return (*(char *)MapSL(current)) ? current + 1 : current; -} - -/*********************************************************************** - * Reserved2(KERNEL.78) - */ -SEGPTR WINAPI KERNEL_AnsiPrev16( SEGPTR start, SEGPTR current ) -{ - return (current==start)?start:current-1; -} - -/*********************************************************************** - * Reserved3 (KERNEL.79) - */ -SEGPTR WINAPI KERNEL_AnsiUpper16( SEGPTR strOrChar ) -{ - /* uppercase only one char if strOrChar < 0x10000 */ - if (HIWORD(strOrChar)) - { - char *s = MapSL(strOrChar); - while (*s) - { - *s = toupper(*s); - s++; - } - return strOrChar; - } - else return toupper((char)strOrChar); -} - -/*********************************************************************** - * Reserved4 (KERNEL.80) - */ -SEGPTR WINAPI KERNEL_AnsiLower16( SEGPTR strOrChar ) -{ - /* lowercase only one char if strOrChar < 0x10000 */ - if (HIWORD(strOrChar)) - { - char *s = MapSL(strOrChar); - while (*s) - { - *s = tolower(*s); - s++; - } - return strOrChar; - } - else return tolower((char)strOrChar); -} - - -/*********************************************************************** - * Reserved5 (KERNEL.87) - */ -INT16 WINAPI KERNEL_lstrcmp16( LPCSTR str1, LPCSTR str2 ) -{ - return (INT16)strcmp( str1, str2 ); -}

1 0

Alexandre Julliard : kernel32: Move the 16-bit error functions to error16.c .
by Alexandre Julliard 08 Oct '09

08 Oct '09

Module: wine Branch: master Commit: fe2c157fe9ef92a735978e3d73af04aac237f82a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2c157fe9ef92a735978e3d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 17:17:00 2009 +0200 kernel32: Move the 16-bit error functions to error16.c. --- dlls/kernel32/error16.c | 18 ++++++++++++++++++ dlls/kernel32/krnl386.exe.spec | 4 ++-- dlls/kernel32/thread.c | 4 ---- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/error16.c b/dlls/kernel32/error16.c index ce8935d..48b38df 100644 --- a/dlls/kernel32/error16.c +++ b/dlls/kernel32/error16.c @@ -243,6 +243,24 @@ static const char *GetParamErrorString(UINT16 uErr) { /*********************************************************************** + * SetLastError (KERNEL.147) + */ +void WINAPI SetLastError16( DWORD error ) +{ + SetLastError( error ); +} + + +/*********************************************************************** + * GetLastError (KERNEL.148) + */ +DWORD WINAPI GetLastError16(void) +{ + return GetLastError(); +} + + +/*********************************************************************** * LogError (KERNEL.324) */ VOID WINAPI LogError16(UINT16 uErr, LPVOID lpvInfo) diff --git a/dlls/kernel32/krnl386.exe.spec b/dlls/kernel32/krnl386.exe.spec index 8b91b5d..09d42f1 100644 --- a/dlls/kernel32/krnl386.exe.spec +++ b/dlls/kernel32/krnl386.exe.spec @@ -148,8 +148,8 @@ 144 pascal -ret16 CreateDirectory(ptr ptr) CreateDirectory16 145 pascal -ret16 RemoveDirectory(ptr) RemoveDirectory16 146 pascal -ret16 DeleteFile(ptr) DeleteFile16 -147 pascal -ret16 SetLastError(long) SetLastError -148 pascal GetLastError() GetLastError +147 pascal -ret16 SetLastError(long) SetLastError16 +148 pascal GetLastError() GetLastError16 149 pascal -ret16 GetVersionEx(ptr) GetVersionEx16 150 pascal -ret16 DirectedYield(word) DirectedYield16 151 stub WinOldApCall diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 3115a60..db95841 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -588,7 +588,6 @@ HANDLE WINAPI GetCurrentThread(void) #ifdef __i386__ /*********************************************************************** - * SetLastError (KERNEL.147) * SetLastError (KERNEL32.@) */ /* void WINAPI SetLastError( DWORD error ); */ @@ -599,7 +598,6 @@ __ASM_STDCALL_FUNC( SetLastError, 4, "ret $4" ) /*********************************************************************** - * GetLastError (KERNEL.148) * GetLastError (KERNEL32.@) */ /* DWORD WINAPI GetLastError(void); */ @@ -622,7 +620,6 @@ __ASM_STDCALL_FUNC( GetCurrentThreadId, 0, ".byte 0x64\n\tmovl 0x24,%eax\n\tret" #else /* __i386__ */ /********************************************************************** - * SetLastError (KERNEL.147) * SetLastError (KERNEL32.@) * * Sets the last-error code. @@ -636,7 +633,6 @@ void WINAPI SetLastError( DWORD error ) /* [in] Per-thread error code */ } /********************************************************************** - * GetLastError (KERNEL.148) * GetLastError (KERNEL32.@) * * Get the last-error code.

1 0