wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

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 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 : 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

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

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

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

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: Move Get/SetProcessDword to kernel16.c.
by Alexandre Julliard 08 Oct '09

08 Oct '09

Module: wine Branch: master Commit: e0ce6dc32eb81660b19bfd6dfd739fb296b38159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ce6dc32eb81660b19bfd6df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 20:49:22 2009 +0200 kernel32: Move Get/SetProcessDword to kernel16.c. --- dlls/kernel32/kernel16.c | 115 ++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/krnl386.exe.spec | 4 +- dlls/kernel32/process.c | 107 +------------------------------------ 3 files changed, 119 insertions(+), 107 deletions(-) diff --git a/dlls/kernel32/kernel16.c b/dlls/kernel32/kernel16.c index e298aa3..3acb932 100644 --- a/dlls/kernel32/kernel16.c +++ b/dlls/kernel32/kernel16.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winternl.h" #include "wownt32.h" +#include "wine/winuser16.h" #include "kernel_private.h" #include "kernel16_private.h" @@ -32,6 +33,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); +extern DWORD WINAPI GetProcessFlags( DWORD processid ); + +static DWORD process_dword; + /************************************************************************** * DllEntryPoint (KERNEL.669) */ @@ -580,6 +585,116 @@ DWORD WINAPI MapProcessHandle( HANDLE hProcess ) } /*********************************************************************** + * SetProcessDword (KERNEL.484) + * 'Of course you cannot directly access Windows internal structures' + */ +void WINAPI SetProcessDword16( DWORD dwProcessID, INT offset, DWORD value ) +{ + TRACE("(%d, %d)\n", dwProcessID, offset ); + + if (dwProcessID && dwProcessID != GetCurrentProcessId()) + { + ERR("%d: process %x not accessible\n", offset, dwProcessID); + return; + } + + switch ( offset ) + { + case GPD_APP_COMPAT_FLAGS: + case GPD_LOAD_DONE_EVENT: + case GPD_HINSTANCE16: + case GPD_WINDOWS_VERSION: + case GPD_THDB: + case GPD_PDB: + case GPD_STARTF_SHELLDATA: + case GPD_STARTF_HOTKEY: + case GPD_STARTF_SHOWWINDOW: + case GPD_STARTF_SIZE: + case GPD_STARTF_POSITION: + case GPD_STARTF_FLAGS: + case GPD_PARENT: + case GPD_FLAGS: + ERR("Not allowed to modify offset %d\n", offset ); + break; + case GPD_USERDATA: + process_dword = value; + break; + default: + ERR("Unknown offset %d\n", offset ); + break; + } +} + +/*********************************************************************** + * GetProcessDword (KERNEL.485) + * 'Of course you cannot directly access Windows internal structures' + */ +DWORD WINAPI GetProcessDword16( DWORD dwProcessID, INT offset ) +{ + DWORD x, y; + STARTUPINFOW siw; + + TRACE("(%d, %d)\n", dwProcessID, offset ); + + if (dwProcessID && dwProcessID != GetCurrentProcessId()) + { + ERR("%d: process %x not accessible\n", offset, dwProcessID); + return 0; + } + + switch ( offset ) + { + case GPD_APP_COMPAT_FLAGS: + return GetAppCompatFlags16(0); + case GPD_LOAD_DONE_EVENT: + return 0; + case GPD_HINSTANCE16: + return GetTaskDS16(); + case GPD_WINDOWS_VERSION: + return GetExeVersion16(); + case GPD_THDB: + return (DWORD_PTR)NtCurrentTeb() - 0x10 /* FIXME */; + case GPD_PDB: + return (DWORD_PTR)NtCurrentTeb()->Peb; /* FIXME: truncating a pointer */ + case GPD_STARTF_SHELLDATA: /* return stdoutput handle from startupinfo ??? */ + GetStartupInfoW(&siw); + return HandleToULong(siw.hStdOutput); + case GPD_STARTF_HOTKEY: /* return stdinput handle from startupinfo ??? */ + GetStartupInfoW(&siw); + return HandleToULong(siw.hStdInput); + case GPD_STARTF_SHOWWINDOW: + GetStartupInfoW(&siw); + return siw.wShowWindow; + case GPD_STARTF_SIZE: + GetStartupInfoW(&siw); + x = siw.dwXSize; + if ( (INT)x == CW_USEDEFAULT ) x = CW_USEDEFAULT16; + y = siw.dwYSize; + if ( (INT)y == CW_USEDEFAULT ) y = CW_USEDEFAULT16; + return MAKELONG( x, y ); + case GPD_STARTF_POSITION: + GetStartupInfoW(&siw); + x = siw.dwX; + if ( (INT)x == CW_USEDEFAULT ) x = CW_USEDEFAULT16; + y = siw.dwY; + if ( (INT)y == CW_USEDEFAULT ) y = CW_USEDEFAULT16; + return MAKELONG( x, y ); + case GPD_STARTF_FLAGS: + GetStartupInfoW(&siw); + return siw.dwFlags; + case GPD_PARENT: + return 0; + case GPD_FLAGS: + return GetProcessFlags(0); + case GPD_USERDATA: + return process_dword; + default: + ERR("Unknown offset %d\n", offset ); + return 0; + } +} + +/*********************************************************************** * FreeLibrary32 (KERNEL.486) */ BOOL WINAPI FreeLibrary32_16( HINSTANCE module ) diff --git a/dlls/kernel32/krnl386.exe.spec b/dlls/kernel32/krnl386.exe.spec index b43c874..60560c5 100644 --- a/dlls/kernel32/krnl386.exe.spec +++ b/dlls/kernel32/krnl386.exe.spec @@ -386,8 +386,8 @@ 481 pascal -ret16 _LeaveWin16Lock() _LeaveWin16Lock 482 pascal LoadSystemLibrary32(str) LoadLibrary32_16 # FIXME! 483 pascal MapProcessHandle(long) MapProcessHandle -484 pascal SetProcessDword(long s_word long) SetProcessDword -485 pascal GetProcessDword(long s_word) GetProcessDword +484 pascal SetProcessDword(long s_word long) SetProcessDword16 +485 pascal GetProcessDword(long s_word) GetProcessDword16 486 pascal FreeLibrary32(long) FreeLibrary32_16 487 pascal GetModuleFileName32(long str word) GetModuleFileName32_16 488 pascal GetModuleHandle32(str) GetModuleHandle32_16 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4d8f2f7..df09558 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -74,7 +74,6 @@ static UINT process_error_mode; static DWORD shutdown_flags = 0; static DWORD shutdown_priority = 0x280; -static DWORD process_dword; static BOOL is_wow64; HMODULE kernel32_handle = 0; @@ -2537,114 +2536,12 @@ DWORD WINAPI GetProcessFlags( DWORD processid ) /*********************************************************************** - * GetProcessDword (KERNEL.485) * GetProcessDword (KERNEL32.18) - * 'Of course you cannot directly access Windows internal structures' */ DWORD WINAPI GetProcessDword( DWORD dwProcessID, INT offset ) { - DWORD x, y; - STARTUPINFOW siw; - - TRACE("(%d, %d)\n", dwProcessID, offset ); - - if (dwProcessID && dwProcessID != GetCurrentProcessId()) - { - ERR("%d: process %x not accessible\n", offset, dwProcessID); - return 0; - } - - switch ( offset ) - { - case GPD_APP_COMPAT_FLAGS: - return GetAppCompatFlags16(0); - case GPD_LOAD_DONE_EVENT: - return 0; - case GPD_HINSTANCE16: - return GetTaskDS16(); - case GPD_WINDOWS_VERSION: - return GetExeVersion16(); - case GPD_THDB: - return (DWORD_PTR)NtCurrentTeb() - 0x10 /* FIXME */; - case GPD_PDB: - return (DWORD_PTR)NtCurrentTeb()->Peb; /* FIXME: truncating a pointer */ - case GPD_STARTF_SHELLDATA: /* return stdoutput handle from startupinfo ??? */ - GetStartupInfoW(&siw); - return HandleToULong(siw.hStdOutput); - case GPD_STARTF_HOTKEY: /* return stdinput handle from startupinfo ??? */ - GetStartupInfoW(&siw); - return HandleToULong(siw.hStdInput); - case GPD_STARTF_SHOWWINDOW: - GetStartupInfoW(&siw); - return siw.wShowWindow; - case GPD_STARTF_SIZE: - GetStartupInfoW(&siw); - x = siw.dwXSize; - if ( (INT)x == CW_USEDEFAULT ) x = CW_USEDEFAULT16; - y = siw.dwYSize; - if ( (INT)y == CW_USEDEFAULT ) y = CW_USEDEFAULT16; - return MAKELONG( x, y ); - case GPD_STARTF_POSITION: - GetStartupInfoW(&siw); - x = siw.dwX; - if ( (INT)x == CW_USEDEFAULT ) x = CW_USEDEFAULT16; - y = siw.dwY; - if ( (INT)y == CW_USEDEFAULT ) y = CW_USEDEFAULT16; - return MAKELONG( x, y ); - case GPD_STARTF_FLAGS: - GetStartupInfoW(&siw); - return siw.dwFlags; - case GPD_PARENT: - return 0; - case GPD_FLAGS: - return GetProcessFlags(0); - case GPD_USERDATA: - return process_dword; - default: - ERR("Unknown offset %d\n", offset ); - return 0; - } -} - -/*********************************************************************** - * SetProcessDword (KERNEL.484) - * 'Of course you cannot directly access Windows internal structures' - */ -void WINAPI SetProcessDword( DWORD dwProcessID, INT offset, DWORD value ) -{ - TRACE("(%d, %d)\n", dwProcessID, offset ); - - if (dwProcessID && dwProcessID != GetCurrentProcessId()) - { - ERR("%d: process %x not accessible\n", offset, dwProcessID); - return; - } - - switch ( offset ) - { - case GPD_APP_COMPAT_FLAGS: - case GPD_LOAD_DONE_EVENT: - case GPD_HINSTANCE16: - case GPD_WINDOWS_VERSION: - case GPD_THDB: - case GPD_PDB: - case GPD_STARTF_SHELLDATA: - case GPD_STARTF_HOTKEY: - case GPD_STARTF_SHOWWINDOW: - case GPD_STARTF_SIZE: - case GPD_STARTF_POSITION: - case GPD_STARTF_FLAGS: - case GPD_PARENT: - case GPD_FLAGS: - ERR("Not allowed to modify offset %d\n", offset ); - break; - case GPD_USERDATA: - process_dword = value; - break; - default: - ERR("Unknown offset %d\n", offset ); - break; - } + FIXME( "(%d, %d): not supported\n", dwProcessID, offset ); + return 0; }

1 0

Alexandre Julliard : kernel32: Fix a couple of compiler warnings on 64-bit.
by Alexandre Julliard 08 Oct '09

08 Oct '09

Module: wine Branch: master Commit: 806deab0b75e1050bc0e47479bec22d7e5c2da43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=806deab0b75e1050bc0e47479… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 18:10:33 2009 +0200 kernel32: Fix a couple of compiler warnings on 64-bit. --- dlls/kernel32/module.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index dee3725..fc75475 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -315,14 +315,11 @@ DWORD MODULE_GetBinaryType( HANDLE hfile, void **res_start, void **res_end ) if (ext_header.nt.FileHeader.Characteristics & IMAGE_FILE_DLL) ret |= BINARY_FLAG_DLL; if (len < sizeof(ext_header.nt)) /* clear remaining part of header if missing */ memset( (char *)&ext_header.nt + len, 0, sizeof(ext_header.nt) - len ); - if (res_start) *res_start = (void *)ext_header.nt.OptionalHeader.ImageBase; - if (res_end) *res_end = (void *)(ext_header.nt.OptionalHeader.ImageBase + - ext_header.nt.OptionalHeader.SizeOfImage); switch (ext_header.nt.OptionalHeader.Magic) { case IMAGE_NT_OPTIONAL_HDR32_MAGIC: - if (res_start) *res_start = (void *)ext_header.nt.OptionalHeader.ImageBase; - if (res_end) *res_end = (void *)(ext_header.nt.OptionalHeader.ImageBase + + if (res_start) *res_start = (void *)(ULONG_PTR)ext_header.nt.OptionalHeader.ImageBase; + if (res_end) *res_end = (void *)((ULONG_PTR)ext_header.nt.OptionalHeader.ImageBase + ext_header.nt.OptionalHeader.SizeOfImage); return ret; case IMAGE_NT_OPTIONAL_HDR64_MAGIC:

1 0

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

08 Oct '09

Module: wine Branch: master Commit: 2f3e8d3c6e528e4d7cb105483f469a04c1322e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3e8d3c6e528e4d7cb105483… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 18:05:35 2009 +0200 kernel32: Move the 16-bit version functions to kernel16.c. --- dlls/kernel32/kernel16.c | 194 ++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel32.spec | 2 - dlls/kernel32/version.c | 205 ------------------------------------------- 3 files changed, 194 insertions(+), 207 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f3e8d3c6e528e4d7cb10…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009