- Wine-Devel - list.winehq.org

Problems running IE with latest release
by Con Hennessy June 14, 2002

June 14, 2002

Hi, I am trying to run IE version 4 ( I think ) however I am getting "unhandled exceptions". When I use the following command "wine --dll commctrl,comctl32=n iexplore.exe" I get : err:heap:HEAP_CreateSystemHeap system heap base address 0x65430000 not available err:font:AddFontFileToList Unable to load font file "/mnt/windows/windows/fonts/desktop.ini" err = 55 err:font:AddFontFileToList Unable to load font file "/mnt/windows/windows/fonts/modern.fon" err = 2 wine: Unhandled exception, starting debugger... err:seh:EXC_DefaultHandling Unhandled exception code c0000005 flags 0 addr 0x1581e3e4 I also tried to use : wine --dll shell,shell32,commctrl,comctl32=n --dll kernel32,netbios,netapi32,user32=b iexplore.exe but with the same results. I know how to turn tracing on, but am not sure what exactly is the problem. I've had a go at turning on the traces and got the following : 0807a828:Ret kernel32.CloseHandle() retval=00000001 ret=16013d94 0807a828:Call kernel32.OpenEventA(001f0003,00000000,16013e30 "HookSwitchHookEnabledEvent") ret=16013dbd 0807a828: open_event( access=001f0003, inherit=0, name=L"HookSwitchHookEnabledEvent" ) 0807a828: open_event() = OBJECT_NAME_NOT_FOUND { handle=0 } 0807a828:Ret kernel32.OpenEventA() retval=00000000 ret=16013dbd 0807a828:Call kernel32.TlsAlloc() ret=16013e03 0807a828:Ret kernel32.TlsAlloc() retval=00000002 ret=16013e03 0807a828:Ret PE DLL (proc=0x16013bbe,module=16012000,type=1,res=(nil)) retval=1 0807a828:trace:module:MODULE_InitDLL (0x159036b4,PROCESS_ATTACH,(nil)) - RETURN 1 0807a828:trace:module:MODULE_DllProcessAttach (ole32.dll,(nil)) - END 0807a828:trace:module:MODULE_InitDLL (shdocvw.dll,PROCESS_ATTACH,(nil)) - CALL 0807a828:trace:module:MODULE_InitDLL (0x1590349c,PROCESS_ATTACH,(nil)) - RETURN 1 0807a828:trace:module:MODULE_DllProcessAttach (shdocvw.dll,(nil)) - END 0807a828:Ret kernel32.LoadLibraryA() retval=16006000 ret=00401328 0807a828:Call kernel32.GetProcAddress(16006000,00000068) ret=00401346 0807a828:trace:win32:MODULE_GetProcAddress (16006000,0x68) 0807a828:trace:win32:PE_FindExportedFunction (104) 0807a828:Ret kernel32.GetProcAddress() retval=160070fc ret=00401346 0807a828:Call ntdll.RtlRaiseException(15b26d80) ret=16007059 0807a828:trace:seh:EXC_RtlRaiseException code=80000100 flags=1 addr=0x401726 0807a828:trace:seh:EXC_RtlRaiseException info[0]=1600da80 0807a828:trace:seh:EXC_RtlRaiseException info[1]=1600da94 0807a828:trace:seh:EXC_RtlRaiseException stub=104 0807a828: queue_exception_event( first=1, record={context={flags=00010007,eax=15b26d78,ebx=156885c4,ecx=1569f6e5,edx=15b26d80,esi=15651564,edi=00000001,ebp=15b26ce0,eip=15636943,esp=15b26cc4,eflags=00200212,cs=0023,ds=002b,es=002b,fs=008f,gs=0000,dr0=158c58c4,dr1=1569f6b1,dr2=1581600d,dr3=158c58c4,dr6=1569f6b1,dr7=158c58c4,float={1569f6a8,15816ff5,1581600d,15b269c0,15816ff5,15b269f0,1581600d,158c58c4,1569f6d5,158c58c4,15b269f0,15b26ad0,158122f4,15b269e8,15816ff5,15b26a18,1569f6d5,1569faa7,00000000,158c58c4,34303118,15b26af8,158122f4,15b26a18,15669fb0,15b26b88,158122e3,15b26a18}},rec={code=80000100,flags=1,rec=(nil),addr=0x401726,params={1600da80,1600da94}} ) 0807a828: queue_exception_event() = 0 { handle=0 } 0807a828:trace:seh:EXC_CallHandler calling handler at 0x15651b64 code=80000100 flags=1 0807a828: queue_exception_event( first=0, record={context={flags=00010007,eax=15b26d78,ebx=156885c4,ecx=1569f6e5,edx=15b26d80,esi=15651564,edi=00000001,ebp=15b26ce0,eip=15636943,esp=15b26cc4,eflags=00200212,cs=0023,ds=002b,es=002b,fs=008f,gs=0000,dr0=158c58c4,dr1=1569f6b1,dr2=1581600d,dr3=158c58c4,dr6=1569f6b1,dr7=158c58c4,float={1569f6a8,15816ff5,1581600d,15b269c0,15816ff5,15b269f0,1581600d,158c58c4,1569f6d5,158c58c4,15b269f0,15b26ad0,158122f4,15b269e8,15816ff5,15b26a18,1569f6d5,1569faa7,00000000,158c58c4,34303118,15b26af8,158122f4,15b26a18,15669fb0,15b26b88,158122e3,15b26a18}},rec={code=80000100,flags=1,rec=(nil),addr=0x401726,params={1600da80,1600da94}} ) 0807a828: queue_exception_event() = 0 { handle=0 } 0807a828: create_event( manual_reset=1, initial_state=0, inherit=1, name=L"" ) 0807a828: create_event() = 0 { handle=56 } wine: Unhandled exception, starting debugger... 0807a828:trace:heap:RtlAllocateHeap (158d0000,00000002,0000006c): returning 15902fa0 0807a828:trace:reg:NtOpenKey (0x80000002,L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug\0000\5555\008d\0000\5246\4545\3554\1590`\158d\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa"...,f003f,0x15b2680c) 0807a828: open_key( parent=-2147483646, access=000f003f, name=L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug" ) Open key ERROR 0807a828: open_key() = OBJECT_NAME_NOT_FOUND { hkey=0 } 0807a828:trace:reg:NtOpenKey <- 0x0000 0807a828:trace:heap:RtlFreeHeap (158d0000,00000002,15902fa0): returning TRUE 0807a828:trace:seh:EXC_RtlRaiseException code=c0000005 flags=0 addr=0x1581e3e4 0807a828:trace:seh:EXC_RtlRaiseException info[0]=00000001 0807a828:trace:seh:EXC_RtlRaiseException info[1]=00000000 0807a828: queue_exception_event( first=1, record={context={flags=00000000,eax=ea985977,ebx=156885c4,ecx=ea98593f,edx=1567a6c1,esi=00000000,edi=15b26964,ebp=15b26668,eip=1581e3e4,esp=15b26664,eflags=00210203,cs=0023,ds=002b,es=002b,fs=008f,gs=0000,dr0=00000000,dr1=00000000,dr2=00000000,dr3=00000000,dr6=00000000,dr7=00000000,float={00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000}},rec={code=c0000005,flags=0,rec=(nil),addr=0x1581e3e4,params={1,0}} ) 0807a828: queue_exception_event() = 0 { handle=0 } 0807a828:trace:seh:EXC_CallHandler calling handler at 0x15651120 code=c0000005 flags=0 0807a828:trace:seh:EXC_CallHandler handler returned 2 0807a828:trace:seh:EXC_CallHandler calling handler at 0x15651b64 code=c0000005 flags=10 0807a828:trace:seh:EXC_CallHandler handler returned 1 0807a828: queue_exception_event( first=0, record={context={flags=00000000,eax=ea985977,ebx=156885c4,ecx=ea98593f,edx=1567a6c1,esi=00000000,edi=15b26964,ebp=15b26668,eip=1581e3e4,esp=15b26664,eflags=00210203,cs=0023,ds=002b,es=002b,fs=008f,gs=0000,dr0=00000000,dr1=00000000,dr2=00000000,dr3=00000000,dr6=00000000,dr7=00000000,float={00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000}},rec={code=c0000005,flags=0,rec=(nil),addr=0x1581e3e4,params={1,0}} ) 0807a828: queue_exception_event() = 0 { handle=0 } 0807a828:err:seh:EXC_DefaultHandling Unhandled exception code c0000005 flags 0 addr 0x1581e3e4 0807a828: terminate_process( handle=-1, exit_code=1 ) 0807a828: terminate_process() = 0 { self=1 } 0807a828: *killed* exit_code=1 yamed(a)plato:~/kde_> /home/yamed/.wine/user.reg: saving key \\User\\yamed /home/yamed/.wine/system.reg: saving key \\Machine /home/yamed/.wine/userdef.reg: saving key \\User\\.Default Server: exiting (pid=23764) Anyone able to help, or make any suggestion ? Thanks, CP

4 7

Re: wine/dlls/winsock socket.c ws2_32.spec
by Martin Wilck June 14, 2002

June 14, 2002

> - hackish implementation of WSADuplicateSocket. + DuplicateHandle(GetCurrentProcess(), s, + hProcess, (LPHANDLE)&lpProtocolInfo->dwCatalogEntryId, + 0, FALSE, DUPLICATE_SAME_ACCESS); + CloseHandle(hProcess); + lpProtocolInfo->dwServiceFlags4 = 0xff00ff00; /* magic */ The Winsock SPI docs say that service providers should use the lpProtocolInfo->dwProviderReserved field. I recommend that that be used in Wine, too. Also, I don't think you need the "magic" field - simply test if dwProviderReserved is a valid handle. Martin -- Martin Wilck Phone: +49 5251 8 15113 Fujitsu Siemens Computers Fax: +49 5251 8 20409 Heinz-Nixdorf-Ring 1 mailto:Martin.Wilck(a)Fujitsu-Siemens.com D-33106 Paderborn http://www.fujitsu-siemens.com/primergy

1 0

Merge rpcrt/ole32 from Rewind
by juergen.schmied＠debitel.net June 14, 2002

June 14, 2002

Hi! I started to merge this files in. This patches are done to a loder wine version so it does not merge in a clean way. Some code is allready implemented twice. So I do: - merge as far as I can - if a function is implemented twice I comment one implementation out but leave the code in (mainly the standard marshaler parts). I can't decide how to merge it. - the final cleanup should be done by the ones who are familiar with that code (Marcus?) - any objections against the rpcrt4 stuff? Ove himself says its not very clean but we dont have any better code yet. Is this OK? juergen

3 2

ole help please! invoke fn issue
by Ann and Jason Edmeades June 14, 2002

June 14, 2002

Hi all, Playing further with my VB program and native oleaut32 I've hit an 'interesting issue' with the Microsoft Date/Time picker. typelib.c in dlls\oleaut32 assumes all parms are dwords and picks the lval of a variant (which for most of the types of variant is the dword containing the important information). However as shown by the following trace: trace:ole:ITypeInfo_fnInvoke (0x404560ac)(0x40418fac,id=20,flags=0x00000004,0x405c5d84,(nil),0x405c5d64,0 x405c5d94) partial stub! trace:ole:dump_DispParms args=1 named args=1 trace:ole:dump_Variant (0x405c5dec) trace:ole:dump_Variant VARTYPE: VT_DATE trace:ole:dump_Variant (?)-882854389 L"Value"(1) parm0: L"\00e5MSComCtl2WWW" memid is 00000014 Param 0: tdesc.vartype 12 (VT_VARIANT) u.parmadesc.flags 1 u.parmadesc.lpex (nil) funckind: 1 (pure virtual) invkind: 4 (property put) callconv: 4 (stdcall) oVft: 224 cParamsOpt: 0 wFlags: 3c helpstring: L"Returns/sets the current date." entry: (null) 08072560:Call ntdll.RtlAllocateHeap(40370000,00000000,00000008) ret=408bfcc3 08072560:Ret ntdll.RtlAllocateHeap() retval=4041a160 ret=408bfcc3 08072560:Call ntdll.RtlAllocateHeap(40370000,00000008,00000004) ret=408bfce4 08072560:Ret ntdll.RtlAllocateHeap() retval=4041a180 ret=408bfce4 trace:ole:ITypeInfo_fnInvoke set 0 to disparg type 7 vs 12 This shows that the function takes one parm and that parm is a variant. We pass the value contained in the parm and it fails. We need to ensure the whole variant is put on the stack for the called function. Since we currently only call with dword parms this wont work. I have managed to get further by a dirty hack: DWORD numArgWords = 0; args[0] = (DWORD)pIUnk; for (i=0;i<pFDesc->funcdesc.cParams;i++) { if (i<pDispParams->cArgs) { TRACE("set %d to disparg type %d vs %d\n",i, V_VT(&pDispParams->rgvarg[pDispParams->cArgs-i-1]), pFDesc->funcdesc.lprgelemdescParam[i].tdesc.vt ); if (pFDesc->funcdesc.lprgelemdescParam[i].tdesc.vt != VT_VARIANT) { args[i+1] = V_UNION(&pDispParams->rgvarg[pDispParams->cArgs-i-1],lVal); numArgWords = numArgWords+1; } else { TRACE("Faking variant on stack as more args \n"); memcpy(&args[i+1], &pDispParams->rgvarg[pDispParams->cArgs-i-1], sizeof(VARIANT)); numArgWords = numArgWords + sizeof(VARIANT)/4; } } else { TYPEDESC *tdesc = &(pFDesc->funcdesc.lprgelemdescParam[i].tdesc); TRACE("set %d to pointer for get (type is %d)\n",i,tdesc->vt); /*FIXME: give pointers for the rest, so propertyget works*/ args[i+1] = (DWORD)&args2[i]; numArgWords = numArgWords+1; /* If pointer to variant, pass reference to variant * in result variant array. */ if ((tdesc->vt == VT_PTR) && (tdesc->u.lptdesc->vt == VT_VARIANT) && pVarResult ) args[i+1] = (DWORD)(pVarResult+(i-pDispParams->cArgs)); } } TRACE("_invoke with %ld args\n", numArgWords+1); res = _invoke((*(DWORD***)pIUnk)[pFDesc->funcdesc.oVft/4], pFDesc->funcdesc.callconv, numArgWords+1, args ); This hack takes the parm and puts the variant into that arg and subsequent ones, meaning the stack to the called function should look as it would be. Unfortunately as it stands this would only work with one parm, so my question is how it is supposed to be fixed. I could potentially change args[i+1] to args[numArgWords+1] but it still feels very hacky. If I have been ignorant of something please bear with me - I've never touched com programming before! Regards, Jason

3 2

dlls/ddraw build problem
by Steven Edwards June 14, 2002

June 14, 2002

Hola, While everyone is looking at the new directx stuff can someone check and see if there is a easy way to fix this? dsurface/dib.o(.text+0x38a):dib.c: undefined reference to `DIB_CreateDIBSection' D:\mingw\bin\dllwrap.exe: D:\mingw\bin\gcc exited with status 1 make: *** [ddraw.dll] Error 1 >From the changelog on 2000-04-29 Ove implemented this in graphics/x11drv/dib.c, include/bitmap.h, include/gdi.h, include/x11drv.h, objects/dib.c. I havent had time to look at the new DIB engine patches from transgamming to see if they could fix this, so if they do then please send this email to /dev/null. Thanks Steven __________________________________________________ Do You Yahoo!? Yahoo! - Official partner of 2002 FIFA World Cup http://fifaworldcup.yahoo.com

2 4

Repeated: Breakage in -relay and -snoop
by Uwe Bonnes June 13, 2002

June 13, 2002

Hallo, since last week, e.g a commandline like "wine <xxx> --debugmsg -relay=RtlEnterCriticalSection" inhibits _any_ relay message to be logged. Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

3 4

Re: FW: [ros-kernel] wine dll
by juergen.schmied＠debitel.net June 13, 2002

June 13, 2002

For now and a any thinkable time this won't work without native shell32, shlwapi, shdocvw and some more shell stuff since big parts of the user interface are in there. It would be more useful to replace just one dll at one time with a wine dll. If you like to test the shell stuff, there is a registry key somewhere to set a different shell - like winfile. juergen "Steven Edwards" <Steven_Ed4153(a)yahoo.com> schrieb: > tested system: windows 2000 server build 2195 > pc tested: AMD Athon XP 1600, 256 ram > > first copied all dll to the windows dir. and booted. > win2k dies durning the winlogon. somewhere... > restored: > * urlmon.dll > * oleaut32.dll > * odbc32.dll > * oledlg.dll > * olepro32.dll > * winnls.dll > windows died again. > > restored: wintrust.dll, comcat.dll, crtdll.dll > result : windows died > > restored: tapi32.dll > result: windows died > > restored: dciman32.dll, dinput.dll > result: windows died > > restored: imm32.dll > result: windows died > > restored: mapi32.dll > result: windows died > > restored: dplayx.dll, mpr.dll > result: windows died > > restored: netapi.dll > result: windows showed a dialog saying that libwine*.dll was not found. > > copied: libwine.dll, libwine_tsx11.dll, libwine_unicode.dll. > result: winlogon.exe reports: msgina.dll could not be loaded, a restart button > is found, so I press it... > > restored: comctl32.dll > result: * the same dialog openes > * mstask.exe, says it cannt find the procedure: PathFintExtensionW(), at shlwapi.dll > * dns.exe, says ir cannt find the procedure: DwEnumEntryDetails(), at rasapi32.dll > > restored: shlwapi.dll, rasapi32.dll > result: after gzilion years (two minutes?) windows loaded, no error reported > I logged in as administrator, explorer did not load. > I press alt-ctrl-del to bring the sequrity dialog. I choosed to run the > task manager. I choose File/New task, and a dialog saying that ordinal 135 was not found in > shdocvm.dll, pressed OK. I runned again explorer. It did not load. I run windows commander, > (the browse command worked fine). Windows commander load ok. Run from the task manager notepad, > loads OK, and wrote this :) > > put wine dll: comctl32.dll > result: winlogon.exe reports: msgina.dll could not be loaded, a restart button. > > restored comctl32.dll and run a few programs. > windows commander runs. > notepad runs > winamp runs > several programs from the systemroot run, and thease gave me errors. > > systomroot\setup.exe : procedure entry not found: CheckSumMappedFile()(a)imagehelp.dll > systomroot\sigverif.exe: procedure entry not found: ImageAddCertificate()(a)imagehelp.dll > systomroot\ntbooks.exe : the instruction at "0x64d2b8c6" referenced at "0x0000" could not be "read".. ok, cancel to debug... (the window title says hh.exe) > procedure entry not found: ImageAddCertificate()(a)imagehelp.dll > systomroot\rundll32.exe: procedure entry not found: ImageDirectoryEntryToData()(a)imagehelp.dll > >

1 0

FW: [ros-kernel] wine dll's on a real system. (Mingw Win2k)
by Steven Edwards June 13, 2002

June 13, 2002

If anyone is interested in the win2k test results then here they are. Thanks Steven "Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson -----Original Message----- From: reactos-kernel-admin(a)lists.sourceforge.net [mailto:reactos-kernel-admin(a)lists.sourceforge.net] On Behalf Of Diego Iastrubni Sent: Wednesday, June 12, 2002 10:55 AM To: reactos-kernel(a)lists.sourceforge.net Subject: [ros-kernel] wine dll's on a real system. Hello gang, I got the wine dll's from Steven and installed them on a win2k server I have, on a ADM Athlon XP1600, 256 ram, and servral gb of disk. I documented what I saw, and the results are not good. :-(, This is the first round, so I will be patient. a few notes: * windows dies means I see the screen getting black and I see the bios again * please ingnore the spelling/ grammar orros in the text attached. * if you can, you can tell me if there is a way to see which programs use which dll, that would make my life easier. - diego -- bureaucracy, n: A method for transforming energy into solid waste.

1 0

Fix for locale regression test failures ...
by Paul Millar June 12, 2002

June 12, 2002

Hi, The problem _seems_ to be the same problem with ole/old2nls.c in two places. In GetNumberFormatA, it was (line 3091 onward): if (lpFormat != NULL) [...] else { if (dwflags & LOCALE_NOUSEROVERRIDE) used_operation = USE_LOCALEINFO; else used_operation = USE_SYSTEMDEFAULT; } with an equivalent test in GetCurrencyFormatA (see line 3331 onward). Both these tests look wrong as the logic is screwed up (not setting LOCALE_NOUSEROVERRIDE => use system defaults). After sullying my hands with MSDN, I found the following references: http://msdn.microsoft.com/library/en-us/intl/nls_0rec.asp and http://msdn.microsoft.com/library/en-us/intl/nls_8a0k.asp for GetCurrencyFormat and GetNumberFormat respectively. Both have a passage like: > If lpFormat is NULL, you can specify LOCALE_NOUSEROVERRIDE to format the > string using the system default number format for the specified locale; > or you can specify zero to format the string using any user overrides to > the locale's default number format. Which suggests the reverse behaviour. AFAIK, MSDN docs have been found to be incorrect in the past, so does anyone know who's right? BTW, swapping both lines to: if (dwflags & LOCALE_NOUSEROVERRIDE) used_operation = USE_SYSTEMDEFAULT; else used_operation = USE_LOCALEINFO; does fixes both the fr_FR and en_GB locale failings and en_US continues to work. I'll submit a proper patch in a moment, but I thought it best put all the information in this email first. Cheers, ---- Paul Millar

1 0

Extremely preliminary BiDi patch
by Shachar Shemesh June 12, 2002

June 12, 2002

Attached is an extremely preliminary BiDi patch. Here are the things this patch contains, and the points I would love to hear the list's comments about. This patch is under the LGPL only, at this stage. Changes: * Fixed the heb.nls file so that LANG=he_IL will be accepted * Implemented a skeleton for GetFontLanguageInfo. o I have filled in the skeleton where I knew what to fill it with. I would guess that a lot of stuff is still missing. o I would apretiate input on the aprorpiatness of using GetTextCharsetInfo as the source of information. o I have removed the FIXME, but a lot of stuff is still unimplemented. I didn't quite know what to put there instead. * GetCharacterPlacementW - This is certanly one of the more overloaded functions in the Win32 set (Select object comes to mind as a competitor, and this one has way more execution flows throught it). So far, as far as I could tell, only the flow that matched Latin fonts was implemented. I have added some (very basic) reordering. I would like to hear your comments about the following points: o I followed the autodocumentation instructions. Is this at all still supported or required? o The algorythm I used is far from a good one. It still doesn't support right to left paragraphs, neutral boundry characters, and a bunch of other necessary stuff. All it does, at the moment, is make sure consecutive runs of one direction are, more or less, readable. o I have added a fastpath option when no work is necassary. When all that is supported is reordering, this may make sense. However, I am somewhat worried that when kerning, ligation, glyphing etc. are added, the fastpath will be meaningless. Opinions? * ExtTextOutW o I am calling GetFontLanguageInfo for each and every ExtTextOutW (which is a focus point for all Text rendering functions). What performance implications will that have? Don't forget that what I pay for in asking whether reordering is necessary, I get back in not calling GetCharacterPlacementW, and in not allocating a buffer. Then again, some Unicode fonts will suffer both allocation and no reordering. o I am calling the backend text printing function in two flows. One is using the allocated buffer used for GetCharacterPlacementW, and the other is the original (no point in allocating a buffer if no processing was done). Should I work hard to merge the two calls? o I am assuming that the backend driver will not perform any reordering. I am not sure how correct that assumption is under, say, KDE3 (Hetz?). These are all the questions for the time being. I also need some explanation regarding procedures. Which of the following three are enough, on their own, to cause the patch to be integrated: 1. Attaching it to a bug (assuming that I am the bug's owner) 2. Sending the patch to wine-devel 3. Sending the patch to wine-patches Obviously, 3 is enough on it's own. Assuming I have questions, however, is 2 enough on its own? Is 1 at all necessary if I'm doing 2 or 3? Is this message off topic on wine-devel? on wine-patches? Shachar Index: dlls/kernel/nls/heb.nls =================================================================== RCS file: /home/wine/wine/dlls/kernel/nls/heb.nls,v retrieving revision 1.3 diff -u -r1.3 heb.nls --- dlls/kernel/nls/heb.nls 19 May 2002 22:23:23 -0000 1.3 +++ dlls/kernel/nls/heb.nls 12 Jun 2002 19:34:02 -0000 @@ -128,6 +128,6 @@ /* LOCVAL(LOCALE_FONTSIGNATURE, "") */ LOCVAL(LOCALE_SISO639LANGNAME,"he") -LOCVAL(LOCALE_SISO3166CTRYNAME,"HE") +LOCVAL(LOCALE_SISO3166CTRYNAME,"IL") /* gregoriansk kalender */ Index: objects/font.c =================================================================== RCS file: /home/wine/wine/objects/font.c,v retrieving revision 1.74 diff -u -r1.74 font.c --- objects/font.c 4 Jun 2002 01:02:52 -0000 1.74 +++ objects/font.c 12 Jun 2002 19:34:04 -0000 @@ -2098,10 +2098,48 @@ /************************************************************************* * GetFontLanguageInfo (GDI32.@) */ -DWORD WINAPI GetFontLanguageInfo(HDC hdc) { - /* return value 0 is correct for most cases anyway */ - FIXME("(%x):stub!\n", hdc); - return 0; +DWORD WINAPI GetFontLanguageInfo(HDC hdc) +{ + FONTSIGNATURE fontsig; + static const DWORD GCP_DBCS_MASK=0x003F0000, + GCP_DIACRITIC_MASK=0x00000000, + FLI_GLYPHS_MASK=0x00000000, + GCP_GLYPHSHAPE_MASK=0x00000040, + GCP_KASHIDA_MASK=0x00000000, + GCP_LIGATE_MASK=0x00000000, + GCP_USEKERNING_MASK=0x00000000, + GCP_REORDER_MASK=0x00000060; + + DWORD result=0; + + GetTextCharsetInfo( hdc, &fontsig, 0 ); + /* We detect each flag we return using a bitmask on the Codepage Bitfields */ + + if( (fontsig.fsCsb[0]&GCP_DBCS_MASK)!=0 ) + result|=GCP_DBCS; + + if( (fontsig.fsCsb[0]&GCP_DIACRITIC_MASK)!=0 ) + result|=GCP_DIACRITIC; + + if( (fontsig.fsCsb[0]&FLI_GLYPHS_MASK)!=0 ) + result|=FLI_GLYPHS; + + if( (fontsig.fsCsb[0]&GCP_GLYPHSHAPE_MASK)!=0 ) + result|=GCP_GLYPHSHAPE; + + if( (fontsig.fsCsb[0]&GCP_KASHIDA_MASK)!=0 ) + result|=GCP_KASHIDA; + + if( (fontsig.fsCsb[0]&GCP_LIGATE_MASK)!=0 ) + result|=GCP_LIGATE; + + if( (fontsig.fsCsb[0]&GCP_USEKERNING_MASK)!=0 ) + result|=GCP_USEKERNING; + + if( (fontsig.fsCsb[0]&GCP_REORDER_MASK)!=0 ) + result|=GCP_REORDER; + + return result; } /************************************************************************* @@ -2235,11 +2273,31 @@ /************************************************************************* * GetCharacterPlacementW [GDI32.@] + * + * Retrieve information about a string. This includes the width, reordering, + * Glyphing and so on. + * + * RETURNS + * + * The width and height of the string if succesful, 0 if failed. + * + * BUGS + * + * All flags except GCP_REORDER are not yet implemented. + * Reordering is not 100% complient to the Windows BiDi method. + * Caret positioning is not yet implemented. + * Classes are not yet implemented. + * */ DWORD WINAPI -GetCharacterPlacementW(HDC hdc, LPCWSTR lpString, INT uCount, - INT nMaxExtent, GCP_RESULTSW *lpResults, - DWORD dwFlags) +GetCharacterPlacementW( + HDC hdc, /* Device context for which the rendering is to be done */ + LPCWSTR lpString, /* The string for which information is to be returned */ + INT uCount, /* Number of WORDS in string. */ + INT nMaxExtent, /* Maximum extent the string is to take (in HDC logical units) */ + GCP_RESULTSW *lpResults, /* A pointer to a GCP_RESULTSW struct */ + DWORD dwFlags /* Flags specifying how to process the string */ + ) { DWORD ret=0; SIZE size; @@ -2254,37 +2312,115 @@ lpResults->lpDx, lpResults->lpCaretPos, lpResults->lpClass, lpResults->lpGlyphs, lpResults->nGlyphs, lpResults->nMaxFit); - if(dwFlags) FIXME("flags 0x%08lx ignored\n", dwFlags); + if(dwFlags&(~GCP_REORDER)) FIXME("flags 0x%08lx ignored\n", dwFlags); if(lpResults->lpCaretPos) FIXME("caret positions not implemented\n"); if(lpResults->lpClass) FIXME("classes not implemented\n"); - /* FIXME: reordering not implemented */ - /* copy will do if the GCP_REORDER flag is not set */ - if(lpResults->lpOutString) - lstrcpynW(lpResults->lpOutString, lpString, uCount); - - nSet = (UINT)uCount; - if(nSet > lpResults->nGlyphs) - nSet = lpResults->nGlyphs; - - /* return number of initialized fields */ - lpResults->nGlyphs = nSet; - - if(lpResults->lpOrder) - { - for(i = 0; i < nSet; i++) - lpResults->lpOrder[i] = i; - } - - if (lpResults->lpDx) - { - int c; - for (i = 0; i < nSet; i++) - { - if (GetCharWidth32W(hdc, lpString[i], lpString[i], &c)) - lpResults->lpDx[i]= c; - } - } + nSet = (UINT)uCount; + if(nSet > lpResults->nGlyphs) + nSet = lpResults->nGlyphs; + + /* return number of initialized fields */ + lpResults->nGlyphs = nSet; + + if(dwFlags==0) + { + /* Treat the case where no special handling was requested in a fastpath way */ + /* copy will do if the GCP_REORDER flag is not set */ + if(lpResults->lpOutString) + lstrcpynW(lpResults->lpOutString, lpString, uCount); + + if(lpResults->lpOrder) + { + for(i = 0; i < nSet; i++) + lpResults->lpOrder[i] = i; + } + + } else + { + WORD *pwCharType; + int run_end; + /* Keep a static table that translates the C2 types to something meaningful */ + /* 1 - left to right + * -1 - right to left + * 0 - neutral + */ + static const int chardir[]={ 0, 1, -1, 1, 1, 1, -1, 1, 0, 0, 0, 0 }; + + WARN("The BiDi algorythm doesn't conform to Windows' yet\n"); + if( (pwCharType=HeapAlloc(GetProcessHeap(), 0, uCount * sizeof(WORD)))==NULL ) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + + return 0; + } + + /* Fill in the order array with directionality values */ + GetStringTypeW(CT_CTYPE2, lpString, uCount, pwCharType); + + /* The complete and correct (at list according to MS) BiDi algorythm is not + * yet implemented here. Instead, we just make sure that consecutive runs of + * the same direction (or neutral) are ordered correctly + */ + for( i=0; i<uCount; i+=run_end ) + { + for( run_end=1; i+run_end<uCount && + (chardir[pwCharType[i+run_end]]==chardir[pwCharType[i]] || + chardir[pwCharType[i+run_end]]==0); ++run_end ) + ; + + if( chardir[pwCharType[i]]==1 || chardir[pwCharType[i]]==0 ) + { + /* A LTR run */ + if(lpResults->lpOutString) + { + int j; + for( j=0; j<run_end; j++ ) + { + lpResults->lpOutString[i+j]=lpString[i+j]; + } + } + + if(lpResults->lpOrder) + { + int j; + for( j=0; j<run_end; j++ ) + lpResults->lpOrder[i+j] = i+j; + } + } else + { + /* A RTL run */ + if(lpResults->lpOutString) + { + int j; + for( j=0; j<run_end; j++ ) + { + lpResults->lpOutString[i+j]=lpString[i+run_end-j-1]; + } + } + + if(lpResults->lpOrder) + { + int j; + for( j=0; j<run_end; j++ ) + lpResults->lpOrder[i+j] = i+run_end-j-1; + } + } + } + + HeapFree(GetProcessHeap(), 0, pwCharType); + } + + /* FIXME: Will use the placement chars */ + if (lpResults->lpDx) + { + int c; + for (i = 0; i < nSet; i++) + { + if (GetCharWidth32W(hdc, lpString[i], lpString[i], &c)) + lpResults->lpDx[i]= c; + } + } if(lpResults->lpGlyphs) GetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0); Index: objects/text.c =================================================================== RCS file: /home/wine/wine/objects/text.c,v retrieving revision 1.45 diff -u -r1.45 text.c --- objects/text.c 31 May 2002 23:06:53 -0000 1.45 +++ objects/text.c 12 Jun 2002 19:34:04 -0000 @@ -170,9 +170,35 @@ { if(PATH_IsPathOpen(dc->path)) FIXME("called on an open path\n"); - else if(dc->funcs->pExtTextOut) - ret = dc->funcs->pExtTextOut(dc->physDev,x,y,flags,lprect,str,count,lpDx); - GDI_ReleaseObj( hdc ); + else if(dc->funcs->pExtTextOut) + { + DWORD fontLangInfo=0; + if( !(flags&(ETO_GLYPH_INDEX|ETO_IGNORELANGUAGE)) && + ((fontLangInfo=GetFontLanguageInfo( hdc ))&(GCP_REORDER|GCP_GLYPHSHAPE)) ) + { + /* The caller did not specify that language processing was already done, + * and the font idetifies iteself as requiring language processing. + */ + GCP_RESULTSW gcp; + + gcp.lStructSize=sizeof(gcp); + gcp.lpOutString=HeapAlloc(GetProcessHeap(), 0, count*sizeof(WCHAR)); + gcp.lpOrder=NULL; + gcp.lpDx=NULL; + gcp.lpCaretPos=NULL; + gcp.lpClass=NULL; + gcp.lpGlyphs=NULL; + gcp.nGlyphs=0; + gcp.nMaxFit=0; + + GetCharacterPlacementW(hdc, str, count, 0, &gcp, GCP_REORDER ); + + ret = dc->funcs->pExtTextOut(dc->physDev,x,y,flags|ETO_IGNORELANGUAGE, + lprect,gcp.lpOutString,count,lpDx); + } else + ret = dc->funcs->pExtTextOut(dc->physDev,x,y,flags,lprect,str,count,lpDx); + } + GDI_ReleaseObj( hdc ); } return ret; }

1 0