March 2006 - wine-commits

Huw Davies : gdi32: Move the font substitution list to a standard Wine list
by Alexandre Julliard 30 Mar '06

30 Mar '06

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 30 Mar '06

30 Mar '06

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 30 Mar '06

30 Mar '06

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 30 Mar '06

30 Mar '06

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 30 Mar '06

30 Mar '06

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 30 Mar '06

30 Mar '06

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 30 Mar '06

30 Mar '06

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 30 Mar '06

30 Mar '06

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 30 Mar '06

30 Mar '06

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 30 Mar '06

30 Mar '06

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

Stefan Dösinger : wined3d: Add WINED3DDEVTYPE to wined3d_types.h.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 6a8578f84762de8d601bb7f0ef1b6a8d31fbbdeb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6a8578f84762de8d601bb7f… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Mar 30 00:16:08 2006 +0200 wined3d: Add WINED3DDEVTYPE to wined3d_types.h. --- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d9/d3d9_private.h | 2 +- dlls/wined3d/directx.c | 20 ++++++++++---------- include/wine/wined3d_interface.h | 14 +++++++------- include/wine/wined3d_types.h | 19 ++++++++++++++----- 5 files changed, 33 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6a8578f84762de8d601…

1 0

Henning Gerhardt : twain: Add German resource.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: eacc0e3bf74985424d30aa9498736982a96f4251 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eacc0e3bf74985424d30aa9… Author: Henning Gerhardt <henning.gerhardt(a)web.de> Date: Thu Mar 30 08:58:09 2006 +0200 twain: Add German resource. --- dlls/twain/rsrc.rc | 1 + dlls/twain/twain_De.rc | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) create mode 100644 dlls/twain/twain_De.rc diff --git a/dlls/twain/rsrc.rc b/dlls/twain/rsrc.rc index 455cac2..94e1da0 100644 --- a/dlls/twain/rsrc.rc +++ b/dlls/twain/rsrc.rc @@ -25,4 +25,5 @@ #include "resource.h" +#include "twain_De.rc" #include "twain_En.rc" diff --git a/dlls/twain/twain_De.rc b/dlls/twain/twain_De.rc new file mode 100644 index 0000000..b378c29 --- /dev/null +++ b/dlls/twain/twain_De.rc @@ -0,0 +1,40 @@ +/* + * German resources for Twain + * + * Copyright 2006 Henning Gerhardt + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Scanne" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "SCANNE.... Bitte warten",IDC_STATIC,53,19,85,8 +END + +STRINGTABLE DISCARDABLE +{ + 0 "" + 1 "px" + 2 "b" + 3 "mm" + 4 "dpi" + 5 "%" + 6 "ns" +}

1 0

Detlef Riekenberg : kernel32: Display the parameter that caused a page fault in GlobalFree().
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 464b35522b5443ac0a4f388a93e2d470a0ba3253 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=464b35522b5443ac0a4f388… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 30 10:37:52 2006 +0200 kernel32: Display the parameter that caused a page fault in GlobalFree(). --- dlls/kernel/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index 1f1e479..c76f876 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -736,7 +736,7 @@ HGLOBAL WINAPI GlobalFree(HGLOBAL hmem) } __EXCEPT_PAGE_FAULT { - ERR("page fault occurred ! Caused by bug ?\n"); + ERR("(%p): Page fault occurred ! Caused by bug ?\n", hmem); SetLastError( ERROR_INVALID_PARAMETER ); hreturned = hmem; }

1 0

Detlef Riekenberg : kernel: Fix handling of invalid parameter in GlobalFlags().
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 1a81f4ff8ae34b0321c5e89d00542d76bd68d555 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1a81f4ff8ae34b0321c5e89… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Mar 29 20:48:39 2006 +0200 kernel: Fix handling of invalid parameter in GlobalFlags(). --- dlls/kernel/heap.c | 19 ++++++++++--------- dlls/kernel/tests/heap.c | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c index a5849ed..1f1e479 100644 --- a/dlls/kernel/heap.c +++ b/dlls/kernel/heap.c @@ -837,16 +837,16 @@ VOID WINAPI GlobalUnfix(HGLOBAL hmem) * * Get information about a global memory object. * - * NOTES - * Should this return GMEM_INVALID_HANDLE on invalid handle? + * PARAMS + * hmem [I] Handle of the global memory object * * RETURNS - * Value specifying allocation flags and lock count - * GMEM_INVALID_HANDLE: Failure + * Failure: GMEM_INVALID_HANDLE, when the provided handle is invalid + * Success: Value specifying allocation flags and lock count + * */ -UINT WINAPI GlobalFlags( - HGLOBAL hmem /* [in] Handle to global memory object */ -) { +UINT WINAPI GlobalFlags(HGLOBAL hmem) +{ DWORD retval; PGLOBAL32_INTERN pintern; @@ -866,8 +866,9 @@ UINT WINAPI GlobalFlags( } else { - WARN("Invalid handle: %p\n", hmem); - retval=0; + WARN("invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic); + SetLastError(ERROR_INVALID_HANDLE); + retval = GMEM_INVALID_HANDLE; } RtlUnlockHeap(GetProcessHeap()); } diff --git a/dlls/kernel/tests/heap.c b/dlls/kernel/tests/heap.c index e1a535c..fee1830 100644 --- a/dlls/kernel/tests/heap.c +++ b/dlls/kernel/tests/heap.c @@ -36,6 +36,7 @@ static SIZE_T resize_9x(SIZE_T size) START_TEST(heap) { void *mem; + UINT flags; HGLOBAL gbl; HGLOBAL hsecond; SIZE_T size; @@ -86,6 +87,12 @@ START_TEST(heap) ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), gbl); + SetLastError(MAGIC_DEAD); + flags = GlobalFlags(gbl); + ok( (flags == GMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), + "returned 0x%04x with 0x%08lx (expected GMEM_INVALID_HANDLE with " \ + "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); + /* Local*() functions */ gbl = LocalAlloc(LMEM_MOVEABLE, 0); @@ -109,13 +116,19 @@ START_TEST(heap) ok(gbl == NULL, "local realloc allocated memory\n"); /* invalid handles are catched in windows */ - gbl = LocalAlloc(GMEM_MOVEABLE, 256); + gbl = LocalAlloc(LMEM_MOVEABLE, 256); LocalFree(gbl); SetLastError(MAGIC_DEAD); hsecond = LocalFree(gbl); /* invalid handle: free memory twice */ ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE), "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n", hsecond, GetLastError(), gbl); + SetLastError(MAGIC_DEAD); + flags = LocalFlags(gbl); + ok( (flags == LMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE), + "returned 0x%04x with 0x%08lx (expected LMEM_INVALID_HANDLE with " \ + "ERROR_INVALID_HANDLE)\n", flags, GetLastError()); + /* trying to lock empty memory should give an error */ gbl = GlobalAlloc(GMEM_MOVEABLE|GMEM_ZEROINIT,0);

1 0

Detlef Riekenberg : tools: Remove wineconf.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 5ca18a11355f64739040cc81403df13fdb12b866 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5ca18a11355f64739040cc8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Mar 30 00:52:26 2006 +0200 tools: Remove wineconf. --- tools/wineconf | 492 -------------------------------------------------------- 1 files changed, 0 insertions(+), 492 deletions(-) delete mode 100755 tools/wineconf Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5ca18a11355f6473904…

1 0

Detlef Riekenberg : DEVELOPER-HINTS: Some directories are renamed / removed / added.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 3f567ce0e05f198ae19b1ff88ef22e0e71486f7b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3f567ce0e05f198ae19b1ff… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Mar 29 23:34:42 2006 +0200 DEVELOPER-HINTS: Some directories are renamed / removed / added. --- DEVELOPERS-HINTS | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/DEVELOPERS-HINTS b/DEVELOPERS-HINTS index 0326ab9..40f6ce1 100644 --- a/DEVELOPERS-HINTS +++ b/DEVELOPERS-HINTS @@ -31,7 +31,7 @@ DLLs (under dlls/): crtdll/ - Old C runtime library crypt32/ - Cryptography cryptdll/ - Cryptography Manager - ctl3d/ - 3D Effects for Common GUI Components + ctl3d32/ - 3D Effects for Common GUI Components d3d8/ - Direct3D (3D graphics) d3d9/ - Direct3D (3D graphics) d3dim/ - Direct3D Immediate Mode @@ -67,25 +67,28 @@ DLLs (under dlls/): iccvid/ - Radius Cinepak Video Decoder icmp/ - ICMP protocol (networking) ifsmgr.vxd/ - IFSMGR VxD implementation + imaadp32.acm/ - IMA ADPCM Audio Codec imagehlp/ - PE (Portable Executable) Image Helper lib imm32/ - Input Method Manager iphlpapi/ - IP Helper API itss/ - Infotech Structured Storage (HTML Help) kernel/ - The Windows kernel - lzexpand/ - Lempel-Ziv compression/decompression + lz32/ - Lempel-Ziv compression/decompression mapi32/ - Mail interface + mciavi32/ - MCI video driver + mcicda/ - MCI audio CD driver + mciseq/ - MCI MIDI driver midimap/ - MIDI mapper mlang/ - Multi Language Support mmdevldr.vxd/ - MMDEVLDR VxD implementation monodebg.vxd/ - MONODEBG VxD implementation mpr/ - Multi-Protocol Router (networking) msacm/ - Audio Compression Manager (multimedia) - msacm/imaadp32/ - IMA ADPCM Audio Codec - msacm/msadp32/ - MS ADPCM Audio Codec - msacm/msg711/ - MS G711 Audio Codec (includes A-Law & MU-Law) - msacm/winemp3/ - Mpeg Layer 3 Audio Codec + msadp32.acm/ - MS ADPCM Audio Codec mscms/ - Color Management System msdmo/ - DirectX Media Objects + msftedit/ - Rich text editing control (Version 4.1) + msg711.acm/ - MS G711 Audio Codec (includes A-Law & MU-Law) mshtml/ - MS HTML component msi/ - Microsoft Installer msimg32/ - Gradient and transparency (graphics) @@ -96,8 +99,8 @@ DLLs (under dlls/): msvcrt20/ - C runtime library version 2.0 msvcrt40/ - C runtime library version 4.0 msvcrtd/ - C runtime library debugging + msvfw32/ - 16 bit video manager msvidc32/ - Microsoft Video-1 Decoder - msvideo/ - 16 bit video manager mswsock/ - Misc networking msxml3/ - MSXML Class Factory netapi32/ - Network interface @@ -109,22 +112,23 @@ DLLs (under dlls/): ole32/ - 32 bit OLE 2.0 libraries oleacc/ - OLE accessibility support oleaut32/ - 32 bit OLE 2.0 automation - olecli/ - 16 bit OLE client + olecli32/ - 16 bit OLE client oledlg/ - OLE 2.0 user interface support olepro32/ - 32 bit OLE 2.0 automation - olesvr/ - 16 bit OLE server + olesvr32/ - 16 bit OLE server opengl32/ - OpenGL implementation (graphics) powrprof/ - Power Management and Profiling psapi/ - Process Status interface qcap/ - DirectShow runtime quartz/ - DirectShow runtime rasapi32/ - Remote Access Server interface - riched20/ - Rich text editing control version 2.0 + riched20/ - Rich text editing control (Version 2.0 and 3.0) richedit/ - Rich text editing control rpcrt4/ - Remote Procedure Call runtime rsabase/ - RSA encryption rsaenh/ - Crypto API (DES, 3DES, RSA, etc.) secur32/ - Contains Windows Security functions + security/ - Security Support Provider Interface sensapi/ - System Event Notification Service serialui/ - Serial port property pages setupapi/ - Setup interface @@ -153,18 +157,14 @@ DLLs (under dlls/): vnetbios.vxd/ - VNETBIOS VxD implementation vtdapi.vxd/ - VTDAPI VxD implementation vwin32.vxd/ - VWIN32 VxD implementation - win32s/ - 32-bit function access for 16-bit systems - winaspi/ - 16 bit Advanced SCSI Peripheral Interface + win32skrnl/ - 32-bit function access for 16-bit systems wined3d/ - Wine internal Direct3D helper winedos/ - DOS features and BIOS calls (Wine specific) + winemp3.acm/ - Mpeg Layer 3 Audio Codec wineps/ - Postscript driver (Wine specific) wininet/ - Internet extensions winmm/ - Multimedia (16 & 32 bit) winmm/joystick/ - Joystick driver - winmm/mcianim/ - MCI animation driver - winmm/mciavi/ - MCI video driver - winmm/mcicda/ - MCI audio CD driver - winmm/mciseq/ - MCI MIDI driver winmm/mciwave/ - MCI wave driver winmm/wavemap/ - Audio mapper winmm/winealsa/ - ALSA audio driver @@ -173,13 +173,14 @@ DLLs (under dlls/): winmm/winejack/ - JACK audio server driver winmm/winenas/ - NAS audio driver winmm/wineoss/ - OSS audio driver - winnls/ - National Language Support - winsock/ - Sockets 2.0 (networking) + winnls32/ - National Language Support winspool/ - Printing & Print Spooler wintab32/ - Tablet device interface wintrust/ - Trust verification interface wldap32/ - LDAP support + wnaspi32/ - 16 bit Advanced SCSI Peripheral Interface wow32/ - WOW subsystem + ws2_32/ - Sockets 2.0 (networking) wsock32/ - Sockets 1.1 (networking) wtsapi32/ - Terminal Services x11drv/ - X11 display driver (Wine specific)

1 0

Robert Shearman : oleaut32: Add IPersist to QueryInterface.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 22e7eeb2a3366667e2a1ac9a582fa7e97a4c927b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22e7eeb2a3366667e2a1ac9… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:41:24 2006 +0100 oleaut32: Add IPersist to QueryInterface. --- dlls/oleaut32/olefont.c | 2 +- dlls/oleaut32/olepicture.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index a9110e7..a73ceb5 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -586,7 +586,7 @@ HRESULT WINAPI OLEFontImpl_QueryInterfac *ppvObject = (IDispatch*)&(this->lpvtblIDispatch); if (IsEqualGUID(&IID_IFontDisp, riid)) *ppvObject = (IDispatch*)&(this->lpvtblIDispatch); - if (IsEqualGUID(&IID_IPersistStream, riid)) + if (IsEqualIID(&IID_IPersist, riid) || IsEqualGUID(&IID_IPersistStream, riid)) *ppvObject = (IPersistStream*)&(this->lpvtblIPersistStream); if (IsEqualGUID(&IID_IConnectionPointContainer, riid)) *ppvObject = (IConnectionPointContainer*)&(this->lpvtblIConnectionPointContainer); diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 74c7fa0..7e2acab 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -457,7 +457,7 @@ static HRESULT WINAPI OLEPictureImpl_Que *ppvObject = (IDispatch*)&(This->lpvtblIDispatch); else if (IsEqualIID(&IID_IPictureDisp, riid)) *ppvObject = (IDispatch*)&(This->lpvtblIDispatch); - else if (IsEqualIID(&IID_IPersistStream, riid)) + else if (IsEqualIID(&IID_IPersist, riid) || IsEqualIID(&IID_IPersistStream, riid)) *ppvObject = (IPersistStream*)&(This->lpvtblIPersistStream); else if (IsEqualIID(&IID_IConnectionPointContainer, riid)) *ppvObject = (IConnectionPointContainer*)&(This->lpvtblIConnectionPointContainer);

1 0

Robert Shearman : oleaut32: Zero out parameter in LoadRegTypeLib in case of failure.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 11c83c5d5ebf8456b2dcd74ee9ea5f283efae20a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11c83c5d5ebf8456b2dcd74… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:41:37 2006 +0100 oleaut32: Zero out parameter in LoadRegTypeLib in case of failure. --- dlls/oleaut32/typelib.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index cfb17ba..61403a6 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -392,7 +392,11 @@ HRESULT WINAPI LoadRegTypeLib( ITypeLib **ppTLib) { BSTR bstr=NULL; - HRESULT res=QueryPathOfRegTypeLib( rguid, wVerMajor, wVerMinor, lcid, &bstr); + HRESULT res; + + *ppTLib = NULL; + + res = QueryPathOfRegTypeLib( rguid, wVerMajor, wVerMinor, lcid, &bstr); if(SUCCEEDED(res)) {

1 0

Robert Shearman : oleaut32: Replace memcmp with IsEqualIID macro.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: aa2214626eb7e698c61bb1bc044b9e21d12f983b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aa2214626eb7e698c61bb1b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:41:01 2006 +0100 oleaut32: Replace memcmp with IsEqualIID macro. Replace memcmp with IsEqualIID macro that doesn't require a size parameter and remove the unneeded brackets to give more compact and more readable code. --- dlls/oleaut32/olepicture.c | 29 ++++++++--------------------- 1 files changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 0441235..74c7fa0 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -451,30 +451,17 @@ static HRESULT WINAPI OLEPictureImpl_Que /* * Compare the riid with the interface IDs implemented by this object. */ - if (memcmp(&IID_IUnknown, riid, sizeof(IID_IUnknown)) == 0) - { - *ppvObject = (IPicture*)This; - } - else if (memcmp(&IID_IPicture, riid, sizeof(IID_IPicture)) == 0) - { + if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IPicture, riid)) *ppvObject = (IPicture*)This; - } - else if (memcmp(&IID_IDispatch, riid, sizeof(IID_IDispatch)) == 0) - { + else if (IsEqualIID(&IID_IDispatch, riid)) *ppvObject = (IDispatch*)&(This->lpvtblIDispatch); - } - else if (memcmp(&IID_IPictureDisp, riid, sizeof(IID_IPictureDisp)) == 0) - { + else if (IsEqualIID(&IID_IPictureDisp, riid)) *ppvObject = (IDispatch*)&(This->lpvtblIDispatch); - } - else if (memcmp(&IID_IPersistStream, riid, sizeof(IID_IPersistStream)) == 0) - { - *ppvObject = (IPersistStream*)&(This->lpvtblIPersistStream); - } - else if (memcmp(&IID_IConnectionPointContainer, riid, sizeof(IID_IConnectionPointContainer)) == 0) - { - *ppvObject = (IConnectionPointContainer*)&(This->lpvtblIConnectionPointContainer); - } + else if (IsEqualIID(&IID_IPersistStream, riid)) + *ppvObject = (IPersistStream*)&(This->lpvtblIPersistStream); + else if (IsEqualIID(&IID_IConnectionPointContainer, riid)) + *ppvObject = (IConnectionPointContainer*)&(This->lpvtblIConnectionPointContainer); + /* * Check that we obtained an interface. */

1 0

Robert Shearman : ole32: Don' t process posted messages in CoWaitForMultipleHandles.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 8c7706bad04b90f4f9a7c25d94a27309d0347c80 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8c7706bad04b90f4f9a7c25… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:40:46 2006 +0100 ole32: Don't process posted messages in CoWaitForMultipleHandles. Tests with native show that during COM calls posted messages aren't retrieved other than COM calls so change the PeekMessage parameters in CoWaitForMultipleHandles to duplicate this. --- dlls/ole32/compobj.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index ab87a5d..a82ed4a 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2647,8 +2647,8 @@ static BOOL COM_PeekMessage(struct apart { /* first try to retrieve messages for incoming COM calls to the apartment window */ return PeekMessageW(msg, apt->win, WM_USER, WM_APP - 1, PM_REMOVE|PM_NOYIELD) || - /* next retrieve all other messages */ - PeekMessageW(msg, NULL, 0, 0, PM_REMOVE|PM_NOYIELD); + /* next retrieve other messages necessary for the app to remain responsive */ + PeekMessageW(msg, NULL, 0, WM_USER - 1, PM_REMOVE|PM_NOYIELD); } /***********************************************************************

1 0

Robert Shearman : ole32: Try to retrieve messages that are COM calls first.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: ff85f892c623438af0d2151c6a6811527ff75b4a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ff85f892c623438af0d2151… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:40:07 2006 +0100 ole32: Try to retrieve messages that are COM calls first. Try to retrieve messages that are COM calls first in CoWaitForMultipleHandles before retrieving other types. --- dlls/ole32/compobj.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 9ab9478..ab87a5d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2645,7 +2645,10 @@ HRESULT WINAPI CoCopyProxy(IUnknown *pPr static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg) { - return PeekMessageW(msg, NULL, 0, 0, PM_REMOVE|PM_NOYIELD); + /* first try to retrieve messages for incoming COM calls to the apartment window */ + return PeekMessageW(msg, apt->win, WM_USER, WM_APP - 1, PM_REMOVE|PM_NOYIELD) || + /* next retrieve all other messages */ + PeekMessageW(msg, NULL, 0, 0, PM_REMOVE|PM_NOYIELD); } /***********************************************************************

1 0

Robert Shearman : ole32: Put the PeekMessage call of CoWaitForMultipleHandles into a separate function .
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: a1548b45d8c3d19fad5632f997da65e5deb4ce0d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a1548b45d8c3d19fad5632f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:39:03 2006 +0100 ole32: Put the PeekMessage call of CoWaitForMultipleHandles into a separate function. Put the PeekMessage call of CoWaitForMultipleHandles into a separate function so that the order and type of the messages retrieved can be customised in the future. --- dlls/ole32/compobj.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 32d7a73..9ab9478 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2643,6 +2643,11 @@ HRESULT WINAPI CoCopyProxy(IUnknown *pPr } +static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg) +{ + return PeekMessageW(msg, NULL, 0, 0, PM_REMOVE|PM_NOYIELD); +} + /*********************************************************************** * CoWaitForMultipleHandles [OLE32.@] * @@ -2704,7 +2709,7 @@ HRESULT WINAPI CoWaitForMultipleHandles( if (res == WAIT_OBJECT_0 + cHandles) /* messages available */ { MSG msg; - while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE|PM_NOYIELD)) + while (COM_PeekMessage(apt, &msg)) { /* FIXME: filter the messages here */ TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message);

1 0

Robert Shearman : ole32: Whether the message loop is entered in CoWaitForMultipleHandles,
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 8c551796a99d5656efe487d1733ed8ce0dd63fda URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8c551796a99d5656efe487d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:38:42 2006 +0100 ole32: Whether the message loop is entered in CoWaitForMultipleHandles, should depend on whether the current apartment is a single threaded one. --- dlls/ole32/compobj.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 2528b61..32d7a73 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2673,7 +2673,8 @@ HRESULT WINAPI CoWaitForMultipleHandles( { HRESULT hr = S_OK; DWORD start_time = GetTickCount(); - BOOL message_loop = TRUE; + APARTMENT *apt = COM_CurrentApt(); + BOOL message_loop = apt && !apt->multi_threaded; TRACE("(0x%08lx, 0x%08lx, %ld, %p, %p)\n", dwFlags, dwTimeout, cHandles, pHandles, lpdwindex);

1 0

Robert Shearman : ole32: Pass the no yield flag to PeekMessage.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 3091aa5302a60e1efc6518b3205dca5d4b7a7b02 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3091aa5302a60e1efc6518b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:38:21 2006 +0100 ole32: Pass the no yield flag to PeekMessage. Pass the no yield flag to PeekMessage since we sleep in MsgWaitForMultipleObjectsEx and the extra context switch is wasteful. --- dlls/ole32/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 7057450..2528b61 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2703,7 +2703,7 @@ HRESULT WINAPI CoWaitForMultipleHandles( if (res == WAIT_OBJECT_0 + cHandles) /* messages available */ { MSG msg; - while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) + while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE|PM_NOYIELD)) { /* FIXME: filter the messages here */ TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message);

1 0

Robert Shearman : server: Store the token source.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: d18711e2823796a31ae5a6f62757ea14761c6308 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d18711e2823796a31ae5a6f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Wed Mar 29 18:37:39 2006 +0100 server: Store the token source. --- server/token.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/server/token.c b/server/token.c index 53bbc13..c350fc9 100644 --- a/server/token.c +++ b/server/token.c @@ -82,6 +82,7 @@ struct token SID *user; /* SID of user this token represents */ unsigned primary; /* is this a primary or impersonation token? */ ACL *default_dacl; /* the default DACL to assign to objects created by this user */ + TOKEN_SOURCE source; /* source of the token */ }; struct privilege @@ -413,7 +414,7 @@ static void token_destroy( struct object static struct token *create_token( unsigned primary, const SID *user, const SID_AND_ATTRIBUTES *groups, unsigned int group_count, const LUID_AND_ATTRIBUTES *privs, unsigned int priv_count, - const ACL *default_dacl ) + const ACL *default_dacl, TOKEN_SOURCE source ) { struct token *token = alloc_object( &token_ops ); if (token) @@ -472,6 +473,8 @@ static struct token *create_token( unsig } else token->default_dacl = NULL; + + token->source = source; } return token; } @@ -576,12 +579,13 @@ struct token *token_create_admin( void ) { alias_admins_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, { alias_users_sid, SE_GROUP_ENABLED|SE_GROUP_ENABLED_BY_DEFAULT|SE_GROUP_MANDATORY }, }; + static const TOKEN_SOURCE admin_source = {"SeMgr", {0, 0}}; /* note: we just set the user sid to be the interactive builtin sid - * we should really translate the UNIX user id to a sid */ token = create_token( TRUE, &interactive_sid, admin_groups, sizeof(admin_groups)/sizeof(admin_groups[0]), admin_privs, sizeof(admin_privs)/sizeof(admin_privs[0]), - default_dacl ); + default_dacl, admin_source ); } if (alias_admins_sid) @@ -1006,7 +1010,10 @@ DECL_HANDLER(duplicate_token) &token_ops ))) { /* FIXME: use req->impersonation_level */ - struct token *token = create_token( req->primary, src_token->user, NULL, 0, NULL, 0, src_token->default_dacl ); + struct token *token = create_token( req->primary, src_token->user, + NULL, 0, NULL, 0, + src_token->default_dacl, + src_token->source ); if (token) { struct privilege *privilege;

1 0

Huw Davies : include: Add DFC_POPUPMENU.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: a3ec0a9466872ceee4517a01e815f4230b1ce58c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a3ec0a9466872ceee4517a0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 29 16:31:57 2006 +0100 include: Add DFC_POPUPMENU. --- include/winuser.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 56cc5e3..96926d8 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3318,6 +3318,7 @@ typedef struct { #define DFC_MENU 2 #define DFC_SCROLL 3 #define DFC_BUTTON 4 +#define DFC_POPUPMENU 5 /* uState's */

1 0

Mike McCormack : wininet: Clean up HTTP_GetCustomHeaderIndex.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 92ddc1c851a01773221d3863dbad38a344630b0a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=92ddc1c851a01773221d386… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Mar 30 18:20:04 2006 +0900 wininet: Clean up HTTP_GetCustomHeaderIndex. --- dlls/wininet/http.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1e32e4c..e93a4d7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2988,7 +2988,8 @@ static void HTTP_CloseHTTPSessionHandle( * Return index of custom header from header array * */ -static INT HTTP_GetCustomHeaderIndex(LPWININETHTTPREQW lpwhr, LPCWSTR lpszField,int requested_index, BOOL request_only) +static INT HTTP_GetCustomHeaderIndex(LPWININETHTTPREQW lpwhr, LPCWSTR lpszField, + int requested_index, BOOL request_only) { DWORD index; @@ -2996,19 +2997,18 @@ static INT HTTP_GetCustomHeaderIndex(LPW for (index = 0; index < lpwhr->nCustHeaders; index++) { - if (!strcmpiW(lpwhr->pCustHeaders[index].lpszField, lpszField)) - { - if ((request_only && - !(lpwhr->pCustHeaders[index].wFlags & HDR_ISREQUEST))|| - (!request_only && - (lpwhr->pCustHeaders[index].wFlags & HDR_ISREQUEST))) + if (strcmpiW(lpwhr->pCustHeaders[index].lpszField, lpszField)) + continue; + + if (request_only && !(lpwhr->pCustHeaders[index].wFlags & HDR_ISREQUEST)) + continue; + + if (!request_only && (lpwhr->pCustHeaders[index].wFlags & HDR_ISREQUEST)) continue; if (requested_index == 0) - break; - else - requested_index --; - } + break; + requested_index --; } if (index >= lpwhr->nCustHeaders)

1 0

Mike McCormack : wininet: Use a lookup table sorted by index so we don' t need a loop to do lookups.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 7f5e273214bb4d75824efc7133b366b4703450a6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f5e273214bb4d75824efc7… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Mar 30 18:02:54 2006 +0900 wininet: Use a lookup table sorted by index so we don't need a loop to do lookups. --- dlls/wininet/http.c | 156 ++++++++++++++++++++++++++------------------------- 1 files changed, 79 insertions(+), 77 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 70dfc38..1e32e4c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1163,12 +1163,6 @@ lend: return handle; } -typedef struct std_hdr_data -{ - const WCHAR* hdrStr; - INT hdrIndex; -} std_hdr_data; - static const WCHAR szAccept[] = { 'A','c','c','e','p','t',0 }; static const WCHAR szAccept_Charset[] = { 'A','c','c','e','p','t','-','C','h','a','r','s','e','t', 0 }; static const WCHAR szAccept_Encoding[] = { 'A','c','c','e','p','t','-','E','n','c','o','d','i','n','g',0 }; @@ -1223,65 +1217,82 @@ static const WCHAR szVia[] = { 'V','i',' static const WCHAR szWarning[] = { 'W','a','r','n','i','n','g',0 }; static const WCHAR szWWW_Authenticate[] = { 'W','W','W','-','A','u','t','h','e','n','t','i','c','a','t','e',0 }; -static const std_hdr_data SORTED_STANDARD_HEADERS[] = { - {szAccept, HTTP_QUERY_ACCEPT,}, - {szAccept_Charset, HTTP_QUERY_ACCEPT_CHARSET,}, - {szAccept_Encoding, HTTP_QUERY_ACCEPT_ENCODING,}, - {szAccept_Language, HTTP_QUERY_ACCEPT_LANGUAGE,}, - {szAccept_Ranges, HTTP_QUERY_ACCEPT_RANGES,}, - {szAge, HTTP_QUERY_AGE,}, - {szAllow, HTTP_QUERY_ALLOW,}, - {szAuthorization, HTTP_QUERY_AUTHORIZATION,}, - {szCache_Control, HTTP_QUERY_CACHE_CONTROL,}, - {szConnection, HTTP_QUERY_CONNECTION,}, - {szContent_Base, HTTP_QUERY_CONTENT_BASE,}, - {szContent_Encoding, HTTP_QUERY_CONTENT_ENCODING,}, - {szContent_ID, HTTP_QUERY_CONTENT_ID,}, - {szContent_Language, HTTP_QUERY_CONTENT_LANGUAGE,}, - {szContent_Length, HTTP_QUERY_CONTENT_LENGTH,}, - {szContent_Location, HTTP_QUERY_CONTENT_LOCATION,}, - {szContent_MD5, HTTP_QUERY_CONTENT_MD5,}, - {szContent_Range, HTTP_QUERY_CONTENT_RANGE,}, - {szContent_Transfer_Encoding,HTTP_QUERY_CONTENT_TRANSFER_ENCODING,}, - {szContent_Type, HTTP_QUERY_CONTENT_TYPE,}, - {szCookie, HTTP_QUERY_COOKIE,}, - {szDate, HTTP_QUERY_DATE,}, - {szETag, HTTP_QUERY_ETAG,}, - {szExpect, HTTP_QUERY_EXPECT,}, - {szExpires, HTTP_QUERY_EXPIRES,}, - {szFrom, HTTP_QUERY_DERIVED_FROM,}, - {szHost, HTTP_QUERY_HOST,}, - {szIf_Match, HTTP_QUERY_IF_MATCH,}, - {szIf_Modified_Since, HTTP_QUERY_IF_MODIFIED_SINCE,}, - {szIf_None_Match, HTTP_QUERY_IF_NONE_MATCH,}, - {szIf_Range, HTTP_QUERY_IF_RANGE,}, - {szIf_Unmodified_Since, HTTP_QUERY_IF_UNMODIFIED_SINCE,}, - {szLast_Modified, HTTP_QUERY_LAST_MODIFIED,}, - {szLocation, HTTP_QUERY_LOCATION,}, - {szMax_Forwards, HTTP_QUERY_MAX_FORWARDS,}, - {szMime_Version, HTTP_QUERY_MIME_VERSION,}, - {szPragma, HTTP_QUERY_PRAGMA,}, - {szProxy_Authenticate, HTTP_QUERY_PROXY_AUTHENTICATE,}, - {szProxy_Authorization, HTTP_QUERY_PROXY_AUTHORIZATION,}, - {szProxy_Connection, HTTP_QUERY_PROXY_CONNECTION,}, - {szPublic, HTTP_QUERY_PUBLIC,}, - {szRange, HTTP_QUERY_RANGE,}, - {szReferer, HTTP_QUERY_REFERER,}, - {szRetry_After, HTTP_QUERY_RETRY_AFTER,}, - {szServer, HTTP_QUERY_SERVER,}, - {szSet_Cookie, HTTP_QUERY_SET_COOKIE,}, - {szStatus, HTTP_QUERY_STATUS_CODE,}, - {szTransfer_Encoding, HTTP_QUERY_TRANSFER_ENCODING,}, - {szUnless_Modified_Since, HTTP_QUERY_UNLESS_MODIFIED_SINCE,}, - {szUpgrade, HTTP_QUERY_UPGRADE,}, - {szURI, HTTP_QUERY_URI,}, - {szUser_Agent, HTTP_QUERY_USER_AGENT,}, - {szVary, HTTP_QUERY_VARY,}, - {szVia, HTTP_QUERY_VIA,}, - {szWarning, HTTP_QUERY_WARNING,}, - {szWWW_Authenticate, HTTP_QUERY_WWW_AUTHENTICATE,}, +static const LPCWSTR header_lookup[] = { + szMime_Version, /* HTTP_QUERY_MIME_VERSION = 0 */ + szContent_Type, /* HTTP_QUERY_CONTENT_TYPE = 1 */ + szContent_Transfer_Encoding,/* HTTP_QUERY_CONTENT_TRANSFER_ENCODING = 2 */ + szContent_ID, /* HTTP_QUERY_CONTENT_ID = 3 */ + NULL, /* HTTP_QUERY_CONTENT_DESCRIPTION = 4 */ + szContent_Length, /* HTTP_QUERY_CONTENT_LENGTH = 5 */ + szContent_Language, /* HTTP_QUERY_CONTENT_LANGUAGE = 6 */ + szAllow, /* HTTP_QUERY_ALLOW = 7 */ + szPublic, /* HTTP_QUERY_PUBLIC = 8 */ + szDate, /* HTTP_QUERY_DATE = 9 */ + szExpires, /* HTTP_QUERY_EXPIRES = 10 */ + szLast_Modified, /* HTTP_QUERY_LAST_MODIFIED = 11 */ + NULL, /* HTTP_QUERY_MESSAGE_ID = 12 */ + szURI, /* HTTP_QUERY_URI = 13 */ + szFrom, /* HTTP_QUERY_DERIVED_FROM = 14 */ + NULL, /* HTTP_QUERY_COST = 15 */ + NULL, /* HTTP_QUERY_LINK = 16 */ + szPragma, /* HTTP_QUERY_PRAGMA = 17 */ + NULL, /* HTTP_QUERY_VERSION = 18 */ + szStatus, /* HTTP_QUERY_STATUS_CODE = 19 */ + NULL, /* HTTP_QUERY_STATUS_TEXT = 20 */ + NULL, /* HTTP_QUERY_RAW_HEADERS = 21 */ + NULL, /* HTTP_QUERY_RAW_HEADERS_CRLF = 22 */ + szConnection, /* HTTP_QUERY_CONNECTION = 23 */ + szAccept, /* HTTP_QUERY_ACCEPT = 24 */ + szAccept_Charset, /* HTTP_QUERY_ACCEPT_CHARSET = 25 */ + szAccept_Encoding, /* HTTP_QUERY_ACCEPT_ENCODING = 26 */ + szAccept_Language, /* HTTP_QUERY_ACCEPT_LANGUAGE = 27 */ + szAuthorization, /* HTTP_QUERY_AUTHORIZATION = 28 */ + szContent_Encoding, /* HTTP_QUERY_CONTENT_ENCODING = 29 */ + NULL, /* HTTP_QUERY_FORWARDED = 30 */ + NULL, /* HTTP_QUERY_FROM = 31 */ + szIf_Modified_Since, /* HTTP_QUERY_IF_MODIFIED_SINCE = 32 */ + szLocation, /* HTTP_QUERY_LOCATION = 33 */ + NULL, /* HTTP_QUERY_ORIG_URI = 34 */ + szReferer, /* HTTP_QUERY_REFERER = 35 */ + szRetry_After, /* HTTP_QUERY_RETRY_AFTER = 36 */ + szServer, /* HTTP_QUERY_SERVER = 37 */ + NULL, /* HTTP_TITLE = 38 */ + szUser_Agent, /* HTTP_QUERY_USER_AGENT = 39 */ + szWWW_Authenticate, /* HTTP_QUERY_WWW_AUTHENTICATE = 40 */ + szProxy_Authenticate, /* HTTP_QUERY_PROXY_AUTHENTICATE = 41 */ + szAccept_Ranges, /* HTTP_QUERY_ACCEPT_RANGES = 42 */ + szSet_Cookie, /* HTTP_QUERY_SET_COOKIE = 43 */ + szCookie, /* HTTP_QUERY_COOKIE = 44 */ + NULL, /* HTTP_QUERY_REQUEST_METHOD = 45 */ + NULL, /* HTTP_QUERY_REFRESH = 46 */ + NULL, /* HTTP_QUERY_CONTENT_DISPOSITION = 47 */ + szAge, /* HTTP_QUERY_AGE = 48 */ + szCache_Control, /* HTTP_QUERY_CACHE_CONTROL = 49 */ + szContent_Base, /* HTTP_QUERY_CONTENT_BASE = 50 */ + szContent_Location, /* HTTP_QUERY_CONTENT_LOCATION = 51 */ + szContent_MD5, /* HTTP_QUERY_CONTENT_MD5 = 52 */ + szContent_Range, /* HTTP_QUERY_CONTENT_RANGE = 53 */ + szETag, /* HTTP_QUERY_ETAG = 54 */ + szHost, /* HTTP_QUERY_HOST = 55 */ + szIf_Match, /* HTTP_QUERY_IF_MATCH = 56 */ + szIf_None_Match, /* HTTP_QUERY_IF_NONE_MATCH = 57 */ + szIf_Range, /* HTTP_QUERY_IF_RANGE = 58 */ + szIf_Unmodified_Since, /* HTTP_QUERY_IF_UNMODIFIED_SINCE = 59 */ + szMax_Forwards, /* HTTP_QUERY_MAX_FORWARDS = 60 */ + szProxy_Authorization, /* HTTP_QUERY_PROXY_AUTHORIZATION = 61 */ + szRange, /* HTTP_QUERY_RANGE = 62 */ + szTransfer_Encoding, /* HTTP_QUERY_TRANSFER_ENCODING = 63 */ + szUpgrade, /* HTTP_QUERY_UPGRADE = 64 */ + szVary, /* HTTP_QUERY_VARY = 65 */ + szVia, /* HTTP_QUERY_VIA = 66 */ + szWarning, /* HTTP_QUERY_WARNING = 67 */ + szExpect, /* HTTP_QUERY_EXPECT = 68 */ + szProxy_Connection, /* HTTP_QUERY_PROXY_CONNECTION = 69 */ + szUnless_Modified_Since, /* HTTP_QUERY_UNLESS_MODIFIED_SINCE = 70 */ }; +#define LAST_TABLE_HEADER (sizeof(header_lookup)/sizeof(header_lookup[0])) + /*********************************************************************** * HTTP_HttpQueryInfoW (internal) */ @@ -1384,20 +1395,11 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( return TRUE; } default: - if (level >= 0 && level <= HTTP_QUERY_MAX ) - { - int i; - for (i = 0; i < sizeof(SORTED_STANDARD_HEADERS)/sizeof(std_hdr_data) ; i++) - { - if (SORTED_STANDARD_HEADERS[i].hdrIndex == level) - { - index = HTTP_GetCustomHeaderIndex(lpwhr, - (LPWSTR)SORTED_STANDARD_HEADERS[i].hdrStr, - requested_index,request_only); - break; - } - } - } + assert (LAST_TABLE_HEADER == (HTTP_QUERY_UNLESS_MODIFIED_SINCE + 1)); + + if (level >= 0 && level < LAST_TABLE_HEADER && header_lookup[level]) + index = HTTP_GetCustomHeaderIndex(lpwhr, header_lookup[level], + requested_index,request_only); } if (index >= 0)

1 0

Mike McCormack : WININET: Clean up HttpQueryInfo.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: ae300883faa29ddad5c65aeac5cad682380e4cd3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ae300883faa29ddad5c65ae… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Mar 30 18:01:48 2006 +0900 WININET: Clean up HttpQueryInfo. Fixes another return FALSE without SetLastError. --- dlls/wininet/http.c | 76 ++++++++++++++++++--------------------------------- 1 files changed, 27 insertions(+), 49 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 48026a0..70dfc38 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1291,28 +1291,18 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( LPHTTPHEADERW lphttpHdr = NULL; BOOL bSuccess = FALSE; BOOL request_only = dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS; - + INT requested_index = lpdwIndex ? *lpdwIndex : 0; + INT level = (dwInfoLevel & ~HTTP_QUERY_MODIFIER_FLAGS_MASK); + INT index = -1; /* Find requested header structure */ - if ((dwInfoLevel & ~HTTP_QUERY_MODIFIER_FLAGS_MASK) == HTTP_QUERY_CUSTOM) + switch (level) { - INT requested_index = (lpdwIndex)?(*lpdwIndex):0; - INT index = HTTP_GetCustomHeaderIndex(lpwhr, (LPWSTR)lpBuffer, - requested_index,request_only); + case HTTP_QUERY_CUSTOM: + index = HTTP_GetCustomHeaderIndex(lpwhr, lpBuffer, requested_index, request_only); + break; - if (index < 0) - return bSuccess; - else - lphttpHdr = &lpwhr->pCustHeaders[index]; - - if (lpdwIndex) - (*lpdwIndex)++; - } - else - { - INT index = dwInfoLevel & ~HTTP_QUERY_MODIFIER_FLAGS_MASK; - - if (index == HTTP_QUERY_RAW_HEADERS_CRLF) + case HTTP_QUERY_RAW_HEADERS_CRLF: { DWORD len = strlenW(lpwhr->lpszRawHeaders); if (len + 1 > *lpdwBufferLength/sizeof(WCHAR)) @@ -1328,7 +1318,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( return TRUE; } - else if (index == HTTP_QUERY_RAW_HEADERS) + case HTTP_QUERY_RAW_HEADERS: { static const WCHAR szCrLf[] = {'\r','\n',0}; LPWSTR * ppszRawHeaderLines = HTTP_Tokenize(lpwhr->lpszRawHeaders, szCrLf); @@ -1361,7 +1351,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( return TRUE; } - else if (index == HTTP_QUERY_STATUS_TEXT) + case HTTP_QUERY_STATUS_TEXT: { DWORD len = strlenW(lpwhr->lpszStatusText); if (len + 1 > *lpdwBufferLength/sizeof(WCHAR)) @@ -1377,7 +1367,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( return TRUE; } - else if (index == HTTP_QUERY_VERSION) + case HTTP_QUERY_VERSION: { DWORD len = strlenW(lpwhr->lpszVersion); if (len + 1 > *lpdwBufferLength/sizeof(WCHAR)) @@ -1393,50 +1383,38 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( return TRUE; } - else if (index >= 0 && index <= HTTP_QUERY_MAX ) - { + default: + if (level >= 0 && level <= HTTP_QUERY_MAX ) + { int i; - for (i = 0; i < sizeof(SORTED_STANDARD_HEADERS)/sizeof(std_hdr_data) ; i++) + for (i = 0; i < sizeof(SORTED_STANDARD_HEADERS)/sizeof(std_hdr_data) ; i++) { - if (SORTED_STANDARD_HEADERS[i].hdrIndex == index) + if (SORTED_STANDARD_HEADERS[i].hdrIndex == level) { - INT requested_index = (lpdwIndex)?(*lpdwIndex):0; - INT index = HTTP_GetCustomHeaderIndex(lpwhr, + index = HTTP_GetCustomHeaderIndex(lpwhr, (LPWSTR)SORTED_STANDARD_HEADERS[i].hdrStr, requested_index,request_only); - - if (index < 0) - break; - lphttpHdr = &lpwhr->pCustHeaders[index]; - - if (lpdwIndex) - (*lpdwIndex)++; - break; } } - - if (!lphttpHdr) - { - SetLastError(ERROR_HTTP_HEADER_NOT_FOUND); - return bSuccess; - } - } - else - { - SetLastError(ERROR_HTTP_HEADER_NOT_FOUND); - return bSuccess; } } + if (index >= 0) + lphttpHdr = &lpwhr->pCustHeaders[index]; + /* Ensure header satisifies requested attributes */ - if ((dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS) && - (~lphttpHdr->wFlags & HDR_ISREQUEST)) + if (!lphttpHdr || + ((dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS) && + (~lphttpHdr->wFlags & HDR_ISREQUEST))) { SetLastError(ERROR_HTTP_HEADER_NOT_FOUND); - return bSuccess; + return bSuccess; } + if (lpdwIndex) + (*lpdwIndex)++; + /* coalesce value to reuqested type */ if (dwInfoLevel & HTTP_QUERY_FLAG_NUMBER) {

1 0

Mike McCormack : wininet: Make sure to set LastError when returning FALSE in HttpQueryInfo.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 2571fa004a334818c1d9c0a438c974a9ce28106f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2571fa004a334818c1d9c0a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Mar 30 18:00:30 2006 +0900 wininet: Make sure to set LastError when returning FALSE in HttpQueryInfo. --- dlls/wininet/http.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 76f7b7e..48026a0 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1406,9 +1406,8 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( requested_index,request_only); if (index < 0) - return bSuccess; - else - lphttpHdr = &lpwhr->pCustHeaders[index]; + break; + lphttpHdr = &lpwhr->pCustHeaders[index]; if (lpdwIndex) (*lpdwIndex)++;

1 0

Mike McCormack : ole32: Fix StgOpenStorage' s handling of the STGM_PRIORITY flag.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 50436da519531d3a6981ec22c22958a1f21fc1b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=50436da519531d3a6981ec2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 29 17:09:25 2006 +0900 ole32: Fix StgOpenStorage's handling of the STGM_PRIORITY flag. --- dlls/ole32/storage32.c | 2 +- dlls/ole32/tests/storage32.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 215413e..bbb2d3c 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5911,7 +5911,7 @@ HRESULT WINAPI StgOpenStorage( /* * Validate the sharing mode */ - if (!(grfMode & STGM_TRANSACTED)) + if (!(grfMode & (STGM_TRANSACTED|STGM_PRIORITY))) switch(STGM_SHARE_MODE(grfMode)) { case STGM_SHARE_EXCLUSIVE: diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 4ac4144..7ed9655 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -448,6 +448,32 @@ static void test_open_storage(void) ok(r == 0, "wrong ref count\n"); } + /* open like visio 2003 */ + stg = NULL; + r = StgOpenStorage( filename, NULL, STGM_PRIORITY | STGM_SHARE_DENY_NONE, NULL, 0, &stg); + ok(r == S_OK, "should succeed\n"); + if (stg) + IStorage_Release(stg); + + /* test other sharing modes with STGM_PRIORITY */ + stg = NULL; + r = StgOpenStorage( filename, NULL, STGM_PRIORITY | STGM_SHARE_EXCLUSIVE, NULL, 0, &stg); + ok(r == S_OK, "should succeed\n"); + if (stg) + IStorage_Release(stg); + + stg = NULL; + r = StgOpenStorage( filename, NULL, STGM_PRIORITY | STGM_SHARE_DENY_WRITE, NULL, 0, &stg); + ok(r == S_OK, "should succeed\n"); + if (stg) + IStorage_Release(stg); + + stg = NULL; + r = StgOpenStorage( filename, NULL, STGM_PRIORITY | STGM_SHARE_DENY_READ, NULL, 0, &stg); + ok(r == S_OK, "should succeed\n"); + if (stg) + IStorage_Release(stg); + r = DeleteFileW(filename); ok(r, "file didn't exist\n"); }

1 0

Alexandre Julliard : x11drv: Replace the SWP_WINE_NOHOSTMOVE flag by a lock count.
by Alexandre Julliard 30 Mar '06

30 Mar '06

Module: wine Branch: refs/heads/master Commit: 3217e534fe20dcc19088229ce7cf82937a32b490 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3217e534fe20dcc19088229… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 29 18:27:01 2006 +0200 x11drv: Replace the SWP_WINE_NOHOSTMOVE flag by a lock count. --- dlls/x11drv/window.c | 4 ++-- dlls/x11drv/winpos.c | 25 +++++++++++++++++-------- dlls/x11drv/x11drv.h | 1 + include/winpos.h | 3 --- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/x11drv/window.c b/dlls/x11drv/window.c index 592d874..a3fff6f 100644 --- a/dlls/x11drv/window.c +++ b/dlls/x11drv/window.c @@ -602,8 +602,7 @@ void X11DRV_sync_window_position( Displa data->client_rect = *new_client_rect; OffsetRect( &data->client_rect, -data->whole_rect.left, -data->whole_rect.top ); - if (!data->whole_window) return; - if (swp_flags & SWP_WINE_NOHOSTMOVE) return; + if (!data->whole_window || data->lock_changes) return; mask = get_window_changes( &changes, &old_whole_rect, &data->whole_rect ); @@ -837,6 +836,7 @@ static struct x11drv_win_data *alloc_win data->xic = 0; data->managed = FALSE; data->dce = NULL; + data->lock_changes = 0; data->hWMIconBitmap = 0; data->hWMIconMask = 0; diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c index 331d6d4..5bf9368 100644 --- a/dlls/x11drv/winpos.c +++ b/dlls/x11drv/winpos.c @@ -567,7 +567,7 @@ BOOL X11DRV_set_window_pos( HWND hwnd, H { req->handle = hwnd; req->previous = insert_after; - req->flags = swp_flags & ~SWP_WINE_NOHOSTMOVE; + req->flags = swp_flags; req->window.left = rectWindow->left; req->window.top = rectWindow->top; req->window.right = rectWindow->right; @@ -625,7 +625,7 @@ BOOL X11DRV_set_window_pos( HWND hwnd, H /* FIXME: copy the valid bits */ - if (data->whole_window && !(swp_flags & SWP_WINE_NOHOSTMOVE)) + if (data->whole_window && !data->lock_changes) { if ((old_style & WS_VISIBLE) && !(new_style & WS_VISIBLE)) { @@ -647,7 +647,7 @@ BOOL X11DRV_set_window_pos( HWND hwnd, H X11DRV_sync_window_position( display, data, swp_flags, rectClient, &new_whole_rect ); - if (data->whole_window && !(swp_flags & SWP_WINE_NOHOSTMOVE)) + if (data->whole_window && !data->lock_changes) { if ((new_style & WS_VISIBLE) && !(new_style & WS_MINIMIZE) && X11DRV_is_window_rect_mapped( rectWindow )) @@ -694,7 +694,6 @@ BOOL X11DRV_SetWindowPos( WINDOWPOS *win winpos->cx, winpos->cy, winpos->flags); orig_flags = winpos->flags; - winpos->flags &= ~SWP_WINE_NOHOSTMOVE; /* First make sure that coordinates are valid for WM_WINDOWPOSCHANGING */ if (!(winpos->flags & SWP_NOMOVE)) @@ -1107,8 +1106,10 @@ void X11DRV_MapNotify( HWND hwnd, XEvent WIN_ReleasePtr( win ); SendMessageA( hwnd, WM_SHOWWINDOW, SW_RESTORE, 0 ); + data->lock_changes++; SetWindowPos( hwnd, 0, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, - SWP_NOZORDER | SWP_WINE_NOHOSTMOVE ); + SWP_NOZORDER ); + data->lock_changes--; } else WIN_ReleasePtr( win ); if (hwndFocus && IsChild( hwnd, hwndFocus )) X11DRV_SetFocus(hwndFocus); /* FIXME */ @@ -1140,8 +1141,10 @@ void X11DRV_UnmapNotify( HWND hwnd, XEve EndMenu(); SendMessageA( hwnd, WM_SHOWWINDOW, SW_MINIMIZE, 0 ); + data->lock_changes++; SetWindowPos( hwnd, 0, 0, 0, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), - SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER | SWP_WINE_NOHOSTMOVE ); + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER ); + data->lock_changes--; } else WIN_ReleasePtr( win ); } @@ -1154,12 +1157,16 @@ void X11DRV_handle_desktop_resize( unsig { RECT rect; HWND hwnd = GetDesktopWindow(); + struct x11drv_win_data *data; + if (!(data = X11DRV_get_win_data( hwnd ))) return; screen_width = width; screen_height = height; TRACE("desktop %p change to (%dx%d)\n", hwnd, width, height); SetRect( &rect, 0, 0, width, height ); - X11DRV_set_window_pos( hwnd, 0, &rect, &rect, SWP_NOZORDER|SWP_NOMOVE|SWP_WINE_NOHOSTMOVE, NULL ); + data->lock_changes++; + X11DRV_set_window_pos( hwnd, 0, &rect, &rect, SWP_NOZORDER|SWP_NOMOVE, NULL ); + data->lock_changes--; SendMessageTimeoutW( HWND_BROADCAST, WM_DISPLAYCHANGE, screen_depth, MAKELPARAM( width, height ), SMTO_ABORTIFHUNG, 2000, NULL ); } @@ -1202,7 +1209,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, y = rect.top; cx = rect.right - rect.left; cy = rect.bottom - rect.top; - flags = SWP_NOACTIVATE | SWP_NOZORDER | SWP_WINE_NOHOSTMOVE; + flags = SWP_NOACTIVATE | SWP_NOZORDER; /* Compare what has changed */ @@ -1223,7 +1230,9 @@ void X11DRV_ConfigureNotify( HWND hwnd, TRACE( "%p resizing from (%ldx%ld) to (%dx%d)\n", hwnd, rect.right - rect.left, rect.bottom - rect.top, cx, cy ); + data->lock_changes++; SetWindowPos( hwnd, 0, x, y, cx, cy, flags ); + data->lock_changes--; } diff --git a/dlls/x11drv/x11drv.h b/dlls/x11drv/x11drv.h index c528c99..0ba4fce 100644 --- a/dlls/x11drv/x11drv.h +++ b/dlls/x11drv/x11drv.h @@ -643,6 +643,7 @@ struct x11drv_win_data XIC xic; /* X input context */ BOOL managed; /* is window managed? */ struct dce *dce; /* DCE for CS_OWNDC or CS_CLASSDC windows */ + unsigned int lock_changes; /* lock count for X11 change requests */ HBITMAP hWMIconBitmap; HBITMAP hWMIconMask; }; diff --git a/include/winpos.h b/include/winpos.h index 27a950c..e480efc 100644 --- a/include/winpos.h +++ b/include/winpos.h @@ -31,9 +31,6 @@ #define SWP_NOCLIENTSIZE 0x0800 #define SWP_NOCLIENTMOVE 0x1000 -/* Wine extra SWP flag */ -#define SWP_WINE_NOHOSTMOVE 0x80000000 - extern BOOL WINPOS_RedrawIconTitle( HWND hWnd ); extern BOOL WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow ); extern void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, POINT *minTrack,

1 0

Petr Tesarik : ntdll: Fix CDROM raw reads.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 4c777d7466ea5fbe04899bf945f097bcc30a7dcb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4c777d7466ea5fbe04899bf… Author: Petr Tesarik <hat(a)tesarici.cz> Date: Mon Mar 27 10:20:39 2006 +0200 ntdll: Fix CDROM raw reads. - Fix incorrect data sizes. - Fix CDDA addressing. - Implement XAForm2 mode on Linux. --- dlls/ntdll/cdrom.c | 152 ++++++++++++++++++++++++++++------------------------ 1 files changed, 82 insertions(+), 70 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index a5cf6cd..8838949 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1192,101 +1192,113 @@ static NTSTATUS CDROM_SetVolume(int fd, /****************************************************************** * CDROM_RawRead * + * Some features of this IOCTL are rather poorly documented and + * not really intuitive either: + * + * 1. Although the DiskOffset parameter is meant to be a + * byte offset into the disk, it is in fact the sector + * number multiplied by 2048 regardless of the actual + * sector size. + * + * 2. The least significant 11 bits of DiskOffset are ignored. + * + * 3. The TrackMode parameter has no effect on the sector + * size. The entire raw sector (i.e. 2352 bytes of data) + * is always returned. IMO the TrackMode is only used + * to check the correct sector type. * */ static NTSTATUS CDROM_RawRead(int fd, const RAW_READ_INFO* raw, void* buffer, DWORD len, DWORD* sz) { - int ret = STATUS_NOT_SUPPORTED; + int ret = STATUS_NOT_SUPPORTED; int io = -1; - DWORD sectSize; TRACE("RAW_READ_INFO: DiskOffset=%li,%li SectorCount=%li TrackMode=%i\n buffer=%p len=%li sz=%p\n", raw->DiskOffset.u.HighPart, raw->DiskOffset.u.LowPart, raw->SectorCount, raw->TrackMode, buffer, len, sz); + if (len < raw->SectorCount * 2352) return STATUS_BUFFER_TOO_SMALL; + +#if defined(linux) + if (raw->DiskOffset.u.HighPart & ~2047) { + WARN("DiskOffset points to a sector >= 2**32\n"); + return ret; + } + switch (raw->TrackMode) { - case YellowMode2: sectSize = 2336; break; - case XAForm2: sectSize = 2328; break; - case CDDA: sectSize = 2352; break; - default: return STATUS_INVALID_PARAMETER; - } - if (len < raw->SectorCount * sectSize) return STATUS_BUFFER_TOO_SMALL; - /* strangely enough, it seems that sector offsets are always indicated with a size of 2048, - * even if a larger size if read... - */ -#if defined(linux) + case YellowMode2: + case XAForm2: { - struct cdrom_read_audio cdra; + DWORD lba = raw->DiskOffset.QuadPart >> 11; struct cdrom_msf* msf; + PBYTE *bp; /* current buffer pointer */ int i; - LONGLONG t = ((LONGLONG)raw->DiskOffset.u.HighPart << 32) + - raw->DiskOffset.u.LowPart + CD_MSF_OFFSET; - switch (raw->TrackMode) + if ((lba + raw->SectorCount) > + ((1 << 8*sizeof(msf->cdmsf_min0)) * CD_SECS * CD_FRAMES + - CD_MSF_OFFSET)) { + WARN("DiskOffset not accessible with MSF\n"); + return ret; + } + + /* Linux reads only one sector at a time. + * ioctl CDROMREADRAW takes struct cdrom_msf as an argument + * on the contrary to what header comments state. + */ + lba += CD_MSF_OFFSET; + for (i = 0, bp = buffer; i < raw->SectorCount; + i++, lba++, bp += 2352) { - case YellowMode2: - /* Linux reads only one sector at a time. - * ioctl CDROMREADMODE2 takes struct cdrom_msf as an argument - * on the contrary to what header comments state. - */ - for (i = 0; i < raw->SectorCount; i++, t += sectSize) + msf = (struct cdrom_msf*)bp; + msf->cdmsf_min0 = lba / CD_FRAMES / CD_SECS; + msf->cdmsf_sec0 = lba / CD_FRAMES % CD_SECS; + msf->cdmsf_frame0 = lba % CD_FRAMES; + io = ioctl(fd, CDROMREADRAW, msf); + if (io != 0) { - msf = (struct cdrom_msf*)buffer + i * sectSize; - msf->cdmsf_min0 = t / CD_FRAMES / CD_SECS; - msf->cdmsf_sec0 = t / CD_FRAMES % CD_SECS; - msf->cdmsf_frame0 = t % CD_FRAMES; - io = ioctl(fd, CDROMREADMODE2, msf); - if (io != 0) - { - *sz = sectSize * i; - return CDROM_GetStatusCode(io); - } + *sz = 2352 * i; + return CDROM_GetStatusCode(io); } - break; - case XAForm2: - FIXME("XAForm2: NIY\n"); - return ret; - case CDDA: - /* FIXME: the output doesn't seem 100% correct... in fact output is shifted - * between by NT2K box and this... should check on the same drive... - * otherwise, I fear a 2352/2368 mismatch somewhere in one of the drivers - * (linux/NT). - * Anyway, that's not critical at all. We're talking of 16/32 bytes, we're - * talking of 0.2 ms of sound - */ - /* 2048 = 2 ** 11 */ - if (raw->DiskOffset.u.HighPart & ~2047) FIXME("Unsupported value\n"); - cdra.addr.lba = ((raw->DiskOffset.u.LowPart >> 11) | - (raw->DiskOffset.u.HighPart << (32 - 11))) - 1; - FIXME("reading at %u\n", cdra.addr.lba); - cdra.addr_format = CDROM_LBA; - cdra.nframes = raw->SectorCount; - cdra.buf = buffer; - io = ioctl(fd, CDROMREADAUDIO, &cdra); - break; - default: - FIXME("NIY: %d\n", raw->TrackMode); - return ret; } + break; + } + + case CDDA: + { + struct cdrom_read_audio cdra; + + cdra.addr.lba = raw->DiskOffset.QuadPart >> 11; + TRACE("reading at %u\n", cdra.addr.lba); + cdra.addr_format = CDROM_LBA; + cdra.nframes = raw->SectorCount; + cdra.buf = buffer; + io = ioctl(fd, CDROMREADAUDIO, &cdra); + break; + } + + default: + FIXME("NIY: %d\n", raw->TrackMode); + return STATUS_INVALID_PARAMETER; } #else + switch (raw->TrackMode) { - switch (raw->TrackMode) - { - case YellowMode2: - FIXME("YellowMode2: NIY\n"); - return ret; - case XAForm2: - FIXME("XAForm2: NIY\n"); - return ret; - case CDDA: - FIXME("CDDA: NIY\n"); - return ret; - } + case YellowMode2: + FIXME("YellowMode2: NIY\n"); + return ret; + case XAForm2: + FIXME("XAForm2: NIY\n"); + return ret; + case CDDA: + FIXME("CDDA: NIY\n"); + return ret; + default: + FIXME("NIY: %d\n", raw->TrackMode); + return STATUS_INVALID_PARAMETER; } #endif - *sz = sectSize * raw->SectorCount; + *sz = 2352 * raw->SectorCount; ret = CDROM_GetStatusCode(io); return ret; }

1 0

Alexandre Julliard : winecfg: Disable the desktop option when configuring a specific application.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: d74a62cfd796c07f9fb93e28c2bbf7f1ffa395ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d74a62cfd796c07f9fb93e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 29 13:49:36 2006 +0200 winecfg: Disable the desktop option when configuring a specific application. --- programs/winecfg/x11drvdlg.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 4b35b25..36ec846 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -53,7 +53,18 @@ static void update_gui_for_desktop_mode( WINE_TRACE("\n"); updating_ui = TRUE; - + + if (current_app) + { + disable(IDC_ENABLE_DESKTOP); + disable(IDC_DESKTOP_WIDTH); + disable(IDC_DESKTOP_HEIGHT); + disable(IDC_DESKTOP_SIZE); + disable(IDC_DESKTOP_BY); + return; + } + enable(IDC_ENABLE_DESKTOP); + /* do we have desktop mode enabled? */ if (reg_key_exists(config_key, keypath("X11 Driver"), "Desktop")) {

1 0

H. Verbeet : wined3d: Create an IWineD3DBaseShader class.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 1e1a708e8ab5827deb5dd6ea5bfeb195e7482f11 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1e1a708e8ab5827deb5dd6e… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Mar 28 21:10:51 2006 +0200 wined3d: Create an IWineD3DBaseShader class. --- dlls/wined3d/pixelshader.c | 10 +++++--- dlls/wined3d/vertexshader.c | 9 +++++-- include/wine/wined3d_interface.h | 50 +++++++++++++++++++++++++++++++++----- 3 files changed, 55 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 89fe4b9..05ca70e 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -52,6 +52,7 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_Q TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IWineD3DBase) + || IsEqualGUID(riid, &IID_IWineD3DBaseShader) || IsEqualGUID(riid, &IID_IWineD3DPixelShader)) { IUnknown_AddRef(iface); *ppobj = This; @@ -1825,10 +1826,11 @@ const IWineD3DPixelShaderVtbl IWineD3DPi IWineD3DPixelShaderImpl_QueryInterface, IWineD3DPixelShaderImpl_AddRef, IWineD3DPixelShaderImpl_Release, - /*** IWineD3DPixelShader methods ***/ + /*** IWineD3DBase methods ***/ IWineD3DPixelShaderImpl_GetParent, + /*** IWineD3DBaseShader methods ***/ + IWineD3DPixelShaderImpl_SetFunction, + /*** IWineD3DPixelShader methods ***/ IWineD3DPixelShaderImpl_GetDevice, - IWineD3DPixelShaderImpl_GetFunction, - /* not part of d3d */ - IWineD3DPixelShaderImpl_SetFunction + IWineD3DPixelShaderImpl_GetFunction }; diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 0fd74e3..24059d0 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -2035,6 +2035,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IWineD3DBase) + || IsEqualGUID(riid, &IID_IWineD3DBaseShader) || IsEqualGUID(riid, &IID_IWineD3DVertexShader)) { IUnknown_AddRef(iface); *ppobj = This; @@ -2214,9 +2215,11 @@ const IWineD3DVertexShaderVtbl IWineD3DV IWineD3DVertexShaderImpl_QueryInterface, IWineD3DVertexShaderImpl_AddRef, IWineD3DVertexShaderImpl_Release, - /*** IWineD3DVertexShader methods ***/ + /*** IWineD3DBase methods ***/ IWineD3DVertexShaderImpl_GetParent, + /*** IWineD3DBaseShader methods ***/ + IWineD3DVertexShaderImpl_SetFunction, + /*** IWineD3DVertexShader methods ***/ IWineD3DVertexShaderImpl_GetDevice, - IWineD3DVertexShaderImpl_GetFunction, - IWineD3DVertexShaderImpl_SetFunction + IWineD3DVertexShaderImpl_GetFunction }; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 2921da5..de0eee5 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -56,6 +56,7 @@ struct IWineD3DStateBlock; struct IWineD3DSurface; struct IWineD3DVolume; struct IWineD3DVertexDeclaration; +struct IWineD3DBaseShader; struct IWineD3DVertexShader; struct IWineD3DPixelShader; struct IWineD3DQuery; @@ -120,6 +121,10 @@ DEFINE_GUID(IID_IWineD3DVolumeTexture, DEFINE_GUID(IID_IWineD3DVertexDeclaration, 0x7cd55be6, 0x6f30, 0x11d9, 0xc6, 0x87, 0x0, 0x4, 0x61, 0x42, 0xc1, 0x4f); +/* {EAC93065-A4DF-446F-86A1-9EF2BCA40A3C} */ +DEFINE_GUID(IID_IWineD3DBaseShader, +0xeac93065, 0xa4df, 0x446f, 0x86, 0xa1, 0x9e, 0xf2, 0xbc, 0xa4, 0x0a, 0x3c); + /* {7F7A2B60-6F30-11d9-C687-00046142C14F} */ DEFINE_GUID(IID_IWineD3DVertexShader, 0x7f7a2b60, 0x6f30, 0x11d9, 0xc6, 0x87, 0x0, 0x4, 0x61, 0x42, 0xc1, 0x4f); @@ -1317,10 +1322,38 @@ DECLARE_INTERFACE_(IWineD3DSwapChain,IWi #endif /***************************************************************************** + * IWineD3DBaseShader interface + */ +#define INTERFACE IWineD3DBaseShader +DECLARE_INTERFACE_(IWineD3DBaseShader,IWineD3DBase) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IWineD3DBase methods ***/ + STDMETHOD(GetParent)(THIS_ IUnknown **pParent) PURE; + /*** IWineD3DBaseShader methods ***/ + STDMETHOD(SetFunction)(THIS_ CONST DWORD *pFunction) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IWineD3DBaseShader_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IWineD3DBaseShader_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IWineD3DBaseShader_Release(p) (p)->lpVtbl->Release(p) +/*** IWineD3DBase methods ***/ +#define IWineD3DBaseShader_GetParent(p,a) (p)->lpVtbl->GetParent(p,a) +/*** IWineD3DBaseShader methods ***/ +#define IWineD3DBaseShader_SetFunction(p,a) (p)->lpVtbl->SetFunction(p,a) +#endif + +/***************************************************************************** * IWineD3DVertexShader interface */ #define INTERFACE IWineD3DVertexShader -DECLARE_INTERFACE_(IWineD3DVertexShader,IWineD3DBase) +DECLARE_INTERFACE_(IWineD3DVertexShader,IWineD3DBaseShader) { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -1328,10 +1361,11 @@ DECLARE_INTERFACE_(IWineD3DVertexShader, STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IWineD3DBase methods ***/ STDMETHOD(GetParent)(THIS_ IUnknown **pParent) PURE; + /*** IWineD3DBaseShader methods ***/ + STDMETHOD(SetFunction)(THIS_ CONST DWORD *pFunction) PURE; /*** IWineD3DVertexShader methods ***/ STDMETHOD(GetDevice)(THIS_ IWineD3DDevice** ppDevice) PURE; STDMETHOD(GetFunction)(THIS_ VOID *pData, UINT *pSizeOfData) PURE; - STDMETHOD(SetFunction)(THIS_ CONST DWORD *pFunction) PURE; STDMETHOD(SetConstantB)(THIS_ UINT StartRegister, CONST BOOL* pConstantData, UINT BoolCount) PURE; STDMETHOD(SetConstantI)(THIS_ UINT StartRegister, CONST INT* pConstantData, UINT Vector4iCount) PURE; STDMETHOD(SetConstantF)(THIS_ UINT StartRegister, CONST FLOAT* pConstantData, UINT Vector4fCount) PURE; @@ -1350,10 +1384,11 @@ DECLARE_INTERFACE_(IWineD3DVertexShader, #define IWineD3DVertexShader_Release(p) (p)->lpVtbl->Release(p) /*** IWineD3DBase methods ***/ #define IWineD3DVertexShader_GetParent(p,a) (p)->lpVtbl->GetParent(p,a) +/*** IWineD3DBaseShader methods ***/ +#define IWineD3DVertexShader_SetFunction(p,a) (p)->lpVtbl->SetFunction(p,a) /*** IWineD3DVertexShader methods ***/ #define IWineD3DVertexShader_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) #define IWineD3DVertexShader_GetFunction(p,a,b) (p)->lpVtbl->GetFunction(p,a,b) -#define IWineD3DVertexShader_SetFunction(p,a) (p)->lpVtbl->SetFunction(p,a) #define IWineD3DVertexShader_SetConstantB(p,a,b,c) (p)->lpVtbl->SetConstantB(p,a,b,c) #define IWineD3DVertexShader_SetConstantI(p,a,b,c) (p)->lpVtbl->SetConstantI(p,a,b,c) #define IWineD3DVertexShader_SetConstantF(p,a,b,c) (p)->lpVtbl->SetConstantF(p,a,b,c) @@ -1367,7 +1402,7 @@ DECLARE_INTERFACE_(IWineD3DVertexShader, * IWineD3DPixelShader interface */ #define INTERFACE IWineD3DPixelShader -DECLARE_INTERFACE_(IWineD3DPixelShader,IWineD3DBase) +DECLARE_INTERFACE_(IWineD3DPixelShader,IWineD3DBaseShader) { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; @@ -1375,11 +1410,11 @@ DECLARE_INTERFACE_(IWineD3DPixelShader,I STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IWineD3DBase methods ***/ STDMETHOD(GetParent)(THIS_ IUnknown **pParent) PURE; + /*** IWineD3DBaseShader methods ***/ + STDMETHOD(SetFunction)(THIS_ CONST DWORD *pFunction) PURE; /*** IWineD3DPixelShader methods ***/ STDMETHOD(GetDevice)(THIS_ IWineD3DDevice** ppDevice) PURE; STDMETHOD(GetFunction)(THIS_ VOID* pData, UINT* pSizeOfData) PURE; - /* Internal Interfaces */ - STDMETHOD(SetFunction)(THIS_ CONST DWORD *pFunction) PURE; }; #undef INTERFACE @@ -1390,10 +1425,11 @@ DECLARE_INTERFACE_(IWineD3DPixelShader,I #define IWineD3DPixelShader_Release(p) (p)->lpVtbl->Release(p) /*** IWineD3DBase methods ***/ #define IWineD3DPixelShader_GetParent(p,a) (p)->lpVtbl->GetParent(p,a) +/*** IWineD3DBaseShader methods ***/ +#define IWineD3DPixelShader_SetFunction(p,a) (p)->lpVtbl->SetFunction(p,a) /*** IWineD3DPixelShader methods ***/ #define IWineD3DPixelShader_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) #define IWineD3DPixelShader_GetFunction(p,a,b) (p)->lpVtbl->GetFunction(p,a,b) -#define IWineD3DPixelShader_SetFunction(p,a) (p)->lpVtbl->SetFunction(p,a) #endif #if 0 /* FIXME: During porting in from d3d8 - the following will be used */

1 0

H. Verbeet : wined3d: Move the vshader_ins and pshader_ins arrays into their respective objects.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: d4132cf7d7b336469f6780052a4142bfafe28d84 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4132cf7d7b336469f67800… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Mar 28 21:10:44 2006 +0200 wined3d: Move the vshader_ins and pshader_ins arrays into their respective objects. --- dlls/wined3d/device.c | 2 ++ dlls/wined3d/pixelshader.c | 14 ++++++++------ dlls/wined3d/vertexshader.c | 20 +++++++++++--------- dlls/wined3d/wined3d_private.h | 4 ++++ 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 16eac5f..d322e82 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1620,6 +1620,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create IWineD3DVertexShaderImpl *object; /* NOTE: impl usage is ok, this is a create */ HRESULT hr = D3D_OK; D3DCREATEOBJECTINSTANCE(object, VertexShader) + object->shader_ins = IWineD3DVertexShaderImpl_shader_ins; TRACE("(%p) : Created Vertex shader %p\n", This, *ppVertexShader); @@ -1664,6 +1665,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Create HRESULT hr = D3D_OK; D3DCREATEOBJECTINSTANCE(object, PixelShader) + object->shader_ins = IWineD3DPixelShaderImpl_shader_ins; hr = IWineD3DPixelShader_SetFunction(*ppPixelShader, pFunction); if (D3D_OK == hr) { TRACE("(%p) : Created Pixel shader %p\n", This, *ppPixelShader); diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 64fe501..89fe4b9 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -629,7 +629,7 @@ void pshader_breakp(WINED3DSHADERVECTOR* /** * log, exp, frc, m*x* seems to be macros ins ... to see */ -static CONST SHADER_OPCODE pshader_ins [] = { +CONST SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[] = { {D3DSIO_NOP, "nop", "NOP", 0, pshader_nop, 0, 0}, {D3DSIO_MOV, "mov", "MOV", 2, pshader_mov, 0, 0}, {D3DSIO_ADD, "add", "ADD", 3, pshader_add, 0, 0}, @@ -746,12 +746,14 @@ inline static const SHADER_OPCODE* pshad DWORD i = 0; DWORD version = This->version; DWORD hex_version = D3DPS_VERSION(version/10, version%10); + const SHADER_OPCODE *shader_ins = This->shader_ins; + /** TODO: use dichotomic search */ - while (NULL != pshader_ins[i].name) { - if (((code & D3DSI_OPCODE_MASK) == pshader_ins[i].opcode) && - (((hex_version >= pshader_ins[i].min_version) && (hex_version <= pshader_ins[i].max_version)) || - ((pshader_ins[i].min_version == 0) && (pshader_ins[i].max_version == 0)))) { - return &pshader_ins[i]; + while (NULL != shader_ins[i].name) { + if (((code & D3DSI_OPCODE_MASK) == shader_ins[i].opcode) && + (((hex_version >= shader_ins[i].min_version) && (hex_version <= shader_ins[i].max_version)) || + ((shader_ins[i].min_version == 0) && (shader_ins[i].max_version == 0)))) { + return &shader_ins[i]; } ++i; } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index cfa8f2e..0fd74e3 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -582,7 +582,7 @@ void vshader_breakp(WINED3DSHADERVECTOR* /** * log, exp, frc, m*x* seems to be macros ins ... to see */ -static CONST SHADER_OPCODE vshader_ins [] = { +CONST SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[] = { {D3DSIO_NOP, "nop", "NOP", 0, vshader_nop, 0, 0}, {D3DSIO_MOV, "mov", "MOV", 2, vshader_mov, 0, 0}, {D3DSIO_ADD, "add", "ADD", 3, vshader_add, 0, 0}, @@ -691,12 +691,14 @@ static CONST SHADER_OPCODE vshader_ins [ }; -inline static const SHADER_OPCODE* vshader_program_get_opcode(const DWORD code) { +inline static const SHADER_OPCODE* vshader_program_get_opcode(IWineD3DVertexShaderImpl *This, const DWORD code) { DWORD i = 0; + const SHADER_OPCODE *shader_ins = This->shader_ins; + /** TODO: use dichotomic search or hash table */ - while (NULL != vshader_ins[i].name) { - if ((code & D3DSI_OPCODE_MASK) == vshader_ins[i].opcode) { - return &vshader_ins[i]; + while (NULL != shader_ins[i].name) { + if ((code & D3DSI_OPCODE_MASK) == shader_ins[i].opcode) { + return &shader_ins[i]; } ++i; } @@ -1305,7 +1307,7 @@ inline static VOID IWineD3DVertexShaderI pToken += comment_len; continue; } - curOpcode = vshader_program_get_opcode(*pToken); + curOpcode = vshader_program_get_opcode(This, *pToken); ++pToken; /* TODO: dcl's */ /* TODO: Consts */ @@ -1485,7 +1487,7 @@ inline static VOID IWineD3DVertexShaderI continue; } - curOpcode = vshader_program_get_opcode(*pToken); + curOpcode = vshader_program_get_opcode(This, *pToken); ++pToken; if (NULL == curOpcode) { /* unknown current opcode ... (shouldn't be any!) */ @@ -1781,7 +1783,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ pToken += comment_len; continue ; } - curOpcode = vshader_program_get_opcode(*pToken); + curOpcode = vshader_program_get_opcode(This, *pToken); ++pToken; if (NULL == curOpcode) { i = 0; @@ -2129,7 +2131,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ len += comment_len + 1; continue; } - curOpcode = vshader_program_get_opcode(*pToken); + curOpcode = vshader_program_get_opcode(This, *pToken); ++pToken; ++len; if (NULL == curOpcode) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cff1ac9..dad25f6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1181,6 +1181,7 @@ typedef struct IWineD3DVertexShaderImpl IWineD3DDeviceImpl *wineD3DDevice; /* IWineD3DVertexShaderImpl */ + CONST SHADER_OPCODE *shader_ins; CONST DWORD *function; UINT functionLength; @@ -1204,6 +1205,7 @@ typedef struct IWineD3DVertexShaderImpl VSHADEROUTPUTDATA output; #endif } IWineD3DVertexShaderImpl; +extern const SHADER_OPCODE IWineD3DVertexShaderImpl_shader_ins[]; extern const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl; /***************************************************************************** @@ -1218,6 +1220,7 @@ typedef struct IWineD3DPixelShaderImpl { IWineD3DDeviceImpl *wineD3DDevice; /* IWineD3DPixelShaderImpl */ + const SHADER_OPCODE *shader_ins; CONST DWORD *function; UINT functionLength; DWORD version; @@ -1233,5 +1236,6 @@ typedef struct IWineD3DPixelShaderImpl { #endif } IWineD3DPixelShaderImpl; +extern const SHADER_OPCODE IWineD3DPixelShaderImpl_shader_ins[]; extern const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl; #endif

1 0

H. Verbeet : wined3d: Move the SHADER_OPCODE definition to wined3d_private. h.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 3ee642bb09629ada8ba4d9f30fd3b0d7f263b055 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3ee642bb09629ada8ba4d9f… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Mar 28 21:10:32 2006 +0200 wined3d: Move the SHADER_OPCODE definition to wined3d_private.h. --- dlls/wined3d/pixelshader.c | 11 ----------- dlls/wined3d/vertexshader.c | 12 ------------ dlls/wined3d/wined3d_private.h | 12 ++++++++++++ 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 381a828..64fe501 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -41,17 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define PGMSIZE 65535 #define REGMASK 0x00001FFF -typedef void (*shader_fct_t)(); - -typedef struct SHADER_OPCODE { - unsigned int opcode; - const char* name; - const char* glname; - CONST UINT num_params; - shader_fct_t soft_fct; - DWORD min_version; - DWORD max_version; -} SHADER_OPCODE; #define GLNAME_REQUIRE_GLSL ((const char *)1) /* ******************************************* diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 13da61c..cfa8f2e 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -78,18 +78,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); /* TODO: Vertex and Pixel shaders are almost identicle, the only exception being the way that some of the data is looked up or the availablity of some of the data i.e. some instructions are only valid for pshaders and some for vshaders because of this the bulk of the software pipeline can be shared between pixel and vertex shaders... and it wouldn't supprise me if the programes can be cross compiled using a large body body shared code */ -typedef void (*shader_fct_t)(); - -typedef struct SHADER_OPCODE { - unsigned int opcode; - const char* name; - const char* glname; - CONST UINT num_params; - shader_fct_t soft_fct; - DWORD min_version; - DWORD max_version; -} SHADER_OPCODE; - #define GLNAME_REQUIRE_GLSL ((const char *)1) /******************************* diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86a1002..cff1ac9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1157,6 +1157,18 @@ enum vsConstantsEnum { VS_CONSTANT_FLOAT }; +typedef void (*shader_fct_t)(); + +typedef struct SHADER_OPCODE { + unsigned int opcode; + const char* name; + const char* glname; + CONST UINT num_params; + shader_fct_t soft_fct; + DWORD min_version; + DWORD max_version; +} SHADER_OPCODE; + /***************************************************************************** * IDirect3DVertexShader implementation structure */

1 0

H. Verbeet : wined3d: Pass the correct number of parameters for texld with ps version >= 2.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 0ac9c473d642f68b7dec57294c17f5777f6ca9d8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0ac9c473d642f68b7dec572… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Mar 28 21:10:22 2006 +0200 wined3d: Pass the correct number of parameters for texld with ps version >= 2. --- dlls/wined3d/pixelshader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index e5311c7..381a828 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -715,6 +715,7 @@ static CONST SHADER_OPCODE pshader_ins [ {D3DSIO_TEXKILL, "texkill", "KIL", 1, pshader_texkill, D3DPS_VERSION(1,0), D3DPS_VERSION(1,4)}, {D3DSIO_TEX, "tex", "undefined", 1, pshader_tex, 0, D3DPS_VERSION(1,3)}, {D3DSIO_TEX, "texld", GLNAME_REQUIRE_GLSL, 2, pshader_texld, D3DPS_VERSION(1,4), D3DPS_VERSION(1,4)}, + {D3DSIO_TEX, "texld", GLNAME_REQUIRE_GLSL, 3, pshader_texld, D3DPS_VERSION(2,0), -1}, {D3DSIO_TEXBEM, "texbem", "undefined", 2, pshader_texbem, 0, D3DPS_VERSION(1,3)}, {D3DSIO_TEXBEML, "texbeml", GLNAME_REQUIRE_GLSL, 2, pshader_texbeml, D3DPS_VERSION(1,0), D3DPS_VERSION(1,3)}, {D3DSIO_TEXREG2AR,"texreg2ar","undefined", 2, pshader_texreg2ar, D3DPS_VERSION(1,1), D3DPS_VERSION(1,3)},

1 0

Mike McCormack : user32: Fix SPI_GETLISTBOXSMOOTHSCROLLING, and implement SPI_SETLISTBOXSMOOTHSCROLLING.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 8398f6e9e94ef78cbf0af9a89672a42ca9a312a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8398f6e9e94ef78cbf0af9a… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 29 15:56:55 2006 +0900 user32: Fix SPI_GETLISTBOXSMOOTHSCROLLING, and implement SPI_SETLISTBOXSMOOTHSCROLLING. --- dlls/user/sysparams.c | 26 ++++---------------------- 1 files changed, 4 insertions(+), 22 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index 1ba3946..3aa7a27 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -298,7 +298,6 @@ static BOOL lowpoweractive = FALSE; static BOOL poweroffactive = FALSE; static BOOL show_sounds = FALSE; static BOOL swap_buttons = FALSE; -static BOOL listbox_smoothscrolling = FALSE; static UINT caret_width = 1; static BYTE user_prefs[4]; @@ -2125,29 +2124,12 @@ BOOL WINAPI SystemParametersInfoW( UINT break; case SPI_GETLISTBOXSMOOTHSCROLLING: /* 0x1006 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - if (!pvParam) return FALSE; - - spi_idx = SPI_SETLISTBOXSMOOTHSCROLLING_IDX; - if (!spi_loaded[spi_idx]) - { - WCHAR buf[5]; - - if (SYSPARAMS_Load( SPI_SETLISTBOXSMOOTHSCROLLING_REGKEY, - SPI_SETLISTBOXSMOOTHSCROLLING_VALNAME, buf, sizeof(buf) )) - { - if ((buf[0]&0x01) == 0x01) - { - listbox_smoothscrolling = TRUE; - } - } - spi_loaded[spi_idx] = TRUE; - } - - *(BOOL *)pvParam = listbox_smoothscrolling; - + ret = get_user_pref_param( 0, 0x08, pvParam ); break; - WINE_SPI_FIXME(SPI_SETLISTBOXSMOOTHSCROLLING);/* 0x1007 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_SETLISTBOXSMOOTHSCROLLING: /* 0x1007 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = set_user_pref_param( 0, 0x08, (BOOL)pvParam, fWinIni ); + break; case SPI_GETGRADIENTCAPTIONS: ret = get_user_pref_param( 0, 0x10, pvParam );

1 0

Mike McCormack : user32: Implement SPI_[GS]ETUIEFFECTS.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 964509df9cc8a2888272d22cfcb4b372cc5fdf81 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=964509df9cc8a2888272d22… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 29 15:58:26 2006 +0900 user32: Implement SPI_[GS]ETUIEFFECTS. --- dlls/user/sysparams.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index bd1e99d..1ba3946 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -2227,8 +2227,15 @@ BOOL WINAPI SystemParametersInfoW( UINT WINE_SPI_FIXME(SPI_SETDROPSHADOW); /* 0x1025 _WIN32_WINNT >= 0x510 */ WINE_SPI_FIXME(SPI_GETBLOCKSENDINPUTRESETS); WINE_SPI_FIXME(SPI_SETBLOCKSENDINPUTRESETS); - WINE_SPI_FIXME(SPI_GETUIEFFECTS); - WINE_SPI_FIXME(SPI_SETUIEFFECTS); + case SPI_GETUIEFFECTS: + ret = get_user_pref_param( 3, 0x80, pvParam ); + break; + + case SPI_SETUIEFFECTS: + /* FIXME: this probably should mask other UI effect values when unset */ + ret = set_user_pref_param( 3, 0x80, (BOOL)pvParam, fWinIni ); + break; + WINE_SPI_FIXME(SPI_GETFOREGROUNDLOCKTIMEOUT);/* 0x2000 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETFOREGROUNDLOCKTIMEOUT);/* 0x2001 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_GETACTIVEWNDTRKTIMEOUT); /* 0x2002 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */

1 0

Mike McCormack : user32: Implement SPI_[GS]ETTOOLTIPANIMATION and SPI_[GS] ETTOOLTIPFADE.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: fc9d36e4b77cdf2950d1a11957386767f5e78581 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc9d36e4b77cdf2950d1a11… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 29 15:58:06 2006 +0900 user32: Implement SPI_[GS]ETTOOLTIPANIMATION and SPI_[GS]ETTOOLTIPFADE. --- dlls/user/sysparams.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index f97bbfb..bd1e99d 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -2185,10 +2185,22 @@ BOOL WINAPI SystemParametersInfoW( UINT ret = set_user_pref_param( 1, 0x04, (BOOL)pvParam, fWinIni ); break; - WINE_SPI_FIXME(SPI_GETTOOLTIPANIMATION); /* 0x1016 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETTOOLTIPANIMATION); /* 0x1017 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_GETTOOLTIPFADE); /* 0x1018 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETTOOLTIPFADE); /* 0x1019 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_GETTOOLTIPANIMATION: /* 0x1016 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = get_user_pref_param( 1, 0x08, pvParam ); + break; + + case SPI_SETTOOLTIPANIMATION: /* 0x1017 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = set_user_pref_param( 1, 0x08, (BOOL)pvParam, fWinIni ); + break; + + case SPI_GETTOOLTIPFADE: /* 0x1018 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = get_user_pref_param( 1, 0x10, pvParam ); + break; + + case SPI_SETTOOLTIPFADE: /* 0x1019 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = set_user_pref_param( 1, 0x10, (BOOL)pvParam, fWinIni ); + break; + case SPI_GETCURSORSHADOW: /* 0x101A _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ ret = get_user_pref_param( 1, 0x20, pvParam ); break;

1 0

Mike McCormack : user32: Implement SPI_[GS]ETMENUANIMATION and SPI_[GS] ETSELECTIONFADE.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 9d044542685a7d93fc6671b1489af889fd7ba194 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9d044542685a7d93fc6671b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 29 15:57:34 2006 +0900 user32: Implement SPI_[GS]ETMENUANIMATION and SPI_[GS]ETSELECTIONFADE. --- dlls/user/sysparams.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index 48359d5..f97bbfb 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -2108,8 +2108,14 @@ BOOL WINAPI SystemParametersInfoW( UINT WINE_SPI_FIXME(SPI_GETACTIVEWINDOWTRACKING);/* 0x1000 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETACTIVEWINDOWTRACKING);/* 0x1001 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_GETMENUANIMATION); /* 0x1002 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETMENUANIMATION); /* 0x1003 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_GETMENUANIMATION: /* 0x1002 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = get_user_pref_param( 0, 0x02, pvParam ); + break; + + case SPI_SETMENUANIMATION: /* 0x1003 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = set_user_pref_param( 0, 0x02, (BOOL)pvParam, fWinIni ); + break; + case SPI_GETCOMBOBOXANIMATION: /* 0x1004 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ ret = get_user_pref_param( 0, 0x04, pvParam ); break; @@ -2171,8 +2177,14 @@ BOOL WINAPI SystemParametersInfoW( UINT WINE_SPI_FIXME(SPI_GETMENUFADE); /* 0x1012 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETMENUFADE); /* 0x1013 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_GETSELECTIONFADE); /* 0x1014 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETSELECTIONFADE); /* 0x1015 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_GETSELECTIONFADE: /* 0x1014 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = get_user_pref_param( 1, 0x04, pvParam ); + break; + + case SPI_SETSELECTIONFADE: /* 0x1015 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = set_user_pref_param( 1, 0x04, (BOOL)pvParam, fWinIni ); + break; + WINE_SPI_FIXME(SPI_GETTOOLTIPANIMATION); /* 0x1016 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETTOOLTIPANIMATION); /* 0x1017 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_GETTOOLTIPFADE); /* 0x1018 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */

1 0

Mike McCormack : user32: Implement SystemParametersInfo(SPI_[SG] ETCURSORSHADOW).
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 9786252186158260c524c56fe614705f12dda163 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9786252186158260c524c56… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 29 15:56:30 2006 +0900 user32: Implement SystemParametersInfo(SPI_[SG]ETCURSORSHADOW). --- dlls/user/sysparams.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index 6401c88..48359d5 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -2177,8 +2177,14 @@ BOOL WINAPI SystemParametersInfoW( UINT WINE_SPI_FIXME(SPI_SETTOOLTIPANIMATION); /* 0x1017 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_GETTOOLTIPFADE); /* 0x1018 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETTOOLTIPFADE); /* 0x1019 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_GETCURSORSHADOW); /* 0x101A _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETCURSORSHADOW); /* 0x101B _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_GETCURSORSHADOW: /* 0x101A _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = get_user_pref_param( 1, 0x20, pvParam ); + break; + + case SPI_SETCURSORSHADOW: /* 0x101B _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = set_user_pref_param( 1, 0x20, (BOOL)pvParam, fWinIni ); + break; + WINE_SPI_FIXME(SPI_GETMOUSESONAR); /* 0x101C _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ WINE_SPI_FIXME(SPI_SETMOUSESONAR); /* 0x101D _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ WINE_SPI_FIXME(SPI_GETMOUSECLICKLOCK); /* 0x101E _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/

1 0

Mike McCormack : user32: Implement SystemParametersInfo(SPI_[GS] ETCOMBOBOXANIMATION).
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: 3244096d2e14b655925d6c48f16c4700c4c48b64 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3244096d2e14b655925d6c4… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 29 15:56:09 2006 +0900 user32: Implement SystemParametersInfo(SPI_[GS]ETCOMBOBOXANIMATION). --- dlls/user/sysparams.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index b17ee66..6401c88 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -2110,8 +2110,13 @@ BOOL WINAPI SystemParametersInfoW( UINT WINE_SPI_FIXME(SPI_SETACTIVEWINDOWTRACKING);/* 0x1001 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_GETMENUANIMATION); /* 0x1002 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETMENUANIMATION); /* 0x1003 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_GETCOMBOBOXANIMATION); /* 0x1004 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETCOMBOBOXANIMATION); /* 0x1005 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_GETCOMBOBOXANIMATION: /* 0x1004 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = get_user_pref_param( 0, 0x04, pvParam ); + break; + + case SPI_SETCOMBOBOXANIMATION: /* 0x1005 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = set_user_pref_param( 0, 0x04, (BOOL)pvParam, fWinIni ); + break; case SPI_GETLISTBOXSMOOTHSCROLLING: /* 0x1006 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ if (!pvParam) return FALSE;

1 0

Mike McCormack : user32: Implement SPI_[SG]ETCARETWIDTH.
by Alexandre Julliard 29 Mar '06

29 Mar '06

Module: wine Branch: refs/heads/master Commit: cd37125f7aaa4ae45f2f334a5b60901ae652b7e4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cd37125f7aaa4ae45f2f334… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Mar 29 15:55:39 2006 +0900 user32: Implement SPI_[SG]ETCARETWIDTH. --- dlls/user/sysparams.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index 769edd7..b17ee66 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -77,6 +77,7 @@ enum spi_index SPI_USERPREFERENCEMASK_IDX, SPI_NONCLIENTMETRICS_IDX, SPI_MINIMIZEDMETRICS_IDX, + SPI_CARETWIDTH_IDX, SPI_INDEX_COUNT }; @@ -207,6 +208,8 @@ static const WCHAR SPI_SETMOUSESCROLLLIN static const WCHAR SPI_SETMOUSESCROLLLINES_VALNAME[]= {'W','h','e','e','l','S','c','r','o','l','l','L','i','n','e','s',0}; static const WCHAR SPI_SETMENUSHOWDELAY_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; static const WCHAR SPI_SETMENUSHOWDELAY_VALNAME[]= {'M','e','n','u','S','h','o','w','D','e','l','a','y',0}; +static const WCHAR SPI_CARETWIDTH_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; +static const WCHAR SPI_CARETWIDTH_VALNAME[]= {'C','a','r','e','t','W','i','d','t','h',0}; /* FIXME - real values */ static const WCHAR SPI_SETSCREENSAVERRUNNING_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; @@ -296,6 +299,7 @@ static BOOL poweroffactive = FALSE; static BOOL show_sounds = FALSE; static BOOL swap_buttons = FALSE; static BOOL listbox_smoothscrolling = FALSE; +static UINT caret_width = 1; static BYTE user_prefs[4]; static MINIMIZEDMETRICS minimized_metrics = @@ -2196,8 +2200,20 @@ BOOL WINAPI SystemParametersInfoW( UINT WINE_SPI_FIXME(SPI_SETACTIVEWNDTRKTIMEOUT); /* 0x2003 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_GETFOREGROUNDFLASHCOUNT);/* 0x2004 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETFOREGROUNDFLASHCOUNT);/* 0x2005 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_GETCARETWIDTH); /* 0x2006 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ - WINE_SPI_FIXME(SPI_SETCARETWIDTH); /* 0x2007 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + case SPI_GETCARETWIDTH: /* 0x2006 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = get_uint_param( SPI_CARETWIDTH_IDX, + SPI_CARETWIDTH_REGKEY, + SPI_CARETWIDTH_VALNAME, + &caret_width, pvParam ); + break; + + case SPI_SETCARETWIDTH: /* 0x2007 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ + ret = set_uint_param( SPI_CARETWIDTH_IDX, + SPI_CARETWIDTH_REGKEY, + SPI_CARETWIDTH_VALNAME, + &caret_width, uiParam, fWinIni ); + break; + WINE_SPI_FIXME(SPI_GETMOUSECLICKLOCKTIME); /* 0x2008 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETMOUSECLICKLOCKTIME); /* 0x2009 _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_GETFONTSMOOTHINGTYPE); /* 0x200A _WIN32_WINNT >= 0x500 || _WIN32_WINDOW > 0x400 */

1 0

Alexandre Julliard : mshtml: Don' t free the URL we have just stored in the callback object.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 31332b3cd6d1c8fb0e11cbb2ff7d00a223468a8f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=31332b3cd6d1c8fb0e11cbb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 28 20:00:18 2006 +0200 mshtml: Don't free the URL we have just stored in the callback object. --- dlls/mshtml/persist.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 9496ceb..270f249 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -465,7 +465,6 @@ static HRESULT WINAPI PersistMoniker_Loa IBinding_Abort(This->status_callback->binding); callback = This->status_callback = BindStatusCallback_Create(This, url); - CoTaskMemFree(url); if(pibc) { pbind = pibc;

1 0

Alexandre Julliard : x11drv: Only warp the mouse pointer if it has actually moved.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: bc15e1bc8195737e0f9ddc741cf4d9e79f500c55 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bc15e1bc8195737e0f9ddc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 28 18:18:01 2006 +0200 x11drv: Only warp the mouse pointer if it has actually moved. --- dlls/x11drv/mouse.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/x11drv/mouse.c b/dlls/x11drv/mouse.c index f2123c0..43b0fb4 100644 --- a/dlls/x11drv/mouse.c +++ b/dlls/x11drv/mouse.c @@ -289,7 +289,8 @@ void X11DRV_send_mouse_input( HWND hwnd, { queue_raw_mouse_message( WM_MOUSEMOVE, hwnd, pt.x, pt.y, data, time, extra_info, injected_flags ); - if (injected_flags & LLMHF_INJECTED) /* we have to actually move the cursor */ + if ((injected_flags & LLMHF_INJECTED) && + ((flags & MOUSEEVENTF_ABSOLUTE) || x || y)) /* we have to actually move the cursor */ { TRACE( "warping to (%ld,%ld)\n", pt.x, pt.y ); wine_tsx11_lock();

1 0

H. Verbeet : d3d8: Add a TRACE for IDirect3DDevice8Impl_CreateVertexBuffer.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 1e421c7da9f85e44c37afce6560c0d63429463f6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1e421c7da9f85e44c37afce… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sun Mar 26 04:19:00 2006 +0200 d3d8: Add a TRACE for IDirect3DDevice8Impl_CreateVertexBuffer. --- dlls/d3d8/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2173d04..e784634 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -398,6 +398,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Crea IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hrc = D3D_OK; + TRACE("(%p) Relay\n", This); /* Allocate the storage for the device */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DVertexBuffer8Impl)); if (NULL == object) {

1 0

Stefan Dösinger : wined3d: Use WINED3DSWAPEFFECT in the wined3d headers and code.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: 1d47556195ecea5dc1456597be5fb88bb2fbc9b1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1d47556195ecea5dc145659… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Mar 28 12:47:36 2006 +0200 wined3d: Use WINED3DSWAPEFFECT in the wined3d headers and code. --- dlls/d3d8/device.c | 4 ++-- dlls/d3d8/directx.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/d3d9/swapchain.c | 4 ++-- dlls/wined3d/swapchain.c | 2 +- include/wine/wined3d_types.h | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5f3ceb4..2173d04 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -197,7 +197,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Crea localParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; localParameters.MultiSampleQuality = NULL; /* d3d9 only */ - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; @@ -230,7 +230,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Rese localParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; localParameters.MultiSampleQuality = NULL; /* D3d9 only */ - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index addfb8b..8241538 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -314,7 +314,7 @@ HRESULT WINAPI IDirect3D8Impl_CreateDe localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; /* d3d9 only */ localParameters.MultiSampleQuality = NULL; - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 32880fa..c5eb0ea 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -172,7 +172,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Re localParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; localParameters.MultiSampleQuality = &pPresentationParameters->MultiSampleQuality; - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 62246fc..86389a9 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -298,7 +298,7 @@ HRESULT WINAPI IDirect3D9Impl_CreateDe localParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; localParameters.MultiSampleQuality = &pPresentationParameters->MultiSampleQuality; - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *) &pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 83ea7c2..c058720 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -128,7 +128,7 @@ HRESULT WINAPI IDirect3DSwapChain9Impl_G winePresentParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; winePresentParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; winePresentParameters.MultiSampleQuality = &pPresentationParameters->MultiSampleQuality; - winePresentParameters.SwapEffect = &pPresentationParameters->SwapEffect; + winePresentParameters.SwapEffect = (WINED3DSWAPEFFECT *)&pPresentationParameters->SwapEffect; winePresentParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; winePresentParameters.Windowed = &pPresentationParameters->Windowed; winePresentParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; @@ -178,7 +178,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Cr localParameters.BackBufferCount = &pPresentationParameters->BackBufferCount; localParameters.MultiSampleType = (WINED3DMULTISAMPLE_TYPE *) &pPresentationParameters->MultiSampleType; localParameters.MultiSampleQuality = &pPresentationParameters->MultiSampleQuality; - localParameters.SwapEffect = &pPresentationParameters->SwapEffect; + localParameters.SwapEffect = (WINED3DSWAPEFFECT *)&pPresentationParameters->SwapEffect; localParameters.hDeviceWindow = &pPresentationParameters->hDeviceWindow; localParameters.Windowed = &pPresentationParameters->Windowed; localParameters.EnableAutoDepthStencil = &pPresentationParameters->EnableAutoDepthStencil; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 05dee94..e417eba 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -314,7 +314,7 @@ HRESULT WINAPI IWineD3DSwapChainImpl_Pre LEAVE_GL(); /* Although this is not strictly required, a simple demo showed this does occur on (at least non-debug) d3d */ - if (This->presentParms.SwapEffect & D3DSWAPEFFECT_DISCARD) { + if (This->presentParms.SwapEffect & WINED3DSWAPEFFECT_DISCARD) { TRACE("Clearing\n"); diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 08e68ba..5ecc645 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -479,7 +479,7 @@ typedef struct _WINED3DPRESENT_PARAMETER UINT *BackBufferCount; WINED3DMULTISAMPLE_TYPE *MultiSampleType; DWORD *MultiSampleQuality; - D3DSWAPEFFECT *SwapEffect; + WINED3DSWAPEFFECT *SwapEffect; HWND *hDeviceWindow; BOOL *Windowed; BOOL *EnableAutoDepthStencil;

1 0

Stefan Dösinger : wined3d: Add WINED3DPOOL to wined3d_types.h.
by Alexandre Julliard 28 Mar '06

28 Mar '06

Module: wine Branch: refs/heads/master Commit: d75fd75d4801ec5abe08a09ea3ffd3bc6b12911c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d75fd75d4801ec5abe08a09… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Mar 28 14:20:47 2006 +0200 wined3d: Add WINED3DPOOL to wined3d_types.h. --- dlls/d3d8/cubetexture.c | 2 + dlls/d3d8/d3d8_private.h | 4 +-- dlls/d3d8/device.c | 16 ++++++----- dlls/d3d8/surface.c | 2 + dlls/d3d8/texture.c | 2 + dlls/d3d8/volume.c | 4 +-- dlls/d3d8/volumetexture.c | 2 + dlls/d3d9/cubetexture.c | 4 +-- dlls/d3d9/d3d9_private.h | 4 +-- dlls/d3d9/device.c | 10 ++++--- dlls/d3d9/indexbuffer.c | 2 + dlls/d3d9/surface.c | 2 + dlls/d3d9/texture.c | 4 +-- dlls/d3d9/vertexbuffer.c | 2 + dlls/d3d9/volume.c | 4 +-- dlls/d3d9/volumetexture.c | 4 +-- dlls/wined3d/basetexture.c | 6 ++-- dlls/wined3d/device.c | 54 +++++++++++++++++++------------------- dlls/wined3d/resource.c | 2 + dlls/wined3d/surface.c | 6 ++-- dlls/wined3d/utils.c | 12 ++++---- dlls/wined3d/wined3d_private.h | 4 +-- include/wine/wined3d_interface.h | 18 ++++++------- include/wine/wined3d_types.h | 17 +++++++++--- 24 files changed, 98 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=d75fd75d4801ec5abe0…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2006