April 2006 - Wine-Commits - list.winehq.org

Juan Lang : crypt32: Add support for the CERT_KEY_PROV_INFO_PROP_ID certificate property.
by Alexandre Julliard April 6, 2006

April 6, 2006

Module: wine Branch: refs/heads/master Commit: 309b26801e50c25f0c3d1742170a32aa62c3fed0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=309b26801e50c25f0c3d174… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Wed Apr 5 15:35:02 2006 -0700 crypt32: Add support for the CERT_KEY_PROV_INFO_PROP_ID certificate property. --- dlls/crypt32/store.c | 159 +++++++++++++++++++++++++++++++++++++++++--------- include/wincrypt.h | 35 +++++++++++ 2 files changed, 165 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=309b26801e50c25f0c3…

1 0

Detlef Riekenberg : winspool: Implement EnumMonitorsA on top of EnumMonitorsW.
by Alexandre Julliard April 6, 2006

April 6, 2006

Module: wine Branch: refs/heads/master Commit: 603f13e2a022779b39cda8681554e290a586391b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=603f13e2a022779b39cda86… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 31 14:32:02 2006 +0200 winspool: Implement EnumMonitorsA on top of EnumMonitorsW. --- dlls/winspool/info.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 119 insertions(+), 3 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index 2a4e82e..c6636ca 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -5136,10 +5136,126 @@ BOOL WINAPI EnumFormsW( HANDLE hPrinter, BOOL WINAPI EnumMonitorsA(LPSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) { - FIXME("%s,%ld,%p,%ld,%p,%p\n", debugstr_a(pName), Level, pMonitors, + BOOL res; + LPBYTE bufferW = NULL; + LPWSTR nameW = NULL; + DWORD needed = 0; + DWORD numentries = 0; + INT len; + + TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_a(pName), Level, pMonitors, cbBuf, pcbNeeded, pcReturned); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + + /* convert servername to unicode */ + if (pName) { + len = MultiByteToWideChar(CP_ACP, 0, pName, -1, NULL, 0); + nameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pName, -1, nameW, len); + } + /* alloc (userbuffersize*sizeof(WCHAR) and try to enum the monitors */ + needed = cbBuf * sizeof(WCHAR); + if (needed) bufferW = HeapAlloc(GetProcessHeap(), 0, needed); + res = EnumMonitorsW(nameW, Level, bufferW, needed, pcbNeeded, pcReturned); + + if(!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { + if (pcbNeeded) needed = *pcbNeeded; + /* HeapReAlloc return NULL, when bufferW was NULL */ + bufferW = (bufferW) ? HeapReAlloc(GetProcessHeap(), 0, bufferW, needed) : + HeapAlloc(GetProcessHeap(), 0, needed); + + /* Try again with the large Buffer */ + res = EnumMonitorsW(nameW, Level, bufferW, needed, pcbNeeded, pcReturned); + } + numentries = pcReturned ? *pcReturned : 0; + needed = 0; + /* + W2k require the buffersize from EnumMonitorsW also for EnumMonitorsA. + We use the smaller Ansi-Size to avoid conflicts with fixed Buffers of old Apps. + */ + if (res) { + /* EnumMonitorsW collected all Data. Parse them to caclulate ANSI-Size */ + DWORD entrysize = 0; + DWORD index; + LPSTR ptr; + LPMONITOR_INFO_2W mi2w; + LPMONITOR_INFO_2A mi2a; + + /* MONITOR_INFO_*W and MONITOR_INFO_*A have the same size */ + entrysize = (Level == 1) ? sizeof(MONITOR_INFO_1A) : sizeof(MONITOR_INFO_2A); + + /* First pass: calculate the size for all Entries */ + mi2w = (LPMONITOR_INFO_2W) bufferW; + mi2a = (LPMONITOR_INFO_2A) pMonitors; + index = 0; + while (index < numentries) { + index++; + needed += entrysize; /* MONITOR_INFO_?A */ + TRACE("%p: parsing #%ld (%s)\n", mi2w, index, debugstr_w(mi2w->pName)); + + needed += WideCharToMultiByte(CP_ACP, 0, mi2w->pName, -1, + NULL, 0, NULL, NULL); + if (Level > 1) { + needed += WideCharToMultiByte(CP_ACP, 0, mi2w->pEnvironment, -1, + NULL, 0, NULL, NULL); + needed += WideCharToMultiByte(CP_ACP, 0, mi2w->pDLLName, -1, + NULL, 0, NULL, NULL); + } + /* use LPBYTE with entrysize to avoid double code (MONITOR_INFO_1 + MONITOR_INFO_2) */ + mi2w = (LPMONITOR_INFO_2W) (((LPBYTE)mi2w) + entrysize); + mi2a = (LPMONITOR_INFO_2A) (((LPBYTE)mi2a) + entrysize); + } + + /* check for errors and quit on failure */ + if (cbBuf < needed) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + res = FALSE; + goto emA_cleanup; + } + len = entrysize * numentries; /* room for all MONITOR_INFO_?A */ + ptr = (LPSTR) &pMonitors[len]; /* room for strings */ + cbBuf -= len ; /* free Bytes in the user-Buffer */ + mi2w = (LPMONITOR_INFO_2W) bufferW; + mi2a = (LPMONITOR_INFO_2A) pMonitors; + index = 0; + /* Second Pass: Fill the User Buffer (if we have one) */ + while ((index < numentries) && pMonitors) { + index++; + TRACE("%p: writing MONITOR_INFO_%ldA #%ld\n", mi2a, Level, index); + mi2a->pName = ptr; + len = WideCharToMultiByte(CP_ACP, 0, mi2w->pName, -1, + ptr, cbBuf , NULL, NULL); + ptr += len; + cbBuf -= len; + if (Level > 1) { + mi2a->pEnvironment = ptr; + len = WideCharToMultiByte(CP_ACP, 0, mi2w->pEnvironment, -1, + ptr, cbBuf, NULL, NULL); + ptr += len; + cbBuf -= len; + + mi2a->pDLLName = ptr; + len = WideCharToMultiByte(CP_ACP, 0, mi2w->pDLLName, -1, + ptr, cbBuf, NULL, NULL); + ptr += len; + cbBuf -= len; + } + /* use LPBYTE with entrysize to avoid double code (MONITOR_INFO_1 + MONITOR_INFO_2) */ + mi2w = (LPMONITOR_INFO_2W) (((LPBYTE)mi2w) + entrysize); + mi2a = (LPMONITOR_INFO_2A) (((LPBYTE)mi2a) + entrysize); + } + } +emA_cleanup: + if (pcbNeeded) *pcbNeeded = needed; + if (pcReturned) *pcReturned = (res) ? numentries : 0; + + HeapFree(GetProcessHeap(), 0, nameW); + HeapFree(GetProcessHeap(), 0, bufferW); + + TRACE("returning %d with %ld (%ld byte for %ld entries)\n", + (res), GetLastError(), needed, numentries); + + return (res); + } /*****************************************************************************

1 0

Detlef Riekenberg : winspool: Implement EnumMonitorsW.
by Alexandre Julliard April 6, 2006

April 6, 2006

Module: wine Branch: refs/heads/master Commit: 4b008052686b1cbceb9db37c42a62c13f14bf035 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b008052686b1cbceb9db37… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Mar 31 14:30:10 2006 +0200 winspool: Implement EnumMonitorsW. --- dlls/winspool/info.c | 163 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 156 insertions(+), 7 deletions(-) diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index 83ae8f7..2a4e82e 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -126,6 +126,14 @@ static const WCHAR DriversW[] = { 'S','y 'E','n','v','i','r','o','n','m','e','n','t','s','\\', '%','s','\\','D','r','i','v','e','r','s','\\',0 }; +static const WCHAR MonitorsW[] = { 'S','y','s','t','e','m','\\', + 'C','u', 'r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'P','r','i','n','t','\\', + 'M','o','n','i','t','o','r','s',0}; + +static const WCHAR LocalPortW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; + static const WCHAR user_default_reg_key[] = { 'S','o','f','t','w','a','r','e','\\', 'M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s',' ','N','T','\\', @@ -672,6 +680,97 @@ void WINSPOOL_LoadSystemPrinters(void) } +/***************************************************************************** + * enumerate the local monitors (INTERNAL) + * + * returns the needed size (in bytes) for pMonitors + * and *lpreturned is set to number of entries returned in pMonitors + * + */ +static DWORD get_local_monitors(DWORD level, LPBYTE pMonitors, DWORD cbBuf, LPDWORD lpreturned) +{ + HKEY hroot = NULL; + HKEY hentry = NULL; + LPWSTR ptr; + LPMONITOR_INFO_2W mi; + WCHAR buffer[MAX_PATH]; + WCHAR dllname[MAX_PATH]; + DWORD dllsize; + DWORD len; + DWORD index = 0; + DWORD needed = 0; + DWORD numentries; + DWORD entrysize; + + entrysize = (level == 1) ? sizeof(MONITOR_INFO_1W) : sizeof(MONITOR_INFO_2W); + + numentries = *lpreturned; /* this is 0, when we scan the registry */ + len = entrysize * numentries; + ptr = (LPWSTR) &pMonitors[len]; + + numentries = 0; + len = sizeof(buffer); + buffer[0] = '\0'; + + /* Windows creates the "Monitors"-Key on reboot / start "spooler" */ + if (RegCreateKeyW(HKEY_LOCAL_MACHINE, MonitorsW, &hroot) == ERROR_SUCCESS) { + /* Scan all Monitor-Registry-Keys */ + while (RegEnumKeyExW(hroot, index, buffer, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { + TRACE("Monitor_%ld: %s\n", numentries, debugstr_w(buffer)); + dllsize = sizeof(dllname); + dllname[0] = '\0'; + + /* The Monitor must have a Driver-DLL */ + if (RegOpenKeyExW(hroot, buffer, 0, KEY_READ, &hentry) == ERROR_SUCCESS) { + if (RegQueryValueExW(hentry, DriverW, NULL, NULL, (LPBYTE) dllname, &dllsize) == ERROR_SUCCESS) { + /* We found a valid DLL for this Monitor. */ + TRACE("using Driver: %s\n", debugstr_w(dllname)); + } + RegCloseKey(hentry); + } + + /* Windows returns only Port-Monitors here, but to simplify our code, + we do no filtering for Language-Monitors */ + if (dllname[0]) { + numentries++; + needed += entrysize; + needed += (len+1) * sizeof(WCHAR); /* len is lstrlenW(monitorname) */ + if (level > 1) { + /* we install and return only monitors for "Windows NT x86" */ + needed += (lstrlenW(envname_x86W) +1) * sizeof(WCHAR); + needed += dllsize; + } + + /* required size is calculated. Now fill the user-buffer */ + if (pMonitors && (cbBuf >= needed)){ + mi = (LPMONITOR_INFO_2W) pMonitors; + pMonitors += entrysize; + + TRACE("%p: writing MONITOR_INFO_%ldW #%ld\n", mi, level, numentries); + mi->pName = ptr; + lstrcpyW(ptr, buffer); /* Name of the Monitor */ + ptr += (len+1); /* len is lstrlenW(monitorname) */ + if (level > 1) { + mi->pEnvironment = ptr; + lstrcpyW(ptr, envname_x86W); /* fixed to "Windows NT x86" */ + ptr += (lstrlenW(envname_x86W)+1); + + mi->pDLLName = ptr; + lstrcpyW(ptr, dllname); /* Name of the Driver-DLL */ + ptr += (dllsize / sizeof(WCHAR)); + } + } + } + index++; + len = sizeof(buffer); + buffer[0] = '\0'; + } + RegCloseKey(hroot); + } + *lpreturned = numentries; + TRACE("need %ld byte for %ld entries\n", needed, numentries); + return needed; +} /****************************************************************** * get_opened_printer_entry @@ -5046,7 +5145,7 @@ BOOL WINAPI EnumMonitorsA(LPSTR pName, D /***************************************************************************** * EnumMonitorsW [WINSPOOL.@] * - * Enumerate available Monitors + * Enumerate available Port-Monitors * * PARAMS * pName [I] Servername or NULL (local Computer) @@ -5058,19 +5157,69 @@ BOOL WINAPI EnumMonitorsA(LPSTR pName, D * * RETURNS * Success: TRUE - * Failure: FALSE and in bufneeded the Bytes required for buffer, if bufsize is too small + * Failure: FALSE and in pcbNeeded the Bytes required for buffer, if cbBuf is too small * - * BUGS - * only a Stub + * NOTES + * Windows reads the Registry once and cache the Results. + * + *| Language-Monitors are also installed in the same Registry-Location but + *| they are filtered in Windows (not returned by EnumMonitors). + *| We do no filtering to simplify our Code. * */ BOOL WINAPI EnumMonitorsW(LPWSTR pName, DWORD Level, LPBYTE pMonitors, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned) { - FIXME("%s,%ld,%p,%ld,%p,%p\n", debugstr_w(pName), Level, pMonitors, + DWORD needed = 0; + DWORD numentries = 0; + BOOL res = FALSE;; + + TRACE("(%s, %ld, %p, %ld, %p, %p)\n", debugstr_w(pName), Level, pMonitors, cbBuf, pcbNeeded, pcReturned); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + + if (pName && (lstrlenW(pName))) { + FIXME("for Server %s not implemented\n", debugstr_w(pName)); + SetLastError(ERROR_ACCESS_DENIED); + goto emW_cleanup; + } + + /* Level is not checked in win9x */ + if (!Level || (Level > 2)) { + WARN("level (%ld) is ignored in win9x\n", Level); + SetLastError(ERROR_INVALID_LEVEL); + goto emW_cleanup; + } + if (!pcbNeeded) { + SetLastError(RPC_X_NULL_REF_POINTER); + goto emW_cleanup; + } + + /* Scan all Monitor-Keys */ + numentries = 0; + needed = get_local_monitors(Level, NULL, 0, &numentries); + + /* we calculated the needed buffersize. now do the error-checks */ + if (cbBuf < needed) { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + goto emW_cleanup; + } + else if (!pMonitors || !pcReturned) { + SetLastError(RPC_X_NULL_REF_POINTER); + goto emW_cleanup; + } + + /* fill the Buffer with the Monitor-Keys */ + needed = get_local_monitors(Level, pMonitors, cbBuf, &numentries); + res = TRUE; + +emW_cleanup: + if (pcbNeeded) *pcbNeeded = needed; + if (pcReturned) *pcReturned = numentries; + + TRACE("returning %d with %ld (%ld byte for %ld entries)\n", + res, GetLastError(), needed, numentries); + + return (res); } /******************************************************************************

1 0

Mike McCormack : shdocvw: Forward IWebBrowser2::Navigate calls to :: Navigate2.
by Alexandre Julliard April 6, 2006

April 6, 2006

Module: wine Branch: refs/heads/master Commit: ba881a94d8ff29e20c9c8763a517001075a63bb8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba881a94d8ff29e20c9c876… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Apr 6 14:44:59 2006 +0900 shdocvw: Forward IWebBrowser2::Navigate calls to ::Navigate2. --- dlls/shdocvw/webbrowser.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index a2021e1..b5fad1e 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -206,14 +206,23 @@ static HRESULT WINAPI WebBrowser_GoSearc return E_NOTIMPL; } -static HRESULT WINAPI WebBrowser_Navigate(IWebBrowser2 *iface, BSTR URL, +static HRESULT WINAPI WebBrowser_Navigate(IWebBrowser2 *iface, BSTR szUrl, VARIANT *Flags, VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { WebBrowser *This = WEBBROWSER_THIS(iface); - FIXME("(%p)->(%s %p %p %p %p)\n", This, debugstr_w(URL), Flags, TargetFrameName, + VARIANT url; + HRESULT r; + + FIXME("(%p)->(%s %p %p %p %p)\n", This, debugstr_w(szUrl), Flags, TargetFrameName, PostData, Headers); - return E_NOTIMPL; + + V_VT(&url) = VT_BSTR; + V_BSTR(&url) = szUrl; + r = IWebBrowser2_Navigate2(iface, &url, Flags, + TargetFrameName, PostData, Headers); + + return r; } static HRESULT WINAPI WebBrowser_Refresh(IWebBrowser2 *iface)

1 0

Mike McCormack : msi: Avoid a crash if a parameter is NULL.
by Alexandre Julliard April 6, 2006

April 6, 2006

Module: wine Branch: refs/heads/master Commit: 17e2c3cc6156591bdea49eba8f199ea20cb7a1f4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=17e2c3cc6156591bdea49eb… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Apr 6 12:45:19 2006 +0900 msi: Avoid a crash if a parameter is NULL. --- dlls/msi/files.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index aa6f8e6..e191fe6 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -350,6 +350,9 @@ static BOOL check_volume(LPCWSTR path, L WCHAR name[MAX_PATH]; UINT type; + if (!want_volume) + return TRUE; + if (!(path[0] && path[1] == ':')) { if (intype)

1 0

Robert Reif : winearts: Don't call arts_free if arts_init wasn't successful .
by Alexandre Julliard April 6, 2006

April 6, 2006

Module: wine Branch: refs/heads/master Commit: 269236c1c8dfba76c5b83de92f927decb1cb2390 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=269236c1c8dfba76c5b83de… Author: Robert Reif <reif(a)earthlink.net> Date: Wed Apr 5 19:14:32 2006 -0400 winearts: Don't call arts_free if arts_init wasn't successful. --- dlls/winmm/winearts/audio.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/winearts/audio.c b/dlls/winmm/winearts/audio.c index 9b5c10b..7a38c2e 100644 --- a/dlls/winmm/winearts/audio.c +++ b/dlls/winmm/winearts/audio.c @@ -202,6 +202,7 @@ typedef struct { ARTS_MSG_RING msgRing; } WINE_WAVEIN; +static BOOL init; static WINE_WAVEOUT WOutDev [MAX_WAVEOUTDRV]; static WINE_WAVEIN WInDev [MAX_WAVEINDRV]; @@ -380,7 +381,8 @@ LONG ARTS_WaveClose(void) } } - arts_free(); /* free up arts */ + if (init) + arts_free(); /* free up arts */ return 1; } @@ -415,6 +417,8 @@ LONG ARTS_WaveInit(void) if (ret) return ret; + init = TRUE; + /* initialize all device handles to -1 */ for (i = 0; i < MAX_WAVEOUTDRV; ++i) {

1 0

appdb/include testResults.php
by WineHQ April 5, 2006

April 5, 2006

ChangeSet ID: 24008 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/04/05 21:02:52 Modified files: include : testResults.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Remove extra 'slash' in url that was causing all kinds of issues like users going to odd websites after clicking on some links on the site Patch: http://cvs.winehq.org/patch.py?id=24008 Old revision New revision Changes Path 1.12 1.13 +1 -1 appdb/include/testResults.php Index: appdb/include/testResults.php diff -u -p appdb/include/testResults.php:1.12 appdb/include/testResults.php:1.13 --- appdb/include/testResults.php:1.12 6 Apr 2006 2: 2:52 -0000 +++ appdb/include/testResults.php 6 Apr 2006 2: 2:52 -0000 @@ -415,7 +415,7 @@ class testData{ echo ' <td>'.$oTest->sTestedRating.'&nbsp</td>',"\n"; if ($_SESSION['current']->hasAppVersionModifyPermission($oTest->iVersionId)) { - echo '<td><a href="'.BASE.'/admin/adminTestResults.php?sub=view&iTestingId='.$oTest->iTestingId.'">',"\n"; + echo '<td><a href="'.BASE.'admin/adminTestResults.php?sub=view&iTestingId='.$oTest->iTestingId.'">',"\n"; echo 'Edit</a></td>',"\n"; } echo '</tr>',"\n";

1 0

Huw Davies : gdi32: Always consume the subst structure.
by Alexandre Julliard April 5, 2006

April 5, 2006

Module: wine Branch: refs/heads/master Commit: f8cb60f6c55bd5c5591c8988abeb87b988fadd9c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f8cb60f6c55bd5c5591c898… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 5 12:43:12 2006 +0100 gdi32: Always consume the subst structure. --- dlls/gdi/freetype.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 96745ec..33c0353 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -568,6 +568,9 @@ static BOOL add_font_subst(struct list * return TRUE; } + HeapFree(GetProcessHeap(), 0, subst->from.name); + HeapFree(GetProcessHeap(), 0, subst->to.name); + HeapFree(GetProcessHeap(), 0, subst); return FALSE; }

1 0

Huw Davies : gdi32: Use the localised family name if present
by Alexandre Julliard April 5, 2006

April 5, 2006

Module: wine Branch: refs/heads/master Commit: 2c7867a1c0d4703e81b913641b7128437128ecac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c7867a1c0d4703e81b9136… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 5 12:45:25 2006 +0100 gdi32: Use the localised family name if present (based on a patch on Byeong-Sik Jeon). --- dlls/gdi/freetype.c | 87 ++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 68 insertions(+), 19 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 08902e1..96745ec 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -117,6 +117,8 @@ MAKE_FUNCPTR(FT_Vector_Unit); MAKE_FUNCPTR(FT_Done_Face); MAKE_FUNCPTR(FT_Get_Char_Index); MAKE_FUNCPTR(FT_Get_Module); +MAKE_FUNCPTR(FT_Get_Sfnt_Name); +MAKE_FUNCPTR(FT_Get_Sfnt_Name_Count); MAKE_FUNCPTR(FT_Get_Sfnt_Table); MAKE_FUNCPTR(FT_Init_FreeType); MAKE_FUNCPTR(FT_Load_Glyph); @@ -592,18 +594,6 @@ static void LoadSubstList(void) LPSTR value; LPVOID data; - if(!list_empty(&font_subst_list)) - { - FontSubst *cursor2; - LIST_FOR_EACH_ENTRY_SAFE(psub, cursor2, &font_subst_list, FontSubst, entry) - { - HeapFree(GetProcessHeap(), 0, psub->to.name); - HeapFree(GetProcessHeap(), 0, psub->from.name); - list_remove(&psub->entry); - HeapFree(GetProcessHeap(), 0, psub); - } - } - if(RegOpenKeyA(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes", &hkey) == ERROR_SUCCESS) { @@ -645,6 +635,45 @@ static void LoadSubstList(void) } } +static WCHAR *get_familyname(FT_Face ft_face) +{ + WCHAR *family = NULL; + FT_SfntName name; + FT_UInt num_names, name_index, i; + + if(FT_IS_SFNT(ft_face)) + { + num_names = pFT_Get_Sfnt_Name_Count(ft_face); + + for(name_index = 0; name_index < num_names; name_index++) + { + if(!pFT_Get_Sfnt_Name(ft_face, name_index, &name)) + { + if((name.name_id == TT_NAME_ID_FONT_FAMILY) && + (name.language_id == GetUserDefaultLCID()) && + (name.platform_id == TT_PLATFORM_MICROSOFT) && + (name.encoding_id == TT_MS_ID_UNICODE_CS)) + { + /* String is not nul terminated and string_len is a byte length. */ + family = HeapAlloc(GetProcessHeap(), 0, name.string_len + 2); + for(i = 0; i < name.string_len / 2; i++) + { + WORD *tmp = (WORD *)&name.string[i * 2]; + family[i] = GET_BE_WORD(*tmp); + } + family[i] = 0; + + TRACE("Got localised name %s\n", debugstr_w(family)); + return family; + } + } + } + } + + return NULL; +} + + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 static BOOL AddFontFileToList(const char *file, char *fake_family, DWORD flags) @@ -652,7 +681,7 @@ static BOOL AddFontFileToList(const char FT_Face ft_face; TT_OS2 *pOS2; TT_Header *pHeader = NULL; - WCHAR *FamilyW, *StyleW; + WCHAR *english_family, *localised_family, *StyleW; DWORD len; Family *family; Face *face; @@ -713,24 +742,42 @@ static BOOL AddFontFileToList(const char size = (My_FT_Bitmap_Size *)ft_face->available_sizes + bitmap_num; len = MultiByteToWideChar(CP_ACP, 0, family_name, -1, NULL, 0); - FamilyW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, family_name, -1, FamilyW, len); + english_family = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, family_name, -1, english_family, len); + + localised_family = NULL; + if(!fake_family) { + localised_family = get_familyname(ft_face); + if(localised_family && !strcmpW(localised_family, english_family)) { + HeapFree(GetProcessHeap(), 0, localised_family); + localised_family = NULL; + } + } family = NULL; LIST_FOR_EACH(family_elem_ptr, &font_list) { family = LIST_ENTRY(family_elem_ptr, Family, entry); - if(!strcmpW(family->FamilyName, FamilyW)) + if(!strcmpW(family->FamilyName, localised_family ? localised_family : english_family)) break; family = NULL; } if(!family) { family = HeapAlloc(GetProcessHeap(), 0, sizeof(*family)); - family->FamilyName = FamilyW; + family->FamilyName = strdupW(localised_family ? localised_family : english_family); list_init(&family->faces); list_add_tail(&font_list, &family->entry); - } else { - HeapFree(GetProcessHeap(), 0, FamilyW); + + if(localised_family) { + FontSubst *subst = HeapAlloc(GetProcessHeap(), 0, sizeof(*subst)); + subst->from.name = strdupW(english_family); + subst->from.charset = -1; + subst->to.name = strdupW(localised_family); + subst->to.charset = -1; + add_font_subst(&font_subst_list, subst, 0); + } } + HeapFree(GetProcessHeap(), 0, localised_family); + HeapFree(GetProcessHeap(), 0, english_family); len = MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, NULL, 0); StyleW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); @@ -1579,6 +1626,8 @@ BOOL WineEngInit(void) LOAD_FUNCPTR(FT_Done_Face) LOAD_FUNCPTR(FT_Get_Char_Index) LOAD_FUNCPTR(FT_Get_Module) + LOAD_FUNCPTR(FT_Get_Sfnt_Name) + LOAD_FUNCPTR(FT_Get_Sfnt_Name_Count) LOAD_FUNCPTR(FT_Get_Sfnt_Table) LOAD_FUNCPTR(FT_Init_FreeType) LOAD_FUNCPTR(FT_Load_Glyph)

1 0

Huw Davies : gdi32: Move a few functions around. Should be a nop.
by Alexandre Julliard April 5, 2006

April 5, 2006

Module: wine Branch: refs/heads/master Commit: c76af0d3b3505480817dcb7cbd1b0dcc4dc7dc69 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c76af0d3b3505480817dcb7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 5 12:41:49 2006 +0100 gdi32: Move a few functions around. Should be a nop. --- dlls/gdi/freetype.c | 409 ++++++++++++++++++++++++++------------------------- 1 files changed, 205 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=c76af0d3b3505480817…

1 0