Ros-diffs April 2015

ros-diffs@reactos.org

17 participants
481 discussions

[akhaldi] 67204: [ODBCCP32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 15 18:09:34 2015 New Revision: 67204 URL: http://svn.reactos.org/svn/reactos?rev=67204&view=rev Log: [ODBCCP32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 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] Wed Apr 15 18:09:34 2015 @@ -36,11 +36,11 @@ bool_ret = SQLGetConfigMode(&config_mode); ok(bool_ret && config_mode == ODBC_BOTH_DSN, "Failed to get the initial SQLGetConfigMode or it was not both\n"); - bool_ret = SQLSetConfigMode(3); + /* try to set invalid mode */ + bool_ret = SQLSetConfigMode(ODBC_SYSTEM_DSN+1); sql_ret = SQLInstallerErrorW(1, &error_code, NULL, 0, NULL); ok(!bool_ret && sql_ret == SQL_SUCCESS_WITH_INFO && error_code == ODBC_ERROR_INVALID_PARAM_SEQUENCE, "SQLSetConfigMode with invalid argument did not fail correctly\n"); - ok (ODBC_SYSTEM_DSN == 2 && ODBC_USER_DSN == 1 && ODBC_BOTH_DSN == 0, "SQLSetConfigMode modes not as expected\n"); for (i = ODBC_SYSTEM_DSN; i >= ODBC_BOTH_DSN; --i) { ok(SQLSetConfigMode((UWORD)i), "SQLSetConfigMode Failed to set config mode\n");

9 years, 5 months

[akhaldi] 67203: [OLEAUT32] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 15 18:09:13 2015 New Revision: 67203 URL: http://svn.reactos.org/svn/reactos?rev=67203&view=rev Log: [OLEAUT32] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.spec trunk/reactos/dll/win32/oleaut32/olepicture.c trunk/reactos/dll/win32/oleaut32/safearray.c trunk/reactos/dll/win32/oleaut32/tmarshal.c trunk/reactos/dll/win32/oleaut32/typelib.c trunk/reactos/dll/win32/oleaut32/varformat.c trunk/reactos/dll/win32/oleaut32/variant.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/oleaut32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/oleaut32.spec [iso-8859-1] Wed Apr 15 18:09:13 2015 @@ -375,7 +375,7 @@ 420 stdcall OleCreateFontIndirect(ptr ptr ptr) 421 stdcall OleTranslateColor(long long long) 422 stub OleLoadPictureFile -423 stub OleSavePictureFile +423 stdcall OleSavePictureFile(ptr wstr) 424 stdcall OleLoadPicturePath(wstr ptr long long ptr ptr) 425 stdcall VarUI4FromI8(int64 ptr) 426 stdcall VarUI4FromUI8(int64 ptr) Modified: trunk/reactos/dll/win32/oleaut32/olepicture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/olepict… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/olepicture.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/olepicture.c [iso-8859-1] Wed Apr 15 18:09:13 2015 @@ -2281,6 +2281,15 @@ } /*********************************************************************** + * OleSavePictureFile (OLEAUT32.423) + */ +HRESULT WINAPI OleSavePictureFile(IDispatch *picture, BSTR filename) +{ + FIXME("(%p %s): stub\n", picture, debugstr_w(filename)); + return CTL_E_FILENOTFOUND; +} + +/*********************************************************************** * OleLoadPicturePath (OLEAUT32.424) */ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, Modified: trunk/reactos/dll/win32/oleaut32/safearray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/safearr… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/safearray.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/safearray.c [iso-8859-1] Wed Apr 15 18:09:13 2015 @@ -83,18 +83,18 @@ FADF_CREATEVECTOR; /* Allocate memory */ -static inline LPVOID SAFEARRAY_Malloc(ULONG ulSize) -{ - /* FIXME: Memory should be allocated and freed using a per-thread IMalloc - * instance returned from CoGetMalloc(). - */ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ulSize); +static inline void* SAFEARRAY_Malloc(ULONG size) +{ + void *ret = CoTaskMemAlloc(size); + if (ret) + memset(ret, 0, size); + return ret; } /* Free memory */ -static inline BOOL SAFEARRAY_Free(LPVOID lpData) -{ - return HeapFree(GetProcessHeap(), 0, lpData); +static inline void SAFEARRAY_Free(void *ptr) +{ + CoTaskMemFree(ptr); } /* Get the size of a supported VT type (0 means unsupported) */ @@ -760,8 +760,7 @@ !(psa->fFeatures & FADF_DATADELETED)) SAFEARRAY_DestroyData(psa, 0); /* Data not previously deleted */ - if (!SAFEARRAY_Free(lpv)) - return E_UNEXPECTED; + SAFEARRAY_Free(lpv); } return S_OK; } @@ -1271,8 +1270,7 @@ /* If this is not a vector, free the data memory block */ if (!(psa->fFeatures & FADF_CREATEVECTOR)) { - if (!SAFEARRAY_Free(psa->pvData)) - return E_UNEXPECTED; + SAFEARRAY_Free(psa->pvData); psa->pvData = NULL; } else Modified: trunk/reactos/dll/win32/oleaut32/tmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/tmarsha… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/tmarshal.c [iso-8859-1] Wed Apr 15 18:09:13 2015 @@ -175,8 +175,6 @@ xsize = 0; return xbuf_add(buf,(LPBYTE)&xsize,sizeof(xsize)); } - - hres = E_FAIL; TRACE("...%s...\n",debugstr_guid(riid)); Modified: trunk/reactos/dll/win32/oleaut32/typelib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/typelib.c [iso-8859-1] Wed Apr 15 18:09:13 2015 @@ -1758,18 +1758,6 @@ { while(n){ if(funcdescs->funcdesc.memid == memid) - return funcdescs; - ++funcdescs; - --n; - } - return NULL; -} - -static inline TLBFuncDesc *TLB_get_funcdesc_by_name(TLBFuncDesc *funcdescs, - UINT n, const OLECHAR *name) -{ - while(n){ - if(!lstrcmpiW(TLB_get_bstr(funcdescs->Name), name)) return funcdescs; ++funcdescs; --n; @@ -2102,10 +2090,6 @@ * * Functions for reading MSFT typelibs (those created by CreateTypeLib2) */ -static inline unsigned int MSFT_Tell(const TLBContext *pcx) -{ - return pcx->pos; -} static inline void MSFT_Seek(TLBContext *pcx, LONG where) { @@ -7611,6 +7595,45 @@ return E_FAIL; } +struct search_res_tlb_params +{ + const GUID *guid; + ITypeLib *pTLib; +}; + +static BOOL CALLBACK search_res_tlb(HMODULE hModule, LPCWSTR lpszType, LPWSTR lpszName, LONG_PTR lParam) +{ + struct search_res_tlb_params *params = (LPVOID)lParam; + static const WCHAR formatW[] = {'\\','%','d',0}; + WCHAR szPath[MAX_PATH+1]; + ITypeLib *pTLib = NULL; + HRESULT ret; + DWORD len; + + if (IS_INTRESOURCE(lpszName) == FALSE) + return TRUE; + + if (!(len = GetModuleFileNameW(hModule, szPath, MAX_PATH))) + return TRUE; + + if (snprintfW(szPath + len, sizeof(szPath)/sizeof(WCHAR) - len, formatW, LOWORD(lpszName)) < 0) + return TRUE; + + ret = LoadTypeLibEx(szPath, REGKIND_NONE, &pTLib); + if (SUCCEEDED(ret)) + { + ITypeLibImpl *impl = impl_from_ITypeLib(pTLib); + if (IsEqualGUID(params->guid, impl->guid)) + { + params->pTLib = pTLib; + return FALSE; /* stop enumeration */ + } + ITypeLib_Release(pTLib); + } + + return TRUE; +} + /* ITypeInfo::GetRefTypeInfo * * If a type description references other type descriptions, it retrieves @@ -7704,20 +7727,33 @@ ITypeLib_AddRef(pTLib); result = S_OK; } else { + static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0}; + struct search_res_tlb_params params; BSTR libnam; TRACE("typeinfo in imported typelib that isn't already loaded\n"); - result = query_typelib_path(TLB_get_guid_null(ref_type->pImpTLInfo->guid), - ref_type->pImpTLInfo->wVersionMajor, - ref_type->pImpTLInfo->wVersionMinor, - This->pTypeLib->syskind, - ref_type->pImpTLInfo->lcid, &libnam, TRUE); - if(FAILED(result)) - libnam = SysAllocString(ref_type->pImpTLInfo->name); - - result = LoadTypeLib(libnam, &pTLib); - SysFreeString(libnam); + /* Search in resource table */ + params.guid = TLB_get_guid_null(ref_type->pImpTLInfo->guid); + params.pTLib = NULL; + EnumResourceNamesW(NULL, TYPELIBW, search_res_tlb, (LONG_PTR)&params); + pTLib = params.pTLib; + result = S_OK; + + if (!pTLib) + { + /* Search on disk */ + result = query_typelib_path(TLB_get_guid_null(ref_type->pImpTLInfo->guid), + ref_type->pImpTLInfo->wVersionMajor, + ref_type->pImpTLInfo->wVersionMinor, + This->pTypeLib->syskind, + ref_type->pImpTLInfo->lcid, &libnam, TRUE); + if (FAILED(result)) + libnam = SysAllocString(ref_type->pImpTLInfo->name); + + result = LoadTypeLib(libnam, &pTLib); + SysFreeString(libnam); + } if(SUCCEEDED(result)) { ref_type->pImpTLInfo->pImpTypeLib = impl_from_ITypeLib(pTLib); @@ -9183,7 +9219,7 @@ file->arraydesc_seg.data = heap_alloc(file->arraydesc_seg.len); else file->arraydesc_seg.data = heap_realloc(file->arraydesc_seg.data, file->arraydesc_seg.len); - encoded = (DWORD*)((char *)file->arraydesc_seg.data) + offs; + encoded = (DWORD*)((char *)file->arraydesc_seg.data + offs); encoded[0] = WMSFT_append_typedesc(&desc->tdescElem, file, NULL, NULL); encoded[1] = desc->cDims | ((desc->cDims * 2 * sizeof(DWORD)) << 16); Modified: trunk/reactos/dll/win32/oleaut32/varformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/varform… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/varformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/varformat.c [iso-8859-1] Wed Apr 15 18:09:13 2015 @@ -2312,7 +2312,7 @@ GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal, sizeof(decimal)/sizeof(WCHAR)); numfmt.lpThousandSep = thousands; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, thousands, + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousands, sizeof(thousands)/sizeof(WCHAR)); if (GetNumberFormatW(LOCALE_USER_DEFAULT, 0, V_BSTR(&vStr), &numfmt, Modified: trunk/reactos/dll/win32/oleaut32/variant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/variant… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/variant.c [iso-8859-1] Wed Apr 15 18:09:13 2015 @@ -28,40 +28,6 @@ #include "precomp.h" WINE_DEFAULT_DEBUG_CHANNEL(variant); - -static const char * const variant_types[] = -{ - "VT_EMPTY","VT_NULL","VT_I2","VT_I4","VT_R4","VT_R8","VT_CY","VT_DATE", - "VT_BSTR","VT_DISPATCH","VT_ERROR","VT_BOOL","VT_VARIANT","VT_UNKNOWN", - "VT_DECIMAL","15","VT_I1","VT_UI1","VT_UI2","VT_UI4","VT_I8","VT_UI8", - "VT_INT","VT_UINT","VT_VOID","VT_HRESULT","VT_PTR","VT_SAFEARRAY", - "VT_CARRAY","VT_USERDEFINED","VT_LPSTR","VT_LPWSTR","32","33","34","35", - "VT_RECORD","VT_INT_PTR","VT_UINT_PTR","39","40","41","42","43","44","45", - "46","47","48","49","50","51","52","53","54","55","56","57","58","59","60", - "61","62","63","VT_FILETIME","VT_BLOB","VT_STREAM","VT_STORAGE", - "VT_STREAMED_OBJECT","VT_STORED_OBJECT","VT_BLOB_OBJECT","VT_CF","VT_CLSID", - "VT_VERSIONED_STREAM" -}; - -static const char * const variant_flags[16] = -{ - "", - "|VT_VECTOR", - "|VT_ARRAY", - "|VT_VECTOR|VT_ARRAY", - "|VT_BYREF", - "|VT_VECTOR|VT_ARRAY", - "|VT_ARRAY|VT_BYREF", - "|VT_VECTOR|VT_ARRAY|VT_BYREF", - "|VT_RESERVED", - "|VT_VECTOR|VT_RESERVED", - "|VT_ARRAY|VT_RESERVED", - "|VT_VECTOR|VT_ARRAY|VT_RESERVED", - "|VT_BYREF|VT_RESERVED", - "|VT_VECTOR|VT_ARRAY|VT_RESERVED", - "|VT_ARRAY|VT_BYREF|VT_RESERVED", - "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_RESERVED", -}; /* Convert a variant from one type to another */ static inline HRESULT VARIANT_Coerce(VARIANTARG* pd, LCID lcid, USHORT wFlags, @@ -1754,9 +1720,8 @@ } else { - if ((dwState & B_PROCESSING_OCT) && ((*lpszStr == '8') || (*lpszStr == '9'))) { - return DISP_E_TYPEMISMATCH; - } + if ((dwState & B_PROCESSING_OCT) && ((*lpszStr == '8') || (*lpszStr == '9'))) + break; if (pNumprs->dwOutFlags & NUMPRS_DECIMAL) pNumprs->nPwr10--; /* Count decimal points in nPwr10 */ 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] Wed Apr 15 18:09:13 2015 @@ -147,7 +147,7 @@ reactos/dll/win32/odbccp32 # Synced to WineStaging-1.7.37 reactos/dll/win32/ole32 # Synced to WineStaging-1.7.37 reactos/dll/win32/oleacc # Synced to WineStaging-1.7.37 -reactos/dll/win32/oleaut32 # Synced to Wine-1.7.27 +reactos/dll/win32/oleaut32 # Synced to WineStaging-1.7.37 reactos/dll/win32/olecli32 # Synced to Wine-1.7.27 reactos/dll/win32/oledlg # Synced to Wine-1.7.27 reactos/dll/win32/olepro32 # Synced to Wine-1.7.27

9 years, 5 months

[akhaldi] 67202: [OLEACC] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 15 18:07:26 2015 New Revision: 67202 URL: http://svn.reactos.org/svn/reactos?rev=67202&view=rev Log: [OLEACC] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/oleacc/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/oleacc/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/main.c [iso-8859-1] Wed Apr 15 18:07:26 2015 @@ -210,10 +210,12 @@ return E_FAIL; data = GlobalAlloc(GMEM_FIXED, size); + if(!data) { + UnmapViewOfFile(view); + return E_OUTOFMEMORY; + } memcpy(data, view, size); UnmapViewOfFile(view); - if(!data) - return E_OUTOFMEMORY; hr = CreateStreamOnHGlobal(data, TRUE, &stream); if(FAILED(hr)) { 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] Wed Apr 15 18:07:26 2015 @@ -146,7 +146,7 @@ reactos/dll/win32/odbc32 # Synced to WineStaging-1.7.37. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to WineStaging-1.7.37 reactos/dll/win32/ole32 # Synced to WineStaging-1.7.37 -reactos/dll/win32/oleacc # Synced to Wine-1.7.27 +reactos/dll/win32/oleacc # Synced to WineStaging-1.7.37 reactos/dll/win32/oleaut32 # Synced to Wine-1.7.27 reactos/dll/win32/olecli32 # Synced to Wine-1.7.27 reactos/dll/win32/oledlg # Synced to Wine-1.7.27

9 years, 5 months

[akhaldi] 67201: [ODBCCP32] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 15 18:06:22 2015 New Revision: 67201 URL: http://svn.reactos.org/svn/reactos?rev=67201&view=rev Log: [ODBCCP32] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.spec trunk/reactos/media/doc/README.WINE 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] Wed Apr 15 18:06:22 2015 @@ -1,57 +1,57 @@ -@ stdcall ODBCCPlApplet( long long ptr ptr) -@ 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) -@ stub SQLCreateDataSourceEx -@ stub SQLCreateDataSourceExW -@ stdcall SQLCreateDataSourceW(ptr wstr) -@ stdcall SQLGetAvailableDrivers(str ptr long ptr) -@ stdcall SQLGetAvailableDriversW(wstr ptr long ptr) -@ stdcall SQLGetConfigMode(ptr) -@ stdcall SQLGetInstalledDrivers(str long ptr) -@ stdcall SQLGetInstalledDriversW(wstr long ptr) -@ stdcall SQLGetPrivateProfileString(str str str str long str) -@ stdcall SQLGetPrivateProfileStringW(wstr wstr wstr wstr long wstr) -@ stdcall SQLGetTranslator(ptr str long ptr ptr long ptr ptr) -@ stdcall SQLGetTranslatorW(ptr wstr long ptr ptr long ptr ptr) -@ stdcall SQLInstallDriver(str str str long ptr) -@ stdcall SQLInstallDriverEx(str str str long ptr long ptr) -@ stdcall SQLInstallDriverExW(wstr wstr wstr long ptr long ptr) -@ stdcall SQLInstallDriverManager(ptr long ptr) -@ stdcall SQLInstallDriverManagerW(ptr long ptr) -@ stdcall SQLInstallDriverW(wstr wstr wstr long ptr) -@ stdcall SQLInstallODBC(ptr str str str) -@ stdcall SQLInstallODBCW(ptr wstr wstr wstr) -@ stdcall SQLInstallTranslator(str str str ptr long ptr long ptr) -@ stdcall SQLInstallTranslatorEx(str str ptr long ptr long ptr) -@ stdcall SQLInstallTranslatorExW(wstr wstr ptr long ptr long ptr) -@ stdcall SQLInstallTranslatorW(wstr wstr wstr ptr long ptr long ptr) -@ stdcall SQLInstallerError(long ptr ptr long ptr) -@ stdcall SQLInstallerErrorW(long ptr ptr long ptr) -@ stub SQLLoadDataSourcesListBox -@ stub SQLLoadDriverListBox -@ stdcall SQLManageDataSources(ptr) -@ stdcall SQLPostInstallerError(long ptr) -@ stdcall SQLPostInstallerErrorW(long ptr) -@ stdcall SQLReadFileDSN(str str str ptr long ptr) -@ stdcall SQLReadFileDSNW(wstr wstr wstr ptr long ptr) -@ stdcall SQLRemoveDSNFromIni(str) -@ stdcall SQLRemoveDSNFromIniW(wstr) -@ stdcall SQLRemoveDefaultDataSource() -@ stdcall SQLRemoveDriver(str long ptr) -@ stdcall SQLRemoveDriverManager(ptr) -@ stdcall SQLRemoveDriverW(wstr long ptr) -@ stdcall SQLRemoveTranslator(str ptr) -@ stdcall SQLRemoveTranslatorW(wstr ptr) -@ stdcall SQLSetConfigMode(long) -@ stdcall SQLValidDSN(str) -@ stdcall SQLValidDSNW(wstr) -@ stdcall SQLWriteDSNToIni(str str) -@ stdcall SQLWriteDSNToIniW(wstr wstr) -@ stdcall SQLWriteFileDSN(str str str str) -@ stdcall SQLWriteFileDSNW(wstr wstr wstr wstr) -@ stdcall SQLWritePrivateProfileString(str str str str) -@ stdcall SQLWritePrivateProfileStringW(wstr wstr wstr wstr) -@ stub SelectTransDlg +2 stdcall SQLInstallDriver(str str str long ptr) +3 stdcall SQLInstallDriverManager(ptr long ptr) +4 stdcall SQLGetInstalledDrivers(str long ptr) +5 stdcall SQLGetAvailableDrivers(str ptr long ptr) +6 stdcall SQLConfigDataSource(ptr long str str) +7 stdcall SQLRemoveDefaultDataSource() +8 stdcall SQLWriteDSNToIni(str str) +9 stdcall SQLRemoveDSNFromIni(str) +10 stdcall SQLInstallODBC(ptr str str str) +11 stdcall SQLManageDataSources(ptr) +12 stdcall SQLCreateDataSource(ptr str) +13 stdcall SQLGetTranslator(ptr str long ptr ptr long ptr ptr) +14 stdcall SQLWritePrivateProfileString(str str str str) +15 stdcall SQLGetPrivateProfileString(str str str str long str) +16 stdcall SQLValidDSN(str) +17 stdcall SQLRemoveDriverManager(ptr) +18 stdcall SQLInstallTranslator(str str str ptr long ptr long ptr) +19 stdcall SQLRemoveTranslator(str ptr) +20 stdcall SQLRemoveDriver(str long ptr) +21 stdcall SQLConfigDriver(ptr long str str ptr long ptr) +22 stdcall SQLInstallerError(long ptr ptr long ptr) +23 stdcall SQLPostInstallerError(long ptr) +24 stdcall SQLReadFileDSN(str str str ptr long ptr) +25 stdcall SQLWriteFileDSN(str str str str) +26 stdcall SQLInstallDriverEx(str str str long ptr long ptr) +27 stdcall SQLGetConfigMode(ptr) +28 stdcall SQLSetConfigMode(long) +29 stdcall SQLInstallTranslatorEx(str str ptr long ptr long ptr) +30 stub SQLCreateDataSourceEx +101 stdcall ODBCCPlApplet( long long ptr ptr) +112 stub SelectTransDlg +202 stdcall SQLInstallDriverW(wstr wstr wstr long ptr) +203 stdcall SQLInstallDriverManagerW(ptr long ptr) +204 stdcall SQLGetInstalledDriversW(wstr long ptr) +205 stdcall SQLGetAvailableDriversW(wstr ptr long ptr) +206 stdcall SQLConfigDataSourceW(ptr long wstr wstr) +208 stdcall SQLWriteDSNToIniW(wstr wstr) +209 stdcall SQLRemoveDSNFromIniW(wstr) +210 stdcall SQLInstallODBCW(ptr wstr wstr wstr) +212 stdcall SQLCreateDataSourceW(ptr wstr) +213 stdcall SQLGetTranslatorW(ptr wstr long ptr ptr long ptr ptr) +214 stdcall SQLWritePrivateProfileStringW(wstr wstr wstr wstr) +215 stdcall SQLGetPrivateProfileStringW(wstr wstr wstr wstr long wstr) +216 stdcall SQLValidDSNW(wstr) +218 stdcall SQLInstallTranslatorW(wstr wstr wstr ptr long ptr long ptr) +219 stdcall SQLRemoveTranslatorW(wstr ptr) +220 stdcall SQLRemoveDriverW(wstr long ptr) +221 stdcall SQLConfigDriverW(ptr long wstr wstr ptr long ptr) +222 stdcall SQLInstallerErrorW(long ptr ptr long ptr) +223 stdcall SQLPostInstallerErrorW(long ptr) +224 stdcall SQLReadFileDSNW(wstr wstr wstr ptr long ptr) +225 stdcall SQLWriteFileDSNW(wstr wstr wstr wstr) +226 stdcall SQLInstallDriverExW(wstr wstr wstr long ptr long ptr) +229 stdcall SQLInstallTranslatorExW(wstr wstr ptr long ptr long ptr) +230 stub SQLCreateDataSourceExW +231 stub SQLLoadDriverListBox +232 stub SQLLoadDataSourcesListBox 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] Wed Apr 15 18:06:22 2015 @@ -144,7 +144,7 @@ reactos/dll/win32/ntprint # Synced to Wine-1.7.27 reactos/dll/win32/objsel # Synced to Wine-1.7.27 reactos/dll/win32/odbc32 # Synced to WineStaging-1.7.37. Depends on port of Linux ODBC. -reactos/dll/win32/odbccp32 # Synced to Wine-1.7.27 +reactos/dll/win32/odbccp32 # Synced to WineStaging-1.7.37 reactos/dll/win32/ole32 # Synced to WineStaging-1.7.37 reactos/dll/win32/oleacc # Synced to Wine-1.7.27 reactos/dll/win32/oleaut32 # Synced to Wine-1.7.27

9 years, 5 months

[akhaldi] 67200: [ODBC32] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 15 18:05:07 2015 New Revision: 67200 URL: http://svn.reactos.org/svn/reactos?rev=67200&view=rev Log: [ODBC32] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/odbc32/proxyodbc.c trunk/reactos/media/doc/README.WINE 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] Wed Apr 15 18:05:07 2015 @@ -54,6 +54,7 @@ static BOOL ODBC_LoadDMFunctions(void); WINE_DEFAULT_DEBUG_CHANNEL(odbc); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static SQLRETURN (*pSQLAllocConnect)(SQLHENV,SQLHDBC*); static SQLRETURN (*pSQLAllocEnv)(SQLHENV*); @@ -1919,11 +1920,19 @@ SQLSMALLINT cbDriverAttrMax, SQLSMALLINT *pcbDriverAttr) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("direction=%d\n", fDirection); if (!pSQLDrivers) return SQL_ERROR; - return pSQLDrivers(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, - szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); + ret = pSQLDrivers(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, + szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); + + if (ret == SQL_NO_DATA && fDirection == SQL_FETCH_FIRST) + ERR_(winediag)("No ODBC drivers could be found. " + "Check the settings for your libodbc provider.\n"); + + return ret; } @@ -2652,11 +2661,19 @@ SQLSMALLINT cbDriverAttrMax, SQLSMALLINT *pcbDriverAttr) { - TRACE("\n"); + SQLRETURN ret; + + TRACE("direction=%d\n", fDirection); if (!pSQLDriversW) return SQL_ERROR; - return pSQLDriversW(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, - szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); + ret = pSQLDriversW(henv, fDirection, szDriverDesc, cbDriverDescMax, pcbDriverDesc, + szDriverAttributes, cbDriverAttrMax, pcbDriverAttr); + + if (ret == SQL_NO_DATA && fDirection == SQL_FETCH_FIRST) + ERR_(winediag)("No ODBC drivers could be found. " + "Check the settings for your libodbc provider.\n"); + + 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] Wed Apr 15 18:05:07 2015 @@ -143,7 +143,7 @@ reactos/dll/win32/ntdsapi # Synced to WineStaging-1.7.37 reactos/dll/win32/ntprint # Synced to Wine-1.7.27 reactos/dll/win32/objsel # Synced to Wine-1.7.27 -reactos/dll/win32/odbc32 # Synced to Wine-1.7.27. Depends on port of Linux ODBC. +reactos/dll/win32/odbc32 # Synced to WineStaging-1.7.37. Depends on port of Linux ODBC. reactos/dll/win32/odbccp32 # Synced to Wine-1.7.27 reactos/dll/win32/ole32 # Synced to WineStaging-1.7.37 reactos/dll/win32/oleacc # Synced to Wine-1.7.27

9 years, 5 months

[akhaldi] 67199: [NTDSAPI] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 15 18:04:15 2015 New Revision: 67199 URL: http://svn.reactos.org/svn/reactos?rev=67199&view=rev Log: [NTDSAPI] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/ntdsapi/ntdsapi.c trunk/reactos/dll/win32/ntdsapi/ntdsapi.spec trunk/reactos/media/doc/README.WINE 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] Wed Apr 15 18:04:15 2015 @@ -50,6 +50,24 @@ } /*********************************************************************** + * DsBindA (NTDSAPI.@) + */ +DWORD WINAPI DsBindA(LPCSTR controller, LPCSTR domain, HANDLE *handle) + { + FIXME("(%s,%s, %p): stub!\n", debugstr_a(controller), debugstr_a(domain), handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * DsBindW (NTDSAPI.@) + */ +DWORD WINAPI DsBindW(LPCWSTR controller, LPCWSTR domain, HANDLE *handle) + { + FIXME("(%s,%s, %p): stub!\n", debugstr_w(controller), debugstr_w(domain), handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** * DsMakeSpnW (NTDSAPI.@) */ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, 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] Wed Apr 15 18:04:15 2015 @@ -1,7 +1,7 @@ @ stub DsAddSidHistoryA @ stub DsAddSidHistoryW -@ stub DsBindA -@ stub DsBindW +@ stdcall DsBindA(str str ptr) +@ stdcall DsBindW(wstr wstr ptr) @ stub DsBindWithCredA @ stub DsBindWithCredW @ stub DsBindWithSpnA 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] Wed Apr 15 18:04:15 2015 @@ -140,7 +140,7 @@ reactos/dll/win32/nddeapi # Synced to Wine-1.7.27 reactos/dll/win32/netapi32 # Forked at Wine-1.3.34 reactos/dll/win32/npptools # Synced to Wine-1.7.27 -reactos/dll/win32/ntdsapi # Synced to Wine-1.7.27 +reactos/dll/win32/ntdsapi # Synced to WineStaging-1.7.37 reactos/dll/win32/ntprint # Synced to Wine-1.7.27 reactos/dll/win32/objsel # Synced to Wine-1.7.27 reactos/dll/win32/odbc32 # Synced to Wine-1.7.27. Depends on port of Linux ODBC.

9 years, 5 months

[akhaldi] 67198: [XMLLITE] Sync with Wine Staging 1.7.37. CORE-9246

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Apr 15 18:03:03 2015 New Revision: 67198 URL: http://svn.reactos.org/svn/reactos?rev=67198&view=rev Log: [XMLLITE] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/xmllite/reader.c trunk/reactos/dll/win32/xmllite/writer.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/xmllite/reader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/reader.c… ============================================================================== --- trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/reader.c [iso-8859-1] Wed Apr 15 18:03:03 2015 @@ -2661,7 +2661,7 @@ TRACE("(%p)->(%p %p)\n", This, name, len); *name = This->strvalues[StringValue_QualifiedName].str; - *len = This->strvalues[StringValue_QualifiedName].len; + if (len) *len = This->strvalues[StringValue_QualifiedName].len; return S_OK; } Modified: trunk/reactos/dll/win32/xmllite/writer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/writer.c… ============================================================================== --- trunk/reactos/dll/win32/xmllite/writer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/xmllite/writer.c [iso-8859-1] Wed Apr 15 18:03:03 2015 @@ -323,7 +323,7 @@ buffer = &output->buffer; - /* It will loop forever until everything is written or an error occured. */ + /* It will loop forever until everything is written or an error occurred. */ do { written = 0; hr = ISequentialStream_Write(output->stream, buffer->data + offset, buffer->written, &written); 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] Wed Apr 15 18:03:03 2015 @@ -224,7 +224,7 @@ reactos/dll/win32/xinput1_2 # Synced to Wine-1.7.27 reactos/dll/win32/xinput1_3 # Synced to Wine-1.7.27 reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.7.27 -reactos/dll/win32/xmllite # Synced to Wine-1.7.27 +reactos/dll/win32/xmllite # Synced to WineStaging-1.7.37 reactos/dll/cpl/inetcpl # Synced to Wine-1.7.27

9 years, 5 months

[ekohl] 67197: [NETAPI32] - Add the client interface code of the server service. - Implement NetRemoteTOD. This will not fix CORE-5423 because the server side (NetrRemoteTOD) is not implemented yet.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Apr 14 21:47:06 2015 New Revision: 67197 URL: http://svn.reactos.org/svn/reactos?rev=67197&view=rev Log: [NETAPI32] - Add the client interface code of the server service. - Implement NetRemoteTOD. This will not fix CORE-5423 because the server side (NetrRemoteTOD) is not implemented yet. Added: trunk/reactos/dll/win32/netapi32/srvsvc.c (with props) Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt trunk/reactos/dll/win32/netapi32/netapi32.spec Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/CMakeLists.txt [iso-8859-1] Tue Apr 14 21:47:06 2015 @@ -8,6 +8,7 @@ add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/atsvc.idl ${REACTOS_SOURCE_DIR}/include/reactos/idl/dssetup.idl + ${REACTOS_SOURCE_DIR}/include/reactos/idl/srvsvc.idl ${REACTOS_SOURCE_DIR}/include/reactos/idl/wkssvc.idl) list(APPEND SOURCE @@ -26,12 +27,14 @@ netbios.c schedule.c share.c + srvsvc.c user.c wksta.c wksta_new.c netapi32.h ${CMAKE_CURRENT_BINARY_DIR}/atsvc_c.c ${CMAKE_CURRENT_BINARY_DIR}/dssetup_c.c + ${CMAKE_CURRENT_BINARY_DIR}/srvsvc_c.c ${CMAKE_CURRENT_BINARY_DIR}/wkssvc_c.c) add_library(netapi32 SHARED Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Tue Apr 14 21:47:06 2015 @@ -183,7 +183,7 @@ @ stdcall NetQueryDisplayInformation(wstr long long long long ptr ptr) @ stub NetRegisterDomainNameChangeNotification @ stub NetRemoteComputerSupports -@ stub NetRemoteTOD +@ stdcall NetRemoteTOD(wstr ptr) @ stub NetRemoveAlternateComputerName @ stub NetRenameMachineInDomain @ stub NetReplExportDirAdd Added: trunk/reactos/dll/win32/netapi32/srvsvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/srvsvc.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/srvsvc.c (added) +++ trunk/reactos/dll/win32/netapi32/srvsvc.c [iso-8859-1] Tue Apr 14 21:47:06 2015 @@ -0,0 +1,101 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: NetAPI DLL + * FILE: reactos/dll/win32/netapi32/schedule.c + * PURPOSE: Server service interface code + * + * PROGRAMMERS: Eric Kohl + */ + +/* INCLUDES ******************************************************************/ + +#include "netapi32.h" +#include "srvsvc_c.h" + +WINE_DEFAULT_DEBUG_CHANNEL(netapi32); + +/* FUNCTIONS *****************************************************************/ + +handle_t __RPC_USER +SRVSVC_HANDLE_bind(SRVSVC_HANDLE pszSystemName) +{ + handle_t hBinding = NULL; + LPWSTR pszStringBinding; + RPC_STATUS status; + + TRACE("SRVSVC_HANDLE_bind() called\n"); + + status = RpcStringBindingComposeW(NULL, + L"ncacn_np", + (RPC_WSTR)pszSystemName, + L"\\pipe\\srvsvc", + NULL, + &pszStringBinding); + if (status) + { + TRACE("RpcStringBindingCompose returned 0x%x\n", status); + return NULL; + } + + /* Set the binding handle that will be used to bind to the server. */ + status = RpcBindingFromStringBindingW(pszStringBinding, + &hBinding); + if (status) + { + TRACE("RpcBindingFromStringBinding returned 0x%x\n", status); + } + + status = RpcStringFreeW(&pszStringBinding); + if (status) + { +// TRACE("RpcStringFree returned 0x%x\n", status); + } + + return hBinding; +} + + +void __RPC_USER +SRVSVC_HANDLE_unbind(SRVSVC_HANDLE pszSystemName, + handle_t hBinding) +{ + RPC_STATUS status; + + TRACE("SRVSVC_HANDLE_unbind() called\n"); + + status = RpcBindingFree(&hBinding); + if (status) + { + TRACE("RpcBindingFree returned 0x%x\n", status); + } +} + + +NET_API_STATUS +WINAPI +NetRemoteTOD( + LPCWSTR UncServerName, + LPBYTE *BufferPtr) +{ + NET_API_STATUS status; + + TRACE("NetRemoteTOD(%s, %p)\n", debugstr_w(UncServerName), + BufferPtr); + + *BufferPtr = NULL; + + RpcTryExcept + { + status = NetrRemoteTOD((SRVSVC_HANDLE)UncServerName, + (LPTIME_OF_DAY_INFO *)BufferPtr); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/netapi32/srvsvc.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 5 months

[ekohl] 67196: [SRVSVC] Add the Server service and its interface definition files.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Apr 14 20:59:34 2015 New Revision: 67196 URL: http://svn.reactos.org/svn/reactos?rev=67196&view=rev Log: [SRVSVC] Add the Server service and its interface definition files. Added: trunk/reactos/base/services/srvsvc/ (with props) trunk/reactos/base/services/srvsvc/CMakeLists.txt (with props) trunk/reactos/base/services/srvsvc/precomp.h (with props) trunk/reactos/base/services/srvsvc/rpcserver.c (with props) trunk/reactos/base/services/srvsvc/srvsvc.c (with props) trunk/reactos/base/services/srvsvc/srvsvc.rc (with props) trunk/reactos/base/services/srvsvc/srvsvc.spec (with props) trunk/reactos/include/reactos/idl/srvsvc.acf (with props) trunk/reactos/include/reactos/idl/srvsvc.idl (with props) Modified: trunk/reactos/base/services/CMakeLists.txt trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/CMakeLists.t… ============================================================================== --- trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/services/CMakeLists.txt [iso-8859-1] Tue Apr 14 20:59:34 2015 @@ -4,6 +4,7 @@ add_subdirectory(rpcss) add_subdirectory(schedsvc) add_subdirectory(spoolsv) +add_subdirectory(srvsvc) add_subdirectory(svchost) add_subdirectory(tcpsvcs) add_subdirectory(telnetd) Propchange: trunk/reactos/base/services/srvsvc/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Apr 14 20:59:34 2015 @@ -0,0 +1 @@ +((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or )?((CORE|ROSTESTS|ROSAPPS)-\d+))? Propchange: trunk/reactos/base/services/srvsvc/ ------------------------------------------------------------------------------ bugtraq:message = See issue %BUGID% for more details. Propchange: trunk/reactos/base/services/srvsvc/ ------------------------------------------------------------------------------ bugtraq:url = https://jira.reactos.org/browse/%BUGID% Propchange: trunk/reactos/base/services/srvsvc/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/services/srvsvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/srvsvc/CMake… ============================================================================== --- trunk/reactos/base/services/srvsvc/CMakeLists.txt (added) +++ trunk/reactos/base/services/srvsvc/CMakeLists.txt [iso-8859-1] Tue Apr 14 20:59:34 2015 @@ -0,0 +1,16 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl) +add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/srvsvc.idl) +spec2def(srvsvc.dll srvsvc.spec ADD_IMPORTLIB) + +add_library(srvsvc SHARED + rpcserver.c + srvsvc.c + srvsvc.rc + ${CMAKE_CURRENT_BINARY_DIR}/srvsvc_s.c + ${CMAKE_CURRENT_BINARY_DIR}/srvsvc.def) + +set_module_type(srvsvc win32dll UNICODE) +target_link_libraries(srvsvc wine) +add_importlibs(srvsvc advapi32 rpcrt4 msvcrt kernel32 ntdll) +add_cd_file(TARGET srvsvc DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/base/services/srvsvc/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/srvsvc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/srvsvc/preco… ============================================================================== --- trunk/reactos/base/services/srvsvc/precomp.h (added) +++ trunk/reactos/base/services/srvsvc/precomp.h [iso-8859-1] Tue Apr 14 20:59:34 2015 @@ -0,0 +1,22 @@ +#ifndef _SRVSVC_PCH_ +#define _SRVSVC_PCH_ + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H +#include <stdarg.h> +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winsvc.h> + +#include <srvsvc_s.h> + +#include <wine/debug.h> + +DWORD +WINAPI +RpcThreadRoutine( + LPVOID lpParameter); + +#endif /* _SRVSVC_PCH_ */ Propchange: trunk/reactos/base/services/srvsvc/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/srvsvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/srvsvc/rpcse… ============================================================================== --- trunk/reactos/base/services/srvsvc/rpcserver.c (added) +++ trunk/reactos/base/services/srvsvc/rpcserver.c [iso-8859-1] Tue Apr 14 20:59:34 2015 @@ -0,0 +1,797 @@ +/* + * ReactOS Services + * Copyright (C) 2015 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Services + * FILE: base/services/srvsvc/rpcserver.c + * PURPOSE: Server service + * PROGRAMMER: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +#include "winerror.h" +#include "lmerr.h" + +WINE_DEFAULT_DEBUG_CHANNEL(srvsvc); + +/* FUNCTIONS *****************************************************************/ + +DWORD +WINAPI +RpcThreadRoutine( + LPVOID lpParameter) +{ + RPC_STATUS Status; + + Status = RpcServerUseProtseqEpW(L"ncacn_np", 20, L"\\pipe\\srvsvc", NULL); + if (Status != RPC_S_OK) + { + ERR("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerRegisterIf(srvsvc_v3_0_s_ifspec, NULL, NULL); + if (Status != RPC_S_OK) + { + ERR("RpcServerRegisterIf() failed (Status %lx)\n", Status); + return 0; + } + + Status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, FALSE); + if (Status != RPC_S_OK) + { + ERR("RpcServerListen() failed (Status %lx)\n", Status); + } + + return 0; +} + + +void __RPC_FAR * __RPC_USER midl_user_allocate(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + + +void __RPC_USER midl_user_free(void __RPC_FAR * ptr) +{ + HeapFree(GetProcessHeap(), 0, ptr); +} + + +void __RPC_USER SHARE_DEL_HANDLE_rundown(SHARE_DEL_HANDLE hClientHandle) +{ +} + + +/* Function 0 */ +void +__stdcall +Opnum0NotUsedOnWire(void) +{ + UNIMPLEMENTED; +} + + +/* Function 1 */ +void +__stdcall +Opnum1NotUsedOnWire(void) +{ + UNIMPLEMENTED; +} + + +/* Function 2 */ +void +__stdcall +Opnum2NotUsedOnWire(void) +{ + UNIMPLEMENTED; +} + + +/* Function 3 */ +void +__stdcall +Opnum3NotUsedOnWire(void) +{ + UNIMPLEMENTED; +} + + +/* Function 4 */ +void +__stdcall +Opnum4NotUsedOnWire(void) +{ + UNIMPLEMENTED; +} + +/* Function 5 */ +void +__stdcall +Opnum5NotUsedOnWire(void) +{ + UNIMPLEMENTED; +} + + +/* Function 6 */ +void +__stdcall +Opnum6NotUsedOnWire(void) +{ + UNIMPLEMENTED; +} + + +/* Function 7 */ +void +__stdcall +Opnum7NotUsedOnWire(void) +{ + UNIMPLEMENTED; +} + + +/* Function 8 */ +NET_API_STATUS +__stdcall +NetrConnectionEnum( + SRVSVC_HANDLE ServerName, + WCHAR *Qualifier, + LPCONNECT_ENUM_STRUCT InfoStruct, + DWORD PreferedMaximumLength, + DWORD *TotalEntries, + DWORD *ResumeHandle) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 9 */ +NET_API_STATUS +__stdcall +NetrFileEnum( + SRVSVC_HANDLE ServerName, + WCHAR *BasePath, + WCHAR *UserName, + PFILE_ENUM_STRUCT InfoStruct, + DWORD PreferedMaximumLength, + DWORD *TotalEntries, + DWORD *ResumeHandle) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 10 */ +NET_API_STATUS +__stdcall +NetrFileGetInfo( + SRVSVC_HANDLE ServerName, + DWORD FileId, + DWORD Level, + LPFILE_INFO InfoStruct) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 11 */ +NET_API_STATUS +__stdcall +NetrFileClose( + SRVSVC_HANDLE ServerName, + DWORD FileId) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 12 */ +NET_API_STATUS +__stdcall +NetrSessionEnum( + SRVSVC_HANDLE ServerName, + WCHAR *ClientName, + WCHAR *UserName, + PSESSION_ENUM_STRUCT InfoStruct, + DWORD PreferedMaximumLength, + DWORD *TotalEntries, + DWORD *ResumeHandle) +{ + UNIMPLEMENTED; + return 0; +} + + +/* Function 13 */ +NET_API_STATUS +__stdcall +NetrSessionDel( + SRVSVC_HANDLE ServerName, + WCHAR *ClientName, + WCHAR *UserName) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 14 */ +NET_API_STATUS +__stdcall +NetrShareAdd( + SRVSVC_HANDLE ServerName, + DWORD Level, + LPSHARE_INFO InfoStruct, + DWORD *ParmErr) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 15 */ +NET_API_STATUS +__stdcall +NetrShareEnum( + SRVSVC_HANDLE ServerName, + LPSHARE_ENUM_STRUCT InfoStruct, + DWORD PreferedMaximumLength, + DWORD *TotalEntries, + DWORD *ResumeHandle) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 16 */ +NET_API_STATUS +__stdcall +NetrShareGetInfo( + SRVSVC_HANDLE ServerName, + WCHAR *NetName, + DWORD Level, + LPSHARE_INFO InfoStruct) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 17 */ +NET_API_STATUS +__stdcall +NetrShareSetInfo( + SRVSVC_HANDLE ServerName, + WCHAR *NetName, + DWORD Level, + LPSHARE_INFO ShareInfo, + DWORD *ParmErr) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 18 */ +NET_API_STATUS +__stdcall +NetrShareDel( + SRVSVC_HANDLE ServerName, + WCHAR *NetName, + DWORD Reserved) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 19 */ +NET_API_STATUS +__stdcall +NetrShareDelSticky( + SRVSVC_HANDLE ServerName, + WCHAR *NetName, + DWORD Reserved) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 20 */ +NET_API_STATUS +__stdcall +NetrShareCheck( + SRVSVC_HANDLE ServerName, + WCHAR *Device, + DWORD *Type) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 21 */ +NET_API_STATUS +__stdcall +NetrServerGetInfo( + SRVSVC_HANDLE ServerName, + DWORD Level, + LPSERVER_INFO InfoStruct) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 22 */ +NET_API_STATUS +__stdcall +NetrServerSetInfo( + SRVSVC_HANDLE ServerName, + DWORD Level, + LPSERVER_INFO ServerInfo, + DWORD *ParmErr) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 23 */ +NET_API_STATUS +__stdcall +NetrServerDiskEnum( + SRVSVC_HANDLE ServerName, + DWORD Level, + DISK_ENUM_CONTAINER *DiskInfoStruct, + DWORD PreferedMaximumLength, + DWORD *TotalEntries, + DWORD *ResumeHandle) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 24 */ +NET_API_STATUS +__stdcall +NetrServerStatisticsGet( + SRVSVC_HANDLE ServerName, + WCHAR *Service, + DWORD Level, + DWORD Options, + LPSTAT_SERVER_0 *InfoStruct) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 25 */ +NET_API_STATUS +__stdcall +NetrServerTransportAdd( + SRVSVC_HANDLE ServerName, + DWORD Level, + LPSERVER_TRANSPORT_INFO_0 Buffer) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 26 */ +NET_API_STATUS +__stdcall +NetrServerTransportEnum( + SRVSVC_HANDLE ServerName, + LPSERVER_XPORT_ENUM_STRUCT InfoStruct, + DWORD PreferedMaximumLength, + DWORD *TotalEntries, + DWORD *ResumeHandle) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 27 */ +NET_API_STATUS +__stdcall +NetrServerTransportDel( + SRVSVC_HANDLE ServerName, + DWORD Level, + LPSERVER_TRANSPORT_INFO_0 Buffer) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 28 */ +NET_API_STATUS +__stdcall +NetrRemoteTOD( + SRVSVC_HANDLE ServerName, + LPTIME_OF_DAY_INFO *BufferPtr) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 29 */ +void +__stdcall +Opnum29NotUsedOnWire(void) +{ + UNIMPLEMENTED; +} + + +/* Function 30 */ +NET_API_STATUS +__stdcall +NetprPathType( + SRVSVC_HANDLE ServerName, + WCHAR *PathName, + DWORD *PathType, + DWORD Flags) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 31 */ +NET_API_STATUS +__stdcall +NetprPathCanonicalize( + SRVSVC_HANDLE ServerName, + WCHAR *PathName, + unsigned char *Outbuf, + DWORD OutbufLen, + WCHAR *Prefix, + DWORD *PathType, + DWORD Flags) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 32 */ +long +__stdcall +NetprPathCompare( + SRVSVC_HANDLE ServerName, + WCHAR *PathName1, + WCHAR *PathName2, + DWORD PathType, + DWORD Flags) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 33 */ +NET_API_STATUS +__stdcall +NetprNameValidate( + SRVSVC_HANDLE ServerName, + WCHAR * Name, + DWORD NameType, + DWORD Flags) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 34 */ +NET_API_STATUS +__stdcall +NetprNameCanonicalize( + SRVSVC_HANDLE ServerName, + WCHAR *Name, + WCHAR *Outbuf, + DWORD OutbufLen, + DWORD NameType, + DWORD Flags) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 35 */ +long +__stdcall +NetprNameCompare( + SRVSVC_HANDLE ServerName, + WCHAR *Name1, + WCHAR *Name2, + DWORD NameType, + DWORD Flags) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 36 */ +NET_API_STATUS +__stdcall +NetrShareEnumSticky( + SRVSVC_HANDLE ServerName, + LPSHARE_ENUM_STRUCT InfoStruct, + DWORD PreferedMaximumLength, + DWORD *TotalEntries, + DWORD *ResumeHandle) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 37 */ +NET_API_STATUS +__stdcall +NetrShareDelStart( + SRVSVC_HANDLE ServerName, + WCHAR *NetName, + DWORD Reserved, + PSHARE_DEL_HANDLE ContextHandle) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 38 */ +NET_API_STATUS +__stdcall +NetrShareDelCommit( + PSHARE_DEL_HANDLE ContextHandle) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 39 */ +DWORD +__stdcall +NetrpGetFileSecurity( + SRVSVC_HANDLE ServerName, + WCHAR *ShareName, + WCHAR *lpFileName, + SECURITY_INFORMATION RequestedInformation, + PADT_SECURITY_DESCRIPTOR *SecurityDescriptor) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 40 */ +DWORD +__stdcall +NetrpSetFileSecurity( + SRVSVC_HANDLE ServerName, + WCHAR *ShareName, + WCHAR *lpFileName, + SECURITY_INFORMATION SecurityInformation, + PADT_SECURITY_DESCRIPTOR SecurityDescriptor) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 41 */ +NET_API_STATUS +__stdcall +NetrServerTransportAddEx( + SRVSVC_HANDLE ServerName, + DWORD Level, + LPTRANSPORT_INFO Buffer) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 42 */ +void +__stdcall +Opnum42NotUsedOnWire(void) +{ + UNIMPLEMENTED; +} + + +/* Function 43 */ +NET_API_STATUS +__stdcall +NetrDfsGetVersion( + SRVSVC_HANDLE ServerName, + DWORD *Version) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 44 */ +NET_API_STATUS +__stdcall +NetrDfsCreateLocalPartition( + SRVSVC_HANDLE ServerName, + WCHAR *ShareName, + GUID *EntryUid, + WCHAR *EntryPrefix, + WCHAR *ShortName, + LPNET_DFS_ENTRY_ID_CONTAINER RelationInfo, + int Force) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 45 */ +NET_API_STATUS +__stdcall +NetrDfsDeleteLocalPartition( + SRVSVC_HANDLE ServerName, + GUID *Uid, + WCHAR *Prefix) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 46 */ +NET_API_STATUS +__stdcall +NetrDfsSetLocalVolumeState( + SRVSVC_HANDLE ServerName, + GUID *Uid, + WCHAR *Prefix, + unsigned long State) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 47 */ +void +__stdcall +Opnum47NotUsedOnWire(void) +{ + UNIMPLEMENTED; +} + + +/* Function 48 */ +NET_API_STATUS +__stdcall +NetrDfsCreateExitPoint( + SRVSVC_HANDLE ServerName, + GUID *Uid, + WCHAR *Prefix, + unsigned long Type, + DWORD ShortPrefixLen, + WCHAR *ShortPrefix) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 49 */ +NET_API_STATUS +__stdcall +NetrDfsDeleteExitPoint( + SRVSVC_HANDLE ServerName, + GUID *Uid, + WCHAR *Prefix, + unsigned long Type) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 50 */ +NET_API_STATUS +__stdcall +NetrDfsModifyPrefix( + SRVSVC_HANDLE ServerName, + GUID *Uid, + WCHAR *Prefix) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 51 */ +NET_API_STATUS +__stdcall +NetrDfsFixLocalVolume( + SRVSVC_HANDLE ServerName, + WCHAR *VolumeName, + unsigned long EntryType, + unsigned long ServiceType, + WCHAR *StgId, + GUID *EntryUid, + WCHAR *EntryPrefix, + LPNET_DFS_ENTRY_ID_CONTAINER RelationInfo, + unsigned long CreateDisposition) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 52 */ +NET_API_STATUS +__stdcall +NetrDfsManagerReportSiteInfo( + SRVSVC_HANDLE ServerName, + LPDFS_SITELIST_INFO *ppSiteInfo) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/* Function 53 */ +NET_API_STATUS +__stdcall +NetrServerTransportDelEx( + SRVSVC_HANDLE ServerName, + DWORD Level, + LPTRANSPORT_INFO Buffer) +{ + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/base/services/srvsvc/rpcserver.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/srvsvc/srvsvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/srvsvc/srvsv… ============================================================================== --- trunk/reactos/base/services/srvsvc/srvsvc.c (added) +++ trunk/reactos/base/services/srvsvc/srvsvc.c [iso-8859-1] Tue Apr 14 20:59:34 2015 @@ -0,0 +1,184 @@ +/* + * ReactOS Services + * Copyright (C) 2015 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Services + * FILE: base/services/srvsvc/srvsvc.c + * PURPOSE: Server service + * PROGRAMMER: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(srvsvc); + +/* GLOBALS ******************************************************************/ + +static WCHAR ServiceName[] = L"Lanmanserver"; + +static SERVICE_STATUS_HANDLE ServiceStatusHandle; +static SERVICE_STATUS ServiceStatus; + +/* FUNCTIONS *****************************************************************/ + +static VOID +UpdateServiceStatus(DWORD dwState) +{ + ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwCurrentState = dwState; + ServiceStatus.dwControlsAccepted = 0; + ServiceStatus.dwWin32ExitCode = 0; + ServiceStatus.dwServiceSpecificExitCode = 0; + ServiceStatus.dwCheckPoint = 0; + + if (dwState == SERVICE_START_PENDING || + dwState == SERVICE_STOP_PENDING || + dwState == SERVICE_PAUSE_PENDING || + dwState == SERVICE_CONTINUE_PENDING) + ServiceStatus.dwWaitHint = 10000; + else + ServiceStatus.dwWaitHint = 0; + + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); +} + +static DWORD WINAPI +ServiceControlHandler(DWORD dwControl, + DWORD dwEventType, + LPVOID lpEventData, + LPVOID lpContext) +{ + TRACE("ServiceControlHandler() called\n"); + + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + TRACE(" SERVICE_CONTROL_STOP received\n"); + /* Stop listening to incoming RPC messages */ + RpcMgmtStopServerListening(NULL); + UpdateServiceStatus(SERVICE_STOPPED); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_PAUSE: + TRACE(" SERVICE_CONTROL_PAUSE received\n"); + UpdateServiceStatus(SERVICE_PAUSED); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_CONTINUE: + TRACE(" SERVICE_CONTROL_CONTINUE received\n"); + UpdateServiceStatus(SERVICE_RUNNING); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_INTERROGATE: + TRACE(" SERVICE_CONTROL_INTERROGATE received\n"); + SetServiceStatus(ServiceStatusHandle, + &ServiceStatus); + return ERROR_SUCCESS; + + case SERVICE_CONTROL_SHUTDOWN: + TRACE(" SERVICE_CONTROL_SHUTDOWN received\n"); + UpdateServiceStatus(SERVICE_STOPPED); + return ERROR_SUCCESS; + + default : + TRACE(" Control %lu received\n", dwControl); + return ERROR_CALL_NOT_IMPLEMENTED; + } +} + + +static +DWORD +ServiceInit(VOID) +{ + HANDLE hThread; + + hThread = CreateThread(NULL, + 0, + (LPTHREAD_START_ROUTINE)RpcThreadRoutine, + NULL, + 0, + NULL); + + if (!hThread) + { + ERR("Can't create PortThread\n"); + return GetLastError(); + } + else + CloseHandle(hThread); + + return ERROR_SUCCESS; +} + + +VOID +WINAPI +ServiceMain(DWORD argc, LPTSTR *argv) +{ + DWORD dwError; + + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + + TRACE("ServiceMain() called\n"); + + ServiceStatusHandle = RegisterServiceCtrlHandlerExW(ServiceName, + ServiceControlHandler, + NULL); + if (!ServiceStatusHandle) + { + ERR("RegisterServiceCtrlHandlerExW() failed! (Error %lu)\n", GetLastError()); + return; + } + + UpdateServiceStatus(SERVICE_START_PENDING); + + dwError = ServiceInit(); + if (dwError != ERROR_SUCCESS) + { + ERR("Service stopped (dwError: %lu\n", dwError); + UpdateServiceStatus(SERVICE_STOPPED); + return; + } + + UpdateServiceStatus(SERVICE_RUNNING); +} + + +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, + DWORD fdwReason, + LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} Propchange: trunk/reactos/base/services/srvsvc/srvsvc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/srvsvc/srvsvc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/srvsvc/srvsv… ============================================================================== --- trunk/reactos/base/services/srvsvc/srvsvc.rc (added) +++ trunk/reactos/base/services/srvsvc/srvsvc.rc [iso-8859-1] Tue Apr 14 20:59:34 2015 @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Server Service" +#define REACTOS_STR_INTERNAL_NAME "srvsvc" +#define REACTOS_STR_ORIGINAL_FILENAME "srvsvc.dll" +#include <reactos/version.rc> Propchange: trunk/reactos/base/services/srvsvc/srvsvc.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/services/srvsvc/srvsvc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/srvsvc/srvsv… ============================================================================== --- trunk/reactos/base/services/srvsvc/srvsvc.spec (added) +++ trunk/reactos/base/services/srvsvc/srvsvc.spec [iso-8859-1] Tue Apr 14 20:59:34 2015 @@ -0,0 +1 @@ +@ stdcall ServiceMain(long ptr) Propchange: trunk/reactos/base/services/srvsvc/srvsvc.spec ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Tue Apr 14 20:59:34 2015 @@ -1609,7 +1609,7 @@ ; SvcHost services HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","DcomLaunch",0x00010000,"PlugPlay" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"DHCP","BITS","lanmanworkstation","Schedule","winmgmt" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SvcHost","netsvcs",0x00010000,"DHCP","BITS","lanmanserver","lanmanworkstation","Schedule","winmgmt" ; Win32 config HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Windows",,0x00000012 Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Tue Apr 14 20:59:34 2015 @@ -1436,6 +1436,15 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","ImagePath",0x00020000,"system32\drivers\fs_rec.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Fs_Rec","Type",0x00010001,0x00000008 + +; Server service +HKLM,"SYSTEM\CurrentControlSet\Services\lanmanserver","DisplayName",0x00000000,"Server service" +HKLM,"SYSTEM\CurrentControlSet\Services\lanmanserver","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\lanmanserver","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" +HKLM,"SYSTEM\CurrentControlSet\Services\lanmanserver","ObjectName",0x00000000,"LocalSystem" +HKLM,"SYSTEM\CurrentControlSet\Services\lanmanserver","Start",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\lanmanserver","Type",0x00010001,0x00000020 +HKLM,"SYSTEM\CurrentControlSet\Services\lanmanserver\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\srvsvc.dll" ; Workstation service HKLM,"SYSTEM\CurrentControlSet\Services\lanmanworkstation","DisplayName",0x00000000,"Workstation service" Added: trunk/reactos/include/reactos/idl/srvsvc.acf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/srvsvc… ============================================================================== --- trunk/reactos/include/reactos/idl/srvsvc.acf (added) +++ trunk/reactos/include/reactos/idl/srvsvc.acf [iso-8859-1] Tue Apr 14 20:59:34 2015 @@ -0,0 +1,6 @@ +[ + implicit_handle(handle_t hBinding) +] +interface srvsvc +{ +} Propchange: trunk/reactos/include/reactos/idl/srvsvc.acf ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/reactos/idl/srvsvc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/srvsvc… ============================================================================== --- trunk/reactos/include/reactos/idl/srvsvc.idl (added) +++ trunk/reactos/include/reactos/idl/srvsvc.idl [iso-8859-1] Tue Apr 14 20:59:34 2015 @@ -0,0 +1,1408 @@ +/* + * Server Service interface definition + */ + +#include <ms-dtyp.idl> + +typedef [handle, string] wchar_t *SRVSVC_HANDLE; + +typedef struct _CONNECTION_INFO_0 +{ + DWORD coni0_id; +} CONNECTION_INFO_0, *PCONNECTION_INFO_0, *LPCONNECTION_INFO_0; + +typedef struct _CONNECT_INFO_0_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPCONNECTION_INFO_0 Buffer; +} CONNECT_INFO_0_CONTAINER, *PCONNECT_INFO_0_CONTAINER, *LPCONNECT_INFO_0_CONTAINER; + +typedef struct _CONNECTION_INFO_1 +{ + DWORD coni1_id; + DWORD coni1_type; + DWORD coni1_num_opens; + DWORD coni1_num_users; + DWORD coni1_time; + [string] wchar_t *coni1_username; + [string] wchar_t *coni1_netname; +} CONNECTION_INFO_1, *PCONNECTION_INFO_1, *LPCONNECTION_INFO_1; + +typedef struct _CONNECT_INFO_1_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPCONNECTION_INFO_1 Buffer; +} CONNECT_INFO_1_CONTAINER, *PCONNECT_INFO_1_CONTAINER, *LPCONNECT_INFO_1_CONTAINER; + +typedef [switch_type(DWORD)] union _CONNECT_ENUM_UNION +{ + [case(0)] CONNECT_INFO_0_CONTAINER *Level0; + [case(1)] CONNECT_INFO_1_CONTAINER *Level1; +} CONNECT_ENUM_UNION; + +typedef struct _CONNECT_ENUM_STRUCT +{ + DWORD Level; + [switch_is(Level)] CONNECT_ENUM_UNION ConnectInfo; +} CONNECT_ENUM_STRUCT, *PCONNECT_ENUM_STRUCT, *LPCONNECT_ENUM_STRUCT; + +typedef struct _FILE_INFO_2 +{ + DWORD fi2_id; +} FILE_INFO_2, *PFILE_INFO_2, *LPFILE_INFO_2; + +typedef struct _FILE_INFO_2_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPFILE_INFO_2 Buffer; +} FILE_INFO_2_CONTAINER, *PFILE_INFO_2_CONTAINER, *LPFILE_INFO_2_CONTAINER; + +typedef struct _FILE_INFO_3 +{ + DWORD fi3_id; + DWORD fi3_permissions; + DWORD fi3_num_locks; + [string] wchar_t *fi3_pathname; + [string] wchar_t *fi3_username; +} FILE_INFO_3, *PFILE_INFO_3, *LPFILE_INFO_3; + +typedef struct _FILE_INFO_3_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPFILE_INFO_3 Buffer; +} FILE_INFO_3_CONTAINER, *PFILE_INFO_3_CONTAINER, *LPFILE_INFO_3_CONTAINER; + +typedef [switch_type(DWORD)] union _FILE_ENUM_UNION +{ + [case(2)] FILE_INFO_2_CONTAINER* Level2; + [case(3)] FILE_INFO_3_CONTAINER* Level3; +} FILE_ENUM_UNION; + +typedef struct _FILE_ENUM_STRUCT +{ + DWORD Level; + [switch_is(Level)] FILE_ENUM_UNION FileInfo; +} FILE_ENUM_STRUCT, *PFILE_ENUM_STRUCT, *LPFILE_ENUM_STRUCT; + +typedef [switch_type(unsigned long)] union _FILE_INFO +{ + [case(2)] LPFILE_INFO_2 FileInfo2; + [case(3)] LPFILE_INFO_3 FileInfo3; +} FILE_INFO, *PFILE_INFO, *LPFILE_INFO; + +typedef struct _SESSION_INFO_0 +{ + [string] wchar_t *sesi0_cname; +} SESSION_INFO_0, *PSESSION_INFO_0, *LPSESSION_INFO_0; + +typedef struct _SESSION_INFO_0_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPSESSION_INFO_0 Buffer; +} SESSION_INFO_0_CONTAINER, *PSESSION_INFO_0_CONTAINER, *LPSESSION_INFO_0_CONTAINER; + +typedef struct _SESSION_INFO_1 +{ + [string] wchar_t *sesi1_cname; + [string] wchar_t *sesi1_username; + DWORD sesi1_num_opens; + DWORD sesi1_time; + DWORD sesi1_idle_time; + DWORD sesi1_user_flags; +} SESSION_INFO_1, *PSESSION_INFO_1, *LPSESSION_INFO_1; + +typedef struct _SESSION_INFO_1_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPSESSION_INFO_1 Buffer; +} SESSION_INFO_1_CONTAINER, *PSESSION_INFO_1_CONTAINER, *LPSESSION_INFO_1_CONTAINER; + +typedef struct _SESSION_INFO_2 +{ + [string] wchar_t *sesi2_cname; + [string] wchar_t *sesi2_username; + DWORD sesi2_num_opens; + DWORD sesi2_time; + DWORD sesi2_idle_time; + DWORD sesi2_user_flags; + [string] wchar_t *sesi2_cltype_name; +} SESSION_INFO_2, *PSESSION_INFO_2, *LPSESSION_INFO_2; + +typedef struct _SESSION_INFO_2_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPSESSION_INFO_2 Buffer; +} SESSION_INFO_2_CONTAINER, *PSESSION_INFO_2_CONTAINER, *LPSESSION_INFO_2_CONTAINER; + +typedef struct _SESSION_INFO_10 +{ + [string] wchar_t *sesi10_cname; + [string] wchar_t *sesi10_username; + DWORD sesi10_time; + DWORD sesi10_idle_time; +} SESSION_INFO_10, *PSESSION_INFO_10, *LPSESSION_INFO_10; + +typedef struct _SESSION_INFO_10_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPSESSION_INFO_10 Buffer; +} SESSION_INFO_10_CONTAINER, *PSESSION_INFO_10_CONTAINER, *LPSESSION_INFO_10_CONTAINER; + +typedef struct _SESSION_INFO_502 +{ + [string] wchar_t *sesi502_cname; + [string] wchar_t *sesi502_username; + DWORD sesi502_num_opens; + DWORD sesi502_time; + DWORD sesi502_idle_time; + DWORD sesi502_user_flags; + [string] wchar_t *sesi502_cltype_name; + [string] wchar_t *sesi502_transport; +} SESSION_INFO_502, *PSESSION_INFO_502, *LPSESSION_INFO_502; + +typedef struct _SESSION_INFO_502_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPSESSION_INFO_502 Buffer; +} SESSION_INFO_502_CONTAINER, *PSESSION_INFO_502_CONTAINER, *LPSESSION_INFO_502_CONTAINER; + +typedef [switch_type(DWORD)] union _SESSION_ENUM_UNION +{ + [case(0)] SESSION_INFO_0_CONTAINER *Level0; + [case(1)] SESSION_INFO_1_CONTAINER *Level1; + [case(2)] SESSION_INFO_2_CONTAINER *Level2; + [case(10)] SESSION_INFO_10_CONTAINER *Level10; + [case(502)] SESSION_INFO_502_CONTAINER *Level502; +} SESSION_ENUM_UNION; + +typedef struct _SESSION_ENUM_STRUCT { + DWORD Level; + [switch_is(Level)] SESSION_ENUM_UNION SessionInfo; +} SESSION_ENUM_STRUCT, *PSESSION_ENUM_STRUCT, *LPSESSION_ENUM_STRUCT; + +typedef struct _SHARE_INFO_502_I +{ + [string] WCHAR *shi502_netname; + DWORD shi502_type; + [string] WCHAR *shi502_remark; + DWORD shi502_permissions; + DWORD shi502_max_uses; + DWORD shi502_current_uses; + [string] WCHAR *shi502_path; + [string] WCHAR *shi502_passwd; + DWORD shi502_reserved; + [size_is(shi502_reserved)] unsigned char *shi502_security_descriptor; +} SHARE_INFO_502_I, *PSHARE_INFO_502_I, *LPSHARE_INFO_502_I; + +typedef struct _SHARE_INFO_503_I +{ + [string] WCHAR *shi503_netname; + DWORD shi503_type; + [string] WCHAR *shi503_remark; + DWORD shi503_permissions; + DWORD shi503_max_uses; + DWORD shi503_current_uses; + [string] WCHAR *shi503_path; + [string] WCHAR *shi503_passwd; + [string] WCHAR *shi503_servername; + DWORD shi503_reserved; + [size_is(shi503_reserved)] PUCHAR shi503_security_descriptor; +} SHARE_INFO_503_I, *PSHARE_INFO_503_I, *LPSHARE_INFO_503_I; + +typedef struct _SHARE_INFO_503_CONTAINER +{ DWORD EntriesRead; + [size_is(EntriesRead)] LPSHARE_INFO_503_I Buffer; +} SHARE_INFO_503_CONTAINER, *PSHARE_INFO_503_CONTAINER, *LPSHARE_INFO_503_CONTAINER; + +typedef struct _SHARE_INFO_1501_I +{ + DWORD shi1501_reserved; + [size_is(shi1501_reserved)] unsigned char *shi1501_security_descriptor; +} SHARE_INFO_1501_I, *PSHARE_INFO_1501_I, *LPSHARE_INFO_1501_I; + +typedef struct _SHARE_INFO_0 +{ + [string] wchar_t *shi0_netname; +} SHARE_INFO_0, *PSHARE_INFO_0, *LPSHARE_INFO_0; + +typedef struct _SHARE_INFO_0_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPSHARE_INFO_0 Buffer; +} SHARE_INFO_0_CONTAINER; + +typedef struct _SHARE_INFO_1 +{ + [string] wchar_t *shi1_netname; + DWORD shi1_type; + [string] wchar_t *shi1_remark; +} SHARE_INFO_1, *PSHARE_INFO_1, *LPSHARE_INFO_1; + +typedef struct _SHARE_INFO_1_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPSHARE_INFO_1 Buffer; +} SHARE_INFO_1_CONTAINER; + +typedef struct _SHARE_INFO_2 +{ + [string] wchar_t *shi2_netname; + DWORD shi2_type; + [string] wchar_t *shi2_remark; + DWORD shi2_permissions; + DWORD shi2_max_uses; + DWORD shi2_current_uses; + [string] wchar_t *shi2_path; + [string] wchar_t *shi2_passwd; +} SHARE_INFO_2, *PSHARE_INFO_2, *LPSHARE_INFO_2; + +typedef struct _SHARE_INFO_2_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPSHARE_INFO_2 Buffer; +} SHARE_INFO_2_CONTAINER, *PSHARE_INFO_2_CONTAINER, *LPSHARE_INFO_2_CONTAINER; + +typedef struct _SHARE_INFO_501 +{ + [string] wchar_t *shi501_netname; + DWORD shi501_type; + [string] wchar_t *shi501_remark; + DWORD shi501_flags; +} SHARE_INFO_501, *PSHARE_INFO_501, *LPSHARE_INFO_501; + +typedef struct _SHARE_INFO_501_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPSHARE_INFO_501 Buffer; +} SHARE_INFO_501_CONTAINER, *PSHARE_INFO_501_CONTAINER, *LPSHARE_INFO_501_CONTAINER; + +typedef struct _SHARE_INFO_502_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPSHARE_INFO_502_I Buffer; +} SHARE_INFO_502_CONTAINER, *PSHARE_INFO_502_CONTAINER, *LPSHARE_INFO_502_CONTAINER; + +typedef [switch_type(DWORD)] union _SHARE_ENUM_UNION +{ + [case(0)] SHARE_INFO_0_CONTAINER *Level0; + [case(1)] SHARE_INFO_1_CONTAINER *Level1; + [case(2)] SHARE_INFO_2_CONTAINER *Level2; + [case(501)] SHARE_INFO_501_CONTAINER *Level501; + [case(502)] SHARE_INFO_502_CONTAINER *Level502; + [case(503)] SHARE_INFO_503_CONTAINER *Level503; +} SHARE_ENUM_UNION; + +typedef struct _SHARE_ENUM_STRUCT +{ + DWORD Level; + [switch_is(Level)] SHARE_ENUM_UNION ShareInfo; +} SHARE_ENUM_STRUCT, *PSHARE_ENUM_STRUCT, *LPSHARE_ENUM_STRUCT; + +typedef struct _SHARE_INFO_1004 +{ + [string] wchar_t *shi1004_remark; +} SHARE_INFO_1004, *PSHARE_INFO_1004, *LPSHARE_INFO_1004; + +typedef struct _SHARE_INFO_1006 +{ + DWORD shi1006_max_uses; +} SHARE_INFO_1006, *PSHARE_INFO_1006, *LPSHARE_INFO_1006; + +typedef struct _SHARE_INFO_1005 +{ + DWORD shi1005_flags; +} SHARE_INFO_1005, *PSHARE_INFO_1005, *LPSHARE_INFO_1005; + +//JMP: order differs in documentation +typedef [switch_type(unsigned long)] union _SHARE_INFO +// for Get & Set info +{ + [case(0)] LPSHARE_INFO_0 ShareInfo0; + [case(1)] LPSHARE_INFO_1 ShareInfo1; + [case(2)] LPSHARE_INFO_2 ShareInfo2; + [case(502)] LPSHARE_INFO_502_I ShareInfo502; + [case(1004)] LPSHARE_INFO_1004 ShareInfo1004; + [case(1006)] LPSHARE_INFO_1006 ShareInfo1006; + [case(1501)] LPSHARE_INFO_1501_I ShareInfo1501; + [default] ; + [case(1005)] LPSHARE_INFO_1005 ShareInfo1005; + [case(501)] LPSHARE_INFO_501 ShareInfo501; + [case(503)] LPSHARE_INFO_503_I ShareInfo503; +} SHARE_INFO, *PSHARE_INFO, *LPSHARE_INFO; + +typedef struct _SERVER_INFO_100 +{ + DWORD sv100_platform_id; + [string] wchar_t *sv100_name; +} SERVER_INFO_100, *PSERVER_INFO_100, *LPSERVER_INFO_100; + +typedef struct _SERVER_INFO_101 +{ + DWORD sv101_platform_id; + [string] wchar_t *sv101_name; + DWORD sv101_version_major; + DWORD sv101_version_minor; + DWORD sv101_type; + [string] wchar_t *sv101_comment; +} SERVER_INFO_101, *PSERVER_INFO_101, *LPSERVER_INFO_101; + +typedef struct _SERVER_INFO_102 +{ + DWORD sv102_platform_id; + [string] wchar_t *sv102_name; + DWORD sv102_version_major; + DWORD sv102_version_minor; + DWORD sv102_type; + [string] wchar_t *sv102_comment; + DWORD sv102_users; + long sv102_disc; + int sv102_hidden; + DWORD sv102_announce; + DWORD sv102_anndelta; + DWORD sv102_licenses; + [string] wchar_t *sv102_userpath; +} SERVER_INFO_102, *PSERVER_INFO_102, *LPSERVER_INFO_102; + +typedef struct _SERVER_INFO_103 +{ + DWORD sv103_platform_id; + [string] wchar_t *sv103_name; + DWORD sv103_version_major; + DWORD sv103_version_minor; + DWORD sv103_type; + [string] wchar_t *sv103_comment; + DWORD sv103_users; + LONG sv103_disc; + BOOL sv103_hidden; + DWORD sv103_announce; + DWORD sv103_anndelta; + DWORD sv103_licenses; + [string] wchar_t* sv103_userpath; + DWORD sv103_capabilities; +} SERVER_INFO_103, *PSERVER_INFO_103, *LPSERVER_INFO_103; + +typedef struct _SERVER_INFO_502 +{ + DWORD sv502_sessopens; + DWORD sv502_sessvcs; + DWORD sv502_opensearch; + DWORD sv502_sizreqbuf; + DWORD sv502_initworkitems; + DWORD sv502_maxworkitems; + DWORD sv502_rawworkitems; + DWORD sv502_irpstacksize; + DWORD sv502_maxrawbuflen; + DWORD sv502_sessusers; + DWORD sv502_sessconns; + DWORD sv502_maxpagedmemoryusage; + DWORD sv502_maxnonpagedmemoryusage; + int sv502_enablesoftcompat; + int sv502_enableforcedlogoff; + int sv502_timesource; + int sv502_acceptdownlevelapis; + int sv502_lmannounce; +} SERVER_INFO_502, *PSERVER_INFO_502, *LPSERVER_INFO_502; + +typedef struct _SERVER_INFO_503 +{ + DWORD sv503_sessopens; + DWORD sv503_sessvcs; + DWORD sv503_opensearch; + DWORD sv503_sizreqbuf; + DWORD sv503_initworkitems; + DWORD sv503_maxworkitems; + DWORD sv503_rawworkitems; + DWORD sv503_irpstacksize; + DWORD sv503_maxrawbuflen; + DWORD sv503_sessusers; + DWORD sv503_sessconns; + DWORD sv503_maxpagedmemoryusage; + DWORD sv503_maxnonpagedmemoryusage; + int sv503_enablesoftcompat; + int sv503_enableforcedlogoff; + int sv503_timesource; + int sv503_acceptdownlevelapis; + int sv503_lmannounce; + [string] wchar_t *sv503_domain; + DWORD sv503_maxcopyreadlen; + DWORD sv503_maxcopywritelen; + DWORD sv503_minkeepsearch; + DWORD sv503_maxkeepsearch; + DWORD sv503_minkeepcomplsearch; + DWORD sv503_maxkeepcomplsearch; + DWORD sv503_threadcountadd; + DWORD sv503_numblockthreads; + DWORD sv503_scavtimeout; + DWORD sv503_minrcvqueue; + DWORD sv503_minfreeworkitems; + DWORD sv503_xactmemsize; + DWORD sv503_threadpriority; + DWORD sv503_maxmpxct; + DWORD sv503_oplockbreakwait; + DWORD sv503_oplockbreakresponsewait; + int sv503_enableoplocks; + int sv503_enableoplockforceclose; + int sv503_enablefcbopens; + int sv503_enableraw; + int sv503_enablesharednetdrives; + DWORD sv503_minfreeconnections; + DWORD sv503_maxfreeconnections; +} SERVER_INFO_503, *PSERVER_INFO_503, *LPSERVER_INFO_503; + +typedef struct _SERVER_INFO_599 +{ + DWORD sv599_sessopens; + DWORD sv599_sessvcs; + DWORD sv599_opensearch; + DWORD sv599_sizreqbuf; + DWORD sv599_initworkitems; + DWORD sv599_maxworkitems; + DWORD sv599_rawworkitems; + DWORD sv599_irpstacksize; + DWORD sv599_maxrawbuflen; + DWORD sv599_sessusers; + DWORD sv599_sessconns; + DWORD sv599_maxpagedmemoryusage; + DWORD sv599_maxnonpagedmemoryusage; + int sv599_enablesoftcompat; + int sv599_enableforcedlogoff; + int sv599_timesource; + int sv599_acceptdownlevelapis; + int sv599_lmannounce; + [string] wchar_t *sv599_domain; + DWORD sv599_maxcopyreadlen; + DWORD sv599_maxcopywritelen; + DWORD sv599_minkeepsearch; + DWORD sv599_maxkeepsearch; + DWORD sv599_minkeepcomplsearch; + DWORD sv599_maxkeepcomplsearch; + DWORD sv599_threadcountadd; + DWORD sv599_numblockthreads; + DWORD sv599_scavtimeout; + DWORD sv599_minrcvqueue; + DWORD sv599_minfreeworkitems; + DWORD sv599_xactmemsize; + DWORD sv599_threadpriority; + DWORD sv599_maxmpxct; + DWORD sv599_oplockbreakwait; + DWORD sv599_oplockbreakresponsewait; + int sv599_enableoplocks; + int sv599_enableoplockforceclose; + int sv599_enablefcbopens; + int sv599_enableraw; + int sv599_enablesharednetdrives; + DWORD sv599_minfreeconnections; + DWORD sv599_maxfreeconnections; + DWORD sv599_initsesstable; + DWORD sv599_initconntable; + DWORD sv599_initfiletable; + DWORD sv599_initsearchtable; + DWORD sv599_alertschedule; + DWORD sv599_errorthreshold; + DWORD sv599_networkerrorthreshold; + DWORD sv599_diskspacethreshold; + DWORD sv599_reserved; + DWORD sv599_maxlinkdelay; + DWORD sv599_minlinkthroughput; + DWORD sv599_linkinfovalidtime; + DWORD sv599_scavqosinfoupdatetime; + DWORD sv599_maxworkitemidletime; +} SERVER_INFO_599, *PSERVER_INFO_599, *LPSERVER_INFO_599; + +typedef struct _SERVER_INFO_1005 +{ + [string] wchar_t *sv1005_comment; +} SERVER_INFO_1005, *PSERVER_INFO_1005, *LPSERVER_INFO_1005; + +typedef struct _SERVER_INFO_1107 +{ + DWORD sv1107_users; +} SERVER_INFO_1107, *PSERVER_INFO_1107, *LPSERVER_INFO_1107; + +typedef struct _SERVER_INFO_1010 +{ + long sv1010_disc; +} SERVER_INFO_1010, *PSERVER_INFO_1010, *LPSERVER_INFO_1010; + +typedef struct _SERVER_INFO_1016 +{ + int sv1016_hidden; +} SERVER_INFO_1016, *PSERVER_INFO_1016, *LPSERVER_INFO_1016; + +typedef struct _SERVER_INFO_1017 +{ + DWORD sv1017_announce; +} SERVER_INFO_1017, *PSERVER_INFO_1017, *LPSERVER_INFO_1017; + +typedef struct _SERVER_INFO_1018 +{ + DWORD sv1018_anndelta; +} SERVER_INFO_1018, *PSERVER_INFO_1018, *LPSERVER_INFO_1018; + +typedef struct _SERVER_INFO_1501 +{ + DWORD sv1501_sessopens; +} SERVER_INFO_1501, *PSERVER_INFO_1501, *LPSERVER_INFO_1501; + +typedef struct _SERVER_INFO_1502 +{ + DWORD sv1502_sessvcs; +} SERVER_INFO_1502, *PSERVER_INFO_1502, *LPSERVER_INFO_1502; + +typedef struct _SERVER_INFO_1503 +{ + DWORD sv1503_opensearch; +} SERVER_INFO_1503, *PSERVER_INFO_1503, *LPSERVER_INFO_1503; + +typedef struct _SERVER_INFO_1506 +{ + DWORD sv1506_maxworkitems; +} SERVER_INFO_1506, *PSERVER_INFO_1506, *LPSERVER_INFO_1506; + +typedef struct _SERVER_INFO_1510 +{ + DWORD sv1510_sessusers; +} SERVER_INFO_1510, *PSERVER_INFO_1510, *LPSERVER_INFO_1510; + +typedef struct _SERVER_INFO_1511 +{ + DWORD sv1511_sessconns; +} SERVER_INFO_1511, *PSERVER_INFO_1511, *LPSERVER_INFO_1511; + +typedef struct _SERVER_INFO_1512 +{ + DWORD sv1512_maxnonpagedmemoryusage; +} SERVER_INFO_1512, *PSERVER_INFO_1512, *LPSERVER_INFO_1512; + +typedef struct _SERVER_INFO_1513 +{ + DWORD sv1513_maxpagedmemoryusage; +} SERVER_INFO_1513, *PSERVER_INFO_1513, *LPSERVER_INFO_1513; + +typedef struct _SERVER_INFO_1514 +{ + int sv1514_enablesoftcompat; +} SERVER_INFO_1514, *PSERVER_INFO_1514, *LPSERVER_INFO_1514; + +typedef struct _SERVER_INFO_1515 +{ + int sv1515_enableforcedlogoff; +} SERVER_INFO_1515, *PSERVER_INFO_1515, *LPSERVER_INFO_1515; + +typedef struct _SERVER_INFO_1516 +{ + int sv1516_timesource; +} SERVER_INFO_1516, *PSERVER_INFO_1516, *LPSERVER_INFO_1516; + +typedef struct _SERVER_INFO_1518 +{ + int sv1518_lmannounce; +} SERVER_INFO_1518, *PSERVER_INFO_1518, *LPSERVER_INFO_1518; + +typedef struct _SERVER_INFO_1523 +{ + DWORD sv1523_maxkeepsearch; +} SERVER_INFO_1523, *PSERVER_INFO_1523, *LPSERVER_INFO_1523; + +typedef struct _SERVER_INFO_1528 +{ + DWORD sv1528_scavtimeout; +} SERVER_INFO_1528, *PSERVER_INFO_1528, *LPSERVER_INFO_1528; + +typedef struct _SERVER_INFO_1529 +{ + DWORD sv1529_minrcvqueue; +} SERVER_INFO_1529, *PSERVER_INFO_1529, *LPSERVER_INFO_1529; + +typedef struct _SERVER_INFO_1530 +{ + DWORD sv1530_minfreeworkitems; +} SERVER_INFO_1530, *PSERVER_INFO_1530, *LPSERVER_INFO_1530; + +typedef struct _SERVER_INFO_1533 +{ + DWORD sv1533_maxmpxct; +} SERVER_INFO_1533, *PSERVER_INFO_1533, *LPSERVER_INFO_1533; + +typedef struct _SERVER_INFO_1534 +{ + DWORD sv1534_oplockbreakwait; +} SERVER_INFO_1534, *PSERVER_INFO_1534, *LPSERVER_INFO_1534; + +typedef struct _SERVER_INFO_1535 +{ + DWORD sv1535_oplockbreakresponsewait; +} SERVER_INFO_1535, *PSERVER_INFO_1535, *LPSERVER_INFO_1535; + +typedef struct _SERVER_INFO_1536 +{ + int sv1536_enableoplocks; +} SERVER_INFO_1536, *PSERVER_INFO_1536, *LPSERVER_INFO_1536; + +typedef struct _SERVER_INFO_1538 +{ + int sv1538_enablefcbopens; +} SERVER_INFO_1538, *PSERVER_INFO_1538, *LPSERVER_INFO_1538; + +typedef struct _SERVER_INFO_1539 +{ + int sv1539_enableraw; +} SERVER_INFO_1539, *PSERVER_INFO_1539, *LPSERVER_INFO_1539; + +typedef struct _SERVER_INFO_1540 +{ + int sv1540_enablesharednetdrives; +} SERVER_INFO_1540, *PSERVER_INFO_1540, *LPSERVER_INFO_1540; + +typedef struct _SERVER_INFO_1541 +{ + int sv1541_minfreeconnections; +} SERVER_INFO_1541, *PSERVER_INFO_1541, *LPSERVER_INFO_1541; + +typedef struct _SERVER_INFO_1542 +{ + int sv1542_maxfreeconnections; +} SERVER_INFO_1542, *PSERVER_INFO_1542, *LPSERVER_INFO_1542; + +typedef struct _SERVER_INFO_1543 +{ + DWORD sv1543_initsesstable; +} SERVER_INFO_1543, *PSERVER_INFO_1543, *LPSERVER_INFO_1543; + +typedef struct _SERVER_INFO_1544 +{ + DWORD sv1544_initconntable; +} SERVER_INFO_1544, *PSERVER_INFO_1544, *LPSERVER_INFO_1544; + +typedef struct _SERVER_INFO_1545 +{ + DWORD sv1545_initfiletable; +} SERVER_INFO_1545, *PSERVER_INFO_1545, *LPSERVER_INFO_1545; + +typedef struct _SERVER_INFO_1546 +{ + DWORD sv1546_initsearchtable; +} SERVER_INFO_1546, *PSERVER_INFO_1546, *LPSERVER_INFO_1546; + +typedef struct _SERVER_INFO_1547 +{ + DWORD sv1547_alertschedule; +} SERVER_INFO_1547, *PSERVER_INFO_1547, *LPSERVER_INFO_1547; + +typedef struct _SERVER_INFO_1548 +{ + DWORD sv1548_errorthreshold; +} SERVER_INFO_1548, *PSERVER_INFO_1548, *LPSERVER_INFO_1548; + +typedef struct _SERVER_INFO_1549 +{ + DWORD sv1549_networkerrorthreshold; +} SERVER_INFO_1549, *PSERVER_INFO_1549, *LPSERVER_INFO_1549; + +typedef struct _SERVER_INFO_1550 +{ + DWORD sv1550_diskspacethreshold; +} SERVER_INFO_1550, *PSERVER_INFO_1550, *LPSERVER_INFO_1550; + +typedef struct _SERVER_INFO_1552 +{ + DWORD sv1552_maxlinkdelay; +} SERVER_INFO_1552, *PSERVER_INFO_1552, *LPSERVER_INFO_1552; + +typedef struct _SERVER_INFO_1553 +{ + DWORD sv1553_minlinkthroughput; +} SERVER_INFO_1553, *PSERVER_INFO_1553, *LPSERVER_INFO_1553; + +typedef struct _SERVER_INFO_1554 +{ + DWORD sv1554_linkinfovalidtime; +} SERVER_INFO_1554, *PSERVER_INFO_1554, *LPSERVER_INFO_1554; + +typedef struct _SERVER_INFO_1555 +{ + DWORD sv1555_scavqosinfoupdatetime; +} SERVER_INFO_1555, *PSERVER_INFO_1555, *LPSERVER_INFO_1555; + +typedef struct _SERVER_INFO_1556 +{ + DWORD sv1556_maxworkitemidletime; +} SERVER_INFO_1556, *PSERVER_INFO_1556, *LPSERVER_INFO_1556; + +typedef [switch_type(unsigned long)] union _SERVER_INFO +{ + [case(100)] LPSERVER_INFO_100 ServerInfo100; + [case(101)] LPSERVER_INFO_101 ServerInfo101; + [case(102)] LPSERVER_INFO_102 ServerInfo102; + [case(103)] LPSERVER_INFO_103 ServerInfo103; + [case(502)] LPSERVER_INFO_502 ServerInfo502; + [case(503)] LPSERVER_INFO_503 ServerInfo503; + [case(599)] LPSERVER_INFO_599 ServerInfo599; + [case(1005)] LPSERVER_INFO_1005 ServerInfo1005; + [case(1107)] LPSERVER_INFO_1107 ServerInfo1107; + [case(1010)] LPSERVER_INFO_1010 ServerInfo1010; + [case(1016)] LPSERVER_INFO_1016 ServerInfo1016; + [case(1017)] LPSERVER_INFO_1017 ServerInfo1017; + [case(1018)] LPSERVER_INFO_1018 ServerInfo1018; + [case(1501)] LPSERVER_INFO_1501 ServerInfo1501; + [case(1502)] LPSERVER_INFO_1502 ServerInfo1502; + [case(1503)] LPSERVER_INFO_1503 ServerInfo1503; + [case(1506)] LPSERVER_INFO_1506 ServerInfo1506; + [case(1510)] LPSERVER_INFO_1510 ServerInfo1510; + [case(1511)] LPSERVER_INFO_1511 ServerInfo1511; + [case(1512)] LPSERVER_INFO_1512 ServerInfo1512; + [case(1513)] LPSERVER_INFO_1513 ServerInfo1513; + [case(1514)] LPSERVER_INFO_1514 ServerInfo1514; + [case(1515)] LPSERVER_INFO_1515 ServerInfo1515; + [case(1516)] LPSERVER_INFO_1516 ServerInfo1516; + [case(1518)] LPSERVER_INFO_1518 ServerInfo1518; + [case(1523)] LPSERVER_INFO_1523 ServerInfo1523; + [case(1528)] LPSERVER_INFO_1528 ServerInfo1528; + [case(1529)] LPSERVER_INFO_1529 ServerInfo1529; + [case(1530)] LPSERVER_INFO_1530 ServerInfo1530; + [case(1533)] LPSERVER_INFO_1533 ServerInfo1533; + [case(1534)] LPSERVER_INFO_1534 ServerInfo1534; + [case(1535)] LPSERVER_INFO_1535 ServerInfo1535; + [case(1536)] LPSERVER_INFO_1536 ServerInfo1536; + [case(1538)] LPSERVER_INFO_1538 ServerInfo1538; + [case(1539)] LPSERVER_INFO_1539 ServerInfo1539; + [case(1540)] LPSERVER_INFO_1540 ServerInfo1540; + [case(1541)] LPSERVER_INFO_1541 ServerInfo1541; + [case(1542)] LPSERVER_INFO_1542 ServerInfo1542; + [case(1543)] LPSERVER_INFO_1543 ServerInfo1543; + [case(1544)] LPSERVER_INFO_1544 ServerInfo1544; + [case(1545)] LPSERVER_INFO_1545 ServerInfo1545; + [case(1546)] LPSERVER_INFO_1546 ServerInfo1546; + [case(1547)] LPSERVER_INFO_1547 ServerInfo1547; + [case(1548)] LPSERVER_INFO_1548 ServerInfo1548; + [case(1549)] LPSERVER_INFO_1549 ServerInfo1549; + [case(1550)] LPSERVER_INFO_1550 ServerInfo1550; + [case(1552)] LPSERVER_INFO_1552 ServerInfo1552; + [case(1553)] LPSERVER_INFO_1553 ServerInfo1553; + [case(1554)] LPSERVER_INFO_1554 ServerInfo1554; + [case(1555)] LPSERVER_INFO_1555 ServerInfo1555; + [case(1556)] LPSERVER_INFO_1556 ServerInfo1556; +} SERVER_INFO, *PSERVER_INFO, *LPSERVER_INFO; + +typedef struct _DISK_INFO +{ + [string] WCHAR Disk[3]; +} DISK_INFO, *PDISK_INFO, *LPDISK_INFO; + +typedef struct _DISK_ENUM_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead), length_is(EntriesRead)] LPDISK_INFO Buffer; +} DISK_ENUM_CONTAINER; + +typedef struct _SERVER_TRANSPORT_INFO_0 +{ + DWORD svti0_numberofvcs; + [string] wchar_t *svti0_transportname; + [size_is(svti0_transportaddresslength)] unsigned char *svti0_transportaddress; + DWORD svti0_transportaddresslength; + [string] wchar_t *svti0_networkaddress; +} SERVER_TRANSPORT_INFO_0, *PSERVER_TRANSPORT_INFO_0, *LPSERVER_TRANSPORT_INFO_0; + +typedef struct _SERVER_XPORT_INFO_0_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPSERVER_TRANSPORT_INFO_0 Buffer; +} SERVER_XPORT_INFO_0_CONTAINER, *PSERVER_XPORT_INFO_0_CONTAINER; + +typedef struct _SERVER_TRANSPORT_INFO_1 +{ + DWORD svti1_numberofvcs; + [string] wchar_t *svti1_transportname; + [size_is(svti1_transportaddresslength)] unsigned char *svti1_transportaddress; + DWORD svti1_transportaddresslength; + [string] wchar_t *svti1_networkaddress; + [string] wchar_t *svti1_domain; +} SERVER_TRANSPORT_INFO_1, *PSERVER_TRANSPORT_INFO_1, *LPSERVER_TRANSPORT_INFO_1; + +typedef struct _SERVER_XPORT_INFO_1_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPSERVER_TRANSPORT_INFO_1 Buffer; +} SERVER_XPORT_INFO_1_CONTAINER, *PSERVER_XPORT_INFO_1_CONTAINER; + +typedef struct _SERVER_TRANSPORT_INFO_2 +{ + DWORD svti2_numberofvcs; + [string] wchar_t *svti2_transportname; + [size_is(svti2_transportaddresslength)] unsigned char *svti2_transportaddress; + DWORD svti2_transportaddresslength; + [string] wchar_t *svti2_networkaddress; + [string] wchar_t *svti2_domain; + unsigned long svti2_flags; +} SERVER_TRANSPORT_INFO_2, *PSERVER_TRANSPORT_INFO_2, *LPSERVER_TRANSPORT_INFO_2; + +typedef struct _SERVER_XPORT_INFO_2_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPSERVER_TRANSPORT_INFO_2 Buffer; +} SERVER_XPORT_INFO_2_CONTAINER, *PSERVER_XPORT_INFO_2_CONTAINER; + +typedef struct _SERVER_TRANSPORT_INFO_3 +{ + DWORD svti3_numberofvcs; + [string] wchar_t *svti3_transportname; + [size_is(svti3_transportaddresslength)] unsigned char *svti3_transportaddress; + DWORD svti3_transportaddresslength; + [string] wchar_t *svti3_networkaddress; + [string] wchar_t *svti3_domain; + unsigned long svti3_flags; + DWORD svti3_passwordlength; + unsigned char svti3_password[256]; +} SERVER_TRANSPORT_INFO_3, *PSERVER_TRANSPORT_INFO_3, *LPSERVER_TRANSPORT_INFO_3; + +typedef struct _SERVER_XPORT_INFO_3_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPSERVER_TRANSPORT_INFO_3 Buffer; +} SERVER_XPORT_INFO_3_CONTAINER, *PSERVER_XPORT_INFO_3_CONTAINER; + +typedef [switch_type(unsigned long)] union _TRANSPORT_INFO +{ + [case(0)] SERVER_TRANSPORT_INFO_0 Transport0; + [case(1)] SERVER_TRANSPORT_INFO_1 Transport1; + [case(2)] SERVER_TRANSPORT_INFO_2 Transport2; + [case(3)] SERVER_TRANSPORT_INFO_3 Transport3; +} TRANSPORT_INFO, *PTRANSPORT_INFO, *LPTRANSPORT_INFO; + +typedef [switch_type(DWORD)] union _SERVER_XPORT_ENUM_UNION +{ + [case(0)] PSERVER_XPORT_INFO_0_CONTAINER Level0; + [case(1)] PSERVER_XPORT_INFO_1_CONTAINER Level1; + [case(2)] PSERVER_XPORT_INFO_2_CONTAINER Level2; + [case(3)] PSERVER_XPORT_INFO_3_CONTAINER Level3; +} SERVER_XPORT_ENUM_UNION; + +typedef struct _SERVER_XPORT_ENUM_STRUCT +{ + DWORD Level; + [switch_is(Level)] SERVER_XPORT_ENUM_UNION XportInfo; +} SERVER_XPORT_ENUM_STRUCT, *PSERVER_XPORT_ENUM_STRUCT, *LPSERVER_XPORT_ENUM_STRUCT; + +typedef [context_handle] void *SHARE_DEL_HANDLE; +typedef SHARE_DEL_HANDLE *PSHARE_DEL_HANDLE; + +typedef struct _ADT_SECURITY_DESCRIPTOR +{ + DWORD Length; + [size_is(Length)] unsigned char *Buffer; +} ADT_SECURITY_DESCRIPTOR, *PADT_SECURITY_DESCRIPTOR; + +typedef struct _STAT_SERVER_0 +{ + DWORD sts0_start; + DWORD sts0_fopens; + DWORD sts0_devopens; + DWORD sts0_jobsqueued; + DWORD sts0_sopens; + DWORD sts0_stimedout; + DWORD sts0_serrorout; + DWORD sts0_pwerrors; + DWORD sts0_permerrors; + DWORD sts0_syserrors; + DWORD sts0_bytessent_low; + DWORD sts0_bytessent_high; + DWORD sts0_bytesrcvd_low; + DWORD sts0_bytesrcvd_high; + DWORD sts0_avresponse; + DWORD sts0_reqbufneed; + DWORD sts0_bigbufneed; +} STAT_SERVER_0, *PSTAT_SERVER_0, *LPSTAT_SERVER_0; + +typedef struct _TIME_OF_DAY_INFO +{ + DWORD tod_elapsedt; + DWORD tod_msecs; + DWORD tod_hours; + DWORD tod_mins; + DWORD tod_secs; + DWORD tod_hunds; + long tod_timezone; + DWORD tod_tinterval; + DWORD tod_day; + DWORD tod_month; + DWORD tod_year; + DWORD tod_weekday; +} TIME_OF_DAY_INFO, *PTIME_OF_DAY_INFO, *LPTIME_OF_DAY_INFO; + +typedef struct _NET_DFS_ENTRY_ID +{ + GUID Uid; + [string] WCHAR *Prefix; +} NET_DFS_ENTRY_ID, *LPNET_DFS_ENTRY_ID; + +typedef struct _NET_DFS_ENTRY_ID_CONTAINER +{ + unsigned long Count; + [size_is(Count)] LPNET_DFS_ENTRY_ID Buffer; +} NET_DFS_ENTRY_ID_CONTAINER, *LPNET_DFS_ENTRY_ID_CONTAINER; + +typedef struct _DFS_SITENAME_INFO +{ + unsigned long SiteFlags; + [string,unique] WCHAR *SiteName; +} DFS_SITENAME_INFO, *PDFS_SITENAME_INFO, *LPDFS_SITENAME_INFO; + +typedef struct _DFS_SITELIST_INFO +{ + unsigned long cSites; + [size_is(cSites)] DFS_SITENAME_INFO Site[]; +} DFS_SITELIST_INFO, *PDFS_SITELIST_INFO, *LPDFS_SITELIST_INFO; + +typedef struct _SERVER_ALIAS_INFO_0 +{ + [string] LMSTR srvai0_alias; + [string] LMSTR srvai0_target; + BOOLEAN srvai0_default; + ULONG srvai0_reserved; +}SERVER_ALIAS_INFO_0, *PSERVER_ALIAS_INFO_0, *LPSERVER_ALIAS_INFO_0; + +typedef struct _SERVER_ALIAS_INFO_0_CONTAINER +{ + DWORD EntriesRead; + [size_is(EntriesRead)] LPSERVER_ALIAS_INFO_0 Buffer; +} SERVER_ALIAS_INFO_0_CONTAINER; + +typedef struct _SERVER_ALIAS_ENUM_STRUCT +{ + DWORD Level; + [switch_is(Level)] union SERVER_ALIAS_ENUM_UNION + { + [case(0)] SERVER_ALIAS_INFO_0_CONTAINER *Level0; + } ServerAliasInfo; +} SERVER_ALIAS_ENUM_STRUCT, *PSERVER_ALIAS_ENUM_STRUCT, *LPSERVER_ALIAS_ENUM_STRUCT; + +typedef [switch_type(unsigned long)] union _SERVER_ALIAS_INFO +{ + [case(0)] LPSERVER_ALIAS_INFO_0 ServerAliasInfo0; +} SERVER_ALIAS_INFO, *PSERVER_ALIAS_INFO, *LPSERVER_ALIAS_INFO; + + +[ + uuid(4B324FC8-1670-01D3-1278-5A47BF6EE188), + version(3.0), +// ms_union, + pointer_default(unique), + endpoint("ncacn_np:[\\pipe\\srvsvc]") +#ifndef __midl + ,implicit_handle(handle_t hBinding) +#endif +] +interface srvsvc +{ + // This method not used on the wire + void + __stdcall + Opnum0NotUsedOnWire(void); + + // This method not used on the wire + void + __stdcall + Opnum1NotUsedOnWire(void); + + // This method not used on the wire + void + __stdcall + Opnum2NotUsedOnWire(void); + + // This method not used on the wire + void + __stdcall + Opnum3NotUsedOnWire(void); + + // This method not used on the wire + void + __stdcall + Opnum4NotUsedOnWire(void); + + // This method not used on the wire + void + __stdcall + Opnum5NotUsedOnWire(void); + + // This method not used on the wire + void + __stdcall + Opnum6NotUsedOnWire(void); + + // This method not used on the wire + void + __stdcall + Opnum7NotUsedOnWire(void); + + NET_API_STATUS + __stdcall + NetrConnectionEnum( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string, unique] WCHAR *Qualifier, + [in, out] LPCONNECT_ENUM_STRUCT InfoStruct, + [in] DWORD PreferedMaximumLength, + [out] DWORD *TotalEntries, + [in, out, unique] DWORD *ResumeHandle); + + NET_API_STATUS + __stdcall + NetrFileEnum( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string, unique] WCHAR *BasePath, + [in, string, unique] WCHAR *UserName, + [in, out] PFILE_ENUM_STRUCT InfoStruct, + [in] DWORD PreferedMaximumLength, + [out] DWORD *TotalEntries, + [in, out, unique] DWORD *ResumeHandle); + + NET_API_STATUS + __stdcall + NetrFileGetInfo( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in] DWORD FileId, + [in] DWORD Level, + [out, switch_is(Level)] LPFILE_INFO InfoStruct); + + NET_API_STATUS + __stdcall + NetrFileClose( + [in,string,unique] SRVSVC_HANDLE ServerName, + [in] DWORD FileId); + + NET_API_STATUS + __stdcall + NetrSessionEnum( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string, unique] WCHAR *ClientName, + [in, string, unique] WCHAR *UserName, + [in, out] PSESSION_ENUM_STRUCT InfoStruct, + [in] DWORD PreferedMaximumLength, + [out] DWORD *TotalEntries, + [in, out, unique] DWORD *ResumeHandle); + + NET_API_STATUS + __stdcall + NetrSessionDel( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string, unique] WCHAR *ClientName, + [in, string, unique] WCHAR *UserName); + + NET_API_STATUS + __stdcall + NetrShareAdd( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in] DWORD Level, + [in, switch_is(Level)] LPSHARE_INFO InfoStruct, + [in, out, unique] DWORD *ParmErr); + + NET_API_STATUS + __stdcall + NetrShareEnum( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, out] LPSHARE_ENUM_STRUCT InfoStruct, + [in] DWORD PreferedMaximumLength, + [out] DWORD *TotalEntries, + [in, out, unique] DWORD *ResumeHandle); + + NET_API_STATUS + __stdcall + NetrShareGetInfo( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string] WCHAR *NetName, + [in] DWORD Level, + [out, switch_is(Level)] LPSHARE_INFO InfoStruct); + + NET_API_STATUS + __stdcall + NetrShareSetInfo( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string] WCHAR *NetName, + [in] DWORD Level, + [in, switch_is(Level)] LPSHARE_INFO ShareInfo, + [in, out, unique] DWORD *ParmErr); + + NET_API_STATUS + __stdcall + NetrShareDel ( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string] WCHAR *NetName, + [in] DWORD Reserved); + + NET_API_STATUS + __stdcall + NetrShareDelSticky( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string] WCHAR *NetName, + [in] DWORD Reserved); + + NET_API_STATUS + __stdcall + NetrShareCheck( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string] WCHAR *Device, + [out] DWORD *Type); + + NET_API_STATUS + __stdcall + NetrServerGetInfo( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in] DWORD Level, + [out, switch_is(Level)] LPSERVER_INFO InfoStruct); + + NET_API_STATUS + __stdcall + NetrServerSetInfo( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in] DWORD Level, + [in, switch_is(Level)] LPSERVER_INFO ServerInfo, + [in, out, unique] DWORD *ParmErr); + + NET_API_STATUS + __stdcall + NetrServerDiskEnum( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in] DWORD Level, + [in, out] DISK_ENUM_CONTAINER *DiskInfoStruct, + [in] DWORD PreferedMaximumLength, + [out] DWORD *TotalEntries, + [in, out, unique] DWORD *ResumeHandle); + + NET_API_STATUS + __stdcall + NetrServerStatisticsGet( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string, unique] WCHAR *Service, + [in] DWORD Level, + [in] DWORD Options, + [out] LPSTAT_SERVER_0 *InfoStruct); + + NET_API_STATUS + __stdcall + NetrServerTransportAdd( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in] DWORD Level, + [in] LPSERVER_TRANSPORT_INFO_0 Buffer); + + NET_API_STATUS + __stdcall + NetrServerTransportEnum( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, out] LPSERVER_XPORT_ENUM_STRUCT InfoStruct, + [in] DWORD PreferedMaximumLength, + [out] DWORD *TotalEntries, + [in, out, unique] DWORD *ResumeHandle); + + NET_API_STATUS + __stdcall + NetrServerTransportDel( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in] DWORD Level, + [in] LPSERVER_TRANSPORT_INFO_0 Buffer); + + NET_API_STATUS + __stdcall + NetrRemoteTOD( + [in, string, unique] SRVSVC_HANDLE ServerName, + [out] LPTIME_OF_DAY_INFO *BufferPtr); + + // This method not used on the wire + void + __stdcall + Opnum29NotUsedOnWire(void); + + NET_API_STATUS + __stdcall + NetprPathType( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string] WCHAR *PathName, + [out] DWORD *PathType, + [in] DWORD Flags); + + NET_API_STATUS + __stdcall + NetprPathCanonicalize( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string] WCHAR *PathName, + [out, size_is(OutbufLen)] unsigned char *Outbuf, + [in, range(0, 64000)] DWORD OutbufLen, + [in, string] WCHAR *Prefix, + [in, out] DWORD *PathType, + [in] DWORD Flags); + + long + __stdcall + NetprPathCompare( + [in, string,unique] SRVSVC_HANDLE ServerName, + [in, string] WCHAR *PathName1, + [in, string] WCHAR *PathName2, + [in] DWORD PathType, + [in] DWORD Flags); + + NET_API_STATUS + __stdcall + NetprNameValidate( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string] WCHAR *Name, + [in] DWORD NameType, + [in] DWORD Flags); + + NET_API_STATUS + __stdcall + NetprNameCanonicalize( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string] WCHAR *Name, + [out, size_is(OutbufLen)] WCHAR *Outbuf, + [in, range(0, 64000)] DWORD OutbufLen, + [in] DWORD NameType, + [in] DWORD Flags); + + long + __stdcall + NetprNameCompare( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string] WCHAR *Name1, + [in, string] WCHAR *Name2, + [in] DWORD NameType, + [in] DWORD Flags); + + NET_API_STATUS + __stdcall + NetrShareEnumSticky( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, out] LPSHARE_ENUM_STRUCT InfoStruct, + [in] DWORD PreferedMaximumLength, + [out] DWORD *TotalEntries, + [in, out, unique] DWORD *ResumeHandle); + + NET_API_STATUS + __stdcall + NetrShareDelStart( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string] WCHAR *NetName, + [in] DWORD Reserved, + [out] PSHARE_DEL_HANDLE ContextHandle); + + NET_API_STATUS + __stdcall + NetrShareDelCommit( + [in, out] PSHARE_DEL_HANDLE ContextHandle); + + DWORD + __stdcall + NetrpGetFileSecurity( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string, unique] WCHAR *ShareName, + [in, string] WCHAR *lpFileName, + [in] SECURITY_INFORMATION RequestedInformation, + [out] PADT_SECURITY_DESCRIPTOR *SecurityDescriptor); + + DWORD + __stdcall + NetrpSetFileSecurity( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string, unique] WCHAR *ShareName, + [in, string] WCHAR *lpFileName, + [in] SECURITY_INFORMATION SecurityInformation, + [in] PADT_SECURITY_DESCRIPTOR SecurityDescriptor); + + NET_API_STATUS + __stdcall + NetrServerTransportAddEx( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in] DWORD Level, + [in, switch_is(Level)] LPTRANSPORT_INFO Buffer); + + // This method not used on the wire + void + __stdcall + Opnum42NotUsedOnWire(void); + + NET_API_STATUS + __stdcall + NetrDfsGetVersion( + [in, string, unique] SRVSVC_HANDLE ServerName, + [out] DWORD *Version); + + NET_API_STATUS + __stdcall + NetrDfsCreateLocalPartition( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string] WCHAR *ShareName, + [in] GUID *EntryUid, + [in, string] WCHAR *EntryPrefix, + [in, string] WCHAR *ShortName, + [in] LPNET_DFS_ENTRY_ID_CONTAINER RelationInfo, + [in] int Force); + + NET_API_STATUS + __stdcall + NetrDfsDeleteLocalPartition( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in] GUID *Uid, + [in, string] WCHAR *Prefix); + + NET_API_STATUS + __stdcall + NetrDfsSetLocalVolumeState( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in] GUID *Uid, + [in, string] WCHAR *Prefix, + [in] unsigned long State); + + // This method not used on the wire + void + __stdcall + Opnum47NotUsedOnWire(void); + + NET_API_STATUS + __stdcall + NetrDfsCreateExitPoint( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in] GUID *Uid, + [in, string] WCHAR *Prefix, + [in] unsigned long Type, + [in, range(0,32) ] DWORD ShortPrefixLen, + [out, size_is(ShortPrefixLen)] WCHAR *ShortPrefix); + + NET_API_STATUS + __stdcall + NetrDfsDeleteExitPoint( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in] GUID *Uid, + [in, string] WCHAR *Prefix, + [in] unsigned long Type); + + NET_API_STATUS + __stdcall + NetrDfsModifyPrefix( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in] GUID *Uid, + [in, string] WCHAR *Prefix); + + NET_API_STATUS + __stdcall + NetrDfsFixLocalVolume( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, string] WCHAR *VolumeName, + [in] unsigned long EntryType, + [in] unsigned long ServiceType, + [in, string] WCHAR *StgId, + [in] GUID *EntryUid, + [in, string] WCHAR *EntryPrefix, + [in] LPNET_DFS_ENTRY_ID_CONTAINER RelationInfo, + [in] unsigned long CreateDisposition); + + NET_API_STATUS + __stdcall + NetrDfsManagerReportSiteInfo( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in, out, unique] LPDFS_SITELIST_INFO *ppSiteInfo); + + NET_API_STATUS + __stdcall + NetrServerTransportDelEx( + [in, string, unique] SRVSVC_HANDLE ServerName, + [in] DWORD Level, + [in, switch_is(Level)] LPTRANSPORT_INFO Buffer); +} Propchange: trunk/reactos/include/reactos/idl/srvsvc.idl ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 5 months

[tkreuzer] 67195: [CRT] Refactor the code for __rt_div to allow reusing it for __rt_sdiv64 and __rt_udiv64 and implement those as asm wrappers around worker functions (due to the calling convention...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Apr 14 18:42:28 2015 New Revision: 67195 URL: http://svn.reactos.org/svn/reactos?rev=67195&view=rev Log: [CRT] Refactor the code for __rt_div to allow reusing it for __rt_sdiv64 and __rt_udiv64 and implement those as asm wrappers around worker functions (due to the calling convention they cannot be implemented fully in C) Added: trunk/reactos/lib/sdk/crt/math/arm/__rt_div_worker.h (with props) trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv.c (with props) trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv64_worker.c (with props) trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c (with props) trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv64_worker.c (with props) Modified: trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/libcntpr.cmake trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv64.s trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv64.s Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Tue Apr 14 18:42:28 2015 @@ -476,7 +476,10 @@ endif() elseif(ARCH STREQUAL "arm") list(APPEND LIBCNTPR_SOURCE - math/arm/__rt_div.c + math/arm/__rt_sdiv.c + math/arm/__rt_sdiv64_worker.c + math/arm/__rt_udiv.c + math/arm/__rt_udiv64_worker.c ) list(APPEND CRT_ASM_SOURCE math/arm/floor.s Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Tue Apr 14 18:42:28 2015 @@ -135,7 +135,10 @@ math/sin.c) elseif(ARCH STREQUAL "arm") list(APPEND LIBCNTPR_SOURCE - math/arm/__rt_div.c + math/arm/__rt_sdiv.c + math/arm/__rt_sdiv64_worker.c + math/arm/__rt_udiv.c + math/arm/__rt_udiv64_worker.c ) list(APPEND LIBCNTPR_ASM_SOURCE math/arm/floor.s Added: trunk/reactos/lib/sdk/crt/math/arm/__rt_div_worker.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_div_worker.h (added) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_div_worker.h [iso-8859-1] Tue Apr 14 18:42:28 2015 @@ -0,0 +1,116 @@ +/* + * COPYRIGHT: BSD, see COPYING.ARM in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/math/arm/__rt_udiv.c + * PURPOSE: Implementation of __rt_udiv + * PROGRAMMER: Timo Kreuzer + * REFERENCE: http://research.microsoft.com/pubs/70645/tr-2008-141.pdf + * http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… + * http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… + */ + +#ifdef _USE_64_BITS_ +typedef unsigned long long UINT3264; +typedef long long INT3264; +#define _CountLeadingZeros _CountLeadingZeros64 +#else +typedef unsigned int UINT3264; +typedef int INT3264; +#endif + +__forceinline +void +__brkdiv0(void) +{ + __emit(0xDEF9); +} + +typedef struct _ARM_DIVRESULT +{ + UINT3264 quotient; /* to be returned in R0 */ + UINT3264 modulus; /* to be returned in R1 */ +} ARM_DIVRESULT; + +#ifndef _USE_64_BITS_ +__forceinline +#endif +void +__rt_div_worker( + ARM_DIVRESULT *result, + UINT3264 divisor, + UINT3264 dividend) +{ + UINT3264 shift; + UINT3264 mask; + UINT3264 quotient; +#ifdef _SIGNED_DIV_ + int dividend_sign; + int divisor_sign; +#endif // _SIGNED_DIV_ + + if (divisor == 0) + { + /* Raise divide by zero error */ + __brkdiv0(); + } + +#ifdef _SIGNED_DIV_ + if ((INT3264)dividend < 0) + { + dividend_sign = 1; + dividend = -(INT3264)dividend; + } + + if ((INT3264)divisor < 0) + { + divisor_sign = 1; + divisor = -(INT3264)divisor; + } +#endif // _SIGNED_DIV_ + + if (divisor > dividend) + { + result->quotient = 0; + result->modulus = divisor; + return; + } + + /* Get the difference in count of leading zeros between dividend and divisor */ + shift = _CountLeadingZeros(divisor); + shift -= _CountLeadingZeros(dividend); + + /* Shift the divisor to the left, so that it's highest bit is the same + as the highest bit of the dividend */ + divisor <<= shift; + + mask = (UINT3264)1 << shift; + + quotient = 0; + do + { + if (dividend >= divisor) + { + quotient |= mask; + dividend -= divisor; + } + divisor >>= 1; + mask >>= 1; + } + while (mask); + +#ifdef _SIGNED_DIV_ + if (dividend_sign ^ divisor_sign) + { + quotient = -(INT3264)quotient; + } + + if (dividend_sign) + { + dividend = -(INT3264)dividend; + } +#endif // _SIGNED_DIV_ + + result->quotient = quotient; + result->modulus = dividend; + return; +} Propchange: trunk/reactos/lib/sdk/crt/math/arm/__rt_div_worker.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv.c (added) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv.c [iso-8859-1] Tue Apr 14 18:42:28 2015 @@ -0,0 +1,26 @@ +/* + * COPYRIGHT: BSD, see COPYING.ARM in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/math/arm/__rt_sdiv.c + * PURPOSE: Implementation of __rt_sdiv + * PROGRAMMER: Timo Kreuzer + * REFERENCE: http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… + * http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… + */ + +#define __rt_div_worker __rt_sdiv_worker +#define _SIGNED_DIV_ + +#include "__rt_div_worker.h" + +ARM_DIVRESULT +__rt_sdiv( + int divisor, + int dividend) +{ + ARM_DIVRESULT result; + + __rt_sdiv_worker(&result, divisor, dividend); + return result; +} + Propchange: trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv64.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv64.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv64.s [iso-8859-1] Tue Apr 14 18:42:28 2015 @@ -9,12 +9,28 @@ #include <kxarm.h> + IMPORT __rt_sdiv64_worker + /* CODE **********************************************************************/ TEXTAREA - LEAF_ENTRY __rt_sdiv64 + NESTED_ENTRY __rt_sdiv64 - LEAF_END __rt_sdiv64 + /* Allocate stack space and store parameters there */ + stmdb sp!,{r0,r1,r2,r3,lr} + PROLOG_END + + /* Load pointer to stack structure into R0 */ + mov r0, sp + + /* Call the C worker function */ + adr lr, Return + b __rt_sdiv64_worker + +Return + /* Move result data into the appropriate registers and return */ + ldmia sp!,{r0,r1,r2,r3,pc} + ENTRY_END __rt_sdiv64 END /* EOF */ Added: trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv64_worker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv64_worker.c (added) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv64_worker.c [iso-8859-1] Tue Apr 14 18:42:28 2015 @@ -0,0 +1,17 @@ +/* + * COPYRIGHT: BSD, see COPYING.ARM in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/math/arm/__rt_sdiv_worker.c + * PURPOSE: Implementation of __rt_sdiv_worker + * PROGRAMMER: Timo Kreuzer + * REFERENCE: http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… + * http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… + */ + +#define __rt_div_worker __rt_sdiv64_worker +#define _SIGNED_DIV_ +#define _USE_64_BITS_ + +#include "__rt_div_worker.h" + +/* __rt_sdiv64 is implemented in __rt_sdiv64.s */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/__rt_sdiv64_worker.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c (added) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c [iso-8859-1] Tue Apr 14 18:42:28 2015 @@ -0,0 +1,25 @@ +/* + * COPYRIGHT: BSD, see COPYING.ARM in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/math/arm/__rt_udiv.c + * PURPOSE: Implementation of __rt_udiv + * PROGRAMMER: Timo Kreuzer + * REFERENCE: http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… + * http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… + */ + +#define __rt_div_worker __rt_udiv_worker + +#include "__rt_div_worker.h" + +ARM_DIVRESULT +__rt_udiv( + unsigned int divisor, + unsigned int dividend) +{ + ARM_DIVRESULT result; + + __rt_udiv_worker(&result, divisor, dividend); + return result; +} + Propchange: trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv64.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv64.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv64.s [iso-8859-1] Tue Apr 14 18:42:28 2015 @@ -9,12 +9,28 @@ #include <kxarm.h> + IMPORT __rt_udiv64_worker + /* CODE **********************************************************************/ TEXTAREA - LEAF_ENTRY __rt_udiv64 + NESTED_ENTRY __rt_udiv64 - LEAF_END __rt_udiv64 + /* Allocate stack space and store parameters there */ + stmdb sp!,{r0,r1,r2,r3,lr} + PROLOG_END + + /* Load pointer to stack structure into R0 */ + mov r0, sp + + /* Call the C worker function */ + adr lr, Return + b __rt_udiv64_worker + +Return + /* Move result data into the appropriate registers and return */ + ldmia sp!,{r0,r1,r2,r3,pc} + ENTRY_END __rt_udiv64 END /* EOF */ Added: trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv64_worker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/arm/__rt_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv64_worker.c (added) +++ trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv64_worker.c [iso-8859-1] Tue Apr 14 18:42:28 2015 @@ -0,0 +1,16 @@ +/* + * COPYRIGHT: BSD, see COPYING.ARM in the top level directory + * PROJECT: ReactOS crt library + * FILE: lib/sdk/crt/math/arm/__rt_udiv64_worker.c + * PURPOSE: Implementation of __rt_udiv64_worker + * PROGRAMMER: Timo Kreuzer + * REFERENCE: http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… + * http://research.microsoft.com/en-us/um/redmond/projects/invisible/src/crt/m… + */ + +#define __rt_div_worker __rt_udiv64_worker +#define _USE_64_BITS_ + +#include "__rt_div_worker.h" + +/* __rt_udiv64 is implemented in __rt_udiv64.s */ Propchange: trunk/reactos/lib/sdk/crt/math/arm/__rt_udiv64_worker.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 5 months

← Newer
1
...
26
27
28
29
30
31
32
...
49
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 April 2015