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

Alexandre Julliard : user32: Re-enable the fast code path in CreateIconIndirect.
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: c9d112fd94e1d56df5a6508b09c6fb36ede4b2a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d112fd94e1d56df5a6508b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 11:22:08 2010 +0200 user32: Re-enable the fast code path in CreateIconIndirect. --- dlls/user32/cursoricon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 8910985..e4973e3 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1837,7 +1837,7 @@ static void stretch_blt_icon( HDC hdc_dst, int dst_x, int dst_y, int dst_width, { HDC hdc = CreateCompatibleDC( 0 ); - if (!SelectObject( hdc, src ) || 1) /* do it the hard way */ + if (!SelectObject( hdc, src )) /* do it the hard way */ { BITMAPINFO *info; void *bits;

1 0

Aric Stewart : usp10: Break out a function to apply a GSUB feature to an entire string of glyphs .
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: 5ad2f6e152680ed82e32f6fb8e53a15b185a9a90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ad2f6e152680ed82e32f6fb8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 27 15:03:21 2010 -0500 usp10: Break out a function to apply a GSUB feature to an entire string of glyphs. --- dlls/usp10/shape.c | 68 +++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 52 insertions(+), 16 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index d7e9811..fe2ea53 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -549,6 +549,57 @@ static VOID *load_gsub_table(HDC hdc) return GSUB_Table; } +static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, void* GSUB_Table, WORD *pwOutGlyphs, int write_dir, INT* pcGlyphs, const char* feat) +{ + int i; + + if (GSUB_Table) + { + const GSUB_Header *header; + const GSUB_Script *script; + const GSUB_LangSys *language; + const GSUB_Feature *feature; + + if (!GSUB_Table) + return GSUB_E_NOFEATURE; + + header = GSUB_Table; + + script = GSUB_get_script_table(header, get_opentype_script(hdc,psa)); + if (!script) + { + TRACE("Script not found\n"); + return GSUB_E_NOFEATURE; + } + language = GSUB_get_lang_table(script, "xxxx"); + if (!language) + { + TRACE("Language not found\n"); + return GSUB_E_NOFEATURE; + } + feature = GSUB_get_feature(header, language, feat); + if (!feature) + { + TRACE("%s feature not found\n",feat); + return GSUB_E_NOFEATURE; + } + + i = 0; + TRACE("applying feature %s\n",feat); + while(i < *pcGlyphs) + { + INT nextIndex; + nextIndex = GSUB_apply_feature(header, feature, pwOutGlyphs, i, write_dir, pcGlyphs); + if (nextIndex > GSUB_E_NOGLYPH) + i = nextIndex; + else + i++; + } + return *pcGlyphs; + } + return GSUB_E_NOFEATURE; +} + static CHAR neighbour_joining_type(int i, int delta, const CHAR* context_type, INT cchLen, SCRIPT_ANALYSIS *psa) { if (i + delta < 0) @@ -668,22 +719,7 @@ void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WC } } - /* Required ligature substitution */ - if (psc->GSUB_Table) - { - i = 0; - while(i < *pcGlyphs) - { - INT nextIndex; - nextIndex = apply_GSUB_feature_to_glyph(hdc, psa, psc->GSUB_Table, pwOutGlyphs, i, dirL, pcGlyphs, "rlig"); - if (nextIndex > GSUB_E_NOGLYPH) - i = nextIndex; - else if (nextIndex == GSUB_E_NOFEATURE) - break; - else - i++; - } - } + apply_GSUB_feature(hdc, psa, psc->GSUB_Table, pwOutGlyphs, dirL, pcGlyphs, "rlig"); HeapFree(GetProcessHeap(),0,context_shape); HeapFree(GetProcessHeap(),0,context_type);

1 0

Austin English : winenas.drv: Remove oldb from nas_add_buffer, where it' s unused.
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: aef3f42f0a5ccf3e96a46e2ee6912f75fc20704f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef3f42f0a5ccf3e96a46e2ee… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 27 10:53:29 2010 -0500 winenas.drv: Remove oldb from nas_add_buffer, where it's unused. --- dlls/winenas.drv/audio.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winenas.drv/audio.c b/dlls/winenas.drv/audio.c index 391ab40..9140da1 100644 --- a/dlls/winenas.drv/audio.c +++ b/dlls/winenas.drv/audio.c @@ -1401,10 +1401,9 @@ static int nas_add_buffer(WINE_WAVEOUT* wwo) { } static int nas_send_buffer(WINE_WAVEOUT* wwo) { - int oldb , len; + int len = 0; char *ptr, *newdata; newdata = NULL; - oldb = len = 0; if (wwo->freeBytes <= 0) return 0;

1 0

André Hentschel : libs/port: Add support for amd64-mingw32msvc platform.
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: fd5b4f4c0cef83cec6f50a0c3621af3675fb0dda URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd5b4f4c0cef83cec6f50a0c3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 27 20:32:42 2010 +0200 libs/port: Add support for amd64-mingw32msvc platform. --- libs/port/getpagesize.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/port/getpagesize.c b/libs/port/getpagesize.c index 79c2306..0271e5d 100644 --- a/libs/port/getpagesize.c +++ b/libs/port/getpagesize.c @@ -30,7 +30,7 @@ size_t getpagesize(void) { # ifdef __svr4__ return sysconf(_SC_PAGESIZE); -# elif defined(__i386__) +# elif defined(__i386__) || defined(__x86_64__) return 4096; # else # error Cannot get the page size on this platform

1 0

André Hentschel : winebuild: Add support for amd64-mingw32msvc platform.
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: 3686e74e1bd00d5c77d9aedf4feea4d3f83bad3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3686e74e1bd00d5c77d9aedf4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 27 20:08:31 2010 +0200 winebuild: Add support for amd64-mingw32msvc platform. --- tools/winebuild/utils.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index b690bab..75568d6 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -54,6 +54,7 @@ static const struct { "i586", CPU_x86 }, { "i686", CPU_x86 }, { "i786", CPU_x86 }, + { "amd64", CPU_x86_64 }, { "x86_64", CPU_x86_64 }, { "sparc", CPU_SPARC }, { "alpha", CPU_ALPHA },

1 0

André Hentschel : oledb32: Fix variant to integer conversion.
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: fd5e732a3910948d50e919c09c6b133e608fecb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd5e732a3910948d50e919c09… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 27 20:39:26 2010 +0200 oledb32: Fix variant to integer conversion. --- dlls/oledb32/convert.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index c9206ba..f6f72d0 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -213,6 +213,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_I2: { signed short *d = dst; + VARIANT tmp; switch(src_type) { case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; @@ -231,7 +232,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_UI4: hr = VarI2FromUI4(*(DWORD*)src, d); break; case DBTYPE_I8: hr = VarI2FromI8(*(LONGLONG*)src, d); break; case DBTYPE_UI8: hr = VarI2FromUI8(*(ULONGLONG*)src, d); break; - case DBTYPE_VARIANT: *d = V_I2((VARIANT*)src); hr = S_OK; break; + case DBTYPE_VARIANT: + VariantInit(&tmp); + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_I2)) == S_OK) + *d = V_I2(&tmp); + break; default: FIXME("Unimplemented conversion %04x -> I2\n", src_type); return E_NOTIMPL; } break; @@ -240,6 +245,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_I4: { signed int *d = dst; + VARIANT tmp; switch(src_type) { case DBTYPE_EMPTY: *d = 0; hr = S_OK; break; @@ -258,7 +264,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_UI4: hr = VarI4FromUI4(*(DWORD*)src, d); break; case DBTYPE_I8: hr = VarI4FromI8(*(LONGLONG*)src, d); break; case DBTYPE_UI8: hr = VarI4FromUI8(*(ULONGLONG*)src, d); break; - case DBTYPE_VARIANT: *d = V_I4((VARIANT*)src); hr = S_OK; break; + case DBTYPE_VARIANT: + VariantInit(&tmp); + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_I4)) == S_OK) + *d = V_I4(&tmp); + break; default: FIXME("Unimplemented conversion %04x -> I4\n", src_type); return E_NOTIMPL; } break;

1 0

Alexandre Julliard : kernel32: Unalign the stack on process startup to work around Doom3 bug.
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: a10e9ba092994936a08e53c206ddb695a7ff53f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a10e9ba092994936a08e53c20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 11:20:28 2010 +0200 kernel32: Unalign the stack on process startup to work around Doom3 bug. --- dlls/kernel32/process.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index af06392..da99ab9 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -944,6 +944,28 @@ static void start_wineboot( HANDLE handles[2] ) } +#ifdef __i386__ +extern DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry ); +__ASM_GLOBAL_FUNC( call_process_entry, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "subl $12,%esp\n\t" /* deliberately mis-align the stack by 8, Doom 3 needs this */ + "pushl 8(%ebp)\n\t" + "call *12(%ebp)\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) +#else +static inline DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry ) +{ + return entry( peb ); +} +#endif + /*********************************************************************** * start_process * @@ -971,7 +993,7 @@ static DWORD WINAPI start_process( PEB *peb ) SetLastError( 0 ); /* clear error code */ if (peb->BeingDebugged) DbgBreakPoint(); - return entry( peb ); + return call_process_entry( peb, entry ); }

1 0

Alexandre Julliard : kernel32/tests: Restore the stderr handle after the closing test.
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: 48cffa0323adb3fd6dd3bec74083f4d04f9af768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48cffa0323adb3fd6dd3bec74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 11:21:44 2010 +0200 kernel32/tests: Restore the stderr handle after the closing test. --- dlls/kernel32/tests/process.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index d66d9f6..065a94a 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1742,7 +1742,7 @@ static void test_ProcessName(void) static void test_Handles(void) { HANDLE handle = GetCurrentProcess(); - HANDLE h2; + HANDLE h2, h3; BOOL ret; DWORD code; @@ -1773,12 +1773,16 @@ static void test_Handles(void) handle = GetStdHandle( STD_ERROR_HANDLE ); ok( handle != 0, "handle %p\n", handle ); + DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &h3, + 0, TRUE, DUPLICATE_SAME_ACCESS ); + SetStdHandle( STD_ERROR_HANDLE, h3 ); CloseHandle( (HANDLE)STD_ERROR_HANDLE ); h2 = GetStdHandle( STD_ERROR_HANDLE ); ok( h2 == 0 || - broken( h2 == handle) || /* nt4, w2k */ + broken( h2 == h3) || /* nt4, w2k */ broken( h2 == INVALID_HANDLE_VALUE), /* win9x */ - "wrong handle %p/%p\n", h2, handle ); + "wrong handle %p/%p\n", h2, h3 ); + SetStdHandle( STD_ERROR_HANDLE, handle ); } static void test_SystemInfo(void)

1 0

Austin English : loader: Remove mapat from map_so_lib, where it is unused.
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: df9fda760ec7c27a05ed95a5b21d7d21d6a80a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=df9fda760ec7c27a05ed95a5b… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 27 11:12:34 2010 -0500 loader: Remove mapat from map_so_lib, where it is unused. --- loader/preloader.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 9f9b083..83a5172 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -778,8 +778,7 @@ static void map_so_lib( const char *name, struct wld_link_map *l) if (zeroend > zeropage) { /* Map the remaining zero pages in from the zero fill FD. */ - caddr_t mapat; - mapat = wld_mmap ((caddr_t) zeropage, zeroend - zeropage, + wld_mmap ((caddr_t) zeropage, zeroend - zeropage, c->prot, MAP_ANON|MAP_PRIVATE|MAP_FIXED, -1, 0); }

1 0

André Hentschel : widl: Add support for amd64-mingw32msvc platform.
by Alexandre Julliard May 28, 2010

May 28, 2010

Module: wine Branch: master Commit: 4bd8d384c4ce3a121125a9febd6fd56dfbea3aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bd8d384c4ce3a121125a9feb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 27 20:09:28 2010 +0200 widl: Add support for amd64-mingw32msvc platform. --- tools/widl/widl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 8c0d0c9..cc25201 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -248,6 +248,7 @@ static void set_target( const char *target ) { "i586", SYS_WIN32 }, { "i686", SYS_WIN32 }, { "i786", SYS_WIN32 }, + { "amd64", SYS_WIN64 }, { "x86_64", SYS_WIN64 }, { "sparc", SYS_WIN32 }, { "alpha", SYS_WIN32 },

1 0