Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 49881: [CMAKE] Fix dwmapi, mpr and msxml3. Ordinal stubs were given the same internal names as Wine.
by spetreolle＠svn.reactos.org 01 Dec '10

01 Dec '10

Author: spetreolle Date: Wed Dec 1 13:36:16 2010 New Revision: 49881 URL: http://svn.reactos.org/svn/reactos?rev=49881&view=rev Log: [CMAKE] Fix dwmapi, mpr and msxml3. Ordinal stubs were given the same internal names as Wine. Added: branches/cmake-bringup/dll/win32/dwmapi/dwmapi_ros.diff branches/cmake-bringup/dll/win32/mpr/mpr_ros.diff branches/cmake-bringup/dll/win32/msxml3/msxml3_ros.diff Modified: branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt branches/cmake-bringup/dll/win32/dwmapi/dwmapi.spec branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt branches/cmake-bringup/dll/win32/mpr/mpr.spec branches/cmake-bringup/dll/win32/msxml3/CMakeLists.txt branches/cmake-bringup/dll/win32/msxml3/msxml3.spec Modified: branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dwmapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dwmapi/CMakeLists.txt [iso-8859-1] Wed Dec 1 13:36:16 2010 @@ -3,9 +3,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(dwmapi.dll dwmapi.spec) -add_library(dwmapi SHARED dwmapi_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/dwmapi.def) +list(APPEND SOURCE + dwmapi_main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/dwmapi.def) + +add_library(dwmapi SHARED ${SOURCE}) set_module_type(dwmapi win32dll) Modified: branches/cmake-bringup/dll/win32/dwmapi/dwmapi.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dwmapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/dwmapi/dwmapi.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dwmapi/dwmapi.spec [iso-8859-1] Wed Dec 1 13:36:16 2010 @@ -1,24 +1,24 @@ -100 stub @ -101 stub @ +100 stub DWMAPI_100 +101 stub DWMAPI_101 102 stdcall DwmEnableComposition (long) -103 stub @ -104 stub @ -105 stub @ -106 stub @ -107 stub @ -108 stub @ -109 stub @ -110 stub @ -111 stub @ -112 stub @ -113 stub @ +103 stub DWMAPI_103 +104 stub DWMAPI_104 +105 stub DWMAPI_105 +106 stub DWMAPI_106 +107 stub DWMAPI_107 +108 stub DWMAPI_108 +109 stub DWMAPI_109 +110 stub DWMAPI_110 +111 stub DWMAPI_111 +112 stub DWMAPI_112 +113 stub DWMAPI_113 -115 stub @ -116 stub @ -117 stub @ -118 stub @ -119 stub @ -120 stub @ +115 stub DWMAPI_114 +116 stub DWMAPI_115 +117 stub DWMAPI_116 +118 stub DWMAPI_117 +119 stub DWMAPI_118 +120 stub DWMAPI_120 @ stub DwmAttachMilContent @ stub DwmDefWindowProc Added: branches/cmake-bringup/dll/win32/dwmapi/dwmapi_ros.diff URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dwmapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/dwmapi/dwmapi_ros.diff (added) +++ branches/cmake-bringup/dll/win32/dwmapi/dwmapi_ros.diff [iso-8859-1] Wed Dec 1 13:36:16 2010 @@ -1,0 +1,48 @@ +Index: dwmapi.spec +=================================================================== +--- dwmapi.spec (revision 49877) ++++ dwmapi.spec (working copy) +@@ -1,24 +1,24 @@ +-100 stub @ +-101 stub @ ++100 stub DWMAPI_100 ++101 stub DWMAPI_101 + 102 stdcall DwmEnableComposition (long) +-103 stub @ +-104 stub @ +-105 stub @ +-106 stub @ +-107 stub @ +-108 stub @ +-109 stub @ +-110 stub @ +-111 stub @ +-112 stub @ +-113 stub @ ++103 stub DWMAPI_103 ++104 stub DWMAPI_104 ++105 stub DWMAPI_105 ++106 stub DWMAPI_106 ++107 stub DWMAPI_107 ++108 stub DWMAPI_108 ++109 stub DWMAPI_109 ++110 stub DWMAPI_110 ++111 stub DWMAPI_111 ++112 stub DWMAPI_112 ++113 stub DWMAPI_113 + +-115 stub @ +-116 stub @ +-117 stub @ +-118 stub @ +-119 stub @ +-120 stub @ ++115 stub DWMAPI_114 ++116 stub DWMAPI_115 ++117 stub DWMAPI_116 ++118 stub DWMAPI_117 ++119 stub DWMAPI_118 ++120 stub DWMAPI_120 + + @ stub DwmAttachMilContent + @ stub DwmDefWindowProc Modified: branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/CMakeLists.txt [iso-8859-1] Wed Dec 1 13:36:16 2010 @@ -1,12 +1,12 @@ - add_definitions(-D__WINESRC__) add_definitions(-D_WINE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(mpr.dll mpr.spec) -add_library(mpr SHARED +list(APPEND SOURCE auth.c mpr_main.c multinet.c @@ -16,6 +16,8 @@ mpr.rc ${CMAKE_CURRENT_BINARY_DIR}/mpr.def) +add_library(mpr SHARED ${SOURCE}) + set_module_type(mpr win32dll) target_link_libraries(mpr wine) Modified: branches/cmake-bringup/dll/win32/mpr/mpr.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mpr/mpr.spec [iso-8859-1] Wed Dec 1 13:36:16 2010 @@ -1,23 +1,23 @@ # ordinal exports - 1 stub @ - 2 stub @ - 3 stub @ - 4 stub @ - 5 stub @ - 6 stub @ - 7 stub @ - 8 stub @ - 9 stub @ -12 stub @ -13 stub @ -14 stub @ -15 stub @ -16 stub @ -17 stub @ -18 stub @ -19 stub @ -20 stub @ -21 stub @ + 1 stub MPR_1 + 2 stub MPR_2 + 3 stub MPR_3 + 4 stub MPR_4 + 5 stub MPR_5 + 6 stub MPR_6 + 7 stub MPR_7 + 8 stub MPR_8 + 9 stub MPR_9 +12 stub MPR_12 +13 stub MPR_13 +14 stub MPR_14 +15 stub MPR_15 +16 stub MPR_16 +17 stub MPR_17 +18 stub MPR_18 +19 stub MPR_19 +20 stub MPR_20 +21 stub MPR_21 22 stdcall @(long) MPR_Alloc 23 stdcall @(ptr long) MPR_ReAlloc 24 stdcall @(ptr) MPR_Free Added: branches/cmake-bringup/dll/win32/mpr/mpr_ros.diff URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mpr/mpr… ============================================================================== --- branches/cmake-bringup/dll/win32/mpr/mpr_ros.diff (added) +++ branches/cmake-bringup/dll/win32/mpr/mpr_ros.diff [iso-8859-1] Wed Dec 1 13:36:16 2010 @@ -1,0 +1,47 @@ +Index: mpr.spec +=================================================================== +--- mpr.spec (revision 49877) ++++ mpr.spec (working copy) +@@ -1,23 +1,23 @@ + # ordinal exports +- 1 stub @ +- 2 stub @ +- 3 stub @ +- 4 stub @ +- 5 stub @ +- 6 stub @ +- 7 stub @ +- 8 stub @ +- 9 stub @ +-12 stub @ +-13 stub @ +-14 stub @ +-15 stub @ +-16 stub @ +-17 stub @ +-18 stub @ +-19 stub @ +-20 stub @ +-21 stub @ ++ 1 stub MPR_1 ++ 2 stub MPR_2 ++ 3 stub MPR_3 ++ 4 stub MPR_4 ++ 5 stub MPR_5 ++ 6 stub MPR_6 ++ 7 stub MPR_7 ++ 8 stub MPR_8 ++ 9 stub MPR_9 ++12 stub MPR_12 ++13 stub MPR_13 ++14 stub MPR_14 ++15 stub MPR_15 ++16 stub MPR_16 ++17 stub MPR_17 ++18 stub MPR_18 ++19 stub MPR_19 ++20 stub MPR_20 ++21 stub MPR_21 + 22 stdcall @(long) MPR_Alloc + 23 stdcall @(ptr long) MPR_ReAlloc + 24 stdcall @(ptr) MPR_Free 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] Wed Dec 1 13:36:16 2010 @@ -1,4 +1,3 @@ - ADD_TYPELIB(msxml3_v1 msxml3_v1.idl) add_dependencies(msxml3_v1 stdole2) @@ -18,9 +17,10 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(msxml3.dll msxml3.spec) -add_library(msxml3 SHARED +list(APPEND SOURCE attribute.c comment.c domdoc.c @@ -50,6 +50,8 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/msxml3.def) +add_library(msxml3 SHARED ${SOURCE}) + set_module_type(msxml3 win32dll) target_link_libraries(msxml3 Modified: branches/cmake-bringup/dll/win32/msxml3/msxml3.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msxml3/… ============================================================================== --- branches/cmake-bringup/dll/win32/msxml3/msxml3.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msxml3/msxml3.spec [iso-8859-1] Wed Dec 1 13:36:16 2010 @@ -1,10 +1,10 @@ - 6 stub @ - 7 stub @ - 8 stub @ - 9 stub @ -10 stub @ -11 stub @ -12 stub @ + 6 stub MSXML3_6 + 7 stub MSXML3_7 + 8 stub MSXML3_8 + 9 stub MSXML3_9 +10 stub MSXML3_10 +11 stub MSXML3_11 +12 stub MSXML3_12 @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) Added: branches/cmake-bringup/dll/win32/msxml3/msxml3_ros.diff URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msxml3/… ============================================================================== --- branches/cmake-bringup/dll/win32/msxml3/msxml3_ros.diff (added) +++ branches/cmake-bringup/dll/win32/msxml3/msxml3_ros.diff [iso-8859-1] Wed Dec 1 13:36:16 2010 @@ -1,0 +1,22 @@ +Index: msxml3.spec +=================================================================== +--- msxml3.spec (revision 49877) ++++ msxml3.spec (working copy) +@@ -1,10 +1,10 @@ +- 6 stub @ +- 7 stub @ +- 8 stub @ +- 9 stub @ +-10 stub @ +-11 stub @ +-12 stub @ ++ 6 stub MSXML3_6 ++ 7 stub MSXML3_7 ++ 8 stub MSXML3_8 ++ 9 stub MSXML3_9 ++10 stub MSXML3_10 ++11 stub MSXML3_11 ++12 stub MSXML3_12 + + @ stdcall -private DllCanUnloadNow() + @ stdcall -private DllGetClassObject(ptr ptr ptr)

1 0

[tkreuzer] 49880: [CMAKE] manual stubs for atl
by tkreuzer＠svn.reactos.org 01 Dec '10

01 Dec '10

Author: tkreuzer Date: Wed Dec 1 13:16:39 2010 New Revision: 49880 URL: http://svn.reactos.org/svn/reactos?rev=49880&view=rev Log: [CMAKE] manual stubs for atl Added: branches/cmake-bringup/dll/win32/atl/stubs.c (with props) Modified: branches/cmake-bringup/dll/win32/atl/CMakeLists.txt branches/cmake-bringup/dll/win32/atl/atl.spec 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] Wed Dec 1 13:16:39 2010 @@ -14,6 +14,7 @@ atl_ax.c atl_main.c registrar.c + stubs.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/atl.def) Modified: branches/cmake-bringup/dll/win32/atl/atl.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/atl/atl… ============================================================================== --- branches/cmake-bringup/dll/win32/atl/atl.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/atl/atl.spec [iso-8859-1] Wed Dec 1 13:16:39 2010 @@ -16,18 +16,18 @@ 21 stdcall AtlModuleTerm(ptr) 22 stdcall AtlModuleUnregisterServer(ptr ptr) 23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr) -24 stub AtlWaitWithMessageLoop -25 stub AtlSetErrorInfo +24 stdcall AtlWaitWithMessageLoop(ptr) +25 stdcall AtlSetErrorInfo(ptr ptr long ptr ptr ptr ptr) 26 stdcall AtlCreateTargetDC(long ptr) 27 stdcall AtlHiMetricToPixel(ptr ptr) 28 stdcall AtlPixelToHiMetric(ptr ptr) -29 stub AtlDevModeW2A +29 stdcall AtlDevModeW2A(ptr ptr) 30 stdcall AtlComPtrAssign(ptr ptr) 31 stdcall AtlComQIPtrAssign(ptr ptr ptr) 32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) -34 stub AtlGetVersion -35 stub AtlAxDialogBoxW -36 stub AtlAxDialogBoxA +34 stdcall AtlGetVersion(ptr) +35 stdcall AtlAxDialogBoxW(ptr wstr ptr ptr ptr) +36 stdcall AtlAxDialogBoxA(ptr str ptr ptr ptr) 37 stdcall AtlAxCreateDialogW(long wstr long ptr long) 38 stdcall AtlAxCreateDialogA(long str long ptr long) 39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) @@ -40,13 +40,13 @@ 46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) 47 stdcall AtlAxGetControl(long ptr) 48 stdcall AtlAxGetHost(long ptr) -49 stub AtlRegisterClassCategoriesHelper +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) -52 stub AtlIPersistPropertyBag_Load -53 stub AtlIPersistPropertyBag_Save -54 stub AtlGetObjectSourceInterface -55 stub AtlModuleUnRegisterTypeLib +52 stdcall AtlIPersistPropertyBag_Load(ptr ptr ptr ptr ptr) +53 stdcall AtlIPersistPropertyBag_Save(ptr long long ptr ptr ptr) +54 stdcall AtlGetObjectSourceInterface(ptr ptr ptr ptr ptr) +55 stdcall AtlModuleUnregisterTypeLib(ptr str) 56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) 57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) 58 stdcall AtlModuleAddTermFunc(ptr ptr long) Added: branches/cmake-bringup/dll/win32/atl/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/atl/stu… ============================================================================== --- branches/cmake-bringup/dll/win32/atl/stubs.c (added) +++ branches/cmake-bringup/dll/win32/atl/stubs.c [iso-8859-1] Wed Dec 1 13:16:39 2010 @@ -1,0 +1,127 @@ +#include <windows.h> +#include <debug.h> + +#define ATLAPI_(x) x WINAPI +#define ATLAPI ATLAPI_(HRESULT) + +struct _ATL_CATMAP_ENTRY; +typedef struct _ATL_PROPMAP_ENTRY ATL_PROPMAP_ENTRY; +typedef struct _ATL_MODULE _ATL_MODULE; + +BOOL +WINAPI +AtlWaitWithMessageLoop( + HANDLE hEvent) +{ + UNIMPLEMENTED; + return FALSE; +} + +ATLAPI +AtlSetErrorInfo( + const CLSID *pclsid, + LPCOLESTR lpszDesc, + DWORD dwHelpID, + LPCOLESTR lpszHelpFile, + const IID *piid, + HRESULT hRes, + HINSTANCE hInst) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +ATLAPI_(LPDEVMODEA) +AtlDevModeW2A(LPDEVMODEA lpDevModeA, LPDEVMODEW lpDevModeW) +{ + UNIMPLEMENTED; + return NULL; +} + +ATLAPI_(DWORD) +AtlGetVersion(void* pReserved) +{ + UNIMPLEMENTED; + return 0; +} + +ATLAPI_(int) +AtlAxDialogBoxW( + HINSTANCE hInstance, + LPCWSTR lpTemplateName, + HWND hWndParent, + DLGPROC lpDialogProc, + LPARAM dwInitParam) +{ + UNIMPLEMENTED; + return 0; +} + +ATLAPI_(int) +AtlAxDialogBoxA( + HINSTANCE hInstance, + LPCSTR lpTemplateName, + HWND hWndParent, + DLGPROC lpDialogProc, + LPARAM dwInitParam) +{ + UNIMPLEMENTED; + return 0; +} + +ATLAPI_(int) +AtlRegisterClassCategoriesHelper( + const CLSID *pclsid, + const struct _ATL_CATMAP_ENTRY* pEntry, + BOOL arg3) +{ + UNIMPLEMENTED; + return 0; +} + +ATLAPI +AtlIPersistPropertyBag_Load( + LPPROPERTYBAG pPropBag, + LPERRORLOG pErrorLog, + const ATL_PROPMAP_ENTRY* pMap, + void* pThis, + IUnknown* pUnk) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +ATLAPI +AtlIPersistPropertyBag_Save( + LPPROPERTYBAG pPropBag, + BOOL fClearDirty, + BOOL fSaveAllProperties, + const ATL_PROPMAP_ENTRY* pMap, + void* pThis, + IUnknown* pUnk) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +ATLAPI +AtlGetObjectSourceInterface( + IUnknown* punkObj, + GUID* plibid, + IID* piid, + unsigned short* pdwMajor, + unsigned short* pdwMinor) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +ATLAPI +AtlModuleUnregisterTypeLib( + _ATL_MODULE* pM, + LPCOLESTR lpszIndex) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + Propchange: branches/cmake-bringup/dll/win32/atl/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 49879: [CMAKE] Manual stubs for activeds
by tkreuzer＠svn.reactos.org 01 Dec '10

01 Dec '10

Author: tkreuzer Date: Wed Dec 1 09:44:45 2010 New Revision: 49879 URL: http://svn.reactos.org/svn/reactos?rev=49879&view=rev Log: [CMAKE] Manual stubs for activeds Added: branches/cmake-bringup/dll/win32/activeds/stubs.c (with props) Modified: branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt branches/cmake-bringup/dll/win32/activeds/activeds.spec Modified: branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actived… ============================================================================== --- branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/activeds/CMakeLists.txt [iso-8859-1] Wed Dec 1 09:44:45 2010 @@ -7,6 +7,7 @@ list(APPEND SOURCE activeds_main.c + stubs.c ${CMAKE_CURRENT_BINARY_DIR}/activeds.def) add_library(activeds SHARED ${SOURCE}) Modified: branches/cmake-bringup/dll/win32/activeds/activeds.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actived… ============================================================================== --- branches/cmake-bringup/dll/win32/activeds/activeds.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/activeds/activeds.spec [iso-8859-1] Wed Dec 1 09:44:45 2010 @@ -1,28 +1,28 @@ 3 stdcall ADsGetObject(wstr ptr ptr) 4 stdcall ADsBuildEnumerator(ptr ptr) -5 stub ADsFreeEnumerator +5 stdcall ADsFreeEnumerator(ptr) 6 stdcall ADsEnumerateNext(ptr long ptr ptr) -7 stub ADsBuildVarArrayStr -8 stub ADsBuildVarArrayInt +7 stdcall ADsBuildVarArrayStr(ptr long ptr) +8 stdcall ADsBuildVarArrayInt(ptr long ptr) 9 stdcall ADsOpenObject(wstr wstr wstr long ptr ptr) -12 stub ADsSetLastError +12 stdcall ADsSetLastError(long str str) 13 stdcall ADsGetLastError(ptr ptr long ptr long) -14 stub AllocADsMem +14 stdcall AllocADsMem(long) 15 stdcall FreeADsMem(ptr) -16 stub ReallocADsMem -17 stub AllocADsStr -18 stub FreeADsStr -19 stub ReallocADsStr -20 stub ADsEncodeBinaryData -21 stub PropVariantToAdsType -22 stub AdsTypeToPropVariant -23 stub AdsFreeAdsValues -24 stub ADsDecodeBinaryData -25 stub AdsTypeToPropVariant2 -26 stub PropVariantToAdsType2 -27 stub ConvertSecDescriptorToVariant -28 stub ConvertSecurityDescriptorToSecDes -#@ stub DllCanUnloadNow -#@ stub DllGetClassObject -#@ stub DllRegisterServer -#@ stub DllUnregisterServer +16 stdcall ReallocADsMem(ptr long long) +17 stdcall AllocADsStr(ptr) +18 stdcall FreeADsStr(ptr) +19 stdcall ReallocADsStr(ptr ptr) +20 stdcall ADsEncodeBinaryData(ptr long ptr) +21 stdcall PropVariantToAdsType(ptr long ptr ptr) +22 stdcall AdsTypeToPropVariant(ptr long ptr) +23 stdcall AdsFreeAdsValues(ptr long) +24 stdcall ADsDecodeBinaryData(wstr ptr long) +25 cdecl AdsTypeToPropVariant2() # unknown prototype +26 cdecl PropVariantToAdsType2() # unknown prototype +27 cdecl ConvertSecDescriptorToVariant() # unknown prototype +28 cdecl ConvertSecurityDescriptorToSecDes() # unknown prototype +#@ stdcall -private DllCanUnloadNow() +#@ stdcall -private DllGetClassObject(ptr ptr ptr) +#@ stdcall -private DllRegisterServer() +#@ stdcall -private DllUnregisterServer() Added: branches/cmake-bringup/dll/win32/activeds/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/actived… ============================================================================== --- branches/cmake-bringup/dll/win32/activeds/stubs.c (added) +++ branches/cmake-bringup/dll/win32/activeds/stubs.c [iso-8859-1] Wed Dec 1 09:44:45 2010 @@ -1,0 +1,176 @@ +#include <windows.h> +#include <iads.h> +#include <stubs.h> + +// FIXME: should go to iads.h +typedef struct _adsvalue *PADSVALUE; + +HRESULT +WINAPI +ADsFreeEnumerator( + IN IEnumVARIANT *pEnumVariant) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +ADsBuildVarArrayStr( + LPWSTR *lppPathNames, + DWORD dwPathNames, + VARIANT *pVar) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +ADsBuildVarArrayInt( + LPDWORD lpdwObjectTypes, + DWORD dwObjectTypes, + VARIANT *pVar) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +VOID +WINAPI +ADsSetLastError( + IN DWORD dwErr, + IN LPCWSTR pszError, + IN LPCWSTR pszProvider) + +{ + UNIMPLEMENTED; +} + +LPVOID +WINAPI +AllocADsMem(DWORD cb) +{ + UNIMPLEMENTED; + return NULL; +} + +LPVOID +WINAPI +ReallocADsMem( + LPVOID pOldMem, + DWORD cbOld, + DWORD cbNew) +{ + UNIMPLEMENTED; + return NULL; +} + +LPWSTR +WINAPI +AllocADsStr(LPCWSTR pStr) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +WINAPI +FreeADsStr(IN LPWSTR pStr) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +WINAPI +ReallocADsStr( + IN OUT LPWSTR *ppStr, + IN LPWSTR pStr) +{ + UNIMPLEMENTED; + return FALSE; +} + +HRESULT +WINAPI +ADsEncodeBinaryData( + PBYTE pbSrcData, + DWORD dwSrcLen, + OUT LPWSTR *ppszDestData) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +PropVariantToAdsType( + VARIANT * pVariant, + DWORD dwNumVariant, + PADSVALUE *ppAdsValues, + PDWORD pdwNumValues) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +HRESULT +WINAPI +AdsTypeToPropVariant( + PADSVALUE pAdsValues, + DWORD dwNumValues, + VARIANT * pVariant) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +void +WINAPI +AdsFreeAdsValues( + PADSVALUE pAdsValues, + DWORD dwNumValues) +{ + UNIMPLEMENTED; +} + +HRESULT +WINAPI +ADsDecodeBinaryData( + LPCWSTR szSrcData, + PBYTE *ppbDestData, + ULONG *pdwDestLen) +{ + UNIMPLEMENTED; + return E_NOTIMPL; +} + +int AdsTypeToPropVariant2() +{ + DPRINT1("WARNING: calling stub AdsTypeToPropVariant2()\n"); + __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); + return 0; +} + +int PropVariantToAdsType2() +{ + DPRINT1("WARNING: calling stub PropVariantToAdsType2()\n"); + __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); + return 0; +} + +int ConvertSecDescriptorToVariant() +{ + DPRINT1("WARNING: calling stub ConvertSecDescriptorToVariant()\n"); + __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); + return 0; +} + +int ConvertSecurityDescriptorToSecDes() +{ + DPRINT1("WARNING: calling stub ConvertSecurityDescriptorToSecDes()\n"); + __wine_spec_unimplemented_stub("activeds.dll", __FUNCTION__); + return 0; +} + Propchange: branches/cmake-bringup/dll/win32/activeds/stubs.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[spetreolle] 49878: [CMAKE] Fix msvcrt and query build.
by spetreolle＠svn.reactos.org 30 Nov '10

30 Nov '10

Author: spetreolle Date: Tue Nov 30 22:31:17 2010 New Revision: 49878 URL: http://svn.reactos.org/svn/reactos?rev=49878&view=rev Log: [CMAKE] Fix msvcrt and query build. Added: branches/cmake-bringup/dll/win32/msvcrt/stubs.c - copied, changed from r49877, branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c Removed: branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt branches/cmake-bringup/dll/win32/query/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Tue Nov 30 22:31:17 2010 @@ -17,7 +17,7 @@ list(APPEND SOURCE dllmain.c - msvcrt_stubs.c + stubs.c msvcrt.rc ${CMAKE_CURRENT_BINARY_DIR}/msvcrt.def) Removed: branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c (removed) @@ -1,95 +1,0 @@ - -#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 ); -} - -#define UNIMPLEMENTED __wine_spec_unimplemented_stub("msvcrt.dll", __FUNCTION__) - -int __get_app_type() -{ - UNIMPLEMENTED; - return 0; -} - -int _fileinfo; - -void * -__p__fileinfo() -{ - return &_fileinfo; -} - -unsigned char _mbcasemap[1]; - -void * -__p__mbcasemap() -{ - return _mbcasemap; -} - -int _atodbl( - void * value, - char * str) -{ - UNIMPLEMENTED; - return 0; -} - -int _ismbbkprint( - unsigned int c) -{ - UNIMPLEMENTED; - return 0; -} - - -int MSVCRT__inp( - unsigned short port) -{ - return _inp(port); -} - -unsigned short MSVCRT__inpw( - unsigned short port) -{ - return _inpw(port); -} - -unsigned long MSVCRT__inpd( - unsigned short port) -{ - return _inpd(port); -} - - -int MSVCRT__outp( - unsigned short port, - int databyte) -{ - return _outp(port, databyte); -} - -unsigned short MSVCRT__outpw( - unsigned short port, - unsigned short dataword) -{ - return _outpw(port, dataword); -} - -unsigned long MSVCRT__outpd( - unsigned short port, - unsigned long dataword) -{ - return _outpd(port, dataword); -} Copied: branches/cmake-bringup/dll/win32/msvcrt/stubs.c (from r49877, branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c) URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/stubs.c [iso-8859-1] Tue Nov 30 22:31:17 2010 @@ -5,15 +5,7 @@ #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 ); -} - +void __wine_spec_unimplemented_stub( const char *module, const char *function ); #define UNIMPLEMENTED __wine_spec_unimplemented_stub("msvcrt.dll", __FUNCTION__) int __get_app_type() @@ -54,19 +46,19 @@ } -int MSVCRT__inp( +int MSVCRT__inp( unsigned short port) { return _inp(port); } -unsigned short MSVCRT__inpw( +unsigned short MSVCRT__inpw( unsigned short port) { return _inpw(port); } -unsigned long MSVCRT__inpd( +unsigned long MSVCRT__inpd( unsigned short port) { return _inpd(port); Modified: branches/cmake-bringup/dll/win32/query/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/query/C… ============================================================================== --- branches/cmake-bringup/dll/win32/query/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/query/CMakeLists.txt [iso-8859-1] Tue Nov 30 22:31:17 2010 @@ -4,7 +4,11 @@ spec2def(query.dll query.spec) -add_library(query SHARED query_main.c ${CMAKE_CURRENT_BINARY_DIR}/query.def) +list(APPEND SOURCE + query_main.c + ${CMAKE_CURRENT_BINARY_DIR}/query.def) + +add_library(query SHARED ${SOURCE}) set_module_type(query win32dll)

1 0

[tkreuzer] 49877: [SPEC2DEF] Handle stubs with stdcall decoration.
by tkreuzer＠svn.reactos.org 30 Nov '10

30 Nov '10

Author: tkreuzer Date: Tue Nov 30 20:58:44 2010 New Revision: 49877 URL: http://svn.reactos.org/svn/reactos?rev=49877&view=rev Log: [SPEC2DEF] Handle stubs with stdcall decoration. Modified: branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Tue Nov 30 20:58:44 2010 @@ -538,6 +538,33 @@ } } + /* Handle special stub cases */ + if (exp.nCallingConvention == CC_STUB) + { + /* Check for c++ mangled name */ + if (pc[0] == '?') + { + printf("Found c++ mangled name...\n"); + // + } + else + { + /* Check for stdcall name */ + char *p = strchr(pc, '@'); + if (p && (p - pc < exp.nNameLength)) + { + int i; + exp.nNameLength = p - pc; + exp.nStackBytes = atoi(p + 1); + exp.nArgCount = exp.nStackBytes / 4; + exp.nCallingConvention = CC_STDCALL; + exp.uFlags |= FL_STUB; + for (i = 0; i < exp.nArgCount; i++) + exp.anArgs[i] = ARG_LONG; + } + } + } + /* Get optional redirection */ if ((pc = NextToken(pc))) {

1 0

[spetreolle] 49876: [CMAKE] Stubs: Fix some win32 modules.
by spetreolle＠svn.reactos.org 30 Nov '10

30 Nov '10

Author: spetreolle Date: Tue Nov 30 20:57:01 2010 New Revision: 49876 URL: http://svn.reactos.org/svn/reactos?rev=49876&view=rev Log: [CMAKE] Stubs: Fix some win32 modules. Modified: branches/cmake-bringup/dll/win32/atl/CMakeLists.txt branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/netcfgx/CMakeLists.txt branches/cmake-bringup/dll/win32/netshell/CMakeLists.txt branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt branches/cmake-bringup/dll/win32/odbc32/CMakeLists.txt branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt branches/cmake-bringup/dll/win32/printui/CMakeLists.txt branches/cmake-bringup/dll/win32/pstorec/CMakeLists.txt branches/cmake-bringup/dll/win32/rasadhlp/CMakeLists.txt branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt branches/cmake-bringup/dll/win32/sfc/CMakeLists.txt branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt branches/cmake-bringup/dll/win32/url/CMakeLists.txt branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt 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] Tue Nov 30 20:57:01 2010 @@ -1,6 +1,3 @@ - -ADD_INTERFACE_DEFINITIONS(atl_atliface_header atliface.idl) - add_definitions(-D__WINESRC__) remove_definitions(-D_WIN32_WINNT=0x502) @@ -8,14 +5,19 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +ADD_INTERFACE_DEFINITIONS(atl_atliface_header atliface.idl) + +set_rc_compiler() spec2def(atl.dll atl.spec) -add_library(atl SHARED +list(APPEND SOURCE atl_ax.c atl_main.c registrar.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/atl.def) + +add_library(atl SHARED ${SOURCE}) set_module_type(atl win32dll) Modified: branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dbghelp… ============================================================================== --- branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -13,9 +13,10 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(dbghelp.dll dbghelp.spec) -add_library(dbghelp SHARED +list(APPEND SOURCE coff.c cpu_i386.c cpu_ppc.c @@ -42,6 +43,8 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/dbghelp.def) +add_library(dbghelp SHARED ${SOURCE}) + set_module_type(dbghelp win32dll) target_link_libraries(dbghelp Modified: branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mssign3… ============================================================================== --- branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mssign32/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -4,7 +4,11 @@ spec2def(mssign32.dll mssign32.spec) -add_library(mssign32 SHARED mssign32_main.c ${CMAKE_CURRENT_BINARY_DIR}/mssign32.def) +list(APPEND SOURCE + mssign32_main.c + ${CMAKE_CURRENT_BINARY_DIR}/mssign32.def) + +add_library(mssign32 SHARED ${SOURCE}) set_module_type(mssign32 win32dll) Modified: branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mssip32… ============================================================================== --- branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mssip32/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -4,7 +4,11 @@ spec2def(mssip32.dll mssip32.spec) -add_library(mssip32 SHARED main.c ${CMAKE_CURRENT_BINARY_DIR}/mssip32.def) +list(APPEND SOURCE + main.c + ${CMAKE_CURRENT_BINARY_DIR}/mssip32.def) + +add_library(mssip32 SHARED ${SOURCE}) set_module_type(mssip32 win32dll) Modified: branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvfw32… ============================================================================== --- branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvfw32/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -4,14 +4,17 @@ add_definitions(-D__WINESRC__) add_definitions(-D_WINE) +set_rc_compiler() spec2def(msvfw32.dll msvfw32.spec) -add_library(msvfw32 SHARED +list(APPEND SOURCE mciwnd.c msvideo_main.c drawdib.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msvfw32.def) + +add_library(msvfw32 SHARED ${SOURCE}) set_module_type(msvfw32 win32dll) Modified: branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -4,7 +4,7 @@ spec2def(netapi32.dll netapi32.spec) -add_library(netapi32 SHARED +list(APPEND SOURCE access.c apibuf.c browsr.c @@ -19,6 +19,8 @@ wksta.c ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def) +add_library(netapi32 SHARED ${SOURCE}) + set_module_type(netapi32 win32dll) target_link_libraries(netapi32 wine) Modified: branches/cmake-bringup/dll/win32/netcfgx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netcfgx… ============================================================================== --- branches/cmake-bringup/dll/win32/netcfgx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netcfgx/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -1,10 +1,10 @@ - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +set_rc_compiler() spec2def(netcfgx.dll netcfgx.spec) -add_library(netcfgx SHARED +list(APPEND SOURCE netcfgx.c classfactory.c netcfg_iface.c @@ -12,6 +12,8 @@ tcpipconf_notify.c netcfgx.rc ${CMAKE_CURRENT_BINARY_DIR}/netcfgx.def) + +add_library(netcfgx SHARED ${SOURCE}) set_module_type(netcfgx win32dll) Modified: branches/cmake-bringup/dll/win32/netshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netshel… ============================================================================== --- branches/cmake-bringup/dll/win32/netshell/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netshell/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -1,8 +1,8 @@ - add_definitions(-D_NETSHELL_) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +set_rc_compiler() spec2def(netshell.dll netshell.spec) list(APPEND SOURCE @@ -38,7 +38,8 @@ setupapi ws2_32 comctl32 - kernel32) + kernel32 + ntdll) add_pch(netshell ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) Modified: branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/newdev/… ============================================================================== --- branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/newdev/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -3,12 +3,14 @@ spec2def(newdev.dll newdev.spec) -add_library(newdev SHARED +list(APPEND SOURCE newdev.c stubs.c wizard.c newdev.rc ${CMAKE_CURRENT_BINARY_DIR}/newdev.def) + +add_library(newdev SHARED ${SOURCE}) set_module_type(newdev win32dll) Modified: branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntlanma… ============================================================================== --- branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ntlanman/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -3,7 +3,12 @@ spec2def(ntlanman.dll ntlanman.spec) -add_library(ntlanman SHARED ntlanman.c ntlanman.rc ${CMAKE_CURRENT_BINARY_DIR}/ntlanman.def) +list(APPEND SOURCE + ntlanman.c + ntlanman.rc + ${CMAKE_CURRENT_BINARY_DIR}/ntlanman.def) + +add_library(ntlanman SHARED ${SOURCE}) set_module_type(ntlanman win32dll) Modified: branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ntprint… ============================================================================== --- branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ntprint/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -1,10 +1,15 @@ - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) +set_rc_compiler() spec2def(ntprint.dll ntprint.spec) -add_library(ntprint SHARED ntprint.c ntprint.rc ${CMAKE_CURRENT_BINARY_DIR}/ntprint.def) +list(APPEND SOURCE + ntprint.c + ntprint.rc + ${CMAKE_CURRENT_BINARY_DIR}/ntprint.def) + +add_library(ntprint SHARED ${SOURCE}) set_module_type(ntprint win32dll) Modified: branches/cmake-bringup/dll/win32/odbc32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/odbc32/… ============================================================================== --- branches/cmake-bringup/dll/win32/odbc32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/odbc32/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -6,7 +6,11 @@ spec2def(odbc32.dll odbc32.spec) -add_library(odbc32 SHARED proxyodbc.c ${CMAKE_CURRENT_BINARY_DIR}/odbc32.def) +list(APPEND SOURCE + proxyodbc.c + ${CMAKE_CURRENT_BINARY_DIR}/odbc32.def) + +add_library(odbc32 SHARED ${SOURCE}) set_module_type(odbc32 win32dll) Modified: branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olesvr3… ============================================================================== --- branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -4,8 +4,11 @@ spec2def(olesvr32.dll olesvr32.spec) -add_library(olesvr32 SHARED olesvr_main.c +list(APPEND SOURCE + olesvr_main.c ${CMAKE_CURRENT_BINARY_DIR}/olesvr32.def) + +add_library(olesvr32 SHARED ${SOURCE}) set_entrypoint(olesvr32 0) Modified: branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olethk3… ============================================================================== --- branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/olethk32/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -2,9 +2,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) +set_rc_compiler() spec2def(olethk32.dll olethk32.spec) -add_library(olethk32 SHARED main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/olethk32.def) +list(APPEND SOURCE + main.c + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/olethk32.def) + +add_library(olethk32 SHARED ${SOURCE}) set_module_type(olethk32 win32dll) Modified: branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/pidgen/… ============================================================================== --- branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/pidgen/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -2,9 +2,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) +set_rc_compiler() spec2def(pidgen.dll pidgen.spec) -add_library(pidgen SHARED main.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/pidgen.def) +list(APPEND SOURCE + main.c + rsrc.rc + ${CMAKE_CURRENT_BINARY_DIR}/pidgen.def) + +add_library(pidgen SHARED ${SOURCE}) set_module_type(pidgen win32dll) Modified: branches/cmake-bringup/dll/win32/printui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/printui… ============================================================================== --- branches/cmake-bringup/dll/win32/printui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/printui/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -2,11 +2,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) +set_rc_compiler() spec2def(printui.dll printui.spec) -add_library(printui SHARED printui.c printui.rc +list(APPEND SOURCE + printui.c + printui.rc ${CMAKE_CURRENT_BINARY_DIR}/printui.def) +add_library(printui SHARED ${SOURCE}) set_entrypoint(printui 0) target_link_libraries(printui wine) 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] Tue Nov 30 20:57:01 2010 @@ -4,9 +4,15 @@ add_definitions(-D__WINESRC__) +set_rc_compiler() spec2def(pstorec.dll pstorec.spec) -add_library(pstorec SHARED pstorec.c rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/pstorec.def) +list(APPEND SOURCE + pstorec.c + rsrc.rc + ${CMAKE_CURRENT_BINARY_DIR}/pstorec.def) + +add_library(pstorec SHARED ${SOURCE}) set_module_type(pstorec win32dll) Modified: branches/cmake-bringup/dll/win32/rasadhlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasadhl… ============================================================================== --- branches/cmake-bringup/dll/win32/rasadhlp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rasadhlp/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -3,11 +3,13 @@ spec2def(rasadhlp.dll rasadhlp.spec) -add_library(rasadhlp SHARED +list(APPEND SOURCE autodial.c init.c winsock.c ${CMAKE_CURRENT_BINARY_DIR}/rasadhlp.def) + +add_library(rasadhlp SHARED ${SOURCE}) set_module_type(rasadhlp win32dll) Modified: branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasdlg/… ============================================================================== --- branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -1,7 +1,12 @@ spec2def(rasdlg.dll rasdlg.spec) -add_library(rasdlg SHARED rasdlg.c rasdlg.rc ${CMAKE_CURRENT_BINARY_DIR}/rasdlg.def) +list(APPEND SOURCE + rasdlg.c + rasdlg.rc + ${CMAKE_CURRENT_BINARY_DIR}/rasdlg.def) + +add_library(rasdlg SHARED ${SOURCE}) set_module_type(rasdlg win32dll) Modified: branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasman/… ============================================================================== --- branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rasman/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -1,7 +1,12 @@ - +set_rc_compiler() spec2def(rasman.dll rasman.spec) -add_library(rasman SHARED rasman.c rasman.rc ${CMAKE_CURRENT_BINARY_DIR}/rasman.def) +list(APPEND SOURCE + rasman.c + rasman.rc + ${CMAKE_CURRENT_BINARY_DIR}/rasman.def) + +add_library(rasman SHARED ${SOURCE}) set_module_type(rasman win32dll) Modified: branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/resutil… ============================================================================== --- branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/resutils/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -4,7 +4,11 @@ spec2def(resutils.dll resutils.spec) -add_library(resutils SHARED resutils.c ${CMAKE_CURRENT_BINARY_DIR}/resutils.def) +list(APPEND SOURCE + resutils.c + ${CMAKE_CURRENT_BINARY_DIR}/resutils.def) + +add_library(resutils SHARED ${SOURCE}) set_module_type(resutils win32dll) Modified: branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samlib/… ============================================================================== --- branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/samlib/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -2,9 +2,16 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) +set_rc_compiler() spec2def(samlib.dll samlib.spec) -add_library(samlib SHARED dllmain.c samlib.c samlib.rc ${CMAKE_CURRENT_BINARY_DIR}/samlib.def) +list(APPEND SOURCE + dllmain.c + samlib.c + samlib.rc + ${CMAKE_CURRENT_BINARY_DIR}/samlib.def) + +add_library(samlib SHARED ${SOURCE}) set_module_type(samlib win32dll) Modified: branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sccbase… ============================================================================== --- branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sccbase/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -4,7 +4,11 @@ spec2def(sccbase.dll sccbase.spec) -add_library(sccbase SHARED main.c ${CMAKE_CURRENT_BINARY_DIR}/sccbase.def) +list(APPEND SOURCE + main.c + ${CMAKE_CURRENT_BINARY_DIR}/sccbase.def) + +add_library(sccbase SHARED ${SOURCE}) set_module_type(sccbase win32dll) Modified: branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/schanne… ============================================================================== --- branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/schannel/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -1,15 +1,17 @@ - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) +set_rc_compiler() spec2def(schannel.dll schannel.spec) -add_library(schannel SHARED +list(APPEND SOURCE lsamode.c schannel_main.c usermode.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/schannel.def) + +add_library(schannel SHARED ${SOURCE}) set_module_type(schannel win32dll) Modified: branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/setupap… ============================================================================== --- branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/setupapi/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -12,9 +12,10 @@ ${REACTOS_SOURCE_DIR}/include/reactos/wine ${REACTOS_BINARY_DIR}/include/reactos/idl) +set_rc_compiler() spec2def(setupapi.dll setupapi.spec) -add_library(setupapi SHARED +list(APPEND SOURCE cfgmgr.c devclass.c devinst.c @@ -33,6 +34,8 @@ rpc.c setupapi.rc ${CMAKE_CURRENT_BINARY_DIR}/setupapi.def) + +add_library(setupapi SHARED ${SOURCE}) set_module_type(setupapi win32dll) Modified: branches/cmake-bringup/dll/win32/sfc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sfc/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/sfc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sfc/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -11,7 +11,7 @@ set_module_type(sfc win32dll) -add_importlibs(sfc msvcrt kernel32) +add_importlibs(sfc msvcrt kernel32 ntdll) add_pch(sfc ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_cab_target(sfc 1) Modified: branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shimgvw… ============================================================================== --- branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -1,7 +1,12 @@ spec2def(shimgvw.dll shimgvw.spec) -add_library(shimgvw SHARED shimgvw.c shimgvw.rc ${CMAKE_CURRENT_BINARY_DIR}/shimgvw.def) +list(APPEND SOURCE + shimgvw.c + shimgvw.rc + ${CMAKE_CURRENT_BINARY_DIR}/shimgvw.def) + +add_library(shimgvw SHARED ${SOURCE}) set_module_type(shimgvw win32dll) @@ -17,5 +22,4 @@ kernel32 ntdll) - add_cab_target(shimgvw 1) Modified: branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/slbcsp/… ============================================================================== --- branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/slbcsp/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -4,7 +4,11 @@ spec2def(slbcsp.dll slbcsp.spec) -add_library(slbcsp SHARED main.c ${CMAKE_CURRENT_BINARY_DIR}/slbcsp.def) +list(APPEND SOURCE + main.c + ${CMAKE_CURRENT_BINARY_DIR}/slbcsp.def) + +add_library(slbcsp SHARED ${SOURCE}) set_module_type(slbcsp win32dll) Modified: branches/cmake-bringup/dll/win32/url/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/url/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/url/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/url/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -4,9 +4,11 @@ spec2def(url.dll url.spec) -add_library(url SHARED +list(APPEND SOURCE url_main.c ${CMAKE_CURRENT_BINARY_DIR}/url.def) + +add_library(url SHARED ${SOURCE}) set_module_type(url win32dll) Modified: branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/usp10/C… ============================================================================== --- branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/usp10/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -4,13 +4,15 @@ spec2def(usp10.dll usp10.spec) -add_library(usp10 SHARED +list(APPEND SOURCE bidi.c usp10.c mirror.c shape.c shaping.c ${CMAKE_CURRENT_BINARY_DIR}/usp10.def) + +add_library(usp10 SHARED ${SOURCE}) set_module_type(usp10 win32dll) Modified: branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/uxtheme… ============================================================================== --- branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/uxtheme/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -1,10 +1,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) +set_rc_compiler() spec2def(uxtheme.dll uxtheme.spec) -add_library(uxtheme SHARED +list(APPEND SOURCE buffer.c draw.c main.c @@ -17,6 +18,8 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/uxtheme.def) +add_library(uxtheme SHARED ${SOURCE}) + set_module_type(uxtheme win32dll) target_link_libraries(uxtheme wine) Modified: branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/windows… ============================================================================== --- branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -11,9 +11,11 @@ ${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng ${REACTOS_SOURCE_DIR}/include/reactos/libs/libtiff) +set_rc_compiler() + spec2def(windowscodecs.dll windowscodecs.spec) -add_library(windowscodecs SHARED +list(APPEND SOURCE bmpdecode.c bmpencode.c clsfactory.c @@ -35,6 +37,8 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/windowscodecs.def) +add_library(windowscodecs SHARED ${SOURCE}) + set_module_type(windowscodecs win32dll) target_link_libraries(windowscodecs wine) Modified: branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wininet… ============================================================================== --- branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wininet/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -10,7 +10,7 @@ set_rc_compiler() -add_library(wininet SHARED +list(APPEND SOURCE cookie.c dialogs.c ftp.c @@ -25,6 +25,8 @@ version.rc ${CMAKE_CURRENT_BINARY_DIR}/wininet.def) +add_library(wininet SHARED ${SOURCE}) + set_module_type(wininet win32dll) target_link_libraries(wininet 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] Tue Nov 30 20:57:01 2010 @@ -5,12 +5,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_library(winspool SHARED +set_rc_compiler() + +list(APPEND SOURCE info.c stubs.c - winspool_winspool.stubs.c winspool.rc ${CMAKE_CURRENT_BINARY_DIR}/winspool.def) + +add_library(winspool SHARED ${SOURCE}) set_target_properties(winspool PROPERTIES SUFFIX ".drv") set_module_type(winspool win32dll) Modified: branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wintrus… ============================================================================== --- branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -2,9 +2,10 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(wintrust.dll wintrust.spec) -add_library(wintrust SHARED +list(APPEND SOURCE crypt.c register.c wintrust_main.c @@ -12,6 +13,8 @@ softpub.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def) + +add_library(wintrust SHARED ${SOURCE}) set_module_type(wintrust win32dll) Modified: branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wlanapi… ============================================================================== --- branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -3,8 +3,11 @@ spec2def(wlanapi.dll wlanapi.spec) -add_library(wlanapi SHARED main.c +list(APPEND SOURCE + main.c ${CMAKE_CURRENT_BINARY_DIR}/wlanapi.def) + +add_library(wlanapi SHARED ${SOURCE}) set_entrypoint(wlanapi 0) Modified: branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wldap32… ============================================================================== --- branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wldap32/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -2,9 +2,10 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(wldap32.dll wldap32.spec) -add_library(wldap32 SHARED +list(APPEND SOURCE add.c ber.c bind.c @@ -28,6 +29,8 @@ wldap32.rc ${CMAKE_CURRENT_BINARY_DIR}/wldap32.def) +add_library(wldap32 SHARED ${SOURCE}) + set_module_type(wldap32 win32dll) target_link_libraries(wldap32 wine) Modified: branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wtsapi3… ============================================================================== --- branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wtsapi32/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -4,7 +4,11 @@ spec2def(wtsapi32.dll wtsapi32.spec) -add_library(wtsapi32 SHARED wtsapi32.c ${CMAKE_CURRENT_BINARY_DIR}/wtsapi32.def) +list(APPEND SOURCE + wtsapi32.c + ${CMAKE_CURRENT_BINARY_DIR}/wtsapi32.def) + +add_library(wtsapi32 SHARED ${SOURCE}) set_module_type(wtsapi32 win32dll) Modified: branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xmllite… ============================================================================== --- branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xmllite/CMakeLists.txt [iso-8859-1] Tue Nov 30 20:57:01 2010 @@ -4,7 +4,12 @@ spec2def(xmllite.dll xmllite.spec) -add_library(xmllite SHARED reader.c xmllite_main.c ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def) +list(APPEND SOURCE + reader.c + xmllite_main.c + ${CMAKE_CURRENT_BINARY_DIR}/xmllite.def) + +add_library(xmllite SHARED ${SOURCE}) set_module_type(xmllite win32dll) @@ -13,5 +18,4 @@ add_importlibs(xmllite msvcrt kernel32 ntdll) - add_cab_target(xmllite 1)

1 0

[fireball] 49875: [FINDSTR] - Port findstr (incomplete, as author of this patch states, it may satisfy RosBE, .c .h and .rc files) from FreeDOS project. Needed for RosBE-on-ReactOS support. See iss...
by fireball＠svn.reactos.org 30 Nov '10

30 Nov '10

Author: fireball Date: Tue Nov 30 19:14:41 2010 New Revision: 49875 URL: http://svn.reactos.org/svn/reactos?rev=49875&view=rev Log: [FINDSTR] - Port findstr (incomplete, as author of this patch states, it may satisfy RosBE, .c .h and .rc files) from FreeDOS project. Needed for RosBE-on-ReactOS support. See issue #5724 for more details. Added: trunk/reactos/base/applications/findstr/ (with props) trunk/reactos/base/applications/findstr/findstr.c (with props) trunk/reactos/base/applications/findstr/findstr.rbuild (with props) trunk/reactos/base/applications/findstr/findstr.rc (with props) trunk/reactos/base/applications/findstr/lang/ (with props) trunk/reactos/base/applications/findstr/lang/bg-BG.rc (with props) trunk/reactos/base/applications/findstr/lang/ca-ES.rc (with props) trunk/reactos/base/applications/findstr/lang/cs-CZ.rc (with props) trunk/reactos/base/applications/findstr/lang/de-DE.rc (with props) trunk/reactos/base/applications/findstr/lang/el-GR.rc (with props) trunk/reactos/base/applications/findstr/lang/en-US.rc (with props) trunk/reactos/base/applications/findstr/lang/es-ES.rc (with props) trunk/reactos/base/applications/findstr/lang/fr-FR.rc (with props) trunk/reactos/base/applications/findstr/lang/it-IT.rc (with props) trunk/reactos/base/applications/findstr/lang/lt-LT.rc (with props) trunk/reactos/base/applications/findstr/lang/no-NO.rc (with props) trunk/reactos/base/applications/findstr/lang/pl-PL.rc (with props) trunk/reactos/base/applications/findstr/lang/pt-BR.rc (with props) trunk/reactos/base/applications/findstr/lang/ru-RU.rc (with props) trunk/reactos/base/applications/findstr/lang/sk-SK.rc (with props) trunk/reactos/base/applications/findstr/lang/sv-SE.rc (with props) trunk/reactos/base/applications/findstr/lang/uk-UA.rc (with props) trunk/reactos/base/applications/findstr/resource.h (with props) trunk/reactos/base/applications/findstr/rsrc.rc (with props) Modified: trunk/reactos/base/applications/applications.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/applicat… ============================================================================== --- trunk/reactos/base/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/applications.rbuild [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -21,6 +21,9 @@ </directory> <directory name="extrac32"> <xi:include href="extrac32/extrac32.rbuild" /> + </directory> + <directory name="findstr"> + <xi:include href="findstr/findstr.rbuild" /> </directory> <directory name="fontview"> <xi:include href="fontview/fontview.rbuild" /> Propchange: trunk/reactos/base/applications/findstr/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Nov 30 19:14:41 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/findstr/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/findstr/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/findstr/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/findstr/findstr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/findstr.c (added) +++ trunk/reactos/base/applications/findstr/findstr.c [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,295 @@ +/* findstr.c */ + +/* Copyright (C) 1994-2002, Jim Hall <jhall(a)freedos.org> */ + +/* Adapted for ReactOS -Edited for Findstr.exe K'Williams */ + +/* + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + + +/* This program locates a string in a text file and prints those lines + * that contain the string. Multiple files are clearly separated. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <ctype.h> +#include <windows.h> + +#include <io.h> +#include <dos.h> + +#include "resource.h" + + +/* Symbol definition */ +#define MAX_STR 1024 + + +/* This function prints out all lines containing a substring. There are some + * conditions that may be passed to the function. + * + * RETURN: If the string was found at least once, returns 1. + * If the string was not found at all, returns 0. + */ +int +find_str (char *sz, FILE *p, int invert_search, + int count_lines, int number_output, int ignore_case, int at_start, int literal_search, + int at_end, int reg_express, int exact_match, int sub_dirs, int only_fname) +{ + int i, length; + long line_number = 0, total_lines = 0; + char *c, temp_str[MAX_STR], this_line[MAX_STR]; + + /* Convert to upper if needed */ + if (ignore_case) + { + length = strlen (sz); + for (i = 0; i < length; i++) + sz[i] = toupper (sz[i]); + } + + /* Scan the file until EOF */ + while (fgets (temp_str, MAX_STR, p) != NULL) + { + /* Remove the trailing newline */ + length = strlen (temp_str); + if (temp_str[length-1] == '\n') + { + temp_str[length-1] = '\0'; + } + + /* Increment number of lines */ + line_number++; + strcpy (this_line, temp_str); + + /* Convert to upper if needed */ + if (ignore_case) + { + for (i = 0; i < length; i++) + { + temp_str[i] = toupper (temp_str[i]); + } + } + + /* Locate the substring */ + + /* strstr() returns a pointer to the first occurrence in the + string of the substring */ + c = strstr (temp_str, sz); + + if ( ((invert_search) ? (c == NULL) : (c != NULL)) ) + { + if (!count_lines) + { + if (number_output) + printf ("%ld:", line_number); + + /* Print the line of text */ + puts (this_line); + } + + total_lines++; + } /* long if */ + } /* while fgets */ + + if (count_lines) + { + /* Just show num. lines that contain the string */ + printf ("%ld\n", total_lines); + } + + + /* RETURN: If the string was found at least once, returns 1. + * If the string was not found at all, returns 0. + */ + return (total_lines > 0 ? 1 : 0); +} + +/* Show usage */ +void +usage (void) +{ + TCHAR lpUsage[4096]; + + LoadString( GetModuleHandle(NULL), IDS_USAGE, (LPTSTR)lpUsage, 4096); + CharToOem(lpUsage, lpUsage); + printf( lpUsage ); +} + + +/* Main program */ +int +main (int argc, char **argv) +{ + char *opt, *needle = NULL; + int ret = 0; + TCHAR lpMessage[4096]; + + int invert_search = 0; /* flag to invert the search */ + int count_lines = 0; /* flag to whether/not count lines */ + int number_output = 0; /* flag to print line numbers */ + int ignore_case = 0; /* flag to be case insensitive */ + int at_start = 0; /* flag to Match if at the beginning of a line. */ + int at_end = 0; /* flag to Match if at the beginning of a line. */ + int reg_express = 0; /* flag to use/not use regular expressions */ + int exact_match = 0; /* flag to be exact match */ + int sub_dirs= 0; /* this and all subdirectories */ + int only_fname= 0; /* print only the name of the file*/ + int literal_search=0; + + FILE *pfile; /* file pointer */ + int hfind; /* search handle */ + struct _finddata_t finddata; /* _findfirst, filenext block */ + + /* Scan the command line */ + while ((--argc) && (needle == NULL)) + { + if (*(opt = *++argv) == '/') + { + switch (opt[1]) + { + case 'b': + case 'B': /* Matches pattern if at the beginning of a line */ + at_start = 1; + break; + + //case 'c': + //case 'C': /* Literal? */ + // literal_search = 1; + // break; + + case 'e': + case 'E': /* matches pattern if at end of line */ + at_end = 1; + break; + + case 'i': + case 'I': /* Ignore */ + ignore_case = 1; + break; + + case 'm': + case 'M': /* only filename */ + only_fname = 1; + break; + + case 'n': + case 'N': /* Number */ + number_output = 1; + break; + + case 'r': + case 'R': /* search strings as regular expressions */ + reg_express = 1; + break; + + case 's': + case 'S': /* search files in child directory too*/ + sub_dirs = 1; + break; + + case 'v': + case 'V': /* Not with */ + invert_search = 1; + break; + + case 'x': + case 'X': /* exact match */ + exact_match = 1; + break; + + default: + usage (); + exit (2); /* syntax error .. return error 2 */ + break; + } + } + else + { + /* Get the string */ + if (needle == NULL) + { + /* Assign the string to find */ + needle = *argv; + } + } + } + + /* Check for search string */ + if (needle == NULL) + { + /* No string? */ + usage (); + exit (1); + } + + /* Scan the files for the string */ + if (argc == 0) + { + ret = find_str (needle, stdin, invert_search, count_lines, + number_output, ignore_case, at_start, literal_search, at_end, reg_express, exact_match, + sub_dirs, only_fname); + } + + while (--argc >= 0) + { + hfind = _findfirst (*++argv, &finddata); + if (hfind < 0) + { + /* We were not able to find a file. Display a message and + set the exit status. */ + LoadString( GetModuleHandle(NULL), IDS_NO_SUCH_FILE, (LPTSTR)lpMessage, 4096); + CharToOem(lpMessage, lpMessage); + fprintf (stderr, lpMessage, *argv);// + } + else + { + /* repeat find next file to match the filemask */ + do + { + /* We have found a file, so try to open it */ + if ((pfile = fopen (finddata.name, "r")) != NULL) + { + printf ("---------------- %s\n", finddata.name); + ret = find_str (needle, pfile, invert_search, count_lines, + number_output, ignore_case, at_start, literal_search, at_end, reg_express, exact_match, + sub_dirs, only_fname); + fclose (pfile); + } + else + { + LoadString(GetModuleHandle(NULL), IDS_CANNOT_OPEN, (LPTSTR)lpMessage, 4096); + CharToOem(lpMessage, lpMessage); + fprintf (stderr, lpMessage, + finddata.name); + } + } + while (_findnext(hfind, &finddata) > 0); + } + _findclose(hfind); + } /* for each argv */ + + /* RETURN: If the string was found at least once, returns 0. + * If the string was not found at all, returns 1. + * (Note that find_str.c returns the exact opposite values.) + */ + exit ( (ret ? 0 : 1) ); +} + + Propchange: trunk/reactos/base/applications/findstr/findstr.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/findstr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/findstr.rbuild (added) +++ trunk/reactos/base/applications/findstr/findstr.rbuild [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="findstr" type="win32cui" installbase="system32" installname="findstr.exe"> + <library>user32</library> + <file>findstr.c</file> + <file>findstr.rc</file> + <file>rsrc.rc</file> +</module> Propchange: trunk/reactos/base/applications/findstr/findstr.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/findstr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/findstr.rc (added) +++ trunk/reactos/base/applications/findstr/findstr.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,6 @@ +#define REACTOS_STR_FILE_DESCRIPTION "W32 findstr command\0" +#define REACTOS_STR_INTERNAL_NAME "findstr\0" +#define REACTOS_STR_ORIGINAL_FILENAME "findstr.exe\0" +#include <reactos/version.rc> + +#include "rsrc.rc" Propchange: trunk/reactos/base/applications/findstr/findstr.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/base/applications/findstr/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Nov 30 19:14:41 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/applications/findstr/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/applications/findstr/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/applications/findstr/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/applications/findstr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/bg-BG.rc (added) +++ trunk/reactos/base/applications/findstr/lang/bg-BG.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,17 @@ +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Èçâåæäà âñè÷êè ðåäîâå âúâ ôàéëà, êîèòî ñúäúðæàò óêàçàíèÿ íèç..\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"íèç\" [ ôàéë... ]\n\ + /C Áðîè êîëêî ðåäà ñúäúðæàò íèçà\n\ + /I Ïðåíåáðåãâà ÃëÀâÍÎñÒòà\n\ + /N Áðîé ïîêàçàíè ðåäîâå, êàòî ñå çàïî÷âà îò 1\n\ + /V Èçâåæäàíå íà ðåäîâåòå, ÍÅñúäúðæàùè íèçà." + +IDS_NO_SUCH_FILE, "FIND: %s: Íÿìà òàêúâ ôàéë\n" + +IDS_CANNOT_OPEN, "FIND: %s: Îòâàðÿíåòî íà ôàéëà å íåâúçìîæíî\n" + +END Propchange: trunk/reactos/base/applications/findstr/lang/bg-BG.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/ca-ES.rc (added) +++ trunk/reactos/base/applications/findstr/lang/ca-ES.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,17 @@ +LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Mostra totes les linies que continguin una determinada cadena de caràcters.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"Cadena de caràcters\" [ file... ]\n\ + /C Conta el numero de linies que contenen la cadena de caràcters\n\ + /I Ignora majúscules i minúscules\n\ + /N Numero de linies mostrades, començant per la primera\n\ + /V Mostra les linies que no contenen la cadena de caràcters" + +IDS_NO_SUCH_FILE, "FIND: %s: No he trobat el fitxer\n" + +IDS_CANNOT_OPEN, "FIND: %s: No puc obrir el fitxer\n" + +END Propchange: trunk/reactos/base/applications/findstr/lang/ca-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/cs-CZ.rc (added) +++ trunk/reactos/base/applications/findstr/lang/cs-CZ.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,23 @@ +/* FILE: applications/cmdutils/find/lang/cs-CZ.rc + * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) + * THANKS TO: Mario Kacmar aka Kario (kario(a)szm.sk) + * UPDATED: 2008-02-29 + */ + +LANGUAGE LANG_CZECH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Zobrazí vechny øádky souboru obsahující hledaný øetìzec.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"øetìzec\" [ soubor... ]\n\ + /C Zobrazí poèet øádkù obsahující øetìzec.\n\ + /I Ignoruje velikost písmen.\n\ + /N Èísluje zobrazené øádky, zaèíná od 1.\n\ + /V Zobrazí vechny øádky, které NEobsahují zadaný øetìec." + +IDS_NO_SUCH_FILE, "FIND: Soubor %s nebyl nalezen.\n" + +IDS_CANNOT_OPEN, "FIND: Soubor %s nelze otevøít!\n" + +END Propchange: trunk/reactos/base/applications/findstr/lang/cs-CZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/de-DE.rc (added) +++ trunk/reactos/base/applications/findstr/lang/de-DE.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,17 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "Sucht in einer Datei nach einer Zeichenfolge.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"string\" [ file... ]\n\ + /C Zeigt nur die Anzahl der die Zeichenfolge enthaltenen Zeilen an.\n\ + /I Ignoriert Groß-/Kleinbuchstaben bei der Suche.\n\ + /N Zeigt die Zeilen mit ihren Zeilennummern an.\n\ + /V Zeigt alle Zeilen an, die die Zeichenfolge NICHT enhalten." + +IDS_NO_SUCH_FILE, "Datei %s nicht gefunden\n" + +IDS_CANNOT_OPEN, "Datei %s kann nicht geöffnet werden.\n" + +END Propchange: trunk/reactos/base/applications/findstr/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/el-GR.rc (added) +++ trunk/reactos/base/applications/findstr/lang/el-GR.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,17 @@ +LANGUAGE LANG_GREEK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Åêôõðþíåé üëåò ôéò ãñáììÝò åíüò áñ÷åßïõ ðïõ ðåñéÝ÷ïõí Ýíá áëöáñéèìçôéêü.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"áëöáñéèìçôéêü\" [ áñ÷åßï... ]\n\ + /C ÌÝôñçóç ãñáììþí ðïõ ðåñéÝ÷ïõí ôï áëöáñéèìçôéêü\n\ + /I Áãíüçóç êåöáëáßùí\n\ + /N ÅìöÜíéóç áñéèìþí óôéò åìöáíéæüìåíåò ãñáììÝò, îåêéíþíôáò áðü ôï 1\n\ + /V Åêôýðùóç ãñáììþí ðïõ äåí ðåñéÝ÷ïõí ôï áëöáñéèìçôéêü" + +IDS_NO_SUCH_FILE, "FIND: %s: Äåí õðÜñ÷åé áõôü ôï áñ÷åßï\n" + +IDS_CANNOT_OPEN, "FIND: %s: Äåí Þôáí äõíáôü ôï Üíïéãìá ôïõ áñ÷åßïõ\n" + +END Propchange: trunk/reactos/base/applications/findstr/lang/el-GR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/en-US.rc (added) +++ trunk/reactos/base/applications/findstr/lang/en-US.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,17 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FINDSTR: Prints all lines of a file that contain a string.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"string\" [ file... ]\n\ + /C Count the number of lines that contain string\n\ + /I Ignore case\n\ + /N Number the displayed lines, starting at 1\n\ + /V Print lines that do not contain the string" + +IDS_NO_SUCH_FILE, "FINDSTR: %s: No such file\n" + +IDS_CANNOT_OPEN, "FINDSTR: %s: Cannot open file\n" + +END Propchange: trunk/reactos/base/applications/findstr/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/findstr/lang/es-ES.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,17 @@ +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Imprime todas las líneas de un fichero que contiene una cadena.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"cadena\" [ fichero... ]\n\ + /C Cuenta el número de líneas que contienen la cadena de caracteres\n\ + /I Ignora mayúsculas y minúsculas\n\ + /N Numero de líneas a mostrar en pantalla, a partir de la primera\n\ + /V Muestra las líneas que no contienen la cadena de caracteres." + +IDS_NO_SUCH_FILE, "FIND: %s: No se encontró el fichero\n" + +IDS_CANNOT_OPEN, "FIND: %s: No se pudo abrir el fichero\n" + +END Propchange: trunk/reactos/base/applications/findstr/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/findstr/lang/fr-FR.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,17 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Affiche toutes les lignes d'un fichier qui contiennent un morceau de texte.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"texte\" [ fichier... ]\n\ + /C Compte le nombre de lignes qui contiennent le texte\n\ + /I Insensible à la casse\n\ + /N Numérote les lignes affichées en commençant à 1\n\ + /V Affiche les lignes qui ne contiennent pas le texte" + +IDS_NO_SUCH_FILE, "FIND: %s : fichier inexistant\n" + +IDS_CANNOT_OPEN, "FIND: %s : impossible d'ouvrir le fichier\n" + +END Propchange: trunk/reactos/base/applications/findstr/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/it-IT.rc (added) +++ trunk/reactos/base/applications/findstr/lang/it-IT.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,17 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Visualizza le linee di un file che contengono un stringa.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"stringa\" [ file... ]\n\ + /C Conta il numero di linee che contengono la stringa\n\ + /I Ignora maiuscole/minuscole\n\ + /N Numera le linee visualizzate a partire da 1\n\ + /V Visualizza le linee che non contengono la stringa" + +IDS_NO_SUCH_FILE, "FIND: %s: File non trovato\n" + +IDS_CANNOT_OPEN, "FIND: %s: Impossibile aprire il file\n" + +END Propchange: trunk/reactos/base/applications/findstr/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/lt-LT.rc (added) +++ trunk/reactos/base/applications/findstr/lang/lt-LT.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,26 @@ +/* + * PROJECT: ReactOS find command + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/cmdutils/find/lang/lt-LT.rc + * PURPOSE: Lithuanian Language File + * TRANSLATOR: Vytis "CMan" Girdþijauskas (cman(a)cman.us) + * DATE: 2007-09-23 + */ + +LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Spausdina visas bylos eilutes, kuriose yra ieðkomas tekstas.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"tekstas\" [ byla... ]\n\ + /C Skaièiuoti eilutes, kuriose yra ieðkomas tekstas\n\ + /I Ignoruoti raidþiø dydá\n\ + /N Numeruoti vaizduojamas eilutes, pradedant nuo 1\n\ + /V Spausdinti eilutes, kuriose nëra ieðkomo teksto" + +IDS_NO_SUCH_FILE, "FIND: %s: Tokios bylos nëra\n" + +IDS_CANNOT_OPEN, "FIND: %s: Nepavyko atverti bylos\n" + +END Propchange: trunk/reactos/base/applications/findstr/lang/lt-LT.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/no-NO.rc (added) +++ trunk/reactos/base/applications/findstr/lang/no-NO.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,17 @@ +LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FINN: Skriv alle linjene for filen som inneholder en streng.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"streng\" [ fil... ]\n\ + /C Teller nummer av linjer som inneholder strenger\n\ + /I Ignorere sak\n\ + /N Nummer viste linjer, start med 1\n\ + /V Skriv linjer som ikke inneholder en streng" + +IDS_NO_SUCH_FILE, "FINN: %s: Ingen filer\n" + +IDS_CANNOT_OPEN, "FINN: %s: Kan ikke åpne filen\n" + +END Propchange: trunk/reactos/base/applications/findstr/lang/no-NO.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/pl-PL.rc (added) +++ trunk/reactos/base/applications/findstr/lang/pl-PL.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,24 @@ +/* + * translated by Caemyr - Olaf Siejka (Dec,2007) + * Use ReactOS forum PM or IRC to contact me + * http://www.reactos.org + * IRC: irc.freenode.net #reactos-pl + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Wywietla wszystkie linie danego pliku, zawieraj¹ce szukany ci¹g znaków.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"ci¹g znaków\" [ plik... ]\n\ + /C Oblicza w ilu liniach pojawi³ siê szukany ci¹g znaków\n\ + /I Ignoruje wielkoæ liter\n\ + /N Numeruje wywietlane linie, zaczynaj¹c od 1\n\ + /V Wywietla te linie które nie zawieraj¹ szukanego ci¹gu znaków" + +IDS_NO_SUCH_FILE, "FIND: %s: Plik nie zosta³ znaleziony\n" + +IDS_CANNOT_OPEN, "FIND: %s: Nie mo¿na otworzyæ pliku\n" + +END Propchange: trunk/reactos/base/applications/findstr/lang/pl-PL.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/pt-BR.rc (added) +++ trunk/reactos/base/applications/findstr/lang/pt-BR.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,17 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Localiza uma seqüência de texto em um ou mais arquivos.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"seqüência\" [ arquivo... ]\n\ + /C Exibe apenas o número de linhas que contêm a seqüência.\n\ + /I Ignora maiúsculas/minúsculas ao localizar uma seqüência.\n\ + /N Exibe o número de cada linha, iniciando no 1.\n\ + /V Exibe todas as linhas que NÃO contêm a seqüência especificada." + +IDS_NO_SUCH_FILE, "FIND: %s: Arquivo não encontrado\n" + +IDS_CANNOT_OPEN, "FIND: %s: Não foi possível abrir o arquivo\n" + +END Propchange: trunk/reactos/base/applications/findstr/lang/pt-BR.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/findstr/lang/ru-RU.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,17 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Ïîèñê òåêñòîâîé ñòðîêè â îäíîì èëè íåñêîëüêèõ ôàéëàõ.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"ñòðîêà\" [ ôàéë... ]\n\ + /C Âûâîä òîëüêî îáùåãî ÷èñëà ñòðîê, ñîäåðæàùèõ çàäàííóþ ñòðîêó.\n\ + /I Ïîèñê áåç ó÷åòà ðåãèñòðà ñèìâîëîâ.\n\ + /N Âûâîä íîìåðîâ îòîáðàæàåìûõ ñòðîê (íà÷èíàÿ ñ 1).\n\ + /V Âûâîä âñåõ ñòðîê, ÍÅ ñîäåðæàùèõ çàäàííóþ ñòðîêó." + +IDS_NO_SUCH_FILE, "FIND: %s: Ôàéë íå ñóùåñòâóåò.\n" + +IDS_CANNOT_OPEN, "FIND: %s: Íåâîçìîæíî îòêðûòü ôàéë.\n" + +END Propchange: trunk/reactos/base/applications/findstr/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/sk-SK.rc (added) +++ trunk/reactos/base/applications/findstr/lang/sk-SK.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,21 @@ +/* TRANSLATOR: M rio Kam r /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 12-02-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Zobraz¡ vçetky riadky s£boru obsahuj£ce hadanì reazec.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"reazec\" [ s£bor... ]\n\ + /C Zobraz¡ poet riadkov, ktor obsahuj£ reazec.\n\ + /I Ignoruje vekos p¡smen.\n\ + /N ¬¡sluje zobrazen riadky, za¡na od 1.\n\ + /V Zobraz¡ vçetky riadky, ktor neobsahuj£ hadanì reazec." + +IDS_NO_SUCH_FILE, "FIND: S£bor %s sa nenaçiel.\n" + +IDS_CANNOT_OPEN, "FIND: S£bor %s sa ned otvori.\n" + +END Propchange: trunk/reactos/base/applications/findstr/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/sv-SE.rc (added) +++ trunk/reactos/base/applications/findstr/lang/sv-SE.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,17 @@ +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Skriver ut alla rader i en fil som innehåller en sträng.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"sträng\" [ fil... ]\n\ + /C Räkna nummren av linjer som innehåller en strängen\n\ + /I Ignorera skiftläge\n\ + /N Antal visade rader, börjar på 1\n\ + /V Skriver ut rader som inte innehåller strängen" + +IDS_NO_SUCH_FILE, "FIND: %s: Ingen sorts fil\n" + +IDS_CANNOT_OPEN, "FIND: %s: Kan inte öppna filen\n" + +END Propchange: trunk/reactos/base/applications/findstr/lang/sv-SE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/lang/uk-UA.rc (added) +++ trunk/reactos/base/applications/findstr/lang/uk-UA.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,25 @@ +/* + * PROJECT: Find + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/cmdutils/find/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for find + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Âèâåäåííÿ âñ³õ ðÿäê³â ôàéëó, ÿê³ ì³ñòÿòü ðÿäîê.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"ðÿäîê\" [ ôàéë... ]\n\ + /C Ïîðàõóâàòè ê³ëüê³ñòü ðÿäê³â, ÿê³ ì³ñòÿòü ðÿäîê\n\ + /I Íå âðàõîâóâàòè ðåã³ñòð ñèìâîë³â\n\ + /N Íóìåðóâàòè ðÿäêè, ÿê³ â³äîáðàæàþòüñÿ (ïî÷èíàþ÷è ç 1)\n\ + /V Âèâåäåííÿ ðÿäê³â, ÿê³ íå ì³ñòÿòü çàäàíèé ðÿäîê" + +IDS_NO_SUCH_FILE, "FIND: %s: Ôàéë íå ³ñíóº\n" + +IDS_CANNOT_OPEN, "FIND: %s: Íåìîæëèâî â³äêðèòè ôàéë\n" + +END Propchange: trunk/reactos/base/applications/findstr/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/resource.h (added) +++ trunk/reactos/base/applications/findstr/resource.h [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,3 @@ +#define IDS_USAGE 1000 +#define IDS_NO_SUCH_FILE 1001 +#define IDS_CANNOT_OPEN 1002 Propchange: trunk/reactos/base/applications/findstr/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/findstr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… ============================================================================== --- trunk/reactos/base/applications/findstr/rsrc.rc (added) +++ trunk/reactos/base/applications/findstr/rsrc.rc [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -1,0 +1,20 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/bg-BG.rc" +#include "lang/ca-ES.rc" +#include "lang/cs-CZ.rc" +#include "lang/de-DE.rc" +#include "lang/el-GR.rc" +#include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/fr-FR.rc" +#include "lang/it-IT.rc" +#include "lang/lt-LT.rc" +#include "lang/no-NO.rc" +#include "lang/pl-PL.rc" +#include "lang/pt-BR.rc" +#include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" +#include "lang/sv-SE.rc" +#include "lang/uk-UA.rc" Propchange: trunk/reactos/base/applications/findstr/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue Nov 30 19:14:41 2010 @@ -45,6 +45,7 @@ base\applications\control\control.exe 1 base\applications\dxdiag\dxdiag.exe 1 base\applications\extrac32\extrac32.exe 1 +base\applications\findstr\findstr.exe 1 base\applications\fontview\fontview.exe 1 base\applications\games\solitaire\sol.exe 1 base\applications\games\spider\spider.exe 1

1 0

[spetreolle] 49874: [CMAKE] Add d3dx9_36 importlib.
by spetreolle＠svn.reactos.org 30 Nov '10

30 Nov '10

Author: spetreolle Date: Tue Nov 30 17:51:44 2010 New Revision: 49874 URL: http://svn.reactos.org/svn/reactos?rev=49874&view=rev Log: [CMAKE] Add d3dx9_36 importlib. Added: branches/cmake-bringup/importlibs/libd3dx9_36.a (with props) Added: branches/cmake-bringup/importlibs/libd3dx9_36.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libd3d… ============================================================================== Binary file - no diff available. Propchange: branches/cmake-bringup/importlibs/libd3dx9_36.a ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[fireball] 49873: [CMD] - Carlo Bramix: MultiByteToWideChar() has just 6 and not 8 parameters, probably it's a forgetten copy/past from WideCharToMultiByte(). - Carlo Bramix: ConvertULargeInteger()...
by fireball＠svn.reactos.org 30 Nov '10

30 Nov '10

Author: fireball Date: Tue Nov 30 16:38:53 2010 New Revision: 49873 URL: http://svn.reactos.org/svn/reactos?rev=49873&view=rev Log: [CMD] - Carlo Bramix: MultiByteToWideChar() has just 6 and not 8 parameters, probably it's a forgetten copy/past from WideCharToMultiByte(). - Carlo Bramix: ConvertULargeInteger() should have its parameter 'Len' declared as UINT rather than 'INT'. This fixes a signed/unsigned mismatch warning. See issue #5678 for more details. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/precomp.h Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Tue Nov 30 16:38:53 2010 @@ -180,7 +180,7 @@ * insert commas into a number */ INT -ConvertULargeInteger(ULONGLONG num, LPTSTR des, INT len, BOOL bPutSeperator) +ConvertULargeInteger(ULONGLONG num, LPTSTR des, UINT len, BOOL bPutSeperator) { TCHAR temp[39]; /* maximum length with nNumberGroups == 1 */ UINT n, iTarget; Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Tue Nov 30 16:38:53 2010 @@ -99,7 +99,7 @@ /* Prototypes for CMD.C */ -INT ConvertULargeInteger(ULONGLONG num, LPTSTR des, INT len, BOOL bPutSeperator); +INT ConvertULargeInteger(ULONGLONG num, LPTSTR des, UINT len, BOOL bPutSeperator); HANDLE RunFile(DWORD, LPTSTR, LPTSTR, LPTSTR, INT); INT ParseCommandLine(LPTSTR); struct _PARSED_COMMAND; Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Tue Nov 30 16:38:53 2010 @@ -131,7 +131,7 @@ error_out_of_memory(); return; } - len = MultiByteToWideChar(OutputCodePage, 0, str, len, buffer, len, NULL, NULL); + len = MultiByteToWideChar(OutputCodePage, 0, str, len, buffer, len); str = (PVOID)buffer; #endif WriteFile(hOutput, str, len * sizeof(WCHAR), &dwWritten, NULL); Modified: trunk/reactos/base/shell/cmd/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/precomp.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/precomp.h [iso-8859-1] Tue Nov 30 16:38:53 2010 @@ -23,6 +23,7 @@ #include <stdarg.h> #include <math.h> #include <time.h> +#include <assert.h> #define NTOS_MODE_USER #include <ndk/ntndk.h>

1 0

[fireball] 49872: [DDRAW] - Jerome Gardou: Almost all of the ddraw->refcount winetests pass. One remains, due to the fact that IdirectDrawSurface::SetPalette is unimplemented. IDirectDraw::Createpa...
by fireball＠svn.reactos.org 30 Nov '10

30 Nov '10

Author: fireball Date: Tue Nov 30 16:29:49 2010 New Revision: 49872 URL: http://svn.reactos.org/svn/reactos?rev=49872&view=rev Log: [DDRAW] - Jerome Gardou: Almost all of the ddraw->refcount winetests pass. One remains, due to the fact that IdirectDrawSurface::SetPalette is unimplemented. IDirectDraw::Createpalette is implemented too, but needs testing. There are no parameter checks. - Comments from me: The patch is not build-tested, however I did my best to merge it to existing ddraw and I prefer the actual code to be in the repository rather than hanging in bugzilla for years (last comment to the patch is dated 29.10.2009). See issue #4909 for more details. Added: trunk/reactos/dll/directx/ddraw/Palette/createpalette.c (with props) trunk/reactos/dll/directx/ddraw/Palette/palette.c (with props) Modified: trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c trunk/reactos/dll/directx/ddraw/Surface/createsurface.c trunk/reactos/dll/directx/ddraw/Surface/surface_main.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface4_Vtable.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface7_Vtable.c trunk/reactos/dll/directx/ddraw/ddraw.rbuild trunk/reactos/dll/directx/ddraw/rosdraw.h trunk/reactos/dll/directx/ddraw/startup.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/ca… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/callbacks_dd_hel.c [iso-8859-1] Tue Nov 30 16:29:49 2010 @@ -75,9 +75,46 @@ DX_STUB; } -DWORD CALLBACK HelDdCreatePalette(LPDDHAL_CREATEPALETTEDATA lpCreatePalette) +DWORD CALLBACK HelDdCreatePalette(LPDDHAL_CREATEPALETTEDATA lpCreatePalette) { - DX_STUB; + DDRAWI_DDRAWPALETTE_GBL* ddPalGbl = lpCreatePalette->lpDDPalette; + LOGPALETTE* logPal ; + WORD size=1; + + if(ddPalGbl->dwFlags & DDRAWIPAL_2) + size = 2; + else if(ddPalGbl->dwFlags & DDRAWIPAL_4) + size = 4; + else if(ddPalGbl->dwFlags & DDRAWIPAL_16) + size = 16; + else if(ddPalGbl->dwFlags & DDRAWIPAL_256) + size = 256; + + DxHeapMemAlloc(logPal, sizeof(LOGPALETTE) + size*sizeof(PALETTEENTRY)); + if(logPal == NULL) + { + lpCreatePalette->ddRVal = DDERR_OUTOFMEMORY; + return DDHAL_DRIVER_HANDLED; + } + + logPal->palVersion = 0x300; + logPal->palNumEntries = size; + CopyMemory(&logPal->palPalEntry[0], lpCreatePalette->lpColorTable, size*sizeof(PALETTEENTRY)); + + ddPalGbl->hHELGDIPalette = CreatePalette(logPal); + + if (ddPalGbl->hHELGDIPalette == NULL) + { + DxHeapMemFree(logPal); + lpCreatePalette->ddRVal = DDERR_INVALIDOBJECT; + return DDHAL_DRIVER_HANDLED; + } + + DxHeapMemFree(logPal); + ddPalGbl->lpColorTable = lpCreatePalette->lpColorTable; + ddPalGbl->dwFlags |= DDRAWIPAL_INHEL | DDRAWIPAL_GDI ; + lpCreatePalette->ddRVal = DD_OK; + return DDHAL_DRIVER_HANDLED; } DWORD CALLBACK HelDdGetScanLine(LPDDHAL_GETSCANLINEDATA lpGetScanLine) Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] Tue Nov 30 16:29:49 2010 @@ -533,6 +533,9 @@ } _SEH2_END; + if(*ppSurf != NULL) + Main_DirectDraw_AddRef(This); + LeaveCriticalSection(&ddcs); return ret; } @@ -540,11 +543,36 @@ /* 5 of 31 DirectDraw7_Vtable api are working simluare to windows */ /* 8 of 31 DirectDraw7_Vtable api are under devloping / testing */ - - - - - - - - +HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, + LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN pUnkOuter) +{ + HRESULT ret = DD_OK; + DX_WINDBG_trace(); + + EnterCriticalSection(&ddcs); + *ppPalette = NULL; + + _SEH2_TRY + { + ret = Internal_CreatePalette(This, dwFlags, palent, ppPalette, pUnkOuter); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = DDERR_INVALIDPARAMS; + } + _SEH2_END; + + //Versions 7 and 4 are addref'ed + if((This->lpVtbl == &DirectDraw7_Vtable || This->lpVtbl == &DirectDraw4_Vtable) && *ppPalette != NULL) + Main_DirectDraw_AddRef(This) ; + + LeaveCriticalSection(&ddcs); + return ret; +} + + + + + + + Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_stubs.c [iso-8859-1] Tue Nov 30 16:29:49 2010 @@ -19,13 +19,6 @@ DWORD dwFlags, LPDIRECTDRAWCLIPPER *ppClipper, IUnknown *pUnkOuter) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -HRESULT WINAPI Main_DirectDraw_CreatePalette(LPDDRAWI_DIRECTDRAW_INT This, DWORD dwFlags, - LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN pUnkOuter) { DX_WINDBG_trace(); DX_STUB; Added: trunk/reactos/dll/directx/ddraw/Palette/createpalette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Palette/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Palette/createpalette.c (added) +++ trunk/reactos/dll/directx/ddraw/Palette/createpalette.c [iso-8859-1] Tue Nov 30 16:29:49 2010 @@ -1,0 +1,135 @@ +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS DirectX + * FILE: ddraw/surface/createsurface.c + * PURPOSE: IDirectDrawPalette Creation + * PROGRAMMER: Jérôme Gardou + * + */ +#include "rosdraw.h" + +DWORD ConvertPCapsFlags(DWORD dwFlags) +{ + DWORD ret = 0; + if(dwFlags & DDPCAPS_4BIT) + ret|=DDRAWIPAL_16; + if(dwFlags & DDPCAPS_8BIT) + ret|=DDRAWIPAL_256; + if(dwFlags & DDPCAPS_8BITENTRIES) + ret|=DDRAWIPAL_STORED_8INDEX; + if(dwFlags & DDPCAPS_ALLOW256) + ret|=DDRAWIPAL_ALLOW256; + if(dwFlags & DDPCAPS_ALPHA) + ret|=DDRAWIPAL_ALPHA; + if(dwFlags & DDPCAPS_1BIT) + ret|=DDRAWIPAL_2; + if(dwFlags & DDPCAPS_2BIT) + ret|=DDRAWIPAL_4; + + return ret; +} + +HRESULT +Internal_CreatePalette( LPDDRAWI_DIRECTDRAW_INT pDDraw, DWORD dwFlags, + LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN pUnkOuter) +{ + DDHAL_CREATEPALETTEDATA mDdCreatePalette = { 0 }; + + LPDDRAWI_DDRAWPALETTE_INT ThisPalInt = NULL; + LPDDRAWI_DDRAWPALETTE_LCL ThisPalLcl = NULL; + LPDDRAWI_DDRAWPALETTE_GBL ThisPalGbl = NULL; + + HRESULT ret; + + if(pUnkOuter) + { + return CLASS_E_NOAGGREGATION; + } + + if(!(pDDraw->lpLcl->dwLocalFlags & DDRAWILCL_SETCOOPCALLED)) + { + return DDERR_NOCOOPERATIVELEVELSET; + } + + + if (pDDraw->lpLcl->dwProcessId != GetCurrentProcessId() ) + { + return DDERR_INVALIDOBJECT; + } + + /* Allocate the palette interface and needed members */ + DxHeapMemAlloc(ThisPalInt, sizeof( DDRAWI_DDRAWPALETTE_INT ) ); + if( ThisPalInt == NULL ) + { + ret = DDERR_OUTOFMEMORY; + goto cleanup; + } + + DxHeapMemAlloc(ThisPalLcl, sizeof( DDRAWI_DDRAWPALETTE_LCL ) ); + if( ThisPalLcl == NULL ) + { + ret = DDERR_OUTOFMEMORY; + goto cleanup; + } + + DxHeapMemAlloc(ThisPalGbl, sizeof( DDRAWI_DDRAWPALETTE_GBL ) ); + if( ThisPalGbl == NULL ) + { + ret = DDERR_OUTOFMEMORY; + goto cleanup; + } + + /*Some initial setup*/ + + ThisPalInt->lpLcl = ThisPalLcl; + ThisPalLcl->lpGbl = ThisPalGbl; + + ThisPalLcl->lpDD_lcl = ThisPalGbl->lpDD_lcl = pDDraw->lpLcl; + ThisPalGbl->dwFlags = ConvertPCapsFlags(dwFlags); + + ThisPalInt->lpVtbl = (PVOID)&DirectDrawPalette_Vtable; + ThisPalGbl->dwProcessId = GetCurrentProcessId(); + + mDdCreatePalette.lpDD = pDDraw->lpLcl->lpGbl; + mDdCreatePalette.lpDDPalette = ThisPalGbl; + if(pDDraw->lpLcl->lpGbl->lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CREATEPALETTE) { + mDdCreatePalette.CreatePalette = pDDraw->lpLcl->lpGbl->lpDDCBtmp->HALDD.CreatePalette; + DX_STUB_str("Using HAL CreatePalette\n"); + } + else { + mDdCreatePalette.CreatePalette = pDDraw->lpLcl->lpGbl->lpDDCBtmp->HELDD.CreatePalette; + DX_STUB_str("Using HEL CreatePalette\n"); + } + mDdCreatePalette.ddRVal = DDERR_GENERIC; + mDdCreatePalette.lpColorTable = palent; + + if (mDdCreatePalette.CreatePalette(&mDdCreatePalette) == DDHAL_DRIVER_NOTHANDLED) + { + DX_STUB_str("mDdCreateSurface failed with DDHAL_DRIVER_NOTHANDLED."); + ret = DDERR_NOTINITIALIZED; + goto cleanup; + } + + if (mDdCreatePalette.ddRVal != DD_OK) + { + DX_STUB_str("mDdCreateSurface failed."); + ret = mDdCreatePalette.ddRVal; + goto cleanup; + } + + *ppPalette = (LPDIRECTDRAWPALETTE)ThisPalInt; + ThisPalInt->lpLink = pDDraw->lpLcl->lpGbl->palList; + pDDraw->lpLcl->lpGbl->palList = ThisPalInt; + ThisPalInt->lpLcl->dwReserved1 = (ULONG_PTR)pDDraw; + IDirectDrawPalette_AddRef(*ppPalette); + + return DD_OK; + +cleanup: + if(ThisPalInt) DxHeapMemFree(ThisPalInt); + if(ThisPalLcl) DxHeapMemFree(ThisPalLcl); + if(ThisPalGbl) DxHeapMemFree(ThisPalGbl); + + return ret; +} Propchange: trunk/reactos/dll/directx/ddraw/Palette/createpalette.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ddraw/Palette/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Palette/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Palette/palette.c (added) +++ trunk/reactos/dll/directx/ddraw/Palette/palette.c [iso-8859-1] Tue Nov 30 16:29:49 2010 @@ -1,0 +1,157 @@ +/* $Id: palette.c $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS DirectX + * FILE: ddraw/Palette/palette.c + * PURPOSE: IDirectDrawPalette Implementation + * PROGRAMMER: Jérôme Gardou + * + */ + +#include "rosdraw.h" + +/***************************************************************************** + * IDirectDrawPalette::QueryInterface + * + * A usual QueryInterface implementation. Can only Query IUnknown and + * IDirectDrawPalette + * + * Params: + * refiid: The interface id queried for + * obj: Address to return the interface pointer at + * + * Returns: + * S_OK on success + * E_NOINTERFACE if the requested interface wasn't found + *****************************************************************************/ +static HRESULT WINAPI +DirectDrawPalette_QueryInterface(IDirectDrawPalette *iface, + REFIID refiid, + void **obj) +{ + if (IsEqualGUID(refiid, &IID_IUnknown) + || IsEqualGUID(refiid, &IID_IDirectDrawPalette)) + { + *obj = iface; + IDirectDrawPalette_AddRef(iface); + return S_OK; + } + else + { + *obj = NULL; + return E_NOINTERFACE; + } +} + +/***************************************************************************** + * IDirectDrawPaletteImpl::AddRef + * + * Increases the refcount. + * + * Returns: + * The new refcount + * + *****************************************************************************/ +static ULONG WINAPI +DirectDrawPalette_AddRef(IDirectDrawPalette *iface) +{ + LPDDRAWI_DDRAWPALETTE_INT This = (LPDDRAWI_DDRAWPALETTE_INT)iface; + ULONG ref = 0; + + _SEH2_TRY + { + ref = ++This->dwIntRefCnt; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END + + return ref; +} + +/***************************************************************************** + * IDirectDrawPaletteImpl::Release + * + * Reduces the refcount. If the refcount falls to 0, the object is destroyed + * + * Returns: + * The new refcount + * + *****************************************************************************/ +static ULONG WINAPI +DirectDrawPalette_Release(IDirectDrawPalette *iface) +{ + LPDDRAWI_DDRAWPALETTE_INT This = (LPDDRAWI_DDRAWPALETTE_INT)iface; + ULONG ref = 0; + + _SEH2_TRY + { + ref = --This->dwIntRefCnt; + if(ref == 0) + { + AcquireDDThreadLock(); + if(((LPDDRAWI_DIRECTDRAW_INT)This->lpLcl->dwReserved1)->lpVtbl == &DirectDraw7_Vtable + || ((LPDDRAWI_DIRECTDRAW_INT)This->lpLcl->dwReserved1)->lpVtbl == &DirectDraw4_Vtable) + Main_DirectDraw_Release((LPDDRAWI_DIRECTDRAW_INT)This->lpLcl->dwReserved1) ; + DxHeapMemFree(This); //HUGE FIXME!!! + ReleaseDDThreadLock(); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END + + return ref; +} + +static HRESULT WINAPI +DirectDrawPalette_Initialize( LPDIRECTDRAWPALETTE iface, + LPDIRECTDRAW ddraw, + DWORD dwFlags, + LPPALETTEENTRY palent) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +static HRESULT WINAPI +DirectDrawPalette_GetEntries( LPDIRECTDRAWPALETTE iface, + DWORD dwFlags, + DWORD dwStart, DWORD dwCount, + LPPALETTEENTRY palent) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +static HRESULT WINAPI +DirectDrawPalette_SetEntries( LPDIRECTDRAWPALETTE iface, + DWORD dwFlags, + DWORD dwStart, + DWORD dwCount, + LPPALETTEENTRY palent) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +static HRESULT WINAPI +DirectDrawPalette_GetCaps( LPDIRECTDRAWPALETTE iface, + LPDWORD lpdwCaps) +{ + DX_WINDBG_trace(); + DX_STUB; +} + +const IDirectDrawPaletteVtbl DirectDrawPalette_Vtable = +{ + DirectDrawPalette_QueryInterface, + DirectDrawPalette_AddRef, + DirectDrawPalette_Release, + DirectDrawPalette_GetCaps, + DirectDrawPalette_GetEntries, + DirectDrawPalette_Initialize, + DirectDrawPalette_SetEntries +}; Propchange: trunk/reactos/dll/directx/ddraw/Palette/palette.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] Tue Nov 30 16:29:49 2010 @@ -182,7 +182,6 @@ /* FIXME ThisSurfaceMore->dmiDDrawReserved7.wMonitorsAttachedToDesktop */ ThisSurfMore->dmiDDrawReserved7.wMonitorsAttachedToDesktop = 1; pDDraw->lpLcl->lpPrimary = ThisSurfInt; - Main_DirectDraw_AddRef(pDDraw); } else { Modified: trunk/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Tue Nov 30 16:29:49 2010 @@ -264,14 +264,28 @@ ULONG WINAPI Main_DDrawSurface_Release(LPDDRAWI_DDRAWSURFACE_INT This) { - /* FIXME This is not right exiame how it should be done */ - DX_STUB_str("FIXME This is not right exiame how it should be done\n"); - return This->dwIntRefCnt; -} - + ULONG ret = --This->dwIntRefCnt; + if(!ret) + { + DX_STUB_str("Release is a bit simplistic right now\n"); + AcquireDDThreadLock(); + DxHeapMemFree(This); + ReleaseDDThreadLock(); + } + return ret; +} + +ULONG WINAPI Main_DDrawSurface_Release4(LPDDRAWI_DDRAWSURFACE_INT This) +{ + ULONG ref = Main_DDrawSurface_Release(This) ; + + if(ref == 0) Main_DirectDraw_Release(This->lpLcl->lpSurfMore->lpDD_int); + + return ref; +} HRESULT WINAPI Main_DDrawSurface_Blt(LPDDRAWI_DDRAWSURFACE_INT ThisDest, LPRECT rdst, LPDDRAWI_DDRAWSURFACE_INT ThisSrc, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface4_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface4_Vtable.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface4_Vtable.c [iso-8859-1] Tue Nov 30 16:29:49 2010 @@ -16,7 +16,7 @@ #endif ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE4); -ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE4); +ULONG WINAPI Main_DDrawSurface_Release4(LPDIRECTDRAWSURFACE4); HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE4, REFIID, LPVOID*); HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE4, HDC); HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE4, LPRECT, LPDIRECTDRAWSURFACE4, LPRECT, DWORD, LPDDBLTFX); @@ -68,7 +68,7 @@ { Main_DDrawSurface_QueryInterface, Main_DDrawSurface_AddRef, /* (Compact done) */ - Main_DDrawSurface_Release, + Main_DDrawSurface_Release4, Main_DDrawSurface_AddAttachedSurface, Main_DDrawSurface_AddOverlayDirtyRect, Main_DDrawSurface_Blt, Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface7_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface7_Vtable.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDrawSurface7_Vtable.c [iso-8859-1] Tue Nov 30 16:29:49 2010 @@ -16,7 +16,7 @@ #endif ULONG WINAPI Main_DDrawSurface_AddRef(LPDIRECTDRAWSURFACE7); -ULONG WINAPI Main_DDrawSurface_Release(LPDIRECTDRAWSURFACE7); +ULONG WINAPI Main_DDrawSurface_Release4(LPDIRECTDRAWSURFACE7); HRESULT WINAPI Main_DDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7, REFIID, LPVOID*); HRESULT WINAPI Main_DDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7, HDC); HRESULT WINAPI Main_DDrawSurface_Blt(LPDIRECTDRAWSURFACE7, LPRECT, LPDIRECTDRAWSURFACE7, LPRECT, DWORD, LPDDBLTFX); @@ -72,7 +72,7 @@ { Main_DDrawSurface_QueryInterface, Main_DDrawSurface_AddRef, /* (Compact done) */ - Main_DDrawSurface_Release, + Main_DDrawSurface_Release4, Main_DDrawSurface_AddAttachedSurface, Main_DDrawSurface_AddOverlayDirtyRect, Main_DDrawSurface_Blt, Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] Tue Nov 30 16:29:49 2010 @@ -8,7 +8,7 @@ <library>d3d8thk</library> <library>dxguid</library> <library>ole32</library> - <library>user32</library> + <library>uuid</library> <library>advapi32</library> <library>pseh</library> @@ -49,7 +49,8 @@ <file>kernel_stubs.c</file> </directory> <directory name="Palette"> - <file>palette_stubs.c</file> + <file>palette.c</file> + <file>createpalette.c</file> </directory> <directory name="Videoport"> <file>videoport_stubs.c</file> Modified: trunk/reactos/dll/directx/ddraw/rosdraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/rosdraw.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/rosdraw.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/rosdraw.h [iso-8859-1] Tue Nov 30 16:29:49 2010 @@ -34,7 +34,7 @@ extern IDirectDrawSurface3Vtbl DirectDrawSurface3_Vtable; extern IDirectDrawSurface2Vtbl DirectDrawSurface2_Vtable; extern IDirectDrawSurfaceVtbl DirectDrawSurface_Vtable; -extern IDirectDrawPaletteVtbl DirectDrawPalette_Vtable; +extern const IDirectDrawPaletteVtbl DirectDrawPalette_Vtable; extern IDirectDrawClipperVtbl DirectDrawClipper_Vtable; extern IDirectDrawColorControlVtbl DirectDrawColorControl_Vtable; extern IDirectDrawGammaControlVtbl DirectDrawGammaControl_Vtable; @@ -92,6 +92,10 @@ LPDDSURFACEDESC2 pDDSD, LPDDRAWI_DDRAWSURFACE_INT *ppSurf, IUnknown *pUnkOuter); + +HRESULT +Internal_CreatePalette( LPDDRAWI_DIRECTDRAW_INT pDDraw, DWORD dwFlags, + LPPALETTEENTRY palent, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN pUnkOuter); /* convert DDSURFACEDESC to DDSURFACEDESC2 */ void CopyDDSurfDescToDDSurfDesc2(LPDDSURFACEDESC2 dst_pDesc, LPDDSURFACEDESC src_pDesc); Modified: trunk/reactos/dll/directx/ddraw/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.… ============================================================================== --- trunk/reactos/dll/directx/ddraw/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ddraw/startup.c [iso-8859-1] Tue Nov 30 16:29:49 2010 @@ -24,17 +24,29 @@ LPDDRAWI_DIRECTDRAW_INT This; DX_WINDBG_trace(); - - if ((IsBadReadPtr(pIface,sizeof(LPDIRECTDRAW))) || - (IsBadWritePtr(pIface,sizeof(LPDIRECTDRAW)))) + BOOL linking = FALSE; + + if (pIface == NULL) { return DDERR_INVALIDPARAMS; } This = (LPDDRAWI_DIRECTDRAW_INT)*pIface; - if ( (IsBadWritePtr(This,sizeof(LPDDRAWI_DIRECTDRAW_INT)) != 0) || - (IsBadWritePtr(This->lpLcl,sizeof(LPDDRAWI_DIRECTDRAW_LCL)) != 0) ) + DX_STUB_str("Linking?\n") + + _SEH2_TRY + { + linking = This->lpLcl ? TRUE:FALSE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + linking = FALSE; + } + _SEH2_END; + + /* fixme linking too second link when we shall not doing it */ + if (!linking) { /* We do not have a DirectDraw interface, we need alloc it*/ LPDDRAWI_DIRECTDRAW_INT memThis; @@ -310,6 +322,7 @@ return DDERR_NODIRECTDRAWSUPPORT; } dwFlags |= DDRAWI_NOHARDWARE; + DX_STUB_str("No hardware support\n"); } if (hel_ret!=DD_OK)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs