Merge from amd64 branch:

[SPIDER]
44002 Fix 64 bit build. (Samuel Serapión)

[PAINT]
43858 Fix 64 bit warnings. (Samuel Serapión)

[RAPPS]
43906 Fix 64 bit build. (Samuel Serapión)

[SNDREC32]
44389 Fix 64 bit build. (Samuel Serapión)

[TFTP]
41097 Fix pointer to DWORD cast. (Timo Kreuzer)

[COMCTL32]
36172 Build as unicode. (Samuel Serapión)

[USERMGR]
41098 Fix 2 POINTER<->DWORD casts. (Timo Kreuzer)

[d3d9]
38149 Fix pointer<->ULONG cast. (Timo Kreuzer)
43839 Fix 64 bit Build. (Samuel Serapión)

[DSOUND]
40753 Make DSDRIVERDESC.dnDevNode a DWORD_PTR and DSPROPERTY.InstanceId a ULONG_PTR. (Timo Kreuzer)

[LSASRV]
44037 Fix 64 bit Build. (Samuel Serapión)

[MMDRV]
40125 Fix 64bit build. (Samuel Serapión)

[MSGINA]
40993 fix 64bit build (Timo Kreuzer)

[NETSHELL]
41001 Don't cast the 1st parameter of InterlockedExchange to volatile void **, but to void ** (Timo Kreuzer)

[OPENGL32]
36502 No need to assert an offset thats only used in i386 specific code. (Samuel Serapión)

[POWRPROF]
41044 Don't cast NULL to DWORD. (Timo Kreuzer)
43860 Don't cast NULL to an integer type. (Samuel Serapión)

[PSAPI]
38150 Fix a cast (Timo Kreuzer)

[SHELL32]
38355 Use Get/SetWindowLongPtr (Samuel Serapión)
41047 Get rid of deprecated LargeInteger functions and use native int64 math instead. (Timo Kreuzer)
41048 DialogProc returns INT_PTR and not BOOL. Don't cast a pointer to LONG. Use INT_PTR instead of int for pointer math. (Timo Kreuzer)
41049 Change return type of OpenMRUListW and CreateMRUListW to HANDLE, add a comment that CREATEMRULISTW is already defined differently in explorer_new/undoc.h (Timo Kreuzer)
44601 Fix a prototype. Convert RtlLargeInteger to native int64. Fixes 64bit built. (Timo Kreuzer)

[WDMAUD.DRV]
41101 Don't cast DWORD to PVOID, use UlongToPtr instead. (Timo Kreuzer)

[WS2_32]
35777 fix ws2_32 spec file (Timo kreuzer)
44044 Fix ws2_32 64bit build (1 of 2) (Samuel Serapión)
44045 Fix ws2_32 64bit build (2 of 2) (Samuel Serapión)

[WS2_32_NEW]
44389 Fix 64 bit built. (Samuel Serapión)

svn path=/trunk/; revision=44602

diff --git a/reactos/base/applications/games/spider/spider.cpp b/reactos/base/applications/games/spider/spider.cpp
index b89d329..96188e0 100644 (file)
--- a/reactos/base/applications/games/spider/spider.cpp
+++ b/reactos/base/applications/games/spider/spider.cpp
@@ -50,7 +50,7 @@ void MakePath(TCHAR *szDest, UINT nDestLen, const TCHAR *szExt)
     lstrcpy(ptr + 1, szExt);
 }
 
-BOOL CALLBACK DifficultyDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DifficultyDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)
     {
@@ -239,7 +239,7 @@ CardImageWndProc(HWND hwnd,
 }
 
 
-BOOL CALLBACK CardBackDlgProc(HWND hDlg,
+INT_PTR CALLBACK CardBackDlgProc(HWND hDlg,
                               UINT uMsg,
                               WPARAM wParam,
                               LPARAM lParam)

diff --git a/reactos/base/applications/paint/winproc.c b/reactos/base/applications/paint/winproc.c
index ee02068..6634e67 100644 (file)
--- a/reactos/base/applications/paint/winproc.c
+++ b/reactos/base/applications/paint/winproc.c
@@ -251,7 +251,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
             {
                 int test[] = { LOWORD(lParam) - 260, LOWORD(lParam) - 140, LOWORD(lParam) - 20 };
                 SendMessage(hStatusBar, WM_SIZE, wParam, lParam);
-                SendMessage(hStatusBar, SB_SETPARTS, 3, (int)&test);
+                SendMessage(hStatusBar, SB_SETPARTS, 3, (LPARAM)&test);
                 MoveWindow(hScrollbox, 56, 49, LOWORD(lParam) - 56, HIWORD(lParam) - 72, TRUE);
                 //InvalidateRect(hwnd, NULL, TRUE);
             }

diff --git a/reactos/base/applications/rapps/toolbar.c b/reactos/base/applications/rapps/toolbar.c
index d7e88a7..31ce603 100644 (file)
--- a/reactos/base/applications/rapps/toolbar.c
+++ b/reactos/base/applications/rapps/toolbar.c
@@ -20,9 +20,9 @@ static WCHAR szModifyBtn[MAX_STR_LEN];
 /* Toolbar buttons */
 static const TBBUTTON Buttons[] =
 {   /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */
-    { 0, ID_INSTALL,   TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (int) szInstallBtn},
-    { 1, ID_UNINSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (int) szUninstallBtn},
-    { 2, ID_MODIFY,    TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (int) szModifyBtn},
+    { 0, ID_INSTALL,   TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szInstallBtn},
+    { 1, ID_UNINSTALL, TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szUninstallBtn},
+    { 2, ID_MODIFY,    TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, (INT_PTR)szModifyBtn},
     { 5, 0,            TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0},
     { 3, ID_REFRESH,   TBSTATE_ENABLED, BTNS_BUTTON | BTNS_AUTOSIZE, {0}, 0, 0},
     { 5, 0,            TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0},

diff --git a/reactos/base/applications/sndrec32/audio_resampler_acm.cpp b/reactos/base/applications/sndrec32/audio_resampler_acm.cpp
index 3598b4b..e30065d 100644 (file)
--- a/reactos/base/applications/sndrec32/audio_resampler_acm.cpp
+++ b/reactos/base/applications/sndrec32/audio_resampler_acm.cpp
@@ -8,6 +8,7 @@
 
 #include "stdafx.h"
 #include "audio_resampler_acm.hpp"
+#include <stdio.h>
 
 
 

diff --git a/reactos/base/services/tftpd/tftpd.cpp b/reactos/base/services/tftpd/tftpd.cpp
index 69ee070..3a09f37 100644 (file)
--- a/reactos/base/services/tftpd/tftpd.cpp
+++ b/reactos/base/services/tftpd/tftpd.cpp
@@ -939,7 +939,7 @@ void processRequest(void *lpParam)
                 continue;
 
             errno = 0;
-            req.bytesReady = (DWORD)outPtr - (DWORD)&req.mesout;
+            req.bytesReady = (DWORD_PTR)outPtr - (DWORD_PTR)&req.mesout;
             //printf("Bytes Ready=%u\n", req.bytesReady);
             send(req.sock, (const char*)&req.mesout, req.bytesReady, 0);
             errno = WSAGetLastError();

diff --git a/reactos/dll/cpl/usrmgr/groups.c b/reactos/dll/cpl/usrmgr/groups.c
index d7f4254..255d6bf 100644 (file)
--- a/reactos/dll/cpl/usrmgr/groups.c
+++ b/reactos/dll/cpl/usrmgr/groups.c
@@ -51,7 +51,7 @@ UpdateGroupsList(HWND hwndListView)
     PLOCALGROUP_INFO_1 pBuffer;
     DWORD entriesread;
     DWORD totalentries;
-    DWORD resume_handle = 0;
+    DWORD_PTR resume_handle = 0;
     DWORD i;
     LV_ITEM lvi;
     INT iItem;

diff --git a/reactos/dll/cpl/usrmgr/userprops.c b/reactos/dll/cpl/usrmgr/userprops.c
index d724d05..c007b18 100644 (file)
--- a/reactos/dll/cpl/usrmgr/userprops.c
+++ b/reactos/dll/cpl/usrmgr/userprops.c
@@ -377,7 +377,7 @@ InitUserGroupsList(HWND hwndDlg)
     PLOCALGROUP_INFO_1 pBuffer;
     DWORD entriesread;
     DWORD totalentries;
-    DWORD resume_handle = 0;
+    DWORD_PTR resume_handle = 0;
     DWORD i;
     LV_ITEM lvi;
     INT iItem;

diff --git a/reactos/dll/directx/d3d9/d3d9_device.c b/reactos/dll/directx/d3d9/d3d9_device.c
index c342075..100d2fd 100644 (file)
--- a/reactos/dll/directx/d3d9/d3d9_device.c
+++ b/reactos/dll/directx/d3d9/d3d9_device.c
@@ -26,7 +26,7 @@ LPDIRECT3DDEVICE9_INT IDirect3DDevice9ToImpl(LPDIRECT3DDEVICE9 iface)
 
 static HRESULT InvalidCall(LPDIRECT3DDEVICE9_INT This, LPSTR ErrorMsg)
 {
-    DPRINT1(ErrorMsg);
+    DPRINT1("%s",ErrorMsg);
     UNLOCK_D3DDEVICE9();
     return D3DERR_INVALIDCALL;
 }

diff --git a/reactos/dll/directx/d3d9/d3d9_helpers.c b/reactos/dll/directx/d3d9/d3d9_helpers.c
index fac9ef4..6231f40 100644 (file)
--- a/reactos/dll/directx/d3d9/d3d9_helpers.c
+++ b/reactos/dll/directx/d3d9/d3d9_helpers.c
@@ -93,7 +93,7 @@ HRESULT SafeAppendString(IN OUT LPSTR Dst, IN DWORD DstSize, IN LPCSTR Src)
 
 HRESULT AlignedAlloc(IN OUT LPVOID *ppObject, IN SIZE_T dwSize)
 {
-    ULONG AddressOffset;
+    ULONG_PTR AddressOffset;
     ULONG AlignedMask = MEM_ALIGNMENT - 1;
     CHAR *AlignedPtr;
     ULONG_PTR *AlignedOffsetPtr;
@@ -114,7 +114,7 @@ HRESULT AlignedAlloc(IN OUT LPVOID *ppObject, IN SIZE_T dwSize)
     if (AlignedPtr == 0)
         return DDERR_OUTOFMEMORY;
 
-    AddressOffset = MEM_ALIGNMENT - ((ULONG)AlignedPtr & AlignedMask);
+    AddressOffset = MEM_ALIGNMENT - ((ULONG_PTR)AlignedPtr & AlignedMask);
        
     AlignedPtr += AddressOffset;
 

diff --git a/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c b/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c
index 970b439..5a31199 100644 (file)
--- a/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c
+++ b/reactos/dll/directx/ddraw/Surface/callbacks_surf_hel.c
@@ -84,7 +84,7 @@ DWORD CALLBACK HelDdSurfLock(LPDDHAL_LOCKDATA lpLockData)
 
 
     /* Get our hdc for the active window */
-    hDC = GetDC(lpLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd);
+    hDC = GetDC((HWND)lpLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd);
 
     if (hDC != NULL)
     {
@@ -200,7 +200,7 @@ DWORD CALLBACK HelDdSurfUnlock(LPDDHAL_UNLOCKDATA lpUnLockData)
     DX_WINDBG_trace();
 
     /* Get our hdc for the active window */
-    hDC = GetDC(lpUnLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd);
+    hDC = GetDC((HWND)lpUnLockData->lpDDSurface->lpSurfMore->lpDD_lcl->hFocusWnd);
 
     if (hDC != NULL)
     {

diff --git a/reactos/dll/directx/dsound/primary.c b/reactos/dll/directx/dsound/primary.c
index a57a5af..b35a4eb 100644 (file)
--- a/reactos/dll/directx/dsound/primary.c
+++ b/reactos/dll/directx/dsound/primary.c
@@ -126,7 +126,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave)
                if (device->driver)
                        flags |= WAVE_DIRECTSOUND;
 
-               hres = mmErr(waveOutOpen(&(device->hwo), device->drvdesc.dnDevNode, device->pwfx, (DWORD_PTR)DSOUND_callback, (DWORD)device, flags));
+               hres = mmErr(waveOutOpen(&(device->hwo), device->drvdesc.dnDevNode, device->pwfx, (DWORD_PTR)DSOUND_callback, (DWORD_PTR)device, flags));
                if (FAILED(hres)) {
                        WARN("waveOutOpen failed\n");
                        if (device->driver)

diff --git a/reactos/dll/directx/dsound/propset.c b/reactos/dll/directx/dsound/propset.c
index 4b6d77e..147d724 100644 (file)
--- a/reactos/dll/directx/dsound/propset.c
+++ b/reactos/dll/directx/dsound/propset.c
@@ -109,7 +109,7 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_Get(
            S(prop).Set = *guidPropSet;
            S(prop).Id = dwPropID;
            S(prop).Flags = 0;  /* unused */
-           S(prop).InstanceId = (ULONG)This->dsb->device;
+           S(prop).InstanceId = (ULONG_PTR)This->dsb->device;
 
            hres = IDsDriverPropertySet_Get(ps, &prop, pInstanceData, cbInstanceData, pPropData, cbPropData, pcbReturned);
 
@@ -145,7 +145,7 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_Set(
            S(prop).Set = *guidPropSet;
            S(prop).Id = dwPropID;
            S(prop).Flags = 0;  /* unused */
-           S(prop).InstanceId = (ULONG)This->dsb->device;
+           S(prop).InstanceId = (ULONG_PTR)This->dsb->device;
            hres = IDsDriverPropertySet_Set(ps,&prop,pInstanceData,cbInstanceData,pPropData,cbPropData);
 
            IDsDriverPropertySet_Release(ps);

diff --git a/reactos/dll/win32/beepmidi/beepmidi.c b/reactos/dll/win32/beepmidi/beepmidi.c
index 3bbc028..696a359 100644 (file)
--- a/reactos/dll/win32/beepmidi/beepmidi.c
+++ b/reactos/dll/win32/beepmidi/beepmidi.c
@@ -240,11 +240,11 @@ GetDeviceCapabilities(
 BOOL
 CallClient(
     DeviceInfo* device_info,
-    DWORD message,
-    DWORD parameter1,
-    DWORD parameter2)
+    DWORD_PTR message,
+    DWORD_PTR parameter1,
+    DWORD_PTR parameter2)
 {
-    DPRINT("Calling client - callback 0x%x mmhandle 0x%x\n", (int) device_info->callback, (int) device_info->mme_handle);
+    DPRINT("Calling client - callback 0x%x mmhandle 0x%x\n", (int) device_info->callback, device_info->mme_handle);
     return DriverCallback(device_info->callback,
                           HIWORD(device_info->flags),
                           device_info->mme_handle,
@@ -749,7 +749,7 @@ ProcessLongMidiMessage(
     header->dwFlags |= MHDR_DONE;
     header->dwFlags &= ~ MHDR_INQUEUE;
 
-    DPRINT("Success? %d\n", (int) CallClient(the_device, MOM_DONE, (DWORD) header, 0));
+    DPRINT("Success? %d\n", CallClient(the_device, MOM_DONE, (DWORD_PTR) header, 0));
 
     return MMSYSERR_NOERROR;
 }
@@ -764,9 +764,9 @@ FAR PASCAL
 modMessage(
     UINT device_id,
     UINT message,
-    DWORD private_data,
-    DWORD parameter1,
-    DWORD parameter2)
+    DWORD_PTR private_data,
+    DWORD_PTR parameter1,
+    DWORD_PTR parameter2)
 {
     switch ( message )
     {

diff --git a/reactos/dll/win32/comctl32/comctl32.rbuild b/reactos/dll/win32/comctl32/comctl32.rbuild
index d2e0c3b..460df46 100644 (file)
--- a/reactos/dll/win32/comctl32/comctl32.rbuild
+++ b/reactos/dll/win32/comctl32/comctl32.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" allowwarnings="true">
+<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" unicode="yes" allowwarnings="true">
        <autoregister infsection="OleControlDlls" type="DllInstall" />
        <importlibrary definition="comctl32.spec" />
        <include base="comctl32">.</include>

diff --git a/reactos/dll/win32/lsasrv/lsarpc.c b/reactos/dll/win32/lsasrv/lsarpc.c
index 039c8f8..f3641bf 100644 (file)
--- a/reactos/dll/win32/lsasrv/lsarpc.c
+++ b/reactos/dll/win32/lsasrv/lsarpc.c
@@ -37,7 +37,7 @@ ReferencePolicyHandle(
     RtlEnterCriticalSection(&PolicyHandleTableLock);
 
     if (RtlIsValidIndexHandle(&PolicyHandleTable,
-                              (ULONG)ObjectHandle,
+                              HandleToUlong(ObjectHandle),
                               (PRTL_HANDLE_TABLE_ENTRY*)&ReferencedPolicy) &&
         !(ReferencedPolicy->Flags & POLICY_DELETE))
     {

diff --git a/reactos/dll/win32/mmdrv/common.c b/reactos/dll/win32/mmdrv/common.c
index 8d64b2f..bb32b80 100644 (file)
--- a/reactos/dll/win32/mmdrv/common.c
+++ b/reactos/dll/win32/mmdrv/common.c
@@ -80,8 +80,8 @@ GetDeviceCount(DeviceType device_type)
 DWORD
 GetDeviceCapabilities(
     DeviceType device_type,
-    DWORD device_id,
-    PVOID capabilities,
+    UINT device_id,
+    DWORD_PTR capabilities,
     DWORD capabilities_size)
 {
     MMRESULT result;
@@ -149,10 +149,10 @@ GetDeviceCapabilities(
 DWORD
 OpenDevice(
     DeviceType device_type,
-    DWORD device_id,
+    UINT device_id,
     PVOID open_descriptor,
     DWORD flags,
-    DWORD private_handle)
+    DWORD_PTR private_handle)
 {
     SessionInfo* session_info;
     MMRESULT result;
@@ -234,7 +234,7 @@ OpenDevice(
 
 DWORD
 CloseDevice(
-    DWORD private_handle)
+    DWORD_PTR private_handle)
 {
     MMRESULT result;
     SessionInfo* session_info = (SessionInfo*) private_handle;

diff --git a/reactos/dll/win32/mmdrv/kernel.c b/reactos/dll/win32/mmdrv/kernel.c
index efba1fc..07ae0be 100644 (file)
--- a/reactos/dll/win32/mmdrv/kernel.c
+++ b/reactos/dll/win32/mmdrv/kernel.c
@@ -22,7 +22,7 @@
 MMRESULT
 CobbleDeviceName(
     DeviceType device_type,
-    DWORD device_id,
+    UINT device_id,
     PWCHAR out_device_name)
 {
     WCHAR base_device_name[MAX_DEVICE_NAME_LENGTH];
@@ -78,7 +78,7 @@ CobbleDeviceName(
 MMRESULT
 OpenKernelDevice(
     DeviceType device_type,
-    DWORD device_id,
+    UINT device_id,
     DWORD access,
     HANDLE* handle)
 {

diff --git a/reactos/dll/win32/mmdrv/mmdrv.h b/reactos/dll/win32/mmdrv/mmdrv.h
index 5bbf644..e35f845 100644 (file)
--- a/reactos/dll/win32/mmdrv/mmdrv.h
+++ b/reactos/dll/win32/mmdrv/mmdrv.h
@@ -127,7 +127,7 @@ typedef struct _SessionInfo
     struct _SessionInfo* next;
 
     DeviceType device_type;
-    DWORD device_id;
+    UINT device_id;
 
     HANDLE kernel_device_handle;
 
@@ -143,8 +143,8 @@ typedef struct _SessionInfo
     BOOL is_paused;
 
     /* Stuff passed to us from winmm */
-    DWORD app_user_data;
-    DWORD callback;
+    DWORD_PTR app_user_data;
+    DWORD_PTR callback;
 
     DWORD flags;
 
@@ -181,8 +181,8 @@ BOOL
 NotifyClient(
     SessionInfo* session_info,
     DWORD message,
-    DWORD parameter1,
-    DWORD parameter2);
+    DWORD_PTR parameter1,
+    DWORD_PTR parameter2);
 
 
 /*
@@ -198,13 +198,13 @@ ErrorToMmResult(UINT error_code);
 MMRESULT
 CobbleDeviceName(
     DeviceType device_type,
-    DWORD device_id,
+    UINT device_id,
     PWCHAR out_device_name);
 
 MMRESULT
 OpenKernelDevice(
     DeviceType device_type,
-    DWORD device_id,
+    UINT device_id,
     DWORD access,
     HANDLE* handle);
 
@@ -231,7 +231,7 @@ GetDeviceData(
 MMRESULT
 CreateSession(
     DeviceType device_type,
-    DWORD device_id,
+    UINT device_id,
     SessionInfo** session_info);
 
 VOID
@@ -240,7 +240,7 @@ DestroySession(SessionInfo* session);
 SessionInfo*
 GetSession(
     DeviceType device_type,
-    DWORD device_id);
+    UINT device_id);
 
 MMRESULT
 StartSessionThread(SessionInfo* session_info);
@@ -253,9 +253,9 @@ CallSessionThread(
 
 DWORD
 HandleBySessionThread(
-    DWORD private_handle,
-    DWORD message,
-    DWORD parameter);
+    DWORD_PTR private_handle,
+    DWORD_PTR message,
+    DWORD_PTR parameter);
 
 
 /* General */
@@ -266,21 +266,21 @@ GetDeviceCount(DeviceType device_type);
 DWORD
 GetDeviceCapabilities(
     DeviceType device_type,
-    DWORD device_id,
-    PVOID capabilities,
+    UINT device_id,
+    DWORD_PTR capabilities,
     DWORD capabilities_size);
 
 DWORD
 OpenDevice(
     DeviceType device_type,
-    DWORD device_id,
+    UINT device_id,
     PVOID open_descriptor,
     DWORD flags,
-    DWORD private_handle);
+    DWORD_PTR private_handle);
 
 DWORD
 CloseDevice(
-    DWORD private_handle);
+    DWORD_PTR private_handle);
 
 DWORD
 PauseDevice(
@@ -310,7 +310,7 @@ QueryWaveFormat(
 
 DWORD
 WriteWaveBuffer(
-    DWORD private_handle,
+    DWORD_PTR private_handle,
     PWAVEHDR wave_header,
     DWORD wave_header_size);
 

diff --git a/reactos/dll/win32/mmdrv/mme.c b/reactos/dll/win32/mmdrv/mme.c
index f2d6f4e..9d9960c 100644 (file)
--- a/reactos/dll/win32/mmdrv/mme.c
+++ b/reactos/dll/win32/mmdrv/mme.c
@@ -22,8 +22,8 @@ BOOL
 NotifyClient(
     SessionInfo* session_info,
     DWORD message,
-    DWORD parameter1,
-    DWORD parameter2)
+    DWORD_PTR parameter1,
+    DWORD_PTR parameter2)
 {
     return DriverCallback(session_info->callback,
                           HIWORD(session_info->flags),
@@ -43,11 +43,11 @@ NotifyClient(
 
 DWORD APIENTRY
 wodMessage(
-    DWORD device_id,
-    DWORD message,
-    DWORD private_handle,
-    DWORD parameter1,
-    DWORD parameter2)
+    UINT device_id,
+    UINT message,
+    DWORD_PTR private_handle,
+    DWORD_PTR parameter1,
+    DWORD_PTR parameter2)
 {
     switch ( message )
     {
@@ -61,7 +61,7 @@ wodMessage(
             DPRINT("WODM_GETDEVCAPS\n");
             return GetDeviceCapabilities(WaveOutDevice,
                                          device_id,
-                                         (PVOID) parameter1,
+                                         parameter1,
                                          parameter2);
 
         /* http://www.osronline.com/ddkx/w98ddk/mmedia_4p85.htm */

diff --git a/reactos/dll/win32/mmdrv/session.c b/reactos/dll/win32/mmdrv/session.c
index b9d63e7..cc79771 100644 (file)
--- a/reactos/dll/win32/mmdrv/session.c
+++ b/reactos/dll/win32/mmdrv/session.c
@@ -26,7 +26,7 @@ CRITICAL_SECTION session_lock;
 SessionInfo*
 GetSession(
     DeviceType device_type,
-    DWORD device_id)
+    UINT device_id)
 {
     SessionInfo* session_info;
 
@@ -59,7 +59,7 @@ GetSession(
 MMRESULT
 CreateSession(
     DeviceType device_type,
-    DWORD device_id,
+    UINT device_id,
     SessionInfo** session_info)
 {
     HANDLE heap = GetProcessHeap();
@@ -186,7 +186,7 @@ StartSessionThread(SessionInfo* session_info)
 
     result = mmTaskCreate(task,
                           &session_info->thread.handle,
-                          (DWORD) session_info);
+                          (DWORD_PTR)session_info);
 
     if ( result != MMSYSERR_NOERROR )
     {
@@ -235,9 +235,9 @@ CallSessionThread(
 
 DWORD
 HandleBySessionThread(
-    DWORD private_handle,
-    DWORD message,
-    DWORD parameter)
+    DWORD_PTR private_handle,
+    DWORD_PTR message,
+    DWORD_PTR parameter)
 {
     return CallSessionThread((SessionInfo*) private_handle,
                              message,

diff --git a/reactos/dll/win32/mmdrv/wave.c b/reactos/dll/win32/mmdrv/wave.c
index c316922..408eb86 100644 (file)
--- a/reactos/dll/win32/mmdrv/wave.c
+++ b/reactos/dll/win32/mmdrv/wave.c
@@ -56,7 +56,7 @@ QueueWaveBuffer(
     wave_header->dwFlags |= WHDR_INQUEUE;
 
     /* Save our handle in the header */
-    wave_header->reserved = (DWORD) session_info;
+    wave_header->reserved = (DWORD_PTR) session_info;
 
     /* Locate the end of the queue */
     previous_node = NULL;
@@ -112,10 +112,10 @@ ReturnCompletedBuffers(SessionInfo* session_info)
             message = (session_info->device_type == WaveOutDevice) ? WOM_DONE :
                                                                      WIM_DATA;
 
-            DPRINT("Notifying client that buffer 0x%x is done\n", (int) header);
+            DPRINT("Notifying client that buffer 0x%p is done\n", header);
 
             /* Notify the client */
-            NotifyClient(session_info, message, (DWORD) header, 0);
+            NotifyClient(session_info, message, (DWORD_PTR) header, 0);
         }
     }
 
@@ -369,7 +369,7 @@ SetWaveFormat(
 
 DWORD
 WriteWaveBuffer(
-    DWORD private_handle,
+    DWORD_PTR private_handle,
     PWAVEHDR wave_header,
     DWORD wave_header_size)
 {

diff --git a/reactos/dll/win32/msgina/gui.c b/reactos/dll/win32/msgina/gui.c
index d3e2a9a..6677a29 100644 (file)
--- a/reactos/dll/win32/msgina/gui.c
+++ b/reactos/dll/win32/msgina/gui.c
@@ -29,7 +29,7 @@ GUIInitialize(
        return TRUE;
 }
 
-static BOOL CALLBACK
+static INT_PTR CALLBACK
 StatusMessageWindowProc(
        IN HWND hwndDlg,
        IN UINT uMsg,

diff --git a/reactos/dll/win32/netshell/lanstatusui.c b/reactos/dll/win32/netshell/lanstatusui.c
index 3ebb4ec..3691289 100644 (file)
--- a/reactos/dll/win32/netshell/lanstatusui.c
+++ b/reactos/dll/win32/netshell/lanstatusui.c
@@ -1198,7 +1198,7 @@ HRESULT WINAPI LanConnectStatusUI_Constructor (IUnknown * pUnkOuter, REFIID riid
     This->lpNetMan = NULL;
     This->pHead = NULL;
 
-    if (InterlockedCompareExchangePointer((volatile void **)&cached_This, This, NULL) != NULL)
+    if (InterlockedCompareExchangePointer((void **)&cached_This, This, NULL) != NULL)
     {
         CoTaskMemFree(This);
     }

diff --git a/reactos/dll/win32/opengl32/gl.c b/reactos/dll/win32/opengl32/gl.c
index e1fb94d..87e868f 100644 (file)
--- a/reactos/dll/win32/opengl32/gl.c
+++ b/reactos/dll/win32/opengl32/gl.c
@@ -22,7 +22,9 @@
 
 #include "opengl32.h"
 
+#if defined(_M_IX86)
 C_ASSERT(FIELD_OFFSET(TEB, glTable) == 0xbe8);
+#endif
 
 int WINAPI glEmptyFunc0( void ) { return 0; }
 int WINAPI glEmptyFunc4( long l1 ) { return 0; }

diff --git a/reactos/dll/win32/powrprof/powrprof.c b/reactos/dll/win32/powrprof/powrprof.c
index 46de3cd..24496fd 100644 (file)
--- a/reactos/dll/win32/powrprof/powrprof.c
+++ b/reactos/dll/win32/powrprof/powrprof.c
@@ -688,13 +688,13 @@ SetActivePwrScheme(UINT uiID,
 
     if (ReadPwrScheme(uiID,&tmp))
     {
-        if (RegOpenKeyEx(HKEY_CURRENT_USER,szUserPowerConfigSubKey,(DWORD)NULL,KEY_ALL_ACCESS,&hKey) != ERROR_SUCCESS)
+        if (RegOpenKeyEx(HKEY_CURRENT_USER,szUserPowerConfigSubKey,0,KEY_ALL_ACCESS,&hKey) != ERROR_SUCCESS)
         {
             return FALSE;
         }
         swprintf(Buf,L"%i",uiID);
 
-        if (RegSetValueExW(hKey,szCurrentPowerPolicies,(DWORD)NULL,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR)) == ERROR_SUCCESS)
+        if (RegSetValueExW(hKey,szCurrentPowerPolicies,0,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR)) == ERROR_SUCCESS)
         {
             RegCloseKey(hKey);
             if ((lpGlobalPowerPolicy != NULL) || (lpPowerPolicy != NULL))
@@ -759,7 +759,7 @@ WriteGlobalPwrPolicy(PGLOBAL_POWER_POLICY pGlobalPowerPolicy)
                     &hKey))
         return FALSE;
 
-    if (RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)&gupp,sizeof(GLOBAL_USER_POWER_POLICY)) == ERROR_SUCCESS)
+    if (RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)&gupp,sizeof(GLOBAL_USER_POWER_POLICY)) == ERROR_SUCCESS)
     {
         RegCloseKey(hKey);
 
@@ -770,7 +770,7 @@ WriteGlobalPwrPolicy(PGLOBAL_POWER_POLICY pGlobalPowerPolicy)
                        &hKey))
             return FALSE;
 
-        if (RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)&gmpp,sizeof(GLOBAL_MACHINE_POWER_POLICY)) == ERROR_SUCCESS)
+        if (RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)&gmpp,sizeof(GLOBAL_MACHINE_POWER_POLICY)) == ERROR_SUCCESS)
         {
             RegCloseKey(hKey);
             return TRUE;
@@ -799,7 +799,7 @@ WriteProcessorPwrScheme(UINT ID,
 
     if (RegCreateKey(HKEY_LOCAL_MACHINE,Buf, &hKey) == ERROR_SUCCESS)
     {
-        RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)pMachineProcessorPowerPolicy,sizeof(MACHINE_PROCESSOR_POWER_POLICY));
+        RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)pMachineProcessorPowerPolicy,sizeof(MACHINE_PROCESSOR_POWER_POLICY));
         RegCloseKey(hKey);
         return TRUE;
     }
@@ -821,7 +821,7 @@ void SetLastID()
                     &hKey) != ERROR_SUCCESS)
         return;
     swprintf(Buf,L"%i",g_LastID);
-    RegSetValueExW(hKey,szLastID,(DWORD)NULL,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR));
+    RegSetValueExW(hKey,szLastID,0,REG_SZ,(CONST BYTE *)Buf,strlenW(Buf)*sizeof(WCHAR));
     RegCloseKey(hKey);
 }
 
@@ -845,8 +845,8 @@ WritePwrScheme(PUINT puiID,
 
     if (RegCreateKey(HKEY_CURRENT_USER,Buf,&hKey) == ERROR_SUCCESS)
     {
-        RegSetValueExW(hKey,szName,(DWORD)NULL,REG_SZ,(const unsigned char *)lpszName,strlenW((const char *)lpszName)*sizeof(WCHAR));
-        RegSetValueExW(hKey,szDescription,(DWORD)NULL,REG_SZ,(const unsigned char *)lpszDescription,strlenW((const char *)lpszDescription)*sizeof(WCHAR));
+        RegSetValueExW(hKey,szName,0,REG_SZ,(const unsigned char *)lpszName,strlenW((const char *)lpszName)*sizeof(WCHAR));
+        RegSetValueExW(hKey,szDescription,0,REG_SZ,(const unsigned char *)lpszDescription,strlenW((const char *)lpszDescription)*sizeof(WCHAR));
         RegCloseKey(hKey);
         return WritePwrPolicy(puiID,pPowerPolicy);
     }
@@ -1143,13 +1143,13 @@ BOOLEAN WINAPI WritePwrPolicy(PUINT puiID, PPOWER_POLICY pPowerPolicy)
 
     if (RegCreateKey(HKEY_CURRENT_USER,Buf,&hKey) == ERROR_SUCCESS)
     {
-        RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)&pPowerPolicy->user,sizeof(USER_POWER_POLICY));
+        RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)&pPowerPolicy->user,sizeof(USER_POWER_POLICY));
         RegCloseKey(hKey);
         swprintf(Buf,L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg\\PowerPolicies\\%i",*puiID);
 
         if (RegCreateKey(HKEY_LOCAL_MACHINE,Buf,&hKey) == ERROR_SUCCESS)
         {
-            RegSetValueExW(hKey,szPolicies,(DWORD)NULL,REG_BINARY,(const unsigned char *)&pPowerPolicy->mach,sizeof(MACHINE_POWER_POLICY));
+            RegSetValueExW(hKey,szPolicies,0,REG_BINARY,(const unsigned char *)&pPowerPolicy->mach,sizeof(MACHINE_POWER_POLICY));
             RegCloseKey(hKey);
             return TRUE;
         }

diff --git a/reactos/dll/win32/psapi/psapi.c b/reactos/dll/win32/psapi/psapi.c
index df0b8fe..03734a9 100644 (file)
--- a/reactos/dll/win32/psapi/psapi.c
+++ b/reactos/dll/win32/psapi/psapi.c
@@ -83,7 +83,7 @@ EnumProcessesCallback(IN PSYSTEM_PROCESS_INFORMATION CurrentProcess,
   }
 
   /* return current process */
-  *Context->lpidProcess = (DWORD)CurrentProcess->UniqueProcessId;
+  *Context->lpidProcess = (DWORD_PTR)CurrentProcess->UniqueProcessId;
 
   /* go to next array slot */
   Context->lpidProcess++;

diff --git a/reactos/dll/win32/shell32/drive.c b/reactos/dll/win32/shell32/drive.c
index 81f6fc7..2e8cce5 100644 (file)
--- a/reactos/dll/win32/shell32/drive.c
+++ b/reactos/dll/win32/shell32/drive.c
@@ -18,11 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define LARGEINT_PROTOS
-#define LargeIntegerDivide RtlLargeIntegerDivide
-#define ExtendedIntegerMultiply RtlExtendedIntegerMultiply
-#define ConvertUlongToLargeInteger RtlConvertUlongToLargeInteger
-#define LargeIntegerSubtract RtlLargeIntegerSubtract
 #define MAX_PROPERTY_SHEET_PAGE 32
 
 #define WIN32_NO_STATUS
@@ -291,26 +286,25 @@ ChkDskDlg(
 
 
 static
-LARGE_INTEGER
-GetFreeBytesShare(LARGE_INTEGER TotalNumberOfFreeBytes, LARGE_INTEGER TotalNumberOfBytes)
+ULONGLONG
+GetFreeBytesShare(ULONGLONG TotalNumberOfFreeBytes, ULONGLONG TotalNumberOfBytes)
 {
-   LARGE_INTEGER Temp, Result, Remainder;
+   ULONGLONG Temp;
 
-   if (TotalNumberOfFreeBytes.QuadPart == 0LL)
+   if (TotalNumberOfFreeBytes == 0LL)
    {
-      return ConvertUlongToLargeInteger(0);
+      return 0;
    }
 
-   Temp = LargeIntegerDivide(TotalNumberOfBytes, ConvertUlongToLargeInteger(100), &Remainder);
-   if (Temp.QuadPart >= TotalNumberOfFreeBytes.QuadPart)
+   Temp = TotalNumberOfBytes / 100;
+   if (Temp >= TotalNumberOfFreeBytes)
    {
-      Result = ConvertUlongToLargeInteger(1);
-   }else
+      return 1;
+   }
+   else
    {
-      Result = LargeIntegerDivide(TotalNumberOfFreeBytes, Temp, &Remainder);
+      return TotalNumberOfFreeBytes / Temp;
    }
-
-   return Result;
 }
 
 static
@@ -343,20 +337,20 @@ PaintStaticControls(HWND hwndDlg, LPDRAWITEMSTRUCT drawItem)
       HBRUSH hMagBrush;
       RECT rect;
       LONG horzsize;
-      LARGE_INTEGER Result;
+      LONGLONG Result;
       WCHAR szBuffer[20];
 
       hBlueBrush = CreateSolidBrush(RGB(0, 0, 255));
       hMagBrush = CreateSolidBrush(RGB(255, 0, 255));
 
       SendDlgItemMessageW(hwndDlg, 14006, WM_GETTEXT, 20, (LPARAM)szBuffer);
-      Result.QuadPart = _wtoi(szBuffer);
+      Result = _wtoi(szBuffer);
 
       CopyRect(&rect, &drawItem->rcItem);
       horzsize = rect.right - rect.left;
-      Result.QuadPart = (Result.QuadPart * horzsize) / 100;
+      Result = (Result * horzsize) / 100;
 
-      rect.right = drawItem->rcItem.right - Result.QuadPart;
+      rect.right = drawItem->rcItem.right - Result;
       FillRect(drawItem->hDC, &rect, hBlueBrush);
       rect.left = rect.right;
       rect.right = drawItem->rcItem.right;
@@ -400,7 +394,7 @@ InitializeGeneralDriveDialog(HWND hwndDlg, WCHAR * szDrive)
       if(GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable, (PULARGE_INTEGER)&TotalNumberOfBytes, (PULARGE_INTEGER)&TotalNumberOfFreeBytes))
       {
          WCHAR szResult[128];
-         LARGE_INTEGER Result;
+         LONGLONG Result;
 #ifdef IOCTL_DISK_GET_LENGTH_INFO_IMPLEMENTED
          HANDLE hVolume;
          DWORD BytesReturned = 0;
@@ -427,13 +421,13 @@ InitializeGeneralDriveDialog(HWND hwndDlg, WCHAR * szDrive)
          if (StrFormatByteSizeW(FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR)))
              SendDlgItemMessageW(hwndDlg, 14005, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult);
 
-         Result = GetFreeBytesShare(TotalNumberOfFreeBytes, TotalNumberOfBytes);
+         Result = GetFreeBytesShare(TotalNumberOfFreeBytes.QuadPart, TotalNumberOfBytes.QuadPart);
          /* set free bytes percentage */
-         swprintf(szResult, L"%02d%%", Result.QuadPart);
+         swprintf(szResult, L"%02d%%", Result);
          SendDlgItemMessageW(hwndDlg, 14006, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult);
          /* store used share amount */
-         Result = LargeIntegerSubtract(ConvertUlongToLargeInteger(100), Result);
-         swprintf(szResult, L"%02d%%", Result.QuadPart);
+         Result = 100 - Result;
+         swprintf(szResult, L"%02d%%", Result);
          SendDlgItemMessageW(hwndDlg, 14004, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult);
          if (DriveType == DRIVE_FIXED)
          {

diff --git a/reactos/dll/win32/shell32/fprop.c b/reactos/dll/win32/shell32/fprop.c
index bf19299..529854e 100644 (file)
--- a/reactos/dll/win32/shell32/fprop.c
+++ b/reactos/dll/win32/shell32/fprop.c
@@ -536,7 +536,7 @@ SH_FileVersionInitialize(HWND hwndDlg, WCHAR *lpfilename)
     SH_FileVersionQuerySetListText(hwndDlg, pBuf, wOriginalFilename, &str, lang, code);
     SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductName, &str, lang, code);
     SH_FileVersionQuerySetListText(hwndDlg, pBuf, wProductVersion, &str, lang, code);
-    SetWindowLongPtr(hwndDlg, DWL_USER, (LONG)pBuf);
+    SetWindowLongPtr(hwndDlg, DWL_USER, (LONG_PTR)pBuf);
 
     /* select first item */
     hDlgCtrl = GetDlgItem(hwndDlg, 14009);

diff --git a/reactos/dll/win32/shell32/she_ocmenu.c b/reactos/dll/win32/shell32/she_ocmenu.c
index c98a45a..618d6ad 100644 (file)
--- a/reactos/dll/win32/shell32/she_ocmenu.c
+++ b/reactos/dll/win32/shell32/she_ocmenu.c
@@ -81,7 +81,7 @@ typedef struct {
 
 #define MRUF_STRING_LIST 0
 
-typedef int (WINAPI *CREATEMRULISTPROCW)(
+typedef HANDLE (WINAPI *CREATEMRULISTPROCW)(
     LPMRUINFO lpmi
 );
 
@@ -105,7 +105,7 @@ static const IContextMenu2Vtbl cmvt;
 static HRESULT WINAPI SHEOWCm_fnQueryInterface(IContextMenu2 *iface, REFIID riid, LPVOID *ppvObj);
 static ULONG WINAPI SHEOWCm_fnRelease(IContextMenu2 *iface);
 
-int OpenMRUList(HKEY hKey);
+HANDLE OpenMRUList(HKEY hKey);
 void LoadItemFromHKCU(POPEN_WITH_CONTEXT pContext, WCHAR * szExt);
 void LoadItemFromHKCR(POPEN_WITH_CONTEXT pContext, WCHAR * szExt);
 void InsertOpenWithItem(POPEN_WITH_CONTEXT pContext, WCHAR * szAppName);
@@ -424,7 +424,7 @@ StoreNewSettings(LPCWSTR szFileName, WCHAR *szAppName)
     WCHAR * pFileExt;
     HKEY hKey;
     LONG result;
-    int hList;
+    HANDLE hList;
 
     /* get file extension */
     pFileExt = wcsrchr(szFileName, L'.');
@@ -448,7 +448,7 @@ StoreNewSettings(LPCWSTR szFileName, WCHAR *szAppName)
     }
 
     /* insert the entry */
-    result = (*AddMRUStringW)((HANDLE)hList, szAppName);
+    result = (*AddMRUStringW)(hList, szAppName);
 
     /* close mru list */
     (*FreeMRUListProc)((HANDLE)hList);
@@ -623,7 +623,7 @@ ExecuteOpenItem(POPEN_ITEM_CONTEXT pItemContext, LPCWSTR FileName)
 }
 
 
-static BOOL CALLBACK OpenWithProgrammDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK OpenWithProgrammDlg(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     LPMEASUREITEMSTRUCT lpmis; 
     LPDRAWITEMSTRUCT lpdis; 
@@ -994,7 +994,7 @@ AddItemFromProgIDList(POPEN_WITH_CONTEXT pContext, HKEY hKey)
    FIXME("implement me :)))\n");
 }
 
-int
+HANDLE
 OpenMRUList(HKEY hKey)
 {
     MRUINFO info;
@@ -1031,7 +1031,7 @@ OpenMRUList(HKEY hKey)
 void
 AddItemFromMRUList(POPEN_WITH_CONTEXT pContext, HKEY hKey)
 {
-    int hList;
+    HANDLE hList;
     int nItem, nCount, nResult;
     WCHAR szBuffer[MAX_PATH];
 

diff --git a/reactos/dll/win32/shell32/shfldr_admintools.c b/reactos/dll/win32/shell32/shfldr_admintools.c
index b37d718..df02e28 100644 (file)
--- a/reactos/dll/win32/shell32/shfldr_admintools.c
+++ b/reactos/dll/win32/shell32/shfldr_admintools.c
@@ -61,7 +61,7 @@ static const shvheader AdminToolsSFHeader[] = {
 #define AdminToolsHELLVIEWCOLUMNS (4)
 
 
-#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
+#define _IPersistFolder2_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
 #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset);
 
 #define _IUnknown_(This)    (IShellFolder*)&(This->lpVtbl)

diff --git a/reactos/dll/win32/shell32/shfldr_fonts.c b/reactos/dll/win32/shell32/shfldr_fonts.c
index d60f4ae..d4f87b6 100644 (file)
--- a/reactos/dll/win32/shell32/shfldr_fonts.c
+++ b/reactos/dll/win32/shell32/shfldr_fonts.c
@@ -41,9 +41,9 @@ static const IShellFolder2Vtbl vt_ShellFolder2;
 static const IPersistFolder2Vtbl vt_NP_PersistFolder2;
 static const IContextMenu2Vtbl vt_ContextMenu2FontItem;
 
-#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
+#define _IPersistFolder2_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
 #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset);
-#define _IContextMenuFontItem_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblContextMenuFontItem)))
+#define _IContextMenuFontItem_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblContextMenuFontItem)))
 #define _ICOM_THIS_From_IContextMenu2FontItem(class, name) class* This = (class*)(((char*)name)-_IContextMenuFontItem_Offset);
 
 #define _IUnknown_(This)       (IUnknown*)&(This->lpVtbl)

diff --git a/reactos/dll/win32/shell32/shfldr_netplaces.c b/reactos/dll/win32/shell32/shfldr_netplaces.c
index e816cb9..07811d0 100644 (file)
--- a/reactos/dll/win32/shell32/shfldr_netplaces.c
+++ b/reactos/dll/win32/shell32/shfldr_netplaces.c
@@ -41,7 +41,7 @@ static const IShellFolder2Vtbl vt_ShellFolder2;
 static const IPersistFolder2Vtbl vt_NP_PersistFolder2;
 
 
-#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
+#define _IPersistFolder2_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
 #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset);
 
 #define _IUnknown_(This)        ((IUnknown*)&(This)->lpVtbl)

diff --git a/reactos/dll/win32/shell32/shfldr_printers.c b/reactos/dll/win32/shell32/shfldr_printers.c
index b1762d1..c7ffbfb 100644 (file)
--- a/reactos/dll/win32/shell32/shfldr_printers.c
+++ b/reactos/dll/win32/shell32/shfldr_printers.c
@@ -35,7 +35,7 @@ typedef struct
     LPITEMIDLIST       pidl;
 } IExtractIconWImpl;
 
-#define _IExtractIconA_Offset ((int)(&(((IExtractIconWImpl*)0)->lpvtblExtractIconA)))
+#define _IExtractIconA_Offset ((INT_PTR)(&(((IExtractIconWImpl*)0)->lpvtblExtractIconA)))
 #define _ICOM_THIS_From_IExtractIconA(class, name) class* This = (class*)(((char*)name)-_IExtractIconA_Offset);
 
 static shvheader PrinterSFHeader[] = {
@@ -305,7 +305,7 @@ typedef struct {
     int dwAttributes;        /* attributes returned by GetAttributesOf FIXME: use it */
 } IGenericSFImpl;
 
-#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
+#define _IPersistFolder2_Offset ((INT_PTR)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2)))
 #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset);
 
 #define _IUnknown_(This)    (IShellFolder*)&(This->lpVtbl)

diff --git a/reactos/dll/win32/wdmaud.drv/wdmaud.c b/reactos/dll/win32/wdmaud.drv/wdmaud.c
index 41211da..462000b 100644 (file)
--- a/reactos/dll/win32/wdmaud.drv/wdmaud.c
+++ b/reactos/dll/win32/wdmaud.drv/wdmaud.c
@@ -923,7 +923,7 @@ PopulateWdmDeviceList(
 
     for ( i = 0; i < DeviceCount; ++ i )
     {
-        Result = ListSoundDevice(DeviceType, (PVOID) i, &SoundDevice);
+        Result = ListSoundDevice(DeviceType, UlongToPtr(i), &SoundDevice);
 
         if ( ! MMSUCCESS(Result) )
         {

diff --git a/reactos/dll/win32/ws2_32/include/upcall.h b/reactos/dll/win32/ws2_32/include/upcall.h
index 16ec65a..25404f4 100644 (file)
--- a/reactos/dll/win32/ws2_32/include/upcall.h
+++ b/reactos/dll/win32/ws2_32/include/upcall.h
@@ -34,7 +34,7 @@ SOCKET
 WSPAPI
 WPUCreateSocketHandle(
     IN  DWORD dwCatalogEntryId,
-    IN  DWORD dwContext,
+    IN  DWORD_PTR dwContext,
     OUT LPINT lpErrno);
 
 int
@@ -69,14 +69,14 @@ WSPAPI
 WPUQueryBlockingCallback(
     IN  DWORD dwCatalogEntryId,
     OUT LPBLOCKINGCALLBACK FAR* lplpfnCallback,
-    OUT LPDWORD lpdwContext,
+    OUT PDWORD_PTR lpdwContext,
     OUT LPINT lpErrno);
 
 INT
 WSPAPI
 WPUQuerySocketHandleContext(
     IN  SOCKET s,
-    OUT LPDWORD lpContext,
+    OUT PDWORD_PTR lpContext,
     OUT LPINT lpErrno);
 
 INT
@@ -84,7 +84,7 @@ WSPAPI
 WPUQueueApc(
     IN  LPWSATHREADID lpThreadId,
     IN  LPWSAUSERAPC lpfnUserApc,
-    IN  DWORD dwContext,
+    IN  DWORD_PTR dwContext,
     OUT LPINT lpErrno);
 
 BOOL

diff --git a/reactos/dll/win32/ws2_32/misc/async.c b/reactos/dll/win32/ws2_32/misc/async.c
index 558960c..a130e7a 100644 (file)
--- a/reactos/dll/win32/ws2_32/misc/async.c
+++ b/reactos/dll/win32/ws2_32/misc/async.c
@@ -111,8 +111,6 @@ typedef struct protoent WS_protoent;
 #endif
 #endif
 
-#define CALLBACK __stdcall
-
 #include "wine/winbase16.h"
 #include "windef.h"
 #include "winbase.h"

diff --git a/reactos/dll/win32/ws2_32/misc/upcall.c b/reactos/dll/win32/ws2_32/misc/upcall.c
index 3ba3b41..ad0ce94 100644 (file)
--- a/reactos/dll/win32/ws2_32/misc/upcall.c
+++ b/reactos/dll/win32/ws2_32/misc/upcall.c
@@ -72,7 +72,7 @@ WPUCreateEvent(OUT LPINT lpErrno)
 SOCKET
 WSPAPI
 WPUCreateSocketHandle(IN  DWORD dwCatalogEntryId,
-                      IN  DWORD dwContext,
+                      IN  DWORD_PTR dwContext,
                       OUT LPINT lpErrno)
 {
     UNIMPLEMENTED
@@ -167,7 +167,7 @@ INT
 WSPAPI
 WPUQueryBlockingCallback(IN  DWORD dwCatalogEntryId,
                          OUT LPBLOCKINGCALLBACK FAR* lplpfnCallback,
-                         OUT LPDWORD lpdwContext,
+                         OUT PDWORD_PTR lpdwContext,
                          OUT LPINT lpErrno)
 {
     UNIMPLEMENTED
@@ -182,7 +182,7 @@ WPUQueryBlockingCallback(IN  DWORD dwCatalogEntryId,
 INT
 WSPAPI
 WPUQuerySocketHandleContext(IN  SOCKET s,
-                            OUT LPDWORD lpContext,
+                            OUT PDWORD_PTR lpContext,
                             OUT LPINT lpErrno)
 {
     UNIMPLEMENTED
@@ -198,7 +198,7 @@ INT
 WSPAPI
 WPUQueueApc(IN  LPWSATHREADID lpThreadId,
             IN  LPWSAUSERAPC lpfnUserApc,
-            IN  DWORD dwContext,
+            IN  DWORD_PTR dwContext,
             OUT LPINT lpErrno)
 {
     UNIMPLEMENTED

diff --git a/reactos/dll/win32/ws2_32/ws2_32.spec b/reactos/dll/win32/ws2_32/ws2_32.spec
index f36ddca..afd1065 100644 (file)
--- a/reactos/dll/win32/ws2_32/ws2_32.spec
+++ b/reactos/dll/win32/ws2_32/ws2_32.spec
@@ -50,7 +50,7 @@
 
 500 stub     WEP
 
-@ stdcall GetAddrInfoW(wstr wstr ptr ptr)
+# @ stdcall GetAddrInfoW(wstr wstr ptr ptr)
 @ stdcall WSApSetPostRoutine(ptr)
 @ stdcall WPUCompleteOverlappedRequest(long ptr long long ptr)
 @ stdcall WSAAccept(long ptr ptr ptr long)

diff --git a/reactos/dll/win32/ws2_32_new/src/socklife.c b/reactos/dll/win32/ws2_32_new/src/socklife.c
index 5d8dc80..d1cd3a9 100644 (file)
--- a/reactos/dll/win32/ws2_32_new/src/socklife.c
+++ b/reactos/dll/win32/ws2_32_new/src/socklife.c
@@ -176,7 +176,7 @@ WPUCloseSocketHandle(IN SOCKET s,
 SOCKET
 WSPAPI
 WPUCreateSocketHandle(IN DWORD dwCatalogEntryId,
-                      IN DWORD dwContext,
+                      IN DWORD_PTR dwContext,
                       OUT LPINT lpErrno)
 {
     UNIMPLEMENTED;
@@ -277,7 +277,7 @@ WPUModifyIFSHandle(IN DWORD dwCatalogEntryId,
 INT
 WSPAPI
 WPUQuerySocketHandleContext(IN SOCKET s,
-                            OUT LPDWORD lpContext,
+                            OUT PDWORD_PTR lpContext,
                             OUT LPINT lpErrno)
 {
     UNIMPLEMENTED;

diff --git a/reactos/dll/win32/ws2_32_new/src/sputil.c b/reactos/dll/win32/ws2_32_new/src/sputil.c
index e82922a..80277c3 100644 (file)
--- a/reactos/dll/win32/ws2_32_new/src/sputil.c
+++ b/reactos/dll/win32/ws2_32_new/src/sputil.c
@@ -173,7 +173,7 @@ INT
 WSPAPI
 WPUQueueApc(IN LPWSATHREADID lpThreadId,
             IN LPWSAUSERAPC lpfnUserApc,
-            IN DWORD dwContext,
+            IN DWORD_PTR dwContext,
             OUT LPINT lpErrno)
 {
     UNIMPLEMENTED;

diff --git a/reactos/include/psdk/dsdriver.h b/reactos/include/psdk/dsdriver.h
index 187cd89..93ae20a 100644 (file)
--- a/reactos/include/psdk/dsdriver.h
+++ b/reactos/include/psdk/dsdriver.h
@@ -64,7 +64,7 @@ typedef struct _DSDRIVERDESC
     DWORD              dwFlags;
     TCHAR      szDesc[256];
     TCHAR      szDrvname[256];
-    DWORD      dnDevNode;
+    DWORD_PTR  dnDevNode;
     WORD       wVxdId;
     WORD       wReserved;
     ULONG      ulDeviceNum;
@@ -120,7 +120,7 @@ typedef union _DSPROPERTY
        GUID    Set;
        ULONG   Id;
        ULONG   Flags;
-       ULONG   InstanceId;
+       ULONG_PTR       InstanceId;
     } DUMMYSTRUCTNAME;
     ULONGLONG  Alignment;
 } DSPROPERTY,*PDSPROPERTY;

diff --git a/reactos/include/psdk/ws2spi.h b/reactos/include/psdk/ws2spi.h
index b02ba93..c34e0b8 100644 (file)
--- a/reactos/include/psdk/ws2spi.h
+++ b/reactos/include/psdk/ws2spi.h
@@ -144,15 +144,15 @@ typedef BOOL (WSPAPI *LPWPUCLOSEEVENT)(WSAEVENT,LPINT);
 typedef INT (WSPAPI *LPWPUCLOSESOCKETHANDLE)(SOCKET,LPINT);
 typedef INT (WSPAPI *LPWPUCLOSETHREAD)(LPWSATHREADID,LPINT);
 typedef WSAEVENT (WSPAPI *LPWPUCREATEEVENT)(LPINT);
-typedef SOCKET (WSPAPI *LPWPUCREATESOCKETHANDLE)(DWORD,DWORD,LPINT);
+typedef SOCKET (WSPAPI *LPWPUCREATESOCKETHANDLE)(DWORD,DWORD_PTR,LPINT);
 typedef INT (WSPAPI *LPWPUFDISSET)(SOCKET,LPFD_SET);
 typedef INT (WSPAPI *LPWPUGETPROVIDERPATH)(LPGUID,LPWSTR,LPINT,LPINT);
 typedef SOCKET (WSPAPI *LPWPUMODIFYIFSHANDLE)(DWORD,SOCKET,LPINT);
 typedef INT (WSPAPI *LPWPUOPENCURRENTTHREAD)(LPWSATHREADID,LPINT);
 typedef BOOL (WSPAPI *LPWPUPOSTMESSAGE)(HWND,UINT,WPARAM,LPARAM);
-typedef INT (WSPAPI *LPWPUQUERYBLOCKINGCALLBACK)(DWORD,LPBLOCKINGCALLBACK FAR*,LPDWORD,LPINT);
-typedef INT (WSPAPI *LPWPUQUERYSOCKETHANDLECONTEXT)(SOCKET,LPDWORD,LPINT);
-typedef INT (WSPAPI *LPWPUQUEUEAPC)(LPWSATHREADID,LPWSAUSERAPC,DWORD,LPINT);
+typedef INT (WSPAPI *LPWPUQUERYBLOCKINGCALLBACK)(DWORD,LPBLOCKINGCALLBACK FAR*,PDWORD_PTR,LPINT);
+typedef INT (WSPAPI *LPWPUQUERYSOCKETHANDLECONTEXT)(SOCKET,PDWORD_PTR,LPINT);
+typedef INT (WSPAPI *LPWPUQUEUEAPC)(LPWSATHREADID,LPWSAUSERAPC,DWORD_PTR,LPINT);
 typedef BOOL (WSPAPI *LPWPURESETEVENT)(WSAEVENT,LPINT);
 typedef BOOL (WSPAPI *LPWPUSETEVENT)(WSAEVENT,LPINT);
 typedef INT (WSAAPI *LPNSPSTARTUP)(LPGUID,LPNSP_ROUTINE);