diff --git a/configure b/configure index d25d2a63780..5e222a01279 100755 --- a/configure +++ b/configure @@ -20031,7 +20031,7 @@ MAKE_LIB_RULES=libs/Makelib.rules MAKE_PROG_RULES=programs/Makeprog.rules - ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/amstream/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/msi/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvidc32/Makefile dlls/msvideo/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/secur32/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/vdhcp.vxd/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" + ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules libs/Makelib.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/amstream/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/ctl3d/Makefile dlls/d3d8/Makefile dlls/d3d9/Makefile dlls/d3dim/Makefile dlls/d3dx8/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/mshtml/Makefile dlls/msi/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvidc32/Makefile dlls/msvideo/Makefile dlls/mswsock/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/secur32/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/tests/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/winspool/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/unicode/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile" cat >confcache <<\_ACEOF @@ -20698,6 +20698,7 @@ do "dlls/uuid/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/uuid/Makefile" ;; "dlls/uxtheme/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/uxtheme/Makefile" ;; "dlls/vdhcp.vxd/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/vdhcp.vxd/Makefile" ;; + "dlls/vdmdbg/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/vdmdbg/Makefile" ;; "dlls/version/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/version/Makefile" ;; "dlls/version/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/version/tests/Makefile" ;; "dlls/vmm.vxd/Makefile" ) CONFIG_FILES="$CONFIG_FILES dlls/vmm.vxd/Makefile" ;; diff --git a/configure.ac b/configure.ac index 5cbdf928005..acd0c0b7371 100644 --- a/configure.ac +++ b/configure.ac @@ -1623,6 +1623,7 @@ dlls/user/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/vdhcp.vxd/Makefile +dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 87897d04b18..b2109894044 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -118,6 +118,7 @@ BASEDIRS = \ user \ uxtheme \ vdhcp.vxd \ + vdmdbg \ version \ vmm.vxd \ vnbt.vxd \ @@ -342,6 +343,7 @@ SYMLINKS_SO = \ user32.dll.so \ uxtheme.dll.so \ vdhcp.vxd.so \ + vdmdbg.dll.so \ version.dll.so \ vmm.vxd.so \ vnbt.vxd.so \ @@ -786,6 +788,9 @@ uxtheme.dll.so: uxtheme/uxtheme.dll.so vdhcp.vxd.so: vdhcp.vxd/vdhcp.vxd.so $(RM) $@ && $(LN_S) vdhcp.vxd/vdhcp.vxd.so $@ +vdmdbg.dll.so: vdmdbg/vdmdbg.dll.so + $(RM) $@ && $(LN_S) vdmdbg/vdmdbg.dll.so $@ + version.dll.so: version/version.dll.so $(RM) $@ && $(LN_S) version/version.dll.so $@ @@ -1013,6 +1018,7 @@ IMPORT_LIBS = \ liburlmon \ libuser32 \ libuxtheme \ + libvdmdbg \ libversion \ libw32skrnl \ libwined3d \ @@ -1539,6 +1545,11 @@ libuxtheme.def: uxtheme/uxtheme.spec.def libuxtheme.a: uxtheme/uxtheme.spec.def $(DLLTOOL) -k -l $@ -d uxtheme/uxtheme.spec.def +libvdmdbg.def: vdmdbg/vdmdbg.spec.def + $(RM) $@ && $(LN_S) vdmdbg/vdmdbg.spec.def $@ +libvdmdbg.a: vdmdbg/vdmdbg.spec.def + $(DLLTOOL) -k -l $@ -d vdmdbg/vdmdbg.spec.def + libversion.def: version/version.spec.def $(RM) $@ && $(LN_S) version/version.spec.def $@ libversion.a: version/version.spec.def @@ -1719,6 +1730,7 @@ url/url.spec.def: $(WINEBUILD) urlmon/urlmon.spec.def: $(WINEBUILD) user/user32.spec.def: $(WINEBUILD) uxtheme/uxtheme.spec.def: $(WINEBUILD) +vdmdbg/vdmdbg.spec.def: $(WINEBUILD) version/version.spec.def: $(WINEBUILD) win32s/w32skrnl.spec.def: $(WINEBUILD) wined3d/wined3d.spec.def: $(WINEBUILD) @@ -1857,6 +1869,7 @@ urlmon/urlmon.dll.so: urlmon user/user32.dll.so: user 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 diff --git a/dlls/user/misc.c b/dlls/user/misc.c index 4c5c5b74b33..42f9a3c3d1d 100644 --- a/dlls/user/misc.c +++ b/dlls/user/misc.c @@ -220,6 +220,26 @@ BOOL WINAPI EnumDesktopsW( HWINSTA hwinsta, DESKTOPENUMPROCW lpEnumFunc, return FALSE; } +/****************************************************************************** + * EnumWindowStationsA [USER32.@] + */ +BOOL WINAPI EnumWindowStationsA( WINSTAENUMPROCA lpEnumFunc, LPARAM lParam) +{ + FIXME("%p,%lx): stub\n",lpEnumFunc,lParam); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/****************************************************************************** + * EnumWindowStationsW [USER32.@] + */ +BOOL WINAPI EnumWindowStationsW( WINSTAENUMPROCW lpEnumFunc, LPARAM lParam) +{ + FIXME("%p,%lx): stub\n",lpEnumFunc,lParam); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + /****************************************************************************** * SetUserObjectInformationA (USER32.@) */ diff --git a/dlls/user/resource.c b/dlls/user/resource.c index 8e8150a1bf0..61860f21d15 100644 --- a/dlls/user/resource.c +++ b/dlls/user/resource.c @@ -438,3 +438,13 @@ INT WINAPI LoadStringA( HINSTANCE instance, UINT resource_id, return retval; } + +/********************************************************************** + * GetGuiResources (USER32.@) + */ +DWORD WINAPI GetGuiResources( HANDLE hProcess, DWORD uiFlags ) +{ + FIXME("(%p,%lx): stub\n",hProcess,uiFlags); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return 0; +} diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec index dee3969f89b..15b1547f8e0 100644 --- a/dlls/user/user32.spec +++ b/dlls/user/user32.spec @@ -193,8 +193,8 @@ @ stdcall EnumPropsExW(long ptr long) @ stdcall EnumPropsW(long ptr) @ stdcall EnumThreadWindows(long ptr long) -@ stub EnumWindowStationsA -@ stub EnumWindowStationsW +@ stdcall EnumWindowStationsA(ptr long) +@ stdcall EnumWindowStationsW(ptr long) @ stdcall EnumWindows(ptr long) @ stdcall EqualRect(ptr ptr) @ stdcall ExcludeUpdateRgn(long long) @@ -247,7 +247,7 @@ @ stdcall GetFocus() @ stdcall GetForegroundWindow() @ stdcall GetGUIThreadInfo(long ptr) -# @ stub GetGuiResources +@ stdcall GetGuiResources(long long) @ stdcall GetIconInfo(long ptr) @ stub GetInputDesktop @ stdcall GetInputState() @@ -402,6 +402,7 @@ @ stdcall LoadStringW(long long ptr long) @ stub LockWindowStation @ stdcall LockWindowUpdate(long) +@ stub LockWorkStation @ stdcall LookupIconIdFromDirectory(ptr long) @ stdcall LookupIconIdFromDirectoryEx(ptr long long long long) @ stub MBToWCSEx diff --git a/dlls/vdmdbg/.cvsignore b/dlls/vdmdbg/.cvsignore new file mode 100644 index 00000000000..afb30cfb1e9 --- /dev/null +++ b/dlls/vdmdbg/.cvsignore @@ -0,0 +1,3 @@ +Makefile +vdmdbg.dll.dbg.c +vdmdbg.spec.def diff --git a/dlls/vdmdbg/Makefile.in b/dlls/vdmdbg/Makefile.in new file mode 100644 index 00000000000..4248e902834 --- /dev/null +++ b/dlls/vdmdbg/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = vdmdbg.dll +IMPORTS = kernel32 + +C_SRCS = \ + vdmdbg.c + +@MAKE_DLL_RULES@ + +### Dependencies: diff --git a/dlls/vdmdbg/vdmdbg.c b/dlls/vdmdbg/vdmdbg.c new file mode 100644 index 00000000000..67a01ed518c --- /dev/null +++ b/dlls/vdmdbg/vdmdbg.c @@ -0,0 +1 @@ +/* nothing here yet */ diff --git a/dlls/vdmdbg/vdmdbg.spec b/dlls/vdmdbg/vdmdbg.spec new file mode 100644 index 00000000000..d129a05448d --- /dev/null +++ b/dlls/vdmdbg/vdmdbg.spec @@ -0,0 +1,21 @@ +# vdmdbg.dll - VDM debugging support library + +@ stub VDMBreakThread +@ stub VDMDetectWOW +@ stub VDMEnumProcessWOW +@ stub VDMEnumTaskWOW +@ stub VDMEnumTaskWOWEx +@ stub VDMGetModuleSelector +@ stub VDMGetPointer +@ stub VDMGetSelectorModule +@ stub VDMGetThreadContext +@ stub VDMGetThreadSelectorEntry +@ stub VDMGlobalFirst +@ stub VDMGlobalNext +@ stub VDMKillWOW +@ stub VDMModuleFirst +@ stub VDMModuleNext +@ stub VDMProcessException +@ stub VDMSetThreadContext +@ stub VDMStartTaskInWOW +@ stub VDMTerminateTaskWOW