wine-devel February 2007

wine-devel@winehq.org

130 participants
279 discussions

Bug 4791 - Civ4 crashes because of recent explorer/systray changes
by Fabian Bieler 06 Feb '07

06 Feb '07

Hello! I tried to look into Bug 4791 (Civ4 crashes because of recent explorer/systray changes http://bugs.winehq.org/show_bug.cgi?id=4791 ). Pretty early during initialization (before the application creates any windows itsself) a WM_FONTCHANGE message is broadcasted. The only window to which the message gets actually send is the Wine Systray Listener window. The message is immediately pulled by peek_message as a MSG_NOTIFY message. A few seconds later the WM_FONTCHANGE message is pulled from the queue of the Wine Systray Listener window again, this time of the type MSG_CALLBACK. the callback function pointer is a nullpointer resulting in a pagefault. If the Wine Desktop window is set as its own parent (like described in the bugzilla thread), the WM_FONTCHANGE message does not get send to the window and the program starts up fine. Now, I do not really understand the wine messaging system (particularly the difference between notify and callback messages) so I thought maybe somebody here could help me with that or point me to some introduction other than http://winehq.org/site/docs/winedev-guide/c3762#AEN3825 and message.c. Should the fontchange-message really be send to the Wine Systray Listener window? All test were run using wine-0.9.30, civ4 v1.61 with nocd-patch and native msxml3. Fabian

1 1

Presenting at LinuxTag?
by Dan Kegel 06 Feb '07

06 Feb '07

David asked if anyone's interested in manning a Wine booth at Linuxtag. A related question: is anybody proposing a Wine talk or tutorial at Linuxtag? The deadline for submitting proposals is Feb 16th. (Here's the CFP: http://www.linuxtag.org/2007/en/conf/cfp/cfp-target.html )

1 0

Daylight saving changes
by Francois Gouget 06 Feb '07

06 Feb '07

Quite a few countries seem to be changing their daylight saving rules this year. Also Wine stores timezone information in the registry so won't we need to update the data we store in the registry? While looking at wine's timezone data I also found quite a few differences with Windows' data. Hence the question: Where does wine.inf's current data come from? Where can one find authoritative data for this? Does any one have an opinion on what to do about those? * wine.inf's TZI field does not match Windows for these time zones: Won't this impact email tools? Arabic Standard Time Azores Standard Time Caucasus Standard Time Dateline Standard Time E. South America Standard Time GTB Standard Time Iran Standard Time Israel Standard Time New Zealand Standard Time Newfoundland Standard Time Pacific SA Standard Time * wine.inf is missing some time zones: Ekaterinburg Standard Time Greenland Standard Time Mid-Atlantic Standard Time Nepal Standard Time Sri Lanka Standard Time W. Central Africa Standard Time * wine.inf has an extra time zone: Mexico Standard Time 2 * Wine's display name is not in the same format as the Windows one: For instance for Tonga Standard Time: Windows has: "Display"="(GMT+13:00) Nuku'alofa" Wine has : "Display"="Pacific/Tongatapu" -- Francois Gouget fgouget(a)codeweavers.com

2 1

[PATCH] make CarbonPoker (previously Poker.com) client work.
by Trent Waddington 06 Feb '07

06 Feb '07

These changes make the Carbon Poker (www.carbonpoker.com) client work. Run the Carbon Poker installer; then Run c:/windows/system32/Macromed/Flash/GetFlash.exe; then Run c:/windows/CarbonPoker/Poker.exe Screenshot: http://rtfm.insomnia.org/~qg/CarbonPoker-Ubuntu-wine.png If someone would like to implement PKCS7 support in crypt32, this patch could be much cleaner. --- ChangeLog | 15 +++++++++++++++ dlls/crypt32/cert.c | 16 ++++++++++++++++ dlls/crypt32/crypt32.spec | 2 +- dlls/crypt32/main.c | 12 +++++++++++- dlls/crypt32/store.c | 4 ++++ dlls/usp10/usp10.c | 33 +++++++++++++++++++++++++++++++++ dlls/usp10/usp10.spec | 2 +- dlls/wininet/http.c | 4 ++-- 8 files changed, 83 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 658036c..297fb08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2007-02-06 Trent Waddington <trent.waddington(a)gmail.com> + + * dlls/crypt32/cert.c: + dlls/crypt32/main.c: + dlls/crypt32/store.c: + dlls/crypt32/crypt32.spec: + crypt32: Hacks to make Macromedia's GetFlash.exe not complain about the lack of PKCS7 support. + + * dlls/usp10/usp10.c: + dlls/usp10/usp10.spec: + usp10: Implemented ScriptGetLogicalWidths. + + * dlls/wininet/http.c: + wininet: Implement a feature of HttpOpenRequestA where lpszAcceptTypes can be terminated with an empty string instead of a NULL. + 2007-01-24 Vitaliy Margolen <wine-patches(a)kievinfo.com> * server/token.c: diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b39c3ca..e3ed7e0 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -130,6 +130,10 @@ BOOL WINAPI CertFreeCertificateContext(PCCERT_CONTEXT pCertContext) { TRACE("(%p)\n", pCertContext); + // HACK for GetFlash.exe + if (pCertContext == 0xdeadbeef) + return TRUE; + if (pCertContext) Context_Release((void *)pCertContext, sizeof(CERT_CONTEXT), CertDataContext_Free); @@ -921,6 +925,12 @@ PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE hCertStore, TRACE("(%p, %d, %d, %d, %p, %p)\n", hCertStore, dwCertEncodingType, dwFlags, dwType, pvPara, pPrevCertContext); + // HACK for GetFlash.exe + if (hCertStore == 0xdeadbeef) { + ret = 0xdeadbeef; + return ret; + } + switch (dwType >> CERT_COMPARE_SHIFT) { case CERT_COMPARE_ANY: @@ -987,6 +997,12 @@ BOOL WINAPI CertVerifySubjectCertificateContext(PCCERT_CONTEXT pSubject, static const DWORD supportedFlags = CERT_STORE_REVOCATION_FLAG | CERT_STORE_SIGNATURE_FLAG | CERT_STORE_TIME_VALIDITY_FLAG; + // HACK for GetFlash.exe + if (pSubject == 0xdeadbeef || pIssuer == 0xdeadbeef) { + *pdwFlags = 0; + return TRUE; + } + if (*pdwFlags & ~supportedFlags) { SetLastError(E_INVALIDARG); diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 7ee23f4..705fb8f 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -118,7 +118,7 @@ @ stub CryptGetAsyncParam @ stdcall CryptGetDefaultOIDDllList(long long ptr ptr) @ stdcall CryptGetDefaultOIDFunctionAddress(long long wstr long ptr ptr) -@ stub CryptGetMessageCertificates +@ stdcall CryptGetMessageCertificates(long long long ptr long) @ stub CryptGetMessageSignerCount @ stdcall CryptGetOIDFunctionAddress(long long str long ptr ptr) @ stdcall CryptGetOIDFunctionValue(long str str wstr ptr ptr ptr) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index dd9e1fb..80567ab 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -238,5 +238,15 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, FIXME("stub: %p, %d, %p, %d, %p, %p, %p\n", pVerifyPara, dwSignerIndex, pbSignedBlob, cbSignedBlob, pbDecoded, pcbDecoded, ppSignerCert); - return FALSE; + return TRUE; +} + +HCERTSTORE WINAPI CryptGetMessageCertificates(DWORD dwMsgAndCertEncodingType, + HCRYPTPROV hCryptProv, DWORD dwFlags, const BYTE* pbSignedBlob, + DWORD cbSignedBlob) +{ + FIXME("stub: %d, %p, %d, %p, %d\n", + dwMsgAndCertEncodingType, hCryptProv, dwFlags, pbSignedBlob, + cbSignedBlob); + return 0xdeadbeef; // HACK for GetFlash.exe } diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 8c8cda5..c82fcbc 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -2431,6 +2431,10 @@ BOOL WINAPI CertCloseStore(HCERTSTORE hCertStore, DWORD dwFlags) TRACE("(%p, %08x)\n", hCertStore, dwFlags); + // HACK for GetFlash.exe + if (hCertStore == 0xdeadbeef) + return TRUE; + if( ! hCertStore ) return TRUE; diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c3b0a17..6f860e0 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1553,6 +1553,39 @@ HRESULT WINAPI ScriptStringGetLogicalWidths(SCRIPT_STRING_ANALYSIS ssa, int *piD } /*********************************************************************** + * ScriptGetLogicalWidths (USP10.@) + * + * Returns logical widths from an analysis. + * + * PARAMS + * psa [I] analysis. + * cChars [I] count of logical code points in the run. + * cGlyphs [I] count of glyphs in the run. + * piGlyphWidth [I] array of glyph advance widths. + * pwLogClust [I] array of logical clusters. + * psva [I] visual attributes. + * piDx [O] logical widths returned. + * + * RETURNS + * Success: S_OK + * Failure: a non-zero HRESULT. + */ +HRESULT WINAPI ScriptGetLogicalWidths(const SCRIPT_ANALYSIS *psa, int cChars, + int cGlyphs, const int *piGlyphWidth, const WORD *pwLogClust, + const SCRIPT_VISATTR *psva, int *piDx) +{ + int i; + + TRACE("%p, %d, %d, %p %p, %p, %p\n", psa, cChars, cGlyphs, piGlyphWidth, pwLogClust, psva, piDx); + + for (i = 0; i < cGlyphs; i++) + { + piDx[i] = piGlyphWidth[i]; + } + return S_OK; +} + +/*********************************************************************** * ScriptStringValidate (USP10.@) * * Validate a string analysis. diff --git a/dlls/usp10/usp10.spec b/dlls/usp10/usp10.spec index df07f43..ac1506e 100644 --- a/dlls/usp10/usp10.spec +++ b/dlls/usp10/usp10.spec @@ -8,7 +8,7 @@ @ stdcall ScriptGetCMap(ptr ptr ptr long long ptr) @ stdcall ScriptGetFontProperties(long ptr ptr) @ stdcall ScriptGetGlyphABCWidth(ptr ptr long ptr) -@ stub ScriptGetLogicalWidths +@ stdcall ScriptGetLogicalWidths(ptr long long ptr ptr ptr ptr) @ stdcall ScriptGetProperties(ptr long) @ stdcall ScriptIsComplex(wstr long long) @ stdcall ScriptItemize(wstr long long ptr ptr ptr ptr) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8a34749..379b03e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -803,11 +803,11 @@ HINTERNET WINAPI HttpOpenRequestA(HINTERNET hHttpSession, if (lpszAcceptTypes) { /* find out how many there are */ - while (lpszAcceptTypes[acceptTypesCount]) + while (lpszAcceptTypes[acceptTypesCount] && *lpszAcceptTypes[acceptTypesCount]) acceptTypesCount++; szAcceptTypes = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR *) * (acceptTypesCount+1)); acceptTypesCount = 0; - while (lpszAcceptTypes[acceptTypesCount]) + while (lpszAcceptTypes[acceptTypesCount] && *lpszAcceptTypes[acceptTypesCount]) { len = MultiByteToWideChar(CP_ACP, 0, lpszAcceptTypes[acceptTypesCount], -1, NULL, 0 ); -- 1.4.4.3

4 5

Re: user32: WM_SETFONT on button doesn't repaint directly
by Dmitry Timoshkov 06 Feb '07

06 Feb '07

"Clinton Stimpson" <cjstimpson(a)utwire.net> wrote: > This patch fixes WM_SETFONT on a button to not paint directly. Instead, > it calls InvalidateRect. > A test is included that demonstrates that no paint events come out of > sending a WM_SETFONT. > > > Thanks, > Clinton Stimpson > > ChangeLog: > Setting font on button doesn't repaint directly. I think that your previous version of the test that called UpdateWindow and demonstrated that WM_SETFONT triggers full painting sequence was more correct. I have no idea though why it has not been accepted. Also, as a way to simplify the test there is no need to create a font, I'd suggest to use GetStockObject to retrieve a handle to one of the stock fonts. -- Dmitry.

1 0

It's that time again - time to start thinking about WineConf 2007!
by Jeremy White 06 Feb '07

06 Feb '07

So we can ask, once again: when will 1.0 ship!?!?! I'd invite anyone with an interest in attending to subscribe to the Wineconf mailing list: http://www.winehq.org/mailman/listinfo/wineconf I think an approach that makes sense is for us to discuss options as to where to hold it this year on that list, and then present either a consensus or choices back to the wine-devel list once we're done. So please come join us, particularly if you have a suggestion or preference for where it should be held! Cheers, Jeremy p.s. I think Wine will go 1.0 in the same year that is the year of Linux on the Desktop <evil grin>.

5 6

msi patch: Is this too hacky?
by Misha Koshelev 06 Feb '07

06 Feb '07

Hi, I submitted the following patch to wine-patches but was thinking about it some more. The problem is that you have the following UI levels and flags: INSTALLUILEVEL_NOCHANGE = 0, INSTALLUILEVEL_DEFAULT = 1, INSTALLUILEVEL_NONE = 2, INSTALLUILEVEL_BASIC = 3, INSTALLUILEVEL_REDUCED = 4, INSTALLUILEVEL_FULL = 5, INSTALLUILEVEL_HIDECANCEL = 0x20, INSTALLUILEVEL_PROGRESSONLY = 0x40, INSTALLUILEVEL_ENDDIALOG = 0x80, INSTALLUILEVEL_SOURCERESONLY = 0x100 and the code to check for the level was: if ( msi_get_property_int(package, szUILevel, 0) >= INSTALLUILEVEL_REDUCED) but the problem is that if any of the flags are set, then immediately this would assume full UI install even though this is not the case for some installers (see bug #6992). I proposed this change: if ( (msi_get_property_int(package, szUILevel, 0) & INSTALLUILEVEL_FULL) >= INSTALLUILEVEL_REDUCED ) It will work because INSTALLUILEVEL_FULL is 4+1 and so doing an AND operation with INSTALLUI_LEVEL FULL will be 4+1 and with INSTALLUILEVEL_REDUCED will be 4, both of which are greater than or equal to four. However, if for some reason these UI levels were to change in the future, or if someone decided to further modify this code and say, try to check for INSTALLUILEVEL_BASIC (3) they would actually be getting a 1 instead by doing INSTALLUILEVEL_BASIC & INSTALLUILEVEL_FULL. So is this too hacky? Is there a simple, better way to do this? Thanks Misha

2 2

Re: msvcrt: implement _mbbtype according to MSDN
by Dmitry Timoshkov 06 Feb '07

06 Feb '07

"Juan Lang" <juan_lang(a)yahoo.com> wrote: > /********************************************************************* > + * _mbbtype(MSVCRT.@) > + */ > +int CDECL _mbbtype(unsigned char c, int type) > +{ > + if (type == 1) > + { > + if ((c >= 0x20 && c <= 0x7e) || (c >= 0xa1 && c <= 0xdf)) > + return _MBC_SINGLE; > + else if ((c >= 0x40 && c <= 0x7e) || (c >= 0x80 && c <= 0xfc)) > + return _MBC_TRAIL; > + else > + return _MBC_ILLEGAL; > + } > + else > + { > + if ((c >= 0x20 && c <= 0x7e) || (c >= 0xa1 && c <= 0xdf)) > + return _MBC_SINGLE; > + else if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xfc)) > + return _MBC_LEAD; > + else > + return _MBC_ILLEGAL; > + } Since MSVCRT_mbctype array is not currently being initialized, probably using MSVCRT_current_ctype would be good enough for now. -- Dmitry.

1 0

Dead links
by Francois Gouget 06 Feb '07

06 Feb '07

I found some dead links on WineHQ. hat should we do about them? Does anyone want to hunt them down to see if they have simply moved elsewhere? There are also a bunch of dead links related to the Wine mailing lists. We cannot simply remove those :-( On the Wine Press page: http://www.winehq.org/site/press * Luhit July 1, 2006 - CrossOver Wine to join the party with BootCamp & Parallels http://luhit.wordpress.com/2006/07/01/mac-crossover-wine-to-join-the-party-… * OSViews September 13, 2004 - ReactOS - The Open Source Windows NT http://www.osviews.com/modules.php?op=modload&name=News&file=article&sid=14… * OSViews May 30, 2004 - SpecOpS Labs response to Wine Project http://www.osviews.com/modules.php?op=modload&name=News&file=article&sid=14… * OrangeCrate May 20, 2004 - An Interview with Jeremy White, CodeWeavers http://www.orangecrate.com/article.php?sid=710 * OSViews October 28, 2003 - Macromedia and Adobe Graphics Suites to Run on Linux http://www.osviews.com/modules.php?op=modload&name=News&file=article&sid=35… * ConsultingTimes October 17, 2002 - CodeWeavers/Xandros Deal: "Let the Revolution Begin!" http://www.consultingtimes.com/articles/codeweavers/codeweaversxandros.html And another one on the Fun Projects page: http://www.winehq.org/site/fun_projects * http://www.trolltech.com/products/qt/windows.html * http://www.winehq.org/hypermail/wine-devel/2003/01/0153.html * http://www.winehq.org/hypermail/wine-devel/2003/04/0324.html * http://www.winehq.org/hypermail/wine-patches/2002/09/0250.html * http://www.winehq.org/hypermail/wine-cvs/2003/12/0051.html And on the Winelib page there are a bunch of dead hypermail mailing list URLs. Unfortunately there appears to be no easy way to map them to the pipermail archives :-( http://www.winehq.org/site/winelib * http://www.winehq.org/hypermail/wine-devel/2004/04/0192.html * http://www.winehq.org/hypermail/wine-patches/2003/04/0237.html + 6 more * Erwin Wolff http://www.winehq.org/site/erwinwolffnl@microformatica.com And on the Resources page: http://www.winehq.org/site/resources * WinDoc http://leb.net/wine/WinDoc/ * X2 http://sunsite.lanet.lv/ftp/mirror/x2ftp/msdos/programming/00Main.html * comp.fonts http://rcum.uni-mb.si/local/fontfaq/cf_1.htm * Internet Font Archive http://rcum.uni-mb.si/local/fontfaq/cf_18.htm#GLOSS6 * Curvesoft http://www.curvesoft.com/tools.html -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ "Lotto: A tax on people who are bad at math." -- unknown "Windows: Microsoft's tax on computer illiterates." -- WE7U

4 5

Donation for your work on Direct 3D
by Mirek 06 Feb '07

06 Feb '07

Hi Stefan and Henry, i would like to send you 35 EUR or 45 USD for your work on Direct 3D in wine, how can i do that? Can you send me your account number and prefered currency? Mirek Slugeň Czech Republic

4 3

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