Ros-diffs March 2016

ros-diffs@reactos.org

13 participants
263 discussions

[hbelusca] 70997: [SHELL32]: Correctly copy the icon file name string, using the user-defined nMaxFile parameter.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Mar 12 17:06:33 2016 New Revision: 70997 URL: http://svn.reactos.org/svn/reactos?rev=70997&view=rev Log: [SHELL32]: Correctly copy the icon file name string, using the user-defined nMaxFile parameter. Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Sat Mar 12 17:06:33 2016 @@ -234,12 +234,12 @@ hLibrary = LoadLibraryExW(lpstrFile, NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE); IconContext.hLibrary = hLibrary; IconContext.Index = *lpdwIconIndex; - wcscpy(IconContext.szName, lpstrFile); + StringCchCopyNW(IconContext.szName, ARRAYSIZE(IconContext.szName), lpstrFile, nMaxFile); res = DialogBoxParamW(shell32_hInstance, MAKEINTRESOURCEW(IDD_PICK_ICON), hwndOwner, PickIconProc, (LPARAM)&IconContext); if (res) { - wcscpy(lpstrFile, IconContext.szName); + StringCchCopyNW(lpstrFile, nMaxFile, IconContext.szName, ARRAYSIZE(IconContext.szName)); *lpdwIconIndex = IconContext.Index; }

8 years, 9 months

[pschweitzer] 70996: [BOOTLIB] Fix some invalid sizeof() usage

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Mar 12 17:01:39 2016 New Revision: 70996 URL: http://svn.reactos.org/svn/reactos?rev=70996&view=rev Log: [BOOTLIB] Fix some invalid sizeof() usage Modified: trunk/reactos/boot/environ/lib/misc/image.c Modified: trunk/reactos/boot/environ/lib/misc/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/imag… ============================================================================== --- trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] (original) +++ trunk/reactos/boot/environ/lib/misc/image.c [iso-8859-1] Sat Mar 12 17:01:39 2016 @@ -1456,7 +1456,7 @@ } /* Zero it out */ - RtlZeroMemory(AppEntry, sizeof(AppEntry)); + RtlZeroMemory(AppEntry, sizeof(*AppEntry)); /* Initialize it */ strcpy(AppEntry->Signature, "BTAPENT"); @@ -1493,7 +1493,7 @@ } /* Zero out the entries for now */ - RtlZeroMemory(IapImageTable, sizeof(IapTableEntries * sizeof(PVOID))); + RtlZeroMemory(IapImageTable, IapTableEntries * sizeof(PVOID)); } /* Set this entry into the table */

8 years, 9 months

[akhaldi] 70995: [SHELL32] Fix build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Mar 11 22:59:57 2016 New Revision: 70995 URL: http://svn.reactos.org/svn/reactos?rev=70995&view=rev Log: [SHELL32] Fix build. Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Fri Mar 11 22:59:57 2016 @@ -207,7 +207,7 @@ hIcon = (HICON)SendMessageW(lpdis->hwndItem, LB_GETITEMDATA, lpdis->itemID, 0); if (lpdis->itemID == (UINT)index) - FillRect(lpdis->hDC, &lpdis->rcItem, (HBRUSH)(COLOR_HIGHLIGHT + 1))); + FillRect(lpdis->hDC, &lpdis->rcItem, (HBRUSH)(COLOR_HIGHLIGHT + 1)); else FillRect(lpdis->hDC, &lpdis->rcItem, (HBRUSH)(COLOR_WINDOW + 1));

8 years, 9 months

[hbelusca] 70994: [SHELL32]: Use the system colours for drawing the icon list item selection rectangle, instead of using hardcoded values.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Mar 11 22:13:48 2016 New Revision: 70994 URL: http://svn.reactos.org/svn/reactos?rev=70994&view=rev Log: [SHELL32]: Use the system colours for drawing the icon list item selection rectangle, instead of using hardcoded values. Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Fri Mar 11 22:13:48 2016 @@ -207,25 +207,12 @@ hIcon = (HICON)SendMessageW(lpdis->hwndItem, LB_GETITEMDATA, lpdis->itemID, 0); if (lpdis->itemID == (UINT)index) - { - HBRUSH hBrush; - hBrush = CreateSolidBrush(RGB(0, 0, 255)); - FillRect(lpdis->hDC, &lpdis->rcItem, hBrush); - DeleteObject(hBrush); - } + FillRect(lpdis->hDC, &lpdis->rcItem, (HBRUSH)(COLOR_HIGHLIGHT + 1))); else - { - HBRUSH hBrush; - hBrush = CreateSolidBrush(RGB(255, 255, 255)); - FillRect(lpdis->hDC, &lpdis->rcItem, hBrush); - DeleteObject(hBrush); - } - DrawIconEx(lpdis->hDC, lpdis->rcItem.left,lpdis->rcItem.top, hIcon, - 0, - 0, - 0, - NULL, - DI_NORMAL); + FillRect(lpdis->hDC, &lpdis->rcItem, (HBRUSH)(COLOR_WINDOW + 1)); + + DrawIconEx(lpdis->hDC, lpdis->rcItem.left,lpdis->rcItem.top, hIcon, + 0, 0, 0, NULL, DI_NORMAL); break; } break;

8 years, 9 months

[hbelusca] 70993: [SHELL32]: Few SendMessageA -> SendMessageW conversions, and whitespace fixes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Mar 11 22:12:44 2016 New Revision: 70993 URL: http://svn.reactos.org/svn/reactos?rev=70993&view=rev Log: [SHELL32]: Few SendMessageA -> SendMessageW conversions, and whitespace fixes. Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Fri Mar 11 22:12:44 2016 @@ -84,7 +84,7 @@ int count; int index; - count = SendMessage(hDlgCtrl, LB_GETCOUNT, 0, 0); + count = SendMessageW(hDlgCtrl, LB_GETCOUNT, 0, 0); if (count == LB_ERR) return; @@ -101,8 +101,8 @@ LPARAM lParam ) { - LPMEASUREITEMSTRUCT lpmis; - LPDRAWITEMSTRUCT lpdis; + LPMEASUREITEMSTRUCT lpmis; + LPDRAWITEMSTRUCT lpdis; HICON hIcon; INT index, count; WCHAR szText[MAX_PATH], szTitle[100], szFilter[100]; @@ -123,7 +123,7 @@ else SetDlgItemTextW(hwndDlg, IDC_EDIT_PATH, pIconContext->szName); - count = SendMessage(pIconContext->hDlgCtrl, LB_GETCOUNT, 0, 0); + count = SendMessageW(pIconContext->hDlgCtrl, LB_GETCOUNT, 0, 0); if (count != LB_ERR) { if (count > pIconContext->Index) @@ -189,22 +189,22 @@ } break; case WM_MEASUREITEM: - lpmis = (LPMEASUREITEMSTRUCT) lParam; + lpmis = (LPMEASUREITEMSTRUCT) lParam; lpmis->itemHeight = 32; lpmis->itemWidth = 64; - return TRUE; - case WM_DRAWITEM: - lpdis = (LPDRAWITEMSTRUCT) lParam; - if (lpdis->itemID == (UINT)-1) - { - break; - } - switch (lpdis->itemAction) - { - case ODA_SELECT: + return TRUE; + case WM_DRAWITEM: + lpdis = (LPDRAWITEMSTRUCT) lParam; + if (lpdis->itemID == (UINT)-1) + { + break; + } + switch (lpdis->itemAction) + { + case ODA_SELECT: case ODA_DRAWENTIRE: index = SendMessageW(pIconContext->hDlgCtrl, LB_GETCURSEL, 0, 0); - hIcon =(HICON)SendMessage(lpdis->hwndItem, LB_GETITEMDATA, lpdis->itemID, (LPARAM) 0); + hIcon = (HICON)SendMessageW(lpdis->hwndItem, LB_GETITEMDATA, lpdis->itemID, 0); if (lpdis->itemID == (UINT)index) { @@ -448,7 +448,7 @@ { HeapFree(GetProcessHeap(), 0, psz); HeapFree(GetProcessHeap(), 0, parent); - SendMessageA (htxt, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)); + SendMessageW(htxt, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)); return TRUE; } @@ -499,9 +499,9 @@ if (ofnProc(&ofn)) { - SetFocus (GetDlgItem (hwnd, IDOK)); - SetWindowTextW (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), szFName); - SendMessageW (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), CB_SETEDITSEL, 0, MAKELPARAM (0, -1)); + SetFocus(GetDlgItem (hwnd, IDOK)); + SetWindowTextW(GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), szFName); + SendMessageW(GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), CB_SETEDITSEL, 0, MAKELPARAM (0, -1)); EnableOkButtonFromEditContents(hwnd); SetFocus (GetDlgItem (hwnd, IDOK)); } @@ -780,7 +780,7 @@ * exported by ordinal */ /* - * TODO: + * TODO: * - Implement the ability to show either the Welcome Screen or the classic dialog boxes based upon the * registry value: SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon\LogonType. */

8 years, 9 months

[hbelusca] 70992: [DELAYIMP]: Whitespace fixes only (tabs -> spaces).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Mar 10 18:31:52 2016 New Revision: 70992 URL: http://svn.reactos.org/svn/reactos?rev=70992&view=rev Log: [DELAYIMP]: Whitespace fixes only (tabs -> spaces). Modified: trunk/reactos/include/psdk/delayimp.h trunk/reactos/lib/sdk/delayimp/delayimp.c Modified: trunk/reactos/include/psdk/delayimp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/delayimp.h?re… ============================================================================== --- trunk/reactos/include/psdk/delayimp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/delayimp.h [iso-8859-1] Thu Mar 10 18:31:52 2016 @@ -14,53 +14,53 @@ enum DLAttr { - dlattrRva = 0x1, + dlattrRva = 0x1, }; /* Notification codes */ enum { - dliStartProcessing, - dliNotePreLoadLibrary, - dliNotePreGetProcAddress, - dliFailLoadLib, - dliFailGetProc, - dliNoteEndProcessing, + dliStartProcessing, + dliNotePreLoadLibrary, + dliNotePreGetProcAddress, + dliFailLoadLib, + dliFailGetProc, + dliNoteEndProcessing, }; typedef struct ImgDelayDescr { - DWORD grAttrs; - RVA rvaDLLName; - RVA rvaHmod; - RVA rvaIAT; - RVA rvaINT; - RVA rvaBoundIAT; - RVA rvaUnloadIAT; - DWORD dwTimeStamp; + DWORD grAttrs; + RVA rvaDLLName; + RVA rvaHmod; + RVA rvaIAT; + RVA rvaINT; + RVA rvaBoundIAT; + RVA rvaUnloadIAT; + DWORD dwTimeStamp; } ImgDelayDescr, *PImgDelayDescr; typedef const ImgDelayDescr *PCImgDelayDescr; typedef struct DelayLoadProc { - BOOL fImportByName; - union - { - LPCSTR szProcName; - DWORD dwOrdinal; - }; + BOOL fImportByName; + union + { + LPCSTR szProcName; + DWORD dwOrdinal; + }; } DelayLoadProc; typedef struct DelayLoadInfo { - DWORD cb; - PCImgDelayDescr pidd; - FARPROC *ppfn; - LPCSTR szDll; - DelayLoadProc dlp; - HMODULE hmodCur; - FARPROC pfnCur; - DWORD dwLastError; + DWORD cb; + PCImgDelayDescr pidd; + FARPROC *ppfn; + LPCSTR szDll; + DelayLoadProc dlp; + HMODULE hmodCur; + FARPROC pfnCur; + DWORD dwLastError; } DelayLoadInfo, *PDelayLoadInfo; typedef FARPROC (WINAPI *PfnDliHook)(unsigned, PDelayLoadInfo); @@ -69,7 +69,7 @@ unsigned IndexFromPImgThunkData(PCImgThunkData pData, PCImgThunkData pBase) { - return pData - pBase; + return pData - pBase; } extern const IMAGE_DOS_HEADER __ImageBase; @@ -78,7 +78,7 @@ PVOID PFromRva(RVA rva) { - return (PVOID)(((ULONG_PTR)(rva)) + ((ULONG_PTR)&__ImageBase)); + return (PVOID)(((ULONG_PTR)(rva)) + ((ULONG_PTR)&__ImageBase)); } Modified: trunk/reactos/lib/sdk/delayimp/delayimp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/delayimp/delayimp.… ============================================================================== --- trunk/reactos/lib/sdk/delayimp/delayimp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/delayimp/delayimp.c [iso-8859-1] Thu Mar 10 18:31:52 2016 @@ -17,71 +17,71 @@ FARPROC WINAPI __delayLoadHelper2(PCImgDelayDescr pidd, PImgThunkData pIATEntry) { - DelayLoadInfo dli; - int index; - PImgThunkData pIAT; - PImgThunkData pINT; - HMODULE *phMod; - FARPROC pProc; + DelayLoadInfo dli; + int index; + PImgThunkData pIAT; + PImgThunkData pINT; + HMODULE *phMod; + FARPROC pProc; - pIAT = PFromRva(pidd->rvaIAT); - pINT = PFromRva(pidd->rvaINT); - phMod = PFromRva(pidd->rvaHmod); - index = IndexFromPImgThunkData(pIATEntry, pIAT); + pIAT = PFromRva(pidd->rvaIAT); + pINT = PFromRva(pidd->rvaINT); + phMod = PFromRva(pidd->rvaHmod); + index = IndexFromPImgThunkData(pIATEntry, pIAT); - dli.cb = sizeof(dli); - dli.pidd = pidd; - dli.ppfn = (FARPROC*)pIATEntry->u1.Function; - dli.szDll = PFromRva(pidd->rvaDLLName); - dli.dlp.fImportByName = !(pINT[index].u1.Ordinal & IMAGE_ORDINAL_FLAG); - if (dli.dlp.fImportByName) - { - /* u1.AdressOfData points to a IMAGE_IMPORT_BY_NAME struct */ - PIMAGE_IMPORT_BY_NAME piibn = PFromRva((RVA)pINT[index].u1.AddressOfData); - dli.dlp.szProcName = (LPCSTR)&piibn->Name; - } - else - { - dli.dlp.dwOrdinal = pINT[index].u1.Ordinal & ~IMAGE_ORDINAL_FLAG; - } - dli.hmodCur = *phMod; - dli.pfnCur = (FARPROC)pIAT[index].u1.Function; - dli.dwLastError = GetLastError(); - pProc = __pfnDliNotifyHook2(dliStartProcessing, &dli); - if (pProc) - { - pIAT[index].u1.Function = (DWORD_PTR)pProc; - return pProc; - } + dli.cb = sizeof(dli); + dli.pidd = pidd; + dli.ppfn = (FARPROC*)pIATEntry->u1.Function; + dli.szDll = PFromRva(pidd->rvaDLLName); + dli.dlp.fImportByName = !(pINT[index].u1.Ordinal & IMAGE_ORDINAL_FLAG); + if (dli.dlp.fImportByName) + { + /* u1.AdressOfData points to a IMAGE_IMPORT_BY_NAME struct */ + PIMAGE_IMPORT_BY_NAME piibn = PFromRva((RVA)pINT[index].u1.AddressOfData); + dli.dlp.szProcName = (LPCSTR)&piibn->Name; + } + else + { + dli.dlp.dwOrdinal = pINT[index].u1.Ordinal & ~IMAGE_ORDINAL_FLAG; + } + dli.hmodCur = *phMod; + dli.pfnCur = (FARPROC)pIAT[index].u1.Function; + dli.dwLastError = GetLastError(); + pProc = __pfnDliNotifyHook2(dliStartProcessing, &dli); + if (pProc) + { + pIAT[index].u1.Function = (DWORD_PTR)pProc; + return pProc; + } - if (dli.hmodCur == NULL) - { - dli.hmodCur = LoadLibraryA(dli.szDll); - if (!dli.hmodCur) - { - dli.dwLastError = GetLastError(); - __pfnDliFailureHook2(dliFailLoadLib, &dli); -// if (ret) -// { -// } - // FIXME: raise exception; - return NULL; - } - *phMod = dli.hmodCur; - } + if (dli.hmodCur == NULL) + { + dli.hmodCur = LoadLibraryA(dli.szDll); + if (!dli.hmodCur) + { + dli.dwLastError = GetLastError(); + __pfnDliFailureHook2(dliFailLoadLib, &dli); +// if (ret) +// { +// } + // FIXME: raise exception; + return NULL; + } + *phMod = dli.hmodCur; + } - /* dli.dlp.szProcName might also contain the ordinal */ - pProc = GetProcAddress(dli.hmodCur, dli.dlp.szProcName); - if (!pProc) - { - dli.dwLastError = GetLastError(); - __pfnDliFailureHook2(dliFailGetProc, &dli); - // FIXME: handle return value & raise exception - return NULL; - } - pIAT[index].u1.Function = (DWORD_PTR)pProc; + /* dli.dlp.szProcName might also contain the ordinal */ + pProc = GetProcAddress(dli.hmodCur, dli.dlp.szProcName); + if (!pProc) + { + dli.dwLastError = GetLastError(); + __pfnDliFailureHook2(dliFailGetProc, &dli); + // FIXME: handle return value & raise exception + return NULL; + } + pIAT[index].u1.Function = (DWORD_PTR)pProc; - return pProc; + return pProc; } /*** The default hooks ***/ @@ -89,13 +89,13 @@ FARPROC WINAPI DefaultDliNotifyHook2(unsigned dliNotify, PDelayLoadInfo pdli) { - return NULL; + return NULL; } FARPROC WINAPI DefaultDliFailureHook2(unsigned dliNotify, PDelayLoadInfo pdli) { - return NULL; + return NULL; } PfnDliHook __pfnDliNotifyHook2 = DefaultDliNotifyHook2;

8 years, 9 months

[aandrejevic] 70991: [NTVDM] Make the default graphics cursor more narrow and less ugly. The new cursor is based on the one from DOSBox.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu Mar 10 02:44:37 2016 New Revision: 70991 URL: http://svn.reactos.org/svn/reactos?rev=70991&view=rev Log: [NTVDM] Make the default graphics cursor more narrow and less ugly. The new cursor is based on the one from DOSBox. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] Thu Mar 10 02:44:37 2016 @@ -72,41 +72,41 @@ static WORD DefaultGfxScreenMask[16] = { - 0xC3FF, // 1100001111111111 - 0xC0FF, // 1100000011111111 - 0xC07F, // 1100000001111111 - 0xC01F, // 1100000000011111 - 0xC00F, // 1100000000001111 - 0xC007, // 1100000000000111 - 0xC003, // 1100000000000011 - 0xC007, // 1100000000000111 - 0xC01F, // 1100000000011111 - 0xC01F, // 1100000000011111 - 0xC00F, // 1100000000001111 - 0xC60F, // 1100011000001111 - 0xFF07, // 1111111100000111 - 0xFF07, // 1111111100000111 - 0xFF87, // 1111111110000111 - 0xFFCF, // 1111111111001111 + 0xE7FF, // 1110011111111111 + 0xE3FF, // 1110001111111111 + 0xE1FF, // 1110000111111111 + 0xE0FF, // 1110000011111111 + 0xE07F, // 1110000001111111 + 0xE03F, // 1110000000111111 + 0xE01F, // 1110000000011111 + 0xE00F, // 1110000000001111 + 0xE007, // 1110000000000111 + 0xE007, // 1110000000000111 + 0xE03F, // 1110000000111111 + 0xE21F, // 1110001000011111 + 0xE61F, // 1110011000011111 + 0xFF0F, // 1111111100001111 + 0xFF0F, // 1111111100001111 + 0xFF8F, // 1111111110001111 }; static WORD DefaultGfxCursorMask[16] = { 0x0000, // 0000000000000000 - 0x1C00, // 0001110000000000 - 0x1F00, // 0001111100000000 - 0x1F80, // 0001111110000000 - 0x1FE0, // 0001111111100000 - 0x1FF0, // 0001111111110000 - 0x1FF8, // 0001111111111000 - 0x1FE0, // 0001111111100000 - 0x1FC0, // 0001111111000000 - 0x1FC0, // 0001111111000000 - 0x19E0, // 0001100111100000 - 0x00E0, // 0000000011100000 - 0x0070, // 0000000001110000 - 0x0070, // 0000000001110000 - 0x0030, // 0000000000110000 + 0x0800, // 0000100000000000 + 0x0C00, // 0000110000000000 + 0x0E00, // 0000111000000000 + 0x0F00, // 0000111100000000 + 0x0F80, // 0000111110000000 + 0x0FC0, // 0000111111000000 + 0x0FE0, // 0000111111100000 + 0x0FF0, // 0000111111110000 + 0x0F80, // 0000111110000000 + 0x0D80, // 0000110110000000 + 0x08C0, // 0000100011000000 + 0x00C0, // 0000000011000000 + 0x0060, // 0000000001100000 + 0x0060, // 0000000001100000 0x0000, // 0000000000000000 };

8 years, 9 months

[aandrejevic] 70990: [NTVDM] Implement PaintMouseCursor and EraseMouseCursor for video modes 12h and 13h.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu Mar 10 00:59:50 2016 New Revision: 70990 URL: http://svn.reactos.org/svn/reactos?rev=70990&view=rev Log: [NTVDM] Implement PaintMouseCursor and EraseMouseCursor for video modes 12h and 13h. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] Thu Mar 10 00:59:50 2016 @@ -146,19 +146,11 @@ static VOID PaintMouseCursor(VOID) { - COORD Position = DriverState.Position; - - /* Apply the clipping rectangle */ - if (Position.X < DriverState.MinX) Position.X = DriverState.MinX; - if (Position.X > DriverState.MaxX) Position.X = DriverState.MaxX; - if (Position.Y < DriverState.MinY) Position.Y = DriverState.MinY; - if (Position.Y > DriverState.MaxY) Position.Y = DriverState.MaxY; - if (Bda->VideoMode <= 3) { WORD Character; - WORD CellX = Position.X / 8; - WORD CellY = Position.Y / 8; + WORD CellX = DriverState.Position.X / 8; + WORD CellY = DriverState.Position.Y / 8; DWORD VideoAddress = TO_LINEAR(TEXT_VIDEO_SEG, Bda->VideoPage * Bda->VideoPageSize); EmulatorReadMemory(&EmulatorContext, @@ -177,6 +169,109 @@ (LPVOID)&Character, sizeof(WORD)); } + else if (Bda->VideoMode == 0x12) + { + INT i, j; + BYTE OldMask; + BYTE OldMap; + + /* Save the write mask */ + IOWriteB(VGA_SEQ_INDEX, VGA_SEQ_MASK_REG); + OldMask = IOReadB(VGA_SEQ_DATA); + + /* And the selected reading plane */ + IOWriteB(VGA_GC_INDEX, VGA_GC_READ_MAP_SEL_REG); + OldMap = IOReadB(VGA_GC_DATA); + + for (i = 0; i < 16; i++) + { + WORD CursorLine[4]; + DWORD VideoAddress = TO_LINEAR(GRAPHICS_VIDEO_SEG, Bda->VideoPage * Bda->VideoPageSize) + + ((DriverState.Position.Y + i) * 640 + DriverState.Position.X) / 8; + + for (j = 0; j < 4; j++) + { + /* Select the reading plane */ + IOWriteB(VGA_GC_INDEX, VGA_GC_READ_MAP_SEL_REG); + IOWriteB(VGA_GC_DATA, j); + + /* Read a part of the scanline */ + EmulatorReadMemory(&EmulatorContext, VideoAddress, &CursorLine[j], sizeof(CursorLine[j])); + } + + /* Save the data below the cursor */ + for (j = 0; j < 16; j++) + { + DriverState.GraphicsData[i * 16 + j] = 0; + + if (CursorLine[0] & (1 << j)) DriverState.GraphicsData[i * 16 + j] |= 1 << 0; + if (CursorLine[1] & (1 << j)) DriverState.GraphicsData[i * 16 + j] |= 1 << 1; + if (CursorLine[2] & (1 << j)) DriverState.GraphicsData[i * 16 + j] |= 1 << 2; + if (CursorLine[3] & (1 << j)) DriverState.GraphicsData[i * 16 + j] |= 1 << 3; + } + + for (j = 0; j < 4; j++) + { + /* Apply the screen mask */ + CursorLine[j] &= MAKEWORD(HIBYTE(DriverState.GraphicsCursor.ScreenMask[i]), + LOBYTE(DriverState.GraphicsCursor.ScreenMask[i])); + + /* And the cursor mask */ + CursorLine[j] ^= MAKEWORD(HIBYTE(DriverState.GraphicsCursor.CursorMask[i]), + LOBYTE(DriverState.GraphicsCursor.CursorMask[i])); + + /* Select the writing plane */ + IOWriteB(VGA_SEQ_INDEX, VGA_SEQ_MASK_REG); + IOWriteB(VGA_SEQ_DATA, 1 << j); + + /* Write the cursor data for this scanline */ + EmulatorWriteMemory(&EmulatorContext, VideoAddress, &CursorLine[j], sizeof(CursorLine[j])); + } + } + + /* Restore the old mask */ + IOWriteB(VGA_SEQ_INDEX, VGA_SEQ_MASK_REG); + IOWriteB(VGA_SEQ_DATA, OldMask); + + /* And the old reading plane */ + IOWriteB(VGA_GC_INDEX, VGA_GC_READ_MAP_SEL_REG); + IOWriteB(VGA_GC_DATA, OldMap); + } + else if (Bda->VideoMode == 0x13) + { + INT i, j; + + for (i = 0; i < 16; i++) + { + BYTE CursorLine[16]; + DWORD VideoAddress = TO_LINEAR(GRAPHICS_VIDEO_SEG, Bda->VideoPage * Bda->VideoPageSize) + + (DriverState.Position.Y + i) * 320 + DriverState.Position.X; + + /* Read a part of the scanline */ + EmulatorReadMemory(&EmulatorContext, + VideoAddress, + &DriverState.GraphicsData[i * 16], + sizeof(CursorLine)); + + for (j = 0; j < 16; j++) + { + /* Apply the screen mask by leaving only the masked pixels intact */ + CursorLine[j] = (DriverState.GraphicsCursor.ScreenMask[i] & (1 << j)) + ? DriverState.GraphicsData[i * 16] + : 0x00; + + /* Apply the cursor mask... */ + if (DriverState.GraphicsCursor.CursorMask[i] & (1 << j)) + { + /* ... by inverting the color of each masked pixel */ + CursorLine[j] ^= 0x0F; + } + } + + /* Write the cursor data for this scanline */ + EmulatorWriteMemory(&EmulatorContext, VideoAddress, &CursorLine, sizeof(CursorLine)); + } + } else { // TODO: NOT IMPLEMENTED @@ -186,18 +281,10 @@ static VOID EraseMouseCursor(VOID) { - COORD Position = DriverState.Position; - - /* Apply the clipping rectangle */ - if (Position.X < DriverState.MinX) Position.X = DriverState.MinX; - if (Position.X > DriverState.MaxX) Position.X = DriverState.MaxX; - if (Position.Y < DriverState.MinY) Position.Y = DriverState.MinY; - if (Position.Y > DriverState.MaxY) Position.Y = DriverState.MaxY; - if (Bda->VideoMode <= 3) { - WORD CellX = Position.X / 8; - WORD CellY = Position.Y / 8; + WORD CellX = DriverState.Position.X / 8; + WORD CellY = DriverState.Position.Y / 8; DWORD VideoAddress = TO_LINEAR(TEXT_VIDEO_SEG, Bda->VideoPage * Bda->VideoPageSize); EmulatorWriteMemory(&EmulatorContext, @@ -205,6 +292,61 @@ + (CellY * Bda->ScreenColumns + CellX) * sizeof(WORD), (LPVOID)&DriverState.Character, sizeof(WORD)); + } + else if (Bda->VideoMode == 0x12) + { + INT i, j; + BYTE OldMask; + + /* Save the write mask */ + IOWriteB(VGA_SEQ_INDEX, VGA_SEQ_MASK_REG); + OldMask = IOReadB(VGA_SEQ_DATA); + + for (i = 0; i < 16; i++) + { + WORD CursorLine[4] = {0}; + DWORD VideoAddress = TO_LINEAR(GRAPHICS_VIDEO_SEG, Bda->VideoPage * Bda->VideoPageSize) + + ((DriverState.Position.Y + i) * 640 + DriverState.Position.X) / 8; + + /* Restore the data that was below the cursor */ + for (j = 0; j < 16; j++) + { + if (DriverState.GraphicsData[i * 16 + j] & (1 << 0)) CursorLine[0] |= 1 << j; + if (DriverState.GraphicsData[i * 16 + j] & (1 << 1)) CursorLine[1] |= 1 << j; + if (DriverState.GraphicsData[i * 16 + j] & (1 << 2)) CursorLine[2] |= 1 << j; + if (DriverState.GraphicsData[i * 16 + j] & (1 << 3)) CursorLine[3] |= 1 << j; + } + + for (j = 0; j < 4; j++) + { + /* Select the writing plane */ + IOWriteB(VGA_SEQ_INDEX, VGA_SEQ_MASK_REG); + IOWriteB(VGA_SEQ_DATA, 1 << j); + + /* Write the original data for this scanline */ + EmulatorWriteMemory(&EmulatorContext, VideoAddress, &CursorLine[j], sizeof(CursorLine[j])); + } + } + + /* Restore the old mask */ + IOWriteB(VGA_SEQ_INDEX, VGA_SEQ_MASK_REG); + IOWriteB(VGA_SEQ_DATA, OldMask); + } + else if (Bda->VideoMode == 0x13) + { + INT i; + + for (i = 0; i < 16; i++) + { + DWORD VideoAddress = TO_LINEAR(GRAPHICS_VIDEO_SEG, Bda->VideoPage * Bda->VideoPageSize) + + (DriverState.Position.Y + i) * 320 + DriverState.Position.X; + + /* Write the original data for this scanline */ + EmulatorWriteMemory(&EmulatorContext, + VideoAddress, + &DriverState.GraphicsData[i * 16], + 16 * sizeof(BYTE)); + } } else { Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h [iso-8859-1] Thu Mar 10 00:59:50 2016 @@ -71,6 +71,8 @@ WORD ScreenMask[16]; WORD CursorMask[16]; } GraphicsCursor; + + BYTE GraphicsData[256]; } MOUSE_DRIVER_STATE, *PMOUSE_DRIVER_STATE; /* FUNCTIONS ******************************************************************/

8 years, 9 months

[hbelusca] 70989: [SHELL32]: Use Unicode version of GetWindowTextLength in the Run dialog box.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Mar 10 00:05:00 2016 New Revision: 70989 URL: http://svn.reactos.org/svn/reactos?rev=70989&view=rev Log: [SHELL32]: Use Unicode version of GetWindowTextLength in the Run dialog box. Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp Modified: trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dialogs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dialogs/dialogs.cpp [iso-8859-1] Thu Mar 10 00:05:00 2016 @@ -350,7 +350,7 @@ BOOL Enable = FALSE; INT Length, n; HWND Edit = GetDlgItem(hwnd, IDC_RUNDLG_EDITPATH); - Length = GetWindowTextLengthA(Edit); + Length = GetWindowTextLengthW(Edit); if (Length > 0) { PWCHAR psz = (PWCHAR)HeapAlloc(GetProcessHeap(), 0, (Length + 1) * sizeof(WCHAR));

8 years, 9 months

[dreimer] 70988: [CLT2016] Fix my forgotten cmakelists file... Clean up wallpapers.

by dreimer＠svn.reactos.org

Author: dreimer Date: Wed Mar 9 23:52:50 2016 New Revision: 70988 URL: http://svn.reactos.org/svn/reactos?rev=70988&view=rev Log: [CLT2016] Fix my forgotten cmakelists file... Clean up wallpapers. Added: branches/ReactOS-0.4.0-CLT2016/wallpapers/ReactOS_Light_16-9.jpg (with props) branches/ReactOS-0.4.0-CLT2016/wallpapers/ReactOS_Light_4-3.jpg (with props) Removed: branches/ReactOS-0.4.0-CLT2016/wallpapers/Angelus/ Modified: branches/ReactOS-0.4.0-CLT2016/wallpapers/CMakeLists.txt Modified: branches/ReactOS-0.4.0-CLT2016/wallpapers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/wallpaper… ============================================================================== --- branches/ReactOS-0.4.0-CLT2016/wallpapers/CMakeLists.txt [iso-8859-1] (original) +++ branches/ReactOS-0.4.0-CLT2016/wallpapers/CMakeLists.txt [iso-8859-1] Wed Mar 9 23:52:50 2016 @@ -1,2 +1,16 @@ -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/Angelus_02_ROSWP_4-3_1024x768.jpg DESTINATION reactos/Web/Wallpaper FOR all) +list(APPEND WALLPAPER_FILES + Angelus_02_ROSWP_4-3_1440x1080.jpg + Angelus_02_ROSWP_4-3_1024x768.jpg + clouds.jpg + lake.jpg + ReactOS_CirclesBlue.bmp + ReactOS_CirclesBlue.jpg + ReactOS_CirclesGold.jpg + ReactOS_Light_4-3.jpg + ReactOS_Light_16-9.jpg + ReadMe.txt) + +foreach(item ${WALLPAPER_FILES}) + add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/Web/Wallpaper FOR all) +endforeach(item) Added: branches/ReactOS-0.4.0-CLT2016/wallpapers/ReactOS_Light_16-9.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/wallpaper… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.0-CLT2016/wallpapers/ReactOS_Light_16-9.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/ReactOS-0.4.0-CLT2016/wallpapers/ReactOS_Light_4-3.jpg URL: http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.0-CLT2016/wallpaper… ============================================================================== Binary file - no diff available. Propchange: branches/ReactOS-0.4.0-CLT2016/wallpapers/ReactOS_Light_4-3.jpg ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

8 years, 9 months

← Newer
1
...
7
8
9
10
11
12
13
...
27
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 March 2016