Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[janderwald] 50137: [AUDIO-BRINGUP] - Fix pci / swenum group key - Remove swenum from reactos.dff - Put swenum in bootstrap base

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Dec 25 09:12:20 2010 New Revision: 50137 URL: http://svn.reactos.org/svn/reactos?rev=50137&view=rev Log: [AUDIO-BRINGUP] - Fix pci / swenum group key - Remove swenum from reactos.dff - Put swenum in bootstrap base Modified: branches/audio-bringup/boot/bootdata/hivesys_i386.inf branches/audio-bringup/boot/bootdata/packages/reactos.dff branches/audio-bringup/drivers/ksfilter/swenum/swenum.rbuild Modified: branches/audio-bringup/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/boot/bootdata/hiv… ============================================================================== --- branches/audio-bringup/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ branches/audio-bringup/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Dec 25 09:12:20 2010 @@ -1257,12 +1257,12 @@ ; Software BUS Driver HKLM,"SYSTEM\CurrentControlSet\Services\SWENUM","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\SWENUM","Group",0x00000000,"Boot Bus +HKLM,"SYSTEM\CurrentControlSet\Services\SWENUM","Group",0x00000000,"Boot Bus" HKLM,"SYSTEM\CurrentControlSet\Services\SWENUM","Tag",0x00010001,0x00000002 ; PCI Bus driver HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus +HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus" HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1045C621",0x00030003,04,00,00,00,00,00,00,00 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10950640",0x00030003,04,00,00,00,00,00,00,00 Modified: branches/audio-bringup/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/boot/bootdata/pac… ============================================================================== --- branches/audio-bringup/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/audio-bringup/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Dec 25 09:12:20 2010 @@ -514,7 +514,6 @@ drivers\input\sermouse\sermouse.sys 2 drivers\ksfilter\ks\ks.sys 2 -drivers\ksfilter\swenum\swenum.sys 2 ;drivers\multimedia\bdasup\bdasup.sys 2 drivers\network\afd\afd.sys 2 Modified: branches/audio-bringup/drivers/ksfilter/swenum/swenum.rbuild URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/swenum/swenum.rbuild [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/swenum/swenum.rbuild [iso-8859-1] Sat Dec 25 09:12:20 2010 @@ -1,6 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="swenum" type="kernelmodedriver" installbase="system32/drivers" installname="swenum.sys"> + <bootstrap installbase="$(CDOUTPUT)" /> <library>ntoskrnl</library> <library>ks</library> <file>swenum.c</file>

13 years, 8 months

[janderwald] 50136: [INF] - Fix PCI group key

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Dec 25 09:08:44 2010 New Revision: 50136 URL: http://svn.reactos.org/svn/reactos?rev=50136&view=rev Log: [INF] - Fix PCI group key Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Dec 25 09:08:44 2010 @@ -1257,7 +1257,7 @@ ; PCI Bus driver HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus +HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus " HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1045C621",0x00030003,04,00,00,00,00,00,00,00 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10950640",0x00030003,04,00,00,00,00,00,00,00

13 years, 8 months

[rmessiant] 50135: [WIN32K] - IntCreateWindow: Fill out MaximumLength field of the window name. Fixes potential buffer overflow in at least NtUserDefSetText.

by rmessiant＠svn.reactos.org

Author: rmessiant Date: Sat Dec 25 05:27:01 2010 New Revision: 50135 URL: http://svn.reactos.org/svn/reactos?rev=50135&view=rev Log: [WIN32K] - IntCreateWindow: Fill out MaximumLength field of the window name. Fixes potential buffer overflow in at least NtUserDefSetText. 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] Sat Dec 25 05:27:01 2010 @@ -1759,6 +1759,7 @@ RtlCopyMemory(pWnd->strName.Buffer, WindowName->Buffer, WindowName->Length); pWnd->strName.Buffer[WindowName->Length / sizeof(WCHAR)] = L'\0'; pWnd->strName.Length = WindowName->Length; + pWnd->strName.MaximumLength = WindowName->Length + sizeof(UNICODE_NULL); } /* Correct the window style. */

13 years, 8 months

[arty] 50134: Make sure to initialize our page operation mutex. Scan the whole range of the MemoryArea for pages to evict. This fixes cache section page eviction.

by arty＠svn.reactos.org

Author: arty Date: Fri Dec 24 22:54:24 2010 New Revision: 50134 URL: http://svn.reactos.org/svn/reactos?rev=50134&view=rev Log: Make sure to initialize our page operation mutex. Scan the whole range of the MemoryArea for pages to evict. This fixes cache section page eviction. Modified: trunk/reactos/ntoskrnl/cache/fssup.c trunk/reactos/ntoskrnl/cache/section/swapout.c Modified: trunk/reactos/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/fssup.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] Fri Dec 24 22:54:24 2010 @@ -25,6 +25,7 @@ extern VOID NTAPI CcpLazyWriteThread(PVOID Unused); HANDLE CcUnmapThreadHandle, CcLazyWriteThreadHandle; CLIENT_ID CcUnmapThreadId, CcLazyWriteThreadId; +FAST_MUTEX GlobalPageOperation; typedef struct _NOCC_PRIVATE_CACHE_MAP { @@ -98,6 +99,7 @@ CcCacheBitmap->SizeOfBitMap = ROUND_UP(CACHE_NUM_SECTIONS, 32); DPRINT("Cache has %d entries\n", CcCacheBitmap->SizeOfBitMap); ExInitializeFastMutex(&CcMutex); + ExInitializeFastMutex(&GlobalPageOperation); // MM stub KeInitializeEvent(&MmWaitPageEvent, SynchronizationEvent, FALSE); Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] Fri Dec 24 22:54:24 2010 @@ -480,8 +480,8 @@ MmLockCacheSectionSegment(Segment); for (i = 0; - i < Segment->Length.QuadPart - - MemoryArea->Data.CacheData.ViewOffset.QuadPart && + i < ((ULONG_PTR)MemoryArea->EndingAddress) - + ((ULONG_PTR)MemoryArea->StartingAddress) && Result < Target; i += PAGE_SIZE) { Offset.QuadPart = MemoryArea->Data.CacheData.ViewOffset.QuadPart + i;

13 years, 8 months

[jgardou] 50133: [GDI32] - remove useless memory reallocation : the buffer size must be dword aligned, we have no way to guarantee the buffer location will be. - pass BITMAPINFO pointer size to NtG...

by jgardou＠svn.reactos.org

Author: jgardou Date: Fri Dec 24 20:29:25 2010 New Revision: 50133 URL: http://svn.reactos.org/svn/reactos?rev=50133&view=rev Log: [GDI32] - remove useless memory reallocation : the buffer size must be dword aligned, we have no way to guarantee the buffer location will be. - pass BITMAPINFO pointer size to NtGdiGetDIBitsInternal [WIN32K] - Improve "not enough memory" check when creating a bitmap - use correct function to set the last error. Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Fri Dec 24 20:29:25 2010 @@ -2,6 +2,36 @@ #define NDEBUG #include <debug.h> + +/* + * DIB_BitmapInfoSize + * + * Return the size of the bitmap info structure including color table. + * 11/16/1999 (RJJ) lifted from wine + */ + +INT FASTCALL DIB_BitmapInfoSize(const BITMAPINFO * info, WORD coloruse) +{ + unsigned int colors, size, masks = 0; + + if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)info; + colors = (core->bcBitCount <= 8) ? 1 << core->bcBitCount : 0; + return sizeof(BITMAPCOREHEADER) + colors * + ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBTRIPLE) : sizeof(WORD)); + } + else /* assume BITMAPINFOHEADER */ + { + colors = info->bmiHeader.biClrUsed; + if (colors > 256) colors = 256; + if (!colors && (info->bmiHeader.biBitCount <= 8)) + colors = 1 << info->bmiHeader.biBitCount; + if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; + size = max( info->bmiHeader.biSize, sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) ); + return size + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); + } +} /* * Return the full scan size for a bitmap. @@ -391,59 +421,40 @@ LPBITMAPINFO lpbmi, UINT uUsage) { - INT Ret = 0; - UINT cjBmpScanSize; - PVOID pvSafeBits = lpvBits; - - if (!hDC || !GdiIsHandleValid((HGDIOBJ)hDC)) - { - GdiSetLastError(ERROR_INVALID_PARAMETER); - return Ret; - } - - cjBmpScanSize = DIB_BitmapMaxBitsSize(lpbmi, cScanLines); - - if ( lpvBits ) - { - if ( lpbmi ) - { + UINT cjBmpScanSize; + UINT cjInfoSize; + + if (!hDC || !GdiIsHandleValid((HGDIOBJ)hDC) || !lpbmi) + { + GdiSetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + cjBmpScanSize = DIB_BitmapMaxBitsSize(lpbmi, cScanLines); + cjInfoSize = DIB_BitmapInfoSize(lpbmi, uUsage); + + if ( lpvBits ) + { if ( lpbmi->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) ) { - if ( lpbmi->bmiHeader.biCompression == BI_JPEG || - lpbmi->bmiHeader.biCompression == BI_PNG ) - { - SetLastError(ERROR_INVALID_PARAMETER); - return Ret; - } + if ( lpbmi->bmiHeader.biCompression == BI_JPEG || + lpbmi->bmiHeader.biCompression == BI_PNG ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } } - } - - if ((ULONG)lpvBits & (sizeof(DWORD) - 1)) - { - pvSafeBits = RtlAllocateHeap(RtlGetProcessHeap(), 0, cjBmpScanSize); - if (!pvSafeBits) - return Ret; - } - } - - Ret = NtGdiGetDIBitsInternal(hDC, + } + + return NtGdiGetDIBitsInternal(hDC, hbmp, uStartScan, cScanLines, - pvSafeBits, + lpvBits, lpbmi, uUsage, cjBmpScanSize, - 0); - if (lpvBits != pvSafeBits) - { - if (Ret) - { - RtlCopyMemory(lpvBits, pvSafeBits, cjBmpScanSize); - } - RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); - } - return Ret; + cjInfoSize); } /* Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Fri Dec 24 20:29:25 2010 @@ -170,11 +170,18 @@ iFormat = BitmapFormat(cBitsPixel, BI_RGB); /* Check parameters */ - if (iFormat == 0 || nWidth <= 0 || nWidth >= 0x8000000 || nHeight <= 0) + if (iFormat == 0 || nWidth <= 0 || nHeight <= 0) { DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", nWidth, nHeight, cBitsPixel); - EngSetLastError(ERROR_INVALID_PARAMETER); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return NULL; + } + + if(WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel)*nHeight >= 0x8000000) + { + /* I just can't get enough, I just can't get enough */ + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; }

13 years, 8 months

[akhaldi] 50132: [CMAKE] - Delete more useless definition files. - Improve more modules.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 24 19:07:09 2010 New Revision: 50132 URL: http://svn.reactos.org/svn/reactos?rev=50132&view=rev Log: [CMAKE] - Delete more useless definition files. - Improve more modules. Removed: branches/cmake-bringup/dll/win32/wing32/wing32.def branches/cmake-bringup/dll/win32/winhttp/winhttp.def branches/cmake-bringup/dll/win32/winspool/winspool_winspool.auto.def branches/cmake-bringup/dll/win32/winspool/winspool_winspool.stubs.c branches/cmake-bringup/dll/win32/winsta/winsta.def branches/cmake-bringup/dll/win32/wmi/wmi.def branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def branches/cmake-bringup/dll/win32/ws2help/ws2help.def branches/cmake-bringup/dll/win32/wshirda/wshirda.def branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def branches/cmake-bringup/dll/win32/wuapi/wuapi.def branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def Modified: branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wing32/… ============================================================================== --- branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -1,14 +1,16 @@ set_unicode() -add_library(wing32 SHARED wing32.c wing32.def) +spec2def(wing32.dll wing32.spec) -if(NOT MSVC) - set_source_files_properties(wing32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + wing32.c + ${CMAKE_CURRENT_BINARY_DIR}/wing32.def) + +add_library(wing32 SHARED ${SOURCE}) set_entrypoint(wing32 0) + add_importlibs(wing32 user32 gdi32) add_dependencies(wing32 psdk) - -add_cab_target(wing32 1) +add_cab_target(wing32 1) Removed: branches/cmake-bringup/dll/win32/wing32/wing32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wing32/… ============================================================================== --- branches/cmake-bringup/dll/win32/wing32/wing32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wing32/wing32.def (removed) @@ -1,14 +1,0 @@ - -LIBRARY wing32.dll - -EXPORTS - WinGBitBlt@32 @1 - WinGCreateBitmap@12 @2 - WinGCreateDC@0 @3 - WinGCreateHalfToneBrush@12 @4 - WinGCreateHalfTonePalette@0 @5 - WinGGetDIBColorTable@16 @6 - WinGGetDIBPointer@8 @7 - WinGRecommendDIBFormat@4 @8 - WinGSetDIBColorTable@16 @9 - WinGStretchBlt@40 @10 Modified: branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winhttp… ============================================================================== --- branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -4,7 +4,7 @@ spec2def(winhttp.dll winhttp.spec) -add_library(winhttp SHARED +list(APPEND SOURCE cookie.c handle.c main.c @@ -14,6 +14,8 @@ url.c ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def) +add_library(winhttp SHARED ${SOURCE}) + set_module_type(winhttp win32dll) target_link_libraries(winhttp wine) add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt crypt32 advapi32 kernel32 ntdll) Removed: branches/cmake-bringup/dll/win32/winhttp/winhttp.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winhttp… ============================================================================== --- branches/cmake-bringup/dll/win32/winhttp/winhttp.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winhttp/winhttp.def (removed) @@ -1,35 +1,0 @@ - -LIBRARY winhttp.dll - -EXPORTS - DllCanUnloadNow@0 @1 PRIVATE - DllGetClassObject@12 @2 PRIVATE - DllRegisterServer@0 @3 PRIVATE - DllUnregisterServer@0 @4 PRIVATE - WinHttpAddRequestHeaders@16 @5 - WinHttpCheckPlatform@0 @6 - WinHttpCloseHandle@4 @7 - WinHttpConnect@16 @8 - WinHttpCrackUrl@16 @9 - WinHttpCreateUrl@16 @10 - WinHttpDetectAutoProxyConfigUrl@8 @11 - WinHttpGetDefaultProxyConfiguration@4 @12 - WinHttpGetIEProxyConfigForCurrentUser@4 @13 - WinHttpGetProxyForUrl@16 @14 - WinHttpOpen@20 @15 - WinHttpOpenRequest@28 @16 - WinHttpQueryAuthSchemes@16 @17 - WinHttpQueryDataAvailable@8 @18 - WinHttpQueryHeaders@24 @19 - WinHttpQueryOption@16 @20 - WinHttpReadData@16 @21 - WinHttpReceiveResponse@8 @22 - WinHttpSendRequest@28 @23 - WinHttpSetCredentials@24 @24 - WinHttpSetDefaultProxyConfiguration@4 @25 - WinHttpSetOption@16 @26 - WinHttpSetStatusCallback@16 @27 - WinHttpSetTimeouts@20 @28 - WinHttpTimeFromSystemTime@8 @29 - WinHttpTimeToSystemTime@8 @30 - WinHttpWriteData@16 @31 Modified: branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winspoo… ============================================================================== --- branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -1,11 +1,11 @@ - -spec2def(winspool.drv winspool.spec) set_unicode() include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) set_rc_compiler() + +spec2def(winspool.drv winspool.spec) list(APPEND SOURCE info.c @@ -16,11 +16,9 @@ add_library(winspool SHARED ${SOURCE}) set_target_properties(winspool PROPERTIES SUFFIX ".drv") + set_module_type(winspool win32dll) - target_link_libraries(winspool wine) - add_importlibs(winspool advapi32 shlwapi msvcrt kernel32 ntdll) - add_cab_target(winspool 1) add_importlib_target(winspool.spec winspool.drv) Removed: branches/cmake-bringup/dll/win32/winspool/winspool_winspool.auto.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winspoo… ============================================================================== --- branches/cmake-bringup/dll/win32/winspool/winspool_winspool.auto.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winspool/winspool_winspool.auto.def (removed) @@ -1,197 +1,0 @@ -; File generated automatically from dll\win32\winspool\winspool.spec; do not edit! - -LIBRARY winspool.drv - -EXPORTS - EnumPrinterPropertySheets=__wine_stub_winspool_drv_100 @100 NONAME - ClusterSplOpen=__wine_stub_winspool_drv_101 @101 NONAME - ClusterSplClose=__wine_stub_winspool_drv_102 @102 NONAME - ClusterSplIsAlive=__wine_stub_winspool_drv_103 @103 NONAME - PerfClose=__wine_stub_winspool_drv_104 @104 - PerfCollect=__wine_stub_winspool_drv_105 @105 - PerfOpen=__wine_stub_winspool_drv_106 @106 - GetDefaultPrinterA@8 @201 - SetDefaultPrinterA@4 @202 - GetDefaultPrinterW@8 @203 - SetDefaultPrinterW@4 @204 - SplReadPrinter=__wine_stub_winspool_drv_205 @205 NONAME - AddPerMachineConnectionA=__wine_stub_winspool_drv_206 @206 NONAME - AddPerMachineConnectionW=__wine_stub_winspool_drv_207 @207 NONAME - DeletePerMachineConnectionA=__wine_stub_winspool_drv_208 @208 NONAME - DeletePerMachineConnectionW=__wine_stub_winspool_drv_209 @209 NONAME - EnumPerMachineConnectionsA=__wine_stub_winspool_drv_210 @210 NONAME - EnumPerMachineConnectionsW=__wine_stub_winspool_drv_211 @211 NONAME - LoadPrinterDriver=__wine_stub_winspool_drv_212 @212 NONAME - RefCntLoadDriver=__wine_stub_winspool_drv_213 @213 NONAME - RefCntUnloadDriver=__wine_stub_winspool_drv_214 @214 NONAME - ForceUnloadDriver=__wine_stub_winspool_drv_215 @215 NONAME - PublishPrinterA=__wine_stub_winspool_drv_216 @216 NONAME - PublishPrinterW=__wine_stub_winspool_drv_217 @217 NONAME - CallCommonPropertySheetUI=__wine_stub_winspool_drv_218 @218 NONAME - PrintUIQueueCreate=__wine_stub_winspool_drv_219 @219 NONAME - PrintUIPrinterPropPages=__wine_stub_winspool_drv_220 @220 NONAME - PrintUIDocumentDefaults=__wine_stub_winspool_drv_221 @221 NONAME - SendRecvBidiData=__wine_stub_winspool_drv_222 @222 NONAME - RouterFreeBidiResponseContainer=__wine_stub_winspool_drv_223 @223 NONAME - ExternalConnectToLd64In32Server=__wine_stub_winspool_drv_224 @224 NONAME - PrintUIWebPnpEntry=__wine_stub_winspool_drv_226 @226 NONAME - PrintUIWebPnpPostEntry=__wine_stub_winspool_drv_227 @227 NONAME - PrintUICreateInstance=__wine_stub_winspool_drv_228 @228 NONAME - PrintUIDocumentPropertiesWrap=__wine_stub_winspool_drv_229 @229 NONAME - PrintUIPrinterSetup=__wine_stub_winspool_drv_230 @230 NONAME - PrintUIServerPropPages=__wine_stub_winspool_drv_231 @231 NONAME - AddDriverCatalog=__wine_stub_winspool_drv_232 @232 NONAME - ADVANCEDSETUPDIALOG=__wine_stub_winspool_drv_107 @107 - AbortPrinter@4 @108 - AddFormA@12 @109 - AddFormW@12 @110 - AddJobA@20 @111 - AddJobW@20 @112 - AddMonitorA@12 @113 - AddMonitorW@12 @114 - AddPortA@12 @115 - AddPortExA@16 @116 - AddPortExW@16 @117 - AddPortW@12 @118 - AddPrinterA@12 @119 - AddPrinterConnectionA@4 @120 - AddPrinterConnectionW@4 @121 - AddPrinterDriverA@12 @122 - AddPrinterDriverExA@16 @123 - AddPrinterDriverExW@16 @124 - AddPrinterDriverW@12 @125 - AddPrinterW@12 @126 - AddPrintProcessorA@16 @127 - AddPrintProcessorW@16 @128 - AddPrintProvidorA@12 @129 - AddPrintProvidorW@12 @130 - AdvancedDocumentPropertiesA@20 @131 - AdvancedDocumentPropertiesW@20 @132 - AdvancedSetupDialog=__wine_stub_winspool_drv_133 @133 - ClosePrinter@4 @134 - CloseSpoolFileHandle=__wine_stub_winspool_drv_135 @135 - ConfigurePortA@12 @136 - ConfigurePortW@12 @137 - ConnectToPrinterDlg@8 @138 - ConvertAnsiDevModeToUnicodeDevMode=__wine_stub_winspool_drv_139 @139 - ConvertUnicodeDevModeToAnsiDevMode=__wine_stub_winspool_drv_140 @140 - CommitSpoolData=__wine_stub_winspool_drv_141 @141 - CreatePrinterIC=__wine_stub_winspool_drv_142 @142 - DEVICECAPABILITIES=__wine_stub_winspool_drv_143 @143 - DEVICEMODE=__wine_stub_winspool_drv_144 @144 - DeleteFormA@8 @145 - DeleteFormW@8 @146 - DeleteMonitorA@12 @147 - DeleteMonitorW@12 @148 - DeletePortA@12 @149 - DeletePortW@12 @150 - DeletePrinter@4 @151 - DeletePrinterConnectionA@4 @152 - DeletePrinterConnectionW@4 @153 - DeletePrinterDataExA@12 @154 - DeletePrinterDataExW@12 @155 - DeletePrinterDataA@8 @156 - DeletePrinterDataW@8 @157 - DeletePrinterDriverA@12 @158 - DeletePrinterDriverExA@20 @159 - DeletePrinterDriverExW@20 @160 - DeletePrinterDriverW@12 @161 - DeletePrinterIC=__wine_stub_winspool_drv_162 @162 - DevQueryPrint=__wine_stub_winspool_drv_163 @163 - DeletePrintProcessorA@12 @164 - DeletePrintProcessorW@12 @165 - DeletePrintProvidorA@12 @166 - DeletePrintProvidorW@12 @167 - DeviceCapabilitiesA@20 @168 - DeviceCapabilitiesW@20 @169 - DeviceMode=__wine_stub_winspool_drv_170 @170 - DocumentEvent=__wine_stub_winspool_drv_171 @171 - DllMain@12 @172 - DocumentPropertiesA@24 @173 - DocumentPropertiesW@24 @174 - EXTDEVICEMODE=__wine_stub_winspool_drv_175 @175 - EndDocPrinter@4 @176 - EndPagePrinter@4 @177 - EnumFormsA@24 @178 - EnumFormsW@24 @179 - EnumJobsA@32 @180 - EnumJobsW@32 @181 - EnumMonitorsA@24 @182 - EnumMonitorsW@24 @183 - EnumPortsA@24 @184 - EnumPortsW@24 @185 - EnumPrinterDataA@36 @186 - EnumPrinterDataExA@24 @187 - EnumPrinterDataExW@24 @188 - EnumPrinterDataW@36 @189 - EnumPrinterDriversA@28 @190 - EnumPrinterDriversW@28 @191 - EnumPrintersA@28 @192 - EnumPrintersW@28 @193 - EnumPrinterKeyA@20 @194 - EnumPrinterKeyW@20 @195 - ExtDeviceMode@32 @196 - EnumPrintProcessorDatatypesA@28 @197 - EnumPrintProcessorDatatypesW@28 @198 - EnumPrintProcessorsA@28 @199 - EnumPrintProcessorsW@28 @200 - FindClosePrinterChangeNotification@4 @225 - FindFirstPrinterChangeNotification@16 @233 - FindNextPrinterChangeNotification@16 @234 - FreePrinterNotifyInfo@4 @235 - GetFormA@24 @236 - GetFormW@24 @237 - GetJobA@24 @238 - GetJobW@24 @239 - GetPrinterA@20 @240 - GetPrinterDataA@24 @241 - GetPrinterDataExA@28 @242 - GetPrinterDataExW@28 @243 - GetPrinterDataW@24 @244 - GetPrinterDriverA@24 @245 - GetPrinterDriverDirectoryA@24 @246 - GetPrinterDriverDirectoryW@24 @247 - GetPrinterDriverW@24 @248 - GetPrinterW@20 @249 - GetPrintProcessorDirectoryA@24 @250 - GetPrintProcessorDirectoryW@24 @251 - GetSpoolFileHandle=__wine_stub_winspool_drv_252 @252 - IsValidDevmodeA=__wine_stub_winspool_drv_253 @253 - IsValidDevmodeW=__wine_stub_winspool_drv_254 @254 - OpenPrinterA@12 @255 - OpenPrinterW@12 @256 - PlayGdiScriptOnPrinterIC=__wine_stub_winspool_drv_257 @257 - PrinterMessageBoxA@24 @258 - PrinterMessageBoxW@24 @259 - PrinterProperties@8 @260 - QueryColorProfile=__wine_stub_winspool_drv_261 @261 - QuerySpoolMode=__wine_stub_winspool_drv_262 @262 - QueryRemoteFonts=__wine_stub_winspool_drv_263 @263 - ReadPrinter@16 @264 - ResetPrinterA@8 @265 - ResetPrinterW@8 @266 - ScheduleJob@8 @267 - SeekPrinter=__wine_stub_winspool_drv_268 @268 - SetAllocFailCount=__wine_stub_winspool_drv_269 @269 - SetFormA@16 @270 - SetFormW@16 @271 - SetJobA@20 @272 - SetJobW@20 @273 - SetPrinterA@16 @274 - SetPrinterDataA@20 @275 - SetPrinterDataExA@24 @276 - SetPrinterDataExW@24 @277 - SetPrinterDataW@20 @278 - SetPrinterW@16 @279 - SplDriverUnloadComplete=__wine_stub_winspool_drv_280 @280 - SpoolerDevQueryPrintW=__wine_stub_winspool_drv_281 @281 - SpoolerInit@0 @282 - SpoolerPrinterEvent=__wine_stub_winspool_drv_283 @283 - StartDocDlgA=__wine_stub_winspool_drv_284 @284 - StartDocDlgW=__wine_stub_winspool_drv_285 @285 - StartDocPrinterA@12 @286 - StartDocPrinterW@12 @287 - StartPagePrinter@4 @288 - WaitForPrinterChange@8 @289 - WritePrinter@16 @290 - XcvDataW@32 @291 Removed: branches/cmake-bringup/dll/win32/winspool/winspool_winspool.stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winspoo… ============================================================================== --- branches/cmake-bringup/dll/win32/winspool/winspool_winspool.stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winspool/winspool_winspool.stubs.c (removed) @@ -1,82 +1,0 @@ -/* File generated automatically from dll\win32\winspool\winspool.spec; do not edit! */ -/* This file can be copied, modified and distributed without restriction. */ - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wine/config.h" -#include "wine/exception.h" - -void __wine_spec_unimplemented_stub( const char *module, const char *function ) -{ - ULONG_PTR args[2]; - - args[0] = (ULONG_PTR)module; - args[1] = (ULONG_PTR)function; - RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); -} - -static const char __wine_spec_file_name[] = "winspool.drv"; - -void __wine_stub_winspool_drv_100(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EnumPrinterPropertySheets"); } -void __wine_stub_winspool_drv_101(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ClusterSplOpen"); } -void __wine_stub_winspool_drv_102(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ClusterSplClose"); } -void __wine_stub_winspool_drv_103(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ClusterSplIsAlive"); } -void __wine_stub_winspool_drv_104(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PerfClose"); } -void __wine_stub_winspool_drv_105(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PerfCollect"); } -void __wine_stub_winspool_drv_106(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PerfOpen"); } -void __wine_stub_winspool_drv_205(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SplReadPrinter"); } -void __wine_stub_winspool_drv_206(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "AddPerMachineConnectionA"); } -void __wine_stub_winspool_drv_207(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "AddPerMachineConnectionW"); } -void __wine_stub_winspool_drv_208(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeletePerMachineConnectionA"); } -void __wine_stub_winspool_drv_209(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeletePerMachineConnectionW"); } -void __wine_stub_winspool_drv_210(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EnumPerMachineConnectionsA"); } -void __wine_stub_winspool_drv_211(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EnumPerMachineConnectionsW"); } -void __wine_stub_winspool_drv_212(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "LoadPrinterDriver"); } -void __wine_stub_winspool_drv_213(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "RefCntLoadDriver"); } -void __wine_stub_winspool_drv_214(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "RefCntUnloadDriver"); } -void __wine_stub_winspool_drv_215(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ForceUnloadDriver"); } -void __wine_stub_winspool_drv_216(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PublishPrinterA"); } -void __wine_stub_winspool_drv_217(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PublishPrinterW"); } -void __wine_stub_winspool_drv_218(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CallCommonPropertySheetUI"); } -void __wine_stub_winspool_drv_219(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIQueueCreate"); } -void __wine_stub_winspool_drv_220(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIPrinterPropPages"); } -void __wine_stub_winspool_drv_221(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIDocumentDefaults"); } -void __wine_stub_winspool_drv_222(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SendRecvBidiData"); } -void __wine_stub_winspool_drv_223(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "RouterFreeBidiResponseContainer"); } -void __wine_stub_winspool_drv_224(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ExternalConnectToLd64In32Server"); } -void __wine_stub_winspool_drv_226(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIWebPnpEntry"); } -void __wine_stub_winspool_drv_227(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIWebPnpPostEntry"); } -void __wine_stub_winspool_drv_228(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUICreateInstance"); } -void __wine_stub_winspool_drv_229(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIDocumentPropertiesWrap"); } -void __wine_stub_winspool_drv_230(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIPrinterSetup"); } -void __wine_stub_winspool_drv_231(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PrintUIServerPropPages"); } -void __wine_stub_winspool_drv_232(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "AddDriverCatalog"); } -void __wine_stub_winspool_drv_107(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ADVANCEDSETUPDIALOG"); } -void __wine_stub_winspool_drv_133(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "AdvancedSetupDialog"); } -void __wine_stub_winspool_drv_135(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CloseSpoolFileHandle"); } -void __wine_stub_winspool_drv_139(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ConvertAnsiDevModeToUnicodeDevMode"); } -void __wine_stub_winspool_drv_140(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "ConvertUnicodeDevModeToAnsiDevMode"); } -void __wine_stub_winspool_drv_141(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CommitSpoolData"); } -void __wine_stub_winspool_drv_142(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "CreatePrinterIC"); } -void __wine_stub_winspool_drv_143(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DEVICECAPABILITIES"); } -void __wine_stub_winspool_drv_144(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DEVICEMODE"); } -void __wine_stub_winspool_drv_162(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeletePrinterIC"); } -void __wine_stub_winspool_drv_163(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DevQueryPrint"); } -void __wine_stub_winspool_drv_170(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DeviceMode"); } -void __wine_stub_winspool_drv_171(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "DocumentEvent"); } -void __wine_stub_winspool_drv_175(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "EXTDEVICEMODE"); } -void __wine_stub_winspool_drv_252(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "GetSpoolFileHandle"); } -void __wine_stub_winspool_drv_253(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "IsValidDevmodeA"); } -void __wine_stub_winspool_drv_254(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "IsValidDevmodeW"); } -void __wine_stub_winspool_drv_257(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "PlayGdiScriptOnPrinterIC"); } -void __wine_stub_winspool_drv_261(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "QueryColorProfile"); } -void __wine_stub_winspool_drv_262(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "QuerySpoolMode"); } -void __wine_stub_winspool_drv_263(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "QueryRemoteFonts"); } -void __wine_stub_winspool_drv_268(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SeekPrinter"); } -void __wine_stub_winspool_drv_269(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SetAllocFailCount"); } -void __wine_stub_winspool_drv_280(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SplDriverUnloadComplete"); } -void __wine_stub_winspool_drv_281(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SpoolerDevQueryPrintW"); } -void __wine_stub_winspool_drv_283(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "SpoolerPrinterEvent"); } -void __wine_stub_winspool_drv_284(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "StartDocDlgA"); } -void __wine_stub_winspool_drv_285(void) { __wine_spec_unimplemented_stub(__wine_spec_file_name, "StartDocDlgW"); } Modified: branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winsta/… ============================================================================== --- branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winsta/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -1,3 +1,5 @@ + +spec2def(winsta.dll winsta.spec) list(APPEND SOURCE logon.c @@ -8,21 +10,14 @@ server.c ws.c winsta.rc - winsta.def) - -if(NOT MSVC) - set_source_files_properties(winsta.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() + ${CMAKE_CURRENT_BINARY_DIR}/winsta.def) add_library(winsta SHARED ${CMAKE_CURRENT_BINARY_DIR}/winsta_winsta.h.gch ${SOURCE}) set_module_type(winsta win32dll) - target_link_libraries(winsta wine) - add_importlibs(winsta msvcrt kernel32 ntdll) add_pch(winsta ${CMAKE_CURRENT_SOURCE_DIR}/winsta.h ${SOURCE}) - add_cab_target(winsta 1) Removed: branches/cmake-bringup/dll/win32/winsta/winsta.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winsta/… ============================================================================== --- branches/cmake-bringup/dll/win32/winsta/winsta.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winsta/winsta.def (removed) @@ -1,124 +1,0 @@ - -LIBRARY winsta.dll - -EXPORTS - LogonIdFromWinStationNameA@12 @1 - LogonIdFromWinStationNameW@12 @2 - RemoteAssistancePrepareSystemRestore@4 @3 - ServerGetInternetConnectorStatus@12 @4 - ServerLicensingClose@4 @5 - ServerLicensingDeactivateCurrentPolicy@4 @6 - ServerLicensingFreePolicyInformation@4 @7 - ServerLicensingGetAvailablePolicyIds@12 @8 - ServerLicensingGetPolicy@8 @9 - ServerLicensingGetPolicyInformationA@16 @10 - ServerLicensingGetPolicyInformationW@16 @11 - ServerLicensingLoadPolicy@8 @12 - ServerLicensingOpenA@4 @13 - ServerLicensingOpenW@4 @14 - ServerLicensingSetPolicy@12 @15 - ServerLicensingUnloadPolicy@8 @16 - ServerQueryInetConnectorInformationA@16 @17 - ServerQueryInetConnectorInformationW@16 @18 - ServerSetInternetConnectorStatus@12 @19 - WinStationActivateLicense@16 @20 - WinStationAutoReconnect@4 @21 - WinStationBroadcastSystemMessage@40 @22 - WinStationCheckAccess@12 @23 - WinStationCheckLoopBack@16 @24 - WinStationCloseServer@16 @25 - WinStationConnectA@4 @26 - WinStationConnectCallback@20 @27 - WinStationConnectEx@8 @28 - WinStationConnectW@20 @29 - WinStationDisconnect@12 @30 - WinStationDynVirtualChanRead@20 @31 - WinStationDynVirtualChanWrite@16 @32 - WinStationEnumerateA@12 @33 - WinStationEnumerateLicenses@12 @34 - WinStationEnumerateProcesses@8 @35 - WinStationEnumerateW@12 @36 - WinStationEnumerate_IndexedA@20 @37 - WinStationEnumerate_IndexedW@20 @38 - WinStationFreeGAPMemory@12 @39 - WinStationFreeMemory@4 @40 - WinStationFreeUserCertificates@4 @41 - WinStationFreeUserCredentials@4 @42 - WinStationGenerateLicense@16 @43 - WinStationGetAllProcesses@16 @44 - WinStationGetConnectionProperty@12 @45 - WinStationGetInitialApplication@20 @46 - WinStationGetLanAdapterNameA@24 @47 - WinStationGetLanAdapterNameW@24 @48 - WinStationGetLoggedOnCount@8 @49 - WinStationGetMachinePolicy@8 @50 - WinStationGetProcessSid@24 @51 - WinStationGetTermSrvCountersValue@12 @52 - WinStationGetUserCertificates@4 @53 - WinStationGetUserCredentials@4 @54 - WinStationGetUserProfile@16 @55 - WinStationInstallLicense@12 @56 - WinStationIsHelpAssistantSession@8 @57 - WinStationIsSessionPermitted@0 @58 - WinStationNameFromLogonIdA@12 @59 - WinStationNameFromLogonIdW@12 @60 - WinStationNtsdDebug@20 @61 - WinStationOpenServerA@4 @62 - WinStationOpenServerW@4 @63 - WinStationQueryAllowConcurrentConnections@0 @64 - WinStationQueryEnforcementCore@24 @65 - WinStationQueryInformationA@24 @66 - WinStationQueryInformationW@24 @67 - WinStationQueryLicense@12 @68 - WinStationQueryLogonCredentialsW@4 @69 - WinStationQueryUpdateRequired@8 @70 - WinStationRegisterConsoleNotification@12 @71 - WinStationRegisterConsoleNotificationEx@16 @72 - WinStationRegisterNotificationEvent@16 @73 - WinStationRemoveLicense@12 @74 - WinStationRenameA@12 @75 - WinStationRenameW@12 @76 - WinStationRequestSessionsList@12 @77 - WinStationReset@12 @78 - WinStationSendMessageA@40 @79 - WinStationSendMessageW@40 @80 - WinStationSendWindowMessage@32 @81 - WinStationServerPing@4 @82 - WinStationSetInformationA@20 @83 - WinStationSetInformationW@20 @84 - WinStationSetPoolCount@12 @85 - WinStationShadow@20 @86 - WinStationShadowStop@12 @87 - WinStationShutdownSystem@8 @88 - WinStationSwitchToServicesSession@0 @89 - WinStationSystemShutdownStarted@0 @90 - WinStationSystemShutdownWait@8 @91 - WinStationTerminateProcess@12 @92 - WinStationUnRegisterConsoleNotification@8 @93 - WinStationUnRegisterNotificationEvent@4 @94 - WinStationUserLoginAccessCheck@16 @95 - WinStationVirtualOpen@12 @96 - WinStationVirtualOpenEx@16 @97 - WinStationWaitSystemEvent@12 @98 - _NWLogonQueryAdmin@12 @99 - _NWLogonSetAdmin@12 @100 - _WinStationAnnoyancePopup@8 @101 - _WinStationBeepOpen@12 @102 - _WinStationBreakPoint@12 @103 - _WinStationCallback@12 @104 - _WinStationCheckForApplicationName@48 @105 - _WinStationFUSCanRemoteUserDisconnect@12 @106 - _WinStationGetApplicationInfo@16 @107 - _WinStationNotifyDisconnectPipe@0 @108 - _WinStationNotifyLogoff@0 @109 - _WinStationNotifyLogon@32 @110 - _WinStationNotifyNewSession@8 @111 - _WinStationReInitializeSecurity@4 @112 - _WinStationReadRegistry@4 @113 - _WinStationSessionInitialized@0 @114 - _WinStationShadowTarget@40 @115 - _WinStationShadowTargetSetup@8 @116 - _WinStationUpdateClientCachedCredentials@28 @117 - _WinStationUpdateSettings@12 @118 - _WinStationUpdateUserConfig@4 @119 - _WinStationWaitForConnect@0 @120 Modified: branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wmi/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -1,13 +1,14 @@ -add_library(wmi SHARED wmi.rc wmi.def) +spec2def(wmi.dll wmi.spec) -if(NOT MSVC) - set_source_files_properties(wmi.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + wmi.rc + ${CMAKE_CURRENT_BINARY_DIR}/wmi.def) + +add_library(wmi SHARED ${SOURCE}) set_entrypoint(wmi 0) add_importlibs(wmi advapi32) add_dependencies(wmi psdk buildno_header) - -add_cab_target(wmi 1) +add_cab_target(wmi 1) Removed: branches/cmake-bringup/dll/win32/wmi/wmi.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wmi/wmi… ============================================================================== --- branches/cmake-bringup/dll/win32/wmi/wmi.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wmi/wmi.def (removed) @@ -1,49 +1,0 @@ - -LIBRARY wmi.dll - -EXPORTS - CloseTrace(a)4=advapi32.CloseTrace @1 - ControlTraceA(a)16=advapi32.ControlTraceA @2 - ControlTraceW(a)16=advapi32.ControlTraceW @3 - CreateTraceInstanceId(a)8=advapi32.CreateTraceInstanceId @4 - EnableTrace(a)20=advapi32.EnableTrace @5 - GetTraceEnableFlags(a)4=advapi32.GetTraceEnableFlags @6 - GetTraceEnableLevel(a)4=advapi32.GetTraceEnableLevel @7 - GetTraceLoggerHandle(a)4=advapi32.GetTraceLoggerHandle @8 - OpenTraceA(a)4=advapi32.OpenTraceA @9 - OpenTraceW(a)4=advapi32.OpenTraceW @10 - ProcessTrace(a)16=advapi32.ProcessTrace @11 - QueryAllTracesA(a)12=advapi32.QueryAllTracesA @12 - QueryAllTracesW(a)12=advapi32.QueryAllTracesW @13 - RegisterTraceGuidsA(a)32=advapi32.RegisterTraceGuidsA @14 - RegisterTraceGuidsW(a)32=advapi32.RegisterTraceGuidsW @15 - RemoveTraceCallback(a)4=advapi32.RemoveTraceCallback @16 - SetTraceCallback(a)8=advapi32.SetTraceCallback @17 - StartTraceA(a)12=advapi32.StartTraceA @18 - StartTraceW(a)12=advapi32.StartTraceW @19 - TraceEvent(a)8=advapi32.TraceEvent @20 - TraceEventInstance(a)16=advapi32.TraceEventInstance @21 - UnregisterTraceGuids(a)4=advapi32.UnregisterTraceGuids @22 - WmiCloseBlock(a)0=advapi32.WmiCloseBlock @23 - WmiDevInstToInstanceNameA(a)0=advapi32.WmiDevInstToInstanceNameA @24 - WmiDevInstToInstanceNameW(a)0=advapi32.WmiDevInstToInstanceNameW @25 - WmiEnumerateGuids(a)0=advapi32.WmiEnumerateGuids @26 - WmiExecuteMethodA(a)0=advapi32.WmiExecuteMethodA @27 - WmiExecuteMethodW(a)0=advapi32.WmiExecuteMethodW @28 - WmiFileHandleToInstanceNameA(a)0=advapi32.WmiFileHandleToInstanceNameA @29 - WmiFileHandleToInstanceNameW(a)0=advapi32.WmiFileHandleToInstanceNameW @30 - WmiFreeBuffer(a)0=advapi32.WmiFreeBuffer @31 - WmiMofEnumerateResourcesA(a)0=advapi32.WmiMofEnumerateResourcesA @32 - WmiMofEnumerateResourcesW(a)0=advapi32.WmiMofEnumerateResourcesW @33 - WmiNotificationRegistrationA(a)0=advapi32.WmiNotificationRegistrationA @34 - WmiNotificationRegistrationW(a)0=advapi32.WmiNotificationRegistrationW @35 - WmiOpenBlock(a)0=advapi32.WmiOpenBlock @36 - WmiQueryAllDataA(a)0=advapi32.WmiQueryAllDataA @37 - WmiQueryAllDataW(a)0=advapi32.WmiQueryAllDataW @38 - WmiQueryGuidInformation(a)0=advapi32.WmiQueryGuidInformation @39 - WmiQuerySingleInstanceA(a)0=advapi32.WmiQuerySingleInstanceA @40 - WmiQuerySingleInstanceW(a)0=advapi32.WmiQuerySingleInstanceW @41 - WmiSetSingleInstanceA(a)0=advapi32.WmiSetSingleInstanceA @42 - WmiSetSingleInstanceW(a)0=advapi32.WmiSetSingleInstanceW @43 - WmiSetSingleItemA(a)0=advapi32.WmiSetSingleItemA @44 - WmiSetSingleItemW(a)0=advapi32.WmiSetSingleItemW @45 Modified: branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32_… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -5,7 +5,9 @@ inc ${REACTOS_SOURCE_DIR}/include/reactos/winsock) -add_library(ws2_32_new SHARED +spec2def(ws2_32_new.dll ws2_32.spec) + +list(APPEND SOURCE src/addrconv.c src/addrinfo.c src/async.c @@ -43,16 +45,11 @@ src/startup.c src/wsautil.c ws2_32.rc - ws2_32.def) + ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def) -if(NOT MSVC) - set_source_files_properties(ws2_32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(ws2_32_new SHARED ${SOURCE}) set_module_type(ws2_32_new win32dll) - target_link_libraries(ws2_32_new wine) - add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) - add_cab_target(ws2_32_new 1) Removed: branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2_32_… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2_32_new/ws2_32.def (removed) @@ -1,121 +1,0 @@ - -LIBRARY ws2_32_new.dll - -EXPORTS - WEP@0 @500 - WPUCompleteOverlappedRequest@20 @24 - WSAAccept@20 @25 - WSAAddressToStringA@20 @26 - WSAAddressToStringW@20 @27 - WSAAsyncGetHostByAddr@28 @102 - WSAAsyncGetHostByName@20 @103 - WSAAsyncGetProtoByName@20 @105 - WSAAsyncGetProtoByNumber@20 @104 - WSAAsyncGetServByName@24 @107 - WSAAsyncGetServByPort@24 @106 - WSAAsyncSelect@16 @101 - WSACancelAsyncRequest@4 @108 - WSACancelBlockingCall@0 @113 - WSACleanup@0 @116 - WSACloseEvent@4 @28 - WSAConnect@28 @29 - WSACreateEvent@0 @30 - WSADuplicateSocketA@12 @31 - WSADuplicateSocketW@12 @32 - WSAEnumNameSpaceProvidersA@8 @33 - WSAEnumNameSpaceProvidersW@8 @34 - WSAEnumNetworkEvents@12 @35 - WSAEnumProtocolsA@12 @36 - WSAEnumProtocolsW@12 @37 - WSAEventSelect@12 @38 - WSAGetLastError@0 @111 - WSAGetOverlappedResult@20 @39 - WSAGetQOSByName@12 @40 - WSAGetServiceClassInfoA@16 @41 - WSAGetServiceClassInfoW@16 @42 - WSAGetServiceClassNameByClassIdA@12 @43 - WSAGetServiceClassNameByClassIdW@12 @44 - WSAHtonl@12 @45 - WSAHtons@12 @46 - WSAInstallServiceClassA@4 @47 - WSAInstallServiceClassW@4 @48 - WSAIoctl@36 @49 - WSAIsBlocking@0 @114 - WSAJoinLeaf@32 @50 - WSALookupServiceBeginA@12 @58 - WSALookupServiceBeginW@12 @59 - WSALookupServiceEnd@4 @60 - WSALookupServiceNextA@16 @61 - WSALookupServiceNextW@16 @62 - WSANSPIoctl@32 @63 - WSANtohl@12 @64 - WSANtohs@12 @65 - WSAProviderConfigChange@12 @66 - WSARecv@28 @67 - WSARecvDisconnect@8 @68 - WSARecvFrom@36 @69 - WSARemoveServiceClass@4 @70 - WSAResetEvent@4 @71 - WSASend@28 @72 - WSASendDisconnect@8 @73 - WSASendTo@36 @74 - WSASetBlockingHook@4 @109 - WSASetEvent@4 @75 - WSASetLastError@4 @112 - WSASetServiceA@12 @76 - WSASetServiceW@12 @77 - WSASocketA@24 @78 - WSASocketW@24 @79 - WSAStartup@8 @115 - WSAStringToAddressA@20 @80 - WSAStringToAddressW@20 @81 - WSAUnhookBlockingHook@0 @110 - WSAWaitForMultipleEvents@20 @82 - WSApSetPostRoutine@4 @83 - FreeAddrInfoW@4=freeaddrinfo@4 @84 - WSCDeinstallProvider@8 @85 - WSCEnableNSProvider@8 @86 - WSCEnumProtocols@16 @87 - WSCGetProviderPath@16 @88 - WSCInstallNameSpace@20 @89 - WSCInstallProvider@20 @90 - WSCUnInstallNameSpace@4 @91 - WSCUpdateProvider@20 @92 - WSCWriteNameSpaceOrder@8 @93 - WSCWriteProviderOrder@8 @94 - __WSAFDIsSet@8 @151 - accept@12 @1 - bind@12 @2 - closesocket@4 @3 - connect@12 @4 - freeaddrinfo@4 @95 - getaddrinfo@16 @96 - gethostbyaddr@12 @51 - gethostbyname@4 @52 - gethostname@8 @57 - getnameinfo@28 @97 - getpeername@12 @5 - getprotobyname@4 @53 - getprotobynumber@4 @54 - getservbyname@8 @55 - getservbyport@8 @56 - getsockname@12 @6 - getsockopt@20 @7 - htonl@4 @8 - htons@4 @9 - inet_addr@4 @11 - inet_ntoa@4 @12 - ioctlsocket@12 @10 - listen@8 @13 - ntohl@4 @14 - ntohs@4 @15 - recv@16 @16 - recvfrom@24 @17 - select@20 @18 - send@16 @19 - sendto@24 @20 - setsockopt@20 @21 - shutdown@8 @22 - socket@12 @23 - GetAddrInfoW@16 @98 - GetNameInfoW@28 @99 Modified: branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2help… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -1,9 +1,9 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) spec2def(ws2help.dll ws2help.spec) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) - -add_library(ws2help SHARED +list(APPEND SOURCE apc.c context.c dllmain.c @@ -11,9 +11,9 @@ notify.c ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def) +add_library(ws2help SHARED ${SOURCE}) + set_module_type(ws2help win32dll) - add_importlibs(ws2help advapi32 ws2_32 msvcrt kernel32 ntdll) - add_cab_target(ws2help 1) add_importlib_target(ws2help.spec) Removed: branches/cmake-bringup/dll/win32/ws2help/ws2help.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ws2help… ============================================================================== --- branches/cmake-bringup/dll/win32/ws2help/ws2help.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ws2help/ws2help.def (removed) @@ -1,27 +1,0 @@ - -LIBRARY ws2help.dll - -EXPORTS - WahCloseApcHelper@4 @1 - WahCloseHandleHelper@4 @2 - WahCloseNotificationHandleHelper@4 @3 - WahCloseSocketHandle@8 @4 - WahCloseThread@8 @5 - WahCompleteRequest@20 @6 - WahCreateHandleContextTable@4 @7 - WahCreateNotificationHandle@8 @8 - WahCreateSocketHandle@8 @9 - WahDestroyHandleContextTable@4 @10 - WahDisableNonIFSHandleSupport@0 @11 - WahEnableNonIFSHandleSupport@0 @12 - WahEnumerateHandleContexts@12 @13 - WahInsertHandleContext@8 @14 - WahNotifyAllProcesses@4 @15 - WahOpenApcHelper@4 @16 - WahOpenCurrentThread@8 @17 - WahOpenHandleHelper@4 @18 - WahOpenNotificationHandleHelper@4 @19 - WahQueueUserApc@16 @20 - WahReferenceContextByHandle@8 @21 - WahRemoveHandleContext@8 @22 - WahWaitForNotification@16 @23 Modified: branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshirda… ============================================================================== --- branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshirda/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -1,14 +1,15 @@ set_unicode() -add_library(wshirda SHARED wshirda.c wshirda.rc wshirda.def) +spec2def(wshirda.dll wshirda.spec) -if(NOT MSVC) - set_source_files_properties(wshirda.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + wshirda.c + wshirda.rc + ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def) + +add_library(wshirda SHARED ${SOURCE}) set_module_type(wshirda win32dll) - add_importlibs(wshirda ws2_32 msvcrt kernel32 ntdll) - add_cab_target(wshirda 1) Removed: branches/cmake-bringup/dll/win32/wshirda/wshirda.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshirda… ============================================================================== --- branches/cmake-bringup/dll/win32/wshirda/wshirda.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshirda/wshirda.def (removed) @@ -1,15 +1,0 @@ - -LIBRARY wshirda.dll - -EXPORTS - WSHEnumProtocols@16 @1 - WSHGetProviderGuid@8 @2 - WSHGetSockaddrType@12 @3 - WSHGetSocketInformation@32 @4 - WSHGetWSAProtocolInfo@12 @5 - WSHGetWildcardSockaddr@12 @6 - WSHGetWinsockMapping@8 @7 - WSHIoctl@52 @8 - WSHNotify@20 @9 - WSHOpenSocket@24 @10 - WSHSetSocketInformation@32 @11 Modified: branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpi… ============================================================================== --- branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -3,17 +3,18 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib) -add_library(wshtcpip SHARED wshtcpip.c wshtcpip.rc wshtcpip.def) +spec2def(wshtcpip.dll wshtcpip.spec) -if(NOT MSVC) - set_source_files_properties(wshtcpip.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + wshtcpip.c + wshtcpip.rc + ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def) + +add_library(wshtcpip SHARED ${SOURCE}) set_entrypoint(wshtcpip 0) target_link_libraries(wshtcpip tdilib) - add_importlibs(wshtcpip ws2_32 kernel32 ntdll) add_dependencies(wshtcpip psdk buildno_header) - -add_cab_target(wshtcpip 1) +add_cab_target(wshtcpip 1) Removed: branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpi… ============================================================================== --- branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshtcpip/wshtcpip.def (removed) @@ -1,20 +1,0 @@ - -LIBRARY wshtcpip.dll - -EXPORTS - WSHAddressToString@20 @1 - WSHEnumProtocols@16 @2 - WSHGetBroadcastSockaddr@12 @3 - WSHGetProviderGuid@8 @4 - WSHGetSockaddrType@12 @5 - WSHGetSocketInformation@32 @6 - WSHGetWildcardSockaddr@12 @7 - WSHGetWinsockMapping@8 @8 - WSHGetWSAProtocolInfo@12 @9 - WSHIoctl@52 @10 - WSHJoinLeaf@52 @11 - WSHNotify@20 @12 - WSHOpenSocket@24 @13 - WSHOpenSocket2@32 @14 - WSHSetSocketInformation@32 @15 - WSHStringToAddress@20 @16 Modified: branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wuapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -6,7 +6,9 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(wuapi SHARED +spec2def(wuapi.dll wuapi.spec) + +list(APPEND SOURCE downloader.c installer.c main.c @@ -14,18 +16,11 @@ searcher.c session.c updates.c - wuapi.def) + ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def) -if(NOT MSVC) - set_source_files_properties(wuapi.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(wuapi SHARED ${SOURCE}) set_module_type(wuapi win32dll) - -target_link_libraries(wuapi - wine - uuid) - +target_link_libraries(wuapi uuid wine) add_importlibs(wuapi ole32 advapi32 msvcrt kernel32 ntdll) - add_cab_target(wuapi 1) Removed: branches/cmake-bringup/dll/win32/wuapi/wuapi.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wuapi/w… ============================================================================== --- branches/cmake-bringup/dll/win32/wuapi/wuapi.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wuapi/wuapi.def (removed) @@ -1,8 +1,0 @@ - -LIBRARY wuapi.dll - -EXPORTS - DllCanUnloadNow@0 @1 PRIVATE - DllGetClassObject@12 @2 PRIVATE - DllRegisterServer@0 @3 PRIVATE - DllUnregisterServer@0 @4 PRIVATE Modified: branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_1/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -2,14 +2,15 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(xinput1_1 SHARED xinput1_1_main.c version.rc xinput1_1.def) +spec2def(xinput1_1.dll xinput1_1.spec) -if(NOT MSVC) - set_source_files_properties(xinput1_1.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + xinput1_1_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/xinput1_1.def) + +add_library(xinput1_1 SHARED ${SOURCE}) set_module_type(xinput1_1 win32dll) - add_importlibs(xinput1_1 msvcrt kernel32) - add_cab_target(xinput1_1 1) Removed: branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_1/xinput1_1.def (removed) @@ -1,9 +1,0 @@ - -LIBRARY xinput1_1.dll - -EXPORTS - XInputEnable(a)4=xinput1_3.XInputEnable @1 - XInputGetCapabilities(a)12=xinput1_3.XInputGetCapabilities @2 - XInputGetDSoundAudioDeviceGuids(a)12=xinput1_3.XInputGetDSoundAudioDeviceGuids @3 - XInputSetState(a)8=xinput1_3.XInputSetState @4 - XInputGetState(a)8=xinput1_3.XInputGetState @5 Modified: branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -2,14 +2,15 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(xinput1_2 SHARED xinput1_2_main.c version.rc xinput1_2.def) +spec2def(xinput1_2.dll xinput1_2.spec) -if(NOT MSVC) - set_source_files_properties(xinput1_2.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + xinput1_2_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/xinput1_2.def) + +add_library(xinput1_2 SHARED ${SOURCE}) set_module_type(xinput1_2 win32dll) - add_importlibs(xinput1_2 msvcrt kernel32) - add_cab_target(xinput1_2 1) Removed: branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_2/xinput1_2.def (removed) @@ -1,9 +1,0 @@ - -LIBRARY xinput1_2.dll - -EXPORTS - XInputEnable(a)4=xinput1_3.XInputEnable @1 - XInputGetCapabilities(a)12=xinput1_3.XInputGetCapabilities @2 - XInputGetDSoundAudioDeviceGuids(a)12=xinput1_3.XInputGetDSoundAudioDeviceGuids @3 - XInputSetState(a)8=xinput1_3.XInputSetState @4 - XInputGetState(a)8=xinput1_3.XInputGetState @5 Modified: branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_3/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -2,16 +2,16 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(xinput1_3 SHARED xinput1_3_main.c version.rc xinput1_3.def) +spec2def(xinput1_3.dll xinput1_3.spec) -if(NOT MSVC) - set_source_files_properties(xinput1_3.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + xinput1_3_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/xinput1_3.def) + +add_library(xinput1_3 SHARED ${SOURCE}) set_module_type(xinput1_3 win32dll) - target_link_libraries(xinput1_3 wine) - add_importlibs(xinput1_3 msvcrt kernel32 ntdll) - add_cab_target(xinput1_3 1) Removed: branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_3/xinput1_3.def (removed) @@ -1,12 +1,0 @@ - -LIBRARY xinput1_3.dll - -EXPORTS - DllMain@12 @1 - XInputGetState@8 @2 - XInputSetState@8 @3 - XInputGetCapabilities@12 @4 - XInputEnable@4 @5 - XInputGetDSoundAudioDeviceGuids@12 @6 - XInputGetBatteryInformation@12 @7 - XInputGetKeystroke@12 @8 Modified: branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput9… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] Fri Dec 24 19:07:09 2010 @@ -2,14 +2,15 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(xinput9_1_0 SHARED xinput9_1_0_main.c version.rc xinput9_1_0.def) +spec2def(xinput9_1_0.dll xinput9_1_0.spec) -if(NOT MSVC) - set_source_files_properties(xinput9_1_0.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + xinput9_1_0_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/xinput9_1_0.def) + +add_library(xinput9_1_0 SHARED ${SOURCE}) set_module_type(xinput9_1_0 win32dll) - add_importlibs(xinput9_1_0 msvcrt kernel32) - add_cab_target(xinput9_1_0 1) Removed: branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput9… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput9_1_0/xinput9_1_0.def (removed) @@ -1,8 +1,0 @@ - -LIBRARY xinput9_1_0.dll - -EXPORTS - XInputGetCapabilities(a)12=xinput1_3.XInputGetCapabilities @1 - XInputGetDSoundAudioDeviceGuids(a)12=xinput1_3.XInputGetDSoundAudioDeviceGuids @2 - XInputSetState(a)8=xinput1_3.XInputSetState @3 - XInputGetState(a)8=xinput1_3.XInputGetState @4

13 years, 8 months

[akhaldi] 50131: [CMAKE] - Delete more useless definition files. - Improve more modules.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 24 18:37:44 2010 New Revision: 50131 URL: http://svn.reactos.org/svn/reactos?rev=50131&view=rev Log: [CMAKE] - Delete more useless definition files. - Improve more modules. Removed: branches/cmake-bringup/dll/win32/olepro32/olepro32.def branches/cmake-bringup/dll/win32/powrprof/powrprof.def branches/cmake-bringup/dll/win32/psapi/psapi.def branches/cmake-bringup/dll/win32/riched20/riched20.def branches/cmake-bringup/dll/win32/riched32/riched32.def branches/cmake-bringup/dll/win32/rsabase/rsabase.def branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def branches/cmake-bringup/dll/win32/samsrv/samsrv.def branches/cmake-bringup/dll/win32/sensapi/sensapi.def branches/cmake-bringup/dll/win32/serialui/serialui.def branches/cmake-bringup/dll/win32/shfolder/shfolder.def branches/cmake-bringup/dll/win32/smdll/smdll.def branches/cmake-bringup/dll/win32/sndblst/sndblst.def branches/cmake-bringup/dll/win32/sti/sti.def branches/cmake-bringup/dll/win32/twain_32/twain_32.def branches/cmake-bringup/dll/win32/uext2/uext2.def branches/cmake-bringup/dll/win32/ufat/ufat.def branches/cmake-bringup/dll/win32/ufatx/ufatx.def branches/cmake-bringup/dll/win32/untfs/untfs.def branches/cmake-bringup/dll/win32/user32/user32.def branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def branches/cmake-bringup/dll/win32/version/version.def branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def branches/cmake-bringup/dll/win32/winfax/winfax.def Modified: branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt branches/cmake-bringup/dll/win32/version/CMakeLists.txt branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olepro3… ============================================================================== --- branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/olepro32/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -2,11 +2,14 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(olepro32 SHARED olepro32stubs.c version.rc olepro32.def) +spec2def(olepro32.dll olepro32.spec) -if(NOT MSVC) - set_source_files_properties(olepro32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + olepro32stubs.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/olepro32.def) + +add_library(olepro32 SHARED ${SOURCE}) set_entrypoint(olepro32 0) @@ -17,4 +20,4 @@ kernel32 ntdll) -add_cab_target(olepro32 1) +add_cab_target(olepro32 1) Removed: branches/cmake-bringup/dll/win32/olepro32/olepro32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olepro3… ============================================================================== --- branches/cmake-bringup/dll/win32/olepro32/olepro32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/olepro32/olepro32.def (removed) @@ -1,15 +1,0 @@ - -LIBRARY olepro32.dll - -EXPORTS - OleIconToCursor(a)8=oleaut32.OleIconToCursor @248 - OleCreatePropertyFrameIndirect(a)4=oleaut32.OleCreatePropertyFrameIndirect @249 - OleCreatePropertyFrame(a)44=oleaut32.OleCreatePropertyFrame @250 - OleLoadPicture(a)20=oleaut32.OleLoadPicture @251 - OleCreatePictureIndirect(a)16=oleaut32.OleCreatePictureIndirect @252 - OleCreateFontIndirect(a)12=oleaut32.OleCreateFontIndirect @253 - OleTranslateColor(a)12=oleaut32.OleTranslateColor @254 - DllCanUnloadNow@0 @255 PRIVATE - DllGetClassObject@12 @256 PRIVATE - DllRegisterServer@0 @257 PRIVATE - DllUnregisterServer@0 @258 PRIVATE Modified: branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/powrpro… ============================================================================== --- branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/powrprof/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -4,9 +4,9 @@ set_unicode() add_library(powrprof SHARED - powrprof.c - powrprof.rc - ${CMAKE_CURRENT_BINARY_DIR}/powrprof.def) + powrprof.c + powrprof.rc + ${CMAKE_CURRENT_BINARY_DIR}/powrprof.def) set_module_type(powrprof win32dll) Removed: branches/cmake-bringup/dll/win32/powrprof/powrprof.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/powrpro… ============================================================================== --- branches/cmake-bringup/dll/win32/powrprof/powrprof.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/powrprof/powrprof.def (removed) @@ -1,27 +1,0 @@ - -LIBRARY powrprof.dll - -EXPORTS - CallNtPowerInformation@20 @1 - CanUserWritePwrScheme@0 @2 - DeletePwrScheme@4 @3 - EnumPwrSchemes@8 @4 - GetActivePwrScheme@4 @5 - GetCurrentPowerPolicies@8 @6 - GetPwrCapabilities@4 @7 - GetPwrDiskSpindownRange@8 @8 - IsAdminOverrideActive@4 @9 - IsPwrHibernateAllowed@0 @10 - IsPwrShutdownAllowed@0 @11 - IsPwrSuspendAllowed@0 @12 - PowerGetActiveScheme@8 @13 - PowerReadDCValue@28 @14 - ReadGlobalPwrPolicy@4 @15 - ReadProcessorPwrScheme@8 @16 - ReadPwrScheme@8 @17 - SetActivePwrScheme@12 @18 - SetSuspendState@12 @19 - WriteGlobalPwrPolicy@4 @20 - WriteProcessorPwrScheme@8 @21 - WritePwrScheme@16 @22 - ValidatePowerPolicies@8 @23 Modified: branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/psapi/C… ============================================================================== --- branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/psapi/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -1,27 +1,19 @@ + +spec2def(psapi.dll psapi.spec) list(APPEND SOURCE malloc.c psapi.c psapi.rc - psapi.def) - -if(NOT MSVC) - set_source_files_properties(psapi.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() + ${CMAKE_CURRENT_BINARY_DIR}/psapi.def) add_library(psapi SHARED ${CMAKE_CURRENT_BINARY_DIR}/psapi_precomp.h.gch ${SOURCE}) set_module_type(psapi win32dll) - -target_link_libraries(psapi - epsapi - ${PSEH_LIB}) - +target_link_libraries(psapi epsapi ${PSEH_LIB}) add_importlibs(psapi msvcrt kernel32 ntdll) add_importlib_target(psapi.spec) - add_pch(psapi ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) - add_cab_target(psapi 1) Removed: branches/cmake-bringup/dll/win32/psapi/psapi.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/psapi/p… ============================================================================== --- branches/cmake-bringup/dll/win32/psapi/psapi.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/psapi/psapi.def (removed) @@ -1,29 +1,0 @@ - -LIBRARY psapi.dll - -EXPORTS - EmptyWorkingSet@4 @1 - EnumDeviceDrivers@12 @2 - EnumPageFilesA@8 @3 - EnumPageFilesW@8 @4 - EnumProcessModules@16 @5 - EnumProcesses@12 @6 - GetDeviceDriverBaseNameA@12 @7 - GetDeviceDriverBaseNameW@12 @8 - GetDeviceDriverFileNameA@12 @9 - GetDeviceDriverFileNameW@12 @10 - GetMappedFileNameA@16 @11 - GetMappedFileNameW@16 @12 - GetModuleBaseNameA@16 @13 - GetModuleBaseNameW@16 @14 - GetModuleFileNameExA@16 @15 - GetModuleFileNameExW@16 @16 - GetModuleInformation@16 @17 - GetPerformanceInfo@8 @18 - GetProcessImageFileNameA@12 @19 - GetProcessImageFileNameW@12 @20 - GetProcessMemoryInfo@12 @21 - GetWsChanges@12 @22 - InitializeProcessForWsWatch@4 @23 - QueryWorkingSet@12 @24 - QueryWorkingSetEx@12 @25 Modified: branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched2… ============================================================================== --- branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -7,7 +7,7 @@ spec2def(riched20.dll riched20.spec) -add_library(riched20 SHARED +list(APPEND SOURCE caret.c clipboard.c context.c @@ -30,8 +30,8 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/riched20.def) +add_library(riched20 SHARED ${SOURCE}) set_module_type(riched20 win32dll) - target_link_libraries(riched20 wine uuid) if(MSVC) Removed: branches/cmake-bringup/dll/win32/riched20/riched20.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched2… ============================================================================== --- branches/cmake-bringup/dll/win32/riched20/riched20.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched20/riched20.def (removed) @@ -1,13 +1,0 @@ - -LIBRARY riched20.dll - -EXPORTS - IID_IRichEditOle @2 DATA - IID_IRichEditOleCallback @3 DATA - CreateTextServices@12 @4 - IID_ITextServices @5 DATA - IID_ITextHost @6 DATA - IID_ITextHost2 @7 DATA - REExtendedRegisterClass@0 @8 - RichEdit10ANSIWndProc@16 @9 - RichEditANSIWndProc@16 @10 Modified: branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched3… ============================================================================== --- branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched32/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -2,16 +2,16 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(riched32 SHARED richedit.c version.rc riched32.def) +spec2def(riched32.dll riched32.spec) -if(NOT MSVC) - set_source_files_properties(riched32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + richedit.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/riched32.def) + +add_library(riched32 SHARED ${SOURCE}) set_module_type(riched32 win32dll) - target_link_libraries(riched32 wine) - add_importlibs(riched32 riched20 user32 msvcrt kernel32 ntdll) - add_cab_target(riched32 1) Removed: branches/cmake-bringup/dll/win32/riched32/riched32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched3… ============================================================================== --- branches/cmake-bringup/dll/win32/riched32/riched32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched32/riched32.def (removed) @@ -1,5 +1,0 @@ - -LIBRARY riched32.dll - -EXPORTS - DllGetVersion@4 @2 PRIVATE Modified: branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsabase… ============================================================================== --- branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rsabase/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -2,16 +2,15 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(rsabase SHARED version.rc rsabase.def) +spec2def(rsabase.dll rsabase.spec) -if(NOT MSVC) - set_source_files_properties(rsabase.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/rsabase.def) + +add_library(rsabase SHARED ${SOURCE}) set_entrypoint(rsabase 0) - target_link_libraries(rsabase wine) - add_importlibs(rsabase rsaenh ntdll) - -add_cab_target(rsabase 1) +add_cab_target(rsabase 1) Removed: branches/cmake-bringup/dll/win32/rsabase/rsabase.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsabase… ============================================================================== --- branches/cmake-bringup/dll/win32/rsabase/rsabase.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rsabase/rsabase.def (removed) @@ -1,31 +1,0 @@ - -LIBRARY rsabase.dll - -EXPORTS - CPAcquireContext(a)16=rsaenh.CPAcquireContext @1 - CPCreateHash(a)20=rsaenh.CPCreateHash @2 - CPDecrypt(a)28=rsaenh.CPDecrypt @3 - CPDeriveKey(a)20=rsaenh.CPDeriveKey @4 - CPDestroyHash(a)8=rsaenh.CPDestroyHash @5 - CPDestroyKey(a)8=rsaenh.CPDestroyKey @6 - CPDuplicateHash(a)20=rsaenh.CPDuplicateHash @7 - CPDuplicateKey(a)20=rsaenh.CPDuplicateKey @8 - CPEncrypt(a)32=rsaenh.CPEncrypt @9 - CPExportKey(a)28=rsaenh.CPExportKey @10 - CPGenKey(a)16=rsaenh.CPGenKey @11 - CPGenRandom(a)12=rsaenh.CPGenRandom @12 - CPGetHashParam(a)24=rsaenh.CPGetHashParam @13 - CPGetKeyParam(a)24=rsaenh.CPGetKeyParam @14 - CPGetProvParam(a)20=rsaenh.CPGetProvParam @15 - CPGetUserKey(a)12=rsaenh.CPGetUserKey @16 - CPHashData(a)20=rsaenh.CPHashData @17 - CPHashSessionKey(a)16=rsaenh.CPHashSessionKey @18 - CPImportKey(a)24=rsaenh.CPImportKey @19 - CPReleaseContext(a)8=rsaenh.CPReleaseContext @20 - CPSetHashParam(a)20=rsaenh.CPSetHashParam @21 - CPSetKeyParam(a)20=rsaenh.CPSetKeyParam @22 - CPSetProvParam(a)16=rsaenh.CPSetProvParam @23 - CPSignHash(a)28=rsaenh.CPSignHash @24 - CPVerifySignature(a)28=rsaenh.CPVerifySignature @25 - DllRegisterServer(a)0=rsaenh.DllRegisterServer @26 PRIVATE - DllUnregisterServer(a)0=rsaenh.DllUnregisterServer @27 PRIVATE Modified: branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsaenh/… ============================================================================== --- branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -5,7 +5,9 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(rsaenh SHARED +spec2def(rsaenh.dll rsaenh.spec) + +list(APPEND SOURCE aes.c des.c handle.c @@ -18,19 +20,12 @@ rsaenh.c sha2.c version.rc - rsaenh.def) + ${CMAKE_CURRENT_BINARY_DIR}/rsaenh.def) -if(NOT MSVC) - set_source_files_properties(rsaenh.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(rsaenh SHARED ${SOURCE}) set_module_type(rsaenh win32dll) - target_link_libraries(rsaenh wine) - add_importlibs(rsaenh msvcrt crypt32 advapi32 kernel32 ntdll) - add_importlib_target(rsaenh.spec) - add_cab_target(rsaenh 1) - Removed: branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rsaenh/… ============================================================================== --- branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rsaenh/rsaenh.def (removed) @@ -1,31 +1,0 @@ - -LIBRARY rsaenh.dll - -EXPORTS - CPAcquireContext@16=RSAENH_CPAcquireContext@16 @1 - CPCreateHash@20=RSAENH_CPCreateHash@20 @2 - CPDecrypt@28=RSAENH_CPDecrypt@28 @3 - CPDeriveKey@20=RSAENH_CPDeriveKey@20 @4 - CPDestroyHash@8=RSAENH_CPDestroyHash@8 @5 - CPDestroyKey@8=RSAENH_CPDestroyKey@8 @6 - CPDuplicateHash@20=RSAENH_CPDuplicateHash@20 @7 - CPDuplicateKey@20=RSAENH_CPDuplicateKey@20 @8 - CPEncrypt@32=RSAENH_CPEncrypt@32 @9 - CPExportKey@28=RSAENH_CPExportKey@28 @10 - CPGenKey@16=RSAENH_CPGenKey@16 @11 - CPGenRandom@12=RSAENH_CPGenRandom@12 @12 - CPGetHashParam@24=RSAENH_CPGetHashParam@24 @13 - CPGetKeyParam@24=RSAENH_CPGetKeyParam@24 @14 - CPGetProvParam@20=RSAENH_CPGetProvParam@20 @15 - CPGetUserKey@12=RSAENH_CPGetUserKey@12 @16 - CPHashData@20=RSAENH_CPHashData@20 @17 - CPHashSessionKey@16=RSAENH_CPHashSessionKey@16 @18 - CPImportKey@24=RSAENH_CPImportKey@24 @19 - CPReleaseContext@8=RSAENH_CPReleaseContext@8 @20 - CPSetHashParam@20=RSAENH_CPSetHashParam@20 @21 - CPSetKeyParam@20=RSAENH_CPSetKeyParam@20 @22 - CPSetProvParam@16=RSAENH_CPSetProvParam@16 @23 - CPSignHash@28=RSAENH_CPSignHash@28 @24 - CPVerifySignature@28=RSAENH_CPVerifySignature@28 @25 - DllRegisterServer@0 @26 PRIVATE - DllUnregisterServer@0 @27 PRIVATE Modified: branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samsrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -1,15 +1,16 @@ set_unicode() -add_library(samsrv SHARED samsrv.c samsrv.rc samsrv.def) +spec2def(samsrv.dll samsrv.spec) -if(NOT MSVC) - set_source_files_properties(samsrv.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + samsrv.c + samsrv.rc + ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def) + +add_library(samsrv SHARED ${SOURCE}) set_entrypoint(samsrv 0) - add_importlibs(samsrv kernel32 ntdll) add_dependencies(samsrv psdk buildno_header) - -add_cab_target(samsrv 1) +add_cab_target(samsrv 1) Removed: branches/cmake-bringup/dll/win32/samsrv/samsrv.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samsrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/samsrv/samsrv.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/samsrv/samsrv.def (removed) @@ -1,6 +1,0 @@ - -LIBRARY samsrv.dll - -EXPORTS - SamIInitialize@0 @1 - SampInitializeRegistry@0 @2 Modified: branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sensapi… ============================================================================== --- branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sensapi/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -2,16 +2,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -add_library(sensapi SHARED sensapi.c sensapi.def) +spec2def(sensapi.dll sensapi.spec) -if(NOT MSVC) - set_source_files_properties(sensapi.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + sensapi.c + ${CMAKE_CURRENT_BINARY_DIR}/sensapi.def) + +add_library(sensapi SHARED ${SOURCE}) set_module_type(sensapi win32dll) - target_link_libraries(sensapi wine) - add_importlibs(sensapi msvcrt kernel32 ntdll) - add_cab_target(sensapi 1) Removed: branches/cmake-bringup/dll/win32/sensapi/sensapi.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sensapi… ============================================================================== --- branches/cmake-bringup/dll/win32/sensapi/sensapi.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sensapi/sensapi.def (removed) @@ -1,7 +1,0 @@ - -LIBRARY sensapi.dll - -EXPORTS - IsDestinationReachableA@8 @1 - IsDestinationReachableW@8 @2 - IsNetworkAlive@4 @3 Modified: branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/serialu… ============================================================================== --- branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -1,14 +1,15 @@ set_unicode() -add_library(serialui SHARED serialui.c serialui.rc serialui.def) +spec2def(serialui.dll serialui.spec) -if(NOT MSVC) - set_source_files_properties(serialui.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + serialui.c + serialui.rc + ${CMAKE_CURRENT_BINARY_DIR}/serialui.def) + +add_library(serialui SHARED ${SOURCE}) set_module_type(serialui win32dll) - add_importlibs(serialui user32 shlwapi msvcrt kernel32) - add_cab_target(serialui 1) Removed: branches/cmake-bringup/dll/win32/serialui/serialui.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/serialu… ============================================================================== --- branches/cmake-bringup/dll/win32/serialui/serialui.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/serialui/serialui.def (removed) @@ -1,10 +1,0 @@ - -LIBRARY serialui.dll - -EXPORTS - drvCommConfigDialogA@12 @1 - drvCommConfigDialogW@12 @2 - drvSetDefaultCommConfigA@12 @3 - drvSetDefaultCommConfigW@12 @4 - drvGetDefaultCommConfigA@12 @5 - drvGetDefaultCommConfigW@12 @6 Modified: branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shfolde… ============================================================================== --- branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -2,17 +2,17 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -add_library(shfolder SHARED version.rc shfolder.def) +spec2def(shfolder.dll shfolder.spec) -if(NOT MSVC) - set_source_files_properties(shfolder.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/shfolder.def) + +add_library(shfolder SHARED ${SOURCE}) set_entrypoint(shfolder 0) target_link_libraries(shfolder wine) - add_importlibs(shfolder shell32 kernel32 ntdll) add_dependencies(shfolder psdk buildno_header) - -add_cab_target(shfolder 1) +add_cab_target(shfolder 1) Removed: branches/cmake-bringup/dll/win32/shfolder/shfolder.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shfolde… ============================================================================== --- branches/cmake-bringup/dll/win32/shfolder/shfolder.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shfolder/shfolder.def (removed) @@ -1,6 +1,0 @@ - -LIBRARY shfolder.dll - -EXPORTS - SHGetFolderPathA(a)20=shell32.SHGetFolderPathA @1 - SHGetFolderPathW(a)20=shell32.SHGetFolderPathW @2 Modified: branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/smdll/C… ============================================================================== --- branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/smdll/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -1,16 +1,17 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) spec2def(smdll.dll smdll.spec) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) - -add_library(smdll SHARED +list(APPEND SOURCE dllmain.c query.c smdll.rc ${CMAKE_CURRENT_BINARY_DIR}/smdll.def) +add_library(smdll SHARED ${SOURCE}) + target_link_libraries(smdll smlib) - add_importlibs(smdll ntdll) add_dependencies(smdll psdk buildno_header) add_cab_target(smdll 1) Removed: branches/cmake-bringup/dll/win32/smdll/smdll.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/smdll/s… ============================================================================== --- branches/cmake-bringup/dll/win32/smdll/smdll.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/smdll/smdll.def (removed) @@ -1,9 +1,0 @@ - -LIBRARY smdll.dll - -EXPORTS - SmCompleteSession@12 @1 - SmConnectApiPort@16 @2 - SmExecuteProgram@8 @3 - SmQueryInformation@20 @4 - SmLookupSubsystem@20 @5 Modified: branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sndblst… ============================================================================== --- branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sndblst/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -4,18 +4,15 @@ add_definitions(-DDEBUG_NT4) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) -add_library(sndblst SHARED sndblst.c sndblst.def) +spec2def(sndblst.dll sndblst.spec) -if(NOT MSVC) - set_source_files_properties(sndblst.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + sndblst.c + ${CMAKE_CURRENT_BINARY_DIR}/sndblst.def) + +add_library(sndblst SHARED ${SOURCE}) set_module_type(sndblst win32dll) - -target_link_libraries(sndblst - mment4 - mmebuddy) - +target_link_libraries(sndblst mment4 mmebuddy) add_importlibs(sndblst user32 winmm advapi32 msvcrt kernel32 ntdll) - add_cab_target(sndblst 1) Removed: branches/cmake-bringup/dll/win32/sndblst/sndblst.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sndblst… ============================================================================== --- branches/cmake-bringup/dll/win32/sndblst/sndblst.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sndblst/sndblst.def (removed) @@ -1,11 +1,0 @@ - -LIBRARY sndblst.dll - -EXPORTS - DriverProc@20 @1 - widMessage@20 @2 - wodMessage@20 @3 - midMessage@20 @4 - modMessage@20 @5 - mxdMessage@20 @6 - auxMessage@20 @7 Removed: branches/cmake-bringup/dll/win32/sti/sti.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/sti… ============================================================================== --- branches/cmake-bringup/dll/win32/sti/sti.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sti/sti.def (removed) @@ -1,11 +1,0 @@ - -LIBRARY sti.dll - -EXPORTS - DllCanUnloadNow@0 @1 PRIVATE - DllGetClassObject@12 @2 PRIVATE - DllRegisterServer@0 @3 PRIVATE - DllUnregisterServer@0 @4 PRIVATE - StiCreateInstance@16=StiCreateInstanceW@16 @5 - StiCreateInstanceA@16 @6 - StiCreateInstanceW@16 @7 Modified: branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/twain_3… ============================================================================== --- branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/twain_32/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -1,7 +1,9 @@ add_definitions(-D_DLL -D__USE_CRTIMP) -add_library(twain_32 SHARED +spec2def(twain_32.dll twain_32.spec) + +list(APPEND SOURCE capability.c ds_audio.c ds_ctrl.c @@ -9,16 +11,11 @@ dsm_ctrl.c twain32_main.c twain_32.rc - twain_32.def) + ${CMAKE_CURRENT_BINARY_DIR}/twain_32.def) -if(NOT MSVC) - set_source_files_properties(twain_32.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(twain_32 SHARED ${SOURCE}) set_module_type(twain_32 win32dll) - target_link_libraries(twain_32 wine) - add_importlibs(twain_32 msvcrt kernel32 ntdll) - add_cab_target(twain_32 1) Removed: branches/cmake-bringup/dll/win32/twain_32/twain_32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/twain_3… ============================================================================== --- branches/cmake-bringup/dll/win32/twain_32/twain_32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/twain_32/twain_32.def (removed) @@ -1,5 +1,0 @@ - -LIBRARY twain_32.dll - -EXPORTS - DSM_Entry@24 @1 Modified: branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uext2/C… ============================================================================== --- branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/uext2/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -1,14 +1,14 @@ -add_library(uext2 SHARED uext2.c uext2.rc uext2.def) +spec2def(uext2.dll uext2.spec) -if(NOT MSVC) - set_source_files_properties(uext2.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + uext2.c + uext2.rc + ${CMAKE_CURRENT_BINARY_DIR}/uext2.def) + +add_library(uext2 SHARED ${SOURCE}) set_module_type(uext2 win32dll) - target_link_libraries(uext2 ext2lib) - add_importlibs(uext2 msvcrt kernel32 ntdll) - add_cab_target(uext2 1) Removed: branches/cmake-bringup/dll/win32/uext2/uext2.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uext2/u… ============================================================================== --- branches/cmake-bringup/dll/win32/uext2/uext2.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/uext2/uext2.def (removed) @@ -1,6 +1,0 @@ - -LIBRARY uext2.dll - -EXPORTS - ChkdskEx@24=Ext2Chkdsk@24 @1 - FormatEx@24=Ext2Format@24 @2 Modified: branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufat/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ufat/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -1,14 +1,14 @@ -add_library(ufat SHARED ufat.c ufat.rc ufat.def) +spec2def(ufat.dll ufat.spec) -if(NOT MSVC) - set_source_files_properties(ufat.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + ufat.c + ufat.rc + ${CMAKE_CURRENT_BINARY_DIR}/ufat.def) + +add_library(ufat SHARED ${SOURCE}) set_module_type(ufat win32dll) - target_link_libraries(ufat vfatlib) - add_importlibs(ufat msvcrt kernel32 ntdll) - add_cab_target(ufat 1) Removed: branches/cmake-bringup/dll/win32/ufat/ufat.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufat/uf… ============================================================================== --- branches/cmake-bringup/dll/win32/ufat/ufat.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ufat/ufat.def (removed) @@ -1,6 +1,0 @@ - -LIBRARY ufat.dll - -EXPORTS - ChkdskEx@24=VfatChkdsk@24 @1 - FormatEx@24=VfatFormat@24 @2 Modified: branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufatx/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ufatx/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -1,16 +1,16 @@ spec2def(ufatx.dll ufatx.spec) -add_library(ufatx SHARED +list(APPEND SOURCE ufatx.rc ${CMAKE_CURRENT_BINARY_DIR}/ufatx.def) + +add_library(ufatx SHARED ${SOURCE}) set_entrypoint(ufatx 0) target_link_libraries(ufatx vfatxlib -lgcc) - add_importlibs(ufatx kernel32 ntdll) add_importlib_target(ufatx.spec) - add_dependencies(ufatx psdk buildno_header) add_cab_target(ufatx 1) Removed: branches/cmake-bringup/dll/win32/ufatx/ufatx.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ufatx/u… ============================================================================== --- branches/cmake-bringup/dll/win32/ufatx/ufatx.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ufatx/ufatx.def (removed) @@ -1,5 +1,0 @@ - -LIBRARY ufatx.dll - -EXPORTS - FormatEx@24=VfatxFormat@24 @1 Modified: branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/untfs/C… ============================================================================== --- branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/untfs/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -1,14 +1,14 @@ -add_library(untfs SHARED untfs.c untfs.rc untfs.def) +spec2def(untfs.dll untfs.spec) -if(NOT MSVC) - set_source_files_properties(untfs.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + untfs.c + untfs.rc + ${CMAKE_CURRENT_BINARY_DIR}/untfs.def) + +add_library(untfs SHARED ${SOURCE}) set_module_type(untfs win32dll) - target_link_libraries(untfs ntfslib) - add_importlibs(untfs msvcrt kernel32 ntdll) - add_cab_target(untfs 1) Removed: branches/cmake-bringup/dll/win32/untfs/untfs.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/untfs/u… ============================================================================== --- branches/cmake-bringup/dll/win32/untfs/untfs.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/untfs/untfs.def (removed) @@ -1,6 +1,0 @@ - -LIBRARY untfs.dll - -EXPORTS - ChkdskEx@24=NtfsChkdsk@24 @1 - FormatEx@24=NtfsFormat@24 @2 Removed: branches/cmake-bringup/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… ============================================================================== --- branches/cmake-bringup/dll/win32/user32/user32.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/user32/user32.def (removed) @@ -1,734 +1,0 @@ - -LIBRARY user32.dll - -EXPORTS - ActivateKeyboardLayout=NtUserActivateKeyboardLayout - AdjustWindowRect - AdjustWindowRectEx - AlignRects - AllowForegroundActivation - AllowSetForegroundWindow - AnimateWindow - AnyPopup - AppendMenuA - AppendMenuW - ArrangeIconicWindows - AttachThreadInput=NtUserAttachThreadInput - BeginDeferWindowPos - BeginPaint=NtUserBeginPaint - BlockInput=NtUserBlockInput - BringWindowToTop - BroadcastSystemMessage=BroadcastSystemMessageA - BroadcastSystemMessageA - BroadcastSystemMessageExA - BroadcastSystemMessageExW - BroadcastSystemMessageW - BuildReasonArray=__wine_stub_user32_dll_22 - CalcMenuBar=__wine_stub_user32_dll_23 - CallMsgFilter=CallMsgFilterA - CallMsgFilterA - CallMsgFilterW - CallNextHookEx - CallWindowProcA - CallWindowProcW - CascadeChildWindows - CascadeWindows - ChangeClipboardChain=NtUserChangeClipboardChain - ChangeDisplaySettingsA - ChangeDisplaySettingsExA - ChangeDisplaySettingsExW - ChangeDisplaySettingsW - ChangeMenuA - ChangeMenuW - CharLowerA - CharLowerBuffA - CharLowerBuffW - CharLowerW - CharNextA - CharNextExA - CharNextW - CharPrevA - CharPrevExA - CharPrevW - CharToOemA - CharToOemBuffA - CharToOemBuffW - CharToOemW - CharUpperA - CharUpperBuffA - CharUpperBuffW - CharUpperW - CheckDlgButton - CheckMenuItem - CheckMenuRadioItem - CheckRadioButton - ChildWindowFromPoint - ChildWindowFromPointEx - CliImmSetHotKey - ClientThreadSetup - ClientToScreen - ClipCursor=NtUserClipCursor - CloseClipboard=NtUserCloseClipboard - CloseDesktop=NtUserCloseDesktop - CloseWindow - CloseWindowStation=NtUserCloseWindowStation - CopyAcceleratorTableA - CopyAcceleratorTableW=NtUserCopyAcceleratorTable - CopyIcon - CopyImage - CopyRect - CountClipboardFormats=NtUserCountClipboardFormats - CreateAcceleratorTableA - CreateAcceleratorTableW=NtUserCreateAcceleratorTable - CreateCaret=NtUserCreateCaret - CreateCursor - CreateDesktopA - CreateDesktopW - CreateDialogIndirectParamA - CreateDialogIndirectParamAorW - CreateDialogIndirectParamW - CreateDialogParamA - CreateDialogParamW - CreateIcon - CreateIconFromResource - CreateIconFromResourceEx - CreateIconIndirect - CreateMDIWindowA - CreateMDIWindowW - CreateMenu - CreatePopupMenu - CreateSystemThreads=__wine_stub_user32_dll_96 - CreateWindowExA - CreateWindowExW - CreateWindowStationA - CreateWindowStationW - CsrBroadcastSystemMessageExW - CtxInitUser32 - DdeAbandonTransaction - DdeAccessData - DdeAddData - DdeClientTransaction - DdeCmpStringHandles - DdeConnect - DdeConnectList - DdeCreateDataHandle - DdeCreateStringHandleA - DdeCreateStringHandleW - DdeDisconnect - DdeDisconnectList - DdeEnableCallback - DdeFreeDataHandle - DdeFreeStringHandle - DdeGetData - DdeGetLastError - DdeGetQualityOfService - DdeImpersonateClient - DdeInitializeA - DdeInitializeW - DdeKeepStringHandle - DdeNameService - DdePostAdvise - DdeQueryConvInfo - DdeQueryNextServer - DdeQueryStringA - DdeQueryStringW - DdeReconnect - DdeSetQualityOfService - DdeSetUserHandle - DdeUnaccessData - DdeUninitialize - DefDlgProcA - DefDlgProcW - DefFrameProcA - DefFrameProcW - DefMDIChildProcA - DefMDIChildProcW - DefRawInputProc - DefWindowProcA - DefWindowProcW - DeferWindowPos - DeleteMenu=NtUserDeleteMenu - DeregisterShellHookWindow - DestroyAcceleratorTable - DestroyCaret - DestroyCursor - DestroyIcon - DestroyMenu=NtUserDestroyMenu - DestroyReasons=__wine_stub_user32_dll_153 - DestroyWindow=NtUserDestroyWindow - DeviceEventWorker=__wine_stub_user32_dll_155 - DialogBoxIndirectParamA - DialogBoxIndirectParamAorW - DialogBoxIndirectParamW - DialogBoxParamA - DialogBoxParamW - DisableProcessWindowsGhosting - DispatchMessageA - DispatchMessageW - DisplayExitWindowsWarnings - DlgDirListA - DlgDirListComboBoxA - DlgDirListComboBoxW - DlgDirListW - DlgDirSelectComboBoxExA - DlgDirSelectComboBoxExW - DlgDirSelectExA - DlgDirSelectExW - DragDetect - DragObject=NtUserDragObject - DrawAnimatedRects=NtUserDrawAnimatedRects - DrawCaption - DrawCaptionTempA - DrawCaptionTempW - DrawEdge - DrawFocusRect - DrawFrame - DrawFrameControl - DrawIcon - DrawIconEx - DrawMenuBar - DrawMenuBarTemp - DrawStateA - DrawStateW - DrawTextA - DrawTextExA - DrawTextExW - DrawTextW - EditWndProc=EditWndProcA - EmptyClipboard=NtUserEmptyClipboard - EnableMenuItem - EnableScrollBar - EnableWindow - EndDeferWindowPos - EndDialog - EndMenu - EndPaint=NtUserEndPaint - EndTask - EnterReaderModeHelper=__wine_stub_user32_dll_203 - EnumChildWindows - EnumClipboardFormats - EnumDesktopWindows - EnumDesktopsA - EnumDesktopsW - EnumDisplayDevicesA - EnumDisplayDevicesW - EnumDisplayMonitors - EnumDisplaySettingsA - EnumDisplaySettingsExA - EnumDisplaySettingsExW - EnumDisplaySettingsW - EnumPropsA - EnumPropsExA - EnumPropsExW - EnumPropsW - EnumThreadWindows - EnumWindowStationsA - EnumWindowStationsW - EnumWindows - EqualRect - ExcludeUpdateRgn=NtUserExcludeUpdateRgn - ExitWindowsEx - FillRect - FindWindowA - FindWindowExA - FindWindowExW - FindWindowW - FlashWindow - FlashWindowEx=NtUserFlashWindowEx - FrameRect - FreeDDElParam - GetActiveWindow - GetAltTabInfo=GetAltTabInfoA - GetAltTabInfoA - GetAltTabInfoW - GetAncestor - GetAppCompatFlags - GetAppCompatFlags2 - GetAsyncKeyState - GetCapture - GetCaretBlinkTime=NtUserGetCaretBlinkTime - GetCaretPos=NtUserGetCaretPos - GetClassInfoA - GetClassInfoExA - GetClassInfoExW - GetClassInfoW - GetClassLongA - GetClassLongW - GetClassNameA - GetClassNameW - GetClassWord - GetClientRect - GetClipCursor=NtUserGetClipCursor - GetClipboardData - GetClipboardFormatNameA - GetClipboardFormatNameW - GetClipboardOwner=NtUserGetClipboardOwner - GetClipboardSequenceNumber=NtUserGetClipboardSequenceNumber - GetClipboardViewer=NtUserGetClipboardViewer - GetComboBoxInfo - GetCursor - GetCursorFrameInfo=__wine_stub_user32_dll_266 - GetCursorInfo=NtUserGetCursorInfo - GetCursorPos - GetDC=NtUserGetDC - GetDCEx=NtUserGetDCEx - GetDesktopWindow - GetDialogBaseUnits - GetDlgCtrlID - GetDlgItem - GetDlgItemInt - GetDlgItemTextA - GetDlgItemTextW - GetDoubleClickTime=NtUserGetDoubleClickTime - GetFocus - GetForegroundWindow=NtUserGetForegroundWindow - GetGUIThreadInfo=NtUserGetGUIThreadInfo - GetGuiResources=NtUserGetGuiResources - GetIconInfo - GetInputDesktop - GetInputState - GetInternalWindowPos - GetKBCodePage - GetKeyNameTextA - GetKeyNameTextW - GetKeyState - GetKeyboardLayout - GetKeyboardLayoutList=NtUserGetKeyboardLayoutList - GetKeyboardLayoutNameA - GetKeyboardLayoutNameW - GetKeyboardState=NtUserGetKeyboardState - GetKeyboardType - GetLastActivePopup - GetLastInputInfo - GetLayeredWindowAttributes=NtUserGetLayeredWindowAttributes - GetListBoxInfo=NtUserGetListBoxInfo - GetMenu - GetMenuBarInfo=NtUserGetMenuBarInfo - GetMenuCheckMarkDimensions - GetMenuContextHelpId - GetMenuDefaultItem - GetMenuInfo - GetMenuItemCount - GetMenuItemID - GetMenuItemInfoA - GetMenuItemInfoW - GetMenuItemRect=NtUserGetMenuItemRect - GetMenuState - GetMenuStringA - GetMenuStringW - GetMessageA - GetMessageExtraInfo - GetMessagePos - GetMessageTime - GetMessageW - GetMonitorInfoA - GetMonitorInfoW - GetMouseMovePointsEx=NtUserGetMouseMovePointsEx - GetNextDlgGroupItem - GetNextDlgTabItem - GetOpenClipboardWindow=NtUserGetOpenClipboardWindow - GetParent - GetPriorityClipboardFormat=NtUserGetPriorityClipboardFormat - GetProcessDefaultLayout - GetProcessWindowStation=NtUserGetProcessWindowStation - GetProgmanWindow - GetPropA - GetPropW - GetQueueStatus - GetRawInputBuffer - GetRawInputData - GetRawInputDeviceInfoA - GetRawInputDeviceInfoW - GetRawInputDeviceList - GetReasonTitleFromReasonCode=__wine_stub_user32_dll_339 - GetRegisteredRawInputDevices - GetScrollBarInfo=NtUserGetScrollBarInfo - GetScrollInfo - GetScrollPos - GetScrollRange - GetShellWindow - GetSubMenu - GetSysColor - GetSysColorBrush - GetSystemMenu - GetSystemMetrics - GetTabbedTextExtentA - GetTabbedTextExtentW - GetTaskmanWindow - GetThreadDesktop - GetTitleBarInfo=NtUserGetTitleBarInfo - GetTopWindow - GetUpdateRect - GetUpdateRgn - GetUserObjectInformationA - GetUserObjectInformationW=NtUserGetObjectInformation - GetUserObjectSecurity - GetWindow - GetWindowContextHelpId - GetWindowDC=NtUserGetWindowDC - GetWindowInfo - GetWindowLongA - GetWindowLongW - GetWindowModuleFileName=GetWindowModuleFileNameA - GetWindowModuleFileNameA - GetWindowModuleFileNameW - GetWindowPlacement=NtUserGetWindowPlacement - GetWindowRect - GetWindowRgn - GetWindowRgnBox - GetWindowTextA - GetWindowTextLengthA - GetWindowTextLengthW - GetWindowTextW - GetWindowThreadProcessId - GetWindowWord - GrayStringA - GrayStringW - HideCaret=NtUserHideCaret - HiliteMenuItem=NtUserHiliteMenuItem - IMPGetIMEA - IMPGetIMEW - IMPQueryIMEA - IMPQueryIMEW - IMPSetIMEA - IMPSetIMEW - ImpersonateDdeClientWindow - InSendMessage - InSendMessageEx - InflateRect - InitializeLpkHooks - InitializeWin32EntryTable=__wine_stub_user32_dll_396 - InsertMenuA - InsertMenuItemA - InsertMenuItemW - InsertMenuW - InternalGetWindowText - IntersectRect - InvalidateRect=NtUserInvalidateRect - InvalidateRgn=NtUserInvalidateRgn - InvertRect - IsCharAlphaA - IsCharAlphaNumericA - IsCharAlphaNumericW - IsCharAlphaW - IsCharLowerA - IsCharLowerW - IsCharUpperA - IsCharUpperW - IsChild - IsClipboardFormatAvailable=NtUserIsClipboardFormatAvailable - IsDialogMessage=IsDialogMessageA - IsDialogMessageA - IsDialogMessageW - IsDlgButtonChecked - IsGUIThread - IsHungAppWindow - IsIconic - IsMenu - IsProcess16Bit=__wine_stub_user32_dll_424 - IsRectEmpty - IsSETEnabled=__wine_stub_user32_dll_426 - IsServerSideWindow - IsWinEventHookInstalled - IsWindow - IsWindowEnabled - IsWindowInDestroy - IsWindowUnicode - IsWindowVisible - IsWow64Message=__wine_stub_user32_dll_434 - IsZoomed - KillSystemTimer - KillTimer=NtUserKillTimer - LoadAcceleratorsA - LoadAcceleratorsW - LoadBitmapA - LoadBitmapW - LoadCursorA - LoadCursorFromFileA - LoadCursorFromFileW - LoadCursorW - LoadIconA - LoadIconW - LoadImageA - LoadImageW - LoadKeyboardLayoutA - LoadKeyboardLayoutEx=__wine_stub_user32_dll_451 - LoadKeyboardLayoutW - LoadLocalFonts - LoadMenuA - LoadMenuIndirectA - LoadMenuIndirectW - LoadMenuW - LoadRemoteFonts - LoadStringA - LoadStringW - LockSetForegroundWindow - LockWindowStation=NtUserLockWindowStation - LockWindowUpdate=NtUserLockWindowUpdate - LockWorkStation=NtUserLockWorkStation - LookupIconIdFromDirectory - LookupIconIdFromDirectoryEx - MBToWCSEx - MB_GetString - MapDialogRect - MapVirtualKeyA - MapVirtualKeyExA - MapVirtualKeyExW - MapVirtualKeyW - MapWindowPoints - MenuItemFromPoint - MenuWindowProcA - MenuWindowProcW - MessageBeep - MessageBoxA - MessageBoxExA - MessageBoxExW - MessageBoxIndirectA - MessageBoxIndirectW - MessageBoxTimeoutA=__wine_stub_user32_dll_484 - MessageBoxTimeoutW=__wine_stub_user32_dll_485 - MessageBoxW - ModifyMenuA - ModifyMenuW - MonitorFromPoint - MonitorFromRect - MonitorFromWindow - MoveWindow=NtUserMoveWindow - MsgWaitForMultipleObjects - MsgWaitForMultipleObjectsEx - NotifyWinEvent - OemKeyScan - OemToCharA - OemToCharBuffA - OemToCharBuffW - OemToCharW - OffsetRect - OpenClipboard - OpenDesktopA - OpenDesktopW - OpenIcon - OpenInputDesktop=NtUserOpenInputDesktop - OpenWindowStationA - OpenWindowStationW - PackDDElParam - PaintDesktop=NtUserPaintDesktop - PaintMenuBar=__wine_stub_user32_dll_511 - PeekMessageA - PeekMessageW - PostMessageA - PostMessageW - PostQuitMessage - PostThreadMessageA - PostThreadMessageW - PrivateExtractIconExA - PrivateExtractIconExW - PrivateExtractIconsA - PrivateExtractIconsW - PtInRect - QuerySendMessage=NtUserQuerySendMessage - RealChildWindowFromPoint - RealGetWindowClass=RealGetWindowClassA - RealGetWindowClassA - RealGetWindowClassW - ReasonCodeNeedsBugID=__wine_stub_user32_dll_529 - ReasonCodeNeedsComment=__wine_stub_user32_dll_530 - RecordShutdownReason=__wine_stub_user32_dll_531 - RedrawWindow=NtUserRedrawWindow - RegisterClassA - RegisterClassExA - RegisterClassExW - RegisterClassW - RegisterClipboardFormatA - RegisterClipboardFormatW - RegisterDeviceNotificationA=RegisterDeviceNotificationW - RegisterDeviceNotificationW - RegisterHotKey=NtUserRegisterHotKey - RegisterLogonProcess - RegisterMessagePumpHook=__wine_stub_user32_dll_543 - RegisterRawInputDevices - RegisterServicesProcess - RegisterShellHookWindow - RegisterSystemThread - RegisterTasklist=NtUserRegisterTasklist - RegisterUserApiHook - RegisterWindowMessageA - RegisterWindowMessageW - ReleaseCapture - ReleaseDC - RemoveMenu=NtUserRemoveMenu - RemovePropA - RemovePropW - ReplyMessage - ReuseDDElParam - ScreenToClient - ScrollChildren - ScrollDC - ScrollWindow - ScrollWindowEx - SendDlgItemMessageA - SendDlgItemMessageW - SendIMEMessageExA - SendIMEMessageExW - SendInput=NtUserSendInput - SendMessageA - SendMessageCallbackA - SendMessageCallbackW - SendMessageTimeoutA - SendMessageTimeoutW - SendMessageW - SendNotifyMessageA - SendNotifyMessageW - SetActiveWindow=NtUserSetActiveWindow - SetCapture=NtUserSetCapture - SetCaretBlinkTime - SetCaretPos - SetClassLongA - SetClassLongW - SetClassWord - SetClipboardData - SetClipboardViewer=NtUserSetClipboardViewer - SetConsoleReserveKeys=__wine_stub_user32_dll_586 - SetCursor=NtUserSetCursor - SetCursorContents=NtUserSetCursorContents - SetCursorPos - SetDebugErrorLevel - SetDeskWallpaper - SetDlgItemInt - SetDlgItemTextA - SetDlgItemTextW - SetDoubleClickTime - SetFocus=NtUserSetFocus - SetForegroundWindow - SetInternalWindowPos=NtUserSetInternalWindowPos - SetKeyboardState=NtUserSetKeyboardState - SetLastErrorEx - SetLayeredWindowAttributes=NtUserSetLayeredWindowAttributes - SetLogonNotifyWindow - SetMenu - SetMenuContextHelpId=NtUserSetMenuContextHelpId - SetMenuDefaultItem=NtUserSetMenuDefaultItem - SetMenuInfo - SetMenuItemBitmaps - SetMenuItemInfoA - SetMenuItemInfoW - SetMessageExtraInfo - SetMessageQueue - SetParent=NtUserSetParent - SetProcessDefaultLayout - SetProcessWindowStation=NtUserSetProcessWindowStation - SetProgmanWindow - SetPropA - SetPropW - SetRect - SetRectEmpty - SetScrollInfo - SetScrollPos - SetScrollRange - SetShellWindow - SetShellWindowEx=NtUserSetShellWindowEx - SetSysColors - SetSysColorsTemp - SetSystemCursor - SetSystemMenu - SetSystemTimer=NtUserSetSystemTimer - SetTaskmanWindow - SetThreadDesktop=NtUserSetThreadDesktop - SetTimer=NtUserSetTimer - SetUserObjectInformationA=NtUserSetObjectInformation - SetUserObjectInformationW=NtUserSetObjectInformation - SetUserObjectSecurity - SetWinEventHook - SetWindowContextHelpId - SetWindowLongA - SetWindowLongW - SetWindowPlacement=NtUserSetWindowPlacement - SetWindowPos=NtUserSetWindowPos - SetWindowRgn - SetWindowStationUser - SetWindowTextA - SetWindowTextW - SetWindowWord - SetWindowsHookA - SetWindowsHookExA - SetWindowsHookExW - SetWindowsHookW - ShowCaret=NtUserShowCaret - ShowCursor - ShowOwnedPopups - ShowScrollBar=NtUserShowScrollBar - ShowStartGlass - ShowWindow=NtUserShowWindow - ShowWindowAsync=NtUserShowWindowAsync - SoftModalMessageBox=__wine_stub_user32_dll_658 - SubtractRect - SwapMouseButton - SwitchDesktop=NtUserSwitchDesktop - SwitchToThisWindow - SystemParametersInfoA - SystemParametersInfoW - TabbedTextOutA - TabbedTextOutW - TileChildWindows - TileWindows - ToAscii - ToAsciiEx - ToUnicode - ToUnicodeEx - TrackMouseEvent - TrackPopupMenu - TrackPopupMenuEx - TranslateAccelerator=TranslateAcceleratorA - TranslateAcceleratorA - TranslateAcceleratorW - TranslateMDISysAccel - TranslateMessage - TranslateMessageEx=__wine_stub_user32_dll_681 - UnhookWinEvent=NtUserUnhookWinEvent - UnhookWindowsHook - UnhookWindowsHookEx=NtUserUnhookWindowsHookEx - UnionRect - UnloadKeyboardLayout=NtUserUnloadKeyboardLayout - UnlockWindowStation=NtUserUnlockWindowStation - UnpackDDElParam - UnregisterClassA - UnregisterClassW - UnregisterDeviceNotification - UnregisterHotKey=NtUserUnregisterHotKey - UnregisterMessagePumpHook=__wine_stub_user32_dll_693 - UnregisterUserApiHook=NtUserUnregisterUserApiHook - UpdateLayeredWindow - UpdateLayeredWindowIndirect - UpdatePerUserSystemParameters - UpdateWindow - User32InitializeImmEntryTable - UserClientDllInitialize=DllMain - UserHandleGrantAccess=NtUserUserHandleGrantAccess - UserLpkPSMTextOut=__wine_stub_user32_dll_702 - UserLpkTabbedTextOut=__wine_stub_user32_dll_703 - UserRealizePalette - UserRegisterWowHandlers - ValidateRect=NtUserValidateRect - ValidateRgn - VkKeyScanA - VkKeyScanExA - VkKeyScanExW - VkKeyScanW - WCSToMBEx - WINNLSEnableIME - WINNLSGetEnableStatus - WINNLSGetIMEHotkey - WaitForInputIdle - WaitMessage=NtUserWaitMessage - Win32PoolAllocationStats=__wine_stub_user32_dll_718 - WinHelpA - WinHelpW - WindowFromDC - WindowFromPoint - WindowFromPhysicalPoint=NtUserWindowFromPhysicalPoint - keybd_event - mouse_event - wsprintfA - wsprintfW - wvsprintfA - wvsprintfW - SetProcessDPIAware Modified: branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/vdmdbg/… ============================================================================== --- branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/vdmdbg/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -1,19 +1,17 @@ set_unicode() -list(APPEND SOURCE vdmdbg.c vdmdbg.def) +spec2def(vdmdbg.dll vdmdbg.spec) -if(NOT MSVC) - set_source_files_properties(vdmdbg.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + vdmdbg.c + ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg.def) add_library(vdmdbg SHARED ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg_vdmdbg.h.gch ${SOURCE}) set_module_type(vdmdbg win32dll) - add_importlibs(vdmdbg msvcrt kernel32 ntdll) add_pch(vdmdbg ${CMAKE_CURRENT_SOURCE_DIR}/vdmdbg.h ${SOURCE}) - add_cab_target(vdmdbg 1) Removed: branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/vdmdbg/… ============================================================================== --- branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/vdmdbg/vdmdbg.def (removed) @@ -1,26 +1,0 @@ - -LIBRARY vdmdbg.dll - -EXPORTS - VDMBreakThread@8 @1 - VDMDetectWOW@0 @2 - VDMEnumProcessWOW@8 @3 - VDMEnumTaskWOW@12 @4 - VDMEnumTaskWOWEx@12 @5 - VDMGetContext@12 @6 - VDMGetDbgFlags@4 @7 - VDMGetModuleSelector@20 @8 - VDMGetPointer@20 @9 - VDMGetSegmentInfo@16 @10 - VDMGetSelectorModule@32 @11 - VDMGlobalFirst@24 @12 - VDMGlobalNext@24 @13 - VDMIsModuleLoaded@4 @14 - VDMKillWOW@0 @15 - VDMModuleFirst@20 @16 - VDMModuleNext@20 @17 - VDMProcessException@4 @18 - VDMSetContext@12 @19 - VDMSetDbgFlags@8 @20 - VDMStartTaskInWOW@12 @21 - VDMTerminateTaskWOW@8 @22 Modified: branches/cmake-bringup/dll/win32/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/version… ============================================================================== --- branches/cmake-bringup/dll/win32/version/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/version/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -1,22 +1,22 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(version.dll version.spec) -add_definitions(-D__WINESRC__) - -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - -add_library(version SHARED +list(APPEND SOURCE info.c install.c resource.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/version.def) +add_library(version SHARED ${SOURCE}) + set_entrypoint(version 0) target_link_libraries(version wine) - add_importlibs(version lz32 kernel32 ntdll) add_dependencies(version psdk buildno_header) add_cab_target(version 1) -add_importlib_target(version.spec) +add_importlib_target(version.spec) Removed: branches/cmake-bringup/dll/win32/version/version.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/version… ============================================================================== --- branches/cmake-bringup/dll/win32/version/version.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/version/version.def (removed) @@ -1,16 +1,0 @@ - -LIBRARY version.dll - -EXPORTS - GetFileVersionInfoA@16 @1 - GetFileVersionInfoSizeA@8 @2 - GetFileVersionInfoSizeW@8 @3 - GetFileVersionInfoW@16 @4 - VerFindFileA@32 @5 - VerFindFileW@32 @6 - VerInstallFileA@32 @7 - VerInstallFileW@32 @8 - VerLanguageNameA(a)12=kernel32.VerLanguageNameA @9 - VerLanguageNameW(a)12=kernel32.VerLanguageNameW @10 - VerQueryValueA@16 @11 - VerQueryValueW@16 @12 Modified: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -9,17 +9,17 @@ ${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer ${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) -add_library(wdmaud.drv SHARED +spec2def(wdmaud.drv wdmaud.spec) + +list(APPEND SOURCE wdmaud.c mixer.c mmixer.c legacy.c wdmaud.rc - wdmaud.def) + ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.def) -if(NOT MSVC) - set_source_files_properties(wdmaud.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(wdmaud.drv SHARED ${SOURCE}) set_module_type(wdmaud.drv win32dll) @@ -31,5 +31,4 @@ mmixer) add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll) - -add_cab_target(wdmaud.drv 1) +add_cab_target(wdmaud.drv 1) Removed: branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.… ============================================================================== --- branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wdmaud.drv/wdmaud.def (removed) @@ -1,10 +1,0 @@ - -LIBRARY wdmaud.drv - -EXPORTS - DriverProc@20 @1 - mxdMessage@20 @2 - auxMessage@20 @3 - wodMessage@20 @4 - widMessage@20 @5 - modMessage@20 @6 Modified: branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winfax/… ============================================================================== --- branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:37:44 2010 @@ -1,14 +1,15 @@ -add_library(winfax SHARED winfax.c winfax.rc winfax.def) +spec2def(winfax.dll winfax.spec) -if(NOT MSVC) - set_source_files_properties(winfax.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + winfax.c + winfax.rc + ${CMAKE_CURRENT_BINARY_DIR}/winfax.def) + +add_library(winfax SHARED ${SOURCE}) set_entrypoint(winfax 0) add_importlibs(winfax kernel32 ntdll) - add_dependencies(winfax psdk) - -add_cab_target(winfax 1) +add_cab_target(winfax 1) Removed: branches/cmake-bringup/dll/win32/winfax/winfax.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winfax/… ============================================================================== --- branches/cmake-bringup/dll/win32/winfax/winfax.def [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winfax/winfax.def (removed) @@ -1,59 +1,0 @@ - -LIBRARY winfax.dll - -EXPORTS - FaxAbort@8 @1 - FaxAccessCheck@8 @2 - FaxClose@4 @3 - FaxCompleteJobParamsA@8 @4 - FaxCompleteJobParamsW@8 @5 - FaxConnectFaxServerA@8 @6 - FaxConnectFaxServerW@8 @7 - FaxEnableRoutingMethodA@12 @8 - FaxEnableRoutingMethodW@12 @9 - FaxEnumGlobalRoutingInfoA@12 @10 - FaxEnumGlobalRoutingInfoW@12 @11 - FaxEnumJobsA@12 @12 - FaxEnumJobsW@12 @13 - FaxEnumPortsA@12 @14 - FaxEnumPortsW@12 @15 - FaxEnumRoutingMethodsA@12 @16 - FaxEnumRoutingMethodsW@12 @17 - FaxFreeBuffer@4 @18 - FaxGetConfigurationA@8 @19 - FaxGetConfigurationW@8 @20 - FaxGetDeviceStatusA@8 @21 - FaxGetDeviceStatusW@8 @22 - FaxGetJobA@12 @23 - FaxGetJobW@12 @24 - FaxGetLoggingCategoriesA@12 @25 - FaxGetLoggingCategoriesW@12 @26 - FaxGetPageData@24 @27 - FaxGetPortA@8 @28 - FaxGetPortW@8 @29 - FaxGetRoutingInfoA@16 @30 - FaxGetRoutingInfoW@16 @31 - FaxInitializeEventQueue@20 @32 - FaxOpenPort@16 @33 - FaxPrintCoverPageA@8 @34 - FaxPrintCoverPageW@8 @35 - FaxRegisterRoutingExtensionW@24 @36 - FaxRegisterServiceProviderW@16 @37 - FaxSendDocumentA@20 @38 - FaxSendDocumentForBroadcastA@20 @39 - FaxSendDocumentForBroadcastW@20 @40 - FaxSendDocumentW@20 @41 - FaxSetConfigurationA@8 @42 - FaxSetConfigurationW@8 @43 - FaxSetGlobalRoutingInfoA@8 @44 - FaxSetGlobalRoutingInfoW@8 @45 - FaxSetJobA@16 @46 - FaxSetJobW@16 @47 - FaxSetLoggingCategoriesA@12 @48 - FaxSetLoggingCategoriesW@12 @49 - FaxSetPortA@8 @50 - FaxSetPortW@8 @51 - FaxSetRoutingInfoA@16 @52 - FaxSetRoutingInfoW@16 @53 - FaxStartPrintJobA@16 @54 - FaxStartPrintJobW@16 @55

13 years, 8 months

[akhaldi] 50130: [CMAKE] - Delete some useless definition files. - Improve some modules.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 24 18:12:56 2010 New Revision: 50130 URL: http://svn.reactos.org/svn/reactos?rev=50130&view=rev Log: [CMAKE] - Delete some useless definition files. - Improve some modules. Removed: branches/cmake-bringup/dll/win32/actxprxy/actxprxy.def branches/cmake-bringup/dll/win32/advapi32/advapi32.def branches/cmake-bringup/dll/win32/advpack/advpack.def branches/cmake-bringup/dll/win32/avifil32/avifil32.def branches/cmake-bringup/dll/win32/beepmidi/beepmidi.pdef branches/cmake-bringup/dll/win32/comcat/comcat.def branches/cmake-bringup/dll/win32/compstui/compstui.def branches/cmake-bringup/dll/win32/gdi32/gdi32.pdef branches/cmake-bringup/dll/win32/hid/hid.def branches/cmake-bringup/dll/win32/hnetcfg/hnetcfg.def branches/cmake-bringup/dll/win32/iccvid/iccvid.def branches/cmake-bringup/dll/win32/imaadp32.acm/imaadp32.def branches/cmake-bringup/dll/win32/jscript/jscript.def branches/cmake-bringup/dll/win32/localui/localui.pdef branches/cmake-bringup/dll/win32/lpk/lpk.pdef branches/cmake-bringup/dll/win32/lz32/lz32.def branches/cmake-bringup/dll/win32/mciavi32/mciavi32.def branches/cmake-bringup/dll/win32/mcicda/mcicda.def branches/cmake-bringup/dll/win32/mciqtz32/mciqtz32.def branches/cmake-bringup/dll/win32/mciseq/mciseq.def branches/cmake-bringup/dll/win32/mciwave/mciwave.def branches/cmake-bringup/dll/win32/mmdrv/mmdrv.def branches/cmake-bringup/dll/win32/msadp32.acm/msadp32.def branches/cmake-bringup/dll/win32/msafd/msafd.def branches/cmake-bringup/dll/win32/msg711.acm/msg711.def branches/cmake-bringup/dll/win32/msgsm32.acm/msgsm32.def branches/cmake-bringup/dll/win32/msimg32/msimg32.def branches/cmake-bringup/dll/win32/msisys.ocx/msisys.def branches/cmake-bringup/dll/win32/msrle32/msrle32.def branches/cmake-bringup/dll/win32/msvcrt/msvcrt.def branches/cmake-bringup/dll/win32/msvidc32/msvidc32.def branches/cmake-bringup/dll/win32/mswsock/mswsock.def branches/cmake-bringup/dll/win32/ntmarta/ntmarta.def branches/cmake-bringup/dll/win32/objsel/objsel.def branches/cmake-bringup/dll/win32/oledlg/oledlg.def Modified: branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt branches/cmake-bringup/dll/win32/netid/CMakeLists.txt branches/cmake-bringup/dll/win32/ntmarta/CMakeLists.txt branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Removed: branches/cmake-bringup/dll/win32/actxprxy/actxprxy.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actxprx… Removed: branches/cmake-bringup/dll/win32/advapi32/advapi32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… Removed: branches/cmake-bringup/dll/win32/advpack/advpack.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advpack… Removed: branches/cmake-bringup/dll/win32/avifil32/avifil32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil3… Removed: branches/cmake-bringup/dll/win32/beepmidi/beepmidi.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmid… Removed: branches/cmake-bringup/dll/win32/comcat/comcat.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comcat/… Removed: branches/cmake-bringup/dll/win32/compstui/compstui.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/compstu… Removed: branches/cmake-bringup/dll/win32/gdi32/gdi32.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdi32/g… Removed: branches/cmake-bringup/dll/win32/hid/hid.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hid/hid… Removed: branches/cmake-bringup/dll/win32/hnetcfg/hnetcfg.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hnetcfg… Removed: branches/cmake-bringup/dll/win32/iccvid/iccvid.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iccvid/… Removed: branches/cmake-bringup/dll/win32/imaadp32.acm/imaadp32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imaadp3… Removed: branches/cmake-bringup/dll/win32/jscript/jscript.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/jscript… Removed: branches/cmake-bringup/dll/win32/localui/localui.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localui… Removed: branches/cmake-bringup/dll/win32/lpk/lpk.pdef URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lpk/lpk… Removed: branches/cmake-bringup/dll/win32/lz32/lz32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lz32/lz… Removed: branches/cmake-bringup/dll/win32/mciavi32/mciavi32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciavi3… Removed: branches/cmake-bringup/dll/win32/mcicda/mcicda.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mcicda/… Removed: branches/cmake-bringup/dll/win32/mciqtz32/mciqtz32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciqtz3… Removed: branches/cmake-bringup/dll/win32/mciseq/mciseq.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciseq/… Removed: branches/cmake-bringup/dll/win32/mciwave/mciwave.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mciwave… Removed: branches/cmake-bringup/dll/win32/mmdrv/mmdrv.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mmdrv/m… Removed: branches/cmake-bringup/dll/win32/msadp32.acm/msadp32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msadp32… Removed: branches/cmake-bringup/dll/win32/msafd/msafd.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msafd/m… Removed: branches/cmake-bringup/dll/win32/msg711.acm/msg711.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msg711.… Removed: branches/cmake-bringup/dll/win32/msgsm32.acm/msgsm32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msgsm32… Removed: branches/cmake-bringup/dll/win32/msimg32/msimg32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msimg32… Modified: branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisys.… Removed: branches/cmake-bringup/dll/win32/msisys.ocx/msisys.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisys.… Modified: branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msrle32… Removed: branches/cmake-bringup/dll/win32/msrle32/msrle32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msrle32… Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… Removed: branches/cmake-bringup/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… Modified: branches/cmake-bringup/dll/win32/msvidc32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvidc3… Removed: branches/cmake-bringup/dll/win32/msvidc32/msvidc32.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvidc3… Modified: branches/cmake-bringup/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mswsock… Removed: branches/cmake-bringup/dll/win32/mswsock/mswsock.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mswsock… Modified: branches/cmake-bringup/dll/win32/netid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/C… Modified: branches/cmake-bringup/dll/win32/ntmarta/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntmarta… Removed: branches/cmake-bringup/dll/win32/ntmarta/ntmarta.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntmarta… Modified: branches/cmake-bringup/dll/win32/objsel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/objsel/… Removed: branches/cmake-bringup/dll/win32/objsel/objsel.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/objsel/… Modified: branches/cmake-bringup/dll/win32/oledlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oledlg/… Removed: branches/cmake-bringup/dll/win32/oledlg/oledlg.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oledlg/…

13 years, 8 months

[akhaldi] 50129: [CMAKE] - Add new-cc activation flag. Dedicated to arty.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 24 18:04:31 2010 New Revision: 50129 URL: http://svn.reactos.org/svn/reactos?rev=50129&view=rev Log: [CMAKE] - Add new-cc activation flag. Dedicated to arty. Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Fri Dec 24 18:04:31 2010 @@ -18,13 +18,35 @@ set_rc_compiler() +set(NEWCC FALSE) + +if(NEWCC) +add_definitions(-DNEWCC) +list(APPEND SOURCE + cache/cachesub.c + cache/copysup.c + cache/fssup.c + cache/lazyrite.c + cache/logsup.c + cache/mdlsup.c + cache/pinsup.c + cache/section/data.c + cache/section/fault.c + cache/section/io.c + cache/section/reqtools.c + cache/section/sptab.c + cache/section/swapout.c) +else() list(APPEND SOURCE cc/cacheman.c cc/copy.c cc/fs.c cc/mdl.c cc/pin.c - cc/view.c + cc/view.c) +endif() + +list(APPEND SOURCE config/cmalloc.c config/cmapi.c config/cmboot.c

13 years, 8 months

[fireball] 50128: - If RosGdiGetDC is called with a NULL (or non-existing) hwnd, restrict any drawing operations on that DC.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Dec 24 17:36:07 2010 New Revision: 50128 URL: http://svn.reactos.org/svn/reactos?rev=50128&view=rev Log: - If RosGdiGetDC is called with a NULL (or non-existing) hwnd, restrict any drawing operations on that DC. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Fri Dec 24 17:36:07 2010 @@ -635,7 +635,17 @@ pDC = DC_LockDc(physDev); /* Get a pointer to this window */ - pDC->pWindow = SwmFindByHwnd(hwnd); + if (hwnd) + pDC->pWindow = SwmFindByHwnd(hwnd); + + /* Handle situation when drawing is forbidden */ + if (!hwnd || !pDC->pWindow) + { + /* Make up a dummy window object which will have empty visibility */ + pDC->pWindow = ExAllocatePool(PagedPool, sizeof(SWM_WINDOW)); + RtlZeroMemory(pDC->pWindow, sizeof(SWM_WINDOW)); + pDC->pWindow->Visible = create_empty_region(); + } /* Release the object */ DC_UnlockDc(pDC); @@ -650,6 +660,13 @@ /* Get a pointer to the DC */ pDC = DC_LockDc(physDev); + + /* Check if it was a dummy window */ + if (!pDC->pWindow->hwnd) + { + /* Free it */ + ExFreePool(pDC->pWindow); + } /* No window clipping is to be performed */ pDC->pWindow = NULL;

13 years, 8 months

← Newer
1
...
9
10
11
12
13
14
15
...
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