Ros-diffs June 2014

ros-diffs@reactos.org

15 participants
157 discussions

[hbelusca] 63680: [WINLOGON] - Do not shutdown the computer if winlogon cannot register itself to user32 (eg. the user double-clicks on winlogon.exe when ReactOS is already launched :P ). - Add a n...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jun 30 21:08:32 2014 New Revision: 63680 URL: http://svn.reactos.org/svn/reactos?rev=63680&view=rev Log: [WINLOGON] - Do not shutdown the computer if winlogon cannot register itself to user32 (eg. the user double-clicks on winlogon.exe when ReactOS is already launched :P ). - Add a note about a possible improvement of the error dialog if msgina cannot be loaded correctly. - Fix french translation. Modified: trunk/reactos/base/system/winlogon/lang/fr-FR.rc trunk/reactos/base/system/winlogon/winlogon.c Modified: trunk/reactos/base/system/winlogon/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… ============================================================================== --- trunk/reactos/base/system/winlogon/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/lang/fr-FR.rc [iso-8859-1] Mon Jun 30 21:08:32 2014 @@ -18,7 +18,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Le chargement du DLL %s de l'interface utilisateur a Ã©chouÃ©", IDC_GINALOADFAILED, 39, 16, 156, 24 - LTEXT "Contactez votre administrateur systÃ¨me pour remplacer le DLL, ou restaurez le DLL original.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + LTEXT "Contactez votre administrateur systÃ¨me pour remplacer la DLL, ou restaurez la DLL originale.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 DEFPUSHBUTTON "&RedÃ©marrer", 1, 80, 91, 68, 14 END Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Mon Jun 30 21:08:32 2014 @@ -321,8 +321,8 @@ if (!RegisterLogonProcess(GetCurrentProcessId(), TRUE)) { ERR("WL: Could not register logon process\n"); - NtShutdownSystem(ShutdownNoReboot); - ExitProcess(0); + NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, NULL, OptionOk, &HardErrorResponse); + ExitProcess(1); } WLSession = (PWLSESSION)HeapAlloc(GetProcessHeap(), 0, sizeof(WLSESSION)); @@ -366,7 +366,7 @@ if (!StartLsass()) { ERR("WL: Failed to start lsass.exe service (error %lu)\n", GetLastError()); - NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, 0, OptionOk, &HardErrorResponse); + NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED, 0, 0, NULL, OptionOk, &HardErrorResponse); ExitProcess(1); } @@ -377,7 +377,9 @@ if (!GinaInit(WLSession)) { ERR("WL: Failed to initialize Gina\n"); - DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_GINALOADFAILED), GetDesktopWindow(), GinaLoadFailedWindowProc, (LPARAM)L""); + // FIXME: Retrieve the real name of the GINA DLL we were trying to load. + // It is known only inside the GinaInit function... + DialogBoxParam(hAppInstance, MAKEINTRESOURCE(IDD_GINALOADFAILED), GetDesktopWindow(), GinaLoadFailedWindowProc, (LPARAM)L"msgina.dll"); HandleShutdown(WLSession, WLX_SAS_ACTION_SHUTDOWN_REBOOT); ExitProcess(1); }

10 years, 5 months

[hbelusca] 63679: [WINLOGON] Add a suitable icon, from the "Farm-Fresh Icon Set" pack of "FatCow Web Hosting" (http://www.fatcow.com/), under a Creative Commons Attribution 3.0 License. See the COP...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jun 30 20:26:03 2014 New Revision: 63679 URL: http://svn.reactos.org/svn/reactos?rev=63679&view=rev Log: [WINLOGON] Add a suitable icon, from the "Farm-Fresh Icon Set" pack of "FatCow Web Hosting" (http://www.fatcow.com/), under a Creative Commons Attribution 3.0 License. See the COPYING file for more details. Added: trunk/reactos/base/system/winlogon/res/ (with props) trunk/reactos/base/system/winlogon/res/COPYING (with props) trunk/reactos/base/system/winlogon/res/winlogon.ico (with props) Modified: trunk/reactos/base/system/winlogon/winlogon.rc Propchange: trunk/reactos/base/system/winlogon/res/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jun 30 20:26:03 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/base/system/winlogon/res/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/base/system/winlogon/res/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/base/system/winlogon/res/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/base/system/winlogon/res/COPYING URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/res/C… ============================================================================== --- trunk/reactos/base/system/winlogon/res/COPYING (added) +++ trunk/reactos/base/system/winlogon/res/COPYING [iso-8859-1] Mon Jun 30 20:26:03 2014 @@ -0,0 +1,12 @@ +Farm-Fresh Icon Set +FatCow Web Hosting - http://www.fatcow.com/ + +Terms of Use +============ +These icon sets are licensed under a Creative Commons Attribution 3.0 License. +This means you can freely use these icons for any purpose, private and commercial, +including online services, templates, themes and software. However, you should +include a link to this page (http://www.fatcow.com/free-icons) in your credits +(software or website). The icons may not be resold, sub-licensed, rented, transferred +or otherwise made available for use. Please link to this page on fatcow.com if you +would like to spread the word. Propchange: trunk/reactos/base/system/winlogon/res/COPYING ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/winlogon/res/winlogon.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/res/w… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/system/winlogon/res/winlogon.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/system/winlogon/winlogon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.rc [iso-8859-1] Mon Jun 30 20:26:03 2014 @@ -2,17 +2,15 @@ #include <winuser.h> #include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Logon Application" #define REACTOS_STR_INTERNAL_NAME "winlogon" #define REACTOS_STR_ORIGINAL_FILENAME "winlogon.exe" #include <reactos/version.rc> -/* -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -IDI_WINLOGON ICON "resources/winlogon.ico" -*/ +IDI_WINLOGON ICON "res/winlogon.ico" /* UTF-8 */ #pragma code_page(65001)

10 years, 5 months

[jgardou] 63678: [NTDLL_APITEST] - Add a test showing that memory content is still available after changing protection to PAGE_NOACCESS

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Jun 30 19:50:28 2014 New Revision: 63678 URL: http://svn.reactos.org/svn/reactos?rev=63678&view=rev Log: [NTDLL_APITEST] - Add a test showing that memory content is still available after changing protection to PAGE_NOACCESS Modified: trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c Modified: trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtProtectV… ============================================================================== --- trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtProtectVirtualMemory.c [iso-8859-1] Mon Jun 30 19:50:28 2014 @@ -89,6 +89,27 @@ { ok(*allocationStart == 0, "Test should not go as far as this.\n"); } EndSeh(STATUS_ACCESS_VIOLATION); + + /* Set it as readable again */ + status = NtProtectVirtualMemory(NtCurrentProcess(), + (void**)&allocationStart, + &allocationSize, + PAGE_READONLY, + &oldProtection); + ok(NT_SUCCESS(status), "NtProtectVirtualMemory failed.\n"); + ok(oldProtection == PAGE_NOACCESS, "Expected PAGE_READONLY, got %08lx.\n", oldProtection); + + /* Try writing it */ + StartSeh() + { + *allocationStart = 0xAA; + } EndSeh(STATUS_ACCESS_VIOLATION); + + /* Try reading it */ + StartSeh() + { + ok(*allocationStart == 0xFF, "Memory content was not preserved.\n"); + } EndSeh(STATUS_SUCCESS); /* Free memory */ status = NtFreeVirtualMemory(NtCurrentProcess(), @@ -96,4 +117,4 @@ &allocationSize, MEM_RELEASE); ok(NT_SUCCESS(status), "Failed freeing memory.\n"); -} +}

10 years, 5 months

[jgardou] 63677: [WIN32K/NTGDI] - Better semi-implementation of CreateHalftonePalette

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Jun 30 18:27:44 2014 New Revision: 63677 URL: http://svn.reactos.org/svn/reactos?rev=63677&view=rev Log: [WIN32K/NTGDI] - Better semi-implementation of CreateHalftonePalette Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c trunk/reactos/win32ss/gdi/ntgdi/palette.h Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Mon Jun 30 18:27:44 2014 @@ -65,7 +65,7 @@ // Create default palette (20 system colors) gppalDefault = PALETTE_AllocPalWithHandle(PAL_INDEXED, 20, - (PULONG)g_sysPalTemplate, + g_sysPalTemplate, 0, 0, 0); GDIOBJ_vReferenceObjectByPointer(&gppalDefault->BaseObject); PALETTE_UnlockPalette(gppalDefault); @@ -132,7 +132,7 @@ PALETTE_AllocPalette( _In_ ULONG iMode, _In_ ULONG cColors, - _In_opt_ PULONG pulColors, + _In_opt_ const PALETTEENTRY* pEntries, _In_ FLONG flRed, _In_ FLONG flGreen, _In_ FLONG flBlue) @@ -174,12 +174,10 @@ if (iMode & PAL_INDEXED) { /* Check if we got a color array */ - if (pulColors) + if (pEntries) { /* Copy the entries */ - RtlCopyMemory(ppal->IndexedColors, - pulColors, - cColors * sizeof(ULONG)); + RtlCopyMemory(ppal->IndexedColors, pEntries, cColors * sizeof(pEntries[0])); } } else if (iMode & PAL_BITFIELDS) @@ -208,7 +206,7 @@ PALETTE_AllocPalWithHandle( _In_ ULONG iMode, _In_ ULONG cColors, - _In_opt_ PULONG pulColors, + _In_opt_ const PALETTEENTRY* pEntries, _In_ FLONG flRed, _In_ FLONG flGreen, _In_ FLONG flBlue) @@ -216,7 +214,7 @@ PPALETTE ppal; /* Allocate the palette without a handle */ - ppal = PALETTE_AllocPalette(iMode, cColors, pulColors, flRed, flGreen, flBlue); + ppal = PALETTE_AllocPalette(iMode, cColors, pEntries, flRed, flGreen, flBlue); if (!ppal) return NULL; /* Insert the palette into the handle table */ @@ -382,7 +380,7 @@ PPALETTE ppal; HPALETTE hpal; - ppal = PALETTE_AllocPalette(iMode, cColors, pulColors, flRed, flGreen, flBlue); + ppal = PALETTE_AllocPalette(iMode, cColors, (PPALETTEENTRY)pulColors, flRed, flGreen, flBlue); if (!ppal) return NULL; hpal = GDIOBJ_hInsertObject(&ppal->BaseObject, GDI_OBJ_HMGR_PUBLIC); @@ -454,7 +452,7 @@ pLogPal->palNumEntries = cEntries; ppal = PALETTE_AllocPalWithHandle(PAL_INDEXED, cEntries, - (PULONG)pLogPal->palPalEntry, + pLogPal->palPalEntry, 0, 0, 0); if (ppal != NULL) @@ -512,107 +510,81 @@ return hpal; } -HPALETTE APIENTRY NtGdiCreateHalftonePalette(HDC hDC) +HPALETTE +APIENTRY +NtGdiCreateHalftonePalette(HDC hDC) { int i, r, g, b; - struct { - WORD Version; - WORD NumberOfEntries; - PALETTEENTRY aEntries[256]; - } Palette; - - Palette.Version = 0x300; - Palette.NumberOfEntries = 256; - if (IntGetSystemPaletteEntries(hDC, 0, 256, Palette.aEntries) == 0) - { - /* From WINE, more that 256 color math */ - Palette.NumberOfEntries = 20; - for (i = 0; i < Palette.NumberOfEntries; i++) - { - Palette.aEntries[i].peRed=0xff; - Palette.aEntries[i].peGreen=0xff; - Palette.aEntries[i].peBlue=0xff; - Palette.aEntries[i].peFlags=0x00; - } - - Palette.aEntries[0].peRed=0x00; - Palette.aEntries[0].peBlue=0x00; - Palette.aEntries[0].peGreen=0x00; - - /* The first 6 */ - for (i=1; i <= 6; i++) - { - Palette.aEntries[i].peRed=(i%2)?0x80:0; - Palette.aEntries[i].peGreen=(i==2)?0x80:(i==3)?0x80:(i==6)?0x80:0; - Palette.aEntries[i].peBlue=(i>3)?0x80:0; - } - - for (i=7; i <= 12; i++) - { - switch(i) + PALETTEENTRY PalEntries[256]; + PPALETTE ppal; + PDC pdc; + HPALETTE hpal = NULL; + + pdc = DC_LockDc(hDC); + if (!pdc) + { + EngSetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + + RtlZeroMemory(PalEntries, sizeof(PalEntries)); + + /* First and last ten entries are default ones */ + for (i = 0; i < 10; i++) + { + PalEntries[i].peRed = g_sysPalTemplate[i].peRed; + PalEntries[i].peGreen = g_sysPalTemplate[i].peGreen; + PalEntries[i].peBlue = g_sysPalTemplate[i].peBlue; + + PalEntries[246 + i].peRed = g_sysPalTemplate[10 + i].peRed; + PalEntries[246 + i].peGreen = g_sysPalTemplate[10 + i].peGreen; + PalEntries[246 + i].peBlue = g_sysPalTemplate[10 + i].peBlue; + } + + ppal = PALETTE_ShareLockPalette(pdc->dclevel.hpal); + if (ppal && (ppal->flFlags & PAL_INDEXED)) + { + /* FIXME: optimize the palette for the current palette */ + UNIMPLEMENTED + } + else + { + for (r = 0; r < 6; r++) + { + for (g = 0; g < 6; g++) { - case 7: - Palette.aEntries[i].peRed=0xc0; - Palette.aEntries[i].peBlue=0xc0; - Palette.aEntries[i].peGreen=0xc0; - break; - case 8: - Palette.aEntries[i].peRed=0xc0; - Palette.aEntries[i].peGreen=0xdc; - Palette.aEntries[i].peBlue=0xc0; - break; - case 9: - Palette.aEntries[i].peRed=0xa6; - Palette.aEntries[i].peGreen=0xca; - Palette.aEntries[i].peBlue=0xf0; - break; - case 10: - Palette.aEntries[i].peRed=0xff; - Palette.aEntries[i].peGreen=0xfb; - Palette.aEntries[i].peBlue=0xf0; - break; - case 11: - Palette.aEntries[i].peRed=0xa0; - Palette.aEntries[i].peGreen=0xa0; - Palette.aEntries[i].peBlue=0xa4; - break; - case 12: - Palette.aEntries[i].peRed=0x80; - Palette.aEntries[i].peGreen=0x80; - Palette.aEntries[i].peBlue=0x80; - } - } - - for (i=13; i <= 18; i++) - { - Palette.aEntries[i].peRed=(i%2)?0xff:0; - Palette.aEntries[i].peGreen=(i==14)?0xff:(i==15)?0xff:(i==18)?0xff:0; - Palette.aEntries[i].peBlue=(i>15)?0xff:0x00; - } - } - else - { - /* 256 color table */ - for (r = 0; r < 6; r++) - for (g = 0; g < 6; g++) for (b = 0; b < 6; b++) { i = r + g*6 + b*36 + 10; - Palette.aEntries[i].peRed = r * 51; - Palette.aEntries[i].peGreen = g * 51; - Palette.aEntries[i].peBlue = b * 51; + PalEntries[i].peRed = r * 51; + PalEntries[i].peGreen = g * 51; + PalEntries[i].peBlue = b * 51; } + } + } for (i = 216; i < 246; i++) { int v = (i - 216) << 3; - Palette.aEntries[i].peRed = v; - Palette.aEntries[i].peGreen = v; - Palette.aEntries[i].peBlue = v; - } - } - - return GreCreatePaletteInternal((LOGPALETTE *)&Palette, Palette.NumberOfEntries); + PalEntries[i].peRed = v; + PalEntries[i].peGreen = v; + PalEntries[i].peBlue = v; + } + } + + if (ppal) + PALETTE_ShareUnlockPalette(ppal); + + DC_UnlockDc(pdc); + + ppal = PALETTE_AllocPalWithHandle(PAL_INDEXED, 256, PalEntries, 0, 0, 0); + if (ppal) + { + hpal = ppal->BaseObject.hHmgr; + PALETTE_UnlockPalette(ppal); + } + + return hpal; } BOOL Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Mon Jun 30 18:27:44 2014 @@ -65,7 +65,7 @@ PALETTE_AllocPalette( _In_ ULONG iMode, _In_ ULONG cColors, - _In_opt_ PULONG pulColors, + _In_opt_ const PALETTEENTRY* pEntries, _In_ FLONG flRed, _In_ FLONG flGreen, _In_ FLONG flBlue); @@ -75,7 +75,7 @@ PALETTE_AllocPalWithHandle( _In_ ULONG iMode, _In_ ULONG cColors, - _In_opt_ PULONG pulColors, + _In_opt_ const PALETTEENTRY* pEntries, _In_ FLONG flRed, _In_ FLONG flGreen, _In_ FLONG flBlue);

10 years, 5 months

[dquintana] 63676: [SHELL32] * Some start menu icons by Robert Naumann (gonzoMD) in proper size and content.

by dquintana＠svn.reactos.org

Author: dquintana Date: Mon Jun 30 17:04:47 2014 New Revision: 63676 URL: http://svn.reactos.org/svn/reactos?rev=63676&view=rev Log: [SHELL32] * Some start menu icons by Robert Naumann (gonzoMD) in proper size and content. Modified: branches/shell-experiments/dll/win32/shell32/bitmap_res.rc branches/shell-experiments/dll/win32/shell32/res/icons/322.ico branches/shell-experiments/dll/win32/shell32/res/icons/323.ico branches/shell-experiments/dll/win32/shell32/res/icons/324.ico branches/shell-experiments/dll/win32/shell32/res/icons/325.ico branches/shell-experiments/dll/win32/shell32/res/icons/326.ico branches/shell-experiments/dll/win32/shell32/res/icons/327.ico branches/shell-experiments/dll/win32/shell32/res/icons/328.ico branches/shell-experiments/dll/win32/shell32/res/icons/329.ico branches/shell-experiments/dll/win32/shell32/res/icons/330.ico Modified: branches/shell-experiments/dll/win32/shell32/bitmap_res.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/bitmap_res.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/bitmap_res.rc [iso-8859-1] Mon Jun 30 17:04:47 2014 @@ -1,4 +1,5 @@ IDB_REACTOS BITMAP "res/bitmaps/reactos.bmp" + IDB_SHELL_IEXPLORE_LG BITMAP "res/bitmaps/204.bmp" IDB_SHELL_IEXPLORE_LG_HOT BITMAP "res/bitmaps/205.bmp" IDB_SHELL_IEXPLORE_SM BITMAP "res/bitmaps/206.bmp" Modified: branches/shell-experiments/dll/win32/shell32/res/icons/322.ico URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== Binary files - no diff available. Modified: branches/shell-experiments/dll/win32/shell32/res/icons/323.ico URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== Binary files - no diff available. Modified: branches/shell-experiments/dll/win32/shell32/res/icons/324.ico URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== Binary files - no diff available. Modified: branches/shell-experiments/dll/win32/shell32/res/icons/325.ico URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== Binary files - no diff available. Modified: branches/shell-experiments/dll/win32/shell32/res/icons/326.ico URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== Binary files - no diff available. Modified: branches/shell-experiments/dll/win32/shell32/res/icons/327.ico URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== Binary files - no diff available. Modified: branches/shell-experiments/dll/win32/shell32/res/icons/328.ico URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== Binary files - no diff available. Modified: branches/shell-experiments/dll/win32/shell32/res/icons/329.ico URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== Binary files - no diff available. Modified: branches/shell-experiments/dll/win32/shell32/res/icons/330.ico URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== Binary files - no diff available.

10 years, 5 months

[akhaldi] 63675: [TRANSLATIONS] * Turkish translation update by Erdem Ersoy. CORE-7861

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jun 30 12:00:07 2014 New Revision: 63675 URL: http://svn.reactos.org/svn/reactos?rev=63675&view=rev Log: [TRANSLATIONS] * Turkish translation update by Erdem Ersoy. CORE-7861 Added: trunk/reactos/dll/cpl/usrmgr/lang/tr-TR.rc (with props) Modified: trunk/reactos/base/applications/calc/lang/tr-TR.rc trunk/reactos/base/applications/charmap/lang/tr-TR.rc trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc trunk/reactos/base/applications/games/spider/lang/tr-TR.rc trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc trunk/reactos/base/applications/mplay32/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc trunk/reactos/base/applications/mspaint/lang/tr-TR.rc trunk/reactos/base/applications/notepad/lang/tr-TR.rc trunk/reactos/base/applications/rapps/lang/tr-TR.rc trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc trunk/reactos/base/applications/winhlp32/lang/Tr.rc trunk/reactos/base/applications/write/lang/Sq.rc trunk/reactos/base/setup/reactos/lang/tr-TR.rc trunk/reactos/base/setup/vmwinst/lang/tr-TR.rc trunk/reactos/base/setup/welcome/lang/tr-TR.rc trunk/reactos/boot/freeldr/fdebug/fdebug.rc trunk/reactos/boot/freeldr/fdebug/lang/tr-TR.rc trunk/reactos/dll/cpl/access/lang/tr-TR.rc trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc trunk/reactos/dll/cpl/appwiz/rsrc.rc trunk/reactos/dll/cpl/console/lang/tr-TR.rc trunk/reactos/dll/cpl/desk/lang/tr-TR.rc trunk/reactos/dll/cpl/hdwwiz/lang/tr-TR.rc trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc trunk/reactos/dll/cpl/input/lang/tr-TR.rc trunk/reactos/dll/cpl/intl/lang/tr-TR.rc trunk/reactos/dll/cpl/joy/lang/tr-TR.rc trunk/reactos/dll/cpl/liccpa/lang/tr-TR.rc trunk/reactos/dll/cpl/main/lang/tr-TR.rc trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc trunk/reactos/dll/cpl/telephon/lang/tr-TR.rc trunk/reactos/dll/cpl/timedate/lang/tr-TR.rc trunk/reactos/dll/cpl/usrmgr/usrmgr.rc trunk/reactos/dll/cpl/wined3dcfg/lang/tr-TR.rc trunk/reactos/dll/shellext/deskadp/deskadp.rc trunk/reactos/dll/shellext/deskadp/lang/tr-TR.rc trunk/reactos/dll/shellext/deskmon/deskmon.rc trunk/reactos/dll/shellext/deskmon/lang/tr-TR.rc trunk/reactos/dll/shellext/slayer/lang/tr-TR.rc trunk/reactos/dll/shellext/slayer/slayer.rc trunk/reactos/dll/win32/aclui/lang/tr-TR.rc trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc trunk/reactos/dll/win32/mpr/mpr.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc trunk/reactos/dll/win32/msacm32/msacm.rc trunk/reactos/dll/win32/msi/msi_Tr.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Tr.rc trunk/reactos/dll/win32/oleaut32/oleaut32.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc trunk/reactos/dll/win32/shlwapi/shlwapi.rc trunk/reactos/dll/win32/wininet/lang/wininet_Tr.rc trunk/reactos/dll/win32/wininet/rsrc.rc trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc trunk/reactos/dll/win32/wldap32/wldap32.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/charmap/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/spider/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/winmine/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/winhlp32/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/write/lang/Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/write/la… Modified: trunk/reactos/base/setup/reactos/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/tr… Modified: trunk/reactos/base/setup/vmwinst/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/tr… Modified: trunk/reactos/base/setup/welcome/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/tr… Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… Modified: trunk/reactos/boot/freeldr/fdebug/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/t… Modified: trunk/reactos/dll/cpl/access/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/tr-TR.… Modified: trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/tr-TR.… Modified: trunk/reactos/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/rsrc.rc?rev… Modified: trunk/reactos/dll/cpl/console/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/tr-TR… Modified: trunk/reactos/dll/cpl/desk/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/tr-TR.rc… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/tr-TR.… Modified: trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/tr-TR… Modified: trunk/reactos/dll/cpl/input/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/tr-TR.r… Modified: trunk/reactos/dll/cpl/intl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/tr-TR.rc… Modified: trunk/reactos/dll/cpl/joy/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/tr-TR.rc?… Modified: trunk/reactos/dll/cpl/liccpa/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/lang/tr-TR.… Modified: trunk/reactos/dll/cpl/main/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/tr-TR.rc… Modified: trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/tr-TR.r… Modified: trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/tr-T… Modified: trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/tr-TR.r… Modified: trunk/reactos/dll/cpl/telephon/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/tr-T… Modified: trunk/reactos/dll/cpl/timedate/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/tr-T… Added: trunk/reactos/dll/cpl/usrmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/tr-TR.… Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rc?r… Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/tr… Modified: trunk/reactos/dll/shellext/deskadp/deskadp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/deska… Modified: trunk/reactos/dll/shellext/deskadp/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/shellext/deskmon/deskmon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/deskm… Modified: trunk/reactos/dll/shellext/deskmon/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… Modified: trunk/reactos/dll/shellext/slayer/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/lang/t… Modified: trunk/reactos/dll/shellext/slayer/slayer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/slayer… Modified: trunk/reactos/dll/win32/aclui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/tr-TR… Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Tr.… Modified: trunk/reactos/dll/win32/mpr/mpr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr.rc?rev=6… Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… Modified: trunk/reactos/dll/win32/msacm32/msacm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm.rc… Modified: trunk/reactos/dll/win32/msi/msi_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Tr.rc?re… Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… Modified: trunk/reactos/dll/win32/oleaut32/oleaut32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/oleaut3… Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi.… Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… Modified: trunk/reactos/dll/win32/wininet/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/rsrc.rc?… Modified: trunk/reactos/dll/win32/wldap32/lang/wldap32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/lang/wld… Modified: trunk/reactos/dll/win32/wldap32/wldap32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.…

10 years, 5 months

[hbelusca] 63674: [NDK]: Certainly that this member exists only in Vista+. See r63673.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 29 18:30:12 2014 New Revision: 63674 URL: http://svn.reactos.org/svn/reactos?rev=63674&view=rev Log: [NDK]: Certainly that this member exists only in Vista+. See r63673. Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Sun Jun 29 18:30:12 2014 @@ -576,6 +576,16 @@ _In_ PVOID Parameter ); +#if (NTDDI_VERSION >= NTDDI_LONGHORN) +typedef +NTSTATUS +(NTAPI *PKWIN32_WIN32DATACOLLECTION_CALLOUT)( + _In_ struct _EPROCESS *Process, + _In_ PVOID Callback, + _In_ PVOID Context +); +#endif + // // Lego Callback // @@ -1413,6 +1423,9 @@ PKWIN32_SESSION_CALLOUT WindowStationDeleteProcedure; PKWIN32_SESSION_CALLOUT WindowStationParseProcedure; PKWIN32_SESSION_CALLOUT WindowStationOpenProcedure; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + PKWIN32_WIN32DATACOLLECTION_CALLOUT Win32DataCollectionProcedure; +#endif } WIN32_CALLOUTS_FPNS, *PWIN32_CALLOUTS_FPNS; #endif // !NTOS_MODE_USER

10 years, 5 months

[hbelusca] 63673: [NDK] - Add PsGetThreadProcess prototype. - Remove Win32DataCollectionProcedure member in WIN32_CALLOUTS_FPNS structure that doesn't exist in Win2k3 SP1 and SP2.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 29 17:54:59 2014 New Revision: 63673 URL: http://svn.reactos.org/svn/reactos?rev=63673&view=rev Log: [NDK] - Add PsGetThreadProcess prototype. - Remove Win32DataCollectionProcedure member in WIN32_CALLOUTS_FPNS structure that doesn't exist in Win2k3 SP1 and SP2. Modified: trunk/reactos/include/ndk/psfuncs.h trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Sun Jun 29 17:54:59 2014 @@ -106,6 +106,13 @@ HANDLE NTAPI PsGetThreadId( + _In_ PETHREAD Thread +); + +NTKERNELAPI +PEPROCESS +NTAPI +PsGetThreadProcess( _In_ PETHREAD Thread ); Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Sun Jun 29 17:54:59 2014 @@ -576,14 +576,6 @@ _In_ PVOID Parameter ); -typedef -NTSTATUS -(NTAPI *PKWIN32_WIN32DATACOLLECTION_CALLOUT)( - _In_ struct _EPROCESS *Process, - _In_ PVOID Callback, - _In_ PVOID Context -); - // // Lego Callback // @@ -1421,7 +1413,6 @@ PKWIN32_SESSION_CALLOUT WindowStationDeleteProcedure; PKWIN32_SESSION_CALLOUT WindowStationParseProcedure; PKWIN32_SESSION_CALLOUT WindowStationOpenProcedure; - PKWIN32_WIN32DATACOLLECTION_CALLOUT Win32DataCollectionProcedure; } WIN32_CALLOUTS_FPNS, *PWIN32_CALLOUTS_FPNS; #endif // !NTOS_MODE_USER

10 years, 5 months

[akhaldi] 63672: [SAL] * Add _Field_size_bytes_part_ annotation.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Jun 29 16:37:18 2014 New Revision: 63672 URL: http://svn.reactos.org/svn/reactos?rev=63672&view=rev Log: [SAL] * Add _Field_size_bytes_part_ annotation. Modified: trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=636… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Sun Jun 29 16:37:18 2014 @@ -605,7 +605,7 @@ //#define _Field_size_bytes_full_(size) //#define _Field_size_bytes_full_opt_(size) #define _Field_size_bytes_opt_(size) _SAL2_NAME(_Field_size_bytes_opt_) _Group_(_Maybenull_ _Writable_bytes_(size)) -//#define _Field_size_bytes_part_(size, count) +#define _Field_size_bytes_part_(size,count) _SAL2_NAME(_Field_size_bytes_part_) _Group_(_Notnull_ _Writable_bytes_(size) _Readable_bytes_(count)) #define _Field_size_bytes_part_opt_(size, count) _SAL2_NAME(_Field_size_bytes_part_opt_) _Group_(_Maybenull_ _Writable_bytes_(size) _Readable_bytes_(count)) //#define _Field_size_full_(size) //#define _Field_size_full_opt_(size)

10 years, 5 months

[dquintana] 63671: [RSHELL] * Change the way the menu items are activated. Now the menubar activates on mouse down, and the other items activate on mouse up. Not everything works perfectly yet, but...

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Jun 29 15:42:06 2014 New Revision: 63671 URL: http://svn.reactos.org/svn/reactos?rev=63671&view=rev Log: [RSHELL] * Change the way the menu items are activated. Now the menubar activates on mouse down, and the other items activate on mouse up. Not everything works perfectly yet, but it will eventually allow proper usage of the shell menus by keeping the mouse button down. I believe this is also the way to go to avoid the "instant reopening" of the menus when trying to close them. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuBand.h branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.h Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Sun Jun 29 15:42:06 2014 @@ -1017,6 +1017,24 @@ return hr; } +HRESULT CMenuBand::_MenuBarMouseDown(HWND hwnd, INT item) +{ + if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hwnd) == S_OK) + m_staticToolbar->MenuBarMouseDown(item); + if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hwnd) == S_OK) + m_SFToolbar->MenuBarMouseDown(item); + return S_OK; +} + +HRESULT CMenuBand::_MenuBarMouseUp(HWND hwnd, INT item) +{ + if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hwnd) == S_OK) + m_staticToolbar->MenuBarMouseUp(item); + if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hwnd) == S_OK) + m_SFToolbar->MenuBarMouseUp(item); + return S_OK; +} + HRESULT STDMETHODCALLTYPE CMenuBand::InvalidateItem(LPSMDATA psmd, DWORD dwFlags) { UNIMPLEMENTED; Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] Sun Jun 29 15:42:06 2014 @@ -191,6 +191,8 @@ HRESULT _IsPopup(); HRESULT _IsTracking(); HRESULT _KillPopupTimers(); + HRESULT _MenuBarMouseDown(HWND hwnd, INT item); + HRESULT _MenuBarMouseUp(HWND hwnd, INT item); BOOL UseBigIcons() { Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Sun Jun 29 15:42:06 2014 @@ -160,6 +160,9 @@ m_selectedMenu(NULL), m_selectedItem(0), m_selectedItemFlags(0), + m_isLButtonDown(FALSE), + m_movedSinceDown(FALSE), + m_windowAtDown(NULL), m_bandCount(0) { m_ptPrev.x = 0; @@ -302,12 +305,18 @@ if (cCapture && cCapture != m_captureHwnd && m_current->type != TrackedMenuEntry) return TRUE; + + m_movedSinceDown = TRUE; + m_ptPrev = pt; child = WindowFromPoint(pt); StackEntry * entry = NULL; - IsTrackedWindow(child, &entry); + if (IsTrackedWindow(child, &entry) == S_OK) + { + DbgPrint("MouseMove %d\n", m_isLButtonDown); + } BOOL isTracking = FALSE; if (entry) @@ -320,7 +329,7 @@ { TRACE("Hot item tracking detected a change (capture=%p / cCapture=%p)...\n", m_captureHwnd, cCapture); DisableMouseTrack(NULL, FALSE); - if (isTracking && iHitTestResult>=0 && m_current->type == TrackedMenuEntry) + if (isTracking && iHitTestResult >= 0 && m_current->type == TrackedMenuEntry) SendMessage(entry->hwnd, WM_CANCELMODE, 0, 0); PostMessage(child, WM_USER_CHANGETRACKEDITEM, iHitTestResult, MAKELPARAM(isTracking, TRUE)); if (m_current->type == TrackedMenuEntry) @@ -359,6 +368,94 @@ { HWND parent = GetAncestor(child, GA_ROOT); DisableMouseTrack(parent, FALSE); + } + + return TRUE; +} + +LRESULT CMenuFocusManager::ProcessMouseDown(MSG* msg) +{ + HWND child; + int iHitTestResult = -1; + + // Don't do anything if another window is capturing the mouse. + HWND cCapture = ::GetCapture(); + if (cCapture && cCapture != m_captureHwnd && m_current->type != TrackedMenuEntry) + return TRUE; + + + POINT pt = msg->pt; + + child = WindowFromPoint(pt); + + StackEntry * entry = NULL; + if (IsTrackedWindow(child, &entry) != S_OK) + return TRUE; + + DbgPrint("MouseDown %d\n", m_isLButtonDown); + + BOOL isTracking = FALSE; + if (entry) + { + ScreenToClient(child, &pt); + iHitTestResult = SendMessageW(child, TB_HITTEST, 0, (LPARAM) &pt); + isTracking = entry->mb->_IsTracking(); + + if (iHitTestResult >= 0) + { + DbgPrint("MouseDown send %d\n", iHitTestResult); + entry->mb->_MenuBarMouseDown(child, iHitTestResult); + } + } + + msg->message = WM_NULL; + + m_isLButtonDown = TRUE; + m_movedSinceDown = FALSE; + m_windowAtDown = child; + + DbgPrint("MouseDown end %d\n", m_isLButtonDown); + + return TRUE; +} + +LRESULT CMenuFocusManager::ProcessMouseUp(MSG* msg) +{ + HWND child; + int iHitTestResult = -1; + + // Don't do anything if another window is capturing the mouse. + HWND cCapture = ::GetCapture(); + if (cCapture && cCapture != m_captureHwnd && m_current->type != TrackedMenuEntry) + return TRUE; + + if (!m_isLButtonDown) + return TRUE; + + m_isLButtonDown = FALSE; + + POINT pt = msg->pt; + + child = WindowFromPoint(pt); + + StackEntry * entry = NULL; + if (IsTrackedWindow(child, &entry) != S_OK) + return TRUE; + + DbgPrint("MouseUp %d\n", m_isLButtonDown); + + BOOL isTracking = FALSE; + if (entry) + { + ScreenToClient(child, &pt); + iHitTestResult = SendMessageW(child, TB_HITTEST, 0, (LPARAM) &pt); + isTracking = entry->mb->_IsTracking(); + + if (iHitTestResult >= 0) + { + DbgPrint("MouseUp send %d\n", iHitTestResult); + entry->mb->_MenuBarMouseUp(child, iHitTestResult); + } } return TRUE; @@ -434,6 +531,7 @@ LRESULT CMenuFocusManager::GetMsgHook(INT nCode, WPARAM hookWParam, LPARAM hookLParam) { + BOOL isLButton = FALSE; if (nCode < 0) return CallNextHookEx(m_hGetMsgHook, nCode, hookWParam, hookLParam); @@ -447,6 +545,9 @@ { case WM_NCLBUTTONDOWN: case WM_LBUTTONDOWN: + isLButton = TRUE; + + // fallthrough; case WM_NCRBUTTONDOWN: case WM_RBUTTONDOWN: if (m_current->type == MenuPopupEntry) @@ -457,8 +558,18 @@ { SetCapture(NULL); m_current->mb->_MenuItemHotTrack(MPOS_FULLCANCEL); + break; } } + + if (isLButton) + { + ProcessMouseDown(msg); + } + break; + case WM_NCLBUTTONUP: + case WM_LBUTTONUP: + ProcessMouseUp(msg); break; case WM_MOUSEMOVE: callNext = ProcessMouseMove(msg); Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] Sun Jun 29 15:42:06 2014 @@ -77,6 +77,10 @@ INT m_selectedItem; DWORD m_selectedItemFlags; + BOOL m_isLButtonDown; + BOOL m_movedSinceDown; + HWND m_windowAtDown; + // TODO: make dynamic #define MAX_RECURSE 20 StackEntry m_bandStack[MAX_RECURSE]; @@ -109,6 +113,8 @@ void SetCapture(HWND child); LRESULT ProcessMouseMove(MSG* msg); + LRESULT ProcessMouseDown(MSG* msg); + LRESULT ProcessMouseUp(MSG* msg); public: HRESULT PushMenuBar(CMenuBand * mb); HRESULT PushMenuPopup(CMenuBand * mb); Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Sun Jun 29 15:42:06 2014 @@ -49,7 +49,8 @@ switch (uMsg) { case WM_COMMAND: - return OnCommand(wParam, lParam, theResult); + //return OnCommand(wParam, lParam, theResult); + return S_OK; case WM_NOTIFY: hdr = reinterpret_cast<LPNMHDR>(lParam); @@ -828,6 +829,30 @@ return m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE); } +HRESULT CMenuToolbarBase::MenuBarMouseDown(INT item) +{ + LRESULT theResult; + TBBUTTON btn; + + if (m_initFlags & SMINIT_VERTICAL) + return S_OK; + + SendMessage(m_hwndToolbar, TB_GETBUTTON, item, reinterpret_cast<LPARAM>(&btn)); + return OnCommand(btn.idCommand, 0, &theResult); +} + +HRESULT CMenuToolbarBase::MenuBarMouseUp(INT item) +{ + LRESULT theResult; + TBBUTTON btn; + + if (!(m_initFlags & SMINIT_VERTICAL)) + return S_OK; + + SendMessage(m_hwndToolbar, TB_GETBUTTON, item, reinterpret_cast<LPARAM>(&btn)); + return OnCommand(btn.idCommand, 0, &theResult); +} + HRESULT CMenuToolbarBase::ExecuteItem(INT iItem) { this->m_menuBand->_KillPopupTimers(); Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] Sun Jun 29 15:42:06 2014 @@ -97,6 +97,9 @@ HRESULT KillPopupTimer(); + HRESULT MenuBarMouseDown(INT item); + HRESULT MenuBarMouseUp(INT item); + protected: virtual HRESULT OnDeletingButton(const NMTOOLBAR * tb) = 0;

10 years, 5 months

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 June 2014