Ros-diffs September 2011

ros-diffs@reactos.org

20 participants
399 discussions

[rharabien] 53660: [WIN32K] - Improve formating of input.c and keyboard.c

by rharabien＠svn.reactos.org

Author: rharabien Date: Fri Sep 9 16:17:02 2011 New Revision: 53660 URL: http://svn.reactos.org/svn/reactos?rev=53660&view=rev Log: [WIN32K] - Improve formating of input.c and keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…

13 years, 3 months

[rharabien] 53659: [WIN32K] - Don't use magic type values for IntMapVirtualKeyEx calls - Fix a typo in ERR

by rharabien＠svn.reactos.org

Author: rharabien Date: Fri Sep 9 16:08:09 2011 New Revision: 53659 URL: http://svn.reactos.org/svn/reactos?rev=53659&view=rev Log: [WIN32K] - Don't use magic type values for IntMapVirtualKeyEx calls - Fix a typo in ERR Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Fri Sep 9 16:08:09 2011 @@ -602,7 +602,7 @@ } if(!NT_SUCCESS(Status)) { - ERR("Win32K: Failed to read from mouse.\n"); + ERR("Win32K: Failed to read from keyboard.\n"); return; //(Status); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Fri Sep 9 16:08:09 2011 @@ -318,7 +318,7 @@ { if( bLigature ) { - TRACE("Not handling ligature (yet)\n" ); + WARN("Not handling ligature (yet)\n" ); return 0; } @@ -579,7 +579,7 @@ switch( Type ) { - case 0: + case MAPVK_VK_TO_VSC: if( Code == VK_SHIFT ) Code = VK_LSHIFT; if( Code == VK_MENU ) @@ -589,13 +589,13 @@ ret = VkToScan( Code, FALSE, keyLayout ); break; - case 1: + case MAPVK_VSC_TO_VK: ret = DontDistinguishShifts - (IntMapVirtualKeyEx( Code, 3, keyLayout ) ); + (IntMapVirtualKeyEx( Code, MAPVK_VSC_TO_VK_EX, keyLayout ) ); break; - case 2: + case MAPVK_VK_TO_CHAR: { WCHAR wp[2] = {0}; @@ -605,10 +605,17 @@ } break; - case 3: + case MAPVK_VSC_TO_VK_EX: ret = ScanToVk( Code, FALSE, keyLayout ); break; + + case MAPVK_VK_TO_VSC_EX: + STUB; + break; + + default: + ERR("Wrong type value: %u\n", Type); } return ret; @@ -796,7 +803,7 @@ { WCHAR UCName[2]; - UCName[0] = W32kSimpleToupper(IntMapVirtualKeyEx( VkCode, 2, keyLayout )); + UCName[0] = W32kSimpleToupper(IntMapVirtualKeyEx( VkCode, MAPVK_VK_TO_CHAR, keyLayout )); UCName[1] = 0; ret = 1; @@ -860,7 +867,7 @@ TRACE("ScanCode %04x\n",ScanCode); BaseMapping = Msg->wParam = - IntMapVirtualKeyEx( ScanCode, 1, KeyboardLayout ); + IntMapVirtualKeyEx( ScanCode, MAPVK_VSC_TO_VK, KeyboardLayout ); if( Prefix == 0 ) { if( ScanCode >= KeyboardLayout->bMaxVSCtoVK )

13 years, 3 months

[tkreuzer] 53658: [HAL] - Add a hack to ApicGetCurrentIrql and ApicSetCurrentIrql to work around a VBox bug - call KeSetTimeIncrement after initializing the rtc clock - calculate TSC frequency from...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Sep 9 15:42:59 2011 New Revision: 53658 URL: http://svn.reactos.org/svn/reactos?rev=53658&view=rev Log: [HAL] - Add a hack to ApicGetCurrentIrql and ApicSetCurrentIrql to work around a VBox bug - call KeSetTimeIncrement after initializing the rtc clock - calculate TSC frequency from the samples - Fix a bug in KeStallExecutionProcessor Modified: trunk/reactos/hal/halx86/apic/apic.c trunk/reactos/hal/halx86/apic/rtctimer.c trunk/reactos/hal/halx86/apic/tsc.c Modified: trunk/reactos/hal/halx86/apic/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/apic.c?rev… ============================================================================== --- trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/apic.c [iso-8859-1] Fri Sep 9 15:42:59 2011 @@ -113,6 +113,11 @@ FORCEINLINE ApicGetCurrentIrql(VOID) { + // HACK: This won't work with amd64, where cr8 is modified directly, but + // VBox is broken and returns a wrong value when using a vmmcall after a + // page table modification. + return KeGetPcr()->Irql; + /* Read the TPR and convert it to an IRQL */ return TprToIrql(ApicRead(APIC_TPR)); } @@ -123,6 +128,9 @@ { /* Convert IRQL and write the TPR */ ApicWrite(APIC_TPR, IrqlToTpr(Irql)); + + /* HACK: Keep PCR field in sync, s.a. */ + KeGetPcr()->Irql = Irql; } UCHAR Modified: trunk/reactos/hal/halx86/apic/rtctimer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/rtctimer.c… ============================================================================== --- trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/rtctimer.c [iso-8859-1] Fri Sep 9 15:42:59 2011 @@ -19,9 +19,10 @@ const UCHAR HalpClockVector = 0xD1; BOOLEAN HalpClockSetMSRate; UCHAR HalpNextMSRate; -UCHAR HalpCurrentRate = 9; +UCHAR HalpCurrentRate = 9; /* Initial rate 9: 128 Hz / 7,8 ms */ ULONG HalpCurrentTimeIncrement; -static UCHAR RtcLargestClockRate = 10; +static UCHAR RtcMinimumClockRate = 6; /* Minimum rate 6: 16 Hz / 62,5 ms */ +static UCHAR RtcMaximumClockRate = 10; /* Maximum rate 10: 256 Hz / 3,9 ms */ ULONG @@ -41,6 +42,10 @@ /* Disable interrupts */ EFlags = __readeflags(); _disable(); + + /* Update the global values */ + HalpCurrentRate = ClockRate; + HalpCurrentTimeIncrement = RtcClockRateToIncrement(ClockRate); /* Acquire CMOS lock */ HalpAcquireCmosSpinLock(); @@ -83,7 +88,12 @@ /* Release CMOS lock */ HalpReleaseCmosSpinLock(); + /* Set initial rate */ RtcSetClockRate(HalpCurrentRate); + + /* Notify the kernel about the maximum and minimum increment */ + KeSetTimeIncrement(RtcClockRateToIncrement(RtcMaximumClockRate), + RtcClockRateToIncrement(RtcMinimumClockRate)); DPRINT1("Clock initialized\n"); } @@ -110,10 +120,6 @@ /* Check if someone changed the time rate */ if (HalpClockSetMSRate) { - /* Update the global values */ - HalpCurrentRate = HalpNextMSRate; - HalpCurrentTimeIncrement = RtcClockRateToIncrement(HalpCurrentRate); - /* Set new clock rate */ RtcSetClockRate(HalpCurrentRate); @@ -143,7 +149,7 @@ UCHAR Rate; /* Lookup largest value below given Increment */ - for (Rate = 2; Rate < RtcLargestClockRate; Rate++) + for (Rate = RtcMinimumClockRate; Rate <= RtcMaximumClockRate; Rate++) { /* Check if this is the largest rate possible */ if (RtcClockRateToIncrement(Rate + 1) > Increment) break; Modified: trunk/reactos/hal/halx86/apic/tsc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic/tsc.c?rev=… ============================================================================== --- trunk/reactos/hal/halx86/apic/tsc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic/tsc.c [iso-8859-1] Fri Sep 9 15:42:59 2011 @@ -17,10 +17,39 @@ LARGE_INTEGER HalpCpuClockFrequency = {INITIAL_STALL_COUNT * 1000000}; UCHAR TscCalibrationPhase; -LARGE_INTEGER TscCalibrationArray[NUM_SAMPLES]; +ULONG64 TscCalibrationArray[NUM_SAMPLES]; UCHAR HalpRtcClockVector = 0xD1; +#define RTC_MODE 6 /* Mode 6 is 1024 Hz */ +#define SAMPLE_FREQENCY ((32768 << 1) >> RTC_MODE) + /* PRIVATE FUNCTIONS *********************************************************/ + +static +ULONG64 +DoLinearRegression( + ULONG XMax, + ULONG64 *ArrayY) +{ + ULONG X, SumXX; + ULONG64 SumXY; + + /* Calculate the sum of the squares of X */ + SumXX = (XMax * (XMax + 1) * (2*XMax + 1)) / 6; + + /* Calculate the sum of the differences to the first value + weighted by x */ + for (SumXY = 0, X = 1; X <= XMax; X++) + { + SumXY += X * (ArrayY[X] - ArrayY[0]); + } + + /* Account for sample frequency */ + SumXY *= SAMPLE_FREQENCY; + + /* Return the quotient of the sums */ + return (SumXY + (SumXX/2)) / SumXX; +} VOID NTAPI @@ -45,9 +74,9 @@ RegisterB = HalpReadCmos(RTC_REGISTER_B); HalpWriteCmos(RTC_REGISTER_B, RegisterB | RTC_REG_B_PI); - /* Modify register A to get 4096 Hz */ + /* Modify register A to RTC_MODE to get SAMPLE_FREQENCY */ RegisterA = HalpReadCmos(RTC_REGISTER_A); - RegisterA = (RegisterA & 0xF0) | 9; + RegisterA = (RegisterA & 0xF0) | RTC_MODE; HalpWriteCmos(RTC_REGISTER_A, RegisterA); /* Save old IDT entry */ @@ -80,8 +109,9 @@ /* Restore old IDT entry */ *IdtPointer = OldIdtEntry; - // do linear regression - + /* Calculate an average, using simplified linear regression */ + HalpCpuClockFrequency.QuadPart = DoLinearRegression(NUM_SAMPLES - 1, + TscCalibrationArray); /* Restore flags */ __writeeflags(Flags); @@ -133,7 +163,7 @@ StartTime = __rdtsc(); /* Calculate the ending time */ - EndTime = StartTime + HalpCpuClockFrequency.QuadPart * MicroSeconds; + EndTime = StartTime + KeGetPcr()->StallScaleFactor * MicroSeconds; /* Loop until time is elapsed */ while (__rdtsc() < EndTime);

13 years, 3 months

[rharabien] 53657: [USER32] - Fix ole32:clipboard winetest regression

by rharabien＠svn.reactos.org

Author: rharabien Date: Fri Sep 9 15:24:14 2011 New Revision: 53657 URL: http://svn.reactos.org/svn/reactos?rev=53657&view=rev Log: [USER32] - Fix ole32:clipboard winetest regression Modified: trunk/reactos/dll/win32/user32/windows/clipboard.c Modified: trunk/reactos/dll/win32/user32/windows/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] Fri Sep 9 15:24:14 2011 @@ -206,6 +206,9 @@ GETCLIPBDATA gcd; hData = NtUserGetClipboardData(uFormat, &gcd); + if (!hData) + return NULL; + if (gcd.fGlobalHandle) { HANDLE hGlobal; @@ -242,7 +245,7 @@ pNewData = IntSynthesizeWideChar(pData, cbData, gcd.uFmtRet == CF_OEMTEXT); break; default: - FIXME("Format: %u\n", uFormat); + FIXME("Format: %u != %u\n", uFormat, gcd.uFmtRet); } /* Is it a global handle? */

13 years, 3 months

[gadamopoulos] 53656: [undocuser.h] - Move definition of UpdatePerUserSystemParameters to undocuser.h

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Fri Sep 9 14:13:04 2011 New Revision: 53656 URL: http://svn.reactos.org/svn/reactos?rev=53656&view=rev Log: [undocuser.h] - Move definition of UpdatePerUserSystemParameters to undocuser.h Modified: trunk/reactos/base/system/userinit/userinit.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/include/reactos/undocuser.h Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Fri Sep 9 14:13:04 2011 @@ -28,6 +28,7 @@ #include <regstr.h> #include <shlobj.h> #include <shlwapi.h> +#include <undocuser.h> #include "resource.h" #include <wine/debug.h> #include <win32k/ntusrtyp.h> @@ -462,11 +463,6 @@ RegCloseKey(hKey); } -DWORD -WINAPI -UpdatePerUserSystemParameters(DWORD dw1, BOOL bEnable); - - static VOID SetUserWallpaper(VOID) { Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Fri Sep 9 14:13:04 2011 @@ -175,11 +175,6 @@ ((Status) == WLX_SAS_ACTION_SHUTDOWN_SLEEP2) || \ ((Status) == WLX_SAS_ACTION_SHUTDOWN_HIBERNATE) \ ) - -/* user32 */ -BOOL WINAPI -UpdatePerUserSystemParameters(DWORD dwUnknown, - DWORD dwReserved); /* environment.c */ BOOL Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Fri Sep 9 14:13:04 2011 @@ -95,6 +95,7 @@ #define SBRG_PAGEDOWNLEFT 4 /* the page down or page left region */ #define SBRG_BOTTOMLEFTBTN 5 /* the bottom or left button */ +BOOL WINAPI UpdatePerUserSystemParameters(DWORD dwReserved, BOOL bEnable); BOOL WINAPI SetLogonNotifyWindow(HWND Wnd, HWINSTA WinSta); BOOL WINAPI KillSystemTimer(HWND,UINT_PTR); UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC);

13 years, 3 months

[rharabien] 53655: [WIN32K] - Rename gQueueKeyStateTable to gKeyStateTable as it has nothing to do with msg queues. They have their own table - Use KS_*_BIT defines instead of magic values

by rharabien＠svn.reactos.org

Author: rharabien Date: Fri Sep 9 13:11:44 2011 New Revision: 53655 URL: http://svn.reactos.org/svn/reactos?rev=53655&view=rev Log: [WIN32K] - Rename gQueueKeyStateTable to gKeyStateTable as it has nothing to do with msg queues. They have their own table - Use KS_*_BIT defines instead of magic values Modified: trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] Fri Sep 9 13:11:44 2011 @@ -28,7 +28,6 @@ #define KBL_RESET 4 /* Key States */ -#define KS_DOWN_MASK 0xc0 #define KS_DOWN_BIT 0x80 #define KS_LOCK_BIT 0x01 /* Lock modifiers */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Fri Sep 9 13:11:44 2011 @@ -15,7 +15,7 @@ DBG_DEFAULT_CHANNEL(UserInput); -extern BYTE gQueueKeyStateTable[]; +extern BYTE gKeyStateTable[]; extern NTSTATUS Win32kInitWin32Thread(PETHREAD Thread); extern PPROCESSINFO ppiScrnSaver; @@ -634,16 +634,16 @@ { if(KeyInput.Flags & KEY_E0) { - gQueueKeyStateTable[VK_RMENU] = 0; + gKeyStateTable[VK_RMENU] = 0; } else { - gQueueKeyStateTable[VK_LMENU] = 0; + gKeyStateTable[VK_LMENU] = 0; } - if (gQueueKeyStateTable[VK_RMENU] == 0 && - gQueueKeyStateTable[VK_LMENU] == 0) + if (gKeyStateTable[VK_RMENU] == 0 && + gKeyStateTable[VK_LMENU] == 0) { - gQueueKeyStateTable[VK_MENU] = 0; + gKeyStateTable[VK_MENU] = 0; } } } @@ -663,15 +663,15 @@ { if(KeyInput.Flags & KEY_E0) { - gQueueKeyStateTable[VK_RMENU] = 0x80; + gKeyStateTable[VK_RMENU] = KS_DOWN_BIT; } else { - gQueueKeyStateTable[VK_LMENU] = 0x80; + gKeyStateTable[VK_LMENU] = KS_DOWN_BIT; bLeftAlt = TRUE; } - gQueueKeyStateTable[VK_MENU] = 0x80; + gKeyStateTable[VK_MENU] = KS_DOWN_BIT; } /* Read the next key before sending this one */ @@ -717,14 +717,14 @@ IntKeyboardSendWinKeyMsg(); else if (fsModifiers == MOD_ALT) { - gQueueKeyStateTable[VK_MENU] = 0; + gKeyStateTable[VK_MENU] = 0; if(bLeftAlt) { - gQueueKeyStateTable[VK_LMENU] = 0; + gKeyStateTable[VK_LMENU] = 0; } else { - gQueueKeyStateTable[VK_RMENU] = 0; + gKeyStateTable[VK_RMENU] = 0; } co_IntKeyboardSendAltKeyMsg(); } @@ -1138,12 +1138,12 @@ Msg.lParam = MAKELPARAM(MousePos.x, MousePos.y); Msg.pt = MousePos; - if (gQueueKeyStateTable[VK_SHIFT] & 0xc0) + if (gKeyStateTable[VK_SHIFT] & KS_DOWN_BIT) { Msg.wParam |= MK_SHIFT; } - if (gQueueKeyStateTable[VK_CONTROL] & 0xc0) + if (gKeyStateTable[VK_CONTROL] & KS_DOWN_BIT) { Msg.wParam |= MK_CONTROL; } @@ -1154,7 +1154,7 @@ } if(mi->dwFlags & MOUSEEVENTF_LEFTDOWN) { - gQueueKeyStateTable[VK_LBUTTON] |= 0xc0; + gKeyStateTable[VK_LBUTTON] |= KS_DOWN_BIT; Msg.message = SwapBtnMsg[0][SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; @@ -1162,7 +1162,7 @@ } else if(mi->dwFlags & MOUSEEVENTF_LEFTUP) { - gQueueKeyStateTable[VK_LBUTTON] &= ~0x80; + gKeyStateTable[VK_LBUTTON] &= ~KS_DOWN_BIT; Msg.message = SwapBtnMsg[1][SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; @@ -1170,7 +1170,7 @@ } if(mi->dwFlags & MOUSEEVENTF_MIDDLEDOWN) { - gQueueKeyStateTable[VK_MBUTTON] |= 0xc0; + gKeyStateTable[VK_MBUTTON] |= KS_DOWN_BIT; Msg.message = WM_MBUTTONDOWN; CurInfo->ButtonsDown |= MK_MBUTTON; Msg.wParam |= CurInfo->ButtonsDown; @@ -1178,7 +1178,7 @@ } else if(mi->dwFlags & MOUSEEVENTF_MIDDLEUP) { - gQueueKeyStateTable[VK_MBUTTON] &= ~0x80; + gKeyStateTable[VK_MBUTTON] &= ~KS_DOWN_BIT; Msg.message = WM_MBUTTONUP; CurInfo->ButtonsDown &= ~MK_MBUTTON; Msg.wParam |= CurInfo->ButtonsDown; @@ -1186,7 +1186,7 @@ } if(mi->dwFlags & MOUSEEVENTF_RIGHTDOWN) { - gQueueKeyStateTable[VK_RBUTTON] |= 0xc0; + gKeyStateTable[VK_RBUTTON] |= KS_DOWN_BIT; Msg.message = SwapBtnMsg[0][!SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[!SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; @@ -1194,7 +1194,7 @@ } else if(mi->dwFlags & MOUSEEVENTF_RIGHTUP) { - gQueueKeyStateTable[VK_RBUTTON] &= ~0x80; + gKeyStateTable[VK_RBUTTON] &= ~KS_DOWN_BIT; Msg.message = SwapBtnMsg[1][!SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[!SwapButtons]; Msg.wParam |= CurInfo->ButtonsDown; @@ -1213,14 +1213,14 @@ Msg.message = WM_XBUTTONDOWN; if(mi->mouseData & XBUTTON1) { - gQueueKeyStateTable[VK_XBUTTON1] |= 0xc0; + gKeyStateTable[VK_XBUTTON1] |= KS_DOWN_BIT; CurInfo->ButtonsDown |= MK_XBUTTON1; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); } if(mi->mouseData & XBUTTON2) { - gQueueKeyStateTable[VK_XBUTTON2] |= 0xc0; + gKeyStateTable[VK_XBUTTON2] |= KS_DOWN_BIT; CurInfo->ButtonsDown |= MK_XBUTTON2; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); @@ -1231,14 +1231,14 @@ Msg.message = WM_XBUTTONUP; if(mi->mouseData & XBUTTON1) { - gQueueKeyStateTable[VK_XBUTTON1] &= ~0x80; + gKeyStateTable[VK_XBUTTON1] &= ~KS_DOWN_BIT; CurInfo->ButtonsDown &= ~MK_XBUTTON1; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); } if(mi->mouseData & XBUTTON2) { - gQueueKeyStateTable[VK_XBUTTON2] &= ~0x80; + gKeyStateTable[VK_XBUTTON2] &= ~KS_DOWN_BIT; CurInfo->ButtonsDown &= ~MK_XBUTTON2; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); @@ -1315,9 +1315,9 @@ if (ki->dwFlags & KEYEVENTF_KEYUP) { Msg.message = WM_KEYUP; - if (((gQueueKeyStateTable[VK_MENU] & 0x80) && + if (((gKeyStateTable[VK_MENU] & KS_DOWN_BIT) && ((wVkStripped == VK_MENU) || (wVkStripped == VK_CONTROL) - || !(gQueueKeyStateTable[VK_CONTROL] & 0x80))) + || !(gKeyStateTable[VK_CONTROL] & KS_DOWN_BIT))) || (wVkStripped == VK_F10)) { if( TrackSysKey == VK_MENU || /* <ALT>-down/<ALT>-up sequence */ @@ -1330,14 +1330,14 @@ else { Msg.message = WM_KEYDOWN; - if (((gQueueKeyStateTable[VK_MENU] & 0x80 || wVkStripped == VK_MENU) && - !(gQueueKeyStateTable[VK_CONTROL] & 0x80 || wVkStripped == VK_CONTROL)) + if (((gKeyStateTable[VK_MENU] & KS_DOWN_BIT || wVkStripped == VK_MENU) && + !(gKeyStateTable[VK_CONTROL] & KS_DOWN_BIT || wVkStripped == VK_CONTROL)) || (wVkStripped == VK_F10)) { Msg.message = WM_SYSKEYDOWN; TrackSysKey = wVkStripped; } - if (!(ki->dwFlags & KEYEVENTF_UNICODE) && gQueueKeyStateTable[wVk] & 0x80) flags |= KF_REPEAT; + if (!(ki->dwFlags & KEYEVENTF_UNICODE) && gKeyStateTable[wVk] & KS_DOWN_BIT) flags |= KF_REPEAT; } if (ki->dwFlags & KEYEVENTF_UNICODE) @@ -1350,17 +1350,17 @@ { if (ki->dwFlags & KEYEVENTF_KEYUP) { - gQueueKeyStateTable[wVk] &= ~0x80; - gQueueKeyStateTable[wVkStripped] = gQueueKeyStateTable[wVkL] | gQueueKeyStateTable[wVkR]; + gKeyStateTable[wVk] &= ~KS_DOWN_BIT; + gKeyStateTable[wVkStripped] = gKeyStateTable[wVkL] | gKeyStateTable[wVkR]; } else { - if (!(gQueueKeyStateTable[wVk] & 0x80)) gQueueKeyStateTable[wVk] ^= 0x01; - gQueueKeyStateTable[wVk] |= 0xc0; - gQueueKeyStateTable[wVkStripped] = gQueueKeyStateTable[wVkL] | gQueueKeyStateTable[wVkR]; - } - - if (gQueueKeyStateTable[VK_MENU] & 0x80) flags |= KF_ALTDOWN; + if (!(gKeyStateTable[wVk] & KS_DOWN_BIT)) gKeyStateTable[wVk] ^= KS_LOCK_BIT; + gKeyStateTable[wVk] |= KS_DOWN_BIT; + gKeyStateTable[wVkStripped] = gKeyStateTable[wVkL] | gKeyStateTable[wVkR]; + } + + if (gKeyStateTable[VK_MENU] & KS_DOWN_BIT) flags |= KF_ALTDOWN; if (wVkStripped == VK_SHIFT) flags &= ~KF_EXTENDED; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Fri Sep 9 13:11:44 2011 @@ -32,7 +32,7 @@ DBG_DEFAULT_CHANNEL(UserKbd); -BYTE gQueueKeyStateTable[256]; +BYTE gKeyStateTable[0x100]; /* FUNCTIONS *****************************************************************/ @@ -42,7 +42,7 @@ NTAPI InitKeyboardImpl(VOID) { - RtlZeroMemory(&gQueueKeyStateTable,0x100); + RtlZeroMemory(&gKeyStateTable, 0x100); return STATUS_SUCCESS; } @@ -69,7 +69,7 @@ if (vk == VK_CAPITAL || vk == VK_NUMLOCK) { if (down) - gQueueKeyStateTable[vk] ^= KS_LOCK_BIT; + gKeyStateTable[vk] ^= KS_LOCK_BIT; } if (vk == VK_SHIFT) @@ -80,46 +80,46 @@ vk = ext ? VK_RMENU : VK_LMENU; if (down) - gQueueKeyStateTable[vk] |= KS_DOWN_BIT; + gKeyStateTable[vk] |= KS_DOWN_BIT; else - gQueueKeyStateTable[vk] &= ~KS_DOWN_MASK; + gKeyStateTable[vk] &= ~KS_DOWN_BIT; if (vk == VK_LSHIFT || vk == VK_RSHIFT) { - if ((gQueueKeyStateTable[VK_LSHIFT] & KS_DOWN_BIT) || - (gQueueKeyStateTable[VK_RSHIFT] & KS_DOWN_BIT)) - { - gQueueKeyStateTable[VK_SHIFT] |= KS_DOWN_BIT; + if ((gKeyStateTable[VK_LSHIFT] & KS_DOWN_BIT) || + (gKeyStateTable[VK_RSHIFT] & KS_DOWN_BIT)) + { + gKeyStateTable[VK_SHIFT] |= KS_DOWN_BIT; } else { - gQueueKeyStateTable[VK_SHIFT] &= ~KS_DOWN_MASK; + gKeyStateTable[VK_SHIFT] &= ~KS_DOWN_BIT; } } if (vk == VK_LCONTROL || vk == VK_RCONTROL) { - if ((gQueueKeyStateTable[VK_LCONTROL] & KS_DOWN_BIT) || - (gQueueKeyStateTable[VK_RCONTROL] & KS_DOWN_BIT)) - { - gQueueKeyStateTable[VK_CONTROL] |= KS_DOWN_BIT; + if ((gKeyStateTable[VK_LCONTROL] & KS_DOWN_BIT) || + (gKeyStateTable[VK_RCONTROL] & KS_DOWN_BIT)) + { + gKeyStateTable[VK_CONTROL] |= KS_DOWN_BIT; } else { - gQueueKeyStateTable[VK_CONTROL] &= ~KS_DOWN_MASK; + gKeyStateTable[VK_CONTROL] &= ~KS_DOWN_BIT; } } if (vk == VK_LMENU || vk == VK_RMENU) { - if ((gQueueKeyStateTable[VK_LMENU] & KS_DOWN_BIT) || - (gQueueKeyStateTable[VK_RMENU] & KS_DOWN_BIT)) - { - gQueueKeyStateTable[VK_MENU] |= KS_DOWN_BIT; + if ((gKeyStateTable[VK_LMENU] & KS_DOWN_BIT) || + (gKeyStateTable[VK_RMENU] & KS_DOWN_BIT)) + { + gKeyStateTable[VK_MENU] |= KS_DOWN_BIT; } else { - gQueueKeyStateTable[VK_MENU] &= ~KS_DOWN_MASK; + gKeyStateTable[VK_MENU] &= ~KS_DOWN_BIT; } } } @@ -338,8 +338,8 @@ if( key < 0x100 ) { - ret = ((DWORD)(gQueueKeyStateTable[key] & KS_DOWN_BIT) << 8 ) | - (gQueueKeyStateTable[key] & KS_LOCK_BIT); + ret = ((DWORD)(gKeyStateTable[key] & KS_DOWN_BIT) << 8 ) | + (gKeyStateTable[key] & KS_LOCK_BIT); if ( ret & 0x8000 ) ret |= 0xFFFF0000; // If down, windows returns 0xFFFF8000. } @@ -359,19 +359,19 @@ if (gpsi->aiSysMet[SM_SWAPBUTTON]) { - if (gQueueKeyStateTable[VK_RBUTTON] & 0x80) ret |= MK_LBUTTON; - if (gQueueKeyStateTable[VK_LBUTTON] & 0x80) ret |= MK_RBUTTON; + if (gKeyStateTable[VK_RBUTTON] & KS_DOWN_BIT) ret |= MK_LBUTTON; + if (gKeyStateTable[VK_LBUTTON] & KS_DOWN_BIT) ret |= MK_RBUTTON; } else { - if (gQueueKeyStateTable[VK_LBUTTON] & 0x80) ret |= MK_LBUTTON; - if (gQueueKeyStateTable[VK_RBUTTON] & 0x80) ret |= MK_RBUTTON; + if (gKeyStateTable[VK_LBUTTON] & KS_DOWN_BIT) ret |= MK_LBUTTON; + if (gKeyStateTable[VK_RBUTTON] & KS_DOWN_BIT) ret |= MK_RBUTTON; } - if (gQueueKeyStateTable[VK_MBUTTON] & 0x80) ret |= MK_MBUTTON; - if (gQueueKeyStateTable[VK_SHIFT] & 0x80) ret |= MK_SHIFT; - if (gQueueKeyStateTable[VK_CONTROL] & 0x80) ret |= MK_CONTROL; - if (gQueueKeyStateTable[VK_XBUTTON1] & 0x80) ret |= MK_XBUTTON1; - if (gQueueKeyStateTable[VK_XBUTTON2] & 0x80) ret |= MK_XBUTTON2; + if (gKeyStateTable[VK_MBUTTON] & KS_DOWN_BIT) ret |= MK_MBUTTON; + if (gKeyStateTable[VK_SHIFT] & KS_DOWN_BIT) ret |= MK_SHIFT; + if (gKeyStateTable[VK_CONTROL] & KS_DOWN_BIT) ret |= MK_CONTROL; + if (gKeyStateTable[VK_XBUTTON1] & KS_DOWN_BIT) ret |= MK_XBUTTON1; + if (gKeyStateTable[VK_XBUTTON2] & KS_DOWN_BIT) ret |= MK_XBUTTON2; return ret; } @@ -443,7 +443,7 @@ UState = ToUnicodeInner( lpMsg->wParam, HIWORD(lpMsg->lParam) & 0xff, - gQueueKeyStateTable, + gKeyStateTable, wp, 2, 0, @@ -850,7 +850,7 @@ /* arty -- handle numpad -- On real windows, the actual key produced * by the messaging layer is different based on the state of numlock. */ - ModifierBits = ModBits(KeyboardLayout,gQueueKeyStateTable); + ModifierBits = ModBits(KeyboardLayout,gKeyStateTable); /* Get the raw scan code, so we can look up whether the key is a numpad * key @@ -934,7 +934,7 @@ } /* We need to unset SYSKEYDOWN if the ALT key is an ALT+Gr */ - if( gQueueKeyStateTable[VK_RMENU] & KS_DOWN_BIT ) + if( gKeyStateTable[VK_RMENU] & KS_DOWN_BIT ) { if( Msg->message == WM_SYSKEYDOWN ) Msg->message = WM_KEYDOWN;

13 years, 3 months

[rharabien] 53654: [WIN32K] - Rewrite co_IntTranslateAccelerator to make it readable - Add back support for 0x80 flag as an accelerator table end

by rharabien＠svn.reactos.org

Author: rharabien Date: Fri Sep 9 13:09:28 2011 New Revision: 53654 URL: http://svn.reactos.org/svn/reactos?rev=53654&view=rev Log: [WIN32K] - Rewrite co_IntTranslateAccelerator to make it readable - Add back support for 0x80 flag as an accelerator table end Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c [iso-8859-1] Fri Sep 9 13:09:28 2011 @@ -12,6 +12,7 @@ * Copyright 1993 Martin Ayotte * Copyright 1994 Alexandre Julliard * Copyright 1997 Morten Welinder + * Copyright 2011 Rafal Harabien * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +33,9 @@ #include <win32k.h> +#define FVIRT_TBL_END 0x80 +#define FVIRT_MASK 0x7F + DBG_DEFAULT_CHANNEL(UserAccel); UINT FASTCALL IntFindSubMenu(HMENU *hMenu, HMENU hSubTarget ); @@ -50,7 +54,7 @@ return NULL; } - Accel= UserGetObject(gHandleTable, hAccel, otAccel); + Accel= UserGetObject(gHandleTable, hAccel, otAccel); if (!Accel) { EngSetLastError(ERROR_INVALID_ACCEL_HANDLE); @@ -65,216 +69,133 @@ BOOLEAN FASTCALL co_IntTranslateAccelerator( PWND Window, - UINT message, - WPARAM wParam, - LPARAM lParam, - BYTE fVirt, - WORD key, - WORD cmd) -{ - INT mask = 0; - UINT mesg = 0; + CONST MSG *pMsg, + CONST ACCEL *pAccel) +{ + BOOL bFound = FALSE; + UINT Mask = 0, nPos; HWND hWnd; + HMENU hMenu, hSubMenu; + PMENU_OBJECT MenuObject, SubMenu; + PMENU_ITEM MenuItem; ASSERT_REFS_CO(Window); hWnd = Window->head.h; TRACE("IntTranslateAccelerator(hwnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x)\n", - Window->head.h, message, wParam, lParam, fVirt, key, cmd); - - if (wParam != key) - { - return FALSE; - } - - TRACE("NtUserGetKeyState(VK_CONTROL) = 0x%x\n",UserGetKeyState(VK_CONTROL)); - TRACE("NtUserGetKeyState(VK_MENU) = 0x%x\n",UserGetKeyState(VK_MENU)); - TRACE("NtUserGetKeyState(VK_SHIFT) = 0x%x\n",UserGetKeyState(VK_SHIFT)); - - if (UserGetKeyState(VK_CONTROL) & 0x8000) mask |= FCONTROL; - if (UserGetKeyState(VK_MENU) & 0x8000) mask |= FALT; - if (UserGetKeyState(VK_SHIFT) & 0x8000) mask |= FSHIFT; - TRACE("Mask 0x%x\n",mask); - - if (message == WM_CHAR || message == WM_SYSCHAR) - { - if ( !(fVirt & FVIRTKEY) && (mask & FALT) == (fVirt & FALT) ) - { - TRACE("found accel for WM_CHAR: ('%c')\n", LOWORD(wParam) & 0xff); - goto found; - } + hWnd, pMsg->message, pMsg->wParam, pMsg->lParam, pAccel->fVirt, pAccel->key, pAccel->cmd); + + if (UserGetKeyState(VK_CONTROL) & 0x8000) Mask |= FCONTROL; + if (UserGetKeyState(VK_MENU) & 0x8000) Mask |= FALT; // FIXME: VK_LMENU (msg winetest!) + if (UserGetKeyState(VK_SHIFT) & 0x8000) Mask |= FSHIFT; + TRACE("Mask 0x%x\n", Mask); + + if (pAccel->fVirt & FVIRTKEY) + { + /* This is a virtual key. Process WM_(SYS)KEYDOWN messages. */ + if (pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN) + { + /* Check virtual key and SHIFT, CTRL, LALT state */ + if (pMsg->wParam == pAccel->key && Mask == (pAccel->fVirt & (FSHIFT | FCONTROL | FALT))) + { + bFound = TRUE; + } + } } else { - if (fVirt & FVIRTKEY) - { - TRACE("found accel for virt_key %04x (scan %04x)\n", - wParam, 0xff & HIWORD(lParam)); - - if (mask == (fVirt & (FSHIFT | FCONTROL | FALT))) goto found; - TRACE("but incorrect SHIFT/CTRL/ALT-state mask %x fVirt %x\n",mask,fVirt); - } - else - { - if (!(lParam & 0x01000000)) /* no special_key */ - { - if ((fVirt & FALT) && (lParam & 0x20000000)) - { /* ^^ ALT pressed */ - TRACE("found accel for Alt-%c\n", LOWORD(wParam) & 0xff); - goto found; - } - } - } - } - - TRACE("IntTranslateAccelerator(hwnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x) = FALSE\n", - Window->head.h, message, wParam, lParam, fVirt, key, cmd); - - return FALSE; - -found: - if (message == WM_KEYUP || message == WM_SYSKEYUP) - mesg = 1; - else - { - HMENU hMenu, hSubMenu, hSysMenu; - UINT uSysStat = (UINT)-1, uStat = (UINT)-1, nPos; - PMENU_OBJECT MenuObject, SubMenu; - PMENU_ITEM MenuItem; - - hMenu = (Window->style & WS_CHILD) ? 0 : (HMENU)Window->IDMenu; - hSysMenu = Window->SystemMenu; - MenuObject = IntGetMenuObject(Window->SystemMenu); - - /* find menu item and ask application to initialize it */ - /* 1. in the system menu */ - hSubMenu = hSysMenu; - if (MenuObject) - { - nPos = IntGetMenuItemByFlag( MenuObject, - cmd, - MF_BYCOMMAND, - &SubMenu, - &MenuItem, - NULL); - - if (MenuItem && (nPos != (UINT)-1)) - { - hSubMenu = MenuItem->hSubMenu; - - if (IntGetCaptureWindow()) - mesg = 2; - if (Window->style & WS_DISABLED) - mesg = 3; - else - { - co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hSysMenu, 0L); - if (hSubMenu != hSysMenu) - { - nPos = IntFindSubMenu(&hSysMenu, hSubMenu); - TRACE("hSysMenu = %p, hSubMenu = %p, nPos = %d\n", hSysMenu, hSubMenu, nPos); - co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, TRUE)); - } - uSysStat = IntGetMenuState(IntGetSubMenu(hSysMenu, 0), cmd, MF_BYCOMMAND); - } - } - else /* 2. in the window's menu */ - { - MenuObject = IntGetMenuObject(hMenu); - hSubMenu = hMenu; - if (MenuObject) - { - nPos = IntGetMenuItemByFlag( MenuObject, - cmd, - MF_BYCOMMAND, - &SubMenu, - &MenuItem, - NULL); - - if (MenuItem && (nPos != (UINT)-1)) - { - if (IntGetCaptureWindow()) - mesg = 2; - if (Window->style & WS_DISABLED) - mesg = 3; - else - { - co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hMenu, 0L); - if (hSubMenu != hMenu) - { - nPos = IntFindSubMenu(&hMenu, hSubMenu); - TRACE("hMenu = %p, hSubMenu = %p, nPos = %d\n", hMenu, hSubMenu, nPos); - co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, FALSE)); - } - uStat = IntGetMenuState(hMenu, cmd, MF_BYCOMMAND); - } - } - } - } - } - if (mesg == 0) - { - if (uSysStat != (UINT)-1) - { - if (uSysStat & (MF_DISABLED|MF_GRAYED)) - mesg=4; - else - mesg=WM_SYSCOMMAND; - } - else - { - if (uStat != (UINT)-1) - { - if (Window->style & WS_MINIMIZE) - mesg=5; - else - { - if (uStat & (MF_DISABLED|MF_GRAYED)) - mesg=6; - else - mesg=WM_COMMAND; - } - } - else - { - mesg=WM_COMMAND; - } - } - } - } - - if (mesg == WM_COMMAND) - { - TRACE(", sending WM_COMMAND, wParam=%0x\n", 0x10000 | cmd); - co_IntSendMessage(Window->head.h, mesg, 0x10000 | cmd, 0L); - } - else if (mesg == WM_SYSCOMMAND) - { - TRACE(", sending WM_SYSCOMMAND, wParam=%0x\n", cmd); - co_IntSendMessage(Window->head.h, mesg, cmd, 0x00010000L); - } - else - { - /* some reasons for NOT sending the WM_{SYS}COMMAND message: - * #0: unknown (please report!) - * #1: for WM_KEYUP,WM_SYSKEYUP - * #2: mouse is captured - * #3: window is disabled - * #4: it's a disabled system menu option - * #5: it's a menu option, but window is iconic - * #6: it's a menu option, but disabled - */ - ERR(", but won't send WM_{SYS}COMMAND, reason is #%d\n", mesg); - if (mesg == 0) - { - ERR(" unknown reason - please report!"); - } - } - - TRACE("IntTranslateAccelerator(hWnd %x, message %x, wParam %x, lParam %x, fVirt %d, key %x, cmd %x) = TRUE\n", - Window->head.h, message, wParam, lParam, fVirt, key, cmd); - + /* This is a char code. Process WM_(SYS)CHAR messages. */ + if (pMsg->message == WM_CHAR || pMsg->message == WM_SYSCHAR) + { + /* Check char code and LALT state only */ + if (pMsg->wParam == pAccel->key && (Mask & FALT) == (pAccel->fVirt & FALT)) + { + bFound = TRUE; + } + } + } + + if (!bFound) + { + /* Don't translate this msg */ + TRACE("IntTranslateAccelerator returns FALSE\n"); + return FALSE; + } + + /* Check if accelerator is associated with menu command */ + hMenu = (Window->style & WS_CHILD) ? 0 : (HMENU)Window->IDMenu; + hSubMenu = NULL; + MenuObject = IntGetMenuObject(hMenu); + if (MenuObject) + { + nPos = IntGetMenuItemByFlag(MenuObject, + pAccel->cmd, + MF_BYCOMMAND, + &SubMenu, + &MenuItem, + NULL); + if (nPos != (UINT)-1) + hSubMenu = MenuItem->hSubMenu; + else + hMenu = NULL; + } + if (!hMenu) + { + /* Check system menu now */ + hMenu = Window->SystemMenu; + hSubMenu = hMenu; /* system menu is a popup menu */ + MenuObject = IntGetMenuObject(hMenu); + if (MenuObject) + { + nPos = IntGetMenuItemByFlag(MenuObject, + pAccel->cmd, + MF_BYCOMMAND, + &SubMenu, + &MenuItem, + NULL); + if (nPos != (UINT)-1) + hSubMenu = MenuItem->hSubMenu; + else + hMenu = NULL; + } + } + + /* If this is a menu item, there is no capturing enabled and + window is not disabled, send WM_INITMENU */ + if (hMenu && !IntGetCaptureWindow()) + { + co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hMenu, 0L); + if (hSubMenu) + { + nPos = IntFindSubMenu(&hMenu, hSubMenu); + TRACE("hSysMenu = %p, hSubMenu = %p, nPos = %d\n", hMenu, hSubMenu, nPos); + co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu, MAKELPARAM(nPos, TRUE)); + } + } + + /* Don't send any message if: + - window is disabled + - menu item is disabled + - this is window menu and window is minimized */ + if (!(Window->style & WS_DISABLED) && + !(hMenu && IntGetMenuState(hMenu, pAccel->cmd, MF_BYCOMMAND) & (MF_DISABLED|MF_GRAYED)) && + !(hMenu && hMenu == (HMENU)Window->IDMenu && !(Window->style & WS_MINIMIZED))) + { + /* If this is system menu item, send WM_SYSCOMMAND, otherwise send WM_COMMAND */ + if (hMenu && hMenu == Window->SystemMenu) + { + TRACE("Sending WM_SYSCOMMAND, wParam=%0x\n", pAccel->cmd); + co_IntSendMessage(hWnd, WM_SYSCOMMAND, pAccel->cmd, 0x00010000L); + } + else + { + TRACE("Sending WM_COMMAND, wParam=%0x\n", 0x10000 | pAccel->cmd); + co_IntSendMessage(hWnd, WM_COMMAND, 0x10000 | pAccel->cmd, 0L); + } + } + + TRACE("IntTranslateAccelerator returns TRUE\n"); return TRUE; } @@ -299,7 +220,6 @@ Accel = UserGetAccelObject(hAccel); if (!Accel) { - EngSetLastError(ERROR_INVALID_ACCEL_HANDLE); RETURN(0); } @@ -336,7 +256,7 @@ RETURN(Ret); CLEANUP: - TRACE("Leave NtUserCopyAcceleratorTable, ret=%i\n",_ret_); + TRACE("Leave NtUserCopyAcceleratorTable, ret=%i\n", _ret_); UserLeave(); END_CLEANUP; } @@ -387,7 +307,7 @@ for (Index = 0; Index < EntriesCount; Index++) { - Accel->Table[Index].fVirt = Entries[Index].fVirt & 0x7F; + Accel->Table[Index].fVirt = Entries[Index].fVirt & FVIRT_MASK; if(Accel->Table[Index].fVirt & FVIRTKEY) { Accel->Table[Index].key = Entries[Index].key; @@ -425,7 +345,7 @@ CLEANUP: TRACE("Leave NtUserCreateAcceleratorTable(Entries %p, EntriesCount %d) = %x\n", - Entries, EntriesCount,_ret_); + Entries, EntriesCount, _ret_); UserLeave(); END_CLEANUP; } @@ -485,9 +405,8 @@ hWnd, hAccel, pUnsafeMessage); UserEnterShared(); - if (pUnsafeMessage == NULL) - { - SetLastNtError(STATUS_INVALID_PARAMETER); + if (hWnd == NULL) + { RETURN( 0); } @@ -504,21 +423,23 @@ _SEH2_END; if ((Message.message != WM_KEYDOWN) && - (Message.message != WM_SYSKEYDOWN) && - (Message.message != WM_SYSCHAR) && - (Message.message != WM_CHAR)) + (Message.message != WM_SYSKEYDOWN) && + (Message.message != WM_SYSCHAR) && + (Message.message != WM_CHAR)) { RETURN( 0); } - if (!(Accel = UserGetAccelObject(hAccel))) + Accel = UserGetAccelObject(hAccel); + if (!Accel) { RETURN( 0); } UserRefObjectCo(Accel, &AccelRef); - if (!(Window = UserGetWindowObject(hWnd))) + Window = UserGetWindowObject(hWnd); + if (!Window) { RETURN( 0); } @@ -529,14 +450,15 @@ for (i = 0; i < Accel->Count; i++) { - if (co_IntTranslateAccelerator(Window, Message.message, Message.wParam, Message.lParam, - Accel->Table[i].fVirt, Accel->Table[i].key, - Accel->Table[i].cmd)) + if (co_IntTranslateAccelerator(Window, &Message, &Accel->Table[i])) { - TRACE("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p) = %i end\n", - hWnd, hAccel, pUnsafeMessage, 1); + TRACE("NtUserTranslateAccelerator returns 1\n"); RETURN( 1); } + + /* Undocumented feature... */ + if (Accel->Table[i].fVirt & FVIRT_TBL_END) + break; } RETURN( 0); @@ -545,8 +467,7 @@ if (Window) UserDerefObjectCo(Window); if (Accel) UserDerefObjectCo(Accel); - TRACE("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p) = %i end\n", - hWnd, hAccel, pUnsafeMessage, 0); + TRACE("NtUserTranslateAccelerator returns 0\n"); UserLeave(); END_CLEANUP; }

13 years, 3 months

[akhaldi] 53653: [SHELL32] * Reintegrate the c++ shell32 branch. Exemplary team-work.. kudos ! * Better code quality, more tests run with less failures... and more. * Dedicated to everyone who help...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Sep 9 10:55:09 2011 New Revision: 53653 URL: http://svn.reactos.org/svn/reactos?rev=53653&view=rev Log: [SHELL32] * Reintegrate the c++ shell32 branch. Exemplary team-work.. kudos ! * Better code quality, more tests run with less failures... and more. * Dedicated to everyone who helped ;) Added: trunk/reactos/dll/win32/shell32/ (props changed) - copied from r53651, branches/shell32_new-bringup/dll/win32/shell32/ trunk/reactos/dll/win32/shell32/CMakeLists.txt - copied, changed from r53651, branches/shell32_new-bringup/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/avi_res.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/avi_res.rc trunk/reactos/dll/win32/shell32/bitmap_res.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/bitmap_res.rc trunk/reactos/dll/win32/shell32/cpanel.h - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/cpanel.h trunk/reactos/dll/win32/shell32/debughlp.h - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/debughlp.h trunk/reactos/dll/win32/shell32/enumidlist.h - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/enumidlist.h trunk/reactos/dll/win32/shell32/icon_res.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/icon_res.rc trunk/reactos/dll/win32/shell32/lang/ (props changed) - copied from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/pidl.h - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/pidl.h trunk/reactos/dll/win32/shell32/precomp.h - copied, changed from r53651, branches/shell32_new-bringup/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/res/ (props changed) - copied from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/ trunk/reactos/dll/win32/shell32/res/avis/ (props changed) - copied from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/avis/ trunk/reactos/dll/win32/shell32/res/avis/160+161+167+168.avi - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/avis/160+161+167+168.avi trunk/reactos/dll/win32/shell32/res/avis/162.avi - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/avis/162.avi trunk/reactos/dll/win32/shell32/res/avis/163.avi - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/avis/163.avi trunk/reactos/dll/win32/shell32/res/avis/164+169.avi - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/avis/164+169.avi trunk/reactos/dll/win32/shell32/res/avis/170.avi - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/avis/170.avi trunk/reactos/dll/win32/shell32/res/avis/Licence/ (props changed) - copied from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/avis/Licence/ trunk/reactos/dll/win32/shell32/res/avis/Licence/COPYING - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/avis/Licence/COPYING trunk/reactos/dll/win32/shell32/res/avis/Licence/Tango.txt - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/avis/Licence/Tango.txt trunk/reactos/dll/win32/shell32/res/bitmaps/ (props changed) - copied from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/bitmaps/ trunk/reactos/dll/win32/shell32/res/bitmaps/204.bmp - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/bitmaps/204.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/205.bmp - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/bitmaps/205.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/206.bmp - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/bitmaps/206.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/207.bmp - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/bitmaps/207.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/225.bmp - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/bitmaps/225.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/226.bmp - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/bitmaps/226.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/227.bmp - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/bitmaps/227.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/228.bmp - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/bitmaps/228.bmp trunk/reactos/dll/win32/shell32/res/bitmaps/shell_about_logo_24bpp.bmp - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/bitmaps/shell_about_logo_24bpp.bmp trunk/reactos/dll/win32/shell32/res/icons/ (props changed) - copied from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/ trunk/reactos/dll/win32/shell32/res/icons/1.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/1.ico trunk/reactos/dll/win32/shell32/res/icons/10.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/10.ico trunk/reactos/dll/win32/shell32/res/icons/1001.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/1001.ico trunk/reactos/dll/win32/shell32/res/icons/1004.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/1004.ico trunk/reactos/dll/win32/shell32/res/icons/11.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/11.ico trunk/reactos/dll/win32/shell32/res/icons/12.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/12.ico trunk/reactos/dll/win32/shell32/res/icons/13.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/13.ico trunk/reactos/dll/win32/shell32/res/icons/134.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/134.ico trunk/reactos/dll/win32/shell32/res/icons/135.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/135.ico trunk/reactos/dll/win32/shell32/res/icons/137.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/137.ico trunk/reactos/dll/win32/shell32/res/icons/138.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/138.ico trunk/reactos/dll/win32/shell32/res/icons/14.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/14.ico trunk/reactos/dll/win32/shell32/res/icons/15.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/15.ico trunk/reactos/dll/win32/shell32/res/icons/151.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/151.ico trunk/reactos/dll/win32/shell32/res/icons/152.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/152.ico trunk/reactos/dll/win32/shell32/res/icons/153.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/153.ico trunk/reactos/dll/win32/shell32/res/icons/154.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/154.ico trunk/reactos/dll/win32/shell32/res/icons/155.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/155.ico trunk/reactos/dll/win32/shell32/res/icons/156.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/156.ico trunk/reactos/dll/win32/shell32/res/icons/157.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/157.ico trunk/reactos/dll/win32/shell32/res/icons/16.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/16.ico trunk/reactos/dll/win32/shell32/res/icons/160.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/160.ico trunk/reactos/dll/win32/shell32/res/icons/161.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/161.ico trunk/reactos/dll/win32/shell32/res/icons/16710.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/16710.ico trunk/reactos/dll/win32/shell32/res/icons/16715.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/16715.ico trunk/reactos/dll/win32/shell32/res/icons/16717.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/16717.ico trunk/reactos/dll/win32/shell32/res/icons/16718.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/16718.ico trunk/reactos/dll/win32/shell32/res/icons/16721.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/16721.ico trunk/reactos/dll/win32/shell32/res/icons/17.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/17.ico trunk/reactos/dll/win32/shell32/res/icons/1700.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/1700.ico trunk/reactos/dll/win32/shell32/res/icons/172.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/172.ico trunk/reactos/dll/win32/shell32/res/icons/173.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/173.ico trunk/reactos/dll/win32/shell32/res/icons/18.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/18.ico trunk/reactos/dll/win32/shell32/res/icons/182.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/182.ico trunk/reactos/dll/win32/shell32/res/icons/183.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/183.ico trunk/reactos/dll/win32/shell32/res/icons/184.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/184.ico trunk/reactos/dll/win32/shell32/res/icons/185.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/185.ico trunk/reactos/dll/win32/shell32/res/icons/186.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/186.ico trunk/reactos/dll/win32/shell32/res/icons/187.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/187.ico trunk/reactos/dll/win32/shell32/res/icons/19.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/19.ico trunk/reactos/dll/win32/shell32/res/icons/191.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/191.ico trunk/reactos/dll/win32/shell32/res/icons/192.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/192.ico trunk/reactos/dll/win32/shell32/res/icons/2.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/2.ico trunk/reactos/dll/win32/shell32/res/icons/20.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/20.ico trunk/reactos/dll/win32/shell32/res/icons/21.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/21.ico trunk/reactos/dll/win32/shell32/res/icons/210.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/210.ico trunk/reactos/dll/win32/shell32/res/icons/22.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/22.ico trunk/reactos/dll/win32/shell32/res/icons/220.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/220.ico trunk/reactos/dll/win32/shell32/res/icons/221.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/221.ico trunk/reactos/dll/win32/shell32/res/icons/222.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/222.ico trunk/reactos/dll/win32/shell32/res/icons/224.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/224.ico trunk/reactos/dll/win32/shell32/res/icons/225.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/225.ico trunk/reactos/dll/win32/shell32/res/icons/226.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/226.ico trunk/reactos/dll/win32/shell32/res/icons/228.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/228.ico trunk/reactos/dll/win32/shell32/res/icons/23.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/23.ico trunk/reactos/dll/win32/shell32/res/icons/233.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/233.ico trunk/reactos/dll/win32/shell32/res/icons/235.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/235.ico trunk/reactos/dll/win32/shell32/res/icons/236.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/236.ico trunk/reactos/dll/win32/shell32/res/icons/237.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/237.ico trunk/reactos/dll/win32/shell32/res/icons/238.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/238.ico trunk/reactos/dll/win32/shell32/res/icons/24.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/24.ico trunk/reactos/dll/win32/shell32/res/icons/240.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/240.ico trunk/reactos/dll/win32/shell32/res/icons/245.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/245.ico trunk/reactos/dll/win32/shell32/res/icons/246.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/246.ico trunk/reactos/dll/win32/shell32/res/icons/248.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/248.ico trunk/reactos/dll/win32/shell32/res/icons/249.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/249.ico trunk/reactos/dll/win32/shell32/res/icons/25.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/25.ico trunk/reactos/dll/win32/shell32/res/icons/250.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/250.ico trunk/reactos/dll/win32/shell32/res/icons/252.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/252.ico trunk/reactos/dll/win32/shell32/res/icons/254.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/254.ico trunk/reactos/dll/win32/shell32/res/icons/255.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/255.ico trunk/reactos/dll/win32/shell32/res/icons/263.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/263.ico trunk/reactos/dll/win32/shell32/res/icons/265.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/265.ico trunk/reactos/dll/win32/shell32/res/icons/268.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/268.ico trunk/reactos/dll/win32/shell32/res/icons/269.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/269.ico trunk/reactos/dll/win32/shell32/res/icons/270.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/270.ico trunk/reactos/dll/win32/shell32/res/icons/271.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/271.ico trunk/reactos/dll/win32/shell32/res/icons/277.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/277.ico trunk/reactos/dll/win32/shell32/res/icons/279.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/279.ico trunk/reactos/dll/win32/shell32/res/icons/28.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/28.ico trunk/reactos/dll/win32/shell32/res/icons/289.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/289.ico trunk/reactos/dll/win32/shell32/res/icons/29.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/29.ico trunk/reactos/dll/win32/shell32/res/icons/290.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/290.ico trunk/reactos/dll/win32/shell32/res/icons/291.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/291.ico trunk/reactos/dll/win32/shell32/res/icons/292.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/292.ico trunk/reactos/dll/win32/shell32/res/icons/293.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/293.ico trunk/reactos/dll/win32/shell32/res/icons/294.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/294.ico trunk/reactos/dll/win32/shell32/res/icons/295.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/295.ico trunk/reactos/dll/win32/shell32/res/icons/296.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/296.ico trunk/reactos/dll/win32/shell32/res/icons/297.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/297.ico trunk/reactos/dll/win32/shell32/res/icons/298.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/298.ico trunk/reactos/dll/win32/shell32/res/icons/299.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/299.ico trunk/reactos/dll/win32/shell32/res/icons/3.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/3.ico trunk/reactos/dll/win32/shell32/res/icons/30.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/30.ico trunk/reactos/dll/win32/shell32/res/icons/302.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/302.ico trunk/reactos/dll/win32/shell32/res/icons/304.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/304.ico trunk/reactos/dll/win32/shell32/res/icons/305.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/305.ico trunk/reactos/dll/win32/shell32/res/icons/309.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/309.ico trunk/reactos/dll/win32/shell32/res/icons/315.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/315.ico trunk/reactos/dll/win32/shell32/res/icons/317.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/317.ico trunk/reactos/dll/win32/shell32/res/icons/318.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/318.ico trunk/reactos/dll/win32/shell32/res/icons/319.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/319.ico trunk/reactos/dll/win32/shell32/res/icons/32.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/32.ico trunk/reactos/dll/win32/shell32/res/icons/322.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/322.ico trunk/reactos/dll/win32/shell32/res/icons/323.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/323.ico trunk/reactos/dll/win32/shell32/res/icons/324.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/324.ico trunk/reactos/dll/win32/shell32/res/icons/325.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/325.ico trunk/reactos/dll/win32/shell32/res/icons/326.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/326.ico trunk/reactos/dll/win32/shell32/res/icons/327.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/327.ico trunk/reactos/dll/win32/shell32/res/icons/328.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/328.ico trunk/reactos/dll/win32/shell32/res/icons/329.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/329.ico trunk/reactos/dll/win32/shell32/res/icons/33.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/33.ico trunk/reactos/dll/win32/shell32/res/icons/330.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/330.ico trunk/reactos/dll/win32/shell32/res/icons/35.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/35.ico trunk/reactos/dll/win32/shell32/res/icons/36.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/36.ico trunk/reactos/dll/win32/shell32/res/icons/37.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/37.ico trunk/reactos/dll/win32/shell32/res/icons/38.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/38.ico trunk/reactos/dll/win32/shell32/res/icons/39.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/39.ico trunk/reactos/dll/win32/shell32/res/icons/4.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/4.ico trunk/reactos/dll/win32/shell32/res/icons/40.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/40.ico trunk/reactos/dll/win32/shell32/res/icons/41.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/41.ico trunk/reactos/dll/win32/shell32/res/icons/44.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/44.ico trunk/reactos/dll/win32/shell32/res/icons/45.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/45.ico trunk/reactos/dll/win32/shell32/res/icons/46.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/46.ico trunk/reactos/dll/win32/shell32/res/icons/47.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/47.ico trunk/reactos/dll/win32/shell32/res/icons/48.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/48.ico trunk/reactos/dll/win32/shell32/res/icons/5.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/5.ico trunk/reactos/dll/win32/shell32/res/icons/54.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/54.ico trunk/reactos/dll/win32/shell32/res/icons/6.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/6.ico trunk/reactos/dll/win32/shell32/res/icons/7.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/7.ico trunk/reactos/dll/win32/shell32/res/icons/8.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/8.ico trunk/reactos/dll/win32/shell32/res/icons/8240.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/8240.ico trunk/reactos/dll/win32/shell32/res/icons/9.ico - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/9.ico trunk/reactos/dll/win32/shell32/res/icons/Icon_Licence/ (props changed) - copied from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/Icon_Licence/ trunk/reactos/dll/win32/shell32/res/icons/Icon_Licence/COPYING - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/Icon_Licence/COPYING trunk/reactos/dll/win32/shell32/res/icons/Icon_Licence/Tango.txt - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/res/icons/Icon_Licence/Tango.txt trunk/reactos/dll/win32/shell32/shell32.rbuild - copied, changed from r53651, branches/shell32_new-bringup/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/shell32.rc trunk/reactos/dll/win32/shell32/shell32.spec - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/shell32.spec trunk/reactos/dll/win32/shell32/shell32_main.h - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shellfolder.h - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/shellfolder.h trunk/reactos/dll/win32/shell32/shfldr.h - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/shfldr.h trunk/reactos/dll/win32/shell32/shobjidl_local.idl - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/shobjidl_local.idl trunk/reactos/dll/win32/shell32/shresdef.h - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/shresdef.h trunk/reactos/dll/win32/shell32/undocshell.h - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/undocshell.h trunk/reactos/dll/win32/shell32/version.h - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/version.h trunk/reactos/dll/win32/shell32/version.rc - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/version.rc trunk/reactos/dll/win32/shell32/xdg.h - copied unchanged from r53651, branches/shell32_new-bringup/dll/win32/shell32/xdg.h Modified: trunk/reactos/ (props changed) trunk/reactos/dll/win32/shell32/res/Copy of rgs/ (props changed) trunk/reactos/dll/win32/shell32/res/rgs/ (props changed) trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp trunk/reactos/dll/win32/shell32/shfldr_mycomp.cpp trunk/reactos/dll/win32/shell32/shlexec.cpp trunk/reactos/dll/win32/shell32/shlfileop.cpp trunk/reactos/dll/win32/shell32/shlview.cpp trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/psdk/appmgmt.h trunk/reactos/include/psdk/shlguid.h trunk/reactos/include/psdk/shlguid_undoc.h trunk/reactos/include/psdk/shlobj.h trunk/reactos/include/psdk/shlobj_undoc.h trunk/reactos/include/psdk/shlwapi.h trunk/reactos/include/psdk/shlwapi_undoc.h trunk/reactos/include/reactos/wine/commctrl.h trunk/reactos/lib/atl/atlbase.h Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 9 10:55:09 2011 @@ -8,4 +8,5 @@ /branches/reactx/reactos:49994-49995 /branches/ros-amd64-bringup:36852 /branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/branches/shell32_new-bringup:51893-53652 /branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 Propchange: trunk/reactos/dll/win32/shell32/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Sep 9 10:55:09 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/shell32/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/shell32/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/shell32/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: trunk/reactos/dll/win32/shell32/CMakeLists.txt (from r53651, branches/shell32_new-bringup/dll/win32/shell32/CMakeLists.txt) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -1,4 +1,3 @@ -set_unicode() set_cpp() remove_definitions(-D_WIN32_WINNT=0x502) @@ -76,13 +75,15 @@ add_library(shell32 SHARED ${SOURCE}) -set_module_type(shell32 win32dll) +set_module_type(shell32 win32dll UNICODE) target_link_libraries(shell32 atlnew wine uuid recyclebin) + +add_delay_importlibs(shell32 ole32 version) add_importlibs(shell32 advapi32 @@ -91,8 +92,6 @@ comctl32 comdlg32 shlwapi - ole32 - version devmgr winspool winmm Propchange: trunk/reactos/dll/win32/shell32/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Sep 9 10:55:09 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/shell32/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/shell32/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/shell32/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: trunk/reactos/dll/win32/shell32/precomp.h (from r53651, branches/shell32_new-bringup/dll/win32/shell32/precomp.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -12,8 +12,6 @@ #include <malloc.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #define WIN32_NO_STATUS #define NTOS_MODE_USER Propchange: trunk/reactos/dll/win32/shell32/res/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Sep 9 10:55:09 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/shell32/res/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/shell32/res/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/shell32/res/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: trunk/reactos/dll/win32/shell32/res/avis/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Sep 9 10:55:09 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/shell32/res/avis/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/shell32/res/avis/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/shell32/res/avis/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: trunk/reactos/dll/win32/shell32/res/avis/Licence/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Sep 9 10:55:09 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/shell32/res/avis/Licence/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/shell32/res/avis/Licence/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/shell32/res/avis/Licence/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: trunk/reactos/dll/win32/shell32/res/bitmaps/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Sep 9 10:55:09 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/shell32/res/bitmaps/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/shell32/res/bitmaps/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/shell32/res/bitmaps/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: trunk/reactos/dll/win32/shell32/res/icons/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Sep 9 10:55:09 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/shell32/res/icons/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/shell32/res/icons/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/shell32/res/icons/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: trunk/reactos/dll/win32/shell32/res/icons/Icon_Licence/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Sep 9 10:55:09 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/shell32/res/icons/Icon_Licence/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/shell32/res/icons/Icon_Licence/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/shell32/res/icons/Icon_Licence/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Copied: trunk/reactos/dll/win32/shell32/shell32.rbuild (from r53651, branches/shell32_new-bringup/dll/win32/shell32/shell32.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -2,7 +2,6 @@ <module name="shell32" type="win32dll" baseaddress="${BASEADDRESS_SHELL32}" installbase="system32" installname="shell32.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="Both" /> <importlibrary definition="shell32.spec" /> - <include base="shell32">.</include> <include base="recyclebin">.</include> <include base="ReactOS">include/reactos/wine</include> <include base="atlnew">.</include> Modified: trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_d… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_desktop.cpp [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -140,7 +140,6 @@ static WCHAR MyDocumentsClassString[] = L"{450D8FBA-AD25-11D0-98A8-0800361B1103}"; TRACE("(%p)->(flags=0x%08x)\n", this, dwFlags); - DbgPrint("[shell32, CDesktopFolderEnum::Initialize] Called with flags = %d\n", dwFlags); /* enumerate the root folders */ if (dwFlags & SHCONTF_FOLDERS) @@ -339,7 +338,6 @@ else if( (pidlTemp = SHELL32_CreatePidlFromBindCtx(pbc, lpszDisplayName)) ) { *ppidl = pidlTemp; - DbgPrint("[shell32, CDesktopFolder::ParseDisplayName] 1 *ppidl = 0x%x\n", *ppidl); return S_OK; } else @@ -406,7 +404,6 @@ HRESULT hResult; TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", this, hwndOwner, dwFlags, ppEnumIDList); - DbgPrint("[shell32, CDesktopFolder::EnumObjects] Called with flags = %d\n", dwFlags); if (ppEnumIDList == NULL) return E_POINTER; Modified: trunk/reactos/dll/win32/shell32/shfldr_mycomp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_mycomp.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shfldr_mycomp.cpp [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -77,8 +77,6 @@ HRESULT WINAPI CDrivesFolderEnum::Initialize(HWND hwndOwner, DWORD dwFlags) { - DbgPrint("[shell32, CDrivesFolderEnum::Initialize] Called with flags = %d\n", dwFlags); - if (CreateMyCompEnumList(dwFlags) == FALSE) return E_FAIL; return S_OK; @@ -98,8 +96,6 @@ BOOL ret = TRUE; TRACE("(%p)->(flags=0x%08x)\n", this, dwFlags); - - DbgPrint("[shell32, CDrivesFolderEnum::CreateMyCompEnumList] Called with flags = %d\n", dwFlags); /* enumerate the folders */ if (dwFlags & SHCONTF_FOLDERS) @@ -260,8 +256,6 @@ TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", this, hwndOwner, dwFlags, ppEnumIDList); - DbgPrint("[shell32, CDrivesFolder::EnumObjects] Called with flags = %d\n", dwFlags); - if (ppEnumIDList == NULL) return E_POINTER; @@ -277,8 +271,6 @@ delete theEnumerator; return hResult; } - - DbgPrint("[shell32, CDrivesFolder::EnumObjects] Calling theEnumerator->Initialize\n"); hResult = theEnumerator->Initialize (hwndOwner, dwFlags); if (FAILED (hResult)) Modified: trunk/reactos/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlexec.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlexec.cpp [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -457,9 +457,6 @@ if (psei->fMask & SEE_MASK_NO_CONSOLE) dwCreationFlags |= CREATE_NEW_CONSOLE; - //DbgPrint("[shell32, SHELL_ExecuteW] CreateProcessW cmd = %ws\n", (LPWSTR)lpCmd); - //DbgBreakPoint(); - if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, dwCreationFlags, env, lpDirectory, &startup, &info)) { @@ -804,7 +801,6 @@ SHELL_ArgifyW(lpResult, resultLen, command, xlpFile, pidl, args, &finishedLen); if (finishedLen > resultLen) ERR("Argify buffer not large enough.. truncated\n"); - DbgPrint("[shell32, SHELL_FindExecutable] Remove double quotation marks and command line arguments\n"); /* Remove double quotation marks and command line arguments */ if (*lpResult == '"') { Modified: trunk/reactos/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlfileo… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -307,8 +307,6 @@ HICON hIcon; int ret; - DbgPrint("[shell32, SHELL_ConfirmDialogW] Called\n"); - assert(nKindOfDialog >= 0 && nKindOfDialog < 32); if (op && (op->dwYesToAllMask & (1 << nKindOfDialog))) return TRUE; @@ -744,8 +742,6 @@ BOOL ret; DWORD attribs; - DbgPrint("[shell32, SHNotifyCopyFileW] Called\n"); - TRACE("(%s %s %s)\n", debugstr_w(src), debugstr_w(dest), bFailIfExists ? "failIfExists" : ""); /* Destination file may already exist with read only attribute */ @@ -756,10 +752,9 @@ if (GetFileAttributesW(dest) & FILE_ATTRIBUTE_READONLY) { SetFileAttributesW(dest, attribs & ~FILE_ATTRIBUTE_READONLY); - DbgPrint("[shell32, SHNotifyCopyFileW] Something went really WRONG...%ls, we still have FILE_ATTRIBUTE_READONLY\n", dest); if (GetFileAttributesW(dest) & FILE_ATTRIBUTE_READONLY) { - DbgPrint("[shell32, SHNotifyCopyFileW] STILL SHIT\n"); + TRACE("[shell32, SHNotifyCopyFileW] STILL SHIT\n"); } } @@ -1407,7 +1402,6 @@ { if (!copy_file_to_file(op, entryToCopy->szFullPath, fileDest->szFullPath)) { - DbgPrint("[shell32, copy_files] copy_file_to_file failed\n"); op->req->fAnyOperationsAborted = TRUE; return ERROR_CANCELLED; } Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -906,8 +906,6 @@ TRACE("%p\n",this); - DbgPrint("[shell32, CDefView::OnCreate] Called\n"); - if(CreateList()) { if(InitList()) @@ -2192,8 +2190,6 @@ TRACE("(%p)->(shlview=%p set=%p shlbrs=%p rec=%p hwnd=%p) incomplete\n",this, lpPrevView,lpfs, psb, prcView, phWnd); - DbgPrint("[shell32, CDefView::CreateViewWindow] Called lpfs = 0x%x, psb = 0x%x\n", lpfs, psb); - if (lpfs != NULL) TRACE("-- vmode=%x flags=%x\n", lpfs->ViewMode, lpfs->fFlags); if (prcView != NULL) @@ -2216,8 +2212,6 @@ { TRACE("-- CommDlgBrowser\n"); } - - DbgPrint("[shell32, CDefView::CreateViewWindow] About to call the create function\n"); Create(hWndParent, prcView, NULL, WS_CHILD | WS_TABSTOP, 0, 0U); if (m_hWnd == NULL) Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -3694,6 +3694,15 @@ ); #endif +#ifdef NTOS_MODE_USER +NTSYSAPI +NTSTATUS +NTAPI +RtlGUIDFromString( + IN PUNICODE_STRING GuidString, + OUT GUID *Guid); +#endif + #ifdef __cplusplus } #endif Modified: trunk/reactos/include/psdk/appmgmt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/appmgmt.h?rev… ============================================================================== --- trunk/reactos/include/psdk/appmgmt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/appmgmt.h [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -18,6 +18,10 @@ #ifndef _APPMGMT_H #define _APPMGMT_H + +#ifdef __cplusplus +extern "C" { +#endif /* defined(__cplusplus) */ typedef struct _MANAGEDAPPLICATION { @@ -42,4 +46,8 @@ DWORD WINAPI CommandLineFromMsiDescriptor(WCHAR*,WCHAR*,DWORD*); DWORD WINAPI GetManagedApplications(GUID*,DWORD,DWORD,LPDWORD,PMANAGEDAPPLICATION*); +#ifdef __cplusplus +} /* extern "C" */ +#endif /* defined(__cplusplus) */ + #endif /* _APPMGMT_H */ Modified: trunk/reactos/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid.h [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -57,27 +57,26 @@ DEFINE_GUID(IID_IProgressDialog, 0xEBBC7C04,0x315E,0x11D2,0xB6,0x2F,0x00,0x60,0x97,0xDF,0x5B,0xD4); -#ifndef __GNUC__ /* avoid duplicate definitions with shobjidl.h (FIXME) */ -DEFINE_GUID(IID_IDockingWindow, 0x012dd920L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); -DEFINE_OLEGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); -DEFINE_OLEGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); -DEFINE_OLEGUID(IID_IExtractIconW, 0x000214FAL, 0, 0); -DEFINE_OLEGUID(IID_IContextMenu, 0x000214E4L, 0, 0); -DEFINE_OLEGUID(IID_IContextMenu2, 0x000214F4L, 0, 0); -DEFINE_OLEGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0); -DEFINE_OLEGUID(IID_IShellBrowser, 0x000214E2L, 0, 0); -DEFINE_OLEGUID(IID_IShellView, 0x000214E3L, 0, 0); -DEFINE_OLEGUID(IID_IShellFolder, 0x000214E6L, 0, 0); -DEFINE_OLEGUID(IID_IShellExtInit, 0x000214E8L, 0, 0); -DEFINE_OLEGUID(IID_IPersistFolder, 0x000214EAL, 0, 0); -DEFINE_OLEGUID(IID_IShellLinkA, 0x000214EEL, 0, 0); -DEFINE_OLEGUID(IID_IEnumIDList, 0x000214F2L, 0, 0); -DEFINE_OLEGUID(IID_IShellLinkW, 0x000214F9L, 0, 0); -DEFINE_OLEGUID(IID_IShellExecuteHookA, 0x000214F5L, 0, 0); -DEFINE_OLEGUID(IID_IShellExecuteHookW, 0x000214FBL, 0, 0); -DEFINE_OLEGUID(IID_INewShortcutHookA, 0x000214E1L, 0, 0); -DEFINE_OLEGUID(IID_INewShortcutHookW, 0x000214F7L, 0, 0); -#endif +/* avoid duplicate definitions with shobjidl.h (FIXME) */ +/* DEFINE_GUID(IID_IDockingWindow, 0x012dd920L, 0x7B26, 0x11D0, 0x8C, 0xA9, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); */ +/* DEFINE_OLEGUID(IID_IShellPropSheetExt, 0x000214E9L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IExtractIconA, 0x000214EBL, 0, 0); */ +/* DEFINE_OLEGUID(IID_IExtractIconW, 0x000214FAL, 0, 0); */ +/* DEFINE_OLEGUID(IID_IContextMenu, 0x000214E4L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IContextMenu2, 0x000214F4L, 0, 0); */ +/* DEFINE_OLEGUID(IID_ICommDlgBrowser, 0x000214F1L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellBrowser, 0x000214E2L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellView, 0x000214E3L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellFolder, 0x000214E6L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExtInit, 0x000214E8L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IPersistFolder, 0x000214EAL, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellLinkA, 0x000214EEL, 0, 0); */ +/* DEFINE_OLEGUID(IID_IEnumIDList, 0x000214F2L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellLinkW, 0x000214F9L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExecuteHookA, 0x000214F5L, 0, 0); */ +/* DEFINE_OLEGUID(IID_IShellExecuteHookW, 0x000214FBL, 0, 0); */ +/* DEFINE_OLEGUID(IID_INewShortcutHookA, 0x000214E1L, 0, 0); */ +/* DEFINE_OLEGUID(IID_INewShortcutHookW, 0x000214F7L, 0, 0); */ DEFINE_GUID(CLSID_CUrlHistory, 0x3c374a40, 0xbae4, 0x11cf, 0xbf, 0x7d, 0x00, 0xaa, 0x00, 0x69, 0x46, 0xee); #define SID_SUrlHistory CLSID_CUrlHistory @@ -133,8 +132,6 @@ DEFINE_GUID(CLSID_ACListISF, 0x03c036f1, 0xa186, 0x11d0, 0x82, 0x4a, 0x00, 0xaa, 0x00, 0x5b, 0x043, 0x83); DEFINE_GUID(CLSID_ProgressDialog, 0xf8383852, 0xfcd3, 0x11d1, 0xa6, 0xb9, 0x0, 0x60, 0x97, 0xdf, 0x5b, 0xd4); - -DEFINE_GUID(CLSID_ShellItem, 0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); #define PSGUID_SHELLDETAILS {0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0} DEFINE_GUID(FMTID_ShellDetails, 0x28636aa6, 0x953d, 0x11d2, 0xb5, 0xd6, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0xd0); Modified: trunk/reactos/include/psdk/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid_undoc… ============================================================================== --- trunk/reactos/include/psdk/shlguid_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid_undoc.h [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -1,4 +1,24 @@ +/* + * Copyright (C) 1999 Juergen Schmied + * Copyright (C) 2009 Andrew Hill + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#ifndef __SHLGUID_UNDOC_H +#define __SHLGUID_UNDOC_H DEFINE_GUID(CLSID_RebarBandSite, 0xECD4FC4D, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); DEFINE_GUID(CLSID_BandSiteMenu, 0xECD4FC4E, 0x521C, 0x11D0, 0xB7, 0x92, 0x00, 0xA0, 0xC9, 0x03, 0x12, 0xE1); DEFINE_GUID(IID_IBandSiteHelper, 0xD1E7AFEA, 0x6A2E, 0x11D0, 0x8C, 0x78, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xB4); @@ -11,60 +31,74 @@ DEFINE_GUID(IID_IShellBrowserService, 0x1307EE17, 0xEA83, 0x49EB, 0x96, 0xB2, 0x3A, 0x28, 0xE2, 0xD7, 0x04, 0x8A); //DEFINE_GUID(IID_IFolderView, 0xCDE725B0, 0xCCC9, 0x4519, 0x91, 0x7E, 0x32, 0x5D, 0x72, 0xFA, 0xB4, 0xCE); -DEFINE_GUID(SID_SProxyBrowser, 0x20C46561, 0x8491, 0x11CF, 0x96, 0x0C, 0x00, 0x80, 0xC7, 0xF4, 0xEE, 0x85); +DEFINE_GUID(SID_SProxyBrowser, 0x20C46561, 0x8491, 0x11CF, 0x96, 0x0C, 0x00, 0x80, 0xC7, 0xF4, 0xEE, 0x85); // this class lives in shell32.dll -DEFINE_GUID(IID_IGlobalFolderSettings, 0xEF8AD2D3, 0xAE36, 0x11D1, 0xB2, 0xD2, 0x00, 0x60, 0x97, 0xDF, 0x8C, 0x11); -DEFINE_GUID(CLSID_GlobalFolderSettings, 0xEF8AD2D1, 0xAE36, 0x11D1, 0xB2, 0xD2, 0x00, 0x60, 0x97, 0xDF, 0x8C, 0x11); -DEFINE_GUID(IID_IRegTreeOptions, 0xAF4F6511, 0xF982, 0x11D0, 0x85, 0x95, 0x00, 0xAA, 0x00, 0x4C, 0xD6, 0xD8); -DEFINE_GUID(CLSID_CRegTreeOptions, 0xAF4F6510, 0xF982, 0x11D0, 0x85, 0x95, 0x00, 0xAA, 0x00, 0x4C, 0xD6, 0xD8); -DEFINE_GUID(IID_IExplorerToolbar, 0x8455F0C1, 0x158F, 0x11D0, 0x89, 0xAE, 0x00, 0xA0, 0xC9, 0x0A, 0x90, 0xAC); +DEFINE_GUID(IID_IGlobalFolderSettings, 0xEF8AD2D3, 0xAE36, 0x11D1, 0xB2, 0xD2, 0x00, 0x60, 0x97, 0xDF, 0x8C, 0x11); +DEFINE_GUID(CLSID_GlobalFolderSettings, 0xEF8AD2D1, 0xAE36, 0x11D1, 0xB2, 0xD2, 0x00, 0x60, 0x97, 0xDF, 0x8C, 0x11); +DEFINE_GUID(IID_IRegTreeOptions, 0xAF4F6511, 0xF982, 0x11D0, 0x85, 0x95, 0x00, 0xAA, 0x00, 0x4C, 0xD6, 0xD8); +DEFINE_GUID(CLSID_CRegTreeOptions, 0xAF4F6510, 0xF982, 0x11D0, 0x85, 0x95, 0x00, 0xAA, 0x00, 0x4C, 0xD6, 0xD8); +DEFINE_GUID(IID_IExplorerToolbar, 0x8455F0C1, 0x158F, 0x11D0, 0x89, 0xAE, 0x00, 0xA0, 0xC9, 0x0A, 0x90, 0xAC); // not registered, lives in browseui.dll -DEFINE_GUID(CLSID_BrowserBar, 0x9581015C, 0xD08E, 0x11D0, 0x8D, 0x36, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); +DEFINE_GUID(CLSID_BrowserBar, 0x9581015C, 0xD08E, 0x11D0, 0x8D, 0x36, 0x00, 0xA0, 0xC9, 0x2D, 0xBF, 0xE8); -DEFINE_GUID(CGID_DefViewFrame, 0x710EB7A1, 0x45ED, 0x11D0, 0x92, 0x4A, 0x00, 0x20, 0xAF, 0xC7, 0xAC, 0x4D); +DEFINE_GUID(CGID_DefViewFrame, 0x710EB7A1, 0x45ED, 0x11D0, 0x92, 0x4A, 0x00, 0x20, 0xAF, 0xC7, 0xAC, 0x4D); // browseui.dll -DEFINE_GUID(CLSID_SH_AddressBand, 0x01E04581, 0x4EEE, 0x11D0, 0xBF, 0xE9, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); -DEFINE_GUID(CLSID_AddressEditBox, 0xA08C11D2, 0xA228, 0x11D0, 0x82, 0x5B, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); -DEFINE_GUID(IID_IAddressEditBox, 0xA08C11D1, 0xA228, 0x11D0, 0x82, 0x5B, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); +DEFINE_GUID(CLSID_SH_AddressBand, 0x01E04581, 0x4EEE, 0x11D0, 0xBF, 0xE9, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); +DEFINE_GUID(CLSID_AddressEditBox, 0xA08C11D2, 0xA228, 0x11D0, 0x82, 0x5B, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); +DEFINE_GUID(IID_IAddressEditBox, 0xA08C11D1, 0xA228, 0x11D0, 0x82, 0x5B, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); -DEFINE_GUID(IID_IAddressBand, 0x106E86E1, 0x52B5, 0x11D0, 0xBF, 0xED, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); -DEFINE_GUID(CLSID_BrandBand, 0x22BF0C20, 0x6DA7, 0x11D0, 0xB3, 0x73, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0x38); -DEFINE_GUID(SID_SBrandBand, 0x82A62DE8, 0x32AC, 0x4E4A, 0x99, 0x35, 0x90, 0x46, 0xC3, 0x78, 0xCF, 0x90); -DEFINE_GUID(CLSID_InternetToolbar, 0x5E6AB780, 0x7743, 0x11CF, 0xA1, 0x2B, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); +DEFINE_GUID(IID_IAddressBand, 0x106E86E1, 0x52B5, 0x11D0, 0xBF, 0xED, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); +DEFINE_GUID(CLSID_BrandBand, 0x22BF0C20, 0x6DA7, 0x11D0, 0xB3, 0x73, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0x38); +DEFINE_GUID(SID_SBrandBand, 0x82A62DE8, 0x32AC, 0x4E4A, 0x99, 0x35, 0x90, 0x46, 0xC3, 0x78, 0xCF, 0x90); +DEFINE_GUID(CLSID_InternetToolbar, 0x5E6AB780, 0x7743, 0x11CF, 0xA1, 0x2B, 0x00, 0xAA, 0x00, 0x4A, 0xE8, 0x37); -DEFINE_GUID(CGID_PrivCITCommands, 0x67077B95, 0x4F9D, 0x11D0, 0xB8, 0x84, 0x00, 0xAA, 0x00, 0xB6, 0x01, 0x04); -DEFINE_GUID(CGID_Theater, 0x0F12079C, 0xC193, 0x11D0, 0x8D, 0x49, 0x00, 0xC0, 0x4F, 0xC9, 0x9D, 0x61); -DEFINE_GUID(CGID_ShellBrowser, 0x3531F060, 0x22B3, 0x11D0, 0x96, 0x9E, 0x00, 0xAA, 0x00, 0xB6, 0x01, 0x04); +DEFINE_GUID(CGID_PrivCITCommands, 0x67077B95, 0x4F9D, 0x11D0, 0xB8, 0x84, 0x00, 0xAA, 0x00, 0xB6, 0x01, 0x04); +DEFINE_GUID(CGID_Theater, 0x0F12079C, 0xC193, 0x11D0, 0x8D, 0x49, 0x00, 0xC0, 0x4F, 0xC9, 0x9D, 0x61); +DEFINE_GUID(CGID_ShellBrowser, 0x3531F060, 0x22B3, 0x11D0, 0x96, 0x9E, 0x00, 0xAA, 0x00, 0xB6, 0x01, 0x04); -DEFINE_GUID(CLSID_SearchBand, 0x2559A1F0, 0x21D7, 0x11D4, 0xBD, 0xAF, 0x00, 0xC0, 0x4F, 0x60, 0xB9, 0xF0); -DEFINE_GUID(CLSID_TipOfTheDayBand, 0x4D5C8C25, 0xD075, 0x11D0, 0xB4, 0x16, 0x00, 0xC0, 0x4F, 0xB9, 0x03, 0x76); -DEFINE_GUID(CLSID_DiscussBand, 0xBDEADE7F, 0xC265, 0x11D0, 0xBC, 0xED, 0x00, 0xA0, 0xC9, 0x0A, 0xB5, 0x0F); -DEFINE_GUID(CLSID_SH_FavBand, 0xEFA24E61, 0xB078, 0x11D0, 0x89, 0xE4, 0x00, 0xC0, 0x4F, 0xC9, 0xE2, 0x6E); -DEFINE_GUID(CLSID_SH_HistBand, 0xEFA24E62, 0xB078, 0x11D0, 0x89, 0xE4, 0x00, 0xC0, 0x4F, 0xC9, 0xE2, 0x6E); -DEFINE_GUID(CLSID_ExplorerBand, 0xEFA24E64, 0xB078, 0x11D0, 0x89, 0xE4, 0x00, 0xC0, 0x4F, 0xC9, 0xE2, 0x6E); -DEFINE_GUID(CLSID_SH_SearchBand, 0x21569614, 0xB795, 0x46B1, 0x85, 0xF4, 0xE7, 0x37, 0xA8, 0xDC, 0x09, 0xAD); -DEFINE_GUID(CLSID_FileSearchBand, 0xC4EE31F3, 0x4768, 0x11D2, 0x5C, 0xBE, 0x00, 0xA0, 0xC9, 0xA8, 0x3D, 0xA1); +DEFINE_GUID(CLSID_SearchBand, 0x2559A1F0, 0x21D7, 0x11D4, 0xBD, 0xAF, 0x00, 0xC0, 0x4F, 0x60, 0xB9, 0xF0); +DEFINE_GUID(CLSID_TipOfTheDayBand, 0x4D5C8C25, 0xD075, 0x11D0, 0xB4, 0x16, 0x00, 0xC0, 0x4F, 0xB9, 0x03, 0x76); +DEFINE_GUID(CLSID_DiscussBand, 0xBDEADE7F, 0xC265, 0x11D0, 0xBC, 0xED, 0x00, 0xA0, 0xC9, 0x0A, 0xB5, 0x0F); +DEFINE_GUID(CLSID_SH_FavBand, 0xEFA24E61, 0xB078, 0x11D0, 0x89, 0xE4, 0x00, 0xC0, 0x4F, 0xC9, 0xE2, 0x6E); +DEFINE_GUID(CLSID_SH_HistBand, 0xEFA24E62, 0xB078, 0x11D0, 0x89, 0xE4, 0x00, 0xC0, 0x4F, 0xC9, 0xE2, 0x6E); +DEFINE_GUID(CLSID_ExplorerBand, 0xEFA24E64, 0xB078, 0x11D0, 0x89, 0xE4, 0x00, 0xC0, 0x4F, 0xC9, 0xE2, 0x6E); +DEFINE_GUID(CLSID_SH_SearchBand, 0x21569614, 0xB795, 0x46B1, 0x85, 0xF4, 0xE7, 0x37, 0xA8, 0xDC, 0x09, 0xAD); +DEFINE_GUID(CLSID_FileSearchBand, 0xC4EE31F3, 0x4768, 0x11D2, 0x5C, 0xBE, 0x00, 0xA0, 0xC9, 0xA8, 0x3D, 0xA1); // missing ResearchBand -DEFINE_GUID(IID_IBandNavigate, 0x3697C30B, 0xCD88, 0x11D0, 0x8A, 0x3E, 0x00, 0xC0, 0x4F, 0xC9, 0xE2, 0x6E); -DEFINE_GUID(IID_INamespaceProxy, 0xCF1609EC, 0xFA4B, 0x4818, 0xAB, 0x01, 0x55, 0x64, 0x33, 0x67, 0xE6, 0x6D); -DEFINE_GUID(IID_IBandProxy, 0x208CE801, 0x754B, 0x11D0, 0x80, 0xCA, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); -DEFINE_GUID(CLSID_BandProxy, 0xF61FFEC1, 0x754F, 0x11D0, 0x80, 0xCA, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); -DEFINE_GUID(SID_IBandProxy, 0x80243AC1, 0x0569, 0x11D1, 0xA7, 0xAE, 0x00, 0x60, 0x97, 0xDF, 0x5B, 0xD4); -DEFINE_GUID(CLSID_ShellSearchExt, 0x169A0691, 0x8DF9, 0x11D1, 0xA1, 0xC4, 0x00, 0xC0, 0x4F, 0xD7, 0x5D, 0x13); +DEFINE_GUID(IID_IBandNavigate, 0x3697C30B, 0xCD88, 0x11D0, 0x8A, 0x3E, 0x00, 0xC0, 0x4F, 0xC9, 0xE2, 0x6E); +DEFINE_GUID(IID_INamespaceProxy, 0xCF1609EC, 0xFA4B, 0x4818, 0xAB, 0x01, 0x55, 0x64, 0x33, 0x67, 0xE6, 0x6D); +DEFINE_GUID(IID_IBandProxy, 0x208CE801, 0x754B, 0x11D0, 0x80, 0xCA, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); +DEFINE_GUID(CLSID_BandProxy, 0xF61FFEC1, 0x754F, 0x11D0, 0x80, 0xCA, 0x00, 0xAA, 0x00, 0x5B, 0x43, 0x83); +DEFINE_GUID(SID_IBandProxy, 0x80243AC1, 0x0569, 0x11D1, 0xA7, 0xAE, 0x00, 0x60, 0x97, 0xDF, 0x5B, 0xD4); +DEFINE_GUID(CLSID_ShellSearchExt, 0x169A0691, 0x8DF9, 0x11D1, 0xA1, 0xC4, 0x00, 0xC0, 0x4F, 0xD7, 0x5D, 0x13); -DEFINE_GUID(CLSID_CommonButtons, 0x1E79697E, 0x9CC5, 0x11D1, 0xA8, 0x3F, 0x00, 0xC0, 0x4F, 0xC9, 0x9D, 0x61); +DEFINE_GUID(CLSID_CommonButtons, 0x1E79697E, 0x9CC5, 0x11D1, 0xA8, 0x3F, 0x00, 0xC0, 0x4F, 0xC9, 0x9D, 0x61); -DEFINE_GUID(CGID_BrandCmdGroup, 0x25019D8C, 0x9EE0, 0x45C0, 0x88, 0x3B, 0x97, 0x2D, 0x48, 0x32, 0x5E, 0x18); +DEFINE_GUID(CGID_BrandCmdGroup, 0x25019D8C, 0x9EE0, 0x45C0, 0x88, 0x3B, 0x97, 0x2D, 0x48, 0x32, 0x5E, 0x18); -DEFINE_GUID(IID_INSCTree, 0x43A8F463, 0x4222, 0x11D2, 0xB6, 0x41, 0x00, 0x60, 0x97, 0xDF, 0x5B, 0xD4); -DEFINE_GUID(IID_INSCTree2, 0x801C1AD5, 0xC47C, 0x428C, 0x97, 0xAF, 0xE9, 0x91, 0xE4, 0x85, 0x7D, 0x97); +DEFINE_GUID(IID_INSCTree, 0x43A8F463, 0x4222, 0x11D2, 0xB6, 0x41, 0x00, 0x60, 0x97, 0xDF, 0x5B, 0xD4); +DEFINE_GUID(IID_INSCTree2, 0x801C1AD5, 0xC47C, 0x428C, 0x97, 0xAF, 0xE9, 0x91, 0xE4, 0x85, 0x7D, 0x97); -DEFINE_GUID(IID_IInitializeObject, 0x4622AD16, 0xFF23, 0x11D0, 0x8D, 0x34, 0x00, 0xA0, 0xC9, 0x0F, 0x27, 0x19); -DEFINE_GUID(IID_IBanneredBar, 0x596A9A94, 0x013E, 0x11D1, 0x8D, 0x34, 0x00, 0xA0, 0xC9, 0x0F, 0x27, 0x19); +DEFINE_GUID(IID_IInitializeObject, 0x4622AD16, 0xFF23, 0x11D0, 0x8D, 0x34, 0x00, 0xA0, 0xC9, 0x0F, 0x27, 0x19); +DEFINE_GUID(IID_IBanneredBar, 0x596A9A94, 0x013E, 0x11D1, 0x8D, 0x34, 0x00, 0xA0, 0xC9, 0x0F, 0x27, 0x19); + +DEFINE_GUID(CLSID_StartMenu, 0x4622AD11, 0xFF23, 0x11D0, 0x8D, 0x34, 0x00, 0xA0, 0xC9, 0x0F, 0x27, 0x19); +DEFINE_GUID(CLSID_MenuBandSite, 0xE13EF4E4, 0xD2F2, 0x11D0, 0x98, 0x16, 0x00, 0xC0, 0x4F, 0xD9, 0x19, 0x72); +DEFINE_GUID(SHELL32_AdvtShortcutProduct, 0x9DB1186F, 0x40DF, 0x11D1, 0xAA, 0x8C, 0x00, 0xC0, 0x4F, 0xB6, 0x78, 0x63); +DEFINE_GUID(SHELL32_AdvtShortcutComponent, 0x9DB1186E, 0x40DF, 0x11D1, 0xAA, 0x8C, 0x00, 0xC0, 0x4F, 0xB6, 0x78, 0x63); +DEFINE_GUID(CLSID_OpenWithMenu, 0x09799AFB, 0xAD67, 0x11D1, 0xAB, 0xCD, 0x00, 0xC0, 0x4F, 0xC3, 0x09, 0x36); + +DEFINE_GUID(CLSID_FontsFolderShortcut, 0xD20EA4E1, 0x3957, 0x11D2, 0xA4, 0x0B, 0x0C, 0x50, 0x20, 0x52, 0x41, 0x52); +DEFINE_GUID(CLSID_AdminFolderShortcut, 0xD20EA4E1, 0x3957, 0x11D2, 0xA4, 0x0B, 0x0C, 0x50, 0x20, 0x52, 0x41, 0x53); + +DEFINE_GUID(CLSID_FolderOptions, 0x6DFD7C5C, 0x2451, 0x11D3, 0xA2, 0x99, 0x00, 0xC0, 0x4F, 0x8E, 0xF6, 0xAF); + +// In theory, this is documented. But until I see an SDK header that defines it, it will be treated as undocumented... +DEFINE_GUID(CLSID_ShellItem, 0x2fe352ea, 0xfd1f, 0x11d2, 0xb1, 0xf4, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); #define CGID_IExplorerToolbar IID_IExplorerToolbar #define SID_IExplorerToolbar IID_IExplorerToolbar @@ -74,4 +108,7 @@ #define CGID_MenuBand CLSID_MenuBand #define SID_STravelLogCursor IID_ITravelLogStg #define SID_IBandSite IID_IBandSite +#define SID_IFolderView IID_IFolderView +#define SID_IShellBrowser IID_IShellBrowser +#endif // __SHLGUID_UNDOC_H Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj.h [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -97,6 +97,7 @@ void WINAPI SHFree(LPVOID); BOOL WINAPI GetFileNameFromBrowse(HWND,LPWSTR,UINT,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR); HRESULT WINAPI SHGetInstanceExplorer(IUnknown**); +VOID WINAPI SHSetInstanceExplorer (IUnknown*); HRESULT WINAPI SHGetFolderPathAndSubDirA(HWND,int,HANDLE,DWORD,LPCSTR,LPSTR); HRESULT WINAPI SHGetFolderPathAndSubDirW(HWND,int,HANDLE,DWORD,LPCWSTR,LPWSTR); #define SHGetFolderPathAndSubDir WINELIB_NAME_AW(SHGetFolderPathAndSubDir); @@ -1458,7 +1459,7 @@ } SHChangeProductKeyAsIDList, *LPSHChangeProductKeyAsIDList; ULONG WINAPI SHChangeNotifyRegister(HWND hwnd, int fSources, LONG fEvents, UINT wMsg, - int cEntries, const SHChangeNotifyEntry *pshcne); + int cEntries, SHChangeNotifyEntry *pshcne); BOOL WINAPI SHChangeNotifyDeregister(ULONG ulID); HANDLE WINAPI SHChangeNotification_Lock(HANDLE hChangeNotification, DWORD dwProcessId, LPITEMIDLIST **pppidl, LONG *plEvent); @@ -1469,7 +1470,7 @@ /**************************************************************************** * SHCreateDirectory API */ -DWORD WINAPI SHCreateDirectory(HWND, LPCWSTR); +int WINAPI SHCreateDirectory(HWND, LPCWSTR); int WINAPI SHCreateDirectoryExA(HWND, LPCSTR, LPSECURITY_ATTRIBUTES); int WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES); #define SHCreateDirectoryEx WINELIB_NAME_AW(SHCreateDirectoryEx) @@ -1835,6 +1836,17 @@ STDMETHOD (GetPriority)(THIS_ int * pIPriority) PURE; }; +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IShellIconOverlayIdentifier_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IShellIconOverlayIdentifier_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IShellIconOverlayIdentifier_Release(p) (p)->lpVtbl->Release(p) +/*** IShellIconOverlayIdentifier methods ***/ +#define IShellIconOverlayIdentifier_IsMemberOf(p,a,b) (p)->lpVtbl->IsMemberOf(p,a,b) +#define IShellIconOverlayIdentifier_GetOverlayInfo(p,a,b,c,d) (p)->lpVtbl->GetOverlayInfo(p,a,b,c,d) +#define IShellIconOverlayIdentifier_GetPriority(p,a) (p)->lpVtbl->GetPriority(p,a) +#endif + #define ISIOI_ICONFILE 0x00000001 #define ISIOI_ICONINDEX 0x00000002 @@ -1856,12 +1868,12 @@ /***************************************************************************** * IDockingWindowSite interface */ -#define INTERFACE IDockingWindowSite +#define INTERFACE IDockingWindowSite DECLARE_INTERFACE_(IDockingWindowSite, IOleWindow) { // *** IUnknown methods *** STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; - STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; // *** IOleWindow methods *** @@ -1875,6 +1887,60 @@ }; #undef INTERFACE +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IDockingWindowSite_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDockingWindowSite_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDockingWindowSite_Release(p) (p)->lpVtbl->Release(p) +/*** IOleWindow methods ***/ +#define IDockingWindowSite_GetWindow(p,a) (p)->lpVtbl->GetWindow(p,a) +#define IDockingWindowSite_ContextSensitiveHelp(p,a) (p)->lpVtbl->ContextSensitiveHelp(p,a) +/*** IDockingWindowSite methods ***/ +#define IDockingWindowSite_GetBorderDW(p,a,b) (p)->lpVtbl->GetBorderDW(p,a,b) +#define IDockingWindowSite_RequestBorderSpaceDW(p,a,b) (p)->lpVtbl->RequestBorderSpaceDW(p,a,b) +#define IDockingWindowSite_SetBorderSpaceDW(p,a,b) (p)->lpVtbl->SetBorderSpaceDW(p,a,b) +#endif + +/***************************************************************************** + * IShellTaskScheduler interface + */ +#define REFTASKOWNERID REFGUID + +#define INTERFACE IShellTaskScheduler +DECLARE_INTERFACE_(IShellTaskScheduler, IUnknown) +{ + // *** IUnknown methods *** + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **ppv) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + + // *** IShellTaskScheduler methods *** + STDMETHOD(AddTask)(THIS_ IRunnableTask *pTask, REFTASKOWNERID rtoid, DWORD_PTR lParam, DWORD dwPriority) PURE; + STDMETHOD(RemoveTasks)(THIS_ REFTASKOWNERID rtoid, DWORD_PTR lParam, BOOL fWaitIfRunning) PURE; + STDMETHOD_(UINT, CountTasks)(THIS_ REFTASKOWNERID rtoid) PURE; + STDMETHOD(Status)(THIS_ DWORD dwReleaseStatus, DWORD dwThreadTimeout) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IShellTaskScheduler_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IShellTaskScheduler_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IShellTaskScheduler_Release(p) (p)->lpVtbl->Release(p) +/*** IShellTaskScheduler methods ***/ +#define IShellTaskScheduler_AddTask(p,a,b,c,d) (p)->lpVtbl->AddTask(p,a,b,c,d) +#define IShellTaskScheduler_RemoveTasks(p,a,b,c) (p)->lpVtbl->RemoveTasks(p,a,b,c) +#define IShellTaskScheduler_CountTasks(p,a) (p)->lpVtbl->CountTasks(p,a) +#define IShellTaskScheduler_Status(p,a,b) (p)->lpVtbl->Status(p,a,b) +#endif + +typedef void (CALLBACK *PFNASYNCICONTASKBALLBACK)(LPCITEMIDLIST pidl, LPVOID pvData, LPVOID pvHint, INT iIconIndex, INT iOpenIconIndex); + +/***************************************************************************** + * Control Panel functions + */ +LRESULT WINAPI CallCPLEntry16(HINSTANCE hMod, FARPROC pFunc, HWND dw3, UINT dw4, LPARAM dw5, LPARAM dw6); + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */ Modified: trunk/reactos/include/psdk/shlobj_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj_undoc.… ============================================================================== --- trunk/reactos/include/psdk/shlobj_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlobj_undoc.h [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -777,6 +777,7 @@ PROC lpfnCompare; } CREATEMRULISTW, *LPCREATEMRULISTW; +#define MRU_STRING 0x0 #define MRU_BINARY 0x1 #define MRU_CACHEWRITE 0x2 @@ -785,6 +786,20 @@ INT WINAPI AddMRUData(HANDLE,LPCVOID,DWORD); INT WINAPI FindMRUData(HANDLE,LPCVOID,DWORD,LPINT); VOID WINAPI FreeMRUList(HANDLE); + +INT WINAPI AddMRUStringW(HANDLE hList, LPCWSTR lpszString); +INT WINAPI AddMRUStringA(HANDLE hList, LPCSTR lpszString); +BOOL WINAPI DelMRUString(HANDLE hList, INT nItemPos); +INT WINAPI FindMRUStringW(HANDLE hList, LPCWSTR lpszString, LPINT lpRegNum); +INT WINAPI FindMRUStringA(HANDLE hList, LPCSTR lpszString, LPINT lpRegNum); +HANDLE WINAPI CreateMRUListLazyW(const CREATEMRULISTW *lpcml, DWORD dwParam2, + DWORD dwParam3, DWORD dwParam4); +HANDLE WINAPI CreateMRUListLazyA(const CREATEMRULISTA *lpcml, DWORD dwParam2, + DWORD dwParam3, DWORD dwParam4); +INT WINAPI EnumMRUListW(HANDLE hList, INT nItemPos, LPVOID lpBuffer, + DWORD nBufferSize); +INT WINAPI EnumMRUListA(HANDLE hList, INT nItemPos, LPVOID lpBuffer, + DWORD nBufferSize); #define DC_NOSENDMSG 0x2000 BOOL WINAPI DrawCaptionTempA(HWND,HDC,const RECT*,HFONT,HICON,LPCSTR,UINT); Modified: trunk/reactos/include/psdk/shlwapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlwapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlwapi.h [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -319,11 +319,7 @@ #endif /* NO_SHLWAPI_REG */ -void WINAPI IUnknown_Set(IUnknown **ppunk, IUnknown *punk); -void WINAPI IUnknown_AtomicRelease(IUnknown **punk); -HRESULT WINAPI IUnknown_GetWindow(IUnknown *punk, HWND *phwnd); HRESULT WINAPI IUnknown_SetSite(IUnknown *punk, IUnknown *punkSite); -HRESULT WINAPI IUnknown_GetSite(IUnknown *punk, REFIID riid, void **ppv); HRESULT WINAPI IUnknown_QueryService(IUnknown *punk, REFGUID guidService, REFIID riid, void **ppvOut); /* Path functions */ @@ -881,9 +877,6 @@ LPWSTR WINAPI StrStrIW(LPCWSTR,LPCWSTR); #define StrStrI WINELIB_NAME_AW(StrStrI) -LPWSTR WINAPI StrStrNW(LPCWSTR,LPCWSTR,UINT); -LPWSTR WINAPI StrStrNIW(LPCWSTR,LPCWSTR,UINT); - int WINAPI StrToIntA(LPCSTR); int WINAPI StrToIntW(LPCWSTR); #define StrToInt WINELIB_NAME_AW(StrToInt) @@ -988,7 +981,6 @@ HRESULT WINAPI SHAutoComplete(HWND,DWORD); /* Threads */ -HRESULT WINAPI SHCreateThreadRef(LONG*, IUnknown**); HRESULT WINAPI SHGetThreadRef(IUnknown**); HRESULT WINAPI SHSetThreadRef(IUnknown*); HRESULT WINAPI SHReleaseThreadRef(void); @@ -1041,6 +1033,24 @@ ((ULONGLONG)(mnr)<< 32) | ((ULONGLONG)(bld)<< 16) | (ULONGLONG)(qfe)) HRESULT WINAPI DllInstall(BOOL,LPCWSTR) DECLSPEC_HIDDEN; + + +#if (_WIN32_IE >= 0x0600) +#define SHGVSPB_PERUSER 0x00000001 +#define SHGVSPB_ALLUSERS 0x00000002 +#define SHGVSPB_PERFOLDER 0x00000004 +#define SHGVSPB_ALLFOLDERS 0x00000008 +#define SHGVSPB_INHERIT 0x00000010 +#define SHGVSPB_ROAM 0x00000020 +#define SHGVSPB_NOAUTODEFAULTS 0x80000000 + +#define SHGVSPB_FOLDER (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER) +#define SHGVSPB_FOLDERNODEFAULTS (SHGVSPB_PERUSER | SHGVSPB_PERFOLDER | SHGVSPB_NOAUTODEFAULTS) +#define SHGVSPB_USERDEFAULTS (SHGVSPB_PERUSER | SHGVSPB_ALLFOLDERS) +#define SHGVSPB_GLOBALDEAFAULTS (SHGVSPB_ALLUSERS | SHGVSPB_ALLFOLDERS) + +HRESULT WINAPI SHGetViewStatePropertyBag(LPCITEMIDLIST pidl, LPWSTR bag_name, DWORD flags, REFIID riid, void **ppv); +#endif /* (_WIN32_IE >= 0x0600) */ /* IsOS definitions */ @@ -1109,6 +1119,11 @@ HRESULT WINAPI QISearch(void* base, const QITAB *pqit, REFIID riid, void **ppv); +HANDLE WINAPI SHAllocShared(LPVOID pv, ULONG cb, DWORD pid); +BOOL WINAPI SHFreeShared(HANDLE hMem, DWORD pid); +LPVOID WINAPI SHLockShared(HANDLE hMem, DWORD pid); +BOOL WINAPI SHUnlockShared(LPVOID pv); + #include <poppack.h> #ifdef __cplusplus Modified: trunk/reactos/include/psdk/shlwapi_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlwapi_undoc… ============================================================================== --- trunk/reactos/include/psdk/shlwapi_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlwapi_undoc.h [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -45,6 +45,43 @@ long filler4; // unknown contents }; +BOOL WINAPI SHAboutInfoA(LPSTR lpszDest, DWORD dwDestLen); +BOOL WINAPI SHAboutInfoW(LPWSTR lpszDest, DWORD dwDestLen); +HRESULT WINAPI IUnknown_QueryStatus(IUnknown *lpUnknown, REFGUID pguidCmdGroup, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT* pCmdText); +HRESULT WINAPI IUnknown_Exec(IUnknown* lpUnknown, REFGUID pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT* pvaIn, VARIANT* pvaOut); +LONG WINAPI SHSetWindowBits(HWND hwnd, INT offset, UINT wMask, UINT wFlags); +HWND WINAPI SHSetParentHwnd(HWND hWnd, HWND hWndParent); +HRESULT WINAPI ConnectToConnectionPoint(IUnknown *lpUnkSink, REFIID riid, BOOL bAdviseOnly, IUnknown *lpUnknown, LPDWORD lpCookie, IConnectionPoint **lppCP); +DWORD WINAPI IUnknown_AtomicRelease(IUnknown **lpUnknown); +BOOL WINAPI SHIsSameObject(IUnknown *lpInt1, IUnknown *lpInt2); +HRESULT WINAPI IUnknown_GetWindow(IUnknown *lpUnknown, HWND *lphWnd); +HRESULT WINAPI IUnknown_SetOwner(IUnknown *pUnk, ULONG arg); +HRESULT WINAPI IUnknown_SetSite(IUnknown *obj, IUnknown *site); +HRESULT WINAPI IUnknown_GetClassID(IUnknown *lpUnknown, CLSID *lpClassId); +HRESULT WINAPI IUnknown_QueryService(IUnknown* lpUnknown, REFGUID sid, REFIID riid, LPVOID *lppOut); +HRESULT WINAPI IUnknown_UIActivateIO(IUnknown *unknown, BOOL activate, LPMSG msg); +BOOL WINAPI SHLoadMenuPopup(HINSTANCE hInst, LPCWSTR szName); +void WINAPI SHPropagateMessage(HWND hWnd, UINT uiMsgId, WPARAM wParam, LPARAM lParam, BOOL bSend); +DWORD WINAPI SHRemoveAllSubMenus(HMENU hMenu); +UINT WINAPI SHEnableMenuItem(HMENU hMenu, UINT wItemID, BOOL bEnable); +DWORD WINAPI SHCheckMenuItem(HMENU hMenu, UINT uID, BOOL bCheck); +DWORD WINAPI SHRegisterClassA(WNDCLASSA *wndclass); +BOOL WINAPI SHSimulateDrop(IDropTarget *pDrop, IDataObject *pDataObj, DWORD grfKeyState, PPOINTL lpPt, DWORD* pdwEffect); +HRESULT WINAPI IUnknown_TranslateAcceleratorOCS(IUnknown *lpUnknown, LPMSG lpMsg, DWORD dwModifiers); +HRESULT WINAPI IUnknown_OnFocusOCS(IUnknown *lpUnknown, BOOL fGotFocus); +HRESULT WINAPI IUnknown_HandleIRestrict(LPUNKNOWN lpUnknown, PVOID lpArg1, PVOID lpArg2, PVOID lpArg3, PVOID lpArg4); +HMENU WINAPI SHGetMenuFromID(HMENU hMenu, UINT uID); +DWORD WINAPI SHGetCurColorRes(void); +DWORD WINAPI SHWaitForSendMessageThread(HANDLE hand, DWORD dwTimeout); +HRESULT WINAPI SHIsExpandableFolder(LPSHELLFOLDER lpFolder, LPCITEMIDLIST pidl); +DWORD WINAPI SHFillRectClr(HDC hDC, LPCRECT pRect, COLORREF cRef); +int WINAPI SHSearchMapInt(const int *lpKeys, const int *lpValues, int iLen, int iKey); +VOID WINAPI IUnknown_Set(IUnknown **lppDest, IUnknown *lpUnknown); +HRESULT WINAPI MayQSForward(IUnknown* lpUnknown, PVOID lpReserved, REFGUID riidCmdGrp, ULONG cCmds, OLECMD *prgCmds, OLECMDTEXT *pCmdText); +HRESULT WINAPI MayExecForward(IUnknown* lpUnknown, INT iUnk, REFGUID pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); +HRESULT WINAPI IsQSForward(REFGUID pguidCmdGroup,ULONG cCmds, OLECMD *prgCmds); +BOOL WINAPI SHIsChildOrSelf(HWND hParent, HWND hChild); + void WINAPI InitOCHostClass(long param8); long WINAPI SHOpenFolderWindow(IEThreadParamBlock *param8); void WINAPI SHCreateSavedWindows(void); Modified: trunk/reactos/include/reactos/wine/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/commc… ============================================================================== --- trunk/reactos/include/reactos/wine/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/commctrl.h [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -11,6 +11,10 @@ #endif #include <psdk/commctrl.h> + +#ifdef __cplusplus +extern "C" { +#endif #undef DPA_GetPtr LPVOID WINAPI DPA_GetPtr(HDPA, INT); @@ -82,4 +86,8 @@ #define TB_UNKWN45D (WM_USER+93) #define TB_UNKWN464 (WM_USER+100) +#ifdef __cplusplus +} +#endif + #endif /* _INC_COMMCTRL_WINE */ Modified: trunk/reactos/lib/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlbase.h?rev=5365… ============================================================================== --- trunk/reactos/lib/atl/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlbase.h [iso-8859-1] Fri Sep 9 10:55:09 2011 @@ -538,6 +538,7 @@ { ATLASSERT(_pModule == NULL); _pModule = this; + _pModule->m_pObjMap = NULL; } ~CComModule()

13 years, 3 months

[cmihail] 53652: [shell32.dll] - Remove DbgPrint calls and replace some of them with TRACE calls.

by cmihail＠svn.reactos.org

Author: cmihail Date: Fri Sep 9 10:17:07 2011 New Revision: 53652 URL: http://svn.reactos.org/svn/reactos?rev=53652&view=rev Log: [shell32.dll] - Remove DbgPrint calls and replace some of them with TRACE calls. Modified: branches/shell32_new-bringup/dll/win32/shell32/shfldr_desktop.cpp branches/shell32_new-bringup/dll/win32/shell32/shfldr_mycomp.cpp branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp Modified: branches/shell32_new-bringup/dll/win32/shell32/shfldr_desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shfldr_desktop.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shfldr_desktop.cpp [iso-8859-1] Fri Sep 9 10:17:07 2011 @@ -140,7 +140,6 @@ static WCHAR MyDocumentsClassString[] = L"{450D8FBA-AD25-11D0-98A8-0800361B1103}"; TRACE("(%p)->(flags=0x%08x)\n", this, dwFlags); - DbgPrint("[shell32, CDesktopFolderEnum::Initialize] Called with flags = %d\n", dwFlags); /* enumerate the root folders */ if (dwFlags & SHCONTF_FOLDERS) @@ -339,7 +338,6 @@ else if( (pidlTemp = SHELL32_CreatePidlFromBindCtx(pbc, lpszDisplayName)) ) { *ppidl = pidlTemp; - DbgPrint("[shell32, CDesktopFolder::ParseDisplayName] 1 *ppidl = 0x%x\n", *ppidl); return S_OK; } else @@ -406,7 +404,6 @@ HRESULT hResult; TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", this, hwndOwner, dwFlags, ppEnumIDList); - DbgPrint("[shell32, CDesktopFolder::EnumObjects] Called with flags = %d\n", dwFlags); if (ppEnumIDList == NULL) return E_POINTER; Modified: branches/shell32_new-bringup/dll/win32/shell32/shfldr_mycomp.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shfldr_mycomp.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shfldr_mycomp.cpp [iso-8859-1] Fri Sep 9 10:17:07 2011 @@ -77,8 +77,6 @@ HRESULT WINAPI CDrivesFolderEnum::Initialize(HWND hwndOwner, DWORD dwFlags) { - DbgPrint("[shell32, CDrivesFolderEnum::Initialize] Called with flags = %d\n", dwFlags); - if (CreateMyCompEnumList(dwFlags) == FALSE) return E_FAIL; return S_OK; @@ -98,8 +96,6 @@ BOOL ret = TRUE; TRACE("(%p)->(flags=0x%08x)\n", this, dwFlags); - - DbgPrint("[shell32, CDrivesFolderEnum::CreateMyCompEnumList] Called with flags = %d\n", dwFlags); /* enumerate the folders */ if (dwFlags & SHCONTF_FOLDERS) @@ -260,8 +256,6 @@ TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", this, hwndOwner, dwFlags, ppEnumIDList); - DbgPrint("[shell32, CDrivesFolder::EnumObjects] Called with flags = %d\n", dwFlags); - if (ppEnumIDList == NULL) return E_POINTER; @@ -277,8 +271,6 @@ delete theEnumerator; return hResult; } - - DbgPrint("[shell32, CDrivesFolder::EnumObjects] Calling theEnumerator->Initialize\n"); hResult = theEnumerator->Initialize (hwndOwner, dwFlags); if (FAILED (hResult)) Modified: branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp [iso-8859-1] Fri Sep 9 10:17:07 2011 @@ -457,9 +457,6 @@ if (psei->fMask & SEE_MASK_NO_CONSOLE) dwCreationFlags |= CREATE_NEW_CONSOLE; - //DbgPrint("[shell32, SHELL_ExecuteW] CreateProcessW cmd = %ws\n", (LPWSTR)lpCmd); - //DbgBreakPoint(); - if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, dwCreationFlags, env, lpDirectory, &startup, &info)) { @@ -804,7 +801,6 @@ SHELL_ArgifyW(lpResult, resultLen, command, xlpFile, pidl, args, &finishedLen); if (finishedLen > resultLen) ERR("Argify buffer not large enough.. truncated\n"); - DbgPrint("[shell32, SHELL_FindExecutable] Remove double quotation marks and command line arguments\n"); /* Remove double quotation marks and command line arguments */ if (*lpResult == '"') { Modified: branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shlfileop.cpp [iso-8859-1] Fri Sep 9 10:17:07 2011 @@ -307,8 +307,6 @@ HICON hIcon; int ret; - DbgPrint("[shell32, SHELL_ConfirmDialogW] Called\n"); - assert(nKindOfDialog >= 0 && nKindOfDialog < 32); if (op && (op->dwYesToAllMask & (1 << nKindOfDialog))) return TRUE; @@ -744,8 +742,6 @@ BOOL ret; DWORD attribs; - DbgPrint("[shell32, SHNotifyCopyFileW] Called\n"); - TRACE("(%s %s %s)\n", debugstr_w(src), debugstr_w(dest), bFailIfExists ? "failIfExists" : ""); /* Destination file may already exist with read only attribute */ @@ -756,10 +752,9 @@ if (GetFileAttributesW(dest) & FILE_ATTRIBUTE_READONLY) { SetFileAttributesW(dest, attribs & ~FILE_ATTRIBUTE_READONLY); - DbgPrint("[shell32, SHNotifyCopyFileW] Something went really WRONG...%ls, we still have FILE_ATTRIBUTE_READONLY\n", dest); if (GetFileAttributesW(dest) & FILE_ATTRIBUTE_READONLY) { - DbgPrint("[shell32, SHNotifyCopyFileW] STILL SHIT\n"); + TRACE("[shell32, SHNotifyCopyFileW] STILL SHIT\n"); } } @@ -1407,7 +1402,6 @@ { if (!copy_file_to_file(op, entryToCopy->szFullPath, fileDest->szFullPath)) { - DbgPrint("[shell32, copy_files] copy_file_to_file failed\n"); op->req->fAnyOperationsAborted = TRUE; return ERROR_CANCELLED; } Modified: branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1] Fri Sep 9 10:17:07 2011 @@ -906,8 +906,6 @@ TRACE("%p\n",this); - DbgPrint("[shell32, CDefView::OnCreate] Called\n"); - if(CreateList()) { if(InitList()) @@ -2192,8 +2190,6 @@ TRACE("(%p)->(shlview=%p set=%p shlbrs=%p rec=%p hwnd=%p) incomplete\n",this, lpPrevView,lpfs, psb, prcView, phWnd); - DbgPrint("[shell32, CDefView::CreateViewWindow] Called lpfs = 0x%x, psb = 0x%x\n", lpfs, psb); - if (lpfs != NULL) TRACE("-- vmode=%x flags=%x\n", lpfs->ViewMode, lpfs->fFlags); if (prcView != NULL) @@ -2216,8 +2212,6 @@ { TRACE("-- CommDlgBrowser\n"); } - - DbgPrint("[shell32, CDefView::CreateViewWindow] About to call the create function\n"); Create(hWndParent, prcView, NULL, WS_CHILD | WS_TABSTOP, 0, 0U); if (m_hWnd == NULL)

13 years, 3 months

[cmihail] 53651: [shell32.dll] [FORMATTING] - Second wave of formatting. At least now we won't have any tabs and spaces mixed in.

by cmihail＠svn.reactos.org

Author: cmihail Date: Thu Sep 8 22:43:43 2011 New Revision: 53651 URL: http://svn.reactos.org/svn/reactos?rev=53651&view=rev Log: [shell32.dll] [FORMATTING] - Second wave of formatting. At least now we won't have any tabs and spaces mixed in. Modified: branches/shell32_new-bringup/dll/win32/shell32/brsfolder.cpp branches/shell32_new-bringup/dll/win32/shell32/changenotify.cpp branches/shell32_new-bringup/dll/win32/shell32/clipboard.cpp branches/shell32_new-bringup/dll/win32/shell32/control.cpp branches/shell32_new-bringup/dll/win32/shell32/dataobject.cpp branches/shell32_new-bringup/dll/win32/shell32/desktop.cpp branches/shell32_new-bringup/dll/win32/shell32/dragdrophelper.cpp branches/shell32_new-bringup/dll/win32/shell32/drive.cpp branches/shell32_new-bringup/dll/win32/shell32/extracticon.cpp branches/shell32_new-bringup/dll/win32/shell32/folder_options.cpp branches/shell32_new-bringup/dll/win32/shell32/folders.cpp branches/shell32_new-bringup/dll/win32/shell32/fprop.cpp branches/shell32_new-bringup/dll/win32/shell32/iconcache.cpp branches/shell32_new-bringup/dll/win32/shell32/pidl.cpp branches/shell32_new-bringup/dll/win32/shell32/ros-systray.cpp branches/shell32_new-bringup/dll/win32/shell32/she_ocmenu.cpp branches/shell32_new-bringup/dll/win32/shell32/shellitem.cpp branches/shell32_new-bringup/dll/win32/shell32/shellole.cpp branches/shell32_new-bringup/dll/win32/shell32/shellord.cpp branches/shell32_new-bringup/dll/win32/shell32/shellpath.cpp branches/shell32_new-bringup/dll/win32/shell32/shellreg.cpp branches/shell32_new-bringup/dll/win32/shell32/shellstring.cpp branches/shell32_new-bringup/dll/win32/shell32/shfldr_admintools.cpp branches/shell32_new-bringup/dll/win32/shell32/shfldr_fs.cpp branches/shell32_new-bringup/dll/win32/shell32/shfldr_mycomp.cpp branches/shell32_new-bringup/dll/win32/shell32/shfldr_netplaces.cpp branches/shell32_new-bringup/dll/win32/shell32/shfldr_recyclebin.cpp branches/shell32_new-bringup/dll/win32/shell32/shlfolder.cpp branches/shell32_new-bringup/dll/win32/shell32/shlfsbind.cpp branches/shell32_new-bringup/dll/win32/shell32/shlmenu.cpp branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp branches/shell32_new-bringup/dll/win32/shell32/shpolicy.cpp branches/shell32_new-bringup/dll/win32/shell32/shv_def_cmenu.cpp branches/shell32_new-bringup/dll/win32/shell32/shv_item_new.cpp branches/shell32_new-bringup/dll/win32/shell32/startmenu.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/shell32_new-bringup/dll/win32/shell32/brsfolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/changenotify.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/clipboard.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/control.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/dataobject.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/dragdrophelper.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/drive.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/extracticon.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/folder_options.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/fprop.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/iconcache.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/pidl.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/ros-systray.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/she_ocmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shellitem.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shellole.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shellord.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shellpath.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shellreg.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shellstring.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shfldr_admintools.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shfldr_fs.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shfldr_mycomp.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shfldr_netplaces.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shfldr_recyclebin.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shlfsbind.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shlmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shpolicy.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shv_def_cmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/shv_item_new.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… Modified: branches/shell32_new-bringup/dll/win32/shell32/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s…

13 years, 3 months

← Newer
1
...
23
24
25
26
27
28
29
...
40
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 September 2011