NoteWorthy Composer Forum

• Font / charset encoding problem? (no reply provided)
  http://www.winehq.com/pipermail/wine-users/2001-July/003130.html
  
  
• Another symbol font fix
  http://www.winehq.org/pipermail/wine-patches/2003-October/008307.html

352c352
< static LPWSTR FONT_mbtowc(LPCSTR str, INT count, INT *plenW)
---
> static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW)
354c354
<     UINT cp = CP_ACP;
---
>     UINT cp = (GetTextCharset(hdc) == SYMBOL_CHARSET) ? CP_SYMBOL : CP_ACP;
1025c1025
<     LPWSTR p = FONT_mbtowc(str, count, &wlen);
---
>     LPWSTR p = FONT_mbtowc(hdc, str, count, &wlen);
1134c1134
<     p = FONT_mbtowc(str, count, &wlen);
---
>     p = FONT_mbtowc(hdc, str, count, &wlen);
1651c1651
<     wstr = FONT_mbtowc(str, count, &wlen);
---
>     wstr = FONT_mbtowc(hdc, str, count, &wlen);
1686c1686
<     p = FONT_mbtowc(str, count, &wlen);
---
>     p = FONT_mbtowc(hdc, str, count, &wlen);
2298c2298
<     wstr = FONT_mbtowc(str, count, &wlen);
---
>     wstr = FONT_mbtowc(hdc, str, count, &wlen);
2436c2436
<         p = FONT_mbtowc(mbchs, len, NULL);
---
>         p = FONT_mbtowc(hdc, mbchs, len, NULL);
2742c2742
<     lpstrW = FONT_mbtowc(lpstr, count, &countW);
---
>     lpstrW = FONT_mbtowc(hdc, lpstr, count, &countW);
2794c2794
<     lpStringW = FONT_mbtowc(lpString, uCount, &uCountW);
---
>     lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW);
2934c2934
<     wstr = FONT_mbtowc(str, count, &wlen);
---
>     wstr = FONT_mbtowc(hdc, str, count, &wlen);

Date: Tue, 9 Jan 2007 06:18:27 +0100
From: Marcus Meissner <meissner@suse.de>
To: wine-devel@winehq.org, me@me.org
Subject: Re: Proposed patch for "fonts.c"

(...)

> 352c352
> < static LPWSTR FONT_mbtowc(LPCSTR str, INT count, INT *plenW)
> ---
> > static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW)

Please use "diff -u".

Ciao, Marcus

--- orig-font.c	Mon Jan  8 07:27:52 2007
+++ font.c	Mon Jan  8 07:30:55 2007
@@ -349,9 +349,9 @@
  * the number of WCHARs that have been written.  The caller should free
  * the returned LPWSTR from the process heap itself.
  */
-static LPWSTR FONT_mbtowc(LPCSTR str, INT count, INT *plenW)
+static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW)
 {
-    UINT cp = CP_ACP;
+    UINT cp = (GetTextCharset(hdc) == SYMBOL_CHARSET) ? CP_SYMBOL : CP_ACP;
     INT lenW;
     LPWSTR strW;
 
@@ -1022,7 +1022,7 @@
 {
     BOOL ret = FALSE;
     INT wlen;
-    LPWSTR p = FONT_mbtowc(str, count, &wlen);
+    LPWSTR p = FONT_mbtowc(hdc, str, count, &wlen);
 
     if (p) {
 	ret = GetTextExtentPoint32W( hdc, p, wlen, size );
@@ -1131,7 +1131,7 @@
        NULL == (walpDx = HeapAlloc(GetProcessHeap(), 0, count * sizeof(INT))))
        return FALSE;
     
-    p = FONT_mbtowc(str, count, &wlen);
+    p = FONT_mbtowc(hdc, str, count, &wlen);
     ret = GetTextExtentExPointW( hdc, p, wlen, maxExt, lpnFit, walpDx, size);
     if (walpDx)
     {
@@ -1648,7 +1648,7 @@
     for(i = 0; i < count; i++)
 	str[i] = (BYTE)(firstChar + i);
 
-    wstr = FONT_mbtowc(str, count, &wlen);
+    wstr = FONT_mbtowc(hdc, str, count, &wlen);
 
     for(i = 0; i < wlen; i++)
     {
@@ -1683,7 +1683,7 @@
     if (flags & ETO_GLYPH_INDEX)
         return ExtTextOutW( hdc, x, y, flags, lprect, (LPCWSTR)str, count, lpDx );
 
-    p = FONT_mbtowc(str, count, &wlen);
+    p = FONT_mbtowc(hdc, str, count, &wlen);
 
     if (lpDx) {
         unsigned int i = 0, j = 0;
@@ -2295,7 +2295,7 @@
     for(i = 0; i < count; i++)
 	str[i] = (BYTE)(firstChar + i);
 
-    wstr = FONT_mbtowc(str, count, &wlen);
+    wstr = FONT_mbtowc(hdc, str, count, &wlen);
 
     for(i = 0; i < wlen; i++)
     {
@@ -2433,7 +2433,7 @@
             len = 1;
             mbchs[0] = (uChar & 0xff);
         }
-        p = FONT_mbtowc(mbchs, len, NULL);
+        p = FONT_mbtowc(hdc, mbchs, len, NULL);
 	c = p[0];
     } else
         c = uChar;
@@ -2739,7 +2739,7 @@
     TRACE("(%p, %s, %d, %p, 0x%x)\n",
           hdc, debugstr_an(lpstr, count), count, pgi, flags);
 
-    lpstrW = FONT_mbtowc(lpstr, count, &countW);
+    lpstrW = FONT_mbtowc(hdc, lpstr, count, &countW);
     ret = GetGlyphIndicesW(hdc, lpstrW, countW, pgi, flags);
     HeapFree(GetProcessHeap(), 0, lpstrW);
 
@@ -2791,7 +2791,7 @@
     /* both structs are equal in size */
     memcpy(&resultsW, lpResults, sizeof(resultsW));
 
-    lpStringW = FONT_mbtowc(lpString, uCount, &uCountW);
+    lpStringW = FONT_mbtowc(hdc, lpString, uCount, &uCountW);
     if(lpResults->lpOutString)
         resultsW.lpOutString = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*uCountW);
 
@@ -2931,7 +2931,7 @@
     for(i = 0; i < count; i++)
         str[i] = (BYTE)(first + i);
 
-    wstr = FONT_mbtowc(str, count, &wlen);
+    wstr = FONT_mbtowc(hdc, str, count, &wlen);
 
     for (i = 0; i < wlen; i++)
     {

• Modify the notation font rendering to avoid a bug in Wine handling of Symbol enclosed strings
  
  Even though we submitted a fix for this bug, we went ahead and included changes in NWC2 that will also circumvent this bug for notation display. The bug will still appear if you use Symbol fonts in other areas of NWC2 (such as Insert, Text).
  
  
• Add a 'retry' prompt to install and update programs, which will enable users to work around a bug in Wine file handling
  
  When the copy operation fails on Wine, you are now given the opportunity to retry. This enables you to manually delete the target file before continuing the update. Do not delete the file too early in the process, or the update will not even be able to start.