Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[akhaldi] 60306: [MSGSM32.ACM] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: akhaldi Date: Sun Sep 22 16:28:18 2013 New Revision: 60306 URL: http://svn.reactos.org/svn/reactos?rev=60306&view=rev Log: [MSGSM32.ACM] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/msgsm32.acm/CMakeLists.txt trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msgsm32.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgsm32.acm/CMak… ============================================================================== --- trunk/reactos/dll/win32/msgsm32.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgsm32.acm/CMakeLists.txt [iso-8859-1] Sun Sep 22 16:28:18 2013 @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msgsm32.acm msgsm32.acm.spec) list(APPEND SOURCE @@ -9,10 +8,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/msgsm32.def) add_library(msgsm32.acm SHARED ${SOURCE}) - set_module_type(msgsm32.acm win32dll) set_target_properties(msgsm32.acm PROPERTIES SUFFIX "") target_link_libraries(msgsm32.acm wine) add_importlibs(msgsm32.acm winmm user32 msvcrt kernel32 ntdll) -add_dependencies(msgsm32.acm psdk) add_cd_file(TARGET msgsm32.acm DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgsm32.acm/msgs… ============================================================================== --- trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgsm32.acm/msgsm32.c [iso-8859-1] Sun Sep 22 16:28:18 2013 @@ -223,7 +223,7 @@ aftd->dwFormatTagIndex = 1; break; } - /* fall thru */ + /* fall through */ case ACM_FORMATTAGDETAILSF_FORMATTAG: switch (aftd->dwFormatTag) { @@ -620,7 +620,7 @@ case ACMDM_STREAM_CONVERT: return GSM_StreamConvert((PACMDRVSTREAMINSTANCE)dwParam1, (PACMDRVSTREAMHEADER)dwParam2); #else - case ACMDM_STREAM_OPEN: ERR("libgsm support not compiled in!\n"); + case ACMDM_STREAM_OPEN: WARN("libgsm support not compiled in!\n"); case ACMDM_STREAM_CLOSE: case ACMDM_STREAM_SIZE: case ACMDM_STREAM_CONVERT: 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] Sun Sep 22 16:28:18 2013 @@ -113,7 +113,7 @@ reactos/dll/win32/msctf # Synced to Wine-1.7.1 reactos/dll/win32/msftedit # Synced to Wine-1.5.19 reactos/dll/win32/msg711.acm # Synced to Wine-1.7.1 -reactos/dll/win32/msgsm32.acm # Synced to Wine-1.5.4 +reactos/dll/win32/msgsm32.acm # Synced to Wine-1.7.1 reactos/dll/win32/mshtml # Synced to Wine-1.5.26 reactos/dll/win32/mshtml.tlb # Synced to Wine-1.5.26 reactos/dll/win32/msi # Synced to Wine-1.5.26

1 0

[akhaldi] 60305: [MSG711.ACM] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: akhaldi Date: Sun Sep 22 16:25:27 2013 New Revision: 60305 URL: http://svn.reactos.org/svn/reactos?rev=60305&view=rev Log: [MSG711.ACM] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/msg711.acm/CMakeLists.txt trunk/reactos/dll/win32/msg711.acm/msg711.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msg711.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msg711.acm/CMake… ============================================================================== --- trunk/reactos/dll/win32/msg711.acm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msg711.acm/CMakeLists.txt [iso-8859-1] Sun Sep 22 16:25:27 2013 @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msg711.acm msg711.acm.spec) list(APPEND SOURCE @@ -9,10 +8,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/msg711.def) add_library(msg711.acm SHARED ${SOURCE}) - set_module_type(msg711.acm win32dll) set_target_properties(msg711.acm PROPERTIES SUFFIX "") target_link_libraries(msg711.acm wine) add_importlibs(msg711.acm winmm user32 msvcrt kernel32 ntdll) -add_dependencies(msg711.acm psdk) add_cd_file(TARGET msg711.acm DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msg711.acm/msg711.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msg711.acm/msg71… ============================================================================== --- trunk/reactos/dll/win32/msg711.acm/msg711.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msg711.acm/msg711.c [iso-8859-1] Sun Sep 22 16:25:27 2013 @@ -697,7 +697,7 @@ aftd->dwFormatTagIndex = 1; break; } - /* fall thru */ + /* fall through */ case ACM_FORMATTAGDETAILSF_FORMATTAG: switch (aftd->dwFormatTag) { 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] Sun Sep 22 16:25:27 2013 @@ -112,7 +112,7 @@ reactos/dll/win32/mscoree # Synced to Wine-1.5.4 reactos/dll/win32/msctf # Synced to Wine-1.7.1 reactos/dll/win32/msftedit # Synced to Wine-1.5.19 -reactos/dll/win32/msg711.acm # Synced to Wine-1.5.19 +reactos/dll/win32/msg711.acm # Synced to Wine-1.7.1 reactos/dll/win32/msgsm32.acm # Synced to Wine-1.5.4 reactos/dll/win32/mshtml # Synced to Wine-1.5.26 reactos/dll/win32/mshtml.tlb # Synced to Wine-1.5.26

1 0

[akhaldi] 60304: [MSCTF_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: akhaldi Date: Sun Sep 22 16:16:55 2013 New Revision: 60304 URL: http://svn.reactos.org/svn/reactos?rev=60304&view=rev Log: [MSCTF_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/msctf/CMakeLists.txt trunk/rostests/winetests/msctf/inputprocessor.c trunk/rostests/winetests/msctf/testlist.c Modified: trunk/rostests/winetests/msctf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/CMakeList… ============================================================================== --- trunk/rostests/winetests/msctf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/msctf/CMakeLists.txt [iso-8859-1] Sun Sep 22 16:16:55 2013 @@ -1,7 +1,5 @@ -add_definitions(-D__ROS_LONG64__) add_executable(msctf_winetest inputprocessor.c testlist.c) -target_link_libraries(msctf_winetest wine) set_module_type(msctf_winetest win32cui) -add_importlibs(msctf_winetest ole32 user32 msvcrt kernel32 ntdll) +add_importlibs(msctf_winetest ole32 user32 msvcrt kernel32) add_cd_file(TARGET msctf_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/msctf/inputprocessor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/inputproc… ============================================================================== --- trunk/rostests/winetests/msctf/inputprocessor.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msctf/inputprocessor.c [iso-8859-1] Sun Sep 22 16:16:55 2013 @@ -203,7 +203,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + ITextStoreACP_AddRef(iface); return S_OK; } @@ -492,7 +492,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + ITfThreadMgrEventSink_AddRef(iface); return S_OK; } @@ -752,7 +752,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + ITfTextInputProcessor_AddRef(iface); return S_OK; } @@ -1079,7 +1079,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + ITfKeyEventSink_AddRef(iface); return S_OK; } @@ -1305,8 +1305,8 @@ static inline int check_context_refcount(ITfContext *iface) { - IUnknown_AddRef(iface); - return IUnknown_Release(iface); + ITfContext_AddRef(iface); + return ITfContext_Release(iface); } @@ -1341,7 +1341,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + ITfTextEditSink_AddRef(iface); return S_OK; } @@ -1697,7 +1697,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + ITfEditSession_AddRef(iface); return S_OK; } @@ -1901,10 +1901,9 @@ { hr = ITfSource_UnadviseSink(source, editSinkCookie); ok(SUCCEEDED(hr),"Failed to unadvise Sink\n"); - ITfTextEditSink_Release(sink); ITfSource_Release(source); } - + ITfTextEditSink_Release(sink); ITfContext_Release(cxt); ITfDocumentMgr_Release(dm); ITfEditSession_Release(es); Modified: trunk/rostests/winetests/msctf/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msctf/testlist.… ============================================================================== --- trunk/rostests/winetests/msctf/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msctf/testlist.c [iso-8859-1] Sun Sep 22 16:16:55 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_inputprocessor(void);

1 0

[akhaldi] 60303: [MSCTF] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: akhaldi Date: Sun Sep 22 16:16:21 2013 New Revision: 60303 URL: http://svn.reactos.org/svn/reactos?rev=60303&view=rev Log: [MSCTF] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/msctf/CMakeLists.txt trunk/reactos/dll/win32/msctf/categorymgr.c trunk/reactos/dll/win32/msctf/compartmentmgr.c trunk/reactos/dll/win32/msctf/context.c trunk/reactos/dll/win32/msctf/displayattributemgr.c trunk/reactos/dll/win32/msctf/documentmgr.c trunk/reactos/dll/win32/msctf/inputprocessor.c trunk/reactos/dll/win32/msctf/langbarmgr.c trunk/reactos/dll/win32/msctf/msctf.c trunk/reactos/dll/win32/msctf/msctf.spec trunk/reactos/dll/win32/msctf/range.c trunk/reactos/dll/win32/msctf/threadmgr.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msctf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/msctf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/CMakeLists.txt [iso-8859-1] Sun Sep 22 16:16:21 2013 @@ -1,11 +1,9 @@ - -add_definitions(-D__WINESRC__) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msctf.dll msctf.spec) list(APPEND SOURCE @@ -19,12 +17,10 @@ msctf.c range.c threadmgr.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/msctf_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/msctf.def) -add_library(msctf SHARED ${SOURCE}) - +add_library(msctf SHARED ${SOURCE} version.rc) set_module_type(msctf win32dll) target_link_libraries(msctf uuid wine) add_importlibs(msctf ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/msctf/categorymgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/categorymg… ============================================================================== --- trunk/reactos/dll/win32/msctf/categorymgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/categorymgr.c [iso-8859-1] Sun Sep 22 16:16:21 2013 @@ -72,7 +72,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + ITfCategoryMgr_AddRef(iface); return S_OK; } @@ -245,7 +245,7 @@ if (ulCount) { - int j; + ULONG j; BOOL found = FALSE; for (j = 0; j < ulCount; j++) if (IsEqualGUID(&guid, ppcatidList[j])) Modified: trunk/reactos/dll/win32/msctf/compartmentmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/compartmen… ============================================================================== --- trunk/reactos/dll/win32/msctf/compartmentmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/compartmentmgr.c [iso-8859-1] Sun Sep 22 16:16:21 2013 @@ -135,7 +135,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + ITfCompartmentMgr_AddRef(iface); return S_OK; } @@ -308,7 +308,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + IEnumGUID_AddRef(iface); return S_OK; } @@ -468,7 +468,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + ITfCompartment_AddRef(iface); return S_OK; } @@ -621,7 +621,7 @@ if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_COMPARTMENTSINK) return E_INVALIDARG; - sink = (CompartmentSink*)remove_Cookie(pdwCookie); + sink = remove_Cookie(pdwCookie); if (!sink) return CONNECT_E_NOCONNECTION; Modified: trunk/reactos/dll/win32/msctf/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/context.c?… ============================================================================== --- trunk/reactos/dll/win32/msctf/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/context.c [iso-8859-1] Sun Sep 22 16:16:21 2013 @@ -145,10 +145,10 @@ } if (This->pITextStoreACP) - ITextStoreACPSink_Release(This->pITextStoreACP); + ITextStoreACP_Release(This->pITextStoreACP); if (This->pITfContextOwnerCompositionSink) - ITextStoreACPSink_Release(This->pITfContextOwnerCompositionSink); + ITfContextOwnerCompositionSink_Release(This->pITfContextOwnerCompositionSink); if (This->defaultCookie) { @@ -220,7 +220,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + ITfContext_AddRef(iface); return S_OK; } @@ -373,7 +373,7 @@ { TS_SELECTION_ACP *acp; Context *This = (Context *)iface; - INT i; + ULONG i; HRESULT hr; TRACE("(%p) %i %i %p\n",This,ec,ulCount,pSelection); @@ -646,7 +646,7 @@ if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_CONTEXTSINK) return E_INVALIDARG; - sink = (ContextSink*)remove_Cookie(pdwCookie); + sink = remove_Cookie(pdwCookie); if (!sink) return CONNECT_E_NOCONNECTION; @@ -900,7 +900,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + ITextStoreACPSink_AddRef(iface); return S_OK; } Modified: trunk/reactos/dll/win32/msctf/displayattributemgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/displayatt… ============================================================================== --- trunk/reactos/dll/win32/msctf/displayattributemgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/displayattributemgr.c [iso-8859-1] Sun Sep 22 16:16:21 2013 @@ -65,7 +65,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + ITfDisplayAttributeMgr_AddRef(iface); return S_OK; } Modified: trunk/reactos/dll/win32/msctf/documentmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/documentmg… ============================================================================== --- trunk/reactos/dll/win32/msctf/documentmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/documentmgr.c [iso-8859-1] Sun Sep 22 16:16:21 2013 @@ -76,7 +76,7 @@ return CONTAINING_RECORD(iface, DocumentMgr, ITfSource_iface); } -static inline EnumTfContext *impl_from_IEnumTfContexts(IEnumTfContexts *iface)\ +static inline EnumTfContext *impl_from_IEnumTfContexts(IEnumTfContexts *iface) { return CONTAINING_RECORD(iface, EnumTfContext, IEnumTfContexts_iface); } @@ -117,7 +117,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + ITfDocumentMgr_AddRef(iface); return S_OK; } @@ -165,7 +165,7 @@ if (This->contextStack[1]) /* FUll */ return TF_E_STACKFULL; - if (!pic || FAILED(IUnknown_QueryInterface(pic,&IID_ITfContext,(LPVOID*) &check))) + if (!pic || FAILED(ITfContext_QueryInterface(pic,&IID_ITfContext,(LPVOID*) &check))) return E_INVALIDARG; if (This->contextStack[0] == NULL) @@ -190,14 +190,14 @@ if (This->contextStack[0]) { ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[0]); + Context_Uninitialize(This->contextStack[0]); ITfContext_Release(This->contextStack[0]); - Context_Uninitialize(This->contextStack[0]); } if (This->contextStack[1]) { ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[1]); + Context_Uninitialize(This->contextStack[1]); ITfContext_Release(This->contextStack[1]); - Context_Uninitialize(This->contextStack[1]); } This->contextStack[0] = This->contextStack[1] = NULL; ITfThreadMgrEventSink_OnUninitDocumentMgr(This->ThreadMgrSink, iface); @@ -211,8 +211,8 @@ return E_FAIL; ITfThreadMgrEventSink_OnPopContext(This->ThreadMgrSink,This->contextStack[0]); + Context_Uninitialize(This->contextStack[0]); ITfContext_Release(This->contextStack[0]); - Context_Uninitialize(This->contextStack[0]); This->contextStack[0] = This->contextStack[1]; This->contextStack[1] = NULL; @@ -368,7 +368,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + IEnumTfContexts_AddRef(iface); return S_OK; } Modified: trunk/reactos/dll/win32/msctf/inputprocessor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/inputproce… ============================================================================== --- trunk/reactos/dll/win32/msctf/inputprocessor.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/inputprocessor.c [iso-8859-1] Sun Sep 22 16:16:21 2013 @@ -176,7 +176,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + ITfInputProcessorProfiles_AddRef(iface); return S_OK; } @@ -743,7 +743,7 @@ if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_IPPSINK) return E_INVALIDARG; - sink = (InputProcessorProfilesSink*)remove_Cookie(pdwCookie); + sink = remove_Cookie(pdwCookie); if (!sink) return CONNECT_E_NOCONNECTION; @@ -807,7 +807,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + IEnumGUID_AddRef(iface); return S_OK; } @@ -963,7 +963,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + IEnumTfLanguageProfiles_AddRef(iface); return S_OK; } Modified: trunk/reactos/dll/win32/msctf/langbarmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/langbarmgr… ============================================================================== --- trunk/reactos/dll/win32/msctf/langbarmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/langbarmgr.c [iso-8859-1] Sun Sep 22 16:16:21 2013 @@ -65,7 +65,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + ITfLangBarMgr_AddRef(iface); return S_OK; } Modified: trunk/reactos/dll/win32/msctf/msctf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.c?re… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf.c [iso-8859-1] Sun Sep 22 16:16:21 2013 @@ -39,6 +39,7 @@ //#include "comcat.h" #include <rpcproxy.h> #include <msctf.h> +#include <inputscope.h> #include "msctf_internal.h" @@ -202,7 +203,7 @@ */ DWORD generate_Cookie(DWORD magic, LPVOID data) { - int i; + UINT i; /* try to reuse IDs if possible */ for (i = 0; i < id_last; i++) @@ -286,7 +287,7 @@ DWORD enumerate_Cookie(DWORD magic, DWORD *index) { - int i; + unsigned int i; for (i = *index; i < id_last; i++) if (cookies[i].id != 0 && cookies[i].magic == magic) { @@ -530,6 +531,7 @@ tlsIndex = TlsAlloc(); break; case DLL_PROCESS_DETACH: + if (fImpLoad) break; TlsFree(tlsIndex); break; } @@ -605,7 +607,7 @@ /*********************************************************************** * SetInputScope(MSCTF.@) */ -HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope) +HRESULT WINAPI SetInputScope(HWND hwnd, InputScope inputscope) { FIXME("STUB: %p %i\n",hwnd,inputscope); return S_OK; @@ -614,16 +616,16 @@ /*********************************************************************** * SetInputScopes(MSCTF.@) */ -HRESULT WINAPI SetInputScopes(HWND hwnd, const INT *pInputScopes, +HRESULT WINAPI SetInputScopes(HWND hwnd, const InputScope *pInputScopes, UINT cInputScopes, WCHAR **ppszPhraseList, UINT cPhrases, WCHAR *pszRegExp, WCHAR *pszSRGS) { - int i; + UINT i; FIXME("STUB: %p ... %s %s\n",hwnd, debugstr_w(pszRegExp), debugstr_w(pszSRGS)); for (i = 0; i < cInputScopes; i++) - TRACE("\tScope[%i] = %i\n",i,pInputScopes[i]); + TRACE("\tScope[%u] = %i\n",i,pInputScopes[i]); for (i = 0; i < cPhrases; i++) - TRACE("\tPhrase[%i] = %s\n",i,debugstr_w(ppszPhraseList[i])); + TRACE("\tPhrase[%u] = %s\n",i,debugstr_w(ppszPhraseList[i])); return S_OK; } @@ -654,3 +656,11 @@ TRACE("\n"); return LangBarMgr_Constructor(NULL,(IUnknown**)pppbm); } + +HRESULT WINAPI TF_CreateLangBarItemMgr(ITfLangBarItemMgr **pplbim) +{ + FIXME("stub %p\n", pplbim); + *pplbim = NULL; + + return E_NOTIMPL; +} Modified: trunk/reactos/dll/win32/msctf/msctf.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/msctf.spec… ============================================================================== --- trunk/reactos/dll/win32/msctf/msctf.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/msctf.spec [iso-8859-1] Sun Sep 22 16:16:21 2013 @@ -12,7 +12,7 @@ @ stub TF_CreateCicLoadMutex @ stub TF_CreateDisplayAttributeMgr @ stdcall TF_CreateInputProcessorProfiles(ptr) -@ stub TF_CreateLangBarItemMgr +@ stdcall TF_CreateLangBarItemMgr(ptr) @ stdcall TF_CreateLangBarMgr(ptr) @ stdcall TF_CreateThreadMgr(ptr) @ stub TF_DllDetachInOther Modified: trunk/reactos/dll/win32/msctf/range.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/range.c?re… ============================================================================== --- trunk/reactos/dll/win32/msctf/range.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/range.c [iso-8859-1] Sun Sep 22 16:16:21 2013 @@ -81,7 +81,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + ITfRange_AddRef(iface); return S_OK; } Modified: trunk/reactos/dll/win32/msctf/threadmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/threadmgr.… ============================================================================== --- trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/threadmgr.c [iso-8859-1] Sun Sep 22 16:16:21 2013 @@ -283,7 +283,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + ITfThreadMgr_AddRef(iface); return S_OK; } @@ -426,7 +426,7 @@ if (!pdimFocus) check = NULL; - else if (FAILED(IUnknown_QueryInterface(pdimFocus,&IID_ITfDocumentMgr,(LPVOID*) &check))) + else if (FAILED(ITfDocumentMgr_QueryInterface(pdimFocus,&IID_ITfDocumentMgr,(LPVOID*) &check))) return E_INVALIDARG; ITfThreadMgrEventSink_OnSetFocus((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, check, This->focus); @@ -666,7 +666,7 @@ if (get_Cookie_magic(pdwCookie)!=COOKIE_MAGIC_TMSINK) return E_INVALIDARG; - sink = (ThreadMgrSink*)remove_Cookie(pdwCookie); + sink = remove_Cookie(pdwCookie); if (!sink) return CONNECT_E_NOCONNECTION; @@ -728,7 +728,7 @@ if (check != NULL) return CONNECT_E_ADVISELIMIT; - if (FAILED(IUnknown_QueryInterface(pSink,&IID_ITfKeyEventSink,(LPVOID*) &check))) + if (FAILED(ITfKeyEventSink_QueryInterface(pSink,&IID_ITfKeyEventSink,(LPVOID*) &check))) return E_INVALIDARG; set_textservice_sink(tid, &IID_ITfKeyEventSink, (IUnknown*)check); @@ -1337,7 +1337,7 @@ if (*ppvOut) { - IUnknown_AddRef(iface); + IEnumTfDocumentMgrs_AddRef(iface); return S_OK; } @@ -1396,7 +1396,7 @@ static HRESULT WINAPI EnumTfDocumentMgr_Skip( IEnumTfDocumentMgrs* iface, ULONG celt) { - INT i; + ULONG i; EnumTfDocumentMgr *This = (EnumTfDocumentMgr *)iface; TRACE("(%p)\n",This); for(i = 0; i < celt && This->index != NULL; i++) 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] Sun Sep 22 16:16:21 2013 @@ -110,7 +110,7 @@ reactos/dll/win32/mscat32 # Synced to Wine-1.7.1 reactos/dll/win32/mscms # Synced to Wine-1.7.1 reactos/dll/win32/mscoree # Synced to Wine-1.5.4 -reactos/dll/win32/msctf # Synced to Wine-1.5.4 +reactos/dll/win32/msctf # Synced to Wine-1.7.1 reactos/dll/win32/msftedit # Synced to Wine-1.5.19 reactos/dll/win32/msg711.acm # Synced to Wine-1.5.19 reactos/dll/win32/msgsm32.acm # Synced to Wine-1.5.4

1 0

[hbelusca] 60302: [RTL] - Implement and export RtlGetCriticalSectionRecursionCount (introduced in NT 5.2 SP1, see http://www.geoffchappell.com/studies/windows/win32/ntdll/history/names52.htm) which...
by hbelusca＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: hbelusca Date: Sun Sep 22 15:14:24 2013 New Revision: 60302 URL: http://svn.reactos.org/svn/reactos?rev=60302&view=rev Log: [RTL] - Implement and export RtlGetCriticalSectionRecursionCount (introduced in NT 5.2 SP1, see http://www.geoffchappell.com/studies/windows/win32/ntdll/history/names52.htm) which definition comes from http://processhacker.sourceforge.net/doc/ntrtl_8h.html#a26bd65dfad63985a247…. - Fix the return type of RtlSetCriticalSectionSpinCount. - Export the already-existing RtlQueryInformationActiveActivationContext API. RtlQueryInformationActiveActivationContext and RtlGetCriticalSectionRecursionCount are needed by Win2k3 user32.dll and winsrv.dll . Modified: trunk/reactos/dll/ntdll/def/ntdll.spec trunk/reactos/lib/rtl/critical.c Modified: trunk/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.spec?r… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sun Sep 22 15:14:24 2013 @@ -614,7 +614,7 @@ @ stdcall RtlGetCallersAddress(ptr ptr) @ stdcall RtlGetCompressionWorkSpaceSize(long ptr ptr) @ stdcall RtlGetControlSecurityDescriptor(ptr ptr ptr) -;@ stdcall RtlGetCriticalSectionRecursionCount +@ stdcall RtlGetCriticalSectionRecursionCount(ptr) @ stdcall RtlGetCurrentDirectory_U(long ptr) @ stdcall RtlGetCurrentPeb() @ stdcall RtlGetCurrentProcessorNumber() ; 5.2 SP1 and higher @@ -780,7 +780,7 @@ @ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) -;@ stdcall RtlQueryInformationActiveActivationContext +@ stdcall RtlQueryInformationActiveActivationContext(long ptr long ptr) ;@ stdcall RtlQueryInterfaceMemoryStream ;@ stdcall RtlQueryProcessBackTraceInformation @ stdcall RtlQueryProcessDebugInformation(long long ptr) Modified: trunk/reactos/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/critical.c?rev=603… ============================================================================== --- trunk/reactos/lib/rtl/critical.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/critical.c [iso-8859-1] Sun Sep 22 15:14:24 2013 @@ -299,7 +299,7 @@ } /* We are out of static buffer, allocate dynamic */ - return RtlAllocateHeap(NtCurrentPeb()->ProcessHeap, + return RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(RTL_CRITICAL_SECTION_DEBUG)); } @@ -436,7 +436,7 @@ * SpinCount is ignored on single-processor systems. * *--*/ -DWORD +ULONG NTAPI RtlSetCriticalSectionSpinCount(PRTL_CRITICAL_SECTION CriticalSection, ULONG SpinCount) @@ -619,6 +619,45 @@ } /*++ + * RtlGetCriticalSectionRecursionCount + * @implemented NT5.2 SP1 + * + * Retrieves the recursion count of a given critical section. + * + * Params: + * CriticalSection - Critical section to retrieve its recursion count. + * + * Returns: + * The recursion count. + * + * Remarks: + * We return the recursion count of the critical section if it is owned + * by the current thread, and otherwise we return zero. + * + *--*/ +LONG +NTAPI +RtlGetCriticalSectionRecursionCount(PRTL_CRITICAL_SECTION CriticalSection) +{ + if (CriticalSection->OwningThread == NtCurrentTeb()->ClientId.UniqueThread) + { + /* + * The critical section is owned by the current thread, + * therefore retrieve its actual recursion count. + */ + return CriticalSection->RecursionCount; + } + else + { + /* + * It is not owned by the current thread, so + * for this thread there is no recursion. + */ + return 0; + } +} + +/*++ * RtlLeaveCriticalSection * @implemented NT4 *

1 0

[hbelusca] 60301: [NTOS] - Fix disabling impersonation in PsDisableImpersonation, and - Fix how we do restore impersonation in NtOpenThreadTokenEx. Patch by Thomas Faber, CORE-7476 #comment Patch c...
by hbelusca＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: hbelusca Date: Sun Sep 22 00:26:31 2013 New Revision: 60301 URL: http://svn.reactos.org/svn/reactos?rev=60301&view=rev Log: [NTOS] - Fix disabling impersonation in PsDisableImpersonation, and - Fix how we do restore impersonation in NtOpenThreadTokenEx. Patch by Thomas Faber, CORE-7476 #comment Patch committed in revision 60301, thanks :). Please retest the bug. Modified: trunk/reactos/ntoskrnl/ps/security.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/security.c [iso-8859-1] Sun Sep 22 00:26:31 2013 @@ -820,10 +820,10 @@ BOOLEAN NTAPI PsDisableImpersonation(IN PETHREAD Thread, - IN PSE_IMPERSONATION_STATE ImpersonationState) + OUT PSE_IMPERSONATION_STATE ImpersonationState) { PPS_IMPERSONATION_INFORMATION Impersonation = NULL; - LONG NewValue, OldValue; + LONG OldFlags; PAGED_CODE(); PSTRACE(PS_SECURITY_DEBUG, "Thread: %p State: %p\n", Thread, ImpersonationState); @@ -835,19 +835,11 @@ PspLockThreadSecurityExclusive(Thread); /* Disable impersonation */ - OldValue = Thread->CrossThreadFlags; - do - { - /* Attempt to change the flag */ - NewValue = - InterlockedCompareExchange((PLONG)&Thread->CrossThreadFlags, - OldValue &~ - CT_ACTIVE_IMPERSONATION_INFO_BIT, - OldValue); - } while (NewValue != OldValue); + OldFlags = PspClearCrossThreadFlag(Thread, + CT_ACTIVE_IMPERSONATION_INFO_BIT); /* Make sure nobody disabled it behind our back */ - if (NewValue & CT_ACTIVE_IMPERSONATION_INFO_BIT) + if (OldFlags & CT_ACTIVE_IMPERSONATION_INFO_BIT) { /* Copy the old state */ Impersonation = Thread->ImpersonationInfo; Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=60… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Sun Sep 22 00:26:31 2013 @@ -1065,7 +1065,7 @@ PTOKEN Token; ULONG RequiredLength; KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; PAGED_CODE(); @@ -2429,6 +2429,7 @@ PACL Dacl = NULL; KPROCESSOR_MODE PreviousMode; NTSTATUS Status; + BOOLEAN RestoreImpersonation = FALSE; PAGED_CODE(); @@ -2482,7 +2483,8 @@ if (OpenAsSelf) { - PsDisableImpersonation(PsGetCurrentThread(), &ImpersonationState); + RestoreImpersonation = PsDisableImpersonation(PsGetCurrentThread(), + &ImpersonationState); } if (CopyOnOpen) @@ -2533,7 +2535,7 @@ if (Dacl) ExFreePoolWithTag(Dacl, TAG_TOKEN_ACL); - if (OpenAsSelf) + if (RestoreImpersonation) { PsRestoreImpersonation(PsGetCurrentThread(), &ImpersonationState); }

1 0

[jgardou] 60300: [MESA/OPENGL32] - Disable un-used mesa features (ATI/NV programs) for a leaner build - Print a fixme instead of asserting in software version of wglGetProcAddress
by jgardou＠svn.reactos.org 22 Sep '13

22 Sep '13

Author: jgardou Date: Sun Sep 22 00:25:59 2013 New Revision: 60300 URL: http://svn.reactos.org/svn/reactos?rev=60300&view=rev Log: [MESA/OPENGL32] - Disable un-used mesa features (ATI/NV programs) for a leaner build - Print a fixme instead of asserting in software version of wglGetProcAddress Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mesa/main/arbprogram.c trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c trunk/reactos/dll/opengl/mesa/src/mesa/main/mfeatures.h trunk/reactos/dll/opengl/mesa/src/mesa/program/CMakeLists.txt trunk/reactos/dll/opengl/opengl32/swimpl.c Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt [iso-8859-1] Sun Sep 22 00:25:59 2013 @@ -8,7 +8,7 @@ api_validate.c accum.c arbprogram.c - atifragshader.c + # atifragshader.c attrib.c arrayobj.c blend.c @@ -54,7 +54,7 @@ mipmap.c mm.c multisample.c - nvprogram.c + # nvprogram.c pack.c pbo.c pixel.c Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/arbprogram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/arbprogram.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/arbprogram.c [iso-8859-1] Sun Sep 22 00:25:59 2013 @@ -370,6 +370,7 @@ base = & prog->Base; } +#if FEATURE_NV_vertex_program else if ((target == GL_VERTEX_PROGRAM_ARB || target == GL_VERTEX_STATE_PROGRAM_NV) && ctx->Extensions.NV_vertex_program) { @@ -378,6 +379,7 @@ base = & prog->Base; } +#endif else if (target == GL_FRAGMENT_PROGRAM_ARB && ctx->Extensions.ARB_fragment_program) { struct gl_fragment_program *prog = ctx->FragmentProgram.Current; @@ -385,6 +387,7 @@ base = & prog->Base; } +#if FEATURE_NV_fragment_program else if (target == GL_FRAGMENT_PROGRAM_NV && ctx->Extensions.NV_fragment_program) { struct gl_fragment_program *prog = ctx->FragmentProgram.Current; @@ -392,6 +395,7 @@ base = & prog->Base; } +#endif else { _mesa_error(ctx, GL_INVALID_ENUM, "glProgramStringARB(target)"); return; Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c [iso-8859-1] Sun Sep 22 00:25:59 2013 @@ -5027,7 +5027,7 @@ /* * GL_NV_fragment_program */ -#if FEATURE_NV_fragment_program +#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program static void GLAPIENTRY save_ProgramLocalParameter4fARB(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w) @@ -5148,6 +5148,7 @@ } } +#if FEATURE_NV_fragment_program static void GLAPIENTRY save_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w) @@ -5178,7 +5179,6 @@ } } - static void GLAPIENTRY save_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte * name, const float v[]) @@ -5204,7 +5204,7 @@ (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } - +#endif #endif /* FEATURE_NV_fragment_program */ @@ -10218,7 +10218,9 @@ SET_GetVertexAttribdvARB(table, _mesa_GetVertexAttribdvARB); SET_GetVertexAttribfvARB(table, _mesa_GetVertexAttribfvARB); SET_GetVertexAttribivARB(table, _mesa_GetVertexAttribivARB); +#if FEATURE_NV_vertex_program SET_GetVertexAttribPointervNV(table, _mesa_GetVertexAttribPointervNV); +#endif SET_ProgramEnvParameter4dARB(table, save_ProgramEnvParameter4dARB); SET_ProgramEnvParameter4dvARB(table, save_ProgramEnvParameter4dvARB); SET_ProgramEnvParameter4fARB(table, save_ProgramEnvParameter4fARB); Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/mfeatures.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/mfeatures.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/mfeatures.h [iso-8859-1] Sun Sep 22 00:25:59 2013 @@ -132,10 +132,10 @@ #define FEATURE_EXT_transform_feedback FEATURE_GL #define FEATURE_APPLE_object_purgeable FEATURE_GL -#define FEATURE_ATI_fragment_shader FEATURE_GL +#define FEATURE_ATI_fragment_shader 0 #define FEATURE_NV_fence FEATURE_GL -#define FEATURE_NV_fragment_program FEATURE_GL -#define FEATURE_NV_vertex_program FEATURE_GL +#define FEATURE_NV_fragment_program 0 +#define FEATURE_NV_vertex_program 0 #define FEATURE_OES_EGL_image 1 #define FEATURE_OES_draw_texture FEATURE_ES1 Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/program/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/program/CMakeLists.txt [iso-8859-1] Sun Sep 22 00:25:59 2013 @@ -5,8 +5,8 @@ arbprogparse.c hash_table.c ir_to_mesa.cpp - nvfragparse.c - nvvertparse.c + # nvfragparse.c + # nvvertparse.c program.c program_parse_extra.c prog_cache.c Modified: trunk/reactos/dll/opengl/opengl32/swimpl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/swimpl… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/swimpl.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/swimpl.c [iso-8859-1] Sun Sep 22 00:25:59 2013 @@ -103,7 +103,9 @@ (void) ctx; if(name == GL_RENDERER) return (const GLubyte *) "ReactOS Software Implementation"; - + /* Don't claim to support the fancy extensions that mesa supports, they will be slow anyway */ + if(name == GL_EXTENSIONS) + return (const GLubyte *)""; return NULL; } @@ -593,7 +595,7 @@ PROC sw_GetProcAddress(LPCSTR name) { /* We don't support any extensions */ - assert(FALSE); + FIXME("Asking for proc address %s, returning NULL.\n", name); return NULL; }

1 0

[hbelusca] 60299: [NTOS] Set the session ID to the process' associated PEB (introduced in revision 43476, the code erratically disappeared in revision 57011 when Alex fixed sessions).
by hbelusca＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: hbelusca Date: Sat Sep 21 23:21:24 2013 New Revision: 60299 URL: http://svn.reactos.org/svn/reactos?rev=60299&view=rev Log: [NTOS] Set the session ID to the process' associated PEB (introduced in revision 43476, the code erratically disappeared in revision 57011 when Alex fixed sessions). Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sat Sep 21 23:21:24 2013 @@ -699,7 +699,7 @@ // // Session ID // - MmGetSessionId(Process); + if (Process->Session) Peb->SessionId = MmGetSessionId(Process); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

1 0

[hbelusca] 60298: [NTOS] - Fix Job object session ID setting and comparison; fix a list initialization. - Correct some comments. - As Alex noticed it 7 years and 2 months ago, in revision 23197, th...
by hbelusca＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: hbelusca Date: Sat Sep 21 22:59:24 2013 New Revision: 60298 URL: http://svn.reactos.org/svn/reactos?rev=60298&view=rev Log: [NTOS] - Fix Job object session ID setting and comparison; fix a list initialization. - Correct some comments. - As Alex noticed it 7 years and 2 months ago, in revision 23197, the ProcessSessionInformation case in the NtSetInformationProcess API doesn't set a new session ID for the given process anymore (checked by myself too), because it is set once and for all at process creation time and is stored inside the Process->Session structure managed by MM. Therefore fake changing it: we just return success if the user-defined value is the same as the session ID of the process, and otherwise we fail. Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/ps/job.c trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sat Sep 21 22:59:24 2013 @@ -1576,7 +1576,7 @@ /* Get the session ID */ SessionId = SessionGlobal->SessionId; - DPRINT1("Last process in sessino %lu going down!!!\n", SessionId); + DPRINT1("Last process in session %lu going down!!!\n", SessionId); /* Free the session page tables */ #ifndef _M_AMD64 Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=6029… ============================================================================== --- trunk/reactos/ntoskrnl/ps/job.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/job.c [iso-8859-1] Sat Sep 21 22:59:24 2013 @@ -169,8 +169,7 @@ ExAcquireRundownProtection(&Process->RundownProtect); if(NT_SUCCESS(Status)) { - // FIXME: This is broken - if(Process->Job == NULL && PtrToUlong(Process->Session) == Job->SessionId) + if(Process->Job == NULL && PsGetProcessSessionId(Process) == Job->SessionId) { /* Just store the pointer to the job object in the process, we'll assign it later. The reason we can't do this here is that locking @@ -272,9 +271,12 @@ the list before it even gets added! */ Job->JobLinks.Flink = NULL; - /* setup the job object */ + /* setup the job object - FIXME: More to do! */ + InitializeListHead(&Job->JobSetLinks); InitializeListHead(&Job->ProcessListHead); - Job->SessionId = PtrToUlong(CurrentProcess->Session); /* inherit the session id from the caller, FIXME: broken */ + + /* inherit the session id from the caller */ + Job->SessionId = PsGetProcessSessionId(CurrentProcess); Status = ExInitializeResource(&Job->JobLock); if(!NT_SUCCESS(Status)) Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=60… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sat Sep 21 22:59:24 2013 @@ -1169,7 +1169,7 @@ /* Getting VDM powers requires the SeTcbPrivilege */ if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) { - /* Bail out */ + /* We don't hold the privilege, bail out */ Status = STATUS_PRIVILEGE_NOT_HELD; DPRINT1("Need TCB privilege\n"); break; @@ -1213,7 +1213,7 @@ /* Setting the error port requires the SeTcbPrivilege */ if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) { - /* Can't set the session ID, bail out. */ + /* We don't hold the privilege, bail out */ Status = STATUS_PRIVILEGE_NOT_HELD; break; } @@ -1332,10 +1332,12 @@ /* Setting the session id requires the SeTcbPrivilege */ if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) { - /* Can't set the session ID, bail out. */ + /* We don't hold the privilege, bail out */ Status = STATUS_PRIVILEGE_NOT_HELD; break; } + +#if 0 // OLD AND DEPRECATED CODE!!!! /* FIXME - update the session id for the process token */ //Status = PsLockProcess(Process, FALSE); @@ -1372,6 +1374,27 @@ /* Unlock the process */ //PsUnlockProcess(Process); + +#endif + + /* + * Since we cannot change the session ID of the given + * process anymore because it is set once and for all + * at process creation time and because it is stored + * inside the Process->Session structure managed by MM, + * we fake changing it: we just return success if the + * user-defined value is the same as the session ID of + * the process, and otherwise we fail. + */ + if (SessionInfo.SessionId == PsGetProcessSessionId(Process)) + { + Status = STATUS_SUCCESS; + } + else + { + Status = STATUS_ACCESS_DENIED; + } + break; case ProcessPriorityClass: @@ -1612,6 +1635,7 @@ /* Setting 'break on termination' requires the SeDebugPrivilege */ if (!SeSinglePrivilegeCheck(SeDebugPrivilege, PreviousMode)) { + /* We don't hold the privilege, bail out */ Status = STATUS_PRIVILEGE_NOT_HELD; break; } @@ -1837,7 +1861,7 @@ /* Only TCB can do this */ if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) { - /* Fail */ + /* We don't hold the privilege, bail out */ DPRINT1("Need TCB to set IOPL\n"); Status = STATUS_PRIVILEGE_NOT_HELD; break; @@ -2366,6 +2390,7 @@ /* Setting 'break on termination' requires the SeDebugPrivilege */ if (!SeSinglePrivilegeCheck(SeDebugPrivilege, PreviousMode)) { + /* We don't hold the privilege, bail out */ Status = STATUS_PRIVILEGE_NOT_HELD; break; }

1 0

[akhaldi] 60297: [PSDK] * Import inputscope.idl from Wine.
by akhaldi＠svn.reactos.org 21 Sep '13

21 Sep '13

Author: akhaldi Date: Sat Sep 21 21:04:03 2013 New Revision: 60297 URL: http://svn.reactos.org/svn/reactos?rev=60297&view=rev Log: [PSDK] * Import inputscope.idl from Wine. Added: trunk/reactos/include/psdk/inputscope.idl (with props) Modified: trunk/reactos/include/psdk/CMakeLists.txt Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… ============================================================================== --- trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] Sat Sep 21 21:04:03 2013 @@ -51,6 +51,7 @@ imnact.idl imnxport.idl indexsrv.idl + inputscope.idl metahost.idl mimeinfo.idl mimeole.idl Added: trunk/reactos/include/psdk/inputscope.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/inputscope.id… ============================================================================== --- trunk/reactos/include/psdk/inputscope.idl (added) +++ trunk/reactos/include/psdk/inputscope.idl [iso-8859-1] Sat Sep 21 21:04:03 2013 @@ -0,0 +1,93 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the mingw-w64 runtime package. + * No warranty is given. + */ + +import "oaidl.idl"; +import "ocidl.idl"; + +typedef enum { + IS_DEFAULT = 0, + IS_URL = 1, + IS_FILE_FULLFILEPATH = 2, + IS_FILE_FILENAME = 3, + IS_EMAIL_USERNAME = 4, + IS_EMAIL_SMTPEMAILADDRESS = 5, + IS_LOGINNAME = 6, + IS_PERSONALNAME_FULLNAME = 7, + IS_PERSONALNAME_PREFIX = 8, + IS_PERSONALNAME_GIVENNAME = 9, + IS_PERSONALNAME_MIDDLENAME = 10, + IS_PERSONALNAME_SURNAME = 11, + IS_PERSONALNAME_SUFFIX = 12, + IS_ADDRESS_FULLPOSTALADDRESS = 13, + IS_ADDRESS_POSTALCODE = 14, + IS_ADDRESS_STREET = 15, + IS_ADDRESS_STATEORPROVINCE = 16, + IS_ADDRESS_CITY = 17, + IS_ADDRESS_COUNTRYNAME = 18, + IS_ADDRESS_COUNTRYSHORTNAME = 19, + IS_CURRENCY_AMOUNTANDSYMBOL = 20, + IS_CURRENCY_AMOUNT = 21, + IS_DATE_FULLDATE = 22, + IS_DATE_MONTH = 23, + IS_DATE_DAY = 24, + IS_DATE_YEAR = 25, + IS_DATE_MONTHNAME = 26, + IS_DATE_DAYNAME = 27, + IS_DIGITS = 28, + IS_NUMBER = 29, + IS_ONECHAR = 30, + IS_PASSWORD = 31, + IS_TELEPHONE_FULLTELEPHONENUMBER = 32, + IS_TELEPHONE_COUNTRYCODE = 33, + IS_TELEPHONE_AREACODE = 34, + IS_TELEPHONE_LOCALNUMBER = 35, + IS_TIME_FULLTIME = 36, + IS_TIME_HOUR = 37, + IS_TIME_MINORSEC = 38, + IS_NUMBER_FULLWIDTH = 39, + IS_ALPHANUMERIC_HALFWIDTH = 40, + IS_ALPHANUMERIC_FULLWIDTH = 41, + IS_CURRENCY_CHINESE = 42, + IS_BOPOMOFO = 43, + IS_HIRAGANA = 44, + IS_KATAKANA_HALFWIDTH = 45, + IS_KATAKANA_FULLWIDTH = 46, + IS_HANJA = 47, + IS_HANGUL_HALFWIDTH = 48, + IS_HANGUL_FULLWIDTH = 49, + IS_SEARCH = 50, + IS_FORMULA = 51, + IS_SEARCH_INCREMENTAL = 52, + IS_CHINESE_HALFWIDTH = 53, + IS_CHINESE_FULLWIDTH = 54, + IS_NATIVE_SCRIPT = 55, + + IS_PHRASELIST = -1, + IS_REGULAREXPRESSION = -2, + IS_SRGS = -3, + IS_XML = -4, + IS_ENUMSTRING = -5 +} InputScope; + +cpp_quote("HRESULT WINAPI SetInputScope(HWND hwnd,InputScope inputscope);") +cpp_quote("HRESULT WINAPI SetInputScopes(HWND hwnd,const InputScope *pInputScopes,UINT cInputScopes,WCHAR **ppszPhraseList,UINT cPhrases,WCHAR *pszRegExp,WCHAR *pszSRGS);") +cpp_quote("HRESULT WINAPI SetInputScopeXML(HWND hwnd,WCHAR *pszXML);") + +cpp_quote("DEFINE_GUID(GUID_PROP_INPUTSCOPE,0x1713dd5a,0x68e7,0x4a5b,0x9a,0xf6,0x59,0x2a,0x59,0x5c,0x77,0x8d);") + +[ + object, + uuid(fde1eaee-6924-4cdf-91e7-da38cff5559d), + pointer_default(unique) +] +interface ITfInputScope : IUnknown +{ + HRESULT GetInputScopes([out, size_is(,*pcCount)] InputScope **pprgInputScopes, [out] UINT *pcCount); + HRESULT GetPhrase([out, size_is(,*pcCount)] BSTR **ppbstrPhrases, [out] UINT *pcCount); + HRESULT GetRegularExpression([out] BSTR *pbstrRegExp); + HRESULT GetSRGS([out] BSTR *pbstrSRGS); + HRESULT GetXML([out] BSTR *pbstrXML); +} Propchange: trunk/reactos/include/psdk/inputscope.idl ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
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