Ros-diffs November 2013

ros-diffs@reactos.org

16 participants
348 discussions

[gadamopoulos] 60879: [shell32] - Do not use HIMAGELIST_QueryInterface which is exported from vista comctl32. The replacement code is taken from HIMAGELIST_QueryInterface and its fine to use it, as...
by gadamopoulos＠svn.reactos.org 07 Nov '13

07 Nov '13

Author: gadamopoulos Date: Thu Nov 7 13:19:23 2013 New Revision: 60879 URL: http://svn.reactos.org/svn/reactos?rev=60879&view=rev Log: [shell32] - Do not use HIMAGELIST_QueryInterface which is exported from vista comctl32. The replacement code is taken from HIMAGELIST_QueryInterface and its fine to use it, as is safe to assume that an HIMAGELIST is a IImageList* - Allows us to use comctl32 5.82 from win2003 and boot to desktop Modified: trunk/reactos/dll/win32/shell32/shellord.cpp Modified: trunk/reactos/dll/win32/shell32/shellord.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellord… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellord.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellord.cpp [iso-8859-1] Thu Nov 7 13:19:23 2013 @@ -2269,7 +2269,9 @@ /* Get the interface for the new image list */ if (hNew) { - ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); + IImageList *imageList = (IImageList*) hNew; + ret = imageList->QueryInterface(riid, ppv); + ImageList_Destroy(hNew); }

1 0

[aandrejevic] 60878: [FAST486] Implement LFS, LGS and MOVZX.
by aandrejevic＠svn.reactos.org 07 Nov '13

07 Nov '13

Author: aandrejevic Date: Thu Nov 7 01:06:39 2013 New Revision: 60878 URL: http://svn.reactos.org/svn/reactos?rev=60878&view=rev Log: [FAST486] Implement LFS, LGS and MOVZX. Modified: branches/ntvdm/lib/fast486/extraops.c branches/ntvdm/lib/fast486/extraops.h Modified: branches/ntvdm/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] Thu Nov 7 01:06:39 2013 @@ -217,10 +217,10 @@ Fast486ExtOpcodeCmpXchg, NULL, // TODO: OPCODE 0xB2 NOT IMPLEMENTED Fast486ExtOpcodeBtr, - NULL, // TODO: OPCODE 0xB4 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xB5 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xB6 NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xB7 NOT IMPLEMENTED + Fast486ExtOpcodeLfsLgs, + Fast486ExtOpcodeLfsLgs, + Fast486ExtOpcodeMovzxByte, + Fast486ExtOpcodeMovzxWord, NULL, // TODO: OPCODE 0xB8 NOT IMPLEMENTED Fast486OpcodeGroup0FB9, Fast486OpcodeGroup0FBA, @@ -945,6 +945,139 @@ return TRUE; } +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeLfsLgs) +{ + UCHAR FarPointer[6]; + BOOLEAN OperandSize, AddressSize; + FAST486_MOD_REG_RM ModRegRm; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFE) == 0xB4); + + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + + TOGGLE_ADSIZE(AddressSize); + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + if (!ModRegRm.Memory) + { + /* Invalid */ + Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; + } + + if (!Fast486ReadMemory(State, + (State->PrefixFlags & FAST486_PREFIX_SEG) + ? State->SegmentOverride : FAST486_REG_DS, + ModRegRm.MemoryAddress, + FALSE, + FarPointer, + OperandSize ? 6 : 4)) + { + /* Exception occurred */ + return FALSE; + } + + if (OperandSize) + { + ULONG Offset = *((PULONG)FarPointer); + USHORT Segment = *((PUSHORT)&FarPointer[sizeof(ULONG)]); + + /* Set the register to the offset */ + State->GeneralRegs[ModRegRm.Register].Long = Offset; + + /* Load the segment */ + return Fast486LoadSegment(State, + (Opcode == 0xB4) + ? FAST486_REG_FS : FAST486_REG_GS, + Segment); + } + else + { + USHORT Offset = *((PUSHORT)FarPointer); + USHORT Segment = *((PUSHORT)&FarPointer[sizeof(USHORT)]); + + /* Set the register to the offset */ + State->GeneralRegs[ModRegRm.Register].LowWord = Offset; + + /* Load the segment */ + return Fast486LoadSegment(State, + (Opcode == 0xB4) + ? FAST486_REG_FS : FAST486_REG_GS, + Segment); + } +} + +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeMovzxByte) +{ + UCHAR Dummy, Value; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + FAST486_MOD_REG_RM ModRegRm; + + TOGGLE_ADSIZE(AddressSize); + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xB6); + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Read the operands */ + if (!Fast486ReadModrmByteOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write back the zero-extended value */ + return Fast486WriteModrmDwordOperands(State, + &ModRegRm, + TRUE, + (ULONG)Value); +} + +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeMovzxWord) +{ + USHORT Dummy, Value; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + FAST486_MOD_REG_RM ModRegRm; + + TOGGLE_ADSIZE(AddressSize); + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xB7); + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Read the operands */ + if (!Fast486ReadModrmWordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write back the zero-extended value */ + return Fast486WriteModrmDwordOperands(State, + &ModRegRm, + TRUE, + (ULONG)Value); +} + FAST486_OPCODE_HANDLER(Fast486ExtOpcodeBtc) { BOOLEAN OperandSize, AddressSize; Modified: branches/ntvdm/lib/fast486/extraops.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.h?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.h [iso-8859-1] Thu Nov 7 01:06:39 2013 @@ -40,6 +40,9 @@ FAST486_OPCODE_HANDLER(Fast486ExtOpcodeCmpXchgByte); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeCmpXchg); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeBtr); +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeLfsLgs); +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeMovzxByte); +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeMovzxWord); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeBtc); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeBsf); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeBsr);

1 0

[aandrejevic] 60877: [FAST486] Implement BSF, BSR and MOVSX.
by aandrejevic＠svn.reactos.org 07 Nov '13

07 Nov '13

Author: aandrejevic Date: Thu Nov 7 00:57:08 2013 New Revision: 60877 URL: http://svn.reactos.org/svn/reactos?rev=60877&view=rev Log: [FAST486] Implement BSF, BSR and MOVSX. Modified: branches/ntvdm/lib/fast486/extraops.c branches/ntvdm/lib/fast486/extraops.h Modified: branches/ntvdm/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] Thu Nov 7 00:57:08 2013 @@ -225,10 +225,10 @@ Fast486OpcodeGroup0FB9, Fast486OpcodeGroup0FBA, Fast486ExtOpcodeBtc, - NULL, // TODO: OPCODE 0xBC NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xBD NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xBE NOT IMPLEMENTED - NULL, // TODO: OPCODE 0xBF NOT IMPLEMENTED + Fast486ExtOpcodeBsf, + Fast486ExtOpcodeBsr, + Fast486ExtOpcodeMovsxByte, + Fast486ExtOpcodeMovsxWord, Fast486ExtOpcodeXaddByte, Fast486ExtOpcodeXadd, NULL, // Invalid @@ -1036,6 +1036,252 @@ return TRUE; } +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeBsf) +{ + INT i; + ULONG Dummy = 0, Value = 0; + BOOLEAN OperandSize, AddressSize; + FAST486_MOD_REG_RM ModRegRm; + ULONG BitNumber; + UINT DataSize; + + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + TOGGLE_OPSIZE(OperandSize); + TOGGLE_ADSIZE(AddressSize); + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xBC); + + /* Get the number of bits */ + if (OperandSize) DataSize = 32; + else DataSize = 16; + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Read the value */ + if (OperandSize) + { + if (!Fast486ReadModrmDwordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + if (!Fast486ReadModrmWordOperands(State, + &ModRegRm, + (PUSHORT)&Dummy, + (PUSHORT)&Value)) + { + /* Exception occurred */ + return FALSE; + } + } + + /* Clear ZF */ + State->Flags.Zf = FALSE; + + for (i = 0; i < DataSize; i++) + { + if(Value & (1 << i)) + { + /* Set ZF */ + State->Flags.Zf = TRUE; + + /* Save the bit number */ + BitNumber = i; + + /* Exit the loop */ + break; + } + } + + if (State->Flags.Zf) + { + /* Write back the result */ + if (OperandSize) + { + if (!Fast486WriteModrmDwordOperands(State, &ModRegRm, TRUE, BitNumber)) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + if (!Fast486WriteModrmWordOperands(State, &ModRegRm, TRUE, LOWORD(BitNumber))) + { + /* Exception occurred */ + return FALSE; + } + } + } + + return TRUE; +} + +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeBsr) +{ + INT i; + ULONG Dummy = 0, Value = 0; + BOOLEAN OperandSize, AddressSize; + FAST486_MOD_REG_RM ModRegRm; + ULONG BitNumber; + UINT DataSize; + + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + TOGGLE_OPSIZE(OperandSize); + TOGGLE_ADSIZE(AddressSize); + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xBD); + + /* Get the number of bits */ + if (OperandSize) DataSize = 32; + else DataSize = 16; + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Read the value */ + if (OperandSize) + { + if (!Fast486ReadModrmDwordOperands(State, &ModRegRm, &Dummy, &Value)) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + if (!Fast486ReadModrmWordOperands(State, + &ModRegRm, + (PUSHORT)&Dummy, + (PUSHORT)&Value)) + { + /* Exception occurred */ + return FALSE; + } + } + + /* Clear ZF */ + State->Flags.Zf = FALSE; + + for (i = DataSize - 1; i >= 0; i--) + { + if(Value & (1 << i)) + { + /* Set ZF */ + State->Flags.Zf = TRUE; + + /* Save the bit number */ + BitNumber = i; + + /* Exit the loop */ + break; + } + } + + if (State->Flags.Zf) + { + /* Write back the result */ + if (OperandSize) + { + if (!Fast486WriteModrmDwordOperands(State, &ModRegRm, TRUE, BitNumber)) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + if (!Fast486WriteModrmWordOperands(State, &ModRegRm, TRUE, LOWORD(BitNumber))) + { + /* Exception occurred */ + return FALSE; + } + } + } + + return TRUE; +} + +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeMovsxByte) +{ + UCHAR Dummy; + CHAR Value; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + FAST486_MOD_REG_RM ModRegRm; + + TOGGLE_ADSIZE(AddressSize); + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xBE); + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Read the operands */ + if (!Fast486ReadModrmByteOperands(State, &ModRegRm, &Dummy, (PUCHAR)&Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write back the sign-extended value */ + return Fast486WriteModrmDwordOperands(State, + &ModRegRm, + TRUE, + (ULONG)((LONG)Value)); +} + +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeMovsxWord) +{ + USHORT Dummy; + SHORT Value; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + FAST486_MOD_REG_RM ModRegRm; + + TOGGLE_ADSIZE(AddressSize); + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xBF); + + /* Get the operands */ + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Read the operands */ + if (!Fast486ReadModrmWordOperands(State, &ModRegRm, &Dummy, (PUSHORT)&Value)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write back the sign-extended value */ + return Fast486WriteModrmDwordOperands(State, + &ModRegRm, + TRUE, + (ULONG)((LONG)Value)); +} + FAST486_OPCODE_HANDLER(Fast486ExtOpcodeConditionalJmp) { BOOLEAN Jump = FALSE; Modified: branches/ntvdm/lib/fast486/extraops.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.h?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.h [iso-8859-1] Thu Nov 7 00:57:08 2013 @@ -41,6 +41,10 @@ FAST486_OPCODE_HANDLER(Fast486ExtOpcodeCmpXchg); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeBtr); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeBtc); +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeBsf); +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeBsr); +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeMovsxByte); +FAST486_OPCODE_HANDLER(Fast486ExtOpcodeMovsxWord); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeConditionalJmp); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeConditionalSet); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeXaddByte);

1 0

[hbelusca] 60876: [NTVDM]: Code formatting only.
by hbelusca＠svn.reactos.org 06 Nov '13

06 Nov '13

Author: hbelusca Date: Wed Nov 6 22:43:40 2013 New Revision: 60876 URL: http://svn.reactos.org/svn/reactos?rev=60876&view=rev Log: [NTVDM]: Code formatting only. Modified: branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Wed Nov 6 22:43:40 2013 @@ -87,32 +87,41 @@ }; static BYTE VgaMemory[VGA_NUM_BANKS * VGA_BANK_SIZE]; +static LPVOID ConsoleFramebuffer = NULL; +static HANDLE TextConsoleBuffer = NULL; +static HANDLE GraphicsConsoleBuffer = NULL; +static HANDLE ConsoleMutex = NULL; +static HPALETTE PaletteHandle = NULL; + static BYTE VgaLatchRegisters[VGA_NUM_BANKS] = {0, 0, 0, 0}; static BYTE VgaMiscRegister; + static BYTE VgaSeqIndex = VGA_SEQ_RESET_REG; static BYTE VgaSeqRegisters[VGA_SEQ_MAX_REG]; + static BYTE VgaGcIndex = VGA_GC_RESET_REG; static BYTE VgaGcRegisters[VGA_GC_MAX_REG]; + static BYTE VgaCrtcIndex = VGA_CRTC_HORZ_TOTAL_REG; static BYTE VgaCrtcRegisters[VGA_CRTC_MAX_REG]; + static BYTE VgaAcIndex = VGA_AC_PAL_0_REG; static BOOLEAN VgaAcLatch = FALSE; static BYTE VgaAcRegisters[VGA_AC_MAX_REG]; + static WORD VgaDacIndex = 0; static BOOLEAN VgaDacReadWrite = FALSE; static BYTE VgaDacRegisters[VGA_PALETTE_SIZE]; -static HPALETTE PaletteHandle = NULL; + static BOOLEAN InVerticalRetrace = FALSE; static BOOLEAN InHorizontalRetrace = FALSE; -static HANDLE TextConsoleBuffer = NULL; -static HANDLE GraphicsConsoleBuffer = NULL; -static LPVOID ConsoleFramebuffer = NULL; -static HANDLE ConsoleMutex = NULL; + static BOOLEAN NeedsUpdate = FALSE; static BOOLEAN ModeChanged = TRUE; static BOOLEAN CursorMoved = FALSE; static BOOLEAN PaletteChanged = FALSE; static BOOLEAN TextMode = TRUE; + static SMALL_RECT UpdateRectangle = { 0, 0, 0, 0 }; /* PRIVATE FUNCTIONS **********************************************************/ @@ -1096,7 +1105,6 @@ { /* Set the sequencer index register */ if (Data < VGA_SEQ_MAX_REG) VgaSeqIndex = Data; - break; } @@ -1104,7 +1112,6 @@ { /* Call the sequencer function */ VgaWriteSequencer(Data); - break; } @@ -1112,7 +1119,6 @@ { VgaDacReadWrite = FALSE; VgaDacIndex = Data * 3; - break; } @@ -1120,7 +1126,6 @@ { VgaDacReadWrite = TRUE; VgaDacIndex = Data * 3; - break; } @@ -1128,14 +1133,12 @@ { /* Ignore writes in read mode */ if (VgaDacReadWrite) VgaWriteDac(Data & 0x3F); - break; } case VGA_MISC_WRITE: { VgaMiscRegister = Data; - break; } @@ -1143,7 +1146,6 @@ { /* Set the CRTC index register */ if (Data < VGA_CRTC_MAX_REG) VgaCrtcIndex = Data; - break; } @@ -1151,7 +1153,6 @@ { /* Call the CRTC function */ VgaWriteCrtc(Data); - break; } @@ -1166,7 +1167,6 @@ { /* Call the GC function */ VgaWriteGc(Data); - break; } }

1 0

[spetreolle] 60875: [ROSTESTS] Display ok_err() errors as hexadecimal instead of signed.
by spetreolle＠svn.reactos.org 06 Nov '13

06 Nov '13

Author: spetreolle Date: Wed Nov 6 19:04:07 2013 New Revision: 60875 URL: http://svn.reactos.org/svn/reactos?rev=60875&view=rev Log: [ROSTESTS] Display ok_err() errors as hexadecimal instead of signed. Modified: trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Wed Nov 6 19:04:07 2013 @@ -687,7 +687,7 @@ #define ok_char(expression, result) ok_hex(expression, result) #define ok_err(error) \ - ok(GetLastError() == (error), "Wrong last error. Expected " #error ", got %d\n", (int)GetLastError()) + ok(GetLastError() == (error), "Wrong last error. Expected " #error ", got 0x%lx\n", GetLastError()) #define ok_str(x, y) \ ok(strcmp(x, y) == 0, "Wrong string. Expected '%s', got '%s'\n", y, x)

1 0

[gadamopoulos] 60874: [shell32] - Open the Admin tools folder when we click Manage in the context menu of my computer for now as we don't have mmc yet
by gadamopoulos＠svn.reactos.org 06 Nov '13

06 Nov '13

Author: gadamopoulos Date: Wed Nov 6 10:56:20 2013 New Revision: 60874 URL: http://svn.reactos.org/svn/reactos?rev=60874&view=rev Log: [shell32] - Open the Admin tools folder when we click Manage in the context menu of my computer for now as we don't have mmc yet Modified: trunk/reactos/dll/win32/shell32/res/rgs/mycomputer.rgs Modified: trunk/reactos/dll/win32/shell32/res/rgs/mycomputer.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/mycomputer.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/res/rgs/mycomputer.rgs [iso-8859-1] Wed Nov 6 10:56:20 2013 @@ -30,7 +30,7 @@ } 'Manage' { - 'command' = e '%%windir%%\system32\mmc.exe /s %%windir%%\system32\compmgmt.msc' + 'command' = e 'explorer.exe /n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\::{D20EA4E1-3957-11d2-A40B-0C5020524153}' val 'SuppressionPolicy' = d '&H4000003c' } }

1 0

[gadamopoulos] 60873: [shell32] - Improve CDefaultContextMenu::InvokePidl so it can handle opening items that are not files
by gadamopoulos＠svn.reactos.org 06 Nov '13

06 Nov '13

Author: gadamopoulos Date: Wed Nov 6 09:48:29 2013 New Revision: 60873 URL: http://svn.reactos.org/svn/reactos?rev=60873&view=rev Log: [shell32] - Improve CDefaultContextMenu::InvokePidl so it can handle opening items that are not files Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp Modified: trunk/reactos/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/defconte… ============================================================================== --- trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/defcontextmenu.cpp [iso-8859-1] Wed Nov 6 09:48:29 2013 @@ -1538,24 +1538,28 @@ HRESULT CDefaultContextMenu::InvokePidl(LPCMINVOKECOMMANDINFO lpcmi, LPCITEMIDLIST pidl, PStaticShellEntry pEntry) { - HRESULT hr; - STRRET strFile; - - hr = m_Dcm.psf->GetDisplayNameOf(pidl, SHGDN_FORPARSING, &strFile); - if (hr != S_OK) - { - ERR("IShellFolder_GetDisplayNameOf failed for apidl\n"); - return hr; + LPITEMIDLIST pidlFull = ILCombine(m_Dcm.pidlFolder, pidl); + if (pidlFull == NULL) + { + return E_FAIL; } WCHAR wszPath[MAX_PATH]; - hr = StrRetToBufW(&strFile, pidl, wszPath, MAX_PATH); - if (hr != S_OK) - return hr; - + BOOL bHasPath = SHGetPathFromIDListW(pidlFull, wszPath); + WCHAR wszDir[MAX_PATH]; - wcscpy(wszDir, wszPath); - PathRemoveFileSpec(wszDir); + if(bHasPath) + { + wcscpy(wszDir, wszPath); + PathRemoveFileSpec(wszDir); + } + else + { + SHGetPathFromIDListW(m_Dcm.pidlFolder, wszDir); + } + + HKEY hkeyClass; + RegOpenKeyExW(HKEY_CLASSES_ROOT, pEntry->szClass, 0, KEY_READ, &hkeyClass); SHELLEXECUTEINFOW sei; ZeroMemory(&sei, sizeof(sei)); @@ -1563,9 +1567,20 @@ sei.hwnd = lpcmi->hwnd; sei.nShow = SW_SHOWNORMAL; sei.lpVerb = pEntry->szVerb; - sei.lpFile = wszPath; sei.lpDirectory = wszDir; + sei.lpIDList = pidlFull; + sei.hkeyClass = hkeyClass; + sei.fMask = SEE_MASK_CLASSKEY | SEE_MASK_IDLIST; + if (bHasPath) + { + sei.lpFile = wszPath; + } + ShellExecuteExW(&sei); + + RegCloseKey(hkeyClass); + + ILFree(pidlFull); return S_OK; }

1 0

[tfaber] 60872: [CLASSPNP] - Fix a debug print
by tfaber＠svn.reactos.org 06 Nov '13

06 Nov '13

Author: tfaber Date: Wed Nov 6 00:10:46 2013 New Revision: 60872 URL: http://svn.reactos.org/svn/reactos?rev=60872&view=rev Log: [CLASSPNP] - Fix a debug print Modified: trunk/reactos/drivers/storage/classpnp/autorun.c Modified: trunk/reactos/drivers/storage/classpnp/autorun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/a… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/autorun.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/autorun.c [iso-8859-1] Wed Nov 6 00:10:46 2013 @@ -441,7 +441,7 @@ KdPrintEx((DPFLTR_CLASSPNP_ID, ClassDebugMCN, "Classpnp => GESN::EXTERNAL: Event: %x Status %x Req %x\n", externalInfo->ExternalEvent, externalInfo->ExternalStatus, - (externalInfo->Request[0] >> 8) | externalInfo->Request[1] + (externalInfo->Request[0] << 8) | externalInfo->Request[1] )); RtlZeroMemory(&externalData, sizeof(DEVICE_EVENT_EXTERNAL_REQUEST));

1 0

[pschweitzer] 60871: [NTOSKRNL] - Implement MiUnlockProcessWorkingSetShared() and make use of it in MiUnlockProcessWorkingSetForFault(). - Complete implementation of MiLockProcessWorkingSetForFault()
by pschweitzer＠svn.reactos.org 05 Nov '13

05 Nov '13

Author: pschweitzer Date: Tue Nov 5 22:03:42 2013 New Revision: 60871 URL: http://svn.reactos.org/svn/reactos?rev=60871&view=rev Log: [NTOSKRNL] - Implement MiUnlockProcessWorkingSetShared() and make use of it in MiUnlockProcessWorkingSetForFault(). - Complete implementation of MiLockProcessWorkingSetForFault() Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Tue Nov 5 22:03:42 2013 @@ -1197,6 +1197,30 @@ // FORCEINLINE VOID +MiUnlockProcessWorkingSetShared(IN PEPROCESS Process, + IN PETHREAD Thread) +{ + /* Make sure we are the owner of a safe acquisition (because shared) */ + ASSERT(MI_WS_OWNER(Process)); + ASSERT(!MI_IS_WS_UNSAFE(Process)); + + /* Ensure we are in a shared acquisition */ + ASSERT(Thread->OwnsProcessWorkingSetShared == TRUE); + ASSERT(Thread->OwnsProcessWorkingSetExclusive == FALSE); + + /* Don't claim the lock anylonger */ + Thread->OwnsProcessWorkingSetShared = FALSE; + + /* Release the lock and re-enable APCs */ + ExReleasePushLockShared(&Process->Vm.WorkingSetMutex); + KeLeaveGuardedRegion(); +} + +// +// Unlocks the working set for the given process +// +FORCEINLINE +VOID MiUnlockProcessWorkingSetUnsafe(IN PEPROCESS Process, IN PETHREAD Thread) { @@ -1330,7 +1354,7 @@ else { /* Owner is shared (implies safe), release normally */ - ASSERT(FALSE); + MiUnlockProcessWorkingSetShared(Process, Thread); *Safe = TRUE; *Shared = TRUE; } @@ -1343,16 +1367,24 @@ IN BOOLEAN Safe, IN BOOLEAN Shared) { - ASSERT(Shared == FALSE); - /* Check if this was a safe lock or not */ if (Safe) { - /* Reacquire safely */ - MiLockProcessWorkingSet(Process, Thread); + if (Shared) + { + /* Reacquire safely & shared */ + MiLockProcessWorkingSetShared(Process, Thread); + } + else + { + /* Reacquire safely */ + MiLockProcessWorkingSet(Process, Thread); + } } else { + /* Unsafe lock cannot be shared */ + ASSERT(Shared == FALSE); /* Reacquire unsafely */ MiLockProcessWorkingSetUnsafe(Process, Thread); }

1 0

[tfaber] 60870: [CMAKE] - Make C4022 (pointer type mismatch) and C4129 (unrecognized escape sequence) into errors CORE-7538
by tfaber＠svn.reactos.org 05 Nov '13

05 Nov '13

Author: tfaber Date: Tue Nov 5 20:52:36 2013 New Revision: 60870 URL: http://svn.reactos.org/svn/reactos?rev=60870&view=rev Log: [CMAKE] - Make C4022 (pointer type mismatch) and C4129 (unrecognized escape sequence) into errors CORE-7538 Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=60870… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue Nov 5 20:52:36 2013 @@ -37,13 +37,17 @@ add_compile_flags("/wd4290") # The following warnings are treated as errors: +# - TODO: C4013: implicit function declaration +# - C4022: pointer type mismatch for parameter +# - TODO: C4028: formal parameter different from declaration # - C4047: different level of indirection -# - C4090: different 'modifier' qualifiers (for C programs only; +# - TODO: C4090: different 'modifier' qualifiers (for C programs only; # for C++ programs, the compiler error C2440 is issued) # - C4098: void function returning a value +# - C4129: unrecognized escape sequence +# - TODO: C4133: incompatible types # - C4700: uninitialized variable usage -##add_compile_flags("/we4047 /we4090 /we4098 /we4700") -add_compile_flags("/we4047 /we4098 /we4700") +add_compile_flags("/we4022 /we4047 /we4098 /we4129 /we4700") # Debugging #if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
35
Older →

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 November 2013