Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[janderwald] 36283: - Add INetConnectionConnectUi interface
by janderwald＠svn.reactos.org 17 Sep '08

17 Sep '08

Author: janderwald Date: Wed Sep 17 08:53:00 2008 New Revision: 36283 URL: http://svn.reactos.org/svn/reactos?rev=36283&view=rev Log: - Add INetConnectionConnectUi interface Modified: trunk/reactos/include/psdk/netcon.h Modified: trunk/reactos/include/psdk/netcon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/netcon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/netcon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/netcon.h [iso-8859-1] Wed Sep 17 08:53:00 2008 @@ -168,6 +168,36 @@ EXTERN_C const CLSID CLSID_ConnectionManager; EXTERN_C const IID IID_INetConnectionManager; +typedef enum +{ + NCUC_DEFAULT = 0, + NCUC_NO_UI = 1, + NCUC_ENABLE_DISABLE = 2 +}NETCONUI_CONNECT_FLAGS; + +#undef INTERFACE +#define INTERFACE INetConnectionConnectUi +DECLARE_INTERFACE_(INetConnectionConnectUi, IUnknown) +{ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD_(HRESULT,SetConnection)(THIS_ INetConnection* pCon) PURE; + STDMETHOD_(HRESULT,Connect) (THIS_ HWND hwndParent, DWORD dwFlags) PURE; + STDMETHOD_(HRESULT,Disconnect) (THIS_ HWND hwndParent, DWORD dwFlags); +}; + +#if !defined(__cplusplus) || defined(CINTERFACE) +#define INetConnectionConnectUi_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define INetConnectionConnectUi_AddRef(p) (p)->lpVtbl->AddRef(p) +#define INetConnectionConnectUi_Release(p) (p)->lpVtbl->Release(p) +#define INetConnectionConnectUi_SetConnection(p,a) (p)->lpVtbl->SetConnection(p,a) +#define INetConnectionConnectUi_Connect(p,a,b) (p)->lpVtbl->Connect(p,a,b) +#define INetConnectionConnectUi_Disconnect(p,a,b) (p)->lpVtbl->Disconnect(p,a,b) +#endif + +EXTERN_C const IID IID_INetConnectionConnectUi; + #undef INTERFACE #define INTERFACE INetConnectionPropertyUi DECLARE_INTERFACE_(INetConnectionPropertyUi, IUnknown)

1 0

[dreimer] 36282: OK, missed some stuff.
by dreimer＠svn.reactos.org 17 Sep '08

17 Sep '08

Author: dreimer Date: Wed Sep 17 08:23:07 2008 New Revision: 36282 URL: http://svn.reactos.org/svn/reactos?rev=36282&view=rev Log: OK, missed some stuff. Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Wed Sep 17 08:23:07 2008 @@ -54,7 +54,7 @@ ${Endif} Call UninstallPrevious !insertmacro INSTALLOPTIONS_EXTRACT "RosSourceDir.ini" - !insertmacro INSTALLOPTIONS_EXTRACT64 "RosSourceDir64.ini" + !insertmacro INSTALLOPTIONS_EXTRACT "RosSourceDir64.ini" FunctionEnd ;; Modified: trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosSourc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh [iso-8859-1] Wed Sep 17 08:23:07 2008 @@ -1,16 +1,16 @@ !macro CUSTOM_PAGE_ROSDIRECTORY64 PageEx custom Caption "" - PageCallBacks "RosDir.show" "RosDir.leave" + PageCallBacks "RosDir64.show" "RosDir64.leave" PageExEnd - Function RosDir.show + Function RosDir64.show !insertmacro MUI_HEADER_TEXT "Select ReactOS 64 Bit Source Location" "Select the directory where the ReactOS 64 Bit sources are located or will be checked out to later." !insertmacro INSTALLOPTIONS_WRITE "RosSourceDir64.ini" "Field 2" "State" "$PROFILE\reactos" !insertmacro INSTALLOPTIONS_DISPLAY "RosSourceDir64.ini" FunctionEnd - Function RosDir.leave - !insertmacro INSTALLOPTIONS_READ $REACTOS_SOURCE_DIRECTORY "RosSourceDir64.ini" "Field 2" "State" + Function RosDir64.leave + !insertmacro INSTALLOPTIONS_READ $REACTOS_SOURCE_DIRECTORY64 "RosSourceDir64.ini" "Field 2" "State" FunctionEnd !macroend

1 0

[dreimer] 36281: Add additional Page in the Setup to set the Source Path for the 64 Bit Source.
by dreimer＠svn.reactos.org 17 Sep '08

17 Sep '08

Author: dreimer Date: Wed Sep 17 07:49:52 2008 New Revision: 36281 URL: http://svn.reactos.org/svn/reactos?rev=36281&view=rev Log: Add additional Page in the Setup to set the Source Path for the 64 Bit Source. Added: trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.ini (with props) trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh (with props) Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosSourceDir.ini Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Wed Sep 17 07:49:52 2008 @@ -33,6 +33,7 @@ !include "MUI2.nsh" !include "InstallOptions.nsh" !include "RosSourceDir.nsh" +!include "RosSourceDir64.nsh" !include "LogicLib.nsh" !include "x64.nsh" @@ -53,6 +54,7 @@ ${Endif} Call UninstallPrevious !insertmacro INSTALLOPTIONS_EXTRACT "RosSourceDir.ini" + !insertmacro INSTALLOPTIONS_EXTRACT64 "RosSourceDir64.ini" FunctionEnd ;; @@ -69,10 +71,12 @@ !insertmacro MUI_PAGE_DIRECTORY ;; -;; ReactOS source directory page +;; ReactOS Source Directory Pages ;; var REACTOS_SOURCE_DIRECTORY !insertmacro CUSTOM_PAGE_ROSDIRECTORY +var REACTOS_SOURCE_DIRECTORY64 +!insertmacro CUSTOM_PAGE_ROSDIRECTORY64 ;; ;; Start menu page @@ -269,7 +273,7 @@ CreateDirectory "$SMPROGRAMS\$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE + SetOutPath $REACTOS_SOURCE_DIRECTORY64 CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" SetOutPath $PROFILE CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" @@ -289,7 +293,7 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE + SetOutPath $REACTOS_SOURCE_DIRECTORY64 CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" SetOutPath $PROFILE CreateShortCut "$DESKTOP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" @@ -303,7 +307,7 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE + SetOutPath $REACTOS_SOURCE_DIRECTORY64 CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" SetOutPath $PROFILE CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" Modified: trunk/tools/RosBE/RosBE-Windows/RosSourceDir.ini URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosSourc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosSourceDir.ini [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosSourceDir.ini [iso-8859-1] Wed Sep 17 07:49:52 2008 @@ -19,7 +19,7 @@ [Field 3] Type=Label -Text=Select the directory where the ReactOS sources are located or will be checked out to later. +Text=Select the directory where the ReactOS Sources are located or will be checked out to later. Left=0 Right=-1 Top=6 Added: trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.ini URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosSourc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.ini (added) +++ trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.ini [iso-8859-1] Wed Sep 17 07:49:52 2008 @@ -1,0 +1,26 @@ +[Settings] +NumFields=3 + +[Field 1] +Type=Groupbox +Text=ReactOS 64 Bit Source Directory +Left=0 +Right=-1 +Top=72 +Bottom=109 + +[Field 2] +Type=DirRequest +State= +Left=10 +Right=-10 +Top=86 +Bottom=99 + +[Field 3] +Type=Label +Text=Select the directory where the ReactOS 64 Bit Sources are located or will be checked out to later. +Left=0 +Right=-1 +Top=6 +Bottom=32 Propchange: trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.ini ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosSourc… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh (added) +++ trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh [iso-8859-1] Wed Sep 17 07:49:52 2008 @@ -1,0 +1,16 @@ +!macro CUSTOM_PAGE_ROSDIRECTORY64 + PageEx custom + Caption "" + PageCallBacks "RosDir.show" "RosDir.leave" + PageExEnd + + Function RosDir.show + !insertmacro MUI_HEADER_TEXT "Select ReactOS 64 Bit Source Location" "Select the directory where the ReactOS 64 Bit sources are located or will be checked out to later." + !insertmacro INSTALLOPTIONS_WRITE "RosSourceDir64.ini" "Field 2" "State" "$PROFILE\reactos" + !insertmacro INSTALLOPTIONS_DISPLAY "RosSourceDir64.ini" + FunctionEnd + + Function RosDir.leave + !insertmacro INSTALLOPTIONS_READ $REACTOS_SOURCE_DIRECTORY "RosSourceDir64.ini" "Field 2" "State" + FunctionEnd +!macroend Propchange: trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sserapion] 36280: remove unicode="yes" on suggestion from Christoph_vW
by sserapion＠svn.reactos.org 17 Sep '08

17 Sep '08

Author: sserapion Date: Wed Sep 17 01:37:38 2008 New Revision: 36280 URL: http://svn.reactos.org/svn/reactos?rev=36280&view=rev Log: remove unicode="yes" on suggestion from Christoph_vW Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild [iso-8859-1] Wed Sep 17 01:37:38 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="wordpad" type="win32gui" installbase="system32" installname="wordpad.exe" allowwarnings="true" unicode="yes"> +<module name="wordpad" type="win32gui" installbase="system32" installname="wordpad.exe" allowwarnings="true"> <include base="wordpad">.</include> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define>

1 0

[sserapion] 36279: Use build-in mechanisms(rbuild) to define UNICODE and friends. Fix a small warning about SetWindowText. Use correct definition of WinMain(not a CALLBACK by any means, somehow this caused real WIN64 to think this wasn't a valid application)
by sserapion＠svn.reactos.org 17 Sep '08

17 Sep '08

Author: sserapion Date: Wed Sep 17 00:15:51 2008 New Revision: 36279 URL: http://svn.reactos.org/svn/reactos?rev=36279&view=rev Log: Use build-in mechanisms(rbuild) to define UNICODE and friends. Fix a small warning about SetWindowText. Use correct definition of WinMain(not a CALLBACK by any means, somehow this caused real WIN64 to think this wasn't a valid application) Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Wed Sep 17 00:15:51 2008 @@ -1948,7 +1948,7 @@ sprintf( buf,"selection = %d..%d, line count=%ld", pSC->chrg.cpMin, pSC->chrg.cpMax, SendMessage(hwndEditor, EM_GETLINECOUNT, 0, 0)); - SetWindowText(GetDlgItem(hWnd, IDC_STATUSBAR), buf); + SetWindowTextA(GetDlgItem(hWnd, IDC_STATUSBAR), buf); SendMessage(hWnd, WM_USER, 0, 0); return 1; } @@ -2528,8 +2528,11 @@ return 0; } - -int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdParagraph, int nCmdShow) +#if defined(__GNUC__) && !defined(__REACTOS__) +int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPSTR szCmdParagraph, int nCmdShow) +#else +int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hOldInstance, LPTSTR szCmdParagraph, int nCmdShow) +#endif { INITCOMMONCONTROLSEX classes = {8, ICC_BAR_CLASSES|ICC_COOL_CLASSES|ICC_USEREX_CLASSES}; HACCEL hAccel; Modified: branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/wordpad/wordpad.rbuild [iso-8859-1] Wed Sep 17 00:15:51 2008 @@ -1,9 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="wordpad" type="win32gui" installbase="system32" installname="wordpad.exe" allowwarnings="true"> +<module name="wordpad" type="win32gui" installbase="system32" installname="wordpad.exe" allowwarnings="true" unicode="yes"> <include base="wordpad">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> <library>comdlg32</library>

1 0

[cgutman] 36278: - Also include nspapi.h
by cgutman＠svn.reactos.org 17 Sep '08

17 Sep '08

Author: cgutman Date: Tue Sep 16 22:41:45 2008 New Revision: 36278 URL: http://svn.reactos.org/svn/reactos?rev=36278&view=rev Log: - Also include nspapi.h Modified: branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32.h Modified: branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32.h URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… ============================================================================== --- branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32.h [iso-8859-1] (original) +++ branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32.h [iso-8859-1] Tue Sep 16 22:41:45 2008 @@ -23,6 +23,7 @@ #include <winsock2.h> #include <Ws2tcpip.h> #include <Ws2spi.h> +#include <nspapi.h> #include <ndk/umtypes.h> #include <ndk/rtlfuncs.h>

1 0

[cgutman] 36277: - Fix another build error
by cgutman＠svn.reactos.org 17 Sep '08

17 Sep '08

Author: cgutman Date: Tue Sep 16 22:23:44 2008 New Revision: 36277 URL: http://svn.reactos.org/svn/reactos?rev=36277&view=rev Log: - Fix another build error Modified: branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h Modified: branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… ============================================================================== --- branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h [iso-8859-1] (original) +++ branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h [iso-8859-1] Tue Sep 16 22:23:44 2008 @@ -879,6 +879,13 @@ IN DWORD ServiceBufferSize, IN INT Flags); +BOOL +WSPAPI +WPUPostMessage(IN HWND hWnd, + IN UINT Msg, + IN WPARAM wParam, + IN LPARAM lParam); + FORCEINLINE PWSPROCESS WsGetProcess()

1 0

[cgutman] 36276: - Fix a build error
by cgutman＠svn.reactos.org 17 Sep '08

17 Sep '08

Author: cgutman Date: Tue Sep 16 22:19:20 2008 New Revision: 36276 URL: http://svn.reactos.org/svn/reactos?rev=36276&view=rev Log: - Fix a build error Modified: branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h Modified: branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… ============================================================================== --- branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h [iso-8859-1] (original) +++ branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h [iso-8859-1] Tue Sep 16 22:19:20 2008 @@ -869,6 +869,16 @@ WSAAPI WsAsyncGlobalInitialize(VOID); +INT +WSAAPI +GetNameInfoW(IN CONST SOCKADDR *pSockaddr, + IN socklen_t SockaddrLength, + OUT PWCHAR pNodeBuffer, + IN DWORD NodeBufferSize, + OUT PWCHAR pServiceBuffer, + IN DWORD ServiceBufferSize, + IN INT Flags); + FORCEINLINE PWSPROCESS WsGetProcess()

1 0

[cgutman] 36275: - Add ADDRINFOW
by cgutman＠svn.reactos.org 17 Sep '08

17 Sep '08

Author: cgutman Date: Tue Sep 16 22:07:15 2008 New Revision: 36275 URL: http://svn.reactos.org/svn/reactos?rev=36275&view=rev Log: - Add ADDRINFOW Modified: branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h Modified: branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h URL: http://svn.reactos.org/svn/reactos/branches/umode-network-branch/dll/win32/… ============================================================================== --- branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h [iso-8859-1] (original) +++ branches/umode-network-branch/dll/win32/ws2_32/inc/ws2_32p.h [iso-8859-1] Tue Sep 16 22:07:15 2008 @@ -21,6 +21,18 @@ WsAsyncGetServByPort, WsAsyncTerminate, } WSASYNCOPS; + +typedef struct _ADDRINFOW +{ + INT ai_flags; + INT ai_family; + INT ai_socktype; + INT ai_protocol; + SIZE_T ai_addrlen; + PWSTR ai_canonname; + struct SOCKADDR *ai_addr; + struct ADDRINFOW *ai_next; +} ADDRINFOW, *PADDRINFOW; typedef struct _WSASYNCBLOCK {

1 0

[sserapion] 36274: Fix up win64 warnings about NtQuerySystemInformation.
by sserapion＠svn.reactos.org 17 Sep '08

17 Sep '08

Author: sserapion Date: Tue Sep 16 21:52:33 2008 New Revision: 36274 URL: http://svn.reactos.org/svn/reactos?rev=36274&view=rev Log: Fix up win64 warnings about NtQuerySystemInformation. Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/cabinet.c branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c branches/ros-amd64-bringup/reactos/base/setup/usetup/partlist.c Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/cabinet.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/setup/usetup/cabinet.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/setup/usetup/cabinet.c [iso-8859-1] Tue Sep 16 21:52:33 2008 @@ -148,7 +148,7 @@ return CS_BADSTREAM; } - ZStream.next_in = (PUCHAR)((ULONG)InputBuffer + 2); + ZStream.next_in = ((PUCHAR)InputBuffer )+ 2; ZStream.avail_in = *InputLength - 2; ZStream.next_out = (PUCHAR)OutputBuffer; ZStream.avail_out = abs(*OutputLength); Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Tue Sep 16 21:52:33 2008 @@ -699,7 +699,7 @@ INFCONTEXT Context; PWCHAR Value; UINT ErrorLine; - SIZE_T ReturnSize; + ULONG ReturnSize; CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/setup/usetup/partlist.c [iso-8859-1] Tue Sep 16 21:52:33 2008 @@ -906,7 +906,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; SYSTEM_DEVICE_INFORMATION Sdi; IO_STATUS_BLOCK Iosb; - SIZE_T ReturnSize; + ULONG ReturnSize; NTSTATUS Status; ULONG DiskNumber; WCHAR Buffer[MAX_PATH];

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2008