April 2008 - Wine-commits - list.winehq.org

James Hawkins : kernel32: Fix a few failing tests in win2k.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: a4f733ab0b558bca9db51bfe6c7ea3882604faee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f733ab0b558bca9db51bfe6… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Wed Apr 16 15:37:09 2008 -0500 kernel32: Fix a few failing tests in win2k. --- dlls/kernel32/tests/environ.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/environ.c b/dlls/kernel32/tests/environ.c index fb33304..c7737d0 100644 --- a/dlls/kernel32/tests/environ.c +++ b/dlls/kernel32/tests/environ.c @@ -364,6 +364,8 @@ static void test_GetComputerNameExA(void) LPSTR name; DWORD error; + static const int MAX_COMP_NAME = 32767; + if (!pGetComputerNameExA) { skip("GetComputerNameExA function not implemented\n"); @@ -373,8 +375,11 @@ static void test_GetComputerNameExA(void) size = 0; ret = pGetComputerNameExA(ComputerNameDnsDomain, (LPSTR)0xdeadbeef, &size); error = GetLastError(); - ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExA should have failed with ERROR_MORE_DATA instead of %d\n", error); - trace("domain size is %d\n", size); + ok(ret == 0, "Expected 0, got %d\n", ret); + ok(error == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", error); + + /* size is not set in win2k */ + size = MAX_COMP_NAME; name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = pGetComputerNameExA(ComputerNameDnsDomain, name, &size); @@ -385,8 +390,11 @@ static void test_GetComputerNameExA(void) size = 0; ret = pGetComputerNameExA(ComputerNameDnsFullyQualified, (LPSTR)0xdeadbeef, &size); error = GetLastError(); - ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExA should have failed with ERROR_MORE_DATA instead of %d\n", error); - trace("fully qualified hostname size is %d\n", size); + ok(ret == 0, "Expected 0, got %d\n", ret); + ok(error == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", error); + + /* size is not set in win2k */ + size = MAX_COMP_NAME; name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = pGetComputerNameExA(ComputerNameDnsFullyQualified, name, &size); @@ -397,8 +405,11 @@ static void test_GetComputerNameExA(void) size = 0; ret = pGetComputerNameExA(ComputerNameDnsHostname, (LPSTR)0xdeadbeef, &size); error = GetLastError(); - ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExA should have failed with ERROR_MORE_DATA instead of %d\n", error); - trace("hostname size is %d\n", size); + ok(ret == 0, "Expected 0, got %d\n", ret); + ok(error == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", error); + + /* size is not set in win2k */ + size = MAX_COMP_NAME; name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = pGetComputerNameExA(ComputerNameDnsHostname, name, &size); @@ -409,8 +420,11 @@ static void test_GetComputerNameExA(void) size = 0; ret = pGetComputerNameExA(ComputerNameNetBIOS, (LPSTR)0xdeadbeef, &size); error = GetLastError(); - ok(!ret && error == ERROR_MORE_DATA, "GetComputerNameExA should have failed with ERROR_MORE_DATA instead of %d\n", error); - trace("NetBIOS size is %d\n", size); + ok(ret == 0, "Expected 0, got %d\n", ret); + ok(error == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", error); + + /* size is not set in win2k */ + size = MAX_COMP_NAME; name = HeapAlloc(GetProcessHeap(), 0, size * sizeof(name[0])); ok(name != NULL, "HeapAlloc failed with error %d\n", GetLastError()); ret = pGetComputerNameExA(ComputerNameNetBIOS, name, &size);

1 0

Alexandre Julliard : comdlg32: CDM_GETSPEC and CDM_GETFILEPATH should preserve double quotes in file lists .
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 24fc87286f656a8cbcdf2f4b40d31d55e6eaf622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24fc87286f656a8cbcdf2f4b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 16 18:05:25 2008 +0200 comdlg32: CDM_GETSPEC and CDM_GETFILEPATH should preserve double quotes in file lists. --- dlls/comdlg32/filedlg.c | 108 ++++++++++++++--------------------------------- 1 files changed, 32 insertions(+), 76 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 3e662ec..f64fca7 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -196,7 +196,7 @@ static void FILEDLG95_SHELL_Clean(HWND hwnd); static BOOL FILEDLG95_SHELL_BrowseToDesktop(HWND hwnd); /* Functions used by the EDIT box */ -static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed, char separator); +static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed); /* Functions used by the filetype combo box */ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd); @@ -858,11 +858,10 @@ LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode) return hook_result; } -static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID buffer) +static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID result) { - UINT sizeUsed = 0, n, total; - LPWSTR lpstrFileList = NULL; - WCHAR lpstrCurrentDir[MAX_PATH]; + UINT len, total; + WCHAR *p, *buffer; FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); TRACE("CDM_GETFILEPATH:\n"); @@ -871,79 +870,29 @@ static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID buffer return -1; /* get path and filenames */ - COMDLG32_GetDisplayNameOf(fodInfos->ShellInfos.pidlAbsCurrent, lpstrCurrentDir); - n = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed, ' '); - - TRACE("path >%s< filespec >%s< %d files\n", - debugstr_w(lpstrCurrentDir),debugstr_w(lpstrFileList),n); - - if( fodInfos->unicode ) - { - LPWSTR bufW = buffer; - total = lstrlenW(lpstrCurrentDir) + 1 + sizeUsed; - - /* Prepend the current path */ - n = lstrlenW(lpstrCurrentDir) + 1; - memcpy( bufW, lpstrCurrentDir, min(n,size) * sizeof(WCHAR)); - if(n<size) - { - /* 'n' includes trailing \0 */ - bufW[n-1] = '\\'; - lstrcpynW( &bufW[n], lpstrFileList, size - n ); - } - TRACE("returned -> %s\n",debugstr_wn(bufW, total)); - } - else + len = SendMessageW( fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0 ); + buffer = HeapAlloc( GetProcessHeap(), 0, (len + 2 + MAX_PATH) * sizeof(WCHAR) ); + COMDLG32_GetDisplayNameOf( fodInfos->ShellInfos.pidlAbsCurrent, buffer ); + if (len) { - LPSTR bufA = buffer; - total = WideCharToMultiByte(CP_ACP, 0, lpstrCurrentDir, -1, - NULL, 0, NULL, NULL); - total += WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed, - NULL, 0, NULL, NULL); - - /* Prepend the current path */ - n = WideCharToMultiByte(CP_ACP, 0, lpstrCurrentDir, -1, - bufA, size, NULL, NULL); - - if(n<size) - { - /* 'n' includes trailing \0 */ - bufA[n-1] = '\\'; - WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed, - &bufA[n], size-n, NULL, NULL); - } - - TRACE("returned -> %s\n",debugstr_an(bufA, total)); + p = buffer + strlenW(buffer); + *p++ = '\\'; + SendMessageW( fodInfos->DlgInfos.hwndFileName, WM_GETTEXT, len + 1, (LPARAM)p ); } - MemFree(lpstrFileList); - - return total; -} - -static INT_PTR FILEDLG95_Handle_GetFileSpec(HWND hwnd, DWORD size, LPVOID buffer) -{ - UINT sizeUsed = 0; - LPWSTR lpstrFileList = NULL; - FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); - - TRACE("CDM_GETSPEC:\n"); - - FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed, ' '); - if( fodInfos->unicode ) + if (fodInfos->unicode) { - lstrcpynW( buffer, lpstrFileList, size ); + total = strlenW( buffer) + 1; + if (result) lstrcpynW( result, buffer, size ); + TRACE( "CDM_GETFILEPATH: returning %u %s\n", total, debugstr_w(result)); } else { - LPSTR bufA = buffer; - DWORD sizeA = WideCharToMultiByte( CP_ACP, 0, lpstrFileList, sizeUsed, NULL, 0, NULL, NULL); - WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed, bufA, size, NULL, NULL); - if (size && size < sizeA) bufA[size - 1] = 0; - sizeUsed = sizeA; + total = WideCharToMultiByte( CP_ACP, 0, buffer, -1, NULL, 0, NULL, NULL ); + if (total <= size) WideCharToMultiByte( CP_ACP, 0, buffer, -1, result, size, NULL, NULL ); + TRACE( "CDM_GETFILEPATH: returning %u %s\n", total, debugstr_a(result)); } - MemFree(lpstrFileList); - - return sizeUsed; + HeapFree( GetProcessHeap(), 0, buffer ); + return total; } /*********************************************************************** @@ -980,7 +929,15 @@ static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM break; case CDM_GETSPEC: - retval = FILEDLG95_Handle_GetFileSpec(hwnd, (UINT)wParam, (LPSTR)lParam); + TRACE("CDM_GETSPEC:\n"); + retval = SendMessageW(fodInfos->DlgInfos.hwndFileName, WM_GETTEXTLENGTH, 0, 0) + 1; + if (lParam) + { + if (fodInfos->unicode) + SendMessageW(fodInfos->DlgInfos.hwndFileName, WM_GETTEXT, wParam, lParam); + else + SendMessageA(fodInfos->DlgInfos.hwndFileName, WM_GETTEXT, wParam, lParam); + } break; case CDM_SETCONTROLTEXT: @@ -1797,7 +1754,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) TRACE("hwnd=%p\n", hwnd); /* get the files from the edit control */ - nFileCount = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed, '\0'); + nFileCount = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed); /* try if the user selected a folder in the shellview */ if(nFileCount == 0) @@ -3204,7 +3161,7 @@ static HRESULT COMDLG32_StrRetToStrNW (LPWSTR dest, DWORD len, LPSTRRET src, LPI * The delimiter is specified by the parameter 'separator', * usually either a space or a nul */ -static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed, char separator) +static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed) { FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); UINT nStrCharCount = 0; /* index in src buffer */ @@ -3238,7 +3195,7 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U (*lpstrFileList)[nFileIndex++] = lpstrEdit[nStrCharCount]; nStrCharCount++; } - (*lpstrFileList)[nFileIndex++] = separator; + (*lpstrFileList)[nFileIndex++] = 0; nFileCount++; } nStrCharCount++; @@ -3253,7 +3210,6 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U } /* trailing \0 */ - if (nFileIndex && separator) nFileIndex--; /* remove trailing separator */ (*lpstrFileList)[nFileIndex++] = '\0'; *sizeUsed = nFileIndex;

1 0

ByeongSik Jeon : winex11: Add VK_HANGUL, VK_HANJA for Korean Native IME.
by Alexandre Julliard 17 Apr '08

17 Apr '08

Module: wine Branch: master Commit: 917164720403c39835076d3a3f90136c997f434a URL: http://source.winehq.org/git/wine.git/?a=commit;h=917164720403c39835076d3a3… Author: ByeongSik Jeon <bsjeon(a)hanmail.net> Date: Wed Apr 16 15:55:46 2008 +0900 winex11: Add VK_HANGUL, VK_HANJA for Korean Native IME. --- dlls/winex11.drv/keyboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 6aa613f..5d48ce7 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -968,7 +968,7 @@ static const WORD nonchar_key_vkey[256] = /* unused */ 0, 0, 0, 0, 0, 0, 0, 0, /* FF20 */ 0, 0, 0, 0, 0, 0, 0, 0, /* FF28 */ - 0, 0, 0, 0, 0, 0, 0, 0, /* FF30 */ + 0, VK_HANGUL, 0, 0, VK_HANJA, 0, 0, 0, /* FF30 */ 0, 0, 0, 0, 0, 0, 0, 0, /* FF38 */ 0, 0, 0, 0, 0, 0, 0, 0, /* FF40 */ 0, 0, 0, 0, 0, 0, 0, 0, /* FF48 */

1 0

Maarten Lankhorst : quartz: Add a Disconnect function to the parser and use it to clean up allocated memory in avisplitter .
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 6165d87fc5d1a2147deba22e802ed41885e48635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6165d87fc5d1a2147deba22e8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 15 20:39:36 2008 -0700 quartz: Add a Disconnect function to the parser and use it to clean up allocated memory in avisplitter. --- dlls/quartz/avisplit.c | 141 +++++++++++++++++++++++++++++----------------- dlls/quartz/mpegsplit.c | 8 ++- dlls/quartz/parser.c | 10 ++- dlls/quartz/parser.h | 5 +- dlls/quartz/waveparser.c | 8 ++- 5 files changed, 114 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6165d87fc5d1a2147deba…

1 0

Kusanagi Kouichi : winex11.drv: Fix Solaris build error.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 75e40229d2f7b00139923e7648038f3481164ced URL: http://source.winehq.org/git/wine.git/?a=commit;h=75e40229d2f7b00139923e764… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Wed Apr 16 00:34:54 2008 +0900 winex11.drv: Fix Solaris build error. Solaris doesn't define XICCallback. --- configure | 109 ++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 6 +++ dlls/winex11.drv/xim.c | 20 +++++---- include/config.h.in | 3 + 4 files changed, 129 insertions(+), 9 deletions(-) diff --git a/configure b/configure index b66a40a..01fdf19 100755 --- a/configure +++ b/configure @@ -10686,6 +10686,115 @@ esac fi + { echo "$as_me:$LINENO: checking for XICCallback.callback" >&5 +echo $ECHO_N "checking for XICCallback.callback... $ECHO_C" >&6; } +if test "${ac_cv_member_XICCallback_callback+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef HAVE_X11_XLIB_H +#include <X11/Xlib.h> +#endif + +int +main () +{ +static XICCallback ac_aggr; +if (ac_aggr.callback) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_XICCallback_callback=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef HAVE_X11_XLIB_H +#include <X11/Xlib.h> +#endif + +int +main () +{ +static XICCallback ac_aggr; +if (sizeof ac_aggr.callback) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_member_XICCallback_callback=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_member_XICCallback_callback=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_member_XICCallback_callback" >&5 +echo "${ECHO_T}$ac_cv_member_XICCallback_callback" >&6; } +if test $ac_cv_member_XICCallback_callback = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_XICCALLBACK_CALLBACK 1 +_ACEOF + + +fi + + opengl_msg="" if test "x$with_opengl" != "xno" diff --git a/configure.ac b/configure.ac index e9dadee..b5c4bf2 100644 --- a/configure.ac +++ b/configure.ac @@ -698,6 +698,12 @@ then WINE_NOTICE_WITH(xcomposite,[test "x$ac_cv_lib_soname_Xcomposite" = "x"], [libxcomposite development files not found, Xcomposite won't be supported.]) + dnl *** Check for XICCallback struct + AC_CHECK_MEMBERS([XICCallback.callback],,, +[#ifdef HAVE_X11_XLIB_H +#include <X11/Xlib.h> +#endif]) + dnl *** End of X11/Xlib.h check dnl Check for the presence of OpenGL diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index d4df9f7..e8bf3bb 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -35,6 +35,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +#ifndef HAVE_XICCALLBACK_CALLBACK +#define XICCallback XIMCallback +#define XICProc XIMProc +#endif + BOOL ximInComposeMode=FALSE; /* moved here from imm32 for dll separation */ @@ -501,11 +506,8 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) XVaNestedList preedit = NULL; XVaNestedList status = NULL; XIC xic; - XICCallback destroy = {(XPointer)data, X11DRV_DestroyIC}; - XIMCallback P_StartCB; - XIMCallback P_DoneCB; - XIMCallback P_DrawCB; - XIMCallback P_CaretCB; + XICCallback destroy = {(XPointer)data, (XICProc)X11DRV_DestroyIC}; + XICCallback P_StartCB, P_DoneCB, P_DrawCB, P_CaretCB; LANGID langid = PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())); Window win = data->whole_window; @@ -531,13 +533,13 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) /* create callbacks */ P_StartCB.client_data = NULL; - P_StartCB.callback = (XIMProc)XIMPreEditStartCallback; P_DoneCB.client_data = NULL; - P_DoneCB.callback = (XIMProc)XIMPreEditDoneCallback; P_DrawCB.client_data = NULL; - P_DrawCB.callback = (XIMProc)XIMPreEditDrawCallback; P_CaretCB.client_data = NULL; - P_CaretCB.callback = (XIMProc)XIMPreEditCaretCallback; + P_StartCB.callback = (XICProc)XIMPreEditStartCallback; + P_DoneCB.callback = (XICProc)XIMPreEditDoneCallback; + P_DrawCB.callback = (XICProc)XIMPreEditDrawCallback; + P_CaretCB.callback = (XICProc)XIMPreEditCaretCallback; if ((ximStyle & (XIMPreeditNothing | XIMPreeditNone)) == 0) { diff --git a/include/config.h.in b/include/config.h.in index ac464db..f867662 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -945,6 +945,9 @@ /* Define to 1 if you have the <X11/Xutil.h> header file. */ #undef HAVE_X11_XUTIL_H +/* Define to 1 if `callback' is member of `XICCallback'. */ +#undef HAVE_XICCALLBACK_CALLBACK + /* Define if you have the XKB extension */ #undef HAVE_XKB

1 0

Maarten Lankhorst : quartz: Dump opendml indexes and header.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 64be38a5b20b5fe64d52e4c2464434e6b5a313d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64be38a5b20b5fe64d52e4c24… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 11 14:02:26 2008 -0700 quartz: Dump opendml indexes and header. --- dlls/quartz/avisplit.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 135 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index ee002ce..ce44f95 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -3,6 +3,7 @@ * * Copyright 2003 Robert Shearman * Copyright 2004-2005 Christian Costa + * Copyright 2008 Maarten Lankhorst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -340,6 +341,60 @@ static HRESULT AVISplitter_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) return S_FALSE; } +static HRESULT AVISplitter_ProcessIndex(AVISplitterImpl *This, LONGLONG qwOffset, DWORD cb) +{ + AVISTDINDEX *pIndex; + int x; + long rest; + + if (cb < sizeof(AVISTDINDEX)) + { + FIXME("size %u too small\n", cb); + return E_INVALIDARG; + } + + pIndex = CoTaskMemAlloc(cb); + if (!pIndex) + return E_OUTOFMEMORY; + + IAsyncReader_SyncRead(((PullPin *)This->Parser.ppPins[0])->pReader, qwOffset, cb, (BYTE *)pIndex); + pIndex = CoTaskMemRealloc(pIndex, pIndex->cb); + if (!pIndex) + return E_OUTOFMEMORY; + + IAsyncReader_SyncRead(((PullPin *)This->Parser.ppPins[0])->pReader, qwOffset, pIndex->cb, (BYTE *)pIndex); + rest = pIndex->cb - sizeof(AVISUPERINDEX) + sizeof(RIFFCHUNK) + sizeof(pIndex->aIndex[0]) * ANYSIZE_ARRAY; + + TRACE("wLongsPerEntry: %hd\n", pIndex->wLongsPerEntry); + TRACE("bIndexSubType: %hd\n", pIndex->bIndexSubType); + TRACE("bIndexType: %hd\n", pIndex->bIndexType); + TRACE("nEntriesInUse: %u\n", pIndex->nEntriesInUse); + TRACE("dwChunkId: %.4s\n", (char *)&pIndex->dwChunkId); + TRACE("qwBaseOffset: %x%08x\n", (DWORD)(pIndex->qwBaseOffset >> 32), (DWORD)pIndex->qwBaseOffset); + TRACE("dwReserved_3: %u\n", pIndex->dwReserved_3); + + if (pIndex->bIndexType != AVI_INDEX_OF_CHUNKS + || pIndex->wLongsPerEntry != 2 + || rest < (pIndex->nEntriesInUse * sizeof(DWORD) * pIndex->wLongsPerEntry) + || (pIndex->bIndexSubType != AVI_INDEX_SUB_DEFAULT)) + { + FIXME("Invalid index chunk encountered\n"); + return E_INVALIDARG; + } + + for (x = 0; x < pIndex->nEntriesInUse; ++x) + { + BOOL keyframe = !(pIndex->aIndex[x].dwOffset >> 31); + DWORDLONG offset = pIndex->qwBaseOffset + (pIndex->aIndex[x].dwOffset & ~(1<<31)); + TRACE("dwOffset: %x%08x\n", (DWORD)(offset >> 32), (DWORD)offset); + TRACE("dwSize: %u\n", pIndex->aIndex[x].dwSize); + TRACE("Frame is a keyframe: %s\n", keyframe ? "yes" : "no"); + } + + CoTaskMemFree(pIndex); + return S_OK; +} + static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE * pData, DWORD cb) { PIN_INFO piOutput; @@ -388,6 +443,7 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE amt.formattype = FORMAT_WaveFormatEx; break; default: + FIXME("fccType %.4s not handled yet\n", (char *)&pStrHdr->fccType); amt.formattype = FORMAT_None; } amt.majortype = MEDIATYPE_Video; @@ -456,6 +512,48 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE case ckidAVIPADDING: TRACE("JUNK chunk ignored\n"); break; + case ckidAVISUPERINDEX: + { + const AVISUPERINDEX *pIndex = (const AVISUPERINDEX *)pChunk; + int x; + long rest = pIndex->cb - sizeof(AVISUPERINDEX) + sizeof(RIFFCHUNK) + sizeof(pIndex->aIndex[0]) * ANYSIZE_ARRAY; + + if (pIndex->cb < sizeof(AVISUPERINDEX) - sizeof(RIFFCHUNK)) + { + FIXME("%u < %u?!\n", pIndex->cb, sizeof(AVISUPERINDEX) - sizeof(RIFFCHUNK)); + break; + } + + TRACE("wLongsPerEntry: %hd\n", pIndex->wLongsPerEntry); + TRACE("bIndexSubType: %hd\n", pIndex->bIndexSubType); + TRACE("bIndexType: %hd\n", pIndex->bIndexType); + TRACE("nEntriesInUse: %u\n", pIndex->nEntriesInUse); + TRACE("dwChunkId: %.4s\n", (char *)&pIndex->dwChunkId); + if (pIndex->dwReserved[0]) + TRACE("dwReserved[0]: %u\n", pIndex->dwReserved[0]); + if (pIndex->dwReserved[2]) + TRACE("dwReserved[1]: %u\n", pIndex->dwReserved[1]); + if (pIndex->dwReserved[2]) + TRACE("dwReserved[2]: %u\n", pIndex->dwReserved[2]); + + if (pIndex->bIndexType != AVI_INDEX_OF_INDEXES + || pIndex->wLongsPerEntry != 4 + || rest < (pIndex->nEntriesInUse * sizeof(DWORD) * pIndex->wLongsPerEntry) + || (pIndex->bIndexSubType != AVI_INDEX_SUB_2FIELD && pIndex->bIndexSubType != AVI_INDEX_SUB_DEFAULT)) + { + FIXME("Invalid index chunk encountered\n"); + break; + } + for (x = 0; x < pIndex->nEntriesInUse; ++x) + { + TRACE("qwOffset: %x%08x\n", (DWORD)(pIndex->aIndex[x].qwOffset >> 32), (DWORD)pIndex->aIndex[x].qwOffset); + TRACE("dwSize: %u\n", pIndex->aIndex[x].dwSize); + AVISplitter_ProcessIndex(This, pIndex->aIndex[x].qwOffset, pIndex->aIndex[x].dwSize); + + TRACE("dwDuration: %u (unreliable)\n", pIndex->aIndex[x].dwDuration); + } + break; + } default: FIXME("unknown chunk type \"%.04s\" ignored\n", (LPCSTR)&pChunk->fcc); } @@ -482,6 +580,42 @@ static HRESULT AVISplitter_ProcessStreamList(AVISplitterImpl * This, const BYTE return hr; } +static HRESULT AVISplitter_ProcessODML(AVISplitterImpl * This, const BYTE * pData, DWORD cb) +{ + const RIFFCHUNK * pChunk; + + for (pChunk = (const RIFFCHUNK *)pData; + ((const BYTE *)pChunk >= pData) && ((const BYTE *)pChunk + sizeof(RIFFCHUNK) < pData + cb) && (pChunk->cb > 0); + pChunk = (const RIFFCHUNK *)((const BYTE*)pChunk + sizeof(RIFFCHUNK) + pChunk->cb) + ) + { + switch (pChunk->fcc) + { + case ckidAVIEXTHEADER: + { + int x; + const AVIEXTHEADER * pExtHdr = (const AVIEXTHEADER *)pChunk; + + TRACE("processing extension header\n"); + if (pExtHdr->cb != sizeof(AVIEXTHEADER) - sizeof(RIFFCHUNK)) + { + FIXME("Size: %u, other size: %u\n", pExtHdr->cb, sizeof(AVIEXTHEADER) - sizeof(RIFFCHUNK)); + break; + } + TRACE("dwGrandFrames: %u\n", pExtHdr->dwGrandFrames); + for (x = 0; x < 61; ++x) + if (pExtHdr->dwFuture[x]) + FIXME("dwFuture[%i] = %u (0x%08x)\n", x, pExtHdr->dwFuture[x], pExtHdr->dwFuture[x]); + break; + } + default: + FIXME("unknown chunk type \"%.04s\" ignored\n", (LPCSTR)&pChunk->fcc); + } + } + + return S_OK; +} + /* FIXME: fix leaks on failure here */ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) { @@ -542,7 +676,7 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) hr = AVISplitter_ProcessStreamList(pAviSplit, (BYTE *)pCurrentChunk + sizeof(RIFFLIST), pCurrentChunk->cb + sizeof(RIFFCHUNK) - sizeof(RIFFLIST)); break; case ckidODML: - FIXME("process ODML header\n"); + hr = AVISplitter_ProcessODML(pAviSplit, (BYTE *)pCurrentChunk + sizeof(RIFFLIST), pCurrentChunk->cb + sizeof(RIFFCHUNK) - sizeof(RIFFLIST)); break; } break;

1 0

Maarten Lankhorst : quartz: Make the avi splitter skip index headers.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: f66ad4dbe0433b6679d61f6a147b2cb5e3712fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=f66ad4dbe0433b6679d61f6a1… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 11 16:40:56 2008 -0700 quartz: Make the avi splitter skip index headers. --- dlls/quartz/avisplit.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index ce44f95..7a7baff 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -138,6 +138,7 @@ static HRESULT AVISplitter_Sample(LPVOID iface, IMediaSample * pSample) WORD streamId; Parser_OutputPin * pOutputPin; BOOL bSyncPoint = TRUE; + BYTE *fcc = (BYTE *)&This->CurrentChunk.fcc; if (This->CurrentChunkOffset >= tStart) offset_src = (long)BYTES_FROM_MEDIATIME(This->CurrentChunkOffset - tStart) + sizeof(RIFFCHUNK); @@ -196,6 +197,13 @@ static HRESULT AVISplitter_Sample(LPVOID iface, IMediaSample * pSample) #endif } + if (fcc[0] == 'i' && fcc[1] == 'x') + { + if (S_FALSE == AVISplitter_NextChunk(&This->CurrentChunkOffset, &This->CurrentChunk, &tStart, &tStop, pbSrcStream, FALSE)) + bMoreData = FALSE; + continue; + } + streamId = StreamFromFOURCC(This->CurrentChunk.fcc); if (streamId > This->Parser.cStreams)

1 0

Maarten Lankhorst : quartz: Parse old style avi index.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: aa623d2eff75e03d6269bbb3c75bd296210c6181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa623d2eff75e03d6269bbb3c… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Apr 11 17:58:47 2008 -0700 quartz: Parse old style avi index. --- dlls/quartz/avisplit.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 84 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 7a7baff..0d15c75 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -147,8 +147,9 @@ static HRESULT AVISplitter_Sample(LPVOID iface, IMediaSample * pSample) switch (This->CurrentChunk.fcc) { + case ckidAVIOLDINDEX: /* Should not be popping up here! */ + ERR("There should be no index in the stream data!\n"); case ckidAVIPADDING: - case ckidAVIOLDINDEX: /* Index is not handled */ /* silently ignore */ if (S_FALSE == AVISplitter_NextChunk(&This->CurrentChunkOffset, &This->CurrentChunk, &tStart, &tStop, pbSrcStream, FALSE)) bMoreData = FALSE; @@ -633,6 +634,8 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) LONGLONG pos = 0; /* in bytes */ BYTE * pBuffer; RIFFCHUNK * pCurrentChunk; + LONGLONG total, avail; + AVISplitterImpl * pAviSplit = (AVISplitterImpl *)This->pin.pinInfo.pFilter; hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); @@ -709,6 +712,7 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) while (list.fcc == ckidAVIPADDING || (list.fcc == FOURCC_LIST && list.fccListType == ckidINFO)) { pos += sizeof(RIFFCHUNK) + list.cb; + hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); } @@ -723,13 +727,90 @@ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) return E_FAIL; } + IAsyncReader_Length(This->pReader, &total, &avail); + + /* FIXME: AVIX files are added ("eXtended") beyond the "AVI " length, and thus won't be played here */ if (hr == S_OK) { - pAviSplit->CurrentChunkOffset = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFLIST)); - pAviSplit->EndOfFile = MEDIATIME_FROM_BYTES(pos + list.cb + sizeof(RIFFLIST)); + This->rtStart = pAviSplit->CurrentChunkOffset = MEDIATIME_FROM_BYTES(pos + sizeof(RIFFLIST)); + pos += list.cb + sizeof(RIFFCHUNK); + + pAviSplit->EndOfFile = This->rtStop = MEDIATIME_FROM_BYTES(pos); + if (pos > total) + { + ERR("File smaller (%x%08x) then EndOfFile (%x%08x)\n", (DWORD)(total >> 32), (DWORD)total, (DWORD)(pAviSplit->EndOfFile >> 32), (DWORD)pAviSplit->EndOfFile); + return E_FAIL; + } + hr = IAsyncReader_SyncRead(This->pReader, BYTES_FROM_MEDIATIME(pAviSplit->CurrentChunkOffset), sizeof(pAviSplit->CurrentChunk), (BYTE *)&pAviSplit->CurrentChunk); } + /* Now peek into the idx1 index, if available */ + if (hr == S_OK && (total - pos) > sizeof(RIFFCHUNK)) + { + memset(&list, 0, sizeof(list)); + + hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(list), (BYTE *)&list); + if (list.fcc == ckidAVIOLDINDEX) + { + int x = 0; + AVIOLDINDEX * pAviOldIndex = CoTaskMemAlloc(list.cb + sizeof(RIFFCHUNK)); + if (!pAviOldIndex) + return E_OUTOFMEMORY; + hr = IAsyncReader_SyncRead(This->pReader, pos, sizeof(RIFFCHUNK) + list.cb, (BYTE *)pAviOldIndex); + if (hr == S_OK) + { + for (x = 0; x < list.cb / sizeof(pAviOldIndex->aIndex[0]); ++x) + { + DWORD temp, temp2, offset, chunkid; + ULONGLONG mov_pos = BYTES_FROM_MEDIATIME(pAviSplit->CurrentChunkOffset) - sizeof(DWORD); + BOOL relative; + + offset = pAviOldIndex->aIndex[x].dwOffset; + chunkid = pAviOldIndex->aIndex[x].dwChunkId; + + IAsyncReader_SyncRead(This->pReader, offset, sizeof(DWORD), (BYTE *)&temp); + relative = (chunkid != temp); + + if (chunkid == mmioFOURCC('7','F','x','x') + && ((char *)&temp)[0] == 'i' && ((char *)&temp)[1] == 'x') + relative = FALSE; + + if (relative) + { + if (offset + mov_pos < BYTES_FROM_MEDIATIME(pAviSplit->EndOfFile)) + hr = IAsyncReader_SyncRead(This->pReader, offset + mov_pos, sizeof(DWORD), (BYTE *)&temp2); + else hr = S_FALSE; + + if (hr == S_OK && chunkid == mmioFOURCC('7','F','x','x') + && ((char *)&temp2)[0] == 'i' && ((char *)&temp2)[1] == 'x') + { + /* Do nothing, all is great */ + } + else if (hr == S_OK && temp2 != chunkid) + { + ERR("Faulty index or bug in handling: Wanted FOURCC: %s, Absolute FOURCC: %s (@ %u), Relative FOURCC: %s (@ %lld)\n", + debugstr_an((char *)&chunkid, 4), debugstr_an((char *)&temp, 4), offset, debugstr_an((char *)&temp2, 4), mov_pos + offset); + } + else if (hr != S_OK) + { + TRACE("hr: %08x\n", hr); + } + } + + TRACE("Scanned dwChunkId: %s\n", debugstr_an((char *)&temp, 4)); + TRACE("dwChunkId: %.4s\n", (char *)&chunkid); + TRACE("dwFlags: %08x\n", pAviOldIndex->aIndex[x].dwFlags); + TRACE("dwOffset (%s): %08x\n", relative ? "relative" : "absolute", offset); + TRACE("dwSize: %08x\n", pAviOldIndex->aIndex[x].dwSize); + } + } + + CoTaskMemFree(pAviOldIndex); + } + hr = S_OK; + } + if (hr != S_OK) return E_FAIL;

1 0

Michael Stefaniuc : fonts: Add the Romanian glyphs SsTt with "comma below" to the tahoma font.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: adc78836b1239dbb8747b6f63bdab1f5eeaf53a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc78836b1239dbb8747b6f63… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 16 00:47:05 2008 +0200 fonts: Add the Romanian glyphs SsTt with "comma below" to the tahoma font. --- fonts/tahoma.sfd | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++---- fonts/tahoma.ttf | Bin 84400 -> 85116 bytes 2 files changed, 124 insertions(+), 10 deletions(-) diff --git a/fonts/tahoma.sfd b/fonts/tahoma.sfd index c62946f..27eb125 100644 --- a/fonts/tahoma.sfd +++ b/fonts/tahoma.sfd @@ -12,13 +12,13 @@ UnderlinePosition: -170 UnderlineWidth: 130 Ascent: 1638 Descent: 410 -XUID: [1021 135 1692684408 1110817] +XUID: [1021 135 1692684408 1110822] FSType: 0 OS2Version: 2 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1169210120 -ModificationTime: 1206566066 +ModificationTime: 1208293008 PfmFamily: 33 TTFWeight: 400 TTFWidth: 5 @@ -94,7 +94,7 @@ NameList: Adobe Glyph List DisplaySize: 16 AntiAlias: 1 FitToEm: 1 -WinInfo: 0 28 11 +WinInfo: 336 28 11 BeginPrivate: 10 BlueValues 27 [-30 0 1120 1177 1522 1522] OtherBlues 11 [-426 -426] @@ -108,7 +108,7 @@ SnapStemV 9 [184 203] ExpansionFactor 4 0.06 EndPrivate TeXData: 1 0 0 327680 163840 109226 571904 -1048576 109226 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144 -BeginChars: 65537 425 +BeginChars: 65537 430 StartChar: .notdef Encoding: 0 0 0 Width: 2048 @@ -9179,8 +9179,62 @@ Fore 936 1671 l 1 EndSplineSet EndChar +StartChar: uni0326 +Encoding: 806 806 425 +Width: 1118 +Flags: W +HStem: -411 276<447 524> +VStem: 361 308 +Fore +361 -411 m 1 + 447 -135 l 1 + 669 -135 l 1 + 524 -411 l 5 + 361 -411 l 1 +EndSplineSet +EndChar +StartChar: Scommaaccent +Encoding: 536 536 426 +Width: 1141 +Flags: W +HStem: -411 276<447 524> -17 164<338.667 837.867> 1369 163<435.993 753.733> +VStem: 89 206<1023.33 1289.2> 361 308 886 211<181.933 591> +Fore +Refer: 425 806 S 1 0 0 1 0 0 2 +Refer: 52 83 N 1 0 0 1 0 0 2 +EndChar +StartChar: uni021A +Encoding: 538 538 427 +Width: 1196 +Flags: W +HStem: -410 276<482 559> 0 21<498 701> 1318 171<3 498 701 1198> +VStem: 396 308 498 203<0 1318> +Fore +Refer: 425 806 S 1 0 0 1 35 1 2 +Refer: 53 84 N 1 0 0 1 0 0 2 +EndChar +StartChar: scommaaccent +Encoding: 537 537 428 +Width: 913 +Flags: W +HStem: -410 276<373 450> -41 154<298.856 587.533> 981 154<342.2 643.267> +VStem: 76 178<740.8 952.933> 287 308 696 189<143.6 347.133> +Fore +Refer: 425 806 S 1 0 0 1 -74 1 2 +Refer: 84 115 N 1 0 0 1 0 0 2 +EndChar +StartChar: uni021B +Encoding: 539 539 429 +Width: 684 +Flags: W +HStem: -410 276<303 380> 0 154<426 719> 977 143<20 155 340 719> +VStem: 155 185<274.336 977 1120 1438> 217 308 +Fore +Refer: 425 806 S 1 0 0 1 -144 1 2 +Refer: 85 116 N 1 0 0 1 0 0 2 +EndChar EndChars -BitmapFont: 9 425 7 2 1 +BitmapFont: 9 430 7 2 1 BDFChar: 0 0 9 1 7 0 6 rdo`RJqEt% BDFChar: 1 32 3 0 0 0 0 @@ -10031,8 +10085,18 @@ BDFChar: 423 371 5 0 4 -2 4 OH>QcE"Eid BDFChar: 424 175 5 0 3 7 7 n,NFg +BDFChar: 425 806 5 3 3 -1 -1 +J,fQL +BDFChar: 426 536 5 0 4 -2 6 +G^t<`#RKo"+92BA +BDFChar: 427 538 5 0 4 -2 6 +p`L\%+<Vd,+92BA +BDFChar: 428 537 4 0 2 -2 4 +@":Kb^]6V" +BDFChar: 429 539 3 0 1 -2 5 +JA?\cJ3X*b EndBitmapFont -BitmapFont: 11 425 9 2 1 FontForge +BitmapFont: 11 430 9 2 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--11-80-96-96-P-62-ISO10646-1" FONTBOUNDINGBOX 1 "15 11 0 -2" @@ -10918,8 +10982,18 @@ BDFChar: 423 371 6 0 4 -2 5 LkpkCLj0IJ BDFChar: 424 175 6 0 5 9 9 qu?]s +BDFChar: 425 806 6 2 3 -2 -1 +5_&h7 +BDFChar: 426 536 6 0 4 -3 7 +G^t<`#RC_*!$FN, +BDFChar: 427 538 6 0 4 -3 7 +p`L\%+<VdL!$FN, +BDFChar: 428 537 5 0 3 -3 5 +E.G_X&E!O25QCca +BDFChar: 429 539 4 0 2 -3 7 +J:QR.J:N/X!'l&7 EndBitmapFont -BitmapFont: 12 425 10 2 1 FontForge +BitmapFont: 12 430 10 2 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--12-90-96-96-P-70-ISO10646-1" FONTBOUNDINGBOX 1 "16 12 0 -2" @@ -11601,8 +11675,18 @@ BDFChar: 423 371 7 0 5 -2 6 KS5#3KT(!Y$ig8- BDFChar: 424 175 7 0 6 9 9 rVuou +BDFChar: 425 806 7 2 3 -2 -1 +5_&h7 +BDFChar: 426 536 7 0 5 -3 8 +G_CTtGQ\/&GQ89t +BDFChar: 427 538 7 0 6 -3 8 +rX]VP&.fBa&-*7a +BDFChar: 428 537 5 0 3 -3 6 +E.EIH&.mb"+@#o, +BDFChar: 429 539 4 0 3 -3 8 +5X=g(5X7S"0E<4\ EndBitmapFont -BitmapFont: 13 425 10 3 1 FontForge +BitmapFont: 13 430 10 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--13-100-96-96-P-73-ISO10646-1" FONTBOUNDINGBOX 1 "15 13 0 -3" @@ -12284,8 +12368,18 @@ BDFChar: 423 371 7 0 5 -2 6 KS5#3KT(!Y$ig8- BDFChar: 424 175 7 0 6 10 10 rVuou +BDFChar: 425 806 7 2 3 -2 -1 +5_&h7 +BDFChar: 426 536 7 0 6 -3 8 +I"Hm!HiaA$HiO^3 +BDFChar: 427 538 8 0 6 -3 8 +rX]VP&.fBa&-*7a +BDFChar: 428 537 6 0 4 -3 6 +E/9$`#`*F"+CG0L +BDFChar: 429 539 4 0 3 -3 8 +5X=g(5X7S"0E<4\ EndBitmapFont -BitmapFont: 15 425 12 3 1 FontForge +BitmapFont: 15 430 12 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--15-110-96-96-P-85-ISO10646-1" FONTBOUNDINGBOX 1 "19 15 0 -3" @@ -12967,8 +13061,18 @@ BDFChar: 423 371 8 0 6 -2 7 JqAT+JqA`'"9ni+ BDFChar: 424 175 8 0 7 12 12 rr<$! +BDFChar: 425 806 8 2 4 -3 -2 +@))aB +BDFChar: 426 536 8 0 6 -3 10 +4(a)4RK5WAlJ!ebdu#T*OA +BDFChar: 427 538 9 0 8 -3 10 +s*t(a)T#QP,1#QP,1#QP,1#QP,1#QOi)#QP\A +BDFChar: 428 537 7 0 5 -3 7 +G_CTT(^,M:!"^ga +BDFChar: 429 539 5 0 4 -3 9 +5X>*05X7S"5WA`T0E;(Q EndBitmapFont -BitmapFont: 16 425 13 3 1 FontForge +BitmapFont: 16 430 13 3 1 FontForge BDFStartProperties: 36 FONT 1 "-FontForge-Tahoma-Normal-R-Normal--16-120-96-96-P-93-ISO10646-1" FONTBOUNDINGBOX 1 "21 16 0 -3" @@ -13650,5 +13754,15 @@ BDFChar: 423 371 9 0 7 -3 8 JUrB'JUrA>4TY`g BDFChar: 424 175 9 0 8 13 14 !!*%L +BDFChar: 425 806 9 2 4 -4 -2 +?pK5B +BDFChar: 426 536 9 0 7 -3 11 +5!a^LJ8bu!!<Ie"!!jDA +BDFChar: 427 538 9 0 8 -3 11 +s*t(a)T#QP,1#QP,1#QP,1#QP,1#QP,1!!!9)(]XO9 +BDFChar: 428 537 7 0 5 -3 8 +G_CTtGQ\/&GQ8:/ +BDFChar: 429 539 5 0 4 -3 11 +5X7U05X7S"5X7Ro!"^ga EndBitmapFont EndSplineFont diff --git a/fonts/tahoma.ttf b/fonts/tahoma.ttf index e54313c..08ce349 100644 Binary files a/fonts/tahoma.ttf and b/fonts/tahoma.ttf differ

1 0

Tomasz Jezierski : hhctrl.ocx: Apparently it is possible to have chm file without #STRINGS in it, so we should not stop processing file at it.
by Alexandre Julliard 16 Apr '08

16 Apr '08

Module: wine Branch: master Commit: 7a5e3d3c04c77cc9e3c8e7daca8ba096f47fee4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a5e3d3c04c77cc9e3c8e7dac… Author: Tomasz Jezierski <developers(a)tefnet.pl> Date: Mon Apr 14 23:07:59 2008 +0200 hhctrl.ocx: Apparently it is possible to have chm file without #STRINGS in it, so we should not stop processing file at it. --- dlls/hhctrl.ocx/chm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index ece05f0..f02866f 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -229,7 +229,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) info->WinType.cbStruct=sizeof(info->WinType); info->WinType.fUniCodeStrings=TRUE; info->WinType.pszType=strdupW(defaultwinW); - info->WinType.pszToc = strdupW(info->pCHMInfo->defToc); + info->WinType.pszToc = strdupW(info->pCHMInfo->defToc ? info->pCHMInfo->defToc : null); info->WinType.pszIndex = strdupW(null); info->WinType.fsValidMembers=0; info->WinType.fsWinProperties=HHWIN_PROP_TRI_PANE; @@ -391,7 +391,7 @@ CHMInfo *OpenCHM(LPCWSTR szFile) &ret->strings_stream); if(FAILED(hres)) { WARN("Could not open #STRINGS stream: %08x\n", hres); - return CloseCHM(ret); + /* It's not critical, so we pass */ } if(!ReadChmSystem(ret)) {

1 0