Ros-diffs

ros-diffs@reactos.org

81390 discussions

[chorns] 20146: Handle access denied scenario
by chorns＠svn.reactos.com 13 Dec '05

13 Dec '05

Handle access denied scenario Modified: trunk/cis/ReactOS.CustomRevisionAction/FtpClient.cs _____ Modified: trunk/cis/ReactOS.CustomRevisionAction/FtpClient.cs --- trunk/cis/ReactOS.CustomRevisionAction/FtpClient.cs 2005-12-13 17:56:27 UTC (rev 20145) +++ trunk/cis/ReactOS.CustomRevisionAction/FtpClient.cs 2005-12-13 18:56:49 UTC (rev 20146) @@ -730,7 +730,12 @@ this.sendCommand( "CWD " + dirName ); - if ( this.resultCode != 250 ) throw new FtpException(result.Substring(4)); + if ( this.resultCode != 250 ) + { + if (this.resultCode == 550) + throw new FtpException(String.Format("Access denied to {0}", this.remotePath + "/" + dirName)); + throw new FtpException(result.Substring(4)); + } this.sendCommand( "PWD" );

1 0

[fireball] 20145: Fix "Warning: Headers already sent" bug when logging into "myReactOS" in russian locale.
by fireball＠svn.reactos.com 13 Dec '05

13 Dec '05

Fix "Warning: Headers already sent" bug when logging into "myReactOS" in russian locale. Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/ru.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/ru.php --- trunk/web/reactos.org/htdocs/roscms/inc/lang/ru.php 2005-12-13 17:54:46 UTC (rev 20144) +++ trunk/web/reactos.org/htdocs/roscms/inc/lang/ru.php 2005-12-13 17:56:27 UTC (rev 20145) @@ -1,4 +1,4 @@ -´??<?php +<?php /* RosCMS - ReactOS Content Management System Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.org>

1 0

[chorns] 20144: svn:ignore maintenance
by chorns＠svn.reactos.com 13 Dec '05

13 Dec '05

svn:ignore maintenance Property changes on: trunk/cis/ReactOS.CustomRevisionAction ___________________________________________________________________ Name: svn:ignore + bin

1 0

[jimtabor] 20143: ModifyMenuA/W, I guess it is done. Remove UNIMPLEMENTED.
by jimtabor＠svn.reactos.com 13 Dec '05

13 Dec '05

ModifyMenuA/W, I guess it is done. Remove UNIMPLEMENTED. Modified: trunk/reactos/lib/user32/windows/menu.c _____ Modified: trunk/reactos/lib/user32/windows/menu.c --- trunk/reactos/lib/user32/windows/menu.c 2005-12-13 00:30:09 UTC (rev 20142) +++ trunk/reactos/lib/user32/windows/menu.c 2005-12-13 03:23:31 UTC (rev 20143) @@ -4334,8 +4334,6 @@ mii.fType = 0; mii.fState = MFS_ENABLED; - UNIMPLEMENTED; - if(!GetMenuItemInfoA( hMnu, uPosition, (BOOL)(MF_BYPOSITION & uFlags), @@ -4431,8 +4429,6 @@ mii.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE; mii.fState = MFS_ENABLED; - UNIMPLEMENTED; - if(!NtUserMenuItemInfo( hMnu, uPosition, (BOOL)(MF_BYPOSITION & uFlags),

1 0

[navaraf] 20142: Remove obsolete definitions.
by navaraf＠svn.reactos.com 13 Dec '05

13 Dec '05

Remove obsolete definitions. Modified: trunk/reactos/lib/user32/windows/menu.c _____ Modified: trunk/reactos/lib/user32/windows/menu.c --- trunk/reactos/lib/user32/windows/menu.c 2005-12-13 00:28:51 UTC (rev 20141) +++ trunk/reactos/lib/user32/windows/menu.c 2005-12-13 00:30:09 UTC (rev 20142) @@ -70,14 +70,6 @@ #define ITEM_PREV -1 #define ITEM_NEXT 1 -#ifndef MF_END -#define MF_END (0x0080) -#endif - -#ifndef MIIM_STRING -#define MIIM_STRING (0x00000040) -#endif - #define MAKEINTATOMA(atom) ((LPCSTR)((ULONG_PTR)((WORD)(atom)))) #define MAKEINTATOMW(atom) ((LPCWSTR)((ULONG_PTR)((WORD)(atom)))) #define POPUPMENU_CLASS_ATOMA MAKEINTATOMA(32768) /* PopupMenu */

1 0

[navaraf] 20141: Remove obsolete definitions.
by navaraf＠svn.reactos.com 13 Dec '05

13 Dec '05

Remove obsolete definitions. Modified: trunk/reactos/lib/user32/windows/messagebox.c _____ Modified: trunk/reactos/lib/user32/windows/messagebox.c --- trunk/reactos/lib/user32/windows/messagebox.c 2005-12-13 00:26:41 UTC (rev 20140) +++ trunk/reactos/lib/user32/windows/messagebox.c 2005-12-13 00:28:51 UTC (rev 20141) @@ -51,16 +51,6 @@ #define IDI_WINLOGOA MAKEINTRESOURCEA(32517) #define IDI_WINLOGOW MAKEINTRESOURCEW(32517) -#ifndef MB_TYPEMASK -#define MB_TYPEMASK 0x0000000F -#endif -#ifndef MB_ICONMASK -#define MB_ICONMASK 0x000000F0 -#endif -#ifndef MB_DEFMASK -#define MB_DEFMASK 0x00000F00 -#endif - #define BTN_CX (75) #define BTN_CY (23)

1 0

[navaraf] 20140: Remove comment about commented out #define. :)
by navaraf＠svn.reactos.com 13 Dec '05

13 Dec '05

Remove comment about commented out #define. :) Modified: trunk/reactos/lib/user32/windows/nonclient.c _____ Modified: trunk/reactos/lib/user32/windows/nonclient.c --- trunk/reactos/lib/user32/windows/nonclient.c 2005-12-13 00:17:08 UTC (rev 20139) +++ trunk/reactos/lib/user32/windows/nonclient.c 2005-12-13 00:26:41 UTC (rev 20140) @@ -22,14 +22,6 @@ /* INCLUDES *******************************************************************/ -/* - * Define this to get the code working on ReactOS. It should be removed later. - */ -/* -Already defined in makefile now. -#define __REACTOS__ -*/ - #include <user32.h> #define NDEBUG #include <debug.h>

1 0

[navaraf] 20139: Add check for VbeModeInfo->PhysBasePtr != 0.
by navaraf＠svn.reactos.com 13 Dec '05

13 Dec '05

Add check for VbeModeInfo->PhysBasePtr != 0. Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-12-13 00:02:07 UTC (rev 20138) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-12-13 00:17:08 UTC (rev 20139) @@ -344,7 +344,8 @@ VbeModeInfo->XResolution >= 640 && VbeModeInfo->YResolution >= 480 && (VbeModeInfo->MemoryModel == VBE_MEMORYMODEL_PACKEDPIXEL || - VbeModeInfo->MemoryModel == VBE_MEMORYMODEL_DIRECTCOLOR)) + VbeModeInfo->MemoryModel == VBE_MEMORYMODEL_DIRECTCOLOR) && + VbeModeInfo->PhysBasePtr != 0) { if (VbeModeInfo->ModeAttributes & VBE_MODEATTR_LINEAR) {

1 0

[navaraf] 20138: Unfuck up the formatting and remove broken check.
by navaraf＠svn.reactos.com 13 Dec '05

13 Dec '05

Unfuck up the formatting and remove broken check. Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-12-12 23:56:24 UTC (rev 20137) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-12-13 00:02:07 UTC (rev 20138) @@ -238,19 +238,13 @@ &VBEDeviceExtension->VbeInfo, sizeof(VBEDeviceExtension->VbeInfo)); - /* Verify VBE is found and not an²thing else */ - if (VideoPortCompareMemory(VBEDeviceExtension->VbeInfo.Signature, "VESA", 4) != 4) - { + /* Verify the VBE signature. */ + if (VideoPortCompareMemory(VBEDeviceExtension->VbeInfo.Signature, "VESA", 4) != 4) + { VideoPortDebugPrint(Warn, "No VBE BIOS present\n"); return FALSE; - } + } - /* Dectect Bad VBE BIOS some Graphice card report 0x200 when they are VBE 1.2 */ - if (VBEDeviceExtension->VbeInfo.OemVendorNamePtr == 0 && VBEDeviceExtension->VbeInfo.Version == 0x200) - { - VBEDeviceExtension->VbeInfo.Version = 0x102; - } - VideoPortDebugPrint(Trace, "VBE BIOS Present (%d.%d, %8ld Kb)\n", VBEDeviceExtension->VbeInfo.Version / 0x100, VBEDeviceExtension->VbeInfo.Version & 0xFF,

1 0

[gvg] 20137: Sync to Wine-0_9_3:
by gvg＠svn.reactos.com 12 Dec '05

12 Dec '05

Sync to Wine-0_9_3: Cihan Altinay <cihan(a)uq.edu.au> - riched20: register ListBox & ComboBox classes Partially implement REExtendedRegisterClass() to register missing window classes so that applications relying on them don't get confused. Modified: trunk/reactos/lib/riched20/editor.c _____ Modified: trunk/reactos/lib/riched20/editor.c --- trunk/reactos/lib/riched20/editor.c 2005-12-12 23:54:50 UTC (rev 20136) +++ trunk/reactos/lib/riched20/editor.c 2005-12-12 23:56:24 UTC (rev 20137) @@ -2,6 +2,7 @@ * RichEdit - functions dealing with editor object * * Copyright 2004 by Krzysztof Foltman + * Copyright 2005 by Cihan Altinay * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -208,6 +209,7 @@ * - full justification * - hyphenation * - tables + * - ListBox & ComboBox not implemented * * Bugs that are probably fixed, but not so easy to verify: * - EN_UPDATE/EN_CHANGE are handled very incorrectly (should be OK now) @@ -235,6 +237,9 @@ int me_debug = 0; HANDLE me_heap = NULL; +static BOOL ME_ListBoxRegistered = FALSE; +static BOOL ME_ComboBoxRegistered = FALSE; + static ME_TextBuffer *ME_MakeText(void) { ME_TextBuffer *buf = ALLOC_OBJ(ME_TextBuffer); @@ -934,6 +939,8 @@ static WCHAR wszClassName[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '2', '0', 'W', 0}; static WCHAR wszClassName50[] = {'R', 'i', 'c', 'h', 'E', 'd', 'i', 't', '5', '0', 'W', 0}; +static WCHAR wszClassNameListBox[] = {'R','E','L','i','s','t','B','o','x','2','0','W', 0}; +static WCHAR wszClassNameComboBox[] = {'R','E','C','o','m','b','o','B','o','x','2','0','W', 0}; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -951,6 +958,10 @@ UnregisterClassW(wszClassName50, 0); UnregisterClassA("RichEdit20A", 0); UnregisterClassA("RichEdit50A", 0); + if (ME_ListBoxRegistered) + UnregisterClassW(wszClassNameListBox, 0); + if (ME_ComboBoxRegistered) + UnregisterClassW(wszClassNameComboBox, 0); HeapDestroy (me_heap); me_heap = NULL; break; @@ -2167,12 +2178,62 @@ return E_FAIL; /* E_NOTIMPL isn't allowed by MSDN */ } +LRESULT WINAPI REComboWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + /* FIXME: Not implemented */ + TRACE("hWnd %p msg %04x (%s) %08x %08lx\n", + hWnd, msg, get_msg_name(msg), wParam, lParam); + return DefWindowProcW(hWnd, msg, wParam, lParam); +} + +LRESULT WINAPI REListWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + /* FIXME: Not implemented */ + TRACE("hWnd %p msg %04x (%s) %08x %08lx\n", + hWnd, msg, get_msg_name(msg), wParam, lParam); + return DefWindowProcW(hWnd, msg, wParam, lParam); +} + /****************************************************************** * REExtendedRegisterClass (RICHED20.8) * * FIXME undocumented + * Need to check for errors and implement controls and callbacks */ -void WINAPI REExtendedRegisterClass(void) +LRESULT WINAPI REExtendedRegisterClass(void) { - FIXME("stub\n"); + WNDCLASSW wcW; + UINT result; + + FIXME("semi stub\n"); + + wcW.cbClsExtra = 0; + wcW.cbWndExtra = 4; + wcW.hInstance = NULL; + wcW.hIcon = NULL; + wcW.hCursor = NULL; + wcW.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); + wcW.lpszMenuName = NULL; + + if (!ME_ListBoxRegistered) + { + wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS; + wcW.lpfnWndProc = REListWndProc; + wcW.lpszClassName = wszClassNameListBox; + if (RegisterClassW(&wcW)) ME_ListBoxRegistered = TRUE; + } + + if (!ME_ComboBoxRegistered) + { + wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS | CS_VREDRAW | CS_HREDRAW; + wcW.lpfnWndProc = REComboWndProc; + wcW.lpszClassName = wszClassNameComboBox; + if (RegisterClassW(&wcW)) ME_ComboBoxRegistered = TRUE; + } + + result = 0; + if (ME_ListBoxRegistered) + result += 1; + if (ME_ComboBoxRegistered) + result += 2; + + return result; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs