Ros-diffs

ros-diffs@reactos.org

81390 discussions

[winesync] 26077: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: winesync Date: Wed Mar 14 15:55:03 2007 New Revision: 26077 URL: http://svn.reactos.org/svn/reactos?rev=26077&view=rev Log: Autosyncing with Wine HEAD Modified: trunk/reactos/dll/win32/advpack/advpack.c trunk/reactos/dll/win32/advpack/advpack_private.h trunk/reactos/dll/win32/advpack/files.c trunk/reactos/dll/win32/advpack/install.c trunk/reactos/dll/win32/advpack/reg.c trunk/reactos/include/psdk/advpub.h Modified: trunk/reactos/dll/win32/advpack/advpack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack.… ============================================================================== --- trunk/reactos/dll/win32/advpack/advpack.c (original) +++ trunk/reactos/dll/win32/advpack/advpack.c Wed Mar 14 15:55:03 2007 @@ -191,7 +191,7 @@ */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); if (fdwReason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls(hinstDLL); @@ -220,7 +220,7 @@ HANDLE hToken; PSID pSid; - TRACE("(%ld, %p)\n", reserved, pReserved); + TRACE("(%d, %p)\n", reserved, pReserved); if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) return FALSE; @@ -302,7 +302,7 @@ */ BOOL WINAPI NeedReboot(DWORD dwRebootCheck) { - FIXME("(%ld): stub\n", dwRebootCheck); + FIXME("(%d): stub\n", dwRebootCheck); return FALSE; } @@ -317,7 +317,7 @@ UNICODE_STRING filenameW, installW; HRESULT res; - TRACE("(%s, %s, %ld, %p, %p)\n", debugstr_a(pszInfFilename), + TRACE("(%s, %s, %d, %p, %p)\n", debugstr_a(pszInfFilename), debugstr_a(pszInstallSection), dwFlags, phInf, pvReserved); if (!pszInfFilename || !phInf) @@ -355,7 +355,7 @@ HRESULT WINAPI OpenINFEngineW(LPCWSTR pszInfFilename, LPCWSTR pszInstallSection, DWORD dwFlags, HINF *phInf, PVOID pvReserved) { - TRACE("(%s, %s, %ld, %p, %p)\n", debugstr_w(pszInfFilename), + TRACE("(%s, %s, %d, %p, %p)\n", debugstr_w(pszInfFilename), debugstr_w(pszInstallSection), dwFlags, phInf, pvReserved); if (!pszInfFilename || !phInf) @@ -376,12 +376,12 @@ * See RebootCheckOnInstallW. */ HRESULT WINAPI RebootCheckOnInstallA(HWND hWnd, LPCSTR pszINF, - LPSTR pszSec, DWORD dwReserved) + LPCSTR pszSec, DWORD dwReserved) { UNICODE_STRING infW, secW; HRESULT res; - TRACE("(%p, %s, %s, %ld)\n", hWnd, debugstr_a(pszINF), + TRACE("(%p, %s, %s, %d)\n", hWnd, debugstr_a(pszINF), debugstr_a(pszSec), dwReserved); if (!pszINF || !pszSec) @@ -422,9 +422,9 @@ * Unimplemented. */ HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF, - LPWSTR pszSec, DWORD dwReserved) -{ - FIXME("(%p, %s, %s, %ld): stub\n", hWnd, debugstr_w(pszINF), + LPCWSTR pszSec, DWORD dwReserved) +{ + FIXME("(%p, %s, %s, %d): stub\n", hWnd, debugstr_w(pszINF), debugstr_w(pszSec), dwReserved); return E_FAIL; @@ -635,7 +635,7 @@ HRESULT res; DWORD len = 0; - TRACE("(%s, %s, %s, %s, %p, %ld, %p, %p)\n", + TRACE("(%s, %s, %s, %s, %p, %d, %p, %p)\n", debugstr_a(pszInfFilename), debugstr_a(pszInstallSection), debugstr_a(pszTranslateSection), debugstr_a(pszTranslateKey), pszBuffer, dwBufferSize,pdwRequiredSize, pvReserved); @@ -710,8 +710,9 @@ DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved) { HINF hInf; - - TRACE("(%s, %s, %s, %s, %p, %ld, %p, %p)\n", + HRESULT hret = S_OK; + + TRACE("(%s, %s, %s, %s, %p, %d, %p, %p)\n", debugstr_w(pszInfFilename), debugstr_w(pszInstallSection), debugstr_w(pszTranslateSection), debugstr_w(pszTranslateKey), pszBuffer, dwBufferSize,pdwRequiredSize, pvReserved); @@ -730,13 +731,13 @@ pszBuffer, dwBufferSize, pdwRequiredSize)) { if (dwBufferSize < *pdwRequiredSize) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); - - return SPAPI_E_LINE_NOT_FOUND; + hret = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + else + hret = SPAPI_E_LINE_NOT_FOUND; } SetupCloseInfFile(hInf); - return S_OK; + return hret; } /*********************************************************************** @@ -754,7 +755,7 @@ HRESULT res; DWORD len = 0; - TRACE("(%p, %s, %s, %s, %s, %ld, %p, %p)\n", hInf, debugstr_a(pszInfFilename), + TRACE("(%p, %s, %s, %s, %s, %d, %p, %p)\n", hInf, debugstr_a(pszInfFilename), debugstr_a(pszTranslateSection), debugstr_a(pszTranslateKey), debugstr_a(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved); @@ -834,7 +835,7 @@ LPWSTR pszBuffer, DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved) { - TRACE("(%p, %s, %s, %s, %s, %ld, %p, %p)\n", hInf, debugstr_w(pszInfFilename), + TRACE("(%p, %s, %s, %s, %s, %d, %p, %p)\n", hInf, debugstr_w(pszInfFilename), debugstr_w(pszTranslateSection), debugstr_w(pszTranslateKey), debugstr_w(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved); Modified: trunk/reactos/dll/win32/advpack/advpack_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/advpack_… ============================================================================== --- trunk/reactos/dll/win32/advpack/advpack_private.h (original) +++ trunk/reactos/dll/win32/advpack/advpack_private.h Wed Mar 14 15:55:03 2007 @@ -26,6 +26,5 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir); HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE); -HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg); #endif /* __ADVPACK_PRIVATE_H */ Modified: trunk/reactos/dll/win32/advpack/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/files.c?… ============================================================================== --- trunk/reactos/dll/win32/advpack/files.c (original) +++ trunk/reactos/dll/win32/advpack/files.c Wed Mar 14 15:55:03 2007 @@ -59,10 +59,11 @@ LPCSTR lpcszBaseName, DWORD dwFlags) { UNICODE_STRING backupdir, basename; - LPWSTR filelist, backup; + LPWSTR filelist; + LPCWSTR backup; HRESULT res; - TRACE("(%s, %s, %s, %ld)\n", debugstr_a(lpcszFileList), + TRACE("(%s, %s, %s, %d)\n", debugstr_a(lpcszFileList), debugstr_a(lpcszBackupDir), debugstr_a(lpcszBaseName), dwFlags); if (lpcszFileList) @@ -126,7 +127,7 @@ static const WCHAR ini[] = {'.','i','n','i',0}; static const WCHAR backup[] = {'b','a','c','k','u','p',0}; - TRACE("(%s, %s, %s, %ld)\n", debugstr_w(lpcszFileList), + TRACE("(%s, %s, %s, %d)\n", debugstr_w(lpcszFileList), debugstr_w(lpcszBackupDir), debugstr_w(lpcszBaseName), dwFlags); if (!lpcszFileList || !*lpcszFileList) @@ -164,14 +165,14 @@ /* FIXME: this is only for the local case, X:\ */ #define ROOT_LENGTH 3 -UINT CALLBACK pQuietQueueCallback(PVOID Context, UINT Notification, - UINT_PTR Param1, UINT_PTR Param2) +static UINT CALLBACK pQuietQueueCallback(PVOID Context, UINT Notification, + UINT_PTR Param1, UINT_PTR Param2) { return 1; } -UINT CALLBACK pQueueCallback(PVOID Context, UINT Notification, - UINT_PTR Param1, UINT_PTR Param2) +static UINT CALLBACK pQueueCallback(PVOID Context, UINT Notification, + UINT_PTR Param1, UINT_PTR Param2) { /* only be verbose for error notifications */ if (!Notification || @@ -199,7 +200,7 @@ UNICODE_STRING destdir, destfile; HRESULT res; - TRACE("(%p, %s, %s, %s, %s, %ld, %ld)\n", hwnd, debugstr_a(lpszSourceDir), + TRACE("(%p, %s, %s, %s, %s, %d, %d)\n", hwnd, debugstr_a(lpszSourceDir), debugstr_a(lpszSourceFile), debugstr_a(lpszDestDir), debugstr_a(lpszDestFile), dwFlags, dwReserved); @@ -256,7 +257,7 @@ HSPFILEQ fileQueue; PVOID pContext; - TRACE("(%p, %s, %s, %s, %s, %ld, %ld)\n", hwnd, debugstr_w(lpszSourceDir), + TRACE("(%p, %s, %s, %s, %s, %d, %d)\n", hwnd, debugstr_w(lpszSourceDir), debugstr_w(lpszSourceFile), debugstr_w(lpszDestDir), debugstr_w(lpszDestFile), dwFlags, dwReserved); @@ -403,7 +404,7 @@ UNICODE_STRING fileordirname; HRESULT res; - TRACE("(%s, %ld)\n", debugstr_a(pszFileOrDirName), dwFlags); + TRACE("(%s, %d)\n", debugstr_a(pszFileOrDirName), dwFlags); RtlCreateUnicodeStringFromAsciiz(&fileordirname, pszFileOrDirName); @@ -437,7 +438,7 @@ WCHAR fname[MAX_PATH]; HRESULT ret = E_FAIL; - TRACE("(%s, %ld)\n", debugstr_w(pszFileOrDirName), dwFlags); + TRACE("(%s, %d)\n", debugstr_w(pszFileOrDirName), dwFlags); if (dwFlags) FIXME("Flags ignored!\n"); @@ -572,7 +573,10 @@ /* empty list */ if (!lstrlenA(szConvertedList)) + { + HeapFree(GetProcessHeap(), 0, szConvertedList); return NULL; + } *dwNumFiles = 1; @@ -599,7 +603,7 @@ } /* determines whether szFile is in the NULL-separated szFileList */ -static BOOL file_in_list(LPSTR szFile, LPSTR szFileList) +static BOOL file_in_list(LPCSTR szFile, LPCSTR szFileList) { DWORD dwLen = lstrlenA(szFile); DWORD dwTestLen; @@ -623,7 +627,7 @@ /* removes nodes from the linked list that aren't specified in szFileList * returns the number of files that are in both the linked list and szFileList */ -static DWORD fill_file_list(EXTRACTdest *extractDest, LPCSTR szCabName, LPSTR szFileList) +static DWORD fill_file_list(EXTRACTdest *extractDest, LPCSTR szCabName, LPCSTR szFileList) { DWORD dwNumFound = 0; struct ExtractFileList *pNode; @@ -698,7 +702,7 @@ DWORD dwFilesFound = 0; LPSTR szConvertedList = NULL; - TRACE("(%s, %s, %ld, %s, %p, %ld)\n", debugstr_a(CabName), debugstr_a(ExpandDir), + TRACE("(%s, %s, %d, %s, %p, %d)\n", debugstr_a(CabName), debugstr_a(ExpandDir), Flags, debugstr_a(FileList), LReserved, Reserved); if (!CabName || !ExpandDir) @@ -742,6 +746,19 @@ extractDest.flags |= EXTRACT_EXTRACTFILES; res = pExtract(&extractDest, CabName); + + if (extractDest.filelist) + { + struct ExtractFileList* curr = extractDest.filelist; + struct ExtractFileList* next; + + while (curr) + { + next = curr->next; + free_file_node(curr); + curr = next; + } + } done: FreeLibrary(hCabinet); @@ -797,7 +814,7 @@ UNICODE_STRING filelist, dir, basename; HRESULT hr; - TRACE("(%p, %s, %s, %s, %ld)\n", hDlg, debugstr_a(pszFileList), + TRACE("(%p, %s, %s, %s, %d)\n", hDlg, debugstr_a(pszFileList), debugstr_a(pszDir), debugstr_a(pszBaseName), dwFlags); RtlCreateUnicodeStringFromAsciiz(&filelist, pszFileList); @@ -839,7 +856,7 @@ HRESULT WINAPI FileSaveRestoreW(HWND hDlg, LPWSTR pszFileList, LPWSTR pszDir, LPWSTR pszBaseName, DWORD dwFlags) { - FIXME("(%p, %s, %s, %s, %ld) stub\n", hDlg, debugstr_w(pszFileList), + FIXME("(%p, %s, %s, %s, %d) stub\n", hDlg, debugstr_w(pszFileList), debugstr_w(pszDir), debugstr_w(pszBaseName), dwFlags); return E_FAIL; @@ -858,7 +875,7 @@ UNICODE_STRING backupdir, backupfile; HRESULT hr; - TRACE("(%p, %s, %s, %s, %s, %s, %ld)\n", hWnd, debugstr_a(pszTitle), + TRACE("(%p, %s, %s, %s, %s, %s, %d)\n", hWnd, debugstr_a(pszTitle), debugstr_a(pszINF), debugstr_a(pszSection), debugstr_a(pszBackupDir), debugstr_a(pszBaseBackupFile), dwFlags); @@ -907,7 +924,7 @@ LPCWSTR pszSection, LPCWSTR pszBackupDir, LPCWSTR pszBaseBackupFile, DWORD dwFlags) { - FIXME("(%p, %s, %s, %s, %s, %s, %ld): stub\n", hWnd, debugstr_w(pszTitle), + FIXME("(%p, %s, %s, %s, %s, %s, %d): stub\n", hWnd, debugstr_w(pszTitle), debugstr_w(pszINF), debugstr_w(pszSection), debugstr_w(pszBackupDir), debugstr_w(pszBaseBackupFile), dwFlags); Modified: trunk/reactos/dll/win32/advpack/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/install.… ============================================================================== --- trunk/reactos/dll/win32/advpack/install.c (original) +++ trunk/reactos/dll/win32/advpack/install.c Wed Mar 14 15:55:03 2007 @@ -214,14 +214,14 @@ return token; } -static BOOL is_full_path(LPWSTR path) +static BOOL is_full_path(LPCWSTR path) { const int MIN_PATH_LEN = 3; if (!path || lstrlenW(path) < MIN_PATH_LEN) return FALSE; - if (path[1] == ':' || (path[0] == '\\' && path[1] == '\\')) + if ((path[1] == ':' && path[2] == '\\') || (path[0] == '\\' && path[1] == '\\')) return TRUE; return FALSE; @@ -229,7 +229,7 @@ /* retrieves the contents of a field, dynamically growing the buffer if necessary */ static WCHAR *get_field_string(INFCONTEXT *context, DWORD index, WCHAR *buffer, - WCHAR *static_buffer, DWORD *size) + const WCHAR *static_buffer, DWORD *size) { DWORD required; @@ -425,8 +425,8 @@ } /* loads the INF file and performs checks on it */ -HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, - LPCWSTR working_dir, DWORD flags, ADVInfo *info) +static HRESULT install_init(LPCWSTR inf_filename, LPCWSTR install_sec, + LPCWSTR working_dir, DWORD flags, ADVInfo *info) { DWORD len; HRESULT hr; @@ -500,7 +500,7 @@ } /* release the install instance information */ -void install_release(ADVInfo *info) +static void install_release(ADVInfo *info) { if (info->hinf && info->hinf != INVALID_HANDLE_VALUE) SetupCloseInfFile(info->hinf); @@ -833,7 +833,7 @@ LPWSTR cmdline_copy, cmdline_ptr; LPWSTR flags, ptr; CABINFOW cabinfo; - HRESULT hr = S_OK; + HRESULT hr; TRACE("(%p, %p, %s, %d)\n", hWnd, hInst, debugstr_w(cmdline), show); @@ -853,22 +853,26 @@ if (flags) cabinfo.dwFlags = atolW(flags); + if (!is_full_path(cabinfo.pszCab) && !is_full_path(cabinfo.pszInf)) + { + HeapFree(GetProcessHeap(), 0, cmdline_copy); + return E_INVALIDARG; + } + /* get the source path from the cab filename */ if (cabinfo.pszCab && *cabinfo.pszCab) { if (!is_full_path(cabinfo.pszCab)) - goto done; - - lstrcpyW(cabinfo.szSrcPath, cabinfo.pszCab); + lstrcpyW(cabinfo.szSrcPath, cabinfo.pszInf); + else + lstrcpyW(cabinfo.szSrcPath, cabinfo.pszCab); + ptr = strrchrW(cabinfo.szSrcPath, '\\'); *(++ptr) = '\0'; } hr = ExecuteCabW(hWnd, &cabinfo, NULL); - -done: HeapFree(GetProcessHeap(), 0, cmdline_copy); - return SUCCEEDED(hr) ? ADV_SUCCESS : ADV_FAILURE; } @@ -919,7 +923,7 @@ UNICODE_STRING dir, title; HRESULT hr; - TRACE("(%p, %s, %s, %s, %s, %p, %ld, %p)\n", + TRACE("(%p, %s, %s, %s, %s, %p, %d, %p)\n", hWnd, debugstr_a(szCmdName), debugstr_a(szInfSection), debugstr_a(szDir), debugstr_a(lpszTitle), phEXE, dwFlags, pvReserved); @@ -976,7 +980,7 @@ ADVInfo info; HRESULT hr; - TRACE("(%p, %s, %s, %s, %s, %p, %ld, %p)\n", + TRACE("(%p, %s, %s, %s, %s, %p, %d, %p)\n", hWnd, debugstr_w(szCmdName), debugstr_w(szInfSection), debugstr_w(szDir), debugstr_w(lpszTitle), phEXE, dwFlags, pvReserved); Modified: trunk/reactos/dll/win32/advpack/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/reg.c?re… ============================================================================== --- trunk/reactos/dll/win32/advpack/reg.c (original) +++ trunk/reactos/dll/win32/advpack/reg.c Wed Mar 14 15:55:03 2007 @@ -98,7 +98,7 @@ return FALSE; } -static void strentry_atow(STRENTRYA *aentry, STRENTRYW *wentry) +static void strentry_atow(const STRENTRYA *aentry, STRENTRYW *wentry) { DWORD name_len, val_len; @@ -171,7 +171,7 @@ return hr; } -static HRESULT write_predefined_strings(HMODULE hm, LPWSTR ini_path) +static HRESULT write_predefined_strings(HMODULE hm, LPCWSTR ini_path) { WCHAR mod_path[MAX_PATH + 2]; WCHAR sys_mod_path[MAX_PATH + 2]; @@ -324,7 +324,7 @@ UNICODE_STRING title, root, subkey, value; HRESULT hr; - TRACE("(%p, %s, %p, %s, %s, %s, %ld)\n", hWnd, debugstr_a(pszTitleString), + TRACE("(%p, %s, %p, %s, %s, %s, %d)\n", hWnd, debugstr_a(pszTitleString), hkBackupKey, debugstr_a(pcszRootKey), debugstr_a(pcszSubKey), debugstr_a(pcszValueName), dwFlags); @@ -369,7 +369,7 @@ LPCWSTR pcszRootKey, LPCWSTR pcszSubKey, LPCWSTR pcszValueName, DWORD dwFlags) { - FIXME("(%p, %s, %p, %s, %s, %s, %ld): stub\n", hWnd, debugstr_w(pszTitleString), + FIXME("(%p, %s, %p, %s, %s, %s, %d): stub\n", hWnd, debugstr_w(pszTitleString), hkBackupKey, debugstr_w(pcszRootKey), debugstr_w(pcszSubKey), debugstr_w(pcszValueName), dwFlags); @@ -388,7 +388,7 @@ UNICODE_STRING title, inf, section; HRESULT hr; - TRACE("(%p, %s, %s, %s, %p, %p, %ld)\n", hWnd, debugstr_a(pszTitle), + TRACE("(%p, %s, %s, %s, %p, %p, %d)\n", hWnd, debugstr_a(pszTitle), debugstr_a(pszINF), debugstr_a(pszSection), hHKLMBackKey, hHKCUBackKey, dwFlags); @@ -431,7 +431,7 @@ LPCWSTR pszSection, HKEY hHKLMBackKey, HKEY hHKCUBackKey, DWORD dwFlags) { - FIXME("(%p, %s, %s, %s, %p, %p, %ld): stub\n", hWnd, debugstr_w(pszTitle), + FIXME("(%p, %s, %s, %s, %p, %p, %d): stub\n", hWnd, debugstr_w(pszTitle), debugstr_w(pszINF), debugstr_w(pszSection), hHKLMBackKey, hHKCUBackKey, dwFlags); Modified: trunk/reactos/include/psdk/advpub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/advpub.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/advpub.h (original) +++ trunk/reactos/include/psdk/advpub.h Wed Mar 14 15:55:03 2007 @@ -223,8 +223,8 @@ HRESULT WINAPI OpenINFEngineW(LPCWSTR pszInfFilename, LPCWSTR pszInstallSection, DWORD dwFlags, HINF *phInf, PVOID pvReserved); #define OpenINFEngine WINELIB_NAME_AW(OpenINFEngine) -HRESULT WINAPI RebootCheckOnInstallA(HWND hWnd, LPCSTR pszINF, LPSTR pszSec, DWORD dwReserved); -HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF, LPWSTR pszSec, DWORD dwReserved); +HRESULT WINAPI RebootCheckOnInstallA(HWND hWnd, LPCSTR pszINF, LPCSTR pszSec, DWORD dwReserved); +HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF, LPCWSTR pszSec, DWORD dwReserved); #define RebootCheckOnInstall WINELIB_NAME_AW(RebootCheckOnInstall) HRESULT WINAPI RegInstallA(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); HRESULT WINAPI RegInstallW(HMODULE hm, LPCWSTR pszSection, const STRTABLEW* pstTable);

1 0

[winesync] 26076: Autosyncing with Wine HEAD
by winesync＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: winesync Date: Wed Mar 14 15:48:32 2007 New Revision: 26076 URL: http://svn.reactos.org/svn/reactos?rev=26076&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/odbccp32/odbccp32.c (with props) trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild (with props) trunk/reactos/dll/win32/odbccp32/odbccp32.spec (with props) Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=260… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Wed Mar 14 15:48:32 2007 @@ -94,6 +94,7 @@ <property name="BASEADDRESS_LSASRV" value="0x76540000" /> <property name="BASEADDRESS_MIDIMAP" value="0x76600000" /> <property name="BASEADDRESS_ODBC32" value="0x76660000" /> + <property name="BASEADDRESS_ODBCCP32" value="0x76380000" /> <property name="BASEADDRESS_WAVEMAP" value="0x76610000" /> <property name="BASEADDRESS_MPR" value="0x76620000" /> <property name="BASEADDRESS_SETUPAPI" value="0x76660000" /> Added: trunk/reactos/dll/win32/odbccp32/odbccp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.c (added) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.c Wed Mar 14 15:48:32 2007 @@ -1,0 +1,974 @@ +/* + * Implementation of the ODBC driver installer + * + * Copyright 2005 Mike McCormack for CodeWeavers + * Copyright 2005 Hans Leidekker + * Copyright 2007 Bill Medland + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <stdarg.h> + +#define COBJMACROS +#define NONAMELESSUNION + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winnls.h" +#include "wine/debug.h" + +#include "odbcinst.h" + +WINE_DEFAULT_DEBUG_CHANNEL(odbc); + +/* Registry key names */ +static const WCHAR drivers_key[] = {'S','o','f','t','w','a','r','e','\\','O','D','B','C','\\','O','D','B','C','I','N','S','T','.','I','N','I','\\','O','D','B','C',' ','D','r','i','v','e','r','s',0}; + +/* This config mode is known to be process-wide. + * MSDN documentation suggests that the value is hidden somewhere in the registry but I haven't found it yet. + * Although both the registry and the ODBC.ini files appear to be maintained together they are not maintained automatically through the registry's IniFileMapping. + */ +static UWORD config_mode = ODBC_BOTH_DSN; + +/* MSDN documentation suggests that the error subsystem handles errors 1 to 8 + * only and experimentation (Windows 2000) shows that the errors are process- + * wide so go for the simple solution; static arrays. + */ +static int num_errors; +static int error_code[8]; +static const WCHAR *error_msg[8]; +static const WCHAR odbc_error_general_err[] = {'G','e','n','e','r','a','l',' ','e','r','r','o','r',0}; +static const WCHAR odbc_error_invalid_buff_len[] = {'I','n','v','a','l','i','d',' ','b','u','f','f','e','r',' ','l','e','n','g','t','h',0}; +static const WCHAR odbc_error_component_not_found[] = {'C','o','m','p','o','n','e','n','t',' ','n','o','t',' ','f','o','u','n','d',0}; +static const WCHAR odbc_error_out_of_mem[] = {'O','u','t',' ','o','f',' ','m','e','m','o','r','y',0}; +static const WCHAR odbc_error_invalid_param_sequence[] = {'I','n','v','a','l','i','d',' ','p','a','r','a','m','e','t','e','r',' ','s','e','q','u','e','n','c','e',0}; + +/* Push an error onto the error stack, taking care of ranges etc. */ +static void push_error(int code, LPCWSTR msg) +{ + if (num_errors < sizeof error_code/sizeof error_code[0]) + { + error_code[num_errors] = code; + error_msg[num_errors] = msg; + num_errors++; + } +} + +/* Clear the error stack */ +static void clear_errors(void) +{ + num_errors = 0; +} + +BOOL WINAPI ODBCCPlApplet( LONG i, LONG j, LONG * p1, LONG * p2) +{ + clear_errors(); + FIXME( "( %d %d %p %p) : stub!\n", i, j, p1, p2); + return FALSE; +} + +static LPWSTR SQLInstall_strdup_multi(LPCSTR str) +{ + LPCSTR p; + LPWSTR ret = NULL; + DWORD len; + + if (!str) + return ret; + + for (p = str; *p; p += lstrlenA(p) + 1) + ; + + len = MultiByteToWideChar(CP_ACP, 0, str, p - str, NULL, 0 ); + ret = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, p - str, ret, len ); + ret[len] = 0; + + return ret; +} + +static LPWSTR SQLInstall_strdup(LPCSTR str) +{ + DWORD len; + LPWSTR ret = NULL; + + if (!str) + return ret; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0 ); + ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len ); + + return ret; +} + +/* Convert the wide string or zero-length-terminated list of wide strings to a + * narrow string or zero-length-terminated list of narrow strings. + * Do not try to emulate windows undocumented excesses (e.g. adding a third \0 + * to a list) + * Arguments + * mode Indicates the sort of string. + * 1 denotes that the buffers contain strings terminated by a single nul + * character + * 2 denotes that the buffers contain zero-length-terminated lists + * (frequently erroneously referred to as double-null-terminated) + * buffer The narrow-character buffer into which to place the result. This + * must be a non-null pointer to the first element of a buffer whose + * length is passed in buffer_length. + * str The wide-character buffer containing the string or list of strings to + * be converted. str_length defines how many wide characters in the + * buffer are to be converted, including all desired terminating nul + * characters. + * str_length Effective length of str + * buffer_length Length of buffer + * returned_length A pointer to a variable that will receive the number of + * narrow characters placed into the buffer. This pointer + * may be NULL. + */ +static BOOL SQLInstall_narrow(int mode, LPSTR buffer, LPCWSTR str, WORD str_length, WORD buffer_length, WORD *returned_length) +{ + LPSTR pbuf; /* allows us to allocate a temporary buffer only if needed */ + int len; /* Length of the converted list */ + BOOL success = FALSE; + assert(mode == 1 || mode == 2); + assert(buffer_length); + len = WideCharToMultiByte(CP_ACP, 0, str, str_length, 0, 0, NULL, NULL); + if (len > 0) + { + if (len > buffer_length) + { + pbuf = HeapAlloc(GetProcessHeap(), 0, len); + } + else + { + pbuf = buffer; + } + len = WideCharToMultiByte(CP_ACP, 0, str, str_length, pbuf, len, NULL, NULL); + if (len > 0) + { + if (pbuf != buffer) + { + if (buffer_length > (mode - 1)) + { + memcpy (buffer, pbuf, buffer_length-mode); + *(buffer+buffer_length-mode) = '\0'; + } + *(buffer+buffer_length-1) = '\0'; + } + if (returned_length) + { + *returned_length = pbuf == buffer ? len : buffer_length; + } + success = TRUE; + } + else + { + ERR("transferring wide to narrow\n"); + } + if (pbuf != buffer) + { + HeapFree(GetProcessHeap(), 0, pbuf); + } + } + else + { + ERR("measuring wide to narrow\n"); + } + return success; +} + +BOOL WINAPI SQLConfigDataSourceW(HWND hwndParent, WORD fRequest, + LPCWSTR lpszDriver, LPCWSTR lpszAttributes) +{ + LPCWSTR p; + + clear_errors(); + FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_w(lpszDriver), + debugstr_w(lpszAttributes)); + + for (p = lpszAttributes; *p; p += lstrlenW(p) + 1) + FIXME("%s\n", debugstr_w(p)); + + return TRUE; +} + +BOOL WINAPI SQLConfigDataSource(HWND hwndParent, WORD fRequest, + LPCSTR lpszDriver, LPCSTR lpszAttributes) +{ + FIXME("%p %d %s %s\n", hwndParent, fRequest, debugstr_a(lpszDriver), + debugstr_a(lpszAttributes)); + clear_errors(); + return TRUE; +} + +BOOL WINAPI SQLConfigDriverW(HWND hwndParent, WORD fRequest, LPCWSTR lpszDriver, + LPCWSTR lpszArgs, LPWSTR lpszMsg, WORD cbMsgMax, WORD *pcbMsgOut) +{ + clear_errors(); + FIXME("(%p %d %s %s %p %d %p)\n", hwndParent, fRequest, debugstr_w(lpszDriver), + debugstr_w(lpszArgs), lpszMsg, cbMsgMax, pcbMsgOut); + return TRUE; +} + +BOOL WINAPI SQLConfigDriver(HWND hwndParent, WORD fRequest, LPCSTR lpszDriver, + LPCSTR lpszArgs, LPSTR lpszMsg, WORD cbMsgMax, WORD *pcbMsgOut) +{ + clear_errors(); + FIXME("(%p %d %s %s %p %d %p)\n", hwndParent, fRequest, debugstr_a(lpszDriver), + debugstr_a(lpszArgs), lpszMsg, cbMsgMax, pcbMsgOut); + return TRUE; +} + +BOOL WINAPI SQLCreateDataSourceW(HWND hwnd, LPCWSTR lpszDS) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLCreateDataSource(HWND hwnd, LPCSTR lpszDS) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLGetAvailableDriversW(LPCWSTR lpszInfFile, LPWSTR lpszBuf, + WORD cbBufMax, WORD *pcbBufOut) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLGetAvailableDrivers(LPCSTR lpszInfFile, LPSTR lpszBuf, + WORD cbBufMax, WORD *pcbBufOut) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLGetConfigMode(UWORD *pwConfigMode) +{ + clear_errors(); + if (pwConfigMode) + *pwConfigMode = config_mode; + return TRUE; +} + +/* This is implemented sensibly rather than according to exact conformance to Microsoft's buggy implementations + * e.g. The Microsoft one occasionally actually adds a third nul character (possibly beyond the buffer). + * e.g. If the key has no drivers then version 3.525.1117.0 does not modify the buffer at all, not even a nul character. + */ +BOOL WINAPI SQLGetInstalledDriversW(LPWSTR lpszBuf, WORD cbBufMax, + WORD *pcbBufOut) +{ + HKEY hDrivers; /* Registry handle to the Drivers key */ + LONG reg_ret; /* Return code from registry functions */ + BOOL success = FALSE; /* The value we will return */ + + clear_errors(); + if (!lpszBuf || cbBufMax == 0) + { + push_error(ODBC_ERROR_INVALID_BUFF_LEN, odbc_error_invalid_buff_len); + } + else if ((reg_ret = RegOpenKeyExW (HKEY_LOCAL_MACHINE /* The drivers does not depend on the config mode */, + drivers_key, 0, KEY_READ /* Maybe overkill */, + &hDrivers)) == ERROR_SUCCESS) + { + DWORD index = 0; + cbBufMax--; + success = TRUE; + while (cbBufMax > 0) + { + DWORD size_name; + size_name = cbBufMax; + if ((reg_ret = RegEnumValueW(hDrivers, index, lpszBuf, &size_name, NULL, NULL, NULL, NULL)) == ERROR_SUCCESS) + { + index++; + assert (size_name < cbBufMax && *(lpszBuf + size_name) == 0); + size_name++; + cbBufMax-= size_name; + lpszBuf+=size_name; + } + else + { + if (reg_ret != ERROR_NO_MORE_ITEMS) + { + success = FALSE; + push_error(ODBC_ERROR_GENERAL_ERR, odbc_error_general_err); + } + break; + } + } + *lpszBuf = 0; + if ((reg_ret = RegCloseKey (hDrivers)) != ERROR_SUCCESS) + TRACE ("Error %d closing ODBC Drivers key\n", reg_ret); + } + else + { + /* MSDN states that it returns failure with COMPONENT_NOT_FOUND in this case. + * Version 3.525.1117.0 (Windows 2000) does not; it actually returns success. + * I doubt if it will actually be an issue. + */ + push_error(ODBC_ERROR_COMPONENT_NOT_FOUND, odbc_error_component_not_found); + } + return success; +} + +BOOL WINAPI SQLGetInstalledDrivers(LPSTR lpszBuf, WORD cbBufMax, + WORD *pcbBufOut) +{ + BOOL ret; + int size_wbuf = cbBufMax; + LPWSTR wbuf; + WORD size_used; + wbuf = HeapAlloc(GetProcessHeap(), 0, size_wbuf*sizeof(WCHAR)); + if (wbuf) + { + ret = SQLGetInstalledDriversW(wbuf, size_wbuf, &size_used); + if (ret) + { + if (!(ret = SQLInstall_narrow(2, lpszBuf, wbuf, size_used, cbBufMax, pcbBufOut))) + { + push_error(ODBC_ERROR_GENERAL_ERR, odbc_error_general_err); + } + } + HeapFree(GetProcessHeap(), 0, wbuf); + /* ignore failure; we have achieved the aim */ + } + else + { + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + ret = FALSE; + } + return ret; +} + +int WINAPI SQLGetPrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry, + LPCWSTR lpszDefault, LPCWSTR RetBuffer, int cbRetBuffer, + LPCWSTR lpszFilename) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +int WINAPI SQLGetPrivateProfileString(LPCSTR lpszSection, LPCSTR lpszEntry, + LPCSTR lpszDefault, LPCSTR RetBuffer, int cbRetBuffer, + LPCSTR lpszFilename) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLGetTranslatorW(HWND hwndParent, LPWSTR lpszName, WORD cbNameMax, + WORD *pcbNameOut, LPWSTR lpszPath, WORD cbPathMax, + WORD *pcbPathOut, DWORD *pvOption) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLGetTranslator(HWND hwndParent, LPSTR lpszName, WORD cbNameMax, + WORD *pcbNameOut, LPSTR lpszPath, WORD cbPathMax, + WORD *pcbPathOut, DWORD *pvOption) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLInstallDriverW(LPCWSTR lpszInfFile, LPCWSTR lpszDriver, + LPWSTR lpszPath, WORD cbPathMax, WORD * pcbPathOut) +{ + DWORD usage; + + clear_errors(); + TRACE("%s %s %p %d %p\n", debugstr_w(lpszInfFile), + debugstr_w(lpszDriver), lpszPath, cbPathMax, pcbPathOut); + + if (lpszInfFile) + return FALSE; + + return SQLInstallDriverExW(lpszDriver, NULL, lpszPath, cbPathMax, + pcbPathOut, ODBC_INSTALL_COMPLETE, &usage); +} + +BOOL WINAPI SQLInstallDriver(LPCSTR lpszInfFile, LPCSTR lpszDriver, + LPSTR lpszPath, WORD cbPathMax, WORD * pcbPathOut) +{ + DWORD usage; + + clear_errors(); + TRACE("%s %s %p %d %p\n", debugstr_a(lpszInfFile), + debugstr_a(lpszDriver), lpszPath, cbPathMax, pcbPathOut); + + if (lpszInfFile) + return FALSE; + + return SQLInstallDriverEx(lpszDriver, NULL, lpszPath, cbPathMax, + pcbPathOut, ODBC_INSTALL_COMPLETE, &usage); +} + +BOOL WINAPI SQLInstallDriverExW(LPCWSTR lpszDriver, LPCWSTR lpszPathIn, + LPWSTR lpszPathOut, WORD cbPathOutMax, WORD *pcbPathOut, + WORD fRequest, LPDWORD lpdwUsageCount) +{ + UINT len; + LPCWSTR p; + WCHAR path[MAX_PATH]; + + clear_errors(); + TRACE("%s %s %p %d %p %d %p\n", debugstr_w(lpszDriver), + debugstr_w(lpszPathIn), lpszPathOut, cbPathOutMax, pcbPathOut, + fRequest, lpdwUsageCount); + + for (p = lpszDriver; *p; p += lstrlenW(p) + 1) + TRACE("%s\n", debugstr_w(p)); + + len = GetSystemDirectoryW(path, MAX_PATH); + + if (pcbPathOut) + *pcbPathOut = len; + + len = GetSystemDirectoryW(path, MAX_PATH); + + if (lpszPathOut && cbPathOutMax > len) + { + lstrcpyW(lpszPathOut, path); + return TRUE; + } + return FALSE; +} + +BOOL WINAPI SQLInstallDriverEx(LPCSTR lpszDriver, LPCSTR lpszPathIn, + LPSTR lpszPathOut, WORD cbPathOutMax, WORD *pcbPathOut, + WORD fRequest, LPDWORD lpdwUsageCount) +{ + LPCSTR p; + LPWSTR driver, pathin; + WCHAR pathout[MAX_PATH]; + BOOL ret; + WORD cbOut = 0; + + clear_errors(); + TRACE("%s %s %p %d %p %d %p\n", debugstr_a(lpszDriver), + debugstr_a(lpszPathIn), lpszPathOut, cbPathOutMax, pcbPathOut, + fRequest, lpdwUsageCount); + + for (p = lpszDriver; *p; p += lstrlenA(p) + 1) + TRACE("%s\n", debugstr_a(p)); + + driver = SQLInstall_strdup_multi(lpszDriver); + pathin = SQLInstall_strdup(lpszPathIn); + + ret = SQLInstallDriverExW(driver, pathin, pathout, MAX_PATH, &cbOut, + fRequest, lpdwUsageCount); + if (ret) + { + int len = WideCharToMultiByte(CP_ACP, 0, pathout, -1, lpszPathOut, + 0, NULL, NULL); + if (len) + { + if (pcbPathOut) + *pcbPathOut = len - 1; + + if (!lpszPathOut || cbPathOutMax < len) + { + ret = FALSE; + goto out; + } + len = WideCharToMultiByte(CP_ACP, 0, pathout, -1, lpszPathOut, + cbPathOutMax, NULL, NULL); + } + } + +out: + HeapFree(GetProcessHeap(), 0, driver); + HeapFree(GetProcessHeap(), 0, pathin); + return ret; +} + +BOOL WINAPI SQLInstallDriverManagerW(LPWSTR lpszPath, WORD cbPathMax, + WORD *pcbPathOut) +{ + UINT len; + WCHAR path[MAX_PATH]; + + clear_errors(); + TRACE("(%p %d %d)\n", lpszPath, cbPathMax, *pcbPathOut); + + len = GetSystemDirectoryW(path, MAX_PATH); + + if (pcbPathOut) + *pcbPathOut = len; + + if (lpszPath && cbPathMax > len) + { + lstrcpyW(lpszPath, path); + return TRUE; + } + return FALSE; +} + +BOOL WINAPI SQLInstallDriverManager(LPSTR lpszPath, WORD cbPathMax, + WORD *pcbPathOut) +{ + BOOL ret; + WORD len, cbOut = 0; + WCHAR path[MAX_PATH]; + + clear_errors(); + TRACE("(%p %d %d)\n", lpszPath, cbPathMax, *pcbPathOut); + + ret = SQLInstallDriverManagerW(path, MAX_PATH, &cbOut); + if (ret) + { + len = WideCharToMultiByte(CP_ACP, 0, path, -1, lpszPath, 0, + NULL, NULL); + if (len) + { + if (pcbPathOut) + *pcbPathOut = len - 1; + + if (!lpszPath || cbPathMax < len) + return FALSE; + + len = WideCharToMultiByte(CP_ACP, 0, path, -1, lpszPath, + cbPathMax, NULL, NULL); + } + } + return ret; +} + +BOOL WINAPI SQLInstallODBCW(HWND hwndParent, LPCWSTR lpszInfFile, + LPCWSTR lpszSrcPath, LPCWSTR lpszDrivers) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLInstallODBC(HWND hwndParent, LPCSTR lpszInfFile, + LPCSTR lpszSrcPath, LPCSTR lpszDrivers) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +SQLRETURN WINAPI SQLInstallerErrorW(WORD iError, DWORD *pfErrorCode, + LPWSTR lpszErrorMsg, WORD cbErrorMsgMax, WORD *pcbErrorMsg) +{ + TRACE("%d %p %p %d %p\n", iError, pfErrorCode, lpszErrorMsg, + cbErrorMsgMax, pcbErrorMsg); + + if (iError == 0) + { + return SQL_ERROR; + } + else if (iError <= num_errors) + { + BOOL truncated = FALSE; + WORD len; + LPCWSTR msg; + iError--; + if (pfErrorCode) + *pfErrorCode = error_code[iError]; + msg = error_msg[iError]; + len = msg ? lstrlenW(msg) : 0; + if (pcbErrorMsg) + *pcbErrorMsg = len; + len++; + if (cbErrorMsgMax < len) + { + len = cbErrorMsgMax; + truncated = TRUE; + } + if (lpszErrorMsg && len) + { + if (msg) + { + memcpy (lpszErrorMsg, msg, len * sizeof(WCHAR)); + } + else + { + assert(len==1); + *lpszErrorMsg = 0; + } + } + else + { + /* Yes. If you pass a null pointer and a large length it is not an error! */ + truncated = TRUE; + } + + return truncated ? SQL_SUCCESS_WITH_INFO : SQL_SUCCESS; + } + + /* At least on Windows 2000 , the buffers are not altered in this case. However that is a little too dangerous a test for just now */ + if (pcbErrorMsg) + *pcbErrorMsg = 0; + + if (lpszErrorMsg && cbErrorMsgMax > 0) + *lpszErrorMsg = '\0'; + + return SQL_NO_DATA; +} + +SQLRETURN WINAPI SQLInstallerError(WORD iError, DWORD *pfErrorCode, + LPSTR lpszErrorMsg, WORD cbErrorMsgMax, WORD *pcbErrorMsg) +{ + SQLRETURN ret; + LPWSTR wbuf; + WORD cbwbuf; + TRACE("%d %p %p %d %p\n", iError, pfErrorCode, lpszErrorMsg, + cbErrorMsgMax, pcbErrorMsg); + + wbuf = 0; + if (lpszErrorMsg && cbErrorMsgMax) + { + wbuf = HeapAlloc(GetProcessHeap(), 0, cbErrorMsgMax*sizeof(WCHAR)); + if (!wbuf) + return SQL_ERROR; + } + ret = SQLInstallerErrorW(iError, pfErrorCode, wbuf, cbErrorMsgMax, &cbwbuf); + if (wbuf) + { + WORD cbBuf = 0; + SQLInstall_narrow(1, lpszErrorMsg, wbuf, cbwbuf+1, cbErrorMsgMax, &cbBuf); + HeapFree(GetProcessHeap(), 0, wbuf); + if (pcbErrorMsg) + *pcbErrorMsg = cbBuf-1; + } + return ret; +} + +BOOL WINAPI SQLInstallTranslatorExW(LPCWSTR lpszTranslator, LPCWSTR lpszPathIn, + LPWSTR lpszPathOut, WORD cbPathOutMax, WORD *pcbPathOut, + WORD fRequest, LPDWORD lpdwUsageCount) +{ + UINT len; + LPCWSTR p; + WCHAR path[MAX_PATH]; + + clear_errors(); + TRACE("%s %s %p %d %p %d %p\n", debugstr_w(lpszTranslator), + debugstr_w(lpszPathIn), lpszPathOut, cbPathOutMax, pcbPathOut, + fRequest, lpdwUsageCount); + + for (p = lpszTranslator; *p; p += lstrlenW(p) + 1) + TRACE("%s\n", debugstr_w(p)); + + len = GetSystemDirectoryW(path, MAX_PATH); + + if (pcbPathOut) + *pcbPathOut = len; + + if (lpszPathOut && cbPathOutMax > len) + { + lstrcpyW(lpszPathOut, path); + return TRUE; + } + return FALSE; +} + +BOOL WINAPI SQLInstallTranslatorEx(LPCSTR lpszTranslator, LPCSTR lpszPathIn, + LPSTR lpszPathOut, WORD cbPathOutMax, WORD *pcbPathOut, + WORD fRequest, LPDWORD lpdwUsageCount) +{ + LPCSTR p; + LPWSTR translator, pathin; + WCHAR pathout[MAX_PATH]; + BOOL ret; + WORD cbOut = 0; + + clear_errors(); + TRACE("%s %s %p %d %p %d %p\n", debugstr_a(lpszTranslator), + debugstr_a(lpszPathIn), lpszPathOut, cbPathOutMax, pcbPathOut, + fRequest, lpdwUsageCount); + + for (p = lpszTranslator; *p; p += lstrlenA(p) + 1) + TRACE("%s\n", debugstr_a(p)); + + translator = SQLInstall_strdup_multi(lpszTranslator); + pathin = SQLInstall_strdup(lpszPathIn); + + ret = SQLInstallTranslatorExW(translator, pathin, pathout, MAX_PATH, + &cbOut, fRequest, lpdwUsageCount); + if (ret) + { + int len = WideCharToMultiByte(CP_ACP, 0, pathout, -1, lpszPathOut, + 0, NULL, NULL); + if (len) + { + if (pcbPathOut) + *pcbPathOut = len - 1; + + if (!lpszPathOut || cbPathOutMax < len) + { + ret = FALSE; + goto out; + } + len = WideCharToMultiByte(CP_ACP, 0, pathout, -1, lpszPathOut, + cbPathOutMax, NULL, NULL); + } + } + +out: + HeapFree(GetProcessHeap(), 0, translator); + HeapFree(GetProcessHeap(), 0, pathin); + return ret; +} + +BOOL WINAPI SQLInstallTranslator(LPCSTR lpszInfFile, LPCSTR lpszTranslator, + LPCSTR lpszPathIn, LPSTR lpszPathOut, WORD cbPathOutMax, + WORD *pcbPathOut, WORD fRequest, LPDWORD lpdwUsageCount) +{ + clear_errors(); + TRACE("%s %s %s %p %d %p %d %p\n", debugstr_a(lpszInfFile), + debugstr_a(lpszTranslator), debugstr_a(lpszPathIn), lpszPathOut, + cbPathOutMax, pcbPathOut, fRequest, lpdwUsageCount); + + if (lpszInfFile) + return FALSE; + + return SQLInstallTranslatorEx(lpszTranslator, lpszPathIn, lpszPathOut, + cbPathOutMax, pcbPathOut, fRequest, lpdwUsageCount); +} + +BOOL WINAPI SQLInstallTranslatorW(LPCWSTR lpszInfFile, LPCWSTR lpszTranslator, + LPCWSTR lpszPathIn, LPWSTR lpszPathOut, WORD cbPathOutMax, + WORD *pcbPathOut, WORD fRequest, LPDWORD lpdwUsageCount) +{ + clear_errors(); + TRACE("%s %s %s %p %d %p %d %p\n", debugstr_w(lpszInfFile), + debugstr_w(lpszTranslator), debugstr_w(lpszPathIn), lpszPathOut, + cbPathOutMax, pcbPathOut, fRequest, lpdwUsageCount); + + if (lpszInfFile) + return FALSE; + + return SQLInstallTranslatorExW(lpszTranslator, lpszPathIn, lpszPathOut, + cbPathOutMax, pcbPathOut, fRequest, lpdwUsageCount); +} + +BOOL WINAPI SQLManageDataSources(HWND hwnd) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +SQLRETURN WINAPI SQLPostInstallerErrorW(DWORD fErrorCode, LPCWSTR szErrorMsg) +{ + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +SQLRETURN WINAPI SQLPostInstallerError(DWORD fErrorCode, LPCSTR szErrorMsg) +{ + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLReadFileDSNW(LPCWSTR lpszFileName, LPCWSTR lpszAppName, + LPCWSTR lpszKeyName, LPWSTR lpszString, WORD cbString, + WORD *pcbString) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLReadFileDSN(LPCSTR lpszFileName, LPCSTR lpszAppName, + LPCSTR lpszKeyName, LPSTR lpszString, WORD cbString, + WORD *pcbString) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLRemoveDefaultDataSource(void) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLRemoveDriverW(LPCWSTR lpszDriver, BOOL fRemoveDSN, + LPDWORD lpdwUsageCount) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLRemoveDriver(LPCSTR lpszDriver, BOOL fRemoveDSN, + LPDWORD lpdwUsageCount) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLRemoveDriverManager(LPDWORD pdwUsageCount) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLRemoveDSNFromIniW(LPCWSTR lpszDSN) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLRemoveDSNFromIni(LPCSTR lpszDSN) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLRemoveTranslatorW(LPCWSTR lpszTranslator, LPDWORD lpdwUsageCount) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLRemoveTranslator(LPCSTR lpszTranslator, LPDWORD lpdwUsageCount) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLSetConfigMode(UWORD wConfigMode) +{ + clear_errors(); + if (wConfigMode > ODBC_SYSTEM_DSN) + { + push_error(ODBC_ERROR_INVALID_PARAM_SEQUENCE, odbc_error_invalid_param_sequence); + return FALSE; + } + else + { + config_mode = wConfigMode; + return TRUE; + } +} + +BOOL WINAPI SQLValidDSNW(LPCWSTR lpszDSN) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLValidDSN(LPCSTR lpszDSN) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLWriteDSNToIniW(LPCWSTR lpszDSN, LPCWSTR lpszDriver) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLWriteDSNToIni(LPCSTR lpszDSN, LPCSTR lpszDriver) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLWriteFileDSNW(LPCWSTR lpszFileName, LPCWSTR lpszAppName, + LPCWSTR lpszKeyName, LPCWSTR lpszString) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLWriteFileDSN(LPCSTR lpszFileName, LPCSTR lpszAppName, + LPCSTR lpszKeyName, LPCSTR lpszString) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLWritePrivateProfileStringW(LPCWSTR lpszSection, LPCWSTR lpszEntry, + LPCWSTR lpszString, LPCWSTR lpszFilename) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI SQLWritePrivateProfileString(LPCSTR lpszSection, LPCSTR lpszEntry, + LPCSTR lpszString, LPCSTR lpszFilename) +{ + clear_errors(); + FIXME("\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} Propchange: trunk/reactos/dll/win32/odbccp32/odbccp32.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild (added) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild Wed Mar 14 15:48:32 2007 @@ -1,0 +1,19 @@ +<module name="odbccp32" type="win32dll" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.dll" allowwarnings="true"> + <importlibrary definition="odbccp32.spec.def" /> + <include base="odbccp32">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>ole32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>uuid</library> + <library>ntdll</library> + <file>odbccp32.c</file> + <file>odbccp32.spec</file> +</module> Propchange: trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.spec Wed Mar 14 15:48:32 2007 @@ -1,0 +1,57 @@ +@ stdcall ODBCCPlApplet( long long ptr ptr) +@ stdcall SQLConfigDataSource(ptr long wstr wstr) +@ stdcall SQLConfigDataSourceW(ptr long str str) +@ 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 Propchange: trunk/reactos/dll/win32/odbccp32/odbccp32.spec ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hpoussin] 26075: Prepare import of Wine library odbccp32 (sorry, this revision won't build)
by hpoussin＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: hpoussin Date: Wed Mar 14 15:44:54 2007 New Revision: 26075 URL: http://svn.reactos.org/svn/reactos?rev=26075&view=rev Log: Prepare import of Wine library odbccp32 (sorry, this revision won't build) Added: trunk/reactos/dll/win32/odbccp32/ Modified: trunk/reactos/dll/win32/win32.rbuild trunk/reactos/include/psdk/msidefs.h trunk/reactos/include/psdk/odbcinst.h trunk/reactos/include/reactos/wine/list.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Wed Mar 14 15:44:54 2007 @@ -151,6 +151,9 @@ <directory name="objsel"> <xi:include href="objsel/objsel.rbuild" /> </directory> +<directory name="odbccp32"> + <xi:include href="odbccp32/odbccp32.rbuild" /> +</directory> <directory name="ole32"> <xi:include href="ole32/ole32.rbuild" /> </directory> Modified: trunk/reactos/include/psdk/msidefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msidefs.h?rev… ============================================================================== --- trunk/reactos/include/psdk/msidefs.h (original) +++ trunk/reactos/include/psdk/msidefs.h Wed Mar 14 15:44:54 2007 @@ -182,6 +182,16 @@ msidbLocatorTypeFileName = 0x001, msidbLocatorTypeRawValue = 0x002, msidbLocatorType64bit = 0x010, +}; + +enum msidbServiceControlEvent +{ + msidbServiceControlEventStart = 0x00000001, + msidbServiceControlEventStop = 0x00000002, + msidbServiceControlEventDelete = 0x00000008, + msidbServiceControlEventUninstallStart = 0x00000010, + msidbServiceControlEventUninstallStop = 0x00000020, + msidbServiceControlEventUninstallDelete = 0x00000080, }; /* Modified: trunk/reactos/include/psdk/odbcinst.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/odbcinst.h?re… ============================================================================== --- trunk/reactos/include/psdk/odbcinst.h (original) +++ trunk/reactos/include/psdk/odbcinst.h Wed Mar 14 15:44:54 2007 @@ -66,8 +66,8 @@ BOOL INSTAPI SQLGetAvailableDriversW(LPCWSTR,LPWSTR,WORD,WORD*); BOOL INSTAPI SQLGetInstalledDrivers(LPSTR,WORD,WORD*); BOOL INSTAPI SQLGetInstalledDriversW(LPWSTR,WORD,WORD*); -int INSTAPI SQLGetPrivateProfileString(LPCSTR,LPCSTR,LPCSTR,LPSTR,int,LPCSTR); -int INSTAPI SQLGetPrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPWSTR,int,LPCWSTR); +int INSTAPI SQLGetPrivateProfileString(LPCSTR,LPCSTR,LPCSTR,LPCSTR,int,LPCSTR); +int INSTAPI SQLGetPrivateProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,int,LPCWSTR); BOOL INSTAPI SQLGetTranslator(HWND,LPSTR,WORD,WORD*,LPSTR,WORD,WORD*,DWORD*); BOOL INSTAPI SQLGetTranslatorW(HWND,LPWSTR,WORD,WORD*,LPWSTR,WORD,WORD*,DWORD*); BOOL INSTAPI SQLInstallDriver(LPCSTR,LPCSTR,LPSTR,WORD,WORD*); Modified: trunk/reactos/include/reactos/wine/list.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/list.… ============================================================================== --- trunk/reactos/include/reactos/wine/list.h (original) +++ trunk/reactos/include/reactos/wine/list.h Wed Mar 14 15:44:54 2007 @@ -139,6 +139,15 @@ list->next = list->prev = list; } +/* count the elements of a list */ +inline static unsigned int list_count( const struct list *list ) +{ + unsigned count = 0; + const struct list *ptr; + for (ptr = list->next; ptr != list; ptr = ptr->next) count++; + return count; +} + /* iterate through the list */ #define LIST_FOR_EACH(cursor,list) \ for ((cursor) = (list)->next; (cursor) != (list); (cursor) = (cursor)->next) 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 (original) +++ trunk/reactos/media/doc/README.WINE Wed Mar 14 15:44:54 2007 @@ -60,6 +60,7 @@ reactos/dll/win32/netapi32 # Synced to Wine-0_9_5 reactos/dll/win32/objsel # Autosync reactos/dll/win32/odbc32 # Out of sync. Depends on port of Linux ODBC. +reactos/dll/win32/odbccp32 # Autosync reactos/dll/win32/ole32 # Synced to Wine-0_9_5 reactos/dll/win32/oleacc # Autosync reactos/dll/win32/oleaut32 # Synced to Wine-0_9_10

1 0

[hpoussin] 26074: Add stubs for SetupDiGetClassInstallParamsA/W Support SetupDiSetClassInstallParams(DIF_ADDPROPERTYPAGE_ADVANCED)
by hpoussin＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: hpoussin Date: Wed Mar 14 15:29:18 2007 New Revision: 26074 URL: http://svn.reactos.org/svn/reactos?rev=26074&view=rev Log: Add stubs for SetupDiGetClassInstallParamsA/W Support SetupDiSetClassInstallParams(DIF_ADDPROPERTYPAGE_ADVANCED) Modified: trunk/reactos/dll/win32/setupapi/devclass.c trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/dll/win32/setupapi/setupapi.spec trunk/reactos/dll/win32/setupapi/setupapi_private.h Modified: trunk/reactos/dll/win32/setupapi/devclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devclas… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devclass.c (original) +++ trunk/reactos/dll/win32/setupapi/devclass.c Wed Mar 14 15:29:18 2007 @@ -51,50 +51,29 @@ IN PSP_CLASSINSTALL_HEADER ClassInstallParams OPTIONAL, IN DWORD ClassInstallParamsSize); -static const UPDATE_CLASS_PARAM_HANDLER UpdateClassInstallParamHandlers[] = { - NULL, /* DIF_SELECTDEVICE */ - NULL, /* DIF_INSTALLDEVICE */ - NULL, /* DIF_ASSIGNRESOURCES */ - NULL, /* DIF_PROPERTIES */ - NULL, /* DIF_REMOVE */ - NULL, /* DIF_FIRSTTIMESETUP */ - NULL, /* DIF_FOUNDDEVICE */ - NULL, /* DIF_SELECTCLASSDRIVERS */ - NULL, /* DIF_VALIDATECLASSDRIVERS */ - NULL, /* DIF_INSTALLCLASSDRIVERS */ - NULL, /* DIF_CALCDISKSPACE */ - NULL, /* DIF_DESTROYPRIVATEDATA */ - NULL, /* DIF_VALIDATEDRIVER */ - NULL, /* DIF_MOVEDEVICE */ - NULL, /* DIF_DETECT */ - NULL, /* DIF_INSTALLWIZARD */ - NULL, /* DIF_DESTROYWIZARDDATA */ - SETUP_PropertyChangeHandler, /* DIF_PROPERTYCHANGE */ - NULL, /* DIF_ENABLECLASS */ - NULL, /* DIF_DETECTVERIFY */ - NULL, /* DIF_INSTALLDEVICEFILES */ - NULL, /* DIF_UNREMOVE */ - NULL, /* DIF_SELECTBESTCOMPATDRV */ - NULL, /* DIF_ALLOW_INSTALL */ - NULL, /* DIF_REGISTERDEVICE */ - NULL, /* DIF_NEWDEVICEWIZARD_PRESELECT */ - NULL, /* DIF_NEWDEVICEWIZARD_SELECT */ - NULL, /* DIF_NEWDEVICEWIZARD_PREANALYZE */ - NULL, /* DIF_NEWDEVICEWIZARD_POSTANALYZE */ - NULL, /* DIF_NEWDEVICEWIZARD_FINISHINSTALL */ - NULL, /* DIF_UNUSED1 */ - NULL, /* DIF_INSTALLINTERFACES */ - NULL, /* DIF_DETECTCANCEL */ - NULL, /* DIF_REGISTER_COINSTALLERS */ - NULL, /* DIF_ADDPROPERTYPAGE_ADVANCED */ - NULL, /* DIF_ADDPROPERTYPAGE_BASIC */ - NULL, /* DIF_RESERVED1 */ - NULL, /* DIF_TROUBLESHOOTER */ - NULL, /* DIF_POWERMESSAGEWAKE */ - NULL, /* DIF_ADDREMOTEPROPERTYPAGE_ADVANCED */ - NULL, /* DIF_UPDATEDRIVER_UI */ - NULL /* DIF_RESERVED2 */ +static BOOL +SETUP_PropertyAddPropertyAdvancedHandler( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_CLASSINSTALL_HEADER ClassInstallParams OPTIONAL, + IN DWORD ClassInstallParamsSize); + +typedef struct _INSTALL_PARAMS_DATA +{ + DI_FUNCTION Function; + UPDATE_CLASS_PARAM_HANDLER UpdateHandler; + ULONG ParamsSize; + LONG FieldOffset; +} INSTALL_PARAMS_DATA; + +#define ADD_PARAM_HANDLER(Function, UpdateHandler, ParamsType, ParamsField) \ + { Function, UpdateHandler, sizeof(ParamsType), FIELD_OFFSET(struct ClassInstallParams, ParamsField) }, + +static const INSTALL_PARAMS_DATA InstallParamsData[] = { + ADD_PARAM_HANDLER(DIF_PROPERTYCHANGE, SETUP_PropertyChangeHandler, SP_PROPCHANGE_PARAMS, PropChangeParams) + ADD_PARAM_HANDLER(DIF_ADDPROPERTYPAGE_ADVANCED, SETUP_PropertyAddPropertyAdvancedHandler, SP_ADDPROPERTYPAGE_DATA, AddPropertyPageData) }; +#undef ADD_PARAM_HANDLER /*********************************************************************** @@ -1496,6 +1475,38 @@ TRACE("Returning %d\n", ret); return ret; +} + +/*********************************************************************** + * SetupDiGetClassInstallParamsA(SETUPAPI.@) + */ +BOOL WINAPI +SetupDiGetClassInstallParamsA( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + OUT PSP_CLASSINSTALL_HEADER ClassInstallParams OPTIONAL, + IN DWORD ClassInstallParamsSize, + OUT PDWORD RequiredSize OPTIONAL) +{ + FIXME("SetupDiGetClassInstallParamsA(%p %p %p %lu %p) Stub\n", + DeviceInfoSet, DeviceInfoData, ClassInstallParams, ClassInstallParamsSize, RequiredSize); + return FALSE; +} + +/*********************************************************************** + * SetupDiGetClassInstallParamsW(SETUPAPI.@) + */ +BOOL WINAPI +SetupDiGetClassInstallParamsW( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + OUT PSP_CLASSINSTALL_HEADER ClassInstallParams OPTIONAL, + IN DWORD ClassInstallParamsSize, + OUT PDWORD RequiredSize OPTIONAL) +{ + FIXME("SetupDiGetClassInstallParamsW(%p %p %p %lu %p) Stub\n", + DeviceInfoSet, DeviceInfoData, ClassInstallParams, ClassInstallParamsSize, RequiredSize); + return FALSE; } /*********************************************************************** @@ -2106,16 +2117,9 @@ else { PSP_PROPCHANGE_PARAMS *CurrentPropChangeParams; - if (!DeviceInfoData) - { - struct DeviceInfoSet *list = (struct DeviceInfoSet *)DeviceInfoSet; - CurrentPropChangeParams = &list->ClassInstallParams.PropChange; - } - else - { - struct DeviceInfoElement *deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; - CurrentPropChangeParams = &deviceInfo->ClassInstallParams.PropChange; - } + struct DeviceInfoElement *deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + CurrentPropChangeParams = &deviceInfo->ClassInstallParams.PropChangeParams; + if (*CurrentPropChangeParams) { MyFree(*CurrentPropChangeParams); @@ -2123,13 +2127,64 @@ } if (PropChangeParams) { - *CurrentPropChangeParams = MyMalloc(sizeof(SP_PROPCHANGE_PARAMS)); + *CurrentPropChangeParams = MyMalloc(ClassInstallParamsSize); if (!*CurrentPropChangeParams) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto done; } - memcpy(*CurrentPropChangeParams, PropChangeParams, sizeof(SP_PROPCHANGE_PARAMS)); + memcpy(*CurrentPropChangeParams, PropChangeParams, ClassInstallParamsSize); + } + ret = TRUE; + } + +done: + return ret; +} + +static BOOL +SETUP_PropertyAddPropertyAdvancedHandler( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN PSP_CLASSINSTALL_HEADER ClassInstallParams OPTIONAL, + IN DWORD ClassInstallParamsSize) +{ + PSP_ADDPROPERTYPAGE_DATA AddPropertyPageData = (PSP_ADDPROPERTYPAGE_DATA)ClassInstallParams; + BOOL ret = FALSE; + + if (ClassInstallParamsSize != sizeof(SP_PROPCHANGE_PARAMS)) + SetLastError(ERROR_INVALID_PARAMETER); + else if (AddPropertyPageData && AddPropertyPageData->Flags != 0) + SetLastError(ERROR_INVALID_FLAGS); + else if (AddPropertyPageData && AddPropertyPageData->NumDynamicPages >= MAX_INSTALLWIZARD_DYNAPAGES) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + PSP_ADDPROPERTYPAGE_DATA *CurrentAddPropertyPageData; + if (!DeviceInfoData) + { + struct DeviceInfoSet *list = (struct DeviceInfoSet *)DeviceInfoSet; + CurrentAddPropertyPageData = &list->ClassInstallParams.AddPropertyPageData; + } + else + { + struct DeviceInfoElement *deviceInfo = (struct DeviceInfoElement *)DeviceInfoData->Reserved; + CurrentAddPropertyPageData = &deviceInfo->ClassInstallParams.AddPropertyPageData; + } + if (*CurrentAddPropertyPageData) + { + MyFree(*CurrentAddPropertyPageData); + *CurrentAddPropertyPageData = NULL; + } + if (AddPropertyPageData) + { + *CurrentAddPropertyPageData = MyMalloc(ClassInstallParamsSize); + if (!*CurrentAddPropertyPageData) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto done; + } + memcpy(*CurrentAddPropertyPageData, AddPropertyPageData, ClassInstallParamsSize); } ret = TRUE; } @@ -2180,30 +2235,34 @@ if (ClassInstallParams) { + DWORD i; /* Check parameters in ClassInstallParams */ - if (ClassInstallParams->InstallFunction < DIF_SELECTDEVICE - || ClassInstallParams->InstallFunction - DIF_SELECTDEVICE >= sizeof(UpdateClassInstallParamHandlers)/sizeof(UpdateClassInstallParamHandlers[0])) + for (i = 0; i < sizeof(InstallParamsData) / sizeof(InstallParamsData[0]); i++) { - SetLastError(ERROR_INVALID_USER_BUFFER); - goto done; + if (InstallParamsData[i].Function == ClassInstallParams->InstallFunction) + { + ret = InstallParamsData[i].UpdateHandler( + DeviceInfoSet, + DeviceInfoData, + ClassInstallParams, + ClassInstallParamsSize); + if (ret) + { + InstallParams.Flags |= DI_CLASSINSTALLPARAMS; + ret = SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); + } + goto done; + } } - else if (UpdateClassInstallParamHandlers[ClassInstallParams->InstallFunction - DIF_SELECTDEVICE] == NULL) - { - ERR("InstallFunction %u is valid, but has no associated update handler\n", ClassInstallParams->InstallFunction); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - goto done; - } - ret = UpdateClassInstallParamHandlers[ClassInstallParams->InstallFunction - DIF_SELECTDEVICE](DeviceInfoSet, DeviceInfoData, ClassInstallParams, ClassInstallParamsSize); - if (!ret) - goto done; - InstallParams.Flags |= DI_CLASSINSTALLPARAMS; + ERR("InstallFunction %u has no associated update handler\n", ClassInstallParams->InstallFunction); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + goto done; } else { InstallParams.Flags &= ~DI_CLASSINSTALLPARAMS; - } - - ret = SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); + ret = SetupDiSetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &InstallParams); + } } done: Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Wed Mar 14 15:29:18 2007 @@ -845,7 +845,9 @@ static BOOL DestroyClassInstallParams(struct ClassInstallParams* installParams) { - return HeapFree(GetProcessHeap(), 0, installParams->PropChange); + HeapFree(GetProcessHeap(), 0, installParams->PropChangeParams); + HeapFree(GetProcessHeap(), 0, installParams->AddPropertyPageData); + return TRUE; } static BOOL @@ -2982,9 +2984,9 @@ TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); if (!DeviceInfoData) - PropChange = ((struct DeviceInfoSet *)DeviceInfoSet)->ClassInstallParams.PropChange; + PropChange = ((struct DeviceInfoSet *)DeviceInfoSet)->ClassInstallParams.PropChangeParams; else - PropChange = ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->ClassInstallParams.PropChange; + PropChange = ((struct DeviceInfoElement *)DeviceInfoData->Reserved)->ClassInstallParams.PropChangeParams; if (!PropChange) { SetLastError(ERROR_INVALID_PARAMETER); Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec Wed Mar 14 15:29:18 2007 @@ -318,8 +318,8 @@ @ stdcall SetupDiGetClassImageList(ptr) @ stdcall SetupDiGetClassImageListExA(ptr str ptr) @ stdcall SetupDiGetClassImageListExW(ptr wstr ptr) -@ stub SetupDiGetClassInstallParamsA -@ stub SetupDiGetClassInstallParamsW +@ stdcall SetupDiGetClassInstallParamsA(ptr ptr ptr long ptr) +@ stdcall SetupDiGetClassInstallParamsW(ptr ptr ptr long ptr) @ stdcall SetupDiGetDeviceInfoListClass(ptr ptr) @ stdcall SetupDiGetDeviceInfoListDetailA(ptr ptr) @ stdcall SetupDiGetDeviceInfoListDetailW(ptr ptr) Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h Wed Mar 14 15:29:18 2007 @@ -108,7 +108,8 @@ struct ClassInstallParams { - PSP_PROPCHANGE_PARAMS PropChange; + PSP_PROPCHANGE_PARAMS PropChangeParams; + PSP_ADDPROPERTYPAGE_DATA AddPropertyPageData; }; struct DeviceInfoElement /* Element of DeviceInfoSet.ListHead */

1 0

[hpoussin] 26073: No need to ask for more rights than needed
by hpoussin＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: hpoussin Date: Wed Mar 14 15:23:21 2007 New Revision: 26073 URL: http://svn.reactos.org/svn/reactos?rev=26073&view=rev Log: No need to ask for more rights than needed Modified: trunk/reactos/base/system/userinit/userinit.c trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c (original) +++ trunk/reactos/base/system/userinit/userinit.c Wed Mar 14 15:23:21 2007 @@ -119,7 +119,7 @@ BOOL ConsoleShell = IsConsoleShell(); if(RegOpenKeyEx(hRootKey, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon", /* FIXME: should be REGSTR_PATH_WINLOGON */ + REGSTR_PATH_WINLOGON, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) { Size = MAX_PATH * sizeof(WCHAR); Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c Wed Mar 14 15:23:21 2007 @@ -902,7 +902,7 @@ LocalKeyName.Length = wcslen (LocalKeyName.Buffer) * sizeof(WCHAR); Status = NtCreateKey (&LocalKeyHandle, - KEY_ALL_ACCESS, + KEY_CREATE_SUB_KEY, &LocalObjectAttributes, 0, NULL,

1 0

[ion] 26072: - Rewrite RtlQueryRegistryValues and implement all the features it requires. This is one of the most important kernel-mode API for driver support. - Fix code in the kernel which was incorrectly calling it.
by ion＠svn.reactos.org 14 Mar '07

14 Mar '07

Author: ion Date: Wed Mar 14 04:44:38 2007 New Revision: 26072 URL: http://svn.reactos.org/svn/reactos?rev=26072&view=rev Log: - Rewrite RtlQueryRegistryValues and implement all the features it requires. This is one of the most important kernel-mode API for driver support. - Fix code in the kernel which was incorrectly calling it. Modified: trunk/reactos/lib/rtl/registry.c trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/registry.c?rev=260… ============================================================================== --- trunk/reactos/lib/rtl/registry.c (original) +++ trunk/reactos/lib/rtl/registry.c Wed Mar 14 04:44:38 2007 @@ -3,22 +3,17 @@ * PROJECT: ReactOS system libraries * PURPOSE: Rtl registry functions * FILE: lib/rtl/registry.c - * PROGRAMER: Eric Kohl + * PROGRAMER: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl */ -/* - * TODO: - * - finish RtlQueryRegistryValues() - */ - /* INCLUDES *****************************************************************/ #include <rtl.h> - #define NDEBUG #include <debug.h> -#define TAG_RTLREGISTRY TAG('R', 't', 'l', 'R') +#define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v') /* DATA **********************************************************************/ @@ -33,6 +28,411 @@ }; /* PRIVATE FUNCTIONS *********************************************************/ + +NTSTATUS +NTAPI +RtlpQueryRegistryDirect(IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Buffer) +{ + USHORT ActualLength = (USHORT)ValueLength; + PUNICODE_STRING ReturnString = Buffer; + PULONG Length = Buffer; + ULONG RealLength; + + /* Check if this is a string */ + if ((ValueType == REG_SZ) || + (ValueType == REG_EXPAND_SZ) || + (ValueType == REG_MULTI_SZ)) + { + /* Normalize the length */ + if (ValueLength > MAXUSHORT) ValueLength = MAXUSHORT; + + /* Check if the return string has been allocated */ + if (!ReturnString->Buffer) + { + /* Allocate it */ + ReturnString->Buffer = RtlpAllocateMemory(ActualLength, TAG_RTLREGISTRY); + if (!ReturnString->Buffer) return STATUS_NO_MEMORY; + ReturnString->MaximumLength = ActualLength; + } + else if (ActualLength > ReturnString->MaximumLength) + { + /* The string the caller allocated is too small */ + return STATUS_BUFFER_TOO_SMALL; + } + + /* Copy the data */ + RtlCopyMemory(ReturnString->Buffer, ValueData, ActualLength); + ReturnString->Length = ActualLength - sizeof(UNICODE_NULL); + } + else if (ValueLength <= sizeof(ULONG)) + { + /* Check if we can just copy the data */ + if ((Buffer != ValueData) && (ValueLength)) + { + /* Copy it */ + RtlCopyMemory(Buffer, ValueData, ValueLength); + } + } + else + { + /* Check if the length is negative */ + if ((LONG)*Length < 0) + { + /* Get the real length and copy the buffer */ + RealLength = -(LONG)*Length; + if (RealLength < ValueLength) return STATUS_BUFFER_TOO_SMALL; + RtlCopyMemory(Buffer, ValueData, ValueLength); + } + else + { + /* Check if there's space for the length and type, plus data */ + if (*Length < (2 * sizeof(ULONG) + ValueLength)) + { + /* Nope, fail */ + return STATUS_BUFFER_TOO_SMALL; + } + + /* Return the data */ + *Length++ = ValueLength; + *Length++ = ValueType; + RtlCopyMemory(Length, ValueData, ValueLength); + } + } + + /* All done */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RtlpCallQueryRegistryRoutine(IN PRTL_QUERY_REGISTRY_TABLE QueryTable, + IN PKEY_VALUE_FULL_INFORMATION KeyValueInfo, + IN OUT PULONG InfoSize, + IN PVOID Context, + IN PVOID Environment) +{ + ULONG InfoLength, Length, c; + LONG RequiredLength, SpareLength; + PCHAR SpareData, DataEnd; + ULONG Type; + PWCHAR Name, p, ValueEnd; + PVOID Data; + NTSTATUS Status; + BOOLEAN FoundExpander = FALSE; + UNICODE_STRING Source, Destination; + + /* Setup defaults */ + InfoLength = *InfoSize; + *InfoSize = 0; + + /* Check if there's no data */ + if (KeyValueInfo->DataOffset == (ULONG)-1) + { + /* Return proper status code */ + return (QueryTable->Flags & RTL_QUERY_REGISTRY_REQUIRED) ? + STATUS_OBJECT_NAME_NOT_FOUND : STATUS_SUCCESS; + } + + /* Setup spare data pointers */ + SpareData = (PCHAR)KeyValueInfo; + SpareLength = InfoLength; + DataEnd = SpareData + SpareLength; + + /* Check if there's no value or data */ + if ((KeyValueInfo->Type == REG_NONE) || + (!(KeyValueInfo->DataLength) && + (KeyValueInfo->Type == QueryTable->DefaultType))) + { + /* Check if there's no value */ + if (QueryTable->DefaultType == REG_NONE) + { + /* Return proper status code */ + return (QueryTable->Flags & RTL_QUERY_REGISTRY_REQUIRED) ? + STATUS_OBJECT_NAME_NOT_FOUND : STATUS_SUCCESS; + } + + /* We can setup a default value... capture the defaults */ + Name = QueryTable->Name; + Type = QueryTable->DefaultType; + Data = QueryTable->DefaultData; + Length = QueryTable->DefaultLength; + if (!Length) + { + /* No default length given, try to calculate it */ + p = Data; + if ((Type == REG_SZ) || (Type == REG_EXPAND_SZ)) + { + /* This is a string, count the characters */ + while (*p++); + Length = (ULONG_PTR)p - (ULONG_PTR)Data; + } + else if (Type == REG_MULTI_SZ) + { + /* This is a multi-string, calculate all characters */ + while (*p) while (*p++); + Length = (ULONG_PTR)p - (ULONG_PTR)Data + sizeof(UNICODE_NULL); + } + } + } + else + { + /* Check if this isn't a direct return */ + if (!(QueryTable->Flags & RTL_QUERY_REGISTRY_DIRECT)) + { + /* Check if we have length */ + if (KeyValueInfo->DataLength) + { + /* Increase the spare data */ + SpareData += KeyValueInfo->DataOffset + + KeyValueInfo->DataLength; + } + else + { + /* Otherwise, the spare data only has the name data */ + SpareData += FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name) + + KeyValueInfo->NameLength; + } + + /* Align the pointer and get new size of spare data */ + SpareData = (PVOID)(((ULONG_PTR)SpareData + 7) & ~7); + SpareLength = DataEnd - SpareData; + + /* Check if we have space to copy the data */ + RequiredLength = KeyValueInfo->NameLength + sizeof(UNICODE_NULL); + if (SpareLength < RequiredLength) + { + /* Fail and return the missing length */ + *InfoSize = SpareData - (PCHAR)KeyValueInfo + RequiredLength; + return STATUS_BUFFER_TOO_SMALL; + } + + /* Copy the data and null-terminate it */ + Name = (PWCHAR)SpareData; + RtlCopyMemory(Name, KeyValueInfo->Name, KeyValueInfo->NameLength); + Name[KeyValueInfo->NameLength / sizeof(WCHAR)] = UNICODE_NULL; + + /* Update the spare data information */ + SpareData += RequiredLength; + SpareData = (PVOID)(((ULONG_PTR)SpareData + 7) & ~7); + SpareLength = DataEnd - SpareData; + } + else + { + /* Just return the name */ + Name = QueryTable->Name; + } + + /* Capture key data */ + Type = KeyValueInfo->Type; + Data = (PVOID)((ULONG_PTR)KeyValueInfo + KeyValueInfo->DataOffset); + Length = KeyValueInfo->DataLength; + } + + /* Check if we're expanding */ + if (!(QueryTable->Flags & RTL_QUERY_REGISTRY_NOEXPAND)) + { + /* Check if it's a multi-string */ + if (Type == REG_MULTI_SZ) + { + /* Prepare defaults */ + Status = STATUS_SUCCESS; + ValueEnd = (PWSTR)((ULONG_PTR)Data + Length) - sizeof(UNICODE_NULL); + p = Data; + + /* Loop all strings */ + while (p < ValueEnd) + { + /* Go to the next string */ + while (*p++); + + /* Get the length and check if this is direct */ + Length = (ULONG_PTR)p - (ULONG_PTR)Data; + if (QueryTable->Flags & RTL_QUERY_REGISTRY_DIRECT) + { + /* Do the query */ + Status = RtlpQueryRegistryDirect(REG_SZ, + Data, + Length, + QueryTable->EntryContext); + QueryTable->EntryContext = (PVOID)((ULONG_PTR)QueryTable-> + EntryContext + + sizeof(UNICODE_STRING)); + } + else + { + /* Call the custom routine */ + Status = QueryTable->QueryRoutine(Name, + REG_SZ, + Data, + Length, + Context, + QueryTable->EntryContext); + } + + /* Normalize status */ + if (Status == STATUS_BUFFER_TOO_SMALL) Status = STATUS_SUCCESS; + if (!NT_SUCCESS(Status)) break; + + /* Update data pointer */ + Data = p; + } + + /* Return */ + return Status; + } + + /* Check if this is an expand string */ + if ((Type == REG_EXPAND_SZ) && (Length >= sizeof(WCHAR))) + { + /* Try to find the expander */ + c = Length - sizeof(UNICODE_NULL); + p = (PWCHAR)Data; + while (c) + { + /* Check if this is one */ + if (*p == L'%') + { + /* Yup! */ + FoundExpander = TRUE; + break; + } + + /* Continue in the buffer */ + p++; + c -= sizeof(WCHAR); + } + + /* So check if we have one */ + if (FoundExpander) + { + /* Setup the source string */ + RtlInitEmptyUnicodeString(&Source, Data, Length); + Source.Length = Source.MaximumLength - sizeof(UNICODE_NULL); + + /* Setup the desination string */ + RtlInitEmptyUnicodeString(&Destination, (PWCHAR)SpareData, 0); + + /* Check if we're out of space */ + if (SpareLength <= 0) + { + /* Then we don't have any space in our string */ + Destination.MaximumLength = 0; + } + else if (SpareLength <= MAXUSHORT) + { + /* This is the good case, where we fit into a string */ + Destination.MaximumLength = SpareLength; + Destination.Buffer[SpareLength / 2 - 1] = UNICODE_NULL; + } + else + { + /* We can't fit into a string, so truncate */ + Destination.MaximumLength = MAXUSHORT; + Destination.Buffer[MAXUSHORT / 2 - 1] = UNICODE_NULL; + } + + /* Expand the strings and set our type as one string */ + Status = RtlExpandEnvironmentStrings_U(Environment, + &Source, + &Destination, + (PULONG)&RequiredLength); + Type = REG_SZ; + + /* Check for success */ + if (NT_SUCCESS(Status)) + { + /* Set the value name and length to our string */ + Data = Destination.Buffer; + Length = Destination.Length + sizeof(UNICODE_NULL); + } + else + { + /* Check if our buffer is too small */ + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* Set the required missing length */ + *InfoSize = SpareData - + (PCHAR)KeyValueInfo + + RequiredLength; + + /* Notify debugger */ + DPRINT1("RTL: Expand variables for %wZ failed - " + "Status == %lx Size %x > %x <%x>\n", + &Source, + Status, + *InfoSize, + InfoLength, + Destination.MaximumLength); + } + else + { + /* Notify debugger */ + DPRINT1("RTL: Expand variables for %wZ failed - " + "Status == %lx\n", + &Source, + Status); + } + + /* Return the status */ + return Status; + } + } + } + } + + /* Check if this is a direct query */ + if (QueryTable->Flags & RTL_QUERY_REGISTRY_DIRECT) + { + /* Return the data */ + Status = RtlpQueryRegistryDirect(Type, + Data, + Length, + QueryTable->EntryContext); + } + else + { + /* Call the query routine */ + Status = QueryTable->QueryRoutine(Name, + Type, + Data, + Length, + Context, + QueryTable->EntryContext); + } + + /* Normalize and return status */ + return (Status == STATUS_BUFFER_TOO_SMALL) ? STATUS_SUCCESS : Status; +} + +PVOID +NTAPI +RtlpAllocDeallocQueryBuffer(IN OUT PSIZE_T BufferSize, + IN PVOID OldBuffer, + IN SIZE_T OldBufferSize, + OUT PNTSTATUS Status) +{ + PVOID Buffer = NULL; + + /* Assume success */ + if (Status) *Status = STATUS_SUCCESS; + + /* Free the old buffer */ + if (OldBuffer) RtlpFreeMemory(OldBuffer, TAG_RTLREGISTRY); + + /* Check if we need to allocate a new one */ + if (BufferSize) + { + /* Allocate */ + Buffer = RtlpAllocateMemory(*BufferSize, TAG_RTLREGISTRY); + if (!(Buffer) && (Status)) *Status = STATUS_NO_MEMORY; + } + + /* Return the pointer */ + return Buffer; +} NTSTATUS NTAPI @@ -557,507 +957,345 @@ } /* - * @unimplemented + * @implemented */ -NTSTATUS NTAPI +NTSTATUS +NTAPI RtlQueryRegistryValues(IN ULONG RelativeTo, - IN PCWSTR Path, - IN PRTL_QUERY_REGISTRY_TABLE QueryTable, - IN PVOID Context, - IN PVOID Environment OPTIONAL) -{ - NTSTATUS Status; - HANDLE BaseKeyHandle; - HANDLE CurrentKeyHandle; - PRTL_QUERY_REGISTRY_TABLE QueryEntry; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; - PKEY_VALUE_FULL_INFORMATION FullValueInfo; - ULONG BufferSize; - ULONG ResultSize; - ULONG Index; - ULONG StringLen; - ULONG ValueNameSize; - PWSTR StringPtr; - PWSTR ExpandBuffer; - PWSTR ValueName; - UNICODE_STRING EnvValue; - UNICODE_STRING EnvExpandedValue; - ULONG DataSize = 0; - - PAGED_CODE_RTL(); - - DPRINT("RtlQueryRegistryValues() called\n"); - - Status = RtlpGetRegistryHandle(RelativeTo, - (PWSTR)Path, - FALSE, - &BaseKeyHandle); - if (!NT_SUCCESS(Status)) - { - DPRINT("RtlpGetRegistryHandle() failed (Status %lx)\n", Status); - return(Status); - } - - CurrentKeyHandle = BaseKeyHandle; - QueryEntry = QueryTable; - while ((QueryEntry->QueryRoutine != NULL) || - (QueryEntry->Name != NULL)) - { - if (((QueryEntry->Flags & (RTL_QUERY_REGISTRY_SUBKEY | RTL_QUERY_REGISTRY_TOPKEY)) != 0) && - (BaseKeyHandle != CurrentKeyHandle)) - { - ZwClose(CurrentKeyHandle); - CurrentKeyHandle = BaseKeyHandle; - } - - if (QueryEntry->Flags & RTL_QUERY_REGISTRY_SUBKEY) - { - DPRINT("Open new subkey: %S\n", QueryEntry->Name); - - RtlInitUnicodeString(&KeyName, - QueryEntry->Name); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - BaseKeyHandle, - NULL); - Status = ZwOpenKey(&CurrentKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - break; - } - else if (QueryEntry->Flags & RTL_QUERY_REGISTRY_DIRECT) - { - DPRINT("Query value directly: %S\n", QueryEntry->Name); - - RtlInitUnicodeString(&KeyName, - QueryEntry->Name); - - BufferSize = sizeof (KEY_VALUE_PARTIAL_INFORMATION) + 4096; - ValueInfo = RtlpAllocateMemory(BufferSize, TAG_RTLREGISTRY); - if (ValueInfo == NULL) - { - Status = STATUS_NO_MEMORY; - break; - } - - Status = ZwQueryValueKey(CurrentKeyHandle, - &KeyName, - KeyValuePartialInformation, - ValueInfo, - BufferSize, - &ResultSize); - if (!NT_SUCCESS(Status)) - { - if (QueryEntry->Flags & RTL_QUERY_REGISTRY_REQUIRED) - { - RtlpFreeMemory(ValueInfo, TAG_RTLREGISTRY); - Status = STATUS_OBJECT_NAME_NOT_FOUND; - break; - } - - if (QueryEntry->DefaultType == REG_SZ) - { - PUNICODE_STRING ValueString; - PUNICODE_STRING SourceString; - - SourceString = (PUNICODE_STRING)QueryEntry->DefaultData; - ValueString = (PUNICODE_STRING)QueryEntry->EntryContext; - if (ValueString->Buffer == NULL) - { - ValueString->Length = SourceString->Length; - ValueString->MaximumLength = SourceString->MaximumLength; - ValueString->Buffer = RtlpAllocateMemory(BufferSize, TAG_RTLREGISTRY); - if (!ValueString->Buffer) - break; - ValueString->Buffer[0] = 0; - memcpy(ValueString->Buffer, - SourceString->Buffer, - SourceString->MaximumLength); - } - else - { - ValueString->Length = min(SourceString->Length, - ValueString->MaximumLength - sizeof(WCHAR)); - memcpy(ValueString->Buffer, - SourceString->Buffer, - ValueString->Length); - ((PWSTR)ValueString->Buffer)[ValueString->Length / sizeof(WCHAR)] = 0; - } - } - else - { - memcpy(QueryEntry->EntryContext, - QueryEntry->DefaultData, - QueryEntry->DefaultLength); - } - Status = STATUS_SUCCESS; - } - else - { - if ((ValueInfo->Type == REG_SZ) || - (ValueInfo->Type == REG_MULTI_SZ) || - (ValueInfo->Type == REG_EXPAND_SZ && (QueryEntry->Flags & RTL_QUERY_REGISTRY_NOEXPAND))) - { - PUNICODE_STRING ValueString; - - ValueString = (PUNICODE_STRING)QueryEntry->EntryContext; - if (ValueString->Buffer == NULL) - { - ValueString->MaximumLength = ValueInfo->DataLength; - ValueString->Buffer = RtlpAllocateMemory(ValueString->MaximumLength, TAG_RTLREGISTRY); - if (ValueString->Buffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - ValueString->Buffer[0] = 0; - } - ValueString->Length = min(ValueInfo->DataLength, - ValueString->MaximumLength) - sizeof(WCHAR); - memcpy(ValueString->Buffer, - ValueInfo->Data, - ValueString->Length); - ((PWSTR)ValueString->Buffer)[ValueString->Length / sizeof(WCHAR)] = 0; - } - else if (ValueInfo->Type == REG_EXPAND_SZ) - { - PUNICODE_STRING ValueString; - - DPRINT("Expand REG_EXPAND_SZ type\n"); - - ValueString = (PUNICODE_STRING)QueryEntry->EntryContext; - - ExpandBuffer = RtlpAllocateMemory(ValueInfo->DataLength * 2, TAG_RTLREGISTRY); - if (ExpandBuffer == NULL) - { - Status = STATUS_NO_MEMORY; - break; - } - - RtlInitUnicodeString(&EnvValue, - (PWSTR)ValueInfo->Data); - EnvExpandedValue.Length = 0; - EnvExpandedValue.MaximumLength = ValueInfo->DataLength * 2; - EnvExpandedValue.Buffer = ExpandBuffer; - *ExpandBuffer = 0; - - RtlExpandEnvironmentStrings_U(Environment, - &EnvValue, - &EnvExpandedValue, - &StringLen); - - if (ValueString->Buffer == NULL) - { - ValueString->MaximumLength = EnvExpandedValue.Length + sizeof(WCHAR); - ValueString->Length = EnvExpandedValue.Length; - ValueString->Buffer = RtlpAllocateMemory(ValueString->MaximumLength, TAG_RTLREGISTRY); - if (ValueString->Buffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - } - } - else - { - ValueString->Length = min(EnvExpandedValue.Length, - ValueString->MaximumLength - sizeof(WCHAR)); - } - - memcpy(ValueString->Buffer, - EnvExpandedValue.Buffer, - ValueString->Length); - ((PWSTR)ValueString->Buffer)[ValueString->Length / sizeof(WCHAR)] = 0; - - RtlpFreeMemory(ExpandBuffer, TAG_RTLREGISTRY); - } - else - { - memcpy(QueryEntry->EntryContext, - ValueInfo->Data, - ValueInfo->DataLength); - } - } - - if (QueryEntry->Flags & RTL_QUERY_REGISTRY_DELETE) - { - Status = ZwDeleteValueKey(CurrentKeyHandle, &KeyName); - - } - - RtlpFreeMemory(ValueInfo, TAG_RTLREGISTRY); - } - else - { - DPRINT("Query value via query routine: %S\n", QueryEntry->Name); - if (QueryEntry->Name != NULL) - { - RtlInitUnicodeString(&KeyName, - QueryEntry->Name); - - BufferSize = sizeof (KEY_VALUE_PARTIAL_INFORMATION) + 4096; - ValueInfo = RtlpAllocateMemory(BufferSize, TAG_RTLREGISTRY); - if (ValueInfo == NULL) - { - Status = STATUS_NO_MEMORY; - break; - } - - Status = ZwQueryValueKey(CurrentKeyHandle, - &KeyName, - KeyValuePartialInformation, - ValueInfo, - BufferSize, - &ResultSize); - if (!NT_SUCCESS(Status)) - { - if (!(QueryEntry->Flags & RTL_QUERY_REGISTRY_REQUIRED)) - { - Status = QueryEntry->QueryRoutine(QueryEntry->Name, - QueryEntry->DefaultType, - QueryEntry->DefaultData, - QueryEntry->DefaultLength, - Context, - QueryEntry->EntryContext); - } - } - else if ((ValueInfo->Type == REG_MULTI_SZ) && - !(QueryEntry->Flags & RTL_QUERY_REGISTRY_NOEXPAND)) - { - DPRINT("Expand REG_MULTI_SZ type\n"); - StringPtr = (PWSTR)ValueInfo->Data; - while (DataSize < (ValueInfo->DataLength-2)) - { - StringLen = (wcslen(StringPtr) + 1) * sizeof(WCHAR); - Status = QueryEntry->QueryRoutine(QueryEntry->Name, - REG_SZ, - (PVOID)StringPtr, - StringLen, - Context, - QueryEntry->EntryContext); - if(!NT_SUCCESS(Status)) - break; - StringPtr = (PWSTR)((PUCHAR)StringPtr + StringLen); - DataSize += StringLen; - } - } - else if ((ValueInfo->Type == REG_EXPAND_SZ) && - !(QueryEntry->Flags & RTL_QUERY_REGISTRY_NOEXPAND)) - { - DPRINT("Expand REG_EXPAND_SZ type\n"); - - ExpandBuffer = RtlpAllocateMemory(ValueInfo->DataLength * 2, TAG_RTLREGISTRY); - if (ExpandBuffer == NULL) - { - Status = STATUS_NO_MEMORY; - break; - } - - RtlInitUnicodeString(&EnvValue, - (PWSTR)ValueInfo->Data); - EnvExpandedValue.Length = 0; - EnvExpandedValue.MaximumLength = ValueInfo->DataLength * 2 * sizeof(WCHAR); - EnvExpandedValue.Buffer = ExpandBuffer; - *ExpandBuffer = 0; - - RtlExpandEnvironmentStrings_U(Environment, - &EnvValue, - &EnvExpandedValue, - &StringLen); - - StringLen = (wcslen(ExpandBuffer) + 1) * sizeof(WCHAR); - Status = QueryEntry->QueryRoutine(QueryEntry->Name, - REG_SZ, - (PVOID)ExpandBuffer, - StringLen, - Context, - QueryEntry->EntryContext); - - RtlpFreeMemory(ExpandBuffer, TAG_RTLREGISTRY); - } - else - { - Status = QueryEntry->QueryRoutine(QueryEntry->Name, - ValueInfo->Type, - ValueInfo->Data, - ValueInfo->DataLength, - Context, - QueryEntry->EntryContext); - } - - if (QueryEntry->Flags & RTL_QUERY_REGISTRY_DELETE) - { - Status = ZwDeleteValueKey(CurrentKeyHandle, &KeyName); - } - - RtlpFreeMemory(ValueInfo, TAG_RTLREGISTRY); - if (!NT_SUCCESS(Status)) - break; - } - else if (QueryEntry->Flags & RTL_QUERY_REGISTRY_NOVALUE) - { - DPRINT("Simple callback\n"); - Status = QueryEntry->QueryRoutine(NULL, - REG_NONE, - NULL, - 0, - Context, - QueryEntry->EntryContext); - if (!NT_SUCCESS(Status)) - break; - } - else - { - DPRINT("Enumerate values\n"); - - BufferSize = sizeof(KEY_VALUE_FULL_INFORMATION) + 4096; - FullValueInfo = RtlpAllocateMemory(BufferSize, TAG_RTLREGISTRY); - if (FullValueInfo == NULL) - { - Status = STATUS_NO_MEMORY; - break; - } - ValueNameSize = 256 * sizeof(WCHAR); - ValueName = RtlpAllocateMemory(ValueNameSize, TAG_RTLREGISTRY); - if (ValueName == NULL) - { - Status = STATUS_NO_MEMORY; - break; - } - Index = 0; - while (TRUE) - { - Status = ZwEnumerateValueKey(CurrentKeyHandle, - Index, - KeyValueFullInformation, - FullValueInfo, - BufferSize, - &ResultSize); - if (!NT_SUCCESS(Status)) - { - if ((Status == STATUS_NO_MORE_ENTRIES) && - (Index == 0) && - (QueryEntry->Flags & RTL_QUERY_REGISTRY_REQUIRED)) - { - Status = STATUS_OBJECT_NAME_NOT_FOUND; - } - else if (Status == STATUS_NO_MORE_ENTRIES) - { - Status = STATUS_SUCCESS; - } - break; - } - - if (FullValueInfo->NameLength > ValueNameSize - sizeof(WCHAR)) - { - /* Should not happen, because the name length is limited to 255 characters */ - RtlpFreeMemory(ValueName, TAG_RTLREGISTRY); - ValueNameSize = FullValueInfo->NameLength + sizeof(WCHAR); - ValueName = RtlpAllocateMemory(ValueNameSize, TAG_RTLREGISTRY); - if (ValueName == NULL) - { - Status = STATUS_NO_MEMORY; - break; - } - } - - memcpy(ValueName, - FullValueInfo->Name, - FullValueInfo->NameLength); - ValueName[FullValueInfo->NameLength / sizeof(WCHAR)] = 0; - - DPRINT("FullValueInfo->Type: %lu\n", FullValueInfo->Type); - if ((FullValueInfo->Type == REG_MULTI_SZ) && - !(QueryEntry->Flags & RTL_QUERY_REGISTRY_NOEXPAND)) - { - DPRINT("Expand REG_MULTI_SZ type\n"); - StringPtr = (PWSTR)((ULONG_PTR)FullValueInfo + FullValueInfo->DataOffset); - while (*StringPtr != 0) - { - StringLen = (wcslen(StringPtr) + 1) * sizeof(WCHAR); - Status = QueryEntry->QueryRoutine(ValueName, - REG_SZ, - (PVOID)StringPtr, - StringLen, - Context, - QueryEntry->EntryContext); - if(!NT_SUCCESS(Status)) - break; - StringPtr = (PWSTR)((PUCHAR)StringPtr + StringLen); - } - } - else if ((FullValueInfo->Type == REG_EXPAND_SZ) && - !(QueryEntry->Flags & RTL_QUERY_REGISTRY_NOEXPAND)) - { - DPRINT("Expand REG_EXPAND_SZ type\n"); - - StringPtr = (PWSTR)((ULONG_PTR)FullValueInfo + FullValueInfo->DataOffset); - ExpandBuffer = RtlpAllocateMemory(FullValueInfo->DataLength * 2, TAG_RTLREGISTRY); - if (ExpandBuffer == NULL) - { - Status = STATUS_NO_MEMORY; - break; - } - - RtlInitUnicodeString(&EnvValue, - StringPtr); - EnvExpandedValue.Length = 0; - EnvExpandedValue.MaximumLength = FullValueInfo->DataLength * 2; - EnvExpandedValue.Buffer = ExpandBuffer; - *ExpandBuffer = 0; - - RtlExpandEnvironmentStrings_U(Environment, - &EnvValue, - &EnvExpandedValue, - &StringLen); - - StringLen = (wcslen(ExpandBuffer) + 1) * sizeof(WCHAR); - Status = QueryEntry->QueryRoutine(ValueName, - REG_SZ, - (PVOID)ExpandBuffer, - StringLen, - Context, - QueryEntry->EntryContext); - - RtlpFreeMemory(ExpandBuffer, TAG_RTLREGISTRY); - } - else - { - Status = QueryEntry->QueryRoutine(ValueName, - FullValueInfo->Type, - (PVOID)((ULONG_PTR)FullValueInfo + FullValueInfo->DataOffset), - FullValueInfo->DataLength, - Context, - QueryEntry->EntryContext); - } - - if (!NT_SUCCESS(Status)) - break; - - /* FIXME: How will these be deleted? */ - - Index++; - } - - RtlpFreeMemory(FullValueInfo, TAG_RTLREGISTRY); - RtlpFreeMemory(ValueName, TAG_RTLREGISTRY); - if (!NT_SUCCESS(Status)) - break; - } - } - - QueryEntry++; - } - - if (CurrentKeyHandle != BaseKeyHandle) - ZwClose(CurrentKeyHandle); - - ZwClose(BaseKeyHandle); - - return(Status); + IN PCWSTR Path, + IN PRTL_QUERY_REGISTRY_TABLE QueryTable, + IN PVOID Context, + IN PVOID Environment OPTIONAL) +{ + NTSTATUS Status; + PKEY_VALUE_FULL_INFORMATION KeyValueInfo = NULL; + HANDLE KeyHandle, CurrentKey; + SIZE_T BufferSize = 128, InfoSize; + UNICODE_STRING KeyPath, KeyValueName; + OBJECT_ATTRIBUTES ObjectAttributes; + ULONG i, Value; + ULONG ResultLength; + + /* Get the registry handle */ + Status = RtlpGetRegistryHandle(RelativeTo, Path, FALSE, &KeyHandle); + if (!NT_SUCCESS(Status)) return Status; + + /* Initialize the path */ + RtlInitUnicodeString(&KeyPath, + (RelativeTo & RTL_REGISTRY_HANDLE) ? NULL : Path); + + /* Allocate a query buffer */ + KeyValueInfo = RtlpAllocDeallocQueryBuffer(&BufferSize, NULL, 0, &Status); + if (!KeyValueInfo) + { + /* Close the handle if we have one and fail */ + if (!(RelativeTo & RTL_REGISTRY_HANDLE)) ZwClose(KeyHandle); + return Status; + } + + /* Set defaults */ + KeyValueInfo->DataOffset = 0; + InfoSize = BufferSize - sizeof(UNICODE_NULL); + CurrentKey = KeyHandle; + + /* Loop the query table */ + while ((QueryTable->QueryRoutine) || + (QueryTable->Flags & (RTL_QUERY_REGISTRY_SUBKEY | + RTL_QUERY_REGISTRY_DIRECT))) + { + /* Check if the request is invalid */ + if ((QueryTable->Flags & RTL_QUERY_REGISTRY_DIRECT) && + (!(QueryTable->Name) || + (QueryTable->Flags & RTL_QUERY_REGISTRY_SUBKEY) || + (QueryTable->QueryRoutine))) + { + /* Fail */ + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Check if we want a specific key */ + if (QueryTable->Flags & (RTL_QUERY_REGISTRY_TOPKEY | + RTL_QUERY_REGISTRY_SUBKEY)) + { + /* Check if we're working with another handle */ + if (CurrentKey != KeyHandle) + { + /* Close our current key and use the top */ + NtClose(CurrentKey); + CurrentKey = KeyHandle; + } + } + + /* Check if we're querying the subkey */ + if (QueryTable->Flags & RTL_QUERY_REGISTRY_SUBKEY) + { + /* Make sure we have a name */ + if (!QueryTable->Name) + { + /* Fail */ + Status = STATUS_INVALID_PARAMETER; + } + else + { + /* Initialize the name */ + RtlInitUnicodeString(&KeyPath, QueryTable->Name); + + /* Get the key handle */ + InitializeObjectAttributes(&ObjectAttributes, + &KeyPath, + OBJ_CASE_INSENSITIVE | + OBJ_KERNEL_HANDLE, + KeyHandle, + NULL); + Status = ZwOpenKey(&CurrentKey, + MAXIMUM_ALLOWED, + &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* If we have a query routine, go enumerate values */ + if (QueryTable->QueryRoutine) goto ProcessValues; + } + } + } + else if (QueryTable->Name) + { + /* Initialize the path */ + RtlInitUnicodeString(&KeyValueName, QueryTable->Name); + + /* Start query loop */ + i = 0; + while (TRUE) + { + /* Make sure we didn't retry too many times */ + if (i++ > 4) + { + /* Fail */ + DPRINT1("RtlQueryRegistryValues: Miscomputed buffer size " + "at line %d\n", __LINE__); + break; + } + + /* Query key information */ + Status = ZwQueryValueKey(CurrentKey, + &KeyValueName, + KeyValueFullInformation, + KeyValueInfo, + InfoSize, + &ResultLength); + if (Status == STATUS_BUFFER_OVERFLOW) + { + /* Normalize status code */ + Status = STATUS_BUFFER_TOO_SMALL; + } + + /* Check for failure */ + if (!NT_SUCCESS(Status)) + { + /* Check if we didn't find it */ + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + /* Setup a default */ + KeyValueInfo->Type = REG_NONE; + KeyValueInfo->DataLength = 0; + ResultLength = InfoSize; + + /* Call the query routine */ + Status = RtlpCallQueryRegistryRoutine(QueryTable, + KeyValueInfo, + &ResultLength, + Context, + Environment); + } + + /* Check for buffer being too small */ + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* Increase allocation size */ + BufferSize = ResultLength + + sizeof(ULONG_PTR) + + sizeof(UNICODE_NULL); + KeyValueInfo = RtlpAllocDeallocQueryBuffer(&BufferSize, + KeyValueInfo, + BufferSize, + &Status); + if (!KeyValueInfo) break; + + /* Update the data */ + KeyValueInfo->DataOffset = 0; + InfoSize = BufferSize - sizeof(UNICODE_NULL); + continue; + } + } + else + { + /* Check if this is a multi-string */ + if (KeyValueInfo->Type == REG_MULTI_SZ) + { + /* Add a null-char */ + ((PWCHAR)KeyValueInfo)[ResultLength / 2] = UNICODE_NULL; + KeyValueInfo->DataLength += sizeof(UNICODE_NULL); + } + + /* Call the query routine */ + ResultLength = InfoSize; + Status = RtlpCallQueryRegistryRoutine(QueryTable, + KeyValueInfo, + &ResultLength, + Context, + Environment); + + /* Check for buffer being too small */ + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* Increase allocation size */ + BufferSize = ResultLength + + sizeof(ULONG_PTR) + + sizeof(UNICODE_NULL); + KeyValueInfo = RtlpAllocDeallocQueryBuffer(&BufferSize, + KeyValueInfo, + BufferSize, + &Status); + if (!KeyValueInfo) break; + + /* Update the data */ + KeyValueInfo->DataOffset = 0; + InfoSize = BufferSize - sizeof(UNICODE_NULL); + continue; + } + + /* Check if we need to delete the key */ + if ((NT_SUCCESS(Status)) && + (QueryTable->Flags & RTL_QUERY_REGISTRY_DELETE)) + { + /* Delete it */ + ZwDeleteValueKey(CurrentKey, &KeyValueName); + } + } + + /* We're done, break out */ + break; + } + } + else if (QueryTable->Flags & RTL_QUERY_REGISTRY_NOVALUE) + { + /* Just call the query routine */ + Status = QueryTable->QueryRoutine(NULL, + REG_NONE, + NULL, + 0, + Context, + QueryTable->EntryContext); + } + else + { +ProcessValues: + /* Loop every value */ + i = Value = 0; + while (TRUE) + { + /* Enumerate the keys */ + Status = ZwEnumerateValueKey(CurrentKey, + Value, + KeyValueFullInformation, + KeyValueInfo, + InfoSize, + &ResultLength); + if (Status == STATUS_BUFFER_OVERFLOW) + { + /* Normalize the status */ + Status = STATUS_BUFFER_TOO_SMALL; + } + + /* Check if we found all the entries */ + if (Status == STATUS_NO_MORE_ENTRIES) + { + /* Check if this was the first entry and caller needs it */ + if (!(Value) && + (QueryTable->Flags & RTL_QUERY_REGISTRY_REQUIRED)) + { + /* Fail */ + Status = STATUS_OBJECT_NAME_NOT_FOUND; + } + else + { + /* Otherwise, it's ok */ + Status = STATUS_SUCCESS; + } + break; + } + + /* Check if enumeration worked */ + if (NT_SUCCESS(Status)) + { + /* Call the query routine */ + ResultLength = InfoSize; + Status = RtlpCallQueryRegistryRoutine(QueryTable, + KeyValueInfo, + &ResultLength, + Context, + Environment); + } + + /* Check if the query failed */ + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* Increase allocation size */ + BufferSize = ResultLength + + sizeof(ULONG_PTR) + + sizeof(UNICODE_NULL); + KeyValueInfo = RtlpAllocDeallocQueryBuffer(&BufferSize, + KeyValueInfo, + BufferSize, + &Status); + if (!KeyValueInfo) break; + + /* Update the data */ + KeyValueInfo->DataOffset = 0; + InfoSize = BufferSize - sizeof(UNICODE_NULL); + + /* Try the value again unless it's been too many times */ + if (i++ <= 4) continue; + break; + } + + /* Break out if we failed */ + if (!NT_SUCCESS(Status)) break; + + /* Reset the number of retries and check if we need to delete */ + i = 0; + if (QueryTable->Flags & RTL_QUERY_REGISTRY_DELETE) + { + /* Build the name */ + RtlInitEmptyUnicodeString(&KeyValueName, + KeyValueInfo->Name, + (USHORT)KeyValueInfo->NameLength); + KeyValueName.Length = KeyValueName.MaximumLength; + + /* Delete the key */ + Status = ZwDeleteValueKey(CurrentKey, &KeyValueName); + if (NT_SUCCESS(Status)) Value--; + } + + /* Go to the next value */ + Value++; + } + } + + /* Check if we failed anywhere along the road */ + if (!NT_SUCCESS(Status)) break; + + /* Continue */ + QueryTable++; + } + + /* Check if we need to close our handle */ + if ((KeyHandle) && !(RelativeTo & RTL_REGISTRY_HANDLE)) ZwClose(KeyHandle); + if ((CurrentKey) && (CurrentKey != KeyHandle)) ZwClose(CurrentKey); + + /* Free our buffer and return status */ + RtlpAllocDeallocQueryBuffer(NULL, KeyValueInfo, BufferSize, NULL); + return Status; } /* EOF */ Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Wed Mar 14 04:44:38 2007 @@ -542,7 +542,7 @@ PDEVICE_NODE DeviceNode, BOOLEAN Lower) { - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + RTL_QUERY_REGISTRY_TABLE QueryTable[2] = {{0}}; PWCHAR KeyBuffer; UNICODE_STRING Class; WCHAR ClassBuffer[40]; @@ -557,10 +557,7 @@ QueryTable[0].Name = L"LowerFilters"; else QueryTable[0].Name = L"UpperFilters"; - QueryTable[0].EntryContext = NULL; QueryTable[0].Flags = RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[1].QueryRoutine = NULL; - QueryTable[1].Name = NULL; KeyBuffer = ExAllocatePool( PagedPool,

1 0

[dgorbachev] 26071: Fix bug #1872
by dgorbachev＠svn.reactos.org 13 Mar '07

13 Mar '07

Author: dgorbachev Date: Tue Mar 13 19:08:49 2007 New Revision: 26071 URL: http://svn.reactos.org/svn/reactos?rev=26071&view=rev Log: Fix bug #1872 Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Tue Mar 13 19:08:49 2007 @@ -3497,6 +3497,9 @@ { INPUT_RECORD Ir; PAGE_NUMBER Page; + LARGE_INTEGER Time; + + NtQuerySystemTime(&Time); if (!CONSOLE_Init()) { @@ -3661,8 +3664,13 @@ /// DO NOT REMOVE!!! DPRINT1("SYSREG_CHECKPOINT:USETUP_COMPLETE\n"); + FreeConsole(); + + /* Avoid bugcheck */ + Time.QuadPart += 50000000; + NtDelayExecution(FALSE, &Time); + /* Reboot */ - FreeConsole(); NtShutdownSystem(ShutdownReboot); NtTerminateProcess(NtCurrentProcess(), 0); }

1 0

[hpoussin] 26070: Prevents a freeze when running the bootcd. Still needs to investigate to find the real reason.
by hpoussin＠svn.reactos.org 13 Mar '07

13 Mar '07

Author: hpoussin Date: Tue Mar 13 18:57:50 2007 New Revision: 26070 URL: http://svn.reactos.org/svn/reactos?rev=26070&view=rev Log: Prevents a freeze when running the bootcd. Still needs to investigate to find the real reason. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Tue Mar 13 18:57:50 2007 @@ -1203,6 +1203,14 @@ &ServiceKeyName, sizeof(UNICODE_STRING)); + if (!DriverName) + { + /* HACK: Something goes wrong in next lines in this case. + * Just leave to prevent a freeze */ + *pDriverObject = DriverObject; + return Status; + } + /* Add the Object and get its handle */ Status = ObInsertObject(DriverObject, NULL,

1 0

[fireball] 26069: - Comment out excessive DbgPrint()s.
by fireball＠svn.reactos.org 13 Mar '07

13 Mar '07

Author: fireball Date: Tue Mar 13 17:40:33 2007 New Revision: 26069 URL: http://svn.reactos.org/svn/reactos?rev=26069&view=rev Log: - Comment out excessive DbgPrint()s. Modified: branches/winldr/windows/peloader.c Modified: branches/winldr/windows/peloader.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/peloader.c?rev=2… ============================================================================== --- branches/winldr/windows/peloader.c (original) +++ branches/winldr/windows/peloader.c Tue Mar 13 17:40:33 2007 @@ -569,13 +569,13 @@ Result = strcmp(VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]), (PCHAR)VaToPa(RVA(DllBase, NameTable[Middle]))); - DbgPrint((DPRINT_WINDOWS, "Binary search: comparing Import '__', Export '%s'\n", + /*DbgPrint((DPRINT_WINDOWS, "Binary search: comparing Import '__', Export '%s'\n",*/ /*VaToPa(&((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name[0]),*/ - (PCHAR)VaToPa(RVA(DllBase, NameTable[Middle])))); - - DbgPrint((DPRINT_WINDOWS, "TE->u1.AOD %p, fulladdr %p\n", + /*(PCHAR)VaToPa(RVA(DllBase, NameTable[Middle]))));*/ + + /*DbgPrint((DPRINT_WINDOWS, "TE->u1.AOD %p, fulladdr %p\n", ThunkData->u1.AddressOfData, - ((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name )); + ((PIMAGE_IMPORT_BY_NAME)VaToPa(ThunkData->u1.AddressOfData))->Name ));*/ /* Depending on result of strcmp, perform different actions */

1 0

[amunger] 26068: Typo fixes, patch by our friend Coviti.
by amunger＠svn.reactos.org 13 Mar '07

13 Mar '07

Author: amunger Date: Tue Mar 13 14:28:18 2007 New Revision: 26068 URL: http://svn.reactos.org/svn/reactos?rev=26068&view=rev Log: Typo fixes, patch by our friend Coviti. Modified: trunk/reactos/base/shell/cmd/en-US.rc Modified: trunk/reactos/base/shell/cmd/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/en-US.rc?re… ============================================================================== --- trunk/reactos/base/shell/cmd/en-US.rc (original) +++ trunk/reactos/base/shell/cmd/en-US.rc Tue Mar 13 14:28:18 2007 @@ -137,7 +137,7 @@ /T display only\n\n\ Type DATE without parameters to display the current date setting and\n\ a prompt for a new one. Press ENTER to keep the same date.\n" - + STRING_DEL_HELP1, "Deletes one or more files.\n\n\ DEL [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\ DELETE [/N /P /T /Q /S /W /Y /Z /A[[:]attributes]] file ...\n\ @@ -389,14 +389,14 @@ STRING_REN_HELP2, " %lu file renamed\n" STRING_REN_HELP3, " %lu files renamed\n" - + STRING_SHIFT_HELP, "Changes the position of replaceable parameters in a batch file.\n\n\ SHIFT [DOWN]" STRING_SCREEN_HELP, "move cursor and optionally print text\n\n\ SCREEN row col [text]\n\n\ - row row to wich move the cursor\n\ - col column to wich move the cursor" + row row to which move the cursor\n\ + col column to which move the cursor" STRING_SET_HELP, "Displays, sets, or removes environment variables.\n\n\ SET [variable[=][string]]\n\n\ @@ -498,7 +498,7 @@ STRING_WINDOW_HELP2, "change console window aspect\n\n\ ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ -window tile of window on wich perform actions\n\ +window tile of window on which perform actions\n\ /POS specify window placement and dimensions\n\ MIN minimize the window\n\ MAX maximize the window\n\ @@ -531,7 +531,7 @@ GOTO Directs the ReactOS command interpreter to a labeled line in\n\ a batch program.\n\ HELP Provides Help information for ReactOS commands.\n\ -HISTORY List alle commands which has been used\n\ +HISTORY List all commands which has been used\n\ IF Performs conditional processing in batch programs.\n\ LABEL Creates, changes, or deletes the volume label of a disk.\n\ MD Creates a directory.\n\ @@ -599,7 +599,7 @@ STRING_ERROR_ERROR2, "Syntax error" STRING_FOR_ERROR1, "'in' missing in for statement." STRING_FOR_ERROR2, "no brackets found." -STRING_FOR_ERROR3, "'do' missing." +STRING_FOR_ERROR3, "'do' missing." STRING_FOR_ERROR4, "no command after 'do'." STRING_FREE_ERROR1, "Invalid drive" STRING_FREE_ERROR2, "unlabeled"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs