Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[jimtabor] 55287: - uxtheme is forked.
by jimtabor＠svn.reactos.org 29 Jan '12

29 Jan '12

Author: jimtabor Date: Sun Jan 29 03:28:39 2012 New Revision: 55287 URL: http://svn.reactos.org/svn/reactos?rev=55287&view=rev Log: - uxtheme is forked. Modified: trunk/reactos/media/doc/README.WINE 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 Jan 29 03:28:39 2012 @@ -167,7 +167,7 @@ reactos/dll/win32/url # Autosync reactos/dll/win32/urlmon # Autosync reactos/dll/win32/usp10 # Synced to Wine-1.3.37 -reactos/dll/win32/uxtheme # Autosync +reactos/dll/win32/uxtheme # Forked reactos/dll/win32/version # Autosync reactos/dll/win32/wer # Autosync reactos/dll/win32/windowscodecs # Autosync

1 0

[akhaldi] 55286: [ODBCCP32_WINETEST] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 28 Jan '12

28 Jan '12

Author: akhaldi Date: Sat Jan 28 23:15:16 2012 New Revision: 55286 URL: http://svn.reactos.org/svn/reactos?rev=55286&view=rev Log: [ODBCCP32_WINETEST] * Sync to Wine 1.3.37. Modified: trunk/rostests/winetests/odbccp32/misc.c Modified: trunk/rostests/winetests/odbccp32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/odbccp32/misc.c… ============================================================================== --- trunk/rostests/winetests/odbccp32/misc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/odbccp32/misc.c [iso-8859-1] Sat Jan 28 23:15:16 2012 @@ -86,28 +86,23 @@ bool_ret = SQLInstallDriverManager(NULL, 0, NULL); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); ok(!bool_ret, "SQLInstallDriverManager unexpectedly succeeded\n"); - todo_wine ok(sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_BUFF_LEN, "Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN\n"); /* Length smaller than MAX_PATH */ bool_ret = SQLInstallDriverManager(target_path, MAX_PATH / 2, NULL); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); - todo_wine { ok(!bool_ret, "SQLInstallDriverManager unexpectedly succeeded\n"); ok(sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_BUFF_LEN, "Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN\n"); - } path_out = 0xcafe; bool_ret = SQLInstallDriverManager(target_path, MAX_PATH / 2, &path_out); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); - todo_wine { ok(!bool_ret, "SQLInstallDriverManager unexpectedly succeeded\n"); ok(sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_BUFF_LEN, "Expected SQLInstallDriverManager to fail with ODBC_ERROR_INVALID_BUFF_LEN\n"); ok(path_out == 0xcafe, "Expected path_out to not have changed\n"); - } /* Length OK */ bool_ret = SQLInstallDriverManager(target_path, MAX_PATH, NULL);

1 0

[akhaldi] 55285: [ODBCCP32] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 28 Jan '12

28 Jan '12

Author: akhaldi Date: Sat Jan 28 23:15:03 2012 New Revision: 55285 URL: http://svn.reactos.org/svn/reactos?rev=55285&view=rev Log: [ODBCCP32] * Sync to Wine 1.3.37. Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.c trunk/reactos/dll/win32/odbccp32/odbccp32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.c [iso-8859-1] Sat Jan 28 23:15:03 2012 @@ -522,8 +522,12 @@ UINT len; WCHAR path[MAX_PATH]; - clear_errors(); TRACE("(%p %d %p)\n", lpszPath, cbPathMax, pcbPathOut); + + if (cbPathMax < MAX_PATH) + return FALSE; + + clear_errors(); len = GetSystemDirectoryW(path, MAX_PATH); @@ -545,8 +549,12 @@ WORD len, cbOut = 0; WCHAR path[MAX_PATH]; - clear_errors(); TRACE("(%p %d %p)\n", lpszPath, cbPathMax, pcbPathOut); + + if (cbPathMax < MAX_PATH) + return FALSE; + + clear_errors(); ret = SQLInstallDriverManagerW(path, MAX_PATH, &cbOut); if (ret) @@ -836,26 +844,26 @@ LPDWORD lpdwUsageCount) { clear_errors(); - FIXME("\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("stub\n"); + if (lpdwUsageCount) *lpdwUsageCount = 1; + return TRUE; } BOOL WINAPI SQLRemoveDriver(LPCSTR lpszDriver, BOOL fRemoveDSN, LPDWORD lpdwUsageCount) { clear_errors(); - FIXME("\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("stub\n"); + if (lpdwUsageCount) *lpdwUsageCount = 1; + return TRUE; } BOOL WINAPI SQLRemoveDriverManager(LPDWORD pdwUsageCount) { clear_errors(); - FIXME("\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + FIXME("stub\n"); + if (pdwUsageCount) *pdwUsageCount = 1; + return TRUE; } BOOL WINAPI SQLRemoveDSNFromIniW(LPCWSTR lpszDSN) Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.spec [iso-8859-1] Sat Jan 28 23:15:03 2012 @@ -1,6 +1,6 @@ @ stdcall ODBCCPlApplet( long long ptr ptr) -@ stdcall SQLConfigDataSource(ptr long wstr wstr) -@ stdcall SQLConfigDataSourceW(ptr long str str) +@ stdcall SQLConfigDataSource(ptr long str str) +@ stdcall SQLConfigDataSourceW(ptr long wstr wstr) @ stdcall SQLConfigDriver(ptr long str str ptr long ptr) @ stdcall SQLConfigDriverW(ptr long wstr wstr ptr long ptr) @ stdcall SQLCreateDataSource(ptr str) 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] Sat Jan 28 23:15:03 2012 @@ -121,7 +121,7 @@ reactos/dll/win32/ntprint # Synced to Wine-1.3.37 reactos/dll/win32/objsel # Synced to Wine-1.3.37 reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. -reactos/dll/win32/odbccp32 # Autosync +reactos/dll/win32/odbccp32 # Synced to Wine-1.3.37 reactos/dll/win32/ole32 # Autosync reactos/dll/win32/oleacc # Autosync reactos/dll/win32/oleaut32 # Autosync

1 0

[akhaldi] 55284: [MSIMTF] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 28 Jan '12

28 Jan '12

Author: akhaldi Date: Sat Jan 28 22:42:14 2012 New Revision: 55284 URL: http://svn.reactos.org/svn/reactos?rev=55284&view=rev Log: [MSIMTF] * Sync to Wine 1.3.37. Added: trunk/reactos/dll/win32/msimtf/msimtf.idl (with props) trunk/reactos/dll/win32/msimtf/msimtf.rgs (with props) Removed: trunk/reactos/dll/win32/msimtf/msimtf.inf Modified: trunk/reactos/dll/win32/msimtf/activeimmapp.c trunk/reactos/dll/win32/msimtf/main.c trunk/reactos/dll/win32/msimtf/rsrc.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msimtf/activeimmapp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/activeimm… ============================================================================== --- trunk/reactos/dll/win32/msimtf/activeimmapp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/activeimmapp.c [iso-8859-1] Sat Jan 28 22:42:14 2012 @@ -31,7 +31,6 @@ #include "winuser.h" #include "winerror.h" #include "objbase.h" -#include "advpub.h" #include "dimm.h" #include "imm.h" @@ -42,10 +41,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msimtf); typedef struct tagActiveIMMApp { - const IActiveIMMAppVtbl *vtbl; + IActiveIMMApp IActiveIMMApp_iface; LONG refCount; } ActiveIMMApp; +static inline ActiveIMMApp *impl_from_IActiveIMMApp(IActiveIMMApp *iface) +{ + return CONTAINING_RECORD(iface, ActiveIMMApp, IActiveIMMApp_iface); +} + static void ActiveIMMApp_Destructor(ActiveIMMApp* This) { TRACE("\n"); @@ -55,7 +59,7 @@ static HRESULT WINAPI ActiveIMMApp_QueryInterface (IActiveIMMApp* iface, REFIID iid, LPVOID *ppvOut) { - ActiveIMMApp *This = (ActiveIMMApp*)iface; + ActiveIMMApp *This = impl_from_IActiveIMMApp(iface); *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IActiveIMMApp)) @@ -75,13 +79,13 @@ static ULONG WINAPI ActiveIMMApp_AddRef(IActiveIMMApp* iface) { - ActiveIMMApp *This = (ActiveIMMApp*)iface; + ActiveIMMApp *This = impl_from_IActiveIMMApp(iface); return InterlockedIncrement(&This->refCount); } static ULONG WINAPI ActiveIMMApp_Release(IActiveIMMApp* iface) { - ActiveIMMApp *This = (ActiveIMMApp*)iface; + ActiveIMMApp *This = impl_from_IActiveIMMApp(iface); ULONG ret; ret = InterlockedDecrement(&This->refCount); @@ -808,7 +812,7 @@ ActiveIMMApp_EnumInputContext }; -HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +DECLSPEC_HIDDEN HRESULT ActiveIMMApp_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ActiveIMMApp *This; if (pUnkOuter) @@ -818,7 +822,7 @@ if (This == NULL) return E_OUTOFMEMORY; - This->vtbl = &ActiveIMMAppVtbl; + This->IActiveIMMApp_iface.lpVtbl = &ActiveIMMAppVtbl; This->refCount = 1; TRACE("returning %p\n",This); Modified: trunk/reactos/dll/win32/msimtf/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/msimtf/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/main.c [iso-8859-1] Sat Jan 28 22:42:14 2012 @@ -27,9 +27,8 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winreg.h" -#include "advpub.h" #include "ole2.h" +#include "rpcproxy.h" #include "dimm.h" #include "wine/debug.h" @@ -60,10 +59,15 @@ } typedef struct { - const IClassFactoryVtbl *lpClassFactoryVtbl; + IClassFactory IClassFactory_iface; HRESULT (*cf)(IUnknown*,IUnknown**); } ClassFactory; + +static inline ClassFactory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, ClassFactory, IClassFactory_iface); +} static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) @@ -100,7 +104,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, void **ppv) { - ClassFactory *This = (ClassFactory*)iface; + ClassFactory *This = impl_from_IClassFactory(iface); HRESULT ret; IUnknown *obj; TRACE("(%p, %p, %s, %p)\n", iface, pOuter, debugstr_guid(riid), ppv); @@ -135,7 +139,7 @@ { if(IsEqualGUID(&CLSID_CActiveIMM, rclsid)) { static ClassFactory cf = { - &ClassFactoryVtbl, + { &ClassFactoryVtbl }, ActiveIMMApp_Constructor, }; @@ -154,59 +158,12 @@ return S_FALSE; } -#define INF_SET_CLSID(clsid) \ - do \ - { \ - static CHAR name[] = "CLSID_" #clsid; \ - \ - pse[i].pszName = name; \ - clsids[i++] = &CLSID_ ## clsid; \ - } while (0) - -static HRESULT register_server(BOOL doregister) -{ - HRESULT hres; - HMODULE hAdvpack; - HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); - STRTABLEA strtable; - STRENTRYA pse[1]; - static CLSID const *clsids[34]; - unsigned int i = 0; - - static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - - INF_SET_CLSID(CActiveIMM); - - for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) { - pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39); - sprintf(pse[i].pszValue, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], - clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4], - clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); - } - - strtable.cEntries = sizeof(pse)/sizeof(pse[0]); - strtable.pse = pse; - - hAdvpack = LoadLibraryW(wszAdvpack); - pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); - - hres = pRegInstall(msimtf_instance, doregister ? "RegisterDll" : "UnregisterDll", &strtable); - - for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) - HeapFree(GetProcessHeap(), 0, pse[i].pszValue); - - return hres; -} - -#undef INF_SET_CLSID - /*********************************************************************** * DllRegisterServer (msimtf.@) */ HRESULT WINAPI DllRegisterServer(void) { - return register_server(TRUE); + return __wine_register_resources( msimtf_instance ); } /*********************************************************************** @@ -214,5 +171,5 @@ */ HRESULT WINAPI DllUnregisterServer(void) { - return register_server(FALSE); + return __wine_unregister_resources( msimtf_instance ); } Added: trunk/reactos/dll/win32/msimtf/msimtf.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/msimtf.id… ============================================================================== --- trunk/reactos/dll/win32/msimtf/msimtf.idl (added) +++ trunk/reactos/dll/win32/msimtf/msimtf.idl [iso-8859-1] Sat Jan 28 22:42:14 2012 @@ -1,0 +1,38 @@ +/* + * COM Classes for msimtf + * + * Copyright 2010 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + helpstring("CActiveIMMApp"), + threading(apartment), + uuid(4955dd33-b159-11d0-8fcf-00aa006bcc59) +] +coclass CActiveIMM { interface IActiveIMMApp; } + +[ + threading(apartment), + uuid(c1ee01f2-b3b6-4a6a-9ddd-e988c088ec82) +] +coclass CActiveIMMAppEx { interface IActiveIMMApp; } + +[ + threading(apartment), + uuid(50d5107a-d278-4871-8989-f4ceaaf59cfc) +] +coclass CActiveIMMAppEx_Trident { interface IActiveIMMApp; } Propchange: trunk/reactos/dll/win32/msimtf/msimtf.idl ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/dll/win32/msimtf/msimtf.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/msimtf.in… ============================================================================== --- trunk/reactos/dll/win32/msimtf/msimtf.inf [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/msimtf.inf (removed) @@ -1,26 +1,0 @@ -[version] -Signature="$CHICAGO$" - - -[RegisterDll] -AddReg=Classes.Reg - - -[UnregisterDll] -DelReg=Classes.Reg - - -[Classes.Reg] -HKCR,"CLSID\%CLSID_CActiveIMM%",,,"CActiveIMMApp" -HKCR,"CLSID\%CLSID_CActiveIMM%\InProcServer32",,,"msimtf.dll" -HKCR,"CLSID\%CLSID_CActiveIMM%\InProcServer32","ThreadingModel",,"Apartment" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident%",,,"CActiveIMMAppEx_Trident" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident%\InProcServer32",,,"msimtf.dll" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx_Trident%\InProcServer32","ThreadingModel",,"Apartment" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx%",,,"CActiveIMMAppEx" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx%\InProcServer32",,,"msimtf.dll" -HKCR,"CLSID\%CLSID_CActiveIMMAppEx%\InProcServer32","ThreadingModel",,"Apartment" - -[Strings] -CLSID_CActiveIMMAppEx_Trident={50D5107A-D278-4871-8989-F4CEAAF59CFC} -CLSID_CActiveIMMAppEx="{C1EE01F2-B3B6-4A6A-9DDD-E988C088EC82}" Added: trunk/reactos/dll/win32/msimtf/msimtf.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/msimtf.rg… ============================================================================== --- trunk/reactos/dll/win32/msimtf/msimtf.rgs (added) +++ trunk/reactos/dll/win32/msimtf/msimtf.rgs [iso-8859-1] Sat Jan 28 22:42:14 2012 @@ -1,0 +1,21 @@ +HKCR +{ + NoRemove Interface + { + } + NoRemove CLSID + { + '{4955DD33-B159-11D0-8FCF-00AA006BCC59}' = s 'CActiveIMMApp' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + } + '{C1EE01F2-B3B6-4A6A-9DDD-E988C088EC82}' = s 'CActiveIMMAppEx' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + } + '{50D5107A-D278-4871-8989-F4CEAAF59CFC}' = s 'CActiveIMMAppEx_Trident' + { + InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } + } + } +} Propchange: trunk/reactos/dll/win32/msimtf/msimtf.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/msimtf/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/msimtf/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/rsrc.rc [iso-8859-1] Sat Jan 28 22:42:14 2012 @@ -1,20 +1,1 @@ -/* - * Copyright 2007 Jacek Caban for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* @makedep: msimtf.inf */ -REGINST REGINST msimtf.inf +1 WINE_REGISTRY msimtf.rgs 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] Sat Jan 28 22:42:14 2012 @@ -103,7 +103,7 @@ reactos/dll/win32/mshtml # Autosync reactos/dll/win32/msimg32 # Autosync reactos/dll/win32/msi # Autosync -reactos/dll/win32/msimtf # Autosync +reactos/dll/win32/msimtf # Synced to Wine-1.3.37 reactos/dll/win32/msisip # Synced to Wine-1.3.37 reactos/dll/win32/msisys.ocx # Autosync reactos/dll/win32/msnet32 # Autosync

1 0

[akhaldi] 55283: [STDOLE32.TLB] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 28 Jan '12

28 Jan '12

Author: akhaldi Date: Sat Jan 28 22:22:11 2012 New Revision: 55283 URL: http://svn.reactos.org/svn/reactos?rev=55283&view=rev Log: [STDOLE32.TLB] * Sync to Wine 1.3.37. Added: trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.rgs (with props) Modified: trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/CMa… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole32.tlb/CMakeLists.txt [iso-8859-1] Sat Jan 28 22:22:11 2012 @@ -4,17 +4,16 @@ add_typelib(std_ole_v1.idl) +set_rc_compiler() spec2def(stdole32.tlb stdole32.tlb.spec) list(APPEND SOURCE rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/stdole32.def) - + set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/std_ole_v1.tlb) add_library(stdole32.tlb SHARED ${SOURCE}) - set_module_type(stdole32.tlb module) set_target_properties(stdole32.tlb PROPERTIES SUFFIX "") - add_cd_file(TARGET stdole32.tlb DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/rsr… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole32.tlb/rsrc.rc [iso-8859-1] Sat Jan 28 22:22:11 2012 @@ -29,3 +29,5 @@ /* @makedep: std_ole_v1.tlb */ 1 TYPELIB std_ole_v1.tlb + +2 WINE_REGISTRY stdole32.tlb.rgs Added: trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/std… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.rgs (added) +++ trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.rgs [iso-8859-1] Sat Jan 28 22:22:11 2012 @@ -1,0 +1,20 @@ +HKCR +{ + NoRemove Typelib + { + NoRemove '{00020430-0000-0000-C000-000000000046}' + { + '1.0' = s 'OLE Automation' + { + '0' { win32 = s '%MODULE%' } + FLAGS = s '1' + } + } + } + NoRemove Interface + { + } + NoRemove CLSID + { + } +} Propchange: trunk/reactos/dll/win32/stdole32.tlb/stdole32.tlb.rgs ------------------------------------------------------------------------------ svn:eol-style = native 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] Sat Jan 28 22:22:11 2012 @@ -157,6 +157,7 @@ reactos/dll/win32/softpub # Autosync reactos/dll/win32/spoolss # Autosync reactos/dll/win32/stdole2.tlb # Synced to Wine-1.3.37 +reactos/dll/win32/stdole32.tlb # Synced to Wine-1.3.37 reactos/dll/win32/sti # Autosync reactos/dll/win32/sxs # Autosync reactos/dll/win32/tapi32 # Autosync

1 0

[akhaldi] 55282: [NTDSAPI] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 28 Jan '12

28 Jan '12

Author: akhaldi Date: Sat Jan 28 22:07:27 2012 New Revision: 55282 URL: http://svn.reactos.org/svn/reactos?rev=55282&view=rev Log: [NTDSAPI] * Sync to Wine 1.3.37. Modified: trunk/reactos/dll/win32/ntdsapi/ntdsapi.c trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec trunk/reactos/include/psdk/ntdsapi.h Modified: trunk/reactos/dll/win32/ntdsapi/ntdsapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdsapi/ntdsapi.… ============================================================================== --- trunk/reactos/dll/win32/ntdsapi/ntdsapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntdsapi/ntdsapi.c [iso-8859-1] Sat Jan 28 22:07:27 2012 @@ -150,3 +150,38 @@ return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * DsMakeSpnA (NTDSAPI.@) + */ +DWORD WINAPI DsGetSpnA(DS_SPN_NAME_TYPE ServType, LPCSTR Servlass, LPCSTR ServName, + USHORT InstPort, USHORT nInstanceNames, + LPCSTR *pInstanceNames, const USHORT *pInstancePorts, + DWORD *pSpn, LPSTR **pszSpn) +{ + FIXME("(%d,%s,%s,%d,%d,%p,%p,%p,%p): stub!\n", ServType, + debugstr_a(Servlass), debugstr_a(ServName), InstPort, + nInstanceNames, pInstanceNames, pInstancePorts, pSpn, pszSpn); + + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * DsServerRegisterSpnA (NTDSAPI.@) + */ +DWORD WINAPI DsServerRegisterSpnA(DS_SPN_WRITE_OP operation, LPCSTR ServiceClass, LPCSTR UserObjectDN) +{ + FIXME("(%d,%s,%s): stub!\n", operation, + debugstr_a(ServiceClass), debugstr_a(UserObjectDN)); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * DsServerRegisterSpnW (NTDSAPI.@) + */ +DWORD WINAPI DsServerRegisterSpnW(DS_SPN_WRITE_OP operation, LPCWSTR ServiceClass, LPCWSTR UserObjectDN) +{ + FIXME("(%d,%s,%s): stub!\n", operation, + debugstr_w(ServiceClass), debugstr_w(UserObjectDN)); + return ERROR_CALL_NOT_IMPLEMENTED; +} Modified: trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdsapi/ntdsapi.… ============================================================================== --- trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec [iso-8859-1] Sat Jan 28 22:07:27 2012 @@ -29,7 +29,7 @@ @ stub DsGetDomainControllerInfoA @ stub DsGetDomainControllerInfoW @ stub DsGetRdnW -@ stub DsGetSpnA +@ stdcall DsGetSpnA(long str str long long ptr ptr ptr ptr) @ stub DsGetSpnW @ stub DsInheritSecurityIdentityA @ stub DsInheritSecurityIdentityW @@ -80,8 +80,8 @@ @ stub DsReplicaUpdateRefsW @ stub DsReplicaVerifyObjectsA @ stub DsReplicaVerifyObjectsW -@ stub DsServerRegisterSpnA -@ stub DsServerRegisterSpnW +@ stdcall DsServerRegisterSpnA(long str str) +@ stdcall DsServerRegisterSpnW(long wstr wstr) @ stub DsUnBindA @ stub DsUnBindW @ stub DsUnquoteRdnValueA Modified: trunk/reactos/include/psdk/ntdsapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdsapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ntdsapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdsapi.h [iso-8859-1] Sat Jan 28 22:07:27 2012 @@ -29,6 +29,27 @@ DWORD WINAPI DsMakeSpnW(LPCWSTR, LPCWSTR, LPCWSTR, USHORT, LPCWSTR, DWORD*, LPWSTR); #define DsMakeSpn WINELIB_NAME_AW(DsMakeSpn) +typedef enum +{ + DS_SPN_DNS_HOST = 0, + DS_SPN_DN_HOST = 1, + DS_SPN_NB_HOST = 2, + DS_SPN_DOMAIN = 3, + DS_SPN_NB_DOMAIN = 4, + DS_SPN_SERVICE = 5 +} DS_SPN_NAME_TYPE; + +typedef enum +{ + DS_SPN_ADD_SPN_OP = 0, + DS_SPN_REPLACE_SPN_OP = 1, + DS_SPN_DELETE_SPN_OP = 2 +} DS_SPN_WRITE_OP; + +DWORD WINAPI DsServerRegisterSpnA(DS_SPN_WRITE_OP operation, LPCSTR ServiceClass, LPCSTR UserObjectDN); +DWORD WINAPI DsServerRegisterSpnW(DS_SPN_WRITE_OP operation, LPCWSTR ServiceClass, LPCWSTR UserObjectDN); +#define DsServerRegisterSpn WINELIB_NAME_AW(DsServerRegisterSpn) + #ifdef __cplusplus } #endif

1 0

[akhaldi] 55281: [STDOLE2.TLB] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 28 Jan '12

28 Jan '12

Author: akhaldi Date: Sat Jan 28 21:08:43 2012 New Revision: 55281 URL: http://svn.reactos.org/svn/reactos?rev=55281&view=rev Log: [STDOLE2.TLB] * Sync to Wine 1.3.37. Added: trunk/reactos/dll/win32/stdole2.tlb/stdole2.tlb.rgs (with props) Modified: trunk/reactos/dll/win32/stdole2.tlb/CMakeLists.txt trunk/reactos/dll/win32/stdole2.tlb/rsrc.rc trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/stdole2.tlb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole2.tlb/CMak… ============================================================================== --- trunk/reactos/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole2.tlb/CMakeLists.txt [iso-8859-1] Sat Jan 28 21:08:43 2012 @@ -4,6 +4,7 @@ add_typelib(std_ole_v2.idl) +set_rc_compiler() spec2def(stdole2.tlb stdole2.tlb.spec) list(APPEND SOURCE Modified: trunk/reactos/dll/win32/stdole2.tlb/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole2.tlb/rsrc… ============================================================================== --- trunk/reactos/dll/win32/stdole2.tlb/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole2.tlb/rsrc.rc [iso-8859-1] Sat Jan 28 21:08:43 2012 @@ -29,3 +29,5 @@ /* @makedep: std_ole_v2.tlb */ 1 TYPELIB std_ole_v2.tlb + +2 WINE_REGISTRY stdole2.tlb.rgs Added: trunk/reactos/dll/win32/stdole2.tlb/stdole2.tlb.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole2.tlb/stdo… ============================================================================== --- trunk/reactos/dll/win32/stdole2.tlb/stdole2.tlb.rgs (added) +++ trunk/reactos/dll/win32/stdole2.tlb/stdole2.tlb.rgs [iso-8859-1] Sat Jan 28 21:08:43 2012 @@ -1,0 +1,38 @@ +HKCR +{ + NoRemove Typelib + { + NoRemove '{00020430-0000-0000-C000-000000000046}' + { + '2.0' = s 'OLE Automation' + { + '0' { win32 = s '%MODULE%' } + FLAGS = s '0' + } + } + } + NoRemove Interface + { + '{BEF6E003-A874-101A-8BBA-00AA00300CAB}' = s 'Font' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{00020430-0000-0000-C000-000000000046}' { val Version = s '2.0' } + } + '{7BF80981-BF32-101A-8BBB-00AA00300CAB}' = s 'Picture' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{00020430-0000-0000-C000-000000000046}' { val Version = s '2.0' } + } + '{4EF6100A-AF88-11D0-9846-00C04FC29993}' = s 'FontEvents' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{00020430-0000-0000-C000-000000000046}' { val Version = s '2.0' } + } + } + NoRemove CLSID + { + } +} Propchange: trunk/reactos/dll/win32/stdole2.tlb/stdole2.tlb.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/std… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl [iso-8859-1] Sat Jan 28 21:08:43 2012 @@ -20,6 +20,7 @@ [ uuid(00020430-0000-0000-C000-000000000046), + restricted, version(1.0), helpstring("OLE Automation") ] 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] Sat Jan 28 21:08:43 2012 @@ -117,7 +117,7 @@ reactos/dll/win32/msxml3 # Autosync reactos/dll/win32/nddeapi # Synced to Wine-1.3.37 reactos/dll/win32/netapi32 # Autosync -reactos/dll/win32/ntdsapi # Autosync +reactos/dll/win32/ntdsapi # Synced to Wine-1.3.37 reactos/dll/win32/ntprint # Synced to Wine-1.3.37 reactos/dll/win32/objsel # Synced to Wine-1.3.37 reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. @@ -156,7 +156,7 @@ reactos/dll/win32/slbcsp # Autosync reactos/dll/win32/softpub # Autosync reactos/dll/win32/spoolss # Autosync -reactos/dll/win32/stdole2.tlb # Autosync +reactos/dll/win32/stdole2.tlb # Synced to Wine-1.3.37 reactos/dll/win32/sti # Autosync reactos/dll/win32/sxs # Autosync reactos/dll/win32/tapi32 # Autosync

1 0

[akhaldi] 55280: * Add mscoree winetest to the rbuild build too.
by akhaldi＠svn.reactos.org 28 Jan '12

28 Jan '12

Author: akhaldi Date: Sat Jan 28 21:04:16 2012 New Revision: 55280 URL: http://svn.reactos.org/svn/reactos?rev=55280&view=rev Log: * Add mscoree winetest to the rbuild build too. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Jan 28 21:04:16 2012 @@ -821,6 +821,7 @@ modules\rostests\winetests\mlang\mlang_winetest.exe 7 optional modules\rostests\winetests\msacm32\msacm32_winetest.exe 7 optional modules\rostests\winetests\mscms\mscms_winetest.exe 7 optional +modules\rostests\winetests\mscoree\mscoree_winetest.exe 7 optional modules\rostests\winetests\msctf\msctf_winetest.exe 7 optional modules\rostests\winetests\mshtml\mshtml_winetest.exe 7 optional modules\rostests\winetests\msi\msi_winetest.exe 7 optional

1 0

[ekohl] 55279: [EVENTLOG] - Log files which are opened when the eventlog service is started are permanent files and will only be closed when the service is stopped. Other log files are closed when ...
by ekohl＠svn.reactos.org 28 Jan '12

28 Jan '12

Author: ekohl Date: Sat Jan 28 20:15:41 2012 New Revision: 55279 URL: http://svn.reactos.org/svn/reactos?rev=55279&view=rev Log: [EVENTLOG] - Log files which are opened when the eventlog service is started are permanent files and will only be closed when the service is stopped. Other log files are closed when their handle is closed. - Opening a non existing backup log file must fail. - Opening an existing backup log files opens the file for reading only. Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.c [iso-8859-1] Sat Jan 28 20:15:41 2012 @@ -327,7 +327,7 @@ DPRINT("%S -> %S\n", Buf, Expanded); - Status = LogfCreate(&pLogf, LogName, &FileName); + Status = LogfCreate(&pLogf, LogName, &FileName, TRUE, FALSE); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create %S! (Status %08lx)\n", Expanded, Status); Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… ============================================================================== --- trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/eventlog.h [iso-8859-1] Sat Jan 28 20:15:41 2012 @@ -92,6 +92,7 @@ PEVENT_OFFSET_INFO OffsetInfo; ULONG OffsetInfoSize; ULONG OffsetInfoNext; + BOOL Permanent; LIST_ENTRY ListEntry; } LOGFILE, *PLOGFILE; @@ -157,9 +158,13 @@ NTSTATUS LogfCreate(PLOGFILE *Logfile, WCHAR * LogName, - PUNICODE_STRING FileName); - -VOID LogfClose(PLOGFILE LogFile); + PUNICODE_STRING FileName, + BOOL Permanent, + BOOL Backup); + +VOID +LogfClose(PLOGFILE LogFile, + BOOL ForceClose); VOID LogfCloseAll(VOID); Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Sat Jan 28 20:15:41 2012 @@ -292,7 +292,9 @@ NTSTATUS LogfCreate(PLOGFILE *LogFile, WCHAR * LogName, - PUNICODE_STRING FileName) + PUNICODE_STRING FileName, + BOOL Permanent, + BOOL Backup) { OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; @@ -314,13 +316,13 @@ NULL); Status = NtCreateFile(&pLogFile->hFile, - GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, + Backup ? (GENERIC_READ | SYNCHRONIZE) : (GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE), &ObjectAttributes, &IoStatusBlock, NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, - FILE_OPEN_IF, + Backup ? FILE_OPEN : FILE_OPEN_IF, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); @@ -371,6 +373,8 @@ pLogFile->OffsetInfoSize = 64; + pLogFile->Permanent = Permanent; + if (bCreateNew) bResult = LogfInitializeNew(pLogFile); else @@ -411,9 +415,15 @@ return Status; } -VOID LogfClose(PLOGFILE LogFile) +VOID +LogfClose(PLOGFILE LogFile, + BOOL ForceClose) { if (LogFile == NULL) + return; + + if ((ForceClose == FALSE) && + (LogFile->Permanent == TRUE)) return; RtlAcquireResourceExclusive(&LogFile->Lock, TRUE); @@ -436,7 +446,7 @@ { while (!IsListEmpty(&LogFileListHead)) { - LogfClose(LogfListHead()); + LogfClose(LogfListHead(), TRUE); } DeleteCriticalSection(&LogFileListCs); Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Sat Jan 28 20:15:41 2012 @@ -158,7 +158,9 @@ /* Create the log file */ Status = LogfCreate(&lpLogHandle->LogFile, NULL, - FileName); + FileName, + FALSE, + TRUE); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create the log file! (Status 0x%08lx)\n", Status); @@ -210,9 +212,7 @@ if (!ElfGetLogHandleEntryByHandle(lpLogHandle)) return STATUS_INVALID_HANDLE; - /* Close the log file if it is a backup file */ - if (lpLogHandle->Flags & LOG_HANDLE_BACKUP_FILE) - LogfClose(lpLogHandle->LogFile); + LogfClose(lpLogHandle->LogFile, FALSE); RemoveEntryList(&lpLogHandle->LogHandleListEntry); HeapFree(GetProcessHeap(),0,lpLogHandle);

1 0

[janderwald] 55278: [USBCCGP] - Start implementing select configuration request
by janderwald＠svn.reactos.org 28 Jan '12

28 Jan '12

Author: janderwald Date: Sat Jan 28 19:49:53 2012 New Revision: 55278 URL: http://svn.reactos.org/svn/reactos?rev=55278&view=rev Log: [USBCCGP] - Start implementing select configuration request Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c [iso-8859-1] Sat Jan 28 19:49:53 2012 @@ -279,6 +279,7 @@ PDODeviceExtension->FunctionDescriptor = &FDODeviceExtension->FunctionDescriptor[Index]; PDODeviceExtension->NextDeviceObject = DeviceObject; PDODeviceExtension->FunctionIndex = Index; + PDODeviceExtension->ConfigurationHandle = FDODeviceExtension->ConfigurationHandle; PDODeviceExtension->ConfigurationDescriptor = FDODeviceExtension->ConfigurationDescriptor; RtlCopyMemory(&PDODeviceExtension->Capabilities, &FDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); RtlCopyMemory(&PDODeviceExtension->DeviceDescriptor, &FDODeviceExtension->DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] Sat Jan 28 19:49:53 2012 @@ -513,6 +513,137 @@ } NTSTATUS +USBCCGP_PDOSelectConfiguration( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PURB Urb; + PUSBD_INTERFACE_INFORMATION InterfaceInformation; + ULONG InterfaceInformationCount, Index, InterfaceIndex; + PUSBD_INTERFACE_LIST_ENTRY Entry; + ULONG NeedSelect; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // get urb + // + Urb = (PURB)IoStack->Parameters.Others.Argument1; + ASSERT(Urb); + + // + // is there already an configuration handle + // + if (Urb->UrbSelectConfiguration.ConfigurationHandle) + { + // + // nothing to do + // + return STATUS_SUCCESS; + } + + // + // count interface information + // + InterfaceInformationCount = 0; + InterfaceInformation = &Urb->UrbSelectConfiguration.Interface; + do + { + InterfaceInformationCount++; + InterfaceInformation = (PUSBD_INTERFACE_INFORMATION)((ULONG_PTR)InterfaceInformation + InterfaceInformation->Length); + }while((ULONG_PTR)InterfaceInformation < (ULONG_PTR)Urb + Urb->UrbSelectConfiguration.Hdr.Length); + + // + // check all interfaces + // + InterfaceInformation = &Urb->UrbSelectConfiguration.Interface; + Index = 0; + Entry = NULL; + + do + { + // + // search for the interface + // + for(InterfaceIndex = 0; InterfaceIndex < PDODeviceExtension->FunctionDescriptor->NumberOfInterfaces; InterfaceIndex++) + { + if (PDODeviceExtension->InterfaceList[InterfaceIndex].Interface->InterfaceNumber == InterfaceInformation->InterfaceNumber) + { + // found interface entry + Entry = &PDODeviceExtension->InterfaceList[InterfaceIndex]; + break; + } + } + + if (!Entry || Entry->InterfaceDescriptor) + { + // + // invalid parameter + // + ASSERT(FALSE); + return STATUS_INVALID_PARAMETER; + } + + NeedSelect = FALSE; + if (Entry->InterfaceDescriptor->bAlternateSetting == InterfaceInformation->AlternateSetting) + { + for(InterfaceIndex = 0; Entry->InterfaceDescriptor->bNumEndpoints; InterfaceIndex++) + { + if (InterfaceInformation->Pipes[InterfaceIndex].MaximumTransferSize != Entry->Interface->Pipes[InterfaceIndex].MaximumTransferSize) + { + // + // changed interface + // + NeedSelect = TRUE; + } + } + } + else + { + // + // need select + // + NeedSelect = TRUE; + } + + if (!NeedSelect) + { + // + // interface is already selected + // + ASSERT(InterfaceInformation->Length == Entry->Interface->Length); + RtlCopyMemory(InterfaceInformation, Entry->Interface, Entry->Interface->Length); + } + else + { + // + // FIXME select interface + // + UNIMPLEMENTED + ASSERT(FALSE); + } + + // + // move to next information + // + InterfaceInformation = (PUSBD_INTERFACE_INFORMATION)((ULONG_PTR)InterfaceInformation + InterfaceInformation->Length); + Index++; + }while(Index < InterfaceInformationCount); + + return STATUS_SUCCESS; +} + +NTSTATUS PDO_HandleInternalDeviceControl( PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -539,11 +670,20 @@ // Urb = (PURB)IoStack->Parameters.Others.Argument1; ASSERT(Urb); - - if (Urb->UrbHeader.Function == URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE) - { - DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_URB Function %x\n", Urb->UrbHeader.Function); - + DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_URB Function %x\n", Urb->UrbHeader.Function); + + if (Urb->UrbHeader.Function == URB_FUNCTION_SELECT_CONFIGURATION) + { + // + // select configuration + // + Status = USBCCGP_PDOSelectConfiguration(DeviceObject, Irp); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + else if (Urb->UrbHeader.Function == URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE) + { if(Urb->UrbControlDescriptorRequest.DescriptorType == USB_DEVICE_DESCRIPTOR_TYPE) { // @@ -581,6 +721,9 @@ return Status; } } + + + } Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] Sat Jan 28 19:49:53 2012 @@ -52,6 +52,9 @@ ULONG FunctionIndex; // function index USB_DEVICE_DESCRIPTOR DeviceDescriptor; // usb device descriptor PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; // usb configuration descriptor + USBD_CONFIGURATION_HANDLE ConfigurationHandle; // configuration handle + PUSBD_INTERFACE_LIST_ENTRY InterfaceList; // interface list + ULONG InterfaceListCount; // interface list count }PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; /* descriptor.c */

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2012