Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 50442: [GDI32] Fix broken portable implementation of _lrintf
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 18:10:08 2011 New Revision: 50442 URL: http://svn.reactos.org/svn/reactos?rev=50442&view=rev Log: [GDI32] Fix broken portable implementation of _lrintf Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h [iso-8859-1] Wed Jan 19 18:10:08 2011 @@ -413,7 +413,7 @@ } #else /* slow, but portable */ - return (int)floor(x >= 0 ? x+0.5 : x-0.5); + return (int)(x >= 0 ? x+0.5 : x-0.5); #endif }

1 0

[akhaldi] 50441: [CMAKE] - Add __WINESRC__ definition to all winetests.
by akhaldi＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: akhaldi Date: Wed Jan 19 17:51:43 2011 New Revision: 50441 URL: http://svn.reactos.org/svn/reactos?rev=50441&view=rev Log: [CMAKE] - Add __WINESRC__ definition to all winetests. Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Wed Jan 19 17:51:43 2011 @@ -1,3 +1,5 @@ + +add_definitions(-D__WINESRC__) add_subdirectory(advapi32) add_subdirectory(advpack)

1 0

[fireball] 50440: - Fix undeclared functions warnings.
by fireball＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: fireball Date: Wed Jan 19 17:19:17 2011 New Revision: 50440 URL: http://svn.reactos.org/svn/reactos?rev=50440&view=rev Log: - Fix undeclared functions warnings. Modified: branches/arwinss/reactos/dll/win32/user32/user_private.h Modified: branches/arwinss/reactos/dll/win32/user32/user_private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- 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] Wed Jan 19 17:19:17 2011 @@ -324,4 +324,7 @@ #define ASSERT(x) if (!(x)) {RtlAssert("#x",__FILE__,__LINE__, ""); } #endif +extern void CDECL __wine_make_gdi_object_system( HGDIOBJ handle, BOOL set ); +extern void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ); + #endif /* __WINE_USER_PRIVATE_H */

1 0

[fireball] 50439: - Globally save monitor working area per monitor, fix incorrectly storing it in the kernelmode. Patch by Drazic. - Required two lines modification of Wine's user32, not a big prob...
by fireball＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: fireball Date: Wed Jan 19 17:17:58 2011 New Revision: 50439 URL: http://svn.reactos.org/svn/reactos?rev=50439&view=rev Log: - Globally save monitor working area per monitor, fix incorrectly storing it in the kernelmode. Patch by Drazic. - Required two lines modification of Wine's user32, not a big problem for later syncing. See issue #5523 for more details. Modified: branches/arwinss/reactos/dll/win32/user32/sysparams.c branches/arwinss/reactos/include/reactos/wine/rosuser.h branches/arwinss/reactos/subsystems/win32/win32k/main/monitor.c branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/arwinss/reactos/dll/win32/user32/sysparams.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/sysparams.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/sysparams.c [iso-8859-1] Wed Jan 19 17:17:58 2011 @@ -39,6 +39,7 @@ #include "controls.h" #include "user_private.h" +#include "rosuser.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -1731,6 +1732,7 @@ spi_idx = SPI_SETWORKAREA_IDX; CopyRect( &work_area, pvParam ); + RosUserSetMonitorInfo( NULL, &work_area ); spi_loaded[spi_idx] = TRUE; break; } Modified: branches/arwinss/reactos/include/reactos/wine/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/rosuser.h [iso-8859-1] Wed Jan 19 17:17:58 2011 @@ -168,6 +168,10 @@ APIENTRY RosUserGetAsyncKeyboardState(BYTE key_state_table[]); +VOID +APIENTRY +RosUserSetMonitorInfo(HMONITOR hMonitor, LPCRECT rcWorkArea); + BOOL NTAPI RosUserRegisterShellHookWindow(HWND hWnd); Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/monitor.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/monitor.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/monitor.c [iso-8859-1] Wed Jan 19 17:17:58 2011 @@ -150,6 +150,15 @@ } Monitor->GdiDevice = pGdiDevice; + + /* Set monitor rects */ + Monitor->rcMonitor.left = 0; /* FIXME: get origin */ + Monitor->rcMonitor.top = 0; /* FIXME: get origin */ + Monitor->rcMonitor.right = Monitor->rcMonitor.left + Monitor->GdiDevice->gdiinfo.ulHorzRes; + Monitor->rcMonitor.bottom = Monitor->rcMonitor.top + Monitor->GdiDevice->gdiinfo.ulVertRes; + + Monitor->rcWork = Monitor->rcMonitor; + if (gMonitorList == NULL) { DPRINT("Primary monitor is beeing attached\n"); @@ -279,10 +288,10 @@ for (Monitor = gMonitorList; Monitor != NULL; Monitor = Monitor->Next) { safeHMonitorList[i] = Monitor->Handle; - safeRectList[i].left = 0; /* FIXME: get origin */ - safeRectList[i].top = 0; /* FIXME: get origin */ - safeRectList[i].right = safeRectList->left + Monitor->GdiDevice->gdiinfo.ulHorzRes; - safeRectList[i].bottom = safeRectList->top + Monitor->GdiDevice->gdiinfo.ulVertRes; + safeRectList[i].left = Monitor->rcMonitor.left; + safeRectList[i].top = Monitor->rcMonitor.top; + safeRectList[i].right = Monitor->rcMonitor.right; + safeRectList[i].bottom = Monitor->rcMonitor.bottom; i++; } @@ -407,11 +416,9 @@ } /* fill monitor info */ - MonitorInfo.rcMonitor.left = 0; /* FIXME: get origin */ - MonitorInfo.rcMonitor.top = 0; /* FIXME: get origin */ - MonitorInfo.rcMonitor.right = MonitorInfo.rcMonitor.left + Monitor->GdiDevice->gdiinfo.ulHorzRes; - MonitorInfo.rcMonitor.bottom = MonitorInfo.rcMonitor.top + Monitor->GdiDevice->gdiinfo.ulVertRes; - MonitorInfo.rcWork = MonitorInfo.rcMonitor; /* FIXME: use DEVMODE panning to calculate work area? */ + MonitorInfo.rcMonitor = Monitor->rcMonitor; + MonitorInfo.rcWork = Monitor->rcWork; /* FIXME: use DEVMODE panning to calculate work area? */ + MonitorInfo.dwFlags = 0; if (Monitor->IsPrimary) @@ -452,6 +459,43 @@ DPRINT("GetMonitorInfo: success\n"); return TRUE; - - -} +} + +VOID +APIENTRY +RosUserSetMonitorInfo( + IN HMONITOR hMonitor, + LPCRECT rcWorkArea) +{ + PMONITOR Monitor; + + DPRINT("Enter RosUserSetMonitorInfo\n"); + + /* get monitor object */ + if (hMonitor) + { + if (!(Monitor = UserGetMonitorObject(hMonitor))) + { + DPRINT1("Couldnt find monitor 0x%lx\n", hMonitor); + return; + } + } + else + { + /* Use a primary one if it exists */ + if (!gMonitorList) return; + Monitor = gMonitorList; + } + + /* Update monitor info */ + _SEH2_TRY + { + Monitor->rcWork = *rcWorkArea; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Ignore the exception */ + } + _SEH2_END; +} + Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Wed Jan 19 17:17:58 2011 @@ -81,6 +81,7 @@ RosUserToUnicodeEx 7 RosUserMapVirtualKeyEx 4 RosUserGetAsyncKeyState 1 +RosUserSetMonitorInfo 2 RosUserRegisterShellHookWindow 1 RosUserDeRegisterShellHookWindow 1 RosUserBuildShellHookHwndList 2

1 0

[tkreuzer] 50438: [ASM] Add include guards to asm.inc and comment out broken ljmp macro
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 16:58:58 2011 New Revision: 50438 URL: http://svn.reactos.org/svn/reactos?rev=50438&view=rev Log: [ASM] Add include guards to asm.inc and comment out broken ljmp macro Modified: trunk/reactos/include/reactos/asm.inc Modified: trunk/reactos/include/reactos/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/asm.inc?re… ============================================================================== --- trunk/reactos/include/reactos/asm.inc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/asm.inc [iso-8859-1] Wed Jan 19 16:58:58 2011 @@ -5,6 +5,8 @@ * PURPOSE: ASM macros for for GAS and MASM/ML64 * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ +#ifndef _ASM_INC_ +#define _ASM_INC_ #ifdef _USE_ML @@ -53,10 +55,6 @@ #define lidt lidt fword ptr ds: -ljmp MACRO segment, offset - DB 0 -ENDM - .code64 MACRO .code ENDM @@ -115,9 +113,9 @@ // FIXME ENDM -ljmp MACRO segment, offset +//ljmp MACRO segment, offset // FIXME -ENDM +//ENDM UNIMPLEMENTED MACRO name ENDM @@ -176,9 +174,9 @@ #define REPEAT .rept #define ENDR .endr -.macro ljmp segment, offset - jmp far ptr \segment:\offset -.endm +//.macro ljmp segment, offset +// jmp far ptr \segment:\offset +//.endm /* MASM compatible EXTERN */ .macro EXTERN name @@ -260,3 +258,5 @@ #define elseif .elseif #endif + +#endif /* _ASM_INC_ */

1 0

[tkreuzer] 50437: [CMAKE] Revert part of 50435
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 16:26:49 2011 New Revision: 50437 URL: http://svn.reactos.org/svn/reactos?rev=50437&view=rev Log: [CMAKE] Revert part of 50435 Modified: trunk/rostests/winetests/amstream/CMakeLists.txt trunk/rostests/winetests/avifil32/CMakeLists.txt Modified: trunk/rostests/winetests/amstream/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/amstream/CMakeL… ============================================================================== --- trunk/rostests/winetests/amstream/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/amstream/CMakeLists.txt [iso-8859-1] Wed Jan 19 16:26:49 2011 @@ -1,5 +1,5 @@ -add_definitions(-D_DLL -D__USE_CRTIMP -D__WINESRC__) +add_definitions(-D_DLL -D__USE_CRTIMP) add_executable(amstream_winetest amstream.c testlist.c) target_link_libraries(amstream_winetest wine uuid) set_module_type(amstream_winetest win32cui) Modified: trunk/rostests/winetests/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/avifil32/CMakeL… ============================================================================== --- trunk/rostests/winetests/avifil32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/avifil32/CMakeLists.txt [iso-8859-1] Wed Jan 19 16:26:49 2011 @@ -1,5 +1,5 @@ -add_definitions(-D_DLL -D__USE_CRTIMP -D__ROS_LONG64__) +add_definitions(-D_DLL -D__USE_CRTIMP) add_executable(avifil32_winetest api.c testlist.c) target_link_libraries(avifil32_winetest wine) set_module_type(avifil32_winetest win32cui)

1 0

[tkreuzer] 50436: [CMAKE] test for the buildbot
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 16:19:52 2011 New Revision: 50436 URL: http://svn.reactos.org/svn/reactos?rev=50436&view=rev Log: [CMAKE] test for the buildbot Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=504… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Wed Jan 19 16:19:52 2011 @@ -223,3 +223,4 @@ set(PSEH_LIB "") endif(CMAKE_CROSSCOMPILING) +

1 0

[tkreuzer] 50435: [CMAKE] Revert r50434. Insetad add __WINESRC__ definition to amstream and avifil32 winetests
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 14:59:38 2011 New Revision: 50435 URL: http://svn.reactos.org/svn/reactos?rev=50435&view=rev Log: [CMAKE] Revert r50434. Insetad add __WINESRC__ definition to amstream and avifil32 winetests Modified: trunk/rostests/winetests/CMakeLists.txt trunk/rostests/winetests/amstream/CMakeLists.txt trunk/rostests/winetests/avifil32/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Wed Jan 19 14:59:38 2011 @@ -1,5 +1,3 @@ - -add_definitions(-D__WINESRC__) add_subdirectory(advapi32) add_subdirectory(advpack) Modified: trunk/rostests/winetests/amstream/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/amstream/CMakeL… ============================================================================== --- trunk/rostests/winetests/amstream/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/amstream/CMakeLists.txt [iso-8859-1] Wed Jan 19 14:59:38 2011 @@ -1,5 +1,5 @@ -add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-D_DLL -D__USE_CRTIMP -D__WINESRC__) add_executable(amstream_winetest amstream.c testlist.c) target_link_libraries(amstream_winetest wine uuid) set_module_type(amstream_winetest win32cui) Modified: trunk/rostests/winetests/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/avifil32/CMakeL… ============================================================================== --- trunk/rostests/winetests/avifil32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/avifil32/CMakeLists.txt [iso-8859-1] Wed Jan 19 14:59:38 2011 @@ -1,5 +1,5 @@ -add_definitions(-D_DLL -D__USE_CRTIMP) +add_definitions(-D_DLL -D__USE_CRTIMP -D__ROS_LONG64__) add_executable(avifil32_winetest api.c testlist.c) target_link_libraries(avifil32_winetest wine) set_module_type(avifil32_winetest win32cui)

1 0

[tkreuzer] 50434: [CMAKE] Add __WINESRC__ definition to all winetests.
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 14:18:42 2011 New Revision: 50434 URL: http://svn.reactos.org/svn/reactos?rev=50434&view=rev Log: [CMAKE] Add __WINESRC__ definition to all winetests. Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Wed Jan 19 14:18:42 2011 @@ -1,3 +1,5 @@ + +add_definitions(-D__WINESRC__) add_subdirectory(advapi32) add_subdirectory(advpack)

1 0

[tkreuzer] 50433: [CMAKE] Fix warnings by casting values explicitly to int in wine/test.h
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 13:50:22 2011 New Revision: 50433 URL: http://svn.reactos.org/svn/reactos?rev=50433&view=rev Log: [CMAKE] Fix warnings by casting values explicitly to int in wine/test.h Modified: branches/cmake-bringup/include/reactos/wine/test.h Modified: branches/cmake-bringup/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/test.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/test.h [iso-8859-1] Wed Jan 19 13:50:22 2011 @@ -440,13 +440,13 @@ { if (exit_code > 255) { - fprintf( stdout, "%s: exception 0x%08x in child process\n", current_test->name, exit_code ); + fprintf( stdout, "%s: exception 0x%08x in child process\n", current_test->name, (unsigned int)exit_code ); InterlockedIncrement( &failures ); } else { fprintf( stdout, "%s: %u failures in child process\n", - current_test->name, exit_code ); + current_test->name, (unsigned int)exit_code ); while (exit_code-- > 0) InterlockedIncrement(&failures); } @@ -558,8 +558,8 @@ if (winetest_debug) { fprintf( stdout, "%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - test->name, successes + failures + todo_successes + todo_failures, - todo_successes, failures + todo_failures, + test->name, (int)successes + failures + todo_successes + todo_failures, + (int)todo_successes, (int)failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", skipped ); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs