31 Jul
2009
31 Jul
'09
6:21 p.m.
Author: sginsberg
Date: Fri Jul 31 20:21:24 2009
New Revision: 42314
URL: http://svn.reactos.org/svn/reactos?rev=42314&view=rev
Log:
- delayimp.h: Use FORCEINLINE instead of static __inline__
- winbase.h: Make winbase.h usable by MSVC
- winuser.h: Add missing const specifiers to GetTabbedTextExtentA/W, TabbedTextOutA/W,
ToAscii/Ex and ToUnicode/Ex
- Make gdi32, user32, beepmidi and csrss drmk build in msvc
- Fix most msvc issues in win32k -- a few remain
- Make ntoskrnl compile with /W1 again
Modified:
trunk/reactos/dll/win32/beepmidi/beepmidi.c
trunk/reactos/dll/win32/gdi32/misc/wingl.c
trunk/reactos/dll/win32/gdi32/objects/dc.c
trunk/reactos/dll/win32/user32/include/user32.h
trunk/reactos/dll/win32/user32/windows/menu.c
trunk/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp
trunk/reactos/include/psdk/delayimp.h
trunk/reactos/include/psdk/winbase.h
trunk/reactos/include/psdk/winuser.h
trunk/reactos/ntoskrnl/mm/ARM3/expool.c
trunk/reactos/ntoskrnl/mm/pool.c
trunk/reactos/subsystems/win32/csrss/api/handle.c
trunk/reactos/subsystems/win32/csrss/api/wapi.c
trunk/reactos/subsystems/win32/win32k/eng/engbrush.c
trunk/reactos/subsystems/win32/win32k/eng/engmisc.c
trunk/reactos/subsystems/win32/win32k/eng/mem.c
trunk/reactos/subsystems/win32/win32k/ldr/loader.c
trunk/reactos/subsystems/win32/win32k/ntuser/menu.c
trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
trunk/reactos/subsystems/win32/win32k/objects/coord.c
trunk/reactos/subsystems/win32/win32k/objects/dclife.c
trunk/reactos/subsystems/win32/win32k/objects/drawing.c
trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c
trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c
trunk/reactos/subsystems/win32/win32k/objects/path.c
trunk/reactos/subsystems/win32/win32k/objects/region.c
Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid…
==============================================================================
--- trunk/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] Fri Jul 31 20:21:24 2009
@@ -142,11 +142,13 @@
while ( ( node != NULL ) && ( arp_notes <= POLYPHONY ) )
{
- DPRINT("playing..\n");
BEEP_SET_PARAMETERS beep_data;
DWORD actually_playing = 0;
double frequency = node->note;
+
+ DPRINT("playing..\n");
+
frequency = frequency / 12;
frequency = pow(2, frequency);
frequency = 8.1758 * frequency;
@@ -481,9 +483,9 @@
{
HANDLE heap = GetProcessHeap();
+ NoteNode* node;
+
DPRINT("PlayNote\n");
-
- NoteNode* node;
if ( velocity == 0 )
{
@@ -757,8 +759,8 @@
Exported function that receives messages from WINMM (the MME API.)
*/
+MMRESULT
FAR PASCAL
-MMRESULT
modMessage(
UINT device_id,
UINT message,
@@ -839,7 +841,8 @@
Driver entrypoint.
*/
-FAR PASCAL LONG
+LONG
+FAR PASCAL
DriverProc(
DWORD driver_id,
HDRVR driver_handle,
Modified: trunk/reactos/dll/win32/gdi32/misc/wingl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/wingl…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/wingl.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdi32/misc/wingl.c [iso-8859-1] Fri Jul 31 20:21:24 2009
@@ -28,11 +28,11 @@
-typedef int WINAPI (*CHOOSEPIXELFMT) (HDC, CONST PIXELFORMATDESCRIPTOR *);
-typedef BOOL WINAPI (*SETPIXELFMT) (HDC, int, CONST PIXELFORMATDESCRIPTOR *);
-typedef BOOL WINAPI (*SWAPBUFFERS) (HDC hdc);
-typedef int WINAPI (*DESCRIBEPIXELFMT) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR);
-typedef int WINAPI (*GETPIXELFMT) (HDC);
+typedef int (WINAPI *CHOOSEPIXELFMT) (HDC, CONST PIXELFORMATDESCRIPTOR *);
+typedef BOOL (WINAPI *SETPIXELFMT) (HDC, int, CONST PIXELFORMATDESCRIPTOR *);
+typedef BOOL (WINAPI *SWAPBUFFERS) (HDC hdc);
+typedef int (WINAPI *DESCRIBEPIXELFMT) (HDC, int, UINT, LPPIXELFORMATDESCRIPTOR);
+typedef int (WINAPI *GETPIXELFMT) (HDC);
static CHOOSEPIXELFMT glChoosePixelFormat = NULL;
Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdi32/objects/dc.c [iso-8859-1] Fri Jul 31 20:21:24 2009
@@ -1539,6 +1539,7 @@
{
PDC_ATTR pDc_Attr;
HGDIOBJ hOldObj = NULL;
+ UINT uType
// PTEB pTeb;
if(!GdiGetHandleUserData(hDC, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr))
@@ -1553,7 +1554,7 @@
return NULL;
}
- UINT uType = GDI_HANDLE_GET_TYPE(hGdiObj);
+ uType = GDI_HANDLE_GET_TYPE(hGdiObj);
switch (uType)
{
Modified: trunk/reactos/dll/win32/user32/include/user32.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u…
==============================================================================
--- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Fri Jul 31 20:21:24 2009
@@ -61,9 +61,11 @@
static __inline PVOID
DesktopPtrToUser(PVOID Ptr)
{
+ PCLIENTINFO pci;
+ PDESKTOPINFO pdi;
GetW32ThreadInfo();
- PCLIENTINFO pci = GetWin32ClientInfo();
- PDESKTOPINFO pdi = pci->pDeskInfo;
+ pci = GetWin32ClientInfo();
+ pdi = pci->pDeskInfo;
ASSERT(Ptr != NULL);
ASSERT(pdi != NULL);
Modified: trunk/reactos/dll/win32/user32/windows/menu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Fri Jul 31 20:21:24 2009
@@ -1234,9 +1234,10 @@
{
HMENU hmenu = LoadMenuW(User32Instance, L"SYSMENU");
LRESULT Result = (LRESULT)hmenu;
+ MENUINFO menuinfo = {0};
+ MENUITEMINFOW info = {0};
// removing space for checkboxes from menu
- MENUINFO menuinfo = {0};
menuinfo.cbSize = sizeof(menuinfo);
menuinfo.fMask = MIM_STYLE;
GetMenuInfo(hmenu, &menuinfo);
@@ -1244,7 +1245,6 @@
SetMenuInfo(hmenu, &menuinfo);
// adding bitmaps to menu items
- MENUITEMINFOW info = {0};
info.cbSize = sizeof(info);
info.fMask |= MIIM_BITMAP;
info.hbmpItem = HBMMENU_POPUP_MINIMIZE;
Modified: trunk/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drm/drmk…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp [iso-8859-1] Fri Jul 31 20:21:24
2009
@@ -24,7 +24,8 @@
/*
* @unimplemented
*/
-NTAPI NTSTATUS
+NTSTATUS
+NTAPI
DrmAddContentHandlers(
IN ULONG ContentId,
IN PVOID *paHandlers,
@@ -41,7 +42,8 @@
/*
* @unimplemented
*/
-NTAPI NTSTATUS
+NTSTATUS
+NTAPI
DrmCreateContentMixed(
IN PULONG paContentId,
IN ULONG cContentId,
@@ -57,7 +59,8 @@
/*
* @unimplemented
*/
-NTAPI NTSTATUS
+NTSTATUS
+NTAPI
DrmDestroyContent(
IN ULONG ContentId)
{
@@ -72,7 +75,8 @@
/*
* @unimplemented
*/
-NTAPI NTSTATUS
+NTSTATUS
+NTAPI
DrmForwardContentToDeviceObject(
IN ULONG ContentId,
IN PVOID Reserved,
@@ -90,7 +94,8 @@
/*
* @unimplemented
*/
-NTAPI NTSTATUS
+NTSTATUS
+NTAPI
DrmForwardContentToFileObject(
IN ULONG ContentId,
IN PFILE_OBJECT FileObject)
@@ -106,7 +111,8 @@
/*
* @unimplemented
*/
-NTAPI NTSTATUS
+NTSTATUS
+NTAPI
DrmForwardContentToInterface(
IN ULONG ContentId,
IN PUNKNOWN pUnknown,
@@ -122,7 +128,8 @@
/*
* @unimplemented
*/
-NTAPI NTSTATUS
+NTSTATUS
+NTAPI
DrmGetContentRights(
IN ULONG ContentId,
OUT PDRMRIGHTS DrmRights)
@@ -130,4 +137,3 @@
UNIMPLEMENTED;
return STATUS_UNSUCCESSFUL;
}
-
Modified: trunk/reactos/include/psdk/delayimp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/delayimp.h?re…
==============================================================================
--- trunk/reactos/include/psdk/delayimp.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/delayimp.h [iso-8859-1] Fri Jul 31 20:21:24 2009
@@ -65,7 +65,7 @@
typedef FARPROC (WINAPI *PfnDliHook)(unsigned, PDelayLoadInfo);
-static __inline__
+FORCEINLINE
unsigned
IndexFromPImgThunkData(PCImgThunkData pData, PCImgThunkData pBase)
{
@@ -74,7 +74,7 @@
extern const IMAGE_DOS_HEADER __ImageBase;
-static __inline__
+FORCEINLINE
PVOID
PFromRva(RVA rva)
{
Modified: trunk/reactos/include/psdk/winbase.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Fri Jul 31 20:21:24 2009
@@ -1872,6 +1872,15 @@
VOID WINAPI InitializeSListHead(PSLIST_HEADER);
USHORT WINAPI QueryDepthSList(PSLIST_HEADER);
+#ifdef _MSC_VER
+
+//
+// Intrinsics are a mess -- *sigh*
+//
+long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange,
const long Comperand);
+#pragma intrinsic(_InterlockedCompareExchange)
+#endif
+
#if !defined(InterlockedAnd)
#define InterlockedAnd InterlockedAnd_Inline
FORCEINLINE
Modified: trunk/reactos/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Fri Jul 31 20:21:24 2009
@@ -4090,8 +4090,8 @@
#define GetSysModalWindow() (NULL)
HMENU WINAPI GetSystemMenu(HWND,BOOL);
int WINAPI GetSystemMetrics(int);
-DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,LPINT);
-DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,LPINT);
+DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,CONST LPINT);
+DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,CONST LPINT);
LONG WINAPI GetWindowLongA(HWND,int);
LONG WINAPI GetWindowLongW(HWND,int);
#ifdef _WIN64
@@ -4411,13 +4411,13 @@
#endif /* (_WIN32_WINNT >= 0x0500) */
BOOL WINAPI SystemParametersInfoA(UINT,UINT,PVOID,UINT);
BOOL WINAPI SystemParametersInfoW(UINT,UINT,PVOID,UINT);
-LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,LPINT,int);
-LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,LPINT,int);
+LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,CONST LPINT,int);
+LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,CONST LPINT,int);
WORD WINAPI TileWindows(HWND,UINT,LPCRECT,UINT,const HWND *);
-int WINAPI ToAscii(UINT,UINT,PBYTE,LPWORD,UINT);
-int WINAPI ToAsciiEx(UINT,UINT,PBYTE,LPWORD,UINT,HKL);
-int WINAPI ToUnicode(UINT,UINT,PBYTE,LPWSTR,int,UINT);
-int WINAPI ToUnicodeEx(UINT,UINT,PBYTE,LPWSTR,int,UINT,HKL);
+int WINAPI ToAscii(UINT,UINT,CONST PBYTE,LPWORD,UINT);
+int WINAPI ToAsciiEx(UINT,UINT,CONST PBYTE,LPWORD,UINT,HKL);
+int WINAPI ToUnicode(UINT,UINT,CONST PBYTE,LPWSTR,int,UINT);
+int WINAPI ToUnicodeEx(UINT,UINT,CONST PBYTE,LPWSTR,int,UINT,HKL);
BOOL WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT);
BOOL WINAPI TrackPopupMenu(HMENU,UINT,int,int,int,HWND,LPCRECT);
BOOL WINAPI TrackPopupMenuEx(HMENU,UINT,int,int,HWND,LPTPMPARAMS);
Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Fri Jul 31 20:21:24 2009
@@ -379,7 +379,11 @@
//
// Quickly deal with big page allocations
//
- if (PAGE_ALIGN(P) == P) return (VOID)MiFreePoolPages(P);
+ if (PAGE_ALIGN(P) == P)
+ {
+ (VOID)MiFreePoolPages(P);
+ return;
+ }
//
// Get the entry for this pool allocation
@@ -497,7 +501,8 @@
// In this case, release the nonpaged pool lock, and free the page
//
KeReleaseQueuedSpinLock(LockQueueNonPagedPoolLock, OldIrql);
- return (VOID)MiFreePoolPages(Entry);
+ (VOID)MiFreePoolPages(Entry);
+ return;
}
//
Modified: trunk/reactos/ntoskrnl/mm/pool.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=423…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Fri Jul 31 20:21:24 2009
@@ -291,7 +291,7 @@
#endif
ExFreePagedPool(Block);
}
- else if (Block) return ExFreeArmPoolWithTag(Block, Tag);
+ else if (Block) ExFreeArmPoolWithTag(Block, Tag);
else
{
/* Warn only for NULL pointers */
Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api…
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] Fri Jul 31 20:21:24
2009
@@ -180,7 +180,7 @@
RtlCopyMemory(Block,
ProcessData->HandleTable,
ProcessData->HandleTableSize * sizeof(CSRSS_HANDLE));
- Block = _InterlockedExchangePointer((volatile
void*)&ProcessData->HandleTable, Block);
+ Block = _InterlockedExchangePointer((void*
volatile)&ProcessData->HandleTable, Block);
RtlFreeHeap( CsrssApiHeap, 0, Block );
ProcessData->HandleTableSize += 64;
}
Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api…
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/api/wapi.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/api/wapi.c [iso-8859-1] Fri Jul 31 20:21:24 2009
@@ -123,7 +123,7 @@
IN HANDLE hApiListenPort)
{
NTSTATUS Status;
- HANDLE ServerPort = (HANDLE) 0;
+ HANDLE ServerPort = NULL, ServerThread = NULL;
PCSRSS_PROCESS_DATA ProcessData = NULL;
REMOTE_PORT_VIEW LpcRead;
LpcRead.Length = sizeof(LpcRead);
@@ -167,7 +167,6 @@
return Status;
}
- HANDLE ServerThread = (HANDLE) 0;
Status = RtlCreateUserThread(NtCurrentProcess(),
NULL,
FALSE,
Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Fri Jul 31 20:21:24
2009
@@ -156,7 +156,9 @@
}
/* Copy the bits to the new format bitmap */
- rclDest = (RECTL){0, 0, psoPattern->sizlBitmap.cx, psoPattern->sizlBitmap.cy};
+ rclDest.left = rclDest.top = 0;
+ rclDest.right = psoPattern->sizlBitmap.cx;
+ rclDest.bottom = psoPattern->sizlBitmap.cy;
EngCopyBits(psoRealize, psoPattern, NULL, pxlo, &rclDest, &ptlSrc);
/* Unlock the bitmap again */
Modified: trunk/reactos/subsystems/win32/win32k/eng/engmisc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] Fri Jul 31 20:21:24
2009
@@ -250,7 +250,7 @@
OUT PUSHORT AnsiCodePage)
{
/* Forward to kernel */
- return RtlGetDefaultCodePage(AnsiCodePage, OemCodePage);
+ RtlGetDefaultCodePage(AnsiCodePage, OemCodePage);
}
/* EOF */
Modified: trunk/reactos/subsystems/win32/win32k/eng/mem.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/mem.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/mem.c [iso-8859-1] Fri Jul 31 20:21:24 2009
@@ -175,7 +175,7 @@
VOID APIENTRY
EngUnsecureMem(HANDLE Mem)
{
- return MmUnsecureVirtualMemory((PVOID) Mem);
+ MmUnsecureVirtualMemory((PVOID) Mem);
}
/* EOF */
Modified: trunk/reactos/subsystems/win32/win32k/ldr/loader.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ld…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ldr/loader.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ldr/loader.c [iso-8859-1] Fri Jul 31 20:21:24
2009
@@ -228,8 +228,9 @@
DPRINT1("ZwSetSystemInformation failed with Status 0x%lx\n", Status);
}
else {
+ PDRIVERS DriverInfo;
hImageHandle = (HANDLE)GdiDriverInfo.ImageAddress;
- PDRIVERS DriverInfo = ExAllocatePool(PagedPool, sizeof(DRIVERS));
+ DriverInfo = ExAllocatePool(PagedPool, sizeof(DRIVERS));
DriverInfo->DriverName.MaximumLength = GdiDriverInfo.DriverName.MaximumLength;
DriverInfo->DriverName.Length = GdiDriverInfo.DriverName.Length;
DriverInfo->DriverName.Buffer = ExAllocatePool(PagedPool,
GdiDriverInfo.DriverName.MaximumLength);
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Fri Jul 31 20:21:24
2009
@@ -292,6 +292,7 @@
NULL);
if(NT_SUCCESS(Status))
{
+ BOOL ret;
if (Menu->MenuInfo.Wnd)
{
Window = UserGetWindowObject(Menu->MenuInfo.Wnd);
@@ -301,7 +302,7 @@
}
}
// UserDereferenceObject(Menu);
- BOOL ret = UserDeleteObject(Menu->MenuInfo.Self, otMenu);
+ ret = UserDeleteObject(Menu->MenuInfo.Self, otMenu);
ObDereferenceObject(WindowStation);
return ret;
}
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Fri Jul 31
20:21:24 2009
@@ -872,9 +872,10 @@
DPRINT("NtUserProcessConnect\n");
if (pUserConnect && ( Size == sizeof(USERCONNECT) ))
{
+ PPROCESSINFO W32Process;
UserEnterShared();
GetW32ThreadInfo();
- PPROCESSINFO W32Process = PsGetCurrentProcessWin32Process();
+ W32Process = PsGetCurrentProcessWin32Process();
_SEH2_TRY
{
pUserConnect->siClient.psi = gpsi;
Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Fri Jul 31 20:21:24
2009
@@ -127,8 +127,8 @@
CONST LPXFORM lpXForm,
DWORD Mode)
{
+ XFORM xformWorld2Wnd;
ASSERT(pDc);
- XFORM xformWorld2Wnd;
switch (Mode)
{
Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Fri Jul 31
20:21:24 2009
@@ -658,7 +658,8 @@
pdcattrNew->ulDirty_ = pdcattrOld->ulDirty_;
pdcattrNew->iCS_CP = pdcattrOld->iCS_CP;
- pdcNew->erclWindow = (RECTL){0, 0, 1, 1};
+ pdcNew->erclWindow.left = pdcNew->erclWindow.top = 0;
+ pdcNew->erclWindow.right = pdcNew->erclWindow.bottom = 1;
DC_UnlockDc(pdcNew);
DC_UnlockDc(pdcOld);
Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] Fri Jul 31
20:21:24 2009
@@ -713,8 +713,9 @@
}
static
+POINT
FASTCALL
-POINT app_boundary_point(Rect r, int angle)
+app_boundary_point(Rect r, int angle)
{
int cx, cy;
double tangent;
Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] Fri Jul 31
20:21:24 2009
@@ -25,14 +25,17 @@
if (!(Device->flFlags & PDEV_DRIVER_PUNTED_CALL) &&
(Surface->dhsurf))
{
if (Device->DriverFunctions.SynchronizeSurface)
- return Device->DriverFunctions.SynchronizeSurface(Surface, Rect, fl);
+ {
+ Device->DriverFunctions.SynchronizeSurface(Surface, Rect, fl);
+ }
else
{
if (Device->DriverFunctions.Synchronize)
- return Device->DriverFunctions.Synchronize(Surface->dhpdev, Rect);
+ {
+ Device->DriverFunctions.Synchronize(Surface->dhpdev, Rect);
+ }
}
}
- return;
}
VOID
Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Fri Jul 31
20:21:24 2009
@@ -349,6 +349,9 @@
POBJ newObject = NULL;
HANDLE CurrentProcessId, LockedProcessId;
UCHAR TypeIndex;
+ UINT Index;
+ PGDI_TABLE_ENTRY Entry;
+ LONG TypeInfo;
GDIDBG_INITLOOPTRACE();
@@ -372,10 +375,6 @@
DPRINT1("Not enough memory to allocate gdi object!\n");
return NULL;
}
-
- UINT Index;
- PGDI_TABLE_ENTRY Entry;
- LONG TypeInfo;
CurrentProcessId = PsGetCurrentProcessId();
LockedProcessId = (HANDLE)((ULONG_PTR)CurrentProcessId | 0x1);
Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Fri Jul 31 20:21:24
2009
@@ -64,8 +64,9 @@
FASTCALL
PATH_Delete(HPATH hPath)
{
+ PPATH pPath;
if (!hPath) return FALSE;
- PPATH pPath = PATH_LockPath( hPath );
+ pPath = PATH_LockPath( hPath );
if (!pPath) return FALSE;
PATH_DestroyGdiPath( pPath );
PATH_UnlockPath( pPath );
Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Fri Jul 31
20:21:24 2009
@@ -2081,7 +2081,7 @@
REGION_Delete(PROSRGNDATA pRgn)
{
if ( pRgn == prgnDefault) return;
- return REGION_FreeRgn(pRgn);
+ REGION_FreeRgn(pRgn);
}