Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[fireball] 50127: - Support scenario when GetDC() is performed on an invisible window. Previously, this problem led to getting DC of a whole screen, but the proper solution is to restrict any drawi...

by fireball＠svn.reactos.org

Author: fireball Date: Fri Dec 24 17:34:14 2010 New Revision: 50127 URL: http://svn.reactos.org/svn/reactos?rev=50127&view=rev Log: - Support scenario when GetDC() is performed on an invisible window. Previously, this problem led to getting DC of a whole screen, but the proper solution is to restrict any drawing to such DC. This fixes drawing issues in GTK based apps. - Add get_device_rect (from Wine source code) and use it to map coordinates in Rectangle implementation. - Silence IsSelectionOwner() debug print. Modified: branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c [iso-8859-1] Fri Dec 24 17:34:14 2010 @@ -2437,7 +2437,7 @@ */ static BOOL NTDRV_CLIPBOARD_IsSelectionOwner(void) { - UNIMPLEMENTED; + //UNIMPLEMENTED; //return selectionAcquired; return TRUE; } Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Fri Dec 24 17:34:14 2010 @@ -31,6 +31,38 @@ BOOL CDECL RosDrv_PatBlt( NTDRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ); +/* get the rectangle in device coordinates, with optional mirroring */ +static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom ) +{ + RECT rect; + + rect.left = left; + rect.top = top; + rect.right = right; + rect.bottom = bottom; + if (GetLayout( hdc ) & LAYOUT_RTL) + { + /* shift the rectangle so that the right border is included after mirroring */ + /* it would be more correct to do this after LPtoDP but that's not what Windows does */ + rect.left--; + rect.right--; + } + LPtoDP( hdc, (POINT *)&rect, 2 ); + if (rect.left > rect.right) + { + int tmp = rect.left; + rect.left = rect.right; + rect.right = tmp; + } + if (rect.top > rect.bottom) + { + int tmp = rect.top; + rect.top = rect.bottom; + rect.bottom = tmp; + } + return rect; +} + BOOL CDECL RosDrv_AlphaBlend(NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, INT widthDst, INT heightDst, NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, BLENDFUNCTION blendfn) @@ -317,8 +349,6 @@ INT CDECL RosDrv_ExtEscape( NTDRV_PDEVICE *physDev, INT escape, INT in_count, LPCVOID in_data, INT out_count, LPVOID out_data ) { - HWND hwnd; - switch(escape) { case NTDRV_ESCAPE: @@ -333,10 +363,8 @@ RosGdiSetDcRects(physDev->hKernelDC, (RECT*)&data->dc_rect, (RECT*)&data->drawable_rect); - hwnd = GetAncestor(data->hwnd, GA_ROOT); - if (!data->release) - RosGdiGetDC(physDev->hKernelDC, hwnd, data->clip_children); + RosGdiGetDC(physDev->hKernelDC, data->hwnd, data->clip_children); else RosGdiReleaseDC(physDev->hKernelDC); @@ -613,11 +641,7 @@ BOOL CDECL RosDrv_Rectangle(NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom) { POINT ptBrush; - RECT rc; - - /* Convert coordinates */ - SetRect(&rc, left, top, right, bottom); - LPtoDP(physDev->hUserDC, (POINT*)&rc, 2); + RECT rc = get_device_rect( physDev->hUserDC, left, top, right, bottom ); if ((rc.left == rc.right) || (rc.top == rc.bottom)) return TRUE; Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Fri Dec 24 17:34:14 2010 @@ -360,40 +360,13 @@ { struct ntdrv_escape_set_drawable escape; struct ntdrv_win_data *data = NTDRV_get_win_data( hwnd ); + //HWND parent; escape.code = NTDRV_SET_DRAWABLE; escape.clip_children = FALSE; escape.gl_copy = FALSE; - escape.hwnd = hwnd; + escape.hwnd = 0; escape.release = FALSE; - - if (top == hwnd && data && IsIconic( hwnd ) /*&& data->icon_window*/) - { - //escape.drawable = data->icon_window; - } - else if (top == hwnd) - { - //escape.fbconfig_id = data ? data->fbconfig_id : (XID)GetPropA( hwnd, fbconfig_id_prop ); - /* GL draws to the client area even for window DCs */ - /*escape.gl_drawable = data ? data->client_window : X11DRV_get_client_window( hwnd ); - if (flags & DCX_WINDOW) - escape.drawable = data ? data->whole_window : X11DRV_get_whole_window( hwnd ); - else - escape.drawable = escape.gl_drawable;*/ - } - else - { - //escape.drawable = X11DRV_get_client_window( top ); - //escape.fbconfig_id = data ? data->fbconfig_id : (XID)GetPropA( hwnd, fbconfig_id_prop ); - //escape.gl_drawable = data ? data->gl_drawable : (Drawable)GetPropA( hwnd, gl_drawable_prop ); - //escape.pixmap = data ? data->pixmap : (Pixmap)GetPropA( hwnd, pixmap_prop ); - //escape.gl_copy = (escape.gl_drawable != 0); - - if (flags & DCX_CLIPCHILDREN) escape.clip_children = TRUE; - } - - //FIXME("hdc %x, hwnd %x, top %x\n win_rect %s, top_rect %s\n", hdc, hwnd, top, - // wine_dbgstr_rect(win_rect), wine_dbgstr_rect(top_rect)); escape.dc_rect.left = win_rect->left - top_rect->left; escape.dc_rect.top = win_rect->top - top_rect->top; @@ -403,6 +376,69 @@ escape.drawable_rect.top = top_rect->top; escape.drawable_rect.right = top_rect->right; escape.drawable_rect.bottom = top_rect->bottom; + + if (top == hwnd) + { + //if (flags & DCX_WINDOW) + { + if (data) + { + /* SWM window already exists */ + escape.hwnd = hwnd; + } + else + { + /* There is no SWM window for this hwnd. + If this is desktop, it's fine otherwise reject any drawing operations */ + if (hwnd == GetDesktopWindow()) + escape.hwnd = hwnd; + else + escape.hwnd = 0; + } + } + } + else + { +#if 0 + /* find the first ancestor that has a drawable */ + if (data) escape.hwnd = hwnd; + + for (parent = hwnd; parent && parent != top; parent = GetAncestor( parent, GA_PARENT )) + { + data = NTDRV_get_win_data( parent ); + if (data) + { + escape.hwnd = parent; + break; + } + } +FIXME("Found hwnd %x backed by an SWM window\n", escape.hwnd); + if (escape.hwnd) + { + POINT pt = { 0, 0 }; + MapWindowPoints( top, parent, &pt, 1 ); + //OffsetRect( &escape.dc_rect, pt.x, pt.y ); + //OffsetRect( &escape.drawable_rect, -pt.x, -pt.y ); + + FIXME("Offset by (%d, %d)\n", pt.x, pt.y); + } + else + { + if (NTDRV_get_win_data(top) || (top == GetDesktopWindow())) + { + /* SWM window already exists */ + escape.hwnd = top; + } + } +#else + escape.hwnd = GetAncestor(hwnd, GA_ROOT); +#endif + + if (flags & DCX_CLIPCHILDREN) escape.clip_children = TRUE; + } + + TRACE("hdc %x, hwnd %x, top %x\n win_rect %s, top_rect %s\n", hdc, hwnd, top, + wine_dbgstr_rect(win_rect), wine_dbgstr_rect(top_rect)); ExtEscape( hdc, NTDRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); }

13 years, 8 months

[akhaldi] 50126: [CMAKE] - Improve some modules.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 24 16:12:23 2010 New Revision: 50126 URL: http://svn.reactos.org/svn/reactos?rev=50126&view=rev Log: [CMAKE] - Improve some modules. Modified: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt branches/cmake-bringup/dll/win32/sti/CMakeLists.txt Modified: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/rpc… ============================================================================== --- branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] Fri Dec 24 16:12:23 2010 @@ -6,8 +6,6 @@ irotp.c rpcss_main.c service_main.c - epm.idl - irot.idl rpcss.rc) include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine) Modified: branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actxprx… ============================================================================== --- branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/actxprxy/CMakeLists.txt [iso-8859-1] Fri Dec 24 16:12:23 2010 @@ -1,13 +1,14 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(actxprxy SHARED usrmarshal.c actxprxy.def) +spec2def(actxprxy.dll actxprxy.spec) -if(NOT MSVC) - set_source_files_properties(actxprxy.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +list(APPEND SOURCE + usrmarshal.c + ${CMAKE_CURRENT_BINARY_DIR}/actxprxy.def) + +add_library(actxprxy SHARED ${SOURCE}) set_entrypoint(actxprxy 0) Modified: branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleaut3… ============================================================================== --- branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Fri Dec 24 16:12:23 2010 @@ -19,7 +19,6 @@ variant.c vartype.c oleaut32.rc - oleaut32_oaidl.idl ${CMAKE_CURRENT_BINARY_DIR}/oleaut32.def) remove_definitions(-D_WIN32_WINNT=0x502) Modified: branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/pstorec… ============================================================================== --- branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] Fri Dec 24 16:12:23 2010 @@ -17,5 +17,5 @@ set_module_type(pstorec win32dll) target_link_libraries(pstorec uuid wine) add_importlibs(pstorec msvcrt kernel32 ntdll) -add_dependencies(pstorec pstorec_tlb pstorec_def) +add_dependencies(pstorec pstorec_tlb) add_cab_target(pstorec 1) Modified: branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole2… ============================================================================== --- branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] Fri Dec 24 16:12:23 2010 @@ -6,8 +6,11 @@ spec2def(stdole2.tlb stdole2.tlb.spec) -add_library(stdole2.tlb SHARED rsrc.rc +list(APPEND SOURCE + rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/stdole2.def) + +add_library(stdole2.tlb SHARED ${SOURCE}) set_entrypoint(stdole2.tlb 0) set_target_properties(stdole2.tlb PROPERTIES SUFFIX "") Modified: branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole3… ============================================================================== --- branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] Fri Dec 24 16:12:23 2010 @@ -6,9 +6,11 @@ spec2def(stdole32.tlb stdole32.tlb.spec) -add_library(stdole32.tlb SHARED +list(APPEND SOURCE rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/stdole32.def) + +add_library(stdole32.tlb SHARED ${SOURCE}) set_entrypoint(stdole32.tlb 0) set_target_properties(stdole32.tlb PROPERTIES SUFFIX "") Modified: branches/cmake-bringup/dll/win32/sti/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sti/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sti/CMakeLists.txt [iso-8859-1] Fri Dec 24 16:12:23 2010 @@ -10,16 +10,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(sti SHARED +spec2def(sti.dll sti.spec) + +list(APPEND SOURCE regsvr.c sti.c sti_main.c - sti_wia.idl - sti.def) + ${CMAKE_CURRENT_BINARY_DIR}/sti.def) -if(NOT MSVC) - set_source_files_properties(sti.def PROPERTIES EXTERNAL_OBJECT TRUE) -endif() +add_library(sti SHARED ${SOURCE}) set_entrypoint(sti 0)

13 years, 8 months

[akhaldi] 50125: [CMAKE] - Add msi, qmgr and qmgrprxy to build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 24 14:25:10 2010 New Revision: 50125 URL: http://svn.reactos.org/svn/reactos?rev=50125&view=rev Log: [CMAKE] - Add msi, qmgr and qmgrprxy to build. Added: branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/msi/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Fri Dec 24 14:25:10 2010 @@ -137,8 +137,8 @@ add_subdirectory(printui) add_subdirectory(psapi) add_subdirectory(pstorec) -#add_subdirectory(qmgr) -#add_subdirectory(qmgrprxy) +add_subdirectory(qmgr) +add_subdirectory(qmgrprxy) add_subdirectory(query) add_subdirectory(rasadhlp) add_subdirectory(rasapi32) Modified: branches/cmake-bringup/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/CMakeLists.txt [iso-8859-1] Fri Dec 24 14:25:10 2010 @@ -1,84 +1,92 @@ - -spec2def(msi.dll msi.spec) - -if (0) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) -add_library(msi SHARED - action.c - alter.c - appsearch.c - automation.c - classes.c - cond.tab.c - create.c</file> - custom.c</file> - database.c</file> - delete.c</file> - dialog.c</file> - distinct.c</file> - drop.c</file> - events.c</file> - files.c</file> - font.c</file> - format.c</file> - handle.c</file> - helpers.c</file> - insert.c</file> - install.c</file> - join.c</file> - media.c</file> - msi.c</file> - msi_main.c</file> - msiquery.c</file> - package.c</file> - preview.c</file> - record.c</file> - registry.c</file> - regsvr.c</file> - script.c</file> - select.c</file> - source.c</file> - sql.tab.c</file> - storages.c</file> - streams.c</file> - string.c</file> - suminfo.c</file> - table.c</file> - tokenize.c</file> - update.c</file> - upgrade.c</file> - where.c</file> - msi.rc</file> - ${CMAKE_CURRENT_BINARY_DIR}/msi.def) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +spec2def(msi.dll msi.spec) + +add_idl_interface(msiserver.idl) + +list(APPEND SOURCE + action.c + alter.c + appsearch.c + automation.c + classes.c + cond.tab.c + create.c + custom.c + database.c + delete.c + dialog.c + distinct.c + drop.c + events.c + files.c + font.c + format.c + handle.c + helpers.c + insert.c + install.c + join.c + media.c + msi.c + msi_main.c + msiquery.c + package.c + preview.c + record.c + registry.c + regsvr.c + script.c + select.c + source.c + sql.tab.c + storages.c + streams.c + string.c + suminfo.c + table.c + tokenize.c + update.c + upgrade.c + where.c + msi.rc + ${CMAKE_CURRENT_BINARY_DIR}/msiserver_i.c + ${CMAKE_CURRENT_BINARY_DIR}/msi.def) + +add_library(msi SHARED ${SOURCE}) + +add_interface_definitions(msi_idlheader msiserver.idl) + +add_typelib(msi_tlb msiserver.idl) set_module_type(msi win32dll) -target_link_libraries(msi wine uuid PSEH_LIB) +target_link_libraries(msi uuid ${PSEH_LIB} wine) + +add_dependencies(msi msi_idlheader msi_tlb) add_importlibs(msi - kernel32 - urlmon - wininet - comctl32 - shell32 - shlwapi - cabinet - oleaut32 - ole32 - version - user32 - gdi32 - advapi32 - odbccp32 - ntdll) - -# <library>msiserver_interface</library> -# <dependency>msiserver</dependency> -# <dependency>msiheader</dependency> + advapi32 + cabinet + comctl32 + gdi32 + odbccp32 + ole32 + oleaut32 + shell32 + shlwapi + urlmon + user32 + version + wininet + msvcrt + kernel32 + ntdll) add_cab_target(msi 1) -endif() add_importlib_target(msi.spec) Added: branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/qmgr/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt [iso-8859-1] Fri Dec 24 14:25:10 2010 @@ -1,0 +1,30 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_idl_interface(qmgr_local.idl) + +spec2def(qmgr.dll qmgr.spec) + +list(APPEND SOURCE + enum_files.c + enum_jobs.c + factory.c + file.c + job.c + qmgr.c + qmgr_main.c + service.c + rsrc.rc + ${CMAKE_CURRENT_BINARY_DIR}/qmgr_local_i.c + ${CMAKE_CURRENT_BINARY_DIR}/qmgr.def) + +add_library(qmgr SHARED ${SOURCE}) + +add_interface_definitions(qmgr_idlheader qmgr_local.idl) + +set_module_type(qmgr win32dll) +target_link_libraries(qmgr uuid wine) +add_importlibs(qmgr ole32 wininet urlmon advapi32 msvcrt kernel32 ntdll) +add_cab_target(qmgr 1) +add_dependencies(qmgr qmgr_idlheader) Propchange: branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/qmgrprx… ============================================================================== --- branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt [iso-8859-1] Fri Dec 24 14:25:10 2010 @@ -1,0 +1,24 @@ + +add_definitions( + -D__WINESRC__ + -DREGISTER_PROXY_DLL) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +add_idl_interface(qmgrprxy.idl) + +spec2def(qmgrprxy.dll qmgrprxy.spec) + +list(APPEND SOURCE + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy_i.c + ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy.def) + +add_library(qmgrprxy SHARED ${SOURCE}) + +rpcproxy(qmgrprxy qmgrprxy.idl) + +set_module_type(qmgrprxy win32dll) +target_link_libraries(qmgrprxy qmgrprxy_proxy ${PSEH_LIB} wine) +add_importlibs(qmgrprxy rpcrt4 msvcrt kernel32 ntdll) +add_cab_target(qmgrprxy 1) Propchange: branches/cmake-bringup/dll/win32/qmgrprxy/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 8 months

[akhaldi] 50124: [CMAKE] - Improve formatting, mainly the uppercase macro names. No functionality change.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 24 13:38:27 2010 New Revision: 50124 URL: http://svn.reactos.org/svn/reactos?rev=50124&view=rev Log: [CMAKE] - Improve formatting, mainly the uppercase macro names. No functionality change. Modified: branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/dll/win32/atl/CMakeLists.txt branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt branches/cmake-bringup/include/dxsdk/CMakeLists.txt branches/cmake-bringup/include/psdk/CMakeLists.txt branches/cmake-bringup/include/reactos/idl/CMakeLists.txt branches/cmake-bringup/include/reactos/wine/CMakeLists.txt Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,8 +1,7 @@ - if (NOT MSVC) -MACRO(CreateBootSectorTarget _target_name _asm_file _object_file) - + +macro(CreateBootSectorTarget _target_name _asm_file _object_file) get_filename_component(OBJECT_PATH ${_object_file} PATH) get_filename_component(OBJECT_NAME ${_object_file} NAME) file(MAKE_DIRECTORY ${OBJECT_PATH}) @@ -11,11 +10,11 @@ foreach(arg ${defines}) set(result_defs ${result_defs} -D${arg}) - endforeach(arg ${defines}) + endforeach() foreach(arg ${includes}) set(result_incs -I${arg} ${result_incs}) - endforeach(arg ${includes}) + endforeach() add_custom_command( OUTPUT ${_object_file} @@ -24,88 +23,91 @@ set_source_files_properties(${_object_file} PROPERTIES GENERATED TRUE) add_custom_target(${_target_name} ALL DEPENDS ${_object_file}) add_minicd(${_object_file} loader ${OBJECT_NAME}) -ENDMACRO(CreateBootSectorTarget _target_name _asm_file _object_file) +endmacro() + else() -MACRO(CreateBootSectorTarget _target_name _asm_file _object_file) -ENDMACRO() + +macro(CreateBootSectorTarget _target_name _asm_file _object_file) +endmacro() + endif() -MACRO(MACRO_IDL_COMPILE_OBJECT OBJECT SOURCE) - GET_PROPERTY(FLAGS SOURCE ${SOURCE} PROPERTY COMPILE_FLAGS) - GET_PROPERTY(DEFINES SOURCE ${SOURCE} PROPERTY COMPILE_DEFINITIONS) - GET_PROPERTY(INCLUDE_DIRECTORIES DIRECTORY PROPERTY INCLUDE_DIRECTORIES) - FOREACH(DIR ${INCLUDE_DIRECTORIES}) - SET(FLAGS "${FLAGS} -I${DIR}") - ENDFOREACH() - - SET(IDL_COMMAND ${CMAKE_IDL_COMPILE_OBJECT}) - STRING(REPLACE "<CMAKE_IDL_COMPILER>" "${CMAKE_IDL_COMPILER}" IDL_COMMAND "${IDL_COMMAND}") - STRING(REPLACE <FLAGS> "${FLAGS}" IDL_COMMAND "${IDL_COMMAND}") - STRING(REPLACE "<DEFINES>" "${DEFINES}" IDL_COMMAND "${IDL_COMMAND}") - STRING(REPLACE "<OBJECT>" "${OBJECT}" IDL_COMMAND "${IDL_COMMAND}") - STRING(REPLACE "<SOURCE>" "${SOURCE}" IDL_COMMAND "${IDL_COMMAND}") - SEPARATE_ARGUMENTS(IDL_COMMAND) - - ADD_CUSTOM_COMMAND( - OUTPUT ${OBJECT} - COMMAND ${IDL_COMMAND} - DEPENDS ${SOURCE} - VERBATIM - ) -ENDMACRO() - -MACRO(ADD_INTERFACE_DEFINITIONS TARGET) - FOREACH(SOURCE ${ARGN}) - GET_FILENAME_COMPONENT(FILE ${SOURCE} NAME_WE) - SET(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.h) - MACRO_IDL_COMPILE_OBJECT(${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}) - LIST(APPEND OBJECTS ${OBJECT}) - ENDFOREACH() - ADD_CUSTOM_TARGET(${TARGET} ALL DEPENDS ${OBJECTS}) -ENDMACRO() - -MACRO(add_minicd_target _targetname _dir) # optional parameter: _nameoncd +macro(idl_compile_object OBJECT SOURCE) + get_property(FLAGS SOURCE ${SOURCE} PROPERTY COMPILE_FLAGS) + get_property(DEFINES SOURCE ${SOURCE} PROPERTY COMPILE_DEFINITIONS) + get_property(INCLUDE_DIRECTORIES DIRECTORY PROPERTY INCLUDE_DIRECTORIES) + + foreach(DIR ${INCLUDE_DIRECTORIES}) + set(FLAGS "${FLAGS} -I${DIR}") + endforeach() + + set(IDL_COMMAND ${CMAKE_IDL_COMPILE_OBJECT}) + string(REPLACE "<CMAKE_IDL_COMPILER>" "${CMAKE_IDL_COMPILER}" IDL_COMMAND "${IDL_COMMAND}") + string(REPLACE <FLAGS> "${FLAGS}" IDL_COMMAND "${IDL_COMMAND}") + string(REPLACE "<DEFINES>" "${DEFINES}" IDL_COMMAND "${IDL_COMMAND}") + string(REPLACE "<OBJECT>" "${OBJECT}" IDL_COMMAND "${IDL_COMMAND}") + string(REPLACE "<SOURCE>" "${SOURCE}" IDL_COMMAND "${IDL_COMMAND}") + separate_arguments(IDL_COMMAND) + + add_custom_command( + OUTPUT ${OBJECT} + COMMAND ${IDL_COMMAND} + DEPENDS ${SOURCE} + VERBATIM) +endmacro() + +macro(add_interface_definitions TARGET) + foreach(SOURCE ${ARGN}) + get_filename_component(FILE ${SOURCE} NAME_WE) + set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.h) + idl_compile_object(${OBJECT} ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE}) + list(APPEND OBJECTS ${OBJECT}) + endforeach() + add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) +endmacro() + +macro(add_minicd_target _targetname _dir) # optional parameter: _nameoncd if("${ARGN}" STREQUAL "") get_target_property(FILENAME ${_targetname} LOCATION) - get_filename_component(_nameoncd ${FILENAME} NAME) - else() - set(_nameoncd ${ARGN}) + get_filename_component(_nameoncd ${FILENAME} NAME) + else() + set(_nameoncd ${ARGN}) endif() file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n") -ENDMACRO(add_minicd_target) - -MACRO(add_minicd FILENAME _dir _nameoncd) +endmacro() + +macro(add_minicd FILENAME _dir _nameoncd) file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n") -ENDMACRO(add_minicd) +endmacro() macro(set_cpp) - include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport) - set(IS_CPP 1) - add_definitions( - -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++ - -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt) -endmacro() - -MACRO(add_livecd_target _targetname _dir )# optional parameter : _nameoncd + include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/c++/stlport) + set(IS_CPP 1) + add_definitions( + -DNATIVE_CPP_INCLUDE=${REACTOS_SOURCE_DIR}/include/c++ + -DNATIVE_C_INCLUDE=${REACTOS_SOURCE_DIR}/include/crt) +endmacro() + +macro(add_livecd_target _targetname _dir )# optional parameter : _nameoncd if("${ARGN}" STREQUAL "") get_target_property(FILENAME ${_targetname} LOCATION) - get_filename_component(_nameoncd ${FILENAME} NAME) - else() - set(_nameoncd ${ARGN}) + get_filename_component(_nameoncd ${FILENAME} NAME) + else() + set(_nameoncd ${ARGN}) endif() file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt "${_targetname}\t${_dir}\t${_nameoncd}\n") -ENDMACRO(add_livecd_target) - -MACRO(add_livecd FILENAME _dir)# optional parameter : _nameoncd +endmacro() + +macro(add_livecd FILENAME _dir)# optional parameter : _nameoncd if("${ARGN}" STREQUAL "") - get_filename_component(_nameoncd ${FILENAME} NAME) - else() - set(_nameoncd ${ARGN}) + get_filename_component(_nameoncd ${FILENAME} NAME) + else() + set(_nameoncd ${ARGN}) endif() file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt "${FILENAME}\t${_dir}\t${_nameoncd}\n") -ENDMACRO(add_livecd) +endmacro() macro(cab_to_dir _dir_num _var_name) # 1 = system32 @@ -137,17 +139,17 @@ endif() endmacro() -MACRO(add_cab_target _targetname _num ) +macro(add_cab_target _targetname _num ) file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt "${_targetname}\t${_num}\n") cab_to_dir(${_num} _dir) add_livecd_target(${_targetname} ${_dir}) -ENDMACRO(add_cab_target) - -MACRO(add_cab FILENAME _num) +endmacro() + +macro(add_cab FILENAME _num) file(APPEND ${REACTOS_BINARY_DIR}/boot/ros_cab.txt "${FILENAME}\t${_num}\n") cab_to_dir(${_num} _dir) add_livecd(${FILENAME} ${_dir}) -ENDMACRO(add_cab) +endmacro() macro(custom_incdefs) if(NOT DEFINED result_incs) #rpc_defines @@ -156,17 +158,17 @@ foreach(arg ${rpc_defines}) set(result_defs ${result_defs} -D${arg}) - endforeach(arg ${defines}) + endforeach() foreach(arg ${rpc_includes}) set(result_incs -I${arg} ${result_incs}) - endforeach(arg ${includes}) - endif() -endmacro(custom_incdefs) + endforeach() + endif() +endmacro() macro(rpcproxy TARGET) custom_incdefs() - list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c) + list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c) foreach(_in_FILE ${ARGN}) get_filename_component(FILE ${_in_FILE} NAME_WE) @@ -183,7 +185,7 @@ add_custom_target(${TARGET}_${FILE}_p DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_p.c) #add_dependencies(${TARGET}_proxy ${TARGET}_${FILE}_p) - endforeach(_in_FILE ${ARGN}) + endforeach() add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_proxy.dlldata.c @@ -195,9 +197,9 @@ add_library(${TARGET}_proxy ${SOURCE}) add_dependencies(${TARGET}_proxy psdk ${PROXY_DEPENDS}) -endmacro(rpcproxy) - -macro (MACRO_IDL_FILES) +endmacro() + +macro(idl_files) custom_incdefs() foreach(_in_FILE ${ARGN}) get_filename_component(FILE ${_in_FILE} NAME_WE) @@ -220,28 +222,29 @@ PROPERTIES GENERATED TRUE) add_library(${FILE}_client ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_c.c) add_dependencies(${FILE}_client psdk) - endforeach(_in_FILE ${ARGN}) - -endmacro (MACRO_IDL_FILES) - -macro(ADD_TYPELIB TARGET) - custom_incdefs() - foreach(SOURCE ${ARGN}) - get_filename_component(FILE ${SOURCE} NAME_WE) - set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb) - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb - COMMAND ${IDL_COMPILER} ${result_incs} ${IDL_FLAGS} ${IDL_TYPELIB_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE} - DEPENDS ${SOURCE}) - list(APPEND OBJECTS ${OBJECT}) - endforeach() - add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) + endforeach() +endmacro() + +macro(add_typelib TARGET) + custom_incdefs() + foreach(SOURCE ${ARGN}) + get_filename_component(FILE ${SOURCE} NAME_WE) + set(OBJECT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb + COMMAND ${IDL_COMPILER} ${result_incs} ${IDL_FLAGS} ${IDL_TYPELIB_ARG} ${CMAKE_CURRENT_BINARY_DIR}/${FILE}.tlb ${CMAKE_CURRENT_SOURCE_DIR}/${SOURCE} + DEPENDS ${SOURCE}) + list(APPEND OBJECTS ${OBJECT}) + endforeach() + add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) endmacro() macro(add_idl_interface IDL_FILE) custom_incdefs() get_filename_component(FILE ${IDL_FILE} NAME_WE) - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c - COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} -m32 --win32 -u -U ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE} - DEPENDS ${IDL_FILE}) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c + COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} -m32 --win32 -u -U ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE} + DEPENDS ${IDL_FILE}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c PROPERTIES GENERATED TRUE) endmacro() Modified: branches/cmake-bringup/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/atl/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/atl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/atl/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -6,7 +6,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -ADD_INTERFACE_DEFINITIONS(atl_atliface_header atliface.idl) +add_interface_definitions(atl_atliface_header atliface.idl) set_rc_compiler() spec2def(atl.dll atl.spec) Modified: branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/jscript… ============================================================================== --- branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,5 +1,5 @@ -ADD_TYPELIB(jsglobal jsglobal.idl) +add_typelib(jsglobal jsglobal.idl) add_dependencies(jsglobal stdole2) remove_definitions(-D_WIN32_WINNT=0x502) Modified: branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml.… ============================================================================== --- branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mshtml.tlb/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,5 +1,5 @@ -ADD_TYPELIB(mshtml_tlb mshtml_tlb.idl) +add_typelib(mshtml_tlb mshtml_tlb.idl) add_dependencies(mshtml_tlb stdole2) add_definitions(-D__WINESRC__) Modified: branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mshtml/… ============================================================================== --- branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mshtml/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -9,7 +9,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -ADD_INTERFACE_DEFINITIONS(mshtml_nsiface_header nsiface.idl) +add_interface_definitions(mshtml_nsiface_header nsiface.idl) set_rc_compiler() Modified: branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msxml3/… ============================================================================== --- branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,4 +1,5 @@ -ADD_TYPELIB(msxml3_v1 msxml3_v1.idl) + +add_typelib(msxml3_v1 msxml3_v1.idl) add_dependencies(msxml3_v1 stdole2) remove_definitions(-D_WIN32_WINNT=0x502) Modified: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -54,7 +54,8 @@ ${CMAKE_CURRENT_BINARY_DIR} ${REACTOS_SOURCE_DIR}/include/reactos/wine) -ADD_INTERFACE_DEFINITIONS(ole32idl dcom.idl irot.idl) +add_interface_definitions(ole32idl dcom.idl irot.idl) + rpcproxy(ole32 dcom.idl ole32_unknwn.idl Modified: branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/pstorec… ============================================================================== --- branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,5 +1,5 @@ -ADD_TYPELIB(pstorec_tlb pstorec_tlb.idl) +add_typelib(pstorec_tlb pstorec_tlb.idl) add_dependencies(pstorec_tlb stdole2) add_definitions(-D__WINESRC__) @@ -15,12 +15,7 @@ add_library(pstorec SHARED ${SOURCE}) set_module_type(pstorec win32dll) - -target_link_libraries(pstorec - uuid - wine) - +target_link_libraries(pstorec uuid wine) add_importlibs(pstorec msvcrt kernel32 ntdll) - add_dependencies(pstorec pstorec_tlb pstorec_def) add_cab_target(pstorec 1) Modified: branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdocvw… ============================================================================== --- branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,9 +1,8 @@ -ADD_TYPELIB(shdocvw_v1 shdocvw_v1.idl) +add_typelib(shdocvw_v1 shdocvw_v1.idl) add_dependencies(shdocvw_v1 stdole2) add_definitions(-D_SHDOCVW_) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(shdocvw.dll shdocvw.spec) Modified: branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole2… ============================================================================== --- branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,9 +1,8 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -ADD_TYPELIB(std_ole_v2 std_ole_v2.idl) +add_typelib(std_ole_v2 std_ole_v2.idl) spec2def(stdole2.tlb stdole2.tlb.spec) @@ -12,8 +11,5 @@ set_entrypoint(stdole2.tlb 0) set_target_properties(stdole2.tlb PROPERTIES SUFFIX "") - - - add_dependencies(stdole2.tlb std_ole_v2) add_cab_target(stdole2.tlb 1) Modified: branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/stdole3… ============================================================================== --- branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,13 +1,13 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -ADD_TYPELIB(std_ole_v1 std_ole_v1.idl) +add_typelib(std_ole_v1 std_ole_v1.idl) spec2def(stdole32.tlb stdole32.tlb.spec) -add_library(stdole32.tlb SHARED rsrc.rc +add_library(stdole32.tlb SHARED + rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/stdole32.def) set_entrypoint(stdole32.tlb 0) Modified: branches/cmake-bringup/include/dxsdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/dxsdk/CMa… ============================================================================== --- branches/cmake-bringup/include/dxsdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/dxsdk/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,5 +1,5 @@ -LIST(APPEND SOURCE +list(APPEND SOURCE amstream.idl amvideo.idl austream.idl @@ -24,4 +24,4 @@ #vmrender.idl ) -ADD_INTERFACE_DEFINITIONS(dxsdk ${SOURCE}) +add_interface_definitions(dxsdk ${SOURCE}) Modified: branches/cmake-bringup/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/CMak… ============================================================================== --- branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,5 +1,5 @@ -LIST(APPEND SOURCE +list(APPEND SOURCE # access.idl activaut.idl activdbg.idl @@ -103,10 +103,9 @@ if(NOT MSVC) LIST(APPEND SOURCE wincodec.idl - wuapi.idl -) + wuapi.idl) endif() -ADD_INTERFACE_DEFINITIONS(psdk ${SOURCE}) +add_interface_definitions(psdk ${SOURCE}) -ADD_TYPELIB(stdole2 stdole2.idl) +add_typelib(stdole2 stdole2.idl) Modified: branches/cmake-bringup/include/reactos/idl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/i… ============================================================================== --- branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/idl/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -7,7 +7,9 @@ svcctl.idl wlansvc.idl) -MACRO_IDL_FILES(${SOURCE}) +idl_files(${SOURCE}) + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -MACRO_IDL_FILES(pnp.idl) + +idl_files(pnp.idl) Modified: branches/cmake-bringup/include/reactos/wine/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/CMakeLists.txt [iso-8859-1] Fri Dec 24 13:38:27 2010 @@ -1,9 +1,9 @@ -ADD_INTERFACE_DEFINITIONS(wineheaders itss.idl wined3d.idl) +add_interface_definitions(wineheaders itss.idl wined3d.idl) list(APPEND SOURCE epm.idl irot.idl) -MACRO_IDL_FILES(${SOURCE}) -ADD_INTERFACE_DEFINITIONS(winesdk ${SOURCE}) +idl_files(${SOURCE}) +add_interface_definitions(winesdk ${SOURCE})

13 years, 8 months

[akhaldi] 50123: [CMAKE] - Fix shell32. - Fix and enable mstask.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 24 12:23:19 2010 New Revision: 50123 URL: http://svn.reactos.org/svn/reactos?rev=50123&view=rev Log: [CMAKE] - Fix shell32. - Fix and enable mstask. Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Fri Dec 24 12:23:19 2010 @@ -100,7 +100,7 @@ add_subdirectory(msrle32) add_subdirectory(mssign32) add_subdirectory(mssip32) -#add_subdirectory(mstask) +add_subdirectory(mstask) add_subdirectory(msvcrt) #add_subdirectory(msvcrt20) FIX spec2def #add_subdirectory(msvcrt40) FIX spec2def Modified: branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mstask/… ============================================================================== --- branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt [iso-8859-1] Fri Dec 24 12:23:19 2010 @@ -5,28 +5,30 @@ add_definitions(-DWINVER=0x600) remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D__WINESRC__) +add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +add_idl_interface(mstask_local.idl) + spec2def(mstask.dll mstask.spec) -add_library(mstask SHARED +list(APPEND SOURCE factory.c mstask_main.c task.c task_scheduler.c task_trigger.c rsrc.rc + ${CMAKE_CURRENT_BINARY_DIR}/mstask_local_i.c ${CMAKE_CURRENT_BINARY_DIR}/mstask.def) + +add_library(mstask SHARED ${SOURCE}) set_module_type(mstask win32dll) -target_link_libraries(mstask - mstask_local_interface - uuid - wine) +target_link_libraries(mstask uuid wine) -add_importlibs(mstask ole32 ntdll) +add_importlibs(mstask ole32 msvcrt kernel32 ntdll) add_cab_target(mstask 1) Modified: branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… ============================================================================== --- branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Fri Dec 24 12:23:19 2010 @@ -1,3 +1,18 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_definitions( + -D_SHELL32_ + -DCOM_NO_WINDOWS_H + -D_WINE) + +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/lib/recyclebin + ${REACTOS_SOURCE_DIR}) + +add_idl_interface(shobjidl_local.idl) spec2def(shell32.dll shell32.spec) @@ -56,20 +71,8 @@ shv_item_new.c folder_options.c shell32.rc + ${CMAKE_CURRENT_BINARY_DIR}/shobjidl_local_i.c ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - -add_definitions( - -D_SHELL32_ - -DCOM_NO_WINDOWS_H - -D_WINE) - -include_directories( - ${REACTOS_SOURCE_DIR}/include/reactos/wine - ${REACTOS_SOURCE_DIR}/lib/recyclebin - ${REACTOS_SOURCE_DIR}) add_pch(shell32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})

13 years, 8 months

[tkreuzer] 50122: [CMAKE] Don't compile telnet and explorer on MSVC for now

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Dec 24 12:13:17 2010 New Revision: 50122 URL: http://svn.reactos.org/svn/reactos?rev=50122&view=rev Log: [CMAKE] Don't compile telnet and explorer on MSVC for now Modified: branches/cmake-bringup/base/applications/network/CMakeLists.txt branches/cmake-bringup/base/shell/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/network/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/CMakeLists.txt [iso-8859-1] Fri Dec 24 12:13:17 2010 @@ -9,6 +9,8 @@ add_subdirectory(nslookup) add_subdirectory(ping) add_subdirectory(route) +if(NOT MSVC) add_subdirectory(telnet) +endif() add_subdirectory(tracert) add_subdirectory(whois) Modified: branches/cmake-bringup/base/shell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/CMakeL… ============================================================================== --- branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/CMakeLists.txt [iso-8859-1] Fri Dec 24 12:13:17 2010 @@ -1,4 +1,7 @@ add_subdirectory(cmd) +if(NOT MSVC) add_subdirectory(explorer) +endif() add_subdirectory(explorer-new) +

13 years, 8 months

[gadamopoulos] 50121: [win32k] - Remove co_IntPostOrSendMessage and use co_IntSendMessageNoWait where possible

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Dec 24 12:11:10 2010 New Revision: 50121 URL: http://svn.reactos.org/svn/reactos?rev=50121&view=rev Log: [win32k] - Remove co_IntPostOrSendMessage and use co_IntSendMessageNoWait where possible Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Fri Dec 24 12:11:10 2010 @@ -180,11 +180,6 @@ WPARAM wParam, LPARAM lParam); LRESULT FASTCALL -co_IntPostOrSendMessage(HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam); -LRESULT FASTCALL co_IntSendMessageTimeout(HWND hWnd, UINT Msg, WPARAM wParam, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Fri Dec 24 12:11:10 2010 @@ -740,11 +740,7 @@ for (; *cursor; cursor++) { - DPRINT("Sending notify\n"); - co_IntPostOrSendMessage(*cursor, - MsgType, - Message, - lParam); + co_IntSendMessageNoWait(*cursor, MsgType, Message, lParam); } ExFreePool(HwndList); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Fri Dec 24 12:11:10 2010 @@ -77,7 +77,7 @@ if (WindowPrev) UserRefObjectCo(WindowPrev, &RefPrev); /* Send palette messages */ - if (co_IntPostOrSendMessage(hWnd, WM_QUERYNEWPALETTE, 0, 0)) + if (co_IntSendMessage(hWnd, WM_QUERYNEWPALETTE, 0, 0)) { UserPostMessage( HWND_BROADCAST, WM_PALETTEISCHANGING, @@ -166,7 +166,7 @@ if (hWndPrev) { IntNotifyWinEvent(EVENT_OBJECT_FOCUS, NULL, OBJID_CLIENT, CHILDID_SELF, 0); - co_IntPostOrSendMessage(hWndPrev, WM_KILLFOCUS, (WPARAM)hWnd, 0); + co_IntSendMessageNoWait(hWndPrev, WM_KILLFOCUS, (WPARAM)hWnd, 0); } } @@ -177,7 +177,7 @@ { PWND pWnd = UserGetWindowObject(hWnd); IntNotifyWinEvent(EVENT_OBJECT_FOCUS, pWnd, OBJID_CLIENT, CHILDID_SELF, 0); - co_IntPostOrSendMessage(hWnd, WM_SETFOCUS, (WPARAM)hWndPrev, 0); + co_IntSendMessageNoWait(hWnd, WM_SETFOCUS, (WPARAM)hWndPrev, 0); } } @@ -579,7 +579,7 @@ if (Window) IntNotifyWinEvent(EVENT_SYSTEM_CAPTURESTART, Window, OBJID_WINDOW, CHILDID_SELF, WEF_SETBYWNDPTI); - co_IntPostOrSendMessage(hWndPrev, WM_CAPTURECHANGED, 0, (LPARAM)hWnd); + co_IntSendMessageNoWait(hWndPrev, WM_CAPTURECHANGED, 0, (LPARAM)hWnd); ThreadQueue->CaptureWindow = hWnd; RETURN( hWndPrev); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Fri Dec 24 12:11:10 2010 @@ -1402,47 +1402,6 @@ CLEANUP: if (Window) UserDerefObjectCo(Window); END_CLEANUP; -} - -/* This function posts a message if the destination's message queue belongs to -another thread, otherwise it sends the message. It does not support broadcast -messages! */ -LRESULT FASTCALL -co_IntPostOrSendMessage( HWND hWnd, - UINT Msg, - WPARAM wParam, - LPARAM lParam ) -{ - ULONG_PTR Result; - PTHREADINFO pti; - PWND Window; - - if ( hWnd == HWND_BROADCAST ) - { - return 0; - } - - if(!(Window = UserGetWindowObject(hWnd))) - { - return 0; - } - - pti = PsGetCurrentThreadWin32Thread(); - - if ( Window->head.pti->MessageQueue != pti->MessageQueue && - FindMsgMemory(Msg) == 0 ) - { - Result = UserPostMessage(hWnd, Msg, wParam, lParam); - } - else - { - if ( !co_IntSendMessageTimeoutSingle(hWnd, Msg, wParam, lParam, SMTO_NORMAL, 0, &Result) ) - { - Result = 0; - } - } - - return (LRESULT)Result; } LRESULT FASTCALL

13 years, 8 months

[akhaldi] 50120: [CMAKE] - Add the remaining winetests to build. We compile them all now.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 24 12:09:01 2010 New Revision: 50120 URL: http://svn.reactos.org/svn/reactos?rev=50120&view=rev Log: [CMAKE] - Add the remaining winetests to build. We compile them all now. Added: trunk/rostests/winetests/oleaut32/CMakeLists.txt (with props) trunk/rostests/winetests/rpcrt4/CMakeLists.txt (with props) Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Fri Dec 24 12:09:01 2010 @@ -49,7 +49,7 @@ add_subdirectory(odbccp32) add_subdirectory(ole32) add_subdirectory(oleacc) -#add_subdirectory(oleaut32) +add_subdirectory(oleaut32) add_subdirectory(opengl32) add_subdirectory(pdh) add_subdirectory(powrprof) @@ -59,7 +59,7 @@ add_subdirectory(rasapi32) add_subdirectory(riched20) add_subdirectory(riched32) -#add_subdirectory(rpcrt4) +add_subdirectory(rpcrt4) add_subdirectory(rsabase) add_subdirectory(rsaenh) add_subdirectory(schannel) Added: trunk/rostests/winetests/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/CMakeL… ============================================================================== --- trunk/rostests/winetests/oleaut32/CMakeLists.txt (added) +++ trunk/rostests/winetests/oleaut32/CMakeLists.txt [iso-8859-1] Fri Dec 24 12:09:01 2010 @@ -1,0 +1,33 @@ + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +ADD_TYPELIB(oleaut32_typelibs test_reg.idl test_tlb.idl tmarshal.idl) +add_dependencies(oleaut32_typelibs stdole2) + +ADD_INTERFACE_DEFINITIONS(oleaut32_idlheaders test_reg.idl tmarshal.idl) +add_idl_interface(tmarshal.idl) + +list(APPEND SOURCE + dispatch.c + olefont.c + olepicture.c + safearray.c + testlist.c + tmarshal.c + tmarshal.rc + typelib.c + usrmarshal.c + varformat.c + vartest.c + vartype.c + ${CMAKE_CURRENT_BINARY_DIR}/tmarshal_i.c) + +add_executable(oleaut32_winetest ${SOURCE}) +target_link_libraries(oleaut32_winetest uuid wine) +set_module_type(oleaut32_winetest win32cui) +add_importlibs(oleaut32_winetest oleaut32 ole32 rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll) +add_dependencies(oleaut32_winetest oleaut32_typelibs oleaut32_idlheaders) Propchange: trunk/rostests/winetests/oleaut32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt (added) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Fri Dec 24 12:09:01 2010 @@ -1,0 +1,30 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x500) + +add_definitions( + -D__ROS_LONG64__ + -D_DLL -D__USE_CRTIMP) + +MACRO_IDL_FILES(server.idl) + +list(APPEND SOURCE + cstub.c + generated.c + ndr_marshall.c + rpc.c + rpc_async.c + rpc_protseq.c + server.c + testlist.c) + +add_executable(rpcrt4_winetest ${SOURCE}) +target_link_libraries(rpcrt4_winetest + uuid + wine + server_server + server_client + ${PSEH_LIB}) + +set_module_type(rpcrt4_winetest win32cui) +add_importlibs(rpcrt4_winetest ole32 rpcrt4 msvcrt kernel32 ntdll) Propchange: trunk/rostests/winetests/rpcrt4/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 8 months

[akhaldi] 50119: [CMAKE] - Add a macro to handle IDL interfaces.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 24 12:08:24 2010 New Revision: 50119 URL: http://svn.reactos.org/svn/reactos?rev=50119&view=rev Log: [CMAKE] - Add a macro to handle IDL interfaces. Modified: branches/cmake-bringup/CMakeMacros.cmake Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Fri Dec 24 12:08:24 2010 @@ -236,3 +236,12 @@ endforeach() add_custom_target(${TARGET} ALL DEPENDS ${OBJECTS}) endmacro() + +macro(add_idl_interface IDL_FILE) + custom_incdefs() + get_filename_component(FILE ${IDL_FILE} NAME_WE) + add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c + COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} -m32 --win32 -u -U ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE} + DEPENDS ${IDL_FILE}) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c PROPERTIES GENERATED TRUE) +endmacro()

13 years, 8 months

[akhaldi] 50118: [CMAKE] - Use SIZE_T in MIDL_user_allocate. This reverts r49295.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Dec 24 11:42:18 2010 New Revision: 50118 URL: http://svn.reactos.org/svn/reactos?rev=50118&view=rev Log: [CMAKE] - Use SIZE_T in MIDL_user_allocate. This reverts r49295. Modified: branches/cmake-bringup/base/services/eventlog/rpc.c branches/cmake-bringup/base/services/rpcss/irotp.c branches/cmake-bringup/base/services/umpnpmgr/umpnpmgr.c branches/cmake-bringup/base/services/wlansvc/rpcserver.c branches/cmake-bringup/base/system/services/rpcserver.c branches/cmake-bringup/dll/win32/advapi32/service/rpc.c branches/cmake-bringup/dll/win32/lsasrv/lsasrv.c branches/cmake-bringup/dll/win32/ole32/moniker.c branches/cmake-bringup/dll/win32/rpcrt4/rpc_epmap.c branches/cmake-bringup/dll/win32/setupapi/rpc.c branches/cmake-bringup/dll/win32/wlanapi/main.c branches/cmake-bringup/include/psdk/rpcndr.h Modified: branches/cmake-bringup/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/eve… ============================================================================== --- branches/cmake-bringup/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/eventlog/rpc.c [iso-8859-1] Fri Dec 24 11:42:18 2010 @@ -694,7 +694,7 @@ } -void __RPC_FAR *__RPC_USER midl_user_allocate(size_t len) +void __RPC_FAR *__RPC_USER midl_user_allocate(SIZE_T len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } Modified: branches/cmake-bringup/base/services/rpcss/irotp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/rpc… ============================================================================== --- branches/cmake-bringup/base/services/rpcss/irotp.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/rpcss/irotp.c [iso-8859-1] Fri Dec 24 11:42:18 2010 @@ -368,7 +368,7 @@ rot_entry_release(rot_entry); } -void * __RPC_USER MIDL_user_allocate(size_t size) +void * __RPC_USER MIDL_user_allocate(SIZE_T size) { return HeapAlloc(GetProcessHeap(), 0, size); } Modified: branches/cmake-bringup/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/ump… ============================================================================== --- branches/cmake-bringup/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Fri Dec 24 11:42:18 2010 @@ -137,7 +137,7 @@ } -void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } Modified: branches/cmake-bringup/base/services/wlansvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/wla… ============================================================================== --- branches/cmake-bringup/base/services/wlansvc/rpcserver.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/wlansvc/rpcserver.c [iso-8859-1] Fri Dec 24 11:42:18 2010 @@ -525,7 +525,7 @@ return ERROR_CALL_NOT_IMPLEMENTED; } -void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } Modified: branches/cmake-bringup/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/servi… ============================================================================== --- branches/cmake-bringup/base/system/services/rpcserver.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/services/rpcserver.c [iso-8859-1] Fri Dec 24 11:42:18 2010 @@ -5391,7 +5391,7 @@ } -void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } Modified: branches/cmake-bringup/dll/win32/advapi32/service/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/advapi32/service/rpc.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/advapi32/service/rpc.c [iso-8859-1] Fri Dec 24 11:42:18 2010 @@ -12,7 +12,7 @@ void __RPC_FAR * __RPC_USER -midl_user_allocate(size_t len) +midl_user_allocate(SIZE_T len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } Modified: branches/cmake-bringup/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lsasrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Fri Dec 24 11:42:18 2010 @@ -72,7 +72,7 @@ } -void __RPC_FAR * __RPC_USER midl_user_allocate(size_t len) +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) { return RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, len); } Modified: branches/cmake-bringup/dll/win32/ole32/moniker.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/m… ============================================================================== --- branches/cmake-bringup/dll/win32/ole32/moniker.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ole32/moniker.c [iso-8859-1] Fri Dec 24 11:42:18 2010 @@ -1657,7 +1657,7 @@ return S_OK; } -void * __RPC_USER MIDL_user_allocate(size_t size) +void * __RPC_USER MIDL_user_allocate(SIZE_T size) { return HeapAlloc(GetProcessHeap(), 0, size); } Modified: branches/cmake-bringup/dll/win32/rpcrt4/rpc_epmap.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/… ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/rpc_epmap.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rpcrt4/rpc_epmap.c [iso-8859-1] Fri Dec 24 11:42:18 2010 @@ -596,7 +596,7 @@ return RPC_S_OK; } -void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t len) +void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len) { return HeapAlloc(GetProcessHeap(), 0, len); } Modified: branches/cmake-bringup/dll/win32/setupapi/rpc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/setupap… ============================================================================== --- branches/cmake-bringup/dll/win32/setupapi/rpc.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/setupapi/rpc.c [iso-8859-1] Fri Dec 24 11:42:18 2010 @@ -111,7 +111,7 @@ void __RPC_FAR * __RPC_USER -midl_user_allocate(size_t len) +midl_user_allocate(SIZE_T len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } Modified: branches/cmake-bringup/dll/win32/wlanapi/main.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wlanapi… ============================================================================== --- branches/cmake-bringup/dll/win32/wlanapi/main.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wlanapi/main.c [iso-8859-1] Fri Dec 24 11:42:18 2010 @@ -198,7 +198,7 @@ } void __RPC_FAR * __RPC_USER -midl_user_allocate(size_t len) +midl_user_allocate(SIZE_T len) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); } Modified: branches/cmake-bringup/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/rpcn… ============================================================================== --- branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/rpcndr.h [iso-8859-1] Fri Dec 24 11:42:18 2010 @@ -118,7 +118,7 @@ #define midl_user_free MIDL_user_free #define midl_user_allocate MIDL_user_allocate -void * __RPC_USER MIDL_user_allocate(size_t size); +void * __RPC_USER MIDL_user_allocate(SIZE_T size); void __RPC_USER MIDL_user_free( void * ); #define NdrFcShort(s) (unsigned char)(s & 0xff), (unsigned char)(s >> 8)

13 years, 8 months

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