wine-devel

wine-devel@winehq.org

4 participants
84464 discussions

Font selection - please review
by Shachar Shemesh 16 Nov '02

16 Nov '02

Hi all, I am thinking of submitting the attached patch. The problem is that I am not comfertable with the location I added it. As far as I could tell, there is nowhere in the whole of Wine where the selected language is matched with the charset to be used by default. This is what this patch comes to amend. There is a slight awkwardness that is inherent to the Win32 API, in which, in order to create the default font, you zero out a LOGFONT struct, fill in the struct length, and call "CreateFontIndirect". Looking at the resulting struct, however, reveals that what you have just asked for is a ANSI_CHARSET font. It appears that windows correctly understands that this is an uninitialized LOGFONT, apparently based on the fields tested. The reason I am not sure this is the correct place, however, is that there seem to be system-wide default fonts, and I'm not 100% sure why, but they are ANSI (read - latin) only. I am willing to delve deeper into that part of the code, but I need to understand it better first. I was wondering whether anyone else on this list is aware of the reasons. Shachar License: LGPL Changelog: Shachar Shemesh <winecode(a)sun.consumer.org.il> objects/font.c * Added a function to convert language to charset. * Added code to select the apropriate charset in case the charset was not specified (DEFAULT_CHARSET or uninitialized LOGFONT). Index: objects/font.c =================================================================== RCS file: /home/sun/sources/cvs/wine/objects/font.c,v retrieving revision 1.89 diff -u -r1.89 font.c --- objects/font.c 13 Nov 2002 04:13:42 -0000 1.89 +++ objects/font.c 14 Nov 2002 19:49:44 -0000 @@ -41,6 +41,8 @@ static INT FONT_GetObjectW( HGDIOBJ handle, void *obj, INT count, LPVOID buffer ); static BOOL FONT_DeleteObject( HGDIOBJ handle, void *obj ); +static BYTE FONT_GetCharsetFromLang( LANGID language ); + static const struct gdi_obj_funcs font_funcs = { FONT_SelectObject, /* pSelectObject */ @@ -317,6 +319,16 @@ { memcpy( &fontPtr->logfont, plf, sizeof(LOGFONTW) ); + /* Make sure the correct font is chosen in case the decision is up to us */ + if( plf->lfCharSet==DEFAULT_CHARSET || + (plf->lfHeight==0 && plf->lfWidth==0 && plf->lfEscapement==0 && + plf->lfCharSet==0 && plf->lfPitchAndFamily==0 && + plf->lfFaceName[0]==0) ) + { + fontPtr->logfont.lfCharSet= + FONT_GetCharsetFromLang( LANGIDFROMLCID(GetUserDefaultLCID())); + } + TRACE("(%ld %ld %ld %ld %x) %s %s %s => %04x\n", plf->lfHeight, plf->lfWidth, plf->lfEscapement, plf->lfOrientation, @@ -2207,4 +2219,69 @@ BOOL WINAPI RemoveFontResourceExW( LPCWSTR str, DWORD fl, PVOID pdv ) { return WineEngRemoveFontResourceEx(str, fl, pdv); +} + +/*********************************************************************** + * FONT_GetCharsetFromLang + */ +static BYTE FONT_GetCharsetFromLang( LANGID language ) +{ + switch( PRIMARYLANGID(language) ) + { + /* I am currently unaware of any language that requires SYMBOL + case : + return SYMBOL_CHARSET;*/ + case LANG_JAPANESE: + return SHIFTJIS_CHARSET; + case LANG_KOREAN: + return HANGEUL_CHARSET; + case LANG_CHINESE: + { + switch( SUBLANGID(language) ) + { + case SUBLANG_CHINESE_SIMPLIFIED: + return GB2312_CHARSET; + case SUBLANG_CHINESE_TRADITIONAL: + return CHINESEBIG5_CHARSET; + } + } + case LANG_GREEK: + return GREEK_CHARSET; + case LANG_TURKISH: + return TURKISH_CHARSET; + case LANG_HEBREW: + return HEBREW_CHARSET; + case LANG_ARABIC: + return ARABIC_CHARSET; + case LANG_LATVIAN: + return BALTIC_CHARSET; + case LANG_VIETNAMESE: + return VIETNAMESE_CHARSET; + case LANG_RUSSIAN: + case LANG_BULGARIAN: + /* Byelorussian probably goes under SUBLANG_RUSSIAN_MOLDAVIA */ + case LANG_MACEDONIAN: + case LANG_SERBIAN: + case LANG_UKRAINIAN: + return RUSSIAN_CHARSET; + case LANG_CZECH: + case LANG_HUNGARIAN: + case LANG_POLISH: + case LANG_ROMANIAN: + /* For some reason SERBIAN and CROATIAN has the same value, despite + * seeming to require different encodings. I disabled one at random. + case LANG_CROATIAN: */ + case LANG_SLOVAK: + case LANG_SLOVENIAN: + case LANG_SORBIAN: + return EE_CHARSET; + case LANG_THAI: + return THAI_CHARSET; + /* The JOHAB charset seem to require KOREAN as well. I don't know when + * to use that instead + case LANG_KOREAN: + return JOHAB_CHARSET; */ + } + + return ANSI_CHARSET; }

2 2

kdelnk2desktop.py
by Dustin Navea 16 Nov '02

16 Nov '02

I just switched to slackware from Mandrake8 and I was foolin around tryin to see if ther ewas an xchat built with kdelibs and stumbled across kdelnk2desktop.py in my /usr/bin dir. im not sure if it exists in other distors but it could be a replacement for the current wineshelllink on distros that do have it. Anyone wanna look into this or want me to, let me know. -Dustin

2 1

something about Chinese character processing
by yf 16 Nov '02

16 Nov '02

I found that to show Chinese character properly, following should be modified. But it only affect menu, the character within the windows still as before ( can't be showed properly). What should I do then? --- wine-20021031/graphics/x11drv/codepage.c.original 2002-11-16 13:50:31.000000000 +0800 +++ wine-20021031/graphics/x11drv/codepage.c 2002-11-04 17:44:14.000000000 +0800 @@ -279,8 +279,8 @@ { if ( IsLegalDBCSChar_cp936( *str_src, *(str_src+1) ) ) { - str2b_dst->byte1 = *str_src; - str2b_dst->byte2 = *(str_src+1); + str2b_dst->byte1 = *str_src&0x7f; + str2b_dst->byte2 = *(str_src+1)&0x7f; str_src++; } else

2 1

Re: StgIsStorageFile Try #2
by Dmitry Timoshkov 16 Nov '02

16 Nov '02

"Ryan Cumming" <ryan(a)completely.kicks-ass.org> wrote: > + strW = HEAP_strdupAtoW( GetProcessHeap(), 0, fn ); Please don't use HEAP_strdupAtoW. Use RtlCreateUnicodeStringFromAsciiz instead. -- Dmitry.

1 0

wineoss MIDI help
by Jeff Smith 16 Nov '02

16 Nov '02

I have several programs that require MIDI support. When I try to run them I get: err:midi:OSS_MidiInit ioctl on midi info for device 0 failed. This comes from line 274 of dlls/winmm/wineoss/midi.c When this error is encountered, the /dev/sequencer is closed and OSS_MidiInit returns. I have determined that my card indicates having two midi devices. Only the second supports the SNDCTL_MIDI_INFO ioctl. But midi.c never gets to the second because of the first. I have tried some simple hacks, but have not accomplished anything notable. Anybody got any insights as to a simple fix? If not, would I be better off delving into wineoss or getting the first MIDI device of the emu10k1 driver to handle MIDI_INFO? ;-) -- Jeff S _________________________________________________________________ MSN 8 with e-mail virus protection service: 2 months FREE* http://join.msn.com/?page=features/virus

1 0

Re: test skeleton Re: StgIsStorageFile
by Ryan Cumming 16 Nov '02

16 Nov '02

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On November 15, 2002 18:06, Greg Turner wrote: > On Friday 15 November 2002 02:29 am, Ryan Cumming wrote: > > On a side note, I made a pretty nice testcase for this, but there > > seems to be no dlls/ole32/tests directory. > > Ask and ye shall receive. Cheers :) I'll get to work on porting my StgIsStorageFile testcase tommorow. - -Ryan -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQE91b9sLGMzRzbJfbQRAtUYAKCIbfexD39A/4raTAqrMylFuCb73gCdG4NP lDhlqa8vxpF17phsWS1mqcs= =ud+e -----END PGP SIGNATURE-----

1 0

Re: Stub implementation of CABINET.DLL
by Greg Turner 16 Nov '02

16 Nov '02

On Friday 15 November 2002 12:47 pm, Patrik Stridvall wrote: > Now that we have the permission to use cabextract > under the LGPL it would be useful to have stubs > for CABINET.DLL so intrested people can work > with implementing it with fewer "infrastructure" > problems. > > ---8<--- > > *** cabinet > > * configure.ac, > include/fci.h, > include/fdi.h, > dlls/Makefile.in, > dlls/cabinet/.cvsignore, > dlls/cabinet/Makefile.in, > dlls/cabinet/cabinet.spec, > dlls/cabinet/fci.c, > dlls/cabinet/fdi.c, > dlls/cabinet/main.c: > Added stub implementation of CABINET.DLL. Anyone working on this? If not I'd be glad to take it on, seems like it should be easy. -- gmt "War is an ugly thing, but not the ugliest of things; the decayed and degraded state of moral and patriotic feeling which thinks that nothing is worth war is much worse. A man who has nothing for which he is willing to fight; nothing he cares about more than his own personal safety; is a miserable creature who has no chance of being free, unless made and kept so by the exertions of better persons than himself." -- John Stuart Mill

1 0

Re: Fw: Re: Filesystem change notifications
by Jeff Smith 15 Nov '02

15 Nov '02

> >It's not that I am for adding everything inline. That's not a good idea. >Also, I think a Windows compatibility layer can be forgiven for having more >dependancies than a personal finance program. This holds especially true if >non-core windows functionality is only available if the external library is >available at runtime (i.e. - no fribidi install - no Hebrew support in >Wine. No CUPS installed - no printing available etc.). I'm not sure this >holds true to something which is a core Windows function. > > Shachar I totally agree. And although we don't want to fall into "dependency hell", one has to consider we are trying provide a layer of compatibilty for an OS that is known for the same. So I think selective dependencies, as Shachar mentions, are perfectly reasonable. I don't mind a dependecy on FAM, but I could be biased, as I already installed it for the associated KDE functionality. If inserted as a conditional dependency, the fallback position if it is not present is no worse than the current position. Just my two centi-dollars. -- Jeff S _________________________________________________________________ Add photos to your e-mail with MSN 8. Get 2 months FREE*. http://join.msn.com/?page=features/featuredemail

1 0

CreateWindow fails
by steve.lustbader＠philips.com 15 Nov '02

15 Nov '02

My app calls CreateWindow like this: WNDCLASSEX wcex; wcex.cbSize = sizeof(WNDCLASSEX); wcex.style = 0; wcex.lpfnWndProc = (WNDPROC)MyWndProc; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = hInstance; // from argument to DllMain wcex.hIcon = NULL; wcex.hCursor = NULL; wcex.hbrBackground = NULL; wcex.lpszMenuName = NULL; wcex.lpszClassName = TEXT("foo"); wcex.hIconSm = NULL; RegisterClassEx(&wcex); g_hTarget = CreateWindow(TEXT("foo"), TEXT(""), WS_POPUP, 0, 0, 0, 0, NULL, NULL, NULL, NULL); ASSERT( NULL != g_hTarget ); It fails the final assertion in Wine but not in Windows. Any idea why CreateWindow would be returning NULL here? What debug output could I provide that could be helpful here? -Steve

1 0

Re: FW: wine-devel digest, Vol 1 #1391 - 17 msgs
by Andrew Lynch 15 Nov '02

15 Nov '02

> Date: Thu, 14 Nov 2002 18:23:49 -0800 (PST) > From: Steven Edwards <steven_ed4153(a)yahoo.com> > Subject: Re: Wine Fun Projects v0.2 > To: dpaun(a)rogers.com, Wine Devel > <wine-devel(a)winehq.com> > > You might want to add visual-mingw to the winelib > apps section. One > thing I recommened to Jermey > White a while back was that WINE might gain more of > a market share if > there was a easy way for > people that are writing Windows apps on Windows if > they had a IDE for > GCC that was cross-platform. > > I was thinking at the time of something like a > CrossOver Developer > Studio or something. > > Anyway the idea is to run Visual-Mingw under WINElib > and be able to > just recompile your Win32 app > that was built with Visual-Mingw and the w32api > package plus reduce > some of the redunancy Wine, > Mingw and ReactOS have by finding areas where we are > not in sync. > > It would be a bitch and a long term project but I > think its something > to think about. > > Thanks > Steven > Visual-Mingw sounds almost identical to DevEx found at http://sourceforge.net/projects/wingtk and http://www.bloodshed.net I am using their wGLADE tool for cygwin/GTK+ development presently and it works great under Win98. Andrew Lynch PS, all of these tools are GPL __________________________________________________ Do you Yahoo!? Yahoo! Web Hosting - Let the expert host your site http://webhosting.yahoo.com

2 2

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-devel