Ros-diffs July 2013

ros-diffs@reactos.org

13 participants
199 discussions

[tkreuzer] 59564: [WIN32K] Fix some bugs related to DIB brushes.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jul 23 15:31:43 2013 New Revision: 59564 URL: http://svn.reactos.org/svn/reactos?rev=59564&view=rev Log: [WIN32K] Fix some bugs related to DIB brushes. Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/brush.c branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/brush.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/b… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/brush.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/brush.c [iso-8859-1] Tue Jul 23 15:31:43 2013 @@ -424,6 +424,13 @@ return NULL; } + /* Check for undocumented case 2 */ + if (iUsage == 2) + { + /* Tests show that this results in a hollow/null brush */ + return GreCreateNullBrush(); + } + /* Allocate a buffer large enough to hold the complete packed DIB */ pvSaveDIB = ExAllocatePoolWithTag(PagedPool, cjDIBSize, TAG_DIB); if (pvSaveDIB == NULL) @@ -468,18 +475,22 @@ entries directly, instead we need to create a fake palette containing pal indices, which is converted into a real palette when the brush is realized. */ - if (iUsage == DIB_PAL_COLORS) iUsage = DIB_PAL_BRUSHHACK; + if (iUsage == DIB_PAL_COLORS) + { + iUsage = DIB_PAL_BRUSHHACK; + flAttr |= BR_IS_DIBPALCOLORS; + } /* Create the pattern bitmap from the DIB. */ hbmPattern = GreCreateDIBitmapInternal(NULL, pbmi->bmiHeader.biWidth, abs(pbmi->bmiHeader.biHeight), - CBM_INIT, + CBM_INIT | CBM_CREATDIB, pvSafeBits, pbmi, iUsage,// FIXME!!! + cjDIBSize - cjInfoSize, 0, - cjDIBSize - cjInfoSize, NULL); /* Free the buffer already */ @@ -492,9 +503,6 @@ return NULL; } - /* Remember if the palette consists of palette indices */ - if (iUsage == DIB_PAL_COLORS) flAttr |= BR_IS_DIBPALCOLORS; - /* Call the internal worker function */ return GreCreateBrushInternal(0, hbmPattern, pvPackedDIB, 0, flAttr); } Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/dibitmap.c [iso-8859-1] Tue Jul 23 15:31:43 2013 @@ -286,7 +286,7 @@ the number of colors in the DC palette */ WORD wIndex = pwColors[i] % ppalDC->NumColors; - /* USe the RGB value from the DC palette */ + /* Use the RGB value from the DC palette */ crColor = PALETTE_ulGetRGBColorFromIndex(ppalDC, wIndex); PALETTE_vSetRGBColorForIndex(ppal, i, crColor); } @@ -644,6 +644,7 @@ if ((iUsage == DIB_PAL_COLORS) && !pdc) goto cleanup; iFormat = psurfDIB->SurfObj.iBitmapFormat; + if (iFormat > BMF_32BPP) goto cleanup; if (psurfDIB) { @@ -1354,7 +1355,7 @@ yTop = cyDIB - (iStartScan + cNumScan); /* Bail out if the intersecion between scanlines and copy area is empty */ - if ((ySrc > yTop + cNumScan) || (ySrc + (INT)cy < yTop)) goto leave; + if ((ySrc > yTop + (INT)cNumScan) || (ySrc + (INT)cy < yTop)) goto leave; /* Check if the copy area starts below or at the topmost scanline */ if (ySrc >= yTop)

11 years, 5 months

[aandrejevic] 59563: [NTVDM] Implement several INT 21h functions.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Jul 23 14:43:03 2013 New Revision: 59563 URL: http://svn.reactos.org/svn/reactos?rev=59563&view=rev Log: [NTVDM] Implement several INT 21h functions. Modified: branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/dos.h Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Tue Jul 23 14:43:03 2013 @@ -704,13 +704,58 @@ return Result; } -BOOLEAN DosCloseHandle(WORD DosHandle) +WORD DosSeekFile(WORD FileHandle, LONG Offset, BYTE Origin, LPDWORD NewOffset) +{ + WORD Result = ERROR_SUCCESS; + DWORD FilePointer; + HANDLE Handle = DosGetRealHandle(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; + + /* Check if the origin is valid */ + if (Origin != FILE_BEGIN && Origin != FILE_CURRENT && Origin != FILE_END) + { + return ERROR_INVALID_FUNCTION; + } + + /* Move the file pointer */ + FilePointer = SetFilePointer(Handle, Offset, NULL, Origin); + + /* Check if there's a possibility the operation failed */ + if (FilePointer == INVALID_SET_FILE_POINTER) + { + /* Get the real error code */ + Result = GetLastError(); + } + + if (Result != ERROR_SUCCESS) + { + /* The operation did fail */ + return Result; + } + + /* Return the file pointer, if requested */ + if (NewOffset) *NewOffset = FilePointer; + + /* Return success */ + return ERROR_SUCCESS; +} + +BOOLEAN DosDuplicateHandle(WORD OldHandle, WORD NewHandle) { BYTE SftIndex; PDOS_PSP PspBlock; LPBYTE HandleTable; - DPRINT("DosCloseHandle: DosHandle 0x%04X\n", DosHandle); + DPRINT("DosDuplicateHandle: OldHandle 0x%04X, NewHandle 0x%04X\n", + OldHandle, + NewHandle); /* The system PSP has no handle table */ if (CurrentPsp == SYSTEM_PSP) return FALSE; @@ -719,6 +764,42 @@ PspBlock = SEGMENT_TO_PSP(CurrentPsp); HandleTable = (LPBYTE)FAR_POINTER(PspBlock->HandleTablePtr); + /* Make sure the old handle is open */ + if (HandleTable[OldHandle] == 0xFF) return FALSE; + + /* Check if the new handle is open */ + if (HandleTable[NewHandle] != 0xFF) + { + /* Close it */ + DosCloseHandle(NewHandle); + } + + /* Increment the reference count of the SFT entry */ + SftIndex = HandleTable[OldHandle]; + DosSftRefCount[SftIndex]++; + + /* Make the new handle point to that SFT entry */ + HandleTable[NewHandle] = SftIndex; + + /* Return success */ + return TRUE; +} + +BOOLEAN DosCloseHandle(WORD DosHandle) +{ + BYTE SftIndex; + PDOS_PSP PspBlock; + LPBYTE HandleTable; + + DPRINT("DosCloseHandle: DosHandle 0x%04X\n", DosHandle); + + /* The system PSP has no handle table */ + if (CurrentPsp == SYSTEM_PSP) return FALSE; + + /* 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 FALSE; @@ -735,6 +816,9 @@ /* Clear the handle */ DosSystemFileTable[SftIndex] = INVALID_HANDLE_VALUE; } + + /* Clear the entry in the JFT */ + HandleTable[DosHandle] = 0xFF; return TRUE; } @@ -1547,10 +1631,156 @@ break; } + /* Delete File */ + case 0x41: + { + LPSTR FileName = (LPSTR)((ULONG_PTR)BaseAddress + TO_LINEAR(DataSegment, Edx)); + + /* Call the API function */ + if (DeleteFileA(FileName)) EmulatorClearFlag(EMULATOR_FLAG_CF); + else + { + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, GetLastError()); + } + + break; + } + + /* Seek File */ + case 0x42: + { + DWORD NewLocation; + WORD ErrorCode = DosSeekFile(LOWORD(Ebx), + MAKELONG(LOWORD(Edx), LOWORD(Ecx)), + LOBYTE(Eax), + &NewLocation); + + if (ErrorCode == 0) + { + /* Clear CF */ + EmulatorClearFlag(EMULATOR_FLAG_CF); + + /* Return the new offset in DX:AX */ + EmulatorSetRegister(EMULATOR_REG_DX, + (Edx & 0xFFFF0000) | HIWORD(NewLocation)); + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFF0000) | LOWORD(NewLocation)); + } + else + { + /* Set CF */ + EmulatorSetFlag(EMULATOR_FLAG_CF); + + /* Return the error code in AX */ + EmulatorSetRegister(EMULATOR_REG_AX, + (Eax & 0xFFFF0000) | ErrorCode); + } + + break; + } + + /* Get/Set File Attributes */ + case 0x43: + { + DWORD Attributes; + LPSTR FileName = (LPSTR)((ULONG_PTR)BaseAddress + TO_LINEAR(DataSegment, Edx)); + + if (LOBYTE(Eax) == 0x00) + { + /* Get the attributes */ + Attributes = GetFileAttributesA(FileName); + + /* Check if it failed */ + if (Attributes == INVALID_FILE_ATTRIBUTES) + { + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, GetLastError()); + + break; + } + + /* Return the attributes that DOS can understand */ + EmulatorClearFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_CX, + (Ecx & 0xFFFFFF00) | LOBYTE(Attributes)); + } + else if (LOBYTE(Eax) == 0x01) + { + /* Try to set the attributes */ + if (SetFileAttributesA(FileName, LOBYTE(Ecx))) + { + EmulatorClearFlag(EMULATOR_FLAG_CF); + } + else + { + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, GetLastError()); + } + } + else + { + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_FUNCTION); + } + + break; + } + /* IOCTL */ case 0x44: { DosHandleIoctl(LOBYTE(Eax), LOWORD(Ebx)); + + break; + } + + /* Duplicate Handle */ + case 0x45: + { + WORD NewHandle; + HANDLE Handle = DosGetRealHandle(LOWORD(Ebx)); + + if (Handle != INVALID_HANDLE_VALUE) + { + /* The handle is invalid */ + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_HANDLE); + + break; + } + + /* Open a new handle to the same entry */ + NewHandle = DosOpenHandle(Handle); + + if (NewHandle == INVALID_DOS_HANDLE) + { + /* Too many files open */ + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_TOO_MANY_OPEN_FILES); + + break; + } + + /* Return the result */ + EmulatorClearFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, NewHandle); + + break; + } + + /* Force Duplicate Handle */ + case 0x46: + { + if (DosDuplicateHandle(LOWORD(Ebx), LOWORD(Ecx))) + { + EmulatorClearFlag(EMULATOR_FLAG_CF); + } + else + { + EmulatorSetFlag(EMULATOR_FLAG_CF); + EmulatorSetRegister(EMULATOR_REG_AX, ERROR_INVALID_HANDLE); + } break; } @@ -1615,6 +1845,14 @@ case 0x4C: { DosTerminateProcess(CurrentPsp, LOBYTE(Eax)); + break; + } + + /* Get Current Process */ + case 0x51: + { + EmulatorSetRegister(EMULATOR_REG_BX, CurrentPsp); + break; } Modified: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] Tue Jul 23 14:43:03 2013 @@ -109,6 +109,9 @@ WORD DosOpenFile(LPWORD Handle, LPCSTR FilePath, BYTE AccessMode); WORD DosReadFile(WORD FileHandle, LPVOID Buffer, WORD Count, LPWORD BytesRead); WORD DosWriteFile(WORD FileHandle, LPVOID Buffer, WORD Count, LPWORD BytesWritten); +WORD DosSeekFile(WORD FileHandle, LONG Offset, BYTE Origin, LPDWORD NewOffset); +BOOLEAN DosDuplicateHandle(WORD OldHandle, WORD NewHandle); +BOOLEAN DosCloseHandle(WORD DosHandle); VOID DosInitializePsp(WORD PspSegment, LPCSTR CommandLine, WORD ProgramSize, WORD Environment); BOOLEAN DosCreateProcess(LPCSTR CommandLine, WORD EnvBlock); VOID DosTerminateProcess(WORD Psp, BYTE ReturnCode);

11 years, 5 months

[gadamopoulos] 59562: - forgot this file

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Jul 23 10:59:05 2013 New Revision: 59562 URL: http://svn.reactos.org/svn/reactos?rev=59562&view=rev Log: - forgot this file Modified: trunk/reactos/dll/win32/shell32/rgs_res.rc Modified: trunk/reactos/dll/win32/shell32/rgs_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/rgs_res.… ============================================================================== --- trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/rgs_res.rc [iso-8859-1] Tue Jul 23 10:59:05 2013 @@ -9,6 +9,7 @@ IDR_FOLDEROPTIONS REGISTRY "res/rgs/folderoptions.rgs" IDR_FOLDERSHORTCUT REGISTRY "res/rgs/foldershortcut.rgs" IDR_FONTSFOLDERSHORTCUT REGISTRY "res/rgs/fontsfoldershortcut.rgs" +IDR_MENUBAND REGISTRY "res/rgs/menuband.rgs" IDR_MENUBANDSITE REGISTRY "res/rgs/menubandsite.rgs" IDR_MYCOMPUTER REGISTRY "res/rgs/mycomputer.rgs" IDR_MYDOCUMENTS REGISTRY "res/rgs/mydocuments.rgs"

11 years, 5 months

[gadamopoulos] 59561: [shell32] - Stub CMenuBand class

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Tue Jul 23 10:53:06 2013 New Revision: 59561 URL: http://svn.reactos.org/svn/reactos?rev=59561&view=rev Log: [shell32] - Stub CMenuBand class Added: trunk/reactos/dll/win32/shell32/CMenuBand.cpp (with props) trunk/reactos/dll/win32/shell32/CMenuBand.h (with props) trunk/reactos/dll/win32/shell32/res/rgs/menuband.rgs (with props) Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/shell32_main.cpp trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Tue Jul 23 10:53:06 2013 @@ -23,6 +23,7 @@ classes.cpp clipboard.cpp control.cpp + CMenuBand.cpp dataobject.cpp dde.cpp debughlp.cpp Added: trunk/reactos/dll/win32/shell32/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuBan… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMenuBand.cpp (added) +++ trunk/reactos/dll/win32/shell32/CMenuBand.cpp [iso-8859-1] Tue Jul 23 10:53:06 2013 @@ -0,0 +1,312 @@ +/* + * PROJECT: shell32 + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/shell32/CMenuBand.c + * PURPOSE: menu band implementation + * PROGRAMMERS: Giannis Adamopoulos (gadamopoulos(a)reactos.org) + */ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand); + +HRESULT STDMETHODCALLTYPE CMenuBand::GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::ShowDW(BOOL fShow) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::CloseDW(DWORD dwReserved) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetWindow(HWND *phwnd) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::ContextSensitiveHelp(BOOL fEnterMode) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetSite(IUnknown *pUnkSite) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetSite(REFIID riid, PVOID *ppvSite) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::UIActivateIO(BOOL fActivate, LPMSG lpMsg) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::HasFocusIO() +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::TranslateAcceleratorIO(LPMSG lpMsg) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::IsDirty() +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::Load(IStream *pStm) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::Save(IStream *pStm, BOOL fClearDirty) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetSizeMax(ULARGE_INTEGER *pcbSize) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetClassID(CLSID *pClassID) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::OnSelect(DWORD dwSelectType) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetSubMenu(IMenuPopup *pmp, BOOL fSet) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetClient(IUnknown *punkClient) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetClient(IUnknown **ppunkClient) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::OnPosRectChangeDB(RECT *prc) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::IsMenuMessage(MSG *pmsg) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::TranslateMenuMessage(MSG *pmsg, LRESULT *plRet) +{ + UNIMPLEMENTED; + return S_FALSE; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::Initialize(IShellMenuCallback *psmc, UINT uId, UINT uIdAncestor,DWORD dwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetMenuInfo(IShellMenuCallback **ppsmc, UINT *puId, UINT *puIdAncestor, DWORD *pdwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::InvalidateItem(LPSMDATA psmd, DWORD dwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetState(LPSMDATA psmd) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetMenuToolbar(IUnknown *punk, DWORD dwFlags) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::IsWindowOwner(HWND hWnd) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetSubMenu(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetToolbar(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetMinWidth(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetNoBorder(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::SetTheme(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetTop(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetBottom(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetTracked(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetParentSite(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::GetState(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::DoDefaultAction(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + +HRESULT STDMETHODCALLTYPE CMenuBand::IsEmpty(THIS) +{ + UNIMPLEMENTED; + return S_OK; +} + Propchange: trunk/reactos/dll/win32/shell32/CMenuBand.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/shell32/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMenuBan… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMenuBand.h (added) +++ trunk/reactos/dll/win32/shell32/CMenuBand.h [iso-8859-1] Tue Jul 23 10:53:06 2013 @@ -0,0 +1,125 @@ + +class CMenuBand : + public CComCoClass<CMenuBand, &CLSID_MenuBand>, + public CComObjectRootEx<CComMultiThreadModelNoCS>, + public IDeskBand, + public IObjectWithSite, + public IInputObject, + public IPersistStream, + public IOleCommandTarget, + public IServiceProvider, + public IMenuPopup, + public IMenuBand, + public IShellMenu2, + public IWinEventHandler, + public IShellMenuAcc +{ +public : + + // *** IDeskBand methods *** + virtual HRESULT STDMETHODCALLTYPE GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi); + + // *** IDockingWindow methods *** + virtual HRESULT STDMETHODCALLTYPE ShowDW(BOOL fShow); + virtual HRESULT STDMETHODCALLTYPE CloseDW(DWORD dwReserved); + virtual HRESULT STDMETHODCALLTYPE ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved); + + // *** IOleWindow methods *** + virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd); + virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); + + // *** IObjectWithSite methods *** + virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); + virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, PVOID *ppvSite); + + // *** IInputObject methods *** + virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL fActivate, LPMSG lpMsg); + virtual HRESULT STDMETHODCALLTYPE HasFocusIO(); + virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg); + + // *** IPersistStream methods *** + virtual HRESULT STDMETHODCALLTYPE IsDirty(); + virtual HRESULT STDMETHODCALLTYPE Load(IStream *pStm); + virtual HRESULT STDMETHODCALLTYPE Save(IStream *pStm, BOOL fClearDirty); + virtual HRESULT STDMETHODCALLTYPE GetSizeMax(ULARGE_INTEGER *pcbSize); + + // *** IPersist methods *** + virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pClassID); + + // *** IOleCommandTarget methods *** + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds[ ], OLECMDTEXT *pCmdText); + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + + // *** IServiceProvider methods *** + virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); + + // *** IMenuPopup methods *** + virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags); + virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType); + virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp, BOOL fSet); + + // *** IDeskBar methods *** + virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient); + virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient); + virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(RECT *prc); + + // *** IMenuBand methods *** + virtual HRESULT STDMETHODCALLTYPE IsMenuMessage(MSG *pmsg); + virtual HRESULT STDMETHODCALLTYPE TranslateMenuMessage(MSG *pmsg, LRESULT *plRet); + + // *** IShellMenu methods *** + virtual HRESULT STDMETHODCALLTYPE Initialize(IShellMenuCallback *psmc, UINT uId, UINT uIdAncestor,DWORD dwFlags); + virtual HRESULT STDMETHODCALLTYPE GetMenuInfo(IShellMenuCallback **ppsmc, UINT *puId, UINT *puIdAncestor, DWORD *pdwFlags); + virtual HRESULT STDMETHODCALLTYPE SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags); + virtual HRESULT STDMETHODCALLTYPE GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv); + virtual HRESULT STDMETHODCALLTYPE SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags); + virtual HRESULT STDMETHODCALLTYPE GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags); + virtual HRESULT STDMETHODCALLTYPE InvalidateItem(LPSMDATA psmd, DWORD dwFlags); + virtual HRESULT STDMETHODCALLTYPE GetState(LPSMDATA psmd); + virtual HRESULT STDMETHODCALLTYPE SetMenuToolbar(IUnknown *punk, DWORD dwFlags); + + // *** IWinEventHandler methods *** + virtual HRESULT STDMETHODCALLTYPE OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult); + virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(HWND hWnd); + + // *** IShellMenu2 methods *** + virtual HRESULT STDMETHODCALLTYPE GetSubMenu(THIS); + virtual HRESULT STDMETHODCALLTYPE SetToolbar(THIS); + virtual HRESULT STDMETHODCALLTYPE SetMinWidth(THIS); + virtual HRESULT STDMETHODCALLTYPE SetNoBorder(THIS); + virtual HRESULT STDMETHODCALLTYPE SetTheme(THIS); + + // *** IShellMenuAcc methods *** + virtual HRESULT STDMETHODCALLTYPE GetTop(THIS); + virtual HRESULT STDMETHODCALLTYPE GetBottom(THIS); + virtual HRESULT STDMETHODCALLTYPE GetTracked(THIS); + virtual HRESULT STDMETHODCALLTYPE GetParentSite(THIS); + virtual HRESULT STDMETHODCALLTYPE GetState(THIS); + virtual HRESULT STDMETHODCALLTYPE DoDefaultAction(THIS); + virtual HRESULT STDMETHODCALLTYPE IsEmpty(THIS); + +DECLARE_REGISTRY_RESOURCEID(IDR_MENUBAND) +DECLARE_NOT_AGGREGATABLE(CMenuBand) +DECLARE_PROTECT_FINAL_CONSTRUCT() + +BEGIN_COM_MAP(CMenuBand) + COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup) + COM_INTERFACE_ENTRY_IID(IID_IMenuBand, IMenuBand) + COM_INTERFACE_ENTRY_IID(IID_IShellMenu, IShellMenu) + COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) + COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IDockingWindow, IDockingWindow) + COM_INTERFACE_ENTRY_IID(IID_IDeskBar, IDeskBar) + COM_INTERFACE_ENTRY_IID(IID_IDeskBand, IDeskBand) + COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) + COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) + COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + COM_INTERFACE_ENTRY_IID(IID_IMenuBand, IMenuBand) + COM_INTERFACE_ENTRY_IID(IID_IShellMenu2, IShellMenu2) + COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) + COM_INTERFACE_ENTRY_IID(IID_IShellMenuAcc, IShellMenuAcc) +END_COM_MAP() + +}; Propchange: trunk/reactos/dll/win32/shell32/CMenuBand.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Tue Jul 23 10:53:06 2013 @@ -70,6 +70,7 @@ #include "startmenu.h" #include "filedefext.h" #include "drvdefext.h" +#include "CMenuBand.h" #include <wine/debug.h> Added: trunk/reactos/dll/win32/shell32/res/rgs/menuband.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/menuband.rgs (added) +++ trunk/reactos/dll/win32/shell32/res/rgs/menuband.rgs [iso-8859-1] Tue Jul 23 10:53:06 2013 @@ -0,0 +1,13 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {5B4DAE26-B807-11D0-9815-00C04FD91972} = s 'Menu Band' + { + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + } + } +} Propchange: trunk/reactos/dll/win32/shell32/res/rgs/menuband.rgs ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Tue Jul 23 10:53:06 2013 @@ -1368,6 +1368,7 @@ OBJECT_ENTRY(CLSID_NewMenu, CNewMenu) OBJECT_ENTRY(CLSID_StartMenu, CStartMenu) OBJECT_ENTRY(CLSID_MenuBandSite, CMenuBandSite) + OBJECT_ENTRY(CLSID_MenuBand, CMenuBand) END_OBJECT_MAP() CShell32Module gModule; Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Tue Jul 23 10:53:06 2013 @@ -537,5 +537,6 @@ #define IDR_OPENWITHMENU 146 #define IDR_FILEDEFEXT 147 #define IDR_DRVDEFEXT 148 +#define IDR_MENUBAND 149 #endif

11 years, 5 months

[ekohl] 59560: [SAMSRV] SamrChangePasswordUser: - Check the MinPasswordAge before trying to change the password. - Set the PasswordLastSet time if the password has been changed successfully. - Set ...

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Jul 22 21:27:33 2013 New Revision: 59560 URL: http://svn.reactos.org/svn/reactos?rev=59560&view=rev Log: [SAMSRV] SamrChangePasswordUser: - Check the MinPasswordAge before trying to change the password. - Set the PasswordLastSet time if the password has been changed successfully. - Set the BadPasswordCount and LastBadPasswordTime if the caller tried to set a bad password. Modified: trunk/reactos/dll/win32/samsrv/samrpc.c Modified: trunk/reactos/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samrpc.c?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samrpc.c [iso-8859-1] Mon Jul 22 21:27:33 2013 @@ -7475,9 +7475,15 @@ PENCRYPTED_LM_OWF_PASSWORD NewLmPassword; PENCRYPTED_NT_OWF_PASSWORD OldNtPassword; PENCRYPTED_NT_OWF_PASSWORD NewNtPassword; + BOOLEAN StoredLmPresent = FALSE; + BOOLEAN StoredNtPresent = FALSE; + BOOLEAN StoredLmEmpty = TRUE; + BOOLEAN StoredNtEmpty = TRUE; PSAM_DB_OBJECT UserObject; ULONG Length; - SAM_USER_FIXED_DATA FixedUserData; + SAM_USER_FIXED_DATA UserFixedData; + SAM_DOMAIN_FIXED_DATA DomainFixedData; + LARGE_INTEGER SystemTime; NTSTATUS Status; TRACE("(%p %u %p %p %u %p %p %u %p %u %p)\n", @@ -7493,6 +7499,14 @@ if (!NT_SUCCESS(Status)) { TRACE("SampValidateDbObject failed with status 0x%08lx\n", Status); + return Status; + } + + /* Get the current time */ + Status = NtQuerySystemTime(&SystemTime); + if (!NT_SUCCESS(Status)) + { + TRACE("NtQuerySystemTime failed (Status 0x%08lx)\n", Status); return Status; } @@ -7503,9 +7517,16 @@ NULL, &StoredLmPassword, &Length); - if (!NT_SUCCESS(Status)) - { - + if (NT_SUCCESS(Status)) + { + if (Length == sizeof(ENCRYPTED_LM_OWF_PASSWORD)) + { + StoredLmPresent = TRUE; + if (!RtlEqualMemory(&StoredLmPassword, + &EmptyLmHash, + sizeof(ENCRYPTED_LM_OWF_PASSWORD))) + StoredLmEmpty = FALSE; + } } /* Retrieve the NT password */ @@ -7515,9 +7536,52 @@ NULL, &StoredNtPassword, &Length); - if (!NT_SUCCESS(Status)) - { - + if (NT_SUCCESS(Status)) + { + if (Length == sizeof(ENCRYPTED_NT_OWF_PASSWORD)) + { + StoredNtPresent = TRUE; + if (!RtlEqualMemory(&StoredNtPassword, + &EmptyNtHash, + sizeof(ENCRYPTED_NT_OWF_PASSWORD))) + StoredNtEmpty = FALSE; + } + } + + /* Retrieve the fixed size user data */ + Length = sizeof(SAM_USER_FIXED_DATA); + Status = SampGetObjectAttribute(UserObject, + L"F", + NULL, + &UserFixedData, + &Length); + if (!NT_SUCCESS(Status)) + { + TRACE("SampGetObjectAttribute failed to retrieve the fixed user data (Status 0x%08lx)\n", Status); + return Status; + } + + /* Check if we can change the password at this time */ + if ((StoredNtEmpty == FALSE) || (StoredNtEmpty == FALSE)) + { + /* Get fixed domain data */ + Length = sizeof(SAM_DOMAIN_FIXED_DATA); + Status = SampGetObjectAttribute(UserObject->ParentObject, + L"F", + NULL, + &DomainFixedData, + &Length); + if (!NT_SUCCESS(Status)) + { + TRACE("SampGetObjectAttribute failed to retrieve the fixed domain data (Status 0x%08lx)\n", Status); + return Status; + } + + if (DomainFixedData.MinPasswordAge.QuadPart > 0) + { + if (SystemTime.QuadPart < (UserFixedData.PasswordLastSet.QuadPart + DomainFixedData.MinPasswordAge.QuadPart)) + return STATUS_ACCOUNT_RESTRICTION; + } } /* FIXME: Decrypt passwords */ @@ -7588,26 +7652,32 @@ LmPresent); if (NT_SUCCESS(Status)) { - /* Get the fixed size user data */ + /* Update PasswordLastSet */ + UserFixedData.PasswordLastSet.QuadPart = SystemTime.QuadPart; + + /* Set the fixed size user data */ Length = sizeof(SAM_USER_FIXED_DATA); - Status = SampGetObjectAttribute(UserObject, + Status = SampSetObjectAttribute(UserObject, L"F", - NULL, - &FixedUserData, - &Length); - if (NT_SUCCESS(Status)) - { - /* Update PasswordLastSet */ - NtQuerySystemTime(&FixedUserData.PasswordLastSet); - - /* Set the fixed size user data */ - Status = SampSetObjectAttribute(UserObject, - L"F", - REG_BINARY, - &FixedUserData, - Length); - } - } + REG_BINARY, + &UserFixedData, + Length); + } + } + + if (Status == STATUS_WRONG_PASSWORD) + { + /* Update BadPasswordCount and LastBadPasswordTime */ + UserFixedData.BadPasswordCount++; + UserFixedData.LastBadPasswordTime.QuadPart = SystemTime.QuadPart; + + /* Set the fixed size user data */ + Length = sizeof(SAM_USER_FIXED_DATA); + Status = SampSetObjectAttribute(UserObject, + L"F", + REG_BINARY, + &UserFixedData, + Length); } return Status;

11 years, 5 months

[aandrejevic] 59559: [NTVDM] Add the program name after the environment block.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Jul 22 20:21:46 2013 New Revision: 59559 URL: http://svn.reactos.org/svn/reactos?rev=59559&view=rev Log: [NTVDM] Add the program name after the environment block. Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Mon Jul 22 20:21:46 2013 @@ -54,7 +54,7 @@ } } -static WORD DosCopyEnvironmentBlock(WORD SourceSegment) +static WORD DosCopyEnvironmentBlock(WORD SourceSegment, LPCSTR ProgramName) { PCHAR Ptr, SourceBuffer, DestBuffer = NULL; ULONG TotalSize = 0; @@ -70,6 +70,9 @@ } TotalSize++; + /* Add the string buffer size */ + TotalSize += strlen(ProgramName) + 1; + /* Allocate the memory for the environment block */ DestSegment = DosAllocateMemory((TotalSize + 0x0F) >> 4, NULL); if (!DestSegment) return 0; @@ -91,7 +94,10 @@ } /* Set the final zero */ - *DestBuffer = 0; + *(DestBuffer++) = 0; + + /* Copy the program name after the environment block */ + strcpy(DestBuffer, ProgramName); return DestSegment; } @@ -846,7 +852,8 @@ /* No, copy the one from the parent */ EnvBlock = DosCopyEnvironmentBlock((CurrentPsp != SYSTEM_PSP) ? SEGMENT_TO_PSP(CurrentPsp)->EnvBlock - : SYSTEM_ENV_BLOCK); + : SYSTEM_ENV_BLOCK, + ProgramFilePath); } /* Check if this is an EXE file or a COM file */

11 years, 5 months

[fireball] 59558: [KERNEL32] - Move Vista+ APIs to their reservation.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jul 22 18:17:58 2013 New Revision: 59558 URL: http://svn.reactos.org/svn/reactos?rev=59558&view=rev Log: [KERNEL32] - Move Vista+ APIs to their reservation. Removed: trunk/reactos/dll/win32/kernel32/winnls/string/mui.c Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/client/vista.c Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Mon Jul 22 18:17:58 2013 @@ -75,7 +75,6 @@ winnls/string/lang.c winnls/string/lcformat.c winnls/string/lstring.c - winnls/string/mui.c winnls/string/nls.c winnls/string/sortkey.c kernel32.rc Modified: trunk/reactos/dll/win32/kernel32/client/vista.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/vista.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/vista.c [iso-8859-1] Mon Jul 22 18:17:58 2013 @@ -734,3 +734,176 @@ return (UInt32x32To64(TickCount.LowPart, SharedUserData->TickCountMultiplier) >> 24) + (UInt32x32To64(TickCount.HighPart, SharedUserData->TickCountMultiplier) << 8); } + +/* + Vista+ MUI support functions + + References: + Evolution of MUI Support across Windows Versions: http://msdn.microsoft.com/en-US/library/ee264317.aspx + Comparing Windows XP Professional Multilingual Options: http://technet.microsoft.com/en-us/library/bb457045.aspx + + More info: + http://msdn.microsoft.com/en-us/goglobal/bb978454.aspx + http://msdn.microsoft.com/en-us/library/dd319074.aspx +*/ + +/* FUNCTIONS *****************************************************************/ + +BOOL +WINAPI +GetFileMUIInfo( + DWORD dwFlags, + PCWSTR pcwszFilePath, + PFILEMUIINFO pFileMUIInfo, + DWORD *pcbFileMUIInfo) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pcwszFilePath, pFileMUIInfo, pcbFileMUIInfo); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetFileMUIPath( + DWORD dwFlags, + PCWSTR pcwszFilePath, + PWSTR pwszLanguage, + PULONG pcchLanguage, + PWSTR pwszFileMUIPath, + PULONG pcchFileMUIPath, + PULONGLONG pululEnumerator) +{ + DPRINT1("%x %p %p %p %p %p\n", dwFlags, pcwszFilePath, pwszLanguage, pwszFileMUIPath, pcchFileMUIPath, pululEnumerator); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetProcessPreferredUILanguages( + DWORD dwFlags, + PULONG pulNumLanguages, + PZZWSTR pwszLanguagesBuffer, + PULONG pcchLanguagesBuffer) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* +* @unimplemented +*/ +BOOL +WINAPI +GetSystemPreferredUILanguages( + DWORD dwFlags, + PULONG pulNumLanguages, + PZZWSTR pwszLanguagesBuffer, + PULONG pcchLanguagesBuffer) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetThreadPreferredUILanguages( + DWORD dwFlags, + PULONG pulNumLanguages, + PZZWSTR pwszLanguagesBuffer, + PULONG pcchLanguagesBuffer) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +LANGID +WINAPI +GetThreadUILanguage(VOID) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetUILanguageInfo( + DWORD dwFlags, + PCZZWSTR pwmszLanguage, + PZZWSTR pwszFallbackLanguages, + PDWORD pcchFallbackLanguages, + PDWORD pdwAttributes) +{ + DPRINT1("%x %p %p %p %p\n", dwFlags, pwmszLanguage, pwszFallbackLanguages, pcchFallbackLanguages, pdwAttributes); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +GetUserPreferredUILanguages( + DWORD dwFlags, + PULONG pulNumLanguages, + PZZWSTR pwszLanguagesBuffer, + PULONG pcchLanguagesBuffer) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +SetProcessPreferredUILanguages( + DWORD dwFlags, + PCZZWSTR pwszLanguagesBuffer, + PULONG pulNumLanguages) +{ + DPRINT1("%x %p %p\n", dwFlags, pwszLanguagesBuffer, pulNumLanguages); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +SetThreadPreferredUILanguages( + DWORD dwFlags, + PCZZWSTR pwszLanguagesBuffer, + PULONG pulNumLanguages + ) +{ + DPRINT1("%x %p %p\n", dwFlags, pwszLanguagesBuffer, pulNumLanguages); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + Removed: trunk/reactos/dll/win32/kernel32/winnls/string/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/mui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/mui.c (removed) @@ -1,183 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: dll/win32/kernel32/winnls/mui.c - * PURPOSE: MUI support functions - * PROGRAMMERS: Edison Henrique Andreassy (ehasis(a)hotmail.com) - */ - -/* INCLUDES ******************************************************************/ -#include <k32.h> - -#define NDEBUG -#include <debug.h> - -/* - References: - Evolution of MUI Support across Windows Versions: http://msdn.microsoft.com/en-US/library/ee264317.aspx - Comparing Windows XP Professional Multilingual Options: http://technet.microsoft.com/en-us/library/bb457045.aspx - - More info: - http://msdn.microsoft.com/en-us/goglobal/bb978454.aspx - http://msdn.microsoft.com/en-us/library/dd319074.aspx -*/ - -/* FUNCTIONS *****************************************************************/ - -BOOL -WINAPI -GetFileMUIInfo( - DWORD dwFlags, - PCWSTR pcwszFilePath, - PFILEMUIINFO pFileMUIInfo, - DWORD *pcbFileMUIInfo) -{ - DPRINT1("%x %p %p %p\n", dwFlags, pcwszFilePath, pFileMUIInfo, pcbFileMUIInfo); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -GetFileMUIPath( - DWORD dwFlags, - PCWSTR pcwszFilePath, - PWSTR pwszLanguage, - PULONG pcchLanguage, - PWSTR pwszFileMUIPath, - PULONG pcchFileMUIPath, - PULONGLONG pululEnumerator) -{ - DPRINT1("%x %p %p %p %p %p\n", dwFlags, pcwszFilePath, pwszLanguage, pwszFileMUIPath, pcchFileMUIPath, pululEnumerator); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -GetProcessPreferredUILanguages( - DWORD dwFlags, - PULONG pulNumLanguages, - PZZWSTR pwszLanguagesBuffer, - PULONG pcchLanguagesBuffer) -{ - DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/* -* @unimplemented -*/ -BOOL -WINAPI -GetSystemPreferredUILanguages( - DWORD dwFlags, - PULONG pulNumLanguages, - PZZWSTR pwszLanguagesBuffer, - PULONG pcchLanguagesBuffer) -{ - DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -GetThreadPreferredUILanguages( - DWORD dwFlags, - PULONG pulNumLanguages, - PZZWSTR pwszLanguagesBuffer, - PULONG pcchLanguagesBuffer) -{ - DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/* - * @unimplemented - */ -LANGID -WINAPI -GetThreadUILanguage(VOID) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -GetUILanguageInfo( - DWORD dwFlags, - PCZZWSTR pwmszLanguage, - PZZWSTR pwszFallbackLanguages, - PDWORD pcchFallbackLanguages, - PDWORD pdwAttributes) -{ - DPRINT1("%x %p %p %p %p\n", dwFlags, pwmszLanguage, pwszFallbackLanguages, pcchFallbackLanguages, pdwAttributes); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -GetUserPreferredUILanguages( - DWORD dwFlags, - PULONG pulNumLanguages, - PZZWSTR pwszLanguagesBuffer, - PULONG pcchLanguagesBuffer) -{ - DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -SetProcessPreferredUILanguages( - DWORD dwFlags, - PCZZWSTR pwszLanguagesBuffer, - PULONG pulNumLanguages) -{ - DPRINT1("%x %p %p\n", dwFlags, pwszLanguagesBuffer, pulNumLanguages); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -SetThreadPreferredUILanguages( - DWORD dwFlags, - PCZZWSTR pwszLanguagesBuffer, - PULONG pulNumLanguages - ) -{ - DPRINT1("%x %p %p\n", dwFlags, pwszLanguagesBuffer, pulNumLanguages); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -}

11 years, 5 months

[aandrejevic] 59557: [NTVDM] Fix bug while initializing and copying the environment strings.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Jul 22 16:36:05 2013 New Revision: 59557 URL: http://svn.reactos.org/svn/reactos?rev=59557&view=rev Log: [NTVDM] Fix bug while initializing and copying the environment strings. Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Mon Jul 22 16:36:05 2013 @@ -83,8 +83,8 @@ strcpy(DestBuffer, Ptr); /* Advance to the next string */ + DestBuffer += strlen(Ptr); Ptr += strlen(Ptr) + 1; - DestBuffer += strlen(Ptr); /* Put a zero after the string */ *(DestBuffer++) = 0; @@ -231,6 +231,8 @@ 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 */ @@ -246,6 +248,7 @@ /* 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; } @@ -1750,13 +1753,13 @@ /* Copy the string into DOS memory */ strcpy(DestPtr, AsciiString); - /* Free the memory */ - HeapFree(GetProcessHeap(), 0, AsciiString); - /* Move to the next string */ SourcePtr += wcslen(SourcePtr) + 1; DestPtr += strlen(AsciiString); *(DestPtr++) = 0; + + /* Free the memory */ + HeapFree(GetProcessHeap(), 0, AsciiString); } *DestPtr = 0;

11 years, 5 months

[fireball] 59556: [KERNEL32] - Stub MUI support functions (by Edison Henrique Andreassy). Don't export them yet (they need to be checked according to the Windows version, so that kernel32 export ta...

by fireball＠svn.reactos.org

Author: fireball Date: Mon Jul 22 14:45:31 2013 New Revision: 59556 URL: http://svn.reactos.org/svn/reactos?rev=59556&view=rev Log: [KERNEL32] - Stub MUI support functions (by Edison Henrique Andreassy). Don't export them yet (they need to be checked according to the Windows version, so that kernel32 export table matches our target). Added: trunk/reactos/dll/win32/kernel32/winnls/string/mui.c (with props) Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Mon Jul 22 14:45:31 2013 @@ -75,6 +75,7 @@ winnls/string/lang.c winnls/string/lcformat.c winnls/string/lstring.c + winnls/string/mui.c winnls/string/nls.c winnls/string/sortkey.c kernel32.rc Added: trunk/reactos/dll/win32/kernel32/winnls/string/mui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/mui.c (added) +++ trunk/reactos/dll/win32/kernel32/winnls/string/mui.c [iso-8859-1] Mon Jul 22 14:45:31 2013 @@ -0,0 +1,183 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/kernel32/winnls/mui.c + * PURPOSE: MUI support functions + * PROGRAMMERS: Edison Henrique Andreassy (ehasis(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ +#include <k32.h> + +#define NDEBUG +#include <debug.h> + +/* + References: + Evolution of MUI Support across Windows Versions: http://msdn.microsoft.com/en-US/library/ee264317.aspx + Comparing Windows XP Professional Multilingual Options: http://technet.microsoft.com/en-us/library/bb457045.aspx + + More info: + http://msdn.microsoft.com/en-us/goglobal/bb978454.aspx + http://msdn.microsoft.com/en-us/library/dd319074.aspx +*/ + +/* FUNCTIONS *****************************************************************/ + +BOOL +WINAPI +GetFileMUIInfo( + DWORD dwFlags, + PCWSTR pcwszFilePath, + PFILEMUIINFO pFileMUIInfo, + DWORD *pcbFileMUIInfo) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pcwszFilePath, pFileMUIInfo, pcbFileMUIInfo); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetFileMUIPath( + DWORD dwFlags, + PCWSTR pcwszFilePath, + PWSTR pwszLanguage, + PULONG pcchLanguage, + PWSTR pwszFileMUIPath, + PULONG pcchFileMUIPath, + PULONGLONG pululEnumerator) +{ + DPRINT1("%x %p %p %p %p %p\n", dwFlags, pcwszFilePath, pwszLanguage, pwszFileMUIPath, pcchFileMUIPath, pululEnumerator); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetProcessPreferredUILanguages( + DWORD dwFlags, + PULONG pulNumLanguages, + PZZWSTR pwszLanguagesBuffer, + PULONG pcchLanguagesBuffer) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* +* @unimplemented +*/ +BOOL +WINAPI +GetSystemPreferredUILanguages( + DWORD dwFlags, + PULONG pulNumLanguages, + PZZWSTR pwszLanguagesBuffer, + PULONG pcchLanguagesBuffer) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetThreadPreferredUILanguages( + DWORD dwFlags, + PULONG pulNumLanguages, + PZZWSTR pwszLanguagesBuffer, + PULONG pcchLanguagesBuffer) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +LANGID +WINAPI +GetThreadUILanguage(VOID) +{ + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetUILanguageInfo( + DWORD dwFlags, + PCZZWSTR pwmszLanguage, + PZZWSTR pwszFallbackLanguages, + PDWORD pcchFallbackLanguages, + PDWORD pdwAttributes) +{ + DPRINT1("%x %p %p %p %p\n", dwFlags, pwmszLanguage, pwszFallbackLanguages, pcchFallbackLanguages, pdwAttributes); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +GetUserPreferredUILanguages( + DWORD dwFlags, + PULONG pulNumLanguages, + PZZWSTR pwszLanguagesBuffer, + PULONG pcchLanguagesBuffer) +{ + DPRINT1("%x %p %p %p\n", dwFlags, pulNumLanguages, pwszLanguagesBuffer, pcchLanguagesBuffer); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +SetProcessPreferredUILanguages( + DWORD dwFlags, + PCZZWSTR pwszLanguagesBuffer, + PULONG pulNumLanguages) +{ + DPRINT1("%x %p %p\n", dwFlags, pwszLanguagesBuffer, pulNumLanguages); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +SetThreadPreferredUILanguages( + DWORD dwFlags, + PCZZWSTR pwszLanguagesBuffer, + PULONG pulNumLanguages + ) +{ + DPRINT1("%x %p %p\n", dwFlags, pwszLanguagesBuffer, pulNumLanguages); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} Propchange: trunk/reactos/dll/win32/kernel32/winnls/string/mui.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/dll/win32/kernel32/winnls/string/mui.c ------------------------------------------------------------------------------ svn:mime-type = text/plain

11 years, 5 months

[aandrejevic] 59555: [NTVDM] Add debug output.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Mon Jul 22 13:51:26 2013 New Revision: 59555 URL: http://svn.reactos.org/svn/reactos?rev=59555&view=rev Log: [NTVDM] Add debug output. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ntvdm.h branches/ntvdm/subsystems/ntvdm/pic.c branches/ntvdm/subsystems/ntvdm/ps2.c branches/ntvdm/subsystems/ntvdm/timer.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Mon Jul 22 13:51:26 2013 @@ -7,6 +7,8 @@ */ /* INCLUDES *******************************************************************/ + +#define NDEBUG #include "bios.h" #include "emulator.h" Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Mon Jul 22 13:51:26 2013 @@ -8,6 +8,8 @@ /* INCLUDES *******************************************************************/ +#define NDEBUG + #include "dos.h" #include "bios.h" #include "emulator.h" @@ -349,11 +351,15 @@ 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_PARAMETER; + DosLastError = ERROR_INVALID_HANDLE; goto Done; } @@ -376,6 +382,7 @@ /* 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; @@ -397,6 +404,10 @@ /* 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); @@ -412,6 +423,10 @@ } 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; @@ -427,6 +442,9 @@ /* 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; } @@ -438,8 +456,14 @@ { 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') return FALSE; + 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; @@ -452,6 +476,8 @@ 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; @@ -476,6 +502,8 @@ { 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; @@ -505,6 +533,10 @@ { HANDLE FileHandle; WORD DosHandle; + + DPRINT("DosCreateFile: FilePath \"%s\", Attributes 0x%04X\n", + FilePath, + Attributes); /* Create the file */ FileHandle = CreateFileA(FilePath, @@ -544,6 +576,10 @@ ACCESS_MASK Access = 0; WORD DosHandle; + DPRINT("DosOpenFile: FilePath \"%s\", AccessMode 0x%04X\n", + FilePath, + AccessMode); + /* Parse the access mode */ switch (AccessMode & 3) { @@ -613,8 +649,10 @@ DWORD BytesRead32 = 0; HANDLE Handle = DosGetRealHandle(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_PARAMETER; + if (Handle == INVALID_HANDLE_VALUE) return ERROR_INVALID_HANDLE; /* Read the file */ if (!ReadFile(Handle, Buffer, Count, &BytesRead32, NULL)) @@ -636,8 +674,12 @@ DWORD BytesWritten32 = 0; HANDLE Handle = DosGetRealHandle(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_PARAMETER; + if (Handle == INVALID_HANDLE_VALUE) return ERROR_INVALID_HANDLE; /* Write the file */ if (!WriteFile(Handle, Buffer, Count, &BytesWritten32, NULL)) @@ -658,6 +700,8 @@ BYTE SftIndex; PDOS_PSP PspBlock; LPBYTE HandleTable; + + DPRINT("DosCloseHandle: DosHandle 0x%04X\n", DosHandle); /* The system PSP has no handle table */ if (CurrentPsp == SYSTEM_PSP) return FALSE; @@ -747,6 +791,10 @@ PDWORD RelocationTable; PWORD RelocWord; + DPRINT("DosCreateProcess: CommandLine \"%s\", EnvBlock 0x%04X\n", + CommandLine, + EnvBlock); + /* Save a copy of the command line */ strcpy(CommandLineCopy, CommandLine); @@ -949,6 +997,10 @@ PDOS_MCB CurrentMcb; LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); PDOS_PSP PspBlock = SEGMENT_TO_PSP(Psp); + + DPRINT("DosTerminateProcess: Psp 0x%04X, ReturnCode 0x%02X\n", + Psp, + ReturnCode); /* Check if this PSP is it's own parent */ if (PspBlock->ParentPsp == Psp) goto Done; @@ -1416,7 +1468,7 @@ /* Return the error code in AX */ EmulatorSetRegister(EMULATOR_REG_AX, - (Eax & 0xFFFF0000) | ERROR_INVALID_PARAMETER); + (Eax & 0xFFFF0000) | ERROR_INVALID_HANDLE); } break; Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Mon Jul 22 13:51:26 2013 @@ -8,6 +8,8 @@ /* INCLUDES *******************************************************************/ +#define NDEBUG + #include "emulator.h" #include "bios.h" #include "dos.h" Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Mon Jul 22 13:51:26 2013 @@ -7,6 +7,8 @@ */ /* INCLUDES *******************************************************************/ + +#define NDEBUG #include "ntvdm.h" #include "emulator.h" Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Mon Jul 22 13:51:26 2013 @@ -16,8 +16,6 @@ #include <stdio.h> #include <conio.h> #include <stdarg.h> - -#define NDEBUG #include <debug.h> /* DEFINES ********************************************************************/ Modified: branches/ntvdm/subsystems/ntvdm/pic.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/pic.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/pic.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/pic.c [iso-8859-1] Mon Jul 22 13:51:26 2013 @@ -8,6 +8,8 @@ /* INCLUDES *******************************************************************/ +#define NDEBUG + #include "pic.h" #include "emulator.h" Modified: branches/ntvdm/subsystems/ntvdm/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] Mon Jul 22 13:51:26 2013 @@ -7,6 +7,8 @@ */ /* INCLUDES *******************************************************************/ + +#define NDEBUG #include "ps2.h" #include "emulator.h" Modified: branches/ntvdm/subsystems/ntvdm/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/timer.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/timer.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/timer.c [iso-8859-1] Mon Jul 22 13:51:26 2013 @@ -8,6 +8,8 @@ /* INCLUDES *******************************************************************/ +#define NDEBUG + #include "timer.h" #include "pic.h"

11 years, 5 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2013