Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 66901: [SHELL32] - Correctly handle recursive change notifications in CDefView - Remove desktop folder hack from SHChangeNotify and move it to CDefView until we have ITranslateShellChangeN...

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Mar 26 12:05:54 2015 New Revision: 66901 URL: http://svn.reactos.org/svn/reactos?rev=66901&view=rev Log: [SHELL32] - Correctly handle recursive change notifications in CDefView - Remove desktop folder hack from SHChangeNotify and move it to CDefView until we have ITranslateShellChangeNotify Fixes phantom files/folders on desktop. Based on a patch by Huw Campbell. CORE-8844 Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/wine/changenotify.c Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Thu Mar 26 12:05:54 2015 @@ -93,6 +93,7 @@ UINT m_uState; UINT m_cidl; PCUITEMID_CHILD_ARRAY m_apidl; + PIDLIST_ABSOLUTE m_pidlParent; LISTVIEW_SORT_INFO m_sortInfo; ULONG m_hNotify; /* change notification handle */ HACCEL m_hAccel; @@ -354,6 +355,7 @@ m_uState(0), m_cidl(0), m_apidl(NULL), + m_pidlParent(NULL), m_hNotify(0), m_hAccel(NULL), m_dwAspects(0), @@ -943,6 +945,7 @@ DestroyMenu(m_hMenu); RevokeDragDrop(m_hWnd); SHChangeNotifyDeregister(m_hNotify); + SHFree(m_pidlParent); bHandled = FALSE; return 0; } @@ -1000,12 +1003,10 @@ m_pSFParent->QueryInterface(IID_PPV_ARG(IPersistFolder2, &ppf2)); if (ppf2) { - PIDLIST_ABSOLUTE pidlParent; - ppf2->GetCurFolder(&pidlParent); + ppf2->GetCurFolder(&m_pidlParent); ntreg.fRecursive = TRUE; - ntreg.pidl = pidlParent; - m_hNotify = SHChangeNotifyRegister(m_hWnd, SHCNF_IDLIST, SHCNE_ALLEVENTS, SHV_CHANGE_NOTIFY, 1, &ntreg); - SHFree(pidlParent); + ntreg.pidl = m_pidlParent; + m_hNotify = SHChangeNotifyRegister(m_hWnd, SHCNRF_InterruptLevel | SHCNRF_ShellLevel, SHCNE_ALLEVENTS, SHV_CHANGE_NOTIFY, 1, &ntreg); } m_hAccel = LoadAcceleratorsW(shell32_hInstance, MAKEINTRESOURCEW(IDA_SHELLVIEW)); @@ -1848,12 +1849,48 @@ return 0; } +/* + * This is just a quick hack to make the desktop work correctly. + * ITranslateShellChangeNotify's IsChildID is undocumented, but most likely the way that + * a folder should know if it should update upon a change notification. + * It is exported by merged folders at a minimum. + */ +static BOOL ILIsParentOrSpecialParent(PCIDLIST_ABSOLUTE pidl1, PCIDLIST_ABSOLUTE pidl2) +{ + if (!pidl1 || !pidl2) + return FALSE; + if (ILIsParent(pidl1, pidl2, TRUE)) + return TRUE; + + if (_ILIsDesktop(pidl1)) + { + PIDLIST_ABSOLUTE deskpidl; + SHGetFolderLocation(NULL, CSIDL_DESKTOPDIRECTORY, NULL, 0, &deskpidl); + if (ILIsParent(deskpidl, pidl2, TRUE)) + { + ILFree(deskpidl); + return TRUE; + } + ILFree(deskpidl); + SHGetFolderLocation(NULL, CSIDL_COMMON_DESKTOPDIRECTORY, NULL, 0, &deskpidl); + if (ILIsParent(deskpidl, pidl2, TRUE)) + { + ILFree(deskpidl); + return TRUE; + } + ILFree(deskpidl); + } + return FALSE; +} + /********************************************************** * ShellView_OnChange() */ LRESULT CDefView::OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { PCIDLIST_ABSOLUTE *Pidls = reinterpret_cast<PCIDLIST_ABSOLUTE*>(wParam); + BOOL bParent0 = ILIsParentOrSpecialParent(m_pidlParent, Pidls[0]); + BOOL bParent1 = ILIsParentOrSpecialParent(m_pidlParent, Pidls[1]); TRACE("(%p)(%p,%p,0x%08x)\n", this, Pidls[0], Pidls[1], lParam); @@ -1861,21 +1898,29 @@ { case SHCNE_MKDIR: case SHCNE_CREATE: - LV_AddItem(ILFindLastID(Pidls[0])); + if (bParent0) + LV_AddItem(ILFindLastID(Pidls[0])); break; case SHCNE_RMDIR: case SHCNE_DELETE: - LV_DeleteItem(ILFindLastID(Pidls[0])); + if (bParent0) + LV_DeleteItem(ILFindLastID(Pidls[0])); break; case SHCNE_RENAMEFOLDER: case SHCNE_RENAMEITEM: - LV_RenameItem(ILFindLastID(Pidls[0]), ILFindLastID(Pidls[1])); + if (bParent0 && bParent1) + LV_RenameItem(ILFindLastID(Pidls[0]), ILFindLastID(Pidls[1])); + else if (bParent0) + LV_DeleteItem(ILFindLastID(Pidls[0])); + else if (bParent1) + LV_AddItem(ILFindLastID(Pidls[0])); break; case SHCNE_UPDATEITEM: - LV_RenameItem(ILFindLastID(Pidls[0]), ILFindLastID(Pidls[0])); + if (bParent0) + LV_RenameItem(ILFindLastID(Pidls[0]), ILFindLastID(Pidls[0])); break; case SHCNE_UPDATEDIR: Modified: trunk/reactos/dll/win32/shell32/wine/changenotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/cha… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/changenotify.c [iso-8859-1] Thu Mar 26 12:05:54 2015 @@ -255,28 +255,6 @@ return TRUE; if( sub && ILIsParent( watched, changed, FALSE ) ) return TRUE; -#ifdef __REACTOS__ - if (sub && _ILIsDesktop(watched)) { - LPITEMIDLIST deskpidl; - WCHAR wszPath[MAX_PATH]; - SHGetSpecialFolderPathW(0, wszPath, CSIDL_DESKTOPDIRECTORY, FALSE); - deskpidl = SHSimpleIDListFromPathW(wszPath); - if (ILIsParent(deskpidl, changed, TRUE)) - { - ILFree(deskpidl); - return TRUE; - } - ILFree(deskpidl); - SHGetSpecialFolderPathW(0, wszPath, CSIDL_COMMON_DESKTOPDIRECTORY, FALSE); - deskpidl = SHSimpleIDListFromPathW(wszPath); - if (ILIsParent(deskpidl, changed, TRUE)) - { - ILFree(deskpidl); - return TRUE; - } - ILFree(deskpidl); - } -#endif return FALSE; }

10 years, 1 month

[tfaber] 66900: [WINMM] - Apply Wine commit b1d9d43a (winmm: Don't mask out SND_ALIAS_ID or SND_FILENAME in sndPlaySound.) by Andrew Eikum. Fixes crash in winmm_winetest:wave - Import WINMM_CheckCa...

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Mar 26 09:53:23 2015 New Revision: 66900 URL: http://svn.reactos.org/svn/reactos?rev=66900&view=rev Log: [WINMM] - Apply Wine commit b1d9d43a (winmm: Don't mask out SND_ALIAS_ID or SND_FILENAME in sndPlaySound.) by Andrew Eikum. Fixes crash in winmm_winetest:wave - Import WINMM_CheckCallback from Wine and use it, various cleanups (commits cb77f9a2, 06d6dd3e, e6a501bb, a311dff7 by Jörg Höhle). In particular, accepting a NULL callback in DriverCallback fixes the crash in winmm_winetest:wave. CORE-9401 #resolve Modified: trunk/reactos/dll/win32/winmm/driver.c trunk/reactos/dll/win32/winmm/playsound.c trunk/reactos/dll/win32/winmm/winemm.h trunk/reactos/dll/win32/winmm/winmm.c Modified: trunk/reactos/dll/win32/winmm/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/driver.c?r… ============================================================================== --- trunk/reactos/dll/win32/winmm/driver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/driver.c [iso-8859-1] Thu Mar 26 09:53:23 2015 @@ -569,36 +569,49 @@ } /************************************************************************** + * DRIVER_getCallback [internal] + */ +static const char* DRIVER_getCallback(DWORD uFlags) +{ + switch(uFlags & DCB_TYPEMASK) { + case DCB_NULL: return "null"; + case DCB_WINDOW: return "window"; + case DCB_TASK: return "task"; + case DCB_EVENT: return "event"; + case DCB_FUNCTION: return "32bit function"; + default: return "UNKNOWN"; + } +} + +/************************************************************************** * DriverCallback [WINMM.@] */ BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, DWORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%08lX, %04X, %p, %04X, %08lX, %08lX, %08lX)\n", - dwCallBack, uFlags, hDev, wMsg, dwUser, dwParam1, dwParam2); + BOOL ret = FALSE; + TRACE("(%08lX, %s %04X, %p, %04X, %08lX, %08lX, %08lX)\n", + dwCallBack, DRIVER_getCallback(uFlags), uFlags, hDev, wMsg, dwUser, dwParam1, dwParam2); + if (!dwCallBack) + return ret; switch (uFlags & DCB_TYPEMASK) { case DCB_NULL: - TRACE("Null !\n"); - if (dwCallBack) - WARN("uFlags=%04X has null DCB value, but dwCallBack=%08lX is not null !\n", uFlags, dwCallBack); - break; + /* Native returns FALSE = no notification, not TRUE */ + return ret; case DCB_WINDOW: - TRACE("Window(%04lX) handle=%p!\n", dwCallBack, hDev); - PostMessageA((HWND)dwCallBack, wMsg, (WPARAM)hDev, dwParam1); + ret = PostMessageA((HWND)dwCallBack, wMsg, (WPARAM)hDev, dwParam1); break; case DCB_TASK: /* aka DCB_THREAD */ - TRACE("Task(%04lx) !\n", dwCallBack); - PostThreadMessageA(dwCallBack, wMsg, (WPARAM)hDev, dwParam1); + ret = PostThreadMessageA(dwCallBack, wMsg, (WPARAM)hDev, dwParam1); break; case DCB_FUNCTION: - TRACE("Function (32 bit) !\n"); ((LPDRVCALLBACK)dwCallBack)(hDev, wMsg, dwUser, dwParam1, dwParam2); + ret = TRUE; break; case DCB_EVENT: - TRACE("Event(%08lx) !\n", dwCallBack); - SetEvent((HANDLE)dwCallBack); + ret = SetEvent((HANDLE)dwCallBack); break; #if 0 /* FIXME: for now only usable in mmsystem.dll16 @@ -630,8 +643,11 @@ WARN("Unknown callback type %d\n", uFlags & DCB_TYPEMASK); return FALSE; } - TRACE("Done\n"); - return TRUE; + if (ret) + TRACE("Done\n"); + else + WARN("Notification failure\n"); + return ret; } /****************************************************************** Modified: trunk/reactos/dll/win32/winmm/playsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/playsound.… ============================================================================== --- trunk/reactos/dll/win32/winmm/playsound.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/playsound.c [iso-8859-1] Thu Mar 26 09:53:23 2015 @@ -538,7 +538,7 @@ */ BOOL WINAPI sndPlaySoundA(LPCSTR pszSoundA, UINT uFlags) { - uFlags &= SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; + uFlags &= SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; return MULTIMEDIA_PlaySound(pszSoundA, 0, uFlags, FALSE); } @@ -547,7 +547,7 @@ */ BOOL WINAPI sndPlaySoundW(LPCWSTR pszSound, UINT uFlags) { - uFlags &= SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; + uFlags &= SND_ALIAS_ID|SND_FILENAME|SND_ASYNC|SND_LOOP|SND_MEMORY|SND_NODEFAULT|SND_NOSTOP|SND_SYNC; return MULTIMEDIA_PlaySound(pszSound, 0, uFlags, TRUE); } Modified: trunk/reactos/dll/win32/winmm/winemm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winemm.h?r… ============================================================================== --- trunk/reactos/dll/win32/winmm/winemm.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winemm.h [iso-8859-1] Thu Mar 26 09:53:23 2015 @@ -179,6 +179,8 @@ void TIME_MMTimeStop(void); +MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer) DECLSPEC_HIDDEN; + /* Global variables */ extern CRITICAL_SECTION WINMM_cs; extern HINSTANCE hWinMM32Instance; Modified: trunk/reactos/dll/win32/winmm/winmm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.c?re… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] Thu Mar 26 09:53:23 2015 @@ -140,6 +140,10 @@ ERR_TO_STR(WAVERR_STILLPLAYING); ERR_TO_STR(WAVERR_UNPREPARED); ERR_TO_STR(WAVERR_SYNC); + ERR_TO_STR(MIDIERR_INVALIDSETUP); + ERR_TO_STR(MIDIERR_NODEVICE); + ERR_TO_STR(MIDIERR_STILLPLAYING); + ERR_TO_STR(MIDIERR_UNPREPARED); } sprintf(unknown, "Unknown(0x%08x)", error); return unknown; @@ -184,6 +188,35 @@ break; } return TRUE; +} + +/************************************************************************** + * WINMM_CheckCallback [internal] + */ +MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer) +{ + switch (fdwOpen & CALLBACK_TYPEMASK) { + case CALLBACK_NULL: /* dwCallback need not be NULL */ + break; + case CALLBACK_WINDOW: + if (dwCallback && !IsWindow((HWND)dwCallback)) + return MMSYSERR_INVALPARAM; + break; + + case CALLBACK_FUNCTION: + /* a NULL cb is acceptable since w2k, MMSYSERR_INVALPARAM earlier */ + if (mixer) + return MMSYSERR_INVALFLAG; /* since w2k, MMSYSERR_NOTSUPPORTED earlier */ + break; + case CALLBACK_THREAD: + case CALLBACK_EVENT: + if (mixer) /* FIXME: mixer supports THREAD+EVENT since w2k */ + return MMSYSERR_NOTSUPPORTED; /* w9X */ + break; + default: + WARN("Unknown callback type %d\n", HIWORD(fdwOpen)); + } + return MMSYSERR_NOERROR; } /************************************************************************** @@ -311,35 +344,27 @@ { HANDLE hMix; LPWINE_MLD wmld; - DWORD dwRet = 0; + DWORD dwRet; MIXEROPENDESC mod; TRACE("(%p, %d, %08lx, %08lx, %08x)\n", lphMix, uDeviceID, dwCallback, dwInstance, fdwOpen); + dwRet = WINMM_CheckCallback(dwCallback, fdwOpen, TRUE); + if(dwRet != MMSYSERR_NOERROR) + return dwRet; + mod.dwCallback = (DWORD_PTR)MIXER_WCallback; - mod.dwInstance = 0; - -/* If callback is a function, - * dwCallback contains function pointer - * dwInstance private data - * - * if callback is a window - * dwCallback contains a window handle - */ - switch (fdwOpen & CALLBACK_TYPEMASK) { - default: - return MMSYSERR_INVALFLAG; - - case CALLBACK_NULL: - break; - - case CALLBACK_WINDOW: + if ((fdwOpen & CALLBACK_TYPEMASK) == CALLBACK_WINDOW) mod.dwInstance = dwCallback; - if (dwCallback && !IsWindow((HWND)dwCallback)) - return MMSYSERR_INVALPARAM; - break; - } + else + mod.dwInstance = 0; + + /* We're remapping to CALLBACK_FUNCTION because that's what old winmm is + * documented to do when opening the mixer driver. + * FIXME: Native supports CALLBACK_EVENT + CALLBACK_THREAD flags since w2k. + * FIXME: The non ALSA drivers ignore callback requests - bug. + */ wmld = MMDRV_Alloc(sizeof(WINE_MIXER), MMDRV_MIXER, &hMix, &fdwOpen, &dwCallback, &dwInstance); @@ -897,8 +922,7 @@ lpwm = (LPWINE_MIDI)MMDRV_Alloc(size, MMDRV_MIDIOUT, &hMidiOut, lpdwFlags, lpdwCallback, lpdwInstance); - if (lphMidiOut != NULL) - *lphMidiOut = hMidiOut; + *lphMidiOut = hMidiOut; if (lpwm) { lpwm->mod.hMidi = hMidiOut; @@ -920,12 +944,16 @@ { HMIDIOUT hMidiOut; LPWINE_MIDI lpwm; - UINT dwRet = 0; + UINT dwRet; TRACE("(%p, %d, %08lX, %08lX, %08X);\n", lphMidiOut, uDeviceID, dwCallback, dwInstance, dwFlags); if (lphMidiOut != NULL) *lphMidiOut = 0; + + dwRet = WINMM_CheckCallback(dwCallback, dwFlags, FALSE); + if (dwRet != MMSYSERR_NOERROR) + return dwRet; lpwm = MIDI_OutAlloc(&hMidiOut, &dwCallback, &dwInstance, &dwFlags, 0, NULL); @@ -1211,12 +1239,16 @@ { HANDLE hMidiIn; LPWINE_MIDI lpwm; - DWORD dwRet = 0; + DWORD dwRet; TRACE("(%p, %d, %08lX, %08lX, %08X);\n", lphMidiIn, uDeviceID, dwCallback, dwInstance, dwFlags); if (lphMidiIn != NULL) *lphMidiIn = 0; + + dwRet = WINMM_CheckCallback(dwCallback, dwFlags, FALSE); + if (dwRet != MMSYSERR_NOERROR) + return dwRet; lpwm = (LPWINE_MIDI)MMDRV_Alloc(sizeof(WINE_MIDI), MMDRV_MIDIIN, &hMidiIn, &dwFlags, &dwCallback, &dwInstance); @@ -1779,6 +1811,10 @@ if (cMidi != 1 || lphMidiStrm == NULL || lpuDeviceID == NULL) return MMSYSERR_INVALPARAM; + ret = WINMM_CheckCallback(dwCallback, fdwOpen, FALSE); + if (ret != MMSYSERR_NOERROR) + return ret; + lpMidiStrm = HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_MIDIStream)); if (!lpMidiStrm) return MMSYSERR_NOMEM; @@ -1792,8 +1828,7 @@ mosm.wDeviceID = *lpuDeviceID; lpwm = MIDI_OutAlloc(&hMidiOut, &dwCallback, &dwInstance, &fdwOpen, 1, &mosm); lpMidiStrm->hDevice = hMidiOut; - if (lphMidiStrm) - *lphMidiStrm = (HMIDISTRM)hMidiOut; + *lphMidiStrm = (HMIDISTRM)hMidiOut; lpwm->mld.uDeviceID = *lpuDeviceID; @@ -1839,11 +1874,23 @@ TRACE("(%p, %p, %u)!\n", hMidiStrm, lpMidiHdr, cbMidiHdr); + if (cbMidiHdr < offsetof(MIDIHDR,dwOffset) || !lpMidiHdr || !lpMidiHdr->lpData + || lpMidiHdr->dwBufferLength < lpMidiHdr->dwBytesRecorded + || lpMidiHdr->dwBytesRecorded % 4 /* player expects DWORD padding */) + return MMSYSERR_INVALPARAM; + /* FIXME: Native additionally checks if the MIDIEVENTs in lpData + * exactly fit dwBytesRecorded. */ + + if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) + return MIDIERR_UNPREPARED; + + if (lpMidiHdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + if (!MMSYSTEM_GetMidiStream(hMidiStrm, &lpMidiStrm, NULL)) { ret = MMSYSERR_INVALHANDLE; - } else if (!lpMidiHdr) { - ret = MMSYSERR_INVALPARAM; } else { + lpMidiHdr->dwFlags |= MHDR_ISSTRM; if (!PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_HEADER, cbMidiHdr, (LPARAM)lpMidiHdr)) { @@ -2011,7 +2058,7 @@ { HANDLE handle; LPWINE_MLD wmld; - DWORD dwRet = MMSYSERR_NOERROR; + DWORD dwRet; WAVEOPENDESC wod; TRACE("(%p, %d, %s, %p, %08lX, %08lX, %08X);\n", @@ -2020,6 +2067,10 @@ if (dwFlags & WAVE_FORMAT_QUERY) TRACE("WAVE_FORMAT_QUERY requested !\n"); + + dwRet = WINMM_CheckCallback(dwCallback, dwFlags, FALSE); + if (dwRet != MMSYSERR_NOERROR) + return dwRet; if (lpFormat == NULL) { WARN("bad format\n"); @@ -2038,7 +2089,6 @@ if ((wmld = MMDRV_Alloc(sizeof(WINE_WAVE), uType, &handle, &dwFlags, &dwCallback, &dwInstance)) == NULL) { - WARN("no memory\n"); return MMSYSERR_NOMEM; }

10 years, 1 month

[aandrejevic] 66899: [NTVDM] Fix a bug in CpuExceptionFilter.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu Mar 26 01:57:35 2015 New Revision: 66899 URL: http://svn.reactos.org/svn/reactos?rev=66899&view=rev Log: [NTVDM] Fix a bug in CpuExceptionFilter. Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c [iso-8859-1] Thu Mar 26 01:57:35 2015 @@ -147,9 +147,8 @@ /* Call the memory handler */ MemExceptionHandler((ULONG)PHYS_TO_REAL(Address), Writing); - // /* Continue executing the exception handler */ - // return EXCEPTION_EXECUTE_HANDLER; - return EXCEPTION_CONTINUE_EXECUTION; + /* The execution of the CPU opcode handler MUST NOT continue */ + return EXCEPTION_EXECUTE_HANDLER; } default: @@ -186,7 +185,7 @@ } _SEH2_EXCEPT(CpuExceptionFilter(_SEH2_GetExceptionInformation())) { - DPRINT1("VDM exception handler called\n"); + DPRINT("VDM exception handler called\n"); } _SEH2_END; }

10 years, 1 month

[hbelusca] 66898: [NTVDM]: Improve few DPRINTs and fix the memory range check in the access violation filter.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Mar 26 01:52:22 2015 New Revision: 66898 URL: http://svn.reactos.org/svn/reactos?rev=66898&view=rev Log: [NTVDM]: Improve few DPRINTs and fix the memory range check in the access violation filter. Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c [iso-8859-1] Thu Mar 26 01:52:22 2015 @@ -122,31 +122,30 @@ /* We only handle access violations so far */ case EXCEPTION_ACCESS_VIOLATION: { + BOOLEAN Writing = (ExceptionRecord->ExceptionInformation[0] == 1); + /* Retrieve the address to which a read or write attempt was made */ - ULONG_PTR Pointer = ExceptionRecord->ExceptionInformation[1]; + ULONG_PTR Address = ExceptionRecord->ExceptionInformation[1]; /* * Check whether the access exception was done inside the virtual memory space * (caused by an emulated app) or outside (casued by a bug in ourselves). */ - if ((ULONG_PTR)Pointer < (ULONG_PTR)BaseAddress || - (ULONG_PTR)Pointer > (ULONG_PTR)BaseAddress + MAX_ADDRESS) + if (Address < (ULONG_PTR)BaseAddress || + Address >= (ULONG_PTR)BaseAddress + MAX_ADDRESS) { - DPRINT1("NTVDM: Access violation at 0x%p outside the virtual memory space!\n", Pointer); + DPRINT1("NTVDM: %s access violation at 0x%p outside the virtual memory space!\n", + (Writing ? "Write" : "Read"), Address); return EXCEPTION_CONTINUE_SEARCH; } - /* We are good to go. Dispatch to our memory handlers. */ - { - BOOLEAN Writing = (ExceptionRecord->ExceptionInformation[0] == 1); - ULONG FaultAddress = (ULONG)PHYS_TO_REAL(Pointer); + /* We are good to go, dispatch to our memory handlers */ /* Fix the CPU state */ Fast486Rewind(&EmulatorContext); - /* Call the handler */ - MemExceptionHandler(FaultAddress, Writing); - } + /* Call the memory handler */ + MemExceptionHandler((ULONG)PHYS_TO_REAL(Address), Writing); // /* Continue executing the exception handler */ // return EXCEPTION_EXECUTE_HANDLER;

10 years, 1 month

[hbelusca] 66897: [NTVDM] Write a proper exception filter for the emulated CPU. Allows to: - handle memory access exceptions inside the virtual memory space (happens when a VDD installs a memory ho...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Mar 26 01:46:27 2015 New Revision: 66897 URL: http://svn.reactos.org/svn/reactos?rev=66897&view=rev Log: [NTVDM] Write a proper exception filter for the emulated CPU. Allows to: - handle memory access exceptions inside the virtual memory space (happens when a VDD installs a memory hook on a memory region and a DOS app tries to read/write inside this region); - detect NTVDM bugs (if during emulation one tries to read/write in invalid memory areas). This should unveils at least 1 bug in the DOS device emulation, when running 386TO486.COM inside NTVDM. Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c [iso-8859-1] Thu Mar 26 01:46:27 2015 @@ -112,10 +112,60 @@ Fast486StepInto(&EmulatorContext); } +LONG CpuExceptionFilter(IN PEXCEPTION_POINTERS ExceptionInfo) +{ + /* Get the exception record */ + PEXCEPTION_RECORD ExceptionRecord = ExceptionInfo->ExceptionRecord; + + switch (ExceptionRecord->ExceptionCode) + { + /* We only handle access violations so far */ + case EXCEPTION_ACCESS_VIOLATION: + { + /* Retrieve the address to which a read or write attempt was made */ + ULONG_PTR Pointer = ExceptionRecord->ExceptionInformation[1]; + + /* + * Check whether the access exception was done inside the virtual memory space + * (caused by an emulated app) or outside (casued by a bug in ourselves). + */ + if ((ULONG_PTR)Pointer < (ULONG_PTR)BaseAddress || + (ULONG_PTR)Pointer > (ULONG_PTR)BaseAddress + MAX_ADDRESS) + { + DPRINT1("NTVDM: Access violation at 0x%p outside the virtual memory space!\n", Pointer); + return EXCEPTION_CONTINUE_SEARCH; + } + + /* We are good to go. Dispatch to our memory handlers. */ + { + BOOLEAN Writing = (ExceptionRecord->ExceptionInformation[0] == 1); + ULONG FaultAddress = (ULONG)PHYS_TO_REAL(Pointer); + + /* Fix the CPU state */ + Fast486Rewind(&EmulatorContext); + + /* Call the handler */ + MemExceptionHandler(FaultAddress, Writing); + } + + // /* Continue executing the exception handler */ + // return EXCEPTION_EXECUTE_HANDLER; + return EXCEPTION_CONTINUE_EXECUTION; + } + + default: + { + DPRINT1("NTVDM: Exception 0x%08lx not handled!\n", ExceptionRecord->ExceptionCode); + break; + } + } + + /* Continue to search for a handler */ + return EXCEPTION_CONTINUE_SEARCH; +} + VOID CpuSimulate(VOID) { - EXCEPTION_RECORD LocalExceptionRecord; - if (CpuCallLevel > MaxCpuCallLevel) { DisplayMessage(L"Too many CPU levels of recursion (%d, expected maximum %d)", @@ -135,20 +185,9 @@ { while (VdmRunning && CpuRunning) ClockUpdate(); } - _SEH2_EXCEPT(LocalExceptionRecord = *_SEH2_GetExceptionInformation()->ExceptionRecord, - EXCEPTION_EXECUTE_HANDLER) - { - BOOLEAN Writing = (LocalExceptionRecord.ExceptionInformation[0] == 1); - ULONG FaultAddress = (ULONG)PHYS_TO_REAL(LocalExceptionRecord.ExceptionInformation[1]); - - /* Make sure this was an access violation */ - ASSERT(LocalExceptionRecord.ExceptionCode == EXCEPTION_ACCESS_VIOLATION); - - /* Fix the CPU state */ - Fast486Rewind(&EmulatorContext); - - /* Call the handler */ - MemExceptionHandler(FaultAddress, Writing); + _SEH2_EXCEPT(CpuExceptionFilter(_SEH2_GetExceptionInformation())) + { + DPRINT1("VDM exception handler called\n"); } _SEH2_END; }

10 years, 1 month

[hbelusca] 66896: Fix 3 misspellings. No code changes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Mar 26 01:43:47 2015 New Revision: 66896 URL: http://svn.reactos.org/svn/reactos?rev=66896&view=rev Log: Fix 3 misspellings. No code changes. Modified: trunk/reactos/base/system/smss/smss.c trunk/reactos/lib/rtl/exception.c trunk/reactos/ntoskrnl/ke/amd64/except.c Modified: trunk/reactos/base/system/smss/smss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smss.c?re… ============================================================================== --- trunk/reactos/base/system/smss/smss.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smss.c [iso-8859-1] Thu Mar 26 01:43:47 2015 @@ -439,7 +439,7 @@ Parameters[3] = (ULONG_PTR)ExceptionInfo->ContextRecord; SmpTerminate(Parameters, 1, RTL_NUMBER_OF(Parameters)); - /* We hould never get here */ + /* We should never get here */ ASSERT(FALSE); return EXCEPTION_EXECUTE_HANDLER; } Modified: trunk/reactos/lib/rtl/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/exception.c?rev=66… ============================================================================== --- trunk/reactos/lib/rtl/exception.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/exception.c [iso-8859-1] Thu Mar 26 01:43:47 2015 @@ -305,7 +305,7 @@ NTAPI RtlUnhandledExceptionFilter(IN struct _EXCEPTION_POINTERS* ExceptionInfo) { - /* This is used by the security cookie checks, and calso called externally */ + /* This is used by the security cookie checks, and also called externally */ UNIMPLEMENTED; PrintStackTrace(ExceptionInfo); return ERROR_CALL_NOT_IMPLEMENTED; Modified: trunk/reactos/ntoskrnl/ke/amd64/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/except.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/except.c [iso-8859-1] Thu Mar 26 01:43:47 2015 @@ -140,7 +140,7 @@ _SEH2_EXCEPT((LocalExceptRecord = *_SEH2_GetExceptionInformation()->ExceptionRecord), EXCEPTION_EXECUTE_HANDLER) { - // FIXNE: handle stack overflow + // FIXME: handle stack overflow /* Nothing we can do here */ _SEH2_YIELD(return);

10 years, 1 month

[aandrejevic] 66895: [NTVDM] Implement DOS character device support and driver loading support. Separate the DOS memory manager code from the main DOS kernel source file. CORE-9370 #resolve #commen...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu Mar 26 00:21:25 2015 New Revision: 66895 URL: http://svn.reactos.org/svn/reactos?rev=66895&view=rev Log: [NTVDM] Implement DOS character device support and driver loading support. Separate the DOS memory manager code from the main DOS kernel source file. CORE-9370 #resolve #comment Committed in revision r66895. Added: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c (with props) trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c (with props) trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h (with props) trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c (with props) trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c (with props) trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h (with props) Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/CMak… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] Thu Mar 26 00:21:25 2015 @@ -29,8 +29,12 @@ hardware/sound/speaker.c hardware/video/vga.c dos/dos32krnl/bios.c + dos/dos32krnl/condrv.c + dos/dos32krnl/device.c dos/dos32krnl/dos.c dos/dos32krnl/dosfiles.c + dos/dos32krnl/emsdrv.c + dos/dos32krnl/memory.c dos/mouse32.c dos/dem.c clock.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.c [iso-8859-1] Thu Mar 26 00:21:25 2015 @@ -313,9 +313,9 @@ for (i = FirstPage; i <= LastPage; i++) { - Offset = (i == FirstPage) ? Address & (EMS_PAGE_SIZE - 1) : 0; + Offset = (i == FirstPage) ? RelativeAddress & (EMS_PAGE_SIZE - 1) : 0; Length = ((i == LastPage) - ? (Address + Size - (LastPage << EMS_PAGE_BITS)) + ? (RelativeAddress + Size - (LastPage << EMS_PAGE_BITS)) : EMS_PAGE_SIZE) - Offset; if (Mapping[i]) RtlCopyMemory(Buffer, (PVOID)((ULONG_PTR)Mapping[i] + Offset), Length); @@ -333,9 +333,9 @@ for (i = FirstPage; i <= LastPage; i++) { - Offset = (i == FirstPage) ? Address & (EMS_PAGE_SIZE - 1) : 0; + Offset = (i == FirstPage) ? RelativeAddress & (EMS_PAGE_SIZE - 1) : 0; Length = ((i == LastPage) - ? (Address + Size - (LastPage << EMS_PAGE_BITS)) + ? (RelativeAddress + Size - (LastPage << EMS_PAGE_BITS)) : EMS_PAGE_SIZE) - Offset; if (Mapping[i]) RtlCopyMemory((PVOID)((ULONG_PTR)Mapping[i] + Offset), Buffer, Length); Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/ems.h [iso-8859-1] Thu Mar 26 00:21:25 2015 @@ -30,8 +30,6 @@ #define EMS_STATUS_INV_LOGICAL_PAGE 0x8A #define EMS_STATUS_INV_PHYSICAL_PAGE 0x8B #define EMS_STATUS_UNKNOWN_FUNCTION 0x8F - -#define ARRAY_INDEX(ptr, array) ((ULONG)(((ULONG_PTR)(ptr) - (ULONG_PTR)(array)) / sizeof(*array))) typedef struct _EMS_HANDLE { Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] Thu Mar 26 00:21:25 2015 @@ -14,6 +14,7 @@ #include "int32.h" #include "dos.h" +#include "memory.h" #include "bios/bios.h" // This is needed because on UNICODE this symbol is redirected to @@ -27,6 +28,8 @@ #undef FreeEnvironmentStrings #define FreeEnvironmentStrings FreeEnvironmentStringsA +#define CHARACTER_ADDRESS 0x007000FF /* 0070:00FF */ + /* PRIVATE VARIABLES **********************************************************/ // static BYTE CurrentDrive; @@ -38,53 +41,60 @@ CHAR DosReadCharacter(WORD FileHandle) { - CHAR Character = '\0'; + PCHAR Character = (PCHAR)FAR_POINTER(CHARACTER_ADDRESS); WORD BytesRead; + *Character = '\0'; DPRINT("DosReadCharacter\n"); /* Use the file reading function */ - DosReadFile(FileHandle, &Character, 1, &BytesRead); - - return Character; + DosReadFile(FileHandle, CHARACTER_ADDRESS, 1, &BytesRead); + + return *Character; } BOOLEAN DosCheckInput(VOID) { - HANDLE Handle = DosGetRealHandle(DOS_INPUT_HANDLE); - - if (IsConsoleHandle(Handle)) - { - /* Save AX */ - USHORT AX = getAX(); - - /* Call the BIOS */ - setAH(0x01); // or 0x11 for enhanced, but what to choose? - Int32Call(&DosContext, BIOS_KBD_INTERRUPT); - - /* Restore AX */ - setAX(AX); - - /* Return keyboard status */ - return (getZF() == 0); - } - else - { - DWORD FileSizeHigh; - DWORD FileSize = GetFileSize(Handle, &FileSizeHigh); - LONG LocationHigh = 0; - DWORD Location = SetFilePointer(Handle, 0, &LocationHigh, FILE_CURRENT); - - return ((Location != FileSize) || (LocationHigh != FileSizeHigh)); + PDOS_SFT_ENTRY SftEntry = DosGetSftEntry(DOS_INPUT_HANDLE); + + switch (SftEntry->Type) + { + case DOS_SFT_ENTRY_WIN32: + { + DWORD FileSizeHigh; + DWORD FileSize = GetFileSize(SftEntry->Handle, &FileSizeHigh); + LONG LocationHigh = 0; + DWORD Location = SetFilePointer(SftEntry->Handle, 0, &LocationHigh, FILE_CURRENT); + + return ((Location != FileSize) || (LocationHigh != FileSizeHigh)); + } + + case DOS_SFT_ENTRY_DEVICE: + { + WORD Result; + + if (!SftEntry->DeviceNode->InputStatusRoutine) return FALSE; + + Result = SftEntry->DeviceNode->InputStatusRoutine(SftEntry->DeviceNode); + return !(Result & DOS_DEVSTAT_BUSY); + } + + default: + { + /* Invalid handle */ + DosLastError = ERROR_INVALID_HANDLE; + return FALSE; + } } } VOID DosPrintCharacter(WORD FileHandle, CHAR Character) { WORD BytesWritten; + *((PCHAR)FAR_POINTER(CHARACTER_ADDRESS)) = Character; /* Use the file writing function */ - DosWriteFile(FileHandle, &Character, 1, &BytesWritten); + DosWriteFile(FileHandle, CHARACTER_ADDRESS, 1, &BytesWritten); } BOOLEAN DosBIOSInitialize(VOID) Added: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c (added) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] Thu Mar 26 00:21:25 2015 @@ -0,0 +1,155 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: dos/dos32krnl/condrv.c + * PURPOSE: DOS32 CON Driver + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#define NDEBUG + +#include "emulator.h" + +#include "dos.h" +#include "dos/dem.h" + +#include "bios/bios.h" + +/* PRIVATE VARIABLES **********************************************************/ + +PDOS_DEVICE_NODE ConIn = NULL, ConOut = NULL; + +/* PRIVATE FUNCTIONS **********************************************************/ + +WORD NTAPI ConDrvReadInput(PDOS_DEVICE_NODE Device, DWORD Buffer, PWORD Length) +{ + CHAR Character; + WORD BytesRead; + PCHAR Pointer = (PCHAR)FAR_POINTER(Buffer); + + /* Save AX */ + USHORT AX = getAX(); + + /* + * Use BIOS Get Keystroke function + */ + for (BytesRead = 0; BytesRead < *Length; BytesRead++) + { + /* Call the BIOS INT 16h, AH=00h "Get Keystroke" */ + setAH(0x00); + Int32Call(&DosContext, BIOS_KBD_INTERRUPT); + + /* Retrieve the character in AL (scan code is in AH) */ + Character = getAL(); + + if (DoEcho) DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); + Pointer[BytesRead] = Character; + + /* Stop on first carriage return */ + if (Character == '\r') + { + if (DoEcho) DosPrintCharacter(DOS_OUTPUT_HANDLE, '\n'); + break; + } + } + + *Length = BytesRead; + + /* Restore AX */ + setAX(AX); + return DOS_DEVSTAT_DONE; +} + +WORD NTAPI ConDrvInputStatus(PDOS_DEVICE_NODE Device) +{ + /* Save AX */ + USHORT AX = getAX(); + + /* Call the BIOS */ + setAH(0x01); // or 0x11 for enhanced, but what to choose? + Int32Call(&DosContext, BIOS_KBD_INTERRUPT); + + /* Restore AX */ + setAX(AX); + + /* If ZF is set, set the busy bit */ + if (getZF()) return DOS_DEVSTAT_BUSY; + else return DOS_DEVSTAT_DONE; +} + +WORD NTAPI ConDrvWriteOutput(PDOS_DEVICE_NODE Device, DWORD Buffer, PWORD Length) +{ + WORD BytesWritten; + PCHAR Pointer = (PCHAR)FAR_POINTER(Buffer); + + /* + * Use BIOS Teletype function + */ + + /* Save AX and BX */ + USHORT AX = getAX(); + USHORT BX = getBX(); + + // FIXME: Use BIOS Write String function INT 10h, AH=13h ?? + for (BytesWritten = 0; BytesWritten < *Length; BytesWritten++) + { + /* Set the parameters */ + setAL(Pointer[BytesWritten]); + setBL(DOS_CHAR_ATTRIBUTE); + setBH(Bda->VideoPage); + + /* Call the BIOS INT 10h, AH=0Eh "Teletype Output" */ + setAH(0x0E); + Int32Call(&DosContext, BIOS_VIDEO_INTERRUPT); + } + + /* Restore AX and BX */ + setBX(BX); + setAX(AX); + return DOS_DEVSTAT_DONE; +} + +WORD NTAPI ConDrvOpen(PDOS_DEVICE_NODE Device) +{ + DPRINT("Handle to %Z opened\n", &Device->Name); + return DOS_DEVSTAT_DONE; +} + +WORD NTAPI ConDrvClose(PDOS_DEVICE_NODE Device) +{ + DPRINT("Handle to %Z closed\n", &Device->Name); + return DOS_DEVSTAT_DONE; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID ConDrvInitialize(PDOS_DEVICE_NODE *InputDevice, PDOS_DEVICE_NODE *OutputDevice) +{ + ConIn = DosCreateDevice(DOS_DEVATTR_STDIN + | DOS_DEVATTR_CON + | DOS_DEVATTR_CHARACTER, + "CONIN$"); + ConOut = DosCreateDevice(DOS_DEVATTR_STDOUT + | DOS_DEVATTR_CON + | DOS_DEVATTR_CHARACTER, + "CONOUT$"); + ASSERT(ConIn != NULL && ConOut != NULL); + + ConIn->ReadRoutine = ConDrvReadInput; + ConIn->InputStatusRoutine = ConDrvInputStatus; + ConOut->WriteRoutine = ConDrvWriteOutput; + ConIn->OpenRoutine = ConOut->OpenRoutine = ConDrvOpen; + ConIn->CloseRoutine = ConOut->CloseRoutine = ConDrvClose; + + if (InputDevice) *InputDevice = ConIn; + if (OutputDevice) *OutputDevice = ConOut; +} + +VOID ConDrvCleanup(VOID) +{ + if (ConIn) DosDeleteDevice(ConIn); + if (ConOut) DosDeleteDevice(ConOut); +} Propchange: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c (added) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] Thu Mar 26 00:21:25 2015 @@ -0,0 +1,383 @@ +/* + * COPYRIGHT: GPLv2+ - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: device.c + * PURPOSE: DOS Device Support + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +/* INCLUDES *******************************************************************/ + +#define NDEBUG + +#include "emulator.h" +#include "dos.h" +#include "dos/dem.h" +#include "memory.h" +#include "device.h" + +/* PRIVATE VARIABLES **********************************************************/ + +static LIST_ENTRY DeviceList = { &DeviceList, &DeviceList }; + +/* PRIVATE FUNCTIONS **********************************************************/ + +static VOID DosCallDriver(DWORD Driver, PDOS_REQUEST_HEADER Request) +{ + PDOS_DRIVER DriverBlock = (PDOS_DRIVER)FAR_POINTER(Driver); + PDOS_REQUEST_HEADER RemoteRequest; + + /* Call the strategy routine first */ + Call16(HIWORD(Driver), DriverBlock->StrategyRoutine); + RemoteRequest = (PDOS_REQUEST_HEADER)SEG_OFF_TO_PTR(getES(), getBX()); + + /* Copy the request structure to ES:BX */ + RtlMoveMemory(RemoteRequest, Request, Request->RequestLength); + + /* Call the interrupt routine */ + Call16(HIWORD(Driver), DriverBlock->InterruptRoutine); + + /* Get the request structure from ES:BX */ + RtlMoveMemory(Request, RemoteRequest, RemoteRequest->RequestLength); +} + +static inline WORD NTAPI DosDriverReadInternal(PDOS_DEVICE_NODE DeviceNode, + DWORD Buffer, + PWORD Length, + BOOLEAN IoControl) +{ + DOS_RW_REQUEST Request; + + Request.Header.RequestLength = IoControl ? sizeof(DOS_IOCTL_RW_REQUEST) + : sizeof(DOS_RW_REQUEST); + Request.Header.CommandCode = IoControl ? DOS_DEVCMD_IOCTL_READ : DOS_DEVCMD_READ; + Request.BufferPointer = Buffer; + Request.Length = *Length; + + DosCallDriver(DeviceNode->Driver, &Request.Header); + + *Length = Request.Length; + return Request.Header.Status; +} + +static inline WORD NTAPI DosDriverWriteInternal(PDOS_DEVICE_NODE DeviceNode, + DWORD Buffer, + PWORD Length, + BOOLEAN IoControl) +{ + DOS_RW_REQUEST Request; + + Request.Header.RequestLength = IoControl ? sizeof(DOS_IOCTL_RW_REQUEST) + : sizeof(DOS_RW_REQUEST); + Request.Header.CommandCode = IoControl ? DOS_DEVCMD_IOCTL_WRITE : DOS_DEVCMD_WRITE; + Request.BufferPointer = Buffer; + Request.Length = *Length; + + DosCallDriver(DeviceNode->Driver, &Request.Header); + + *Length = Request.Length; + return Request.Header.Status; +} + +static inline WORD NTAPI DosDriverGenericRequest(PDOS_DEVICE_NODE DeviceNode, + BYTE CommandCode) +{ + DOS_REQUEST_HEADER Request; + + Request.RequestLength = sizeof(DOS_REQUEST_HEADER); + Request.CommandCode = CommandCode; + + DosCallDriver(DeviceNode->Driver, &Request); + + return Request.Status; +} + +static WORD NTAPI DosDriverDispatchIoctlRead(PDOS_DEVICE_NODE DeviceNode, + DWORD Buffer, + PWORD Length) +{ + return DosDriverReadInternal(DeviceNode, Buffer, Length, TRUE); +} + +static WORD NTAPI DosDriverDispatchRead(PDOS_DEVICE_NODE DeviceNode, + DWORD Buffer, + PWORD Length) +{ + return DosDriverReadInternal(DeviceNode, Buffer, Length, FALSE); +} + +static WORD NTAPI DosDriverDispatchPeek(PDOS_DEVICE_NODE DeviceNode, + PBYTE Character) +{ + DOS_PEEK_REQUEST Request; + + Request.Header.RequestLength = sizeof(DOS_PEEK_REQUEST); + Request.Header.CommandCode = DOS_DEVCMD_PEEK; + + DosCallDriver(DeviceNode->Driver, &Request.Header); + + *Character = Request.Character; + return Request.Header.Status; +} + +static WORD NTAPI DosDriverDispatchInputStatus(PDOS_DEVICE_NODE DeviceNode) +{ + return DosDriverGenericRequest(DeviceNode, DOS_DEVCMD_INSTAT); +} + +static WORD NTAPI DosDriverDispatchFlushInput(PDOS_DEVICE_NODE DeviceNode) +{ + return DosDriverGenericRequest(DeviceNode, DOS_DEVCMD_FLUSH_INPUT); +} + +static WORD NTAPI DosDriverDispatchIoctlWrite(PDOS_DEVICE_NODE DeviceNode, + DWORD Buffer, + PWORD Length) +{ + return DosDriverWriteInternal(DeviceNode, Buffer, Length, TRUE); +} + +static WORD NTAPI DosDriverDispatchWrite(PDOS_DEVICE_NODE DeviceNode, + DWORD Buffer, + PWORD Length) +{ + return DosDriverWriteInternal(DeviceNode, Buffer, Length, FALSE); +} + +static WORD NTAPI DosDriverDispatchOutputStatus(PDOS_DEVICE_NODE DeviceNode) +{ + return DosDriverGenericRequest(DeviceNode, DOS_DEVCMD_OUTSTAT); +} + +static WORD NTAPI DosDriverDispatchFlushOutput(PDOS_DEVICE_NODE DeviceNode) +{ + return DosDriverGenericRequest(DeviceNode, DOS_DEVCMD_FLUSH_OUTPUT); +} + +static WORD NTAPI DosDriverDispatchOpen(PDOS_DEVICE_NODE DeviceNode) +{ + return DosDriverGenericRequest(DeviceNode, DOS_DEVCMD_OPEN); +} + +static WORD NTAPI DosDriverDispatchClose(PDOS_DEVICE_NODE DeviceNode) +{ + return DosDriverGenericRequest(DeviceNode, DOS_DEVCMD_CLOSE); +} + +static WORD NTAPI DosDriverDispatchOutputUntilBusy(PDOS_DEVICE_NODE DeviceNode, + DWORD Buffer, + PWORD Length) +{ + DOS_OUTPUT_BUSY_REQUEST Request; + + Request.Header.RequestLength = sizeof(DOS_OUTPUT_BUSY_REQUEST); + Request.Header.CommandCode = DOS_DEVCMD_OUTPUT_BUSY; + Request.BufferPointer = Buffer; + Request.Length = *Length; + + DosCallDriver(DeviceNode->Driver, &Request.Header); + + *Length = Request.Length; + return Request.Header.Status; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +PDOS_DEVICE_NODE DosGetDevice(LPCSTR DeviceName) +{ + PLIST_ENTRY i; + PDOS_DEVICE_NODE Node; + ANSI_STRING DeviceNameString; + + RtlInitAnsiString(&DeviceNameString, DeviceName); + + for (i = DeviceList.Flink; i != &DeviceList; i = i->Flink) + { + Node = CONTAINING_RECORD(i, DOS_DEVICE_NODE, Entry); + if (RtlEqualString(&Node->Name, &DeviceNameString, TRUE)) return Node; + } + + return NULL; +} + +PDOS_DEVICE_NODE DosCreateDevice(WORD Attributes, PCHAR DeviceName) +{ + BYTE i; + PDOS_DEVICE_NODE Node; + + /* Make sure this is a character device */ + if (!(Attributes & DOS_DEVATTR_CHARACTER)) + { + DPRINT1("ERROR: Block devices are not supported.\n"); + return FALSE; + } + + Node = (PDOS_DEVICE_NODE)RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(DOS_DEVICE_NODE)); + if (Node == NULL) return NULL; + + Node->DeviceAttributes = Attributes; + + /* Initialize the name string */ + Node->Name.Buffer = Node->NameBuffer; + Node->Name.MaximumLength = MAX_DEVICE_NAME; + + for (i = 0; i < MAX_DEVICE_NAME; i++) + { + if (DeviceName[i] == '\0' || DeviceName[i] == ' ') break; + Node->Name.Buffer[i] = DeviceName[i]; + } + + Node->Name.Length = i; + + InsertTailList(&DeviceList, &Node->Entry); + return Node; +} + +VOID DosDeleteDevice(PDOS_DEVICE_NODE DeviceNode) +{ + RemoveEntryList(&DeviceNode->Entry); + RtlFreeHeap(RtlGetProcessHeap(), 0, DeviceNode); +} + +DWORD DosLoadDriver(LPCSTR DriverFile) +{ + DWORD Result = ERROR_SUCCESS; + HANDLE FileHandle = INVALID_HANDLE_VALUE, FileMapping = NULL; + LPBYTE Address = NULL; + DWORD Driver; + PDOS_DRIVER DriverHeader; + WORD Segment = 0; + DWORD FileSize; + DWORD DriversLoaded = 0; + DOS_INIT_REQUEST Request; + PDOS_DEVICE_NODE DeviceNode; + + /* Open a handle to the driver file */ + FileHandle = CreateFileA(DriverFile, + GENERIC_READ, + FILE_SHARE_READ, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); + if (FileHandle == INVALID_HANDLE_VALUE) + { + Result = GetLastError(); + goto Cleanup; + } + + /* Get the file size */ + FileSize = GetFileSize(FileHandle, NULL); + + /* Allocate DOS memory for the driver */ + Segment = DosAllocateMemory(FileSize >> 4, NULL); + if (Segment == 0) + { + Result = DosLastError; + goto Cleanup; + } + + /* Create a mapping object for the file */ + FileMapping = CreateFileMapping(FileHandle, + NULL, + PAGE_READONLY, + 0, + 0, + NULL); + if (FileMapping == NULL) + { + Result = GetLastError(); + goto Cleanup; + } + + /* Map the file into memory */ + Address = (LPBYTE)MapViewOfFile(FileMapping, FILE_MAP_READ, 0, 0, 0); + if (Address == NULL) + { + Result = GetLastError(); + goto Cleanup; + } + + /* Copy the entire file to the DOS memory */ + Driver = MAKELONG(0, Segment); + DriverHeader = (PDOS_DRIVER)FAR_POINTER(Driver); + RtlCopyMemory(DriverHeader, Address, FileSize); + + /* Loop through all the drivers in this file */ + while (TRUE) + { + if (!(DriverHeader->DeviceAttributes & DOS_DEVATTR_CHARACTER)) + { + DPRINT1("Error loading driver at %04X:%04X: " + "Block device drivers are not supported.\n", + HIWORD(Driver), + LOWORD(Driver)); + goto Next; + } + + /* Send the driver an init request */ + RtlZeroMemory(&Request, sizeof(Request)); + Request.Header.RequestLength = sizeof(DOS_INIT_REQUEST); + Request.Header.CommandCode = DOS_DEVCMD_INIT; + // TODO: Set Request.DeviceString to the appropriate line in CONFIG.NT! + DosCallDriver(Driver, &Request.Header); + + if (Request.Header.Status & DOS_DEVSTAT_ERROR) + { + DPRINT1("Error loading driver at %04X:%04X: " + "Initialization routine returned error %u.\n", + HIWORD(Driver), + LOWORD(Driver), + Request.Header.Status & 0x7F); + goto Next; + } + + /* Create the device */ + DeviceNode = DosCreateDevice(DriverHeader->DeviceAttributes, + DriverHeader->DeviceName); + DeviceNode->Driver = Driver; + DeviceNode->IoctlReadRoutine = DosDriverDispatchIoctlRead; + DeviceNode->ReadRoutine = DosDriverDispatchRead; + DeviceNode->PeekRoutine = DosDriverDispatchPeek; + DeviceNode->InputStatusRoutine = DosDriverDispatchInputStatus; + DeviceNode->FlushInputRoutine = DosDriverDispatchFlushInput; + DeviceNode->IoctlWriteRoutine = DosDriverDispatchIoctlWrite; + DeviceNode->WriteRoutine = DosDriverDispatchWrite; + DeviceNode->OutputStatusRoutine = DosDriverDispatchOutputStatus; + DeviceNode->FlushOutputRoutine = DosDriverDispatchFlushOutput; + DeviceNode->OpenRoutine = DosDriverDispatchOpen; + DeviceNode->CloseRoutine = DosDriverDispatchClose; + DeviceNode->OutputUntilBusyRoutine = DosDriverDispatchOutputUntilBusy; + + DriversLoaded++; + +Next: + if (LOWORD(DriverHeader->Link) == 0xFFFF) break; + Driver = DriverHeader->Link; + DriverHeader = (PDOS_DRIVER)FAR_POINTER(Driver); + } + + DPRINT1("%u drivers loaded from %s.\n", DriversLoaded, DriverFile); + +Cleanup: + if (Result != ERROR_SUCCESS) + { + /* It was not successful, cleanup the DOS memory */ + if (Segment) DosFreeMemory(Segment); + } + + /* Unmap the file */ + if (Address != NULL) UnmapViewOfFile(Address); + + /* Close the file mapping object */ + if (FileMapping != NULL) CloseHandle(FileMapping); + + /* Close the file handle */ + if (FileHandle != INVALID_HANDLE_VALUE) CloseHandle(FileHandle); + + return Result; +} + + Propchange: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h (added) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h [iso-8859-1] Thu Mar 26 00:21:25 2015 @@ -0,0 +1,199 @@ +/* + * COPYRIGHT: GPLv2+ - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: device.h + * PURPOSE: DOS Device Support + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#ifndef _DEVICE_H_ +#define _DEVICE_H_ + +#include <ndk/rtlfuncs.h> + +/* DEFINITIONS ****************************************************************/ + +#define MAX_DEVICE_NAME 8 + +#define DOS_DEVATTR_STDIN (1 << 0) +#define DOS_DEVATTR_STDOUT (1 << 1) +#define DOS_DEVATTR_NUL (1 << 2) +#define DOS_DEVATTR_CLOCK (1 << 3) +#define DOS_DEVATTR_CON (1 << 4) +#define DOS_DEVATTR_OPENCLOSE (1 << 11) +#define DOS_DEVATTR_SPECIAL (1 << 13) +#define DOS_DEVATTR_IOCTL (1 << 14) +#define DOS_DEVATTR_CHARACTER (1 << 15) + +#define DOS_DEVCMD_INIT 0 +#define DOS_DEVCMD_MEDIACHK 1 +#define DOS_DEVCMD_BUILDBPB 2 +#define DOS_DEVCMD_IOCTL_READ 3 +#define DOS_DEVCMD_READ 4 +#define DOS_DEVCMD_PEEK 5 +#define DOS_DEVCMD_INSTAT 6 +#define DOS_DEVCMD_FLUSH_INPUT 7 +#define DOS_DEVCMD_WRITE 8 +#define DOS_DEVCMD_WRITE_VERIFY 9 +#define DOS_DEVCMD_OUTSTAT 10 +#define DOS_DEVCMD_FLUSH_OUTPUT 11 +#define DOS_DEVCMD_IOCTL_WRITE 12 +#define DOS_DEVCMD_OPEN 13 +#define DOS_DEVCMD_CLOSE 14 +#define DOS_DEVCMD_REMOVABLE 15 +#define DOS_DEVCMD_OUTPUT_BUSY 16 + +#define DOS_DEVSTAT_DONE (1 << 8) +#define DOS_DEVSTAT_BUSY (1 << 9) +#define DOS_DEVSTAT_ERROR (1 << 15) + +#define DOS_DEVERR_WRITE_PROTECT 0 +#define DOS_DEVERR_UNKNOWN_UNIT 1 +#define DOS_DEVERR_NOT_READY 2 +#define DOS_DEVERR_UNKNOWN_COMMAND 3 +#define DOS_DEVERR_BAD_DATA_CRC 4 +#define DOS_DEVERR_BAD_REQUEST 5 +#define DOS_DEVERR_INVALID_SEEK 6 +#define DOS_DEVERR_UNKNOWN_MEDIUM 7 +#define DOS_DEVERR_BAD_BLOCK 8 +#define DOS_DEVERR_OUT_OF_PAPER 9 +#define DOS_DEVERR_WRITE_FAULT 10 +#define DOS_DEVERR_READ_FAULT 11 +#define DOS_DEVERR_GENERAL 12 +#define DOS_DEVERR_BAD_MEDIA_CHANGE 15 + +typedef struct _DOS_DEVICE_NODE DOS_DEVICE_NODE, *PDOS_DEVICE_NODE; + +typedef WORD (NTAPI *PDOS_DEVICE_GENERIC_ROUTINE)(PDOS_DEVICE_NODE DeviceNode); + +typedef WORD (NTAPI *PDOS_DEVICE_IO_ROUTINE) +( + PDOS_DEVICE_NODE DeviceNode, + DWORD Buffer, + PWORD Length +); + +typedef WORD (NTAPI *PDOS_DEVICE_PEEK_ROUTINE) +( + PDOS_DEVICE_NODE DeviceNode, + PBYTE Character +); + +struct _DOS_DEVICE_NODE +{ + LIST_ENTRY Entry; + WORD DeviceAttributes; + ANSI_STRING Name; + CHAR NameBuffer[MAX_DEVICE_NAME]; + PDOS_DEVICE_IO_ROUTINE IoctlReadRoutine; + PDOS_DEVICE_IO_ROUTINE ReadRoutine; + PDOS_DEVICE_PEEK_ROUTINE PeekRoutine; + PDOS_DEVICE_GENERIC_ROUTINE InputStatusRoutine; + PDOS_DEVICE_GENERIC_ROUTINE FlushInputRoutine; + PDOS_DEVICE_IO_ROUTINE IoctlWriteRoutine; + PDOS_DEVICE_IO_ROUTINE WriteRoutine; + PDOS_DEVICE_GENERIC_ROUTINE OutputStatusRoutine; + PDOS_DEVICE_GENERIC_ROUTINE FlushOutputRoutine; + PDOS_DEVICE_GENERIC_ROUTINE OpenRoutine; + PDOS_DEVICE_GENERIC_ROUTINE CloseRoutine; + PDOS_DEVICE_IO_ROUTINE OutputUntilBusyRoutine; + DWORD Driver; +}; + +#pragma pack(push, 1) + +typedef struct _DOS_DRIVER +{ + DWORD Link; + WORD DeviceAttributes; + WORD StrategyRoutine; + WORD InterruptRoutine; + + union + { + CHAR DeviceName[MAX_DEVICE_NAME]; // for character devices + + struct // for block devices + { + BYTE UnitCount; + BYTE Reserved[MAX_DEVICE_NAME - 1]; + }; + }; +} DOS_DRIVER, *PDOS_DRIVER; + +typedef struct _DOS_REQUEST_HEADER +{ + IN BYTE RequestLength; + IN BYTE UnitNumber OPTIONAL; + IN BYTE CommandCode; + OUT WORD Status; + + BYTE Reserved[8]; +} DOS_REQUEST_HEADER, *PDOS_REQUEST_HEADER; + +typedef struct _DOS_INIT_REQUEST +{ + DOS_REQUEST_HEADER Header; + + OUT BYTE UnitsInitialized; + OUT DWORD ReturnBreakAddress; + + union + { + IN DWORD DeviceString; // for character devices + + struct // for block devices + { + IN BYTE FirstDriveLetter; + OUT DWORD BpbPointer; + }; + }; + +} DOS_INIT_REQUEST, *PDOS_INIT_REQUEST; + +typedef struct _DOS_IOCTL_RW_REQUEST +{ + DOS_REQUEST_HEADER Header; + + IN BYTE MediaDescriptorByte OPTIONAL; + IN DWORD BufferPointer; + IN OUT WORD Length; + IN WORD StartingBlock OPTIONAL; +} DOS_IOCTL_RW_REQUEST, *PDOS_IOCTL_RW_REQUEST; + +typedef struct _DOS_RW_REQUEST +{ + DOS_REQUEST_HEADER Header; + + IN BYTE MediaDescriptorByte OPTIONAL; + IN DWORD BufferPointer; + IN OUT WORD Length; + IN WORD StartingBlock OPTIONAL; + OUT DWORD VolumeLabelPtr OPTIONAL; +} DOS_RW_REQUEST, *PDOS_RW_REQUEST; + +typedef struct _DOS_PEEK_REQUEST +{ + DOS_REQUEST_HEADER Header; + OUT BYTE Character; +} DOS_PEEK_REQUEST, *PDOS_PEEK_REQUEST; + +typedef struct _DOS_OUTPUT_BUSY_REQUEST +{ + DOS_REQUEST_HEADER Header; + + IN DWORD BufferPointer; + IN OUT WORD Length; +} DOS_OUTPUT_BUSY_REQUEST, *PDOS_OUTPUT_BUSY_REQUEST; + +#pragma pack(pop) + +/* FUNCTIONS ******************************************************************/ + +PDOS_DEVICE_NODE DosGetDevice(LPCSTR DeviceName); +PDOS_DEVICE_NODE DosCreateDevice(WORD Attributes, PCHAR DeviceName); +VOID DosDeleteDevice(PDOS_DEVICE_NODE DeviceNode); + +#endif // _DEVICE_H_ + +/* EOF */ Propchange: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Thu Mar 26 00:21:25 2015 @@ -17,6 +17,8 @@ #include "dos.h" #include "dos/dem.h" +#include "device.h" +#include "memory.h" #include "bios/bios.h" @@ -27,381 +29,21 @@ CALLBACK16 DosContext; -static WORD CurrentPsp = SYSTEM_PSP; -static WORD DosLastError = 0; static DWORD DiskTransferArea; /*static*/ BYTE CurrentDrive; static CHAR LastDrive = 'E'; static CHAR CurrentDirectories[NUM_DRIVES][DOS_DIR_LENGTH]; - -static struct -{ - HANDLE Handle; - WORD RefCount; -} DosSystemFileTable[DOS_SFT_SIZE]; - -static BYTE DosAllocStrategy = DOS_ALLOC_BEST_FIT; -static BOOLEAN DosUmbLinked = FALSE; +static DOS_SFT_ENTRY DosSystemFileTable[DOS_SFT_SIZE]; static WORD DosErrorLevel = 0x0000; + +/* PUBLIC VARIABLES ***********************************************************/ /* Echo state for INT 21h, AH = 01h and AH = 3Fh */ BOOLEAN DoEcho = FALSE; +WORD CurrentPsp = SYSTEM_PSP; +WORD DosLastError = 0; /* PRIVATE FUNCTIONS **********************************************************/ - -/* - * Memory management functions - */ -static VOID DosCombineFreeBlocks(WORD StartBlock) -{ - PDOS_MCB CurrentMcb = SEGMENT_TO_MCB(StartBlock), NextMcb; - - /* If this is the last block or it's not free, quit */ - if (CurrentMcb->BlockType == 'Z' || CurrentMcb->OwnerPsp != 0) return; - - while (TRUE) - { - /* Get a pointer to the next MCB */ - NextMcb = SEGMENT_TO_MCB(StartBlock + CurrentMcb->Size + 1); - - /* Check if the next MCB is free */ - if (NextMcb->OwnerPsp == 0) - { - /* Combine them */ - CurrentMcb->Size += NextMcb->Size + 1; - CurrentMcb->BlockType = NextMcb->BlockType; - NextMcb->BlockType = 'I'; - } - else - { - /* No more adjoining free blocks */ - break; - } - } -} - -static WORD DosAllocateMemory(WORD Size, WORD *MaxAvailable) -{ - WORD Result = 0, Segment = FIRST_MCB_SEGMENT, MaxSize = 0; - PDOS_MCB CurrentMcb, NextMcb; - BOOLEAN SearchUmb = FALSE; - - DPRINT("DosAllocateMemory: Size 0x%04X\n", Size); - - if (DosUmbLinked && (DosAllocStrategy & (DOS_ALLOC_HIGH | DOS_ALLOC_HIGH_LOW))) - { - /* Search UMB first */ - Segment = UMB_START_SEGMENT; - SearchUmb = TRUE; - } - - while (TRUE) - { - /* Get a pointer to the MCB */ - CurrentMcb = SEGMENT_TO_MCB(Segment); - - /* Make sure it's valid */ - if (CurrentMcb->BlockType != 'M' && CurrentMcb->BlockType != 'Z') - { - DPRINT("The DOS memory arena is corrupted!\n"); - DosLastError = ERROR_ARENA_TRASHED; - return 0; - } - - /* Only check free blocks */ - if (CurrentMcb->OwnerPsp != 0) goto Next; - - /* Combine this free block with adjoining free blocks */ - DosCombineFreeBlocks(Segment); - - /* Update the maximum block size */ - if (CurrentMcb->Size > MaxSize) MaxSize = CurrentMcb->Size; - - /* Check if this block is big enough */ - if (CurrentMcb->Size < Size) goto Next; - - switch (DosAllocStrategy & 0x3F) - { - case DOS_ALLOC_FIRST_FIT: - { - /* For first fit, stop immediately */ - Result = Segment; - goto Done; - } - - case DOS_ALLOC_BEST_FIT: - { - /* For best fit, update the smallest block found so far */ - if ((Result == 0) || (CurrentMcb->Size < SEGMENT_TO_MCB(Result)->Size)) - { - Result = Segment; - } - - break; - } - - case DOS_ALLOC_LAST_FIT: - { - /* For last fit, make the current block the result, but keep searching */ - Result = Segment; - break; - } - } - -Next: - /* If this was the last MCB in the chain, quit */ - if (CurrentMcb->BlockType == 'Z') - { - /* Check if nothing was found while searching through UMBs */ - if ((Result == 0) && SearchUmb && (DosAllocStrategy & DOS_ALLOC_HIGH_LOW)) - { - /* Search low memory */ - Segment = FIRST_MCB_SEGMENT; - continue; - } - - break; - } - - /* Otherwise, update the segment and continue */ - Segment += CurrentMcb->Size + 1; - } - -Done: - - /* If we didn't find a free block, return 0 */ - if (Result == 0) - { - DosLastError = ERROR_NOT_ENOUGH_MEMORY; - if (MaxAvailable) *MaxAvailable = MaxSize; - return 0; - } - - /* Get a pointer to the MCB */ - CurrentMcb = SEGMENT_TO_MCB(Result); - - /* Check if the block is larger than requested */ - if (CurrentMcb->Size > Size) - { - /* It is, split it into two blocks */ - NextMcb = SEGMENT_TO_MCB(Result + Size + 1); - - /* Initialize the new MCB structure */ - NextMcb->BlockType = CurrentMcb->BlockType; - NextMcb->Size = CurrentMcb->Size - Size - 1; - NextMcb->OwnerPsp = 0; - - /* Update the current block */ - CurrentMcb->BlockType = 'M'; - CurrentMcb->Size = Size; - } - - /* Take ownership of the block */ - CurrentMcb->OwnerPsp = CurrentPsp; - - /* Return the segment of the data portion of the block */ - return Result + 1; -} - -static BOOLEAN DosResizeMemory(WORD BlockData, WORD NewSize, WORD *MaxAvailable) -{ - BOOLEAN Success = TRUE; - WORD Segment = BlockData - 1, ReturnSize = 0, NextSegment; - PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment), NextMcb; - - DPRINT("DosResizeMemory: BlockData 0x%04X, NewSize 0x%04X\n", - BlockData, - NewSize); - - /* Make sure this is a valid, allocated block */ - if ((Mcb->BlockType != 'M' && Mcb->BlockType != 'Z') || Mcb->OwnerPsp == 0) - { - Success = FALSE; - DosLastError = ERROR_INVALID_HANDLE; - goto Done; - } - - ReturnSize = Mcb->Size; - - /* Check if we need to expand or contract the block */ - if (NewSize > Mcb->Size) - { - /* We can't expand the last block */ - if (Mcb->BlockType != 'M') - { - Success = FALSE; - goto Done; - } - - /* Get the pointer and segment of the next MCB */ - NextSegment = Segment + Mcb->Size + 1; - NextMcb = SEGMENT_TO_MCB(NextSegment); - - /* Make sure the next segment is free */ - if (NextMcb->OwnerPsp != 0) - { - DPRINT("Cannot expand memory block: next segment is not free!\n"); - DosLastError = ERROR_NOT_ENOUGH_MEMORY; - Success = FALSE; - goto Done; - } - - /* Combine this free block with adjoining free blocks */ - DosCombineFreeBlocks(NextSegment); - - /* Set the maximum possible size of the block */ - ReturnSize += NextMcb->Size + 1; - - if (ReturnSize < NewSize) - { - DPRINT("Cannot expand memory block: insufficient free segments available!\n"); - DosLastError = ERROR_NOT_ENOUGH_MEMORY; - Success = FALSE; - goto Done; - } - - /* Maximize the current block */ - Mcb->Size = ReturnSize; - Mcb->BlockType = NextMcb->BlockType; - - /* Invalidate the next block */ - NextMcb->BlockType = 'I'; - - /* Check if the block is larger than requested */ - if (Mcb->Size > NewSize) - { - DPRINT("Block too large, reducing size from 0x%04X to 0x%04X\n", - Mcb->Size, - NewSize); - - /* It is, split it into two blocks */ - NextMcb = SEGMENT_TO_MCB(Segment + NewSize + 1); - - /* Initialize the new MCB structure */ - NextMcb->BlockType = Mcb->BlockType; - NextMcb->Size = Mcb->Size - NewSize - 1; - NextMcb->OwnerPsp = 0; - - /* Update the current block */ - Mcb->BlockType = 'M'; - Mcb->Size = NewSize; - } - } - else if (NewSize < Mcb->Size) - { - DPRINT("Shrinking block from 0x%04X to 0x%04X\n", - Mcb->Size, - NewSize); - - /* Just split the block */ - NextMcb = SEGMENT_TO_MCB(Segment + NewSize + 1); - NextMcb->BlockType = Mcb->BlockType; - NextMcb->Size = Mcb->Size - NewSize - 1; - NextMcb->OwnerPsp = 0; - - /* Update the MCB */ - Mcb->BlockType = 'M'; - Mcb->Size = NewSize; - } - -Done: - /* Check if the operation failed */ - if (!Success) - { - DPRINT("DosResizeMemory FAILED. Maximum available: 0x%04X\n", - ReturnSize); - - /* Return the maximum possible size */ - if (MaxAvailable) *MaxAvailable = ReturnSize; - } - - return Success; -} - -static BOOLEAN DosFreeMemory(WORD BlockData) -{ - PDOS_MCB Mcb = SEGMENT_TO_MCB(BlockData - 1); - - DPRINT("DosFreeMemory: BlockData 0x%04X\n", BlockData); - - /* Make sure the MCB is valid */ - if (Mcb->BlockType != 'M' && Mcb->BlockType != 'Z') - { - DPRINT("MCB block type '%c' not valid!\n", Mcb->BlockType); - return FALSE; - } - - /* Mark the block as free */ - Mcb->OwnerPsp = 0; - - return TRUE; -} - -static BOOLEAN DosLinkUmb(VOID) -{ - DWORD Segment = FIRST_MCB_SEGMENT; - PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment); - - DPRINT("Linking UMB\n"); - - /* Check if UMBs are already linked */ - if (DosUmbLinked) return FALSE; - - /* Find the last block */ - while ((Mcb->BlockType == 'M') && (Segment <= 0xFFFF)) - { - Segment += Mcb->Size + 1; - Mcb = SEGMENT_TO_MCB(Segment); - } - - /* Make sure it's valid */ - if (Mcb->BlockType != 'Z') return FALSE; - - /* Connect the MCB with the UMB chain */ - Mcb->BlockType = 'M'; - - DosUmbLinked = TRUE; - return TRUE; -} - -static BOOLEAN DosUnlinkUmb(VOID) -{ - DWORD Segment = FIRST_MCB_SEGMENT; - PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment); - - DPRINT("Unlinking UMB\n"); - - /* Check if UMBs are already unlinked */ - if (!DosUmbLinked) return FALSE; - - /* Find the block preceding the MCB that links it with the UMB chain */ - while (Segment <= 0xFFFF) - { - if ((Segment + Mcb->Size) == (FIRST_MCB_SEGMENT + USER_MEMORY_SIZE)) - { - /* This is the last non-UMB segment */ - break; - } - - /* Advance to the next MCB */ - Segment += Mcb->Size + 1; - Mcb = SEGMENT_TO_MCB(Segment); - } - - /* Mark the MCB as the last MCB */ - Mcb->BlockType = 'Z'; - - DosUmbLinked = FALSE; - return TRUE; -} - -static VOID DosChangeMemoryOwner(WORD Segment, WORD NewOwner) -{ - PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment - 1); - - /* Just set the owner */ - Mcb->OwnerPsp = NewOwner; -} static WORD DosCopyEnvironmentBlock(LPCSTR Environment OPTIONAL, LPCSTR ProgramName) @@ -471,13 +113,8 @@ return DestSegment; } - - - - - /* Taken from base/shell/cmd/console.c */ -BOOL IsConsoleHandle(HANDLE hHandle) +static BOOL IsConsoleHandle(HANDLE hHandle) { DWORD dwMode; @@ -500,12 +137,59 @@ return GetConsoleMode(hHandle, &dwMode); } +static inline PDOS_SFT_ENTRY DosFindFreeSftEntry(VOID) +{ + INT i; + + for (i = 0; i < DOS_SFT_SIZE; i++) + { + if (DosSystemFileTable[i].Type == DOS_SFT_ENTRY_NONE) + { + return &DosSystemFileTable[i]; + } + } + + return NULL; +} + +static inline PDOS_SFT_ENTRY DosFindWin32SftEntry(HANDLE Handle) +{ + INT i; + + for (i = 0; i < DOS_SFT_SIZE; i++) + { + if (DosSystemFileTable[i].Type == DOS_SFT_ENTRY_WIN32 + && DosSystemFileTable[i].Handle == Handle) + { + return &DosSystemFileTable[i]; + } + } + + return NULL; +} + +static inline PDOS_SFT_ENTRY DosFindDeviceSftEntry(PDOS_DEVICE_NODE Device) +{ + INT i; + + for (i = 0; i < DOS_SFT_SIZE; i++) + { + if (DosSystemFileTable[i].Type == DOS_SFT_ENTRY_DEVICE + && DosSystemFileTable[i].DeviceNode == Device) + { + return &DosSystemFileTable[i]; + } + } + + return NULL; +} + WORD DosOpenHandle(HANDLE Handle) { - BYTE i; WORD DosHandle; PDOS_PSP PspBlock; LPBYTE HandleTable; + PDOS_SFT_ENTRY SftEntry; /* The system PSP has no handle table */ if (CurrentPsp == SYSTEM_PSP) return INVALID_DOS_HANDLE; @@ -524,59 +208,95 @@ if (DosHandle == PspBlock->HandleTableSize) return INVALID_DOS_HANDLE; /* Check if the handle is already in the SFT */ - for (i = 0; i < DOS_SFT_SIZE; i++) - { - /* Check if this is the same handle */ - if (DosSystemFileTable[i].Handle != Handle) continue; - + SftEntry = DosFindWin32SftEntry(Handle); + + if (SftEntry != NULL) + { /* Already in the table, reference it */ - DosSystemFileTable[i].RefCount++; - - /* Set the JFT entry to that SFT index */ - HandleTable[DosHandle] = i; - - /* Return the new handle */ - return DosHandle; - } - - /* Add the handle to the SFT */ - for (i = 0; i < DOS_SFT_SIZE; i++) - { - /* Make sure this is an empty table entry */ - if (DosSystemFileTable[i].Handle != INVALID_HANDLE_VALUE) continue; - - /* Initialize the empty table entry */ - DosSystemFileTable[i].Handle = Handle; - DosSystemFileTable[i].RefCount = 1; - - /* Set the JFT entry to that SFT index */ - HandleTable[DosHandle] = i; - - /* Return the new handle */ - return DosHandle; - } - - /* The SFT is full */ - return INVALID_DOS_HANDLE; + SftEntry->RefCount++; + goto Finish; + } + + /* Find a free SFT entry to use */ + SftEntry = DosFindFreeSftEntry(); + if (SftEntry == NULL) + { + /* The SFT is full */ + return INVALID_DOS_HANDLE; + } + + /* Initialize the empty table entry */ + SftEntry->Type = DOS_SFT_ENTRY_WIN32; + SftEntry->Handle = Handle; + SftEntry->RefCount = 1; + +Finish: + + /* Set the JFT entry to that SFT index */ + HandleTable[DosHandle] = ARRAY_INDEX(SftEntry, DosSystemFileTable); + + /* Return the new handle */ + return DosHandle; } -HANDLE DosGetRealHandle(WORD DosHandle) +WORD DosOpenDevice(PDOS_DEVICE_NODE Device) { + WORD DosHandle; PDOS_PSP PspBlock; LPBYTE HandleTable; + PDOS_SFT_ENTRY SftEntry; + + DPRINT("DosOpenDevice(\"%Z\")\n", &Device->Name); /* The system PSP has no handle table */ - if (CurrentPsp == SYSTEM_PSP) return INVALID_HANDLE_VALUE; + if (CurrentPsp == SYSTEM_PSP) return INVALID_DOS_HANDLE; /* Get a pointer to the handle table */ PspBlock = SEGMENT_TO_PSP(CurrentPsp); HandleTable = (LPBYTE)FAR_POINTER(PspBlock->HandleTablePtr); - /* Make sure the handle is open */ - if (HandleTable[DosHandle] == 0xFF) return INVALID_HANDLE_VALUE; - - /* Return the Win32 handle */ - return DosSystemFileTable[HandleTable[DosHandle]].Handle; + /* Find a free entry in the JFT */ + for (DosHandle = 0; DosHandle < PspBlock->HandleTableSize; DosHandle++) + { + if (HandleTable[DosHandle] == 0xFF) break; + } + + /* If there are no free entries, fail */ + if (DosHandle == PspBlock->HandleTableSize) return INVALID_DOS_HANDLE; + + /* Check if the device is already in the SFT */ + SftEntry = DosFindDeviceSftEntry(Device); + + if (SftEntry != NULL) + { + /* Already in the table, reference it */ + SftEntry->RefCount++; + goto Finish; + } + + /* Find a free SFT entry to use */ + SftEntry = DosFindFreeSftEntry(); + if (SftEntry == NULL) + { + /* The SFT is full */ + return INVALID_DOS_HANDLE; + } + + /* Initialize the empty table entry */ + SftEntry->Type = DOS_SFT_ENTRY_DEVICE; + SftEntry->DeviceNode = Device; + SftEntry->RefCount = 1; + +Finish: + + /* Call the open routine, if it exists */ + if (Device->OpenRoutine) Device->OpenRoutine(Device); + + /* Set the JFT entry to that SFT index */ + HandleTable[DosHandle] = ARRAY_INDEX(SftEntry, DosSystemFileTable); + + /* Return the new handle */ + return DosHandle; } static VOID DosCopyHandleTable(LPBYTE DestinationTable) @@ -591,31 +311,77 @@ /* Check if this is the initial process */ if (CurrentPsp == SYSTEM_PSP) { - /* Set up the standard I/O devices */ - for (i = 0; i <= 2; i++) - { - /* Set the index in the SFT */ - DestinationTable[i] = (BYTE)i; + PDOS_SFT_ENTRY SftEntry; + HANDLE StandardHandles[3]; + PDOS_DEVICE_NODE ConIn = DosGetDevice("CONIN$"); + PDOS_DEVICE_NODE ConOut = DosGetDevice("CONOUT$"); + ASSERT(ConIn != NULL && ConOut != NULL); + + /* Get the native standard handles */ + StandardHandles[0] = GetStdHandle(STD_INPUT_HANDLE); + StandardHandles[1] = GetStdHandle(STD_OUTPUT_HANDLE); + StandardHandles[2] = GetStdHandle(STD_ERROR_HANDLE); + + for (i = 0; i < 3; i++) + { + PDOS_DEVICE_NODE Device = (i == 0) ? ConIn : ConOut; + + /* Find the corresponding SFT entry */ + if (IsConsoleHandle(StandardHandles[i])) + { + SftEntry = DosFindDeviceSftEntry(Device); + } + else + { + SftEntry = DosFindWin32SftEntry(StandardHandles[i]); + } + + if (SftEntry == NULL) + { + /* Create a new SFT entry for it */ + SftEntry = DosFindFreeSftEntry(); + + if (SftEntry == NULL) + { + DPRINT1("Cannot create standard handle %d, the SFT is full!\n", i); + continue; + } + + SftEntry->RefCount = 0; + + if (IsConsoleHandle(StandardHandles[i])) + { + SftEntry->Type = DOS_SFT_ENTRY_DEVICE; + SftEntry->DeviceNode = Device; + + /* Call the open routine */ + if (Device->OpenRoutine) Device->OpenRoutine(Device); + } + else + { + SftEntry->Type = DOS_SFT_ENTRY_WIN32; + SftEntry->Handle = StandardHandles[i]; + } + } + + SftEntry->RefCount++; + DestinationTable[i] = ARRAY_INDEX(SftEntry, DosSystemFileTable); + } + } + else + { + /* Get the parent PSP block and handle table */ + PspBlock = SEGMENT_TO_PSP(CurrentPsp); + SourceTable = (LPBYTE)FAR_POINTER(PspBlock->HandleTablePtr); + + /* Copy the first 20 handles into the new table */ + for (i = 0; i < DEFAULT_JFT_SIZE; i++) + { + DestinationTable[i] = SourceTable[i]; /* Increase the reference count */ - DosSystemFileTable[i].RefCount++; - } - - /* Done */ - return; - } - - /* Get the parent PSP block and handle table */ - PspBlock = SEGMENT_TO_PSP(CurrentPsp); - SourceTable = (LPBYTE)FAR_POINTER(PspBlock->HandleTablePtr); - - /* Copy the first 20 handles into the new table */ - for (i = 0; i < 20; i++) - { - DestinationTable[i] = SourceTable[i]; - - /* Increase the reference count */ - DosSystemFileTable[SourceTable[i]].RefCount++; + DosSystemFileTable[SourceTable[i]].RefCount++; + } } } @@ -634,12 +400,12 @@ return TRUE; } - if (PspBlock->HandleTableSize > 20) + if (PspBlock->HandleTableSize > DEFAULT_JFT_SIZE) { /* Get the segment of the current table */ Segment = (LOWORD(PspBlock->HandleTablePtr) >> 4) + HIWORD(PspBlock->HandleTablePtr); - if (NewSize <= 20) + if (NewSize <= DEFAULT_JFT_SIZE) { /* Get the current handle table */ HandleTable = FAR_POINTER(PspBlock->HandleTablePtr); @@ -679,7 +445,7 @@ PspBlock->HandleTableSize = NewSize; } } - else if (NewSize > 20) + else if (NewSize > DEFAULT_JFT_SIZE) { Segment = DosAllocateMemory(NewSize, NULL); if (Segment == 0) return FALSE; @@ -702,9 +468,9 @@ static BOOLEAN DosCloseHandle(WORD DosHandle) { - BYTE SftIndex; PDOS_PSP PspBlock; LPBYTE HandleTable; + PDOS_SFT_ENTRY SftEntry; DPRINT("DosCloseHandle: DosHandle 0x%04X\n", DosHandle); @@ -718,18 +484,45 @@ /* Make sure the handle is open */ if (HandleTable[DosHandle] == 0xFF) return FALSE; + /* Make sure the SFT entry is valid */ + SftEntry = &DosSystemFileTable[HandleTable[DosHandle]]; + if (SftEntry->Type == DOS_SFT_ENTRY_NONE) return FALSE; + /* Decrement the reference count of the SFT entry */ - SftIndex = HandleTable[DosHandle]; - DosSystemFileTable[SftIndex].RefCount--; + SftEntry->RefCount--; /* Check if the reference count fell to zero */ - if (!DosSystemFileTable[SftIndex].RefCount) - { - /* Close the file, it's no longer needed */ - CloseHandle(DosSystemFileTable[SftIndex].Handle); - - /* Clear the handle */ - DosSystemFileTable[SftIndex].Handle = INVALID_HANDLE_VALUE; + if (!SftEntry->RefCount) + { + switch (SftEntry->Type) + { + case DOS_SFT_ENTRY_WIN32: + { + /* Close the win32 handle and clear it */ + CloseHandle(SftEntry->Handle); + + break; + } + + case DOS_SFT_ENTRY_DEVICE: + { + PDOS_DEVICE_NODE Node = SftEntry->DeviceNode; + + /* Call the close routine, if it exists */ + if (Node->CloseRoutine) SftEntry->DeviceNode->CloseRoutine(SftEntry->DeviceNode); + + break; + } + + default: + { + /* Shouldn't happen */ + ASSERT(FALSE); + } + } + + /* Invalidate the SFT entry */ + SftEntry->Type = DOS_SFT_ENTRY_NONE; } /* Clear the entry in the JFT */ @@ -776,12 +569,6 @@ return TRUE; } - - - - - - static BOOLEAN DosChangeDrive(BYTE Drive) { WCHAR DirectoryPath[DOS_CMDLINE_LENGTH]; @@ -870,6 +657,25 @@ } /* PUBLIC FUNCTIONS ***********************************************************/ + +PDOS_SFT_ENTRY DosGetSftEntry(WORD DosHandle) +{ + PDOS_PSP PspBlock; + LPBYTE HandleTable; + + /* The system PSP has no handle table */ + if (CurrentPsp == SYSTEM_PSP) return NULL; + + /* Get a pointer to the handle table */ + PspBlock = SEGMENT_TO_PSP(CurrentPsp); + HandleTable = (LPBYTE)FAR_POINTER(PspBlock->HandleTablePtr); + + /* Make sure the handle is open */ + if (HandleTable[DosHandle] == 0xFF) return NULL; + + /* Return a pointer to the SFT entry */ + return &DosSystemFileTable[HandleTable[DosHandle]]; +} VOID DosInitializePsp(WORD PspSegment, LPCSTR CommandLine, WORD ProgramSize, WORD Environment) { @@ -1020,19 +826,22 @@ /* Make sure it does not pass 0xFFFF */ if (ExeSize > 0xFFFF) ExeSize = 0xFFFF; - /* Reduce the size one by one until the allocation is successful */ - for (i = Header->e_maxalloc; i >= Header->e_minalloc; i--, ExeSize--) - { - /* Try to allocate that much memory */ + /* Try to allocate that much memory */ + Segment = DosAllocateMemory((WORD)ExeSize, &MaxAllocSize); + + if (Segment == 0) + { + /* Check if there's at least enough memory for the minimum size */ + if (MaxAllocSize < (ExeSize - Header->e_maxalloc + Header->e_minalloc)) + { + Result = DosLastError; + goto Cleanup; + } + + /* Allocate that minimum amount */ + ExeSize = MaxAllocSize; Segment = DosAllocateMemory((WORD)ExeSize, NULL); - if (Segment != 0) break; - } - - /* Check if at least the lowest allocation was successful */ - if (Segment == 0) - { - Result = DosLastError; - goto Cleanup; + ASSERT(Segment != 0); } /* Initialize the PSP */ @@ -1403,11 +1212,12 @@ BOOLEAN DosHandleIoctl(BYTE ControlCode, WORD FileHandle) { - HANDLE Handle = DosGetRealHandle(FileHandle); - - if (Handle == INVALID_HANDLE_VALUE) - { - /* Doesn't exist */ + PDOS_SFT_ENTRY Entry = DosGetSftEntry(FileHandle); + PDOS_DEVICE_NODE Node = Entry->DeviceNode; + + /* Make sure it exists and is a device */ + if (!Entry || Entry->Type != DOS_SFT_ENTRY_DEVICE) + { DosLastError = ERROR_FILE_NOT_FOUND; return FALSE; } @@ -1417,32 +1227,68 @@ /* Get Device Information */ case 0x00: { - WORD InfoWord = 0; - /* * See Ralf Brown: http://www.ctyme.com/intr/rb-2820.htm * for a list of possible flags. */ - if (Handle == DosSystemFileTable[DOS_INPUT_HANDLE].Handle) - { - /* Console input */ - InfoWord |= 1 << 0; - - /* It is a device */ - InfoWord |= 1 << 7; - } - else if (Handle == DosSystemFileTable[DOS_OUTPUT_HANDLE].Handle) - { - /* Console output */ - InfoWord |= 1 << 1; - - /* It is a device */ - InfoWord |= 1 << 7; - } - /* Return the device information word */ - setDX(InfoWord); + setDX(Node->DeviceAttributes); + return TRUE; + } + + /* Set Device Information */ + case 0x01: + { + Node->DeviceAttributes = getDX(); + return TRUE; + } + + /* Read From Device I/O Control Channel */ + case 0x02: + { + WORD Length = getCX(); + + if (!(Node->DeviceAttributes & DOS_DEVATTR_IOCTL)) + { + DosLastError = ERROR_INVALID_FUNCTION; + return FALSE; + } + + /* Do nothing if there is no IOCTL routine */ + if (!Node->IoctlReadRoutine) + { + setAX(0); + return TRUE; + } + + Node->IoctlReadRoutine(Node, MAKELONG(getDX(), getDS()), &Length); + + setAX(Length); + return TRUE; + } + + /* Write To Device I/O Control Channel */ + case 0x03: + { + WORD Length = getCX(); + + if (!(Node->DeviceAttributes & DOS_DEVATTR_IOCTL)) + { + DosLastError = ERROR_INVALID_FUNCTION; + return FALSE; + } + + /* Do nothing if there is no IOCTL routine */ + if (!Node->IoctlWriteRoutine) + { + setAX(0); + return TRUE; + } + + Node->IoctlWriteRoutine(Node, MAKELONG(getDX(), getDS()), &Length); + + setAX(Length); return TRUE; } @@ -2130,13 +1976,24 @@ break; } - /* Open File */ + /* Open File or Device */ case 0x3D: { WORD FileHandle; - WORD ErrorCode = DosOpenFile(&FileHandle, - (LPCSTR)SEG_OFF_TO_PTR(getDS(), getDX()), - getAL()); + WORD ErrorCode; + LPCSTR FileName = (LPCSTR)SEG_OFF_TO_PTR(getDS(), getDX()); + PDOS_DEVICE_NODE Device = DosGetDevice(FileName); + + if (Device) + { + FileHandle = DosOpenDevice(Device); + ErrorCode = (FileHandle != INVALID_DOS_HANDLE) + ? ERROR_SUCCESS : ERROR_TOO_MANY_OPEN_FILES; + } + else + { + ErrorCode = DosOpenFile(&FileHandle, FileName, getAL()); + } if (ErrorCode == ERROR_SUCCESS) { @@ -2152,7 +2009,7 @@ break; } - /* Close File */ + /* Close File or Device */ case 0x3E: { if (DosCloseHandle(getBX())) @@ -2174,11 +2031,11 @@ WORD BytesRead = 0; WORD ErrorCode; - DPRINT("INT 21h, AH = 3Fh\n"); + DPRINT1("INT 21h, AH = 3Fh\n"); DoEcho = TRUE; ErrorCode = DosReadFile(getBX(), - SEG_OFF_TO_PTR(getDS(), getDX()), + MAKELONG(getDX(), getDS()), getCX(), &BytesRead); DoEcho = FALSE; @@ -2202,7 +2059,7 @@ { WORD BytesWritten = 0; WORD ErrorCode = DosWriteFile(getBX(), - SEG_OFF_TO_PTR(getDS(), getDX()), + MAKELONG(getDX(), getDS()), getCX(), &BytesWritten); @@ -2335,9 +2192,9 @@ case 0x45: { WORD NewHandle; - HANDLE Handle = DosGetRealHandle(getBX()); - - if (Handle == INVALID_HANDLE_VALUE) + PDOS_SFT_ENTRY SftEntry = DosGetSftEntry(getBX()); + + if (SftEntry == NULL || SftEntry->Type == DOS_SFT_ENTRY_NONE) { /* The handle is invalid */ Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; @@ -2346,7 +2203,26 @@ } /* Open a new handle to the same entry */ - NewHandle = DosOpenHandle(Handle); + switch (SftEntry->Type) + { + case DOS_SFT_ENTRY_WIN32: + { + NewHandle = DosOpenHandle(SftEntry->Handle); + break; + } + + case DOS_SFT_ENTRY_DEVICE: + { + NewHandle = DosOpenDevice(SftEntry->DeviceNode); + break; + } + + default: + { + /* Shouldn't happen */ + ASSERT(FALSE); + } + } if (NewHandle == INVALID_DOS_HANDLE) { @@ -2742,9 +2618,9 @@ /* Lock/Unlock Region of File */ case 0x5C: { - HANDLE Handle = DosGetRealHandle(getBX()); - - if (Handle == INVALID_HANDLE_VALUE) + PDOS_SFT_ENTRY SftEntry = DosGetSftEntry(getBX()); + + if (SftEntry->Type != DOS_SFT_ENTRY_WIN32) { /* The handle is invalid */ Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; @@ -2755,7 +2631,7 @@ if (getAL() == 0x00) { /* Lock region of file */ - if (LockFile(Handle, + if (LockFile(SftEntry->Handle, MAKELONG(getCX(), getDX()), 0, MAKELONG(getSI(), getDI()), 0)) { @@ -2770,7 +2646,7 @@ else if (getAL() == 0x01) { /* Unlock region of file */ - if (UnlockFile(Handle, + if (UnlockFile(SftEntry->Handle, MAKELONG(getCX(), getDX()), 0, MAKELONG(getSI(), getDI()), 0)) { @@ -2979,6 +2855,7 @@ CHAR CurrentDirectory[MAX_PATH]; CHAR DosDirectory[DOS_DIR_LENGTH]; LPSTR Path; + PDOS_DEVICE_NODE ConInDevice, ConOutDevice; FILE *Stream; WCHAR Buffer[256]; @@ -3031,19 +2908,15 @@ /* Initialize the SFT */ for (i = 0; i < DOS_SFT_SIZE; i++) { - DosSystemFileTable[i].Handle = INVALID_HANDLE_VALUE; + DosSystemFileTable[i].Type = DOS_SFT_ENTRY_NONE; DosSystemFileTable[i].RefCount = 0; } - /* Get handles to standard I/O devices */ - DosSystemFileTable[0].Handle = GetStdHandle(STD_INPUT_HANDLE); - DosSystemFileTable[1].Handle = GetStdHandle(STD_OUTPUT_HANDLE); - DosSystemFileTable[2].Handle = GetStdHandle(STD_ERROR_HANDLE); - - /* Initialize the reference counts */ - DosSystemFileTable[0].RefCount = - DosSystemFileTable[1].RefCount = - DosSystemFileTable[2].RefCount = 1; + /* Load the EMS driver */ + EmsDrvInitialize(); + + /* Load the CON driver */ + ConDrvInitialize(&ConInDevice, &ConOutDevice); #endif Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Thu Mar 26 00:21:25 2015 @@ -12,6 +12,7 @@ /* INCLUDES *******************************************************************/ #include "ntvdm.h" +#include "device.h" /**/ #include "int32.h" /**/ @@ -48,13 +49,7 @@ #define NUM_DRIVES ('Z' - 'A' + 1) #define DOS_CHAR_ATTRIBUTE 0x07 #define DOS_PROGRAM_NAME_TAG 0x0001 - -enum DOS_ALLOC_STRATEGY -{ - DOS_ALLOC_FIRST_FIT, - DOS_ALLOC_BEST_FIT, - DOS_ALLOC_LAST_FIT -}; +#define DEFAULT_JFT_SIZE 20 typedef enum { @@ -63,16 +58,26 @@ DOS_LOAD_OVERLAY = 0x03 } DOS_EXEC_TYPE; +typedef enum +{ + DOS_SFT_ENTRY_NONE, + DOS_SFT_ENTRY_WIN32, + DOS_SFT_ENTRY_DEVICE +} DOS_SFT_ENTRY_TYPE; + +typedef struct _DOS_SFT_ENTRY +{ + DOS_SFT_ENTRY_TYPE Type; + WORD RefCount; + + union + { + HANDLE Handle; + PDOS_DEVICE_NODE DeviceNode; + }; +} DOS_SFT_ENTRY, *PDOS_SFT_ENTRY; + #pragma pack(push, 1) - -typedef struct _DOS_MCB -{ - CHAR BlockType; - WORD OwnerPsp; - WORD Size; - BYTE Unused[3]; - CHAR Name[8]; -} DOS_MCB, *PDOS_MCB; typedef struct _DOS_FCB { @@ -169,7 +174,11 @@ #pragma pack(pop) +/* VARIABLES ******************************************************************/ + extern BOOLEAN DoEcho; +extern WORD CurrentPsp; +extern WORD DosLastError; /* FUNCTIONS ******************************************************************/ @@ -190,15 +199,17 @@ VOID DosPrintCharacter(WORD FileHandle, CHAR Character); BOOLEAN DosBIOSInitialize(VOID); - +VOID EmsDrvInitialize(VOID); +VOID EmsDrvCleanup(VOID); +VOID ConDrvInitialize(PDOS_DEVICE_NODE *InputDevice, PDOS_DEVICE_NODE *OutputDevice); +VOID ConDrvCleanup(VOID); /* * DOS Kernel Functions * See dos.c */ -BOOL IsConsoleHandle(HANDLE hHandle); WORD DosOpenHandle(HANDLE Handle); -HANDLE DosGetRealHandle(WORD DosHandle); +PDOS_SFT_ENTRY DosGetSftEntry(WORD DosHandle); WORD DosCreateFileEx(LPWORD Handle, LPWORD CreationStatus, @@ -214,11 +225,11 @@ LPCSTR FilePath, BYTE AccessShareModes); WORD DosReadFile(WORD FileHandle, - LPVOID Buffer, + DWORD Buffer, WORD Count, LPWORD BytesRead); WORD DosWriteFile(WORD FileHandle, - LPVOID Buffer, + DWORD Buffer, WORD Count, LPWORD BytesWritten); WORD DosSeekFile(WORD FileHandle, Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] Thu Mar 26 00:21:25 2015 @@ -394,129 +394,84 @@ } WORD DosReadFile(WORD FileHandle, - LPVOID Buffer, + DWORD Buffer, WORD Count, LPWORD BytesRead) { WORD Result = ERROR_SUCCESS; - DWORD BytesRead32 = 0; - HANDLE Handle = DosGetRealHandle(FileHandle); + PDOS_SFT_ENTRY SftEntry = DosGetSftEntry(FileHandle); DPRINT("DosReadFile: FileHandle 0x%04X, Count 0x%04X\n", FileHandle, Count); - /* Make sure the handle is valid */ - if (Handle == INVALID_HANDLE_VALUE) return ERROR_INVALID_HANDLE; - - if (IsConsoleHandle(Handle)) - { - CHAR Character; - - /* - * Use BIOS Get Keystroke function - */ - - /* Save AX */ - USHORT AX = getAX(); - - for (BytesRead32 = 0; BytesRead32 < Count; BytesRead32++) - { - /* Call the BIOS INT 16h, AH=00h "Get Keystroke" */ - setAH(0x00); - Int32Call(&DosContext, BIOS_KBD_INTERRUPT); - - /* Retrieve the character in AL (scan code is in AH) */ - Character = getAL(); - - if (DoEcho) DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); - - ((PCHAR)Buffer)[BytesRead32] = Character; - - /* Stop on first carriage return */ - if (Character == '\r') - { - if (DoEcho) DosPrintCharacter(DOS_OUTPUT_HANDLE, '\n'); - break; - } - - // BytesRead32++; - } - - /* Restore AX */ - setAX(AX); - } - else - { + if (SftEntry->Type == DOS_SFT_ENTRY_WIN32) + { + DWORD BytesRead32 = 0; + /* Read the file */ - if (!ReadFile(Handle, Buffer, Count /* * sizeof(CHAR) */, &BytesRead32, NULL)) + if (!ReadFile(SftEntry->Handle, FAR_POINTER(Buffer), Count, &BytesRead32, NULL)) { /* Store the error code */ Result = (WORD)GetLastError(); } - } - - /* The number of bytes read is always 16-bit */ - *BytesRead = LOWORD(BytesRead32); + + /* The number of bytes read is always 16-bit */ + *BytesRead = LOWORD(BytesRead32); + } + else if (SftEntry->Type == DOS_SFT_ENTRY_DEVICE) + { + if (!SftEntry->DeviceNode->ReadRoutine) return ERROR_INVALID_FUNCTION; + + /* Read the device */ + SftEntry->DeviceNode->ReadRoutine(SftEntry->DeviceNode, Buffer, &Count); + *BytesRead = Count; + } + else + { + /* Invalid handle */ + return ERROR_INVALID_HANDLE; + } /* Return the error code */ return Result; } WORD DosWriteFile(WORD FileHandle, - LPVOID Buffer, + DWORD Buffer, WORD Count, LPWORD BytesWritten) { WORD Result = ERROR_SUCCESS; - DWORD BytesWritten32 = 0; - HANDLE Handle = DosGetRealHandle(FileHandle); + PDOS_SFT_ENTRY SftEntry = DosGetSftEntry(FileHandle); DPRINT("DosWriteFile: FileHandle 0x%04X, Count 0x%04X\n", FileHandle, Count); - /* Make sure the handle is valid */ - if (Handle == INVALID_HANDLE_VALUE) return ERROR_INVALID_HANDLE; - - if (IsConsoleHandle(Handle)) - { - /* - * Use BIOS Teletype function - */ - - /* Save AX and BX */ - USHORT AX = getAX(); - USHORT BX = getBX(); - - // FIXME: Use BIOS Write String function INT 10h, AH=13h ?? - - for (BytesWritten32 = 0; BytesWritten32 < Count; BytesWritten32++) - { - /* Set the parameters */ - setAL(((PCHAR)Buffer)[BytesWritten32]); - setBL(DOS_CHAR_ATTRIBUTE); - setBH(Bda->VideoPage); - - /* Call the BIOS INT 10h, AH=0Eh "Teletype Output" */ - setAH(0x0E); - Int32Call(&DosContext, BIOS_VIDEO_INTERRUPT); - - // BytesWritten32++; - } - - /* Restore AX and BX */ - setBX(BX); - setAX(AX); - } - else - { + if (SftEntry->Type == DOS_SFT_ENTRY_WIN32) + { + DWORD BytesWritten32 = 0; + /* Write the file */ - if (!WriteFile(Handle, Buffer, Count /* * sizeof(CHAR) */, &BytesWritten32, NULL)) + if (!WriteFile(SftEntry->Handle, FAR_POINTER(Buffer), Count, &BytesWritten32, NULL)) { /* Store the error code */ Result = (WORD)GetLastError(); } - } - - /* The number of bytes written is always 16-bit */ - *BytesWritten = LOWORD(BytesWritten32); + + /* The number of bytes written is always 16-bit */ + *BytesWritten = LOWORD(BytesWritten32); + } + else if (SftEntry->Type == DOS_SFT_ENTRY_DEVICE) + { + if (!SftEntry->DeviceNode->WriteRoutine) return ERROR_INVALID_FUNCTION; + + /* Read the device */ + SftEntry->DeviceNode->WriteRoutine(SftEntry->DeviceNode, Buffer, &Count); + *BytesWritten = Count; + } + else + { + /* Invalid handle */ + return ERROR_INVALID_HANDLE; + } /* Return the error code */ return Result; @@ -529,15 +484,23 @@ { WORD Result = ERROR_SUCCESS; DWORD FilePointer; - HANDLE Handle = DosGetRealHandle(FileHandle); + PDOS_SFT_ENTRY SftEntry = DosGetSftEntry(FileHandle); DPRINT("DosSeekFile: FileHandle 0x%04X, Offset 0x%08X, Origin 0x%02X\n", FileHandle, Offset, Origin); - /* Make sure the handle is valid */ - if (Handle == INVALID_HANDLE_VALUE) return ERROR_INVALID_HANDLE; + if (SftEntry->Type == DOS_SFT_ENTRY_NONE) + { + /* Invalid handle */ + return ERROR_INVALID_HANDLE; + } + else if (SftEntry->Type == DOS_SFT_ENTRY_DEVICE) + { + /* For character devices, always return success */ + return ERROR_SUCCESS; + } /* Check if the origin is valid */ if (Origin != FILE_BEGIN && Origin != FILE_CURRENT && Origin != FILE_END) @@ -545,17 +508,7 @@ return ERROR_INVALID_FUNCTION; } - /* Move the file pointer */ - if (IsConsoleHandle(Handle)) - { - /* Always succeeds when seeking a console handle */ - FilePointer = 0; - Result = ERROR_SUCCESS; - } - else - { - FilePointer = SetFilePointer(Handle, Offset, NULL, Origin); - } + FilePointer = SetFilePointer(SftEntry->Handle, Offset, NULL, Origin); /* Check if there's a possibility the operation failed */ if (FilePointer == INVALID_SET_FILE_POINTER) @@ -579,17 +532,34 @@ BOOL DosFlushFileBuffers(WORD FileHandle) { - HANDLE Handle = DosGetRealHandle(FileHandle); - - /* Make sure the handle is valid */ - if (Handle == INVALID_HANDLE_VALUE) return FALSE; - - /* - * This function can either flush files back to disks, or flush - * console input buffers, in which case there is no need to check - * whether the handle is a console handle. FlushFileBuffers() - * automatically does this check and calls FlushConsoleInputBuffer() - * if needed. - */ - return FlushFileBuffers(Handle); -} + PDOS_SFT_ENTRY SftEntry = DosGetSftEntry(FileHandle); + + switch (SftEntry->Type) + { + case DOS_SFT_ENTRY_WIN32: + { + return FlushFileBuffers(SftEntry->Handle); + } + + case DOS_SFT_ENTRY_DEVICE: + { + if (SftEntry->DeviceNode->FlushInputRoutine) + { + SftEntry->DeviceNode->FlushInputRoutine(SftEntry->DeviceNode); + } + + if (SftEntry->DeviceNode->FlushOutputRoutine) + { + SftEntry->DeviceNode->FlushOutputRoutine(SftEntry->DeviceNode); + } + + return TRUE; + } + + default: + { + /* Invalid handle */ + return FALSE; + } + } +} Added: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c (added) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] Thu Mar 26 00:21:25 2015 @@ -0,0 +1,48 @@ +/* + * COPYRIGHT: GPLv2+ - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: emsdrv.c + * PURPOSE: DOS EMS Driver + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +/* INCLUDES *******************************************************************/ + +#define NDEBUG + +#include "dos.h" +#include "dos/dem.h" +#include "device.h" + +#define EMS_DEVICE_NAME "EMMXXXX0" + +/* PRIVATE VARIABLES **********************************************************/ + +static PDOS_DEVICE_NODE Node; + +/* PRIVATE FUNCTIONS **********************************************************/ + +WORD NTAPI EmsDrvDispatchIoctlRead(PDOS_DEVICE_NODE Device, DWORD Buffer, PWORD Length) +{ + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + return DOS_DEVSTAT_DONE; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID EmsDrvInitialize(VOID) +{ + /* Create the device */ + Node = DosCreateDevice(DOS_DEVATTR_IOCTL + | DOS_DEVATTR_CHARACTER, + EMS_DEVICE_NAME); + Node->IoctlReadRoutine = EmsDrvDispatchIoctlRead; +} + +VOID EmsDrvCleanup(VOID) +{ + /* Delete the device */ + DosDeleteDevice(Node); +} Propchange: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c (added) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] Thu Mar 26 00:21:25 2015 @@ -0,0 +1,378 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: dos/dos32krnl/memory.c + * PURPOSE: DOS32 Memory Manager + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +/* INCLUDES *******************************************************************/ + +#define NDEBUG + +#include "emulator.h" + +#include "dos.h" +#include "dos/dem.h" +#include "memory.h" + +/* PUBLIC VARIABLES ***********************************************************/ + +BYTE DosAllocStrategy = DOS_ALLOC_BEST_FIT; +BOOLEAN DosUmbLinked = FALSE; + +/* PRIVATE FUNCTIONS **********************************************************/ + +static VOID DosCombineFreeBlocks(WORD StartBlock) +{ + PDOS_MCB CurrentMcb = SEGMENT_TO_MCB(StartBlock), NextMcb; + + /* If this is the last block or it's not free, quit */ + if (CurrentMcb->BlockType == 'Z' || CurrentMcb->OwnerPsp != 0) return; + + while (TRUE) + { + /* Get a pointer to the next MCB */ + NextMcb = SEGMENT_TO_MCB(StartBlock + CurrentMcb->Size + 1); + + /* Check if the next MCB is free */ + if (NextMcb->OwnerPsp == 0) + { + /* Combine them */ + CurrentMcb->Size += NextMcb->Size + 1; + CurrentMcb->BlockType = NextMcb->BlockType; + NextMcb->BlockType = 'I'; + } + else + { + /* No more adjoining free blocks */ + break; + } + } +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +WORD DosAllocateMemory(WORD Size, WORD *MaxAvailable) +{ + WORD Result = 0, Segment = FIRST_MCB_SEGMENT, MaxSize = 0; + PDOS_MCB CurrentMcb, NextMcb; + BOOLEAN SearchUmb = FALSE; + + DPRINT("DosAllocateMemory: Size 0x%04X\n", Size); + + if (DosUmbLinked && (DosAllocStrategy & (DOS_ALLOC_HIGH | DOS_ALLOC_HIGH_LOW))) + { + /* Search UMB first */ + Segment = UMB_START_SEGMENT; + SearchUmb = TRUE; + } + + while (TRUE) + { + /* Get a pointer to the MCB */ + CurrentMcb = SEGMENT_TO_MCB(Segment); + + /* Make sure it's valid */ + if (CurrentMcb->BlockType != 'M' && CurrentMcb->BlockType != 'Z') + { + DPRINT("The DOS memory arena is corrupted!\n"); + DosLastError = ERROR_ARENA_TRASHED; + return 0; + } + + /* Only check free blocks */ + if (CurrentMcb->OwnerPsp != 0) goto Next; + + /* Combine this free block with adjoining free blocks */ + DosCombineFreeBlocks(Segment); + + /* Update the maximum block size */ + if (CurrentMcb->Size > MaxSize) MaxSize = CurrentMcb->Size; + + /* Check if this block is big enough */ + if (CurrentMcb->Size < Size) goto Next; + + switch (DosAllocStrategy & 0x3F) + { + case DOS_ALLOC_FIRST_FIT: + { + /* For first fit, stop immediately */ + Result = Segment; + goto Done; + } + + case DOS_ALLOC_BEST_FIT: + { + /* For best fit, update the smallest block found so far */ + if ((Result == 0) || (CurrentMcb->Size < SEGMENT_TO_MCB(Result)->Size)) + { + Result = Segment; + } + + break; + } + + case DOS_ALLOC_LAST_FIT: + { + /* For last fit, make the current block the result, but keep searching */ + Result = Segment; + break; + } + } + +Next: + /* If this was the last MCB in the chain, quit */ + if (CurrentMcb->BlockType == 'Z') + { + /* Check if nothing was found while searching through UMBs */ + if ((Result == 0) && SearchUmb && (DosAllocStrategy & DOS_ALLOC_HIGH_LOW)) + { + /* Search low memory */ + Segment = FIRST_MCB_SEGMENT; + continue; + } + + break; + } + + /* Otherwise, update the segment and continue */ + Segment += CurrentMcb->Size + 1; + } + +Done: + + /* If we didn't find a free block, return 0 */ + if (Result == 0) + { + DosLastError = ERROR_NOT_ENOUGH_MEMORY; + if (MaxAvailable) *MaxAvailable = MaxSize; + return 0; + } + + /* Get a pointer to the MCB */ + CurrentMcb = SEGMENT_TO_MCB(Result); + + /* Check if the block is larger than requested */ + if (CurrentMcb->Size > Size) + { + /* It is, split it into two blocks */ + NextMcb = SEGMENT_TO_MCB(Result + Size + 1); + + /* Initialize the new MCB structure */ + NextMcb->BlockType = CurrentMcb->BlockType; + NextMcb->Size = CurrentMcb->Size - Size - 1; + NextMcb->OwnerPsp = 0; + + /* Update the current block */ + CurrentMcb->BlockType = 'M'; + CurrentMcb->Size = Size; + } + + /* Take ownership of the block */ + CurrentMcb->OwnerPsp = CurrentPsp; + + /* Return the segment of the data portion of the block */ + return Result + 1; +} + +BOOLEAN DosResizeMemory(WORD BlockData, WORD NewSize, WORD *MaxAvailable) +{ + BOOLEAN Success = TRUE; + WORD Segment = BlockData - 1, ReturnSize = 0, NextSegment; + PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment), NextMcb; + + DPRINT("DosResizeMemory: BlockData 0x%04X, NewSize 0x%04X\n", + BlockData, + NewSize); + + /* Make sure this is a valid, allocated block */ + if ((Mcb->BlockType != 'M' && Mcb->BlockType != 'Z') || Mcb->OwnerPsp == 0) + { + Success = FALSE; + DosLastError = ERROR_INVALID_HANDLE; + goto Done; + } + + ReturnSize = Mcb->Size; + + /* Check if we need to expand or contract the block */ + if (NewSize > Mcb->Size) + { + /* We can't expand the last block */ + if (Mcb->BlockType != 'M') + { + Success = FALSE; + goto Done; + } + + /* Get the pointer and segment of the next MCB */ + NextSegment = Segment + Mcb->Size + 1; + NextMcb = SEGMENT_TO_MCB(NextSegment); + + /* Make sure the next segment is free */ + if (NextMcb->OwnerPsp != 0) + { + DPRINT("Cannot expand memory block: next segment is not free!\n"); + DosLastError = ERROR_NOT_ENOUGH_MEMORY; + Success = FALSE; + goto Done; + } + + /* Combine this free block with adjoining free blocks */ + DosCombineFreeBlocks(NextSegment); + + /* Set the maximum possible size of the block */ + ReturnSize += NextMcb->Size + 1; + + if (ReturnSize < NewSize) + { + DPRINT("Cannot expand memory block: insufficient free segments available!\n"); + DosLastError = ERROR_NOT_ENOUGH_MEMORY; + Success = FALSE; + goto Done; + } + + /* Maximize the current block */ + Mcb->Size = ReturnSize; + Mcb->BlockType = NextMcb->BlockType; + + /* Invalidate the next block */ + NextMcb->BlockType = 'I'; + + /* Check if the block is larger than requested */ + if (Mcb->Size > NewSize) + { + DPRINT("Block too large, reducing size from 0x%04X to 0x%04X\n", + Mcb->Size, + NewSize); + + /* It is, split it into two blocks */ + NextMcb = SEGMENT_TO_MCB(Segment + NewSize + 1); + + /* Initialize the new MCB structure */ + NextMcb->BlockType = Mcb->BlockType; + NextMcb->Size = Mcb->Size - NewSize - 1; + NextMcb->OwnerPsp = 0; + + /* Update the current block */ + Mcb->BlockType = 'M'; + Mcb->Size = NewSize; + } + } + else if (NewSize < Mcb->Size) + { + DPRINT("Shrinking block from 0x%04X to 0x%04X\n", + Mcb->Size, + NewSize); + + /* Just split the block */ + NextMcb = SEGMENT_TO_MCB(Segment + NewSize + 1); + NextMcb->BlockType = Mcb->BlockType; + NextMcb->Size = Mcb->Size - NewSize - 1; + NextMcb->OwnerPsp = 0; + + /* Update the MCB */ + Mcb->BlockType = 'M'; + Mcb->Size = NewSize; + } + +Done: + /* Check if the operation failed */ + if (!Success) + { + DPRINT("DosResizeMemory FAILED. Maximum available: 0x%04X\n", + ReturnSize); + + /* Return the maximum possible size */ + if (MaxAvailable) *MaxAvailable = ReturnSize; + } + + return Success; +} + +BOOLEAN DosFreeMemory(WORD BlockData) +{ + PDOS_MCB Mcb = SEGMENT_TO_MCB(BlockData - 1); + + DPRINT("DosFreeMemory: BlockData 0x%04X\n", BlockData); + + /* Make sure the MCB is valid */ + if (Mcb->BlockType != 'M' && Mcb->BlockType != 'Z') + { + DPRINT("MCB block type '%c' not valid!\n", Mcb->BlockType); + return FALSE; + } + + /* Mark the block as free */ + Mcb->OwnerPsp = 0; + + return TRUE; +} + +BOOLEAN DosLinkUmb(VOID) +{ + DWORD Segment = FIRST_MCB_SEGMENT; + PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment); + + DPRINT("Linking UMB\n"); + + /* Check if UMBs are already linked */ + if (DosUmbLinked) return FALSE; + + /* Find the last block */ + while ((Mcb->BlockType == 'M') && (Segment <= 0xFFFF)) + { + Segment += Mcb->Size + 1; + Mcb = SEGMENT_TO_MCB(Segment); + } + + /* Make sure it's valid */ + if (Mcb->BlockType != 'Z') return FALSE; + + /* Connect the MCB with the UMB chain */ + Mcb->BlockType = 'M'; + + DosUmbLinked = TRUE; + return TRUE; +} + +BOOLEAN DosUnlinkUmb(VOID) +{ + DWORD Segment = FIRST_MCB_SEGMENT; + PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment); + + DPRINT("Unlinking UMB\n"); + + /* Check if UMBs are already unlinked */ + if (!DosUmbLinked) return FALSE; + + /* Find the block preceding the MCB that links it with the UMB chain */ + while (Segment <= 0xFFFF) + { + if ((Segment + Mcb->Size) == (FIRST_MCB_SEGMENT + USER_MEMORY_SIZE)) + { + /* This is the last non-UMB segment */ + break; + } + + /* Advance to the next MCB */ + Segment += Mcb->Size + 1; + Mcb = SEGMENT_TO_MCB(Segment); + } + + /* Mark the MCB as the last MCB */ + Mcb->BlockType = 'Z'; + + DosUmbLinked = FALSE; + return TRUE; +} + +VOID DosChangeMemoryOwner(WORD Segment, WORD NewOwner) +{ + PDOS_MCB Mcb = SEGMENT_TO_MCB(Segment - 1); + + /* Just set the owner */ + Mcb->OwnerPsp = NewOwner; +} + Propchange: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h (added) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h [iso-8859-1] Thu Mar 26 00:21:25 2015 @@ -0,0 +1,46 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: dos/dos32krnl/memory.h + * PURPOSE: DOS32 Memory Manager + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +#ifndef _MEMORY_H_ +#define _MEMORY_H_ + +/* TYPEDEFS *******************************************************************/ + +enum DOS_ALLOC_STRATEGY +{ + DOS_ALLOC_FIRST_FIT, + DOS_ALLOC_BEST_FIT, + DOS_ALLOC_LAST_FIT +}; + +typedef struct _DOS_MCB +{ + CHAR BlockType; + WORD OwnerPsp; + WORD Size; + BYTE Unused[3]; + CHAR Name[8]; +} DOS_MCB, *PDOS_MCB; + +/* VARIABLES ******************************************************************/ + +extern BYTE DosAllocStrategy; +extern BOOLEAN DosUmbLinked; + +/* FUNCTIONS ******************************************************************/ + +WORD DosAllocateMemory(WORD Size, WORD *MaxAvailable); +BOOLEAN DosResizeMemory(WORD BlockData, WORD NewSize, WORD *MaxAvailable); +BOOLEAN DosFreeMemory(WORD BlockData); +BOOLEAN DosLinkUmb(VOID); +BOOLEAN DosUnlinkUmb(VOID); +VOID DosChangeMemoryOwner(WORD Segment, WORD NewOwner); + +#endif // _MEMORY_H_ + +/* EOF */ Propchange: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.h [iso-8859-1] Thu Mar 26 00:21:25 2015 @@ -34,6 +34,7 @@ #define REAL_TO_PHYS(ptr) (PVOID)((ULONG_PTR)(ptr) + (ULONG_PTR)BaseAddress) #define PHYS_TO_REAL(ptr) (PVOID)((ULONG_PTR)(ptr) - (ULONG_PTR)BaseAddress) +#define ARRAY_INDEX(ptr, array) ((ULONG)(((ULONG_PTR)(ptr) - (ULONG_PTR)(array)) / sizeof(*array))) /* BCD-Binary conversion */

10 years, 1 month

[gadamopoulos] 66894: [SHELL32] - Stub SHGetComputerDisplayNameW.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Mar 26 00:00:24 2015 New Revision: 66894 URL: http://svn.reactos.org/svn/reactos?rev=66894&view=rev Log: [SHELL32] - Stub SHGetComputerDisplayNameW. Modified: trunk/reactos/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/stubs.cpp Modified: trunk/reactos/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.spec [iso-8859-1] Thu Mar 26 00:00:24 2015 @@ -447,7 +447,7 @@ 726 stdcall -noname CopyStreamUI(ptr ptr ptr) 727 stdcall SHGetImageList(long ptr ptr) 730 stdcall RestartDialogEx(long wstr long long) -731 stub -noname SHRegisterDarwinLink +731 stdcall -noname -stub SHRegisterDarwinLink(long long long) 732 stdcall -noname SHReValidateDarwinCache() 733 stdcall -noname CheckDiskSpace() 740 stub -noname SHCreateFileDataObject @@ -459,7 +459,7 @@ 749 stub SHGetShellStyleHInstance 750 stub SHGetAttributesFromDataObject 751 stub -noname SHSimulateDropOnClsid -752 stub -noname SHGetComputerDisplayNameW +752 stdcall -noname SHGetComputerDisplayNameW(long long long long) 753 stdcall -noname CheckStagingArea() 754 stub -noname SHLimitInputEditWithFlags 755 stdcall -noname PathIsEqualOrSubFolder(wstr wstr) Modified: trunk/reactos/dll/win32/shell32/stubs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/stubs.cp… ============================================================================== --- trunk/reactos/dll/win32/shell32/stubs.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/stubs.cpp [iso-8859-1] Thu Mar 26 00:00:24 2015 @@ -1402,3 +1402,10 @@ /* Called by native explorer */ return 0; } + +EXTERN_C +DWORD WINAPI SHGetComputerDisplayNameW(DWORD param1, DWORD param2, DWORD param3, DWORD param4) +{ + FIXME("SHGetComputerDisplayNameW() stub\n"); + return E_FAIL; +}

10 years, 1 month

[tkreuzer] 66893: [WIN32K] Rewrite brush code in C++

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 25 22:38:20 2015 New Revision: 66893 URL: http://svn.reactos.org/svn/reactos?rev=66893&view=rev Log: [WIN32K] Rewrite brush code in C++ Added: trunk/reactos/win32ss/gdi/ntgdi/baseobj.hpp (with props) trunk/reactos/win32ss/gdi/ntgdi/brush.cpp (with props) trunk/reactos/win32ss/gdi/ntgdi/brush.hpp (with props) Removed: trunk/reactos/win32ss/gdi/ntgdi/brush.c Modified: trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/pch.h trunk/reactos/win32ss/user/ntuser/ntuser.c Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Wed Mar 25 22:38:20 2015 @@ -1,5 +1,10 @@ set(USE_DIBLIB FALSE) + +if(NOT MSVC) + # HACK: this should be enabled globally! + add_compile_flags_language("-std=c++11" "CXX") +endif() # Give WIN32 subsystem its own project. PROJECT(WIN32SS) @@ -146,7 +151,7 @@ gdi/ntgdi/bezier.c gdi/ntgdi/bitblt.c gdi/ntgdi/bitmaps.c - gdi/ntgdi/brush.c + gdi/ntgdi/brush.cpp gdi/ntgdi/cliprgn.c gdi/ntgdi/coord.c gdi/ntgdi/dcattr.c @@ -227,7 +232,7 @@ endif() add_importlibs(win32k ntoskrnl hal ftfd) -add_pch(win32k pch.h SOURCE) +#add_pch(win32k pch.h SOURCE) add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all) set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h) Added: trunk/reactos/win32ss/gdi/ntgdi/baseobj.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/baseobj.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/baseobj.hpp (added) +++ trunk/reactos/win32ss/gdi/ntgdi/baseobj.hpp [iso-8859-1] Wed Mar 25 22:38:20 2015 @@ -0,0 +1,109 @@ + +#pragma once + +#define GDIOBJ_POOL_TAG(type) ('00hG' + (((type) & 0x1f) << 24)) + +#define BASEOBJECT CBASEOBJECT + +class BASEOBJECT : private _BASEOBJECT +{ +public: + + enum OWNER + { + POWNED = GDI_OBJ_HMGR_POWNED, + PUBLIC = GDI_OBJ_HMGR_PUBLIC, + NONE = GDI_OBJ_HMGR_NONE + }; + +protected: + + BASEOBJECT( + _In_ GDILOOBJTYPE loobjtype) + { + /* Initialize the object */ + _BASEOBJECT::hHmgr = (HGDIOBJ)(ULONG_PTR)loobjtype; + this->cExclusiveLock = 0; + this->ulShareCount = 1; + this->BaseFlags = 0;//fl & 0xffff; + DBG_INITLOG(&this->slhLog); + DBG_LOGEVENT(&this->slhLog, EVENT_ALLOCATE, 0); + #if DBG_ENABLE_GDIOBJ_BACKTRACES + DbgCaptureStackBackTace(this->apvBackTrace, 1, GDI_OBJECT_STACK_LEVELS); + #endif /* GDI_DEBUG */ + } + + static + BASEOBJECT* + LockExclusive( + HGDIOBJ hobj, + GDIOBJTYPE objtype); + + static + BASEOBJECT* + LockExclusive( + HGDIOBJ hobj, + GDILOOBJTYPE loobjtype); + + static + BASEOBJECT* + LockShared( + HGDIOBJ hobj, + GDILOOBJTYPE loobjtype, + OWNER owner) + { + return 0; + } + + VOID + vSetObjectAttr( + _In_opt_ PVOID pvUserAttr) + { + GDIOBJ_vSetObjectAttr((POBJ)this, pvUserAttr); + } + + +public: + + static + inline + PVOID + pvAllocate( + _In_ GDIOBJTYPE objtype, + _In_ SIZE_T cjSize) + { + return ExAllocatePoolWithTag(PagedPool, cjSize, GDIOBJ_POOL_TAG(objtype)); + } + + VOID + vUnlock( + VOID) + { + if (this->cExclusiveLock > 0) + { + GDIOBJ_vUnlockObject(this); + } + else + { + GDIOBJ_vDereferenceObject(this); + } + } + + inline + HGDIOBJ + hHmgr( + VOID) + { + return _BASEOBJECT::hHmgr; + } + + HGDIOBJ + hInsertObject( + OWNER owner) + { + return GDIOBJ_hInsertObject(this, owner); + } + +}; + + Propchange: trunk/reactos/win32ss/gdi/ntgdi/baseobj.hpp ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/win32ss/gdi/ntgdi/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.c (removed) @@ -1,563 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS win32 subsystem - * PURPOSE: Functions for brushes - * FILE: subsystem/win32/win32k/objects/brush.c - * PROGRAMER: - */ - -#include <win32k.h> - -#define NDEBUG -#include <debug.h> - -static -VOID -BRUSH_vInit( - PBRUSH pbr) -{ - /* Start with kmode brush attribute */ - pbr->pBrushAttr = &pbr->BrushAttr; -} - -static -PBRUSH -BRUSH_AllocBrushWithHandle( - VOID) -{ - PBRUSH pbr; - - pbr = (PBRUSH)GDIOBJ_AllocObjWithHandle(GDILoObjType_LO_BRUSH_TYPE, sizeof(BRUSH)); - if (pbr == NULL) - { - return NULL; - } - - BRUSH_vInit(pbr); - return pbr; -} - -static -BOOL -BRUSH_bAllocBrushAttr(PBRUSH pbr) -{ - PPROCESSINFO ppi; - BRUSH_ATTR *pBrushAttr; - NT_ASSERT(pbr->pBrushAttr == &pbr->BrushAttr); - - ppi = PsGetCurrentProcessWin32Process(); - NT_ASSERT(ppi); - __analysis_assume(ppi); - - pBrushAttr = GdiPoolAllocate(ppi->pPoolBrushAttr); - if (!pBrushAttr) - { - DPRINT1("Could not allocate brush attr\n"); - return FALSE; - } - - /* Copy the content from the kernel mode dc attr */ - pbr->pBrushAttr = pBrushAttr; - *pbr->pBrushAttr = pbr->BrushAttr; - - /* Set the object attribute in the handle table */ - GDIOBJ_vSetObjectAttr(&pbr->BaseObject, pBrushAttr); - - DPRINT("BRUSH_bAllocBrushAttr: pbr=%p, pbr->pdcattr=%p\n", pbr, pbr->pBrushAttr); - return TRUE; -} - -static -VOID -BRUSH_vFreeBrushAttr(PBRUSH pbr) -{ - PPROCESSINFO ppi; - - if (pbr->pBrushAttr == &pbr->BrushAttr) return; - - /* Reset the object attribute in the handle table */ - GDIOBJ_vSetObjectAttr(&pbr->BaseObject, NULL); - - /* Free memory from the process gdi pool */ - ppi = PsGetCurrentProcessWin32Process(); - ASSERT(ppi); - GdiPoolFree(ppi->pPoolBrushAttr, pbr->pBrushAttr); - - /* Reset to kmode brush attribute */ - pbr->pBrushAttr = &pbr->BrushAttr; -} - -BOOL -FASTCALL -IntGdiSetBrushOwner(PBRUSH pbr, ULONG ulOwner) -{ - // FIXME: - if (pbr->flAttrs & BR_IS_GLOBAL) return TRUE; - - if ((ulOwner == GDI_OBJ_HMGR_PUBLIC) || ulOwner == GDI_OBJ_HMGR_NONE) - { - /* Free user mode attribute, if any */ - BRUSH_vFreeBrushAttr(pbr); - - // Deny user access to User Data. - GDIOBJ_vSetObjectAttr(&pbr->BaseObject, NULL); - } - - if (ulOwner == GDI_OBJ_HMGR_POWNED) - { - /* Allocate a user mode attribute */ - BRUSH_bAllocBrushAttr(pbr); - - // Allow user access to User Data. - GDIOBJ_vSetObjectAttr(&pbr->BaseObject, pbr->pBrushAttr); - } - - GDIOBJ_vSetObjectOwner(&pbr->BaseObject, ulOwner); - - return TRUE; -} - -BOOL -FASTCALL -GreSetBrushOwner(HBRUSH hBrush, ULONG ulOwner) -{ - BOOL Ret; - PBRUSH pbrush; - - pbrush = BRUSH_ShareLockBrush(hBrush); - Ret = IntGdiSetBrushOwner(pbrush, ulOwner); - BRUSH_ShareUnlockBrush(pbrush); - return Ret; -} - -VOID -NTAPI -BRUSH_vCleanup(PVOID ObjectBody) -{ - PBRUSH pbrush = (PBRUSH)ObjectBody; - if (pbrush->hbmPattern) - { - GreSetObjectOwner(pbrush->hbmPattern, GDI_OBJ_HMGR_POWNED); - GreDeleteObject(pbrush->hbmPattern); - } - - /* Check if there is a usermode attribute */ - if (pbrush->pBrushAttr != &pbrush->BrushAttr) - { - BRUSH_vFreeBrushAttr(pbrush); - } - - /* Free the kmode styles array of EXTPENS */ - if (pbrush->pStyle) - { - ExFreePool(pbrush->pStyle); - } -} - -VOID -NTAPI -BRUSH_vDeleteObject( - PVOID pvObject) -{ - BRUSH_vCleanup(pvObject); - ExFreePoolWithTag(pvObject, GDITAG_HMGR_BRUSH_TYPE); -} - - -INT -FASTCALL -BRUSH_GetObject(PBRUSH pbrush, INT cjSize, LPLOGBRUSH plogbrush) -{ - /* Check if only size is requested */ - if (plogbrush == NULL) return sizeof(LOGBRUSH); - - /* Check if size is ok */ - if (cjSize == 0) return 0; - - /* Set colour */ - plogbrush->lbColor = pbrush->BrushAttr.lbColor; - - /* Default to 0 */ - plogbrush->lbHatch = 0; - - /* Get the type of style */ - if (pbrush->flAttrs & BR_IS_SOLID) - { - plogbrush->lbStyle = BS_SOLID; - } - else if (pbrush->flAttrs & BR_IS_NULL) - { - plogbrush->lbStyle = BS_NULL; // BS_HOLLOW - } - else if (pbrush->flAttrs & BR_IS_HATCH) - { - plogbrush->lbStyle = BS_HATCHED; - plogbrush->lbHatch = pbrush->iHatch; - } - else if (pbrush->flAttrs & BR_IS_DIB) - { - plogbrush->lbStyle = BS_DIBPATTERN; - plogbrush->lbHatch = (ULONG_PTR)pbrush->hbmClient; - } - else if (pbrush->flAttrs & BR_IS_BITMAP) - { - plogbrush->lbStyle = BS_PATTERN; - } - else - { - plogbrush->lbStyle = 0; // ??? - } - - /* FIXME - else if (pbrush->flAttrs & ) - { - plogbrush->lbStyle = BS_INDEXED; - } - else if (pbrush->flAttrs & ) - { - plogbrush->lbStyle = BS_DIBPATTERNPT; - } - */ - - /* FIXME */ - return sizeof(LOGBRUSH); -} - -HBRUSH -APIENTRY -IntGdiCreateDIBBrush( - const BITMAPINFO *BitmapInfo, - UINT uUsage, - UINT BitmapInfoSize, - const VOID* pvClient) -{ - HBRUSH hBrush; - PBRUSH pbrush; - HBITMAP hPattern; - ULONG_PTR DataPtr; - PVOID pvDIBits; - - if (BitmapInfo->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - DataPtr = (ULONG_PTR)BitmapInfo + DIB_BitmapInfoSize(BitmapInfo, uUsage); - - hPattern = DIB_CreateDIBSection(NULL, BitmapInfo, uUsage, &pvDIBits, NULL, 0, 0); - if (hPattern == NULL) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - RtlCopyMemory(pvDIBits, - (PVOID)DataPtr, - DIB_GetDIBImageBytes(BitmapInfo->bmiHeader.biWidth, - BitmapInfo->bmiHeader.biHeight, - BitmapInfo->bmiHeader.biBitCount * BitmapInfo->bmiHeader.biPlanes)); - - pbrush = BRUSH_AllocBrushWithHandle(); - if (pbrush == NULL) - { - GreDeleteObject(hPattern); - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - hBrush = pbrush->BaseObject.hHmgr; - - pbrush->flAttrs |= BR_IS_BITMAP | BR_IS_DIB; - if (uUsage == DIB_PAL_COLORS) - pbrush->flAttrs |= BR_IS_DIBPALCOLORS; - pbrush->hbmPattern = hPattern; - pbrush->hbmClient = (HBITMAP)pvClient; - /* FIXME: Fill in the rest of fields!!! */ - - GreSetObjectOwner(hPattern, GDI_OBJ_HMGR_PUBLIC); - - GDIOBJ_vUnlockObject(&pbrush->BaseObject); - - return hBrush; -} - -HBRUSH -APIENTRY -IntGdiCreateHatchBrush( - INT Style, - COLORREF Color) -{ - HBRUSH hBrush; - PBRUSH pbrush; - - if (Style < 0 || Style >= NB_HATCH_STYLES) - { - return 0; - } - - pbrush = BRUSH_AllocBrushWithHandle(); - if (pbrush == NULL) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - hBrush = pbrush->BaseObject.hHmgr; - - pbrush->flAttrs |= BR_IS_HATCH; - pbrush->BrushAttr.lbColor = Color & 0xFFFFFF; - pbrush->iHatch = Style; - - GDIOBJ_vUnlockObject(&pbrush->BaseObject); - - return hBrush; -} - -HBRUSH -APIENTRY -IntGdiCreatePatternBrush( - HBITMAP hBitmap) -{ - HBRUSH hBrush; - PBRUSH pbrush; - HBITMAP hPattern; - - hPattern = BITMAP_CopyBitmap(hBitmap); - if (hPattern == NULL) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - pbrush = BRUSH_AllocBrushWithHandle(); - if (pbrush == NULL) - { - GreDeleteObject(hPattern); - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - hBrush = pbrush->BaseObject.hHmgr; - - pbrush->flAttrs |= BR_IS_BITMAP; - pbrush->hbmPattern = hPattern; - /* FIXME: Fill in the rest of fields!!! */ - - GreSetObjectOwner(hPattern, GDI_OBJ_HMGR_PUBLIC); - - GDIOBJ_vUnlockObject(&pbrush->BaseObject); - - return hBrush; -} - -HBRUSH -APIENTRY -IntGdiCreateSolidBrush( - COLORREF Color) -{ - HBRUSH hBrush; - PBRUSH pbrush; - - pbrush = BRUSH_AllocBrushWithHandle(); - if (pbrush == NULL) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - hBrush = pbrush->BaseObject.hHmgr; - - pbrush->flAttrs |= BR_IS_SOLID; - - pbrush->BrushAttr.lbColor = Color & 0x00FFFFFF; - /* FIXME: Fill in the rest of fields!!! */ - - GDIOBJ_vUnlockObject(&pbrush->BaseObject); - - return hBrush; -} - -HBRUSH -APIENTRY -IntGdiCreateNullBrush(VOID) -{ - HBRUSH hBrush; - PBRUSH pbrush; - - pbrush = BRUSH_AllocBrushWithHandle(); - if (pbrush == NULL) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - hBrush = pbrush->BaseObject.hHmgr; - - pbrush->flAttrs |= BR_IS_NULL; - GDIOBJ_vUnlockObject(&pbrush->BaseObject); - - return hBrush; -} - -VOID -NTAPI -IntGdiSetSolidBrushColor(HBRUSH hBrush, COLORREF Color) -{ - PBRUSH pbrush; - - pbrush = BRUSH_ShareLockBrush(hBrush); - if (pbrush->flAttrs & BR_IS_SOLID) - { - pbrush->BrushAttr.lbColor = Color & 0xFFFFFF; - } - BRUSH_ShareUnlockBrush(pbrush); -} - - -/* PUBLIC FUNCTIONS ***********************************************************/ - -HBRUSH -APIENTRY -NtGdiCreateDIBBrush( - IN PVOID BitmapInfoAndData, - IN FLONG ColorSpec, - IN UINT BitmapInfoSize, - IN BOOL b8X8, - IN BOOL bPen, - IN PVOID PackedDIB) -{ - BITMAPINFO *SafeBitmapInfoAndData; - NTSTATUS Status = STATUS_SUCCESS; - HBRUSH hBrush; - - SafeBitmapInfoAndData = EngAllocMem(FL_ZERO_MEMORY, BitmapInfoSize, TAG_DIB); - if (SafeBitmapInfoAndData == NULL) - { - EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - _SEH2_TRY - { - ProbeForRead(BitmapInfoAndData, BitmapInfoSize, 1); - RtlCopyMemory(SafeBitmapInfoAndData, BitmapInfoAndData, BitmapInfoSize); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - EngFreeMem(SafeBitmapInfoAndData); - SetLastNtError(Status); - return 0; - } - - hBrush = IntGdiCreateDIBBrush(SafeBitmapInfoAndData, - ColorSpec, - BitmapInfoSize, - PackedDIB); - - EngFreeMem(SafeBitmapInfoAndData); - - return hBrush; -} - -HBRUSH -APIENTRY -NtGdiCreateHatchBrushInternal( - ULONG Style, - COLORREF Color, - BOOL bPen) -{ - return IntGdiCreateHatchBrush(Style, Color); -} - -HBRUSH -APIENTRY -NtGdiCreatePatternBrushInternal( - HBITMAP hBitmap, - BOOL bPen, - BOOL b8x8) -{ - return IntGdiCreatePatternBrush(hBitmap); -} - -HBRUSH -APIENTRY -NtGdiCreateSolidBrush(COLORREF Color, - IN OPTIONAL HBRUSH hbr) -{ - return IntGdiCreateSolidBrush(Color); -} - -HBITMAP -APIENTRY -NtGdiGetObjectBitmapHandle( - _In_ HBRUSH hbr, - _Out_ UINT *piUsage) -{ - HBITMAP hbmPattern; - PBRUSH pbr; - - /* Lock the brush */ - pbr = BRUSH_ShareLockBrush(hbr); - if (pbr == NULL) - { - DPRINT1("Could not lock brush\n"); - return NULL; - } - - /* Get the pattern bitmap handle */ - hbmPattern = pbr->hbmPattern; - - _SEH2_TRY - { - ProbeForWrite(piUsage, sizeof(*piUsage), sizeof(*piUsage)); - - /* Set usage according to flags */ - if (pbr->flAttrs & BR_IS_DIBPALCOLORS) - *piUsage = DIB_PAL_COLORS; - else - *piUsage = DIB_RGB_COLORS; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - DPRINT1("Got exception!\n"); - hbmPattern = NULL; - } - _SEH2_END; - - /* Unlock the brush */ - BRUSH_ShareUnlockBrush(pbr); - - /* Return the pattern bitmap handle */ - return hbmPattern; -} - -/* - * @unimplemented - */ -HBRUSH -APIENTRY -NtGdiSetBrushAttributes( - IN HBRUSH hbm, - IN DWORD dwFlags) -{ - UNIMPLEMENTED; - return NULL; -} - - -/* - * @unimplemented - */ -HBRUSH -APIENTRY -NtGdiClearBrushAttributes( - IN HBRUSH hbr, - IN DWORD dwFlags) -{ - UNIMPLEMENTED; - return NULL; -} - - -/* EOF */ Added: trunk/reactos/win32ss/gdi/ntgdi/brush.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.cp… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.cpp (added) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.cpp [iso-8859-1] Wed Mar 25 22:38:20 2015 @@ -0,0 +1,550 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS win32 subsystem + * PURPOSE: BRUSH class implementation + * PROGRAMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + * + * REFERENCES: http://support.microsoft.com/kb/kbview/108497 + */ + +#include "brush.hpp" + +DBG_DEFAULT_CHANNEL(GdiBrush); + +BRUSH::BRUSH( + _In_ FLONG flAttrs, + _In_ COLORREF crColor, + _In_ ULONG iHatch, + _In_opt_ HBITMAP hbmPattern, + _In_opt_ PVOID pvClient, + _In_ GDILOOBJTYPE loobjtype = GDILoObjType_LO_BRUSH_TYPE) + : BASEOBJECT(loobjtype) +{ + static ULONG ulGlobalBrushUnique = 0; + + /* Get a unique value */ + this->ulBrushUnique = InterlockedIncrementUL(&ulGlobalBrushUnique); + + /* Start with kmode brush attribute */ + this->pBrushAttr = &this->BrushAttr; + + /* Set parameters */ + this->flAttrs = flAttrs; + this->iHatch = iHatch; + this->hbmPattern = hbmPattern; + this->hbmClient = (HBITMAP)pvClient; + this->pBrushAttr->lbColor = crColor; + + /* Initialize the other fields */ + this->ptOrigin.x = 0; + this->ptOrigin.y = 0; + this->bCacheGrabbed = FALSE; + this->crBack = 0; + this->crFore = 0; + this->ulPalTime = 0; + this->ulSurfTime = 0; + this->pvRBrush = NULL; + this->hdev = NULL; +} + +BRUSH::~BRUSH( + VOID) +{ + /* Check if we have a user mode brush attribute */ + if (this->pBrushAttr != &this->BrushAttr) + { + /* Free memory to the process GDI pool */ + GdiPoolFree(GetBrushAttrPool(), this->pBrushAttr); + } + + /* Delete the pattern bitmap */ + if (this->hbmPattern != NULL) + { + GreSetBitmapOwner(this->hbmPattern, BASEOBJECT::OWNER::POWNED); + GreDeleteObject(this->hbmPattern); + } +} + +VOID +BRUSH::vDeleteObject( + _In_ PVOID pvObject) +{ + PBRUSH pbr = static_cast<PBRUSH>(pvObject); + NT_ASSERT((GDI_HANDLE_GET_TYPE(pbr->hHmgr()) == GDILoObjType_LO_BRUSH_TYPE) || + (GDI_HANDLE_GET_TYPE(pbr->hHmgr()) == GDILoObjType_LO_PEN_TYPE) || + (GDI_HANDLE_GET_TYPE(pbr->hHmgr()) == GDILoObjType_LO_EXTPEN_TYPE)); + delete pbr; +} + +BOOL +BRUSH::bAllocateBrushAttr( + VOID) +{ + PBRUSH_ATTR pBrushAttr; + NT_ASSERT(this->pBrushAttr == &this->BrushAttr); + + /* Allocate a brush attribute from the pool */ + pBrushAttr = static_cast<PBRUSH_ATTR>(GdiPoolAllocate(GetBrushAttrPool())); + if (pBrushAttr == NULL) + { + ERR("Could not allocate brush attr\n"); + return FALSE; + } + + /* Copy the content from the kernel mode brush attribute */ + this->pBrushAttr = pBrushAttr; + *this->pBrushAttr = this->BrushAttr; + + /* Set the object attribute in the handle table */ + vSetObjectAttr(pBrushAttr); + + return TRUE; +} + +VOID +BRUSH::vSetSolidColor( + _In_ COLORREF crColor) +{ + NT_ASSERT(this->flAttrs & BR_IS_SOLID); + + /* Set new color and reset the pal times */ + this->pBrushAttr->lbColor = crColor & 0xFFFFFF; + this->ulPalTime = -1; + this->ulSurfTime = -1; +} + +HBITMAP +BRUSH::hbmGetBitmapHandle( + _Out_ PUINT puUsage) const +{ + /* Return the color usage based on flags */ + *puUsage = (this->flAttrs & BR_IS_DIBPALCOLORS) ? DIB_PAL_COLORS : + (this->flAttrs & BR_IS_DIBPALINDICES) ? DIB_PAL_INDICES : + DIB_RGB_COLORS; + + return this->hbmPattern; +} + +UINT +BRUSH::cjGetObject( + _In_ UINT cjSize, + _Out_bytecap_(cjSize) PLOGBRUSH plb) const +{ + /* Check if only size is requested */ + if (plb == NULL) + return sizeof(LOGBRUSH); + + /* Check if size is ok */ + if (cjSize == 0) + return 0; + + /* Set color */ + plb->lbColor = this->BrushAttr.lbColor; + + /* Set style and hatch based on the attribute flags */ + if (this->flAttrs & BR_IS_SOLID) + { + plb->lbStyle = BS_SOLID; + plb->lbHatch = 0; + } + else if (this->flAttrs & BR_IS_HATCH) + { + plb->lbStyle = BS_HATCHED; + plb->lbHatch = this->iHatch; + } + else if (this->flAttrs & BR_IS_DIB) + { + plb->lbStyle = BS_DIBPATTERN; + plb->lbHatch = (ULONG_PTR)this->hbmClient; + } + else if (this->flAttrs & BR_IS_BITMAP) + { + plb->lbStyle = BS_PATTERN; + plb->lbHatch = (ULONG_PTR)this->hbmClient; + } + else if (this->flAttrs & BR_IS_NULL) + { + plb->lbStyle = BS_NULL; + plb->lbHatch = 0; + } + else + { + NT_ASSERT(FALSE); + } + + return sizeof(LOGBRUSH); +} + +static +HBRUSH +CreateBrushInternal( + _In_ ULONG flAttrs, + _In_ COLORREF crColor, + _In_ ULONG iHatch, + _In_opt_ HBITMAP hbmPattern, + _In_opt_ PVOID pvClient) +{ + BASEOBJECT::OWNER owner; + PBRUSH pbr; + HBRUSH hbr; + + NT_ASSERT(((flAttrs & BR_IS_BITMAP) == 0) || (hbmPattern != NULL)); + + /* Create the brush (brush takes ownership of the bitmap) */ + pbr = new BRUSH(flAttrs, crColor, iHatch, hbmPattern, pvClient); + if (pbr == NULL) + { + ERR("Failed to allocate a brush\n"); + GreSetBitmapOwner(hbmPattern, BASEOBJECT::OWNER::POWNED); + GreDeleteObject(hbmPattern); + return NULL; + } + + /* Check if this is a global brush */ + if (!(flAttrs & BR_IS_GLOBAL)) + { + /* Not a global brush, so allocate a user mode brush attribute */ + if (!pbr->bAllocateBrushAttr()) + { + ERR("Failed to allocate brush attribute\n"); + delete pbr; + return NULL; + } + } + + /* Set the owner, either public or process owned */ + owner = (flAttrs & BR_IS_GLOBAL) ? BASEOBJECT::OWNER::PUBLIC : + BASEOBJECT::OWNER::POWNED; + + /* Insert the object into the GDI handle table */ + hbr = static_cast<HBRUSH>(pbr->hInsertObject(owner)); + if (hbr == NULL) + { + ERR("Failed to insert brush\n"); + delete pbr; + return NULL; + } + + /* Unlock the brush */ + pbr->vUnlock(); + + return hbr; +} + + +/* C interface ***************************************************************/ + +extern "C" { + +VOID +NTAPI +BRUSH_vDeleteObject( + PVOID pvObject) +{ + BRUSH::vDeleteObject(pvObject); +} + +INT +FASTCALL +BRUSH_GetObject( + PBRUSH pbr, + INT cjBuffer, + LPLOGBRUSH plbBuffer) +{ + return pbr->cjGetObject(cjBuffer, plbBuffer); +} + +HBRUSH +NTAPI +IntGdiCreateNullBrush( + VOID) +{ + /* Call the internal function */ + return CreateBrushInternal(BR_IS_NULL | BR_IS_GLOBAL, 0, 0, NULL, NULL); +} + +HBRUSH +APIENTRY +IntGdiCreateSolidBrush( + COLORREF crColor) +{ + /* Call the internal function */ + return CreateBrushInternal(BR_IS_SOLID | BR_IS_GLOBAL, + crColor, + 0, + NULL, + NULL); +} + +HBRUSH +NTAPI +IntGdiCreatePatternBrush( + HBITMAP hbmPattern) +{ + NT_ASSERT(hbmPattern != NULL); + GreSetBitmapOwner(hbmPattern, BASEOBJECT::OWNER::PUBLIC); + return CreateBrushInternal(BR_IS_BITMAP | BR_IS_GLOBAL, + 0, + 0, + hbmPattern, + NULL); +} + +VOID +NTAPI +IntGdiSetSolidBrushColor( + _In_ HBRUSH hbr, + _In_ COLORREF crColor) +{ + PBRUSH pbr; + + /* Lock the brush */ + pbr = BRUSH::LockAny(hbr); + if (pbr == NULL) + { + ERR("Failed to lock brush %p\n", hbr); + return; + } + + /* Call the member function */ + pbr->vSetSolidColor(crColor); + + /* Unlock the brush */ + pbr->vUnlock(); +} + +__kernel_entry +HBRUSH +APIENTRY +NtGdiCreateSolidBrush( + _In_ COLORREF crColor, + _In_opt_ HBRUSH hbr) +{ + if (hbr != NULL) + { + WARN("hbr is not supported, ignoring\n"); + } + + /* Call the internal function */ + return CreateBrushInternal(BR_IS_SOLID, crColor, 0, NULL, NULL); +} + +__kernel_entry +HBRUSH +APIENTRY +NtGdiCreateHatchBrushInternal( + _In_ ULONG iHatch, + _In_ COLORREF crColor, + _In_ BOOL bPen) +{ + FLONG flAttr; + + if (bPen) + { + WARN("bPen is not supported, ignoring\n"); + } + + /* Check what kind if hatch style this is */ + if (iHatch < HS_DDI_MAX) + { + flAttr = BR_IS_HATCH; + } + else if (iHatch < HS_API_MAX) + { + flAttr = BR_IS_SOLID; + } + else + { + ERR("Invalid iHatch: %lu\n", iHatch); + return NULL; + } + + /* Call the internal function */ + return CreateBrushInternal(flAttr, crColor, iHatch, NULL, NULL); +} + +__kernel_entry +HBRUSH +APIENTRY +NtGdiCreatePatternBrushInternal( + _In_ HBITMAP hbmClient, + _In_ BOOL bPen, + _In_ BOOL b8X8) +{ + HBITMAP hbmPattern; + + if (b8X8) + { + WARN("b8X8 is not supported, ignoring\n"); + } + + if (bPen) + { + WARN("bPen is not supported, ignoring\n"); + } + + /* Copy the bitmap */ + hbmPattern = BITMAP_CopyBitmap(hbmClient); + if (hbmPattern == NULL) + { + ERR("Failed to copy the bitmap %p\n", hbmPattern); + return NULL; + } + + /* Call the internal function (will delete hbmPattern on failure) */ + return CreateBrushInternal(BR_IS_BITMAP, 0, 0, hbmPattern, hbmClient); +} + +__kernel_entry +HBRUSH +APIENTRY +NtGdiCreateDIBBrush( + _In_reads_bytes_(cj) PVOID pv, + _In_ FLONG uUsage, + _In_ UINT cj, + _In_ BOOL b8X8, + _In_ BOOL bPen, + _In_ PVOID pvClient) +{ + PVOID pvPackedDIB; + FLONG flAttrs; + HBITMAP hbm; + HBRUSH hbr = NULL; + + if (b8X8) + { + WARN("b8X8 is not supported, ignoring\n"); + } + + if (bPen) + { + WARN("bPen is not supported, ignoring\n"); + } + + if (uUsage > DIB_PAL_INDICES) + { + ERR("Invalid uUsage value: %lu\n", uUsage); + EngSetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + /* Allocate a buffer for the packed DIB */ + pvPackedDIB = ExAllocatePoolWithTag(PagedPool, cj, GDITAG_TEMP); + if (pvPackedDIB == NULL) + { + ERR("Failed to allocate temp buffer of %u bytes\n", cj); + return NULL; + } + + /* Probe and copy the packed DIB */ + _SEH2_TRY + { + ProbeForRead(pv, cj, 1); + RtlCopyMemory(pvPackedDIB, pv, cj); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("Got exception, pv = %p, cj = %lu\n", pv, cj); + goto cleanup; + } + _SEH2_END; + + flAttrs = BR_IS_BITMAP | BR_IS_DIB; + + /* Check what kind of color table we have */ + if (uUsage == DIB_PAL_COLORS) + { + /* Remember it and use DIB_PAL_BRUSHHACK to create a "special" palette */ + flAttrs |= BR_IS_DIBPALCOLORS; + uUsage = DIB_PAL_BRUSHHACK; + } + else if (uUsage == DIB_PAL_INDICES) + { + /* No color table, bitmap contains device palette indices */ + flAttrs |= BR_IS_DIBPALINDICES; + + /* FIXME: This makes tests pass, but needs investigation. */ + flAttrs |= BR_IS_NULL; + } + + /* Create a bitmap from the DIB */ + hbm = GreCreateDIBitmapFromPackedDIB(pvPackedDIB, cj, uUsage); + if (hbm == NULL) + { + ERR("Failed to create bitmap from DIB\n"); + goto cleanup; + } + + /* Call the internal function (will delete hbm on failure) */ + hbr = CreateBrushInternal(flAttrs, 0, 0, hbm, pvClient); + +cleanup: + + ExFreePoolWithTag(pvPackedDIB, GDITAG_TEMP); + + return hbr; +} + +__kernel_entry +HBITMAP +APIENTRY +NtGdiGetObjectBitmapHandle( + _In_ HBRUSH hbr, + _Out_ UINT *piUsage) +{ + PBRUSH pbr; + HBITMAP hbm; + UINT uUsage; + + /* Lock the brush */ + pbr = BRUSH::LockForRead(hbr); + if (pbr == NULL) + { + ERR("Failed to lock brush %p\n", hbr); + return NULL; + } + + /* Call the member function */ + hbm = pbr->hbmGetBitmapHandle(&uUsage); + + /* Unlock the brush */ + pbr->vUnlock(); + + _SEH2_TRY + { + ProbeForWrite(piUsage, sizeof(*piUsage), 1); + *piUsage = uUsage; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("Got exception! piUsage = %p\n", piUsage); + hbm = NULL; + } + _SEH2_END; + + return hbm; +} + +__kernel_entry +HBRUSH +APIENTRY +NtGdiSetBrushAttributes( + _In_ HBRUSH hbr, + _In_ DWORD dwFlags) +{ + __debugbreak(); + return NULL; +} + +__kernel_entry +HBRUSH +APIENTRY +NtGdiClearBrushAttributes( + _In_ HBRUSH hbr, + _In_ DWORD dwFlags) +{ + __debugbreak(); + return NULL; +} + +} /* extern "C" */ Propchange: trunk/reactos/win32ss/gdi/ntgdi/brush.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/win32ss/gdi/ntgdi/brush.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.hp… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.hpp (added) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.hpp [iso-8859-1] Wed Mar 25 22:38:20 2015 @@ -0,0 +1,121 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS win32 subsystem + * PURPOSE: BRUSH class definition + * PROGRAMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#pragma once + +#include <win32k.h> +#include "baseobj.hpp" + +__prefast_operator_new_null + +class BRUSH : public BASEOBJECT, protected _BRUSHBODY +{ + +public: + _Analysis_mode_(_Analysis_operator_new_null_) + + inline + void* + __cdecl + operator new( + _In_ size_t cjSize) throw() + { + return ExAllocatePoolWithTag(PagedPool, cjSize, GDITAG_HMGR_BRUSH_TYPE); + //return BASEOBJECT::pvAllocate(GDIObjType_BRUSH_TYPE, cjSize); + } + + inline + void + operator delete( + void *pvObject) + { + /// HACK! better would be to extract the exact object type's tag + ExFreePool(pvObject); + //ExFreePoolWithTag(pvObject, GDITAG_HMGR_BRUSH_TYPE); + //BASEOBJECT::pvFree(GDIObjType_BRUSH_TYPE, cjSize); + } + + BRUSH( + _In_ FLONG flAttrs, + _In_ COLORREF crColor, + _In_ ULONG iHatch, + _In_opt_ HBITMAP hbmPattern, + _In_opt_ PVOID pvClient, + _In_ GDILOOBJTYPE objtype); + + ~BRUSH( + VOID); + + static + VOID + vDeleteObject( + _In_ PVOID pvObject); + + BOOL + bAllocateBrushAttr( + VOID); + + _Check_return_ + _Ret_opt_bytecount_(sizeof(BRUSH)) + static + inline + PBRUSH + LockForRead( + _In_ HBRUSH hbr) + { + return static_cast<PBRUSH>( + BASEOBJECT::LockShared(hbr, + GDILoObjType_LO_BRUSH_TYPE, + BASEOBJECT::OWNER::PUBLIC)); + } + + _Check_return_ + _Ret_opt_bytecount_(sizeof(BRUSH)) + static + inline + PBRUSH + LockForWrite( + _In_ HBRUSH hbr) + { + return static_cast<PBRUSH>( + BASEOBJECT::LockShared(hbr, + GDILoObjType_LO_BRUSH_TYPE, + BASEOBJECT::OWNER::POWNED)); + } + + _Check_return_ + _Ret_opt_bytecap_(sizeof(BRUSH)) + static + inline + PBRUSH + LockAny( + _In_ HBRUSH hbr) + { + return static_cast<PBRUSH>( + BASEOBJECT::LockShared(hbr, + GDILoObjType_LO_BRUSH_TYPE, + BASEOBJECT::OWNER::NONE)); + } + + UINT + cjGetObject( + _In_ UINT cjBuffer, + _Out_bytecap_(cjBuffer) PLOGBRUSH plbBuffer) const; + + HBITMAP + hbmGetBitmapHandle( + _Out_ PUINT puUsage) const; + + VOID + vSetSolidColor( + _In_ COLORREF crColor); +}; + +/* HACK! */ +extern "C" +PGDI_POOL +GetBrushAttrPool(VOID); Propchange: trunk/reactos/win32ss/gdi/ntgdi/brush.hpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Wed Mar 25 22:38:20 2015 @@ -28,6 +28,19 @@ * this is the only way it can ever be exclusively locked. It prevents the * object from being locked by another thread. A shared lock will simply fail, * while an exclusive lock will succeed after the object was unlocked. + * + * Ownership: + * + * Owner: POWNED PUBLIC NONE spec + * --------------------------------------------------- + * LockForRead + + - PUBLIC + * LockForWrite + - - POWNED + * LockAny + + + NONE + * NtGdiDeleteObjectApp + - - PUBLIC + * GreDeleteObject + + + NONE + * GreSetOwner(POWNED) - - + - + * GreSetOwner(PUBLIC) + - + - + * GreSetOwner(NONE) + - - - * */ @@ -1590,5 +1603,16 @@ return TRUE; } +/// HACK! +PGDI_POOL +GetBrushAttrPool(VOID) +{ + PPROCESSINFO ppi; + + ppi = PsGetCurrentProcessWin32Process(); + NT_ASSERT(ppi != NULL); + + return ppi->pPoolBrushAttr; +} /* EOF */ Modified: trunk/reactos/win32ss/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/pch.h?rev=66893&r1… ============================================================================== --- trunk/reactos/win32ss/pch.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/pch.h [iso-8859-1] Wed Mar 25 22:38:20 2015 @@ -66,6 +66,10 @@ /* SEH support with PSEH */ #include <pseh/pseh2.h> +#ifdef __cplusplus +extern "C" { +#endif + /* Public Win32K headers */ #include <include/ntgdityp.h> #include <ntgdi.h> @@ -91,4 +95,8 @@ /* Internal Win32K header */ #include "win32kp.h" +#ifdef __cplusplus +} /* extern "C" */ +#endif + #endif /* __W32K_H */ Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Wed Mar 25 22:38:20 2015 @@ -144,9 +144,14 @@ if (gpsi->hbrGray == NULL) { hPattern55AABitmap = GreCreateBitmap(8, 8, 1, 1, (LPBYTE)wPattern55AA); + if (hPattern55AABitmap == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + //NT_VERIFY(GreSetBitmapOwner(hPattern55AABitmap, GDI_OBJ_HMGR_PUBLIC)); gpsi->hbrGray = IntGdiCreatePatternBrush(hPattern55AABitmap); GreDeleteObject(hPattern55AABitmap); - GreSetBrushOwner(gpsi->hbrGray, GDI_OBJ_HMGR_PUBLIC); + if (gpsi->hbrGray == NULL) + return STATUS_INSUFFICIENT_RESOURCES; } return STATUS_SUCCESS;

10 years, 1 month

[tkreuzer] 66892: [WIN32K] Handle DIB_PAL_INDICES in DIB_BitmapInfoSize

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 25 22:37:16 2015 New Revision: 66892 URL: http://svn.reactos.org/svn/reactos?rev=66892&view=rev Log: [WIN32K] Handle DIB_PAL_INDICES in DIB_BitmapInfoSize Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Wed Mar 25 22:37:16 2015 @@ -1916,13 +1916,17 @@ INT FASTCALL DIB_BitmapInfoSize(const BITMAPINFO * info, WORD coloruse) { unsigned int colors, size, masks = 0; + unsigned int colorsize; + + colorsize = (coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : + (coloruse == DIB_PAL_INDICES) ? 0 : + sizeof(WORD); if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)info; colors = (core->bcBitCount <= 8) ? 1 << core->bcBitCount : 0; - return sizeof(BITMAPCOREHEADER) + colors * - ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBTRIPLE) : sizeof(WORD)); + return sizeof(BITMAPCOREHEADER) + colors * colorsize; } else /* Assume BITMAPINFOHEADER */ { @@ -1932,7 +1936,7 @@ colors = 1 << info->bmiHeader.biBitCount; if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; size = max( info->bmiHeader.biSize, sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) ); - return size + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); + return size + colors * colorsize; } }

10 years, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs