March 2006 - Wine-Commits - list.winehq.org

Huw Davies : gdi32: Move the font substitution list to a standard Wine list
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: ea42bb77034385747e0f8b2b92c1a8a9fb5a79eb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ea42bb77034385747e0f8b2… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 30 14:38:07 2006 +0100 gdi32: Move the font substitution list to a standard Wine list (based on a patch by Byeong-Sik Jeon). --- dlls/gdi/freetype.c | 90 ++++++++++++++++++++++++++++----------------------- 1 files changed, 50 insertions(+), 40 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 1914f1f..febe146 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -280,6 +280,8 @@ static struct list unused_gdi_font_list static struct list child_font_list = LIST_INIT(child_font_list); static struct list system_links = LIST_INIT(system_links); +static struct list font_subst_list = LIST_INIT(font_subst_list); + static struct list font_list = LIST_INIT(font_list); static const WCHAR defSerif[] = {'T','i','m','e','s',' ','N','e','w',' ', @@ -362,17 +364,16 @@ static const WCHAR *ElfScriptsW[32] = { }; typedef struct { - WCHAR *name; - INT charset; + WCHAR *name; + INT charset; } NameCs; typedef struct tagFontSubst { - NameCs from; - NameCs to; - struct tagFontSubst *next; + struct list entry; + NameCs from; + NameCs to; } FontSubst; -static FontSubst *substlist = NULL; static BOOL have_installed_roman_font = FALSE; /* CreateFontInstance will fail if this is still FALSE */ static const WCHAR font_mutex_nameW[] = {'_','_','W','I','N','E','_','F','O','N','T','_','M','U','T','E','X','_','_','\0'}; @@ -718,13 +719,15 @@ static void DumpSubstList(void) { FontSubst *psub; - for(psub = substlist; psub; psub = psub->next) + LIST_FOR_EACH_ENTRY(psub, &font_subst_list, FontSubst, entry) + { if(psub->from.charset != -1 || psub->to.charset != -1) TRACE("%s:%d -> %s:%d\n", debugstr_w(psub->from.name), psub->from.charset, debugstr_w(psub->to.name), psub->to.charset); else TRACE("%s -> %s\n", debugstr_w(psub->from.name), debugstr_w(psub->to.name)); + } return; } @@ -746,6 +749,22 @@ static LPSTR strdupA(LPCSTR p) return ret; } +static FontSubst *get_font_subst(const struct list *subst_list, const WCHAR *from_name, + INT from_charset) +{ + FontSubst *element; + + LIST_FOR_EACH_ENTRY(element, subst_list, FontSubst, entry) + { + if(!strcmpiW(element->from.name, from_name) && + (element->from.charset == from_charset || + element->from.charset == -1)) + return element; + } + + return NULL; +} + static void split_subst_info(NameCs *nc, LPSTR str) { CHAR *p = strrchr(str, ','); @@ -763,22 +782,22 @@ static void split_subst_info(NameCs *nc, static void LoadSubstList(void) { - FontSubst *psub, **ppsub; + FontSubst *psub; HKEY hkey; DWORD valuelen, datalen, i = 0, type, dlen, vlen; LPSTR value; LPVOID data; - if(substlist) { - for(psub = substlist; psub;) { - FontSubst *ptmp; - HeapFree(GetProcessHeap(), 0, psub->to.name); - HeapFree(GetProcessHeap(), 0, psub->from.name); - ptmp = psub; - psub = psub->next; - HeapFree(GetProcessHeap(), 0, ptmp); - } - substlist = NULL; + if(!list_empty(&font_subst_list)) + { + FontSubst *cursor2; + LIST_FOR_EACH_ENTRY_SAFE(psub, cursor2, &font_subst_list, FontSubst, entry) + { + HeapFree(GetProcessHeap(), 0, psub->to.name); + HeapFree(GetProcessHeap(), 0, psub->from.name); + list_remove(&psub->entry); + HeapFree(GetProcessHeap(), 0, psub); + } } if(RegOpenKeyA(HKEY_LOCAL_MACHINE, @@ -794,26 +813,23 @@ static void LoadSubstList(void) dlen = datalen; vlen = valuelen; - ppsub = &substlist; while(RegEnumValueA(hkey, i++, value, &vlen, NULL, &type, data, &dlen) == ERROR_SUCCESS) { TRACE("Got %s=%s\n", debugstr_a(value), debugstr_a(data)); - *ppsub = HeapAlloc(GetProcessHeap(), 0, sizeof(**ppsub)); - (*ppsub)->next = NULL; - split_subst_info(&((*ppsub)->from), value); - split_subst_info(&((*ppsub)->to), data); + psub = HeapAlloc(GetProcessHeap(), 0, sizeof(*psub)); + split_subst_info(&psub->from, value); + split_subst_info(&psub->to, data); /* Win 2000 doesn't allow mapping between different charsets or mapping of DEFAULT_CHARSET */ - if(((*ppsub)->to.charset != (*ppsub)->from.charset) || - (*ppsub)->to.charset == DEFAULT_CHARSET) { - HeapFree(GetProcessHeap(), 0, (*ppsub)->to.name); - HeapFree(GetProcessHeap(), 0, (*ppsub)->from.name); - HeapFree(GetProcessHeap(), 0, *ppsub); - *ppsub = NULL; + if((psub->to.charset != psub->from.charset) || + psub->to.charset == DEFAULT_CHARSET) { + HeapFree(GetProcessHeap(), 0, psub->to.name); + HeapFree(GetProcessHeap(), 0, psub->from.name); + HeapFree(GetProcessHeap(), 0, psub); } else { - ppsub = &((*ppsub)->next); + list_add_head(&font_subst_list, &psub->entry); } /* reset dlen and vlen */ dlen = datalen; @@ -2205,11 +2221,8 @@ GdiFont WineEngCreateFontInstance(DC *dc family = NULL; if(lf.lfFaceName[0] != '\0') { FontSubst *psub; - for(psub = substlist; psub; psub = psub->next) - if(!strcmpiW(lf.lfFaceName, psub->from.name) && - (psub->from.charset == -1 || - psub->from.charset == lf.lfCharSet)) - break; + psub = get_font_subst(&font_subst_list, lf.lfFaceName, lf.lfCharSet); + if(psub) { TRACE("substituting %s -> %s\n", debugstr_w(lf.lfFaceName), debugstr_w(psub->to.name)); @@ -2628,11 +2641,8 @@ DWORD WineEngEnumFonts(LPLOGFONTW plf, F if(plf->lfFaceName[0]) { FontSubst *psub; - for(psub = substlist; psub; psub = psub->next) - if(!strcmpiW(plf->lfFaceName, psub->from.name) && - (psub->from.charset == -1 || - psub->from.charset == plf->lfCharSet)) - break; + psub = get_font_subst(&font_subst_list, plf->lfFaceName, plf->lfCharSet); + if(psub) { TRACE("substituting %s -> %s\n", debugstr_w(plf->lfFaceName), debugstr_w(psub->to.name));

1 0

Alexandre Julliard : user: Only wait for sent messages in wait_message_reply.
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: 6280ab29e641f553f993657130a34633d491fe58 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6280ab29e641f553f993657… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 30 16:23:56 2006 +0200 user: Only wait for sent messages in wait_message_reply. --- dlls/user/message.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user/message.c b/dlls/user/message.c index 18c5d4b..ccb37e6 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c @@ -2148,7 +2148,7 @@ static void wait_message_reply( UINT fla ReleaseThunkLock( &dwlc ); res = USER_Driver->pMsgWaitForMultipleObjectsEx( 1, &server_queue, - INFINITE, QS_ALLINPUT, 0 ); + INFINITE, QS_SENDMESSAGE, 0 ); if (dwlc) RestoreThunkLock( dwlc ); } }

1 0

Alexandre Julliard : x11drv: Filter a few more event types in filter_event.
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: c7a1dfde9fd25652f29c2615beb8d843c94759c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c7a1dfde9fd25652f29c261… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 30 16:23:12 2006 +0200 x11drv: Filter a few more event types in filter_event. ConfigureNotify and related events should only be processed when posted messages are selected. There's no need to handle MappingNotify if keyboard events are not selected. --- dlls/x11drv/event.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/x11drv/event.c b/dlls/x11drv/event.c index 53c1a6a..98e40b8 100644 --- a/dlls/x11drv/event.c +++ b/dlls/x11drv/event.c @@ -212,6 +212,7 @@ static Bool filter_event( Display *displ case KeyPress: case KeyRelease: case KeymapNotify: + case MappingNotify: return (mask & QS_KEY) != 0; case ButtonPress: case ButtonRelease: @@ -222,6 +223,12 @@ static Bool filter_event( Display *displ return (mask & QS_MOUSEMOVE) != 0; case Expose: return (mask & QS_PAINT) != 0; + case FocusIn: + case FocusOut: + case MapNotify: + case UnmapNotify: + case ConfigureNotify: + case PropertyNotify: case ClientMessage: return (mask & QS_POSTMESSAGE) != 0; default:

1 0

Alexandre Julliard : dlls: Removed a number of no longer needed dependencies.
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: 2c1d696801abd737814b4fdcc808a2dff22ecac6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2c1d696801abd737814b4fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 30 13:24:11 2006 +0200 dlls: Removed a number of no longer needed dependencies. --- dlls/Makefile.in | 209 +++++++----------------------------------------------- dlls/make_dlls | 9 +- 2 files changed, 29 insertions(+), 189 deletions(-) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 3183cd0..c269fb0 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -367,90 +367,85 @@ winspool.drv.so: winspool/winspool.drv.s # Placeholders for 16-bit libraries -avifile.dll16 : avifil32/avifil32.dll.so +avifile.dll16: echo "avifil32.dll" >$@ -commdlg.dll16 : commdlg/comdlg32.dll.so +commdlg.dll16: echo "comdlg32.dll" >$@ -ctl3d.dll16 ctl3dv2.dll16 : ctl3d32/ctl3d32.dll.so +ctl3d.dll16 ctl3dv2.dll16: echo "ctl3d32.dll" >$@ -dispdib.dll16 gdi.exe16 wing.dll16 : gdi/gdi32.dll.so +dispdib.dll16 gdi.exe16 wing.dll16: echo "gdi32.dll" >$@ -imm.dll16 : imm32/imm32.dll.so +imm.dll16: echo "imm32.dll" >$@ -comm.drv16 krnl386.exe16 stress.dll16 \ - system.drv16 toolhelp.dll16 win87em.dll16 \ - windebug.dll16 : kernel/kernel32.dll.so +comm.drv16 krnl386.exe16 stress.dll16 system.drv16 toolhelp.dll16 win87em.dll16 windebug.dll16: echo "kernel32.dll" >$@ -lzexpand.dll16 : lz32/lz32.dll.so +lzexpand.dll16: echo "lz32.dll" >$@ -msacm.dll16 : msacm/msacm32.dll.so +msacm.dll16: echo "msacm32.dll" >$@ -msvideo.dll16 : msvfw32/msvfw32.dll.so +msvideo.dll16: echo "msvfw32.dll" >$@ -compobj.dll16 ole2.dll16 ole2conv.dll16 \ - ole2nls.dll16 ole2prox.dll16 ole2thk.dll16 \ - storage.dll16 : ole32/ole32.dll.so +compobj.dll16 ole2.dll16 ole2conv.dll16 ole2nls.dll16 ole2prox.dll16 ole2thk.dll16 storage.dll16: echo "ole32.dll" >$@ -ole2disp.dll16 typelib.dll16 : oleaut32/oleaut32.dll.so +ole2disp.dll16 typelib.dll16: echo "oleaut32.dll" >$@ -olecli.dll16 : olecli32/olecli32.dll.so +olecli.dll16: echo "olecli32.dll" >$@ -olesvr.dll16 : olesvr32/olesvr32.dll.so +olesvr.dll16: echo "olesvr32.dll" >$@ -rasapi16.dll16 : rasapi32/rasapi32.dll.so +rasapi16.dll16: echo "rasapi32.dll" >$@ -setupx.dll16 : setupapi/setupapi.dll.so +setupx.dll16: echo "setupapi.dll" >$@ -shell.dll16 : shell32/shell32.dll.so +shell.dll16: echo "shell32.dll" >$@ -twain.dll16 : twain/twain_32.dll.so +twain.dll16: echo "twain_32.dll" >$@ -ddeml.dll16 display.drv16 keyboard.drv16 \ - mouse.drv16 user.exe16 : user/user32.dll.so +ddeml.dll16 display.drv16 keyboard.drv16 mouse.drv16 user.exe16: echo "user32.dll" >$@ -ver.dll16 : version/version.dll.so +ver.dll16: echo "version.dll" >$@ -w32sys.dll16 win32s16.dll16 : w32skrnl/w32skrnl.dll.so +w32sys.dll16 win32s16.dll16: echo "w32skrnl.dll" >$@ -wprocs.dll16 : winedos/winedos.dll.so +wprocs.dll16: echo "winedos.dll" >$@ -wineps16.drv16 : wineps/wineps.drv.so +wineps16.drv16: echo "wineps.drv" >$@ -mmsystem.dll16 sound.drv16 : winmm/winmm.dll.so +mmsystem.dll16 sound.drv16: echo "winmm.dll" >$@ -winnls.dll16 : winnls32/winnls32.dll.so +winnls.dll16: echo "winnls32.dll" >$@ -wintab.dll16 : wintab32/wintab32.dll.so +wintab.dll16: echo "wintab32.dll" >$@ -winaspi.dll16 : wnaspi32/wnaspi32.dll.so +winaspi.dll16: echo "wnaspi32.dll" >$@ -winsock.dll16 : ws2_32/ws2_32.dll.so +winsock.dll16: echo "ws2_32.dll" >$@ # Import libraries @@ -939,178 +934,28 @@ $(INSTALLSUBDIRS:%=%/__install__) $(INST # Map library name to the corresponding directory -activeds/activeds.dll.so: activeds -advapi32/advapi32.dll.so: advapi32 -advpack/advpack.dll.so: advpack -amstream/amstream.dll.so: amstream -atl/atl.dll.so: atl -avicap32/avicap32.dll.so: avicap32 -avifil32/avifil32.dll.so: avifil32 -cabinet/cabinet.dll.so: cabinet -capi2032/capi2032.dll.so: capi2032 -cards/cards.dll.so: cards -cfgmgr32/cfgmgr32.dll.so: cfgmgr32 -comcat/comcat.dll.so: comcat -comctl32/comctl32.dll.so: comctl32 commdlg/comdlg32.dll.so: commdlg -crtdll/crtdll.dll.so: crtdll -crypt32/crypt32.dll.so: crypt32 -cryptdll/cryptdll.dll.so: cryptdll -ctl3d32/ctl3d32.dll.so: ctl3d32 -d3d8/d3d8.dll.so: d3d8 -d3d9/d3d9.dll.so: d3d9 -d3dim/d3dim.dll.so: d3dim -d3drm/d3drm.dll.so: d3drm -d3dx8/d3dx8.dll.so: d3dx8 -d3dxof/d3dxof.dll.so: d3dxof -dbghelp/dbghelp.dll.so: dbghelp -dciman32/dciman32.dll.so: dciman32 ddraw/ddraw.dll.so: ddraw -devenum/devenum.dll.so: devenum -dinput/dinput.dll.so: dinput -dinput8/dinput8.dll.so: dinput8 -dmband/dmband.dll.so: dmband -dmcompos/dmcompos.dll.so: dmcompos -dmime/dmime.dll.so: dmime -dmloader/dmloader.dll.so: dmloader -dmscript/dmscript.dll.so: dmscript -dmstyle/dmstyle.dll.so: dmstyle -dmsynth/dmsynth.dll.so: dmsynth -dmusic/dmusic.dll.so: dmusic -dmusic32/dmusic32.dll.so: dmusic32 -dplay/dplay.dll.so: dplay -dplayx/dplayx.dll.so: dplayx -dpnet/dpnet.dll.so: dpnet -dpnhpast/dpnhpast.dll.so: dpnhpast -dsound/dsound.dll.so: dsound -dswave/dswave.dll.so: dswave -dxdiagn/dxdiagn.dll.so: dxdiagn gdi/gdi32.dll.so: gdi -glu32/glu32.dll.so: glu32 -glut32/glut32.dll.so: glut32 -hhctrl.ocx/hhctrl.ocx.so: hhctrl.ocx -iccvid/iccvid.dll.so: iccvid -icmp/icmp.dll.so: icmp -ifsmgr.vxd/ifsmgr.vxd.so: ifsmgr.vxd -imaadp32.acm/imaadp32.acm.so: imaadp32.acm -imagehlp/imagehlp.dll.so: imagehlp -imm32/imm32.dll.so: imm32 -iphlpapi/iphlpapi.dll.so: iphlpapi -itss/itss.dll.so: itss winmm/joystick/joystick.drv.so: winmm/joystick kernel/kernel32.dll.so: kernel -lz32/lz32.dll.so: lz32 -mapi32/mapi32.dll.so: mapi32 -mciavi32/mciavi32.dll.so: mciavi32 -mcicda/mcicda.dll.so: mcicda -mciseq/mciseq.dll.so: mciseq winmm/mciwave/mciwave.drv.so: winmm/mciwave -midimap/midimap.dll.so: midimap -mlang/mlang.dll.so: mlang -mmdevldr.vxd/mmdevldr.vxd.so: mmdevldr.vxd -monodebg.vxd/monodebg.vxd.so: monodebg.vxd -mpr/mpr.dll.so: mpr winmm/wavemap/msacm.drv.so: winmm/wavemap msacm/msacm32.dll.so: msacm -msadp32.acm/msadp32.acm.so: msadp32.acm -mscms/mscms.dll.so: mscms -msdmo/msdmo.dll.so: msdmo -msftedit/msftedit.dll.so: msftedit -msg711.acm/msg711.acm.so: msg711.acm -mshtml/mshtml.dll.so: mshtml -msi/msi.dll.so: msi -msimg32/msimg32.dll.so: msimg32 msisys/msisys.ocx.so: msisys -msnet32/msnet32.dll.so: msnet32 -msrle32/msrle32.dll.so: msrle32 -msvcrt/msvcrt.dll.so: msvcrt -msvcrt20/msvcrt20.dll.so: msvcrt20 -msvcrt40/msvcrt40.dll.so: msvcrt40 -msvcrtd/msvcrtd.dll.so: msvcrtd -msvfw32/msvfw32.dll.so: msvfw32 -msvidc32/msvidc32.dll.so: msvidc32 -mswsock/mswsock.dll.so: mswsock -msxml3/msxml3.dll.so: msxml3 -netapi32/netapi32.dll.so: netapi32 -newdev/newdev.dll.so: newdev -ntdll/ntdll.dll.so: ntdll -objsel/objsel.dll.so: objsel -odbc32/odbc32.dll.so: odbc32 -odbccp32/odbccp32.dll.so: odbccp32 -ole32/ole32.dll.so: ole32 -oleacc/oleacc.dll.so: oleacc -oleaut32/oleaut32.dll.so: oleaut32 -olecli32/olecli32.dll.so: olecli32 -oledlg/oledlg.dll.so: oledlg -olepro32/olepro32.dll.so: olepro32 -olesvr32/olesvr32.dll.so: olesvr32 -opengl32/opengl32.dll.so: opengl32 -powrprof/powrprof.dll.so: powrprof -psapi/psapi.dll.so: psapi -qcap/qcap.dll.so: qcap -quartz/quartz.dll.so: quartz -rasapi32/rasapi32.dll.so: rasapi32 -riched20/riched20.dll.so: riched20 richedit/riched32.dll.so: richedit -rpcrt4/rpcrt4.dll.so: rpcrt4 -rsabase/rsabase.dll.so: rsabase -rsaenh/rsaenh.dll.so: rsaenh -secur32/secur32.dll.so: secur32 -security/security.dll.so: security -sensapi/sensapi.dll.so: sensapi -serialui/serialui.dll.so: serialui -setupapi/setupapi.dll.so: setupapi -sfc/sfc.dll.so: sfc -shdocvw/shdocvw.dll.so: shdocvw -shell32/shell32.dll.so: shell32 -shfolder/shfolder.dll.so: shfolder -shlwapi/shlwapi.dll.so: shlwapi -snmpapi/snmpapi.dll.so: snmpapi -spoolss/spoolss.dll.so: spoolss -stdole2.tlb/stdole2.tlb.so: stdole2.tlb -stdole32.tlb/stdole32.tlb.so: stdole32.tlb -sti/sti.dll.so: sti -tapi32/tapi32.dll.so: tapi32 twain/twain_32.dll.so: twain -unicows/unicows.dll.so: unicows -url/url.dll.so: url -urlmon/urlmon.dll.so: urlmon user/user32.dll.so: user -usp10/usp10.dll.so: usp10 -uxtheme/uxtheme.dll.so: uxtheme -vdhcp.vxd/vdhcp.vxd.so: vdhcp.vxd -vdmdbg/vdmdbg.dll.so: vdmdbg -version/version.dll.so: version -vmm.vxd/vmm.vxd.so: vmm.vxd -vnbt.vxd/vnbt.vxd.so: vnbt.vxd -vnetbios.vxd/vnetbios.vxd.so: vnetbios.vxd -vtdapi.vxd/vtdapi.vxd.so: vtdapi.vxd -vwin32.vxd/vwin32.vxd.so: vwin32.vxd -w32skrnl/w32skrnl.dll.so: w32skrnl winmm/winealsa/winealsa.drv.so: winmm/winealsa winmm/winearts/winearts.drv.so: winmm/winearts winmm/wineaudioio/wineaudioio.drv.so: winmm/wineaudioio -wined3d/wined3d.dll.so: wined3d -winedos/winedos.dll.so: winedos winmm/wineesd/wineesd.drv.so: winmm/wineesd winmm/winejack/winejack.drv.so: winmm/winejack -winemp3.acm/winemp3.acm.so: winemp3.acm winmm/winenas/winenas.drv.so: winmm/winenas winmm/wineoss/wineoss.drv.so: winmm/wineoss wineps/wineps.drv.so: wineps x11drv/winex11.drv.so: x11drv -wininet/wininet.dll.so: wininet -winmm/winmm.dll.so: winmm -winnls32/winnls32.dll.so: winnls32 winspool/winspool.drv.so: winspool -wintab32/wintab32.dll.so: wintab32 -wintrust/wintrust.dll.so: wintrust -wldap32/wldap32.dll.so: wldap32 -wnaspi32/wnaspi32.dll.so: wnaspi32 -wow32/wow32.dll.so: wow32 -ws2_32/ws2_32.dll.so: ws2_32 -wsock32/wsock32.dll.so: wsock32 -wtsapi32/wtsapi32.dll.so: wtsapi32 dxerr8/libdxerr8.a: dxerr8 dxerr9/libdxerr9.a: dxerr9 dxguid/libdxguid.a: dxguid diff --git a/dlls/make_dlls b/dlls/make_dlls index fb6d459..d085337 100755 --- a/dlls/make_dlls +++ b/dlls/make_dlls @@ -231,13 +231,7 @@ print NEWMAKE "# Placeholders for 16-bit foreach my $mod (sort keys %directories) { next unless defined $altnames{$mod}; - my $count = 0; - foreach my $i (sort @{$altnames{$mod}}) - { - if ($count++ == 3) { printf NEWMAKE "\\\n "; $count = 1; } - printf NEWMAKE "%s16 ", $i; - } - printf NEWMAKE ": %s/%s.so\n", $directories{$mod}, $mod; + printf NEWMAKE "%s:\n", join(" ", map { $_ . "16"; } sort @{$altnames{$mod}}); printf NEWMAKE "\techo \"%s\" >\$\@\n\n", $mod; } @@ -309,6 +303,7 @@ print NEWMAKE "# Map library name to the foreach my $mod (sort keys %directories) { + next unless (needs_symlink($mod) || $mod eq "ddraw.dll"); # FIXME: hack because of x11drv printf NEWMAKE "%s/%s.so: %s\n", $directories{$mod}, $mod, $directories{$mod}; } foreach my $mod (sort keys %staticlib_dirs)

1 0

Detlef Riekenberg : spoolss: Add minimal spoolss.dll.
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: 717d18c9083ec55c5d051c087e20443888620f91 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=717d18c9083ec55c5d051c0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Mar 29 21:49:52 2006 +0200 spoolss: Add minimal spoolss.dll. --- DEVELOPERS-HINTS | 1 configure | 3 + configure.ac | 1 dlls/Makefile.in | 2 + dlls/spoolss/.gitignore | 1 dlls/spoolss/Makefile.in | 13 ++++ dlls/spoolss/spoolss.spec | 151 +++++++++++++++++++++++++++++++++++++++++++ dlls/spoolss/spoolss_main.c | 47 +++++++++++++ 8 files changed, 218 insertions(+), 1 deletions(-) create mode 100644 dlls/spoolss/.gitignore create mode 100644 dlls/spoolss/Makefile.in create mode 100644 dlls/spoolss/spoolss.spec create mode 100644 dlls/spoolss/spoolss_main.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=717d18c9083ec55c5d0…

1 0

Alexandre Julliard : user: Don't send WM_PARENTNOTIFY to the desktop window .
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: 4d3282a5fbc8a4b0c92d11f13df795080afc7989 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4d3282a5fbc8a4b0c92d11f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 30 13:22:27 2006 +0200 user: Don't send WM_PARENTNOTIFY to the desktop window. --- dlls/user/message.c | 1 + dlls/user/win.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user/message.c b/dlls/user/message.c index 8fe2ee7..18c5d4b 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c @@ -1563,6 +1563,7 @@ static void send_parent_notify( HWND hwn if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD)) break; if (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_NOPARENTNOTIFY) break; if (!(parent = GetParent(hwnd))) break; + if (parent == GetDesktopWindow()) break; MapWindowPoints( hwnd, parent, &pt, 1 ); hwnd = parent; SendMessageW( hwnd, WM_PARENTNOTIFY, diff --git a/dlls/user/win.c b/dlls/user/win.c index 44c2461..10a1a4f 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -275,8 +275,12 @@ static void send_parent_notify( HWND hwn { if ((GetWindowLongW( hwnd, GWL_STYLE ) & (WS_CHILD | WS_POPUP)) == WS_CHILD && !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_NOPARENTNOTIFY)) - SendMessageW( GetParent(hwnd), WM_PARENTNOTIFY, - MAKEWPARAM( msg, GetWindowLongPtrW( hwnd, GWLP_ID )), (LPARAM)hwnd ); + { + HWND parent = GetParent(hwnd); + if (parent && parent != GetDesktopWindow()) + SendMessageW( parent, WM_PARENTNOTIFY, + MAKEWPARAM( msg, GetWindowLongPtrW( hwnd, GWLP_ID )), (LPARAM)hwnd ); + } }

1 0

James Hawkins : advpack: Open the INF file if the RSC_FLAG_INF flag is specified.
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: c26245077de0759d10a531a4e7575798fa374ecf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c26245077de0759d10a531a… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Mar 29 11:36:04 2006 -0600 advpack: Open the INF file if the RSC_FLAG_INF flag is specified. --- dlls/advpack/install.c | 19 +++++++++++++++++++ dlls/advpack/tests/install.c | 13 +++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index f44c042..042f761 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -33,6 +33,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack); +#define SPAPI_ERROR 0xE0000000L +#define SPAPI_PREFIX 0x800F0000L +#define SPAPI_MASK 0xFFFFL +#define HRESULT_FROM_SPAPI(x) ((x & SPAPI_MASK) | SPAPI_PREFIX) + /* this structure very closely resembles parameters of RunSetupCommand() */ typedef struct { @@ -293,6 +298,9 @@ HRESULT WINAPI RunSetupCommandW(HWND hWn LPCWSTR lpszTitle, HANDLE *phEXE, DWORD dwFlags, LPVOID pvReserved ) { + HINF hinf; + DWORD err; + TRACE("(%p, %s, %s, %s, %s, %p, 0x%08lx, %p)\n", hWnd, debugstr_w(szCmdName), debugstr_w(szInfSection), debugstr_w(szDir), debugstr_w(lpszTitle), @@ -307,5 +315,16 @@ HRESULT WINAPI RunSetupCommandW(HWND hWn if (!(dwFlags & RSC_FLAG_INF)) return launch_exe(szCmdName, szDir, phEXE); + hinf = SetupOpenInfFileW(szCmdName, NULL, INF_STYLE_WIN4, NULL); + if (hinf == INVALID_HANDLE_VALUE) + { + err = GetLastError(); + if (err & SPAPI_ERROR) + return HRESULT_FROM_SPAPI(err); + else + return HRESULT_FROM_WIN32(err); + } + + SetupCloseInfFile(hinf); return E_UNEXPECTED; } diff --git a/dlls/advpack/tests/install.c b/dlls/advpack/tests/install.c index 26f0fa4..d8eee76 100644 --- a/dlls/advpack/tests/install.c +++ b/dlls/advpack/tests/install.c @@ -40,6 +40,14 @@ static BOOL init_function_pointers() return TRUE; } +static BOOL is_spapi_err(DWORD err) +{ + const DWORD SPAPI_PREFIX = 0x800F0000L; + const DWORD SPAPI_MASK = 0xFFFF0000L; + + return (((err & SPAPI_MASK) ^ SPAPI_PREFIX) == 0); +} + static void test_RunSetupCommand() { HRESULT hr; @@ -72,10 +80,7 @@ static void test_RunSetupCommand() /* try to run an exe with the RSC_FLAG_INF flag */ hexe = (HANDLE)0xdeadbeef; hr = pRunSetupCommand(NULL, "winver.exe", "Install", "c:\\windows\\system32", "Title", &hexe, RSC_FLAG_INF, NULL); - todo_wine - { - ok(hr == SPAPI_E_WRONG_INF_STYLE, "Expected SPAPI_E_WRONG_INF_STYLE, got %ld\n", hr); - } + ok(is_spapi_err(hr), "Expected a setupapi error, got %ld\n", hr); ok(hexe == (HANDLE)0xdeadbeef, "Expected hexe to be 0xdeadbeef\n"); ok(!TerminateProcess(hexe, 0), "Expected TerminateProcess to fail\n");

1 0

James Hawkins : advpack: Forward LaunchINFSectionExA to its Unicode counterpart.
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: 724a4b36c211193e4959a508e3b5e3cc41095808 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=724a4b36c211193e4959a50… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Mar 30 04:05:27 2006 -0600 advpack: Forward LaunchINFSectionExA to its Unicode counterpart. --- dlls/advpack/install.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 417084e..f44c042 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -138,6 +138,27 @@ INT WINAPI LaunchINFSectionA( HWND hWnd, /*********************************************************************** * LaunchINFSectionExA (ADVPACK.@) * + * See LaunchINFSectionExW. + */ +HRESULT WINAPI LaunchINFSectionExA(HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show) +{ + UNICODE_STRING cmd; + HRESULT hr; + + TRACE("(%p, %p, %s, %d): stub\n", hWnd, hInst, debugstr_a(cmdline), show); + + RtlCreateUnicodeStringFromAsciiz(&cmd, cmdline); + + hr = LaunchINFSectionExW(hWnd, hInst, cmd.Buffer, show); + + RtlFreeUnicodeString(&cmd); + + return hr; +} + +/*********************************************************************** + * LaunchINFSectionExW (ADVPACK.@) + * * Installs an INF section with BACKUP/ROLLBACK capabilities. * * PARAMS @@ -162,9 +183,9 @@ INT WINAPI LaunchINFSectionA( HWND hWnd, * BUGS * Unimplemented. */ -HRESULT WINAPI LaunchINFSectionExA( HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show ) +HRESULT WINAPI LaunchINFSectionExW(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT show) { - FIXME("(%p %p %s %d): stub\n", hWnd, hInst, debugstr_a(cmdline), show ); + FIXME("(%p, %p, %s, %d): stub\n", hWnd, hInst, debugstr_w(cmdline), show ); return E_FAIL; }

1 0

James Hawkins : advpack: Fix the documentation for the cmdline parameter of LaunchInfSection/Ex.
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: 93fc6d450aa9900f57324c898a91c371704ed901 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=93fc6d450aa9900f57324c8… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Mar 30 03:52:17 2006 -0600 advpack: Fix the documentation for the cmdline parameter of LaunchInfSection/Ex. --- dlls/advpack/install.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index c6bc6c5..417084e 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -110,16 +110,22 @@ HRESULT WINAPI ExecuteCabA( HWND hwnd, C * PARAMS * hWnd [I] Handle to parent window, NULL for desktop. * hInst [I] Instance of the process. - * cmdline [I] Contains parameters in the order INF,section,flags. - * show [I] Reboot behaviour: - * 'A' reboot always - * 'I' default, reboot if needed - * 'N' no reboot + * cmdline [I] Contains parameters in the order INF,section,flags,reboot. + * show [I] How the window should be shown. * * RETURNS * Success: S_OK. * Failure: S_FALSE * + * NOTES + * INF - Filename of the INF to launch. + * section - INF section to install. + * flags - see advpub.h. + * reboot - smart reboot behavior + * 'A' Always reboot. + * 'I' Reboot if needed (default). + * 'N' No reboot. + * * BUGS * Unimplemented. */ @@ -137,16 +143,22 @@ INT WINAPI LaunchINFSectionA( HWND hWnd, * PARAMS * hWnd [I] Handle to parent window, NULL for desktop. * hInst [I] Instance of the process. - * cmdline [I] Contains parameters in the order INF,section,CAB,flags. - * show [I] Reboot behaviour: - * 'A' reboot always - * 'I' default, reboot if needed - * 'N' no reboot + * cmdline [I] Contains parameters in the order INF,section,CAB,flags,reboot. + * show [I] How the window should be shown. * * RETURNS * Success: S_OK. * Failure: E_FAIL. * + * NOTES + * INF - Filename of the INF to launch. + * section - INF section to install. + * flags - see advpub.h. + * reboot - smart reboot behavior + * 'A' Always reboot. + * 'I' Reboot if needed (default). + * 'N' No reboot. + * * BUGS * Unimplemented. */

1 0

Eric Pouech : kernel: Resource browsing.
by Alexandre Julliard March 30, 2006

March 30, 2006

Module: wine Branch: refs/heads/master Commit: 038e604fe4cadb0d4471d6ac0d888c0c6a85cb20 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=038e604fe4cadb0d4471d6a… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Mar 29 21:23:18 2006 +0200 kernel: Resource browsing. Try to be a bit more strict when checking for resource mapping in exception handler (and prevent some exceptions while in exception handler). --- dlls/kernel/except.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/except.c b/dlls/kernel/except.c index 1c97a2e..95c5ce9 100644 --- a/dlls/kernel/except.c +++ b/dlls/kernel/except.c @@ -403,7 +403,7 @@ inline static BOOL check_resource_write( if (!rec->ExceptionInformation[0]) return FALSE; /* not a write access */ addr = (void *)rec->ExceptionInformation[1]; if (!VirtualQuery( addr, &info, sizeof(info) )) return FALSE; - if (info.State == MEM_FREE) return FALSE; + if (info.State == MEM_FREE || !(info.Type & MEM_IMAGE)) return FALSE; if (!(rsrc = RtlImageDirectoryEntryToData( (HMODULE)info.AllocationBase, TRUE, IMAGE_DIRECTORY_ENTRY_RESOURCE, &size ))) return FALSE;

1 0