Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[akhaldi] 60336: [MSVFW32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 23 Sep '13

23 Sep '13

Author: akhaldi Date: Mon Sep 23 11:36:07 2013 New Revision: 60336 URL: http://svn.reactos.org/svn/reactos?rev=60336&view=rev Log: [MSVFW32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/msvfw32/CMakeLists.txt trunk/reactos/dll/win32/msvfw32/msvideo_main.c trunk/reactos/dll/win32/msvfw32/msvideo_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/CMakeLists.txt [iso-8859-1] Mon Sep 23 11:36:07 2013 @@ -1,21 +1,18 @@ - -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) add_definitions(-D_WINE) - +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(msvfw32.dll msvfw32.spec ADD_IMPORTLIB) list(APPEND SOURCE mciwnd.c msvideo_main.c drawdib.c - rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msvfw32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msvfw32.def) -add_library(msvfw32 SHARED ${SOURCE}) +add_library(msvfw32 SHARED ${SOURCE} rsrc.rc) set_module_type(msvfw32 win32dll) target_link_libraries(msvfw32 wine) -add_importlibs(msvfw32 winmm version comctl32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(msvfw32 winmm comctl32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET msvfw32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msvfw32/msvideo_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo_main.c [iso-8859-1] Mon Sep 23 11:36:07 2013 @@ -407,9 +407,11 @@ driver = reg_driver_list; while(driver) if (!compare_fourcc(fccType, driver->fccType) && - !compare_fourcc(fccHandler, driver->fccHandler)) + !compare_fourcc(fccHandler, driver->fccHandler)) { + fccType = driver->fccType; + fccHandler = driver->fccHandler; break; - else + } else driver = driver->next; if (driver && driver->proc) @@ -430,7 +432,13 @@ icopen.dnDevNode = 0; /* FIXME */ if (!driver) { - /* The driver is registered in the registry */ + /* normalize to lower case as in 'vidc' */ + ((char*)&fccType)[0] = tolower(((char*)&fccType)[0]); + ((char*)&fccType)[1] = tolower(((char*)&fccType)[1]); + ((char*)&fccType)[2] = tolower(((char*)&fccType)[2]); + ((char*)&fccType)[3] = tolower(((char*)&fccType)[3]); + icopen.fccType = fccType; + /* Seek the driver in the registry */ fourcc_to_string(codecname, fccType); codecname[4] = '.'; fourcc_to_string(codecname + 5, fccHandler); @@ -534,7 +542,6 @@ TRACE("(%p,%p,%d)\n", hic, picinfo, cb); - whic = MSVIDEO_GetHicPtr(hic); if (!whic) return ICERR_BADHANDLE; if (!picinfo) return MMSYSERR_INVALPARAM; @@ -1370,7 +1377,7 @@ icComp->lFrameNum = pc->lFrame++; icComp->lpOutput = pc->lpBitsOut; icComp->lpPrev = pc->lpBitsPrev; - ret = ICSendMessage(pc->hic, ICM_COMPRESS, (DWORD_PTR)icComp, sizeof(icComp)); + ret = ICSendMessage(pc->hic, ICM_COMPRESS, (DWORD_PTR)icComp, sizeof(*icComp)); if (icComp->dwFlags & AVIIF_KEYFRAME) { @@ -1509,7 +1516,10 @@ fnGetFileName = (LPVOID)GetProcAddress(hComdlg32, szFunctionName); if (fnGetFileName == NULL) + { + FreeLibrary(hComdlg32); return FALSE; + } /* FIXME: need to add OFN_ENABLEHOOK and our own handler */ ret = fnGetFileName(lpofn); Modified: trunk/reactos/dll/win32/msvfw32/msvideo_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvideo_… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvideo_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvideo_private.h [iso-8859-1] Mon Sep 23 11:36:07 2013 @@ -44,6 +44,7 @@ struct tagWINE_HIC* next; } WINE_HIC; +extern HMODULE MSVFW32_hModule DECLSPEC_HIDDEN; #define IDC_CONFIGURE 882 #define IDC_ABOUT 883 Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Sep 23 11:36:07 2013 @@ -128,7 +128,7 @@ reactos/dll/win32/mstask # Synced to Wine-1.7.1 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync -reactos/dll/win32/msvfw32 # Autosync +reactos/dll/win32/msvfw32 # Synced to Wine-1.7.1 reactos/dll/win32/msvidc32 # Autosync reactos/dll/win32/msxml # Synced to Wine-1.5.19 reactos/dll/win32/msxml2 # Synced to Wine-1.5.19

1 0

[akhaldi] 60335: [MSTASK_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 23 Sep '13

23 Sep '13

Author: akhaldi Date: Mon Sep 23 11:34:12 2013 New Revision: 60335 URL: http://svn.reactos.org/svn/reactos?rev=60335&view=rev Log: [MSTASK_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/mstask/CMakeLists.txt trunk/rostests/winetests/mstask/task_scheduler.c trunk/rostests/winetests/mstask/task_trigger.c Modified: trunk/rostests/winetests/mstask/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mstask/CMakeLis… ============================================================================== --- trunk/rostests/winetests/mstask/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mstask/CMakeLists.txt [iso-8859-1] Mon Sep 23 11:34:12 2013 @@ -1,5 +1,3 @@ - -add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE task.c @@ -8,7 +6,6 @@ testlist.c) add_executable(mstask_winetest ${SOURCE}) -target_link_libraries(mstask_winetest wine) set_module_type(mstask_winetest win32cui) -add_importlibs(mstask_winetest ole32 msvcrt kernel32 ntdll) +add_importlibs(mstask_winetest ole32 user32 msvcrt kernel32) add_cd_file(TARGET mstask_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/mstask/task_scheduler.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mstask/task_sch… ============================================================================== --- trunk/rostests/winetests/mstask/task_scheduler.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mstask/task_scheduler.c [iso-8859-1] Mon Sep 23 11:34:12 2013 @@ -28,6 +28,8 @@ static ITaskScheduler *test_task_scheduler; +static const WCHAR does_not_existW[] = {'\\','\\','d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; + static void test_NewWorkItem(void) { HRESULT hres; @@ -102,10 +104,112 @@ return; } +static void test_GetTargetComputer(void) +{ + HRESULT hres; + WCHAR *oldname; + + /* Create TaskScheduler */ + hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **) &test_task_scheduler); + ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08x\n", hres); + if (hres != S_OK) + { + skip("Failed to create task scheduler.\n"); + return; + } + + if (0) + { + /* This crashes on w2k */ + hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, NULL); + ok(hres == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hres); + } + + hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &oldname); + ok((hres == S_OK) && oldname && oldname[0] == '\\' && oldname[1] == '\\' && oldname[2], + "got 0x%x and %s (expected S_OK and an unc name)\n", hres, wine_dbgstr_w(oldname)); + + CoTaskMemFree(oldname); + + ITaskScheduler_Release(test_task_scheduler); + return; +} + +static void test_SetTargetComputer(void) +{ + WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 3]; /* extra space for two '\' and a zero */ + DWORD len = MAX_COMPUTERNAME_LENGTH + 1; /* extra space for a zero */ + WCHAR *oldname = NULL; + WCHAR *name = NULL; + HRESULT hres; + + + buffer[0] = '\\'; + buffer[1] = '\\'; + if (!GetComputerNameW(buffer + 2, &len)) + return; + + /* Create TaskScheduler */ + hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **) &test_task_scheduler); + ok(hres == S_OK, "CTaskScheduler CoCreateInstance failed: %08x\n", hres); + if (hres != S_OK) + { + skip("Failed to create task scheduler. Skipping tests.\n"); + return; + } + + hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &oldname); + ok(hres == S_OK, "got 0x%x and %s (expected S_OK)\n", hres, wine_dbgstr_w(oldname)); + + /* NULL is an alias for the local computer */ + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, NULL); + ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &name); + ok((hres == S_OK && !lstrcmpiW(name, buffer)), + "got 0x%x with %s (expected S_OK and %s)\n", + hres, wine_dbgstr_w(name), wine_dbgstr_w(buffer)); + CoTaskMemFree(name); + + /* The name must be valid */ + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, does_not_existW); + ok(hres == HRESULT_FROM_WIN32(ERROR_BAD_NETPATH), "got 0x%x (expected 0x80070035)\n", hres); + /* the name of the target computer is unchanged */ + hres = ITaskScheduler_GetTargetComputer(test_task_scheduler, &name); + ok((hres == S_OK && !lstrcmpiW(name, buffer)), + "got 0x%x with %s (expected S_OK and %s)\n", + hres, wine_dbgstr_w(name), wine_dbgstr_w(buffer)); + CoTaskMemFree(name); + + /* the two backslash are optional */ + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, oldname + 2); + ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + + /* the case is ignored */ + CharUpperW(buffer); + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, buffer); + ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + CharLowerW(buffer); + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, buffer); + ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + + /* cleanup */ + hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, oldname); + ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); + + CoTaskMemFree(oldname); + ITaskScheduler_Release(test_task_scheduler); + return; +} + + START_TEST(task_scheduler) { CoInitialize(NULL); test_NewWorkItem(); test_Activate(); + test_GetTargetComputer(); + test_SetTargetComputer(); CoUninitialize(); } Modified: trunk/rostests/winetests/mstask/task_trigger.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mstask/task_tri… ============================================================================== --- trunk/rostests/winetests/mstask/task_trigger.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mstask/task_trigger.c [iso-8859-1] Mon Sep 23 11:34:12 2013 @@ -303,7 +303,8 @@ ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); normal_trigger_state.MinutesDuration = 5; normal_trigger_state.MinutesInterval = 0; - ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres); + hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); + ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); normal_trigger_state.MinutesDuration = 0; normal_trigger_state.MinutesInterval = 0;

1 0

[akhaldi] 60334: [MSTASK] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 23 Sep '13

23 Sep '13

Author: akhaldi Date: Mon Sep 23 11:33:50 2013 New Revision: 60334 URL: http://svn.reactos.org/svn/reactos?rev=60334&view=rev Log: [MSTASK] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/mstask/CMakeLists.txt trunk/reactos/dll/win32/mstask/factory.c trunk/reactos/dll/win32/mstask/mstask_main.c trunk/reactos/dll/win32/mstask/task_scheduler.c trunk/reactos/dll/win32/mstask/task_trigger.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mstask/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/mstask/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/CMakeLists.txt [iso-8859-1] Mon Sep 23 11:33:50 2013 @@ -1,9 +1,3 @@ - -remove_definitions(-DWINVER=0x502) -add_definitions(-DWINVER=0x600) - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -16,12 +10,11 @@ task.c task_scheduler.c task_trigger.c - rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/mstask_local_i.c ${CMAKE_CURRENT_BINARY_DIR}/mstask_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/mstask.def) -add_library(mstask SHARED ${SOURCE}) +add_library(mstask SHARED ${SOURCE} rsrc.rc) set_module_type(mstask win32dll) target_link_libraries(mstask uuid wine) add_importlibs(mstask ole32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/mstask/factory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/factory.c… ============================================================================== --- trunk/reactos/dll/win32/mstask/factory.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/factory.c [iso-8859-1] Mon Sep 23 11:33:50 2013 @@ -56,14 +56,14 @@ return E_NOINTERFACE; } -static ULONG WINAPI MSTASK_IClassFactory_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI MSTASK_IClassFactory_AddRef(IClassFactory *face) { TRACE("\n"); InterlockedIncrement(&dll_ref); return 2; } -static ULONG WINAPI MSTASK_IClassFactory_Release(LPCLASSFACTORY iface) +static ULONG WINAPI MSTASK_IClassFactory_Release(IClassFactory *iface) { TRACE("\n"); InterlockedDecrement(&dll_ref); @@ -71,8 +71,8 @@ } static HRESULT WINAPI MSTASK_IClassFactory_CreateInstance( - LPCLASSFACTORY iface, - LPUNKNOWN pUnkOuter, + IClassFactory *iface, + IUnknown *pUnkOuter, REFIID riid, LPVOID *ppvObj) { @@ -89,21 +89,21 @@ if (FAILED(res)) return res; - res = ITaskScheduler_QueryInterface(punk, riid, ppvObj); - ITaskScheduler_Release(punk); + res = IUnknown_QueryInterface(punk, riid, ppvObj); + IUnknown_Release(punk); return res; } static HRESULT WINAPI MSTASK_IClassFactory_LockServer( - LPCLASSFACTORY iface, + IClassFactory *iface, BOOL fLock) { TRACE("\n"); - if (fLock != FALSE) - MSTASK_IClassFactory_AddRef(iface); + if (fLock) + IClassFactory_AddRef(iface); else - MSTASK_IClassFactory_Release(iface); + IClassFactory_Release(iface); return S_OK; } Modified: trunk/reactos/dll/win32/mstask/mstask_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/mstask_ma… ============================================================================== --- trunk/reactos/dll/win32/mstask/mstask_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/mstask_main.c [iso-8859-1] Mon Sep 23 11:33:50 2013 @@ -42,8 +42,6 @@ DisableThreadLibraryCalls(hinstDLL); hInst = hinstDLL; break; - case DLL_PROCESS_DETACH: - break; } return TRUE; Modified: trunk/reactos/dll/win32/mstask/task_scheduler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/task_sche… ============================================================================== --- trunk/reactos/dll/win32/mstask/task_scheduler.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/task_scheduler.c [iso-8859-1] Mon Sep 23 11:33:50 2013 @@ -89,16 +89,57 @@ ITaskScheduler* iface, LPCWSTR pwszComputer) { - FIXME("%p, %s: stub\n", iface, debugstr_w(pwszComputer)); - return E_NOTIMPL; + TaskSchedulerImpl *This = impl_from_ITaskScheduler(iface); + WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 3]; /* extra space for two '\' and a zero */ + DWORD len = MAX_COMPUTERNAME_LENGTH + 1; /* extra space for a zero */ + + TRACE("(%p)->(%s)\n", This, debugstr_w(pwszComputer)); + + /* NULL is an alias for the local computer */ + if (!pwszComputer) + return S_OK; + + buffer[0] = '\\'; + buffer[1] = '\\'; + if (GetComputerNameW(buffer + 2, &len)) + { + if (!lstrcmpiW(buffer, pwszComputer) || /* full unc name */ + !lstrcmpiW(buffer + 2, pwszComputer)) /* name without backslash */ + return S_OK; + } + + FIXME("remote computer %s not supported\n", debugstr_w(pwszComputer)); + return HRESULT_FROM_WIN32(ERROR_BAD_NETPATH); } static HRESULT WINAPI MSTASK_ITaskScheduler_GetTargetComputer( ITaskScheduler* iface, LPWSTR *ppwszComputer) { - FIXME("%p, %p: stub\n", iface, ppwszComputer); - return E_NOTIMPL; + TaskSchedulerImpl *This = impl_from_ITaskScheduler(iface); + LPWSTR buffer; + DWORD len = MAX_COMPUTERNAME_LENGTH + 1; /* extra space for the zero */ + + TRACE("(%p)->(%p)\n", This, ppwszComputer); + + if (!ppwszComputer) + return E_INVALIDARG; + + /* extra space for two '\' and a zero */ + buffer = CoTaskMemAlloc((MAX_COMPUTERNAME_LENGTH + 3) * sizeof(WCHAR)); + if (buffer) + { + buffer[0] = '\\'; + buffer[1] = '\\'; + if (GetComputerNameW(buffer + 2, &len)) + { + *ppwszComputer = buffer; + return S_OK; + } + CoTaskMemFree(buffer); + } + *ppwszComputer = NULL; + return HRESULT_FROM_WIN32(GetLastError()); } static HRESULT WINAPI MSTASK_ITaskScheduler_Enum( Modified: trunk/reactos/dll/win32/mstask/task_trigger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/task_trig… ============================================================================== --- trunk/reactos/dll/win32/mstask/task_trigger.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/task_trigger.c [iso-8859-1] Mon Sep 23 11:33:50 2013 @@ -142,8 +142,6 @@ if (pTrigger->MinutesDuration <= pTrigger->MinutesInterval && pTrigger->MinutesInterval > 0) return E_INVALIDARG; - if (pTrigger->MinutesDuration > 0 && pTrigger->MinutesInterval == 0) - return E_INVALIDARG; tmp_trigger_cond.MinutesDuration = pTrigger->MinutesDuration; tmp_trigger_cond.MinutesInterval = pTrigger->MinutesInterval; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Sep 23 11:33:50 2013 @@ -125,7 +125,7 @@ reactos/dll/win32/msrle32 # Synced to Wine-1.7.1 reactos/dll/win32/mssign32 # Synced to Wine-1.7.1 reactos/dll/win32/mssip32 # Synced to Wine-1.7.1 -reactos/dll/win32/mstask # Synced to Wine-1.5.4 +reactos/dll/win32/mstask # Synced to Wine-1.7.1 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync reactos/dll/win32/msvfw32 # Autosync

1 0

[akhaldi] 60333: [MSSIP32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 23 Sep '13

23 Sep '13

Author: akhaldi Date: Mon Sep 23 11:32:21 2013 New Revision: 60333 URL: http://svn.reactos.org/svn/reactos?rev=60333&view=rev Log: [MSSIP32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/mssip32/CMakeLists.txt trunk/reactos/dll/win32/mssip32/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mssip32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssip32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/mssip32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mssip32/CMakeLists.txt [iso-8859-1] Mon Sep 23 11:32:21 2013 @@ -10,11 +10,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/mssip32.def) add_library(mssip32 SHARED ${SOURCE}) - set_module_type(mssip32 win32dll) - target_link_libraries(mssip32 wine) - add_importlibs(mssip32 msvcrt kernel32 ntdll) - add_cd_file(TARGET mssip32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/mssip32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssip32/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/mssip32/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mssip32/main.c [iso-8859-1] Mon Sep 23 11:32:21 2013 @@ -39,10 +39,6 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break; - case DLL_PROCESS_DETACH: - break; - default: - break; } return TRUE; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Sep 23 11:32:21 2013 @@ -124,7 +124,7 @@ reactos/dll/win32/msnet32 # Synced to Wine-1.5.19 reactos/dll/win32/msrle32 # Synced to Wine-1.7.1 reactos/dll/win32/mssign32 # Synced to Wine-1.7.1 -reactos/dll/win32/mssip32 # Synced to Wine-1.5.19 +reactos/dll/win32/mssip32 # Synced to Wine-1.7.1 reactos/dll/win32/mstask # Synced to Wine-1.5.4 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync

1 0

[akhaldi] 60332: [MSSIGN32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 23 Sep '13

23 Sep '13

Author: akhaldi Date: Mon Sep 23 10:39:45 2013 New Revision: 60332 URL: http://svn.reactos.org/svn/reactos?rev=60332&view=rev Log: [MSSIGN32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/mssign32/mssign32_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mssign32/mssign32_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssign32/mssign3… ============================================================================== --- trunk/reactos/dll/win32/mssign32/mssign32_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mssign32/mssign32_main.c [iso-8859-1] Mon Sep 23 10:39:45 2013 @@ -41,8 +41,6 @@ case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls( hinst ); break; - case DLL_PROCESS_DETACH: - break; } return TRUE; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Sep 23 10:39:45 2013 @@ -123,7 +123,7 @@ reactos/dll/win32/msisys.ocx # Synced to Wine-1.7.1 reactos/dll/win32/msnet32 # Synced to Wine-1.5.19 reactos/dll/win32/msrle32 # Synced to Wine-1.7.1 -reactos/dll/win32/mssign32 # Synced to Wine-1.5.19 +reactos/dll/win32/mssign32 # Synced to Wine-1.7.1 reactos/dll/win32/mssip32 # Synced to Wine-1.5.19 reactos/dll/win32/mstask # Synced to Wine-1.5.4 reactos/dll/win32/msvcrt20 # Out of sync

1 0

[akhaldi] 60331: [MSRLE32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 23 Sep '13

23 Sep '13

Author: akhaldi Date: Mon Sep 23 10:17:50 2013 New Revision: 60331 URL: http://svn.reactos.org/svn/reactos?rev=60331&view=rev Log: [MSRLE32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/msrle32/CMakeLists.txt trunk/reactos/dll/win32/msrle32/msrle32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msrle32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/msrle32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/CMakeLists.txt [iso-8859-1] Mon Sep 23 10:17:50 2013 @@ -5,11 +5,10 @@ list(APPEND SOURCE msrle32.c - rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/msrle32.def) -add_library(msrle32 SHARED ${SOURCE}) +add_library(msrle32 SHARED ${SOURCE} rsrc.rc) set_module_type(msrle32 win32dll) target_link_libraries(msrle32 wine) -add_importlibs(msrle32 msvcrt winmm user32 kernel32 ntdll) +add_importlibs(msrle32 winmm user32 msvcrt kernel32 ntdll) add_cd_file(TARGET msrle32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msrle32/msrle32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle32.… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle32.c [iso-8859-1] Mon Sep 23 10:17:50 2013 @@ -42,7 +42,7 @@ #define QUALITY_to_DIST(q) (ICQUALITY_HIGH - q) static inline WORD ColorCmp(WORD clr1, WORD clr2) { - register UINT a = (clr1-clr2); + UINT a = clr1 - clr2; return SQR(a); } static inline WORD Intensity(RGBQUAD clr) @@ -1535,7 +1535,7 @@ { /* swap buffer for current and previous frame */ /* Don't free and alloc new -- costs to much time and they are of equal size ! */ - register LPWORD pTmp = pi->pPrevFrame; + LPWORD pTmp = pi->pPrevFrame; pi->pPrevFrame = pi->pCurFrame; pi->pCurFrame = pTmp; @@ -1917,9 +1917,6 @@ DisableThreadLibraryCalls(hModule); MSRLE32_hModule = hModule; break; - - case DLL_PROCESS_DETACH: - break; } return TRUE; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Sep 23 10:17:50 2013 @@ -122,7 +122,7 @@ reactos/dll/win32/msisip # Synced to Wine-1.7.1 reactos/dll/win32/msisys.ocx # Synced to Wine-1.7.1 reactos/dll/win32/msnet32 # Synced to Wine-1.5.19 -reactos/dll/win32/msrle32 # Autosync +reactos/dll/win32/msrle32 # Synced to Wine-1.7.1 reactos/dll/win32/mssign32 # Synced to Wine-1.5.19 reactos/dll/win32/mssip32 # Synced to Wine-1.5.19 reactos/dll/win32/mstask # Synced to Wine-1.5.4

1 0

[ion] 60330: [NTOSKRNL]: Count should be initialized to zero. Thanks to MSVC for finding a bug.
by ion＠svn.reactos.org 23 Sep '13

23 Sep '13

Author: ion Date: Mon Sep 23 03:16:38 2013 New Revision: 60330 URL: http://svn.reactos.org/svn/reactos?rev=60330&view=rev Log: [NTOSKRNL]: Count should be initialized to zero. Thanks to MSVC for finding a bug. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Sep 23 03:16:38 2013 @@ -2751,7 +2751,7 @@ IN SIZE_T ViewSize) { ULONG_PTR StartAddress, EndingAddress, Base; - ULONG Hash, Count, Size, QuotaCharge; + ULONG Hash, Count = 0, Size, QuotaCharge; PMMSESSION Session; PMMPTE LastProtoPte, PointerPte, ProtoPte; PCONTROL_AREA ControlArea;

1 0

[ion] 60329: - Implement and export MmCommitSessionMappedView. No gurantees this works until ThFabba writes a test for it, but it does what Windows does :P, minus charging commit since we don't do ...
by ion＠svn.reactos.org 23 Sep '13

23 Sep '13

Author: ion Date: Mon Sep 23 02:30:58 2013 New Revision: 60329 URL: http://svn.reactos.org/svn/reactos?rev=60329&view=rev Log: - Implement and export MmCommitSessionMappedView. No gurantees this works until ThFabba writes a test for it, but it does what Windows does :P, minus charging commit since we don't do that yet. Nothing in ROS calls this so guranteed 0 regressions. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/ntoskrnl.spec Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Sep 23 02:30:58 2013 @@ -2742,6 +2742,171 @@ return MiUnmapViewInSystemSpace(&MmSession, MappedBase); } +/* + * @implemented + */ +NTSTATUS +NTAPI +MmCommitSessionMappedView(IN PVOID MappedBase, + IN SIZE_T ViewSize) +{ + ULONG_PTR StartAddress, EndingAddress, Base; + ULONG Hash, Count, Size, QuotaCharge; + PMMSESSION Session; + PMMPTE LastProtoPte, PointerPte, ProtoPte; + PCONTROL_AREA ControlArea; + PSEGMENT Segment; + PSUBSECTION Subsection; + MMPTE TempPte; + PAGED_CODE(); + + /* Make sure the base isn't past the session view range */ + if ((MappedBase < MiSessionViewStart) || + (MappedBase >= (PVOID)((ULONG_PTR)MiSessionViewStart + MmSessionViewSize))) + { + DPRINT1("Base outside of valid range\n"); + return STATUS_INVALID_PARAMETER_1; + } + + /* Make sure the size isn't past the session view range */ + if (((ULONG_PTR)MiSessionViewStart + MmSessionViewSize - + (ULONG_PTR)MappedBase) < ViewSize) + { + DPRINT1("Size outside of valid range\n"); + return STATUS_INVALID_PARAMETER_2; + } + + /* Sanity check */ + ASSERT(ViewSize != 0); + + /* Process must be in a session */ + if (PsGetCurrentProcess()->ProcessInSession == FALSE) + { + DPRINT1("Process is not in session\n"); + return STATUS_NOT_MAPPED_VIEW; + } + + /* Compute the correctly aligned base and end addresses */ + StartAddress = (ULONG_PTR)PAGE_ALIGN(MappedBase); + EndingAddress = ((ULONG_PTR)MappedBase + ViewSize - 1) | (PAGE_SIZE - 1); + + /* Sanity check and grab the session */ + ASSERT(MmIsAddressValid(MmSessionSpace) == TRUE); + Session = &MmSessionSpace->Session; + + /* Get the hash entry for this allocation */ + Hash = (StartAddress >> 16) % Session->SystemSpaceHashKey; + + /* Lock system space */ + KeAcquireGuardedMutex(Session->SystemSpaceViewLockPointer); + + /* Loop twice so we can try rolling over if needed */ + while (TRUE) + { + /* Extract the size and base addresses from the entry */ + Base = Session->SystemSpaceViewTable[Hash].Entry & ~0xFFFF; + Size = Session->SystemSpaceViewTable[Hash].Entry & 0xFFFF; + + /* Convert the size to bucket chunks */ + Size *= MI_SYSTEM_VIEW_BUCKET_SIZE; + + /* Bail out if this entry fits in here */ + if ((StartAddress >= Base) && (EndingAddress < (Base + Size))) break; + + /* Check if we overflew past the end of the hash table */ + if (++Hash >= Session->SystemSpaceHashSize) + { + /* Reset the hash to zero and keep searching from the bottom */ + Hash = 0; + if (++Count == 2) + { + /* But if we overflew twice, then this is not a real mapping */ + KeBugCheckEx(0xD7, //DRIVER_UNMAPPING_INVALID_VIEW, + Base, + 2, + 0, + 0); + } + } + } + + /* Make sure the view being mapped is not file-based */ + ControlArea = Session->SystemSpaceViewTable[Hash].ControlArea; + if (ControlArea->FilePointer != NULL) + { + /* It is, so we have to bail out */ + DPRINT1("Only page-filed backed sections can be commited\n"); + KeReleaseGuardedMutex(Session->SystemSpaceViewLockPointer); + return STATUS_ALREADY_COMMITTED; + } + + /* Get the subsection. We don't support LARGE_CONTROL_AREA in ARM3 */ + ASSERT(ControlArea->u.Flags.GlobalOnlyPerSession == 0); + ASSERT(ControlArea->u.Flags.Rom == 0); + Subsection = (PSUBSECTION)(ControlArea + 1); + + /* Get the start and end PTEs -- make sure the end PTE isn't past the end */ + ProtoPte = Subsection->SubsectionBase + ((StartAddress - Base) >> PAGE_SHIFT); + QuotaCharge = MiAddressToPte(EndingAddress) - MiAddressToPte(StartAddress) + 1; + LastProtoPte = ProtoPte + QuotaCharge; + if (LastProtoPte >= Subsection->SubsectionBase + Subsection->PtesInSubsection) + { + DPRINT1("PTE is out of bounds\n"); + KeReleaseGuardedMutex(Session->SystemSpaceViewLockPointer); + return STATUS_INVALID_PARAMETER_2; + } + + /* Acquire the commit lock and count all the non-committed PTEs */ + KeAcquireGuardedMutexUnsafe(&MmSectionCommitMutex); + PointerPte = ProtoPte; + while (PointerPte < LastProtoPte) + { + if (PointerPte->u.Long) QuotaCharge--; + PointerPte++; + } + + /* Was everything committed already? */ + if (!QuotaCharge) + { + /* Nothing to do! */ + KeReleaseGuardedMutexUnsafe(&MmSectionCommitMutex); + KeReleaseGuardedMutex(Session->SystemSpaceViewLockPointer); + return STATUS_SUCCESS; + } + + /* Pick the segment and template PTE */ + Segment = ControlArea->Segment; + TempPte = Segment->SegmentPteTemplate; + ASSERT(TempPte.u.Long != 0); + + /* Loop all prototype PTEs to be committed */ + while (PointerPte < LastProtoPte) + { + /* Make sure the PTE is already invalid */ + if (PointerPte->u.Long == 0) + { + /* And write the invalid PTE */ + MI_WRITE_INVALID_PTE(PointerPte, TempPte); + } + + /* Move to the next PTE */ + PointerPte++; + } + + /* Check if we had at least one page charged */ + if (QuotaCharge) + { + /* Update the accounting data */ + Segment->NumberOfCommittedPages += QuotaCharge; + InterlockedExchangeAddSizeT(&MmSharedCommit, QuotaCharge); + } + + /* Release all */ + KeReleaseGuardedMutexUnsafe(&MmSectionCommitMutex); + KeReleaseGuardedMutex(Session->SystemSpaceViewLockPointer); + return STATUS_SUCCESS; +} + /* SYSTEM CALLS ***************************************************************/ NTSTATUS Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Mon Sep 23 02:30:58 2013 @@ -758,7 +758,7 @@ @ stdcall MmAllocatePagesForMdlEx(long long long long long long long long long) @ stdcall MmBuildMdlForNonPagedPool(ptr) @ stdcall MmCanFileBeTruncated(ptr ptr) -;MmCommitSessionMappedView +@ stdcall MmCommitSessionMappedView(ptr ptr) @ stdcall MmCreateMdl(ptr ptr long) ;MmCreateMirror @ stdcall MmCreateSection(ptr long ptr ptr long long ptr ptr)

1 0

[hbelusca] 60328: [APITEST:POWRPROF] Include stdio.h for printf function.
by hbelusca＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: hbelusca Date: Sun Sep 22 21:52:27 2013 New Revision: 60328 URL: http://svn.reactos.org/svn/reactos?rev=60328&view=rev Log: [APITEST:POWRPROF] Include stdio.h for printf function. Modified: trunk/rostests/apitests/powrprof/power.c Modified: trunk/rostests/apitests/powrprof/power.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/powrprof/power.c… ============================================================================== --- trunk/rostests/apitests/powrprof/power.c [iso-8859-1] (original) +++ trunk/rostests/apitests/powrprof/power.c [iso-8859-1] Sun Sep 22 21:52:27 2013 @@ -9,6 +9,7 @@ #include <apitest.h> +#include <stdio.h> #include <stdarg.h> #include <ntstatus.h> #define WIN32_NO_STATUS

1 0

[tkreuzer] 60327: [DEBUG.H] Add a _WARN macro to emit compiler warning messages (also adds __STRLINE__ macro, being resolved to the current line number as a string token) [NTOSKRNL] Fix some x64 is...
by tkreuzer＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: tkreuzer Date: Sun Sep 22 21:19:40 2013 New Revision: 60327 URL: http://svn.reactos.org/svn/reactos?rev=60327&view=rev Log: [DEBUG.H] Add a _WARN macro to emit compiler warning messages (also adds __STRLINE__ macro, being resolved to the current line number as a string token) [NTOSKRNL] Fix some x64 issues and warn about unimplemented session space stuff on x64 Modified: trunk/reactos/include/reactos/debug.h trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Sun Sep 22 21:19:40 2013 @@ -230,4 +230,18 @@ #define ASSERT_IRQL_EQUAL(x) ASSERT(KeGetCurrentIrql()==(x)) #define ASSERT_IRQL_LESS(x) ASSERT(KeGetCurrentIrql()<(x)) +#define __STRING2__(x) #x +#define __STRING__(x) __STRING2__(x) +#define __STRLINE__ __STRING__(__LINE__) + +#define __TOKENPASTE2__(x, y) x ## y +#define __TOKENPASTE__(x, y) __TOKENPASTE2__(x, y) + +#ifdef _MSC_VER +#define _WARN(msg) __pragma(message("WARNING! Line " __STRLINE__ ": " msg)) +#else +#define _WARN1(_func1, _func2, _msg) void __attribute__((warning (_msg))) _func1(void); void __attribute__((used)) _func2(void) { _func1(); } +#define _WARN(_msg) _WARN1(__TOKENPASTE__(__warn_func1__, __LINE__), __TOKENPASTE__(__warn_func2__, __LINE__), _msg) +#endif + #endif /* __INTERNAL_DEBUG */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Sep 22 21:19:40 2013 @@ -32,7 +32,7 @@ PETHREAD CurrentThread = PsGetCurrentThread(); PTEB Teb = CurrentThread->Tcb.Teb; PVOID StackBase, DeallocationStack, NextStackAddress; - ULONG GuranteedSize; + SIZE_T GuranteedSize; NTSTATUS Status; /* Do we own the address space lock? */ @@ -116,7 +116,7 @@ MiAccessCheck(IN PMMPTE PointerPte, IN BOOLEAN StoreInstruction, IN KPROCESSOR_MODE PreviousMode, - IN ULONG ProtectionCode, + IN ULONG_PTR ProtectionCode, IN PVOID TrapFrame, IN BOOLEAN LockHeld) { @@ -1496,7 +1496,7 @@ return STATUS_SUCCESS; } } - +#if (_MI_PAGING_LEVELS == 2) /* Check if this was a session PTE that needs to remap the session PDE */ if (MI_IS_SESSION_PTE(Address)) { @@ -1512,6 +1512,11 @@ 6); } } +#else + +_WARN("Session space stuff is not implemented yet!") + +#endif /* Check for a fault on the page table or hyperspace */ if (MI_IS_PAGE_TABLE_OR_HYPER_ADDRESS(Address)) @@ -1970,7 +1975,7 @@ else { /* Get the protection code and check if this is a proto PTE */ - ProtectionCode = TempPte.u.Soft.Protection; + ProtectionCode = (ULONG)TempPte.u.Soft.Protection; if (TempPte.u.Soft.Prototype) { /* Do we need to go find the real PTE? */

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
56
Older →

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 September 2013