wine-devel

wine-devel@winehq.org

9 participants
84457 discussions

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel