Author: fireball Date: Sun Sep 23 20:30:27 2012 New Revision: 57369
URL: http://svn.reactos.org/svn/reactos?rev=57369&view=rev Log: - Minor compiling fixes. - CMake switch.
Added: branches/arwinss/reactos/dll/win32/user32/CMakeLists.txt (with props) Modified: branches/arwinss/reactos/dll/win32/user32/csr.c branches/arwinss/reactos/dll/win32/user32/desktop.c branches/arwinss/reactos/dll/win32/user32/misc.c branches/arwinss/reactos/dll/win32/user32/property.c branches/arwinss/reactos/dll/win32/user32/scroll.c branches/arwinss/reactos/dll/win32/user32/user_private.h
Added: branches/arwinss/reactos/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/CMakeLists.txt (added) +++ branches/arwinss/reactos/dll/win32/user32/CMakeLists.txt [iso-8859-1] Sun Sep 23 20:30:27 2012 @@ -1,0 +1,90 @@ +add_definitions(-D__WINESRC__ + -D_WINE) + +remove_definitions(-DWINVER=0x502 + -D_WIN32_WINNT=0x502 + -D_WIN32_WINDOWS=0x502 + -D_SETUPAPI_VER=0x502) + +add_definitions(-DWINVER=0x0600 + -D_WIN32_WINNT=0x0600 + -D_WIN32_WINDOWS=0x600 + -D_SETUPAPI_VER=0x600) + +spec2def(user32.dll user32.spec ADD_IMPORTLIB) + +include_directories( + BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/include/reactos/subsys + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/win32ss/include + ) + +set_rc_compiler() + +list(APPEND SOURCE + atom.c + button.c + caret.c + class.c + clipboard.c + combo.c + csr.c + cursoricon.c + dde_client.c + dde_misc.c + dde_server.c + defdlg.c + defwnd.c + desktop.c + dialog.c + driver.c + edit.c + exticon.c + focus.c + hook.c + icontitle.c + input.c + legacy.c + listbox.c + lstr.c + mdi.c + menu.c + message.c + misc.c + msgbox.c + nonclient.c + painting.c + property.c + resource.c + scroll.c + spy.c + static.c + sysparams.c + text.c + uitools.c + user_main.c + win.c + winhelp.c + winpos.c + winproc.c + winstation.c + wsprintf.c + resources/user32.rc + ${CMAKE_CURRENT_BINARY_DIR}/user32_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/user32.def) + +add_library(user32 SHARED ${SOURCE}) +set_module_type(user32 win32dll UNICODE) + +target_link_libraries(user32 + user32_wsprintf + wine + win32ksys + ${PSEH_LIB}) + +add_delay_importlibs(user32 imm32 usp10) +add_importlibs(user32 gdi32 advapi32 version msvcrt kernel32 ntdll) +add_pch(user32 include/user32.h) +add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all) +
Propchange: branches/arwinss/reactos/dll/win32/user32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Modified: branches/arwinss/reactos/dll/win32/user32/csr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/csr.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/csr.c [iso-8859-1] Sun Sep 23 20:30:27 2012 @@ -92,7 +92,7 @@ NTSTATUS Status;
CsrRequest = MAKE_CSR_API(REGISTER_LOGON_PROCESS, CSR_GUI); - Request.Data.RegisterLogonProcessRequest.ProcessId = dwProcessId; + Request.Data.RegisterLogonProcessRequest.ProcessId = (HANDLE)dwProcessId; Request.Data.RegisterLogonProcessRequest.Register = bRegister;
Status = CsrClientCallServer(&Request,
Modified: branches/arwinss/reactos/dll/win32/user32/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/desktop.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/desktop.c [iso-8859-1] Sun Sep 23 20:30:27 2012 @@ -32,6 +32,7 @@ #include "wingdi.h" #include "winnls.h" #include "controls.h" +#include "user_private.h"
static HBRUSH hbrushPattern; static HBITMAP hbitmapWallPaper;
Modified: branches/arwinss/reactos/dll/win32/user32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] Sun Sep 23 20:30:27 2012 @@ -426,7 +426,7 @@ */ BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPCRECT rect, MONITORENUMPROC proc, LPARAM lp ) { - return USER_Driver->pEnumDisplayMonitors( hdc, rect, proc, lp ); + return USER_Driver->pEnumDisplayMonitors( hdc, (LPRECT)rect, proc, lp ); }
/***********************************************************************
Modified: branches/arwinss/reactos/dll/win32/user32/property.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/property.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/property.c [iso-8859-1] Sun Sep 23 20:30:27 2012 @@ -29,6 +29,7 @@ #include "winuser.h" #include "wine/unicode.h" #include "winternl.h" +#include "user_private.h" #include "wine/server.h"
/* size of buffer needed to store an atom string */
Modified: branches/arwinss/reactos/dll/win32/user32/scroll.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/scroll.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/scroll.c [iso-8859-1] Sun Sep 23 20:30:27 2012 @@ -1529,7 +1529,7 @@ case WM_SETCURSOR: if (GetWindowLongW( hwnd, GWL_STYLE ) & SBS_SIZEGRIP) { - ULONG_PTR cursor = (GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) ? IDC_SIZENESW : IDC_SIZENWSE; + ULONG_PTR cursor = (ULONG_PTR)((GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) ? IDC_SIZENESW : IDC_SIZENWSE); return (LRESULT)SetCursor( LoadCursorA( 0, (LPSTR)cursor )); } return DefWindowProcW( hwnd, message, wParam, lParam );
Modified: branches/arwinss/reactos/dll/win32/user32/user_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user32... ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/user_private.h [iso-8859-1] Sun Sep 23 20:30:27 2012 @@ -36,6 +36,10 @@ #ifndef __REACTOS__ #define WM_SYSTIMER 0x0118 #define WM_POPUPSYSTEMMENU 0x0313 +#else +// Hack to silence IDC_ARROW cast errors +#undef MAKEINTRESOURCE +#define MAKEINTRESOURCE(i) ((ULONG_PTR)((WORD)(i))) #endif
/* internal messages codes */
-
fireball＠svn.reactos.org