Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 64113: [GLU32] * Link with mingwex. * Allow multiple definitions at link time because longjmp exists in both our msvcrt and mingwex. CORE-8516
by akhaldi＠svn.reactos.org 11 Sep '14

11 Sep '14

Author: akhaldi Date: Thu Sep 11 10:13:05 2014 New Revision: 64113 URL: http://svn.reactos.org/svn/reactos?rev=64113&view=rev Log: [GLU32] * Link with mingwex. * Allow multiple definitions at link time because longjmp exists in both our msvcrt and mingwex. CORE-8516 Modified: trunk/reactos/dll/opengl/glu32/CMakeLists.txt Modified: trunk/reactos/dll/opengl/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/CMakeList… ============================================================================== --- trunk/reactos/dll/opengl/glu32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/glu32/CMakeLists.txt [iso-8859-1] Thu Sep 11 10:13:05 2014 @@ -114,6 +114,11 @@ if(NOT MSVC) add_target_compile_flags(glu32 "-Wno-write-strings -Wno-unused-but-set-variable") + if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(glu32 mingwex) + #FIXME: longjmp exists in both our msvcrt and mingwex + add_target_link_flags(glu32 "-Wl,--allow-multiple-definition") + endif() endif() add_importlibs(glu32 opengl32 gdi32 msvcrt kernel32 ntdll)

1 0

[hpoussin] 64112: [CDFS] - Correctly decode address of first session, which now uses MSF format since r64106
by hpoussin＠svn.reactos.org 10 Sep '14

10 Sep '14

Author: hpoussin Date: Wed Sep 10 19:45:57 2014 New Revision: 64112 URL: http://svn.reactos.org/svn/reactos?rev=64112&view=rev Log: [CDFS] - Correctly decode address of first session, which now uses MSF format since r64106 Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Wed Sep 10 19:45:57 2014 @@ -200,7 +200,6 @@ PVD_HEADER VdHeader; ULONG Size; ULONG Offset; - ULONG i; CDROM_TOC Toc; DPRINT("CdfsGetVolumeData\n"); @@ -227,10 +226,14 @@ DPRINT("FirstTrack %u, LastTrack %u, TrackNumber %u\n", Toc.FirstTrack, Toc.LastTrack, Toc.TrackData[0].TrackNumber); - Offset = 0; - for (i = 0; i < 4; i++) - { - Offset = (Offset << 8) + Toc.TrackData[0].Address[i]; + Offset = Toc.TrackData[0].Address[1] * 60 * 75; + Offset += Toc.TrackData[0].Address[2] * 75; + Offset += Toc.TrackData[0].Address[3]; + if (Offset >= 150) + { + /* Remove MSF numbering offset of first frame */ + /* FIXME: should be done only for real cdroms? */ + Offset -= 150; } CdInfo->VolumeOffset = Offset;

1 0

[akhaldi] 64111: [CMAKE/CLANG] * Do not add PIC and PIE related flags. CORE-8516
by akhaldi＠svn.reactos.org 10 Sep '14

10 Sep '14

Author: akhaldi Date: Wed Sep 10 19:00:53 2014 New Revision: 64111 URL: http://svn.reactos.org/svn/reactos?rev=64111&view=rev Log: [CMAKE/CLANG] * Do not add PIC and PIE related flags. CORE-8516 Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=64111&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Wed Sep 10 19:00:53 2014 @@ -37,6 +37,12 @@ set(CMAKE_STATIC_LIBRARY_SUFFIX ".a") set(CMAKE_LINK_LIBRARY_SUFFIX "") set(CMAKE_CREATE_WIN32_EXE "") + set(CMAKE_C_COMPILE_OPTIONS_PIC "") + set(CMAKE_CXX_COMPILE_OPTIONS_PIC "") + set(CMAKE_C_COMPILE_OPTIONS_PIE "") + set(CMAKE_CXX_COMPILE_OPTIONS_PIE "") + set(CMAKE_SHARED_LIBRARY_C_FLAGS "") + set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "") endif() if(DBG)

1 0

[akhaldi] 64110: [WIN32SS] * Remove unused CompareSpans().
by akhaldi＠svn.reactos.org 10 Sep '14

10 Sep '14

Author: akhaldi Date: Wed Sep 10 18:49:29 2014 New Revision: 64110 URL: http://svn.reactos.org/svn/reactos?rev=64110&view=rev Log: [WIN32SS] * Remove unused CompareSpans(). Modified: trunk/reactos/win32ss/gdi/eng/clip.c Modified: trunk/reactos/win32ss/gdi/eng/clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/clip.c?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/clip.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/clip.c [iso-8859-1] Wed Sep 10 18:49:29 2014 @@ -150,40 +150,6 @@ Cmp = 0; } } - return Cmp; -} - -static __inline int -CompareSpans( - const SPAN *Span1, - const SPAN *Span2) -{ - int Cmp; - - if (Span1->Y < Span2->Y) - { - Cmp = -1; - } - else if (Span2->Y < Span1->Y) - { - Cmp = +1; - } - else - { - if (Span1->X < Span2->X) - { - Cmp = -1; - } - else if (Span2->X < Span1->X) - { - Cmp = +1; - } - else - { - Cmp = 0; - } - } - return Cmp; }

1 0

[dquintana] 64109: [EXPLORER-NEW] * <+smiley1_> could you please create a subroutine for that?
by dquintana＠svn.reactos.org 10 Sep '14

10 Sep '14

Author: dquintana Date: Wed Sep 10 17:26:47 2014 New Revision: 64109 URL: http://svn.reactos.org/svn/reactos?rev=64109&view=rev Log: [EXPLORER-NEW] * <+smiley1_> could you please create a subroutine for that? Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/traywnd.c [iso-8859-1] Wed Sep 10 17:26:47 2014 @@ -2197,6 +2197,179 @@ SendMessageW(This->hwndStart, BM_SETSTATE, TRUE, 0); } } +} + +static void ProcessMouseTracking(ITrayWindowImpl * This) +{ + RECT rcCurrent; + POINT pt; + BOOL over; + UINT state = This->AutoHideState; + + GetCursorPos(&pt); + GetWindowRect(This->hWnd, &rcCurrent); + over = PtInRect(&rcCurrent, pt); + + if (SendMessage(This->hwndStart, BM_GETSTATE, 0, 0) != BST_UNCHECKED) + { + over = TRUE; + } + + if (over) + { + if (state == AUTOHIDE_HIDING) + { + TRACE("AutoHide cancelling hide.\n"); + This->AutoHideState = AUTOHIDE_SHOWING; + SetTimer(This->hWnd, TIMER_ID_AUTOHIDE, AUTOHIDE_INTERVAL_ANIMATING, NULL); + } + else if (state == AUTOHIDE_HIDDEN) + { + TRACE("AutoHide starting show.\n"); + This->AutoHideState = AUTOHIDE_SHOWING; + SetTimer(This->hWnd, TIMER_ID_AUTOHIDE, AUTOHIDE_DELAY_SHOW, NULL); + } + } + else + { + if (state == AUTOHIDE_SHOWING) + { + TRACE("AutoHide cancelling show.\n"); + This->AutoHideState = AUTOHIDE_HIDING; + SetTimer(This->hWnd, TIMER_ID_AUTOHIDE, AUTOHIDE_INTERVAL_ANIMATING, NULL); + } + else if (state == AUTOHIDE_SHOWN) + { + TRACE("AutoHide starting hide.\n"); + This->AutoHideState = AUTOHIDE_HIDING; + SetTimer(This->hWnd, TIMER_ID_AUTOHIDE, AUTOHIDE_DELAY_HIDE, NULL); + } + + KillTimer(This->hWnd, TIMER_ID_MOUSETRACK); + } +} + +static void ProcessAutoHide(ITrayWindowImpl * This) +{ + BOOL ret; + RECT rc = This->rcTrayWnd[This->Position]; + INT w = This->TraySize.cx - GetSystemMetrics(SM_CXBORDER) * 2 - 1; + INT h = This->TraySize.cy - GetSystemMetrics(SM_CYBORDER) * 2 - 1; + + TRACE("AutoHide Timer received for %u, rc=(%d, %d, %d, %d), w=%d, h=%d.\n", This->AutoHideState, rc.left, rc.top, rc.right, rc.bottom, w, h); + + switch (This->AutoHideState) + { + case AUTOHIDE_HIDING: + switch (This->Position) + { + case ABE_LEFT: + This->AutoHideOffset.cy = 0; + This->AutoHideOffset.cx -= AUTOHIDE_SPEED_HIDE; + if (This->AutoHideOffset.cx < -w) + This->AutoHideOffset.cx = -w; + break; + case ABE_TOP: + This->AutoHideOffset.cx = 0; + This->AutoHideOffset.cy -= AUTOHIDE_SPEED_HIDE; + if (This->AutoHideOffset.cy < -h) + This->AutoHideOffset.cy = -h; + break; + case ABE_RIGHT: + This->AutoHideOffset.cy = 0; + This->AutoHideOffset.cx += AUTOHIDE_SPEED_HIDE; + if (This->AutoHideOffset.cx > w) + This->AutoHideOffset.cx = w; + break; + case ABE_BOTTOM: + This->AutoHideOffset.cx = 0; + This->AutoHideOffset.cy += AUTOHIDE_SPEED_HIDE; + if (This->AutoHideOffset.cy > h) + This->AutoHideOffset.cy = h; + break; + } + + if (This->AutoHideOffset.cx != w && This->AutoHideOffset.cy != h) + { + SetTimer(This->hWnd, TIMER_ID_AUTOHIDE, AUTOHIDE_INTERVAL_ANIMATING, NULL); + break; + } + + /* fallthrough */ + case AUTOHIDE_HIDDEN: + + switch (This->Position) + { + case ABE_LEFT: + This->AutoHideOffset.cx = -w; + This->AutoHideOffset.cy = 0; + break; + case ABE_TOP: + This->AutoHideOffset.cx = 0; + This->AutoHideOffset.cy = -h; + break; + case ABE_RIGHT: + This->AutoHideOffset.cx = w; + This->AutoHideOffset.cy = 0; + break; + case ABE_BOTTOM: + This->AutoHideOffset.cx = 0; + This->AutoHideOffset.cy = h; + break; + } + + KillTimer(This->hWnd, TIMER_ID_AUTOHIDE); + This->AutoHideState = AUTOHIDE_HIDDEN; + break; + + case AUTOHIDE_SHOWING: + if (This->AutoHideOffset.cx >= AUTOHIDE_SPEED_SHOW) + { + This->AutoHideOffset.cx -= AUTOHIDE_SPEED_SHOW; + } + else if (This->AutoHideOffset.cx <= -AUTOHIDE_SPEED_SHOW) + { + This->AutoHideOffset.cx += AUTOHIDE_SPEED_SHOW; + } + else + { + This->AutoHideOffset.cx = 0; + } + + if (This->AutoHideOffset.cy >= AUTOHIDE_SPEED_SHOW) + { + This->AutoHideOffset.cy -= AUTOHIDE_SPEED_SHOW; + } + else if (This->AutoHideOffset.cy <= -AUTOHIDE_SPEED_SHOW) + { + This->AutoHideOffset.cy += AUTOHIDE_SPEED_SHOW; + } + else + { + This->AutoHideOffset.cy = 0; + } + + if (This->AutoHideOffset.cx != 0 || This->AutoHideOffset.cy != 0) + { + SetTimer(This->hWnd, TIMER_ID_AUTOHIDE, AUTOHIDE_INTERVAL_ANIMATING, NULL); + break; + } + + /* fallthrough */ + case AUTOHIDE_SHOWN: + + KillTimer(This->hWnd, TIMER_ID_AUTOHIDE); + This->AutoHideState = AUTOHIDE_SHOWN; + break; + } + + rc.left += This->AutoHideOffset.cx; + rc.right += This->AutoHideOffset.cx; + rc.top += This->AutoHideOffset.cy; + rc.bottom += This->AutoHideOffset.cy; + + TRACE("AutoHide Changing position to (%d, %d, %d, %d) and state=%u.\n", rc.left, rc.top, rc.right, rc.bottom, This->AutoHideState); + SetWindowPos(This->hWnd, NULL, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, SWP_NOACTIVATE | SWP_NOZORDER); } static LRESULT CALLBACK @@ -2811,175 +2984,11 @@ case WM_TIMER: if (wParam == TIMER_ID_MOUSETRACK) { - RECT rcCurrent; - POINT pt; - BOOL over; - UINT state = This->AutoHideState; - - GetCursorPos(&pt); - GetWindowRect(This->hWnd, &rcCurrent); - over = PtInRect(&rcCurrent, pt); - - if (SendMessage(This->hwndStart, BM_GETSTATE, 0, 0) != BST_UNCHECKED) - { - over = TRUE; - } - - if (over) - { - if (state == AUTOHIDE_HIDING) - { - TRACE("AutoHide cancelling hide.\n"); - This->AutoHideState = AUTOHIDE_SHOWING; - SetTimer(This->hWnd, TIMER_ID_AUTOHIDE, AUTOHIDE_INTERVAL_ANIMATING, NULL); - } - else if (state == AUTOHIDE_HIDDEN) - { - TRACE("AutoHide starting show.\n"); - This->AutoHideState = AUTOHIDE_SHOWING; - SetTimer(This->hWnd, TIMER_ID_AUTOHIDE, AUTOHIDE_DELAY_SHOW, NULL); - } - } - else - { - if (state == AUTOHIDE_SHOWING) - { - TRACE("AutoHide cancelling show.\n"); - This->AutoHideState = AUTOHIDE_HIDING; - SetTimer(This->hWnd, TIMER_ID_AUTOHIDE, AUTOHIDE_INTERVAL_ANIMATING, NULL); - } - else if (state == AUTOHIDE_SHOWN) - { - TRACE("AutoHide starting hide.\n"); - This->AutoHideState = AUTOHIDE_HIDING; - SetTimer(This->hWnd, TIMER_ID_AUTOHIDE, AUTOHIDE_DELAY_HIDE, NULL); - } - - KillTimer(This->hWnd, TIMER_ID_MOUSETRACK); - } + ProcessMouseTracking(This); } else if (wParam == TIMER_ID_AUTOHIDE) { - BOOL ret; - RECT rc = This->rcTrayWnd[This->Position]; - INT w = This->TraySize.cx - GetSystemMetrics(SM_CXBORDER) * 2 - 1; - INT h = This->TraySize.cy - GetSystemMetrics(SM_CYBORDER) * 2 - 1; - - TRACE("AutoHide Timer received for %u, rc=(%d, %d, %d, %d), w=%d, h=%d.\n", This->AutoHideState, rc.left, rc.top, rc.right, rc.bottom, w, h); - - switch (This->AutoHideState) - { - case AUTOHIDE_HIDING: - switch (This->Position) - { - case ABE_LEFT: - This->AutoHideOffset.cy = 0; - This->AutoHideOffset.cx -= AUTOHIDE_SPEED_HIDE; - if (This->AutoHideOffset.cx < -w) - This->AutoHideOffset.cx = -w; - break; - case ABE_TOP: - This->AutoHideOffset.cx = 0; - This->AutoHideOffset.cy -= AUTOHIDE_SPEED_HIDE; - if (This->AutoHideOffset.cy < -h) - This->AutoHideOffset.cy = -h; - break; - case ABE_RIGHT: - This->AutoHideOffset.cy = 0; - This->AutoHideOffset.cx += AUTOHIDE_SPEED_HIDE; - if (This->AutoHideOffset.cx > w) - This->AutoHideOffset.cx = w; - break; - case ABE_BOTTOM: - This->AutoHideOffset.cx = 0; - This->AutoHideOffset.cy += AUTOHIDE_SPEED_HIDE; - if (This->AutoHideOffset.cy > h) - This->AutoHideOffset.cy = h; - break; - } - - if (This->AutoHideOffset.cx != w && This->AutoHideOffset.cy != h) - { - SetTimer(This->hWnd, TIMER_ID_AUTOHIDE, AUTOHIDE_INTERVAL_ANIMATING, NULL); - break; - } - - /* fallthrough */ - case AUTOHIDE_HIDDEN: - - switch (This->Position) - { - case ABE_LEFT: - This->AutoHideOffset.cx = -w; - This->AutoHideOffset.cy = 0; - break; - case ABE_TOP: - This->AutoHideOffset.cx = 0; - This->AutoHideOffset.cy = -h; - break; - case ABE_RIGHT: - This->AutoHideOffset.cx = w; - This->AutoHideOffset.cy = 0; - break; - case ABE_BOTTOM: - This->AutoHideOffset.cx = 0; - This->AutoHideOffset.cy = h; - break; - } - - KillTimer(This->hWnd, TIMER_ID_AUTOHIDE); - This->AutoHideState = AUTOHIDE_HIDDEN; - break; - - case AUTOHIDE_SHOWING: - if (This->AutoHideOffset.cx >= AUTOHIDE_SPEED_SHOW) - { - This->AutoHideOffset.cx -= AUTOHIDE_SPEED_SHOW; - } - else if (This->AutoHideOffset.cx <= -AUTOHIDE_SPEED_SHOW) - { - This->AutoHideOffset.cx += AUTOHIDE_SPEED_SHOW; - } - else - { - This->AutoHideOffset.cx = 0; - } - - if (This->AutoHideOffset.cy >= AUTOHIDE_SPEED_SHOW) - { - This->AutoHideOffset.cy -= AUTOHIDE_SPEED_SHOW; - } - else if (This->AutoHideOffset.cy <= -AUTOHIDE_SPEED_SHOW) - { - This->AutoHideOffset.cy += AUTOHIDE_SPEED_SHOW; - } - else - { - This->AutoHideOffset.cy = 0; - } - - if (This->AutoHideOffset.cx != 0 || This->AutoHideOffset.cy != 0) - { - SetTimer(This->hWnd, TIMER_ID_AUTOHIDE, AUTOHIDE_INTERVAL_ANIMATING, NULL); - break; - } - - /* fallthrough */ - case AUTOHIDE_SHOWN: - - KillTimer(This->hWnd, TIMER_ID_AUTOHIDE); - This->AutoHideState = AUTOHIDE_SHOWN; - break; - } - - rc.left += This->AutoHideOffset.cx; - rc.right += This->AutoHideOffset.cx; - rc.top += This->AutoHideOffset.cy; - rc.bottom += This->AutoHideOffset.cy; - - TRACE("AutoHide Changing position to (%d, %d, %d, %d) and state=%u.\n", rc.left, rc.top, rc.right, rc.bottom, This->AutoHideState); - ret = SetWindowPos(This->hWnd, NULL, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, SWP_NOACTIVATE | SWP_NOZORDER); - TRACE("ret=%d, err=%d\n", ret, GetLastError()); + ProcessAutoHide(This); } goto DefHandler;

1 0

[hpoussin] 64108: [NTOS:IO] - Support creating new registry keys when registering new interfaces - IoSetDeviceInterfaceState: do not try to parse symbolic link name, as symbolic link name is enough...
by hpoussin＠svn.reactos.org 10 Sep '14

10 Sep '14

Author: hpoussin Date: Wed Sep 10 16:05:44 2014 New Revision: 64108 URL: http://svn.reactos.org/svn/reactos?rev=64108&view=rev Log: [NTOS:IO] - Support creating new registry keys when registering new interfaces - IoSetDeviceInterfaceState: do not try to parse symbolic link name, as symbolic link name is enough to open the right object - IoSetDeviceInterfaceState: send the notification on the right interface when registering interfaces on devices already having an interface Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Wed Sep 10 16:05:44 2014 @@ -95,9 +95,13 @@ OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, ClassesKey, NULL); - Status = ZwOpenKey(GuidKeyRealP, - DesiredAccess | KEY_ENUMERATE_SUB_KEYS, - &ObjectAttributes); + Status = ZwCreateKey(GuidKeyRealP, + DesiredAccess | KEY_ENUMERATE_SUB_KEYS, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + NULL); ZwClose(ClassesKey); if (!NT_SUCCESS(Status)) { @@ -142,9 +146,13 @@ OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, *GuidKeyRealP, NULL); - Status = ZwOpenKey(DeviceKeyRealP, - DesiredAccess | KEY_ENUMERATE_SUB_KEYS, - &ObjectAttributes); + Status = ZwCreateKey(DeviceKeyRealP, + DesiredAccess | KEY_ENUMERATE_SUB_KEYS, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to open %wZ%wZ\\%wZ\n", &BaseKeyU, &GuidString, &SubKeyName); @@ -156,9 +164,13 @@ OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, *DeviceKeyRealP, NULL); - Status = ZwOpenKey(InstanceKeyRealP, - DesiredAccess, - &ObjectAttributes); + Status = ZwCreateKey(InstanceKeyRealP, + DesiredAccess, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to open %wZ%wZ\\%wZ%\\%wZ (%x)\n", &BaseKeyU, &GuidString, &SubKeyName, &ReferenceString, Status); @@ -1237,7 +1249,6 @@ PDEVICE_OBJECT PhysicalDeviceObject; PFILE_OBJECT FileObject; UNICODE_STRING GuidString; - UNICODE_STRING SymLink; PWCHAR StartPosition; PWCHAR EndPosition; NTSTATUS Status; @@ -1255,8 +1266,8 @@ /* Symbolic link name is \??\ACPI#PNP0501#1#{GUID}\ReferenceString */ /* Get GUID from SymbolicLinkName */ - StartPosition = wcschr(SymbolicLinkName->Buffer, L'{'); - EndPosition = wcschr(SymbolicLinkName->Buffer, L'}'); + StartPosition = wcsrchr(SymbolicLinkName->Buffer, L'{'); + EndPosition = wcsrchr(SymbolicLinkName->Buffer, L'}'); if (!StartPosition ||!EndPosition || StartPosition > EndPosition) { DPRINT1("IoSetDeviceInterfaceState() returning STATUS_INVALID_PARAMETER_1\n"); @@ -1264,10 +1275,6 @@ } GuidString.Buffer = StartPosition; GuidString.MaximumLength = GuidString.Length = (USHORT)((ULONG_PTR)(EndPosition + 1) - (ULONG_PTR)StartPosition); - - SymLink.Buffer = SymbolicLinkName->Buffer; - SymLink.MaximumLength = SymLink.Length = (USHORT)((ULONG_PTR)(EndPosition + 1) - (ULONG_PTR)SymLink.Buffer); - DPRINT("IoSetDeviceInterfaceState('%wZ', %u)\n", SymbolicLinkName, Enable); Status = OpenRegistryHandlesFromSymbolicLink(SymbolicLinkName, KEY_CREATE_SUB_KEY, @@ -1315,7 +1322,7 @@ /* Get pointer to the PDO */ Status = IoGetDeviceObjectPointer( - &SymLink, + SymbolicLinkName, 0, /* DesiredAccess */ &FileObject, &PhysicalDeviceObject);

1 0

[akhaldi] 64107: [RICHED20] * Fall back to gas with some source files until http://llvm.org/bugs/show_bug.cgi?id=19027 is fixed. CORE-8516
by akhaldi＠svn.reactos.org 10 Sep '14

10 Sep '14

Author: akhaldi Date: Wed Sep 10 16:03:22 2014 New Revision: 64107 URL: http://svn.reactos.org/svn/reactos?rev=64107&view=rev Log: [RICHED20] * Fall back to gas with some source files until http://llvm.org/bugs/show_bug.cgi?id=19027 is fixed. CORE-8516 Modified: trunk/reactos/dll/win32/riched20/CMakeLists.txt Modified: trunk/reactos/dll/win32/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/riched20/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/CMakeLists.txt [iso-8859-1] Wed Sep 10 16:03:22 2014 @@ -33,6 +33,11 @@ list(APPEND SOURCE txthost.c txtsrv.c) endif() +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + #FIXME: http://llvm.org/bugs/show_bug.cgi?id=19027 + set_property(SOURCE txthost.c txtsrv.c APPEND_STRING PROPERTY COMPILE_FLAGS " -no-integrated-as") +endif() + list(APPEND ADDITIONAL_SOURCE version.rc ${CMAKE_CURRENT_BINARY_DIR}/riched20.def)

1 0

[hpoussin] 64106: [CDFS] Use IOCTL_CDROM_READ_TOC instead of IOCTL_CDROM_GET_LAST_SESSION, which is not always available
by hpoussin＠svn.reactos.org 10 Sep '14

10 Sep '14

Author: hpoussin Date: Wed Sep 10 16:02:02 2014 New Revision: 64106 URL: http://svn.reactos.org/svn/reactos?rev=64106&view=rev Log: [CDFS] Use IOCTL_CDROM_READ_TOC instead of IOCTL_CDROM_GET_LAST_SESSION, which is not always available Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Wed Sep 10 16:02:02 2014 @@ -201,14 +201,7 @@ ULONG Size; ULONG Offset; ULONG i; - struct - { - UCHAR Length[2]; - UCHAR FirstSession; - UCHAR LastSession; - TRACK_DATA TrackData; - } - Toc; + CDROM_TOC Toc; DPRINT("CdfsGetVolumeData\n"); @@ -219,7 +212,7 @@ Size = sizeof(Toc); Status = CdfsDeviceIoControl(DeviceObject, - IOCTL_CDROM_GET_LAST_SESSION, + IOCTL_CDROM_READ_TOC, NULL, 0, &Toc, @@ -231,13 +224,13 @@ return Status; } - DPRINT("FirstSession %u, LastSession %u, FirstTrack %u\n", - Toc.FirstSession, Toc.LastSession, Toc.TrackData.TrackNumber); + DPRINT("FirstTrack %u, LastTrack %u, TrackNumber %u\n", + Toc.FirstTrack, Toc.LastTrack, Toc.TrackData[0].TrackNumber); Offset = 0; for (i = 0; i < 4; i++) { - Offset = (Offset << 8) + Toc.TrackData.Address[i]; + Offset = (Offset << 8) + Toc.TrackData[0].Address[i]; } CdInfo->VolumeOffset = Offset;

1 0

[akhaldi] 64105: [CMAKE/CLANG] * Link mingwex when needed because having it globally won't do. CORE-8516
by akhaldi＠svn.reactos.org 10 Sep '14

10 Sep '14

Author: akhaldi Date: Wed Sep 10 15:56:48 2014 New Revision: 64105 URL: http://svn.reactos.org/svn/reactos?rev=64105&view=rev Log: [CMAKE/CLANG] * Link mingwex when needed because having it globally won't do. CORE-8516 Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt trunk/reactos/dll/opengl/opengl32/CMakeLists.txt trunk/reactos/dll/win32/beepmidi/CMakeLists.txt trunk/reactos/dll/win32/gdiplus/CMakeLists.txt trunk/reactos/dll/win32/mshtml/CMakeLists.txt trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt trunk/reactos/toolchain-clang.cmake Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… ============================================================================== --- trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -33,6 +33,11 @@ set_module_type(d3dx9_36 win32dll) add_dependencies(d3dx9_36 d3d_idl_headers) target_link_libraries(d3dx9_36 dxguid wine) + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(d3dx9_36 mingwex) +endif() + add_importlibs(d3dx9_36 d3dcompiler_43 d3dxof user32 ole32 gdi32 msvcrt kernel32 ntdll) add_pch(d3dx9_36 d3dx9_36_private.h SOURCE) add_cd_file(TARGET d3dx9_36 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/CM… ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -25,5 +25,10 @@ set_module_type(dsound win32dll) target_link_libraries(dsound dxguid uuid wine) + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(dsound mingwex) +endif() + add_importlibs(dsound winmm ole32 advapi32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET dsound DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -46,6 +46,11 @@ set_module_type(wined3d win32dll) target_link_libraries(wined3d wine) + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(wined3d mingwex) +endif() + add_importlibs(wined3d user32 opengl32 gdi32 advapi32 msvcrt kernel32 ntdll) add_pch(wined3d wined3d_private.h SOURCE) add_cd_file(TARGET wined3d DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/opengl/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/CMakeL… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/CMakeLists.txt [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -53,6 +53,10 @@ target_link_libraries(opengl32 mesa_x86) endif() +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(opengl32 mingwex) +endif() + set_module_type(opengl32 win32dll HOTPATCHABLE) add_importlibs(opengl32 gdi32 user32 advapi32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -7,6 +7,10 @@ add_library(beepmidi SHARED ${SOURCE}) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(beepmidi mingwex) +endif() + set_module_type(beepmidi win32dll UNICODE) add_importlibs(beepmidi winmm msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/CMakeLists.txt [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -33,6 +33,11 @@ set_module_type(gdiplus win32dll) target_link_libraries(gdiplus wine) + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(gdiplus mingwex) +endif() + add_delay_importlibs(gdiplus windowscodecs) add_importlibs(gdiplus msvcrt shlwapi oleaut32 ole32 user32 gdi32 kernel32 ntdll) add_pch(gdiplus gdiplus_private.h SOURCE) Modified: trunk/reactos/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -106,6 +106,11 @@ set_module_type(mshtml win32dll) target_link_libraries(mshtml uuid wine strmiids oldnames) + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(mshtml mingwex) +endif() + add_delay_importlibs(mshtml wininet) add_importlibs(mshtml urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_dependencies(mshtml mshtml_nsiface_header) Modified: trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/CMake… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -30,6 +30,10 @@ libsamplerate mmixer) +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + target_link_libraries(wdmaud.drv mingwex) +endif() + add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll) add_pch(wdmaud.drv wdmaud.h SOURCE) add_cd_file(TARGET wdmaud.drv DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/toolchain-clang.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-clang.cmake?rev=… ============================================================================== --- trunk/reactos/toolchain-clang.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-clang.cmake [iso-8859-1] Wed Sep 10 15:56:48 2014 @@ -56,7 +56,7 @@ set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) # Don't link with anything by default unless we say so -set(CMAKE_C_STANDARD_LIBRARIES "-lmingwex -lgcc" CACHE STRING "Standard C Libraries") +set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") #MARK_AS_ADVANCED(CLEAR CMAKE_CXX_STANDARD_LIBRARIES) set(CMAKE_CXX_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C++ Libraries")

1 0

[akhaldi] 64104: [CMAKE/CLANG] * Do not pass -mwindows when linking executables. CORE-8516
by akhaldi＠svn.reactos.org 10 Sep '14

10 Sep '14

Author: akhaldi Date: Wed Sep 10 15:34:05 2014 New Revision: 64104 URL: http://svn.reactos.org/svn/reactos?rev=64104&view=rev Log: [CMAKE/CLANG] * Do not pass -mwindows when linking executables. CORE-8516 Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=64104&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Wed Sep 10 15:34:05 2014 @@ -36,6 +36,7 @@ set(CMAKE_LINK_DEF_FILE_FLAG "") set(CMAKE_STATIC_LIBRARY_SUFFIX ".a") set(CMAKE_LINK_LIBRARY_SUFFIX "") + set(CMAKE_CREATE_WIN32_EXE "") endif() if(DBG)

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