Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 74934: [UXTHEME] -Rename ActiveThemeFile to g_ActiveThemeFile, user32ApiHook to g_user32ApiHook and gbThemeHooksActive to g_bThemeHooksActive.
by gadamopoulos＠svn.reactos.org 07 Jun '17

07 Jun '17

Author: gadamopoulos Date: Wed Jun 7 08:28:14 2017 New Revision: 74934 URL: http://svn.reactos.org/svn/reactos?rev=74934&view=rev Log: [UXTHEME] -Rename ActiveThemeFile to g_ActiveThemeFile, user32ApiHook to g_user32ApiHook and gbThemeHooksActive to g_bThemeHooksActive. 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] Wed Jun 7 08:28:14 2017 @@ -25,10 +25,6 @@ /*********************************************************************** * Defines and global variables */ - -static BOOL MSSTYLES_GetNextInteger(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, int *value); -static BOOL MSSTYLES_GetNextToken(LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LPWSTR lpBuff, DWORD buffSize); -static HRESULT MSSTYLES_GetFont (LPCWSTR lpStringStart, LPCWSTR lpStringEnd, LPCWSTR *lpValEnd, LOGFONTW* logfont); extern int alphaBlendMode; 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] Wed Jun 7 08:28:14 2017 @@ -51,7 +51,7 @@ static ATOM atSubIdList; ATOM atWndContext; -PTHEME_FILE ActiveThemeFile; +PTHEME_FILE g_ActiveThemeFile; RTL_HANDLE_TABLE g_UxThemeHandleTable; int g_cHandles; @@ -131,44 +131,44 @@ static HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) { - if(ActiveThemeFile) - MSSTYLES_CloseThemeFile(ActiveThemeFile); - ActiveThemeFile = tf; - if (ActiveThemeFile) - { - MSSTYLES_ReferenceTheme(ActiveThemeFile); - MSSTYLES_ParseThemeIni(ActiveThemeFile); + if(g_ActiveThemeFile) + MSSTYLES_CloseThemeFile(g_ActiveThemeFile); + g_ActiveThemeFile = tf; + if (g_ActiveThemeFile) + { + MSSTYLES_ReferenceTheme(g_ActiveThemeFile); + MSSTYLES_ParseThemeIni(g_ActiveThemeFile); } return S_OK; } static BOOL bIsThemeActive(LPCWSTR pszTheme, LPCWSTR pszColor, LPCWSTR pszSize) { - if (ActiveThemeFile == NULL) + if (g_ActiveThemeFile == NULL) return FALSE; - if (wcscmp(pszTheme, ActiveThemeFile->szThemeFile) != 0) + if (wcscmp(pszTheme, g_ActiveThemeFile->szThemeFile) != 0) return FALSE; if (!pszColor[0]) { - if (ActiveThemeFile->pszAvailColors != ActiveThemeFile->pszSelectedColor) + if (g_ActiveThemeFile->pszAvailColors != g_ActiveThemeFile->pszSelectedColor) return FALSE; } else { - if (wcscmp(pszColor, ActiveThemeFile->pszSelectedColor) != 0) + if (wcscmp(pszColor, g_ActiveThemeFile->pszSelectedColor) != 0) return FALSE; } if (!pszSize[0]) { - if (ActiveThemeFile->pszAvailSizes != ActiveThemeFile->pszSelectedSize) + if (g_ActiveThemeFile->pszAvailSizes != g_ActiveThemeFile->pszSelectedSize) return FALSE; } else { - if (wcscmp(pszSize, ActiveThemeFile->pszSelectedSize) != 0) + if (wcscmp(pszSize, g_ActiveThemeFile->pszSelectedSize) != 0) return FALSE; } @@ -192,7 +192,7 @@ WCHAR szCurrentSize[64]; BOOL bThemeActive = FALSE; - if(bLoad == TRUE && gbThemeHooksActive) + if(bLoad == TRUE && g_bThemeHooksActive) { /* Get current theme configuration */ if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { @@ -517,7 +517,7 @@ TRACE("UXTHEME_ApplyTheme\n"); - if (tf && !ActiveThemeFile) + if (tf && !g_ActiveThemeFile) { UXTHEME_BackupSystemMetrics(); } @@ -533,10 +533,10 @@ TRACE("Writing theme config to registry\n"); if(!RegCreateKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { - tmp[0] = ActiveThemeFile?'1':'0'; + tmp[0] = g_ActiveThemeFile ? '1' : '0'; tmp[1] = '\0'; RegSetValueExW(hKey, szThemeActive, 0, REG_SZ, (const BYTE*)tmp, sizeof(WCHAR)*2); - if (ActiveThemeFile) { + if (g_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, @@ -597,7 +597,7 @@ { TRACE("\n"); SetLastError(ERROR_SUCCESS); - return (ActiveThemeFile != NULL); + return (g_ActiveThemeFile != NULL); } /*********************************************************************** @@ -614,10 +614,10 @@ TRACE("IsThemeActive\n"); SetLastError(ERROR_SUCCESS); - if (ActiveThemeFile) + if (g_ActiveThemeFile) return TRUE; - if (gbThemeHooksActive) + if (g_bThemeHooksActive) return FALSE; bActive = FALSE; @@ -646,7 +646,7 @@ TRACE("(%d)\n", fEnable); - if (fEnable != (ActiveThemeFile != NULL)) { + if (fEnable != (g_ActiveThemeFile != NULL)) { if(fEnable) UXTHEME_BackupSystemMetrics(); else @@ -718,7 +718,7 @@ { PUXTHEME_HANDLE pHandle; - if (!gbThemeHooksActive || !hTheme || hTheme == INVALID_HANDLE_VALUE) + if (!g_bThemeHooksActive || !hTheme || hTheme == INVALID_HANDLE_VALUE) return NULL; if (!RtlIsValidHandle(&g_UxThemeHandleTable, (PRTL_HANDLE_TABLE_ENTRY)hTheme)) @@ -806,7 +806,7 @@ */ HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags) { - return OpenThemeDataInternal(ActiveThemeFile, hwnd, pszClassList, flags); + return OpenThemeDataInternal(g_ActiveThemeFile, hwnd, pszClassList, flags); } /*********************************************************************** @@ -822,7 +822,7 @@ */ HTHEME WINAPI OpenThemeData(HWND hwnd, LPCWSTR classlist) { - return OpenThemeDataInternal(ActiveThemeFile, hwnd, classlist, 0); + return OpenThemeDataInternal(g_ActiveThemeFile, hwnd, classlist, 0); } /*********************************************************************** @@ -885,31 +885,31 @@ { int cchar; - if(ActiveThemeFile == NULL) + if(g_ActiveThemeFile == NULL) return E_PROP_ID_UNSUPPORTED; if (pszThemeFileName && dwMaxNameChars) { - cchar = lstrlenW(ActiveThemeFile->szThemeFile) + 1; + cchar = lstrlenW(g_ActiveThemeFile->szThemeFile) + 1; if(cchar > dwMaxNameChars) return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); - lstrcpynW(pszThemeFileName, ActiveThemeFile->szThemeFile, cchar); + lstrcpynW(pszThemeFileName, g_ActiveThemeFile->szThemeFile, cchar); } if (pszColorBuff && cchMaxColorChars) { - cchar = lstrlenW(ActiveThemeFile->pszSelectedColor) + 1; + cchar = lstrlenW(g_ActiveThemeFile->pszSelectedColor) + 1; if(cchar > cchMaxColorChars) return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); - lstrcpynW(pszColorBuff, ActiveThemeFile->pszSelectedColor, cchar); + lstrcpynW(pszColorBuff, g_ActiveThemeFile->pszSelectedColor, cchar); } if (pszSizeBuff && cchMaxSizeChars) { - cchar = lstrlenW(ActiveThemeFile->pszSelectedSize) + 1; + cchar = lstrlenW(g_ActiveThemeFile->pszSelectedSize) + 1; if(cchar > cchMaxSizeChars) return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); - lstrcpynW(pszSizeBuff, ActiveThemeFile->pszSelectedSize, cchar); + lstrcpynW(pszSizeBuff, g_ActiveThemeFile->pszSelectedSize, cchar); } return S_OK; @@ -1018,7 +1018,7 @@ TRACE("(%s,%s,%p,%d)\n", debugstr_w(pszThemeName), debugstr_w(pszPropertyName), pszValueBuff, cchMaxValChars); - if (!gbThemeHooksActive) + if (!g_bThemeHooksActive) return E_FAIL; hr = MSSTYLES_OpenThemeFile(pszThemeName, NULL, NULL, &pt); @@ -1094,7 +1094,7 @@ debugstr_w(pszColorName), debugstr_w(pszSizeName), hThemeFile, unknown); - if (!gbThemeHooksActive) + if (!g_bThemeHooksActive) return E_FAIL; return MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, pszSizeName, (PTHEME_FILE*)hThemeFile); @@ -1178,7 +1178,7 @@ pszColorName, dwColorNameLen, pszSizeName, dwSizeNameLen); - if (!gbThemeHooksActive) + if (!g_bThemeHooksActive) return E_FAIL; hr = MSSTYLES_OpenThemeFile(pszThemeFileName, NULL, NULL, &pt); @@ -1299,7 +1299,7 @@ TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName), debugstr_w(pszSizeName), dwColorNum); - if (!gbThemeHooksActive) + if (!g_bThemeHooksActive) return E_FAIL; hr = MSSTYLES_OpenThemeFile(pszThemeFileName, NULL, pszSizeName, &pt); @@ -1362,7 +1362,7 @@ TRACE("(%s,%s,%d)\n", debugstr_w(pszThemeFileName), debugstr_w(pszColorName), dwSizeNum); - if (!gbThemeHooksActive) + if (!g_bThemeHooksActive) return E_FAIL; hr = MSSTYLES_OpenThemeFile(pszThemeFileName, pszColorName, NULL, &pt); @@ -1434,7 +1434,7 @@ HRESULT hr; TRACE("(%s)\n", debugstr_w(pszThemeFileName)); - if (!gbThemeHooksActive) + if (!g_bThemeHooksActive) return E_FAIL; hr = MSSTYLES_OpenThemeFile(pszThemeFileName, NULL, NULL, &pt); 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] Wed Jun 7 08:28:14 2017 @@ -8,11 +8,11 @@ #include "uxthemep.h" -USERAPIHOOK user32ApiHook; +USERAPIHOOK g_user32ApiHook; BYTE gabDWPmessages[UAHOWP_MAX_SIZE]; BYTE gabMSGPmessages[UAHOWP_MAX_SIZE]; BYTE gabDLGPmessages[UAHOWP_MAX_SIZE]; -BOOL gbThemeHooksActive = FALSE; +BOOL g_bThemeHooksActive = FALSE; PWND_DATA ThemeGetWndData(HWND hWnd) { @@ -55,7 +55,7 @@ if(pwndData->HasThemeRgn) { - user32ApiHook.SetWindowRgn(hWnd, 0, TRUE); + g_user32ApiHook.SetWindowRgn(hWnd, 0, TRUE); } if (pwndData->hTabBackgroundBrush != NULL) @@ -192,7 +192,7 @@ DeleteObject(hrgn1); - user32ApiHook.SetWindowRgn(hWnd, hrgn, TRUE); + g_user32ApiHook.SetWindowRgn(hWnd, hrgn, TRUE); } int OnPostWinPosChanged(HWND hWnd, WINDOWPOS* pWinPos) @@ -227,7 +227,7 @@ if(pwndData->HasThemeRgn) { pwndData->HasThemeRgn = FALSE; - user32ApiHook.SetWindowRgn(hWnd, 0, TRUE); + g_user32ApiHook.SetWindowRgn(hWnd, 0, TRUE); } return 0; } @@ -250,7 +250,7 @@ { if(!IsAppThemed()) { - return user32ApiHook.DefWindowProcW(hWnd, + return g_user32ApiHook.DefWindowProcW(hWnd, Msg, wParam, lParam); @@ -260,7 +260,7 @@ Msg, wParam, lParam, - user32ApiHook.DefWindowProcW); + g_user32ApiHook.DefWindowProcW); } static LRESULT CALLBACK @@ -268,7 +268,7 @@ { if(!IsAppThemed()) { - return user32ApiHook.DefWindowProcA(hWnd, + return g_user32ApiHook.DefWindowProcA(hWnd, Msg, wParam, lParam); @@ -278,7 +278,7 @@ Msg, wParam, lParam, - user32ApiHook.DefWindowProcA); + g_user32ApiHook.DefWindowProcA); } static LRESULT CALLBACK @@ -487,7 +487,7 @@ pwndData->HasThemeRgn = FALSE; } - return user32ApiHook.SetWindowRgn(hWnd, hRgn, bRedraw); + return g_user32ApiHook.SetWindowRgn(hWnd, hRgn, bRedraw); } BOOL WINAPI ThemeGetScrollInfo(HWND hwnd, int fnBar, LPSCROLLINFO lpsi) @@ -514,7 +514,7 @@ * with GetScrollInfo, it will get wrong data. So uxtheme needs to * hook it and set the correct tracking position itself */ - ret = user32ApiHook.GetScrollInfo(hwnd, fnBar, lpsi); + ret = g_user32ApiHook.GetScrollInfo(hwnd, fnBar, lpsi); if ( lpsi && (lpsi->fMask & SIF_TRACKPOS) && pwndData->SCROLL_TrackingWin == hwnd && @@ -525,7 +525,7 @@ return ret; dodefault: - return user32ApiHook.GetScrollInfo(hwnd, fnBar, lpsi); + return g_user32ApiHook.GetScrollInfo(hwnd, fnBar, lpsi); } /********************************************************************** @@ -539,14 +539,14 @@ { UXTHEME_LoadTheme(FALSE); ThemeCleanupWndContext(NULL, 0); - gbThemeHooksActive = FALSE; + g_bThemeHooksActive = FALSE; return TRUE; } - gbThemeHooksActive = TRUE; + g_bThemeHooksActive = TRUE; /* Store the original functions from user32 */ - user32ApiHook = *puah; + g_user32ApiHook = *puah; puah->DefWindowProcA = ThemeDefWindowProcA; puah->DefWindowProcW = ThemeDefWindowProcW; @@ -673,9 +673,9 @@ INT WINAPI ClassicSystemParametersInfoW(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni) { - if (gbThemeHooksActive) - { - return user32ApiHook.SystemParametersInfoW(uiAction, uiParam, pvParam, fWinIni); + if (g_bThemeHooksActive) + { + return g_user32ApiHook.SystemParametersInfoW(uiAction, uiParam, pvParam, fWinIni); } return SystemParametersInfoW(uiAction, uiParam, pvParam, fWinIni); @@ -683,9 +683,9 @@ INT WINAPI ClassicSystemParametersInfoA(UINT uiAction, UINT uiParam, PVOID pvParam, UINT fWinIni) { - if (gbThemeHooksActive) - { - return user32ApiHook.SystemParametersInfoA(uiAction, uiParam, pvParam, fWinIni); + if (g_bThemeHooksActive) + { + return g_user32ApiHook.SystemParametersInfoA(uiAction, uiParam, pvParam, fWinIni); } return SystemParametersInfoA(uiAction, uiParam, pvParam, fWinIni); @@ -693,9 +693,9 @@ INT WINAPI ClassicGetSystemMetrics(int nIndex) { - if (gbThemeHooksActive) - { - return user32ApiHook.GetSystemMetrics(nIndex); + if (g_bThemeHooksActive) + { + return g_user32ApiHook.GetSystemMetrics(nIndex); } return GetSystemMetrics(nIndex); @@ -703,9 +703,9 @@ BOOL WINAPI ClassicAdjustWindowRectEx(LPRECT lpRect, DWORD dwStyle, BOOL bMenu, DWORD dwExStyle) { - if (gbThemeHooksActive) - { - return user32ApiHook.AdjustWindowRectEx(lpRect, dwStyle, bMenu, dwExStyle); + if (g_bThemeHooksActive) + { + return g_user32ApiHook.AdjustWindowRectEx(lpRect, dwStyle, bMenu, dwExStyle); } return AdjustWindowRectEx(lpRect, dwStyle, bMenu, dwExStyle); 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] Wed Jun 7 08:28:14 2017 @@ -250,8 +250,7 @@ extern HINSTANCE hDllInst; extern ATOM atWindowTheme; extern ATOM atWndContext; -extern BOOL gbThemeHooksActive; -extern PTHEME_FILE ActiveThemeFile; +extern BOOL g_bThemeHooksActive; void UXTHEME_InitSystem(HINSTANCE hInst); void UXTHEME_LoadTheme(BOOL bLoad);

1 0

[rgampa] 74933: [USBXHCI] -stubplemented all the functions required for USBPORT_REGISTRATION_PACKET -removed usbehci files CORE-13344
by rgampa＠svn.reactos.org 07 Jun '17

07 Jun '17

Author: rgampa Date: Wed Jun 7 06:00:09 2017 New Revision: 74933 URL: http://svn.reactos.org/svn/reactos?rev=74933&view=rev Log: [USBXHCI] -stubplemented all the functions required for USBPORT_REGISTRATION_PACKET -removed usbehci files CORE-13344 Removed: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware_xhci.h branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci_new.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci_new.h Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbmport.h branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/CMakeLists.txt branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/dbg_xhci.h branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/debug.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbmport.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/dbg_xhci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/debug.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Removed: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware_xhci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Removed: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci_new.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… Removed: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci_new.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive…

1 0

[hbelusca] 74932: [USETUP]: When installing new FreeLDR entries for recognized DOS/OS-2 boot loaders, use distinct OS section names. Also, add detection for the Dell Real-Mode Kernel OS (DRMK).
by hbelusca＠svn.reactos.org 06 Jun '17

06 Jun '17

Author: hbelusca Date: Tue Jun 6 23:44:56 2017 New Revision: 74932 URL: http://svn.reactos.org/svn/reactos?rev=74932&view=rev Log: [USETUP]: When installing new FreeLDR entries for recognized DOS/OS-2 boot loaders, use distinct OS section names. Also, add detection for the Dell Real-Mode Kernel OS (DRMK). Modified: branches/setup_improvements/base/setup/usetup/bootsup.c Modified: branches/setup_improvements/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… ============================================================================== --- branches/setup_improvements/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/bootsup.c [iso-8859-1] Tue Jun 6 23:44:56 2017 @@ -2208,7 +2208,7 @@ { DPRINT1("Found COMPAQ MS-DOS 1.x (1.11, 1.12) / MS-DOS 1.25 boot loader\n"); - Section = L"DOS"; + Section = L"CPQDOS"; Description = L"\"COMPAQ MS-DOS 1.x / MS-DOS 1.25\""; BootDrive = L"hd0"; BootPartition = L"1"; @@ -2222,7 +2222,7 @@ { DPRINT1("Found Microsoft DOS or Windows 9x boot loader\n"); - Section = L"DOS"; + Section = L"MSDOS"; Description = L"\"MS-DOS/Windows\""; BootDrive = L"hd0"; BootPartition = L"1"; @@ -2236,7 +2236,7 @@ { DPRINT1("Found IBM PC-DOS or DR-DOS 5.x or IBM OS/2 1.0\n"); - Section = L"DOS"; + Section = L"IBMDOS"; Description = L"\"IBM PC-DOS or DR-DOS 5.x or IBM OS/2 1.0\""; BootDrive = L"hd0"; BootPartition = L"1"; @@ -2249,8 +2249,21 @@ { DPRINT1("Found DR-DOS 3.x\n"); - Section = L"DOS"; + Section = L"DRDOS"; Description = L"\"DR-DOS 3.x\""; + BootDrive = L"hd0"; + BootPartition = L"1"; + BootSector = L"BOOTSECT.DOS"; + } + else + /* Search for Dell Real-Mode Kernel (DRMK) OS */ + if (DoesFileExist_2(SystemRootPath->Buffer, L"DELLBIO.BIN") == TRUE || + DoesFileExist_2(SystemRootPath->Buffer, L"DELLRMK.BIN") == TRUE) + { + DPRINT1("Found Dell Real-Mode Kernel OS\n"); + + Section = L"DRMK"; + Description = L"\"Dell Real-Mode Kernel OS\""; BootDrive = L"hd0"; BootPartition = L"1"; BootSector = L"BOOTSECT.DOS"; @@ -2263,7 +2276,7 @@ { DPRINT1("Found MS OS/2 1.x\n"); - Section = L"DOS"; + Section = L"MSOS2"; Description = L"\"MS OS/2 1.x\""; BootDrive = L"hd0"; BootPartition = L"1"; @@ -2277,7 +2290,7 @@ { DPRINT1("Found MS/IBM OS/2\n"); - Section = L"DOS"; + Section = L"IBMOS2"; Description = L"\"MS/IBM OS/2\""; BootDrive = L"hd0"; BootPartition = L"1"; @@ -2289,7 +2302,7 @@ { DPRINT1("Found FreeDOS boot loader\n"); - Section = L"DOS"; + Section = L"FDOS"; Description = L"\"FreeDOS\""; BootDrive = L"hd0"; BootPartition = L"1";

1 0

[gadamopoulos] 74931: [COMCTL32] -Fix a lot of tests for the v5 toolbar without braking the behavior of the v6 one (that needs to be tested).
by gadamopoulos＠svn.reactos.org 06 Jun '17

06 Jun '17

Author: gadamopoulos Date: Tue Jun 6 12:19:17 2017 New Revision: 74931 URL: http://svn.reactos.org/svn/reactos?rev=74931&view=rev Log: [COMCTL32] -Fix a lot of tests for the v5 toolbar without braking the behavior of the v6 one (that needs to be tested). Modified: trunk/reactos/dll/win32/comctl32/toolbar.c Modified: trunk/reactos/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/toolbar… ============================================================================== --- trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/toolbar.c [iso-8859-1] Tue Jun 6 12:19:17 2017 @@ -253,12 +253,11 @@ static inline int default_top_margin(const TOOLBAR_INFO *infoPtr) { -#ifndef __REACTOS__ +#ifdef __REACTOS__ + if (infoPtr->iVersion == 6) + return 0; +#endif return (infoPtr->dwStyle & TBSTYLE_FLAT ? 0 : TOP_BORDER); -#else /* r65766 */ - /* This is the behaviour in comctl32 v6 */ - return 0; -#endif } static inline BOOL TOOLBAR_HasDropDownArrows(DWORD exStyle)

1 0

[hbelusca] 74930: [EXPLORER]: Fix what appears to be a copy-pasta error: use the correct window class names in the corresponding message maps. Validated by Giannis Adamopoulos.
by hbelusca＠svn.reactos.org 05 Jun '17

05 Jun '17

Author: hbelusca Date: Mon Jun 5 22:01:09 2017 New Revision: 74930 URL: http://svn.reactos.org/svn/reactos?rev=74930&view=rev Log: [EXPLORER]: Fix what appears to be a copy-pasta error: use the correct window class names in the corresponding message maps. Validated by Giannis Adamopoulos. Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Mon Jun 5 22:01:09 2017 @@ -586,7 +586,7 @@ DECLARE_WND_CLASS_EX(szSysPagerWndClass, CS_DBLCLKS, COLOR_3DFACE) - BEGIN_MSG_MAP(CTaskSwitchWnd) + BEGIN_MSG_MAP(CSysPagerWnd) MESSAGE_HANDLER(WM_CREATE, OnCreate) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) MESSAGE_HANDLER(WM_SIZE, OnSize) @@ -1195,7 +1195,7 @@ DECLARE_WND_CLASS_EX(szTrayClockWndClass, CS_DBLCLKS, COLOR_3DFACE) - BEGIN_MSG_MAP(CTaskSwitchWnd) + BEGIN_MSG_MAP(CTrayClockWnd) MESSAGE_HANDLER(WM_CREATE, OnCreate) MESSAGE_HANDLER(WM_DESTROY, OnDestroy) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) @@ -1588,7 +1588,7 @@ DECLARE_WND_CLASS_EX(szTrayNotifyWndClass, CS_DBLCLKS, COLOR_3DFACE) - BEGIN_MSG_MAP(CTaskSwitchWnd) + BEGIN_MSG_MAP(CTrayNotifyWnd) MESSAGE_HANDLER(WM_CREATE, OnCreate) MESSAGE_HANDLER(WM_THEMECHANGED, OnThemeChanged) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground)

1 0

[gadamopoulos] 74929: [COMCTL32_APITEST] -Make comctl32v5.manifest really point to the v5 library.
by gadamopoulos＠svn.reactos.org 05 Jun '17

05 Jun '17

Author: gadamopoulos Date: Mon Jun 5 21:50:21 2017 New Revision: 74929 URL: http://svn.reactos.org/svn/reactos?rev=74929&view=rev Log: [COMCTL32_APITEST] -Make comctl32v5.manifest really point to the v5 library. Modified: trunk/rostests/apitests/comctl32/comctl32v5.manifest Modified: trunk/rostests/apitests/comctl32/comctl32v5.manifest URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/comctl32/comctl3… ============================================================================== --- trunk/rostests/apitests/comctl32/comctl32v5.manifest [iso-8859-1] (original) +++ trunk/rostests/apitests/comctl32/comctl32v5.manifest [iso-8859-1] Mon Jun 5 21:50:21 2017 @@ -5,7 +5,7 @@ <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" - version="6.0.0.0" + version="5.82.0.0" publicKeyToken="6595b64144ccf1df" processorArchitecture="*" language="*"

1 0

[tfaber] 74928: [NTDLL_VISTA] - Avoid importing from kernel32. We're supposed to be... ntdll CORE-13361
by tfaber＠svn.reactos.org 05 Jun '17

05 Jun '17

Author: tfaber Date: Mon Jun 5 21:37:13 2017 New Revision: 74928 URL: http://svn.reactos.org/svn/reactos?rev=74928&view=rev Log: [NTDLL_VISTA] - Avoid importing from kernel32. We're supposed to be... ntdll CORE-13361 Modified: trunk/reactos/dll/win32/ntdll_vista/CMakeLists.txt trunk/reactos/dll/win32/ntdll_vista/DllMain.c Modified: trunk/reactos/dll/win32/ntdll_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdll_vista/CMak… ============================================================================== --- trunk/reactos/dll/win32/ntdll_vista/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntdll_vista/CMakeLists.txt [iso-8859-1] Mon Jun 5 21:37:13 2017 @@ -15,6 +15,6 @@ add_library(ntdll_vista SHARED ${SOURCE}) set_module_type(ntdll_vista win32dll ENTRYPOINT DllMain 12) -add_importlibs(ntdll_vista ntdll kernel32) +add_importlibs(ntdll_vista ntdll) add_dependencies(ntdll_vista psdk) add_cd_file(TARGET ntdll_vista DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/ntdll_vista/DllMain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdll_vista/DllM… ============================================================================== --- trunk/reactos/dll/win32/ntdll_vista/DllMain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntdll_vista/DllMain.c [iso-8859-1] Mon Jun 5 21:37:13 2017 @@ -7,6 +7,8 @@ #include <winreg.h> #include <winuser.h> #include <winwlx.h> +#include <ndk/rtltypes.h> +#include <ndk/umfuncs.h> #define NDEBUG #include <debug.h> @@ -25,7 +27,7 @@ { if (dwReason == DLL_PROCESS_ATTACH) { - DisableThreadLibraryCalls(hDll); + LdrDisableThreadCalloutsForDll(hDll); RtlpInitializeKeyedEvent(); } else if (dwReason == DLL_PROCESS_DETACH)

1 0

[phater] 74927: [WINETESTS] Avoid canceling the test when Samba is not installed and NTLM authentication is tested
by phater＠svn.reactos.org 05 Jun '17

05 Jun '17

Author: phater Date: Mon Jun 5 19:27:50 2017 New Revision: 74927 URL: http://svn.reactos.org/svn/reactos?rev=74927&view=rev Log: [WINETESTS] Avoid canceling the test when Samba is not installed and NTLM authentication is tested Modified: trunk/rostests/winetests/winhttp/winhttp.c Modified: trunk/rostests/winetests/winhttp/winhttp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/winhttp… ============================================================================== --- trunk/rostests/winetests/winhttp/winhttp.c [iso-8859-1] (original) +++ trunk/rostests/winetests/winhttp/winhttp.c [iso-8859-1] Mon Jun 5 19:27:50 2017 @@ -2188,7 +2188,12 @@ else { send(c, largeauth, sizeof largeauth - 1, 0); +#ifdef __REACTOS__ + memset(buffer, 'A', sizeof(buffer)); + for (i = 0; i < (10240 / sizeof(buffer)); i++) send(c, buffer, sizeof(buffer), 0); +#else for (i = 0; i < 10240; i++) send(c, "A", 1, 0); +#endif continue; } }

1 0

[pschweitzer] 74926: [UDFS] Only use unused var warnings. Patch by Thomas. CORE-4375
by pschweitzer＠svn.reactos.org 05 Jun '17

05 Jun '17

Author: pschweitzer Date: Mon Jun 5 16:02:47 2017 New Revision: 74926 URL: http://svn.reactos.org/svn/reactos?rev=74926&view=rev Log: [UDFS] Only use unused var warnings. Patch by Thomas. CORE-4375 Modified: trunk/reactos/drivers/filesystems/udfs/CMakeLists.txt Modified: trunk/reactos/drivers/filesystems/udfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/CMakeLists.txt [iso-8859-1] Mon Jun 5 16:02:47 2017 @@ -46,9 +46,7 @@ # FIXME: Make sure we marked all what needs to be marked with stdcall before removing this. add_target_compile_flags(udfs "/Gz") else() - # FIXME: Tons of warnings. - replace_compile_flags("-Werror" " ") - add_target_compile_flags(udfs "-fpermissive") + add_target_compile_flags(udfs "-Wno-unused-but-set-variable") endif() set_module_type(udfs kernelmodedriver) target_link_libraries(udfs ${PSEH_LIB})

1 0

[pschweitzer] 74925: [UDFS] Misc fixes by Thomas. CORE-4375
by pschweitzer＠svn.reactos.org 05 Jun '17

05 Jun '17

Author: pschweitzer Date: Mon Jun 5 15:54:51 2017 New Revision: 74925 URL: http://svn.reactos.org/svn/reactos?rev=74925&view=rev Log: [UDFS] Misc fixes by Thomas. CORE-4375 Modified: trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.h trunk/reactos/drivers/filesystems/udfs/close.cpp trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp trunk/reactos/drivers/filesystems/udfs/misc.cpp trunk/reactos/drivers/filesystems/udfs/protos.h trunk/reactos/drivers/filesystems/udfs/udf_info/phys_eject.cpp trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp trunk/reactos/drivers/filesystems/udfs/udfinit.cpp Modified: trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.h [iso-8859-1] Mon Jun 5 15:54:51 2017 @@ -96,7 +96,7 @@ extern OSSTATUS UDFGetDiskInfo(IN PDEVICE_OBJECT DeviceObject, // the target device object IN PVCB Vcb); // Volume control block from this DevObj -extern VOID UDFEjectReqWaiter(IN PVOID Context); +extern VOID NTAPI UDFEjectReqWaiter(IN PVOID Context); extern VOID UDFStopEjectWaiter(PVCB Vcb); @@ -182,4 +182,4 @@ IN BOOLEAN Unlock); -#endif //__UDF_PHYS_LIB__H__ +#endif //__UDF_PHYS_LIB__H__ Modified: trunk/reactos/drivers/filesystems/udfs/close.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/close.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/close.cpp [iso-8859-1] Mon Jun 5 15:54:51 2017 @@ -686,6 +686,7 @@ It operates until reach lower threshold */ VOID +NTAPI UDFDelayedClose( PVOID unused ) Modified: trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp [iso-8859-1] Mon Jun 5 15:54:51 2017 @@ -900,7 +900,7 @@ // terminates automatically ASSERT(!(Vcb->VCBFlags & UDF_VCB_FLAGS_STOP_WAITER_EVENT)); Vcb->VCBFlags |= UDF_VCB_FLAGS_STOP_WAITER_EVENT; - ExInitializeWorkItem(&(Vcb->EjectWaiter->EjectReqWorkQueueItem), (PWORKER_THREAD_ROUTINE)UDFEjectReqWaiter, Vcb->EjectWaiter); + ExInitializeWorkItem(&(Vcb->EjectWaiter->EjectReqWorkQueueItem), UDFEjectReqWaiter, Vcb->EjectWaiter); UDFPrint(("UDFStartEjectWaiter: create thread\n")); ExQueueWorkItem(&(Vcb->EjectWaiter->EjectReqWorkQueueItem), DelayedWorkQueue); } else { Modified: trunk/reactos/drivers/filesystems/udfs/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/misc.cpp [iso-8859-1] Mon Jun 5 15:54:51 2017 @@ -1174,7 +1174,7 @@ KeReleaseSpinLock( &(Vcb->OverflowQueueSpinLock), SavedIrql ); // queue up the request - ExInitializeWorkItem(&(PtrIrpContext->WorkQueueItem), (PWORKER_THREAD_ROUTINE)UDFCommonDispatch, PtrIrpContext); + ExInitializeWorkItem(&(PtrIrpContext->WorkQueueItem), UDFCommonDispatch, PtrIrpContext); ExQueueWorkItem(&(PtrIrpContext->WorkQueueItem), CriticalWorkQueue); // ExQueueWorkItem(&(PtrIrpContext->WorkQueueItem), DelayedWorkQueue); @@ -1204,6 +1204,7 @@ * *************************************************************************/ VOID +NTAPI UDFCommonDispatch( IN PVOID Context // actually is a pointer to IRPContext structure ) Modified: trunk/reactos/drivers/filesystems/udfs/protos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/p… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/protos.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/protos.h [iso-8859-1] Mon Jun 5 15:54:51 2017 @@ -87,7 +87,7 @@ extern VOID UDFCloseAllDelayed(PVCB Vcb); -extern VOID UDFDelayedClose(PVOID unused = NULL); +extern VOID NTAPI UDFDelayedClose(PVOID unused = NULL); extern NTSTATUS UDFCloseAllXXXDelayedInDir(IN PVCB Vcb, IN PUDF_FILE_INFO FileInfo, @@ -642,7 +642,7 @@ PtrUDFIrpContext PtrIrpContext, PIRP Irp); -extern VOID UDFCommonDispatch( +extern VOID NTAPI UDFCommonDispatch( VOID *Context); // actually an IRPContext structure extern NTSTATUS UDFInitializeVCB( @@ -756,7 +756,7 @@ extern OSSTATUS UDFGetDiskInfo(IN PDEVICE_OBJECT DeviceObject, // the target device object IN PVCB Vcb); // Volume control block from this DevObj -extern VOID UDFEjectReqWaiter(IN PVOID Context); +extern VOID NTAPI UDFEjectReqWaiter(IN PVOID Context); extern VOID UDFStopEjectWaiter(PVCB Vcb); Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/phys_eject.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/phys_eject.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/phys_eject.cpp [iso-8859-1] Mon Jun 5 15:54:51 2017 @@ -26,6 +26,7 @@ This routine checks for User Eject request & initiates Dismount */ void +NTAPI UDFEjectReqWaiter( IN void* Context ) Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp [iso-8859-1] Mon Jun 5 15:54:51 2017 @@ -537,10 +537,12 @@ } // end UDFVForget() VOID +NTAPI UDFVWorkItem( - PUDF_VERIFY_REQ VerifyReq - ) -{ + PVOID Context + ) +{ + PUDF_VERIFY_REQ VerifyReq = (PUDF_VERIFY_REQ)Context; PVCB Vcb = VerifyReq->Vcb; ULONG ReadBytes; // OSSTATUS RC; @@ -703,7 +705,7 @@ InterlockedIncrement((PLONG)&(VerifyCtx->QueuedCount)); #ifndef _CONSOLE ExInitializeWorkItem( &(VerifyReq->VerifyItem), - (PWORKER_THREAD_ROUTINE) UDFVWorkItem, + UDFVWorkItem, VerifyReq ); ExQueueWorkItem( &(VerifyReq->VerifyItem), CriticalWorkQueue ); #else Modified: trunk/reactos/drivers/filesystems/udfs/udfinit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/u… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/udfinit.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/udfinit.cpp [iso-8859-1] Mon Jun 5 15:54:51 2017 @@ -179,7 +179,7 @@ InitializeListHead( &UDFGlobalData.DirDelayedCloseQueue ); ExInitializeWorkItem( &UDFGlobalData.CloseItem, - (PWORKER_THREAD_ROUTINE) UDFDelayedClose, + UDFDelayedClose, NULL ); UDFGlobalData.DelayedCloseCount = 0; @@ -312,7 +312,7 @@ FsRegistered = TRUE; UDFPrint(("UDF: IoRegisterFsRegistrationChange()\n")); - IoRegisterFsRegistrationChange( DriverObject, (PDRIVER_FS_NOTIFICATION)UDFFsNotification ); + IoRegisterFsRegistrationChange( DriverObject, UDFFsNotification ); // delay.QuadPart = -10000000; // KeDelayExecutionThread(KernelMode, FALSE, &delay); //10 microseconds

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