Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[akhaldi] 73976: [SHLWAPI] Sync with Wine Staging 2.2. CORE-12823 36b45a3 shlwapi: Fix the return value of SHAddDataBlock 437123b shlwapi: Avoid 'else if' for IStream_fnQueryInterface. 101edb1 shlw...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 19:40:16 2017 New Revision: 73976 URL: http://svn.reactos.org/svn/reactos?rev=73976&view=rev Log: [SHLWAPI] Sync with Wine Staging 2.2. CORE-12823 36b45a3 shlwapi: Fix the return value of SHAddDataBlock 437123b shlwapi: Avoid 'else if' for IStream_fnQueryInterface. 101edb1 shlwapi: Changed UrlEscapeW error paths and add tests. 4eac6e8 shlwapi: Remove dot segments for URLs starting with /. 6cbcc76 shlwapi: Make ParseURL case-insensitive. Modified: trunk/reactos/dll/win32/shlwapi/clist.c trunk/reactos/dll/win32/shlwapi/regstream.c trunk/reactos/dll/win32/shlwapi/url.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/shlwapi/clist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/clist.c?… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/clist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/clist.c [iso-8859-1] Sun Feb 26 19:40:16 2017 @@ -54,32 +54,19 @@ * the call returns S_OK but does not actually add the element. * See SHWriteDataBlockList. */ -#ifndef __REACTOS__ -HRESULT -#else -BOOL -#endif -WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewItem) +BOOL WINAPI SHAddDataBlock(LPDBLIST* lppList, const DATABLOCK_HEADER *lpNewItem) { LPDATABLOCK_HEADER lpInsertAt = NULL; ULONG ulSize; TRACE("(%p,%p)\n", lppList, lpNewItem); - if(!lppList || !lpNewItem ) -#ifndef __REACTOS__ - return E_INVALIDARG; -#else + if(!lppList || !lpNewItem) return FALSE; -#endif if (lpNewItem->cbSize < sizeof(DATABLOCK_HEADER) || lpNewItem->dwSignature == CLIST_ID_CONTAINER) -#ifndef __REACTOS__ - return S_OK; -#else return FALSE; -#endif ulSize = lpNewItem->cbSize; @@ -136,15 +123,9 @@ lpInsertAt = NextItem(lpInsertAt); lpInsertAt->cbSize = 0; -#ifdef __REACTOS__ return TRUE; -#endif - } -#ifndef __REACTOS__ - return S_OK; -#else + } return FALSE; -#endif } /************************************************************************* @@ -362,11 +343,7 @@ */ BOOL WINAPI SHRemoveDataBlock(LPDBLIST* lppList, DWORD dwSignature) { -#ifndef __REACTOS__ - LPDATABLOCK_HEADER lpList = 0; -#else LPDATABLOCK_HEADER lpList = NULL; -#endif LPDATABLOCK_HEADER lpItem = NULL; LPDATABLOCK_HEADER lpNext; ULONG ulNewSize; Modified: trunk/reactos/dll/win32/shlwapi/regstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/regstrea… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/regstream.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/regstream.c [iso-8859-1] Sun Feb 26 19:40:16 2017 @@ -53,10 +53,8 @@ *ppvObj = NULL; - if(IsEqualIID(riid, &IID_IUnknown)) /*IUnknown*/ - *ppvObj = This; - else if(IsEqualIID(riid, &IID_IStream)) /*IStream*/ - *ppvObj = This; + if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IStream)) + *ppvObj = &This->IStream_iface; if(*ppvObj) { Modified: trunk/reactos/dll/win32/shlwapi/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?re… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] Sun Feb 26 19:40:16 2017 @@ -123,7 +123,7 @@ for(i=0; i < sizeof(shlwapi_schemes)/sizeof(shlwapi_schemes[0]); i++) { if(scheme_len == strlenW(shlwapi_schemes[i].scheme_name) - && !memcmp(scheme, shlwapi_schemes[i].scheme_name, scheme_len*sizeof(WCHAR))) + && !memicmpW(scheme, shlwapi_schemes[i].scheme_name, scheme_len)) return shlwapi_schemes[i].scheme_number; } @@ -355,6 +355,9 @@ } else dwFlags |= URL_ESCAPE_UNSAFE; + state = 5; + is_file_url = TRUE; + } else if(url[0] == '/') { state = 5; is_file_url = TRUE; } @@ -1074,7 +1077,7 @@ TRACE("(%p(%s) %p %p 0x%08x)\n", pszUrl, debugstr_w(pszUrl), pszEscaped, pcchEscaped, dwFlags); - if(!pszUrl || !pcchEscaped) + if(!pszUrl || !pcchEscaped || !pszEscaped || *pcchEscaped == 0) return E_INVALIDARG; if(dwFlags & ~(URL_ESCAPE_SPACES_ONLY | 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 Feb 26 19:40:16 2017 @@ -174,7 +174,7 @@ reactos/dll/win32/shdocvw # Synced to WineStaging-2.2 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-1.9.11 -reactos/dll/win32/shlwapi # Synced to WineStaging-1.9.23 +reactos/dll/win32/shlwapi # Synced to WineStaging-2.2 reactos/dll/win32/slbcsp # Synced to WineStaging-1.9.11 reactos/dll/win32/snmpapi # Synced to WineStaging-1.9.11 reactos/dll/win32/softpub # Synced to WineStaging-1.9.11

7 years, 10 months

[akhaldi] 73975: [SHDOCVW] Sync with Wine Staging 2.2. CORE-12823 f3d33f5 shdocvw: Add a __WINE_ALLOC_SIZE attribute to heap_alloc().

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 19:27:59 2017 New Revision: 73975 URL: http://svn.reactos.org/svn/reactos?rev=73975&view=rev Log: [SHDOCVW] Sync with Wine Staging 2.2. CORE-12823 f3d33f5 shdocvw: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.h [iso-8859-1] Sun Feb 26 19:27:59 2017 @@ -57,7 +57,7 @@ /* memory allocation functions */ -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } 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 Feb 26 19:27:59 2017 @@ -171,7 +171,7 @@ reactos/dll/win32/sensapi # Synced to WineStaging-1.9.11 reactos/dll/win32/setupapi # Forked at Wine-20050524 reactos/dll/win32/shdoclc # Synced to WineStaging-1.9.11 -reactos/dll/win32/shdocvw # Synced to WineStaging-1.9.11 +reactos/dll/win32/shdocvw # Synced to WineStaging-2.2 reactos/dll/win32/shell32 # Forked at Wine-20071011 reactos/dll/win32/shfolder # Synced to WineStaging-1.9.11 reactos/dll/win32/shlwapi # Synced to WineStaging-1.9.23

7 years, 10 months

[akhaldi] 73974: [SCRRUN_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 19:25:18 2017 New Revision: 73974 URL: http://svn.reactos.org/svn/reactos?rev=73974&view=rev Log: [SCRRUN_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/scrrun/dictionary.c trunk/rostests/winetests/scrrun/filesystem.c Modified: trunk/rostests/winetests/scrrun/dictionary.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/scrrun/dictiona… ============================================================================== --- trunk/rostests/winetests/scrrun/dictionary.c [iso-8859-1] (original) +++ trunk/rostests/winetests/scrrun/dictionary.c [iso-8859-1] Sun Feb 26 19:25:18 2017 @@ -30,6 +30,37 @@ #include "scrrun.h" +#define test_provideclassinfo(a, b) _test_provideclassinfo((IDispatch*)a, b, __LINE__) +static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) +{ + IProvideClassInfo *classinfo; + TYPEATTR *attr; + ITypeInfo *ti; + IUnknown *unk; + HRESULT hr; + + hr = IDispatch_QueryInterface(disp, &IID_IProvideClassInfo, (void **)&classinfo); + ok_(__FILE__,line) (hr == S_OK, "Failed to get IProvideClassInfo, %#x.\n", hr); + + hr = IProvideClassInfo_GetClassInfo(classinfo, &ti); + ok_(__FILE__,line) (hr == S_OK, "GetClassInfo() failed, %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &attr); + ok_(__FILE__,line) (hr == S_OK, "GetTypeAttr() failed, %#x.\n", hr); + + ok_(__FILE__,line) (IsEqualGUID(&attr->guid, guid), "Unexpected typeinfo %s, expected %s\n", wine_dbgstr_guid(&attr->guid), + wine_dbgstr_guid(guid)); + + hr = IProvideClassInfo_QueryInterface(classinfo, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Failed to QI for IUnknown.\n"); + ok(unk == (IUnknown *)disp, "Got unk %p, original %p\n", unk, disp); + IUnknown_Release(unk); + + IProvideClassInfo_Release(classinfo); + ITypeInfo_ReleaseTypeAttr(ti, attr); + ITypeInfo_Release(ti); +} + static void test_interfaces(void) { static const WCHAR key_add[] = {'a', 0}; @@ -60,6 +91,8 @@ hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); ok(hr == E_NOINTERFACE, "got 0x%08x, expected 0x%08x\n", hr, E_NOINTERFACE); + test_provideclassinfo(disp, &CLSID_Dictionary); + V_VT(&key) = VT_BSTR; V_BSTR(&key) = SysAllocString(key_add); V_VT(&value) = VT_BSTR; Modified: trunk/rostests/winetests/scrrun/filesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/scrrun/filesyst… ============================================================================== --- trunk/rostests/winetests/scrrun/filesystem.c [iso-8859-1] (original) +++ trunk/rostests/winetests/scrrun/filesystem.c [iso-8859-1] Sun Feb 26 19:25:18 2017 @@ -100,6 +100,37 @@ return drive; } +#define test_provideclassinfo(a, b) _test_provideclassinfo((IDispatch*)a, b, __LINE__) +static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) +{ + IProvideClassInfo *classinfo; + TYPEATTR *attr; + ITypeInfo *ti; + IUnknown *unk; + HRESULT hr; + + hr = IDispatch_QueryInterface(disp, &IID_IProvideClassInfo, (void **)&classinfo); + ok_(__FILE__,line) (hr == S_OK, "Failed to get IProvideClassInfo, %#x.\n", hr); + + hr = IProvideClassInfo_GetClassInfo(classinfo, &ti); + ok_(__FILE__,line) (hr == S_OK, "GetClassInfo() failed, %#x.\n", hr); + + hr = ITypeInfo_GetTypeAttr(ti, &attr); + ok_(__FILE__,line) (hr == S_OK, "GetTypeAttr() failed, %#x.\n", hr); + + ok_(__FILE__,line) (IsEqualGUID(&attr->guid, guid), "Unexpected typeinfo %s, expected %s\n", wine_dbgstr_guid(&attr->guid), + wine_dbgstr_guid(guid)); + + hr = IProvideClassInfo_QueryInterface(classinfo, &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Failed to QI for IUnknown.\n"); + ok(unk == (IUnknown *)disp, "Got unk %p, original %p.\n", unk, disp); + IUnknown_Release(unk); + + IProvideClassInfo_Release(classinfo); + ITypeInfo_ReleaseTypeAttr(ti, attr); + ITypeInfo_Release(ti); +} + static void test_interfaces(void) { static const WCHAR nonexistent_dirW[] = { @@ -121,6 +152,8 @@ GetSystemDirectoryW(windows_path, MAX_PATH); lstrcpyW(file_path, windows_path); lstrcatW(file_path, file_kernel32W); + + test_provideclassinfo(disp, &CLSID_FileSystemObject); hr = IDispatch_QueryInterface(disp, &IID_IObjectWithSite, (void**)&site); ok(hr == E_NOINTERFACE, "got 0x%08x, expected 0x%08x\n", hr, E_NOINTERFACE); @@ -927,6 +960,7 @@ hr = IFileSystem3_GetFolder(fs3, str, &folder); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); + test_provideclassinfo(folder, &CLSID_Folder); IFolder_Release(folder); } @@ -978,6 +1012,7 @@ hr = IFolder_get_SubFolders(folder, &folders); ok(hr == S_OK, "got 0x%08x\n", hr); + test_provideclassinfo(folders, &CLSID_Folders); IFolder_Release(folder); count = 0; @@ -1153,6 +1188,7 @@ hr = IFolder_get_Files(folder, &files); ok(hr == S_OK, "got 0x%08x\n", hr); + test_provideclassinfo(files, &CLSID_Files); IFolder_Release(folder); count = 0; @@ -1220,6 +1256,7 @@ hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IFile, (void **)&file); ok(hr == S_OK, "got 0x%08x\n", hr); + test_provideclassinfo(file, &CLSID_File); str = NULL; hr = IFile_get_Name(file, &str); @@ -1292,6 +1329,8 @@ hr = IFileSystem3_get_Drives(fs3, &drives); ok(hr == S_OK, "got 0x%08x\n", hr); + test_provideclassinfo(drives, &CLSID_Drives); + hr = IDriveCollection_get__NewEnum(drives, (IUnknown**)&enumvar); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1418,6 +1457,8 @@ hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_FALSE, VARIANT_FALSE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); + + test_provideclassinfo(stream, &CLSID_TextStream); hr = ITextStream_Read(stream, 1, &str); ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); @@ -2033,6 +2074,7 @@ wine_dbgstr_w(ptr->drivespec)); SysFreeString(driveletter); } + test_provideclassinfo(drive, &CLSID_Drive); IDrive_Release(drive); } else ok(drive == NULL, "got %p for drive spec %s\n", drive, wine_dbgstr_w(ptr->drivespec));

7 years, 10 months

[akhaldi] 73973: [SCRRUN] Sync with Wine Staging 2.2. CORE-12823 0d8d0b9 scrrun: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). d806a47 scrrun: Remove unreachable code (Coverity). eda5d61 scrru...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 19:24:21 2017 New Revision: 73973 URL: http://svn.reactos.org/svn/reactos?rev=73973&view=rev Log: [SCRRUN] Sync with Wine Staging 2.2. CORE-12823 0d8d0b9 scrrun: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). d806a47 scrrun: Remove unreachable code (Coverity). eda5d61 scrrun: Added IProvideClassInfo support for filesystem objects. ba2e6fb scrrun: Added IProvideClassInfo support for dictionary. 62cb1f8 scrrun: Improved tracing of IDictionary methods. Modified: trunk/reactos/dll/win32/scrrun/dictionary.c trunk/reactos/dll/win32/scrrun/filesystem.c trunk/reactos/dll/win32/scrrun/scrrun.c trunk/reactos/dll/win32/scrrun/scrrun_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/scrrun/dictionary.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/dictionar… ============================================================================== --- trunk/reactos/dll/win32/scrrun/dictionary.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/dictionary.c [iso-8859-1] Sun Feb 26 19:24:21 2017 @@ -52,6 +52,7 @@ typedef struct { + struct provideclassinfo classinfo; IDictionary IDictionary_iface; LONG ref; @@ -227,19 +228,19 @@ static ULONG WINAPI dict_enum_AddRef(IEnumVARIANT *iface) { struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); - TRACE("(%p)\n", This); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; } static ULONG WINAPI dict_enum_Release(IEnumVARIANT *iface) { struct dictionary_enum *This = impl_from_IEnumVARIANT(iface); - LONG ref; - - TRACE("(%p)\n", This); - - ref = InterlockedDecrement(&This->ref); - if(ref == 0) { + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + + if (!ref) { list_remove(&This->notify); IDictionary_Release(&This->dict->IDictionary_iface); heap_free(This); @@ -373,6 +374,10 @@ { *obj = &This->IDictionary_iface; } + else if (IsEqualIID(riid, &IID_IProvideClassInfo)) + { + *obj = &This->classinfo.IProvideClassInfo_iface; + } else if ( IsEqualGUID( riid, &IID_IDispatchEx )) { TRACE("Interface IDispatchEx not supported - returning NULL\n"); @@ -391,27 +396,28 @@ return E_NOINTERFACE; } - IDictionary_AddRef(iface); + IUnknown_AddRef((IUnknown*)*obj); return S_OK; } static ULONG WINAPI dictionary_AddRef(IDictionary *iface) { dictionary *This = impl_from_IDictionary(iface); - TRACE("(%p)\n", This); - - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + + return ref; } static ULONG WINAPI dictionary_Release(IDictionary *iface) { dictionary *This = impl_from_IDictionary(iface); - LONG ref; - - TRACE("(%p)\n", This); - - ref = InterlockedDecrement(&This->ref); - if(ref == 0) { + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + + if (!ref) { IDictionary_RemoveAll(iface); heap_free(This); } @@ -423,7 +429,7 @@ { dictionary *This = impl_from_IDictionary(iface); - TRACE("(%p)->()\n", This); + TRACE("(%p)->(%p)\n", This, pctinfo); *pctinfo = 1; return S_OK; @@ -872,7 +878,7 @@ { dictionary *This; - TRACE("(%p)\n", obj); + TRACE("(%p, %p, %s, %p)\n", factory, outer, debugstr_guid(riid), obj); *obj = NULL; @@ -887,6 +893,7 @@ list_init(&This->notifier); memset(This->buckets, 0, sizeof(This->buckets)); + init_classinfo(&CLSID_Dictionary, (IUnknown *)&This->IDictionary_iface, &This->classinfo); *obj = &This->IDictionary_iface; return S_OK; Modified: trunk/reactos/dll/win32/scrrun/filesystem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/filesyste… ============================================================================== --- trunk/reactos/dll/win32/scrrun/filesystem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/filesystem.c [iso-8859-1] Sun Feb 26 19:24:21 2017 @@ -26,19 +26,27 @@ static const WCHAR bsW[] = {'\\',0}; static const WCHAR utf16bom = 0xfeff; +struct filesystem { + struct provideclassinfo classinfo; + IFileSystem3 IFileSystem3_iface; +}; + struct foldercollection { + struct provideclassinfo classinfo; IFolderCollection IFolderCollection_iface; LONG ref; BSTR path; }; struct filecollection { + struct provideclassinfo classinfo; IFileCollection IFileCollection_iface; LONG ref; BSTR path; }; struct drivecollection { + struct provideclassinfo classinfo; IDriveCollection IDriveCollection_iface; LONG ref; DWORD drives; @@ -74,18 +82,21 @@ }; struct drive { + struct provideclassinfo classinfo; IDrive IDrive_iface; LONG ref; BSTR root; }; struct folder { + struct provideclassinfo classinfo; IFolder IFolder_iface; LONG ref; BSTR path; }; struct file { + struct provideclassinfo classinfo; IFile IFile_iface; LONG ref; @@ -93,6 +104,7 @@ }; struct textstream { + struct provideclassinfo classinfo; ITextStream ITextStream_iface; LONG ref; @@ -107,6 +119,11 @@ IORead, IOWrite }; + +static inline struct filesystem *impl_from_IFileSystem3(IFileSystem3 *iface) +{ + return CONTAINING_RECORD(iface, struct filesystem, IFileSystem3_iface); +} static inline struct drive *impl_from_IDrive(IDrive *iface) { @@ -213,13 +230,17 @@ IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID_IUnknown)) { - *obj = iface; - ITextStream_AddRef(iface); - return S_OK; - } - - *obj = NULL; - return E_NOINTERFACE; + *obj = &This->ITextStream_iface; + } + else if (IsEqualIID(riid, &IID_IProvideClassInfo)) + { + *obj = &This->classinfo.IProvideClassInfo_iface; + } + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*obj); + return S_OK; } static ULONG WINAPI textstream_AddRef(ITextStream *iface) @@ -708,6 +729,7 @@ } } + init_classinfo(&CLSID_TextStream, (IUnknown *)&stream->ITextStream_iface, &stream->classinfo); *ret = &stream->ITextStream_iface; return S_OK; } @@ -724,12 +746,16 @@ IsEqualIID( riid, &IID_IDispatch ) || IsEqualIID( riid, &IID_IUnknown)) { - *obj = iface; - IDrive_AddRef(iface); + *obj = &This->IDrive_iface; + } + else if (IsEqualIID( riid, &IID_IProvideClassInfo )) + { + *obj = &This->classinfo.IProvideClassInfo_iface; } else return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*obj); return S_OK; } @@ -1067,6 +1093,7 @@ This->root[2] = '\\'; This->root[3] = 0; + init_classinfo(&CLSID_Drive, (IUnknown *)&This->IDrive_iface, &This->classinfo); *drive = &This->IDrive_iface; return S_OK; } @@ -1560,12 +1587,16 @@ IsEqualIID( riid, &IID_IDispatch ) || IsEqualIID( riid, &IID_IUnknown )) { - *obj = iface; - IFolderCollection_AddRef(iface); + *obj = &This->IFolderCollection_iface; + } + else if (IsEqualIID( riid, &IID_IProvideClassInfo )) + { + *obj = &This->classinfo.IProvideClassInfo_iface; } else return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*obj); return S_OK; } @@ -1740,6 +1771,7 @@ return E_OUTOFMEMORY; } + init_classinfo(&CLSID_Folders, (IUnknown *)&This->IFolderCollection_iface, &This->classinfo); *folders = &This->IFolderCollection_iface; return S_OK; @@ -1757,12 +1789,16 @@ IsEqualIID( riid, &IID_IDispatch ) || IsEqualIID( riid, &IID_IUnknown )) { - *obj = iface; - IFileCollection_AddRef(iface); + *obj = &This->IFileCollection_iface; + } + else if (IsEqualIID( riid, &IID_IProvideClassInfo )) + { + *obj = &This->classinfo.IProvideClassInfo_iface; } else return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*obj); return S_OK; } @@ -1929,6 +1965,7 @@ return E_OUTOFMEMORY; } + init_classinfo(&CLSID_Files, (IUnknown *)&This->IFileCollection_iface, &This->classinfo); *files = &This->IFileCollection_iface; return S_OK; } @@ -1945,12 +1982,16 @@ IsEqualIID( riid, &IID_IDispatch ) || IsEqualIID( riid, &IID_IUnknown )) { - *obj = iface; - IDriveCollection_AddRef(iface); + *obj = &This->IDriveCollection_iface; + } + else if (IsEqualIID( riid, &IID_IProvideClassInfo )) + { + *obj = &This->classinfo.IProvideClassInfo_iface; } else return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*obj); return S_OK; } @@ -2094,6 +2135,7 @@ for (This->count = 0; mask; This->count++) mask &= mask - 1; + init_classinfo(&CLSID_Drives, (IUnknown *)&This->IDriveCollection_iface, &This->classinfo); *drives = &This->IDriveCollection_iface; return S_OK; } @@ -2110,12 +2152,16 @@ IsEqualIID( riid, &IID_IDispatch ) || IsEqualIID( riid, &IID_IUnknown)) { - *obj = iface; - IFolder_AddRef(iface); + *obj = &This->IFolder_iface; + } + else if (IsEqualIID( riid, &IID_IProvideClassInfo )) + { + *obj = &This->classinfo.IProvideClassInfo_iface; } else return E_NOINTERFACE; + IUnknown_AddRef((IUnknown*)*obj); return S_OK; } @@ -2434,6 +2480,7 @@ return E_OUTOFMEMORY; } + init_classinfo(&CLSID_Folder, (IUnknown *)&This->IFolder_iface, &This->classinfo); *folder = &This->IFolder_iface; return S_OK; @@ -2444,18 +2491,24 @@ struct file *This = impl_from_IFile(iface); TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + *obj = NULL; if (IsEqualIID(riid, &IID_IFile) || IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID_IUnknown)) { - *obj = iface; - IFile_AddRef(iface); - return S_OK; - } - - *obj = NULL; - return E_NOINTERFACE; + *obj = &This->IFile_iface; + } + else if (IsEqualIID( riid, &IID_IProvideClassInfo )) + { + *obj = &This->classinfo.IProvideClassInfo_iface; + } + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown*)*obj); + return S_OK; } static ULONG WINAPI file_AddRef(IFile *iface) @@ -2800,12 +2853,15 @@ return create_error(GetLastError()); } + init_classinfo(&CLSID_File, (IUnknown *)&f->IFile_iface, &f->classinfo); *file = &f->IFile_iface; return S_OK; } static HRESULT WINAPI filesys_QueryInterface(IFileSystem3 *iface, REFIID riid, void **ppvObject) { + struct filesystem *This = impl_from_IFileSystem3(iface); + TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); if ( IsEqualGUID( riid, &IID_IFileSystem3 ) || @@ -2813,7 +2869,11 @@ IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) { - *ppvObject = iface; + *ppvObject = &This->IFileSystem3_iface; + } + else if (IsEqualGUID( riid, &IID_IProvideClassInfo )) + { + *ppvObject = &This->classinfo.IProvideClassInfo_iface; } else if ( IsEqualGUID( riid, &IID_IDispatchEx )) { @@ -2833,7 +2893,7 @@ return E_NOINTERFACE; } - IFileSystem3_AddRef(iface); + IUnknown_AddRef((IUnknown*)*ppvObject); return S_OK; } @@ -3878,11 +3938,13 @@ filesys_GetFileVersion }; -static IFileSystem3 filesystem = { &filesys_vtbl }; +static struct filesystem filesystem; HRESULT WINAPI FileSystem_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) { TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - return IFileSystem3_QueryInterface(&filesystem, riid, ppv); -} + filesystem.IFileSystem3_iface.lpVtbl = &filesys_vtbl; + init_classinfo(&CLSID_FileSystemObject, (IUnknown *)&filesystem.IFileSystem3_iface, &filesystem.classinfo); + return IFileSystem3_QueryInterface(&filesystem.IFileSystem3_iface, riid, ppv); +} Modified: trunk/reactos/dll/win32/scrrun/scrrun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun.c?… ============================================================================== --- trunk/reactos/dll/win32/scrrun/scrrun.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/scrrun.c [iso-8859-1] Sun Feb 26 19:24:21 2017 @@ -22,6 +22,11 @@ static HINSTANCE scrrun_instance; +static inline struct provideclassinfo *impl_from_IProvideClassInfo(IProvideClassInfo *iface) +{ + return CONTAINING_RECORD(iface, struct provideclassinfo, IProvideClassInfo_iface); +} + typedef HRESULT (*fnCreateInstance)(LPVOID *ppObj); static HRESULT WINAPI scrruncf_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppv ) @@ -105,6 +110,9 @@ HRESULT hres; ITypeLib *tl; + if(typelib) + return S_OK; + hres = LoadRegTypeLib(&LIBID_Scripting, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); if(FAILED(hres)) { ERR("LoadRegTypeLib failed: %08x\n", hres); @@ -116,13 +124,21 @@ return hres; } +static HRESULT get_typeinfo_of_guid(const GUID *guid, ITypeInfo **tinfo) +{ + HRESULT hres; + + if(FAILED(hres = load_typelib())) + return hres; + + return ITypeLib_GetTypeInfoOfGuid(typelib, guid, tinfo); +} + HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) { HRESULT hres; - if (!typelib) - hres = load_typelib(); - if (!typelib) + if (FAILED(hres = load_typelib())) return hres; if(!typeinfos[tid]) { @@ -155,6 +171,56 @@ ITypeInfo_Release(typeinfos[i]); ITypeLib_Release(typelib); +} + +static HRESULT WINAPI provideclassinfo_QueryInterface(IProvideClassInfo *iface, REFIID riid, void **obj) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IProvideClassInfo)) { + *obj = iface; + IProvideClassInfo_AddRef(iface); + return S_OK; + } + else + return IUnknown_QueryInterface(This->outer, riid, obj); +} + +static ULONG WINAPI provideclassinfo_AddRef(IProvideClassInfo *iface) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI provideclassinfo_Release(IProvideClassInfo *iface) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + return IUnknown_Release(This->outer); +} + +static HRESULT WINAPI provideclassinfo_GetClassInfo(IProvideClassInfo *iface, ITypeInfo **ti) +{ + struct provideclassinfo *This = impl_from_IProvideClassInfo(iface); + + TRACE("(%p)->(%p)\n", This, ti); + + return get_typeinfo_of_guid(This->guid, ti); +} + +static const IProvideClassInfoVtbl provideclassinfovtbl = { + provideclassinfo_QueryInterface, + provideclassinfo_AddRef, + provideclassinfo_Release, + provideclassinfo_GetClassInfo +}; + +void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) +{ + classinfo->IProvideClassInfo_iface.lpVtbl = &provideclassinfovtbl; + classinfo->outer = outer; + classinfo->guid = guid; } BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) Modified: trunk/reactos/dll/win32/scrrun/scrrun_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/scrrun/scrrun_pr… ============================================================================== --- trunk/reactos/dll/win32/scrrun/scrrun_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/scrrun/scrrun_private.h [iso-8859-1] Sun Feb 26 19:24:21 2017 @@ -60,7 +60,15 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; -static inline void *heap_alloc(size_t len) +struct provideclassinfo { + IProvideClassInfo IProvideClassInfo_iface; + IUnknown *outer; + const GUID *guid; +}; + +extern void init_classinfo(const GUID *guid, IUnknown *outer, struct provideclassinfo *classinfo) DECLSPEC_HIDDEN; + +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); } 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 Feb 26 19:24:21 2017 @@ -165,7 +165,7 @@ reactos/dll/win32/rsaenh # Synced to WineStaging-1.9.11 reactos/dll/win32/sccbase # Synced to WineStaging-1.9.11 reactos/dll/win32/schannel # Synced to WineStaging-1.9.11 -reactos/dll/win32/scrrun # Synced to WineStaging-1.9.11 +reactos/dll/win32/scrrun # Synced to WineStaging-2.2 reactos/dll/win32/secur32 # Forked reactos/dll/win32/security # Forked (different .spec) reactos/dll/win32/sensapi # Synced to WineStaging-1.9.11

7 years, 10 months

[akhaldi] 73972: [PSTOREC] Sync with Wine Staging 2.2. CORE-12823 8d3af56 pstorec: Fix QueryInterface() of IPStore.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 19:20:43 2017 New Revision: 73972 URL: http://svn.reactos.org/svn/reactos?rev=73972&view=rev Log: [PSTOREC] Sync with Wine Staging 2.2. CORE-12823 8d3af56 pstorec: Fix QueryInterface() of IPStore. Modified: trunk/reactos/dll/win32/pstorec/pstorec.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/pstorec/pstorec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/pstorec.… ============================================================================== --- trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/pstorec/pstorec.c [iso-8859-1] Sun Feb 26 19:20:43 2017 @@ -71,13 +71,13 @@ { PStore_impl *This = impl_from_IPStore(iface); - TRACE("%p %s\n",This,debugstr_guid(riid)); + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObj); *ppvObj = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) + if (IsEqualIID(riid, &IID_IPStore) || IsEqualIID(riid, &IID_IUnknown)) { - *ppvObj = This; + *ppvObj = &This->IPStore_iface; } if (*ppvObj) 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 Feb 26 19:20:43 2017 @@ -152,7 +152,7 @@ reactos/dll/win32/powrprof # Forked at Wine-1.0rc5 reactos/dll/win32/printui # Synced to WineStaging-1.9.11 reactos/dll/win32/propsys # Synced to WineStaging-1.9.16 -reactos/dll/win32/pstorec # Synced to WineStaging-1.9.16 +reactos/dll/win32/pstorec # Synced to WineStaging-2.2 reactos/dll/win32/qmgr # Synced to WineStaging-1.9.23 reactos/dll/win32/qmgrprxy # Synced to WineStaging-1.9.11 reactos/dll/win32/query # Synced to WineStaging-1.9.11

7 years, 10 months

[akhaldi] 73971: [ODBC32] Sync with Wine Staging 2.2. CORE-12823 25e495f odbc32: Improve some tracing. 0c785e5 odbc32: Fix some spec file entries.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 19:18:31 2017 New Revision: 73971 URL: http://svn.reactos.org/svn/reactos?rev=73971&view=rev Log: [ODBC32] Sync with Wine Staging 2.2. CORE-12823 25e495f odbc32: Improve some tracing. 0c785e5 odbc32: Fix some spec file entries. Modified: trunk/reactos/dll/win32/odbc32/odbc32.spec trunk/reactos/dll/win32/odbc32/proxyodbc.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/odbc32/odbc32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/odbc32.sp… ============================================================================== --- trunk/reactos/dll/win32/odbc32/odbc32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbc32/odbc32.spec [iso-8859-1] Sun Feb 26 19:18:31 2017 @@ -38,7 +38,7 @@ 38 stdcall SQLGetStmtAttr(long long ptr long ptr) 39 stdcall SQLSetConnectAttr(long long ptr long) 40 stdcall SQLColumns(long str long str long str long str long) - 41 stdcall SQLDriverConnect(long long str long str long str long) + 41 stdcall SQLDriverConnect(long long str long str long ptr long) 42 stdcall SQLGetConnectOption(long long ptr) 43 stdcall SQLGetData(long long long ptr long ptr) 44 stdcall SQLGetFunctions(long long ptr) @@ -103,7 +103,7 @@ 138 stdcall SQLGetStmtAttrW(long long ptr long ptr) 139 stdcall SQLSetConnectAttrW(long long ptr long) 140 stdcall SQLColumnsW(long wstr long wstr long wstr long wstr long) -141 stdcall SQLDriverConnectW(long long wstr long wstr long wstr long) +141 stdcall SQLDriverConnectW(long long wstr long wstr long ptr long) 142 stdcall SQLGetConnectOptionW(long long ptr) 145 stdcall SQLGetInfoW(long long ptr long ptr) 147 stdcall SQLGetTypeInfoW(long long) Modified: trunk/reactos/dll/win32/odbc32/proxyodbc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/proxyodbc… ============================================================================== --- trunk/reactos/dll/win32/odbc32/proxyodbc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbc32/proxyodbc.c [iso-8859-1] Sun Feb 26 19:18:31 2017 @@ -510,8 +510,6 @@ const char *s = getenv("LIB_ODBC_DRIVER_MANAGER"); char error[256]; - TRACE("\n"); - #ifdef SONAME_LIBODBC if (!s || !s[0]) s = SONAME_LIBODBC; #endif @@ -521,6 +519,7 @@ if (dmHandle != NULL) { + TRACE("Opened library %s\n", s); nErrorType = ERROR_FREE; return TRUE; } @@ -680,7 +679,7 @@ SQLRETURN WINAPI SQLAllocConnect(SQLHENV EnvironmentHandle, SQLHDBC *ConnectionHandle) { SQLRETURN ret; - TRACE("Env=%p\n",EnvironmentHandle); + TRACE("(EnvironmentHandle %p)\n",EnvironmentHandle); if (!pSQLAllocConnect) { @@ -690,7 +689,7 @@ } ret = pSQLAllocConnect(EnvironmentHandle, ConnectionHandle); - TRACE("Returns ret=%d, Handle %p\n",ret, *ConnectionHandle); + TRACE("Returns %d, Handle %p\n", ret, *ConnectionHandle); return ret; } @@ -711,7 +710,7 @@ } ret = pSQLAllocEnv(EnvironmentHandle); - TRACE("Returns ret=%d, Env=%p\n",ret, *EnvironmentHandle); + TRACE("Returns %d, EnvironmentHandle %p\n", ret, *EnvironmentHandle); return ret; } @@ -722,7 +721,7 @@ SQLRETURN WINAPI SQLAllocHandle(SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE *OutputHandle) { SQLRETURN ret; - TRACE("(Type=%d, Handle=%p)\n",HandleType,InputHandle); + TRACE("(Type %d, Handle %p)\n", HandleType, InputHandle); if (!pSQLAllocHandle) { @@ -743,7 +742,7 @@ } ret = pSQLAllocHandle(HandleType, InputHandle, OutputHandle); - TRACE("Returns ret=%d, Handle=%p\n",ret, *OutputHandle); + TRACE("Returns %d, Handle %p\n", ret, *OutputHandle); return ret; } @@ -755,7 +754,7 @@ { SQLRETURN ret; - TRACE("(Connection=%p)\n",ConnectionHandle); + TRACE("(Connection %p)\n", ConnectionHandle); if (!pSQLAllocStmt) { @@ -765,7 +764,7 @@ } ret = pSQLAllocStmt(ConnectionHandle, StatementHandle); - TRACE ("Returns ret=%d, Handle=%p\n", ret, *StatementHandle); + TRACE ("Returns %d, Handle %p\n", ret, *StatementHandle); return ret; } @@ -856,12 +855,12 @@ SQLRETURN WINAPI SQLCloseCursor(SQLHSTMT StatementHandle) { SQLRETURN ret; - TRACE("(Handle=%p)\n",StatementHandle); + TRACE("(Handle %p)\n", StatementHandle); if (!pSQLCloseCursor) return SQL_ERROR; ret = pSQLCloseCursor(StatementHandle); - TRACE("returns %d\n",ret); + TRACE("Returns %d\n", ret); return ret; } @@ -915,7 +914,7 @@ ret = pSQLConnect(ConnectionHandle, ServerName, NameLength1, UserName, NameLength2, Authentication, NameLength3); - TRACE("returns %d\n",ret); + TRACE("Returns %d\n", ret); return ret; } @@ -943,7 +942,7 @@ { SQLRETURN ret; - TRACE("EnvironmentHandle = %p\n", EnvironmentHandle); + TRACE("(EnvironmentHandle %p)\n", EnvironmentHandle); if (!pSQLDataSources) return SQL_ERROR; @@ -952,7 +951,7 @@ if (TRACE_ON(odbc)) { - TRACE("returns: %d \t", ret); + TRACE("Returns %d \t", ret); if (NameLength1 && *NameLength1 > 0) TRACE("DataSource = %s,", ServerName); if (NameLength2 && *NameLength2 > 0) @@ -979,7 +978,7 @@ BufferLength1, NameLength1, Description, BufferLength2, NameLength2); if (TRACE_ON(odbc)) { - TRACE("returns: %d \t", ret); + TRACE("Returns %d \t", ret); if (NameLength1 && *NameLength1 > 0) TRACE("DataSource = %s,", ServerName); if (NameLength2 && *NameLength2 > 0) @@ -1013,12 +1012,12 @@ SQLRETURN WINAPI SQLDisconnect(SQLHDBC ConnectionHandle) { SQLRETURN ret; - TRACE("(Handle=%p)\n", ConnectionHandle); + TRACE("(Handle %p)\n", ConnectionHandle); if (!pSQLDisconnect) return SQL_ERROR; ret = pSQLDisconnect(ConnectionHandle); - TRACE("returns %d\n",ret); + TRACE("Returns %d\n", ret); return ret; } @@ -1044,11 +1043,21 @@ SQLCHAR *MessageText, SQLSMALLINT BufferLength, SQLSMALLINT *TextLength) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(EnvironmentHandle %p, ConnectionHandle %p, StatementHandle %p, BufferLength %d)\n", + EnvironmentHandle, ConnectionHandle, StatementHandle, BufferLength); if (!pSQLError) return SQL_ERROR; - return pSQLError(EnvironmentHandle, ConnectionHandle, StatementHandle, - Sqlstate, NativeError, MessageText, BufferLength, TextLength); + ret = pSQLError(EnvironmentHandle, ConnectionHandle, StatementHandle, + Sqlstate, NativeError, MessageText, BufferLength, TextLength); + if (ret == SQL_SUCCESS) + TRACE("SQLState %s, Error %d, Text %s, Textlen %d\n", + debugstr_an((char *)Sqlstate, 5), *NativeError, + debugstr_an((char *)MessageText, *TextLength), *TextLength); + else + TRACE("Returns %d\n", ret); + return ret; } @@ -1106,12 +1115,12 @@ SQLRETURN WINAPI SQLFreeConnect(SQLHDBC ConnectionHandle) { SQLRETURN ret; - TRACE("(Handle=%p)\n",ConnectionHandle); + TRACE("(Handle %p)\n", ConnectionHandle); if (!pSQLFreeConnect) return SQL_ERROR; ret = pSQLFreeConnect(ConnectionHandle); - TRACE("Returns %d\n",ret); + TRACE("Returns %d\n", ret); return ret; } @@ -1122,12 +1131,12 @@ SQLRETURN WINAPI SQLFreeEnv(SQLHENV EnvironmentHandle) { SQLRETURN ret; - TRACE("(Env=%p)\n",EnvironmentHandle); + TRACE("(EnvironmentHandle %p)\n",EnvironmentHandle); if (!pSQLFreeEnv) return SQL_ERROR; ret = pSQLFreeEnv(EnvironmentHandle); - TRACE("Returns %d\n",ret); + TRACE("Returns %d\n", ret); return ret; } @@ -1138,12 +1147,12 @@ SQLRETURN WINAPI SQLFreeHandle(SQLSMALLINT HandleType, SQLHANDLE Handle) { SQLRETURN ret; - TRACE("(Type=%d, Handle=%p)\n",HandleType,Handle); + TRACE("(Type %d, Handle %p)\n", HandleType, Handle); if (!pSQLFreeHandle) return SQL_ERROR; ret = pSQLFreeHandle(HandleType, Handle); - TRACE ("Returns %d\n",ret); + TRACE ("Returns %d\n", ret); return ret; } @@ -1154,12 +1163,12 @@ SQLRETURN WINAPI SQLFreeStmt(SQLHSTMT StatementHandle, SQLUSMALLINT Option) { SQLRETURN ret; - TRACE("(Handle %p, Option=%d)\n",StatementHandle, Option); + TRACE("(Handle %p, Option %d)\n", StatementHandle, Option); if (!pSQLFreeStmt) return SQL_ERROR; ret = pSQLFreeStmt(StatementHandle, Option); - TRACE("Returns %d\n",ret); + TRACE("Returns %d\n", ret); return ret; } @@ -1922,7 +1931,7 @@ { SQLRETURN ret; - TRACE("direction=%d\n", fDirection); + TRACE("(Direction %d)\n", fDirection); if (!pSQLDrivers) return SQL_ERROR; ret = pSQLDrivers(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, @@ -1972,11 +1981,16 @@ SQLSMALLINT *ptr_conn_str_out, SQLUSMALLINT driver_completion ) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("(ConnectionString %s, Length %d)\n", + debugstr_a((char *)conn_str_in), len_conn_str_in); if (!pSQLDriverConnect) return SQL_ERROR; - return pSQLDriverConnect(hdbc, hwnd, conn_str_in, len_conn_str_in, conn_str_out, + ret = pSQLDriverConnect(hdbc, hwnd, conn_str_in, len_conn_str_in, conn_str_out, conn_str_out_max, ptr_conn_str_out, driver_completion); + TRACE("Returns %d\n", ret); + return ret; } @@ -2075,7 +2089,7 @@ ret = pSQLConnectW(ConnectionHandle, ServerName, NameLength1, UserName, NameLength2, Authentication, NameLength3); - TRACE("returns %d\n",ret); + TRACE("Returns %d\n", ret); return ret; } @@ -2349,7 +2363,8 @@ SQLSMALLINT *ptr_conn_str_out, SQLUSMALLINT driver_completion ) { - TRACE("ConnStrIn (%d bytes) --> %s\n", len_conn_str_in, debugstr_w(conn_str_in)); + TRACE("(ConnectionString %s, Length %d)\n", + debugstr_w(conn_str_in), len_conn_str_in); if (!pSQLDriverConnectW) return SQL_ERROR; return pSQLDriverConnectW(hdbc, hwnd, conn_str_in, len_conn_str_in, conn_str_out, @@ -2516,7 +2531,7 @@ if (TRACE_ON(odbc)) { - TRACE("returns: %d \t", ret); + TRACE("Returns %d \t", ret); if (*NameLength1 > 0) TRACE("DataSource = %s,", debugstr_w(ServerName)); if (*NameLength2 > 0) @@ -2663,7 +2678,7 @@ { SQLRETURN ret; - TRACE("direction=%d\n", fDirection); + TRACE("(Direction %d)\n", fDirection); if (!pSQLDriversW) return SQL_ERROR; ret = pSQLDriversW(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, 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 Feb 26 19:18:31 2017 @@ -137,7 +137,7 @@ reactos/dll/win32/npptools # Synced to WineStaging-1.9.11 reactos/dll/win32/ntdsapi # Synced to WineStaging-1.9.11 reactos/dll/win32/objsel # Synced to WineStaging-1.9.11 -reactos/dll/win32/odbc32 # Synced to WineStaging-1.9.23. Depends on port of Linux ODBC. +reactos/dll/win32/odbc32 # Synced to WineStaging-2.2. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to WineStaging-1.9.11 reactos/dll/win32/ole32 # Synced to WineStaging-1.9.23 reactos/dll/win32/oleacc # Synced to WineStaging-1.9.11

7 years, 10 months

[akhaldi] 73970: [MSXML3_WINETEST] Sync with Wine Staging 2.2. CORE-12823

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 19:09:04 2017 New Revision: 73970 URL: http://svn.reactos.org/svn/reactos?rev=73970&view=rev Log: [MSXML3_WINETEST] Sync with Wine Staging 2.2. CORE-12823 Modified: trunk/rostests/winetests/msxml3/httpreq.c trunk/rostests/winetests/msxml3/xmlview.c Modified: trunk/rostests/winetests/msxml3/httpreq.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/httpreq.… ============================================================================== --- trunk/rostests/winetests/msxml3/httpreq.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/httpreq.c [iso-8859-1] Sun Feb 26 19:09:04 2017 @@ -1439,7 +1439,7 @@ IXMLHttpRequest *xhr; IObjectWithSite *obj_site, *obj_site2; BSTR bstrResponse, str, str1; - VARIANT varbody, varbody_ref; + VARIANT varbody; VARIANT dummy; LONG state, status, bound; IDispatch *event; @@ -1625,12 +1625,11 @@ SysFreeString(bstrResponse); } - /* POST: VT_VARIANT|VT_BYREF body */ + /* POST: VT_VARIANT body */ + /* VT_VARIANT|VT_BYREF fails on Windows 10 */ test_open(xhr, "POST", urlA, S_OK); - V_VT(&varbody_ref) = VT_VARIANT|VT_BYREF; - V_VARIANTREF(&varbody_ref) = &varbody; - hr = IXMLHttpRequest_send(xhr, varbody_ref); + hr = IXMLHttpRequest_send(xhr, varbody); EXPECT_HR(hr, S_OK); /* GET request */ Modified: trunk/rostests/winetests/msxml3/xmlview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/xmlview.… ============================================================================== --- trunk/rostests/winetests/msxml3/xmlview.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/xmlview.c [iso-8859-1] Sun Feb 26 19:09:04 2017 @@ -188,7 +188,7 @@ ok(hres == S_OK, "QueryInterface(IID_IHTMLDocument) returned %x, expected S_OK\n", hres); hres = IHTMLDocument_QueryInterface(htmldoc, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "QueryInterface(IID_IUnknown) returned %x, expected S_OK\n", hres); - todo_wine ok(unk == xmlview, "Aggregation is not working as expected\n"); + ok(unk == xmlview, "Aggregation is not working as expected\n"); IUnknown_Release(unk); IHTMLDocument_Release(htmldoc);

7 years, 10 months

[akhaldi] 73969: [MSXML3] Sync with Wine Staging 2.2. CORE-12823 45dd9d1 msxml3: Accept AllowXsltScript and AllowDocumentFunction properties. 2191d97 msxml3: Duplicate stylesheet document before pa...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 19:07:55 2017 New Revision: 73969 URL: http://svn.reactos.org/svn/reactos?rev=73969&view=rev Log: [MSXML3] Sync with Wine Staging 2.2. CORE-12823 45dd9d1 msxml3: Accept AllowXsltScript and AllowDocumentFunction properties. 2191d97 msxml3: Duplicate stylesheet document before passing it to libxslt. 1242648 msxml3: Remove dead initialization (clang). Modified: trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… ============================================================================== --- trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/domdoc.c [iso-8859-1] Sun Feb 26 19:07:55 2017 @@ -51,6 +51,8 @@ static const WCHAR PropValueXPathW[] = {'X','P','a','t','h',0}; static const WCHAR PropValueXSLPatternW[] = {'X','S','L','P','a','t','t','e','r','n',0}; static const WCHAR PropertyResolveExternalsW[] = {'R','e','s','o','l','v','e','E','x','t','e','r','n','a','l','s',0}; +static const WCHAR PropertyAllowXsltScriptW[] = {'A','l','l','o','w','X','s','l','t','S','c','r','i','p','t',0}; +static const WCHAR PropertyAllowDocumentFunctionW[] = {'A','l','l','o','w','D','o','c','u','m','e','n','t','F','u','n','c','t','i','o','n',0}; /* Anything that passes the test_get_ownerDocument() * tests can go here (data shared between all instances). @@ -3052,7 +3054,9 @@ } else if (lstrcmpiW(p, PropertyProhibitDTDW) == 0 || lstrcmpiW(p, PropertyNewParserW) == 0 || - lstrcmpiW(p, PropertyResolveExternalsW) == 0) + lstrcmpiW(p, PropertyResolveExternalsW) == 0 || + lstrcmpiW(p, PropertyAllowXsltScriptW) == 0 || + lstrcmpiW(p, PropertyAllowDocumentFunctionW) == 0) { /* Ignore */ FIXME("Ignoring property %s, value %s\n", debugstr_w(p), debugstr_variant(&value)); Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/node.c [iso-8859-1] Sun Feb 26 19:07:55 2017 @@ -810,7 +810,7 @@ case XML_DOCUMENT_FRAG_NODE: if (trim && !preserving) { - xmlChar* ret = str; + xmlChar* ret; int len; if (!str) @@ -1301,6 +1301,7 @@ { #ifdef SONAME_LIBXSLT xsltStylesheetPtr xsltSS; + xmlDocPtr sheet_doc; HRESULT hr = S_OK; xmlnode *sheet; @@ -1312,8 +1313,9 @@ sheet = get_node_obj(stylesheet); if(!sheet) return E_FAIL; - xsltSS = pxsltParseStylesheetDoc(sheet->node->doc); - if(xsltSS) + sheet_doc = xmlCopyDoc(sheet->node->doc, 1); + xsltSS = pxsltParseStylesheetDoc(sheet_doc); + if (xsltSS) { const char **xslparams = NULL; xmlDocPtr result; @@ -1358,11 +1360,11 @@ hr = node_transform_write_to_bstr(xsltSS, result, p); xmlFreeDoc(result); } - /* libxslt "helpfully" frees the XML document the stylesheet was - generated from, too */ - xsltSS->doc = NULL; + pxsltFreeStylesheet(xsltSS); } + else + xmlFreeDoc(sheet_doc); if(!*p) *p = SysAllocStringLen(NULL, 0); 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 Feb 26 19:07:55 2017 @@ -129,7 +129,7 @@ reactos/dll/win32/msvidc32 # Synced to WineStaging-1.9.11 reactos/dll/win32/msxml # Synced to WineStaging-1.9.11 reactos/dll/win32/msxml2 # Synced to WineStaging-1.9.11 -reactos/dll/win32/msxml3 # Synced to WineStaging-1.9.16 +reactos/dll/win32/msxml3 # Synced to WineStaging-2.2 reactos/dll/win32/msxml4 # Synced to WineStaging-1.9.11 reactos/dll/win32/msxml6 # Synced to WineStaging-1.9.11 reactos/dll/win32/nddeapi # Synced to WineStaging-1.9.11

7 years, 10 months

[akhaldi] 73968: [MSVFW32] Sync with Wine Staging 2.2. CORE-12823 8b566b5 msvfw32: Fix some spec file entries. 15840d9 msvfw32: Remove duplicated debug. ca2420c msvfw32: Allow ICInfo to enumerate c...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Feb 26 19:03:35 2017 New Revision: 73968 URL: http://svn.reactos.org/svn/reactos?rev=73968&view=rev Log: [MSVFW32] Sync with Wine Staging 2.2. CORE-12823 8b566b5 msvfw32: Fix some spec file entries. 15840d9 msvfw32: Remove duplicated debug. ca2420c msvfw32: Allow ICInfo to enumerate codecs when fccType is zero. Modified: trunk/reactos/dll/win32/msvfw32/msvfw32.spec trunk/reactos/dll/win32/msvfw32/msvideo_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msvfw32/msvfw32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/msvfw32.… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/msvfw32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/msvfw32.spec [iso-8859-1] Sun Feb 26 19:03:35 2017 @@ -34,13 +34,13 @@ @ stdcall ICImageCompress(long long ptr ptr ptr long ptr) @ stdcall ICImageDecompress(long long ptr ptr ptr) @ stdcall ICInfo(long long ptr) -@ stdcall ICInstall(long long ptr str long) +@ stdcall ICInstall(long long long str long) @ stdcall ICLocate(long long ptr ptr long) @ stub ICMThunk @ stdcall ICOpen(long long long) @ stdcall ICOpenFunction(long long long ptr) @ stdcall ICRemove(long long long) -@ stdcall ICSendMessage(long long ptr ptr) +@ stdcall ICSendMessage(long long long long) @ stdcall ICSeqCompressFrame(ptr long ptr ptr ptr) @ stdcall ICSeqCompressFrameEnd(ptr) @ stdcall ICSeqCompressFrameStart(ptr ptr) 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] Sun Feb 26 19:03:35 2017 @@ -245,7 +245,7 @@ lRet = RegEnumValueA(hKey, i++, buf, &name, 0, &type, (LPBYTE)(buf+name), &data); if (lRet == ERROR_NO_MORE_ITEMS) break; if (lRet != ERROR_SUCCESS) continue; - if (name != 9 || strncasecmp(buf, fccTypeStr, 5)) continue; + if (fccType && (name != 9 || strncasecmp(buf, fccTypeStr, 5))) continue; buf[name] = '='; if ((result = handler(buf, cnt++, param))) break; } @@ -259,7 +259,7 @@ for (s = buf; *s; s += strlen(s) + 1) { TRACE("got %s\n", s); - if (strncasecmp(s, fccTypeStr, 5) || s[9] != '=') continue; + if (fccType && (strncasecmp(s, fccTypeStr, 5) || s[9] != '=')) continue; if ((result = handler(s, cnt++, param))) break; } } @@ -618,7 +618,6 @@ lstrcpyW(picinfo->szDriver, ii.szDriver); } - TRACE(" -> %s\n", wine_dbgstr_icerr(ret)); return ret; } @@ -866,8 +865,6 @@ icd.lpOutput = lpBits; icd.ckid = 0; ret = ICSendMessage(hic,ICM_DECOMPRESS,(DWORD_PTR)&icd,sizeof(ICDECOMPRESS)); - - TRACE("-> %s\n",wine_dbgstr_icerr(ret)); return ret; } 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 Feb 26 19:03:35 2017 @@ -125,7 +125,7 @@ reactos/dll/win32/mstask # Synced to WineStaging-1.9.11 reactos/dll/win32/msvcrt20 # Out of sync reactos/dll/win32/msvcrt40 # Out of sync -reactos/dll/win32/msvfw32 # Synced to WineStaging-1.9.23 +reactos/dll/win32/msvfw32 # Synced to WineStaging-2.2 reactos/dll/win32/msvidc32 # Synced to WineStaging-1.9.11 reactos/dll/win32/msxml # Synced to WineStaging-1.9.11 reactos/dll/win32/msxml2 # Synced to WineStaging-1.9.11

7 years, 10 months

[ekohl] 73967: [PROCESSR] Add a generic processor driver that does nothing but provide a proper CPU device name (FriendlyName) to the registry. CORE-5960 #resolve

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 26 18:57:28 2017 New Revision: 73967 URL: http://svn.reactos.org/svn/reactos?rev=73967&view=rev Log: [PROCESSR] Add a generic processor driver that does nothing but provide a proper CPU device name (FriendlyName) to the registry. CORE-5960 #resolve Added: trunk/reactos/drivers/processor/ (with props) trunk/reactos/drivers/processor/CMakeLists.txt (with props) trunk/reactos/drivers/processor/processr/ (with props) trunk/reactos/drivers/processor/processr/CMakeLists.txt (with props) trunk/reactos/drivers/processor/processr/misc.c (with props) trunk/reactos/drivers/processor/processr/pnp.c (with props) trunk/reactos/drivers/processor/processr/processr.c (with props) trunk/reactos/drivers/processor/processr/processr.h (with props) trunk/reactos/drivers/processor/processr/processr.rc (with props) Modified: trunk/reactos/drivers/CMakeLists.txt trunk/reactos/media/inf/cpu.inf Modified: trunk/reactos/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] Sun Feb 26 18:57:28 2017 @@ -14,6 +14,7 @@ add_subdirectory(ksfilter) add_subdirectory(network) add_subdirectory(parallel) +add_subdirectory(processor) add_subdirectory(sac) add_subdirectory(serial) add_subdirectory(setup) Propchange: trunk/reactos/drivers/processor/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Feb 26 18:57:28 2017 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/drivers/processor/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/drivers/processor/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/drivers/processor/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/drivers/processor/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/processor/CMakeLis… ============================================================================== --- trunk/reactos/drivers/processor/CMakeLists.txt (added) +++ trunk/reactos/drivers/processor/CMakeLists.txt [iso-8859-1] Sun Feb 26 18:57:28 2017 @@ -0,0 +1,2 @@ + +add_subdirectory(processr) Propchange: trunk/reactos/drivers/processor/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/processor/processr/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Feb 26 18:57:28 2017 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/drivers/processor/processr/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/drivers/processor/processr/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/drivers/processor/processr/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/drivers/processor/processr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/processor/processr… ============================================================================== --- trunk/reactos/drivers/processor/processr/CMakeLists.txt (added) +++ trunk/reactos/drivers/processor/processr/CMakeLists.txt [iso-8859-1] Sun Feb 26 18:57:28 2017 @@ -0,0 +1,12 @@ + +list(APPEND SOURCE + processr.c + misc.c + pnp.c + processr.h) + +add_library(processr SHARED ${SOURCE} processr.rc) +set_module_type(processr kernelmodedriver) +add_importlibs(processr hal ntoskrnl) +add_pch(processr processr.h SOURCE) +add_cd_file(TARGET processr DESTINATION reactos/system32/drivers FOR all) Propchange: trunk/reactos/drivers/processor/processr/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/processor/processr/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/processor/processr… ============================================================================== --- trunk/reactos/drivers/processor/processr/misc.c (added) +++ trunk/reactos/drivers/processor/processr/misc.c [iso-8859-1] Sun Feb 26 18:57:28 2017 @@ -0,0 +1,81 @@ +/* + * PROJECT: ReactOS Generic CPU Driver + * LICENSE: GNU GPLv2 only as published by the Free Software Foundation + * FILE: drivers/processor/processr/misc.c + * PURPOSE: Misc routines + * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> + */ + +/* INCLUDES *******************************************************************/ + +#include "processr.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; + +static +NTSTATUS +NTAPI +ForwardIrpAndWaitCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + if (Irp->PendingReturned) + KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); + + return STATUS_MORE_PROCESSING_REQUIRED; +} + + +NTSTATUS +NTAPI +ForwardIrpAndWait( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PDEVICE_OBJECT LowerDevice; + KEVENT Event; + NTSTATUS Status; + + LowerDevice = ((PDEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + ASSERT(LowerDevice); + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + IoCopyCurrentIrpStackLocationToNext(Irp); + + DPRINT("Calling lower device %p\n", LowerDevice); + IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); + + Status = IoCallDriver(LowerDevice, Irp); + if (Status == STATUS_PENDING) + { + Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + if (NT_SUCCESS(Status)) + Status = Irp->IoStatus.Status; + } + + return Status; +} + + +NTSTATUS +NTAPI +ForwardIrpAndForget( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PDEVICE_OBJECT LowerDevice; + + LowerDevice = ((PDEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + ASSERT(LowerDevice); + + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(LowerDevice, Irp); +} + +/* EOF */ Propchange: trunk/reactos/drivers/processor/processr/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/processor/processr/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/processor/processr… ============================================================================== --- trunk/reactos/drivers/processor/processr/pnp.c (added) +++ trunk/reactos/drivers/processor/processr/pnp.c [iso-8859-1] Sun Feb 26 18:57:28 2017 @@ -0,0 +1,402 @@ +/* + * PROJECT: ReactOS Generic CPU Driver + * LICENSE: GNU GPLv2 only as published by the Free Software Foundation + * FILE: drivers/processor/processr/pnp.c + * PURPOSE: Plug N Play routines + * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> + */ + +/* INCLUDES *******************************************************************/ + +#include "processr.h" + +#include <stdio.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +static +NTSTATUS +GetDeviceId( + PDEVICE_OBJECT DeviceObject, + BUS_QUERY_ID_TYPE IdType, + PWSTR *DeviceId) +{ + PIO_STACK_LOCATION IrpStack; + IO_STATUS_BLOCK IoStatus; + PDEVICE_OBJECT TargetObject; + KEVENT Event; + PIRP Irp; + NTSTATUS Status; + + PAGED_CODE(); + + /* Initialize the event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + TargetObject = IoGetAttachedDeviceReference(DeviceObject); + + /* Build the IRP */ + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, + TargetObject, + NULL, + 0, + NULL, + &Event, + &IoStatus); + if (Irp == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto done; + } + + /* PNP IRPs all begin life as STATUS_NOT_SUPPORTED */ + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + + /* Get the top of stack */ + IrpStack = IoGetNextIrpStackLocation(Irp); + + /* Set the top of stack */ + RtlZeroMemory(IrpStack, sizeof(IO_STACK_LOCATION)); + IrpStack->MajorFunction = IRP_MJ_PNP; + IrpStack->MinorFunction = IRP_MN_QUERY_ID; + IrpStack->Parameters.QueryId.IdType = IdType; + + /* Call the driver */ + Status = IoCallDriver(TargetObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + + Status = IoStatus.Status; + } + + if (NT_SUCCESS(Status)) + { + *DeviceId = (PWSTR)IoStatus.Information; + } + +done: + /* Dereference the target device object */ + ObDereferenceObject(TargetObject); + + return Status; +} + + + +static +VOID +ProcessorSetFriendlyName( + PDEVICE_OBJECT DeviceObject) +{ + KEY_VALUE_PARTIAL_INFORMATION *Buffer = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING HardwareKeyName, ValueName, EnumKeyName; + HANDLE KeyHandle = NULL; + ULONG DataLength = 0; + ULONG BufferLength = 0; + NTSTATUS Status; + PWSTR KeyNameBuffer = NULL; + PWSTR DeviceId = NULL; + PWSTR InstanceId = NULL; + PWSTR pszPrefix = L"\\Registry\\Machine\\System\\CurrentcontrolSet\\Enum"; + + RtlInitUnicodeString(&HardwareKeyName, + L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0"); + InitializeObjectAttributes(&ObjectAttributes, + &HardwareKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwOpenKey(&KeyHandle, + KEY_READ, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwOpenKey() failed (Status 0x%08lx)\n", Status); + return; + } + + RtlInitUnicodeString(&ValueName, + L"ProcessorNameString"); + Status = ZwQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformation, + NULL, + 0, + &DataLength); + if (Status != STATUS_BUFFER_OVERFLOW && Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_SUCCESS) + { + DPRINT1("ZwQueryValueKey() failed (Status 0x%08lx)\n", Status); + goto done; + } + + Buffer = ExAllocatePool(PagedPool, + DataLength + sizeof(KEY_VALUE_PARTIAL_INFORMATION)); + if (Buffer == NULL) + { + DPRINT1("ExAllocatePool() failed\n"); + goto done; + } + + Status = ZwQueryValueKey(KeyHandle, + &ValueName, + KeyValuePartialInformation, + Buffer, + DataLength + sizeof(KEY_VALUE_PARTIAL_INFORMATION), + &DataLength); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwQueryValueKey() failed (Status 0x%08lx)\n", Status); + goto done; + } + + DPRINT("ProcessorNameString: %S\n", (PWSTR)&Buffer->Data[0]); + + ZwClose(KeyHandle); + KeyHandle = NULL; + + Status = GetDeviceId(DeviceObject, + BusQueryDeviceID, + &DeviceId); + if (!NT_SUCCESS(Status)) + { + DPRINT1("GetDeviceId() failed (Status 0x%08lx)\n", Status); + goto done; + } + + DPRINT("DeviceId: %S\n", DeviceId); + + Status = GetDeviceId(DeviceObject, + BusQueryInstanceID, + &InstanceId); + if (!NT_SUCCESS(Status)) + { + DPRINT1("GetDeviceId() failed (Status 0x%08lx)\n", Status); + goto done; + } + + DPRINT("InstanceId: %S\n", InstanceId); + + BufferLength = wcslen(pszPrefix) + 1 + wcslen(DeviceId) + 1 + wcslen(InstanceId) + 1; + + KeyNameBuffer = ExAllocatePool(PagedPool, BufferLength * sizeof(WCHAR)); + if (KeyNameBuffer == NULL) + { + DPRINT1("ExAllocatePool() failed\n"); + goto done; + } + + swprintf(KeyNameBuffer, L"%s\\%s\\%s", pszPrefix, DeviceId, InstanceId); + + RtlInitUnicodeString(&EnumKeyName, KeyNameBuffer); + InitializeObjectAttributes(&ObjectAttributes, + &EnumKeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwOpenKey(&KeyHandle, + KEY_WRITE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwOpenKey() failed (Status 0x%08lx)\n", Status); + goto done; + } + + RtlInitUnicodeString(&ValueName, + L"FriendlyName"); + Status = ZwSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)&Buffer->Data[0], + Buffer->DataLength); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwSetValueKey() failed (Status 0x%08lx)\n", Status); + goto done; + } + +done: + if (KeyHandle != NULL) + ZwClose(KeyHandle); + + if (KeyNameBuffer != NULL) + ExFreePool(KeyNameBuffer); + + if (InstanceId != NULL) + ExFreePool(InstanceId); + + if (DeviceId != NULL) + ExFreePool(DeviceId); + + if (Buffer != NULL) + ExFreePool(Buffer); +} + + +static +NTSTATUS +ProcessorStartDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PCM_RESOURCE_LIST ResourceList, + IN PCM_RESOURCE_LIST ResourceListTranslated) +{ + DPRINT("ProcessorStartDevice()\n"); + + ProcessorSetFriendlyName(DeviceObject); + + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +ProcessorPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp; + ULONG_PTR Information = 0; + NTSTATUS Status = STATUS_NOT_SUPPORTED; + + DPRINT("ProcessorPnp()\n"); + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + switch (IrpSp->MinorFunction) + { + case IRP_MN_START_DEVICE: + DPRINT(" IRP_MN_START_DEVICE received\n"); + + /* Call lower driver */ + Status = ForwardIrpAndWait(DeviceObject, Irp); + if (NT_SUCCESS(Status)) + { + Status = ProcessorStartDevice(DeviceObject, + IrpSp->Parameters.StartDevice.AllocatedResources, + IrpSp->Parameters.StartDevice.AllocatedResourcesTranslated); + } + break; + + case IRP_MN_QUERY_REMOVE_DEVICE: + DPRINT(" IRP_MN_QUERY_REMOVE_DEVICE\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + + case IRP_MN_REMOVE_DEVICE: + DPRINT(" IRP_MN_REMOVE_DEVICE received\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + + case IRP_MN_CANCEL_REMOVE_DEVICE: + DPRINT(" IRP_MN_CANCEL_REMOVE_DEVICE\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + + case IRP_MN_STOP_DEVICE: + DPRINT(" IRP_MN_STOP_DEVICE received\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + + case IRP_MN_QUERY_STOP_DEVICE: + DPRINT(" IRP_MN_QUERY_STOP_DEVICE received\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + + case IRP_MN_CANCEL_STOP_DEVICE: + DPRINT(" IRP_MN_CANCEL_STOP_DEVICE\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + + case IRP_MN_QUERY_DEVICE_RELATIONS: + DPRINT(" IRP_MN_QUERY_DEVICE_RELATIONS\n"); + + switch (IrpSp->Parameters.QueryDeviceRelations.Type) + { + case BusRelations: + DPRINT(" IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + break; + + case RemovalRelations: + DPRINT(" IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + + default: + DPRINT(" IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + IrpSp->Parameters.QueryDeviceRelations.Type); + return ForwardIrpAndForget(DeviceObject, Irp); + } + break; + + case IRP_MN_SURPRISE_REMOVAL: + DPRINT(" IRP_MN_SURPRISE_REMOVAL received\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: /* (optional) 0xd */ + DPRINT(" IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + + default: + DPRINT(" Unknown IOCTL 0x%lx\n", IrpSp->MinorFunction); + return ForwardIrpAndForget(DeviceObject, Irp); + } + + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + + +NTSTATUS +NTAPI +ProcessorAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT Pdo) +{ + PDEVICE_EXTENSION DeviceExtension = NULL; + PDEVICE_OBJECT Fdo = NULL; + NTSTATUS Status; + + DPRINT("ProcessorAddDevice()\n"); + + ASSERT(DriverObject); + ASSERT(Pdo); + + /* Create functional device object */ + Status = IoCreateDevice(DriverObject, + sizeof(DEVICE_EXTENSION), + NULL, + FILE_DEVICE_UNKNOWN, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &Fdo); + if (NT_SUCCESS(Status)) + { + DeviceExtension = (PDEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(DEVICE_EXTENSION)); + + DeviceExtension->DeviceObject = Fdo; + + Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08lx\n", Status); + IoDeleteDevice(Fdo); + return Status; + } + + Fdo->Flags |= DO_DIRECT_IO; + Fdo->Flags |= DO_POWER_PAGABLE; + + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; + } + + return Status; +} + +/* EOF */ Propchange: trunk/reactos/drivers/processor/processr/pnp.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/processor/processr/processr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/processor/processr… ============================================================================== --- trunk/reactos/drivers/processor/processr/processr.c (added) +++ trunk/reactos/drivers/processor/processr/processr.c [iso-8859-1] Sun Feb 26 18:57:28 2017 @@ -0,0 +1,65 @@ +/* + * PROJECT: ReactOS Generic CPU Driver + * LICENSE: GNU GPLv2 only as published by the Free Software Foundation + * FILE: drivers/processor/processr/processr.c + * PURPOSE: Main Driver Routines + * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> + */ + +/* INCLUDES *******************************************************************/ + +#include "processr.h" + +#define NDEBUG +#include <debug.h> + + +/* FUNCTIONS ******************************************************************/ + +static +VOID +NTAPI +ProcessorUnload( + IN PDRIVER_OBJECT DriverObject) +{ + DPRINT("ProcessorUnload()\n"); +} + + +static +NTSTATUS +NTAPI +ProcessorPower( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ +// PIO_STACK_LOCATION IrpSp; +// NTSTATUS Status = Irp->IoStatus.Status; + PDEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + + DPRINT("ProcessorPower()\n"); + +// IrpSp = IoGetCurrentIrpStackLocation(Irp); + + PoStartNextPowerIrp(Irp); + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(DeviceExtension->LowerDevice, Irp); +} + + +NTSTATUS +NTAPI +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + DPRINT("Processr: DriverEntry()\n"); + + DriverObject->MajorFunction[IRP_MJ_PNP] = ProcessorPnp; + DriverObject->MajorFunction[IRP_MJ_POWER] = ProcessorPower; + + DriverObject->DriverExtension->AddDevice = ProcessorAddDevice; + DriverObject->DriverUnload = ProcessorUnload; + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/processor/processr/processr.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/processor/processr/processr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/processor/processr… ============================================================================== --- trunk/reactos/drivers/processor/processr/processr.h (added) +++ trunk/reactos/drivers/processor/processr/processr.h [iso-8859-1] Sun Feb 26 18:57:28 2017 @@ -0,0 +1,51 @@ +/* + * PROJECT: ReactOS Generic CPU Driver + * LICENSE: GNU GPLv2 only as published by the Free Software Foundation + * FILE: drivers/processor/processr/processr.h + * PURPOSE: Common header file + * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> + */ + +#ifndef _PROCESSR_PCH_ +#define _PROCESSR_PCH_ + +#include <ntddk.h> + +typedef struct _DEVICE_EXTENSION +{ + PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT LowerDevice; + +} DEVICE_EXTENSION, *PDEVICE_EXTENSION; + + +/* misc.c */ + +NTSTATUS +NTAPI +ForwardIrpAndWait( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +ForwardIrpAndForget( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + + +/* pnp.c */ + +NTSTATUS +NTAPI +ProcessorPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +ProcessorAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT Pdo); + +#endif /* _PROCESSR_PCH_ */ Propchange: trunk/reactos/drivers/processor/processr/processr.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/processor/processr/processr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/processor/processr… ============================================================================== --- trunk/reactos/drivers/processor/processr/processr.rc (added) +++ trunk/reactos/drivers/processor/processr/processr.rc [iso-8859-1] Sun Feb 26 18:57:28 2017 @@ -0,0 +1,13 @@ +/* + * PROJECT: ReactOS Generic CPU Driver + * LICENSE: GNU GPLv2 only as published by the Free Software Foundation + * FILE: drivers/processor/processr/processr.rc + * PURPOSE: Resource definition file + * PROGRAMMERS: Eric Kohl <eric.kohl(a)reactos.org> + */ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Processor Device Driver\0" +#define REACTOS_STR_INTERNAL_NAME "processr\0" +#define REACTOS_STR_ORIGINAL_FILENAME "processr.sys\0" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/processor/processr/processr.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=7396… ============================================================================== --- trunk/reactos/media/inf/cpu.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/cpu.inf [iso-8859-1] Sun Feb 26 18:57:28 2017 @@ -29,73 +29,83 @@ %VIAMfg%=VIA [Standard] -%Processor.DeviceDesc% = NO_DRV,ACPI\Processor +%Processor.DeviceDesc% = Processr_Inst,ACPI\Processor [Cyrix] -%CyrixProcessor.DeviceDesc% = NO_DRV,ACPI\CyrixInstead_-_x86 +%CyrixProcessor.DeviceDesc% = Processr_Inst,ACPI\CyrixInstead_-_x86 [Intel] -%IntelProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_5_model_1 -%IntelProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_5_model_2 -%IntelProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_5_model_3 -%IntelMMXProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_5_model_4 -%IntelMMXProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_5_model_7 -%IntelMMXProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_5_model_8 -%IntelPROProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_1 -%IntelP2Processor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_3 -%IntelP2Processor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_5 -%IntelP2Processor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_6 -%IntelP3Processor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_7 -%IntelP3Processor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_8 -%IntelMProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_9 -%IntelP3Processor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_10 -%IntelP3Processor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_11 -%IntelMProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_13 -%IntelCoreProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_14 -%IntelCoreProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_15 -%IntelCoreProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_22 -%IntelCoreProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_23 -%IntelCoreiXProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_26 -%IntelAtomProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_28 -%IntelCoreiXProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_30 -%IntelCoreiXProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_6_Model_37 -%IntelP4Processor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86_Family_15 -%IntelProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineIntel_-_x86 +%IntelProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_5_model_1 +%IntelProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_5_model_2 +%IntelProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_5_model_3 +%IntelMMXProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_5_model_4 +%IntelMMXProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_5_model_7 +%IntelMMXProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_5_model_8 +%IntelPROProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_1 +%IntelP2Processor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_3 +%IntelP2Processor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_5 +%IntelP2Processor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_6 +%IntelP3Processor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_7 +%IntelP3Processor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_8 +%IntelMProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_9 +%IntelP3Processor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_10 +%IntelP3Processor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_11 +%IntelMProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_13 +%IntelCoreProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_14 +%IntelCoreProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_15 +%IntelCoreProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_22 +%IntelCoreProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_23 +%IntelCoreiXProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_26 +%IntelAtomProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_28 +%IntelCoreiXProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_30 +%IntelCoreiXProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_6_Model_37 +%IntelP4Processor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86_Family_15 +%IntelProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineIntel_-_x86 [AMD] -%AMDK6Processor.DeviceDesc% = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_5_Model_7 -%AMDK62Processor.DeviceDesc% = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_5_Model_8 -%AMDK63Processor.DeviceDesc% = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_5_Model_9 -%AMDK63Processor.DeviceDesc% = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_5_Model_10 -%AMDK63Processor.DeviceDesc% = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_5_Model_13 -%AMDK7Processor.DeviceDesc% = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_6 -%AMDK8Processor.DeviceDesc% = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_15 -%AMDPHENProcessor.DeviceDesc% = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_16 -%AMDQProcessor.DeviceDesc% = NO_DRV,ACPI\AuthenticAMD_-_x86_Family_17 -%AMDProcessor.DeviceDesc% = NO_DRV,ACPI\AuthenticAMD_-_x86 +%AMDK6Processor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_5_Model_7 +%AMDK62Processor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_5_Model_8 +%AMDK63Processor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_5_Model_9 +%AMDK63Processor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_5_Model_10 +%AMDK63Processor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_5_Model_13 +%AMDK7Processor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_6 +%AMDK8Processor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_15 +%AMDPHENProcessor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_16 +%AMDQProcessor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86_Family_17 +%AMDProcessor.DeviceDesc% = Processr_Inst,ACPI\AuthenticAMD_-_x86 [Transmeta] -%TransmetaProcessor.DeviceDesc% = NO_DRV,ACPI\GenuineTMx86_-_x86 +%TransmetaProcessor.DeviceDesc% = Processr_Inst,ACPI\GenuineTMx86_-_x86 [VIA] -%ViaNEHProcessor.DeviceDesc% = NO_DRV,ACPI\CentaurHauls_-_x86_Family_6_Model_9 -%ViaESTProcessor.DeviceDesc% = NO_DRV,ACPI\CentaurHauls_-_x86_Family_6_Model_10 -%ViaC7Processor.DeviceDesc% = NO_DRV,ACPI\CentaurHauls_-_x86_Family_6_Model_13 -%ViaNANOProcessor.DeviceDesc% = NO_DRV,ACPI\CentaurHauls_-_x86_Family_6_Model_15 -%ViaProcessor.DeviceDesc% = NO_DRV,ACPI\CentaurHauls_-_x86 - -;---------------------------- NO DRIVER REQ ----------------------------- - -[NO_DRV] -AddReg=NO_DRV.AddReg - -[NO_DRV.Services] -AddService = , 0x00000002 - -[NO_DRV.HW] - -[NO_DRV.AddReg] +%ViaNEHProcessor.DeviceDesc% = Processr_Inst,ACPI\CentaurHauls_-_x86_Family_6_Model_9 +%ViaESTProcessor.DeviceDesc% = Processr_Inst,ACPI\CentaurHauls_-_x86_Family_6_Model_10 +%ViaC7Processor.DeviceDesc% = Processr_Inst,ACPI\CentaurHauls_-_x86_Family_6_Model_13 +%ViaNANOProcessor.DeviceDesc% = Processr_Inst,ACPI\CentaurHauls_-_x86_Family_6_Model_15 +%ViaProcessor.DeviceDesc% = Processr_Inst,ACPI\CentaurHauls_-_x86 + +;---------------------------- Processr Driver --------------------------- + +[Processr_Inst.NT] +CopyFiles = Processr_Inst.CopyFiles.NT +AddReg = Processr_Inst.AddReg.NT + +[Processr_Inst.CopyFiles.NT] +processr.sys + +[Processr_Inst.AddReg.NT] HKR,,EnumPropPages32,,"devcpux.dll,PropSheetExtProc" + +[Processr_Inst.NT.Services] +AddService = Processor, 0x00000002, Processr_Service_Inst + +[Processr_Service_Inst] +DisplayName = %Processor.ServiceDesc% +ServiceType = 1 +StartType = 1 +ErrorControl = 1 +ServiceBinary = %12%\processr.sys +LoadOrderGroup = Extended Base ;-------------------------------- STRINGS ------------------------------- @@ -110,6 +120,7 @@ TransmetaMfg = "Transmeta" VIAMfg = "VIA" Processor.DeviceDesc = "Processor" +Processor.ServiceDesc = "Processor driver" CyrixProcessor.DeviceDesc = "Cyrix 6x86 Processor" IntelProcessor.DeviceDesc = "Intel Pentium Processor" IntelMMXProcessor.DeviceDesc = "Intel Pentium MMX Processor" @@ -139,6 +150,7 @@ [Strings.0405] Processor.DeviceDesc = "Procesor" +Processor.ServiceDesc = "Processor driver" CyrixProcessor.DeviceDesc = "Procesor Cyrix 6x86" IntelProcessor.DeviceDesc = "Procesor Intel Pentium" IntelMMXProcessor.DeviceDesc = "Procesor Intel Pentium MMX" @@ -169,6 +181,7 @@ [Strings.0407] ProcessorClassName = "Prozessoren" Processor.DeviceDesc = "Prozessor" +Processor.ServiceDesc = "Prozessortreiber" CyrixProcessor.DeviceDesc = "Cyrix 6x86 Prozessor" IntelProcessor.DeviceDesc = "Intel Pentium Prozessor" IntelMMXProcessor.DeviceDesc = "Intel Pentium MMX Prozessor" @@ -198,23 +211,27 @@ [Strings.0408] Processor.DeviceDesc = "ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï" +Processor.ServiceDesc = "Processor driver" IntelProcessor.DeviceDesc = "ÎÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï Intel" Standard = "Î ÏÏÏÏÏÎ¿Ï ÎµÏÎµÎ¾ÎµÏÎ³Î±ÏÏÎ®Ï" [Strings.0a] ReactOS = "Equipo de ReactOS" Processor.DeviceDesc = "Procesador" +Processor.ServiceDesc = "Processor driver" IntelProcessor.DeviceDesc = "Procesador Intel" AMDProcessor.DeviceDesc = "Procesador AMD" Standard = "Procesador estÃ¡ndar" [Strings.040C] Processor.DeviceDesc = "Processeur" +Processor.ServiceDesc = "Processor driver" IntelProcessor.DeviceDesc = "Processeur Intel" Standard = "Processeur standard" [Strings.0411] Processor.DeviceDesc = "ããã»ããµ" +Processor.ServiceDesc = "Processor driver" IntelProcessor.DeviceDesc = "Intel ããã»ããµ" Standard = "ã¹ã¿ã³ãã¼ãããã»ããµ" @@ -228,6 +245,7 @@ TransmetaMfg = "Transmeta" VIAMfg = "VIA" Processor.DeviceDesc = "Procesor" +Processor.ServiceDesc = "Processor driver" CyrixProcessor.DeviceDesc = "Procesor Cyrix 6x86" IntelProcessor.DeviceDesc = "Procesor Intel Pentium" IntelMMXProcessor.DeviceDesc = "Procesor Intel Pentium MMX" @@ -257,6 +275,7 @@ [Strings.0416] Processor.DeviceDesc = "Processadores" +Processor.ServiceDesc = "Processor driver" IntelProcessor.DeviceDesc = "Procesador Intel" Standard = "Processador padrÃ£o" @@ -264,6 +283,7 @@ ReactOS = "FundaÈia ReactOS" ProcessorClassName = "Procesoare" Processor.DeviceDesc = "Procesor" +Processor.ServiceDesc = "Processor driver" CyrixProcessor.DeviceDesc = "Procesor Cyrix 6x86" IntelProcessor.DeviceDesc = "Procesor Intel Pentium" IntelMMXProcessor.DeviceDesc = "Procesor Intel Pentium MMX" @@ -297,6 +317,7 @@ ProcessorClassName = "ÐÑÐ¾ÑÐµÑÑÐ¾ÑÑ" Processor.DeviceDesc = "ÐÑÐ¾ÑÐµÑÑÐ¾Ñ" +Processor.ServiceDesc = "Processor driver" CyrixProcessor.DeviceDesc = "Cyrix 6x86 Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" IntelProcessor.DeviceDesc = "Intel Pentium Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" IntelMMXProcessor.DeviceDesc = "Intel Pentium MMX Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ñ" @@ -326,6 +347,7 @@ [Strings.041B] Processor.DeviceDesc = "Procesor" +Processor.ServiceDesc = "Processor driver" IntelProcessor.DeviceDesc = "Intel procesor" Standard = "Å tandardnÃ½ procesor" @@ -339,6 +361,7 @@ TransmetaMfg = "Transmeta" VIAMfg = "VIA" Processor.DeviceDesc = "Ä°Ålemci" +Processor.ServiceDesc = "Processor driver" CyrixProcessor.DeviceDesc = "Cyrix 6x86 Ä°Ålemci" IntelProcessor.DeviceDesc = "Intel Pentium Ä°Ålemci" IntelMMXProcessor.DeviceDesc = "Intel Pentium MMX Ä°Ålemci" @@ -370,6 +393,7 @@ ReactOS = "Ð¤Ð¾Ð½Ð´ ReactOS" ProcessorClassName = "ÐÑÐ¾ÑÐµÑÐ¾ÑÐ¸" Processor.DeviceDesc = "ÐÑÐ¾ÑÐµÑÐ¾Ñ" +Processor.ServiceDesc = "Processor driver" CyrixProcessor.DeviceDesc = "ÐÑÐ¾ÑÐµÑÐ¾Ñ Cyrix 6x86" IntelProcessor.DeviceDesc = "ÐÑÐ¾ÑÐµÑÐ¾Ñ Intel Pentium" IntelMMXProcessor.DeviceDesc = "ÐÑÐ¾ÑÐµÑÐ¾Ñ Intel Pentium MMX" @@ -399,5 +423,6 @@ [Strings.0427] Processor.DeviceDesc = "Procesorius" +Processor.ServiceDesc = "Processor driver" IntelProcessor.DeviceDesc = "Intel procesorius" Standard = "Standartinis procesorius"

7 years, 10 months

← Newer
1
2
3
4
5
6
7
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2017