- wine-devel - winehq.org

Re: PATCH: more capabilities for linux/cpu flags
by Philipp Wollermann 29 Jun '03

29 Jun '03

Hi, according to MSDN (http://msdn.microsoft.com/library/default.asp?url=/library/en-us/sysinfo/ba se/isprocessorfeaturepresent.asp): PF_XMMI_INSTRUCTIONS_AVAILABLE The SSE instruction set is available. PF_XMMI64_INSTRUCTIONS_AVAILABLE The SSE2 instruction set is available. Philipp ----- Original Message ----- From: "Marcus Meissner" <marcus(a)jet.franken.de> To: <wine-patches(a)winehq.com> Sent: Sunday, June 29, 2003 12:35 PM Subject: PATCH: more capabilities for linux/cpu flags > Hi, > > This adds 2 more checks for PF_xxx flag CPU detection for Linux. > > Ciao, Marcus > > Changelog: > Add tests for PF_AMD3D and PF_XMMI instructions. (Not sure if > XMMI instructions are SSE or SSE2). > > Index: misc/cpu.c > =================================================================== > RCS file: /home/wine/wine/misc/cpu.c,v > retrieving revision 1.32 > diff -u -r1.32 cpu.c > --- misc/cpu.c 21 May 2003 18:24:34 -0000 1.32 > +++ misc/cpu.c 29 Jun 2003 10:32:11 -0000 > @@ -315,6 +315,13 @@ > PF[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE; > if (strstr(value,"tsc")) > PF[PF_RDTSC_INSTRUCTION_AVAILABLE] = TRUE; > + if (strstr(value,"3dnow")) > + PF[PF_AMD3D_INSTRUCTIONS_AVAILABLE] = TRUE; > + /* Not sure if XMMI is sse2 or sse, stay on > + * the safe side. > + */ > + if (strstr(value,"sse2")) > + PF[PF_XMMI_INSTRUCTIONS_AVAILABLE] = TRUE; > > } > } >

1 0

link updates #4
by Tom Wickline 29 Jun '03

29 Jun '03

Hello, With these three fixes all failed urls are fixed and there is only one issue of WWN in the past 13 weeks that has a failed url. The fixes to cvs.shtml, opengl-problems.shtml, wine-debugger.shtml are in #2 and #3. I was going to try and fix most/all the WWN links but after looking into this I see it could be a time consuming task. And i'm not sure how substantial the end benefit would really be.. Anyone have any comments about this ? If you guy's think its a good thing ill fix as many as I can.. If you think its a no win situation I will just look at the past 13 issues in the future.. Tom

1 0

Re: Localization to portuguese (Take IV - the last)
by Tom 29 Jun '03

29 Jun '03

Marcelo Duarte wrote: >Pardon, pardon, pardon.... but the third was missing a new file and generate a >compilation error. Now I do a complete test. This is the last, I promisse. >I'm going to sleep. > > May I ask where the patch is ? Tom

1 0

removal of duplicated / out of date work
by Tom 29 Jun '03

29 Jun '03

Hi, I was looking through /wine/documentation and there is a old faq in there faq.sgml and the old status directory and after looking at cvs : http://cvs.winehq.com/cvsweb/wine/documentation/status/ it looks as most of this is 4 years old. Is any of this going to be removed in the future ? Tom

1 0

Re: PATCH: dlls/commdlg/printdlg.c add casts
by Mike Hearn 28 Jun '03

28 Jun '03

On Sat, 28 Jun 2003 09:46:35 +0200, Sir Gerald Pfeifer scribed thus: > The following patch to dlls/commdlg/printdlg.c > > revision 1.66 > date: 2003/06/27 22:21:06; author: julliard; state: Exp; lines: +4 -7 > Mike Hearn <m.hearn(a)signal.qinetiq.com> > Store PrintStructures in a window property instead of extra window bytes. > > cause two new warnings > > printdlg.c:2056: warning: passing arg 2 of `GetPropW' from incompatible pointer type > printdlg.c:2061: warning: passing arg 2 of `SetPropW' from incompatible pointer type Odd, I don't remember getting those. Perhaps I just didn't notice. In future I'll try and remember to compile with -Werror before submitting. In this case I think it's mostly academic as the string doesn't have any non ANSI characters in it, but I think another solution might be to put an L before the string, so it becomes: SetPropW(hDlg, L"__WINE_WHATEVER"....)

3 5

Fw: CVS Install error: version mismatch 113/109
by BiGgUn 28 Jun '03

28 Jun '03

Hi I have got exactly the same error. This is what i have done to solve it: 1/ Kill all wineserver instances killall wineserver 2/ Kill all wine instances killall wine 3/ Recompile my lastest wine sources make depend && make && make install It did work for me. HTH Stephan

1 0

Re: XEMBED System tray support
by Mike Hearn 28 Jun '03

28 Jun '03

This one has been dropped a couple of times now. Anything I need to do to it (other than the obvious cosmetic improvements/work around gnome bugs etc) On Mon, 2003-06-23 at 20:53, Mike Hearn wrote: > bump > > ChangeLog: > Implement XEMBED based system tray support for KDE 3.1+ and GNOME 2.2+

1 0

imagehlp.h question - building with Mingw or MS_VC headers
by Steven Edwards 27 Jun '03

27 Jun '03

around line 560 in imagehlp.h we have this /*********************************************************************** * Wine specific */ extern HANDLE IMAGEHLP_hHeap; Can this be moved to a internal header or done in some other way so we can build with other headers? Thanks Steven

2 1

Re: PATCH: dosmem access via ReadProcessMemory
by Alexandre Julliard 27 Jun '03

27 Jun '03

Marcus Meissner <meissner(a)suse.de> writes: > An EEPROM programmer from BP Microsystems uses ReadProcessMemory to access > the BIOS data segment (to find out parallel ports). What happens if you run it with Windows version set to NT? -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: RFC: dsound patch
by Robert Reif 27 Jun '03

27 Jun '03

I just sent a rather large patch to wine-patches that addresses a number of 3D sound problems and also fixes a problem I was having when switching between sound cards quickly. I added more tests for 3D, COM and reference counts and have run the tests on win2k with dx8.1 with the same results. I have also tested with the sample programs from the DX8 SDK. Please test it with real apps and send me feedback. Thanks, Bob.

1 0

Wine Status Changelog
by Tom 27 Jun '03

27 Jun '03

Hello, Here is what I have for the Changelog thus far. There is 49 entries so far and I could have over looked something. If anything is out of place, incorrect just let me know and ill fix it. Tom

4 7

[Patch] dlls/oleaut32/typelib.c - Via a CVS search, reverse regression to get Kazza working
by Stefan Jones 26 Jun '03

26 Jun '03

On upgrading to Wine 20030618 I found that kazaa lite will no longer work and gave me the following error: No debug information in 32bit DLL 'C:\WINDOWS\SYSTEM\SHDOCVW.DLL' (0x71000000) Unhandled exception: page fault on read access to 0x00000004 in 32-bit code (0x411ed9c9). In 32-bit mode. 0x411ed9c9 (ITypeInfo_fnGetContainingTypeLib+0x49 [typelib.c:4801] in oleaut32.dll.so): call *0x4(%edx) 4802 TRACE("returning ppTLib=%p", *ppTLib); Wine-dbg>WineDbg terminated on pid a using in wine.config: [AppDefaults\\KazaaLite.kpp\\DllOverrides] "*" = "builtin, native, so" ;"shdoclc" = "native" "shdocvw" = "native" "shlwapi" = "native" "commctrl" = "native" ;"comdlg32" = "native" I looked though the CVS logs and mail archives and I found the following: http://www.winehq.org/hypermail/wine-devel/2003/06/0414.html and the patch below which was applied to dlls/oleaut32/typelib.c This caused the crash, reversing it fixes the error. please fix / apply, or I will cry!!! anyway, how do you use winedbg, I am not thick but it refuses to do normal gdb stuff like the run command or a backtrace! Is there a URL I missed? Stefan revision 1.95 date: 2003/05/13 22:15:26; author: julliard; state: Exp; lines: +0 -2 Dmitry Timoshkov <dmitry(a)codeweavers.com> Remove redundant ITypeLib2_AddRef's. Makes LoadTypeLib/ITypeLib2_Release work. Index: typelib.c =================================================================== RCS file: /home/wine/wine/dlls/oleaut32/typelib.c,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- typelib.c 13 May 2003 00:41:58 -0000 1.94 +++ typelib.c 13 May 2003 22:15:26 -0000 1.95 @@ -1844,7 +1844,6 @@ pcx->pTblDir->pTypeInfoTab.offset+count*sizeof(tiBase)); /* this is where we are coming from */ ptiRet->pTypeLib = pLibInfo; - ITypeLib2_AddRef((ITypeLib2 *)pLibInfo); ptiRet->index=count; /* fill in the typeattr fields */ FIXME("Assign constructor/destructor memid\n"); @@ -3055,7 +3054,6 @@ } *ppTypeInfoImpl = (ITypeInfoImpl*)ITypeInfo_Constructor(); (*ppTypeInfoImpl)->pTypeLib = pTypeLibImpl; - ITypeLib2_AddRef((ITypeLib2 *)pTypeLibImpl); (*ppTypeInfoImpl)->index = i; (*ppTypeInfoImpl)->Name = TLB_MultiByteToBSTR( pOtherTypeInfoBlks[i].name_offs +

1 0

Re: winedos / Preparing for DPMI IRQs
by Sylvain Petreolle 26 Jun '03

26 Jun '03

Hi, Could you give examples of what has been enabled here ? I will be happy to do tests if some free programs uses this. ===== Sylvain Petreolle (spetreolle at users dot sourceforge dot net) ICQ #170597259 "What if tomorrow the War could be over ?" Morpheus, in "Reloaded". For the Law of Oil and Fire, Im an European that lives in France. For all my Brothers and friends, Im a human living on Earth. ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

3 7

Wintab: Update on debugging & demo patch.
by Robert North 26 Jun '03

26 Jun '03

Ok, Firstly, I'm including a patch that demonstrates fixes to the crashing in Painter, and the recursion in Photoshop. The patch assumes that you have already applied Aric's patch from April 23rd. I'd like feedback on wether the patch is OK, as it was generated on from my local subversion repository, not CVS. Please bear in mind that the code is designed as quick demonstration fixes, not for quality code. Having said that comments are welcome. ******** Secondly, I've done some more investigation into why Photoshop was not seeing tablet pressure. It turns out that this is due to Photoshop requesting tablet events from the desktop window. In the x11drv/event.c file, X11 events are interrogated, and the X11 window converted to a win32 window. This is done using the X11 feature of contexts: Application specific info mapping from an X11 window to user defined value. It appears that the X11 window has no X11 context, and therefore the XInput event handler is passed a hWnd of NULL. This causes the FindOpenContext not match any context. (Hence the recursion) Without a context, no event is posted (Hence the lack of pressure info) Here's a typical debug trace showing the problem: trace:event:EVENT_ProcessEvent called. trace:event:EVENT_ProcessEvent Got extention event for hwnd/window (nil)/37, GetFocus()=0x40042 trace:event:X11DRV_ProcessTabletEvent Recieved tablet motion event ((nil)) trace:wintab32:X11DRV_ProcessTabletEvent Recieved tablet motion event ((nil)) trace:wintab32:WTPacketsPeek (0xc00, 64, 0x43c828c4) trace:wintab32:WTPacketsGet (0xc00, 64, 0x1098388) trace:wintab32:TABLET_WindowProc Incomming Message 0x7ff0 (0x00000000, 0x00000000) trace:wintab32:AddPacketToContextQueue Trying Queue c00 (0 10020) trace:wintab32:AddPacketToContextQueue Done ((nil)) ******** Thirdly, I've found out why Painter wasn't scaling correctly. There appear to be 2 issues. a. Tablet coordinates should be relative to the window the wintab context is attached to. Currently they are absoloute. b. The default system context as returned by WTInfo contains zero in the lcSysExtX,lcSysExtY fields These fields should contain the I know how to fix the above problems, and will do so. P.S. Aric, I can now see the race condtion problem you were talking about in Painter. Cheers -Rob. Index: dlls/wintab32/context.c =================================================================== --- dlls/wintab32/context.c (.../file:///usr/local/svnroot/wine/trunk) (revision 73) +++ dlls/wintab32/context.c (revision 73) @@ -3,6 +3,7 @@ * * Copyright 2002 Patrik Stridvall * Copyright 2003 Codeweavers, Aric Stewart + * Copyright 2003 Robert North * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -168,11 +169,16 @@ ptr = gOpenContexts; while (ptr) { - TRACE("Trying Context %lx (%x %x)\n",(LONG)ptr->handle,(INT)hwnd, + TRACE("Trying Context %lx hwnd(%x %x)\n",(LONG)ptr->handle,(INT)hwnd, (INT)ptr->hwndOwner); - if (ptr->hwndOwner == hwnd) + if (ptr->hwndOwner == hwnd) return ptr; + /* Rob 19-6-2003 Added recursion down pointer chein. + to avoid infinite loop. + Use TABLET_FindOpenContext as template. + */ + ptr = ptr->next; } return NULL; } @@ -251,7 +257,13 @@ int static inline CopyTabletData(LPVOID target, LPVOID src, INT size) { - memcpy(target,src,size); +/* + Rob 19-6-2003 + Return size only, if target is NULL: + Was causing horrible crashes in MetaCreation's Painter 5. +*/ + if(target != NULL) + memcpy(target,src,size); return(size); } @@ -318,39 +330,42 @@ static VOID TABLET_BlankPacketData(LPOPENCONTEXT context, LPVOID lpPkt, INT n) { - int rc = 0; + if(lpPkt != NULL) + { + int rc = 0; - if (context->context.lcPktData & PK_CONTEXT) - rc +=sizeof(HCTX); - if (context->context.lcPktData & PK_STATUS) - rc +=sizeof(UINT); - if (context->context.lcPktData & PK_TIME) - rc += sizeof(LONG); - if (context->context.lcPktData & PK_CHANGED) - rc += sizeof(WTPKT); - if (context->context.lcPktData & PK_SERIAL_NUMBER) - rc += sizeof(UINT); - if (context->context.lcPktData & PK_CURSOR) - rc += sizeof(UINT); - if (context->context.lcPktData & PK_BUTTONS) - rc += sizeof(DWORD); - if (context->context.lcPktData & PK_X) - rc += sizeof(DWORD); - if (context->context.lcPktData & PK_Y) - rc += sizeof(DWORD); - if (context->context.lcPktData & PK_Z) - rc += sizeof(DWORD); - if (context->context.lcPktData & PK_NORMAL_PRESSURE) - rc += sizeof(UINT); - if (context->context.lcPktData & PK_TANGENT_PRESSURE) - rc += sizeof(UINT); - if (context->context.lcPktData & PK_ORIENTATION) - rc += sizeof(ORIENTATION); - if (context->context.lcPktData & PK_ROTATION) - rc += sizeof(ROTATION); + if (context->context.lcPktData & PK_CONTEXT) + rc +=sizeof(HCTX); + if (context->context.lcPktData & PK_STATUS) + rc +=sizeof(UINT); + if (context->context.lcPktData & PK_TIME) + rc += sizeof(LONG); + if (context->context.lcPktData & PK_CHANGED) + rc += sizeof(WTPKT); + if (context->context.lcPktData & PK_SERIAL_NUMBER) + rc += sizeof(UINT); + if (context->context.lcPktData & PK_CURSOR) + rc += sizeof(UINT); + if (context->context.lcPktData & PK_BUTTONS) + rc += sizeof(DWORD); + if (context->context.lcPktData & PK_X) + rc += sizeof(DWORD); + if (context->context.lcPktData & PK_Y) + rc += sizeof(DWORD); + if (context->context.lcPktData & PK_Z) + rc += sizeof(DWORD); + if (context->context.lcPktData & PK_NORMAL_PRESSURE) + rc += sizeof(UINT); + if (context->context.lcPktData & PK_TANGENT_PRESSURE) + rc += sizeof(UINT); + if (context->context.lcPktData & PK_ORIENTATION) + rc += sizeof(ORIENTATION); + if (context->context.lcPktData & PK_ROTATION) + rc += sizeof(ROTATION); - rc *= n; - memset(lpPkt,0,rc); + rc *= n; + memset(lpPkt,0,rc); + } } @@ -856,7 +871,14 @@ */ int WINAPI WTPacketsGet(HCTX hCtx, int cMaxPkts, LPVOID lpPkts) { - int limit; + /* + Rob 19-6-2003 + WTPacketsGet fails with lpPkts set to NULL. + TO DO: Handle null condition. + Null condition flushes queue (Of Max packets????) + */ + int limit = 0; + int maxPktsToGet; LPOPENCONTEXT context; LPVOID ptr = lpPkts; @@ -872,15 +894,20 @@ return 0; } - for(limit = 0; limit < cMaxPkts && limit < context->PacketsQueued; limit++) + maxPktsToGet = min(cMaxPkts,context->PacketsQueued); + if(lpPkts != NULL) + { + for(limit = 0; limit < maxPktsToGet; limit++) ptr=TABLET_CopyPacketData(context ,ptr, &context->PacketQueue[limit]); - - if (limit < context->PacketsQueued) + } + + if (maxPktsToGet < context->PacketsQueued) { - memcpy(context->PacketQueue, &context->PacketQueue[limit], - (context->QueueSize - (limit))*sizeof(WTPACKET)); + /* TO DO: Wrong function mem areas overlap. should use memmove*/ + memmove(context->PacketQueue, &context->PacketQueue[maxPktsToGet], + (context->QueueSize - (maxPktsToGet))*sizeof(WTPACKET)); } - context->PacketsQueued -= limit; + context->PacketsQueued -= maxPktsToGet; LeaveCriticalSection(&csTablet); TRACE("Copied %i packets\n",limit); @@ -911,7 +938,7 @@ if ((rc+1) < context->QueueSize) { - memcpy(context->PacketQueue, &context->PacketQueue[rc+1], + memmove(context->PacketQueue, &context->PacketQueue[rc+1], (context->QueueSize - (rc+1))*sizeof(WTPACKET)); } context->PacketsQueued -= (rc+1); @@ -1080,7 +1107,7 @@ for (limit = 0; limit < cMaxPkts && limit < context->PacketsQueued; limit++) ptr = TABLET_CopyPacketData(context ,ptr, &context->PacketQueue[limit]); - + LeaveCriticalSection(&csTablet); TRACE("Copied %i packets\n",limit); return limit; @@ -1099,7 +1126,7 @@ UINT num = 0; TRACE("(%p, %u, %u, %d, %p, %p)\n", - hCtx, wBegin, wEnd, cMaxPkts, lpPkts, lpNPkts); + hCtx, wBegin, wEnd, cMaxPkts, lpPkts, lpNPkts); context = TABLET_FindOpenContext(hCtx); @@ -1130,7 +1157,7 @@ /* remove read packets */ if ((end+1) < context->PacketsQueued) - memcpy( &context->PacketQueue[bgn], &context->PacketQueue[end+1], + memmove( &context->PacketQueue[bgn], &context->PacketQueue[end+1], (context->PacketsQueued - ((end-bgn)+1)) * sizeof (WTPACKET)); context->PacketsQueued -= ((end-bgn)+1);

2 2

Wine Status DLL's #2
by Tom 26 Jun '03

26 Jun '03

Here is #2 any one have any comments ? Tom

3 4

Re: Mac OS X Support : Asm syntax support
by Marcus Meissner 26 Jun '03

26 Jun '03

On Wed, Jun 25, 2003 at 02:32:29PM +0200, Pierre d'Herbemont wrote: > Hi, > > Here is a patch which should add support for Mac OS X ppc asm syntax, > and some Mach-O quirk (like text section). > I hope it will be ok. It mainly relay on Macro which are stored in > build.h (any better place?). > > Cheers, > > Pierre > > ChangeLog: > - Add support for Mac OS X assembler syntax This needs 2 places fixed: > +# define LD_SECTION_TEXT ".section \".text\"" Should be # define LD_SECTION_TEXT ".section \\\".text\\\"" and: > +# define PPC_LOW(mem,index) "(" mem ")@l(##index)" should be: # define PPC_LOW(mem,index) "(" mem ")@l(" #index ")" Ciao, Marcus

2 1

PATCH - comdlg32 filedlg win16/32 split
by Steven Edwards 26 Jun '03

26 Jun '03

Hello, Well this is it. Other then in the print dialogs all of the internal Win16isms are GONE!!!! In a few days I will start on the print dialogs again. Now if only it will work =) Thanks Steven Changelog: Remove calls to FindResource16, FreeResource16, GlobalAlloc16, GlobalFree16 GlobalLock16, GlobalUnLock16, LoadResource16 when building as a 32 bit dll. Create new internal functions FILEDLG_MapOfnStruct16 and FILEDLG_DestroyPrivate16. Share a few other internal functions with the 16 bit commdlg. Index: filedlg.h =================================================================== RCS file: /home/wine/wine/dlls/commdlg/filedlg.h,v retrieving revision 1.2 diff -u -r1.2 filedlg.h --- filedlg.h 24 Jun 2003 19:24:29 -0000 1.2 +++ filedlg.h 26 Jun 2003 01:43:40 -0000 @@ -60,6 +60,7 @@ LPWSTR FILEDLG_GetFileType(LPWSTR cfptr, LPWSTR fptr, WORD index); void FILEDLG_MapDrawItemStruct(LPDRAWITEMSTRUCT16 lpdis16, LPDRAWITEMSTRUCT lpdis); +void FILEDLG_MapOfnStructA(LPOPENFILENAMEA ofnA, LPOPENFILENAMEW ofnW, BOOL open); BOOL FILEDLG_ScanDir(HWND hWnd, LPWSTR newPath); LONG FILEDLG_WMDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam, int savedlg, LPDRAWITEMSTRUCT lpdis); Index: filedlg.c =================================================================== RCS file: /home/wine/wine/dlls/commdlg/filedlg.c,v retrieving revision 1.64 diff -u -r1.64 filedlg.c --- filedlg.c 24 Jun 2003 19:24:29 -0000 1.64 +++ filedlg.c 26 Jun 2003 01:43:48 -0000 @@ -155,81 +155,6 @@ return TRUE; } - -/*********************************************************************** - * Get16BitsTemplate [internal] - * - * Get a template (FALSE if failure) when 16 bits dialogs are used - * by a 16 bits application - * - */ -BOOL Get16BitsTemplate(LFSPRIVATE lfs) -{ - LPOPENFILENAME16 ofn16 = lfs->ofn16; - LPCVOID template; - HGLOBAL16 hGlobal16 = 0; - - if (ofn16->Flags & OFN_ENABLETEMPLATEHANDLE) - lfs->hDlgTmpl16 = ofn16->hInstance; - else if (ofn16->Flags & OFN_ENABLETEMPLATE) - { - HANDLE16 hResInfo; - if (!(hResInfo = FindResource16(ofn16->hInstance, - MapSL(ofn16->lpTemplateName), - RT_DIALOGA))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); - return FALSE; - } - if (!(lfs->hDlgTmpl16 = LoadResource16( ofn16->hInstance, hResInfo ))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); - return FALSE; - } - lfs->hResource16 = lfs->hDlgTmpl16; - } - else - { /* get resource from (32 bits) own Wine resource; convert it to 16 */ - HRSRC hResInfo; - HGLOBAL hDlgTmpl32; - LPCVOID template32; - DWORD size; - - if (!(hResInfo = FindResourceA(COMDLG32_hInstance, - lfs->open ? "OPEN_FILE":"SAVE_FILE", RT_DIALOGA))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); - return FALSE; - } - if (!(hDlgTmpl32 = LoadResource(COMDLG32_hInstance, hResInfo )) || - !(template32 = LockResource( hDlgTmpl32 ))) - { - COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); - return FALSE; - } - size = SizeofResource(GetModuleHandleA("COMDLG32"), hResInfo); - hGlobal16 = GlobalAlloc16(0, size); - if (!hGlobal16) - { - COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE); - ERR("alloc failure for %ld bytes\n", size); - return FALSE; - } - template = GlobalLock16(hGlobal16); - if (!template) - { - COMDLG32_SetCommDlgExtendedError(CDERR_MEMLOCKFAILURE); - ERR("global lock failure for %x handle\n", hGlobal16); - GlobalFree16(hGlobal16); - return FALSE; - } - ConvertDialog32To16((LPVOID)template32, size, (LPVOID)template); - lfs->hDlgTmpl16 = hGlobal16; - lfs->hGlobal16 = hGlobal16; - } - return TRUE; -} - /*********************************************************************** * FILEDLG_StripEditControl [internal] * Strip pathnames off the contents of the edit control. @@ -1107,44 +1032,6 @@ } } - -/************************************************************************ - * FILEDLG_MapOfnStruct16 [internal] - * map a 16 bits structure to an Unicode one - */ -void FILEDLG_MapOfnStruct16(LPOPENFILENAME16 ofn16, LPOPENFILENAMEW ofnW, BOOL open) -{ - OPENFILENAMEA ofnA; - /* first convert to linear pointers */ - memset(&ofnA, 0, sizeof(OPENFILENAMEA)); - ofnA.lStructSize = sizeof(OPENFILENAMEA); - ofnA.hwndOwner = HWND_32(ofn16->hwndOwner); - ofnA.hInstance = HINSTANCE_32(ofn16->hInstance); - if (ofn16->lpstrFilter) - ofnA.lpstrFilter = MapSL(ofn16->lpstrFilter); - if (ofn16->lpstrCustomFilter) - ofnA.lpstrCustomFilter = MapSL(ofn16->lpstrCustomFilter); - ofnA.nMaxCustFilter = ofn16->nMaxCustFilter; - ofnA.nFilterIndex = ofn16->nFilterIndex; - ofnA.lpstrFile = MapSL(ofn16->lpstrFile); - ofnA.nMaxFile = ofn16->nMaxFile; - ofnA.lpstrFileTitle = MapSL(ofn16->lpstrFileTitle); - ofnA.nMaxFileTitle = ofn16->nMaxFileTitle; - ofnA.lpstrInitialDir = MapSL(ofn16->lpstrInitialDir); - ofnA.lpstrTitle = MapSL(ofn16->lpstrTitle); - ofnA.Flags = ofn16->Flags; - ofnA.nFileOffset = ofn16->nFileOffset; - ofnA.nFileExtension = ofn16->nFileExtension; - ofnA.lpstrDefExt = MapSL(ofn16->lpstrDefExt); - if (HIWORD(ofn16->lpTemplateName)) - ofnA.lpTemplateName = MapSL(ofn16->lpTemplateName); - else - ofnA.lpTemplateName = (LPSTR) ofn16->lpTemplateName; /* ressource number */ - /* now calls the 32 bits Ansi to Unicode version to complete the job */ - FILEDLG_MapOfnStructA(&ofnA, ofnW, open); -} - - /************************************************************************ * FILEDLG_DestroyPrivate [internal] * destroys the private object @@ -1154,15 +1041,8 @@ HWND hwnd; if (!lfs) return; hwnd = lfs->hwnd; - /* free resources for a 16 bits dialog */ - if (lfs->hResource16) FreeResource16(lfs->hResource16); - if (lfs->hGlobal16) - { - GlobalUnlock16(lfs->hGlobal16); - GlobalFree16(lfs->hGlobal16); - } /* if ofnW has been allocated, have to free everything in it */ - if (lfs->ofn16 || lfs->ofnA) + if (lfs->ofnA) { LPOPENFILENAMEW ofnW = lfs->ofnW; if (ofnW->lpstrFilter) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrFilter); @@ -1185,7 +1065,7 @@ * allocate a private object to hold 32 bits Unicode * structure that will be used throughtout the calls, while * keeping available the original structures and a few variables - * On entry : type = dialog procedure type (16,32A,32W) + * On entry : type = dialog procedure type (32A,32W) * dlgType = dialog type (open or save) */ LFSPRIVATE FILEDLG_AllocPrivate(LPARAM lParam, int type, UINT dlgType) @@ -1204,14 +1084,6 @@ lfs->fileokstring = RegisterWindowMessageA(FILEOKSTRINGA); switch(type) { - case LFS16: - lfs->ofn16 = MapSL(lParam); - if (lfs->ofn16->Flags & OFN_ENABLEHOOK) - if (lfs->ofn16->lpfnHook) - lfs->hook = TRUE; - - break; - case LFS32A: lfs->ofnA = (LPOPENFILENAMEA) lParam; if (lfs->ofnA->Flags & OFN_ENABLEHOOK) @@ -1232,20 +1104,13 @@ lfs->ofnW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(OPENFILENAMEW)); if (lfs->ofnW) { - if (lfs->ofn16) - FILEDLG_MapOfnStruct16(lfs->ofn16, lfs->ofnW, lfs->open); if (lfs->ofnA) FILEDLG_MapOfnStructA(lfs->ofnA, lfs->ofnW, lfs->open); } else ret = NULL; } - if (lfs->ofn16) - { - if (!Get16BitsTemplate(lfs)) ret = NULL; - } - else - if (!Get32BitsTemplate(lfs)) ret = NULL; + if (!Get32BitsTemplate(lfs)) ret = NULL; if (!ret) FILEDLG_DestroyPrivate(lfs); return ret; } Index: filedlg16.c =================================================================== RCS file: /home/wine/wine/dlls/commdlg/filedlg16.c,v retrieving revision 1.2 diff -u -r1.2 filedlg16.c --- filedlg16.c 24 Jun 2003 19:24:29 -0000 1.2 +++ filedlg16.c 26 Jun 2003 01:43:56 -0000 @@ -184,6 +184,195 @@ return TRUE; } +/*********************************************************************** + * Get16BitsTemplate [internal] + * + * Get a template (FALSE if failure) when 16 bits dialogs are used + * by a 16 bits application + * + */ +BOOL Get16BitsTemplate(LFSPRIVATE lfs) +{ + LPOPENFILENAME16 ofn16 = lfs->ofn16; + LPCVOID template; + HGLOBAL16 hGlobal16 = 0; + + if (ofn16->Flags & OFN_ENABLETEMPLATEHANDLE) + lfs->hDlgTmpl16 = ofn16->hInstance; + else if (ofn16->Flags & OFN_ENABLETEMPLATE) + { + HANDLE16 hResInfo; + if (!(hResInfo = FindResource16(ofn16->hInstance, + MapSL(ofn16->lpTemplateName), + RT_DIALOGA))) + { + COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); + return FALSE; + } + if (!(lfs->hDlgTmpl16 = LoadResource16( ofn16->hInstance, hResInfo ))) + { + COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); + return FALSE; + } + lfs->hResource16 = lfs->hDlgTmpl16; + } + else + { /* get resource from (32 bits) own Wine resource; convert it to 16 */ + HRSRC hResInfo; + HGLOBAL hDlgTmpl32; + LPCVOID template32; + DWORD size; + + if (!(hResInfo = FindResourceA(COMDLG32_hInstance, + lfs->open ? "OPEN_FILE":"SAVE_FILE", RT_DIALOGA))) + { + COMDLG32_SetCommDlgExtendedError(CDERR_FINDRESFAILURE); + return FALSE; + } + if (!(hDlgTmpl32 = LoadResource(COMDLG32_hInstance, hResInfo )) || + !(template32 = LockResource( hDlgTmpl32 ))) + { + COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); + return FALSE; + } + size = SizeofResource(GetModuleHandleA("COMDLG32"), hResInfo); + hGlobal16 = GlobalAlloc16(0, size); + if (!hGlobal16) + { + COMDLG32_SetCommDlgExtendedError(CDERR_MEMALLOCFAILURE); + ERR("alloc failure for %ld bytes\n", size); + return FALSE; + } + template = GlobalLock16(hGlobal16); + if (!template) + { + COMDLG32_SetCommDlgExtendedError(CDERR_MEMLOCKFAILURE); + ERR("global lock failure for %x handle\n", hGlobal16); + GlobalFree16(hGlobal16); + return FALSE; + } + ConvertDialog32To16((LPVOID)template32, size, (LPVOID)template); + lfs->hDlgTmpl16 = hGlobal16; + lfs->hGlobal16 = hGlobal16; + } + return TRUE; +} + +/************************************************************************ + * FILEDLG_MapOfnStruct16 [internal] + * map a 16 bits structure to an Unicode one + */ +void FILEDLG_MapOfnStruct16(LPOPENFILENAME16 ofn16, LPOPENFILENAMEW ofnW, BOOL open) +{ + OPENFILENAMEA ofnA; + /* first convert to linear pointers */ + memset(&ofnA, 0, sizeof(OPENFILENAMEA)); + ofnA.lStructSize = sizeof(OPENFILENAMEA); + ofnA.hwndOwner = HWND_32(ofn16->hwndOwner); + ofnA.hInstance = HINSTANCE_32(ofn16->hInstance); + if (ofn16->lpstrFilter) + ofnA.lpstrFilter = MapSL(ofn16->lpstrFilter); + if (ofn16->lpstrCustomFilter) + ofnA.lpstrCustomFilter = MapSL(ofn16->lpstrCustomFilter); + ofnA.nMaxCustFilter = ofn16->nMaxCustFilter; + ofnA.nFilterIndex = ofn16->nFilterIndex; + ofnA.lpstrFile = MapSL(ofn16->lpstrFile); + ofnA.nMaxFile = ofn16->nMaxFile; + ofnA.lpstrFileTitle = MapSL(ofn16->lpstrFileTitle); + ofnA.nMaxFileTitle = ofn16->nMaxFileTitle; + ofnA.lpstrInitialDir = MapSL(ofn16->lpstrInitialDir); + ofnA.lpstrTitle = MapSL(ofn16->lpstrTitle); + ofnA.Flags = ofn16->Flags; + ofnA.nFileOffset = ofn16->nFileOffset; + ofnA.nFileExtension = ofn16->nFileExtension; + ofnA.lpstrDefExt = MapSL(ofn16->lpstrDefExt); + if (HIWORD(ofn16->lpTemplateName)) + ofnA.lpTemplateName = MapSL(ofn16->lpTemplateName); + else + ofnA.lpTemplateName = (LPSTR) ofn16->lpTemplateName; /* ressource number */ + /* now calls the 32 bits Ansi to Unicode version to complete the job */ + FILEDLG_MapOfnStructA(&ofnA, ofnW, open); +} + +/************************************************************************ + * FILEDLG_DestroyPrivate [internal] + * destroys the private object + */ +void FILEDLG_DestroyPrivate16(LFSPRIVATE lfs) +{ + HWND hwnd; + if (!lfs) return; + hwnd = lfs->hwnd; + /* free resources for a 16 bits dialog */ + if (lfs->hResource16) FreeResource16(lfs->hResource16); + if (lfs->hGlobal16) + { + GlobalUnlock16(lfs->hGlobal16); + GlobalFree16(lfs->hGlobal16); + } + /* if ofnW has been allocated, have to free everything in it */ + if (lfs->ofn16) + { + LPOPENFILENAMEW ofnW = lfs->ofnW; + if (ofnW->lpstrFilter) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrFilter); + if (ofnW->lpstrCustomFilter) HeapFree(GetProcessHeap(), 0, ofnW->lpstrCustomFilter); + if (ofnW->lpstrFile) HeapFree(GetProcessHeap(), 0, ofnW->lpstrFile); + if (ofnW->lpstrFileTitle) HeapFree(GetProcessHeap(), 0, ofnW->lpstrFileTitle); + if (ofnW->lpstrInitialDir) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrInitialDir); + if (ofnW->lpstrTitle) HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrTitle); + if ((ofnW->lpTemplateName) && (HIWORD(ofnW->lpTemplateName))) + HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpTemplateName); + HeapFree(GetProcessHeap(), 0, ofnW); + } + TRACE("destroying private allocation %p\n", lfs); + HeapFree(GetProcessHeap(), 0, lfs); + RemovePropA(hwnd, OFN_PROP); +} + +/************************************************************************ + * FILEDLG_AllocPrivate16 [internal] + * allocate a 16 bit private object to hold 32 bits Unicode + * structure that will be used throughtout the calls, while + * keeping available the original structures and a few variables + * On entry : dlgType = dialog type (open or save) + * + */ +LFSPRIVATE FILEDLG_AllocPrivate16(LPARAM lParam, UINT dlgType) +{ + LFSPRIVATE lfs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct FSPRIVATE)); + LFSPRIVATE ret; + TRACE("alloc private buf %p\n", lfs); + if (!lfs) return NULL; + lfs->hook = FALSE; + lfs->lParam = lParam; + if (dlgType == OPEN_DIALOG) + lfs->open = TRUE; + else + lfs->open = FALSE; + lfs->lbselchstring = RegisterWindowMessageA(LBSELCHSTRINGA); + lfs->fileokstring = RegisterWindowMessageA(FILEOKSTRINGA); + lfs->ofn16 = MapSL(lParam); + + if (lfs->ofn16->Flags & OFN_ENABLEHOOK) + if (lfs->ofn16->lpfnHook) + lfs->hook = TRUE; + ret = lfs; + if (!lfs->ofnW) + { /* this structure is needed internally, so create it */ + lfs->ofnW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(OPENFILENAMEW)); + if (lfs->ofnW) + { + if (lfs->ofn16) + FILEDLG_MapOfnStruct16(lfs->ofn16, lfs->ofnW, lfs->open); + } + else + ret = NULL; + } + if (!Get16BitsTemplate(lfs)) ret = NULL; + if (!ret) FILEDLG_DestroyPrivate16(lfs); + return ret; +} + /* ------------------ Dialog procedures ---------------------- */ /*********************************************************************** @@ -312,14 +501,14 @@ if (!lpofn || !FileDlg_Init()) return FALSE; - lfs = FILEDLG_AllocPrivate((LPARAM) ofn, LFS16, OPEN_DIALOG); + lfs = FILEDLG_AllocPrivate16((LPARAM) ofn, OPEN_DIALOG); if (lfs) { hInst = GetWindowWord( HWND_32(lpofn->hwndOwner), GWL_HINSTANCE ); ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 6); bRet = DialogBoxIndirectParam16( hInst, lfs->hDlgTmpl16, lpofn->hwndOwner, (DLGPROC16) ptr, (LPARAM) lfs); - FILEDLG_DestroyPrivate(lfs); + FILEDLG_DestroyPrivate16(lfs); } TRACE("return lpstrFile='%s' !\n", (char *)MapSL(lpofn->lpstrFile)); @@ -350,14 +539,14 @@ if (!lpofn || !FileDlg_Init()) return FALSE; - lfs = FILEDLG_AllocPrivate((LPARAM) ofn, LFS16, SAVE_DIALOG); + lfs = FILEDLG_AllocPrivate16((LPARAM) ofn, SAVE_DIALOG); if (lfs) { hInst = GetWindowWord( HWND_32(lpofn->hwndOwner), GWL_HINSTANCE ); ptr = GetProcAddress16(GetModuleHandle16("COMMDLG"), (LPCSTR) 7); bRet = DialogBoxIndirectParam16( hInst, lfs->hDlgTmpl16, lpofn->hwndOwner, (DLGPROC16) ptr, (LPARAM) lfs); - FILEDLG_DestroyPrivate(lfs); + FILEDLG_DestroyPrivate16(lfs); } TRACE("return lpstrFile='%s' !\n", (char *)MapSL(lpofn->lpstrFile));

1 0

on vacation...
by Gregory M. Turner 26 Jun '03

26 Jun '03

I am going to my brother's wedding in CA, leaving tomorrow morning and arriving back in Chicago around the 8th. As such, I will probably be more-or-less incommunicado until that time, and cabinet.dll will have to wait. I was hoping to move a little faster and have split cabinet's working by now... but unless I find time to do it tonight, it ain't happening. See you all in a couple weeks, -- "Socialism in general has a record of failure so blatant that only an intellectual could ignore or evade it." -- Thomas Sowell gmt

2 2

PATCH - comdlg32 more win16/32
by Steven Edwards 26 Jun '03

26 Jun '03

Hello, With this patch all of the calls to CallWindowProc16 are gone except in the print dialogs. I am unsure about a few small parts of it so a little rubbing and a lot of testing would be nice. I hate duplicating all this code but I dont really see any other way to do this as I really dont understand most of the low level stuff here. Thanks Steven Changelog: Remove calls to CallWindowProc16 when building as a 32 bit dll. Create new internal functions CC_WMInitDialog16 CC_WMCommand16. Share a few other internal functions with the 16 bit commdlg. Index: colordlg.h =================================================================== RCS file: /home/wine/wine/dlls/commdlg/colordlg.h,v retrieving revision 1.1 diff -u -r1.1 colordlg.h --- colordlg.h 13 Jun 2003 18:07:45 -0000 1.1 +++ colordlg.h 26 Jun 2003 01:00:46 -0000 @@ -69,12 +69,21 @@ BOOL CC_HookCallChk( LPCHOOSECOLORW lpcc ); int CC_MouseCheckResultWindow( HWND hDlg, LPARAM lParam ); -LONG CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam, BOOL b16 ); LRESULT CC_WMLButtonDown( HWND hDlg, WPARAM wParam, LPARAM lParam ); LRESULT CC_WMLButtonUp( HWND hDlg, WPARAM wParam, LPARAM lParam ); LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode, HWND hwndCtl ); LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam ); LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam ); +int CC_RGBtoHSL(char c, int r, int g, int b); +void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPRECT lprect ); +void CC_PaintSelectedColor( HWND hDlg, COLORREF cr ); +void CC_PaintCross( HWND hDlg, int x, int y); +void CC_PaintTriangle( HWND hDlg, int y); +void CC_EditSetHSL( HWND hDlg, int h, int s, int l ); +int CC_HSLtoRGB(char c, int hue, int sat, int lum); +void CC_EditSetRGB( HWND hDlg, COLORREF cr ); +int CC_CheckDigitsInEdit( HWND hwnd, int maxval ); +void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, COLORREF* lpcr ); #endif /* _WINE_COLORDLG_H */ Index: colordlg.c =================================================================== RCS file: /home/wine/wine/dlls/commdlg/colordlg.c,v retrieving revision 1.41 diff -u -r1.41 colordlg.c --- colordlg.c 13 Jun 2003 18:07:45 -0000 1.41 +++ colordlg.c 26 Jun 2003 01:00:53 -0000 @@ -67,7 +67,7 @@ /*********************************************************************** * CC_HSLtoRGB [internal] */ -static int CC_HSLtoRGB(char c, int hue, int sat, int lum) +int CC_HSLtoRGB(char c, int hue, int sat, int lum) { int res = 0, maxrgb; @@ -112,7 +112,7 @@ /*********************************************************************** * CC_RGBtoHSL [internal] */ -static int CC_RGBtoHSL(char c, int r, int g, int b) +int CC_RGBtoHSL(char c, int r, int g, int b) { WORD maxi, mini, mmsum, mmdif, result = 0; int iresult = 0; @@ -355,7 +355,7 @@ /*********************************************************************** * CC_CheckDigitsInEdit [internal] */ -static int CC_CheckDigitsInEdit( HWND hwnd, int maxval ) +int CC_CheckDigitsInEdit( HWND hwnd, int maxval ) { int i, k, m, result, value; long editpos; @@ -397,7 +397,7 @@ /*********************************************************************** * CC_PaintSelectedColor [internal] */ -static void CC_PaintSelectedColor( HWND hDlg, COLORREF cr ) +void CC_PaintSelectedColor( HWND hDlg, COLORREF cr ) { RECT rect; HDC hdc; @@ -428,7 +428,7 @@ /*********************************************************************** * CC_PaintTriangle [internal] */ -static void CC_PaintTriangle( HWND hDlg, int y) +void CC_PaintTriangle( HWND hDlg, int y) { HDC hDC; long temp; @@ -471,7 +471,7 @@ /*********************************************************************** * CC_PaintCross [internal] */ -static void CC_PaintCross( HWND hDlg, int x, int y) +void CC_PaintCross( HWND hDlg, int x, int y) { HDC hDC; int w = GetDialogBaseUnits(); @@ -621,7 +621,7 @@ /*********************************************************************** * CC_EditSetRGB [internal] */ -static void CC_EditSetRGB( HWND hDlg, COLORREF cr ) +void CC_EditSetRGB( HWND hDlg, COLORREF cr ) { char buffer[10]; LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER); @@ -644,7 +644,7 @@ /*********************************************************************** * CC_EditSetHSL [internal] */ -static void CC_EditSetHSL( HWND hDlg, int h, int s, int l ) +void CC_EditSetHSL( HWND hDlg, int h, int s, int l ) { char buffer[10]; LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER); @@ -666,7 +666,7 @@ /*********************************************************************** * CC_SwitchToFullSize [internal] */ -static void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPRECT lprect ) +void CC_SwitchToFullSize( HWND hDlg, COLORREF result, LPRECT lprect ) { int i; LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER); @@ -740,7 +740,7 @@ * CC_PaintUserColorArray [internal] * Paint the 16 user-selected colors */ -static void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, COLORREF* lpcr ) +void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, COLORREF* lpcr ) { HWND hwnd = GetDlgItem(hDlg, 0x2d1); RECT rect; @@ -799,7 +799,7 @@ /*********************************************************************** * CC_WMInitDialog [internal] */ -LONG CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam, BOOL b16 ) +LONG CC_WMInitDialog( HWND hDlg, WPARAM wParam, LPARAM lParam) { int i, res; int r, g, b; @@ -810,28 +810,7 @@ TRACE("WM_INITDIALOG lParam=%08lX\n", lParam); lpp = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct CCPRIVATE) ); - if (b16) - { - CHOOSECOLORW *ch32; - CHOOSECOLOR16 *ch16 = (CHOOSECOLOR16 *) lParam; - ch32 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CHOOSECOLORW) ); - lpp->lpcc = ch32; - lpp->lpcc16 = ch16; - if (lpp->lpcc16->lStructSize != sizeof(CHOOSECOLOR16) ) - { - EndDialog (hDlg, 0) ; - return FALSE; - } - ch32->lStructSize = sizeof(CHOOSECOLORW); - ch32->hwndOwner = HWND_32(ch16->hwndOwner); - /* Should be an HINSTANCE but MS made a typo */ - ch32->hInstance = HWND_32(ch16->hInstance); - ch32->lpCustColors = MapSL(ch16->lpCustColors); - ch32->lpfnHook = (LPCCHOOKPROC) ch16->lpfnHook; /* only used as flag */ - ch32->Flags = ch16->Flags; - } - else - lpp->lpcc = (LPCHOOSECOLORW) lParam; + lpp->lpcc = (LPCHOOSECOLORW) lParam; if (lpp->lpcc->lStructSize != sizeof(CHOOSECOLORW) ) { @@ -895,10 +874,6 @@ SendMessageA( GetDlgItem(hDlg, i), EM_LIMITTEXT, 3, 0); /* max 3 digits: xyz */ if (CC_HookCallChk(lpp->lpcc)) { - if (b16) - res = CallWindowProc16( (WNDPROC16)lpp->lpcc16->lpfnHook, - HWND_16(hDlg), WM_INITDIALOG, wParam, lParam); - else res = CallWindowProcA( (WNDPROC)lpp->lpcc->lpfnHook, hDlg, WM_INITDIALOG, wParam, lParam); } @@ -1029,16 +1004,7 @@ case 0x40e: /* Help! */ /* The Beatles, 1965 ;-) */ i = RegisterWindowMessageA(HELPMSGSTRINGA); - if (lpp->lpcc16) - { - if (lpp->lpcc->hwndOwner) - SendMessageA(lpp->lpcc->hwndOwner, i, 0, (LPARAM)lpp->lpcc16); - if ( CC_HookCallChk(lpp->lpcc)) - CallWindowProc16( (WNDPROC16) lpp->lpcc16->lpfnHook, - HWND_16(hDlg), WM_COMMAND, psh15, - (LPARAM)lpp->lpcc16); - } - else + if (lpp->lpcc) { if (lpp->lpcc->hwndOwner) SendMessageA(lpp->lpcc->hwndOwner, i, 0, (LPARAM)lpp->lpcc); @@ -1050,24 +1016,12 @@ case IDOK : cokmsg = RegisterWindowMessageA(COLOROKSTRINGA); - if (lpp->lpcc16) - { - if (lpp->lpcc->hwndOwner) - if (SendMessageA(lpp->lpcc->hwndOwner, cokmsg, 0, (LPARAM)lpp->lpcc16)) - break; /* do NOT close */ - } - else - { + if (lpp->lpcc) + { if (lpp->lpcc->hwndOwner) - if (SendMessageA(lpp->lpcc->hwndOwner, cokmsg, 0, (LPARAM)lpp->lpcc)) - break; /* do NOT close */ - } - if (lpp->lpcc16) - { - BYTE *ptr = MapSL(lpp->lpcc16->lpCustColors); - memcpy(ptr, lpp->lpcc->lpCustColors, sizeof(COLORREF)*16); - lpp->lpcc16->rgbResult = lpp->lpcc->rgbResult; - } + if (SendMessageA(lpp->lpcc->hwndOwner, cokmsg, 0, (LPARAM)lpp->lpcc)) + break; /* do NOT close */ + } EndDialog(hDlg, 1) ; return TRUE ; @@ -1240,7 +1194,7 @@ switch (message) { case WM_INITDIALOG: - return CC_WMInitDialog(hDlg, wParam, lParam, FALSE); + return CC_WMInitDialog(hDlg, wParam, lParam); case WM_NCDESTROY: DeleteDC(lpp->hdcMem); DeleteObject(lpp->hbmMem); Index: colordlg16.c =================================================================== RCS file: /home/wine/wine/dlls/commdlg/colordlg16.c,v retrieving revision 1.1 diff -u -r1.1 colordlg16.c --- colordlg16.c 13 Jun 2003 18:07:45 -0000 1.1 +++ colordlg16.c 26 Jun 2003 01:01:00 -0000 @@ -43,6 +43,267 @@ #include "colordlg.h" /*********************************************************************** + * CC_WMInitDialog16 [internal] + */ +LONG CC_WMInitDialog16( HWND hDlg, WPARAM wParam, LPARAM lParam) +{ + int i, res; + int r, g, b; + HWND hwnd; + RECT rect; + POINT point; + LCCPRIV lpp; + + TRACE("WM_INITDIALOG lParam=%08lX\n", lParam); + lpp = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct CCPRIVATE) ); + + CHOOSECOLORW *ch32; + CHOOSECOLOR16 *ch16 = (CHOOSECOLOR16 *) lParam; + ch32 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CHOOSECOLORW) ); + lpp->lpcc = ch32; + lpp->lpcc16 = ch16; + if (lpp->lpcc16->lStructSize != sizeof(CHOOSECOLOR16) ) + { + EndDialog (hDlg, 0) ; + return FALSE; + } + ch32->lStructSize = sizeof(CHOOSECOLORW); + ch32->hwndOwner = HWND_32(ch16->hwndOwner); + /* Should be an HINSTANCE but MS made a typo */ + ch32->hInstance = HWND_32(ch16->hInstance); + ch32->lpCustColors = MapSL(ch16->lpCustColors); + ch32->lpfnHook = (LPCCHOOKPROC) ch16->lpfnHook; /* only used as flag */ + ch32->Flags = ch16->Flags; + + if (lpp->lpcc->lStructSize != sizeof(CHOOSECOLORW) ) + { + EndDialog (hDlg, 0) ; + return FALSE; + } + SetWindowLongA(hDlg, DWL_USER, (LONG)lpp); + + if (!(lpp->lpcc->Flags & CC_SHOWHELP)) + ShowWindow( GetDlgItem(hDlg,0x40e), SW_HIDE); + lpp->msetrgb = RegisterWindowMessageA(SETRGBSTRINGA); + +#if 0 + cpos = MAKELONG(5,7); /* init */ + if (lpp->lpcc->Flags & CC_RGBINIT) + { + for (i = 0; i < 6; i++) + for (j = 0; j < 8; j++) + if (predefcolors[i][j] == lpp->lpcc->rgbResult) + { + cpos = MAKELONG(i,j); + goto found; + } + } + found: + /* FIXME: Draw_a_focus_rect & set_init_values */ +#endif + + GetWindowRect(hDlg, &lpp->fullsize); + if (lpp->lpcc->Flags & CC_FULLOPEN || lpp->lpcc->Flags & CC_PREVENTFULLOPEN) + { + hwnd = GetDlgItem(hDlg, 0x2cf); + EnableWindow(hwnd, FALSE); + } + if (!(lpp->lpcc->Flags & CC_FULLOPEN ) || lpp->lpcc->Flags & CC_PREVENTFULLOPEN) + { + rect = lpp->fullsize; + res = rect.bottom - rect.top; + hwnd = GetDlgItem(hDlg, 0x2c6); /* cut at left border */ + point.x = point.y = 0; + ClientToScreen(hwnd, &point); + ScreenToClient(hDlg,&point); + GetClientRect(hDlg, &rect); + point.x += GetSystemMetrics(SM_CXDLGFRAME); + SetWindowPos(hDlg, 0, 0, 0, point.x, res, SWP_NOMOVE|SWP_NOZORDER); + + for (i = 0x2bf; i < 0x2c5; i++) + ShowWindow( GetDlgItem(hDlg, i), SW_HIDE); + for (i = 0x2d3; i < 0x2d9; i++) + ShowWindow( GetDlgItem(hDlg, i), SW_HIDE); + ShowWindow( GetDlgItem(hDlg, 0x2c9), SW_HIDE); + ShowWindow( GetDlgItem(hDlg, 0x2c8), SW_HIDE); + ShowWindow( GetDlgItem(hDlg, 0x2c6), SW_HIDE); + ShowWindow( GetDlgItem(hDlg, 0x2c5), SW_HIDE); + ShowWindow( GetDlgItem(hDlg, 1090 ), SW_HIDE); + } + else + CC_SwitchToFullSize(hDlg, lpp->lpcc->rgbResult, NULL); + res = TRUE; + for (i = 0x2bf; i < 0x2c5; i++) + SendMessageA( GetDlgItem(hDlg, i), EM_LIMITTEXT, 3, 0); /* max 3 digits: xyz */ + if (CC_HookCallChk(lpp->lpcc)) + { + res = CallWindowProc16( (WNDPROC16)lpp->lpcc16->lpfnHook, + HWND_16(hDlg), WM_INITDIALOG, wParam, lParam); + } + + /* Set the initial values of the color chooser dialog */ + r = GetRValue(lpp->lpcc->rgbResult); + g = GetGValue(lpp->lpcc->rgbResult); + b = GetBValue(lpp->lpcc->rgbResult); + + CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); + lpp->h = CC_RGBtoHSL('H', r, g, b); + lpp->s = CC_RGBtoHSL('S', r, g, b); + lpp->l = CC_RGBtoHSL('L', r, g, b); + + /* Doing it the long way because CC_EditSetRGB/HSL doesn't seem to work */ + SetDlgItemInt(hDlg, 703, lpp->h, TRUE); + SetDlgItemInt(hDlg, 704, lpp->s, TRUE); + SetDlgItemInt(hDlg, 705, lpp->l, TRUE); + SetDlgItemInt(hDlg, 706, r, TRUE); + SetDlgItemInt(hDlg, 707, g, TRUE); + SetDlgItemInt(hDlg, 708, b, TRUE); + + CC_PaintCross(hDlg, lpp->h, lpp->s); + CC_PaintTriangle(hDlg, lpp->l); + + return res; +} + +/*********************************************************************** + * CC_WMCommand16 [internal] + */ +LRESULT CC_WMCommand16( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD notifyCode, HWND hwndCtl ) +{ + int r, g, b, i, xx; + UINT cokmsg; + HDC hdc; + COLORREF *cr; + LCCPRIV lpp = (LCCPRIV)GetWindowLongA(hDlg, DWL_USER); + TRACE("CC_WMCommand wParam=%x lParam=%lx\n", wParam, lParam); + switch (wParam) + { + case 0x2c2: /* edit notify RGB */ + case 0x2c3: + case 0x2c4: + if (notifyCode == EN_UPDATE && !lpp->updating) + { + i = CC_CheckDigitsInEdit(hwndCtl, 255); + r = GetRValue(lpp->lpcc->rgbResult); + g = GetGValue(lpp->lpcc->rgbResult); + b= GetBValue(lpp->lpcc->rgbResult); + xx = 0; + switch (wParam) + { + case 0x2c2: if ((xx = (i != r))) r = i; break; + case 0x2c3: if ((xx = (i != g))) g = i; break; + case 0x2c4: if ((xx = (i != b))) b = i; break; + } + if (xx) /* something has changed */ + { + lpp->lpcc->rgbResult = RGB(r, g, b); + CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); + lpp->h = CC_RGBtoHSL('H', r, g, b); + lpp->s = CC_RGBtoHSL('S', r, g, b); + lpp->l = CC_RGBtoHSL('L', r, g, b); + CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l); + CC_PaintCross(hDlg, lpp->h, lpp->s); + CC_PaintTriangle(hDlg, lpp->l); + } + } + break; + + case 0x2bf: /* edit notify HSL */ + case 0x2c0: + case 0x2c1: + if (notifyCode == EN_UPDATE && !lpp->updating) + { + i = CC_CheckDigitsInEdit(hwndCtl , wParam == 0x2bf ? 239:240); + xx = 0; + switch (wParam) + { + case 0x2bf: if ((xx = ( i != lpp->h))) lpp->h = i; break; + case 0x2c0: if ((xx = ( i != lpp->s))) lpp->s = i; break; + case 0x2c1: if ((xx = ( i != lpp->l))) lpp->l = i; break; + } + if (xx) /* something has changed */ + { + r = CC_HSLtoRGB('R', lpp->h, lpp->s, lpp->l); + g = CC_HSLtoRGB('G', lpp->h, lpp->s, lpp->l); + b = CC_HSLtoRGB('B', lpp->h, lpp->s, lpp->l); + lpp->lpcc->rgbResult = RGB(r, g, b); + CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); + CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); + CC_PaintCross(hDlg, lpp->h, lpp->s); + CC_PaintTriangle(hDlg, lpp->l); + } + } + break; + + case 0x2cf: + CC_SwitchToFullSize(hDlg, lpp->lpcc->rgbResult, &lpp->fullsize); + SetFocus( GetDlgItem(hDlg, 0x2bf)); + break; + + case 0x2c8: /* add colors ... column by column */ + cr = lpp->lpcc->lpCustColors; + cr[(lpp->nextuserdef % 2) * 8 + lpp->nextuserdef / 2] = lpp->lpcc->rgbResult; + if (++lpp->nextuserdef == 16) + lpp->nextuserdef = 0; + CC_PaintUserColorArray(hDlg, 2, 8, lpp->lpcc->lpCustColors); + break; + + case 0x2c9: /* resulting color */ + hdc = GetDC(hDlg); + lpp->lpcc->rgbResult = GetNearestColor(hdc, lpp->lpcc->rgbResult); + ReleaseDC(hDlg, hdc); + CC_EditSetRGB(hDlg, lpp->lpcc->rgbResult); + CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); + r = GetRValue(lpp->lpcc->rgbResult); + g = GetGValue(lpp->lpcc->rgbResult); + b = GetBValue(lpp->lpcc->rgbResult); + lpp->h = CC_RGBtoHSL('H', r, g, b); + lpp->s = CC_RGBtoHSL('S', r, g, b); + lpp->l = CC_RGBtoHSL('L', r, g, b); + CC_EditSetHSL(hDlg, lpp->h, lpp->s, lpp->l); + CC_PaintCross(hDlg, lpp->h, lpp->s); + CC_PaintTriangle(hDlg, lpp->l); + break; + + case 0x40e: /* Help! */ /* The Beatles, 1965 ;-) */ + i = RegisterWindowMessageA(HELPMSGSTRINGA); + if (lpp->lpcc16) + { + if (lpp->lpcc->hwndOwner) + SendMessageA(lpp->lpcc->hwndOwner, i, 0, (LPARAM)lpp->lpcc16); + if ( CC_HookCallChk(lpp->lpcc)) + CallWindowProc16( (WNDPROC16) lpp->lpcc16->lpfnHook, + HWND_16(hDlg), WM_COMMAND, psh15, + (LPARAM)lpp->lpcc16); + } + break; + + case IDOK : + cokmsg = RegisterWindowMessageA(COLOROKSTRINGA); + if (lpp->lpcc16) + { + if (lpp->lpcc->hwndOwner) + if (SendMessageA(lpp->lpcc->hwndOwner, cokmsg, 0, (LPARAM)lpp->lpcc16)) + break; /* do NOT close */ + } + if (lpp->lpcc16) + { + BYTE *ptr = MapSL(lpp->lpcc16->lpCustColors); + memcpy(ptr, lpp->lpcc->lpCustColors, sizeof(COLORREF)*16); + lpp->lpcc16->rgbResult = lpp->lpcc->rgbResult; + } + EndDialog(hDlg, 1) ; + return TRUE ; + + case IDCANCEL : + EndDialog(hDlg, 0) ; + return TRUE ; + + } + return FALSE; +} + +/*********************************************************************** * ColorDlgProc (COMMDLG.8) */ BOOL16 CALLBACK ColorDlgProc16( HWND16 hDlg16, UINT16 message, @@ -71,7 +332,7 @@ switch (message) { case WM_INITDIALOG: - return CC_WMInitDialog(hDlg, wParam, lParam, TRUE); + return CC_WMInitDialog16(hDlg, wParam, lParam); case WM_NCDESTROY: DeleteDC(lpp->hdcMem); DeleteObject(lpp->hbmMem); @@ -80,7 +341,7 @@ SetWindowLongA(hDlg, DWL_USER, 0L); /* we don't need it anymore */ break; case WM_COMMAND: - if (CC_WMCommand(hDlg, wParam, lParam, + if (CC_WMCommand16(hDlg, wParam, lParam, HIWORD(lParam), HWND_32(LOWORD(lParam)))) return TRUE; break;

1 0

Re: Bidi B patch
by Alexandre Julliard 25 Jun '03

25 Jun '03

Shachar Shemesh <wine-patches(a)shemesh.biz> writes: > -#include "config.h" > -#include "wine/port.h" > +#include <config.h> > +#include <wine/port.h> > > #include <stdlib.h> > #include <string.h> > #include <assert.h> > -#include "winerror.h" > -#include "winnls.h" > -#include "wownt32.h" > -#include "gdi.h" > -#include "wine/unicode.h" > -#include "wine/debug.h" > +#include <winerror.h> > +#include <winnls.h> > +#include <wownt32.h> > +#include <gdi.h> > +#include <wine/unicode.h> > +#include <wine/debug.h> > +#include "gdibidi.h" Please don't change include quotes when modifying a file. It's not necessary, and only adds confusion. -- Alexandre Julliard julliard(a)winehq.com

6 11

I know this doesnt have anything to do with wine, but....
by Dustin Navea 25 Jun '03

25 Jun '03

This was taken from my sister's History teacher's printout and re-typed by myself for your enjoyment.. Dr. Seuss Explains Why Computers Sometimes Crash If a packet hits a pocket on a socket on a port, and the bus is interrupted at a very last resort, and the access of the memory makes your floppy disk abort, then the socket packet pocket has an error to report. If your cursor finds a menu item followed by a dash, and the double-clicking ! icon puts your window in the trash, and your data is corrupted cause the index doesn't hash, then your situation's hopeless and your system's gonna crash!! If the lable on the cable on the table at your house says the network is connected to the button on your mouse, but your packets want to tunnel to another protocol, that's repeatedly rejected by the printer down the hall, and your screen is all distorted by the side effects of gauss, so your icons in the window are as wavy as a souse; then you may as well reboot and go out with a bang, 'cuz sure as I'm a poet, then sucker's gonna hang! When the copy of your floppy's getting sloppy in the disk, and the macro code instructions cause unnecessary risk, then you'l have to flash the memory and you'll want to RAM your ROM. Quickly turn off the computer and be sure to tell your Mom! WELL! That certainly clears things up for ME! ===== -- Dustin Navea Minor Contributor, winehq.com Buzilla Janitor, bugs.winehq.com Network Admin, irc.blynk.net (down) __________________________________ Do you Yahoo!? SBC Yahoo! DSL - Now only $29.95 per month! http://sbc.yahoo.com

1 0

RE: Wine Status DLL's #2
by PETREOLLE Sylvain 25 Jun '03

25 Jun '03

The links for WWN article coverages dont work (no effect in IE window) -----Message d'origine----- De : Tom [mailto:twickline@skybest.com] Envoyé : mercredi 25 juin 2003 04:35 À : wine-devel(a)winehq.org Objet : Wine Status DLL's #2 Here is #2 any one have any comments ? Tom

2 1

were #1 at rpmseek :))
by Tom 25 Jun '03

25 Jun '03

I just thought I would let you guy's know we are the #1 download at : http://rpmseek.com/index.html?hl=com Tom

1 0

Re: dlls/rpcrt4/rpc_server.c
by Gregory M. Turner 25 Jun '03

25 Jun '03

On Tuesday 24 June 2003 03:53 am, Gerald Pfeifer wrote: > Is the following warning for dlls/rpcrt4/rpc_server.c > > rpc_server.c:133: warning: variable `func' might be clobbered by > `longjmp' or `vfork' > > indicative of a real problem, or are we sure that won't cause problems? > > (If the latter, is there a way to avoid the warning?) I don't know the answer -- perhaps this is something about PIC? Presumably the longjmp's in question are the ones generated by the __TRY/__EXCEPT macros used there. Interestingly, my gentoo gcc 3.2.2 does not give the warning. What's your gcc? Perhaps you should post the results of gcc -E or gcc -S on this file, using the same command-line args as the wine makefiles.... -- "Socialism in general has a record of failure so blatant that only an intellectual could ignore or evade it." -- Thomas Sowell gmt

1 0

Re: README.diff
by Alexandre Julliard 25 Jun '03

25 Jun '03

Tom Wickline <twickline(a)skybest.com> writes: > Changelog > > Fix link's The current links are supposed to work, and they are much nicer without the ?page= noise. Why do you need to change them? -- Alexandre Julliard julliard(a)winehq.com

3 9

Re: ntdll/kernel32: #30
by Alexandre Julliard 24 Jun '03

24 Jun '03

Eric Pouech <pouech-eric(a)wanadoo.fr> writes: > - made async.h ready for use in ntdll > + moved it to include/wine Actually async.h should be removed at some point, so IMO it's better to leave it in include/ for now so that we don't forget about it. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: Fix for 'compiling' IDL files
by Alexandre Julliard 24 Jun '03

24 Jun '03

"Robert Shearman" <R.J.Shearman(a)warwick.ac.uk> writes: > - Don't #define REFIID and others when included by WIDL This should be done with #ifdefs around each type definition like it's done in the Microsoft headers, not based on whether they are included from WIDL or not. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: Typelib containment refcounting (2)
by Alexandre Julliard 24 Jun '03

24 Jun '03

Mike Hearn <mike(a)theoretic.com> writes: > This is a slightly modified version of the original patch which releases > the typelib reference on every ITypeInfo::Release(), not just when being > destroyed. This is still not right, there are many other places that increment the ITypeInfo refcount that would need to be fixed too. And if you increment the typelib refcount everywhere it will create a refcount loop and nothing will ever get freed. This needs more thought... -- Alexandre Julliard julliard(a)winehq.com

1 0

About SIGCHLD and Wine
by Sylvain Petreolle 24 Jun '03

24 Jun '03

Executing dmesg with wine active, I saw this today : application bug: wine(27346) has SIGCHLD set to SIG_IGN but calls wait(). (see the NOTES section of 'man 2 wait'). Workaround activated. In this case, in Linux, is a call to wait() supposed to block until all Wine children have exited or not ? ===== Sylvain Petreolle (spetreolle at users dot sourceforge dot net) ICQ #170597259 alias upsf='false ; while [ $? -ne 0 ] ; do cvs update -APd ; done 2>&1 |tee cvslog' "What if tomorrow the War could be over ?" Morpheus, in "Reloaded". ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

1 0

Re: XEMBED System tray support
by Sylvain Petreolle 24 Jun '03

24 Jun '03

Hi Mike, Im testing your patch with various programs. Seems to work way cool. One question however: Did you forgot/left-as-is the "Wine-Systray" window with purpose ? In Gnome, I get an empty 20x1 window. (only circumferences and controls :)) Around line 200 in dlls/shell32/systray.c I see : /* Create tray window for icon. */ ptrayItem->hWnd = CreateWindowExA( WS_EX_TRAYWINDOW, "WineSystray", "Wine-Systray", ===== Sylvain Petreolle (spetreolle at users dot sourceforge dot net) ICQ #170597259 alias upsf='false ; while [ $? -ne 0 ] ; do cvs update -APd ; done 2>&1 |tee cvslog' "What if tomorrow the War could be over ?" Morpheus, in "Reloaded". ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

2 1

RE: Localization to the Portuguese
by E Lea 24 Jun '03

24 Jun '03

>>>Your granfather's spoke russian correct ? >>>and the war in 1941 was was not a russian revolution ...... That would > >>>be 1917 the bolshevik revolution >>>if my poor memory severs me correct...... >>>The point is you made a crack about americans not wanting to look at >>>there british roots in the english >>>launauge. So I say you should not look at the bolshevik's in your >>>launguage as any one knows not to >>>fight russia in the winter.... As you will soon freeze to death....... > >>>and you have railroads that our off gauge :) >> ^^^ >>Do Americans have a word for grammer? > >"Grammer" ? Not the best way to criticize someone else's language... I know, I cringed as soon as I clicked the "send" button, but by then it was too late

1 0

RE: Localization to the Portuguese
by E Lea 24 Jun '03

24 Jun '03

Tom wrote: >>Well, although it meant to be a bit of humor I just can't resist >>to make some comments. >> >>Your mention about the war looks kind of ridiculous. It was 1776, right? >>But we, here in Russia, too well remember 1941, 22 June, which is a bit >>closer to nowadays. I haven't seen both my grandfathers, which were killed >>under Moscow, we have lost more than 20 millions of people in that war. >>What now? That's a history. There are particular persons to blame and >>to praise. What people, and especially particular language have to do >>with all the things we are talking about? >> >> >> > >Your granfather's spoke russian correct ? >and the war in 1941 was was not a russian revolution ...... That would >be 1917 the bolshevik revolution >if my poor memory severs me correct...... >The point is you made a crack about americans not wanting to look at >there british roots in the english >launauge. So I say you should not look at the bolshevik's in your >launguage as any one knows not to >fight russia in the winter.... As you will soon freeze to death....... >and you have railroads that our off gauge :) ^^^ Do Americans have a word for grammer?

3 2

Re: [dx58] begin of d3d8/d3dcore split
by fenix＠club-internet.fr 24 Jun '03

24 Jun '03

Hi, >It would be better to name the dll wined3dcore, or simply > wined3d, to avoid potential naming conflicts. why not, it's more cleaner :) Regards, Raphael

1 0

Re: Localization to the Portuguese
by Eric Pouech 24 Jun '03

24 Jun '03

Marcelo Duarte wrote: > Hi, > I intend to perhaps keep the support the Portuguese language and to other > tasks. > Please, in any modifications to the resources, it would like to be informed > to translate them, because I can be the support to Brazilian Portuguese > language in the Wine. good to have someone to this in charge... > Alexandre, the portuguese of Brazil is slightly different of Portugal, but > ALL files *Pt.rc that I encountered is brazilian portuguese (because "File" > is translated to "Arquivo" in Brazil and to "Ficheiro" in Portugal, etc). > The questions are: I need to separate them? Which is the correct behavior? Since there are differences, and if you're ready to support those different, then we can always create two sets of resources for portugese: one for portugese from Portugal, another one for brasilian portugese. Note, that windows consider Brasilian portugese to be the default sublang for all portugese:s (which seems to me a bit ackward, but South America is likely closer to Redmond than Lusitania...) A+ -- Eric Pouech

5 9

Fw: win.ini _3_ bounced and I have no idea why ????????????????
by BiGgUn 24 Jun '03

24 Jun '03

> I am in favor of a bounced patch list ... what about simply using wine-devel as a bounced patch list ? Stephan

1 0

Status Page Dll's --My Status :)
by Tom Wickline 24 Jun '03

24 Jun '03

Hi, Anyone have any Comments, Flames or Suggestions before I send this ? Tom

6 9

quartz once again: was DEVENUM.DLL Implementation
by Mark Hannessen 24 Jun '03

24 Jun '03

>Well, if you want to start work on Quartz, feel free to do it, you would be >our saviour (to all the gamerz out there who cannot have intro / cutscene >movies due to the missing Quartz stuff in Wine). quartz was already was in wine once. but was removed from wine because of legal issues. that is, the author feared it was not legal and demanded it to be removed. transgaming is still using it in WineX and it's LGPL code so you if you really need it you can just copy it from their cvs tree. still i think it would be nice to have quarz in wine so i have been thinking about this one for some time. but what makes you think writing a new one is not going to have legal issues? Mark Hannessen

5 5

dlls/rpcrt4/rpc_server.c
by Gerald Pfeifer 24 Jun '03

24 Jun '03

Is the following warning for dlls/rpcrt4/rpc_server.c rpc_server.c:133: warning: variable `func' might be clobbered by `longjmp' or `vfork' indicative of a real problem, or are we sure that won't cause problems? (If the latter, is there a way to avoid the warning?) Gerald -- Gerald "Jerry" pfeifer(a)dbai.tuwien.ac.at http://www.pfeifer.com/gerald/

1 0

Im back.. sorta..... ;)
by Dustin Navea 24 Jun '03

24 Jun '03

Hey guys, I'm back.. sorta as the subject says. I have pretty much daily access to a computer, but unfortunately I cannot install linux on it (mom's computer and it is a loaner from her office). So I am back on the net and resubscribed to the list, just cant help in actual wine debugging (although i can always find out behaviors in windows).. Actually I was thinking of volunteering to be a janitor for Bugzilla.. I see a lot of frivolous bugs and out of date bugs on there and since I sweep it almost daily, I may as well be listed as the maintainer/janitor.. ;) Whaddya say, all in favor say I... ;) -Dustin __________________________________ Do you Yahoo!? SBC Yahoo! DSL - Now only $29.95 per month! http://sbc.yahoo.com

3 2

Re: lostwages/ include/wwn.php templates/en/contri ...
by Brian Vincent (C) 24 Jun '03

24 Jun '03

Hm.. spelling fixes in WWN. Not sure I like that idea. A lot of these are spelling fixes in quoted remarks. I have a long standing policy of not editing spelling mistakes. Unless it's a grammatical error so bad that it makes reading it unbearable, I don't touch it. (I can probably count the number of times I've done that on one hand.) I even question markup sometimes - lest some moron flames me later for taking their quote out of context. Of course, I'm lazy. If I started spellchecking it probably wouldn't last long anyway. PS. Anyone notice the interviews on WWN? Anyone have any comments or suggestions for improving them? Any particular people I need to interview that I'm forgetting? (I do have some in various stages of preparation, and a list of people I need to include.) I'll save Alexandre for last. --------------- Brian Vincent Copper Mountain Telecom vincentb(a)coppercolorado.com

4 3

mailing lists mail delivery problems
by Christian Costa 24 Jun '03

24 Jun '03

Hi, This is about one month or so I'm experiencing problems with mailing lists. Indeed, mail delivery is disabled randomly for some of them. I have to turned on again the delivery by editing options of my account. This is really annoying. Is anyone experiencing the same kind of problems? What's happening? How can this be solved? Thanks in advance for any clue. Bye, Christian

1 0

UTF-8 keyboard?
by Shachar Shemesh 24 Jun '03

24 Jun '03

Hi all, A while back someone (I think it was Alexander) mentioned something about UTF-8 working for keyboard detection and entering info. That same mistyrious someone said it was in XOO, and will be merged when Alexander finishes his merges. I just tried it with latest CVS, and I am getting mixed results. If I'm using an unknown encoding, when I run wine with +keyboard, I get: > trace:keyboard:X11DRV_KEYBOARD_DetectLayout matches=22, mismatches=25, > seq=21, score=-56 > trace:keyboard:X11DRV_KEYBOARD_DetectLayout detected layout is > "Israeli keyboard layout" > trace:keyboard:X11DRV_InitKeyboard OEM specific virtual key DF > assigned to keycode 54: > trace:keyboard:X11DRV_InitKeyboard (FF9D (KP_Begin) FFB5 (KP_5) 0 > (NoSymbol) 0 (NoSymbol) ) > trace:keyboard:X11DRV_InitKeyboard OEM specific virtual key E0 > assigned to keycode 73: > trace:keyboard:X11DRV_InitKeyboard (FFEB (Super_L) FFEB (Super_L) 0 > (NoSymbol) 0 (NoSymbol) ) > trace:keyboard:KEYBOARD_MapDeadKeysym no character for dead keysym > 0x0000fe08 > trace:keyboard:KEYBOARD_MapDeadKeysym no character for dead keysym > 0x0000fe08 > trace:keyboard:X11DRV_InitKeyboard OEM specific virtual key E1 > assigned to keycode 75: > trace:keyboard:X11DRV_InitKeyboard (FF67 (Menu) FF67 (Menu) 0 > (NoSymbol) 0 (NoSymbol) ) > trace:keyboard:X11DRV_KeyEvent Adjusting NumLock state. > trace:keyboard:KEYBOARD_GenerateMsg OFF + Keypress => generating DOWN > and UP messages. > trace:keyboard:KEYBOARD_GenerateMsg INTERM : don't treat release of > toggle key. InputKeyStateTable[0x90] = 0x1 > trace:keyboard:X11DRV_ToUnicode NumLockMask = 0010 > trace:keyboard:X11DRV_ToUnicode AltGrMask = 2000 > trace:keyboard:X11DRV_ToUnicode Found keycode 77 (0x4D) > trace:keyboard:KEYBOARD_MapDeadKeysym no character for dead keysym > 0x0000ff7f > trace:keyboard:X11DRV_ToUnicode NumLockMask = 0010 > trace:keyboard:X11DRV_ToUnicode AltGrMask = 2000 > trace:keyboard:X11DRV_ToUnicode Found keycode 38 (0x26) > trace:keyboard:KEYBOARD_MapDeadKeysym no character for dead keysym > 0x00000cf9 > err:keyboard:X11DRV_ToUnicode Please report: no char for keysym 0CF9 > (hebrew_shin) : > err:keyboard:X11DRV_ToUnicode > (virtKey=41,scanCode=1E,keycode=26,state=2010) > trace:keyboard:X11DRV_ToUnicode NumLockMask = 0010 > trace:keyboard:X11DRV_ToUnicode AltGrMask = 2000 > trace:keyboard:X11DRV_ToUnicode Found keycode 45 (0x2D) > trace:keyboard:KEYBOARD_MapDeadKeysym no character for dead keysym > 0x00000cec > err:keyboard:X11DRV_ToUnicode Please report: no char for keysym 0CEC > (hebrew_lamed) : > err:keyboard:X11DRV_ToUnicode > (virtKey=4B,scanCode=25,keycode=2D,state=2010) > trace:keyboard:X11DRV_ToUnicode NumLockMask = 0010 > trace:keyboard:X11DRV_ToUnicode AltGrMask = 2000 > trace:keyboard:X11DRV_ToUnicode Found keycode 30 (0x1E) > trace:keyboard:KEYBOARD_MapDeadKeysym no character for dead keysym > 0x00000ce5 > err:keyboard:X11DRV_ToUnicode Please report: no char for keysym 0CE5 > (hebrew_waw) : > err:keyboard:X11DRV_ToUnicode > (virtKey=55,scanCode=16,keycode=1E,state=2010) > trace:keyboard:X11DRV_ToUnicode NumLockMask = 0010 > trace:keyboard:X11DRV_ToUnicode AltGrMask = 2000 > trace:keyboard:X11DRV_ToUnicode Found keycode 32 (0x20) > trace:keyboard:KEYBOARD_MapDeadKeysym no character for dead keysym > 0x00000ced > err:keyboard:X11DRV_ToUnicode Please report: no char for keysym 0CED > (hebrew_finalmem) : > err:keyboard:X11DRV_ToUnicode > (virtKey=4F,scanCode=18,keycode=20,state=2010) When I run it with en_US.UTF-8, I get: > trace:keyboard:X11DRV_KEYBOARD_DetectLayout detected layout is > "Israeli keyboard layout" > trace:keyboard:X11DRV_InitKeyboard OEM specific virtual key DF > assigned to keycode 54: > trace:keyboard:X11DRV_InitKeyboard (FF9D (KP_Begin) FFB5 (KP_5) 0 > (NoSymbol) 0 (NoSymbol) ) > trace:keyboard:X11DRV_InitKeyboard OEM specific virtual key E0 > assigned to keycode 73: > trace:keyboard:X11DRV_InitKeyboard (FFEB (Super_L) FFEB (Super_L) 0 > (NoSymbol) 0 (NoSymbol) ) > trace:keyboard:KEYBOARD_MapDeadKeysym no character for dead keysym > 0x0000fe08 > trace:keyboard:KEYBOARD_MapDeadKeysym no character for dead keysym > 0x0000fe08 > trace:keyboard:X11DRV_InitKeyboard OEM specific virtual key E1 > assigned to keycode 75: > trace:keyboard:X11DRV_InitKeyboard (FF67 (Menu) FF67 (Menu) 0 > (NoSymbol) 0 (NoSymbol) ) > trace:keyboard:X11DRV_KeyEvent Adjusting NumLock state. > trace:keyboard:KEYBOARD_GenerateMsg OFF + Keypress => generating DOWN > and UP messages. > trace:keyboard:KEYBOARD_GenerateMsg INTERM : don't treat release of > toggle key. InputKeyStateTable[0x90] = 0x1 > trace:keyboard:X11DRV_ToUnicode NumLockMask = 0010 > trace:keyboard:X11DRV_ToUnicode AltGrMask = 2000 > trace:keyboard:X11DRV_ToUnicode Found keycode 77 (0x4D) > trace:keyboard:KEYBOARD_MapDeadKeysym no character for dead keysym > 0x0000ff7f > trace:keyboard:X11DRV_ToUnicode NumLockMask = 0010 > trace:keyboard:X11DRV_ToUnicode AltGrMask = 2000 > trace:keyboard:X11DRV_ToUnicode Found keycode 38 (0x26) > trace:keyboard:X11DRV_ToUnicode NumLockMask = 0010 > trace:keyboard:X11DRV_ToUnicode AltGrMask = 2000 > trace:keyboard:X11DRV_ToUnicode Found keycode 45 (0x2D) > trace:keyboard:X11DRV_ToUnicode NumLockMask = 0010 > trace:keyboard:X11DRV_ToUnicode AltGrMask = 2000 > trace:keyboard:X11DRV_ToUnicode Found keycode 30 (0x1E) > trace:keyboard:X11DRV_ToUnicode NumLockMask = 0010 > trace:keyboard:X11DRV_ToUnicode AltGrMask = 2000 > trace:keyboard:X11DRV_ToUnicode Found keycode 32 (0x20) That is - no errors, but I don't get any characters on screen either. When running this with locale he_IL, I get this: > trace:keyboard:X11DRV_KEYBOARD_DetectLayout detected layout is > "Israeli keyboard layout" > trace:keyboard:X11DRV_InitKeyboard OEM specific virtual key DF > assigned to keycode 54: > trace:keyboard:X11DRV_InitKeyboard (FF9D (KP_Begin) FFB5 (KP_5) 0 > (NoSymbol) 0 (NoSymbol) ) > trace:keyboard:X11DRV_InitKeyboard OEM specific virtual key E0 > assigned to keycode 73: > trace:keyboard:X11DRV_InitKeyboard (FFEB (Super_L) FFEB (Super_L) 0 > (NoSymbol) 0 (NoSymbol) ) > trace:keyboard:KEYBOARD_MapDeadKeysym no character for dead keysym > 0x0000fe08 > trace:keyboard:KEYBOARD_MapDeadKeysym no character for dead keysym > 0x0000fe08 > trace:keyboard:X11DRV_InitKeyboard OEM specific virtual key E1 > assigned to keycode 75: > trace:keyboard:X11DRV_InitKeyboard (FF67 (Menu) FF67 (Menu) 0 > (NoSymbol) 0 (NoSymbol) ) > trace:keyboard:X11DRV_KeyEvent Adjusting NumLock state. > trace:keyboard:KEYBOARD_GenerateMsg OFF + Keypress => generating DOWN > and UP messages. > trace:keyboard:KEYBOARD_GenerateMsg INTERM : don't treat release of > toggle key. InputKeyStateTable[0x90] = 0x1 > trace:keyboard:X11DRV_ToUnicode NumLockMask = 0010 > trace:keyboard:X11DRV_ToUnicode AltGrMask = 2000 > trace:keyboard:X11DRV_ToUnicode Found keycode 77 (0x4D) > trace:keyboard:KEYBOARD_MapDeadKeysym no character for dead keysym > 0x0000ff7f > trace:keyboard:X11DRV_ToUnicode NumLockMask = 0010 > trace:keyboard:X11DRV_ToUnicode AltGrMask = 2000 > trace:keyboard:X11DRV_ToUnicode Found keycode 38 (0x26) > trace:keyboard:X11DRV_ToUnicode NumLockMask = 0010 > trace:keyboard:X11DRV_ToUnicode AltGrMask = 2000 > trace:keyboard:X11DRV_ToUnicode Found keycode 45 (0x2D) > trace:keyboard:X11DRV_ToUnicode NumLockMask = 0010 > trace:keyboard:X11DRV_ToUnicode AltGrMask = 2000 > trace:keyboard:X11DRV_ToUnicode Found keycode 30 (0x1E) > trace:keyboard:X11DRV_ToUnicode NumLockMask = 0010 > trace:keyboard:X11DRV_ToUnicode AltGrMask = 2000 > trace:keyboard:X11DRV_ToUnicode Found keycode 32 (0x20) Characters do appear on screen, this time. Could it just be that edit control (I'm using notepad to test this) does not support UTF-8? Shachar -- Shachar Shemesh Open Source integration consultant Home page & resume - http://www.shemesh.biz/

3 6

Re: [dx58] begin of d3d8/d3dcore split
by Alexandre Julliard 24 Jun '03

24 Jun '03

Raphaël Junqueira <fenix(a)club-internet.fr> writes: > Changelog: > - begin of d3dcore split for future d3d9 promote > - currently only debug, utils, shaders and draw functions code > - definitions of 3 headers (as dx use to do): gl, types, interface It would be better to name the dll wined3dcore, or simply wined3d, to avoid potential naming conflicts. -- Alexandre Julliard julliard(a)winehq.com

1 0

Re: dmusic: framework for file loading
by Raphaël Junqueira 23 Jun '03

23 Jun '03

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi rok ;) > As I've mentioned, we'll need a function for loading chunks from dmusic > files. I tried to write one, and here's result; it's not very nice, but > it works (sort of). > At the time being, it only "loads" and displays data > (--debugmsg=+dmfile for debug and --debugmsg=+dmfiledat for the display > of data). I couldn't make it load data into IDirectMusic*Impl > interfaces, because whatever I did, exception occured (maybe someone > more familiar with this could do this (Raphael?)). Also, if someone has > more robust and simpler function, please tell me. > DMUSIC_FillSegmentFromFileHandle loads sample.sgt from DX SDK > completely... however, i didn't try the other. Impressive work ;) > Also "fixed" a problem I've encountered while running 3DAudio.exe (from > SDK). One of the latest patches added this clause: > > if (!ppDirectSound) > IDirectSound_Release(*ppDirectSound); well, seem another christian regression ;) for what i understand, this code must be the correct one: if (!ppDirectSound) IDirectSound_Release(This->dsound); > I don't know why, but it causes exception (i've commented it). well Releasing a NULL object ;) > > ChangeLog: > - wine/dlls/dmusic/dmusic_private.h: added some new structs > - wine/dlls/dmusic/dmusic_loader.c: load file > - wine/dlls/dmusic/dmusic_preformance.c: minor fix > - wine/dlls/dmusic/helper.c: new file with file loading functions Regards, Raphael -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.2 (GNU/Linux) iD8DBQE+9ctCp7NA3AmQTU4RAnTBAJ9rsoPKZWAzvofqiK2ENFqi6Ja73gCfTICO thCaWwcK4Qcria2lDYb2AFU= =TGgh -----END PGP SIGNATURE-----

2 2

More Info and a call for help
by Robert Lunnon 23 Jun '03

23 Jun '03

I am having problems with this Program, Little Fighter II, and also the installer that comes with the Worms II demo, both internet downloadable. Anyway both of these faults might be due to stack overflows or overwrites, especially the Worms II one below. What variable controls the size of the stack allocated to a thread ? More info below Worms II http://www.worms2.com/main.html?page=good&area=demo&file=3 LF2 http://www.littlefighter.com/ Worms II fails during setup with a seg fault here 0xddb2484a: popw %es 0xddb2484c: popw %fs 0xddb2484f: popw %gs 0xddb24852: orl %eax,%eax 0xddb24854: lret $0xc > ::stack 0xddb2484a() This is part of relay16.s in ntdll in part reproduced below movzwl (112), %esp .byte 0x64 popl (112) popl %edx popl %ecx popl %ebp popw %ds popw %es popw %fs popw %gs orl %eax, %eax lret $12 And Has this machine state %cs = 0x0017 %eax = 0x00000000 %ds = 0x023f %ebx = 0x0000000e %ss = 0x023f %ecx = 0x00000436 %es = 0x001f %edx = 0x03a703a7 %fs = 0x0227 %esi = 0x0000056d %gs = 0x0000 %edi = 0x00005ddd %eip = 0xddb2484a %ebp = 0x000054e2 %kesp = 0xeeb18fe4 %eflags = 0x00010246 id=0 vip=0 vif=0 ac=0 vm=0 rf=1 nt=0 iopl=0x0 status=<of,df,IF,tf,sf,ZF,af,PF,cf> %esp = 0x00005416 %trapno = 0xd %err = 0x3a4 With these memory mappings BASE LIMIT SIZE NAME 0 10000 10000 [ anon ] 10000 110000 100000 [ anon ] 8042000 8048000 6000 [ stack ] 8050000 8051000 1000 /export/home/local/bin/wine 8060000 8061000 1000 /export/home/local/bin/wine 8061000 8105000 a4000 [ heap ] 65430000 65530000 100000 tmpfs.0.2.472492402 dc6a0000 dc6a1000 1000 [ anon ] dc6b0000 dc6c0000 10000 /export/home/local/lib/wine/ctl3d32.dll.so dc6c0000 dc6c1000 1000 [ anon ] dc6c1000 dc6c4000 3000 /export/home/local/lib/wine/ctl3d32.dll.so dc6d3000 dc6d5000 2000 /export/home/local/lib/wine/ctl3d32.dll.so dc6e0000 dc6f0000 10000 /export/home/local/lib/wine/lz32.dll.so dc6f0000 dc6f1000 1000 [ anon ] dc6f1000 dc6f5000 4000 /export/home/local/lib/wine/lz32.dll.so dc704000 dc705000 1000 /export/home/local/lib/wine/lz32.dll.so dc710000 dc720000 10000 /export/home/local/lib/wine/version.dll.so dc720000 dc721000 1000 [ anon ] dc721000 dc728000 7000 /export/home/local/lib/wine/version.dll.so dc737000 dc739000 2000 /export/home/local/lib/wine/version.dll.so dc740000 dc741000 1000 [ anon ] dc741000 dc841000 100000 [ anon ] dc841000 dc843000 2000 [ anon ] dc843000 dc965000 122000 [ anon ] dc980000 dc990000 10000 /export/home/local/lib/wine/midimap.drv.so dc990000 dc991000 1000 [ anon ] dc991000 dc994000 3000 /export/home/local/lib/wine/midimap.drv.so dc9a3000 dc9a4000 1000 /export/home/local/lib/wine/midimap.drv.so dc9b0000 dc9c0000 10000 [ anon ] dc9c0000 dcac0000 100000 [ anon ] dcae0000 dcaf0000 10000 /export/home/local/lib/wine/msacm32.dll.so dcaf0000 dcaf1000 1000 [ anon ] dcaf1000 dcafe000 d000 /export/home/local/lib/wine/msacm32.dll.so dcb0d000 dcb0f000 2000 /export/home/local/lib/wine/msacm32.dll.so dcb20000 dcb21000 1000 [ anon ] dcb30000 dcb40000 10000 /export/home/local/lib/wine/msacm.drv.so dcb40000 dcb41000 1000 [ anon ] dcb41000 dcb46000 5000 /export/home/local/lib/wine/msacm.drv.so dcb55000 dcb56000 1000 /export/home/local/lib/wine/msacm.drv.so dcb60000 dcb66000 6000 /opt/cfw/gcc322/lib/libgcc_s.so.1 dcb75000 dcb77000 2000 /opt/cfw/gcc322/lib/libgcc_s.so.1 dcb80000 dcbd9000 59000 /opt/cfw/gcc322/lib/libstdc++.so.5.0.2 dcbe8000 dcbfd000 15000 /opt/cfw/gcc322/lib/libstdc++.so.5.0.2 dcbfd000 dcc01000 4000 /opt/cfw/gcc322/lib/libstdc++.so.5.0.2 dcc10000 dcc16000 6000 /export/home/local/lib/libaudioio.0.4.so dcc25000 dcc26000 1000 /export/home/local/lib/libaudioio.0.4.so dcc26000 dcc29000 3000 /export/home/local/lib/libaudioio.0.4.so dcc30000 dcc40000 10000 /export/home/local/lib/wine/wineaudioio.drv.so dcc40000 dcc41000 1000 [ anon ] dcc41000 dcc51000 10000 /export/home/local/lib/wine/wineaudioio.drv.so dcc60000 dcc62000 2000 /export/home/local/lib/wine/wineaudioio.drv.so dcc70000 dcc80000 10000 /export/home/local/lib/wine/winmm.dll.so dcc80000 dcc81000 1000 [ anon ] dcc81000 dccd0000 4f000 /export/home/local/lib/wine/winmm.dll.so dccdf000 dcce5000 6000 /export/home/local/lib/wine/winmm.dll.so dccf0000 dccf1000 1000 [ anon ] dcd00000 dcd02000 2000 /usr/X11R6/lib/X11/locale/common/xlcDef.so.2 dcd11000 dcd12000 1000 /usr/X11R6/lib/X11/locale/common/xlcDef.so.2 dcd20000 dcd30000 10000 [ anon ] dcd40000 dcd41000 1000 [ anon ] dcd50000 dcd54000 4000 /usr/X11R6/lib/libXrender.so.1.1 dcd63000 dcd64000 1000 /usr/X11R6/lib/libXrender.so.1.1 dcd70000 dcd71000 1000 [ anon ] dcd80000 dce3b000 bb000 /usr/X11R6/lib/libX11.so.6.2 dce4a000 dce4d000 3000 /usr/X11R6/lib/libX11.so.6.2 dce50000 dce5c000 c000 /usr/X11R6/lib/libXext.so.6.4 dce6b000 dce6c000 1000 /usr/X11R6/lib/libXext.so.6.4 dce70000 dce85000 15000 /usr/X11R6/lib/libICE.so.6.3 dce94000 dce95000 1000 /usr/X11R6/lib/libICE.so.6.3 dce95000 dce97000 2000 /usr/X11R6/lib/libICE.so.6.3 dcea0000 dcea7000 7000 /usr/X11R6/lib/libSM.so.6.0 dceb6000 dceb8000 2000 /usr/X11R6/lib/libSM.so.6.0 dcec0000 dced0000 10000 /export/home/local/lib/wine/x11drv.dll.so dced0000 dced1000 1000 [ anon ] dced1000 dcf23000 52000 /export/home/local/lib/wine/x11drv.dll.so dcf32000 dcf36000 4000 /export/home/local/lib/wine/x11drv.dll.so dcf36000 dcf37000 1000 /export/home/local/lib/wine/x11drv.dll.so dcf40000 dcf76000 36000 /usr/X11R6/lib/libfreetype.so.6.2 dcf85000 dcf89000 4000 /usr/X11R6/lib/libfreetype.so.6.2 dcf90000 dcf91000 1000 [ anon ] dcfa0000 dcfd0000 30000 /export/home/local/lib/wine/kernel32.dll.so dcfd0000 dcfd1000 1000 [ anon ] dcfd1000 dd04a000 79000 /export/home/local/lib/wine/kernel32.dll.so dd059000 dd071000 18000 /export/home/local/lib/wine/kernel32.dll.so dd080000 dd090000 10000 /export/home/local/lib/wine/advapi32.dll.so dd090000 dd091000 1000 [ anon ] dd091000 dd0a8000 17000 /export/home/local/lib/wine/advapi32.dll.so dd0b7000 dd0bb000 4000 /export/home/local/lib/wine/advapi32.dll.so dd0c0000 dd0e0000 20000 /export/home/local/lib/wine/gdi32.dll.so dd0e0000 dd0e1000 1000 [ anon ] dd0e1000 dd11c000 3b000 /export/home/local/lib/wine/gdi32.dll.so dd12b000 dd134000 9000 /export/home/local/lib/wine/gdi32.dll.so dd134000 dd144000 10000 /export/home/local/lib/wine/gdi32.dll.so dd150000 dd170000 20000 /export/home/local/lib/wine/user32.dll.so dd170000 dd171000 1000 [ anon ] dd171000 dd218000 a7000 /export/home/local/lib/wine/user32.dll.so dd227000 dd239000 12000 /export/home/local/lib/wine/user32.dll.so dd239000 dd27c000 43000 /export/home/local/lib/wine/user32.dll.so dd280000 dd290000 10000 /export/home/local/lib/wine/winedos.dll.so dd290000 dd291000 1000 [ anon ] dd291000 dd2bd000 2c000 /export/home/local/lib/wine/winedos.dll.so dd2cc000 dd2ce000 2000 /export/home/local/lib/wine/winedos.dll.so dd2ce000 dd2d0000 2000 /export/home/local/lib/wine/winedos.dll.so dd2e0000 dd2e1000 1000 [ anon ] dd2e1000 dd3e1000 100000 [ anon ] dd3e1000 dd3e3000 2000 [ anon ] dd3e3000 dd4f3000 110000 [ anon ] dd500000 dd501000 1000 [ anon ] dd510000 dd520000 10000 /export/home/local/lib/wine/winevdm.exe.so dd520000 dd521000 1000 [ anon ] dd521000 dd523000 2000 /export/home/local/lib/wine/winevdm.exe.so dd532000 dd533000 1000 /export/home/local/lib/wine/winevdm.exe.so dd540000 dd541000 1000 [ anon ] dd550000 dd551000 1000 [ anon ] dd560000 dd610000 b0000 [ anon ] dd610000 dd670000 60000 [ anon ] dd680000 dd681000 1000 [ anon ] dd690000 dd691000 1000 [ anon ] dd6a0000 dd6a3000 3000 /usr/lib/libmp.so.2 dd6b3000 dd6b4000 1000 /usr/lib/libmp.so.2 dd6c0000 dd6c2000 2000 /usr/lib/libmd5.so.1 dd6d2000 dd6d3000 1000 /usr/lib/libmd5.so.1 dd6e0000 dd6e8000 8000 /usr/lib/libaio.so.1 dd6f8000 dd6f9000 1000 /usr/lib/libaio.so.1 dd6f9000 dd6fa000 1000 /usr/lib/libaio.so.1 dd700000 dd701000 1000 [ anon ] dd710000 dd711000 1000 [ anon ] dd720000 dd72d000 d000 /usr/lib/libm.so.1 dd73c000 dd73d000 1000 /usr/lib/libm.so.1 dd740000 dd7c9000 89000 /usr/lib/libnsl.so.1 dd7d9000 dd7de000 5000 /usr/lib/libnsl.so.1 dd7de000 dd7e6000 8000 /usr/lib/libnsl.so.1 dd7f0000 dd7fb000 b000 /usr/lib/libsocket.so.1 dd80b000 dd80c000 1000 /usr/lib/libsocket.so.1 dd810000 dd811000 1000 [ anon ] dd820000 dd853000 33000 /usr/lib/libresolv.so.2 dd863000 dd866000 3000 /usr/lib/libresolv.so.2 dd866000 dd867000 1000 /usr/lib/libresolv.so.2 dd870000 dd876000 6000 /usr/lib/librt.so.1 dd886000 dd887000 1000 /usr/lib/librt.so.1 dd890000 dd92d000 9d000 /usr/lib/libc.so.1 dd93d000 dd943000 6000 /usr/lib/libc.so.1 dd943000 dd944000 1000 /usr/lib/libc.so.1 dd950000 dda30000 e0000 /export/home/local/lib/libwine_unicode.so.1 dda3f000 dda40000 1000 /export/home/local/lib/libwine_unicode.so.1 dda50000 dda51000 1000 [ anon ] dda60000 dda64000 4000 /export/home/local/lib/libwine.so.1 dda73000 dda74000 1000 /export/home/local/lib/libwine.so.1 dda74000 dda87000 13000 /export/home/local/lib/libwine.so.1 dda90000 ddac0000 30000 /export/home/local/lib/wine/ntdll.dll.so ddac0000 ddac1000 1000 [ anon ] ddac1000 ddb3d000 7c000 /export/home/local/lib/wine/ntdll.dll.so ddb4c000 ddb57000 b000 /export/home/local/lib/wine/ntdll.dll.so ddb57000 ddb79000 22000 /export/home/local/lib/wine/ntdll.dll.so ddb80000 ddb81000 1000 /usr/lib/libdl.so.1 ddb90000 ddbda000 4a000 /usr/lib/ld.so.1 ddbea000 ddbee000 4000 /usr/lib/ld.so.1 ddbee000 ddbf0000 2000 /usr/lib/ld.so.1 The Fault indicates that the exception occurs at eip 0xddb2484a: and the address of the fault indicates it also is at 0xddb2484a which would indicate that it had trouble fetching the instruction ??? Also Note the very low value of esp, Its also possible there has been a stack overflow here. My question is simply. Does This also occur under Linux ????, can Someone try it for me LF2 Faults creating the first thread as documented here before. Could someone also test this under Linux as it would be useful to know whether this problem is solaris specific, or is related to wine generally EG a stack overflow or improperly allocated/protected segment Thanks in advance Bob

2 1

Re: Mac OS X Support : winebuild assembler conformance
by Marcus Meissner 23 Jun '03

23 Jun '03

On Mon, Jun 23, 2003 at 02:01:38PM +0200, Pierre d'Herbemont wrote: > Hi, > > Here is a patch which fix the problem with darwin's asm. I would like > to know if linux assembler is ok with this patch. Hmm, not quite. On Linux/PPC: d3d8.spec.s:351: Error: syntax error; found `(' but expected `,' d3d8.spec.s:351: Error: junk at end of line: `(_imports+80)' 351: lis r9,ha16(_imports+80) 352: la r8,lo16(_imports+80)(r9) Ciao, Marcus

2 1

Application icon
by Moreno 23 Jun '03

23 Jun '03

Hi, i have a question about an application icon. when i start Lotus Notes 5 give me the x icon. If inside the application i excange the application (to Lotus Notes Designer 5 and close Notes Client 5. reopen Notes Client 5) i can see the original image. My question is: Where is implemented the differnce? bye Moreno -- Moreno <morenoca(a)freemail.it>

1 0

Strange Crash in Direct X init
by Robert Lunnon 23 Jun '03

23 Jun '03

I have a strange crash in thread creation with a program called little fighter II (Which is downloadable off the internet) LF2 Spawns a Thread in User_DirectDrawSurface_Construct (below) and when created the thread creation call crashes in a mutex_lock. Strange thing is the same thread creation calll in eudora3.2 succeeds although there the thread is created to service Asychronous Winsock calls. In the eudora case the Thread is created much later, after the window is up and dispalyed. Can anyone hazard a guess as to what is happening here ? I am at a loss to explain why the same call should succeed in one place and fall over in another See below for a partial debug session transcript of the code leading up to the segv fault the program will fall over during the call to _lwp_create. Bob... The program being debugged has been started already. Start it from the beginning? (y or n) y Starting program: /export/home/local/bin/wine ./lf2 Setting Signal Handlers err:font:ReadFontDir Can't open directory "/usr2/robert/c/windows/Fonts" x11drv: Warning: $DISPLAY variable ignored, using ':0.0' specified in config file fixme:ddraw:Main_DirectDraw_SetCooperativeLevel (dd5c9438)->(00010022,00000008) Breakpoint 1, SYSDEPS_SpawnThread (teb=0xdc043000) at ../../scheduler/sysdeps.c:204 204 fprintf(stderr,"Starting New Thread Via thr_create stack base = %lx size =%d\n",teb->stack_base, (char *)teb->stack_top - ( char *)teb->stack_base); (gdb) bt #0 SYSDEPS_SpawnThread (teb=0xdc043000) at ../../scheduler/sysdeps.c:204 #1 0xddb07fad in CreateThread (sa=0x0, stack=0, start=0xdcf0e50c <User_update_thread>, param=0xdd5c9bd0, flags=0, id=0x0) at ../../scheduler/thread.c:289 #2 0xdcf0de1b in User_DirectDrawSurface_Construct (This=0xdd5c9bd0, pDD=0xdd5c9438, pDDSD=0xdd522cbc) at dsurface/user.c:101 #3 0xdcf0decc in User_DirectDrawSurface_Create (pDD=0xdd5c9438, pDDSD=0xdd522cbc, ppSurf=0xdd522d84, pUnkOuter=0x0) at dsurface/user.c:140 #4 0xdcf02ae1 in HAL_DirectDraw_create_primary (This=0xdd5c9438, pDDSD=0xdd522cbc, ppSurf=0xdd522d84, pUnkOuter=0x0) at ddraw/hal.c:446 #5 0xdcf03bc2 in create_primary (This=0xdd5c9438, pDDSD=0xdd522dac, ppSurf=0xdd522d84, pUnkOuter=0x0) at ddraw/main.c:473 #6 0xdcf03f74 in Main_DirectDraw_CreateSurface (iface=0xdd5c9438, pDDSD=0xdd522dac, ppSurf=0xdd522d84, pUnkOuter=0x0) at ddraw/main.c:593 #7 0xdcf058cb in IDirectDrawImpl_CreateSurface (This=0xdd5c9444, pSDesc=0xdd522dac, ppSurface=0x44a854, pUnkOuter=0x0) at ddraw/thunks.c:207 #8 0x00401216 in ?? () #9 0xddb03aec in start_process () at ../../scheduler/process.c:455 #10 0xddb06f0e in call_on_thread_stack (func=0xddb03908) at ../../scheduler/sysdeps.c:124 (gdb) up #1 0xddb07fad in CreateThread (sa=0x0, stack=0, start=0xdcf0e50c <User_update_thread>, param=0xdd5c9bd0, flags=0, id=0x0) at ../../scheduler/thread.c:289 289 if (SYSDEPS_SpawnThread( teb ) == -1) (gdb) list 284 teb->entry_arg = param; 285 teb->startup = THREAD_Start; 286 teb->htask16 = GetCurrentTask(); 287 288 if (id) *id = tid; 289 if (SYSDEPS_SpawnThread( teb ) == -1) 290 { 291 CloseHandle( handle ); 292 close( request_pipe[1] ); 293 THREAD_FreeTEB( teb ); (gdb) print teb $1 = (TEB *) 0xdc043000 (gdb) print *teb $2 = {except = 0xffffffff, stack_top = 0xdc043000, stack_low = 0xdbe20000, htask16 = 279, stack_sel = 0, fiber = 0x0, user_ptr = 0, self = 0xdc043000, tibflags = 1, mutex_count = 0, pid = 0, tid = 10, queue = 0, pad1 = 0, tls_ptr = 0x0, Peb = 0xddb78d40, flags = 0, exit_code = 259, teb_sel = 423, emu_sel = 0, unknown1 = 0, unknown2 = 0, startup = 0xddb07de8 <THREAD_Start>, thread_errno = 0, thread_h_errno = 0, signal_stack = 0xdbe21000, exit_stack = 0x0, emu_data = 0x0, last_error = 0, debug_cb = 0x0, debug_thread = 0, pcontext = 0x0, cur_stack = 0, ThunkConnect = 0, NegStackBase = 0, current_ss = 0, pad2 = 0, ss_table = 0x0, thunk_ss = 0, pad3 = 0, pad4 = {0 <repeats 15 times>}, CurrentLocale = 0, pad5 = {0 <repeats 48 times>}, delta_priority = 0, unknown4 = {0, 0, 0, 0, 0, 0, 0}, create_data = 0x0, suspend_count = 0, entry_point = 0xdcf0e50c, entry_arg = 0xdd5c9bd0, unknown5 = {0, 0, 0, 0}, sys_count = {0, 0, 0, 0}, sys_mutex = {0x0, 0x0, 0x0, 0x0}, unknown6 = {0, 0, 0, 0, 0}, code_page = 0, unused = {0, 0}, gs_sel = 0, request_fd = 14, reply_fd = -1, wait_fd = {-1, -1}, debug_info = 0xdc044000, pthread_data = 0x0, pending_list = 0x0, driver_data = 0x0, dpmi_vif = 0, vm86_pending = 0, vm86_ptr = 0x0, pad6 = {0 <repeats 624 times>}, StaticUnicodeString = {Length = 0, MaximumLength = 522, Buffer = 0xdc043c00}, StaticUnicodeBuffer = {0 <repeats 261 times>}, stack_base = 0xdbe20000, tls_array = {0x0 <repeats 64 times>}, pad8 = {0, 0, 0}, ReservedForNtRpc = 0x0, pad9 = { 0 <repeats 24 times>}, ErrorInfo = 0x0} (gdb) step Starting New Thread Via thr_create stack base = dbe20000 size =2240512 282 _lwp_makecontext( &context, (void(*)(void *))SYSDEPS_StartThread, teb, (gdb) 284 sigprocmask(SIG_SETMASK, NULL, &context.uc_sigmask); (gdb) 285 err=_lwp_create( &context, LWP_DETACHED, &new_lwp ) ; (gdb) print context $3 = {uc_flags = 4, uc_link = 0x50, uc_sigmask = {__sigbits = {1, 0, 0, 0}}, uc_stack = {ss_sp = 0x0, ss_size = 0, ss_flags = 0}, uc_mcontext = {gregs = {0, 143, 31, 31, 0, 0, -603705352, 9, -581817680, -593636687, 9, -581817668, 32, 0, -575639696, 23, -577633087, -603705360, 31}, fpregs = {fp_reg_set = {fpchip_state = {state = {-581133360, 0, -581817304, -584563419, 0, 0, 0, 0, -576773248, -575357312, -581817576, -581817562, -581817772, -575738902, -576456548, -593636687, 9, -581817568, 32, 0, -577515520, -577924375, -577515520, -581817768, -577997369, 11, -576243124}, status = -581817728}, fp_emul_space = { fp_emul = "Ð\233\\Ý\0\0\0\0(,RÝ%E(Ý", '\0' <repeats 16 times>, "\200#\237Ý\200¾´Ý\030+RÝ&+RÝT*RÝêë®Ý\234ø£Ý±Ò\235Ü\t\0\0\0 + RÝ \0\0\0\0\0\0\0\0Ð\223Ýé\222\215Ý\0Ð\223ÝX*RÝÇu\214Ý\v\0\0\0L:§Ý\200*RÝÿâ\214Ý\016&²ÝÈ-\224Ý\0Ð\223Ý`Ý\a\bÿâ\214Ý\020Þ\a\b\0\0\0\0\2 24\024\224Ý\0\0\0\0\030Þ\a\b\0Ð\223Ý\234*RÝ{ú\221Ý\210\024\224Ý\0Ð\223Ý°*RÝGÝ\214Ý\026ä°ÝÁä°Ý\001\0\0\0~\e²Ý;ß\a\bW\0"..., fp_epad = "\a\b"}, f_fpregs = {-581133360, 0, -581817304, -584563419, 0, 0, 0, 0, -576773248, -575357312, -581817576, -581817562, -581817772, -575738902, -576456548, -593636687, 9, -581817568, 32, 0, -577515520, -577924375, -577515520, -581817768, -577997369, 11, -576243124, -581817728, -577969409, -575527410, -577491512, -577515520, 134733152, -577969409, 134733328, 0, -577497964, 0, 134733336, -577515520, -581817700, -577635717, -577497976, -577515520, -581817680, -577970873, -575609834, -575609663, 1, -575530114, 134733627, 87, 1, 87, -575322962, 1465002724, -575357312, 134733628, 4096, -581817592, -575525247, 134733336}}, f_wregs = {-604889088, 4096, 87, -604889088, 134733336, 64, -575357312, -581817488, -605945856, -581817556, -575708909, -1, -581817544, -581817540, 320, -581817488, -575357312, -581817488, -581817524, -575708957, -1, -604889088, 4096, 320, -581817488, -575357312, -581817472, -575636289, -604889088, 1, 320, -581817488, 8192}}}, uc_filler = {-605937664, 2248704, 64, -575357312, 10}}

2 2

Info on windows server 2003 (new APIs)
by Eric Pouech 22 Jun '03

22 Jun '03

http://msdn.microsoft.com/msdnmag/issues/03/06/WindowsServer2003/default.as… well, not too many surprises here (most of the new APIs already existed in XP) A+ -- Eric Pouech

1 0

Re: dmusic: framework for file loading
by Andreas Mohr 22 Jun '03

22 Jun '03

On Sun, Jun 22, 2003 at 03:12:43PM +0200, Rok Mandeljc wrote: > As I've mentioned, we'll need a function for loading chunks from dmusic > files. I tried to write one, and here's result; it's not very nice, but > it works (sort of). > At the time being, it only "loads" and displays data > (--debugmsg=+dmfile for debug and --debugmsg=+dmfiledat for the display > of data). I couldn't make it load data into IDirectMusic*Impl > interfaces, because whatever I did, exception occured (maybe someone > more familiar with this could do this (Raphael?)). Also, if someone has > more robust and simpler function, please tell me. > DMUSIC_FillSegmentFromFileHandle loads sample.sgt from DX SDK > completely... however, i didn't try the other. > > Also "fixed" a problem I've encountered while running 3DAudio.exe (from > SDK). One of the latest patches added this clause: > > if (!ppDirectSound) > IDirectSound_Release(*ppDirectSound); > > I don't know why, but it causes exception (i've commented it). Would you PLEASE remove the ! instead of commenting the whole stupid thing!? Aargh, too easy... ;) Andreas Mohr

1 0

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