wine-commits February 2009

wine-commits@winehq.org

2 participants
965 discussions

Paul Vriens : kernel32/tests: Fix some test failures on Win9x and WinME.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: a8c24d343ce82b7c108d5e17fb143fc57297e404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c24d343ce82b7c108d5e17f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Jan 31 15:23:33 2009 +0100 kernel32/tests: Fix some test failures on Win9x and WinME. --- dlls/kernel32/tests/profile.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 7424fce..24342da 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -377,8 +377,11 @@ static void test_profile_existing(void) ok(INVALID_HANDLE_VALUE != h, "%d: CreateFile failed\n",i); SetLastError(0xdeadbeef); ret = GetPrivateProfileStringA(SECTION, KEY, NULL, buffer, MAX_PATH, testfile2); + /* Win9x and WinME returns 0 for all cases except the first one */ if (!pe[i].read_error) - ok( ret, "%d: GetPrivateProfileString failed with error %u\n", i, GetLastError() ); + ok( ret || + broken(!ret && GetLastError() == 0xdeadbeef), /* Win9x, WinME */ + "%d: GetPrivateProfileString failed with error %u\n", i, GetLastError() ); else ok( !ret, "%d: GetPrivateProfileString succeeded\n", i ); CloseHandle(h);

1 0

Paul Vriens : kernel32/tests: Fix some tests on Win9x and WinME ( GetPrivateProfileSection).
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 2bac661c2fc0dc2bbdc9a39fb60f2c7bb872de89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bac661c2fc0dc2bbdc9a39fb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Jan 31 15:03:13 2009 +0100 kernel32/tests: Fix some tests on Win9x and WinME (GetPrivateProfileSection). --- dlls/kernel32/tests/profile.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index c7cf3ef..7424fce 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -174,13 +174,17 @@ static void test_profile_sections(void) SetLastError(0xdeadbeef); ret = GetPrivateProfileSectionA( NULL, buf, sizeof(buf), testfile4 ); ok( ret == 0, "expected return size 0, got %d\n", ret ); - ok( GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok( GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), /* Win9x, WinME */ + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = GetPrivateProfileSectionA( "section1", buf, sizeof(buf), NULL ); ok( ret == 0, "expected return size 0, got %d\n", ret ); todo_wine - ok( GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); + ok( GetLastError() == ERROR_FILE_NOT_FOUND || + broken(GetLastError() == 0xdeadbeef), /* Win9x, WinME */ + "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); /* And a real one */ SetLastError(0xdeadbeef); @@ -190,7 +194,9 @@ static void test_profile_sections(void) ok( ret == 35 && !strcmp( buf, "name1=val1,name2=,name3,name4=val4"), "wrong section returned(%d): %s\n", ret, buf); ok( buf[ret-1] == 0 && buf[ret] == 0, "returned buffer not terminated with double-null\n" ); - ok( GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", GetLastError()); + ok( GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == 0xdeadbeef), /* Win9x, WinME */ + "expected ERROR_SUCCESS, got %d\n", GetLastError()); DeleteFileA( testfile4 ); }

1 0

Paul Vriens : kernel32/tests: Fill the buffer and check for double-NULL to show a bug in Wine.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: b7b59236cf6608b869d06b5b128ec18a9fbc590e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b59236cf6608b869d06b5b1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Jan 31 14:50:02 2009 +0100 kernel32/tests: Fill the buffer and check for double-NULL to show a bug in Wine. --- dlls/kernel32/tests/profile.c | 43 +++++++++++++++++++++++++++++++++++----- 1 files changed, 37 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7b59236cf6608b869d06…

1 0

Andrew Talbot : wintrust: Declare a functions static.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 8bfc62cf8b8ceb7a76f3f00755eaa3e634b557ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bfc62cf8b8ceb7a76f3f0075… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 31 13:02:39 2009 +0000 wintrust: Declare a functions static. --- dlls/wintrust/asn.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index e9d3a7f..e776cba 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -969,7 +969,7 @@ static BOOL CRYPT_AsnEncodeInteger(DWORD dwCertEncodingType, return ret; } -BOOL WINAPI CRYPT_AsnEncodeInt(DWORD dwCertEncodingType, +static BOOL WINAPI CRYPT_AsnEncodeInt(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded) {

1 0

Andrew Talbot : winmm: Declare some functions static.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 84666d84a56860dcd6a7a63ab7f77b6b84bfee27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84666d84a56860dcd6a7a63ab… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 31 13:02:34 2009 +0000 winmm: Declare some functions static. --- dlls/winmm/mci.c | 80 ++++++++++++++++++++++++++------------------------- dlls/winmm/winemm.h | 5 --- 2 files changed, 41 insertions(+), 44 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index b0d90e7..dfb0ba7 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -85,6 +85,8 @@ static const WCHAR wszSystemIni[] = {'s','y','s','t','e','m','.','i','n','i',0}; static WINE_MCIDRIVER *MciDrivers; +static UINT WINAPI MCI_DefYieldProc(MCIDEVICEID wDevID, DWORD data); + /* dup a string and uppercase it */ static inline LPWSTR str_dup_upper( LPCWSTR str ) { @@ -117,7 +119,7 @@ LPWINE_MCIDRIVER MCI_GetDriver(UINT16 wDevID) /************************************************************************** * MCI_GetDriverFromString [internal] */ -UINT MCI_GetDriverFromString(LPCWSTR lpstrName) +static UINT MCI_GetDriverFromString(LPCWSTR lpstrName) { LPWINE_MCIDRIVER wmd; UINT ret = 0; @@ -931,6 +933,41 @@ errCleanUp: } /************************************************************************** + * MCI_SendCommandFrom32 [internal] + */ +static DWORD MCI_SendCommandFrom32(MCIDEVICEID wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +{ + DWORD dwRet = MCIERR_INVALID_DEVICE_ID; + LPWINE_MCIDRIVER wmd = MCI_GetDriver(wDevID); + + if (wmd) { + if (wmd->bIs32) { + dwRet = SendDriverMessage(wmd->hDriver, wMsg, dwParam1, dwParam2); + } else if (pFnMciMapMsg32WTo16) { + WINMM_MapType res; + + switch (res = pFnMciMapMsg32WTo16(wmd->wType, wMsg, dwParam1, &dwParam2)) { + case WINMM_MAP_MSGERROR: + TRACE("Not handled yet (%s)\n", MCI_MessageToString(wMsg)); + dwRet = MCIERR_DRIVER_INTERNAL; + break; + case WINMM_MAP_NOMEM: + TRACE("Problem mapping msg=%s from 32a to 16\n", MCI_MessageToString(wMsg)); + dwRet = MCIERR_OUT_OF_MEMORY; + break; + case WINMM_MAP_OK: + case WINMM_MAP_OKMEM: + dwRet = SendDriverMessage(wmd->hDriver, wMsg, dwParam1, dwParam2); + if (res == WINMM_MAP_OKMEM) + pFnMciUnMapMsg32WTo16(wmd->wType, wMsg, dwParam1, dwParam2); + break; + } + } + } + return dwRet; +} + +/************************************************************************** * MCI_FinishOpen [internal] */ static DWORD MCI_FinishOpen(LPWINE_MCIDRIVER wmd, LPMCI_OPEN_PARMSW lpParms, @@ -1551,44 +1588,9 @@ BOOL WINAPI mciFreeCommandResource(UINT uTable) } /************************************************************************** - * MCI_SendCommandFrom32 [internal] - */ -DWORD MCI_SendCommandFrom32(MCIDEVICEID wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) -{ - DWORD dwRet = MCIERR_INVALID_DEVICE_ID; - LPWINE_MCIDRIVER wmd = MCI_GetDriver(wDevID); - - if (wmd) { - if (wmd->bIs32) { - dwRet = SendDriverMessage(wmd->hDriver, wMsg, dwParam1, dwParam2); - } else if (pFnMciMapMsg32WTo16) { - WINMM_MapType res; - - switch (res = pFnMciMapMsg32WTo16(wmd->wType, wMsg, dwParam1, &dwParam2)) { - case WINMM_MAP_MSGERROR: - TRACE("Not handled yet (%s)\n", MCI_MessageToString(wMsg)); - dwRet = MCIERR_DRIVER_INTERNAL; - break; - case WINMM_MAP_NOMEM: - TRACE("Problem mapping msg=%s from 32a to 16\n", MCI_MessageToString(wMsg)); - dwRet = MCIERR_OUT_OF_MEMORY; - break; - case WINMM_MAP_OK: - case WINMM_MAP_OKMEM: - dwRet = SendDriverMessage(wmd->hDriver, wMsg, dwParam1, dwParam2); - if (res == WINMM_MAP_OKMEM) - pFnMciUnMapMsg32WTo16(wmd->wType, wMsg, dwParam1, dwParam2); - break; - } - } - } - return dwRet; -} - -/************************************************************************** * MCI_SendCommandFrom16 [internal] */ -DWORD MCI_SendCommandFrom16(MCIDEVICEID wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +static DWORD MCI_SendCommandFrom16(MCIDEVICEID wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { DWORD dwRet = MCIERR_INVALID_DEVICE_ID; LPWINE_MCIDRIVER wmd = MCI_GetDriver(wDevID); @@ -1805,7 +1807,7 @@ static DWORD MCI_Close(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms /************************************************************************** * MCI_WriteString [internal] */ -DWORD MCI_WriteString(LPWSTR lpDstStr, DWORD dstSize, LPCWSTR lpSrcStr) +static DWORD MCI_WriteString(LPWSTR lpDstStr, DWORD dstSize, LPCWSTR lpSrcStr) { DWORD ret = 0; @@ -2301,7 +2303,7 @@ static void MyUserYield(void) /************************************************************************** * MCI_DefYieldProc [internal] */ -UINT WINAPI MCI_DefYieldProc(MCIDEVICEID wDevID, DWORD data) +static UINT WINAPI MCI_DefYieldProc(MCIDEVICEID wDevID, DWORD data) { INT16 ret; diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index dcd2290..3ddff08 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -202,14 +202,9 @@ void MMDRV_InstallMap(unsigned int, MMDRV_MAPFUNC, MMDRV_UNMAPFUNC, MMDRV_MAPFUNC, MMDRV_UNMAPFUNC, LPDRVCALLBACK); WINE_MCIDRIVER* MCI_GetDriver(UINT16 uDevID); -UINT MCI_GetDriverFromString(LPCWSTR str); -DWORD MCI_WriteString(LPWSTR lpDstStr, DWORD dstSize, LPCWSTR lpSrcStr); const char* MCI_MessageToString(UINT wMsg); -UINT WINAPI MCI_DefYieldProc(MCIDEVICEID wDevID, DWORD data); LRESULT MCI_CleanUp(LRESULT dwRet, UINT wMsg, DWORD dwParam2); DWORD MCI_SendCommand(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2, BOOL bFrom32); -DWORD MCI_SendCommandFrom32(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); -DWORD MCI_SendCommandFrom16(UINT wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2); UINT MCI_SetCommandTable(void *table, UINT uDevType); BOOL MCI_DeleteCommandTable(UINT uTbl, BOOL delete); LPWSTR MCI_strdupAtoW(LPCSTR str);

1 0

Andrew Talbot : wininet: Declare some functions static.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: f815b68a30843b431502c328e044e1811ec2c5b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f815b68a30843b431502c328e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 31 13:02:20 2009 +0000 wininet: Declare some functions static. --- dlls/wininet/http.c | 5 +++-- dlls/wininet/internet.h | 3 --- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 5bf3388..7d4f8a6 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -125,8 +125,9 @@ static BOOL HTTP_HandleRedirect(LPWININETHTTPREQW lpwhr, LPCWSTR lpszUrl); static UINT HTTP_DecodeBase64(LPCWSTR base64, LPSTR bin); static BOOL HTTP_VerifyValidHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field); static void HTTP_DrainContent(WININETHTTPREQW *req); +static BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr); -LPHTTPHEADERW HTTP_GetHeader(LPWININETHTTPREQW req, LPCWSTR head) +static LPHTTPHEADERW HTTP_GetHeader(LPWININETHTTPREQW req, LPCWSTR head) { int HeaderIndex = 0; HeaderIndex = HTTP_GetCustomHeaderIndex(req, head, 0, TRUE); @@ -4206,7 +4207,7 @@ static BOOL HTTP_ProcessHeader(LPWININETHTTPREQW lpwhr, LPCWSTR field, LPCWSTR v * Called when all content from server has been read by client. * */ -BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr) +static BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr) { WCHAR szVersion[10]; WCHAR szConnectionResponse[20]; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index dc57214..fad69bd 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -379,7 +379,6 @@ INTERNETAPI HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, LPCWSTR lpszVerb, LPCWSTR lpszObjectName, LPCWSTR lpszVersion, LPCWSTR lpszReferrer , LPCWSTR *lpszAcceptTypes, DWORD dwFlags, DWORD_PTR dwContext); -BOOL HTTP_FinishedReading(LPWININETHTTPREQW lpwhr); VOID SendAsyncCallback(LPWININETHANDLEHEADER hdr, DWORD_PTR dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInfo, @@ -389,8 +388,6 @@ VOID INTERNET_SendCallback(LPWININETHANDLEHEADER hdr, DWORD_PTR dwContext, DWORD dwInternetStatus, LPVOID lpvStatusInfo, DWORD dwStatusInfoLength); -LPHTTPHEADERW HTTP_GetHeader(LPWININETHTTPREQW lpwhr, LPCWSTR header); - BOOL NETCON_connected(WININET_NETCONNECTION *connection); BOOL NETCON_init(WININET_NETCONNECTION *connnection, BOOL useSSL); BOOL NETCON_create(WININET_NETCONNECTION *connection, int domain,

1 0

Lei Zhang : oleaut32/tests: Add a VarFormat test for date and time.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: ae28430ff80b547c9a34edee2b99dda96b4ba098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae28430ff80b547c9a34edee2… Author: Lei Zhang <thestig(a)google.com> Date: Fri Jan 30 20:05:15 2009 -0800 oleaut32/tests: Add a VarFormat test for date and time. --- dlls/oleaut32/tests/varformat.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/varformat.c b/dlls/oleaut32/tests/varformat.c index b8de8e2..738c306 100644 --- a/dlls/oleaut32/tests/varformat.c +++ b/dlls/oleaut32/tests/varformat.c @@ -230,6 +230,7 @@ static const FMTDATERES VarFormat_date_results[] = static void test_VarFormat(void) { static const WCHAR szTesting[] = { 't','e','s','t','i','n','g','\0' }; + static const WCHAR szNum[] = { '3','9','6','9','7','.','1','1','\0' }; size_t i; WCHAR buffW[256]; char buff[256]; @@ -315,6 +316,10 @@ static void test_VarFormat(void) VARFMT(VT_BSTR,V_BSTR,bstrin,"<&&",S_OK,"testing"); VARFMT(VT_BSTR,V_BSTR,bstrin,"<&>&",S_OK,"testing"); SysFreeString(bstrin); + bstrin = SysAllocString(szNum); + todo_wine VARFMT(VT_BSTR,V_BSTR,bstrin,"hh:mm",S_OK,"02:38"); + todo_wine VARFMT(VT_BSTR,V_BSTR,bstrin,"mm-dd-yy",S_OK,"09-06-08"); + SysFreeString(bstrin); /* Numeric values are converted to strings then output */ VARFMT(VT_I1,V_I1,1,"<&>&",S_OK,"1");

1 0

Hans Leidekker : mlang: Export a couple of functions by ordinal.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 29c0f7e714acb180a963c082a23f87a4e1f2d579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c0f7e714acb180a963c082a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 30 17:10:32 2009 +0100 mlang: Export a couple of functions by ordinal. --- dlls/mlang/mlang.spec | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/mlang/mlang.spec b/dlls/mlang/mlang.spec index 1e8f022..dc9630a 100644 --- a/dlls/mlang/mlang.spec +++ b/dlls/mlang/mlang.spec @@ -1,14 +1,15 @@ -@ stdcall ConvertINetMultiByteToUnicode(ptr long ptr ptr ptr ptr) -@ stub ConvertINetReset -@ stdcall ConvertINetString(ptr long long ptr ptr ptr ptr) -@ stdcall ConvertINetUnicodeToMultiByte(ptr long ptr ptr ptr ptr) +110 stdcall IsConvertINetStringAvailable(long long) +111 stdcall ConvertINetString(ptr long long ptr ptr ptr ptr) +112 stdcall ConvertINetUnicodeToMultiByte(ptr long ptr ptr ptr ptr) +113 stdcall ConvertINetMultiByteToUnicode(ptr long ptr ptr ptr ptr) +114 stub ConvertINetReset +120 stdcall LcidToRfc1766A(long ptr long) +121 stdcall LcidToRfc1766W(long ptr long) +122 stdcall Rfc1766ToLcidA(ptr str) +123 stdcall Rfc1766ToLcidW(ptr wstr) + @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stdcall GetGlobalFontLinkObject() -@ stdcall IsConvertINetStringAvailable(long long) -@ stdcall LcidToRfc1766A(long ptr long) -@ stdcall LcidToRfc1766W(long ptr long) -@ stdcall Rfc1766ToLcidA(ptr str) -@ stdcall Rfc1766ToLcidW(ptr wstr)

1 0

Hans Leidekker : mlang: Implement IMLangFontLink2_GetScriptFontInfo.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: 34a3d21354fdc3d1c2cbcec0c39a92bfb44a979d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34a3d21354fdc3d1c2cbcec0c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 30 17:09:41 2009 +0100 mlang: Implement IMLangFontLink2_GetScriptFontInfo. --- dlls/mlang/mlang.c | 46 ++++++++++++++++++++++++++++++++++++------- dlls/mlang/tests/mlang.c | 48 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 85 insertions(+), 9 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index e002046..424011d 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -450,10 +450,11 @@ static const struct mlang_data const MIME_CP_INFO *mime_cp_info; const char *fixed_font; const char *proportional_font; + SCRIPT_ID sid; } mlang_data[] = { { "Arabic",1256,sizeof(arabic_cp)/sizeof(arabic_cp[0]),arabic_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidArabic }, /* FIXME */ { "Baltic",1257,sizeof(baltic_cp)/sizeof(baltic_cp[0]),baltic_cp, "Courier","Arial" }, /* FIXME */ { "Chinese Simplified",936,sizeof(chinese_simplified_cp)/sizeof(chinese_simplified_cp[0]),chinese_simplified_cp, @@ -463,23 +464,23 @@ static const struct mlang_data { "Central European",1250,sizeof(central_european_cp)/sizeof(central_european_cp[0]),central_european_cp, "Courier","Arial" }, /* FIXME */ { "Cyrillic",1251,sizeof(cyrillic_cp)/sizeof(cyrillic_cp[0]),cyrillic_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidCyrillic }, /* FIXME */ { "Greek",1253,sizeof(greek_cp)/sizeof(greek_cp[0]),greek_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidGreek }, /* FIXME */ { "Hebrew",1255,sizeof(hebrew_cp)/sizeof(hebrew_cp[0]),hebrew_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidHebrew }, /* FIXME */ { "Japanese",932,sizeof(japanese_cp)/sizeof(japanese_cp[0]),japanese_cp, "MS Gothic","MS PGothic" }, { "Korean",949,sizeof(korean_cp)/sizeof(korean_cp[0]),korean_cp, "Courier","Arial" }, /* FIXME */ { "Thai",874,sizeof(thai_cp)/sizeof(thai_cp[0]),thai_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidThai }, /* FIXME */ { "Turkish",1254,sizeof(turkish_cp)/sizeof(turkish_cp[0]),turkish_cp, "Courier","Arial" }, /* FIXME */ { "Vietnamese",1258,sizeof(vietnamese_cp)/sizeof(vietnamese_cp[0]),vietnamese_cp, "Courier","Arial" }, /* FIXME */ { "Western European",1252,sizeof(western_cp)/sizeof(western_cp[0]),western_cp, - "Courier","Arial" }, /* FIXME */ + "Courier","Arial", sidLatin }, /* FIXME */ { "Unicode",CP_UNICODE,sizeof(unicode_cp)/sizeof(unicode_cp[0]),unicode_cp, "Courier","Arial" } /* FIXME */ }; @@ -3177,8 +3178,37 @@ static HRESULT WINAPI fnIMLangFontLink2_GetScriptFontInfo(IMLangFontLink2* This, SCRIPT_ID sid, DWORD dwFlags, UINT *puiFonts, SCRIPTFONTINFO *pScriptFont) { - FIXME("(%p)->%i %i %p %p\n",This, sid, dwFlags, puiFonts, pScriptFont); - return E_NOTIMPL; + UINT i, j; + + TRACE("(%p)->%u %x %p %p\n", This, sid, dwFlags, puiFonts, pScriptFont); + + if (!dwFlags) dwFlags = SCRIPTCONTF_PROPORTIONAL_FONT; + + for (i = 0, j = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) + { + if (sid == mlang_data[i].sid) + { + if (pScriptFont) + { + if (j >= *puiFonts) break; + + pScriptFont[j].scripts = 1 << mlang_data[i].sid; + if (dwFlags == SCRIPTCONTF_FIXED_FONT) + { + MultiByteToWideChar(CP_ACP, 0, mlang_data[i].fixed_font, -1, + pScriptFont[j].wszFont, MAX_MIMEFACE_NAME); + } + else if (dwFlags == SCRIPTCONTF_PROPORTIONAL_FONT) + { + MultiByteToWideChar(CP_ACP, 0, mlang_data[i].proportional_font, -1, + pScriptFont[j].wszFont, MAX_MIMEFACE_NAME); + } + } + j++; + } + } + *puiFonts = j; + return S_OK; } static HRESULT WINAPI fnIMLangFontLink2_CodePageToScriptID(IMLangFontLink2* This, diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 1506963..ae5060a 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -1369,10 +1369,49 @@ static void test_JapaneseConversion(void) ok(memcmp(outputW,&unc_jp[i][1],destsz)==0,"(%i) Strings do not match\n",i); } +static void test_GetScriptFontInfo(IMLangFontLink2 *font_link) +{ + HRESULT hr; + UINT nfonts; + SCRIPTFONTINFO sfi[1]; + + nfonts = 0; + hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidLatin, 0, &nfonts, NULL); + ok(hr == S_OK, "GetScriptFontInfo failed %u\n", GetLastError()); + ok(nfonts, "unexpected result\n"); + + nfonts = 0; + hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidLatin, SCRIPTCONTF_FIXED_FONT, &nfonts, NULL); + ok(hr == S_OK, "GetScriptFontInfo failed %u\n", GetLastError()); + ok(nfonts, "unexpected result\n"); + + nfonts = 0; + hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidLatin, SCRIPTCONTF_PROPORTIONAL_FONT, &nfonts, NULL); + ok(hr == S_OK, "GetScriptFontInfo failed %u\n", GetLastError()); + ok(nfonts, "unexpected result\n"); + + nfonts = 1; + memset(sfi, 0, sizeof(sfi)); + hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidLatin, SCRIPTCONTF_FIXED_FONT, &nfonts, sfi); + ok(hr == S_OK, "GetScriptFontInfo failed %u\n", GetLastError()); + ok(nfonts == 1, "got %u, expected 1\n", nfonts); + ok(sfi[0].scripts, "unexpected result\n"); + ok(sfi[0].wszFont[0], "unexpected result\n"); + + nfonts = 1; + memset(sfi, 0, sizeof(sfi)); + hr = IMLangFontLink2_GetScriptFontInfo(font_link, sidLatin, SCRIPTCONTF_PROPORTIONAL_FONT, &nfonts, sfi); + ok(hr == S_OK, "GetScriptFontInfo failed %u\n", GetLastError()); + ok(nfonts == 1, "got %u, expected 1\n", nfonts); + ok(sfi[0].scripts, "unexpected result\n"); + ok(sfi[0].wszFont[0], "unexpected result\n"); +} + START_TEST(mlang) { IMultiLanguage2 *iML2 = NULL; IMLangFontLink *iMLFL = NULL; + IMLangFontLink2 *iMLFL2 = NULL; HRESULT ret; if (!init_function_ptrs()) @@ -1415,10 +1454,17 @@ START_TEST(mlang) ret = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, &IID_IMLangFontLink, (void **)&iMLFL); - if (ret != S_OK || !iML2) return; + if (ret != S_OK || !iMLFL) return; IMLangFontLink_Test(iMLFL); IMLangFontLink_Release(iMLFL); + ret = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, + &IID_IMLangFontLink2, (void **)&iMLFL2); + if (ret != S_OK || !iMLFL2) return; + + test_GetScriptFontInfo(iMLFL2); + IMLangFontLink2_Release(iMLFL2); + CoUninitialize(); }

1 0

Juan Lang : mapi32: Fix many test failures on Win9x.
by Alexandre Julliard 02 Feb '09

02 Feb '09

Module: wine Branch: master Commit: f5c0f3c3c26ffbb6b48335ec1b7c36427895cea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c0f3c3c26ffbb6b48335ec1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Jan 30 08:14:00 2009 -0800 mapi32: Fix many test failures on Win9x. --- dlls/mapi32/tests/prop.c | 46 +++++++++++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 19 deletions(-) diff --git a/dlls/mapi32/tests/prop.c b/dlls/mapi32/tests/prop.c index 0e979d1..92198a9 100644 --- a/dlls/mapi32/tests/prop.c +++ b/dlls/mapi32/tests/prop.c @@ -239,7 +239,8 @@ static void test_UlPropSize(void) } res = pUlPropSize(&pv); - ok(res == exp, "pt= %d: Expected %d, got %d\n", pt, exp, res); + ok(res == exp || broken(!res) /* Win9x */, + "pt= %d: Expected %d, got %d\n", pt, exp, res); } } @@ -280,30 +281,30 @@ static void test_FPropContainsProp(void) pvRight.Value.lpszA = szFull; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING); - ok(bRet == TRUE, "(full,full)[] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,full)[] match failed\n"); pvRight.Value.lpszA = szPrefix; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING); ok(bRet == FALSE, "(full,prefix)[] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); ok(bRet == TRUE, "(full,prefix)[PREFIX] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING); - ok(bRet == TRUE, "(full,prefix)[SUBSTRING] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,prefix)[SUBSTRING] match failed\n"); pvRight.Value.lpszA = szPrefixLower; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); ok(bRet == FALSE, "(full,prefixlow)[PREFIX] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING); ok(bRet == FALSE, "(full,prefixlow)[SUBSTRING] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX|FL_IGNORECASE); - ok(bRet == TRUE, "(full,prefixlow)[PREFIX|IGNORECASE] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,prefixlow)[PREFIX|IGNORECASE] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING|FL_IGNORECASE); - ok(bRet == TRUE, "(full,prefixlow)[SUBSTRING|IGNORECASE] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,prefixlow)[SUBSTRING|IGNORECASE] match failed\n"); pvRight.Value.lpszA = szSubstring; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING); ok(bRet == FALSE, "(full,substr)[] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); ok(bRet == FALSE, "(full,substr)[PREFIX] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING); - ok(bRet == TRUE, "(full,substr)[SUBSTRING] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,substr)[SUBSTRING] match failed\n"); pvRight.Value.lpszA = szSubstringLower; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); ok(bRet == FALSE, "(full,substrlow)[PREFIX] match failed\n"); @@ -312,10 +313,10 @@ static void test_FPropContainsProp(void) bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX|FL_IGNORECASE); ok(bRet == FALSE, "(full,substrlow)[PREFIX|IGNORECASE] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING|FL_IGNORECASE); - ok(bRet == TRUE, "(full,substrlow)[SUBSTRING|IGNORECASE] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,substrlow)[SUBSTRING|IGNORECASE] match failed\n"); pvRight.Value.lpszA = szFullLower; bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING|FL_IGNORECASE); - ok(bRet == TRUE, "(full,fulllow)[IGNORECASE] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "(full,fulllow)[IGNORECASE] match failed\n"); pvLeft.ulPropTag = pvRight.ulPropTag = PT_BINARY; pvLeft.Value.bin.lpb = (LPBYTE)szFull; @@ -323,15 +324,15 @@ static void test_FPropContainsProp(void) pvLeft.Value.bin.cb = pvRight.Value.bin.cb = strlen(szFull); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING); - ok(bRet == TRUE, "bin(full,full)[] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "bin(full,full)[] match failed\n"); pvRight.Value.bin.lpb = (LPBYTE)szPrefix; pvRight.Value.bin.cb = strlen(szPrefix); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_FULLSTRING); ok(bRet == FALSE, "bin(full,prefix)[] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); - ok(bRet == TRUE, "bin(full,prefix)[PREFIX] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "bin(full,prefix)[PREFIX] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING); - ok(bRet == TRUE, "bin(full,prefix)[SUBSTRING] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "bin(full,prefix)[SUBSTRING] match failed\n"); pvRight.Value.bin.lpb = (LPBYTE)szPrefixLower; pvRight.Value.bin.cb = strlen(szPrefixLower); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); @@ -349,7 +350,7 @@ static void test_FPropContainsProp(void) bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); ok(bRet == FALSE, "bin(full,substr)[PREFIX] match failed\n"); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_SUBSTRING); - ok(bRet == TRUE, "bin(full,substr)[SUBSTRING] match failed\n"); + ok(bRet == TRUE || broken(!bRet) /* Win9x */, "bin(full,substr)[SUBSTRING] match failed\n"); pvRight.Value.bin.lpb = (LPBYTE)szSubstringLower; pvRight.Value.bin.cb = strlen(szSubstringLower); bRet = pFPropContainsProp(&pvLeft, &pvRight, FL_PREFIX); @@ -502,7 +503,8 @@ static void test_FPropCompareProp(void) } bRet = pFPropCompareProp(&pvLeft, FPCProp_Results[j].relOp, &pvRight); - ok(bRet == bExp, "pt %d (%d,%d,%s): expected %d, got %d\n", ptTypes[i], + ok(bRet == bExp || broken(!bRet) /* Win9x */, + "pt %d (%d,%d,%s): expected %d, got %d\n", ptTypes[i], FPCProp_Results[j].lVal, FPCProp_Results[j].rVal, relops[FPCProp_Results[j].relOp], bExp, bRet); } @@ -646,7 +648,8 @@ static void test_PpropFindProp(void) pvProp.ulPropTag = ptTypes[i]; pRet = pPpropFindProp(&pvProp, 1u, ptTypes[i]); - ok(pRet == &pvProp, "PpropFindProp[%d]: Didn't find existing propery\n", + ok(pRet == &pvProp || broken(pRet != &pvProp) /* Win9x */, + "PpropFindProp[%d]: Didn't find existing propery\n", ptTypes[i]); pRet = pPpropFindProp(&pvProp, 1u, i ? ptTypes[i-1] : ptTypes[i+1]); @@ -882,7 +885,8 @@ static void test_LpValFindProp(void) pvProp.ulPropTag = PROP_TAG(ptTypes[i], 1u); pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 1u), 1u, &pvProp); - ok(pRet == &pvProp, "LpValFindProp[%d]: Didn't find existing propery id/type\n", + ok(pRet == &pvProp || broken(pRet != &pvProp) /* Win9x */, + "LpValFindProp[%d]: Didn't find existing propery id/type\n", ptTypes[i]); pRet = pLpValFindProp(PROP_TAG(ptTypes[i], 0u), 1u, &pvProp); @@ -894,7 +898,8 @@ static void test_LpValFindProp(void) ptTypes[i]); pRet = pLpValFindProp(PROP_TAG(PT_NULL, 1u), 1u, &pvProp); - ok(pRet == &pvProp, "LpValFindProp[%d]: Didn't find existing propery id\n", + ok(pRet == &pvProp || broken(pRet != &pvProp) /* Win9x */, + "LpValFindProp[%d]: Didn't find existing propery id\n", ptTypes[i]); } } @@ -990,7 +995,8 @@ static void test_FBadPropTag(void) if (bBad) ok(res != 0, "pt= %d: Expected non-zero, got 0\n", pt); else - ok(res == 0, "pt= %d: Expected zero, got %d\n", pt, res); + ok(res == 0 || broken(res) /* Win9x */, + "pt= %d: Expected zero, got %d\n", pt, res); } } @@ -1079,7 +1085,8 @@ static void test_FBadProp(void) if (bBad) ok(res != 0, "pt= %d: Expected non-zero, got 0\n", pt); else - ok(res == 0, "pt= %d: Expected zero, got %d\n", pt, res); + ok(res == 0 || broken(res) /* Win9x */, + "pt= %d: Expected zero, got %d\n", pt, res); } } @@ -1130,7 +1137,8 @@ static void test_FBadColumnSet(void) if (bBad) ok(res != 0, "pt= %d: Expected non-zero, got 0\n", pt); else - ok(res == 0, "pt= %d: Expected zero, got %d\n", pt, res); + ok(res == 0 || broken(res) /* Win9x */, + "pt= %d: Expected zero, got %d\n", pt, res); } }

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 February 2009