wine-devel August 2004

wine-devel@winehq.org

122 participants
273 discussions

New Fun Project - Winelib port of Allegiance
by Steven Edwards 18 Aug '04

18 Aug '04

Hi all, Microsoft Research has released a Shared Source version of the game Allegiance. This is a hefty 512 meg download and of course the license that it is under would prevent anyone from sharing the changes but this would really allow us to improve Winelib by porting such a massive game. http://research.microsoft.com/research/allegiance/ Grab your copy quick before they pull it down. Thanks Steven __________________________________ Do you Yahoo!? Yahoo! Mail - 50x more storage than other providers! http://promotions.yahoo.com/new_mail

1 0

Re: OLEAUT32: implementation for IPersistPropertyBag_Load for OLEFont
by Robert Shearman 18 Aug '04

18 Aug '04

Alex Villacís Lasso wrote: > This implementation is enough to satisfy VB6 when loading font objects > from property bags in projects. > > Changelog: > * Added implementation for IPersistPropertyBag_Load on OLEFont Looks good, but a few comments below: ... >+ V_VT(&valueAttr) = VT_EMPTY; > > It is probably better practice to use VariantInit here. >+ iRes = IPropertyBag_Read(pPropBag, sAttrName, &valueAttr, pErrorLog); >+ switch (iRes) { > > >+ case S_OK: >+ if (V_VT(&valueAttr) == VT_BSTR) { >+ /* Type is BSTR, use for name directly */ >+ OLEFontImpl_put_Name(this, V_BSTR(&valueAttr)); >+ >+ /* FIXME: Leaking memory here? */ >+ } else { >+ /* Don't know how to handle this type */ >+ FIXME("Name has type %d, not implemented\n", V_VT(&valueAttr)); >+ iRes = E_NOTIMPL; >+ } > Perhaps use VariantChangeType here? >+ break; >+ case E_POINTER: >+ FIXME("\tiResult = [E_POINTER]\n"); >+ break; >+ case E_INVALIDARG: >+ FIXME("\tiResult = [undef]\n"); >+ iRes = S_OK; >+ break; >+ case E_FAIL: >+ FIXME("\tiResult = [E_FAIL]\n"); >+ break; >+ } > Catch the errors you need to (why is E_INVALIDARG ok?) and either move these common debug statements to the end of the function (they should also be ERR's, not FIXME's). Also, you other unexpected errors, which is bad. >+ } >+ >+ if (iRes == S_OK) { >+ CY iSize; >+ iSize.s.Hi = 0; >+ iSize.s.Lo = 0; >+ >+ V_VT(&valueAttr) = VT_EMPTY; >+ iRes = IPropertyBag_Read(pPropBag, sAttrSize, &valueAttr, pErrorLog); >+ switch (iRes) { >+ case S_OK: >+ switch (V_VT(&valueAttr)) { >+ case VT_I2: >+ iSize.s.Lo = V_I2(&valueAttr) * 10000UL; >+ break; >+ case VT_UI2: >+ iSize.s.Lo = V_UI2(&valueAttr) * 10000UL; >+ break; >+ case VT_I4: >+ iSize.s.Lo = V_I4(&valueAttr) * 10000UL; >+ break; >+ case VT_UI4: >+ iSize.s.Lo = V_UI4(&valueAttr) * 10000UL; >+ break; >+ case VT_R4: >+ iSize.s.Lo = (ULONG)(V_R4(&valueAttr) * 10000UL); >+ break; >+ case VT_R8: >+ iSize.s.Lo = (ULONG)(V_R8(&valueAttr) * 10000UL); >+ break; > > Again, perhaps use VariantChangeType here? >+ default: >+ /* Don't know how to handle this type */ >+ FIXME("Size type %d, not implemented\n", V_VT(&valueAttr)); >+ iRes = E_NOTIMPL; >+ break; >+ } >+ if (iRes != E_NOTIMPL) IFont_put_Size(this, iSize); >+ break; >+ case E_POINTER: >+ FIXME("\tiResult = [E_POINTER]\n"); >+ break; >+ case E_INVALIDARG: >+ FIXME("\tiResult = [undef]\n"); >+ iRes = S_OK; >+ break; >+ case E_FAIL: >+ FIXME("\tiResult = [E_FAIL]\n"); >+ break; >+ } > Same comment as before about errors. >+ } >+ if (iRes == S_OK) { >+ signed short iCharset = 0; >+ >+ V_VT(&valueAttr) = VT_EMPTY; >+ iRes = IPropertyBag_Read(pPropBag, sAttrCharset, &valueAttr, pErrorLog); >+ switch (iRes) { >+ case S_OK: >+ switch (V_VT(&valueAttr)) { >+ case VT_I2: >+ if (V_I2(&valueAttr) < 0) { >+ FIXME("Unexpected value for Font Charset (%hd), using 0\n", V_I2(&valueAttr)); >+ } else { >+ iCharset = V_I2(&valueAttr); >+ } >+ break; >+ case VT_UI2: >+ if (V_UI4(&valueAttr) > 32767L) { >+ FIXME("Unexpected value for Font Charset (%ld), using 0\n", V_UI4(&valueAttr)); >+ } else { >+ iCharset = V_UI2(&valueAttr); >+ } >+ break; >+ case VT_I4: >+ if (V_I4(&valueAttr) < 0 || V_I4(&valueAttr) > 32767L) { >+ FIXME("Unexpected value for Font Charset (%ld), using 0\n", V_I4(&valueAttr)); >+ } else { >+ iCharset = V_I4(&valueAttr); >+ } >+ break; >+ case VT_UI4: >+ if (V_UI4(&valueAttr) > 32767L) { >+ FIXME("Unexpected value for Font Charset (%ld), using 0\n", V_UI4(&valueAttr)); >+ } else { >+ iCharset = V_UI4(&valueAttr); >+ } >+ break; >+ default: >+ /* Don't know how to handle this type */ >+ FIXME("Charset type %d, not implemented\n", V_VT(&valueAttr)); >+ iRes = E_NOTIMPL; > > Use VariantChangeType here and you will get all the bounds checking for free. >+ } >+ if (iRes != E_NOTIMPL) IFont_put_Charset(this, iCharset); >+ break; >+ case E_POINTER: >+ FIXME("\tiResult = [E_POINTER]\n"); >+ break; >+ case E_INVALIDARG: >+ FIXME("\tiResult = [undef]\n"); >+ iRes = S_OK; >+ break; >+ case E_FAIL: >+ FIXME("\tiResult = [E_FAIL]\n"); >+ break; >+ } >+ } >+ >+ if (iRes == S_OK) { >+ signed short iWeight = FW_NORMAL; >+ >+ V_VT(&valueAttr) = VT_EMPTY; >+ iRes = IPropertyBag_Read(pPropBag, sAttrWeight, &valueAttr, pErrorLog); >+ switch (iRes) { >+ case S_OK: >+ switch (V_VT(&valueAttr)) { >+ case VT_I2: >+ if (V_I2(&valueAttr) < 0) { >+ FIXME("Unexpected value for Font Weight (%hd), using FW_NORMAL\n", V_I2(&valueAttr)); >+ } else { >+ iWeight = V_I2(&valueAttr); >+ } >+ break; >+ case VT_UI2: >+ if (V_UI4(&valueAttr) > 32767L) { >+ FIXME("Unexpected value for Font Weight (%ld), using FW_NORMAL\n", V_UI4(&valueAttr)); >+ } else { >+ iWeight = V_UI2(&valueAttr); >+ } >+ break; >+ case VT_I4: >+ if (V_I4(&valueAttr) < 0 || V_I4(&valueAttr) > 32767L) { >+ FIXME("Unexpected value for Font Weight (%ld), using FW_NORMAL\n", V_I4(&valueAttr)); >+ } else { >+ iWeight = V_I4(&valueAttr); >+ } >+ break; >+ case VT_UI4: >+ if (V_UI4(&valueAttr) > 32767L) { >+ FIXME("Unexpected value for Font Weight (%ld), using FW_NORMAL\n", V_UI4(&valueAttr)); >+ } else { >+ iWeight = V_UI4(&valueAttr); >+ } >+ break; >+ default: >+ /* Don't know how to handle this type */ >+ FIXME("Weight type %d, not implemented\n", V_VT(&valueAttr)); >+ iRes = E_NOTIMPL; >+ } > Again, use VariantChangeType. >+ if (iRes != E_NOTIMPL) IFont_put_Weight(this, iWeight); >+ break; >+ case E_POINTER: >+ FIXME("\tiResult = [E_POINTER]\n"); >+ break; >+ case E_INVALIDARG: >+ FIXME("\tiResult = [undef]\n"); >+ iRes = S_OK; >+ break; >+ case E_FAIL: >+ FIXME("\tiResult = [E_FAIL]\n"); >+ break; >+ } >+ } >+ >+ if (iRes == S_OK) { >+ BOOL bUnderline = FALSE; >+ >+ V_VT(&valueAttr) = VT_EMPTY; >+ iRes = IPropertyBag_Read(pPropBag, sAttrUnderline, &valueAttr, pErrorLog); >+ switch (iRes) { >+ case S_OK: >+ switch (V_VT(&valueAttr)) { >+ case VT_I2: >+ bUnderline = V_I2(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_I4: >+ bUnderline = V_I4(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_UI2: >+ bUnderline = V_UI2(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_UI4: >+ bUnderline = V_UI4(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_BOOL: >+ bUnderline = V_BOOL(&valueAttr); >+ break; >+ default: >+ /* Don't know how to handle this type */ >+ FIXME("Underline type %d, not implemented\n", V_VT(&valueAttr)); >+ iRes = E_NOTIMPL; >+ break; >+ } > Again, VariantChangeType. >+ if (iRes != E_NOTIMPL) IFont_put_Underline(this, bUnderline); >+ break; >+ case E_POINTER: >+ FIXME("\tiResult = [E_POINTER]\n"); >+ break; >+ case E_INVALIDARG: >+ FIXME("\tiResult = [undef]\n"); >+ iRes = S_OK; >+ break; >+ case E_FAIL: >+ FIXME("\tiResult = [E_FAIL]\n"); >+ break; >+ } >+ } >+ >+ if (iRes == S_OK) { >+ BOOL bItalic = FALSE; >+ >+ V_VT(&valueAttr) = VT_EMPTY; >+ iRes = IPropertyBag_Read(pPropBag, sAttrItalic, &valueAttr, pErrorLog); >+ switch (iRes) { >+ case S_OK: >+ switch (V_VT(&valueAttr)) { >+ case VT_I2: >+ bItalic = V_I2(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_I4: >+ bItalic = V_I4(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_UI2: >+ bItalic = V_UI2(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_UI4: >+ bItalic = V_UI4(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_BOOL: >+ bItalic = V_BOOL(&valueAttr); >+ break; >+ default: >+ /* Don't know how to handle this type */ >+ FIXME("Italic type %d, not implemented\n", V_VT(&valueAttr)); >+ iRes = E_NOTIMPL; >+ break; >+ } > Again, use VariantChangeType. >+ if (iRes != E_NOTIMPL) IFont_put_Italic(this, bItalic); >+ break; >+ case E_POINTER: >+ FIXME("\tiResult = [E_POINTER]\n"); >+ break; >+ case E_INVALIDARG: >+ FIXME("\tiResult = [undef]\n"); >+ iRes = S_OK; >+ break; >+ case E_FAIL: >+ FIXME("\tiResult = [E_FAIL]\n"); >+ break; >+ } >+ } >+ >+ if (iRes == S_OK) { >+ BOOL bStrikethrough = FALSE; >+ >+ V_VT(&valueAttr) = VT_EMPTY; >+ iRes = IPropertyBag_Read(pPropBag, sAttrStrikethrough, &valueAttr, pErrorLog); >+ switch (iRes) { >+ case S_OK: >+ switch (V_VT(&valueAttr)) { >+ case VT_I2: >+ bStrikethrough = V_I2(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_I4: >+ bStrikethrough = V_I4(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_UI2: >+ bStrikethrough = V_UI2(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_UI4: >+ bStrikethrough = V_UI4(&valueAttr) ? TRUE : FALSE; >+ break; >+ case VT_BOOL: >+ bStrikethrough = V_BOOL(&valueAttr); >+ break; >+ default: >+ /* Don't know how to handle this type */ >+ FIXME("Strikethrough type %d, not implemented\n", V_VT(&valueAttr)); >+ iRes = E_NOTIMPL; >+ break; >+ } > > Again, use VariantChangeType. >+ if (iRes != E_NOTIMPL) IFont_put_Strikethrough(this, bStrikethrough); >+ break; >+ case E_POINTER: >+ FIXME("\tiResult = [E_POINTER]\n"); >+ break; >+ case E_INVALIDARG: >+ FIXME("\tiResult = [undef]\n"); >+ iRes = S_OK; >+ break; >+ case E_FAIL: >+ FIXME("\tiResult = [E_FAIL]\n"); >+ break; >+ } >+ } >+ return iRes; > } > > static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Save( > > Thanks, Rob

1 0

Re: Some more hardcoded c:\windows paths
by Juan Lang 18 Aug '04

18 Aug '04

Vincent wrote: > Any idea why CSIDL_PROGRAMS was HKEY_DISALLOWED? That, apparently, was my mistake. I introduced it here: http://www.winehq.org/hypermail/wine-patches/2004/04/0106.html Thanks for fixing it. --Juan __________________________________ Do you Yahoo!? New and Improved Yahoo! Mail - Send 10MB messages! http://promotions.yahoo.com/new_mail

1 0

Re: WineSetupTk...
by Ivan Leo Puoti 18 Aug '04

18 Aug '04

> I doubt there's a one maintainer Nobody maintains it because it's obsolete and isn't used with current versions of wine. Ivan.

1 0

Re: WineSetupTk...
by Mike Hearn 18 Aug '04

18 Aug '04

> I didn't realize that WineSetupTk was depreciated when I wrote. I just want to > play StarCraft and Diablo and was finding the documentation a bit hard to > follow. (I couldn't find my .wine.conf file and got stuck, that's why I > thought I needed WineSetupTk.) I will poke at it a bit myself and if I can > figure out how it works, maybe then I can make a suggestion or two for > clearing up the documentation. (Who maintains the documentation, BTW?) OK, what specifically were you trying to configure. Our aim (obviously) is that StarCraft and such should work out of the box with no configuration needed.

2 1

"winetest" throws an exception after the unsuccessful send operation
by Saulius Krasuckas 18 Aug '04

18 Aug '04

I am getting this after all the tests were performed, network transfer of the report file was over and after the http server has responded (with some error-message) in Wine: err:win:WIN_FindWndPtr window 0x10022 belongs to other process err:win:WIN_FindWndPtr window 0x10022 belongs to other process wine: Unhandled exception (thread 000b), starting debugger... fixme:console:SetConsoleCtrlHandler (0x4067a644,1) - no error checking or testing yet WineDbg starting on pid 0xa Unhandled exception: page fault on read access to 0xffe5024c in 32-bit code (0x40045cf2). In 32 bit mode. 0x40045cf2 pthread_mutex_lock in libpthread.so.0: movl 0xc(%edi),%eax Wine-dbg>bt Backtrace: =>1 0x40045cf2 pthread_mutex_lock+0x12 in libpthread.so.0 (0x40c0fe28) 2 0x42075bea free+0x9a in libc.so.6 (0x40c0fe48) 3 0x4065753a send_file+0x362(name=0x781e4a80) [send.c:217] in winetest (0x40c0fe78) 4 0x40656f2e .L256+0xde in winetest (0x40c0fe9c) 5 0x4065511c __wine_exe_main+0x11c in winetest (0x40c0ff2c) 6 0x403a101a start_process+0xf2(arg=0x0) [process.c:995] in kernel32 (0x40c0fff4) 7 0x4002a8cd wine_switch_to_stack+0x11 in libwine.so.1 (0x00000000) And the error message in the message-box looks like this: Can't submit logfile '/tmp/rescVOMCP'. Server response: <!DOCTYPE HTML PUBLIC"... ... <title>500 Internal Server Error</title> ... <p>The server encountered an internal error or misconfiguration and was unable to complete your request.</p> ... <address>Apache 2.0.40 Server at test.winehq.org Port 80</address> <body><html> Back to the code. Excerpts from the programs/winetest/send.c: > unsigned char *buffer; ... > buffer = xmalloc (BUFLEN + 1); ... > if (ret) { > buffer[total] = 0; > str = strstr (buffer, "\r\n\r\n"); > if (str) buffer = str + 4; > report (R_ERROR, "Can't submit logfile '%s'. " > "Server response: %s", name, buffer); > } > free (buffer); Is it OK to try to free the modified "buffer" ptr? I thought we should preserve its value. We can use the "str" instead of the "buffer". I've tried such mod and it worked fine in my case: --- wine/programs/winetest/send.c 6 Jul 2004 21:03:22 -0000 1.12 +++ wine/programs/winetest/send.c 18 Aug 2004 07:41:24 -0000 @@ -209,9 +209,9 @@ if (ret) { buffer[total] = 0; str = strstr (buffer, "\r\n\r\n"); - if (str) buffer = str + 4; + str = (str)?(str + 4):(buffer); report (R_ERROR, "Can't submit logfile '%s'. " - "Server response: %s", name, buffer); + "Server response: %s", name, str); } free (buffer); return ret; Should I submit it to the wine-patches or I am wrong with it?

2 3

Re: WineSetupTk...
by Ivan Leo Puoti 18 Aug '04

18 Aug '04

>Ivan, do we need to remove links to sourceforge since its no longer >available? Actually iy is, but it isn't listed on the download page. Like all files on sf, you can't remove a release, but you can hide it. >I would guess so.. So do you want to do it or me? I'll send in a patch. Ivan.

1 0

Re: More winecfg todos
by Jacek Caban 18 Aug '04

18 Aug '04

> You probably want to increase the size of the drive mappings list so it > fills the tab, currently there is just a lot of empty space at the top of > the pane now you removed the old stuff. I have almost ready patch. I've attached screenshot. Is it a good idea? Thanks, Jacek

6 15

Interesting bug
by Mike Hearn 18 Aug '04

18 Aug '04

From the appdb: ----------------------------------------------------------------------- * SAVE FOR WEB Solution* : Well, after a fair amount of trail-and-error testing, I have FINALLY found what WILL or WONT allow Save-For-Web to work... It actually is how you execute Photoshop.exe ... if you try to run it with forward slashes in the path, Save for Web will NOT work. If you execute with backslashes, Save for Web WILL work. So... Save for Web works with: wine "c:\program files\adobe\Photoshop 7.0\Photoshop.exe" Save for Web WILL NOT work with: wine "c:/program files/adobe/Photoshop 7.0/Photoshop.exe" Enjoy! Hiji ----------------------------------------------------------------------- I don't have Photoshop here, but perhaps we should ensure that argv[0] and equivalents always use backslashes?

2 1

Re: winealsa dsound capture message patch
by Alexandre Julliard 18 Aug '04

18 Aug '04

Robert Reif <reif(a)earthlink.net> writes: > Adds missing wine specific dsound capture message support. This patch causes the dsound capture test to hang for me. Here's the output I get before killing it: capture.c:230:Testing Primary Sound Capture Driver - winealsa.drv fixme:wave:widDsCreate DirectSoundCapture not implemented The (slower) DirectSound HEL mode will be used instead. capture.c:256: DirectSoundCapture Caps: size=16 flags=0x00000020 formats=fffff channels=2 capture.c:331: Testing the capture buffer at 8000x8x1 PCM capture.c:123: Caps: size = 16 flags=0x00000000 buffer size=8000 capture.c:142: tag=0x0001 8000x8x1 avg.B/s=8000 align=1 capture.c:154: status=0x0000 -- Alexandre Julliard julliard(a)winehq.org

2 1

← Newer
1
...
11
12
13
14
15
16
17
...
28
Older →

Jump to page:

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 August 2004