Ros-diffs June 2017

ros-diffs@reactos.org

20 participants
526 discussions

[ekohl] 74941: [INTL] Fix freeing logic in GetSupportedCP(). Patch by Victor Martinez Calvo. CORE-13385

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Jun 7 14:10:43 2017 New Revision: 74941 URL: http://svn.reactos.org/svn/reactos?rev=74941&view=rev Log: [INTL] Fix freeing logic in GetSupportedCP(). Patch by Victor Martinez Calvo. CORE-13385 Modified: trunk/reactos/dll/cpl/intl/advanced.c Modified: trunk/reactos/dll/cpl/intl/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/advanced.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/advanced.c [iso-8859-1] Wed Jun 7 14:10:43 2017 @@ -61,18 +61,19 @@ { pCodePage->NextItem = PCPage; PCPage = pCodePage; + + wsprintf(szSection, L"CODEPAGE_REMOVE_%d", uiCodePage); + + if ((uiCodePage == GetACP()) || + (uiCodePage == GetOEMCP()) || + (!SetupFindFirstLineW(hInf, szSection, L"AddReg", &Context2))) + { + pCodePage->Flags |= CODEPAGE_NOT_REMOVEABLE; + } } else { HeapFree(GetProcessHeap(), 0, pCodePage); - } - - wsprintf(szSection, L"CODEPAGE_REMOVE_%d", uiCodePage); - if ((uiCodePage == GetACP()) || - (uiCodePage == GetOEMCP()) || - (!SetupFindFirstLineW(hInf, szSection, L"AddReg", &Context2))) - { - pCodePage->Flags |= CODEPAGE_NOT_REMOVEABLE; } }

7 years, 3 months

[ekohl] 74940: [INTL] Fix GetDateSetting() overruns. Patch by Victor Martinez Calvo. CORE-13387

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Jun 7 13:48:49 2017 New Revision: 74940 URL: http://svn.reactos.org/svn/reactos?rev=74940&view=rev Log: [INTL] Fix GetDateSetting() overruns. Patch by Victor Martinez Calvo. CORE-13387 Modified: trunk/reactos/dll/cpl/intl/date.c Modified: trunk/reactos/dll/cpl/intl/date.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/date.c?rev=74… ============================================================================== --- trunk/reactos/dll/cpl/intl/date.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/date.c [iso-8859-1] Wed Jun 7 13:48:49 2017 @@ -520,9 +520,9 @@ HWND hwndDlg, PGLOBALDATA pGlobalData) { - WCHAR szLongDateFormat[MAX_SAMPLES_STR_SIZE]; - WCHAR szShortDateFormat[MAX_SAMPLES_STR_SIZE]; - WCHAR szDateSeparator[MAX_SAMPLES_STR_SIZE]; + WCHAR szLongDateFormat[MAX_LONGDATEFORMAT]; + WCHAR szShortDateFormat[MAX_SHORTDATEFORMAT]; + WCHAR szDateSeparator[MAX_DATESEPARATOR]; if (!SetLongDateFormat(hwndDlg, szLongDateFormat) || !SetShortDateFormat(hwndDlg, szShortDateFormat) ||

7 years, 3 months

[ekohl] 74939: [INTL] Fix overruns in GetTimeSetting(). Patch by Victor Martinez Calvo. CORE-13386

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Jun 7 13:43:33 2017 New Revision: 74939 URL: http://svn.reactos.org/svn/reactos?rev=74939&view=rev Log: [INTL] Fix overruns in GetTimeSetting(). Patch by Victor Martinez Calvo. CORE-13386 Modified: trunk/reactos/dll/cpl/intl/time.c Modified: trunk/reactos/dll/cpl/intl/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/time.c?rev=74… ============================================================================== --- trunk/reactos/dll/cpl/intl/time.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/time.c [iso-8859-1] Wed Jun 7 13:43:33 2017 @@ -162,9 +162,9 @@ PGLOBALDATA pGlobalData) { WCHAR szTimeFormat[MAX_TIMEFORMAT]; - WCHAR szTimeSep[MAX_TIMEFORMAT]; - WCHAR szTimeAM[MAX_TIMEFORMAT]; - WCHAR szTimePM[MAX_TIMEFORMAT]; + WCHAR szTimeSep[MAX_TIMESEPARATOR]; + WCHAR szTimeAM[MAX_TIMEAMSYMBOL]; + WCHAR szTimePM[MAX_TIMEPMSYMBOL]; /* Time format */ GetSelectedComboBoxText(hwndDlg,

7 years, 3 months

[ekohl] 74938: [INTL] Prevent wcsncopy overflows in GetCurrencySettings(). Patch by Victor Martinez Calvo. CORE-13379

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Jun 7 13:37:43 2017 New Revision: 74938 URL: http://svn.reactos.org/svn/reactos?rev=74938&view=rev Log: [INTL] Prevent wcsncopy overflows in GetCurrencySettings(). Patch by Victor Martinez Calvo. CORE-13379 Modified: trunk/reactos/dll/cpl/intl/currency.c Modified: trunk/reactos/dll/cpl/intl/currency.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/currency.c?re… ============================================================================== --- trunk/reactos/dll/cpl/intl/currency.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/currency.c [iso-8859-1] Wed Jun 7 13:37:43 2017 @@ -279,7 +279,7 @@ GetSelectedComboBoxText(hwndDlg, IDC_CURRENCYSYMBOL, szCurrSymbol, - MAX_SAMPLES_STR_SIZE); + MAX_CURRSYMBOL); if (szCurrSymbol[0] == L'\0') { @@ -302,7 +302,7 @@ GetSelectedComboBoxText(hwndDlg, IDC_CURRENCYDECSEP, szCurrDecimalSep, - MAX_SAMPLES_STR_SIZE); + MAX_CURRDECIMALSEP); if (szCurrDecimalSep[0] == L'\0') { @@ -320,7 +320,7 @@ GetSelectedComboBoxText(hwndDlg, IDC_CURRENCYGRPSEP, szCurrThousandSep, - MAX_SAMPLES_STR_SIZE); + MAX_CURRTHOUSANDSEP); if (szCurrThousandSep[0] == L'\0') {

7 years, 3 months

[bfreisen] 74937: [MSPAINT] - fix incorrect file extension management -- patch by Katayama Hirofumi MZ CORE-12354 #resolve

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Wed Jun 7 10:12:05 2017 New Revision: 74937 URL: http://svn.reactos.org/svn/reactos?rev=74937&view=rev Log: [MSPAINT] - fix incorrect file extension management -- patch by Katayama Hirofumi MZ CORE-12354 #resolve Modified: trunk/reactos/base/applications/mspaint/main.cpp Modified: trunk/reactos/base/applications/mspaint/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/main.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/main.cpp [iso-8859-1] Wed Jun 7 10:12:05 2017 @@ -83,6 +83,66 @@ CSizeboxWindow sizeboxCenterBottom; CSizeboxWindow sizeboxRightBottom; CTextEditWindow textEditWindow; + +// get file name extension from filter string +static BOOL +FileExtFromFilter(LPTSTR pExt, LPCTSTR pTitle, OPENFILENAME *pOFN) +{ + LPTSTR pchExt = pExt; + *pchExt = 0; + + DWORD nIndex = 1; + for (LPCTSTR pch = pOFN->lpstrFilter; *pch; ++nIndex) + { + pch += lstrlen(pch) + 1; + if (pOFN->nFilterIndex == nIndex) + { + for (++pch; *pch && *pch != _T(';'); ++pch) + { + *pchExt++ = *pch; + } + *pchExt = 0; + CharLower(pExt); + return TRUE; + } + pch += lstrlen(pch) + 1; + } + return FALSE; +} + +// Hook procedure for OPENFILENAME to change the file name extension +static UINT APIENTRY +OFNHookProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + HWND hParent; + OFNOTIFY *pon; + switch (uMsg) + { + case WM_NOTIFY: + pon = (OFNOTIFY *)lParam; + if (pon->hdr.code == CDN_TYPECHANGE) + { + hParent = GetParent(hwnd); + TCHAR Path[MAX_PATH]; + SendMessage(hParent, CDM_GETFILEPATH, SIZEOF(Path), (LPARAM)Path); + LPTSTR pchTitle = _tcsrchr(Path, _T('\\')); + if (pchTitle == NULL) + pchTitle = _tcsrchr(Path, _T('/')); + + LPTSTR pch = _tcsrchr((pchTitle ? pchTitle : Path), _T('.')); + if (pch && pchTitle) + { + pchTitle++; + *pch = 0; + FileExtFromFilter(pch, pchTitle, pon->lpOFN); + SendMessage(hParent, CDM_SETCONTROLTEXT, 0x047c, (LPARAM)pchTitle); + lstrcpyn(pon->lpOFN->lpstrFile, Path, SIZEOF(pon->lpOFN->lpstrFile)); + } + } + break; + } + return 0; +} /* entry point */ @@ -272,7 +332,8 @@ sfn.nMaxFile = SIZEOF(sfnFilename); sfn.lpstrFileTitle = sfnFiletitle; sfn.nMaxFileTitle = SIZEOF(sfnFiletitle); - sfn.Flags = OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY; + sfn.Flags = OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_EXPLORER | OFN_ENABLEHOOK; + sfn.lpfnHook = OFNHookProc; /* creating the size boxes */ RECT sizeboxPos = {0, 0, 0 + 3, 0 + 3};

7 years, 3 months

[bfreisen] 74936: [MSPAINT] - fix incorrect image resizing -- patch by Katayama Hirofumi MZ CORE-10719 #resolve

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Wed Jun 7 10:00:04 2017 New Revision: 74936 URL: http://svn.reactos.org/svn/reactos?rev=74936&view=rev Log: [MSPAINT] - fix incorrect image resizing -- patch by Katayama Hirofumi MZ CORE-10719 #resolve Modified: trunk/reactos/base/applications/mspaint/history.cpp trunk/reactos/base/applications/mspaint/sizebox.cpp trunk/reactos/base/applications/mspaint/sizebox.h Modified: trunk/reactos/base/applications/mspaint/history.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/history.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/history.cpp [iso-8859-1] Wed Jun 7 10:00:04 2017 @@ -129,6 +129,11 @@ int oldWidth = GetWidth(); int oldHeight = GetHeight(); + if (nWidth <= 0) + nWidth = 1; + if (nHeight <= 0) + nHeight = 1; + SelectObject(hDrawingDC, hBms[currInd]); DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); hBms[(currInd + 1) % HISTORYSIZE] = CreateDIBWithProperties(nWidth, nHeight); Modified: trunk/reactos/base/applications/mspaint/sizebox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/sizebox.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/sizebox.cpp [iso-8859-1] Wed Jun 7 10:00:04 2017 @@ -12,9 +12,9 @@ /* FUNCTIONS ********************************************************/ -BOOL resizing = FALSE; -short xOrig; -short yOrig; +static BOOL resizing = FALSE; +static short xOrig; +static short yOrig; LRESULT CSizeboxWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { @@ -76,8 +76,6 @@ { short xRel; short yRel; - ReleaseCapture(); - resizing = FALSE; int imgXRes = imageModel.GetWidth(); int imgYRes = imageModel.GetHeight(); xRel = (GET_X_LPARAM(lParam) - xOrig) * 1000 / toolsModel.GetZoom(); @@ -100,5 +98,13 @@ imageModel.Crop(imgXRes + xRel, imgYRes + yRel, 0, 0); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) _T("")); } + ReleaseCapture(); + resizing = FALSE; return 0; } + +LRESULT CSizeboxWindow::OnCancelMode(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + resizing = FALSE; + return 0; +} Modified: trunk/reactos/base/applications/mspaint/sizebox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/sizebox.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/sizebox.h [iso-8859-1] Wed Jun 7 10:00:04 2017 @@ -16,10 +16,12 @@ MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) + MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) END_MSG_MAP() LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnLButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnCancelMode(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); };

7 years, 3 months

[gadamopoulos] 74935: [UXTHEME] -Fix parsing font styles like bold or italic.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Jun 7 08:35:35 2017 New Revision: 74935 URL: http://svn.reactos.org/svn/reactos?rev=74935&view=rev Log: [UXTHEME] -Fix parsing font styles like bold or italic. Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c 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:35:35 2017 @@ -963,9 +963,9 @@ return FALSE; } start = cur; - while(cur < lpStringEnd && *cur != ',') cur++; + while(cur < lpStringEnd && *cur != '\n'&& *cur != ',') cur++; end = cur; - while(isspace(*end)) end--; + while(isspace(*(end-1))) end--; lstrcpynW(lpBuff, start, min(buffSize, end-start+1));

7 years, 3 months

[gadamopoulos] 74934: [UXTHEME] -Rename ActiveThemeFile to g_ActiveThemeFile, user32ApiHook to g_user32ApiHook and gbThemeHooksActive to g_bThemeHooksActive.

by gadamopoulos＠svn.reactos.org

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);

7 years, 3 months

[rgampa] 74933: [USBXHCI] -stubplemented all the functions required for USBPORT_REGISTRATION_PACKET -removed usbehci files CORE-13344

by rgampa＠svn.reactos.org

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…

7 years, 3 months

[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

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";

7 years, 3 months

← Newer
1
...
29
30
31
32
33
34
35
...
53
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 June 2017