Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-28 20:19:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Made user32.dll compile under MSVC (doesn't link though)

Browse source 
svn path=/trunk/; revision=33402
This commit is contained in:
Gregor Brunmar 2008-05-10 10:29:19 +00:00
parent 433a98b5fa
commit 7eab8b0750
8 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/dll/win32/user32/controls/edit.c
View file

@ -171,7 +171,7 @@ typedef struct
/* /*
* These functions have trivial implementations * These functions have trivial implementations
* We still like to call them internally * We still like to call them internally
* "static inline" makes them more like macro's * "static __inline" makes them more like macro's
*/ */
static __inline BOOL EDIT_EM_CanUndo(EDITSTATE *es); static __inline BOOL EDIT_EM_CanUndo(EDITSTATE *es);
static __inline void EDIT_EM_EmptyUndoBuffer(EDITSTATE *es); static __inline void EDIT_EM_EmptyUndoBuffer(EDITSTATE *es);
@ -402,14 +402,14 @@ static DWORD get_app_version(void)
return version; return version;
} }
static inline UINT get_text_length(EDITSTATE *es) static __inline UINT get_text_length(EDITSTATE *es)
{ {
if(es->text_length == (UINT)-1) if(es->text_length == (UINT)-1)
es->text_length = strlenW(es->text); es->text_length = strlenW(es->text);
return es->text_length; return es->text_length;
} }
static inline void text_buffer_changed(EDITSTATE *es) static __inline void text_buffer_changed(EDITSTATE *es)
{ {
es->text_length = (UINT)-1; es->text_length = (UINT)-1;
} }

2
reactos/dll/win32/user32/controls/listbox.c
View file

@ -894,7 +894,7 @@ static LRESULT LISTBOX_GetText( LB_DESCR *descr, INT index, LPWSTR buffer, BOOL
} }
} }
static inline INT LISTBOX_lstrcmpiW( LCID lcid, LPCWSTR str1, LPCWSTR str2 ) static __inline INT LISTBOX_lstrcmpiW( LCID lcid, LPCWSTR str1, LPCWSTR str2 )
{ {
INT ret = CompareStringW( lcid, NORM_IGNORECASE, str1, -1, str2, -1 ); INT ret = CompareStringW( lcid, NORM_IGNORECASE, str1, -1, str2, -1 );
if (ret == CSTR_LESS_THAN) if (ret == CSTR_LESS_THAN)

2
reactos/dll/win32/user32/include/dde_private.h
View file

@ -243,7 +243,7 @@ extern void WDML_BroadcastDDEWindows(LPCWSTR clsName, UINT uMsg,
WPARAM wParam, LPARAM lParam); WPARAM wParam, LPARAM lParam);
extern void WDML_NotifyThreadExit(DWORD tid); extern void WDML_NotifyThreadExit(DWORD tid);
static inline void WDML_ExtractAck(WORD status, DDEACK* da) static __inline void WDML_ExtractAck(WORD status, DDEACK* da)
{ {
*da = *((DDEACK*)&status); *da = *((DDEACK*)&status);
} }

4
reactos/dll/win32/user32/include/user32.h
View file

@ -23,6 +23,7 @@
#include <windowsx.h> #include <windowsx.h>
#include <winnls32.h> #include <winnls32.h>
#include <ndk/ntndk.h> #include <ndk/ntndk.h>
#include <ddk/ntstatus.h>
/* CSRSS Headers */ /* CSRSS Headers */
#include <csrss/csrss.h> #include <csrss/csrss.h>
@ -38,6 +39,9 @@
/* Internal User32 Headers */ /* Internal User32 Headers */
#include "user32p.h" #include "user32p.h"
#include <libs\pseh\pseh.h>
#include <libs\pseh\framebased.h>
/* FIXME: Use ntgdi.h then cleanup... */ /* FIXME: Use ntgdi.h then cleanup... */
HGDIOBJ STDCALL NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj); HGDIOBJ STDCALL NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj);
BOOL STDCALL NtGdiPatBlt(HDC hdcDst, INT x, INT y, INT cx, INT cy, DWORD rop4); BOOL STDCALL NtGdiPatBlt(HDC hdcDst, INT x, INT y, INT cx, INT cy, DWORD rop4);

4
reactos/dll/win32/user32/misc/resources.c
View file

@ -9,8 +9,8 @@
#define CR_INVALID_DATA 0x0000001F #define CR_INVALID_DATA 0x0000001F
#endif #endif
typedef DWORD STDCALL (*CMP_REGNOTIFY) (HANDLE, LPVOID, DWORD, PULONG); typedef DWORD (STDCALL *CMP_REGNOTIFY) (HANDLE, LPVOID, DWORD, PULONG);
typedef DWORD STDCALL (*CMP_UNREGNOTIFY) (ULONG ); typedef DWORD (STDCALL *CMP_UNREGNOTIFY) (ULONG );
/* FIXME: Currently IsBadWritePtr is implemented using VirtualQuery which /* FIXME: Currently IsBadWritePtr is implemented using VirtualQuery which
does not seem to work properly for stack address space. */ does not seem to work properly for stack address space. */

15
reactos/dll/win32/user32/windows/defwnd.c
View file

@ -1000,17 +1000,22 @@ VOID FASTCALL
DefWndScreenshot(HWND hWnd) DefWndScreenshot(HWND hWnd)
{ {
RECT rect; RECT rect;
HDC hdc;
INT w;
INT h;
HBITMAP hbitmap;
HDC hdc2;
OpenClipboard(hWnd); OpenClipboard(hWnd);
EmptyClipboard(); EmptyClipboard();
HDC hdc = GetWindowDC(hWnd); hdc = GetWindowDC(hWnd);
GetWindowRect(hWnd, &rect); GetWindowRect(hWnd, &rect);
INT w = rect.right - rect.left; w = rect.right - rect.left;
INT h = rect.bottom - rect.top; h = rect.bottom - rect.top;
HBITMAP hbitmap = CreateCompatibleBitmap(hdc, w, h); hbitmap = CreateCompatibleBitmap(hdc, w, h);
HDC hdc2 = CreateCompatibleDC(hdc); hdc2 = CreateCompatibleDC(hdc);
SelectObject(hdc2, hbitmap); SelectObject(hdc2, hbitmap);
BitBlt(hdc2, 0, 0, w, h, BitBlt(hdc2, 0, 0, w, h,

4
reactos/dll/win32/user32/windows/spy.c
View file

@ -1916,7 +1916,7 @@ static int indent_tls_index;
/*********************************************************************** /***********************************************************************
* get_indent_level * get_indent_level
*/ */
inline static INT_PTR get_indent_level(void) __inline static INT_PTR get_indent_level(void)
{ {
return (INT_PTR)TlsGetValue( indent_tls_index ); return (INT_PTR)TlsGetValue( indent_tls_index );
} }
@ -1925,7 +1925,7 @@ inline static INT_PTR get_indent_level(void)
/*********************************************************************** /***********************************************************************
* set_indent_level * set_indent_level
*/ */
inline static void set_indent_level( INT_PTR level ) __inline static void set_indent_level( INT_PTR level )
{ {
TlsSetValue( indent_tls_index, (void *)level ); TlsSetValue( indent_tls_index, (void *)level );
} }

6
reactos/dll/win32/user32/windows/window.c
View file

@ -277,6 +277,7 @@ CreateWindowExA(DWORD dwExStyle,
{ {
POINT mPos[2]; POINT mPos[2];
UINT id = 0; UINT id = 0;
HWND top_child;
/* lpParams of WM_[NC]CREATE is different for MDI children. /* lpParams of WM_[NC]CREATE is different for MDI children.
* MDICREATESTRUCT members have the originally passed values. * MDICREATESTRUCT members have the originally passed values.
@ -309,7 +310,7 @@ CreateWindowExA(DWORD dwExStyle,
WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX); WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX);
} }
HWND top_child = GetWindow(hWndParent, GW_CHILD); top_child = GetWindow(hWndParent, GW_CHILD);
if (top_child) if (top_child)
{ {
@ -382,6 +383,7 @@ CreateWindowExW(DWORD dwExStyle,
{ {
POINT mPos[2]; POINT mPos[2];
UINT id = 0; UINT id = 0;
HWND top_child;
/* lpParams of WM_[NC]CREATE is different for MDI children. /* lpParams of WM_[NC]CREATE is different for MDI children.
* MDICREATESTRUCT members have the originally passed values. * MDICREATESTRUCT members have the originally passed values.
@ -414,7 +416,7 @@ CreateWindowExW(DWORD dwExStyle,
WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX); WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX);
} }
HWND top_child = GetWindow(hWndParent, GW_CHILD); top_child = GetWindow(hWndParent, GW_CHILD);
if (top_child) if (top_child)
{ {