Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[jimtabor] 50208: [User32] - Fix most of the user32 wine win test_mdi tests. Leaving 30 failures dealing with rect size, Class and Title names.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Dec 29 08:17:54 2010 New Revision: 50208 URL: http://svn.reactos.org/svn/reactos?rev=50208&view=rev Log: [User32] - Fix most of the user32 wine win test_mdi tests. Leaving 30 failures dealing with rect size, Class and Title names. Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Wed Dec 29 08:17:54 2010 @@ -342,6 +342,20 @@ POINT mPos[2]; UINT id = 0; HWND top_child; + PWND pWndParent; + PCLS pCls; + + pWndParent = ValidateHwnd(hWndParent); + + if (!pWndParent) return NULL; + + pCls = DesktopPtrToUser(pWndParent->pcls); + + if (pCls->fnid != FNID_MDICLIENT) // wine uses WIN_ISMDICLIENT + { + WARN("WS_EX_MDICHILD, but parent %p is not MDIClient\n", hWndParent); + return NULL; + } /* lpParams of WM_[NC]CREATE is different for MDI children. * MDICREATESTRUCT members have the originally passed values. @@ -358,7 +372,7 @@ lpParam = (LPVOID)&mdi; - if (GetWindowLongPtrW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) + if (pWndParent->style & MDIS_ALLCHILDSTYLES) { if (dwStyle & WS_POPUP) { @@ -454,7 +468,21 @@ POINT mPos[2]; UINT id = 0; HWND top_child; - + PWND pWndParent; + PCLS pCls; + + pWndParent = ValidateHwnd(hWndParent); + + if (!pWndParent) return NULL; + + pCls = DesktopPtrToUser(pWndParent->pcls); + + if (pCls->fnid != FNID_MDICLIENT) + { + WARN("WS_EX_MDICHILD, but parent %p is not MDIClient\n", hWndParent); + return NULL; + } + /* lpParams of WM_[NC]CREATE is different for MDI children. * MDICREATESTRUCT members have the originally passed values. */ @@ -470,7 +498,7 @@ lpParam = (LPVOID)&mdi; - if (GetWindowLongPtrW(hWndParent, GWL_STYLE) & MDIS_ALLCHILDSTYLES) + if (pWndParent->style & MDIS_ALLCHILDSTYLES) { if (dwStyle & WS_POPUP) {

13 years, 8 months

[tkreuzer] 50207: [CMAKE] - fix decorations on non-x86 builds - improve batt and aclui - remove set_export_spec macro

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Dec 29 08:08:18 2010 New Revision: 50207 URL: http://svn.reactos.org/svn/reactos?rev=50207&view=rev Log: [CMAKE] - fix decorations on non-x86 builds - improve batt and aclui - remove set_export_spec macro Modified: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt branches/cmake-bringup/dll/win32/batt/CMakeLists.txt branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/C… ============================================================================== --- branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] Wed Dec 29 08:08:18 2010 @@ -1,3 +1,5 @@ + +spec2def(aclui.dll aclui.spec) set_unicode() @@ -18,9 +20,7 @@ set_module_type(aclui win32dll) -set_export_spec(aclui aclui.spec aclui.dll) - -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/aclui.def) +add_importlib_target(aclui.spec) add_importlibs(aclui user32 gdi32 comctl32 ole32 oleaut32 advapi32 uxtheme msvcrt kernel32 ntdll) Modified: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] Wed Dec 29 08:08:18 2010 @@ -1,3 +1,5 @@ + +spec2def(batt.dll batt.spec) set_unicode() @@ -8,9 +10,7 @@ set_module_type(batt win32dll) -set_export_spec(batt batt.spec) - -add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/batt.def) +add_importlib_target(batt.spec) add_importlibs(batt msvcrt kernel32) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=502… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Wed Dec 29 08:08:18 2010 @@ -224,6 +224,10 @@ endforeach() endmacro() +if(NOT ARCH MATCHES i386) + set(DECO_OPTION "-@") +endif() + macro(add_importlib_target _exports_file) get_filename_component(_name ${_exports_file} NAME_WE) @@ -234,10 +238,6 @@ set(DLLNAME_OPTION "-n=${ARGV1}") else() set(DLLNAME_OPTION "") - endif() - - if(NOT ARCH MATCHES i386) - set(DECO_OPTION "-@") endif() add_custom_command( @@ -273,17 +273,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c) endmacro() -# Optional 3rd parameter: dllname -macro(set_export_spec _module _spec_file) - get_filename_component(_file ${_spec_file} NAME_WE) - if (${ARGC} GREATER 2) - set(_dllname ${ARGV2}) - else() - set(_dllname ${_file}.dll) - endif() - spec2def(${_dllname} ${_spec_file}) -endmacro() - #pseh lib, needed with mingw set(PSEH_LIB "pseh")

13 years, 8 months

[jimtabor] 50206: - Update note after 50205.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Dec 29 04:52:06 2010 New Revision: 50206 URL: http://svn.reactos.org/svn/reactos?rev=50206&view=rev Log: - Update note after 50205. Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Wed Dec 29 04:52:06 2010 @@ -668,7 +668,8 @@ /* FIXME I'm only getting NULLs from Thread Enumeration, and it's * probably because I'm not doing it right in NtUserBuildHwndList. * Once that's fixed, we shouldn't have to check for a NULL HWND - * here + * here + * This is now fixed in revision 50205. (jt) */ if (!pHwnd[i]) /* don't enumerate a NULL HWND */ continue;

13 years, 8 months

[jimtabor] 50205: [Win32k] - Fix all the user32 wine win test_enum_thread_windows tests.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Dec 29 04:43:51 2010 New Revision: 50205 URL: http://svn.reactos.org/svn/reactos?rev=50205&view=rev Log: [Win32k] - Fix all the user32 wine win test_enum_thread_windows tests. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Dec 29 04:43:51 2010 @@ -1423,7 +1423,7 @@ ObDereferenceObject(Desktop); } } - else + else // Build EnumThreadWindows list! { PETHREAD Thread; PTHREADINFO W32Thread; @@ -1431,37 +1431,46 @@ PWND Window; Status = PsLookupThreadByThreadId((HANDLE)dwThreadId, &Thread); - if(!NT_SUCCESS(Status)) - { + if (!NT_SUCCESS(Status)) + { + DPRINT1("Thread Id is not valid!\n"); return ERROR_INVALID_PARAMETER; } - if(!(W32Thread = (PTHREADINFO)Thread->Tcb.Win32Thread)) + if (!(W32Thread = (PTHREADINFO)Thread->Tcb.Win32Thread)) { ObDereferenceObject(Thread); - DPRINT("Thread is not a GUI Thread!\n"); + DPRINT1("Thread is not initialized!\n"); return ERROR_INVALID_PARAMETER; } Current = W32Thread->WindowListHead.Flink; - while(Current != &(W32Thread->WindowListHead)) + while (Current != &(W32Thread->WindowListHead)) { Window = CONTAINING_RECORD(Current, WND, ThreadListEntry); ASSERT(Window); - if(bChildren || Window->spwndOwner != NULL) + if (dwCount < *pBufSize && pWnd) { - if(dwCount < *pBufSize && pWnd) - { - Status = MmCopyToCaller(pWnd++, &Window->head.h, sizeof(HWND)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - break; - } - } - dwCount++; + _SEH2_TRY + { + ProbeForWrite(pWnd, sizeof(HWND), 1); + *pWnd = Window->head.h; + pWnd++; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure to build window list!\n"); + SetLastNtError(Status); + break; + } } - Current = Current->Flink; + dwCount++; + Current = Window->ThreadListEntry.Flink; } ObDereferenceObject(Thread);

13 years, 8 months

[pschweitzer] 50204: [NTOSKRNL] Fix typo ~

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Dec 28 21:40:23 2010 New Revision: 50204 URL: http://svn.reactos.org/svn/reactos?rev=50204&view=rev Log: [NTOSKRNL] Fix typo ~ Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=502… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Tue Dec 28 21:40:23 2010 @@ -203,7 +203,7 @@ Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); if (!Mdl) { - return STATUS_INSUFFICIANT_RESOURCES; + return STATUS_INSUFFICIENT_RESOURCES; } MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ; @@ -265,7 +265,7 @@ Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); if (!Mdl) { - return STATUS_INSUFFICIANT_RESOURCES; + return STATUS_INSUFFICIENT_RESOURCES; } MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ;

13 years, 8 months

[pschweitzer] 50203: [NTOSKRNL] Hoovering part 2...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Dec 28 21:34:54 2010 New Revision: 50203 URL: http://svn.reactos.org/svn/reactos?rev=50203&view=rev Log: [NTOSKRNL] Hoovering part 2... Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=502… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Tue Dec 28 21:34:54 2010 @@ -186,62 +186,69 @@ NTAPI ReadCacheSegment(PCACHE_SEGMENT CacheSeg) { - ULONG Size; - PMDL Mdl; - NTSTATUS Status; - LARGE_INTEGER SegOffset; - IO_STATUS_BLOCK IoStatus; - KEVENT Event; - - SegOffset.QuadPart = CacheSeg->FileOffset; - Size = (ULONG)(CacheSeg->Bcb->AllocationSize.QuadPart - CacheSeg->FileOffset); - if (Size > CacheSeg->Bcb->CacheSegmentSize) - { - Size = CacheSeg->Bcb->CacheSegmentSize; - } - Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); - MmBuildMdlForNonPagedPool(Mdl); - Mdl->MdlFlags |= MDL_IO_PAGE_READ; - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoPageRead(CacheSeg->Bcb->FileObject, Mdl, &SegOffset, & Event, &IoStatus); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = IoStatus.Status; - } - - IoFreeMdl(Mdl); - - if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE) - { - DPRINT1("IoPageRead failed, Status %x\n", Status); - return Status; - } - if (CacheSeg->Bcb->CacheSegmentSize > Size) - { - memset ((char*)CacheSeg->BaseAddress + Size, 0, + ULONG Size; + PMDL Mdl; + NTSTATUS Status; + LARGE_INTEGER SegOffset; + IO_STATUS_BLOCK IoStatus; + KEVENT Event; + + SegOffset.QuadPart = CacheSeg->FileOffset; + Size = (ULONG)(CacheSeg->Bcb->AllocationSize.QuadPart - CacheSeg->FileOffset); + if (Size > CacheSeg->Bcb->CacheSegmentSize) + { + Size = CacheSeg->Bcb->CacheSegmentSize; + } + + Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); + if (!Mdl) + { + return STATUS_INSUFFICIANT_RESOURCES; + } + MmBuildMdlForNonPagedPool(Mdl); + Mdl->MdlFlags |= MDL_IO_PAGE_READ; + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Status = IoPageRead(CacheSeg->Bcb->FileObject, Mdl, &SegOffset, &Event, &IoStatus); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + IoFreeMdl(Mdl); + + if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE) + { + DPRINT1("IoPageRead failed, Status %x\n", Status); + return Status; + } + + if (CacheSeg->Bcb->CacheSegmentSize > Size) + { + RtlZeroMemory((char*)CacheSeg->BaseAddress + Size, CacheSeg->Bcb->CacheSegmentSize - Size); } - return STATUS_SUCCESS; + + return STATUS_SUCCESS; } NTSTATUS NTAPI WriteCacheSegment(PCACHE_SEGMENT CacheSeg) { - ULONG Size; - PMDL Mdl; - NTSTATUS Status; - IO_STATUS_BLOCK IoStatus; - LARGE_INTEGER SegOffset; - KEVENT Event; - - CacheSeg->Dirty = FALSE; - SegOffset.QuadPart = CacheSeg->FileOffset; - Size = (ULONG)(CacheSeg->Bcb->AllocationSize.QuadPart - CacheSeg->FileOffset); - if (Size > CacheSeg->Bcb->CacheSegmentSize) - { - Size = CacheSeg->Bcb->CacheSegmentSize; + ULONG Size; + PMDL Mdl; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatus; + LARGE_INTEGER SegOffset; + KEVENT Event; + + CacheSeg->Dirty = FALSE; + SegOffset.QuadPart = CacheSeg->FileOffset; + Size = (ULONG)(CacheSeg->Bcb->AllocationSize.QuadPart - CacheSeg->FileOffset); + if (Size > CacheSeg->Bcb->CacheSegmentSize) + { + Size = CacheSeg->Bcb->CacheSegmentSize; } // // Nonpaged pool PDEs in ReactOS must actually be synchronized between the @@ -254,24 +261,30 @@ MmGetPfnForProcess(NULL, (PVOID)((ULONG_PTR)CacheSeg->BaseAddress + (i << PAGE_SHIFT))); } while (++i < (Size >> PAGE_SHIFT)); } - Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); - MmBuildMdlForNonPagedPool(Mdl); - Mdl->MdlFlags |= MDL_IO_PAGE_READ; - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoSynchronousPageWrite(CacheSeg->Bcb->FileObject, Mdl, &SegOffset, &Event, &IoStatus); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = IoStatus.Status; - } - IoFreeMdl(Mdl); - if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) - { - DPRINT1("IoPageWrite failed, Status %x\n", Status); - CacheSeg->Dirty = TRUE; - return(Status); - } - return(STATUS_SUCCESS); + + Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); + if (!Mdl) + { + return STATUS_INSUFFICIANT_RESOURCES; + } + MmBuildMdlForNonPagedPool(Mdl); + Mdl->MdlFlags |= MDL_IO_PAGE_READ; + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Status = IoSynchronousPageWrite(CacheSeg->Bcb->FileObject, Mdl, &SegOffset, &Event, &IoStatus); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + IoFreeMdl(Mdl); + if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) + { + DPRINT1("IoPageWrite failed, Status %x\n", Status); + CacheSeg->Dirty = TRUE; + return Status; + } + + return STATUS_SUCCESS; }

13 years, 8 months

[pschweitzer] 50202: [NTOSKRNL] Plumber work part 1. To prevent leaks

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Dec 28 21:12:51 2010 New Revision: 50202 URL: http://svn.reactos.org/svn/reactos?rev=50202&view=rev Log: [NTOSKRNL] Plumber work part 1. To prevent leaks Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=502… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Tue Dec 28 21:12:51 2010 @@ -210,6 +210,8 @@ Status = IoStatus.Status; } + IoFreeMdl(Mdl); + if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE) { DPRINT1("IoPageRead failed, Status %x\n", Status); @@ -262,6 +264,7 @@ KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); Status = IoStatus.Status; } + IoFreeMdl(Mdl); if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) { DPRINT1("IoPageWrite failed, Status %x\n", Status);

13 years, 8 months

[pschweitzer] 50201: [NTOSKRNL] Hoover a bit in CC part 1. Should make MM happier. But MS fastfat driver not yet

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Dec 28 20:59:24 2010 New Revision: 50201 URL: http://svn.reactos.org/svn/reactos?rev=50201&view=rev Log: [NTOSKRNL] Hoover a bit in CC part 1. Should make MM happier. But MS fastfat driver not yet Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=502… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Tue Dec 28 20:59:24 2010 @@ -199,8 +199,7 @@ { Size = CacheSeg->Bcb->CacheSegmentSize; } - Mdl = _alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size)); - MmInitializeMdl(Mdl, CacheSeg->BaseAddress, Size); + Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ; KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -253,8 +252,7 @@ MmGetPfnForProcess(NULL, (PVOID)((ULONG_PTR)CacheSeg->BaseAddress + (i << PAGE_SHIFT))); } while (++i < (Size >> PAGE_SHIFT)); } - Mdl = _alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size)); - MmInitializeMdl(Mdl, CacheSeg->BaseAddress, Size); + Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); MmBuildMdlForNonPagedPool(Mdl); Mdl->MdlFlags |= MDL_IO_PAGE_READ; KeInitializeEvent(&Event, NotificationEvent, FALSE);

13 years, 8 months

[tkreuzer] 50200: [CMAKE] Fix compilation of kddll

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Dec 28 20:29:34 2010 New Revision: 50200 URL: http://svn.reactos.org/svn/reactos?rev=50200&view=rev Log: [CMAKE] Fix compilation of kddll Modified: branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt branches/cmake-bringup/drivers/base/kddll/kddll.h Modified: branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kddl… ============================================================================== --- branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt [iso-8859-1] Tue Dec 28 20:29:34 2010 @@ -1,11 +1,11 @@ -spec2def(kdcom.dll kdcom.spec) +spec2def(kdcom.dll kddll.spec) add_library(kdcom SHARED kdcom.c kddll.c kdserial.c - ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) + ${CMAKE_CURRENT_BINARY_DIR}/kddll.def) set_entrypoint(kdcom 0) set_subsystem(kdcom native) @@ -14,3 +14,4 @@ add_importlibs(kdcom ntoskrnl hal) add_dependencies(kdcom psdk buildno_header bugcodes) +add_importlib_target(kddll.spec kdcom.dll) Modified: branches/cmake-bringup/drivers/base/kddll/kddll.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kddl… ============================================================================== --- branches/cmake-bringup/drivers/base/kddll/kddll.h [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/kddll/kddll.h [iso-8859-1] Tue Dec 28 20:29:34 2010 @@ -12,14 +12,14 @@ #include <ntifs.h> #define NDEBUG #include <halfuncs.h> -#include <stdio.h> -#include <stdlib.h> #include <debug.h> #include "arc/arc.h" #include "windbgkd.h" #include <wdbgexts.h> #include <ioaccess.h> /* port intrinsics */ + +long atol(const char *str); typedef UCHAR BYTE, *PBYTE;

13 years, 8 months

[tkreuzer] 50199: [CMAKE] Build the right kdcom when _WINKD_ is set

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Dec 28 19:56:55 2010 New Revision: 50199 URL: http://svn.reactos.org/svn/reactos?rev=50199&view=rev Log: [CMAKE] Build the right kdcom when _WINKD_ is set Modified: branches/cmake-bringup/drivers/base/CMakeLists.txt Modified: branches/cmake-bringup/drivers/base/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/CMak… ============================================================================== --- branches/cmake-bringup/drivers/base/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/CMakeLists.txt [iso-8859-1] Tue Dec 28 19:56:55 2010 @@ -2,11 +2,11 @@ add_subdirectory(beep) add_subdirectory(bootvid) -if(_WINKD_ MATCHES 1) +if(_WINKD_) add_subdirectory(kddll) else() add_subdirectory(kdcom) -endif(_WINKD_ MATCHES 1) +endif() add_subdirectory(nmidebug) add_subdirectory(null)

13 years, 8 months

← Newer
1
2
3
4
5
6
7
8
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2010