Ros-diffs April 2011

ros-diffs@reactos.org

19 participants
296 discussions

[ilardig] 51463: [SUBST] Add Italian and Spanish translations.

by ilardig＠svn.reactos.org

Author: ilardig Date: Wed Apr 27 07:09:47 2011 New Revision: 51463 URL: http://svn.reactos.org/svn/reactos?rev=51463&view=rev Log: [SUBST] Add Italian and Spanish translations. Added: trunk/reactos/base/system/subst/lang/es-ES.rc (with props) trunk/reactos/base/system/subst/lang/it-IT.rc (with props) Modified: trunk/reactos/base/system/subst/rsrc.rc Added: trunk/reactos/base/system/subst/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/es-… ============================================================================== --- trunk/reactos/base/system/subst/lang/es-ES.rc (added) +++ trunk/reactos/base/system/subst/lang/es-ES.rc [iso-8859-1] Wed Apr 27 07:09:47 2011 @@ -1,0 +1,16 @@ +#include "resource.h" +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_INCORRECT_PARAMETER_COUNT "Cantidad de parámetros incorrecta - %s\n" + IDS_INVALID_PARAMETER "Cantidad de parámetros incorrecta - %s\n" + IDS_INVALID_PARAMETER2 "Parámetro incorrecto - %s\n" + IDS_DRIVE_ALREAD_SUBSTED "Unidad ya sustituida\n" + IDS_FAILED_WITH_ERROCODE "Falla con código de error 0x%x: %s\n" + IDS_USAGE "Asocia una ruta con una letra de unidad.\n\nSUBST [unidad1: [unidad2:]ruta]\nSUBST unidad1: /D\n\n unidad1: \ + Especifica una unidad virtual a la cual se quiere asignar una ruta.\n \ + [unidad2:]ruta Especifica una unidad física y una ruta a la cual asignar\n \ + una unidad virtual.\n /D \ + Elimina una unidad (virtual) substituida.\n\nEscribir SUBST sin parámetros para mostrar una lista de las unidades virtuales actuales.\n" +END Propchange: trunk/reactos/base/system/subst/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/subst/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/it-… ============================================================================== --- trunk/reactos/base/system/subst/lang/it-IT.rc (added) +++ trunk/reactos/base/system/subst/lang/it-IT.rc [iso-8859-1] Wed Apr 27 07:09:47 2011 @@ -1,0 +1,16 @@ +#include "resource.h" +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_INCORRECT_PARAMETER_COUNT "Numero di parametri invalido - %s\n" + IDS_INVALID_PARAMETER "Incorrect number of parameters - %s\n" + IDS_INVALID_PARAMETER2 "Parametro invalido - %s\n" + IDS_DRIVE_ALREAD_SUBSTED "Unità già sostituita\n" + IDS_FAILED_WITH_ERROCODE "Interruzione con codice di errore 0x%x: %s\n" + IDS_USAGE "Associa un percorso ad una lettera di unità.\n\nSUBST [unità1: [unità2:]percorso]\nSUBST unità1: /D\n\n unità1: \ + Specifica un'unità virtuale alla quale assegnare un percorso.\n \ + [unità2:]percorso Specifica un'unità fisica e un percorso da assegnare ad una\n \ + unità virtuale.\n /D \ + Elimina un'unità (virtuale) sostituita.\n\nDigitare SUBST senza parametri per mostrare un elenco delle unità virtuali attuali.\n" +END Propchange: trunk/reactos/base/system/subst/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/subst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/rsrc.rc?… ============================================================================== --- trunk/reactos/base/system/subst/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/rsrc.rc [iso-8859-1] Wed Apr 27 07:09:47 2011 @@ -4,3 +4,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/it-IT.rc"

13 years, 8 months

[akhaldi] 51462: [CMAKE] * uncomment the NDEBUG define.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Apr 26 22:54:53 2011 New Revision: 51462 URL: http://svn.reactos.org/svn/reactos?rev=51462&view=rev Log: [CMAKE] * uncomment the NDEBUG define. Modified: branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c Modified: branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/kdbg/kdb… ============================================================================== --- branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Tue Apr 26 22:54:53 2011 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> -//#define NDEBUG +#define NDEBUG #include "../cache/section/newmm.h" #include <debug.h>

13 years, 8 months

[jimtabor] 51461: [User32] - Sync up menu without the Right to Left support. Still missing needed changes for adding it. - Patches by Alexandre Julliard and Dmitry Timoshkov.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Apr 26 03:31:15 2011 New Revision: 51461 URL: http://svn.reactos.org/svn/reactos?rev=51461&view=rev Log: [User32] - Sync up menu without the Right to Left support. Still missing needed changes for adding it. - Patches by Alexandre Julliard and Dmitry Timoshkov. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Tue Apr 26 03:31:15 2011 @@ -511,57 +511,46 @@ TRACE("\tlooking for '%c' (0x%02x) in [%p]\n", (char) Key, Key, MenuInfo); if (NULL == MenuInfo || ! IsMenu(MenuInfo->Self)) - { + { if (MenuGetRosMenuInfo(&SysMenuInfo, GetSystemMenu(WndOwner, FALSE))) - { + { MenuInfo = &SysMenuInfo; - } + } else - { + { MenuInfo = NULL; - } - } + } + } if (NULL != MenuInfo) - { + { if (MenuGetAllRosMenuItemInfo(MenuInfo->Self, &Items) <= 0) - { + { return -1; - } - if (! ForceMenuChar) - { - Key = toupperW(Key); + } + if ( !ForceMenuChar ) + { ItemInfo = Items; for (i = 0; i < MenuInfo->MenuItemCount; i++, ItemInfo++) - { + { if ((ItemInfo->lpstr) && NULL != ItemInfo->dwTypeData) - { + { WCHAR *p = (WCHAR *) ItemInfo->dwTypeData - 2; do - { - p = strchrW(p + 2, '&'); - } - while (NULL != p && L'&' == p[1]); - if (NULL != p && (toupperW(p[1]) == Key)) - { - return i; - } - } - } - } + { + p = strchrW (p + 2, '&'); + } + while (p != NULL && p [1] == '&'); + if (p && (toupperW(p[1]) == toupperW(Key))) return i; + } + } + } MenuChar = SendMessageW(WndOwner, WM_MENUCHAR, MAKEWPARAM(Key, MenuInfo->Flags), (LPARAM) MenuInfo->Self); - if (2 == HIWORD(MenuChar)) - { - return LOWORD(MenuChar); - } - if (1 == HIWORD(MenuChar)) - { - return (UINT) (-2); - } - } - + if (HIWORD(MenuChar) == MNC_EXECUTE) return LOWORD(MenuChar); + if (HIWORD(MenuChar) == MNC_CLOSE) return (UINT)(-2); + } return (UINT)(-1); } @@ -1576,12 +1565,12 @@ MenuInfo.FocusedItem = NO_SELECTED_ITEM; } - /* ReactOS Check */ - if (!ValidateHwnd(hwndOwner)) - { // This window maybe already DEAD!!! + /* store the owner for DrawItem */ + if (!IsWindow(hwndOwner)) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return FALSE; } - /* store the owner for DrawItem */ MenuInfo.WndOwner = hwndOwner; MenuSetRosMenuInfo(&MenuInfo); @@ -3673,7 +3662,7 @@ if( uItem == NO_SELECTED_ITEM ) MenuMoveSelection( hwnd, &MenuInfo, ITEM_NEXT ); else - PostMessageW( hwnd, WM_KEYDOWN, VK_DOWN, 0L ); + PostMessageW( hwnd, WM_KEYDOWN, VK_RETURN, 0 ); } track_menu:

13 years, 8 months

[jimtabor] 51460: [Win32Csr] - Hack ReactOS to boot again! See bug 5655.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Apr 26 00:01:03 2011 New Revision: 51460 URL: http://svn.reactos.org/svn/reactos?rev=51460&view=rev Log: [Win32Csr] - Hack ReactOS to boot again! See bug 5655. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Tue Apr 26 00:01:03 2011 @@ -94,7 +94,19 @@ { 0, 0, NULL } }; +static HHOOK hhk = NULL; + /* FUNCTIONS *****************************************************************/ + +LRESULT +CALLBACK +KeyboardHookProc( + int nCode, + WPARAM wParam, + LPARAM lParam) +{ + return CallNextHookEx(hhk, nCode, wParam, lParam); +} BOOL WINAPI DllMain(HANDLE hDll, @@ -104,6 +116,13 @@ if (DLL_PROCESS_ATTACH == dwReason) { Win32CsrDllHandle = hDll; +// +// HACK HACK HACK ReactOS to BOOT! Initialization BUG ALERT! See bug 5655. +// + hhk = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardHookProc, NULL, 0); +// BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! +// BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! +// BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! } if (DLL_PROCESS_DETACH == dwReason)

13 years, 8 months

[jimtabor] 51459: [User32|Win32csr] - Move AppSwitch to User32.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Apr 25 23:14:06 2011 New Revision: 51459 URL: http://svn.reactos.org/svn/reactos?rev=51459&view=rev Log: [User32|Win32csr] - Move AppSwitch to User32. Added: trunk/reactos/dll/win32/user32/controls/appswitch.c - copied, changed from r51458, trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c Removed: trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c Modified: trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild Copied: trunk/reactos/dll/win32/user32/controls/appswitch.c (from r51458, trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/appswitch.c [iso-8859-1] Mon Apr 25 23:14:06 2011 @@ -2,14 +2,15 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: subsys/csrss/win32csr/appswitch.c + * FILE: dll/win32/user32/controls/appswitch.c * PURPOSE: app switching functionality * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) */ -#define NDEBUG -#include "w32csr.h" -#include <debug.h> +#include <user32.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(user32); typedef struct APPSWITCH_ITEM { @@ -55,7 +56,7 @@ hProcess = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_VM_READ, FALSE, dwPid); if (hProcess) { - if (GetModuleFileNameExW(hProcess, NULL, szFileName, MAX_PATH)) +// if (GetModuleFileNameExW(hProcess, NULL, szFileName, MAX_PATH)) { szFileName[MAX_PATH-1] = L'\0'; PrivateExtractIconExW(szFileName, 0, &hIcon, NULL, 1); @@ -70,7 +71,7 @@ /* get the text length */ Length = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); /* allocate item structure for it */ - pItem = (PAPPSWITCH_ITEM)HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, sizeof(APPSWITCH_ITEM) + Length * sizeof(WCHAR)); +// pItem = (PAPPSWITCH_ITEM)HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, sizeof(APPSWITCH_ITEM) + Length * sizeof(WCHAR)); if (!pItem) return TRUE; if (Length) @@ -165,7 +166,7 @@ /* FIXME * launch window */ - DPRINT1("launch alt-tab window\n"); + FIXME("launch alt-tab window\n"); } else { @@ -205,7 +206,7 @@ SetRect(&Rect, X-5, Y-5, X + XSize + 5, Y + YSize + 5); FillRect(hDc, &Rect, hBrush); DeleteObject((HGDIOBJ)hBrush); - SendDlgItemMessageW(hwndDlg, IDC_STATIC_CUR_APP, WM_SETTEXT, 0, (LPARAM)pCurItem->szText); +// SendDlgItemMessageW(hwndDlg, IDC_STATIC_CUR_APP, WM_SETTEXT, 0, (LPARAM)pCurItem->szText); } DrawIcon(hDc, X, Y, pCurItem->hIcon); @@ -223,7 +224,7 @@ { pNextItem = pCurItem->Next; DestroyIcon(pCurItem->hIcon); - HeapFree(Win32CsrApiHeap, 0, pCurItem); +// HeapFree(Win32CsrApiHeap, 0, pCurItem); pCurItem = pNextItem; } pRoot = NULL; @@ -265,5 +266,5 @@ InitializeAppSwitchHook() { hhk = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardHookProc, NULL, 0); - DPRINT("InitializeAppSwitchHook hhk %p\n", hhk); -} + TRACE("InitializeAppSwitchHook hhk %p\n", hhk); +} Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Mon Apr 25 23:14:06 2011 @@ -16,6 +16,7 @@ <pch>user32.h</pch> </directory> <directory name="controls"> + <file>appswitch.c</file> <file>button.c</file> <file>combo.c</file> <file>edit.c</file> Removed: trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c (removed) @@ -1,269 +1,0 @@ - -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: subsys/csrss/win32csr/appswitch.c - * PURPOSE: app switching functionality - * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) - */ - -#define NDEBUG -#include "w32csr.h" -#include <debug.h> - -typedef struct APPSWITCH_ITEM -{ - HWND hwndDlg; - DWORD zPos; - HICON hIcon; - BOOL bFocus; - struct APPSWITCH_ITEM * Next; - WCHAR szText[1]; -} APPSWITCH_ITEM, *PAPPSWITCH_ITEM; - -static PAPPSWITCH_ITEM pRoot = NULL; -static DWORD NumOfWindows = 0; -static HWND hAppWindowDlg = NULL; -static HHOOK hhk = NULL; - -UINT WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT); - - -BOOL -CALLBACK -EnumWindowEnumProc( - HWND hwnd, - LPARAM lParam -) -{ - PAPPSWITCH_ITEM pItem; - UINT Length; - HICON hIcon; - PAPPSWITCH_ITEM pCurItem; - DWORD dwPid; - HANDLE hProcess; - WCHAR szFileName[MAX_PATH] = {0}; - - /* check if the enumerated window is visible */ - if (!IsWindowVisible(hwnd)) - return TRUE; - /* get window icon */ - hIcon = (HICON)SendMessage(hwnd, WM_GETICON, ICON_BIG, 0); - if (!hIcon) - { - GetWindowThreadProcessId(hwnd, &dwPid); - hProcess = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_VM_READ, FALSE, dwPid); - if (hProcess) - { - if (GetModuleFileNameExW(hProcess, NULL, szFileName, MAX_PATH)) - { - szFileName[MAX_PATH-1] = L'\0'; - PrivateExtractIconExW(szFileName, 0, &hIcon, NULL, 1); - } - } - } - else - { - /* icons from WM_GETICON need to be copied */ - hIcon = CopyIcon(hIcon); - } - /* get the text length */ - Length = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); - /* allocate item structure for it */ - pItem = (PAPPSWITCH_ITEM)HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, sizeof(APPSWITCH_ITEM) + Length * sizeof(WCHAR)); - if (!pItem) - return TRUE; - if (Length) - { - /* retrieve the window text when available */ - SendMessageW(hwnd, WM_GETTEXT, Length+1, (LPARAM)pItem->szText); - } - /* copy the window icon */ - pItem->hIcon = hIcon; - /* store window handle */ - pItem->hwndDlg = hwnd; - /* is the window the active window */ - if (GetActiveWindow() == hwnd) - pItem->bFocus = TRUE; - - if (!pRoot) - { - /* first item */ - pRoot = pItem; - return TRUE; - } - - /* enumerate the last item */ - pCurItem = pRoot; - while(pCurItem->Next) - pCurItem = pCurItem->Next; - - /* insert it into the list */ - pCurItem->Next = pItem; - NumOfWindows++; - return TRUE; -} - -VOID -EnumerateAppWindows(HDESK hDesk, HWND hwndDlg) -{ - /* initialize defaults */ - pRoot = NULL; - NumOfWindows = 0; - hAppWindowDlg = hwndDlg; - /* enumerate all windows */ - EnumDesktopWindows(hDesk, EnumWindowEnumProc, (LPARAM)NULL); - if (NumOfWindows > 7) - { - /* FIXME resize window */ - } -} - -VOID -MarkNextEntryAsActive() -{ - PAPPSWITCH_ITEM pItem; - - pItem = pRoot; - if (!pRoot) - return; - - while(pItem) - { - if (pItem->bFocus) - { - pItem->bFocus = FALSE; - if (pItem->Next) - pItem->Next->bFocus = TRUE; - else - pRoot->bFocus = TRUE; - } - pItem = pItem->Next; - } - - InvalidateRgn(hAppWindowDlg, NULL, TRUE); -} - - -LRESULT -CALLBACK -KeyboardHookProc( - int nCode, - WPARAM wParam, - LPARAM lParam -) -{ - PKBDLLHOOKSTRUCT hk = (PKBDLLHOOKSTRUCT) lParam; - - if (wParam == WM_SYSKEYUP) - { - /* is tab key pressed */ - if (hk->vkCode == VK_TAB) - { - if (hAppWindowDlg == NULL) - { - /* FIXME - * launch window - */ - DPRINT1("launch alt-tab window\n"); - } - else - { - MarkNextEntryAsActive(); - } - } - } - return CallNextHookEx(hhk, nCode, wParam, lParam); -} - -VOID -PaintAppWindows(HWND hwndDlg, HDC hDc) -{ - DWORD dwIndex, X, Y; - PAPPSWITCH_ITEM pCurItem; - RECT Rect; - DWORD XSize, YSize, XMax; - HBRUSH hBrush; - - X = 10; - Y = 10; - XSize = GetSystemMetrics(SM_CXICON); - YSize = GetSystemMetrics(SM_CYICON); - XMax = (XSize+(XSize/2)) * 7 + X; - pCurItem = pRoot; - - for (dwIndex = 0; dwIndex < NumOfWindows; dwIndex++) - { - if (X >= XMax) - { - X = 10; - Y += YSize + (YSize/2); - } - if (pCurItem->bFocus) - { - hBrush = CreateSolidBrush(RGB(30, 30, 255)); - SetRect(&Rect, X-5, Y-5, X + XSize + 5, Y + YSize + 5); - FillRect(hDc, &Rect, hBrush); - DeleteObject((HGDIOBJ)hBrush); - SendDlgItemMessageW(hwndDlg, IDC_STATIC_CUR_APP, WM_SETTEXT, 0, (LPARAM)pCurItem->szText); - } - - DrawIcon(hDc, X, Y, pCurItem->hIcon); - pCurItem = pCurItem->Next; - X += XSize +(XSize/2); - } -} -VOID -DestroyAppWindows() -{ - PAPPSWITCH_ITEM pCurItem, pNextItem; - - pCurItem = pRoot; - while(pCurItem) - { - pNextItem = pCurItem->Next; - DestroyIcon(pCurItem->hIcon); - HeapFree(Win32CsrApiHeap, 0, pCurItem); - pCurItem = pNextItem; - } - pRoot = NULL; - hAppWindowDlg = NULL; - NumOfWindows = 0; -} - -INT_PTR -CALLBACK -SwitchWindowDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - PAINTSTRUCT Paint; - HDESK hInput; - - switch (message) - { - case WM_INITDIALOG: - hInput = OpenInputDesktop(0,0, GENERIC_ALL); - if (hInput) - { - EnumerateAppWindows(hInput, hwndDlg); - CloseDesktop(hInput); - } - return TRUE; - case WM_PAINT: - BeginPaint(hwndDlg, &Paint); - PaintAppWindows(hwndDlg, Paint.hdc); - EndPaint(hwndDlg, &Paint); - break; - case WM_DESTROY: - DestroyAppWindows(); - break; - } - return FALSE; -} - -VOID -WINAPI -InitializeAppSwitchHook() -{ - hhk = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardHookProc, NULL, 0); - DPRINT("InitializeAppSwitchHook hhk %p\n", hhk); -} Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Mon Apr 25 23:14:06 2011 @@ -14,7 +14,6 @@ /* Not defined in any header file */ extern VOID WINAPI PrivateCsrssManualGuiCheck(LONG Check); -extern VOID WINAPI InitializeAppSwitchHook(); extern LIST_ENTRY DosDeviceHistory; extern RTL_CRITICAL_SECTION Win32CsrDefineDosDeviceCritSec; @@ -105,7 +104,6 @@ if (DLL_PROCESS_ATTACH == dwReason) { Win32CsrDllHandle = hDll; - InitializeAppSwitchHook(); } if (DLL_PROCESS_DETACH == dwReason) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] Mon Apr 25 23:14:06 2011 @@ -29,6 +29,5 @@ <file>harderror.c</file> <file>lineinput.c</file> <file>tuiconsole.c</file> - <file>appswitch.c</file> <file>win32csr.rc</file> </module>

13 years, 8 months

[akhaldi] 51458: [CRT/MINGW-W64] * Call pei and __main before possible invocation of DllEntryPoint. By Kai Tietz.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Apr 25 21:55:41 2011 New Revision: 51458 URL: http://svn.reactos.org/svn/reactos?rev=51458&view=rev Log: [CRT/MINGW-W64] * Call pei and __main before possible invocation of DllEntryPoint. By Kai Tietz. Modified: trunk/reactos/lib/3rdparty/mingw/crtdll.c Modified: trunk/reactos/lib/3rdparty/mingw/crtdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtdll.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crtdll.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crtdll.c [iso-8859-1] Mon Apr 25 21:55:41 2011 @@ -179,6 +179,9 @@ retcode = FALSE; goto i__leave; } + _pei386_runtime_relocator (); + if (retcode && dwReason == DLL_PROCESS_ATTACH) + __main (); if (dwReason == DLL_PROCESS_ATTACH || dwReason == DLL_THREAD_ATTACH) { retcode = DllEntryPoint (hDllHandle, dwReason, lpreserved); @@ -187,9 +190,6 @@ if (! retcode) goto i__leave; } - _pei386_runtime_relocator (); - if (retcode && dwReason == DLL_PROCESS_ATTACH) - __main (); retcode = DllMain(hDllHandle,dwReason,lpreserved); if ((dwReason == DLL_PROCESS_ATTACH) && ! retcode) {

13 years, 8 months

[tkreuzer] 51457: [win32k] Acquire ownership of the window clip region, before deleting it. Fixes a region leak.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Apr 25 21:53:06 2011 New Revision: 51457 URL: http://svn.reactos.org/svn/reactos?rev=51457&view=rev Log: [win32k] Acquire ownership of the window clip region, before deleting it. Fixes a region leak. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Apr 25 21:53:06 2011 @@ -210,7 +210,7 @@ } pWnd->style |= WS_DISABLED; } - + if (Update) { IntNotifyWinEvent(EVENT_OBJECT_STATECHANGE, pWnd, OBJID_WINDOW, CHILDID_SELF, 0); @@ -517,6 +517,7 @@ if(Window->hrgnClip) { + IntGdiSetRegionOwner(Window->hrgnClip, GDI_OBJ_HMGR_POWNED); GreDeleteObject(Window->hrgnClip); Window->hrgnClip = NULL; } @@ -2265,7 +2266,7 @@ UserDereferenceObject(Window); } if (ParentWindow) UserDerefObjectCo(ParentWindow); - + return ret; }

13 years, 8 months

[janderwald] 51456: [MMIXER] - Merge 50674

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Apr 25 20:38:39 2011 New Revision: 51456 URL: http://svn.reactos.org/svn/reactos?rev=51456&view=rev Log: [MMIXER] - Merge 50674 Modified: branches/audio-bringup/lib/drivers/sound/mmixer/sup.c Modified: branches/audio-bringup/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/lib/drivers/sound… ============================================================================== --- branches/audio-bringup/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ branches/audio-bringup/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Mon Apr 25 20:38:39 2011 @@ -544,6 +544,14 @@ ASSERT(MixerData->Topology); ASSERT(MixerData->MixerInfo == MixerInfo); + /* now allocate logical pin array */ + Status = MMixerAllocateTopologyNodeArray(MixerContext, MixerData->Topology, &LogicalNodes); + if (Status != MM_STATUS_SUCCESS) + { + /* no memory */ + return MM_STATUS_NO_MEMORY; + } + /* get logical pin nodes */ MMixerGetConnectedFromLogicalTopologyPins(MixerData->Topology, MixerControl->NodeID, &LogicalNodesCount, LogicalNodes); @@ -552,7 +560,7 @@ ASSERT(LogicalNodesCount == MixerControl->Control.Metrics.dwReserved[0]); Values = (LPMIXERCONTROLDETAILS_BOOLEAN)MixerControlDetails->paDetails; - for(Index = 0; Index < ConnectedNodesCount; Index++) + for(Index = 0; Index < LogicalNodesCount; Index++) { /* getting logical pin offset */ MMixerGetLowestLogicalTopologyPinOffsetFromArray(LogicalNodesCount, LogicalNodes, &CurLogicalPinOffset);

13 years, 8 months

[janderwald] 51455: [MMIXER] - Merge 50674 to trunk: - Allocate memory for the logical pin array - Use the correct counter variable for logical pin array - Found by msvc See issue #6143 for more de...

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Apr 25 20:34:41 2011 New Revision: 51455 URL: http://svn.reactos.org/svn/reactos?rev=51455&view=rev Log: [MMIXER] - Merge 50674 to trunk: - Allocate memory for the logical pin array - Use the correct counter variable for logical pin array - Found by msvc See issue #6143 for more details. Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/s… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Mon Apr 25 20:34:41 2011 @@ -544,6 +544,14 @@ ASSERT(MixerData->Topology); ASSERT(MixerData->MixerInfo == MixerInfo); + /* now allocate logical pin array */ + Status = MMixerAllocateTopologyNodeArray(MixerContext, MixerData->Topology, &LogicalNodes); + if (Status != MM_STATUS_SUCCESS) + { + /* no memory */ + return MM_STATUS_NO_MEMORY; + } + /* get logical pin nodes */ MMixerGetConnectedFromLogicalTopologyPins(MixerData->Topology, MixerControl->NodeID, &LogicalNodesCount, LogicalNodes); @@ -552,7 +560,7 @@ ASSERT(LogicalNodesCount == MixerControl->Control.Metrics.dwReserved[0]); Values = (LPMIXERCONTROLDETAILS_BOOLEAN)MixerControlDetails->paDetails; - for(Index = 0; Index < ConnectedNodesCount; Index++) + for(Index = 0; Index < LogicalNodesCount; Index++) { /* getting logical pin offset */ MMixerGetLowestLogicalTopologyPinOffsetFromArray(LogicalNodesCount, LogicalNodes, &CurLogicalPinOffset);

13 years, 8 months

[spetreolle] 51454: [SHIMGVW] Implement imageview_fullscreenW.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Mon Apr 25 19:02:07 2011 New Revision: 51454 URL: http://svn.reactos.org/svn/reactos?rev=51454&view=rev Log: [SHIMGVW] Implement imageview_fullscreenW. Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c trunk/reactos/dll/win32/shimgvw/shimgvw.spec Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.c [iso-8859-1] Mon Apr 25 19:02:07 2011 @@ -519,12 +519,6 @@ DPRINT("ImageView_PrintToW() not implemented\n"); } -VOID WINAPI -imageview_fullscreenW(HWND hwnd, HINSTANCE hInst, LPCWSTR path, int nShow) -{ - DPRINT("ImageView_fullscreenW() not implemented\n"); -} - BOOL WINAPI DllMain(IN HINSTANCE hinstDLL, IN DWORD dwReason, Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… ============================================================================== --- trunk/reactos/dll/win32/shimgvw/shimgvw.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shimgvw/shimgvw.spec [iso-8859-1] Mon Apr 25 19:02:07 2011 @@ -5,7 +5,7 @@ @ stdcall ImageView_PrintTo(ptr ptr wstr long) @ stdcall ImageView_PrintToA(ptr ptr str long) @ stdcall ImageView_PrintToW(ptr ptr wstr long) -@ stdcall imageview_fullscreenW(ptr ptr wstr long) +@ stdcall imageview_fullscreenW(ptr ptr wstr long) ImageView_FullscreenW @ stub ConvertDIBSECTIONToThumbnail @ stub DllCanUnloadNow @ stub DllGetClassObject

13 years, 8 months

← Newer
1
2
3
4
5
6
7
8
9
...
30
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 April 2011