Ros-diffs May 2013

ros-diffs@reactos.org

16 participants
234 discussions

[hbelusca] 59100: Let's try to fix GCC builds on Linux bots.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed May 29 00:44:18 2013 New Revision: 59100 URL: http://svn.reactos.org/svn/reactos?rev=59100&view=rev Log: Let's try to fix GCC builds on Linux bots. Modified: trunk/reactos/win32ss/user/consrv/CMakeLists.txt Modified: trunk/reactos/win32ss/user/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/CMakeL… ============================================================================== --- trunk/reactos/win32ss/user/consrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/consrv/CMakeLists.txt [iso-8859-1] Wed May 29 00:44:18 2013 @@ -36,11 +36,11 @@ # FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(MSVC) ## NOTE: No need to specify it as we use MSVC :) - #add_target_compile_flags(consrv "/Ze") - ##set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Ze") + ##add_target_compile_flags(consrv "/Ze") + #set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Ze") else() - add_target_compile_flags(consrv "-fms-extensions") - #set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fms-extensions") + #add_target_compile_flags(consrv "-fms-extensions") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fms-extensions") endif() target_link_libraries(consrv win32ksys ${PSEH_LIB} uuid) # win32ksys because of NtUser...()

11 years, 6 months

[hbelusca] 59099: [CONSOLE.CPL-KERNEL32] Fix some compilation warnings with MSVC. [KERNEL32-CONSRV] - Implement console graphics screen buffers, as described in http://blog.airesoft.co.uk/2012/10/t...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed May 29 00:29:07 2013 New Revision: 59099 URL: http://svn.reactos.org/svn/reactos?rev=59099&view=rev Log: [CONSOLE.CPL-KERNEL32] Fix some compilation warnings with MSVC. [KERNEL32-CONSRV] - Implement console graphics screen buffers, as described in http://blog.airesoft.co.uk/2012/10/things-ms-can-do-that-they-dont-tell-you… . The idea is that the console server creates a memory shared section to be shared with the client console application (it increases performance). A mutex is used to "say" to the console server that he can repaint the screen. The function InvalidateConsoleDIBits is implemented too. The definition of the structure CONSOLE_GRAPHICS_BUFFER_INFO comes directly from the site. - CreateConsoleScreenBuffer was modified to be able to create such buffers. This is needed for a working NTVDM-like application. [CONSRV] - Rework the console buffer structures so that text-mode buffers and graphics-mode buffers can "inherit" from an "abstract" structure, CONSOLE_SCREEN_BUFFER. Add few helper functions for manipulating them. - Reorganize the output code in "graphics.c" and "text.c" files to separate text-mode only code from graphics-mode only code, both in the console server and in the GUI front-end. Other fixes: - Fix mouse handling (left and right clicks when one goes away from the "Selection" mode); do not handle mouse signal when we reactivate the GUI front-end window by a click. - Fix GetLargestConsoleWindowSize API in console server side. Now pressing Alt+F9 in Far Manager to "change" the "video" mode works correctly. Finally: - Start to implement a (fake, i.e. not using directly a VGA driver) console fullscreen mode. Currently Alt-Enter key presses call a stub which just alternates DPRINTing between "switch to fullscreen mode" and "switch to windowed mode". Images here: - Example of an application (a 16-bit emulator by Mysoft) which uses the console graphics screen-buffer functionality: http://img577.imageshack.us/img577/1693/mysoftemulatorargon.png - A potpourri of console applications which use graphics screen-buffers: http://img571.imageshack.us/img571/6526/consoledelirium.png Enjoy :) Added: trunk/reactos/win32ss/user/consrv/frontends/gui/graphics.c (with props) trunk/reactos/win32ss/user/consrv/frontends/gui/text.c (with props) trunk/reactos/win32ss/user/consrv/graphics.c (with props) trunk/reactos/win32ss/user/consrv/text.c (with props) Modified: trunk/reactos/dll/cpl/console/console.c trunk/reactos/dll/cpl/console/layout.c trunk/reactos/dll/cpl/console/options.c trunk/reactos/dll/win32/kernel32/client/console/console.c trunk/reactos/dll/win32/kernel32/client/console/history.c trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/wincon.h trunk/reactos/include/reactos/subsys/win/conmsg.h trunk/reactos/win32ss/user/consrv/CMakeLists.txt trunk/reactos/win32ss/user/consrv/api.h trunk/reactos/win32ss/user/consrv/coninput.c trunk/reactos/win32ss/user/consrv/conio.h trunk/reactos/win32ss/user/consrv/conoutput.c trunk/reactos/win32ss/user/consrv/conoutput.h trunk/reactos/win32ss/user/consrv/console.c trunk/reactos/win32ss/user/consrv/consrv.h trunk/reactos/win32ss/user/consrv/frontends/gui/guisettings.c trunk/reactos/win32ss/user/consrv/frontends/gui/guisettings.h trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/consrv/frontends/tui/tuiterm.c trunk/reactos/win32ss/user/consrv/handle.c trunk/reactos/win32ss/user/consrv/include/conio.h trunk/reactos/win32ss/user/consrv/include/settings.h trunk/reactos/win32ss/user/consrv/init.c trunk/reactos/win32ss/user/consrv/lineinput.c trunk/reactos/win32ss/user/consrv/settings.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.c?… Modified: trunk/reactos/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r… Modified: trunk/reactos/dll/cpl/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/options.c?… Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/console/history.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… Modified: trunk/reactos/win32ss/user/consrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/CMakeL… Modified: trunk/reactos/win32ss/user/consrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/api.h?… Modified: trunk/reactos/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/coninp… Modified: trunk/reactos/win32ss/user/consrv/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conio.… Modified: trunk/reactos/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conout… Modified: trunk/reactos/win32ss/user/consrv/conoutput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/conout… Modified: trunk/reactos/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consol… Modified: trunk/reactos/win32ss/user/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/consrv… Added: trunk/reactos/win32ss/user/consrv/frontends/gui/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Modified: trunk/reactos/win32ss/user/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Modified: trunk/reactos/win32ss/user/consrv/frontends/gui/guisettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Modified: trunk/reactos/win32ss/user/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Added: trunk/reactos/win32ss/user/consrv/frontends/gui/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Modified: trunk/reactos/win32ss/user/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/fronte… Added: trunk/reactos/win32ss/user/consrv/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/graphi… Modified: trunk/reactos/win32ss/user/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/handle… Modified: trunk/reactos/win32ss/user/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/includ… Modified: trunk/reactos/win32ss/user/consrv/include/settings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/includ… Modified: trunk/reactos/win32ss/user/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/init.c… Modified: trunk/reactos/win32ss/user/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/linein… Modified: trunk/reactos/win32ss/user/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/settin… Added: trunk/reactos/win32ss/user/consrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/consrv/text.c…

11 years, 6 months

[gadamopoulos] 59098: [uxtheme] - Fix almost all of the (few) tests for uxtheme - Do not allow opening or enumerating themes when the themes service is not running

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue May 28 19:19:29 2013 New Revision: 59098 URL: http://svn.reactos.org/svn/reactos?rev=59098&view=rev Log: [uxtheme] - Fix almost all of the (few) tests for uxtheme - Do not allow opening or enumerating themes when the themes service is not running Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c trunk/reactos/dll/win32/uxtheme/system.c trunk/reactos/dll/win32/uxtheme/themehooks.c trunk/reactos/dll/win32/uxtheme/uxthemep.h Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] Tue May 28 19:19:29 2013 @@ -81,6 +81,9 @@ LPWSTR pszSelectedSize = NULL; LPWSTR tmp; + if (!gbThemeHooksActive) + return E_FAIL; + TRACE("Opening %s\n", debugstr_w(lpThemeFile)); hTheme = LoadLibraryExW(lpThemeFile, NULL, LOAD_LIBRARY_AS_DATAFILE); @@ -168,6 +171,9 @@ (*tf)->pszSelectedColor = pszSelectedColor; (*tf)->pszSelectedSize = pszSelectedSize; (*tf)->dwRefCount = 1; + + TRACE("Theme %p refcount: %d\n", *tf, (*tf)->dwRefCount); + return S_OK; invalid_theme: @@ -183,7 +189,10 @@ void MSSTYLES_CloseThemeFile(PTHEME_FILE tf) { if(tf) { + tf->dwRefCount--; + TRACE("Theme %p refcount: %d\n", tf, tf->dwRefCount); + if(!tf->dwRefCount) { if(tf->hTheme) FreeLibrary(tf->hTheme); if(tf->classes) { @@ -218,6 +227,7 @@ HRESULT MSSTYLES_ReferenceTheme(PTHEME_FILE tf) { tf->dwRefCount++; + TRACE("Theme %p refcount: %d\n", tf, tf->dwRefCount); return S_OK; } @@ -774,6 +784,7 @@ TRACE("Opened app %s, class %s from list %s\n", debugstr_w(cls->szAppName), debugstr_w(cls->szClassName), debugstr_w(pszClassList)); cls->tf = tf; cls->tf->dwRefCount++; + TRACE("Theme %p refcount: %d\n", tf, tf->dwRefCount); } return cls; } Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Tue May 28 19:19:29 2013 @@ -50,8 +50,6 @@ static ATOM atSubIdList; ATOM atWndContrext; -static BOOL bThemeActive = FALSE; - static PTHEME_FILE ActiveThemeFile; /***********************************************************************/ @@ -155,6 +153,7 @@ WCHAR szCurrentTheme[MAX_PATH]; WCHAR szCurrentColor[64]; WCHAR szCurrentSize[64]; + BOOL bThemeActive = FALSE; if(bLoad == TRUE) { @@ -472,24 +471,26 @@ WCHAR tmp[2]; HRESULT hr; - if(tf && !bThemeActive) UXTHEME_BackupSystemMetrics(); + if (tf && !ActiveThemeFile) + { + UXTHEME_BackupSystemMetrics(); + } + hr = UXTHEME_SetActiveTheme(tf); - if(FAILED(hr)) + if (FAILED(hr)) return hr; - if(tf) { - bThemeActive = TRUE; - } - else { + + if (!tf) + { UXTHEME_RestoreSystemMetrics(); - bThemeActive = FALSE; } TRACE("Writing theme config to registry\n"); if(!RegCreateKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { - tmp[0] = bThemeActive?'1':'0'; + tmp[0] = ActiveThemeFile?'1':'0'; tmp[1] = '\0'; RegSetValueExW(hKey, szThemeActive, 0, REG_SZ, (const BYTE*)tmp, sizeof(WCHAR)*2); - if(bThemeActive) { + if (ActiveThemeFile) { RegSetValueExW(hKey, szColorName, 0, REG_SZ, (const BYTE*)tf->pszSelectedColor, (lstrlenW(tf->pszSelectedColor)+1)*sizeof(WCHAR)); RegSetValueExW(hKey, szSizeName, 0, REG_SZ, (const BYTE*)tf->pszSelectedSize, @@ -545,17 +546,42 @@ */ BOOL WINAPI IsAppThemed(void) { - return IsThemeActive(); -} - -/*********************************************************************** - * IsThemeActive (UXTHEME.@) - */ -BOOL WINAPI IsThemeActive(void) -{ TRACE("\n"); SetLastError(ERROR_SUCCESS); - return bThemeActive; + return (ActiveThemeFile != NULL); +} + +/*********************************************************************** + * IsThemeActive (UXTHEME.@) + */ +BOOL WINAPI IsThemeActive(void) +{ + BOOL bActive; + LRESULT Result; + HKEY hKey; + WCHAR tmp[10]; + DWORD buffsize; + + TRACE("\n"); + SetLastError(ERROR_SUCCESS); + + if (ActiveThemeFile) + return TRUE; + + if (gbThemeHooksActive) + return FALSE; + + bActive = FALSE; + Result = RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey); + if (Result == ERROR_SUCCESS) + { + buffsize = sizeof(tmp)/sizeof(tmp[0]); + if (!RegQueryValueExW(hKey, szThemeActive, NULL, NULL, (LPBYTE)tmp, &buffsize)) + bActive = (tmp[0] != '0'); + RegCloseKey(hKey); + } + + return bActive; } /*********************************************************************** @@ -571,14 +597,14 @@ TRACE("(%d)\n", fEnable); - if(fEnable != bThemeActive) { + if (fEnable != (ActiveThemeFile != NULL)) { if(fEnable) UXTHEME_BackupSystemMetrics(); else UXTHEME_RestoreSystemMetrics(); UXTHEME_SaveSystemMetrics (); - bThemeActive = fEnable; - if(bThemeActive) szEnabled[0] = '1'; + + if (fEnable) szEnabled[0] = '1'; if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { RegSetValueExW(hKey, szThemeActive, 0, REG_SZ, (LPBYTE)szEnabled, sizeof(WCHAR)); RegCloseKey(hKey); @@ -641,7 +667,7 @@ if(flags) FIXME("unhandled flags: %x\n", flags); - if(bThemeActive) + if (ThemeFile) { pszAppName = UXTHEME_GetWindowProperty(hwnd, atSubAppName, szAppBuff, sizeof(szAppBuff)/sizeof(szAppBuff[0])); /* If SetWindowTheme was used on the window, that overrides the class list passed to this function */ @@ -650,10 +676,24 @@ pszUseClassList = pszClassList; if (pszUseClassList) + { + if (!ThemeFile->classes) + MSSTYLES_ParseThemeIni(ThemeFile); hTheme = MSSTYLES_OpenThemeClass(ThemeFile, pszAppName, pszUseClassList); - } + } + } + if(IsWindow(hwnd)) + { SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme), hTheme); + } + else + { + SetLastError(E_PROP_ID_UNSUPPORTED); + } + + SetLastError(hTheme ? ERROR_SUCCESS : E_PROP_ID_UNSUPPORTED); + TRACE(" = %p\n", hTheme); return hTheme; } @@ -667,15 +707,11 @@ } /*********************************************************************** - * OpenThemeDataEx (UXTHEME.16) + * OpenThemeDataFromFile (UXTHEME.16) */ HTHEME WINAPI OpenThemeDataFromFile(HTHEMEFILE hThemeFile, HWND hwnd, LPCWSTR pszClassList, DWORD flags) { - PTHEME_FILE ThemeFile = (PTHEME_FILE)hThemeFile; - - MSSTYLES_ParseThemeIni(ThemeFile); - - return OpenThemeDataInternal(ThemeFile, hwnd, pszClassList, flags); + return OpenThemeDataInternal((PTHEME_FILE)hThemeFile, hwnd, pszClassList, flags); } /*********************************************************************** @@ -700,8 +736,12 @@ HTHEME WINAPI GetWindowTheme(HWND hwnd) { TRACE("(%p)\n", hwnd); + if(!IsWindow(hwnd)) + { SetLastError(E_HANDLE); + return NULL; + } return GetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme)); } @@ -719,12 +759,16 @@ debugstr_w(pszSubIdList)); if(!IsWindow(hwnd)) - return E_HANDLE; + return E_HANDLE; hr = UXTHEME_SetWindowProperty(hwnd, atSubAppName, pszSubAppName); - if(SUCCEEDED(hr)) - hr = UXTHEME_SetWindowProperty(hwnd, atSubIdList, pszSubIdList); - if(SUCCEEDED(hr)) + if (!SUCCEEDED(hr)) + return hr; + + hr = UXTHEME_SetWindowProperty(hwnd, atSubIdList, pszSubIdList); + if (!SUCCEEDED(hr)) + return hr; + UXTHEME_broadcast_msg (hwnd, WM_THEMECHANGED); return hr; } @@ -741,7 +785,7 @@ if(ActiveThemeFile == NULL) return E_PROP_ID_UNSUPPORTED; - if(pszThemeFileName) + if (pszThemeFileName && dwMaxNameChars) { cchar = lstrlenW(ActiveThemeFile->szThemeFile) + 1; if(cchar > dwMaxNameChars) @@ -749,7 +793,7 @@ lstrcpynW(pszThemeFileName, ActiveThemeFile->szThemeFile, cchar); } - if(pszColorBuff) + if (pszColorBuff && cchMaxColorChars) { cchar = lstrlenW(ActiveThemeFile->pszSelectedColor) + 1; if(cchar > cchMaxColorChars) @@ -757,7 +801,7 @@ lstrcpynW(pszColorBuff, ActiveThemeFile->pszSelectedColor, cchar); } - if(pszSizeBuff) + if (pszSizeBuff && cchMaxSizeChars) { cchar = lstrlenW(ActiveThemeFile->pszSelectedSize) + 1; if(cchar > cchMaxSizeChars) Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] Tue May 28 19:19:29 2013 @@ -11,16 +11,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); - - -extern HINSTANCE hDllInst; - -LRESULT CALLBACK ThemeWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, WNDPROC DefWndProc); - USERAPIHOOK user32ApiHook; BYTE gabDWPmessages[UAHOWP_MAX_SIZE]; BYTE gabMSGPmessages[UAHOWP_MAX_SIZE]; - +BOOL gbThemeHooksActive = FALSE; PWND_CONTEXT ThemeGetWndContext(HWND hWnd) { @@ -266,13 +260,15 @@ BOOL CALLBACK ThemeInitApiHook(UAPIHK State, PUSERAPIHOOK puah) { - /* Sanity checks for the caller */ if (!puah || State != uahLoadInit) { UXTHEME_LoadTheme(FALSE); ThemeCleanupWndContext(NULL, 0); + gbThemeHooksActive = FALSE; return TRUE; } + + gbThemeHooksActive = TRUE; /* Store the original functions from user32 */ user32ApiHook = *puah; Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] Tue May 28 19:19:29 2013 @@ -199,14 +199,17 @@ /* Minimum size of the rectangle between the arrows */ #define SCROLL_MIN_RECT 4 +LRESULT CALLBACK ThemeWndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, WNDPROC DefWndProc); void ThemeDrawScrollBar(PDRAW_CONTEXT pcontext, INT Bar, POINT* pt); VOID NC_TrackScrollBar(HWND Wnd, WPARAM wParam, POINT Pt); void ThemeInitDrawContext(PDRAW_CONTEXT pcontext, HWND hWnd, HRGN hRgn); void ThemeCleanupDrawContext(PDRAW_CONTEXT pcontext); PWND_CONTEXT ThemeGetWndContext(HWND hWnd); +extern HINSTANCE hDllInst; extern ATOM atWindowTheme; extern ATOM atWndContrext; +extern BOOL gbThemeHooksActive; void UXTHEME_InitSystem(HINSTANCE hInst); void UXTHEME_LoadTheme(BOOL bLoad);

11 years, 6 months

[ekohl] 59097: [SAMSRV] - SamrCreateUser2InDomain2: Set the logon hours attribute. - Implement SamrConnect2.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue May 28 17:29:57 2013 New Revision: 59097 URL: http://svn.reactos.org/svn/reactos?rev=59097&view=rev Log: [SAMSRV] - SamrCreateUser2InDomain2: Set the logon hours attribute. - Implement SamrConnect2. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Tue May 28 17:29:57 2013 @@ -7638,6 +7638,7 @@ SAM_USER_FIXED_DATA FixedUserData; PSAM_DB_OBJECT DomainObject; PSAM_DB_OBJECT UserObject; + UCHAR LogonHours[23]; ULONG ulSize; ULONG ulRid; WCHAR szRid[9]; @@ -7898,7 +7899,21 @@ return Status; } - /* FIXME: Set LogonHours attribute*/ + /* Set LogonHours attribute*/ + *((PUSHORT)LogonHours) = 168; + memset(&(LogonHours[2]), 0xff, 21); + + Status = SampSetObjectAttribute(UserObject, + L"LogonHours", + REG_BINARY, + &LogonHours, + sizeof(LogonHours)); + if (!NT_SUCCESS(Status)) + { + TRACE("failed with status 0x%08lx\n", Status); + return Status; + } + /* FIXME: Set Groups attribute*/ /* Set LMPwd attribute*/ @@ -8088,6 +8103,7 @@ return STATUS_NOT_IMPLEMENTED; } + /* Function 57 */ NTSTATUS NTAPI @@ -8095,8 +8111,11 @@ OUT SAMPR_HANDLE *ServerHandle, IN ACCESS_MASK DesiredAccess) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + TRACE("(%p %p %lx)\n", ServerName, ServerHandle, DesiredAccess); + + return SamrConnect(ServerName, + ServerHandle, + DesiredAccess); }

11 years, 7 months

[cwittich] 59096: [DEVMGR] reboot instead of shutdown after driver update

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue May 28 17:18:41 2013 New Revision: 59096 URL: http://svn.reactos.org/svn/reactos?rev=59096&view=rev Log: [DEVMGR] reboot instead of shutdown after driver update Modified: trunk/reactos/dll/win32/devmgr/advprop.c Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Tue May 28 17:18:41 2013 @@ -597,7 +597,7 @@ } /* Finally shut down the system */ - if(!ExitWindowsEx(EWX_POWEROFF, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | SHTDN_REASON_FLAG_PLANNED)) + if(!ExitWindowsEx(EWX_REBOOT, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | SHTDN_REASON_FLAG_PLANNED)) { DPRINT("ExitWindowsEx failed\n"); break;

11 years, 7 months

[ekohl] 59095: [DEVMGR] Add the driver update pushbutton to the remaining languages. Please keep all languages synchronized!!!!!

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon May 27 21:30:17 2013 New Revision: 59095 URL: http://svn.reactos.org/svn/reactos?rev=59095&view=rev Log: [DEVMGR] Add the driver update pushbutton to the remaining languages. Please keep all languages synchronized!!!!! Modified: trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc trunk/reactos/dll/win32/devmgr/lang/el-GR.rc trunk/reactos/dll/win32/devmgr/lang/en-US.rc trunk/reactos/dll/win32/devmgr/lang/es-ES.rc trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc trunk/reactos/dll/win32/devmgr/lang/he-IL.rc trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc trunk/reactos/dll/win32/devmgr/lang/id-ID.rc trunk/reactos/dll/win32/devmgr/lang/it-IT.rc trunk/reactos/dll/win32/devmgr/lang/no-NO.rc trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc Modified: trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/bg-BG.rc [iso-8859-1] Mon May 27 21:30:17 2013 @@ -175,6 +175,8 @@ EDITTEXT IDC_DIGITALSIGNER, 105, 81, 140, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "ÐÐ¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸ Ð·Ð° Ð²Ð¾Ð´Ð°ÑÐ°...", IDC_DRIVERDETAILS, 7, 106, 95, 15 LTEXT "ÐÐ¾ÐºÐ°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸ Ð·Ð° ÑÐ°Ð¹Ð»Ð¾Ð²ÐµÑÐµ Ð½Ð° Ð²Ð¾Ð´Ð°ÑÐ°.", -1, 105, 110, 141, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 95, 15 + LTEXT "Update the device driver.", -1, 105, 130, 141, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc [iso-8859-1] Mon May 27 21:30:17 2013 @@ -174,8 +174,10 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "DigitÃ¡lnÃ podpis:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Detaily ovladaÄe...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + PUSHBUTTON "&Detaily ovladaÄe...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "ZobrazÃ detaily souborÅ¯ ovladaÄe.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/el-G… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/el-GR.rc [iso-8859-1] Mon May 27 21:30:17 2013 @@ -171,8 +171,10 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Digital Signer:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&ÎÎµÏÏÎ¿Î¼ÎÏÎµÎ¹ÎµÏ Î¿Î´Î·Î³Î¿Ï...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + PUSHBUTTON "&ÎÎµÏÏÎ¿Î¼ÎÏÎµÎ¹ÎµÏ Î¿Î´Î·Î³Î¿Ï...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "To view details about the driver files.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/en-US.rc [iso-8859-1] Mon May 27 21:30:17 2013 @@ -172,10 +172,10 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Digital Signer:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Driver Details", IDC_DRIVERDETAILS, 7, 106, 75, 15 + PUSHBUTTON "&Driver Details...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "To view details about the driver files.", -1, 91, 110, 154, 17, SS_NOPREFIX PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 - LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX + LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/es-ES.rc [iso-8859-1] Mon May 27 21:30:17 2013 @@ -174,6 +174,8 @@ EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "&Detalles del controlador...", IDC_DRIVERDETAILS, 7, 106, 90, 15 LTEXT "Ver detalles de los archivos del controlador.", -1, 100, 110, 150, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 90, 15 + LTEXT "Update the device driver.", -1, 100, 130, 150, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/fr-FR.rc [iso-8859-1] Mon May 27 21:30:17 2013 @@ -170,8 +170,10 @@ EDITTEXT IDC_DRVVERSION, 120, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Signature numÃ©rique :", -1, 37, 81, 80, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 120, 81, 126, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&DÃ©tails...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + PUSHBUTTON "&DÃ©tails...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "Voir les dÃ©tails Ã propos des fichiers du Pilote.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/he-IL.rc [iso-8859-1] Mon May 27 21:30:17 2013 @@ -172,8 +172,10 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "×××¦×¨ ××ª××× ××××××××ª:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "×¤×¨×× ×× ×× ×××ª×§×...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + PUSHBUTTON "×¤×¨×× ×× ×× ×××ª×§×...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "××©× ××¦××ª ×¤×¨××× ×××××ª ×§××¦× ×× ×× ×××ª×§×.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/hu-H… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/hu-HU.rc [iso-8859-1] Mon May 27 21:30:17 2013 @@ -170,8 +170,10 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Digital Signer:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Driver Details...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + PUSHBUTTON "&Driver Details...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "To view details about the driver files.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/id-ID.rc [iso-8859-1] Mon May 27 21:30:17 2013 @@ -171,8 +171,10 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Penanda tangan Digital:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "Rincian &Driver...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + PUSHBUTTON "Rincian &Driver...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "Untuk melihat rincian tetang file driver.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/it-IT.rc [iso-8859-1] Mon May 27 21:30:17 2013 @@ -171,8 +171,10 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Firmatario digitale:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "Dettagli del &Driver...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + PUSHBUTTON "Dettagli del &Driver...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "Per vedere i dettagli sui file del driver.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/no-NO.rc [iso-8859-1] Mon May 27 21:30:17 2013 @@ -171,8 +171,10 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Digital signert:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Driver detaljer...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + PUSHBUTTON "&Driver detaljer...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "For Ã¥ vise detaljer om driver filene.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc [iso-8859-1] Mon May 27 21:30:17 2013 @@ -179,8 +179,10 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Podpis cyfrowy:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&SzczegÃ³Åy sterownika...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + PUSHBUTTON "&SzczegÃ³Åy sterownika...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "WyÅwietla informacje szczegÃ³Åowe.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pt-B… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/pt-BR.rc [iso-8859-1] Mon May 27 21:30:17 2013 @@ -171,8 +171,10 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "SignatÃ¡rio Digital:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Detalhes do driver...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + PUSHBUTTON "&Detalhes do driver...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "Exibir detalhes sobre os arquivos de driver.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc [iso-8859-1] Mon May 27 21:30:17 2013 @@ -172,8 +172,10 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Semnatar digital:", -1, 37, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Detaliiâ¦", IDC_DRIVERDETAILS, 7, 106, 70, 15 + PUSHBUTTON "&Detaliiâ¦", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "Mai multe detalii despre modulele pilot.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] Mon May 27 21:30:17 2013 @@ -169,8 +169,10 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Ð¦Ð¸ÑÑÐ¾Ð²Ð°Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑ:", -1, 7, 81, 80, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + PUSHBUTTON "&Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "ÐÑÐ¾ÑÐ¼Ð¾ÑÑ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ð¹ Ð¾ ÑÐ°Ð¹Ð»Ð°Ñ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ¾Ð².", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/sk-SK.rc [iso-8859-1] Mon May 27 21:30:17 2013 @@ -174,8 +174,10 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "DigitÃ¡lne podpÃsal:", -1, 34, 81, 60, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&Driver Details...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + PUSHBUTTON "&Driver Details...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "To view details about the driver files.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230 Modified: trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/uk-UA.rc [iso-8859-1] Mon May 27 21:30:17 2013 @@ -177,8 +177,10 @@ EDITTEXT IDC_DRVVERSION, 100, 67, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY LTEXT "Ð¦Ð¸ÑÑÐ¾Ð²Ð¸Ð¹ Ð¿ÑÐ´Ð¿Ð¸Ñ:", -1, 4, 81, 65, 8, SS_NOPREFIX EDITTEXT IDC_DIGITALSIGNER, 100, 81, 145, 12, NOT WS_TABSTOP | NOT WS_BORDER | ES_AUTOHSCROLL | ES_READONLY - PUSHBUTTON "&ÐÑÐ´Ð¾Ð¼Ð¾ÑÑÑ...", IDC_DRIVERDETAILS, 7, 106, 70, 15 + PUSHBUTTON "&ÐÑÐ´Ð¾Ð¼Ð¾ÑÑÑ...", IDC_DRIVERDETAILS, 7, 106, 75, 15 LTEXT "ÐÐµÑÐµÐ³Ð»ÑÐ´ Ð²ÑÐ´Ð¾Ð¼Ð¾ÑÑÐµÐ¹ Ð¿ÑÐ¾ ÑÐ°Ð¹Ð»Ð¸ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ°.", -1, 91, 110, 154, 17, SS_NOPREFIX + PUSHBUTTON "&Update Driver...", IDC_UPDATEDRIVER, 7, 126, 75, 15 + LTEXT "Update the device driver.", -1, 91, 130, 154, 17, SS_NOPREFIX END IDD_DRIVERDETAILS DIALOGEX DISCARDABLE 0, 0, 224, 230

11 years, 7 months

[tkreuzer] 59094: [INCLUDE] - Add some missing 64 bit intrinsics - Fix a warning in intsafe.h - Use SAL2 annotations in sspi.h - Fix some annotations

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 27 20:55:23 2013 New Revision: 59094 URL: http://svn.reactos.org/svn/reactos?rev=59094&view=rev Log: [INCLUDE] - Add some missing 64 bit intrinsics - Fix a warning in intsafe.h - Use SAL2 annotations in sspi.h - Fix some annotations Modified: trunk/reactos/include/crt/msc/intrin.h trunk/reactos/include/ndk/obfuncs.h trunk/reactos/include/psdk/intsafe.h trunk/reactos/include/xdk/sspi.h Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Mon May 27 20:55:23 2013 @@ -191,6 +191,12 @@ #pragma intrinsic(_BitScanForward) unsigned char _BitScanReverse(unsigned long * Index, unsigned long Mask); #pragma intrinsic(_BitScanReverse) +#ifdef _WIN64 +unsigned char _BitScanForward64(unsigned long * Index, unsigned long long Mask); +#pragma intrinsic(_BitScanForward64) +unsigned char _BitScanReverse64(unsigned long * Index, unsigned long long Mask); +#pragma intrinsic(_BitScanReverse64) +#endif unsigned char _bittest(const long * a, long b); #pragma intrinsic(_bittest) unsigned char _bittestandcomplement(long * a, long b); Modified: trunk/reactos/include/ndk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/obfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/obfuncs.h [iso-8859-1] Mon May 27 20:55:23 2013 @@ -74,7 +74,7 @@ ObCreateObjectType( _In_ PUNICODE_STRING TypeName, _In_ POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, - _In_ PVOID Reserved, + _Reserved_ PVOID Reserved, _Out_ POBJECT_TYPE *ObjectType ); @@ -111,7 +111,7 @@ _In_ KPROCESSOR_MODE AccessMode, _In_opt_ PACCESS_STATE PassedAccessState, _In_ ACCESS_MASK DesiredAccess, - _Inout_ PVOID ParseContext, + _Inout_opt_ PVOID ParseContext, _Out_ PHANDLE Handle ); Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Mon May 27 20:55:23 2013 @@ -340,7 +340,7 @@ _In_ _TypeFrom Input, \ _Out_ _Deref_out_range_(==, Input) _TypeTo *pOutput) \ { \ - if ((Input >= 0) && (Input <= _TypeTo ## _MAX)) \ + if ((Input >= 0) && ((_TypeTo)Input <= _TypeTo ## _MAX)) \ { \ *pOutput = (_TypeTo)Input; \ return INTSAFE_SUCCESS; \ @@ -694,7 +694,7 @@ #define DEFINE_SAFE_MULT_U32(_Name, _Type, _Convert) \ -__checkReturn \ +_Must_inspect_result_ \ __forceinline \ INTSAFE_RESULT \ INTSAFE_NAME(_Name)( \ Modified: trunk/reactos/include/xdk/sspi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/sspi.h?rev=590… ============================================================================== --- trunk/reactos/include/xdk/sspi.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/sspi.h [iso-8859-1] Mon May 27 20:55:23 2013 @@ -379,7 +379,7 @@ #ifdef MIDL_PASS MIDL_PROP([size_is(cbBuffer)]) PCHAR pvBuffer; #else - __field_bcount(cbBuffer) void SEC_FAR *pvBuffer; + _Field_size_bytes_(cbBuffer) void SEC_FAR *pvBuffer; #endif } SecBuffer, *PSecBuffer; @@ -387,7 +387,7 @@ { ULONG ulVersion; ULONG cBuffers; - MIDL_PROP([size_is(cBuffers)]) __field_ecount(cBuffers) PSecBuffer pBuffers; + MIDL_PROP([size_is(cBuffers)]) _Field_size_(cBuffers) PSecBuffer pBuffers; } SecBufferDesc, SEC_FAR *PSecBufferDesc; typedef struct _SecPkgInfoW @@ -498,17 +498,17 @@ typedef struct _SecPkgContext_SessionKey { ULONG SessionKeyLength; - __field_bcount(SessionKeyLength) PUCHAR SessionKey; + _Field_size_bytes_(SessionKeyLength) PUCHAR SessionKey; } SecPkgContext_SessionKey, *PSecPkgContext_SessionKey; typedef struct _SecPkgContext_NegoKeys { ULONG KeyType; USHORT KeyLength; - __field_bcount(KeyLength) PUCHAR KeyValue; + _Field_size_bytes_(KeyLength) PUCHAR KeyValue; ULONG VerifyKeyType; USHORT VerifyKeyLength; - __field_bcount(VerifyKeyLength) PUCHAR VerifyKeyValue; + _Field_size_bytes_(VerifyKeyLength) PUCHAR VerifyKeyValue; } SecPkgContext_NegoKeys, *PSecPkgContext_NegoKeys; typedef struct _SecPkgContext_DceInfo

11 years, 7 months

[tkreuzer] 59093: [MKHIVE] Fix build and silence MSVC warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 27 20:27:28 2013 New Revision: 59093 URL: http://svn.reactos.org/svn/reactos?rev=59093&view=rev Log: [MKHIVE] Fix build and silence MSVC warnings Modified: trunk/reactos/tools/mkhive/mkhive.h Modified: trunk/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.h?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] Mon May 27 20:27:28 2013 @@ -137,7 +137,12 @@ #include <string.h> #endif//_WIN32 +#ifndef _MSC_VER #define _In_ #define _Out_ +#define _In_opt_ +#define _In_range_(x, y) +#endif +#define __drv_aliasesMem /* EOF */

11 years, 7 months

[tkreuzer] 59092: [RTL] Fix some annotations for bitmap code

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 27 20:20:33 2013 New Revision: 59092 URL: http://svn.reactos.org/svn/reactos?rev=59092&view=rev Log: [RTL] Fix some annotations for bitmap code Modified: trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=59092… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] Mon May 27 20:20:33 2013 @@ -28,7 +28,8 @@ #define RTL_BITMAP_RUN RTL_BITMAP_RUN64 #define PRTL_BITMAP_RUN PRTL_BITMAP_RUN64 #undef BitScanForward -#define BitScanForward BitScanForward64 +#define BitScanForward(Index, Mask) \ + do { unsigned long tmp; BitScanForward64(&tmp, Mask); *Index = tmp; } while (0) #define RtlFillMemoryUlong RtlFillMemoryUlonglong #define RtlInitializeBitMap RtlInitializeBitMap64 @@ -245,8 +246,8 @@ NTAPI RtlInitializeBitMap( _Out_ PRTL_BITMAP BitMapHeader, - _In_ PBITMAP_BUFFER BitMapBuffer, - _In_ BITMAP_INDEX SizeOfBitMap) + _In_opt_ __drv_aliasesMem PBITMAP_BUFFER BitMapBuffer, + _In_opt_ ULONG SizeOfBitMap) { /* Setup the bitmap header */ BitMapHeader->SizeOfBitMap = SizeOfBitMap; @@ -289,7 +290,7 @@ NTAPI RtlSetBit( _In_ PRTL_BITMAP BitMapHeader, - _In_ BITMAP_INDEX BitNumber) + _In_range_(<, BitMapHeader->SizeOfBitMap) BITMAP_INDEX BitNumber) { ASSERT(BitNumber <= BitMapHeader->SizeOfBitMap); BitMapHeader->Buffer[BitNumber / _BITCOUNT] |= ((BITMAP_INDEX)1 << (BitNumber & (_BITCOUNT - 1))); @@ -299,8 +300,8 @@ NTAPI RtlClearBits( _In_ PRTL_BITMAP BitMapHeader, - _In_ BITMAP_INDEX StartingIndex, - _In_ BITMAP_INDEX NumberToClear) + _In_range_(0, BitMapHeader->SizeOfBitMap - NumberToClear) BITMAP_INDEX StartingIndex, + _In_range_(0, BitMapHeader->SizeOfBitMap - StartingIndex) BITMAP_INDEX NumberToClear) { BITMAP_INDEX Bits, Mask; PBITMAP_BUFFER Buffer; @@ -356,8 +357,8 @@ NTAPI RtlSetBits( _In_ PRTL_BITMAP BitMapHeader, - _In_ BITMAP_INDEX StartingIndex, - _In_ BITMAP_INDEX NumberToSet) + _In_range_(0, BitMapHeader->SizeOfBitMap - NumberToSet) BITMAP_INDEX StartingIndex, + _In_range_(0, BitMapHeader->SizeOfBitMap - StartingIndex) BITMAP_INDEX NumberToSet) { BITMAP_INDEX Bits, Mask; PBITMAP_BUFFER Buffer; @@ -413,7 +414,7 @@ NTAPI RtlTestBit( _In_ PRTL_BITMAP BitMapHeader, - _In_ BITMAP_INDEX BitNumber) + _In_range_(<, BitMapHeader->SizeOfBitMap) BITMAP_INDEX BitNumber) { ASSERT(BitNumber < BitMapHeader->SizeOfBitMap); return (BitMapHeader->Buffer[BitNumber / _BITCOUNT] >> (BitNumber & (_BITCOUNT - 1))) & 1;

11 years, 7 months

[tfaber] 59091: [CLASS2] - Add symlink creation support for CDROM devices [USBSTOR] - Simply forward unsupported SCSI operations Fixes USB CDROM support. CORE-6591 #resolve Patch by Johannes "USB G...

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon May 27 18:39:32 2013 New Revision: 59091 URL: http://svn.reactos.org/svn/reactos?rev=59091&view=rev Log: [CLASS2] - Add symlink creation support for CDROM devices [USBSTOR] - Simply forward unsupported SCSI operations Fixes USB CDROM support. CORE-6591 #resolve Patch by Johannes "USB God" Anderwald. Modified: trunk/reactos/drivers/storage/class/class2/class2.c trunk/reactos/drivers/usb/usbstor/scsi.c trunk/reactos/drivers/usb/usbstor/usbstor.h Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Mon May 27 18:39:32 2013 @@ -137,6 +137,7 @@ /* The following hack to assign drive letters with a non-PnP storage stack */ typedef struct _CLASS_DEVICE_INFO { + ULONG DeviceType; ULONG Partitions; ULONG DeviceNumber; ULONG DriveNumber; @@ -205,7 +206,15 @@ do { /* Check that the disk exists */ - PartitionU.Length = swprintf(PartitionU.Buffer, L"\\Device\\HardDisk%d\\Partition0", DeviceNumber) * sizeof(WCHAR); + if (DeviceInfo->DeviceType == FILE_DEVICE_DISK) + { + PartitionU.Length = swprintf(PartitionU.Buffer, L"\\Device\\HardDisk%d\\Partition0", DeviceNumber) * sizeof(WCHAR); + } + else if (DeviceInfo->DeviceType == FILE_DEVICE_CD_ROM) + { + PartitionU.Length = swprintf(PartitionU.Buffer, L"\\Device\\CdRom%d", DeviceNumber) * sizeof(WCHAR); + } + InitializeObjectAttributes(&ObjectAttributes, &PartitionU, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, @@ -233,7 +242,14 @@ do { /* Check that the drive exists */ - PartitionU.Length = swprintf(PartitionU.Buffer, L"\\??\\PhysicalDrive%d", DriveNumber) * sizeof(WCHAR); + if (DeviceInfo->DeviceType == FILE_DEVICE_DISK) + { + PartitionU.Length = swprintf(PartitionU.Buffer, L"\\??\\PhysicalDrive%d", DriveNumber) * sizeof(WCHAR); + } + else if (DeviceInfo->DeviceType == FILE_DEVICE_CD_ROM) + { + PartitionU.Length = swprintf(PartitionU.Buffer, L"\\??\\%C:", ('C' + DriveNumber)) * sizeof(WCHAR); + } InitializeObjectAttributes(&ObjectAttributes, &PartitionU, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, @@ -252,18 +268,36 @@ } } while (Status == STATUS_SUCCESS); + if (DeviceInfo->DeviceType == FILE_DEVICE_DISK) + { + PartitionU.Length = swprintf(PartitionU.Buffer, L"\\Device\\Harddisk%d\\Partition0", DeviceNumber) * sizeof(WCHAR); + DriveLetterU.Length = swprintf(DriveLetterU.Buffer, L"\\??\\PhysicalDrive%d", DriveNumber) * sizeof(WCHAR); + } + else if (DeviceInfo->DeviceType == FILE_DEVICE_CD_ROM) + { + PartitionU.Length = swprintf(PartitionU.Buffer, L"\\Device\\CdRom%d", DeviceNumber) * sizeof(WCHAR); + DriveLetterU.Length = swprintf(DriveLetterU.Buffer, L"\\??\\%C:", ('C' + DriveNumber)) * sizeof(WCHAR); + } + /* Create the symbolic link to PhysicalDriveX */ - PartitionU.Length = swprintf(PartitionU.Buffer, L"\\Device\\Harddisk%d\\Partition0", DeviceNumber) * sizeof(WCHAR); - DriveLetterU.Length = swprintf(DriveLetterU.Buffer, L"\\??\\PhysicalDrive%d", DriveNumber) * sizeof(WCHAR); - Status = IoCreateSymbolicLink(&DriveLetterU, &PartitionU); if (!NT_SUCCESS(Status)) { /* Failed to create symbolic link */ + DbgPrint("Failed to create symbolic link %wZ -> %wZ with %lx\n", &PartitionU, &DriveLetterU, Status); return Status; } DbgPrint("HACK: Created symbolic link %wZ -> %wZ\n", &PartitionU, &DriveLetterU); + + DeviceInfo->DeviceNumber = DeviceNumber; + DeviceInfo->DriveNumber = DriveNumber; + + if (DeviceInfo->DeviceType == FILE_DEVICE_CD_ROM) + { + /* done for cdroms */ + return STATUS_SUCCESS; + } while (TRUE) { @@ -303,9 +337,6 @@ } } - DeviceInfo->DeviceNumber = DeviceNumber; - DeviceInfo->DriveNumber = DriveNumber; - return STATUS_SUCCESS; } @@ -361,7 +392,7 @@ Status = IoCreateDevice(DriverObject, sizeof(CLASS_DEVICE_INFO), NULL, - FILE_DEVICE_DISK, + DriverExtension->InitializationData.DeviceType, 0, FALSE, &DeviceObject); @@ -375,6 +406,7 @@ /* Attach it to the PDO */ DeviceInfo->LowerDevice = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); + DeviceInfo->DeviceType = DriverExtension->InitializationData.DeviceType; /* Check that the kernel has already assigned drive letters */ if (KeLoaderBlock == NULL) Modified: trunk/reactos/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/scsi.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] Mon May 27 18:39:32 2013 @@ -171,7 +171,7 @@ NTAPI USBSTOR_CSWCompletionRoutine( PDEVICE_OBJECT DeviceObject, - PIRP Irp, + PIRP Irp, PVOID Ctx) { PIRP_CONTEXT Context; @@ -430,7 +430,7 @@ NTAPI USBSTOR_DataCompletionRoutine( PDEVICE_OBJECT DeviceObject, - PIRP Irp, + PIRP Irp, PVOID Ctx) { PIRP_CONTEXT Context; @@ -475,7 +475,7 @@ NTAPI USBSTOR_CBWCompletionRoutine( PDEVICE_OBJECT DeviceObject, - PIRP Irp, + PIRP Irp, PVOID Ctx) { PIRP_CONTEXT Context; @@ -509,7 +509,7 @@ { // // write request use bulk out pipe - // + // PipeHandle = Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkOutPipeIndex].PipeHandle; } else @@ -582,7 +582,7 @@ DPRINT("%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", Block[0] & 0xFF, Block[1] & 0xFF, Block[2] & 0xFF, Block[3] & 0xFF, Block[4] & 0xFF, Block[5] & 0xFF, Block[6] & 0xFF, Block[7] & 0xFF, Block[8] & 0xFF, Block[9] & 0xFF, Block[10] & 0xFF, Block[11] & 0xFF, Block[12] & 0xFF, Block[13] & 0xFF, Block[14] & 0xFF, Block[15] & 0xFF, Block[16] & 0xFF, Block[17] & 0xFF, Block[18] & 0xFF, Block[19] & 0xFF, - Block[20] & 0xFF, Block[21] & 0xFF, Block[22] & 0xFF, Block[23] & 0xFF, Block[24] & 0xFF, Block[25] & 0xFF, Block[26] & 0xFF, Block[27] & 0xFF, Block[28] & 0xFF, Block[29] & 0xFF, + Block[20] & 0xFF, Block[21] & 0xFF, Block[22] & 0xFF, Block[23] & 0xFF, Block[24] & 0xFF, Block[25] & 0xFF, Block[26] & 0xFF, Block[27] & 0xFF, Block[28] & 0xFF, Block[29] & 0xFF, Block[30] & 0xFF); } @@ -1079,10 +1079,10 @@ // first struct is the header // MODE_PARAMETER_HEADER / _MODE_PARAMETER_HEADER10 // - // followed by + // followed by // MODE_PARAMETER_BLOCK // - // + // UNIMPLEMENTED // @@ -1258,7 +1258,7 @@ PPDO_DEVICE_EXTENSION PDODeviceExtension; PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK Request; - UFI_TEST_UNIT_CMD Cmd; + UFI_UNKNOWN_CMD Cmd; // // get current stack location @@ -1283,7 +1283,7 @@ // // sanity check // - ASSERT(Request->CdbLength == sizeof(UFI_TEST_UNIT_CMD)); + ASSERT(Request->CdbLength <= sizeof(UFI_UNKNOWN_CMD)); // // initialize test unit cmd @@ -1412,29 +1412,12 @@ // Status = USBSTOR_SendTestUnit(DeviceObject, Irp, RetryCount); } -#if 0 - else if (pCDB->AsByte[0] == SCSIOP_MECHANISM_STATUS) - { - DPRINT1("SCSIOP_MECHANISM_STATUS\n"); - - // - // Just send it the way it is - // + else + { + // Unknown request. Simply forward + DPRINT1("Forwarding unknown Operation Code %x\n", pCDB->AsByte[0]); Status = USBSTOR_SendUnknownRequest(DeviceObject, Irp, RetryCount); } -#endif - else - { - // unsupported request - DPRINT1("UNIMPLEMENTED Operation Code %x\n", pCDB->AsByte[0]); - Status = STATUS_NOT_SUPPORTED; - - Request->SrbStatus = SRB_STATUS_ERROR; - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - USBSTOR_QueueTerminateRequest(PDODeviceExtension->LowerDeviceObject, Irp); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } return Status; } Modified: trunk/reactos/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] Mon May 27 18:39:32 2013 @@ -317,6 +317,12 @@ #define UFI_TEST_UNIT_CMD_LEN (6) +//------------------------------------------------------------------------------------------------------------------------------------------- +typedef struct +{ + UCHAR Bytes[16]; +}UFI_UNKNOWN_CMD, *PUFI_UNKNOWN_CMD; + typedef struct { union @@ -385,7 +391,7 @@ PVOID AllocateItem( - IN POOL_TYPE PoolType, + IN POOL_TYPE PoolType, IN ULONG ItemSize); VOID @@ -406,7 +412,7 @@ NTAPI USBSTOR_SyncForwardIrpCompletionRoutine( PDEVICE_OBJECT DeviceObject, - PIRP Irp, + PIRP Irp, PVOID Context); NTSTATUS @@ -452,7 +458,7 @@ NTAPI USBSTOR_CSWCompletionRoutine( PDEVICE_OBJECT DeviceObject, - PIRP Irp, + PIRP Irp, PVOID Ctx); NTSTATUS

11 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2013