Music font problem

[Andrew Johnson]

Please CC: me on any replies, I'm not subscribed.

Tony Lambregts wrote:
> 
> The best that I can suggest for now is that you attach your 
> hack^H^H^H^Hpatch and provide a link to your screen shot. It would not 
> hurt to start a bug report for this either http://bugs.winehq.org

Ok, the change necessary to get Noteworthy Composer to find its font 
is shown below.  There's a screen dump showing it running at
	http://www.aps.anl.gov/~anj/font_bug.png
Note that the rectangular boxes should all be note heads or other 
musical symbols found in the Noteworthy font NWCV15.

This issue may explain bug #380, which similarly involved a music font 
not being properly selected, but in my case the program noticed and 
aborts without the wine patch below.  I have not filed a bug report 
for this yet.

Thanks to Tony and Huw for responding.

- Andrew

Index: freetype.c
===================================================================
RCS file: /home/wine/wine/dlls/gdi/freetype.c,v
retrieving revision 1.30
diff -u -r1.30 freetype.c
--- freetype.c  23 Jan 2003 21:32:36 -0000      1.30
+++ freetype.c  20 Feb 2003 06:18:23 -0000
@@ -165,6 +165,8 @@
  static WCHAR MSSansSerifW[] = {'M','S',' ','S','a','n','s',' ',
                                'S','e','r','i','f','\0'};
  static WCHAR HelvW[] = {'H','e','l','v','\0'};
+/* ANJ */
+static WCHAR NWCV15W[] = {'N','W','C','V','1','5','\0'};

  static WCHAR ArabicW[] = {'A','r','a','b','i','c','\0'};
  static WCHAR BalticW[] = {'B','a','l','t','i','c','\0'};
@@ -970,6 +972,9 @@

      if(!strcmpiW(lf.lfFaceName, SymbolW))
          lf.lfCharSet = SYMBOL_CHARSET;
+    /* ANJ */
+    if(!strcmpiW(lf.lfFaceName, NWCV15W))
+        lf.lfCharSet = SYMBOL_CHARSET;

      if(!TranslateCharsetInfo((DWORD*)(INT)lf.lfCharSet, &csi, 
TCI_SRCCHARSET)) {
          switch(lf.lfCharSet) {