Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 50662: try to fix build
by tkreuzer＠svn.reactos.org 11 Feb '11

11 Feb '11

Author: tkreuzer Date: Fri Feb 11 18:05:48 2011 New Revision: 50662 URL: http://svn.reactos.org/svn/reactos?rev=50662&view=rev Log: try to fix build Modified: trunk/reactos/dll/directx/msdmo/stubs.c trunk/reactos/dll/win32/atl/stubs.c trunk/reactos/dll/win32/cabinet/stubs.c trunk/reactos/dll/win32/cryptdll/stubs.c trunk/reactos/dll/win32/loadperf/stubs.c Modified: trunk/reactos/dll/directx/msdmo/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/stubs.c?… ============================================================================== --- trunk/reactos/dll/directx/msdmo/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdmo/stubs.c [iso-8859-1] Fri Feb 11 18:05:48 2011 @@ -1,7 +1,7 @@ #include <windows.h> #define NDEBUG -#include <debug.h> +#include <reactos/debug.h> void WINAPI Modified: trunk/reactos/dll/win32/atl/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/stubs.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/atl/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/stubs.c [iso-8859-1] Fri Feb 11 18:05:48 2011 @@ -1,5 +1,5 @@ #include <windows.h> -#include <debug.h> +#include <reactos/debug.h> #define ATLAPI_(x) x WINAPI #define ATLAPI ATLAPI_(HRESULT) @@ -31,7 +31,7 @@ return E_NOTIMPL; } -ATLAPI_(LPDEVMODEA) +ATLAPI_(LPDEVMODEA) AtlDevModeW2A(LPDEVMODEA lpDevModeA, LPDEVMODEW lpDevModeW) { UNIMPLEMENTED; Modified: trunk/reactos/dll/win32/cabinet/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/cabinet/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/stubs.c [iso-8859-1] Fri Feb 11 18:05:48 2011 @@ -1,5 +1,5 @@ #include <windows.h> -#include <debug.h> +#include <reactos/debug.h> typedef PVOID PSESSION; Modified: trunk/reactos/dll/win32/cryptdll/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdll/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/cryptdll/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdll/stubs.c [iso-8859-1] Fri Feb 11 18:05:48 2011 @@ -1,7 +1,7 @@ #include <windows.h> #define NDEBUG -#include <debug.h> +#include <reactos/debug.h> void WINAPI CDBuildIntegrityVect(DWORD Unknown1, DWORD Unknown2) Modified: trunk/reactos/dll/win32/loadperf/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/loadperf/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/loadperf/stubs.c [iso-8859-1] Fri Feb 11 18:05:48 2011 @@ -1,7 +1,7 @@ #include <windows.h> #define NDEBUG -#include <debug.h> +#include <reactos/debug.h> #define LOADPERF_FUNCTION DWORD WINAPI

1 0

[tkreuzer] 50661: Add missing stubs.h
by tkreuzer＠svn.reactos.org 11 Feb '11

11 Feb '11

Author: tkreuzer Date: Fri Feb 11 17:41:05 2011 New Revision: 50661 URL: http://svn.reactos.org/svn/reactos?rev=50661&view=rev Log: Add missing stubs.h Added: trunk/reactos/include/reactos/stubs.h (with props) Added: trunk/reactos/include/reactos/stubs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/stubs.h?re… ============================================================================== --- trunk/reactos/include/reactos/stubs.h (added) +++ trunk/reactos/include/reactos/stubs.h [iso-8859-1] Fri Feb 11 17:41:05 2011 @@ -1,0 +1,16 @@ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wine/config.h" +#include "wine/exception.h" + +#include <reactos/debug.h> + +#define __wine_spec_unimplemented_stub(module, function) \ +{ \ + ULONG_PTR args[2]; \ + args[0] = (ULONG_PTR)module; \ + args[1] = (ULONG_PTR)function; \ + RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); \ +} Propchange: trunk/reactos/include/reactos/stubs.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 50660: [NTOSKRNL] Fix compilation of zw.S with MSVC
by tkreuzer＠svn.reactos.org 11 Feb '11

11 Feb '11

Author: tkreuzer Date: Fri Feb 11 17:39:07 2011 New Revision: 50660 URL: http://svn.reactos.org/svn/reactos?rev=50660&view=rev Log: [NTOSKRNL] Fix compilation of zw.S with MSVC Modified: branches/cmake-bringup/ntoskrnl/ex/zw.S Modified: branches/cmake-bringup/ntoskrnl/ex/zw.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ex/zw.S?… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ex/zw.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ex/zw.S [iso-8859-1] Fri Feb 11 17:39:07 2011 @@ -1,6 +1,8 @@ #include <asm.inc> #include <syscalls.inc> + +EXTERN _KiSystemService .code

1 0

[tkreuzer] 50659: add stub files to build
by tkreuzer＠svn.reactos.org 11 Feb '11

11 Feb '11

Author: tkreuzer Date: Fri Feb 11 17:27:43 2011 New Revision: 50659 URL: http://svn.reactos.org/svn/reactos?rev=50659&view=rev Log: add stub files to build Modified: trunk/reactos/dll/directx/msdmo/msdmo.rbuild trunk/reactos/dll/win32/activeds/activeds.rbuild trunk/reactos/dll/win32/atl/atl.rbuild trunk/reactos/dll/win32/browseui/browseui.rbuild trunk/reactos/dll/win32/cabinet/cabinet.rbuild trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/cryptdll/cryptdll.rbuild trunk/reactos/dll/win32/loadperf/loadperf.rbuild trunk/reactos/dll/win32/mapi32/mapi32.rbuild trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild trunk/reactos/dll/win32/secur32/secur32.rbuild Modified: trunk/reactos/dll/directx/msdmo/msdmo.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/msdmo.rb… ============================================================================== --- trunk/reactos/dll/directx/msdmo/msdmo.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdmo/msdmo.rbuild [iso-8859-1] Fri Feb 11 17:27:43 2011 @@ -5,6 +5,7 @@ <define name="__WINESRC__" /> <file>dmoreg.c</file> <file>dmort.c</file> + <file>stubs.c</file> <file>rsrc.rc</file> <library>wine</library> <library>uuid</library> Modified: trunk/reactos/dll/win32/activeds/activeds.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/activeds/actived… ============================================================================== --- trunk/reactos/dll/win32/activeds/activeds.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/activeds/activeds.rbuild [iso-8859-1] Fri Feb 11 17:27:43 2011 @@ -6,5 +6,6 @@ <define name="__WINESRC__" /> <library>wine</library> <file>activeds_main.c</file> + <file>stubs.c</file> </module> </group> Modified: trunk/reactos/dll/win32/atl/atl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/atl/atl.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl.rbuild [iso-8859-1] Fri Feb 11 17:27:43 2011 @@ -12,6 +12,7 @@ <file>atl_main.c</file> <file>registrar.c</file> <file>rsrc.rc</file> + <file>stubs.c</file> <include base="atl" root="intermediate">.</include> <library>wine</library> <library>uuid</library> Modified: trunk/reactos/dll/win32/browseui/browseui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.rbuild [iso-8859-1] Fri Feb 11 17:27:43 2011 @@ -43,5 +43,6 @@ <file>toolsband.cpp</file> <file>travellog.cpp</file> <file>utility.cpp</file> + <file>dllinstall.c</file> <file>browseui.rc</file> </module> Modified: trunk/reactos/dll/win32/cabinet/cabinet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/cabinet.rbuild [iso-8859-1] Fri Feb 11 17:27:43 2011 @@ -9,6 +9,7 @@ <file>cabinet_main.c</file> <file>fci.c</file> <file>fdi.c</file> + <file>stubs.c</file> <file>cabinet.rc</file> <library>wine</library> <library>ntdll</library> Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.rbuild [iso-8859-1] Fri Feb 11 17:27:43 2011 @@ -46,6 +46,7 @@ <file>trackbar.c</file> <file>treeview.c</file> <file>updown.c</file> + <file>stubs.c</file> <file>rsrc.rc</file> <library>uuid</library> <library>wine</library> Modified: trunk/reactos/dll/win32/cryptdll/cryptdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdll/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdll/cryptdll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdll/cryptdll.rbuild [iso-8859-1] Fri Feb 11 17:27:43 2011 @@ -9,4 +9,5 @@ <library>advapi32</library> <library>ntdll</library> <file>cryptdll.c</file> + <file>stubs.c</file> </module> Modified: trunk/reactos/dll/win32/loadperf/loadperf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/loadper… ============================================================================== --- trunk/reactos/dll/win32/loadperf/loadperf.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/loadperf/loadperf.rbuild [iso-8859-1] Fri Feb 11 17:27:43 2011 @@ -6,6 +6,7 @@ <include base="ReactOS">include/reactos/wine</include> <define name="__WINESRC__" /> <file>loadperf_main.c</file> + <file>stubs.c</file> <library>wine</library> <library>ntdll</library> </module> Modified: trunk/reactos/dll/win32/mapi32/mapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.rb… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/mapi32.rbuild [iso-8859-1] Fri Feb 11 17:27:43 2011 @@ -11,6 +11,7 @@ <file>prop.c</file> <file>sendmail.c</file> <file>util.c</file> + <file>stubs.c</file> <file>version.rc</file> <library>wine</library> <library>shlwapi</library> Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] Fri Feb 11 17:27:43 2011 @@ -21,5 +21,6 @@ <library>pseh</library> <pch>precomp.h</pch> <file>dllmain.c</file> + <file>stubs.c</file> <file>msvcrt.rc</file> </module> Modified: trunk/reactos/dll/win32/secur32/secur32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secur32.… ============================================================================== --- trunk/reactos/dll/win32/secur32/secur32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/secur32.rbuild [iso-8859-1] Fri Feb 11 17:27:43 2011 @@ -9,6 +9,7 @@ <file>dllmain.c</file> <file>secext.c</file> <file>sspi.c</file> + <file>stubs.c</file> <file>secur32.rc</file> <pch>precomp.h</pch> </module>

1 0

[akhaldi] 50658: [CMAKE] - Mark fastcall exports correctly, now that we have proper support in spec2def.
by akhaldi＠svn.reactos.org 11 Feb '11

11 Feb '11

Author: akhaldi Date: Fri Feb 11 17:07:01 2011 New Revision: 50658 URL: http://svn.reactos.org/svn/reactos?rev=50658&view=rev Log: [CMAKE] - Mark fastcall exports correctly, now that we have proper support in spec2def. Modified: branches/cmake-bringup/drivers/video/videoprt/videoprt.spec Modified: branches/cmake-bringup/drivers/video/videoprt/videoprt.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/vid… ============================================================================== --- branches/cmake-bringup/drivers/video/videoprt/videoprt.spec [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/videoprt/videoprt.spec [iso-8859-1] Fri Feb 11 17:07:01 2011 @@ -44,9 +44,9 @@ @ stdcall VideoPortGetVgaStatus(ptr ptr) @ stdcall VideoPortInitialize(ptr ptr ptr ptr) @ stdcall VideoPortInt10(ptr ptr) -@ stdcall -norelay VideoPortInterlockedDecrement(ptr) NTOSKRNL.InterlockedDecrement -@ stdcall -norelay VideoPortInterlockedExchange(ptr long) NTOSKRNL.InterlockedExchange -@ stdcall -norelay VideoPortInterlockedIncrement(ptr) NTOSKRNL.InterlockedIncrement +@ fastcall VideoPortInterlockedDecrement(ptr) NTOSKRNL.InterlockedDecrement +@ fastcall VideoPortInterlockedExchange(ptr long) NTOSKRNL.InterlockedExchange +@ fastcall VideoPortInterlockedIncrement(ptr) NTOSKRNL.InterlockedIncrement @ stdcall VideoPortIsNoVesa() @ stdcall VideoPortLockBuffer(ptr ptr long long) @ stdcall VideoPortLockPages(ptr ptr ptr ptr long)

1 0

[tkreuzer] 50657: merge most spec file changes from cmake branch
by tkreuzer＠svn.reactos.org 11 Feb '11

11 Feb '11

Author: tkreuzer Date: Fri Feb 11 17:01:40 2011 New Revision: 50657 URL: http://svn.reactos.org/svn/reactos?rev=50657&view=rev Log: merge most spec file changes from cmake branch Added: trunk/reactos/dll/directx/msdmo/stubs.c (with props) trunk/reactos/dll/win32/activeds/stubs.c (with props) trunk/reactos/dll/win32/atl/stubs.c (with props) trunk/reactos/dll/win32/browseui/dllinstall.c (with props) trunk/reactos/dll/win32/cabinet/stubs.c (with props) trunk/reactos/dll/win32/comctl32/stubs.c (with props) trunk/reactos/dll/win32/cryptdll/stubs.c (with props) trunk/reactos/dll/win32/loadperf/stubs.c (with props) trunk/reactos/dll/win32/mapi32/stubs.c (with props) trunk/reactos/dll/win32/msvcrt/stubs.c (with props) trunk/reactos/dll/win32/secur32/stubs.c (with props) Modified: trunk/reactos/dll/directx/msdmo/msdmo.spec trunk/reactos/dll/directx/quartz/quartz.spec trunk/reactos/dll/win32/activeds/activeds.spec trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/atl/atl.spec trunk/reactos/dll/win32/browseui/browseui.spec trunk/reactos/dll/win32/cabinet/cabinet.spec trunk/reactos/dll/win32/comctl32/comctl32.spec trunk/reactos/dll/win32/cryptdll/cryptdll.spec trunk/reactos/dll/win32/dnsapi/dnsapi.spec trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c trunk/reactos/dll/win32/gdi32/gdi32.spec trunk/reactos/dll/win32/hid/hid.spec trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec trunk/reactos/dll/win32/loadperf/loadperf.spec trunk/reactos/dll/win32/mapi32/mapi32.spec trunk/reactos/dll/win32/mpr/mpr.spec trunk/reactos/dll/win32/msvcrt/msvcrt.spec trunk/reactos/dll/win32/msxml3/msxml3.spec trunk/reactos/dll/win32/secur32/secur32.spec trunk/reactos/dll/win32/security/security.spec trunk/reactos/dll/win32/shdocvw/shdocvw.spec trunk/reactos/dll/win32/shlwapi/shlwapi.spec trunk/reactos/dll/win32/tapi32/tapi32.spec trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/winmm/winmm.spec trunk/reactos/dll/win32/ws2_32/ws2_32.spec Modified: trunk/reactos/dll/directx/msdmo/msdmo.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/msdmo.sp… ============================================================================== --- trunk/reactos/dll/directx/msdmo/msdmo.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdmo/msdmo.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,11 +1,11 @@ @ stdcall DMOEnum(ptr long long ptr long ptr ptr) @ stdcall DMOGetName(ptr wstr) @ stdcall DMOGetTypes(ptr long ptr ptr long ptr ptr) -@ stub DMOGuidToStrA -@ stub DMOGuidToStrW +@ stdcall DMOGuidToStrA(long long) +@ stdcall DMOGuidToStrW(long long) @ stdcall DMORegister(wstr ptr ptr long long ptr long ptr) -@ stub DMOStrToGuidA -@ stub DMOStrToGuidW +@ stdcall DMOStrToGuidA(long long) +@ stdcall DMOStrToGuidW(long long) @ stdcall DMOUnregister(ptr ptr) @ stdcall MoCopyMediaType(ptr ptr) @ stdcall MoCreateMediaType(ptr long) Added: trunk/reactos/dll/directx/msdmo/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/stubs.c?… ============================================================================== --- trunk/reactos/dll/directx/msdmo/stubs.c (added) +++ trunk/reactos/dll/directx/msdmo/stubs.c [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,0 +1,32 @@ + +#include <windows.h> +#define NDEBUG +#include <debug.h> + +void +WINAPI +DMOGuidToStrA(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void +WINAPI +DMOGuidToStrW(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void +WINAPI +DMOStrToGuidA(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void +WINAPI +DMOStrToGuidW(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} Propchange: trunk/reactos/dll/directx/msdmo/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/quartz/quartz.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz.… ============================================================================== --- trunk/reactos/dll/directx/quartz/quartz.spec [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/quartz.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -6,4 +6,5 @@ @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() -@ stub GetProxyDllInfo +@ stdcall GetProxyDllInfo(ptr ptr) + Modified: trunk/reactos/dll/win32/activeds/activeds.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/activeds/actived… ============================================================================== --- trunk/reactos/dll/win32/activeds/activeds.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/activeds/activeds.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,28 +1,28 @@ 3 stdcall ADsGetObject(wstr ptr ptr) 4 stdcall ADsBuildEnumerator(ptr ptr) -5 stub ADsFreeEnumerator +5 stdcall ADsFreeEnumerator(ptr) 6 stdcall ADsEnumerateNext(ptr long ptr ptr) -7 stub ADsBuildVarArrayStr -8 stub ADsBuildVarArrayInt +7 stdcall ADsBuildVarArrayStr(ptr long ptr) +8 stdcall ADsBuildVarArrayInt(ptr long ptr) 9 stdcall ADsOpenObject(wstr wstr wstr long ptr ptr) -12 stub ADsSetLastError +12 stdcall ADsSetLastError(long str str) 13 stdcall ADsGetLastError(ptr ptr long ptr long) -14 stub AllocADsMem +14 stdcall AllocADsMem(long) 15 stdcall FreeADsMem(ptr) -16 stub ReallocADsMem -17 stub AllocADsStr -18 stub FreeADsStr -19 stub ReallocADsStr -20 stub ADsEncodeBinaryData -21 stub PropVariantToAdsType -22 stub AdsTypeToPropVariant -23 stub AdsFreeAdsValues -24 stub ADsDecodeBinaryData -25 stub AdsTypeToPropVariant2 -26 stub PropVariantToAdsType2 -27 stub ConvertSecDescriptorToVariant -28 stub ConvertSecurityDescriptorToSecDes -#@ stub DllCanUnloadNow -#@ stub DllGetClassObject -#@ stub DllRegisterServer -#@ stub DllUnregisterServer +16 stdcall ReallocADsMem(ptr long long) +17 stdcall AllocADsStr(ptr) +18 stdcall FreeADsStr(ptr) +19 stdcall ReallocADsStr(ptr ptr) +20 stdcall ADsEncodeBinaryData(ptr long ptr) +21 stdcall PropVariantToAdsType(ptr long ptr ptr) +22 stdcall AdsTypeToPropVariant(ptr long ptr) +23 stdcall AdsFreeAdsValues(ptr long) +24 stdcall ADsDecodeBinaryData(wstr ptr long) +25 cdecl AdsTypeToPropVariant2() # unknown prototype +26 cdecl PropVariantToAdsType2() # unknown prototype +27 cdecl ConvertSecDescriptorToVariant() # unknown prototype +28 cdecl ConvertSecurityDescriptorToSecDes() # unknown prototype +#@ stdcall -private DllCanUnloadNow() +#@ stdcall -private DllGetClassObject(ptr ptr ptr) +#@ stdcall -private DllRegisterServer() +#@ stdcall -private DllUnregisterServer() Added: trunk/reactos/dll/win32/activeds/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/activeds/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/activeds/stubs.c (added) +++ trunk/reactos/dll/win32/activeds/stubs.c [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,0 +1,176 @@ +#include <windows.h> +#include <iads.h> +#include <stubs.h> + +// FIXME: should go to iads.h +typedef struct _adsvalue *PADSVALUE; + +HRESULT +WINAPI +ADsFreeEnumerator( + IN IEnumVARIANT *pEnumVariant) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +ADsBuildVarArrayStr( + LPWSTR *lppPathNames, + DWORD dwPathNames, + VARIANT *pVar) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +ADsBuildVarArrayInt( + LPDWORD lpdwObjectTypes, + DWORD dwObjectTypes, + VARIANT *pVar) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +VOID +WINAPI +ADsSetLastError( + IN DWORD dwErr, + IN LPCWSTR pszError, + IN LPCWSTR pszProvider) + +{ + UNIMPLEMENTED; +} + +LPVOID +WINAPI +AllocADsMem(DWORD cb) +{ + UNIMPLEMENTED; + return NULL; +} + +LPVOID +WINAPI +ReallocADsMem( + LPVOID pOldMem, + DWORD cbOld, + DWORD cbNew) +{ + UNIMPLEMENTED; + return NULL; +} + +LPWSTR +WINAPI +AllocADsStr(LPCWSTR pStr) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +WINAPI +FreeADsStr(IN LPWSTR pStr) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +ReallocADsStr( + IN OUT LPWSTR *ppStr, + IN LPWSTR pStr) +{ + UNIMPLEMENTED; + return FALSE; +} + +HRESULT +WINAPI +ADsEncodeBinaryData( + PBYTE pbSrcData, + DWORD dwSrcLen, + OUT LPWSTR *ppszDestData) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +PropVariantToAdsType( + VARIANT * pVariant, + DWORD dwNumVariant, + PADSVALUE *ppAdsValues, + PDWORD pdwNumValues) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +AdsTypeToPropVariant( + PADSVALUE pAdsValues, + DWORD dwNumValues, + VARIANT * pVariant) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +void +WINAPI +AdsFreeAdsValues( + PADSVALUE pAdsValues, + DWORD dwNumValues) +{ + UNIMPLEMENTED; +} + +HRESULT +WINAPI +ADsDecodeBinaryData( + LPCWSTR szSrcData, + PBYTE *ppbDestData, + ULONG *pdwDestLen) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +int AdsTypeToPropVariant2() +{ + DPRINT1("WARNING: calling stub AdsTypeToPropVariant2()\n"); + __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); + return 0; +} + +int PropVariantToAdsType2() +{ + DPRINT1("WARNING: calling stub PropVariantToAdsType2()\n"); + __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); + return 0; +} + +int ConvertSecDescriptorToVariant() +{ + DPRINT1("WARNING: calling stub ConvertSecDescriptorToVariant()\n"); + __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); + return 0; +} + +int ConvertSecurityDescriptorToSecDes() +{ + DPRINT1("WARNING: calling stub ConvertSecurityDescriptorToSecDes()\n"); + __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); + return 0; +} + Propchange: trunk/reactos/dll/win32/activeds/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -383,8 +383,8 @@ @ stub LsaOpenSecret @ stub LsaOpenTrustedDomain @ stdcall LsaOpenTrustedDomainByName(ptr ptr long ptr) -@ stub LsaQueryDomainInformationPolicy -@ stub LsaQueryForestTrustInformation +@ stdcall LsaQueryDomainInformationPolicy(ptr long ptr) +@ stdcall LsaQueryForestTrustInformation(ptr ptr ptr) @ stdcall LsaQueryInfoTrustedDomain(long long long) @ stdcall LsaQueryInformationPolicy(ptr long ptr) @ stub LsaQuerySecret @@ -396,7 +396,7 @@ @ stub LsaRemovePrivilegesFromAccount @ stdcall LsaRetrievePrivateData(ptr ptr ptr) @ stdcall LsaSetDomainInformationPolicy(ptr long ptr) -@ stub LsaSetForestTrustInformation +@ stdcall LsaSetForestTrustInformation(ptr ptr ptr long ptr) @ stdcall LsaSetInformationPolicy(long long ptr) @ stub LsaSetInformationTrustedDomain @ stub LsaSetQuotasForAccount Modified: trunk/reactos/dll/win32/atl/atl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atl.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/atl/atl.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atl.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -16,18 +16,18 @@ 21 stdcall AtlModuleTerm(ptr) 22 stdcall AtlModuleUnregisterServer(ptr ptr) 23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr) -24 stub AtlWaitWithMessageLoop -25 stub AtlSetErrorInfo +24 stdcall AtlWaitWithMessageLoop(ptr) +25 stdcall AtlSetErrorInfo(ptr ptr long ptr ptr ptr ptr) 26 stdcall AtlCreateTargetDC(long ptr) 27 stdcall AtlHiMetricToPixel(ptr ptr) 28 stdcall AtlPixelToHiMetric(ptr ptr) -29 stub AtlDevModeW2A +29 stdcall AtlDevModeW2A(ptr ptr) 30 stdcall AtlComPtrAssign(ptr ptr) 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) -34 stub AtlGetVersion -35 stub AtlAxDialogBoxW -36 stub AtlAxDialogBoxA +34 stdcall AtlGetVersion(ptr) +35 stdcall AtlAxDialogBoxW(ptr wstr ptr ptr ptr) +36 stdcall AtlAxDialogBoxA(ptr str ptr ptr ptr) 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) 38 stdcall AtlAxCreateDialogA(long str long ptr long) 39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) @@ -40,13 +40,13 @@ 46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) 47 stdcall AtlAxGetControl(long ptr) 48 stdcall AtlAxGetHost(long ptr) -49 stub AtlRegisterClassCategoriesHelper +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) -52 stub AtlIPersistPropertyBag_Load -53 stub AtlIPersistPropertyBag_Save -54 stub AtlGetObjectSourceInterface -55 stub AtlModuleUnRegisterTypeLib +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) +53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr) +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) +55 stdcall AtlModuleUnregisterTypeLib(ptr str) 56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) 57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) Added: trunk/reactos/dll/win32/atl/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/stubs.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/atl/stubs.c (added) +++ trunk/reactos/dll/win32/atl/stubs.c [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,0 +1,127 @@ +#include <windows.h> +#include <debug.h> + +#define ATLAPI_(x) x WINAPI +#define ATLAPI ATLAPI_(HRESULT) + +struct _ATL_CATMAP_ENTRY; +typedef struct _ATL_PROPMAP_ENTRY ATL_PROPMAP_ENTRY; +typedef struct _ATL_MODULE _ATL_MODULE; + +BOOL +WINAPI +AtlWaitWithMessageLoop( + HANDLE hEvent) +{ + UNIMPLEMENTED; + return FALSE; +} + +ATLAPI +AtlSetErrorInfo( + const CLSID *pclsid, + LPCOLESTR lpszDesc, + DWORD dwHelpID, + LPCOLESTR lpszHelpFile, + const IID *piid, + HRESULT hRes, + HINSTANCE hInst) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +ATLAPI_(LPDEVMODEA) +AtlDevModeW2A(LPDEVMODEA lpDevModeA, LPDEVMODEW lpDevModeW) +{ + UNIMPLEMENTED; + return NULL; +} + +ATLAPI_(DWORD) +AtlGetVersion(void* pReserved) +{ + UNIMPLEMENTED; + return 0; +} + +ATLAPI_(int) +AtlAxDialogBoxW( + HINSTANCE hInstance, + LPCWSTR lpTemplateName, + HWND hWndParent, + DLGPROC lpDialogProc, + LPARAM dwInitParam) +{ + UNIMPLEMENTED; + return 0; +} + +ATLAPI_(int) +AtlAxDialogBoxA( + HINSTANCE hInstance, + LPCSTR lpTemplateName, + HWND hWndParent, + DLGPROC lpDialogProc, + LPARAM dwInitParam) +{ + UNIMPLEMENTED; + return 0; +} + +ATLAPI_(int) +AtlRegisterClassCategoriesHelper( + const CLSID *pclsid, + const struct _ATL_CATMAP_ENTRY* pEntry, + BOOL arg3) +{ + UNIMPLEMENTED; + return 0; +} + +ATLAPI +AtlIPersistPropertyBag_Load( + LPPROPERTYBAG pPropBag, + LPERRORLOG pErrorLog, + const ATL_PROPMAP_ENTRY* pMap, + void* pThis, + IUnknown* pUnk) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +ATLAPI +AtlIPersistPropertyBag_Save( + LPPROPERTYBAG pPropBag, + BOOL fClearDirty, + BOOL fSaveAllProperties, + const ATL_PROPMAP_ENTRY* pMap, + void* pThis, + IUnknown* pUnk) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +ATLAPI +AtlGetObjectSourceInterface( + IUnknown* punkObj, + GUID* plibid, + IID* piid, + unsigned short* pdwMajor, + unsigned short* pdwMinor) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +ATLAPI +AtlModuleUnregisterTypeLib( + _ATL_MODULE* pM, + LPCOLESTR lpszIndex) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + Propchange: trunk/reactos/dll/win32/atl/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/browseui/browseui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/browseui.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,7 +1,7 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllGetVersion(ptr) -@ stub DllInstall +@ stdcall DllInstall(long wstr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() 101 stdcall -noname InitOCHostClass(long) Added: trunk/reactos/dll/win32/browseui/dllinstall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/dllinst… ============================================================================== --- trunk/reactos/dll/win32/browseui/dllinstall.c (added) +++ trunk/reactos/dll/win32/browseui/dllinstall.c [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,0 +1,11 @@ +#include <windows.h> + +HRESULT +WINAPI +DllInstall( + BOOL bInstall, + PCWSTR pszCmdLine) +{ + return S_OK; +} + Propchange: trunk/reactos/dll/win32/browseui/dllinstall.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/cabinet/cabinet.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet.… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cabinet/cabinet.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,7 +1,7 @@ -1 stub GetDllVersion +1 stdcall -private GetDllVersion() 2 stdcall -private DllGetVersion (ptr) 3 stdcall Extract(ptr str) -4 stub DeleteExtractedFiles +4 stdcall -private DeleteExtractedFiles(ptr) 10 cdecl FCICreate(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) 11 cdecl FCIAddFile(long ptr ptr long ptr ptr ptr long) 12 cdecl FCIFlushFolder(long ptr ptr) Added: trunk/reactos/dll/win32/cabinet/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/cabinet/stubs.c (added) +++ trunk/reactos/dll/win32/cabinet/stubs.c [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,0 +1,22 @@ +#include <windows.h> +#include <debug.h> + +typedef PVOID PSESSION; + +VOID +WINAPI +DeleteExtractedFiles( + PSESSION ps) +{ + UNIMPLEMENTED; +} + + +LPCSTR +WINAPI +GetDllVersion(void) +{ + /* This is what it returns on Windows XP SP3 */ + return "5.1.2600.5512"; +} + Propchange: trunk/reactos/dll/win32/cabinet/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/comctl32/comctl32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -30,8 +30,8 @@ 155 stdcall -noname FindMRUStringA(long str ptr) 156 stdcall -noname DelMRUString(long long) 157 stdcall -noname CreateMRUListLazyA(ptr long long long) -163 stub -noname CreatePage -164 stub -noname CreateProxyPage +163 stdcall -noname CreatePage(long ptr) +164 stdcall -noname CreateProxyPage(long long) 167 stdcall -noname AddMRUData(long ptr long) 169 stdcall -noname FindMRUData(long ptr long ptr) 233 stdcall -noname Str_GetPtrA(str str long) @@ -88,13 +88,13 @@ 376 stdcall -noname IntlStrEqWorkerA(long str str long) 377 stdcall -noname IntlStrEqWorkerW(long wstr wstr long) 382 stdcall -noname SmoothScrollWindow(ptr) -383 stub -noname DoReaderMode +383 stdcall -noname DoReaderMode(ptr) 384 stdcall -noname SetPathWordBreakProc(ptr long) 385 stdcall -noname DPA_EnumCallback(long long long) 386 stdcall -noname DPA_DestroyCallback(ptr ptr long) 387 stdcall -noname DSA_EnumCallback(ptr ptr long) 388 stdcall -noname DSA_DestroyCallback(ptr ptr long) -389 stub -noname SHGetProcessDword +389 stdcall -noname comctl32_389(long long) 390 stdcall -noname ImageList_SetColorTable(ptr long long ptr) 400 stdcall -noname CreateMRUListW(ptr) 401 stdcall -noname AddMRUStringW(long wstr) Added: trunk/reactos/dll/win32/comctl32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/stubs.c (added) +++ trunk/reactos/dll/win32/comctl32/stubs.c [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,0 +1,41 @@ +#include <windows.h> +#include <reactos/debug.h> + +typedef PVOID PREADERMODEINFO; + +HWND +WINAPI +CreatePage( + DWORD dwInitParam, + HWND hWndParent) +{ + UNIMPLEMENTED; + return NULL; +} + +HWND +WINAPI +CreateProxyPage( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID +WINAPI +DoReaderMode( + PREADERMODEINFO prmi) +{ + UNIMPLEMENTED; +} + +VOID +WINAPI +comctl32_389( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; +} Propchange: trunk/reactos/dll/win32/comctl32/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/cryptdll/cryptdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdll/cryptdl… ============================================================================== --- trunk/reactos/dll/win32/cryptdll/cryptdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptdll/cryptdll.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,14 +1,14 @@ -@ stub CDBuildIntegrityVect -@ stub CDBuildVect -@ stub CDFindCommonCSystem -@ stub CDFindCommonCSystemWithKey -@ stub CDGenerateRandomBits -@ stub CDLocateCSystem -@ stub CDLocateCheckSum -@ stub CDLocateRng -@ stub CDRegisterCSystem -@ stub CDRegisterCheckSum -@ stub CDRegisterRng +@ stdcall CDBuildIntegrityVect(long long) +@ stdcall CDBuildVect(long long) +@ stdcall CDFindCommonCSystem(long long long) +@ stdcall CDFindCommonCSystemWithKey(long long long long long) +@ stdcall CDGenerateRandomBits(long long) +@ stdcall CDLocateCSystem(long long) +@ stdcall CDLocateCheckSum(long long) +@ stdcall CDLocateRng(long long) +@ stdcall CDRegisterCSystem(long) +@ stdcall CDRegisterCheckSum(long) +@ stdcall CDRegisterRng(long) @ stdcall MD5Final(ptr) advapi32.MD5Final @ stdcall MD5Init(ptr) advapi32.MD5Init @ stdcall MD5Update(ptr ptr long) advapi32.MD5Update Added: trunk/reactos/dll/win32/cryptdll/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdll/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/cryptdll/stubs.c (added) +++ trunk/reactos/dll/win32/cryptdll/stubs.c [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,0 +1,71 @@ + +#include <windows.h> +#define NDEBUG +#include <debug.h> + +void WINAPI +CDBuildIntegrityVect(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDBuildVect(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDFindCommonCSystem(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDFindCommonCSystemWithKey(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, DWORD Unknown4, DWORD Unknown5) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDGenerateRandomBits(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDLocateCSystem(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDLocateCheckSum(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDLocateRng(DWORD Unknown1, DWORD Unknown2) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDRegisterCSystem(DWORD Unknown1) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDRegisterCheckSum(DWORD Unknown1) +{ + UNIMPLEMENTED; +} + +void WINAPI +CDRegisterRng(DWORD Unknown1) +{ + UNIMPLEMENTED; +} + Propchange: trunk/reactos/dll/win32/cryptdll/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/dnsapi/dnsapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi.sp… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,132 +1,132 @@ @ stdcall DnsAcquireContextHandle_A(long ptr ptr) @ stdcall DnsAcquireContextHandle_UTF8(long ptr ptr) @ stdcall DnsAcquireContextHandle_W(long ptr ptr) -@ stub DnsAddRecordSet_A -@ stub DnsAddRecordSet_UTF8 -@ stub DnsAddRecordSet_W -@ stub DnsAllocateRecord -@ stub DnsApiHeapReset +@ stdcall DnsAddRecordSet_A() +@ stdcall DnsAddRecordSet_UTF8() +@ stdcall DnsAddRecordSet_W() +@ stdcall DnsAllocateRecord() +@ stdcall DnsApiHeapReset() @ stdcall DnsApiAlloc(long) @ stdcall DnsApiFree(ptr) -@ stub DnsAsyncRegisterHostAddrs_A -@ stub DnsAsyncRegisterHostAddrs_UTF8 -@ stub DnsAsyncRegisterHostAddrs_W -@ stub DnsAsyncRegisterInit -@ stub DnsAsyncRegisterTerm -@ stub DnsCheckNameCollision_A -@ stub DnsCheckNameCollision_UTF8 -@ stub DnsCheckNameCollision_W -@ stub DnsCopyStringEx -@ stub DnsCreateReverseNameStringForIpAddress -@ stub DnsCreateStandardDnsNameCopy -@ stub DnsCreateStringCopy -@ stub DnsDhcpSrvRegisterHostName_W -@ stub DnsDhcpSrvRegisterInit -@ stub DnsDhcpSrvRegisterTerm -@ stub DnsDisableAdapterDomainNameRegistration -@ stub DnsDisableBNodeResolverThread -@ stub DnsDisableDynamicRegistration -@ stub DnsDowncaseDnsNameLabel -@ stub DnsEnableAdapterDomainNameRegistration -@ stub DnsEnableBNodeResolverThread -@ stub DnsEnableDynamicRegistration +@ stdcall DnsAsyncRegisterHostAddrs_A() +@ stdcall DnsAsyncRegisterHostAddrs_UTF8() +@ stdcall DnsAsyncRegisterHostAddrs_W() +@ stdcall DnsAsyncRegisterInit() +@ stdcall DnsAsyncRegisterTerm() +@ stdcall DnsCheckNameCollision_A() +@ stdcall DnsCheckNameCollision_UTF8() +@ stdcall DnsCheckNameCollision_W() +@ stdcall DnsCopyStringEx() +@ stdcall DnsCreateReverseNameStringForIpAddress() +@ stdcall DnsCreateStandardDnsNameCopy() +@ stdcall DnsCreateStringCopy() +@ stdcall DnsDhcpSrvRegisterHostName_W() +@ stdcall DnsDhcpSrvRegisterInit() +@ stdcall DnsDhcpSrvRegisterTerm() +@ stdcall DnsDisableAdapterDomainNameRegistration() +@ stdcall DnsDisableBNodeResolverThread() +@ stdcall DnsDisableDynamicRegistration() +@ stdcall DnsDowncaseDnsNameLabel() +@ stdcall DnsEnableAdapterDomainNameRegistration() +@ stdcall DnsEnableBNodeResolverThread() +@ stdcall DnsEnableDynamicRegistration() @ stdcall DnsExtractRecordsFromMessage_UTF8(ptr long ptr) @ stdcall DnsExtractRecordsFromMessage_W(ptr long ptr) -@ stub DnsFindAuthoritativeZone +@ stdcall DnsFindAuthoritativeZone() @ stdcall DnsFlushResolverCache() -@ stub DnsFlushResolverCacheEntry_A -@ stub DnsFlushResolverCacheEntry_UTF8 -@ stub DnsFlushResolverCacheEntry_W -@ stub DnsFreeAdapterInformation -@ stub DnsFreeNetworkInformation -@ stub DnsFreeSearchInformation -@ stub DnsGetBufferLengthForStringCopy -@ stub DnsGetCacheDataTable -@ stub DnsGetDnsServerList -@ stub DnsGetDomainName -@ stub DnsGetHostName_A -@ stub DnsGetHostName_UTF8 -@ stub DnsGetHostName_W -@ stub DnsGetIpAddressInfoList -@ stub DnsGetIpAddressList -@ stub DnsGetLastServerUpdateIP -@ stub DnsGetMaxNumberOfAddressesToRegister -@ stub DnsGetNetworkInformation -@ stub DnsGetPrimaryDomainName_A -@ stub DnsGetPrimaryDomainName_UTF8 -@ stub DnsGetPrimaryDomainName_W -@ stub DnsGetSearchInformation -@ stub DnsIpv6AddressToString -@ stub DnsIpv6StringToAddress -@ stub DnsIsAdapterDomainNameRegistrationEnabled -@ stub DnsIsAMailboxType -@ stub DnsIsDynamicRegistrationEnabled -@ stub DnsIsStatusRcode -@ stub DnsIsStringCountValidForTextType -@ stub DnsMapRcodeToStatus -@ stub DnsModifyRecordSet_A -@ stub DnsModifyRecordSet_UTF8 -@ stub DnsModifyRecordSet_W +@ stdcall DnsFlushResolverCacheEntry_A() +@ stdcall DnsFlushResolverCacheEntry_UTF8() +@ stdcall DnsFlushResolverCacheEntry_W() +@ stdcall DnsFreeAdapterInformation() +@ stdcall DnsFreeNetworkInformation() +@ stdcall DnsFreeSearchInformation() +@ stdcall DnsGetBufferLengthForStringCopy() +@ stdcall DnsGetCacheDataTable() +@ stdcall DnsGetDnsServerList() +@ stdcall DnsGetDomainName() +@ stdcall DnsGetHostName_A() +@ stdcall DnsGetHostName_UTF8() +@ stdcall DnsGetHostName_W() +@ stdcall DnsGetIpAddressInfoList() +@ stdcall DnsGetIpAddressList() +@ stdcall DnsGetLastServerUpdateIP() +@ stdcall DnsGetMaxNumberOfAddressesToRegister() +@ stdcall DnsGetNetworkInformation() +@ stdcall DnsGetPrimaryDomainName_A() +@ stdcall DnsGetPrimaryDomainName_UTF8() +@ stdcall DnsGetPrimaryDomainName_W() +@ stdcall DnsGetSearchInformation() +@ stdcall DnsIpv6AddressToString() +@ stdcall DnsIpv6StringToAddress() +@ stdcall DnsIsAdapterDomainNameRegistrationEnabled() +@ stdcall DnsIsAMailboxType() +@ stdcall DnsIsDynamicRegistrationEnabled() +@ stdcall DnsIsStatusRcode() +@ stdcall DnsIsStringCountValidForTextType() +@ stdcall DnsMapRcodeToStatus() +@ stdcall DnsModifyRecordSet_A() +@ stdcall DnsModifyRecordSet_UTF8() +@ stdcall DnsModifyRecordSet_W() @ stdcall DnsModifyRecordsInSet_A(ptr ptr long ptr ptr ptr) @ stdcall DnsModifyRecordsInSet_UTF8(ptr ptr long ptr ptr ptr) @ stdcall DnsModifyRecordsInSet_W(ptr ptr long ptr ptr ptr) @ stdcall DnsNameCompare_A(str str) -@ stub DnsNameCompareEx_A -@ stub DnsNameCompareEx_UTF8 -@ stub DnsNameCompareEx_W +@ stdcall DnsNameCompareEx_A() +@ stdcall DnsNameCompareEx_UTF8() +@ stdcall DnsNameCompareEx_W() @ stdcall DnsNameCompare_W(wstr wstr) -@ stub DnsNameCopy -@ stub DnsNameCopyAllocate -@ stub DnsNotifyResolver +@ stdcall DnsNameCopy() +@ stdcall DnsNameCopyAllocate() +@ stdcall DnsNotifyResolver() @ stdcall DnsQuery_A(str long long ptr ptr ptr) @ stdcall DnsQueryConfig(long long wstr ptr ptr ptr) -@ stub DnsQueryEx +@ stdcall DnsQueryEx() @ stdcall DnsQuery_UTF8(str long long ptr ptr ptr) @ stdcall DnsQuery_W(wstr long long ptr ptr ptr) -@ stub DnsRecordBuild_UTF8 -@ stub DnsRecordBuild_W +@ stdcall DnsRecordBuild_UTF8() +@ stdcall DnsRecordBuild_W() @ stdcall DnsRecordCompare(ptr ptr) @ stdcall DnsRecordCopyEx(ptr long long) @ stdcall DnsRecordListFree(ptr long) @ stdcall DnsRecordSetCompare(ptr ptr ptr ptr) @ stdcall DnsRecordSetCopyEx(ptr long long) @ stdcall DnsRecordSetDetach(ptr) -@ stub DnsRecordStringForType -@ stub DnsRecordStringForWritableType -@ stub DnsRecordTypeForName -@ stub DnsRelationalCompare_UTF8 -@ stub DnsRelationalCompare_W +@ stdcall DnsRecordStringForType() +@ stdcall DnsRecordStringForWritableType() +@ stdcall DnsRecordTypeForName() +@ stdcall DnsRelationalCompare_UTF8() +@ stdcall DnsRelationalCompare_W() @ stdcall DnsReleaseContextHandle(ptr) -@ stub DnsRemoveRegistrations +@ stdcall DnsRemoveRegistrations() @ stdcall DnsReplaceRecordSetA(ptr long ptr ptr ptr) -@ stub DnsReplaceRecordSet_A +@ stdcall DnsReplaceRecordSet_A() @ stdcall DnsReplaceRecordSetUTF8(ptr long ptr ptr ptr) -@ stub DnsReplaceRecordSet_UTF8 +@ stdcall DnsReplaceRecordSet_UTF8() @ stdcall DnsReplaceRecordSetW(ptr long ptr ptr ptr) -@ stub DnsReplaceRecordSet_W -@ stub DnsServiceNotificationDeregister_A -@ stub DnsServiceNotificationDeregister_UTF8 -@ stub DnsServiceNotificationDeregister_W -@ stub DnsServiceNotificationRegister_A -@ stub DnsServiceNotificationRegister_UTF8 -@ stub DnsServiceNotificationRegister_W -@ stub DnsSetMaxNumberOfAddressesToRegister -@ stub DnsStatusString -@ stub DnsStringCopyAllocateEx -@ stub DnsUnicodeToUtf8 -@ stub DnsUpdate -@ stub DnsUpdateTest_A -@ stub DnsUpdateTest_UTF8 -@ stub DnsUpdateTest_W -@ stub DnsUtf8ToUnicode +@ stdcall DnsReplaceRecordSet_W() +@ stdcall DnsServiceNotificationDeregister_A() +@ stdcall DnsServiceNotificationDeregister_UTF8() +@ stdcall DnsServiceNotificationDeregister_W() +@ stdcall DnsServiceNotificationRegister_A() +@ stdcall DnsServiceNotificationRegister_UTF8() +@ stdcall DnsServiceNotificationRegister_W() +@ stdcall DnsSetMaxNumberOfAddressesToRegister() +@ stdcall DnsStatusString() +@ stdcall DnsStringCopyAllocateEx() +@ stdcall DnsUnicodeToUtf8() +@ stdcall DnsUpdate() +@ stdcall DnsUpdateTest_A() +@ stdcall DnsUpdateTest_UTF8() +@ stdcall DnsUpdateTest_W() +@ stdcall DnsUtf8ToUnicode() @ stdcall DnsValidateName_A(str long) @ stdcall DnsValidateName_UTF8(str long) @ stdcall DnsValidateName_W(wstr long) -@ stub DnsValidateUtf8Byte -@ stub DnsWinsRecordFlagForString -@ stub DnsWinsRecordFlagString +@ stdcall DnsValidateUtf8Byte() +@ stdcall DnsWinsRecordFlagForString() +@ stdcall DnsWinsRecordFlagString() @ stdcall DnsWriteQuestionToBuffer_UTF8(ptr ptr str long long long) @ stdcall DnsWriteQuestionToBuffer_W(ptr ptr wstr long long long) -@ stub DnsWriteReverseNameStringForIpAddress -@ stub GetCurrentTimeInSeconds +@ stdcall DnsWriteReverseNameStringForIpAddress() +@ stdcall GetCurrentTimeInSeconds() @ stdcall DnsFree(ptr long) Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/st… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/stubs.c [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -822,3 +822,10 @@ UNIMPLEMENTED; return ERROR_OUTOFMEMORY; } + +DNS_STATUS WINAPI +DnsNotifyResolver() +{ + UNIMPLEMENTED; + return ERROR_OUTOFMEMORY; +} Modified: trunk/reactos/dll/win32/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.spec… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -102,7 +102,7 @@ @ stdcall DdEntry27(ptr long) NtGdiDdFlipToGDISurface @ stdcall DdEntry28(ptr ptr) NtGdiDdGetAvailDriverMemory @ stdcall DdEntry29(ptr ptr) NtGdiDdGetBltStatus -@ stdcall DdEntry2(ptr)NtGdiD3dContextDestroy +@ stdcall DdEntry2(ptr) NtGdiD3dContextDestroy @ stdcall DdEntry30(ptr ptr) NtGdiDdGetDC @ stdcall DdEntry31(ptr ptr) NtGdiDdGetDriverInfo @ stdcall DdEntry32(ptr ptr long) NtGdiDdGetDxHandle @@ -125,7 +125,7 @@ @ stdcall DdEntry48(ptr ptr) NtGdiDdSetExclusiveMode @ stdcall DdEntry49(ptr ptr ptr) NtGdiDdSetGammaRamp @ stdcall DdEntry4(ptr) NtGdiD3dValidateTextureStageState -@ stdcall DdEntry50(ptr ptr long)NtGdiDdCreateSurfaceEx +@ stdcall DdEntry50(ptr ptr long) NtGdiDdCreateSurfaceEx @ stdcall DdEntry51(ptr ptr ptr) NtGdiDdSetOverlayPosition @ stdcall DdEntry52(ptr ptr) NtGdiDdUnattachSurface @ stdcall DdEntry53(ptr ptr) NtGdiDdUnlock Modified: trunk/reactos/dll/win32/hid/hid.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hid/hid.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/hid/hid.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/hid/hid.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,44 +1,44 @@ -@ stub HidD_FlushQueue -@ stub HidD_FreePreparsedData -@ stub HidD_GetAttributes -@ stub HidD_GetConfiguration -@ stub HidD_GetFeature +@ stdcall HidD_FlushQueue(ptr) +@ stdcall HidD_FreePreparsedData(ptr) +@ stdcall HidD_GetAttributes(ptr ptr) +@ stdcall HidD_GetConfiguration(ptr ptr long) +@ stdcall HidD_GetFeature(ptr ptr long) @ stdcall HidD_GetHidGuid(ptr) -@ stub HidD_GetIndexedString -@ stub HidD_GetInputReport -@ stub HidD_GetManufacturerString -@ stub HidD_GetMsGenreDescriptor -@ stub HidD_GetNumInputBuffers -@ stub HidD_GetPhysicalDescriptor -@ stub HidD_GetPreparsedData -@ stub HidD_GetProductString -@ stub HidD_GetSerialNumberString -@ stub HidD_Hello -@ stub HidD_SetConfiguration -@ stub HidD_SetFeature -@ stub HidD_SetNumInputBuffers -@ stub HidD_SetOutputReport -@ stub HidP_GetButtonCaps -@ stub HidP_GetCaps -@ stub HidP_GetData -@ stub HidP_GetExtendedAttributes -@ stub HidP_GetLinkCollectionNodes -@ stub HidP_GetScaledUsageValue -@ stub HidP_GetSpecificButtonCaps -@ stub HidP_GetSpecificValueCaps -@ stub HidP_GetUsageValue -@ stub HidP_GetUsageValueArray -@ stub HidP_GetUsages -@ stub HidP_GetUsagesEx -@ stub HidP_GetValueCaps -@ stub HidP_InitializeReportForID -@ stub HidP_MaxDataListLength -@ stub HidP_MaxUsageListLength -@ stub HidP_SetData -@ stub HidP_SetScaledUsageValue -@ stub HidP_SetUsageValue -@ stub HidP_SetUsageValueArray -@ stub HidP_SetUsages -@ stub HidP_TranslateUsagesToI8042ScanCodes -@ stub HidP_UnsetUsages -@ stub HidP_UsageListDifference +@ stdcall HidD_GetIndexedString(ptr long ptr long) +@ stdcall HidD_GetInputReport(ptr ptr long) +@ stdcall HidD_GetManufacturerString(ptr ptr long) +@ stdcall HidD_GetMsGenreDescriptor(ptr ptr long) +@ stdcall HidD_GetNumInputBuffers(ptr ptr) +@ stdcall HidD_GetPhysicalDescriptor(ptr ptr long) +@ stdcall HidD_GetPreparsedData(ptr ptr) +@ stdcall HidD_GetProductString(ptr ptr long) +@ stdcall HidD_GetSerialNumberString(ptr ptr long) +@ stdcall HidD_Hello(ptr long) +@ stdcall HidD_SetConfiguration(ptr ptr long) +@ stdcall HidD_SetFeature(ptr ptr long) +@ stdcall HidD_SetNumInputBuffers(ptr long) +@ stdcall HidD_SetOutputReport(ptr ptr long) +@ stdcall HidP_GetButtonCaps(long ptr ptr ptr) +@ stdcall HidP_GetCaps(ptr ptr) +@ stdcall HidP_GetData(long ptr ptr ptr ptr long) +@ stdcall HidP_GetExtendedAttributes(long long ptr ptr ptr) +@ stdcall HidP_GetLinkCollectionNodes(ptr ptr ptr) +@ stdcall HidP_GetScaledUsageValue(long long long long ptr ptr ptr long) +@ stdcall HidP_GetSpecificButtonCaps(long long long long ptr ptr ptr) +@ stdcall HidP_GetSpecificValueCaps(long long long long ptr ptr ptr) +@ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) +@ stdcall HidP_GetUsageValueArray(long long long long ptr long ptr ptr long) +@ stdcall HidP_GetUsages(long long long ptr ptr ptr ptr long) +@ stdcall HidP_GetUsagesEx(long long ptr ptr ptr ptr long) +@ stdcall HidP_GetValueCaps(long ptr ptr ptr) +@ stdcall HidP_InitializeReportForID(long long ptr ptr long) +@ stdcall HidP_MaxDataListLength(long ptr) +@ stdcall HidP_MaxUsageListLength(long long ptr) +@ stdcall HidP_SetData(long ptr ptr ptr ptr long) +@ stdcall HidP_SetScaledUsageValue(long long long long long ptr ptr long) +@ stdcall HidP_SetUsageValue(long long long long long ptr ptr long) +@ stdcall HidP_SetUsageValueArray(long long long long ptr long ptr ptr long) +@ stdcall HidP_SetUsages(long long long ptr ptr ptr ptr long) +@ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr) +@ stdcall HidP_UnsetUsages(long long long ptr ptr ptr ptr long) +@ stdcall HidP_UsageListDifference(ptr ptr ptr ptr long) Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -10,7 +10,7 @@ @ stub AllocateAndGetUdpExTable2FromStack @ stub AllocateAndGetUdpExTableFromStack @ stdcall AllocateAndGetUdpTableFromStack( ptr long long long ) -@ stub CancelIPChangeNotify +@ stdcall CancelIPChangeNotify(ptr) @ stub CancelSecurityHealthChangeNotify @ stdcall CreateIpForwardEntry( ptr ) @ stdcall CreateIpNetEntry( ptr ) @@ -19,16 +19,16 @@ @ stdcall DeleteIpForwardEntry( ptr ) @ stdcall DeleteIpNetEntry( ptr ) @ stdcall DeleteProxyArpEntry( long long long ) -@ stub DisableMediaSense +@ stdcall DisableMediaSense(ptr ptr) @ stdcall EnableRouter( ptr ptr ) @ stdcall FlushIpNetTable( long ) @ stub FlushIpNetTableFromStack @ stdcall GetAdapterIndex( wstr ptr ) -@ stub GetAdapterOrderMap +@ stdcall GetAdapterOrderMap() @ stdcall GetAdaptersAddresses( long long ptr ptr ptr ) @ stdcall GetAdaptersInfo( ptr ptr ) @ stdcall GetBestInterface( long ptr ) -@ stub GetBestInterfaceEx +@ stdcall GetBestInterfaceEx(ptr ptr) @ stub GetBestInterfaceFromStack @ stdcall GetBestRoute( long long long ) @ stub GetBestRouteFromStack @@ -36,7 +36,7 @@ @ stub GetExtendedUdpTable @ stdcall GetFriendlyIfIndex( long ) @ stdcall GetIcmpStatistics( ptr ) -@ stub GetIcmpStatisticsEx +@ stdcall GetIcmpStatisticsEx(ptr long) @ stub GetIcmpStatsFromStack @ stub GetIcmpStatsFromStackEx @ stdcall GetIfEntry( ptr ) @@ -49,13 +49,13 @@ @ stdcall GetInterfaceInfo( ptr ptr ) @ stdcall GetIpAddrTable( ptr ptr long ) @ stub GetIpAddrTableFromStack -@ stub GetIpErrorString +@ stdcall GetIpErrorString(long ptr ptr) @ stdcall GetIpForwardTable( ptr ptr long ) @ stub GetIpForwardTableFromStack @ stdcall GetIpNetTable( ptr ptr long ) @ stub GetIpNetTableFromStack @ stdcall GetIpStatistics( ptr ) -@ stub GetIpStatisticsEx +@ stdcall GetIpStatisticsEx(ptr long) @ stub GetIpStatsFromStack @ stub GetIpStatsFromStackEx @ stdcall GetNetworkParams( ptr ptr ) @@ -68,14 +68,14 @@ @ stdcall GetRTTAndHopCount( long ptr long ptr ) @ stub GetTcpExTable2FromStack @ stdcall GetTcpStatistics( ptr ) -@ stub GetTcpStatisticsEx +@ stdcall GetTcpStatisticsEx(ptr long) @ stub GetTcpStatsFromStack @ stub GetTcpStatsFromStackEx @ stdcall GetTcpTable( ptr ptr long ) @ stub GetTcpTableFromStack @ stub GetUdpExTable2FromStack @ stdcall GetUdpStatistics( ptr ) -@ stub GetUdpStatisticsEx +@ stdcall GetUdpStatisticsEx(ptr long) @ stub GetUdpStatsFromStack @ stub GetUdpStatsFromStackEx @ stdcall GetUdpTable( ptr ptr long ) @@ -112,14 +112,14 @@ @ stub NhGetGuidFromInterfaceName @ stdcall NhGetInterfaceNameFromDeviceGuid(long long long long long) @ stub NhGetInterfaceNameFromGuid -@ stub NhpAllocateAndGetInterfaceInfoFromStack +@ stdcall NhpAllocateAndGetInterfaceInfoFromStack(ptr ptr long ptr long) @ stub NhpGetInterfaceIndexFromStack @ stdcall NotifyAddrChange( ptr ptr ) @ stdcall NotifyRouteChange( ptr ptr ) @ stub NotifyRouteChangeEx @ stub NotifySecurityHealthChange -@ stub RestoreMediaSense -@ stub SendARP +@ stdcall RestoreMediaSense(ptr ptr) +@ stdcall SendARP(long long ptr ptr) @ stub SetAdapterIpAddress @ stub SetBlockRoutes @ stdcall SetIfEntry( ptr ) Modified: trunk/reactos/dll/win32/loadperf/loadperf.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/loadper… ============================================================================== --- trunk/reactos/dll/win32/loadperf/loadperf.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/loadperf/loadperf.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,14 +1,14 @@ -@ stub BackupPerfRegistryToFileW +@ stdcall BackupPerfRegistryToFileW(long long) @ stdcall InstallPerfDllA(str str ptr) @ stdcall InstallPerfDllW(wstr wstr ptr) -@ stub LoadMofFromInstalledServiceA -@ stub LoadMofFromInstalledServiceW +@ stdcall LoadMofFromInstalledServiceA(ptr ptr ptr) +@ stdcall LoadMofFromInstalledServiceW(ptr ptr ptr) @ stdcall LoadPerfCounterTextStringsA(str long) @ stdcall LoadPerfCounterTextStringsW(wstr long) -@ stub RestorePerfRegistryFromFileW -@ stub SetServiceAsTrustedA -@ stub SetServiceAsTrustedW +@ stdcall RestorePerfRegistryFromFileW(ptr ptr) +@ stdcall SetServiceAsTrustedA(ptr ptr) +@ stdcall SetServiceAsTrustedW(ptr ptr) @ stdcall UnloadPerfCounterTextStringsA(str long) @ stdcall UnloadPerfCounterTextStringsW(wstr long) -@ stub UpdatePerfNameFilesA -@ stub UpdatePerfNameFilesW +@ stdcall UpdatePerfNameFilesA(ptr ptr ptr ptr) +@ stdcall UpdatePerfNameFilesW(ptr ptr ptr ptr) Added: trunk/reactos/dll/win32/loadperf/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/loadperf/stubs.c (added) +++ trunk/reactos/dll/win32/loadperf/stubs.c [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,0 +1,85 @@ + +#include <windows.h> +#define NDEBUG +#include <debug.h> + +#define LOADPERF_FUNCTION DWORD WINAPI + +LOADPERF_FUNCTION +BackupPerfRegistryToFileW( + IN LPCWSTR szFileName, + IN LPCWSTR szCommentString OPTIONAL) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +LOADPERF_FUNCTION +LoadMofFromInstalledServiceA( + IN LPCSTR szServiceName, + IN LPCSTR szMofFilename, + IN ULONG_PTR dwFlags) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +LOADPERF_FUNCTION +LoadMofFromInstalledServiceW( + IN LPCWSTR szServiceName, + IN LPCWSTR szMofFilename, + IN ULONG_PTR dwFlags) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +LOADPERF_FUNCTION +RestorePerfRegistryFromFileW( + IN LPCWSTR szFileName, + IN LPCWSTR szLangId) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +LOADPERF_FUNCTION +SetServiceAsTrustedA( + IN LPCSTR szReserved, + IN LPCSTR szServiceName) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +LOADPERF_FUNCTION +SetServiceAsTrustedW( + IN LPCWSTR szReserved OPTIONAL, + IN LPCWSTR szServiceName) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +LOADPERF_FUNCTION +UpdatePerfNameFilesA( + IN LPCSTR szNewCtrFilePath, + IN LPCSTR szNewHlpFilePath OPTIONAL, + IN LPSTR szLanguageID, + IN ULONG_PTR dwFlags) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +LOADPERF_FUNCTION +UpdatePerfNameFilesW( + IN LPCWSTR szNewCtrFilePath, + IN LPCWSTR szNewHlpFilePath OPTIONAL, + IN LPWSTR szLanguageID, + IN ULONG_PTR dwFlags) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + Propchange: trunk/reactos/dll/win32/loadperf/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mapi32/mapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/mapi32.sp… ============================================================================== --- trunk/reactos/dll/win32/mapi32/mapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/mapi32.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,4 +1,4 @@ - 8 stub @ + 8 stub mapi32_8 10 stdcall MAPILogonEx(long ptr ptr long ptr) 11 stdcall MAPILogonEx@20(long ptr ptr long ptr) MAPILogonEx 12 stdcall MAPIAllocateBuffer(long ptr) @@ -18,8 +18,8 @@ 26 stub LaunchWizard@20 27 stdcall -private DllGetClassObject(ptr ptr ptr) 28 stdcall -private DllCanUnloadNow() - 29 stub MAPIOpenFormMgr - 30 stub MAPIOpenFormMgr@8 + 29 stdcall MAPIOpenFormMgr(ptr ptr) + 30 stdcall MAPIOpenFormMgr@8(ptr ptr) MAPIOpenFormMgr 31 stdcall MAPIOpenLocalFormContainer(ptr) 32 stdcall MAPIOpenLocalFormContainer@4(ptr) MAPIOpenLocalFormContainer 33 stdcall ScInitMapiUtil@4(long) ScInitMapiUtil @@ -89,12 +89,12 @@ 146 stub HrDecomposeMsgID@24 147 stdcall OpenStreamOnFile@24(ptr ptr ptr ptr ptr ptr) OpenStreamOnFile 148 stdcall OpenStreamOnFile(ptr ptr ptr ptr ptr ptr) -149 stub OpenTnefStream@28 -150 stub OpenTnefStream -151 stub OpenTnefStreamEx@32 -152 stub OpenTnefStreamEx -153 stub GetTnefStreamCodepage@12 -154 stub GetTnefStreamCodepage +149 stdcall OpenTnefStream@28(ptr ptr ptr long ptr long ptr) OpenTnefStream +150 stdcall OpenTnefStream(ptr ptr ptr long ptr long ptr) +151 stdcall OpenTnefStreamEx@32(ptr ptr ptr long ptr long ptr ptr) OpenTnefStreamEx +152 stdcall OpenTnefStreamEx(ptr ptr ptr long ptr long ptr ptr) +153 stdcall GetTnefStreamCodepage@12(ptr ptr ptr) GetTnefStreamCodepage +154 stdcall GetTnefStreamCodepage(ptr ptr ptr) 155 stdcall UlFromSzHex@4(ptr) UlFromSzHex 156 stub UNKOBJ_ScAllocate@12 157 stub UNKOBJ_ScAllocateMore@16 @@ -120,10 +120,10 @@ 180 stdcall FBadRow@4(ptr) FBadRow 181 stdcall FBadProp@4(ptr) FBadProp 182 stdcall FBadColumnSet@4(ptr) FBadColumnSet -183 stub RTFSync@12 -184 stub RTFSync -185 stub WrapCompressedRTFStream@12 -186 stub WrapCompressedRTFStream +183 stdcall RTFSync@12(ptr long ptr) RTFSync +184 stdcall RTFSync(ptr long ptr) +185 stdcall WrapCompressedRTFStream@12(ptr long ptr) WrapCompressedRTFStream +186 stdcall WrapCompressedRTFStream(ptr long ptr) 187 stub __ValidateParameters@8 188 stub __CPPValidateParameters@8 189 stub FBadSortOrderSet@4 @@ -178,13 +178,13 @@ 239 stub HrDispatchNotifications@4 241 stub HrValidateParameters@8 244 stub ScCreateConversationIndex@16 -246 stub HrGetOmiProvidersFlags -247 stub HrGetOmiProvidersFlags@8 -248 stub HrSetOmiProvidersFlagsInvalid -249 stub HrSetOmiProvidersFlagsInvalid@4 -250 stub GetOutlookVersion -251 stub GetOutlookVersion@0 -252 stub FixMAPI -253 stub FixMAPI@0 +246 stdcall HrGetOmiProvidersFlags(long long) +247 stdcall HrGetOmiProvidersFlags@8(long long) HrGetOmiProvidersFlags +248 stdcall HrSetOmiProvidersFlagsInvalid(long) +249 stdcall HrSetOmiProvidersFlagsInvalid@4(long) HrSetOmiProvidersFlagsInvalid +250 stdcall GetOutlookVersion() +251 stdcall GetOutlookVersion@0() GetOutlookVersion +252 stdcall FixMAPI() +253 stdcall FixMAPI@0() FixMAPI 254 stdcall FGetComponentPath(str str ptr long long) 255 stdcall FGetComponentPath@20(str str ptr long long) FGetComponentPath Added: trunk/reactos/dll/win32/mapi32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/mapi32/stubs.c (added) +++ trunk/reactos/dll/win32/mapi32/stubs.c [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,0 +1,116 @@ +#include <windows.h> +#include <mapix.h> +#include <reactos/debug.h> + +typedef PVOID LPMAPIFORMMGR, LPADDRESSBOOK; + +HRESULT +WINAPI +MAPIOpenFormMgr( + LPMAPISESSION pSession, + LPMAPIFORMMGR *ppmgr) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + + +HRESULT +WINAPI +OpenTnefStream( + LPVOID lpvSupport, + LPSTREAM lpStream, + LPTSTR lpszStreamName, + ULONG ulFlags, + LPMESSAGE lpMessage, + WORD wKey, + LPSTREAM *lppTNEF) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +OpenTnefStreamEx( + LPVOID lpvSupport, + LPSTREAM lpStream, + LPTSTR lpszStreamName, + ULONG ulFlags, + LPMESSAGE lpMessage, + WORD wKeyVal, + LPADDRESSBOOK lpAdressBook, + LPSTREAM *lppTNEF) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +GetTnefStreamCodepage( + LPSTREAM lpStream, + ULONG *lpulCodepage, + ULONG *lpulSubCodepage) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +RTFSync( + LPMESSAGE lpMessage, + ULONG ulFlags, + BOOL *lpfMessageUpdated) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +WrapCompressedRTFStream( + LPSTREAM lpCompressedRTFStream, + ULONG ulflags, + LPSTREAM *lpUncompressedRTFStream) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +HrGetOmiProvidersFlags( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +HrSetOmiProvidersFlagsInvalid( + DWORD dwUnknown1) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +ULONG +WINAPI +GetOutlookVersion(void) +{ + UNIMPLEMENTED; + return 0; +} + +HRESULT +WINAPI +FixMAPI(void) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + Propchange: trunk/reactos/dll/win32/mapi32/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/mpr/mpr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/mpr/mpr.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mpr/mpr.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,23 +1,23 @@ # ordinal exports - 1 stub @ - 2 stub @ - 3 stub @ - 4 stub @ - 5 stub @ - 6 stub @ - 7 stub @ - 8 stub @ - 9 stub @ -12 stub @ -13 stub @ -14 stub @ -15 stub @ -16 stub @ -17 stub @ -18 stub @ -19 stub @ -20 stub @ -21 stub @ + 1 stub MPR_1 + 2 stub MPR_2 + 3 stub MPR_3 + 4 stub MPR_4 + 5 stub MPR_5 + 6 stub MPR_6 + 7 stub MPR_7 + 8 stub MPR_8 + 9 stub MPR_9 +12 stub MPR_12 +13 stub MPR_13 +14 stub MPR_14 +15 stub MPR_15 +16 stub MPR_16 +17 stub MPR_17 +18 stub MPR_18 +19 stub MPR_19 +20 stub MPR_20 +21 stub MPR_21 22 stdcall @(long) MPR_Alloc 23 stdcall @(ptr long) MPR_ReAlloc 24 stdcall @(ptr) MPR_Free Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -137,14 +137,14 @@ @ extern __badioinfo __badioinfo @ cdecl __crtCompareStringA(long long str long str long) kernel32.CompareStringA @ cdecl __crtCompareStringW(long long wstr long wstr long) kernel32.CompareStringW -@ cdecl __crtGetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfo +@ cdecl __crtGetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfoW @ cdecl __crtGetStringTypeW(long long wstr long ptr) @ cdecl __crtLCMapStringA(long long str long ptr long long long) # stub __crtLCMapStringW @ cdecl __dllonexit(ptr ptr ptr) @ cdecl __doserrno() __doserrno @ cdecl __fpecode() -@ stub __get_app_type +@ cdecl __get_app_type() @ cdecl __getmainargs(ptr ptr ptr long ptr) @ extern __initenv __initenv @ cdecl __iob_func() __p__iob @@ -152,7 +152,7 @@ @ cdecl __iscsym(long) __iscsym @ cdecl __iscsymf(long) __iscsymf @ extern __lc_codepage MSVCRT___lc_codepage -@ stub __lc_collate +# @ stub __lc_collate # not in XP / 7 @ extern __lc_collate_cp MSVCRT___lc_collate_cp @ extern __lc_handle MSVCRT___lc_handle @ cdecl __lconv_init() @@ -190,15 +190,15 @@ @ cdecl -arch=i386 __p__daylight() @ cdecl -arch=i386 __p__dstbias() @ cdecl -arch=i386 __p__environ() -@ stub -arch=i386 __p__fileinfo #() +@ cdecl -arch=i386 __p__fileinfo() @ cdecl -arch=i386 __p__fmode() @ cdecl -arch=i386 __p__iob() -@ stub -arch=i386 __p__mbcasemap #() +@ cdecl -arch=i386 __p__mbcasemap() @ cdecl -arch=i386 __p__mbctype() @ cdecl -arch=i386 __p__osver() @ cdecl -arch=i386 __p__pctype() __pctype_func @ cdecl -arch=i386 __p__pgmptr() -@ stub -arch=i386 __p__pwctype #() +@ cdecl -arch=i386 __p__pwctype() @ cdecl -arch=i386 __p__timezone() __p__timezone @ cdecl -arch=i386 __p__tzname() @ cdecl -arch=i386 __p__wcmdln() @@ -210,7 +210,7 @@ @ cdecl __pctype_func() __pctype_func @ extern __pioinfo __pioinfo # stub __pwctype_func -@ stub __pxcptinfoptrs #() +@ cdecl __pxcptinfoptrs() @ cdecl __set_app_type(long) @ extern __setlc_active @ cdecl __setusermatherr(ptr) @@ -260,7 +260,7 @@ # stub _aligned_realloc_dbg @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) -@ stub _atodbl #(ptr str) +@ cdecl _atodbl(ptr str) # stub _atodbl_l # @ cdecl _atof_l(str ptr) # stub _atoflt_l @@ -365,7 +365,7 @@ @ cdecl _fgetchar() @ cdecl _fgetwchar() @ cdecl _filbuf(ptr) -# extern _fileinfo +@ extern _fileinfo @ cdecl _filelength(long) @ cdecl -ret64 _filelengthi64(long) @ cdecl _fileno(ptr) @@ -381,7 +381,7 @@ @ cdecl _flushall() @ extern _fmode @ cdecl _fpclass(double) -@ stub _fpieee_flt #(long ptr ptr) +@ cdecl _fpieee_flt(long ptr ptr) @ cdecl _fpreset() # stub _fprintf_l # stub _fprintf_p @@ -439,8 +439,8 @@ # stub _get_winminor # stub _get_winver # stub _get_wpgmptr -@ stub _get_terminate -@ stub _get_unexpected +# @ stub _get_terminate # not in XP / 7 +# @ stub _get_unexpected # not in XP / 7 @ cdecl _getch() @ cdecl _getche() @ cdecl _getcwd(str long) @@ -452,7 +452,7 @@ @ cdecl _getmaxstdio() @ cdecl _getmbcp() @ cdecl _getpid() kernel32.GetCurrentProcessId -@ stub _getsystime #(ptr) +@ cdecl _getsystime(ptr) @ cdecl _getw(ptr) # stub _getwch # stub _getwche @@ -466,7 +466,7 @@ @ cdecl _heapchk() @ cdecl _heapmin() @ cdecl _heapset(long) -@ stub _heapused #(ptr ptr) +# @ stub _heapused #(ptr ptr) # not in XP / 7 @ cdecl _heapwalk(ptr) @ cdecl _hypot(double double) @ cdecl _i64toa(long long ptr long) @@ -475,10 +475,10 @@ # stub _i64tow_s @ cdecl _initterm(ptr ptr) # stub _initterm_e -@ stub _inp #(long) -i386 -@ stub _inpd #(long) -i386 -@ stub _inpw #(long) -i386 -# @ cdecl _invalid_parameter(wstr wstr wstr long long) +@ cdecl -arch=i386 _inp(long) MSVCRT__inp +@ cdecl -arch=i386 _inpd(long) MSVCRT__inpd +@ cdecl -arch=i386 _inpw(long) MSVCRT__inpw +@ cdecl _invalid_parameter(wstr wstr wstr long long) @ extern _iob # stub _isalnum_l # stub _isalpha_l @@ -490,25 +490,25 @@ # stub _isgraph_l # stub _isleadbyte_l # stub _islower_l -@ stub _ismbbalnum #(long) +@ cdecl _ismbbalnum(long) # stub _ismbbalnum_l @ stub _ismbbalpha #(long) # stub _ismbbalpha_l -@ stub _ismbbgraph #(long) +@ cdecl _ismbbgraph(long) # stub _ismbbgraph_l -@ stub _ismbbkalnum #(long) +@ cdecl _ismbbkalnum(long) # stub _ismbbkalnum_l @ cdecl _ismbbkana(long) # stub _ismbbkana_l -@ stub _ismbbkprint #(long) +@ cdecl _ismbbkprint(long) # stub _ismbbkprint_l -@ stub _ismbbkpunct #(long) +@ cdecl _ismbbkpunct(long) # stub _ismbbkpunct_l @ cdecl _ismbblead(long) # stub _ismbblead_l @ stub _ismbbprint #(long) # stub _ismbbprint_l -@ stub _ismbbpunct #(long) +@ cdecl _ismbbpunct(long) # stub _ismbbpunct_l @ cdecl _ismbbtrail(long) # stub _ismbbtrail_l @@ -524,11 +524,11 @@ # stub _ismbchira_l @ cdecl _ismbckata(long) # stub _ismbckata_l -@ stub _ismbcl0 #(long) +@ cdecl _ismbcl0(long) # stub _ismbcl0_l -@ stub _ismbcl1 #(long) +@ cdecl _ismbcl1(long) # stub _ismbcl1_l -@ stub _ismbcl2 #(long) +@ cdecl _ismbcl2(long) # stub _ismbcl2_l @ cdecl _ismbclegal(long) # stub _ismbclegal_l @@ -602,20 +602,20 @@ @ cdecl _mbbtombc(long) # stub _mbbtombc_l @ cdecl _mbbtype(long long) -# extern _mbcasemap +@ extern _mbcasemap @ cdecl _mbccpy (str str) # stub _mbccpy_l # stub _mbccpy_s # stub _mbccpy_s_l @ cdecl _mbcjistojms (long) # stub _mbcjistojms_l -@ stub _mbcjmstojis #(long) +@ cdecl _mbcjmstojis(long) # stub _mbcjmstojis_l @ cdecl _mbclen(ptr) # stub _mbclen_l -@ stub _mbctohira #(long) +@ cdecl _mbctohira(long) # stub _mbctohira_l -@ stub _mbctokata #(long) +@ cdecl _mbctokata(long) # stub _mbctokata_l @ cdecl _mbctolower(long) # stub _mbctolower_l @@ -665,7 +665,7 @@ # stub _mbsnbcmp_l @ cdecl _mbsnbcnt(ptr long) # stub _mbsnbcnt_l -@ stub _mbsnbcoll #(str str long) +@ cdecl _mbsnbcoll(str str long) # stub _mbsnbcoll_l @ cdecl _mbsnbcpy(ptr str long) # stub _mbsnbcpy_l @@ -673,7 +673,7 @@ # stub _mbsnbcpy_s_l @ cdecl _mbsnbicmp(str str long) # stub _mbsnbicmp_l -@ stub _mbsnbicoll #(str str long) +@ cdecl _mbsnbicoll(str str long) # stub _mbsnbicoll_l @ cdecl _mbsnbset(str long long) # stub _mbsnbset_l @@ -687,7 +687,7 @@ # stub _mbsnccnt_l @ cdecl _mbsncmp(str str long) # stub _mbsncmp_l -@ stub _mbsncoll #(str str long) +@ cdecl _mbsncoll(str str long) # stub _mbsncoll_l @ cdecl _mbsncpy(str str long) # stub _mbsncpy_l @@ -697,7 +697,7 @@ # stub _mbsnextc_l @ cdecl _mbsnicmp(str str long) # stub _mbsnicmp_l -@ stub _mbsnicoll #(str str long) +@ cdecl _mbsnicoll(str str long) # stub _mbsnicoll_l @ cdecl _mbsninc(str long) # stub _mbsninc_l @@ -757,9 +757,9 @@ @ cdecl _open_osfhandle(long long) @ extern _osplatform _osplatform @ extern _osver _osver -@ stub _outp #(long long) -@ stub _outpd #(long long) -@ stub _outpw #(long long) +@ cdecl _outp(long long) MSVCRT__outp +@ cdecl _outpd(long long) MSVCRT__outpd +@ cdecl _outpw(long long) MSVCRT__outpw @ cdecl _pclose (ptr) @ extern _pctype _pctype @ extern _pgmptr _pgmptr @@ -819,7 +819,7 @@ @ cdecl _setmaxstdio(long) @ cdecl _setmbcp(long) @ cdecl _setmode(long long) -@ stub _setsystime #(ptr long) +@ cdecl _setsystime(ptr long) @ cdecl _sleep(long) @ varargs _snprintf(ptr long str) # stub _snprintf_c @@ -876,11 +876,11 @@ # stub _strlwr_l # stub _strlwr_s # stub _strlwr_s_l -@ stub _strncoll #(str str long) +@ cdecl _strncoll(str str long) # stub _strncoll_l @ cdecl _strnicmp(str str long) # stub _strnicmp_l -@ stub _strnicoll #(str str long) +@ cdecl _strnicoll(str str long) # stub _strnicoll_l @ cdecl _strnset(str long long) # stub _strnset_s @@ -1021,11 +1021,11 @@ # stub _wcslwr_l # stub _wcslwr_s # stub _wcslwr_s_l -@ stub _wcsncoll #(wstr wstr long) +@ cdecl _wcsncoll(wstr wstr long) # stub _wcsncoll_l @ cdecl _wcsnicmp(wstr wstr long) # stub _wcsnicmp_l -@ stub _wcsnicoll #(wstr wstr long) +@ cdecl _wcsnicoll(wstr wstr long) # stub _wcsnicoll_l @ cdecl _wcsnset(wstr long long) # stub _wcsnset_s @@ -1091,7 +1091,7 @@ # stub _wmktemp_s @ varargs _wopen(wstr long) # stub _woutput_s -@ stub _wperror #(wstr) +@ cdecl _wperror(wstr) @ extern _wpgmptr @ cdecl _wpopen (wstr wstr) # stub _wprintf_l @@ -1131,7 +1131,7 @@ @ cdecl _wsystem(wstr) @ cdecl _wtempnam(wstr wstr) # stub _wtempnam_dbg -@ stub _wtmpnam #(ptr) +@ cdecl _wtmpnam(ptr) # stub _wtmpnam_s # @ cdecl _wtof(wstr) # @ cdecl _wtof_l(wstr ptr) Added: trunk/reactos/dll/win32/msvcrt/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/stubs.c?r… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/stubs.c (added) +++ trunk/reactos/dll/win32/msvcrt/stubs.c [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,0 +1,83 @@ + +#include <stubs.h> + +#undef UNIMPLEMENTED +#define UNIMPLEMENTED __wine_spec_unimplemented_stub("msvcrt.dll", __FUNCTION__) + +int __get_app_type() +{ + UNIMPLEMENTED; + return 0; +} + +int _fileinfo; + +void * +__p__fileinfo() +{ + return &_fileinfo; +} + +unsigned char _mbcasemap[1]; + +void * +__p__mbcasemap() +{ + return _mbcasemap; +} + +int _atodbl( + void * value, + char * str) +{ + UNIMPLEMENTED; + return 0; +} + +int _ismbbkprint( + unsigned int c) +{ + UNIMPLEMENTED; + return 0; +} + + +int MSVCRT__inp( + unsigned short port) +{ + return _inp(port); +} + +unsigned short MSVCRT__inpw( + unsigned short port) +{ + return _inpw(port); +} + +unsigned long MSVCRT__inpd( + unsigned short port) +{ + return _inpd(port); +} + + +int MSVCRT__outp( + unsigned short port, + int databyte) +{ + return _outp(port, databyte); +} + +unsigned short MSVCRT__outpw( + unsigned short port, + unsigned short dataword) +{ + return _outpw(port, dataword); +} + +unsigned long MSVCRT__outpd( + unsigned short port, + unsigned long dataword) +{ + return _outpd(port, dataword); +} Propchange: trunk/reactos/dll/win32/msvcrt/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msxml3/msxml3.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml3.sp… ============================================================================== --- trunk/reactos/dll/win32/msxml3/msxml3.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/msxml3.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,10 +1,10 @@ - 6 stub @ - 7 stub @ - 8 stub @ - 9 stub @ -10 stub @ -11 stub @ -12 stub @ + 6 stub MSXML3_6 + 7 stub MSXML3_7 + 8 stub MSXML3_8 + 9 stub MSXML3_9 +10 stub MSXML3_10 +11 stub MSXML3_11 +12 stub MSXML3_12 @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) Modified: trunk/reactos/dll/win32/secur32/secur32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/secur32.… ============================================================================== --- trunk/reactos/dll/win32/secur32/secur32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/secur32.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,17 +1,10 @@ -@ stdcall LsaRegisterLogonProcess(ptr ptr ptr) -@ stdcall LsaLogonUser(ptr ptr long long ptr long ptr ptr ptr ptr ptr ptr ptr ptr) -@ stdcall LsaDeregisterLogonProcess(long) -@ stdcall LsaConnectUntrusted(long) -@ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr) -@ stdcall LsaFreeReturnBuffer(ptr) -@ stdcall LsaCallAuthenticationPackage(long long ptr long ptr ptr ptr) @ stdcall AcceptSecurityContext(ptr ptr ptr long long ptr ptr ptr ptr) @ stdcall AcquireCredentialsHandleA(str str long ptr ptr ptr ptr ptr ptr) @ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) @ stdcall AddCredentialsA(ptr str str long ptr ptr ptr ptr) @ stdcall AddCredentialsW(ptr wstr wstr long ptr ptr ptr ptr) -@ stub AddSecurityPackageA -@ stub AddSecurityPackageW +@ stdcall AddSecurityPackageA(str ptr) +@ stdcall AddSecurityPackageW(wstr ptr) @ stdcall ApplyControlTokenA(ptr ptr) @ stdcall ApplyControlToken(ptr ptr) ApplyControlTokenW @ stdcall CompleteAuthToken(ptr ptr) @@ -19,8 +12,8 @@ @ stub CredUnmarshalTargetInfo @ stdcall DecryptMessage(ptr ptr long ptr) @ stdcall DeleteSecurityContext(ptr) -@ stub DeleteSecurityPackageA -@ stub DeleteSecurityPackageW +@ stdcall DeleteSecurityPackageA(str) +@ stdcall DeleteSecurityPackageW(wstr) @ stdcall EncryptMessage(ptr long ptr long) @ stdcall EnumerateSecurityPackagesA(ptr ptr) @ stdcall EnumerateSecurityPackagesW(ptr ptr) @@ -29,7 +22,7 @@ @ stdcall FreeCredentialsHandle(ptr) @ stdcall GetComputerObjectNameA(long ptr ptr) @ stdcall GetComputerObjectNameW(long ptr ptr) -@ stub GetSecurityUserInfo +@ stdcall GetSecurityUserInfo(ptr long ptr) @ stdcall GetUserNameExA(long ptr ptr) @ stdcall GetUserNameExW(long ptr ptr) @ stdcall ImpersonateSecurityContext(ptr) @@ -39,8 +32,15 @@ @ stdcall InitSecurityInterfaceW() @ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) @ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) +@ stdcall LsaCallAuthenticationPackage(long long ptr long ptr ptr ptr) +@ stdcall LsaConnectUntrusted(long) +@ stdcall LsaDeregisterLogonProcess(long) @ stdcall LsaEnumerateLogonSessions(ptr ptr) +@ stdcall LsaFreeReturnBuffer(ptr) @ stdcall LsaGetLogonSessionData(ptr ptr) +@ stdcall LsaLogonUser(ptr ptr long long ptr long ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr) +@ stdcall LsaRegisterLogonProcess(ptr ptr ptr) @ stdcall LsaRegisterPolicyChangeNotification(long ptr) @ stdcall LsaUnregisterPolicyChangeNotification(long ptr) @ stdcall MakeSignature(ptr long ptr long) @@ -64,7 +64,7 @@ @ stdcall SealMessage(ptr long ptr long) EncryptMessage @ stub SecCacheSspiPackages @ stub SecDeleteUserModeContext -@ stub SecGetLocaleSpecificEncryptionRules +@ stub SecGetLocaleSpecificEncryptionRules # not on win32k3 x64 @ stub SecInitUserModeContext @ stub SecpFreeMemory @ stub SecpTranslateName Added: trunk/reactos/dll/win32/secur32/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/secur32/stubs.c (added) +++ trunk/reactos/dll/win32/secur32/stubs.c [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,0 +1,56 @@ + + +#include <windows.h> + +#define NDEBUG +#include <reactos/debug.h> + +#define SEC_ENTRY WINAPI +#define STATUS_UNSUCCESSFUL ((SECURITY_STATUS)0x80000001) + +typedef LONG SECURITY_STATUS; +typedef PVOID PSECURITY_PACKAGE_OPTIONS, PSecurityUserData; + +SECURITY_STATUS +SEC_ENTRY +DeleteSecurityPackageA(LPSTR pszPackageName) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +SECURITY_STATUS +SEC_ENTRY +DeleteSecurityPackageW(LPWSTR pszPackageName) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +SECURITY_STATUS +SEC_ENTRY +AddSecurityPackageA(LPSTR pszPackageName, PSECURITY_PACKAGE_OPTIONS pOptions) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +SECURITY_STATUS +SEC_ENTRY +AddSecurityPackageW(LPWSTR pszPackageName, PSECURITY_PACKAGE_OPTIONS pOptions) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +SECURITY_STATUS +SEC_ENTRY +GetSecurityUserInfo( + PLUID LogonId, + ULONG Flags, + PSecurityUserData *UserInformation) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + Propchange: trunk/reactos/dll/win32/secur32/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/security/security.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/security/securit… ============================================================================== --- trunk/reactos/dll/win32/security/security.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/security/security.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,48 +1,27 @@ -@ stdcall LsaRegisterLogonProcess(ptr ptr ptr) secur32.LsaRegisterLogonProcess -@ stdcall LsaLogonUser(ptr ptr long long ptr long ptr ptr ptr ptr ptr ptr ptr ptr) secur32.LsaLogonUser -@ stdcall LsaDeregisterLogonProcess(long) secur32.LsaDeregisterLogonProcess -@ stdcall LsaConnectUntrusted(long) secur32.LsaConnectUntrusted -@ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr) SECUR32.LsaLookupAuthenticationPackage -@ stdcall LsaFreeReturnBuffer(ptr) SECUR32.LsaFreeReturnBuffer -@ stdcall LsaCallAuthenticationPackage(long long ptr long ptr ptr ptr) SECUR32.LsaCallAuthenticationPackage @ stdcall AcceptSecurityContext(ptr ptr ptr long long ptr ptr ptr ptr) SECUR32.AcceptSecurityContext @ stdcall AcquireCredentialsHandleA(str str long ptr ptr ptr ptr ptr ptr) SECUR32.AcquireCredentialsHandleA @ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) SECUR32.AcquireCredentialsHandleW -@ stdcall AddCredentialsA(ptr str str long ptr ptr ptr ptr) SECUR32.AddCredentialsA -@ stdcall AddCredentialsW(ptr wstr wstr long ptr ptr ptr ptr) SECUR32.AddCredentialsW -@ stub AddSecurityPackageA # SECUR32.AddSecurityPackageA -@ stub AddSecurityPackageW # SECUR32.AddSecurityPackageW -@ stdcall ApplyControlTokenA(ptr ptr) SECUR32.ApplyControlTokenA -@ stdcall ApplyControlTokenW(ptr ptr) SECUR32.ApplyControlTokenW +@ stdcall AddSecurityPackageA(str ptr) SECUR32.AddSecurityPackageA +@ stdcall AddSecurityPackageW(wstr ptr) SECUR32.AddSecurityPackageW +@ stdcall ApplyControlToken(ptr ptr) SECUR32.ApplyControlToken @ stdcall CompleteAuthToken(ptr ptr) SECUR32.CompleteAuthToken -@ stub CredMarshalTargetInfo # SECUR32.CredMarshalTargetInfo -@ stub CredUnmarshalTargetInfo # SECUR32.CredUnmarshalTargetInfo @ stdcall DecryptMessage(ptr ptr long ptr) SECUR32.DecryptMessage @ stdcall DeleteSecurityContext(ptr) SECUR32.DeleteSecurityContext -@ stub DeleteSecurityPackageA # SECUR32.DeleteSecurityPackageA -@ stub DeleteSecurityPackageW # SECUR32.DeleteSecurityPackageW +@ stdcall DeleteSecurityPackageA(str) SECUR32.DeleteSecurityPackageA +@ stdcall DeleteSecurityPackageW(wstr) SECUR32.DeleteSecurityPackageW @ stdcall EncryptMessage(ptr long ptr long) SECUR32.EncryptMessage @ stdcall EnumerateSecurityPackagesA(ptr ptr) SECUR32.EnumerateSecurityPackagesA @ stdcall EnumerateSecurityPackagesW(ptr ptr) SECUR32.EnumerateSecurityPackagesW @ stdcall ExportSecurityContext(ptr long ptr ptr) SECUR32.ExportSecurityContext @ stdcall FreeContextBuffer(ptr) SECUR32.FreeContextBuffer @ stdcall FreeCredentialsHandle(ptr) SECUR32.FreeCredentialsHandle -@ stdcall GetComputerObjectNameA(long ptr ptr) SECUR32.GetComputerObjectNameA -@ stdcall GetComputerObjectNameW(long ptr ptr) SECUR32.GetComputerObjectNameW -@ stub GetSecurityUserInfo # SECUR32.GetSecurityUserInfo -@ stdcall GetUserNameExA(long ptr ptr) SECUR32.GetUserNameExA -@ stdcall GetUserNameExW(long ptr ptr) SECUR32.GetUserNameExW @ stdcall ImpersonateSecurityContext(ptr) SECUR32.ImpersonateSecurityContext @ stdcall ImportSecurityContextA(str ptr ptr ptr) SECUR32.ImportSecurityContextA @ stdcall ImportSecurityContextW(wstr ptr ptr ptr) SECUR32.ImportSecurityContextW +@ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) SECUR32.InitializeSecurityContextA +@ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) SECUR32.InitializeSecurityContextW @ stdcall InitSecurityInterfaceA() SECUR32.InitSecurityInterfaceA @ stdcall InitSecurityInterfaceW() SECUR32.InitSecurityInterfaceW -@ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) SECUR32.InitializeSecurityContextA -@ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) SECUR32.InitializeSecurityContextW -@ stdcall LsaEnumerateLogonSessions(ptr ptr) SECUR32.LsaEnumerateLogonSessions -@ stdcall LsaGetLogonSessionData(ptr ptr) SECUR32.LsaGetLogonSessionData -@ stdcall LsaRegisterPolicyChangeNotification(long ptr) SECUR32.LsaRegisterPolicyChangeNotification -@ stdcall LsaUnregisterPolicyChangeNotification(long ptr) SECUR32.LsaUnregisterPolicyChangeNotification @ stdcall MakeSignature(ptr long ptr long) SECUR32.MakeSignature @ stdcall QueryContextAttributesA(ptr long ptr) SECUR32.QueryContextAttributesA @ stdcall QueryContextAttributesW(ptr long ptr) SECUR32.QueryContextAttributesW @@ -52,26 +31,7 @@ @ stdcall QuerySecurityPackageInfoA(str ptr) SECUR32.QuerySecurityPackageInfoA @ stdcall QuerySecurityPackageInfoW(wstr ptr) SECUR32.QuerySecurityPackageInfoW @ stdcall RevertSecurityContext(ptr) SECUR32.RevertSecurityContext -@ stub SaslAcceptSecurityContext # SECUR32.SaslAcceptSecurityContext -@ stub SaslEnumerateProfilesA # SECUR32.SaslEnumerateProfilesA -@ stub SaslEnumerateProfilesW # SECUR32.SaslEnumerateProfilesW -@ stub SaslGetProfilePackageA # SECUR32.SaslGetProfilePackageA -@ stub SaslGetProfilePackageW # SECUR32.SaslGetProfilePackageW -@ stub SaslIdentifyPackageA # SECUR32.SaslIdentifyPackageA -@ stub SaslIdentifyPackageW # SECUR32.SaslIdentifyPackageW -@ stub SaslInitializeSecurityContextA # SECUR32.SaslInitializeSecurityContextA -@ stub SaslInitializeSecurityContextW # SECUR32.SaslInitializeSecurityContextW @ stdcall SealMessage(ptr long ptr long) SECUR32.EncryptMessage -@ stub SecCacheSspiPackages # SECUR32.SecCacheSspiPackages -@ stub SecDeleteUserModeContext # SECUR32.SecDeleteUserModeContext -@ stub SecGetLocaleSpecificEncryptionRules # SECUR32.SecGetLocaleSpecificEncryptionRules -@ stub SecInitUserModeContext # SECUR32.SecInitUserModeContext -@ stub SecpFreeMemory # SECUR32.SecpFreeMemory -@ stub SecpTranslateName # SECUR32.SecpTranslateName -@ stub SecpTranslateNameEx # SECUR32.SecpTranslateNameEx -@ stub SetContextAttributesA # SECUR32.SetContextAttributesA -@ stub SetContextAttributesW #SECUR32.SetContextAttributesW -@ stdcall TranslateNameA(str long long ptr ptr) SECUR32.TranslateNameA -@ stdcall TranslateNameW(wstr long long ptr ptr) SECUR32.TranslateNameW @ stdcall UnsealMessage(ptr ptr long ptr) SECUR32.DecryptMessage @ stdcall VerifySignature(ptr ptr long ptr) SECUR32.VerifySignature + Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -43,7 +43,7 @@ 158 stdcall -noname SHRestricted2A(long str long) 159 stdcall -noname SHRestricted2W(long wstr long) 160 stub -noname SHIsRestricted2W -161 stub @ # CSearchAssistantOC::OnDraw +161 stub shdocvw_161 # CSearchAssistantOC::OnDraw 162 stub -noname CDDEAuto_Navigate 163 stub SHAddSubscribeFavorite 164 stub -noname ResetProfileSharing @@ -66,7 +66,7 @@ 185 stub -noname FireEvent_Quit 187 stub -noname SHDGetPageLocation 188 stub -noname SHIEErrorMsgBox -189 stub @ # FIXME: same as ordinal 148 +189 stub shdocvw_189 # FIXME: same as ordinal 148 190 stub -noname SHRunIndirectRegClientCommandForward 191 stub -noname SHIsRegisteredClient 192 stub -noname SHGetHistoryPIDL @@ -75,7 +75,7 @@ 196 stub -noname IEDDE_WindowDestroyed 197 stub -noname IEDDE_NewWindow 198 stub -noname IsErrorUrl -199 stub @ +199 stub shdocvw_199 200 stub -noname SHGetViewStream 203 stub -noname NavToUrlUsingIEA 204 stub -noname NavToUrlUsingIEW @@ -91,7 +91,7 @@ 217 stub -noname GetDefaultInternetSearchUrlA 218 stdcall -noname IEParseDisplayNameWithBCW(long wstr ptr ptr) 219 stub -noname IEILIsEqual -220 stub @ +220 stub shdocvw_220 221 stub -noname IECreateFromPathCPWithBCA 222 stub -noname IECreateFromPathCPWithBCW 223 stub -noname ResetWebSettings Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -417,7 +417,7 @@ 417 stub -noname SHWinHelpOnDemandA 418 stdcall -noname MLFreeLibrary(long) 419 stdcall -noname SHFlushSFCacheWrap() -420 stub @ # CMemStream::Commit +420 stub SHLWAPI_420 # CMemStream::Commit 421 stub -noname SHLoadPersistedDataObject 422 stdcall -noname SHGlobalCounterCreateNamedA(str long) 423 stdcall -noname SHGlobalCounterCreateNamedW(wstr long) Modified: trunk/reactos/dll/win32/tapi32/tapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/tapi32.sp… ============================================================================== --- trunk/reactos/dll/win32/tapi32/tapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/tapi32/tapi32.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -100,7 +100,7 @@ @ stub lineGetCountryW @ stdcall lineGetDevCaps(long long long long ptr) lineGetDevCapsA @ stdcall lineGetDevCapsA(long long long long ptr) -@ stub lineGetDevCapsW +@ stdcall lineGetDevCapsW(ptr long long long ptr) @ stdcall lineGetDevConfig(long ptr str) lineGetDevConfigA @ stdcall lineGetDevConfigA(long ptr str) @ stub lineGetDevConfigW @@ -108,7 +108,7 @@ @ stub lineGetGroupListW @ stdcall lineGetID(long long long long ptr str) lineGetIDA @ stdcall lineGetIDA(long long long long ptr str) -@ stub lineGetIDW +@ stdcall lineGetIDW(ptr long ptr long ptr ptr) @ stdcall lineGetIcon(long str ptr) lineGetIconA @ stdcall lineGetIconA(long str ptr) @ stub lineGetIconW @@ -120,7 +120,7 @@ @ stdcall lineGetNumRings(long long ptr) @ stdcall lineGetProviderList(long ptr) lineGetProviderListA @ stdcall lineGetProviderListA(long ptr) -@ stub lineGetProviderListW +@ stdcall lineGetProviderListW(long ptr) @ stub lineGetProxyStatus @ stub lineGetQueueInfo @ stub lineGetQueueInfoA @@ -141,7 +141,7 @@ @ stub lineInitializeExW @ stdcall lineMakeCall(long ptr str long ptr) lineMakeCallA @ stdcall lineMakeCallA(long ptr str long ptr) -@ stub lineMakeCallW +@ stdcall lineMakeCallW(ptr ptr ptr long ptr) @ stdcall lineMonitorDigits(long long) @ stdcall lineMonitorMedia(long long) @ stdcall lineMonitorTones(long ptr long) Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -541,3 +541,94 @@ return 0; } +BOOL +WINAPI +BuildReasonArray(PVOID Pointer) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID +WINAPI +CreateSystemThreads(DWORD dwUnknown) +{ + NtUserCallOneParam(dwUnknown, ONEPARAM_ROUTINE_CREATESYSTEMTHREADS); +} + +BOOL +WINAPI +DestroyReasons(PVOID Pointer) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +DeviceEventWorker(DWORD dw1, DWORD dw2, DWORD dw3, DWORD dw4, DWORD dw5) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +GetCursorFrameInfo(DWORD dw1, DWORD dw2, DWORD dw3, DWORD dw4, DWORD dw5) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +GetReasonTitleFromReasonCode(DWORD dw1, DWORD dw2, DWORD dw3) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +RecordShutdownReason(DWORD dw0) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +UserLpkPSMTextOut(DWORD dw1, DWORD dw2, DWORD dw3, DWORD dw4, DWORD dw5, DWORD dw6) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +UserLpkTabbedTextOut( + DWORD dw1, + DWORD dw2, + DWORD dw3, + DWORD dw4, + DWORD dw5, + DWORD dw6, + DWORD dw7, + DWORD dw8, + DWORD dw9, + DWORD dw10, + DWORD dw11, + DWORD dw12) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +Win32PoolAllocationStats(DWORD dw1, DWORD dw2, DWORD dw3, DWORD dw4, DWORD dw5) +{ + UNIMPLEMENTED; + return FALSE; +} + Modified: trunk/reactos/dll/win32/winmm/winmm.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.spec… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -1,7 +1,7 @@ # ordinal exports 1 stdcall @(ptr long long) PlaySoundA -3 stub @ -4 stub @ +3 stub WINMM_3 +4 stub WINMM_4 @ stdcall CloseDriver(long long long) @ stdcall DefDriverProc(long long long long long) Modified: trunk/reactos/dll/win32/ws2_32/ws2_32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/ws2_32.sp… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/ws2_32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/ws2_32.spec [iso-8859-1] Fri Feb 11 17:01:40 2011 @@ -48,7 +48,7 @@ 151 stdcall __WSAFDIsSet(long ptr) -500 stub WEP +500 stdcall WEP() # @ stdcall GetAddrInfoW(wstr wstr ptr ptr) @ stdcall WSApSetPostRoutine(ptr) @@ -84,13 +84,13 @@ @ stdcall WSALookupServiceEnd(long) @ stdcall WSALookupServiceNextA(long long ptr ptr) @ stdcall WSALookupServiceNextW(long long ptr ptr) -@ stub WSANSPIoctl +@ stdcall WSANSPIoctl(ptr long ptr long ptr long ptr ptr) @ stdcall WSANtohl(long long ptr) @ stdcall WSANtohs(long long ptr) @ stdcall WSAProviderConfigChange(ptr ptr ptr) @ stdcall WSARecv(long ptr long ptr ptr ptr ptr) @ stdcall WSARecvDisconnect(long ptr) -@ stdcall WSARecvFrom(long ptr long ptr ptr ptr ptr ptr ptr ) +@ stdcall WSARecvFrom(long ptr long ptr ptr ptr ptr ptr ptr ) @ stdcall WSARemoveServiceClass(ptr) @ stdcall WSAResetEvent(long) kernel32.ResetEvent @ stdcall WSASend(long ptr long ptr long ptr ptr) @@ -111,8 +111,8 @@ @ stdcall WSCInstallNameSpace(wstr wstr long long ptr) @ stdcall WSCInstallProvider(ptr wstr ptr long ptr) @ stdcall WSCUnInstallNameSpace(ptr) -@ stub WSCUpdateProvider -@ stub WSCWriteNameSpaceOrder +@ stdcall WSCUpdateProvider(ptr ptr ptr long ptr) +@ stdcall WSCWriteNameSpaceOrder(ptr long) @ stdcall WSCWriteProviderOrder(ptr long) @ stdcall freeaddrinfo(ptr) @ stdcall getaddrinfo(str str ptr ptr)

1 0

[akhaldi] 50656: Reduce difference with the cmake branch, mostly msvc and amd64 fixes.
by akhaldi＠svn.reactos.org 11 Feb '11

11 Feb '11

Author: akhaldi Date: Fri Feb 11 13:48:41 2011 New Revision: 50656 URL: http://svn.reactos.org/svn/reactos?rev=50656&view=rev Log: Reduce difference with the cmake branch, mostly msvc and amd64 fixes. Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/drivers/storage/classpnp/class.c trunk/reactos/drivers/storage/classpnp/obsolete.c trunk/reactos/include/crt/mingw32/intrin_x86.h trunk/reactos/include/crt/setjmp.h trunk/reactos/include/crt/stddef.h trunk/reactos/include/crt/stdlib.h trunk/reactos/include/crt/string.h trunk/reactos/include/crt/sys/stat.h trunk/reactos/include/crt/vadefs.h trunk/reactos/include/ndk/inline_ntcurrentteb.h trunk/reactos/include/ndk/peb_teb.h trunk/reactos/include/psdk/rpc.h trunk/reactos/include/psdk/strsafe.h trunk/reactos/include/psdk/unknown.h trunk/reactos/include/psdk/wspiapi.h trunk/reactos/include/reactos/asm.h trunk/reactos/include/reactos/mingw-w64/sect_attribs.h trunk/reactos/include/xdk/kefuncs.h trunk/reactos/lib/drivers/ip/network/i386/checksum.S trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/tools/unicode/string.c trunk/reactos/tools/unicode/wine/unicode.h Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -39,6 +39,10 @@ extern ULONG LoaderPagesSpanned; extern BOOLEAN AcpiPresent; +extern HEADLESS_LOADER_BLOCK LoaderRedirectionInformation; +extern BOOLEAN WinLdrTerminalConnected; +extern void WinLdrSetupEms(IN PCHAR BootOptions); + BOOLEAN WinLdrCheckForLoadedDll(IN OUT PLOADER_PARAMETER_BLOCK WinLdrBlock, IN PCH DllName, @@ -206,8 +210,6 @@ #ifdef _M_IX86 /* Set headless block pointer */ - extern HEADLESS_LOADER_BLOCK LoaderRedirectionInformation; - extern BOOLEAN WinLdrTerminalConnected; if (WinLdrTerminalConnected) { Extension->HeadlessLoaderBlock = MmHeapAlloc(sizeof(HEADLESS_LOADER_BLOCK)); @@ -537,7 +539,6 @@ #ifdef _M_IX86 /* Setup redirection support */ - extern void WinLdrSetupEms(IN PCHAR BootOptions); WinLdrSetupEms(BootOptions); #endif /* Detect hardware */ Modified: trunk/reactos/drivers/storage/classpnp/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -2485,7 +2485,7 @@ retry = TRUE; } - if (retry && (irpStack->Parameters.Others.Argument4--)) { + if (retry && ((*(PCHAR*)&irpStack->Parameters.Others.Argument4)--)) { // // Retry request. Modified: trunk/reactos/drivers/storage/classpnp/obsolete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/o… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/obsolete.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/obsolete.c [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -161,7 +161,7 @@ retry = TRUE; } - if (retry && (irpStack->Parameters.Others.Argument4--)) { + if (retry && ((*(PCHAR*)&irpStack->Parameters.Others.Argument4)--)) { // // Retry request. If the class driver has supplied a StartIo, Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -1128,6 +1128,39 @@ __asm__ __volatile__("rep; outsl" : : [Port] "d" (Port), [Buffer] "S" (Buffer), "c" (Count)); } +__INTRIN_INLINE int _inp(unsigned short Port) +{ + return __inbyte(Port); +} + +__INTRIN_INLINE unsigned short _inpw(unsigned short Port) +{ + return __inword(Port); +} + +__INTRIN_INLINE unsigned long _inpd(unsigned short Port) +{ + return __indword(Port); +} + +__INTRIN_INLINE int _outp(unsigned short Port, int databyte) +{ + __outbyte(Port, databyte); + return databyte; +} + +__INTRIN_INLINE unsigned short _outpw(unsigned short Port, unsigned short dataword) +{ + __outword(Port, dataword); + return dataword; +} + +__INTRIN_INLINE unsigned long _outpd(unsigned short Port, unsigned long dataword) +{ + __outdword(Port, dataword); + return dataword; +} + /*** System information ***/ __INTRIN_INLINE void __cpuid(int CPUInfo[], const int InfoType) Modified: trunk/reactos/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/setjmp.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/setjmp.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/setjmp.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -145,9 +145,6 @@ #define _JMP_BUF_DEFINED #endif -#ifdef _MSC_VER -int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf); -#else #ifdef USE_MINGW_SETJMP_TWO_ARGS #ifndef _INC_SETJMPEX #if defined(__x86_64) @@ -158,20 +155,19 @@ ({ void* value; __asm__ __volatile__("movl %%esp, %[value]" : [value] "=r" (value)); value; }) #endif #define setjmp(BUF) _setjmp((BUF),mingw_getsp()) - int __cdecl __MINGW_NOTHROW _setjmp(jmp_buf _Buf,void *_Ctx); -#else + int __MINGW_NOTHROW __cdecl _setjmp(jmp_buf _Buf,void *_Ctx); +#else /* _INC_SETJMPEX */ #undef setjmp #define setjmp(BUF) _setjmpex((BUF),mingw_getsp()) #define setjmpex(BUF) _setjmpex((BUF),mingw_getsp()) - int __cdecl __MINGW_NOTHROW _setjmpex(jmp_buf _Buf,void *_Ctx); -#endif -#else + int __MINGW_NOTHROW __cdecl _setjmpex(jmp_buf _Buf,void *_Ctx); +#endif /* _INC_SETJMPEX */ +#else /* !USE_MINGW_SETJMP_TWO_ARGS */ #ifndef _INC_SETJMPEX #define setjmp _setjmp #endif - int __cdecl __MINGW_NOTHROW setjmp(jmp_buf _Buf); -#endif -#endif + int __MINGW_NOTHROW __cdecl setjmp(jmp_buf _Buf); +#endif /* !USE_MINGW_SETJMP_TWO_ARGS */ __declspec(noreturn) __MINGW_NOTHROW void __cdecl ms_longjmp(jmp_buf _Buf,int _Value)/* throw(...)*/; __declspec(noreturn) __MINGW_NOTHROW void __cdecl longjmp(jmp_buf _Buf,int _Value); Modified: trunk/reactos/include/crt/stddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stddef.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/stddef.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stddef.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -13,13 +13,7 @@ extern "C" { #endif -#ifndef _CRT_ERRNO_DEFINED -#define _CRT_ERRNO_DEFINED - _CRTIMP extern int *__cdecl _errno(void); -#define errno (*_errno()) - errno_t __cdecl _set_errno(int _Value); - errno_t __cdecl _get_errno(int *_Value); -#endif +#include <errno.h> _CRTIMP extern unsigned long __cdecl __threadid(void); #define _threadid (__threadid()) Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -134,13 +134,7 @@ _invalid_parameter_handler __cdecl _set_invalid_parameter_handler(_invalid_parameter_handler _Handler); _invalid_parameter_handler __cdecl _get_invalid_parameter_handler(void); -#ifndef _CRT_ERRNO_DEFINED -#define _CRT_ERRNO_DEFINED - _CRTIMP extern int *__cdecl _errno(void); -#define errno (*_errno()) - errno_t __cdecl _set_errno(int _Value); - errno_t __cdecl _get_errno(int *_Value); -#endif +#include <errno.h> _CRTIMP unsigned long *__cdecl __doserrno(void); #define _doserrno (*__doserrno()) errno_t __cdecl _set_doserrno(unsigned long _Value); @@ -447,10 +441,10 @@ _CRTIMP void __cdecl _wsplitpath(const wchar_t *_FullPath,wchar_t *_Drive,wchar_t *_Dir,wchar_t *_Filename,wchar_t *_Ext); #endif - _CRTIMP void __cdecl _beep(unsigned _Frequency,unsigned _Duration) __MINGW_ATTRIB_DEPRECATED; + _CRTIMP __MINGW_ATTRIB_DEPRECATED void __cdecl _beep(unsigned _Frequency,unsigned _Duration); /* Not to be confused with _set_error_mode (int). */ - _CRTIMP void __cdecl _seterrormode(int _Mode) __MINGW_ATTRIB_DEPRECATED; - _CRTIMP void __cdecl _sleep(unsigned long _Duration) __MINGW_ATTRIB_DEPRECATED; + _CRTIMP __MINGW_ATTRIB_DEPRECATED void __cdecl _seterrormode(int _Mode); + _CRTIMP __MINGW_ATTRIB_DEPRECATED void __cdecl _sleep(unsigned long _Duration); #endif #ifndef NO_OLDNAMES Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/string.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/string.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -82,6 +82,17 @@ _CRTIMP char *_strupr_l(char *_String,_locale_t _Locale); _CRTIMP size_t __cdecl strxfrm(char *_Dst,const char *_Src,size_t _MaxCount); _CRTIMP size_t __cdecl _strxfrm_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); +#if __STDC_WANT_SECURE_LIB__ + _CRTIMP errno_t __cdecl _strset_s(char *_Dst,size_t _DstSize,int _Value); + _CRTIMP errno_t __cdecl _strerror_s(char *_Buf,size_t _SizeInBytes,const char *_ErrMsg); + _CRTIMP errno_t __cdecl _strlwr_s(char *_Str,size_t _Size); + _CRTIMP errno_t __cdecl _strlwr_s_l(char *_Str,size_t _Size,_locale_t _Locale); + _CRTIMP errno_t __cdecl _strnset_s(char *_Str,size_t _Size,int _Val,size_t _MaxCount); + _CRTIMP errno_t __cdecl _strupr_s(char *_Str,size_t _Size); + _CRTIMP errno_t __cdecl _strupr_s_l(char *_Str,size_t _Size,_locale_t _Locale); + _CRTIMP errno_t __cdecl strcpy_s(char *_Dst, size_t _Size, const char *_Src); + _CRTIMP errno_t __cdecl strcat_s(char *_Dst, size_t _Size, const char *_Src); +#endif #ifndef NO_OLDNAMES _CRTIMP _CRT_NONSTDC_DEPRECATE(_strdup) char *__cdecl strdup(const char *_Src); @@ -102,27 +113,15 @@ _CRTIMP wchar_t *__cdecl _wcsdup(const wchar_t *_Str); _CRTIMP _CRT_INSECURE_DEPRECATE(wcsat_s) wchar_t *__cdecl wcscat(wchar_t *_Dest,const wchar_t *_Source); -#if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcsat_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); -#endif _CRTIMP _CONST_RETURN wchar_t *__cdecl wcschr(const wchar_t *_Str,wchar_t _Ch); _CRTIMP int __cdecl wcscmp(const wchar_t *_Str1,const wchar_t *_Str2); _CRTIMP _CRT_INSECURE_DEPRECATE(wcscpy_s) wchar_t *__cdecl wcscpy(wchar_t *_Dest,const wchar_t *_Source); -#if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcscpy_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); -#endif _CRTIMP size_t __cdecl wcscspn(const wchar_t *_Str,const wchar_t *_Control); _CRTIMP wchar_t *wcsncat(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); _CRTIMP size_t __cdecl wcslen(const wchar_t *_Str); _CRTIMP _CRT_INSECURE_DEPRECATE(wcsnlen_s) size_t __cdecl wcsnlen(const wchar_t *_Src,size_t _MaxCount); -#if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcsnlen_s(wchar_t **_Src, size_t _MaxCount); -#endif _CRTIMP int __cdecl wcsncmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); _CRTIMP _CRT_INSECURE_DEPRECATE(wcsncpy_s) wchar_t *wcsncpy(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); -#if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcsncpy_s(wchar_t *_Dest, size_t SizeInWords, const wchar_t *_Source ,size_t _Count); -#endif _CRTIMP _CONST_RETURN wchar_t *__cdecl wcspbrk(const wchar_t *_Str,const wchar_t *_Control); _CRTIMP _CONST_RETURN wchar_t *__cdecl wcsrchr(const wchar_t *_Str,wchar_t _Ch); _CRTIMP size_t __cdecl wcsspn(const wchar_t *_Str,const wchar_t *_Control); @@ -151,6 +150,20 @@ _CRTIMP int __cdecl _wcsncoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); _CRTIMP int __cdecl _wcsnicoll(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); _CRTIMP int __cdecl _wcsnicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); +#if __STDC_WANT_SECURE_LIB__ + _CRTIMP errno_t __cdecl wcsat_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); + _CRTIMP errno_t __cdecl wcscpy_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); + _CRTIMP errno_t __cdecl wcsnlen_s(wchar_t **_Src, size_t _MaxCount); + _CRTIMP errno_t __cdecl wcsncpy_s(wchar_t *_Dest, size_t SizeInWords, const wchar_t *_Source ,size_t _Count); + _CRTIMP errno_t __cdecl _wcserror_s(wchar_t *_Buf,size_t _SizeInWords,int _ErrNum); + _CRTIMP errno_t __cdecl __wcserror_s(wchar_t *_Buffer,size_t _SizeInWords,const wchar_t *_ErrMsg); + _CRTIMP errno_t __cdecl _wcsnset_s(wchar_t *_Dst,size_t _DstSizeInWords,wchar_t _Val,size_t _MaxCount); + _CRTIMP errno_t __cdecl _wcsset_s(wchar_t *_Str,size_t _SizeInWords,wchar_t _Val); + _CRTIMP errno_t __cdecl _wcslwr_s(wchar_t *_Str,size_t _SizeInWords); + _CRTIMP errno_t __cdecl _wcslwr_s_l(wchar_t *_Str,size_t _SizeInWords,_locale_t _Locale); + _CRTIMP errno_t __cdecl _wcsupr_s(wchar_t *_Str,size_t _Size); + _CRTIMP errno_t __cdecl _wcsupr_s_l(wchar_t *_Str,size_t _Size,_locale_t _Locale); +#endif #ifndef NO_OLDNAMES _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsdup) wchar_t *__cdecl wcsdup(const wchar_t *_Str); @@ -171,8 +184,6 @@ } #endif -#include <sec_api/string_s.h> - // HACK #define strcasecmp _stricmp #define strncasecmp _strnicmp @@ -180,3 +191,4 @@ #define wcsicmp _wcsicmp #endif + Modified: trunk/reactos/include/crt/sys/stat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/stat.h?rev… ============================================================================== --- trunk/reactos/include/crt/sys/stat.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/stat.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -187,9 +187,9 @@ _Stat->st_gid = _Stat64.st_gid; _Stat->st_rdev = _Stat64.st_rdev; _Stat->st_size = _Stat64.st_size; - _Stat->st_atime = _Stat64.st_atime; - _Stat->st_mtime = _Stat64.st_mtime; - _Stat->st_ctime = _Stat64.st_ctime; + _Stat->st_atime = (__time32_t)_Stat64.st_atime; + _Stat->st_mtime = (__time32_t)_Stat64.st_mtime; + _Stat->st_ctime = (__time32_t)_Stat64.st_ctime; return ret; } __CRT_INLINE int __cdecl _fstat32i64(int _FileDes, struct _stat32i64 *_Stat) @@ -204,9 +204,9 @@ _Stat->st_gid = _Stat64.st_gid; _Stat->st_rdev = _Stat64.st_rdev; _Stat->st_size = _Stat64.st_size; - _Stat->st_atime = _Stat64.st_atime; - _Stat->st_mtime = _Stat64.st_mtime; - _Stat->st_ctime = _Stat64.st_ctime; + _Stat->st_atime = (__time32_t)_Stat64.st_atime; + _Stat->st_mtime = (__time32_t)_Stat64.st_mtime; + _Stat->st_ctime = (__time32_t)_Stat64.st_ctime; return ret; } #endif /* _USE_32BIT_TIME_T */ Modified: trunk/reactos/include/crt/vadefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/vadefs.h?rev=5… ============================================================================== --- trunk/reactos/include/crt/vadefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/vadefs.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -81,14 +81,24 @@ #define __va_copy(d,s) __builtin_va_copy(d,s) #elif defined(_MSC_VER) -#if defined(_M_IA64) || defined(_M_AMD64) || defined(_M_CEE) -#error Please implement me -#endif - +#if defined(_M_IX86) #define _crt_va_start(v,l) ((void)((v) = (va_list)_ADDRESSOF(l) + _INTSIZEOF(l))) #define _crt_va_arg(v,l) (*(l *)(((v) += _INTSIZEOF(l)) - _INTSIZEOF(l))) #define _crt_va_end(v) ((void)((v) = (va_list)0)) #define __va_copy(d,s) ((void)((d) = (s))) +#elif defined(_M_AMD64) +#define _PTRSIZEOF(n) ((sizeof(n) + sizeof(void*) - 1) & ~(sizeof(void*) - 1)) +#define _ISSTRUCT(t) ((sizeof(t) > sizeof(void*)) || (sizeof(t) & (sizeof(t)-1)) != 0) +#define _crt_va_start(v,l) ((void)((v) = (va_list)_ADDRESSOF(l) + _PTRSIZEOF(l))) +#define _crt_va_arg(v,t) (_ISSTRUCT(t) ? \ + (**(t**)(((v) += sizeof(void*)) - sizeof(void*))) : \ + (*(t*)(((v) += sizeof(void*)) - sizeof(void*)))) +#define _crt_va_end(v) ((void)((v) = (va_list)0)) +#define __va_copy(d,s) ((void)((d) = (s))) +#else //if defined(_M_IA64) || defined(_M_CEE) +#error Please implement me +#endif + #endif #if !defined(va_copy) && (!defined(__STRICT_ANSI__) || __STDC_VERSION__ + 0 >= 199900L) Modified: trunk/reactos/include/ndk/inline_ntcurrentteb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/inline_ntcurre… ============================================================================== --- trunk/reactos/include/ndk/inline_ntcurrentteb.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/inline_ntcurrentteb.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -1,20 +1,10 @@ #ifndef _INLINE_NT_CURRENTTEB_H_ #define _INLINE_NT_CURRENTTEB_H_ - -#ifdef __GNUC__ #if defined(_M_IX86) FORCEINLINE struct _TEB * NtCurrentTeb(void) { - struct _TEB *ret; - - __asm__ __volatile__ ( - "movl %%fs:0x18, %0\n" - : "=r" (ret) - : /* no inputs */ - ); - - return ret; + return (struct _TEB *)__readfsdword(0x18); } #elif defined(_M_ARM) @@ -24,63 +14,17 @@ #include <armddk.h> #elif defined(_M_AMD64) -FORCEINLINE struct _TEB * NtCurrentTeb(VOID) +FORCEINLINE struct _TEB * NtCurrentTeb(void) { return (struct _TEB *)__readgsqword(FIELD_OFFSET(NT_TIB, Self)); } #elif defined(_M_PPC) -extern __inline__ struct _TEB * NtCurrentTeb(void) +FORCEINLINE struct _TEB * NtCurrentTeb(void) { - return __readfsdword_winnt(0x18); + return (struct _TEB *)__readfsdword_winnt(0x18); } #else -extern __inline__ struct _TEB * NtCurrentTeb(void) -{ - return __readfsdword_winnt(0x18); -} +#error Unsupported architecture #endif -#elif defined(__WATCOMC__) - -extern PVOID GetCurrentFiber(void); -#pragma aux GetCurrentFiber = \ - "mov eax, dword ptr fs:0x10" \ - value [eax] \ - modify [eax]; - -extern struct _TEB * NtCurrentTeb(void); -#pragma aux NtCurrentTeb = \ - "mov eax, dword ptr fs:0x18" \ - value [eax] \ - modify [eax]; - -#elif defined(_MSC_VER) - -#if (_MSC_FULL_VER >= 13012035) - -__inline PVOID GetCurrentFiber(void) { return (PVOID)(ULONG_PTR)__readfsdword(0x10); } -__inline struct _TEB * NtCurrentTeb(void) { return (struct _TEB *)(ULONG_PTR)__readfsdword(0x18); } - -#else - -static __inline PVOID GetCurrentFiber(void) -{ - PVOID p; - __asm mov eax, fs:[10h] - __asm mov [p], eax - return p; -} - -static __inline struct _TEB * NtCurrentTeb(void) -{ - struct _TEB *p; - __asm mov eax, fs:[18h] - __asm mov [p], eax - return p; -} - -#endif /* _MSC_FULL_VER */ - -#endif /* __GNUC__/__WATCOMC__/_MSC_VER */ - #endif//_INLINE_NT_CURRENTTEB_H_ Modified: trunk/reactos/include/ndk/peb_teb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/peb_teb.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/peb_teb.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/peb_teb.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -12,7 +12,7 @@ #define PTR(x) x #endif -#if defined(_WIN64) && !defined(EXPLICIT_32BIT) +#if (defined(_WIN64) && !defined(EXPLICIT_32BIT)) || defined(EXPLICIT_64BIT) #define GDI_HANDLE_BUFFER_SIZE 60 #else #define GDI_HANDLE_BUFFER_SIZE 34 Modified: trunk/reactos/include/psdk/rpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpc.h?rev=506… ============================================================================== --- trunk/reactos/include/psdk/rpc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpc.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -1,17 +1,11 @@ #if !defined( RPC_NO_WINDOWS_H ) && !defined( MAC ) && !defined( _MAC ) -#if defined (_OLE32_) -#ifndef RC_INVOKED -#include <stdarg.h> -#endif -#include <windef.h> -#include <winbase.h> -#else +#ifndef _INC_WINDOWS #include <windows.h> -#endif +#endif /* _INC_WINDOWS */ #endif -#ifdef __GNUC__ +#ifndef RC_INVOKED #include <pseh/pseh2.h> #endif Modified: trunk/reactos/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/strsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/strsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/strsafe.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -1,6 +1,7 @@ #ifndef __STRSAFE_H_ #define __STRSAFE_H_ +#include <stdio.h> #include <stdlib.h> #include <stdarg.h> @@ -238,7 +239,11 @@ #else // !STRSAFE_LIB /* Create inlined versions */ +#ifdef __GNUC__ #define STRSAFEAPI HRESULT static __inline__ +#else +#define STRSAFEAPI HRESULT __inline +#endif #define STRSAFE_MAX_CXX STRSAFE_CCHtoCXX(STRSAFE_MAX_CCH) @@ -496,7 +501,7 @@ if (SUCCEEDED(hr)) { - if ((dwFlags & STRSAFE_FILL_BEHIND_NULL) && (iResult + 1 < cchMax)) + if ((dwFlags & STRSAFE_FILL_BEHIND_NULL) && ((size_t)iResult + 1 < cchMax)) { memset(pszDest + iResult + 1, dwFlags & 0xff, Modified: trunk/reactos/include/psdk/unknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/unknown.h?rev… ============================================================================== --- trunk/reactos/include/psdk/unknown.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/unknown.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -16,8 +16,8 @@ * */ -#ifndef __unknwn_h__ -#define __unknwn_h__ +#ifndef _UNKNOWN_H_ +#define _UNKNOWN_H_ #ifdef __cplusplus extern "C" { @@ -70,5 +70,5 @@ IN POOL_TYPE PoolType ); -#endif +#endif /* _UNKNOWN_H_ */ Modified: trunk/reactos/include/psdk/wspiapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wspiapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wspiapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wspiapi.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -44,6 +44,12 @@ #define getaddrinfo WspiapiGetAddrInfo #define getnameinfo WspiapiGetNameInfo #define freeaddrinfo WspiapiFreeAddrInfo + +#if _MSC_VER +#define WSPIAPI_INLINE __inline +#else +#define WSPIAPI_INLINE static inline +#endif typedef int (WINAPI *WSPIAPI_PGETADDRINFO)( @@ -436,12 +442,12 @@ } WSPIAPI_FUNCTION; #define WSPIAPI_FUNCTION_ARRAY { \ - "getaddrinfo", (FARPROC) WspiapiLegacyGetAddrInfo, \ - "getnameinfo", (FARPROC) WspiapiLegacyGetNameInfo, \ - "freeaddrinfo", (FARPROC) WspiapiLegacyFreeAddrInfo, \ -} - -FORCEINLINE + {"getaddrinfo", (FARPROC) WspiapiLegacyGetAddrInfo}, \ + {"getnameinfo", (FARPROC) WspiapiLegacyGetNameInfo}, \ + {"freeaddrinfo", (FARPROC) WspiapiLegacyFreeAddrInfo} \ +} + +WSPIAPI_INLINE FARPROC WINAPI WspiapiLoad( @@ -503,7 +509,7 @@ return (rgtGlobal[wFunction].pfAddress); } -FORCEINLINE +WSPIAPI_INLINE int WINAPI WspiapiGetAddrInfo( @@ -522,7 +528,7 @@ return iError; } -FORCEINLINE +WSPIAPI_INLINE int WINAPI WspiapiGetNameInfo( @@ -544,7 +550,7 @@ return iError; } -FORCEINLINE +WSPIAPI_INLINE void WINAPI WspiapiFreeAddrInfo( Modified: trunk/reactos/include/reactos/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/asm.h?rev=… ============================================================================== --- trunk/reactos/include/reactos/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/asm.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -12,6 +12,7 @@ OPTION DOTNAME .586 +.XMM .MODEL FLAT ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING @@ -73,6 +74,10 @@ .long MACRO args:VARARG dd args +ENDM + +.double MACRO args:VARARG + dq args ENDM UNIMPLEMENTED MACRO name @@ -115,6 +120,10 @@ /* MASM compatible PUBLIC */ .macro PUBLIC symbol .global \symbol +.endm + +/* Dummy ASSUME */ +.macro ASSUME p1 p2 p3 p4 p5 p6 p7 p8 .endm /* MASM compatible ALIGN */ Modified: trunk/reactos/include/reactos/mingw-w64/sect_attribs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mingw-w64/… ============================================================================== --- trunk/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mingw-w64/sect_attribs.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -9,7 +9,7 @@ #if defined(_M_IA64) || defined(_M_AMD64) #define _ATTRIBUTES #else -#define _ATTRIBUTES shared +#define _ATTRIBUTES read #endif /* Reference list of existing section for msvcrt. */ Modified: trunk/reactos/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/kefuncs.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -208,7 +208,7 @@ #endif NTKERNELAPI -DECLSPEC_NORETURN +//DECLSPEC_NORETURN VOID NTAPI KeBugCheckEx( Modified: trunk/reactos/lib/drivers/ip/network/i386/checksum.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/i38… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/i386/checksum.S [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/i386/checksum.S [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -24,109 +24,111 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ - + /* * computes a partial checksum, e.g. for TCP/UDP fragments */ -/* +/* unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum) */ - -.text + +#include <asm.inc> + +.code .align 4 -.globl _csum_partial - +PUBLIC _csum_partial + #ifndef CONFIG_X86_USE_PPRO_CHECKSUM - /* + /* * Experiments with Ethernet and SLIP connections show that buff * is aligned on either a 2-byte or 4-byte boundary. We get at * least a twofold speedup on 486 and Pentium if it is 4-byte aligned. * Fortunately, it is easy to convert 2-byte alignment to 4-byte * alignment for the unrolled loop. - */ -_csum_partial: - pushl %esi - pushl %ebx - movl 20(%esp),%eax # Function arg: unsigned int sum - movl 16(%esp),%ecx # Function arg: int len - movl 12(%esp),%esi # Function arg: unsigned char *buff - testl $3, %esi # Check alignment. - jz 2f # Jump if alignment is ok. - testl $1, %esi # Check alignment. - jz 10f # Jump if alignment is boundary of 2bytes. + */ +_csum_partial: + push esi + push ebx + mov eax, [esp + 20] // Function arg: unsigned int sum + mov ecx, [esp + 16] // Function arg: int len + mov esi, [esp + 12] // Function arg: unsigned char *buff + test esi, 3 // Check alignment. + jz m2 // Jump if alignment is ok. + test esi, 1 // Check alignment. + jz l10 // Jump if alignment is boundary of 2bytes. // buf is odd - dec %ecx - jl 8f - movzbl (%esi), %ebx - adcl %ebx, %eax - roll $8, %eax - inc %esi - testl $2, %esi - jz 2f -10: - subl $2, %ecx # Alignment uses up two bytes. - jae 1f # Jump if we had at least two bytes. - addl $2, %ecx # ecx was < 2. Deal with it. - jmp 4f -1: movw (%esi), %bx - addl $2, %esi - addw %bx, %ax - adcl $0, %eax -2: - movl %ecx, %edx - shrl $5, %ecx - jz 2f - testl %esi, %esi -1: movl (%esi), %ebx - adcl %ebx, %eax - movl 4(%esi), %ebx - adcl %ebx, %eax - movl 8(%esi), %ebx - adcl %ebx, %eax - movl 12(%esi), %ebx - adcl %ebx, %eax - movl 16(%esi), %ebx - adcl %ebx, %eax - movl 20(%esi), %ebx - adcl %ebx, %eax - movl 24(%esi), %ebx - adcl %ebx, %eax - movl 28(%esi), %ebx - adcl %ebx, %eax - lea 32(%esi), %esi - dec %ecx - jne 1b - adcl $0, %eax -2: movl %edx, %ecx - andl $0x1c, %edx - je 4f - shrl $2, %edx # This clears CF -3: adcl (%esi), %eax - lea 4(%esi), %esi - dec %edx - jne 3b - adcl $0, %eax -4: andl $3, %ecx - jz 7f - cmpl $2, %ecx - jb 5f - movw (%esi),%cx - leal 2(%esi),%esi - je 6f - shll $16,%ecx -5: movb (%esi),%cl -6: addl %ecx,%eax - adcl $0, %eax -7: - testl $1, 12(%esp) - jz 8f - roll $8, %eax -8: - popl %ebx - popl %esi + dec ecx + jl l8 + movzx ebx, byte ptr [esi] + adc eax, ebx + rol eax, 8 + inc esi + test esi, 2 + jz m2 +l10: + sub ecx, 2 // Alignment uses up two bytes. + jae m1 // Jump if we had at least two bytes. + add ecx, 2 // ecx was < 2. Deal with it. + jmp l4 +m1: mov bx, [esi] + add esi, 2 + add ax, bx + adc eax, 0 +m2: + mov edx, ecx + shr ecx, 5 + jz l2 + test esi, esi +l1: mov ebx, [esi] + adc eax, ebx + mov ebx, [esi + 4] + adc eax, ebx + mov ebx, [esi + 8] + adc eax, ebx + mov ebx, [esi + 12] + adc eax, ebx + mov ebx, [esi + 16] + adc eax, ebx + mov ebx, [esi + 20] + adc eax, ebx + mov ebx, [esi + 24] + adc eax, ebx + mov ebx, [esi + 28] + adc eax, ebx + lea esi, [esi + 32] + dec ecx + jne l1 + adc eax, 0 +l2: mov ecx, edx + and edx, HEX(1c) + je l4 + shr edx, 2 // This clears CF +l3: adc eax, [esi] + lea esi, [esi + 4] + dec edx + jne l3 + adc eax, 0 +l4: and ecx, 3 + jz l7 + cmp ecx, 2 + jb l5 + mov cx, [esi] + lea esi, [esi + 2] + je l6 + shl ecx, 16 +l5: mov cl, [esi] +l6: add eax, ecx + adc eax, 0 +l7: + test dword ptr [esp + 12], 1 + jz l8 + rol eax, 8 +l8: + pop ebx + pop esi ret #else @@ -134,116 +136,118 @@ /* Version for PentiumII/PPro */ csum_partial: - pushl %esi - pushl %ebx - movl 20(%esp),%eax # Function arg: unsigned int sum - movl 16(%esp),%ecx # Function arg: int len - movl 12(%esp),%esi # Function arg: const unsigned char *buf - - testl $3, %esi - jnz 25f -10: - movl %ecx, %edx - movl %ecx, %ebx - andl $0x7c, %ebx - shrl $7, %ecx - addl %ebx,%esi - shrl $2, %ebx - negl %ebx - lea 45f(%ebx,%ebx,2), %ebx - testl %esi, %esi - jmp *%ebx - - # Handle 2-byte-aligned regions -20: addw (%esi), %ax - lea 2(%esi), %esi - adcl $0, %eax - jmp 10b -25: - testl $1, %esi - jz 30f - # buf is odd - dec %ecx - jl 90f - movzbl (%esi), %ebx - addl %ebx, %eax - adcl $0, %eax - roll $8, %eax - inc %esi - testl $2, %esi - jz 10b - -30: subl $2, %ecx - ja 20b - je 32f - addl $2, %ecx - jz 80f - movzbl (%esi),%ebx # csumming 1 byte, 2-aligned - addl %ebx, %eax - adcl $0, %eax - jmp 80f -32: - addw (%esi), %ax # csumming 2 bytes, 2-aligned - adcl $0, %eax - jmp 80f - -40: - addl -128(%esi), %eax - adcl -124(%esi), %eax - adcl -120(%esi), %eax - adcl -116(%esi), %eax - adcl -112(%esi), %eax - adcl -108(%esi), %eax - adcl -104(%esi), %eax - adcl -100(%esi), %eax - adcl -96(%esi), %eax - adcl -92(%esi), %eax - adcl -88(%esi), %eax - adcl -84(%esi), %eax - adcl -80(%esi), %eax - adcl -76(%esi), %eax - adcl -72(%esi), %eax - adcl -68(%esi), %eax - adcl -64(%esi), %eax - adcl -60(%esi), %eax - adcl -56(%esi), %eax - adcl -52(%esi), %eax - adcl -48(%esi), %eax - adcl -44(%esi), %eax - adcl -40(%esi), %eax - adcl -36(%esi), %eax - adcl -32(%esi), %eax - adcl -28(%esi), %eax - adcl -24(%esi), %eax - adcl -20(%esi), %eax - adcl -16(%esi), %eax - adcl -12(%esi), %eax - adcl -8(%esi), %eax - adcl -4(%esi), %eax -45: - lea 128(%esi), %esi - adcl $0, %eax - dec %ecx - jge 40b - movl %edx, %ecx -50: andl $3, %ecx - jz 80f - - # Handle the last 1-3 bytes without jumping - notl %ecx # 1->2, 2->1, 3->0, higher bits are masked - movl $0xffffff,%ebx # by the shll and shrl instructions - shll $3,%ecx - shrl %cl,%ebx - andl -128(%esi),%ebx # esi is 4-aligned so should be ok - addl %ebx,%eax - adcl $0,%eax -80: - testl $1, 12(%esp) - jz 90f - roll $8, %eax -90: - popl %ebx - popl %esi + push esi + push ebx + mov eax, [esp + 20] # Function arg: unsigned int sum + mov ecx, [esp + 16] # Function arg: int len + mov esi, [esp + 12] # Function arg: const unsigned char *buf + + test esi, 3 + jnz l25f +l10: + mov edx, ecx + mov ebx, ecx + and ebx, HEX(7c) + shr ecx, 7 + add esi, ebx + shr ebx, 2 + neg ebx + lea ebx, l45[ebx + ebx * 2] + test esi, esi + jmp dword ptr [ebx] + + // Handle 2-byte-aligned regions +l20: add ax, [esi] + lea esi, [esi + 2] + adc eax, 0 + jmp l10b +l25: + test esi, 1 + jz l30f + // buf is odd + dec ecx + jl l90 + movzb ebx, [esi] + add eax, ebx + adc eax, 0 + rol eax, 8 + inc esi + test esi, 2 + jz l10b + +l30: sub ecx, 2 + ja l20 + je l32 + add ecx, 2 + jz l80 + movzb ebx, [esi] // csumming 1 byte, 2-aligned + add eax, ebx + adc eax, 0 + jmp l80 +l32: + add ax, [esi] // csumming 2 bytes, 2-aligned + adc eax, 0 + jmp l80 + +l40: + add eax, [esi -128] + adc eax, [esi -124] + adc eax, [esi -120] + adc eax, [esi -116] + adc eax, [esi -112] + adc eax, [esi -108] + adc eax, [esi -104] + adc eax, [esi -100] + adc eax, [esi -96] + adc eax, [esi -92] + adc eax, [esi -88] + adc eax, [esi -84] + adc eax, [esi -80] + adc eax, [esi -76] + adc eax, [esi -72] + adc eax, [esi -68] + adc eax, [esi -64] + adc eax, [esi -60] + adc eax, [esi -56] + adc eax, [esi -52] + adc eax, [esi -48] + adc eax, [esi -44] + adc eax, [esi -40] + adc eax, [esi -36] + adc eax, [esi -32] + adc eax, [esi -28] + adc eax, [esi -24] + adc eax, [esi -20] + adc eax, [esi -16] + adc eax, [esi -12] + adc eax, [esi -8] + adc eax, [esi -4] +l45: + lea esi, [esi + 128] + adc eax, 0 + dec ecx + jge l40 + mov ecx, edx +l50: and ecx, 3 + jz l80 + + // Handle the last 1-3 bytes without jumping + not ecx // 1->2, 2->1, 3->0, higher bits are masked + mov ebx, HEX(ffffff) // by the shll and shrl instructions + shl ecx, 3 + shr ebx, cl + and ebx, [esi -128] // esi is 4-aligned so should be ok + add eax, ebx + adc eax, 0 +l80: + test dword ptr [esp + 12], 1 + jz l90 + rol eax, 8 +l90: + pop ebx + pop esi ret - + #endif + +END Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -144,6 +144,32 @@ sgdt [eax] } } + +FORCEINLINE +VOID +__fxsave(OUT PFX_SAVE_AREA SaveArea) +{ + __asm mov eax, SaveArea + __asm fxsave [eax] +} + +FORCEINLINE +VOID +__fxrstor(IN PFX_SAVE_AREA SaveArea) +{ + __asm mov eax, SaveArea + __asm fxrstor [eax] +} + +FORCEINLINE +VOID +__fnsave(OUT PFLOATING_SAVE_AREA SaveArea) +{ + __asm mov eax, SaveArea + __asm fnsave [eax] + __asm wait; +} + #define Ke386GetGlobalDescriptorTable __sgdt FORCEINLINE @@ -267,6 +293,28 @@ __asm mov ax, Value; __asm mov gs, ax; } + +extern ULONG KeI386FxsrPresent; + +FORCEINLINE +VOID +Ke386SaveFpuState(IN PVOID SaveArea) +{ + if (KeI386FxsrPresent) + { + __fxsave(SaveArea); + } + else + { + __fnsave(SaveArea); + } +} + +#define Ke386FnSave __fnsave +#define Ke386FxSave __fxsave +// The name suggest, that the original author didn't understand what frstor means +#define Ke386FxStore __fxrstor + #else #error Unknown compiler for inline assembler Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -109,7 +109,13 @@ #define CX86_CCR1 0xc1 /* NSC/Cyrix CPU indexed register access macros */ -#define getCx86(reg) ({ WRITE_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x22,(reg)); READ_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x23); }) +static __inline +ULONG +getCx86(UCHAR reg) +{ + WRITE_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x22, reg); + return READ_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x23); +} #define setCx86(reg, data) do { \ WRITE_PORT_UCHAR((PUCHAR)(ULONG_PTR)0x22,(reg)); \ Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -18,15 +18,16 @@ /* GLOBALS ********************************************************************/ /* Template PTE and PDE for a kernel page */ -MMPTE ValidKernelPde = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; -MMPTE ValidKernelPte = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; +MMPTE ValidKernelPde = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; +MMPTE ValidKernelPte = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; /* Template PDE for a demand-zero page */ -MMPDE DemandZeroPde = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)}; -MMPTE DemandZeroPte = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)}; +MMPDE DemandZeroPde = {{MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}}; +MMPTE DemandZeroPte = {{MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}}; /* Template PTE for prototype page */ -MMPTE PrototypePte = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}; +MMPTE PrototypePte = {{(MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | + PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}}; /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -128,6 +128,14 @@ #define PTE_EXECUTE_READWRITE 0x2 // Not worrying about NX yet #define PTE_EXECUTE_WRITECOPY 0x200 #define PTE_PROTOTYPE 0x400 + +// +// State Flags +// +#define PTE_VALID 0x1 +#define PTE_ACCESSED 0x20 +#define PTE_DIRTY 0x40 + // // Cache flags // Modified: trunk/reactos/tools/unicode/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/string.c?rev… ============================================================================== --- trunk/reactos/tools/unicode/string.c [iso-8859-1] (original) +++ trunk/reactos/tools/unicode/string.c [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -21,7 +21,6 @@ #include <assert.h> #include <limits.h> #include <stdio.h> -#include <string.h> #define WINE_UNICODE_INLINE /* nothing */ #include "wine/unicode.h" @@ -465,7 +464,7 @@ *fmta = '\0'; if (*iter == 'a' || *iter == 'A' || *iter == 'e' || *iter == 'E' || - *iter == 'f' || *iter == 'F' || + *iter == 'f' || *iter == 'F' || *iter == 'g' || *iter == 'G') sprintf(bufaiter, fmtbufa, va_arg(valist, double)); else Modified: trunk/reactos/tools/unicode/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/wine/unicode… ============================================================================== --- trunk/reactos/tools/unicode/wine/unicode.h [iso-8859-1] (original) +++ trunk/reactos/tools/unicode/wine/unicode.h [iso-8859-1] Fri Feb 11 13:48:41 2011 @@ -18,10 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_UNICODE_H -#define __WINE_UNICODE_H +#ifndef __WINE_WINE_UNICODE_H +#define __WINE_WINE_UNICODE_H #include <stdarg.h> +#include <string.h> #include <host/typedefs.h> // Definitions copied from <winnls.h> @@ -44,12 +45,24 @@ #define WC_NO_BEST_FIT_CHARS 1024 #define WC_ERR_INVALID_CHARS 0x0080 +#ifdef __WINE_WINE_TEST_H +#error This file should not be used in Wine tests +#endif + +#ifdef __cplusplus +extern "C" { +#endif + #ifndef WINE_UNICODE_API -#define WINE_UNICODE_API DECLSPEC_IMPORT +# if defined(_MSC_VER) || defined(__MINGW32__) +# define WINE_UNICODE_API DECLSPEC_IMPORT +# else +# define WINE_UNICODE_API +# endif #endif #ifndef WINE_UNICODE_INLINE -#define WINE_UNICODE_INLINE extern inline +#define WINE_UNICODE_INLINE static inline #endif /* code page info common to SBCS and DBCS */ @@ -117,20 +130,17 @@ extern int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist ); extern int vsnprintfW( WCHAR *str, size_t len, const WCHAR *format, va_list valist ); -WINE_UNICODE_INLINE int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch ); WINE_UNICODE_INLINE int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch ) { return (table->info.char_size == 2) && (table->dbcs.cp2uni_leadbytes[ch]); } -WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ); WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ) { extern WINE_UNICODE_API const WCHAR wine_casemap_lower[]; return ch + wine_casemap_lower[wine_casemap_lower[ch >> 8] + (ch & 0xff)]; } -WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch ); WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch ) { extern WINE_UNICODE_API const WCHAR wine_casemap_upper[]; @@ -139,74 +149,62 @@ /* the character type contains the C1_* flags in the low 12 bits */ /* and the C2_* type in the high 4 bits */ -WINE_UNICODE_INLINE unsigned short get_char_typeW( WCHAR ch ); WINE_UNICODE_INLINE unsigned short get_char_typeW( WCHAR ch ) { extern WINE_UNICODE_API const unsigned short wine_wctype_table[]; return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)]; } -WINE_UNICODE_INLINE int iscntrlW( WCHAR wc ); WINE_UNICODE_INLINE int iscntrlW( WCHAR wc ) { return get_char_typeW(wc) & C1_CNTRL; } -WINE_UNICODE_INLINE int ispunctW( WCHAR wc ); WINE_UNICODE_INLINE int ispunctW( WCHAR wc ) { return get_char_typeW(wc) & C1_PUNCT; } -WINE_UNICODE_INLINE int isspaceW( WCHAR wc ); WINE_UNICODE_INLINE int isspaceW( WCHAR wc ) { return get_char_typeW(wc) & C1_SPACE; } -WINE_UNICODE_INLINE int isdigitW( WCHAR wc ); WINE_UNICODE_INLINE int isdigitW( WCHAR wc ) { return get_char_typeW(wc) & C1_DIGIT; } -WINE_UNICODE_INLINE int isxdigitW( WCHAR wc ); WINE_UNICODE_INLINE int isxdigitW( WCHAR wc ) { return get_char_typeW(wc) & C1_XDIGIT; } -WINE_UNICODE_INLINE int islowerW( WCHAR wc ); WINE_UNICODE_INLINE int islowerW( WCHAR wc ) { return get_char_typeW(wc) & C1_LOWER; } -WINE_UNICODE_INLINE int isupperW( WCHAR wc ); WINE_UNICODE_INLINE int isupperW( WCHAR wc ) { return get_char_typeW(wc) & C1_UPPER; } -WINE_UNICODE_INLINE int isalnumW( WCHAR wc ); WINE_UNICODE_INLINE int isalnumW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_DIGIT|C1_LOWER|C1_UPPER); } -WINE_UNICODE_INLINE int isalphaW( WCHAR wc ); WINE_UNICODE_INLINE int isalphaW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_LOWER|C1_UPPER); } -WINE_UNICODE_INLINE int isgraphW( WCHAR wc ); WINE_UNICODE_INLINE int isgraphW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); } -WINE_UNICODE_INLINE int isprintW( WCHAR wc ); WINE_UNICODE_INLINE int isprintW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_BLANK|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); @@ -214,15 +212,13 @@ /* some useful string manipulation routines */ -WINE_UNICODE_INLINE unsigned int strlenW( const WCHAR *str ); WINE_UNICODE_INLINE unsigned int strlenW( const WCHAR *str ) { const WCHAR *s = str; while (*s) s++; - return s - str; -} - -WINE_UNICODE_INLINE WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ); + return (unsigned int)(s - str); +} + WINE_UNICODE_INLINE WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) { WCHAR *p = dst; @@ -233,14 +229,12 @@ /* strncpy doesn't do what you think, don't use it */ #define strncpyW(d,s,n) error do_not_use_strncpyW_use_lstrcpynW_or_memcpy_instead -WINE_UNICODE_INLINE int strcmpW( const WCHAR *str1, const WCHAR *str2 ); WINE_UNICODE_INLINE int strcmpW( const WCHAR *str1, const WCHAR *str2 ) { while (*str1 && (*str1 == *str2)) { str1++; str2++; } return *str1 - *str2; } -WINE_UNICODE_INLINE int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ); WINE_UNICODE_INLINE int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) { if (n <= 0) return 0; @@ -248,21 +242,18 @@ return *str1 - *str2; } -WINE_UNICODE_INLINE WCHAR *strcatW( WCHAR *dst, const WCHAR *src ); WINE_UNICODE_INLINE WCHAR *strcatW( WCHAR *dst, const WCHAR *src ) { strcpyW( dst + strlenW(dst), src ); return dst; } -WINE_UNICODE_INLINE WCHAR *strchrW( const WCHAR *str, WCHAR ch ); WINE_UNICODE_INLINE WCHAR *strchrW( const WCHAR *str, WCHAR ch ) { do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++); return NULL; } -WINE_UNICODE_INLINE WCHAR *strrchrW( const WCHAR *str, WCHAR ch ); WINE_UNICODE_INLINE WCHAR *strrchrW( const WCHAR *str, WCHAR ch ) { WCHAR *ret = NULL; @@ -270,14 +261,12 @@ return ret; } -WINE_UNICODE_INLINE WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ); WINE_UNICODE_INLINE WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) { for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)(ULONG_PTR)str; return NULL; } -WINE_UNICODE_INLINE size_t strspnW( const WCHAR *str, const WCHAR *accept ); WINE_UNICODE_INLINE size_t strspnW( const WCHAR *str, const WCHAR *accept ) { const WCHAR *ptr; @@ -285,7 +274,6 @@ return ptr - str; } -WINE_UNICODE_INLINE size_t strcspnW( const WCHAR *str, const WCHAR *reject ); WINE_UNICODE_INLINE size_t strcspnW( const WCHAR *str, const WCHAR *reject ) { const WCHAR *ptr; @@ -293,7 +281,6 @@ return ptr - str; } -WINE_UNICODE_INLINE WCHAR *strlwrW( WCHAR *str ); WINE_UNICODE_INLINE WCHAR *strlwrW( WCHAR *str ) { WCHAR *ret = str; @@ -301,7 +288,6 @@ return ret; } -WINE_UNICODE_INLINE WCHAR *struprW( WCHAR *str ); WINE_UNICODE_INLINE WCHAR *struprW( WCHAR *str ) { WCHAR *ret = str; @@ -309,7 +295,6 @@ return ret; } -WINE_UNICODE_INLINE WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ); WINE_UNICODE_INLINE WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) { const WCHAR *end; @@ -317,7 +302,6 @@ return NULL; } -WINE_UNICODE_INLINE WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ); WINE_UNICODE_INLINE WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) { const WCHAR *end; @@ -326,13 +310,11 @@ return ret; } -WINE_UNICODE_INLINE long int atolW( const WCHAR *str ); WINE_UNICODE_INLINE long int atolW( const WCHAR *str ) { return strtolW( str, (WCHAR **)0, 10 ); } -WINE_UNICODE_INLINE int atoiW( const WCHAR *str ); WINE_UNICODE_INLINE int atoiW( const WCHAR *str ) { return (int)atolW( str ); @@ -340,4 +322,8 @@ #undef WINE_UNICODE_INLINE -#endif /* __WINE_UNICODE_H */ +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_WINE_UNICODE_H */

1 0

[tkreuzer] 50655: [FREELDR] Fix broken release version
by tkreuzer＠svn.reactos.org 10 Feb '11

10 Feb '11

Author: tkreuzer Date: Thu Feb 10 20:26:41 2011 New Revision: 50655 URL: http://svn.reactos.org/svn/reactos?rev=50655&view=rev Log: [FREELDR] Fix broken release version Modified: trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/freeldr.c Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Thu Feb 10 20:26:41 2011 @@ -66,19 +66,6 @@ BOOLEAN DebugStartOfLine = TRUE; -// We need to emulate these, because the original ones don't work in freeldr -int __cdecl wctomb(char *mbchar, wchar_t wchar) -{ - *mbchar = wchar; - return 1; -} - -int __cdecl mbtowc (wchar_t *wchar, const char *mbchar, size_t count) -{ - *wchar = *mbchar; - return 1; -} - VOID DebugInit(VOID) { if (DebugPort & RS232) Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Thu Feb 10 20:26:41 2011 @@ -53,3 +53,16 @@ #endif RunLoader(); } + +// We need to emulate these, because the original ones don't work in freeldr +int __cdecl wctomb(char *mbchar, wchar_t wchar) +{ + *mbchar = wchar; + return 1; +} + +int __cdecl mbtowc (wchar_t *wchar, const char *mbchar, size_t count) +{ + *wchar = *mbchar; + return 1; +}

1 0

[fireball] 50654: - Add stubs for all page heap API functions. - Enable call to RtlpPageHeapDestroy() when necessary. - Reset Parameters==-1 hack after unsuccessful call to RtlpPageHeapCreate(), wo...
by fireball＠svn.reactos.org 10 Feb '11

10 Feb '11

Author: fireball Date: Thu Feb 10 18:21:53 2011 New Revision: 50654 URL: http://svn.reactos.org/svn/reactos?rev=50654&view=rev Log: - Add stubs for all page heap API functions. - Enable call to RtlpPageHeapDestroy() when necessary. - Reset Parameters==-1 hack after unsuccessful call to RtlpPageHeapCreate(), would be necessary when page heap is implemented.. Modified: trunk/reactos/lib/rtl/heap.c trunk/reactos/lib/rtl/heap.h trunk/reactos/lib/rtl/heappage.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=50654&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Thu Feb 10 18:21:53 2011 @@ -1364,6 +1364,10 @@ //ASSERT(FALSE); DPRINT1("Enabling page heap failed\n"); + + /* Reset a special Parameters == -1 hack */ + if ((ULONG_PTR)Parameters == (ULONG_PTR)-1) + Parameters = NULL; } /* Check validation flags */ @@ -1715,6 +1719,9 @@ PHEAP_SEGMENT Segment; if (!HeapPtr) return NULL; + + /* Call page heap routine if required */ + if (Heap->ForceFlags & HEAP_FLAG_PAGE_ALLOCS) return RtlpPageHeapDestroy(HeapPtr); /* Call special heap */ if (RtlpHeapIsSpecial(Heap->Flags)) Modified: trunk/reactos/lib/rtl/heap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.h?rev=50654&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.h [iso-8859-1] Thu Feb 10 18:21:53 2011 @@ -385,6 +385,8 @@ ULONG Flags, PVOID Ptr); +/* heappage.c */ + HANDLE NTAPI RtlpPageHeapCreate(ULONG Flags, PVOID Addr, @@ -393,4 +395,49 @@ PVOID Lock, PRTL_HEAP_PARAMETERS Parameters); +PVOID NTAPI +RtlpPageHeapDestroy(HANDLE HeapPtr); + +PVOID NTAPI +RtlpPageHeapAllocate(IN PVOID HeapPtr, + IN ULONG Flags, + IN SIZE_T Size); + +BOOLEAN NTAPI +RtlpPageHeapFree(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr); + +PVOID NTAPI +RtlpPageHeapReAllocate(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr, + SIZE_T Size); + +BOOLEAN NTAPI +RtlpPageHeapGetUserInfo(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + PVOID *UserValue, + PULONG UserFlags); + +BOOLEAN NTAPI +RtlpPageHeapSetUserValue(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + PVOID UserValue); + +BOOLEAN +NTAPI +RtlpPageHeapSetUserFlags(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + ULONG UserFlagsReset, + ULONG UserFlagsSet); + +SIZE_T NTAPI +RtlpPageHeapSize(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr); + #endif Modified: trunk/reactos/lib/rtl/heappage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=506… ============================================================================== --- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Thu Feb 10 18:21:53 2011 @@ -36,4 +36,73 @@ return NULL; } +PVOID NTAPI +RtlpPageHeapDestroy(HANDLE HeapPtr) +{ + return FALSE; +} + +PVOID NTAPI +RtlpPageHeapAllocate(IN PVOID HeapPtr, + IN ULONG Flags, + IN SIZE_T Size) +{ + return NULL; +} + +BOOLEAN NTAPI +RtlpPageHeapFree(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr) +{ + return FALSE; +} + +PVOID NTAPI +RtlpPageHeapReAllocate(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr, + SIZE_T Size) +{ + return NULL; +} + +BOOLEAN NTAPI +RtlpPageHeapGetUserInfo(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + PVOID *UserValue, + PULONG UserFlags) +{ + return FALSE; +} + +BOOLEAN NTAPI +RtlpPageHeapSetUserValue(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + PVOID UserValue) +{ + return FALSE; +} + +BOOLEAN +NTAPI +RtlpPageHeapSetUserFlags(PVOID HeapHandle, + ULONG Flags, + PVOID BaseAddress, + ULONG UserFlagsReset, + ULONG UserFlagsSet) +{ + return FALSE; +} + +SIZE_T NTAPI +RtlpPageHeapSize(HANDLE HeapPtr, + ULONG Flags, + PVOID Ptr) +{ + return 0; +} + /* EOF */

1 0

[akhaldi] 50653: [XCOPY] - Spanish translation by JasonGenie at gmail dot com See issue #5889 for more details.
by akhaldi＠svn.reactos.org 10 Feb '11

10 Feb '11

Author: akhaldi Date: Thu Feb 10 17:13:53 2011 New Revision: 50653 URL: http://svn.reactos.org/svn/reactos?rev=50653&view=rev Log: [XCOPY] - Spanish translation by JasonGenie at gmail dot com See issue #5889 for more details. Added: trunk/reactos/base/applications/cmdutils/xcopy/Es.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc Added: trunk/reactos/base/applications/cmdutils/xcopy/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/Es.rc (added) +++ trunk/reactos/base/applications/cmdutils/xcopy/Es.rc [iso-8859-1] Thu Feb 10 17:13:53 2011 @@ -1,0 +1,80 @@ +/* + * XCOPY - Wine-compatible xcopy program + * Spanish language support + * + * Copyright (C) 2007 Jeisson T. + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "xcopy.h" + +LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_INVPARMS, "Cantidad invalido de parametros - Use xcopy /? para obtener ayuda\n" + STRING_INVPARM, "Parametro invalido '%s' - Use xcopy /? para obtener ayuda\n" + STRING_PAUSE, "Unde <enter> para iniciar la copia\n" + STRING_SIMCOPY, "%d archivo(s) seran copiado(s)\n" + STRING_COPY, "%d archivo(s) copiado(s)\n" + STRING_QISDIR, "Es '%s' un nombre de archivo o de directorio\n\ + en el punto de destino?\n\ + (F - Archivo, D - Directorio)\n" + STRING_SRCPROMPT,"%s? (Si|No)\n" + STRING_OVERWRITE,"Destruir y escribir encima %s? (Si|No|Todo)\n" + STRING_COPYFAIL, "La copia de '%s' a '%s' ha faillecido con r/c %d\n" + STRING_OPENFAIL, "Impossible de abrir '%s'\n" + STRING_READFAIL, "Hubo un error durante la lectura de '%s'\n" + STRING_YES_CHAR, "S" + STRING_NO_CHAR, "N" + STRING_ALL_CHAR, "T" + STRING_FILE_CHAR,"A" + STRING_DIR_CHAR, "D" + + STRING_HELP, +"XCOPY - Copia los archivos o directorios fuentes a un destino\n\ +\n\ +Sintaxis:\n\ +XCOPY fuente [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ +\n\ +En la cual:\n\ +\n\ +[/I] Asuma el directorio si el destino no existe y copia dos o\n\ +\tmas archivos\n\ +[/S] Copia directorios y subdirectorios\n\ +[/E] Copia directorios y subdirectorios, incluyendo las que estan vacias\n\ +[/Q] No mostrar la lista de los nombres de los archivos durante la copia (silencioso)\n\ +[/F] Mostrar todas las fuentes y todos los destinos durante la copia.\n\ +[/L] Simular la operacion, mostrando los nombres de archivos que seran copiados\n\ +[/W] Preguntar antes de iniciar la operacion de copia\n\ +[/T] Crear una estructura de repertorios vacios pero no copia los archivos\n\ +[/Y] No pide confirmacion cuando sobreescribe sobre los archivos\n\ +[/-Y] Pide confirmacion cuando sobreescribe los archivos\n\ +[/P] Pregunta al usuario ante de copiar cada archivo fuente\n\ +[/N] Copiar usando los nombres cortos\n\ +[/U] Copia solamente los archivos que ya existent en el punto de destino\n\ +[/R] Sobreescribir los archivos en lectura unica\n\ +[/H] Incluir los archivos escondidos y los del systema en la copia\n\ +[/C] Siempre continuar mismo si un error occure en la copia\n\ +[/A] Copia solamente archivos con el attributo de archivo definido\n\ +[/M] Copia solamente archivos con el attributo de archivo definido, supprime\n\ +\tl'attributo de archivo\n\ +[/D | /D:m-d-y] Copia los nuevos archivos or los que fueront modificado despues la fecha especificada.\n\ +\t\tSi la fecha no esta especificada, copia unicamente cuando el archivo de destino est mas viejo\n\ +\t\tque el archivo fuente\n\n" + +} Propchange: trunk/reactos/base/applications/cmdutils/xcopy/Es.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc [iso-8859-1] Thu Feb 10 17:13:53 2011 @@ -30,6 +30,7 @@ #include "En.rc" #include "No.rc" #include "Pl.rc" +#include "Es.rc" /* UTF-8 */ #include "De.rc"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs