Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 22518: Don't enumerate the serial port used for debugging
by hpoussin＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: hpoussin Date: Fri Jun 23 02:57:32 2006 New Revision: 22518 URL: http://svn.reactos.ru/svn/reactos?rev=22518&view=rev Log: Don't enumerate the serial port used for debugging Modified: trunk/reactos/drivers/bus/acpi/include/acpi.h trunk/reactos/drivers/bus/acpi/ospm/fdo.c Modified: trunk/reactos/drivers/bus/acpi/include/acpi.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/acpi/include/ac… ============================================================================== --- trunk/reactos/drivers/bus/acpi/include/acpi.h (original) +++ trunk/reactos/drivers/bus/acpi/include/acpi.h Fri Jun 23 02:57:32 2006 @@ -60,6 +60,7 @@ #include "actables.h" #include "acdispat.h" #include <ntddk.h> +#include <ndk/haltypes.h> #include <bm.h> #include <bn.h> #include <bmpower.h> Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/acpi/ospm/fdo.c… ============================================================================== --- trunk/reactos/drivers/bus/acpi/ospm/fdo.c (original) +++ trunk/reactos/drivers/bus/acpi/ospm/fdo.c Fri Jun 23 02:57:32 2006 @@ -361,6 +361,77 @@ } +static BOOLEAN +AcpiCheckIfIsSerialDebugPort( + IN PACPI_DEVICE Device) +{ + ACPI_STATUS AcpiStatus; + BM_NODE *Node; + ACPI_BUFFER Buffer; + BOOLEAN Done; + RESOURCE* resource; + + if (!KdComPortInUse) + return FALSE; + + AcpiStatus = bm_get_node(Device->BmHandle, 0, &Node); + if (!ACPI_SUCCESS(AcpiStatus)) + return FALSE; + + /* Get current resources */ + Buffer.length = 0; + AcpiStatus = acpi_get_current_resources(Node->device.acpi_handle, &Buffer); + if ((AcpiStatus & ACPI_OK) == 0) + return FALSE; + if (Buffer.length == 0) + return FALSE; + + Buffer.pointer = ExAllocatePool(PagedPool, Buffer.length); + if (!Buffer.pointer) + return FALSE; + AcpiStatus = acpi_get_current_resources(Node->device.acpi_handle, &Buffer); + if (!ACPI_SUCCESS(AcpiStatus)) + { + ExFreePool(Buffer.pointer); + return FALSE; + } + + /* Loop through the list of resources to see if the + * device is using the serial port address + */ + Done = FALSE; + resource = (RESOURCE*)Buffer.pointer; + while (!Done) + { + switch (resource->id) + { + case io: + { + IO_RESOURCE *io_data = (IO_RESOURCE*) &resource->data; + if (*KdComPortInUse == ULongToPtr(io_data->min_base_address)) + { + ExFreePool(Buffer.pointer); + return TRUE; + } + break; + } + case end_tag: + { + Done = TRUE; + break; + } + default: + { + break; + } + } + resource = (RESOURCE *) ((NATIVE_UINT) resource + (NATIVE_UINT) resource->length); + } + + ExFreePool(Buffer.pointer); + return FALSE; +} + static NTSTATUS FdoQueryBusRelations( IN PDEVICE_OBJECT DeviceObject, @@ -396,6 +467,15 @@ { ACPI_BUFFER Buffer; Device = CONTAINING_RECORD(CurrentEntry, ACPI_DEVICE, DeviceListEntry); + + if (AcpiCheckIfIsSerialDebugPort(Device)) + { + /* Skip this device */ + DPRINT("Found debug serial port ; skipping it\n"); + Relations->Count--; + CurrentEntry = CurrentEntry->Flink; + continue; + } /* FIXME: For ACPI namespace devices on the motherboard create filter DOs and attach them just above the ACPI bus device object (PDO) */

1 0

[gedmurphy] 22517: [AUDIT] timedate.cpl For some reason, this had been unlocked but not had it's svn:needs-lock props removed. I've been working on this for the past few days and can verify it's clean.
by gedmurphy＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: gedmurphy Date: Fri Jun 23 02:37:10 2006 New Revision: 22517 URL: http://svn.reactos.ru/svn/reactos?rev=22517&view=rev Log: [AUDIT] timedate.cpl For some reason, this had been unlocked but not had it's svn:needs-lock props removed. I've been working on this for the past few days and can verify it's clean. Modified: trunk/reactos/dll/cpl/timedate/clock.c (props changed) trunk/reactos/dll/cpl/timedate/monthcal.c (props changed) trunk/reactos/dll/cpl/timedate/ntpclient.c (props changed) trunk/reactos/dll/cpl/timedate/resource.h (props changed) trunk/reactos/dll/cpl/timedate/timedate.h (props changed) Propchange: trunk/reactos/dll/cpl/timedate/clock.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/timedate/monthcal.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/timedate/ntpclient.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/timedate/resource.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/cpl/timedate/timedate.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[hpoussin] 22516: Fail start of the serial port currently used for debugging, according to http://blogs.msdn.com/doronh/archive/2006/06/07/621604.aspx
by hpoussin＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: hpoussin Date: Fri Jun 23 02:14:51 2006 New Revision: 22516 URL: http://svn.reactos.ru/svn/reactos?rev=22516&view=rev Log: Fail start of the serial port currently used for debugging, according to http://blogs.msdn.com/doronh/archive/2006/06/07/621604.aspx Modified: trunk/reactos/drivers/base/serial/pnp.c trunk/reactos/drivers/base/serial/serial.h trunk/reactos/drivers/base/serial/serial.rc (props changed) trunk/reactos/include/ndk/haltypes.h Modified: trunk/reactos/drivers/base/serial/pnp.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/base/serial/pnp.c?r… ============================================================================== --- trunk/reactos/drivers/base/serial/pnp.c (original) +++ trunk/reactos/drivers/base/serial/pnp.c Fri Jun 23 02:14:51 2006 @@ -193,6 +193,13 @@ return STATUS_INSUFFICIENT_RESOURCES; ComPortBase = (PUCHAR)DeviceExtension->BaseAddress; + /* Test if we are trying to start the serial port used for debugging */ + if (KdComPortInUse && *KdComPortInUse == ULongToPtr(DeviceExtension->BaseAddress)) + { + DPRINT("Failing IRP_MN_START_DEVICE as this serial port is used for debugging\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + if (DeviceExtension->UartType == UartUnknown) DeviceExtension->UartType = SerialDetectUartType(ComPortBase); @@ -329,7 +336,6 @@ */ case IRP_MN_START_DEVICE: /* 0x0 */ { - BOOLEAN ConflictDetected; DPRINT("Serial: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); ASSERT(((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->PnpState == dsStopped); @@ -343,20 +349,6 @@ ((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ComPort); Status = STATUS_INSUFFICIENT_RESOURCES; break; - } - /* FIXME: HACK: verify that we don't have resource conflict, - * because PnP manager doesn't do it automatically - */ - Status = IoReportResourceForDetection( - DeviceObject->DriverObject, Stack->Parameters.StartDevice.AllocatedResources, 0, - NULL, NULL, 0, - &ConflictDetected); - if (!NT_SUCCESS(Status)) - { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; } /* Call lower driver */ Modified: trunk/reactos/drivers/base/serial/serial.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/base/serial/serial.… ============================================================================== --- trunk/reactos/drivers/base/serial/serial.h (original) +++ trunk/reactos/drivers/base/serial/serial.h Fri Jun 23 02:14:51 2006 @@ -8,6 +8,7 @@ */ #include <ntddk.h> +#include <ndk/haltypes.h> #include <ntddser.h> #include <stdio.h> Propchange: trunk/reactos/drivers/base/serial/serial.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/include/ndk/haltypes.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/haltypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/haltypes.h (original) +++ trunk/reactos/include/ndk/haltypes.h Fri Jun 23 02:14:51 2006 @@ -144,7 +144,7 @@ // HAL Exports // #ifndef _NTHAL_ -extern PUCHAR *KdComPortInUse; +extern PUCHAR NTSYSAPI *KdComPortInUse; #endif #endif

1 0

[hpoussin] 22515: [AUDIT] serial.sys is clean. I wrote it myself and I didn't use unclean methods.
by hpoussin＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: hpoussin Date: Fri Jun 23 02:13:27 2006 New Revision: 22515 URL: http://svn.reactos.ru/svn/reactos?rev=22515&view=rev Log: [AUDIT] serial.sys is clean. I wrote it myself and I didn't use unclean methods. Modified: trunk/reactos/drivers/base/serial/circularbuffer.c (props changed) trunk/reactos/drivers/base/serial/cleanup.c (props changed) trunk/reactos/drivers/base/serial/close.c (props changed) trunk/reactos/drivers/base/serial/create.c (props changed) trunk/reactos/drivers/base/serial/devctrl.c (props changed) trunk/reactos/drivers/base/serial/info.c (props changed) trunk/reactos/drivers/base/serial/legacy.c (props changed) trunk/reactos/drivers/base/serial/misc.c (props changed) trunk/reactos/drivers/base/serial/pnp.c (props changed) trunk/reactos/drivers/base/serial/power.c (props changed) trunk/reactos/drivers/base/serial/rw.c (props changed) trunk/reactos/drivers/base/serial/serial.c (props changed) trunk/reactos/drivers/base/serial/serial.h (props changed) Propchange: trunk/reactos/drivers/base/serial/circularbuffer.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/base/serial/cleanup.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/base/serial/close.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/base/serial/create.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/base/serial/devctrl.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/base/serial/info.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/base/serial/legacy.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/base/serial/misc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/base/serial/pnp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/base/serial/power.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/base/serial/rw.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/base/serial/serial.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/base/serial/serial.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[jimtabor] 22514: Update wine sync info.
by jimtabor＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: jimtabor Date: Fri Jun 23 02:12:19 2006 New Revision: 22514 URL: http://svn.reactos.ru/svn/reactos?rev=22514&view=rev Log: Update wine sync info. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=2… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Fri Jun 23 02:12:19 2006 @@ -119,8 +119,8 @@ reactos/dll/win32/user32/controls/edit.c # Synced at 20051210 reactos/dll/win32/user32/controls/icontitle.c # Synced at 20060617 reactos/dll/win32/user32/controls/listbox.c # Synced at 20060616 - reactos/dll/win32/user32/controls/scrollbar.c # Forked (?) - reactos/dll/win32/user32/controls/static.c # Out of sync + reactos/dll/win32/user32/controls/scrollbar.c # Forked + reactos/dll/win32/user32/controls/static.c # Synced at 20060622 reactos/dll/win32/user32/misc/dde.c # Last sync date unknown (dde_misc.c) reactos/dll/win32/user32/misc/ddeclient.c # Last sync date unknown @@ -130,6 +130,7 @@ reactos/dll/win32/user32/misc/winhelp.c # Last sync date unknown reactos/dll/win32/user32/misc/wsprintf.c # Out of sync + reactos/dll/win32/user32/windows/defwnd.c # Forked reactos/dll/win32/user32/windows/draw.c # Forked at Wine-20020904 (uitools.c) reactos/dll/win32/user32/windows/mdi.c # Out of sync reactos/dll/win32/user32/windows/menu.c # Forked

1 0

[fireball] 22513: Sync with Wine. Based on James Tabor's patch, with little modifications.
by fireball＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: fireball Date: Fri Jun 23 02:00:24 2006 New Revision: 22513 URL: http://svn.reactos.ru/svn/reactos?rev=22513&view=rev Log: Sync with Wine. Based on James Tabor's patch, with little modifications. Modified: trunk/reactos/dll/win32/user32/controls/static.c Modified: trunk/reactos/dll/win32/user32/controls/static.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/user32/controls/s… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/static.c (original) +++ trunk/reactos/dll/win32/user32/controls/static.c Fri Jun 23 02:00:24 2006 @@ -16,19 +16,42 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * NOTES + * + * This code was audited for completeness against the documented features + * of Comctl32.dll version 6.0 on Oct. 4, 2004, by Dimitrie O. Paun. + * + * Unless otherwise noted, we believe this code to be complete, as per + * the specification mentioned above. + * If you discover missing features, or bugs, please note them below. + * + * Notes: + * - Windows XP introduced new behavior: The background of centered + * icons and bitmaps is painted differently. This is only done if + * a manifest is present. + * Because it has not yet been decided how to implement the two + * different modes in Wine, only the Windows XP mode is implemented. + * - Controls with SS_SIMPLE but without SS_NOPREFIX: + * The text should not be changed. Windows doesn't clear the + * client rectangle, so the new text must be larger than the old one. + * - The SS_RIGHTJUST style is currently not implemented by Windows + * (or it does something different than documented). + * + * TODO: + * - Animated cursors */ #include <user32.h> -#ifndef __REACTOS__ WINE_DEFAULT_DEBUG_CHANNEL(static); -#endif static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, DWORD style ); +//static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ); static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); @@ -59,8 +82,8 @@ STATIC_PaintTextfn, /* SS_LEFTNOWORDWRAP */ STATIC_PaintOwnerDrawfn, /* SS_OWNERDRAW */ STATIC_PaintBitmapfn, /* SS_BITMAP */ - NULL, /* SS_ENHMETAFILE */ - STATIC_PaintEtchedfn, /* SS_ETCHEDHORIZ */ + NULL, /* STATIC_PaintEnhMetafn, SS_ENHMETAFILE */ + STATIC_PaintEtchedfn, /* SS_ETCHEDHORZ */ STATIC_PaintEtchedfn, /* SS_ETCHEDVERT */ STATIC_PaintEtchedfn, /* SS_ETCHEDFRAME */ }; @@ -94,24 +117,23 @@ /*********************************************************************** * STATIC_SetIcon * - * Set the icon for an SS_ICON control. + * Set the icon for an SS_ICON control. Modified for ReactOS */ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) { -#ifdef __REACTOS__ HICON prevIcon; + ICONINFO info; if ((style & SS_TYPEMASK) != SS_ICON) return 0; - prevIcon = (HICON)SetWindowLongA( hwnd, HICON_GWL_OFFSET, (LONG)hicon ); - if (hicon && !(style & SS_CENTERIMAGE)) - { - ICONINFO info; + if (hicon && (!GetIconInfo(hicon, &info))) { + WARN("hicon != 0, but info == 0\n"); + return 0; + } + prevIcon = (HICON)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hicon ); + if (hicon && !(style & SS_CENTERIMAGE) && !(style & SS_REALSIZECONTROL)) + { BITMAP bm; - if (!GetIconInfo(hicon, &info)) - { - return 0; - } if (!GetObjectW(info.hbmColor, sizeof(BITMAP), &bm)) { return 0; @@ -120,30 +142,12 @@ SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); } return prevIcon; -#else - HICON prevIcon; - CURSORICONINFO *info = hicon?(CURSORICONINFO *) GlobalLock16(HICON_16(hicon)):NULL; - - if ((style & SS_TYPEMASK) != SS_ICON) return 0; - if (hicon && !info) { - ERR("huh? hicon!=0, but info=0???\n"); - return 0; - } - prevIcon = (HICON)SetWindowLongA( hwnd, HICON_GWL_OFFSET, (LONG)hicon ); - if (hicon && !(style & SS_CENTERIMAGE)) - { - SetWindowPos( hwnd, 0, 0, 0, info->nWidth, info->nHeight, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); - GlobalUnlock16(HICON_16(hicon)); - } - return prevIcon; -#endif } /*********************************************************************** * STATIC_SetBitmap * - * Set the bitmap for an SS_BITMAP control. + * Set the bitmap for an SS_BITMAP control. Modified for ReactOS */ static HBITMAP STATIC_SetBitmap( HWND hwnd, HBITMAP hBitmap, DWORD style ) { @@ -151,15 +155,11 @@ if ((style & SS_TYPEMASK) != SS_BITMAP) return 0; if (hBitmap && GetObjectType(hBitmap) != OBJ_BITMAP) { -#ifdef __REACTOS__ - OutputDebugStringA("huh? hBitmap!=0, but not bitmap\n"); -#else - ERR("huh? hBitmap!=0, but not bitmap\n"); -#endif - return 0; - } - hOldBitmap = (HBITMAP)SetWindowLongA( hwnd, HICON_GWL_OFFSET, (LONG)hBitmap ); - if (hBitmap && !(style & SS_CENTERIMAGE)) + ERR("huh? hBitmap!=0, but not bitmap\n"); + return 0; + } + hOldBitmap = (HBITMAP)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hBitmap ); + if (hBitmap && !(style & SS_CENTERIMAGE) && !(style & SS_REALSIZECONTROL)) { BITMAP bm; GetObjectW(hBitmap, sizeof(bm), &bm); @@ -170,16 +170,68 @@ } /*********************************************************************** + * STATIC_SetEnhMetaFile + * + * Set the enhanced metafile for an SS_ENHMETAFILE control. + */ +//static HENHMETAFILE STATIC_SetEnhMetaFile( HWND hwnd, HENHMETAFILE hEnhMetaFile, DWORD style ) +//{ +// if ((style & SS_TYPEMASK) != SS_ENHMETAFILE) return 0; +// if (hEnhMetaFile && GetObjectType(hEnhMetaFile) != OBJ_ENHMETAFILE) { +// WARN("hEnhMetaFile != 0, but it's not an enhanced metafile\n"); +// return 0; +// } +// return (HENHMETAFILE)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hEnhMetaFile ); +//} + +/*********************************************************************** + * STATIC_GetImage + * + * Gets the bitmap for an SS_BITMAP control, the icon/cursor for an + * SS_ICON control or the enhanced metafile for an SS_ENHMETAFILE control. + */ +static HANDLE STATIC_GetImage( HWND hwnd, WPARAM wParam, DWORD style ) +{ + switch(style & SS_TYPEMASK) + { + case SS_ICON: + if ((wParam != IMAGE_ICON) && + (wParam != IMAGE_CURSOR)) return NULL; + break; + case SS_BITMAP: + if (wParam != IMAGE_BITMAP) return NULL; + break; + case SS_ENHMETAFILE: + if (wParam != IMAGE_ENHMETAFILE) return NULL; + break; + default: + return NULL; + } + return (HANDLE)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); +} + +/*********************************************************************** * STATIC_LoadIconA * * Load the icon for an SS_ICON control. */ -static HICON STATIC_LoadIconA( HWND hwnd, LPCSTR name ) -{ - HINSTANCE hInstance = (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE ); - HICON hicon = LoadIconA( hInstance, name ); - if (!hicon) hicon = LoadIconA( 0, name ); +static HICON STATIC_LoadIconA( HWND hwnd, LPCSTR name, DWORD style ) +{ + HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ); + if ((style & SS_REALSIZEIMAGE) != 0) + { + return LoadImageA(hInstance, name, IMAGE_ICON, 0, 0, LR_SHARED); + } + else + { + HICON hicon = LoadIconA( hInstance, name ); + if (!hicon) hicon = LoadCursorA( hInstance, name ); + if (!hicon) hicon = LoadIconA( 0, name ); + /* Windows doesn't try to load a standard cursor, + probably because most IDs for standard cursors conflict + with the IDs for standard icons anyway */ return hicon; + } } /*********************************************************************** @@ -187,12 +239,23 @@ * * Load the icon for an SS_ICON control. */ -static HICON STATIC_LoadIconW( HWND hwnd, LPCWSTR name ) -{ - HINSTANCE hInstance = (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE ); - HICON hicon = LoadIconW( hInstance, name ); - if (!hicon) hicon = LoadIconW( 0, name ); - return hicon; +static HICON STATIC_LoadIconW( HWND hwnd, LPCWSTR name, DWORD style ) +{ + HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ); + if ((style & SS_REALSIZEIMAGE) != 0) + { + return LoadImageW(hInstance, name, IMAGE_ICON, 0, 0, LR_SHARED); + } + else + { + HICON hicon = LoadIconW( hInstance, name ); + if (!hicon) hicon = LoadCursorW( hInstance, name ); + if (!hicon) hicon = LoadIconW( 0, name ); + /* Windows doesn't try to load a standard cursor, + probably because most IDs for standard cursors conflict + with the IDs for standard icons anyway */ + return hicon; + } } /*********************************************************************** @@ -202,11 +265,9 @@ */ static HBITMAP STATIC_LoadBitmapA( HWND hwnd, LPCSTR name ) { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE ); - HBITMAP hbitmap = LoadBitmapA( hInstance, name ); - if (!hbitmap) /* Try OEM icon (FIXME: is this right?) */ - hbitmap = LoadBitmapA( 0, name ); - return hbitmap; + HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ); + /* Windows doesn't try to load OEM Bitmaps (hInstance == NULL) */ + return LoadBitmapA( hInstance, name ); } /*********************************************************************** @@ -216,11 +277,9 @@ */ static HBITMAP STATIC_LoadBitmapW( HWND hwnd, LPCWSTR name ) { - HINSTANCE hInstance = (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE ); - HBITMAP hbitmap = LoadBitmapW( hInstance, name ); - if (!hbitmap) /* Try OEM icon (FIXME: is this right?) */ - hbitmap = LoadBitmapW( 0, name ); - return hbitmap; + HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ); + /* Windows doesn't try to load OEM Bitmaps (hInstance == NULL) */ + return LoadBitmapW( hInstance, name ); } /*********************************************************************** @@ -243,7 +302,21 @@ } } -static VOID STATIC_InitColours() +static HBRUSH STATIC_SendWmCtlColorStatic(HWND hwnd, HDC hdc) +{ + HBRUSH hBrush = (HBRUSH) SendMessageW( GetParent(hwnd), + WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); + if (!hBrush) /* did the app forget to call DefWindowProc ? */ + { + /* FIXME: DefWindowProc should return different colors if a + manifest is present */ + hBrush = (HBRUSH)DefWindowProcW(GetParent(hwnd), WM_CTLCOLORSTATIC, + (WPARAM)hdc, (LPARAM)hwnd); + } + return hBrush; +} + +static VOID STATIC_InitColours(void) { color_3ddkshadow = GetSysColor(COLOR_3DDKSHADOW); color_3dshadow = GetSysColor(COLOR_3DSHADOW); @@ -251,13 +324,34 @@ } /*********************************************************************** + * hasTextStyle + * + * Tests if the control displays text. + */ +static BOOL hasTextStyle( DWORD style ) +{ + switch(style & SS_TYPEMASK) + { + case SS_SIMPLE: + case SS_LEFT: + case SS_LEFTNOWORDWRAP: + case SS_CENTER: + case SS_RIGHT: + case SS_OWNERDRAW: + return TRUE; + } + + return FALSE; +} + +/*********************************************************************** * StaticWndProc_common */ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL unicode ) { LRESULT lResult = 0; - LONG full_style = GetWindowLongA( hwnd, GWL_STYLE ); + LONG full_style = GetWindowLongW( hwnd, GWL_STYLE ); LONG style = full_style & SS_TYPEMASK; switch (uMsg) @@ -265,11 +359,7 @@ case WM_CREATE: if (style < 0L || style > SS_TYPEMASK) { -#ifdef __REACTOS__ - OutputDebugStringA("Unknown style\n"); -#else ERR("Unknown style 0x%02lx\n", style ); -#endif return -1; } STATIC_InitColours(); @@ -290,6 +380,7 @@ else return unicode ? DefWindowProcW(hwnd, uMsg, wParam, lParam) : DefWindowProcA(hwnd, uMsg, wParam, lParam); + case WM_PRINTCLIENT: case WM_PAINT: { PAINTSTRUCT ps; @@ -301,86 +392,97 @@ break; case WM_ENABLE: - InvalidateRect(hwnd, NULL, TRUE); + STATIC_TryPaintFcn( hwnd, full_style ); + if (full_style & SS_NOTIFY) { + if (wParam) { + SendMessageW( GetParent(hwnd), WM_COMMAND, + MAKEWPARAM( GetWindowLongPtrW(hwnd,GWLP_ID), STN_ENABLE ), (LPARAM)hwnd); + } + else { + SendMessageW( GetParent(hwnd), WM_COMMAND, + MAKEWPARAM( GetWindowLongPtrW(hwnd,GWLP_ID), STN_DISABLE ), (LPARAM)hwnd); + } + } break; case WM_SYSCOLORCHANGE: STATIC_InitColours(); - InvalidateRect(hwnd, NULL, TRUE); + STATIC_TryPaintFcn( hwnd, full_style ); break; case WM_NCCREATE: - if (full_style & SS_SUNKEN) - SetWindowLongA( hwnd, GWL_EXSTYLE, - GetWindowLongA( hwnd, GWL_EXSTYLE ) | WS_EX_STATICEDGE ); - - if(unicode) - lParam = (LPARAM)(((LPCREATESTRUCTW)lParam)->lpszName); - else - lParam = (LPARAM)(((LPCREATESTRUCTA)lParam)->lpszName); - /* fall through */ + { + LPCSTR textA; + LPCWSTR textW; + + if (full_style & SS_SUNKEN) + SetWindowLongW( hwnd, GWL_EXSTYLE, + GetWindowLongW( hwnd, GWL_EXSTYLE ) | WS_EX_STATICEDGE ); + + if(unicode) + { + textA = NULL; + textW = ((LPCREATESTRUCTW)lParam)->lpszName; + } + else + { + textA = ((LPCREATESTRUCTA)lParam)->lpszName; + textW = NULL; + } + + switch (style) { + case SS_ICON: + { + HICON hIcon; + if(unicode) + hIcon = STATIC_LoadIconW(hwnd, textW, full_style); + else + hIcon = STATIC_LoadIconA(hwnd, textA, full_style); + STATIC_SetIcon(hwnd, hIcon, full_style); + } + break; + case SS_BITMAP: + { + HBITMAP hBitmap; + if(unicode) + hBitmap = STATIC_LoadBitmapW(hwnd, textW); + else + hBitmap = STATIC_LoadBitmapA(hwnd, textA); + STATIC_SetBitmap(hwnd, hBitmap, full_style); + } + break; + } + /* SS_ENHMETAFILE: Despite what MSDN says, Windows does not load + the enhanced metafile that was specified as the window text. */ + } + return unicode ? DefWindowProcW(hwnd, uMsg, wParam, lParam) : + DefWindowProcA(hwnd, uMsg, wParam, lParam); + case WM_SETTEXT: - switch (style) { - case SS_ICON: - { - HICON hIcon; - if(unicode) - hIcon = STATIC_LoadIconW(hwnd, (LPCWSTR)lParam); - else - hIcon = STATIC_LoadIconA(hwnd, (LPCSTR)lParam); - /* FIXME : should we also return the previous hIcon here ??? */ - STATIC_SetIcon(hwnd, hIcon, full_style); - break; - } - case SS_BITMAP: - { - HBITMAP hBitmap; - if(unicode) - hBitmap = STATIC_LoadBitmapW(hwnd, (LPCWSTR)lParam); - else - hBitmap = STATIC_LoadBitmapA(hwnd, (LPCSTR)lParam); - STATIC_SetBitmap(hwnd, hBitmap, full_style); - break; - } - case SS_LEFT: - case SS_CENTER: - case SS_RIGHT: - case SS_SIMPLE: - case SS_LEFTNOWORDWRAP: + if (hasTextStyle( full_style )) { if (HIWORD(lParam)) { - if(unicode) - lResult = DefWindowProcW( hwnd, WM_SETTEXT, wParam, lParam ); - else - lResult = DefWindowProcA( hwnd, WM_SETTEXT, wParam, lParam ); + if(unicode) + lResult = DefWindowProcW( hwnd, uMsg, wParam, lParam ); + else + lResult = DefWindowProcA( hwnd, uMsg, wParam, lParam ); + STATIC_TryPaintFcn( hwnd, full_style ); } - if (uMsg == WM_SETTEXT) - STATIC_TryPaintFcn( hwnd, full_style ); - break; } - default: - if (HIWORD(lParam)) - { - if(unicode) - lResult = DefWindowProcW( hwnd, WM_SETTEXT, wParam, lParam ); - else - lResult = DefWindowProcA( hwnd, WM_SETTEXT, wParam, lParam ); - } - if(uMsg == WM_SETTEXT) - InvalidateRect(hwnd, NULL, TRUE); - } - return 1; /* success. FIXME: check text length */ + break; case WM_SETFONT: - if ((style == SS_ICON) || (style == SS_BITMAP)) return 0; - SetWindowLongA( hwnd, HFONT_GWL_OFFSET, wParam ); + if (hasTextStyle( full_style )) + { + SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, wParam ); if (LOWORD(lParam)) - InvalidateRect( hwnd, NULL, TRUE ); + STATIC_TryPaintFcn( hwnd, full_style ); + } break; case WM_GETFONT: - return GetWindowLongA( hwnd, HFONT_GWL_OFFSET ); + return GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); case WM_NCHITTEST: if (full_style & SS_NOTIFY) @@ -395,38 +497,41 @@ case WM_NCLBUTTONDOWN: if (full_style & SS_NOTIFY) SendMessageW( GetParent(hwnd), WM_COMMAND, - MAKEWPARAM( GetWindowLongW(hwnd,GWL_ID), STN_CLICKED ), (LPARAM)hwnd); + MAKEWPARAM( GetWindowLongPtrW(hwnd,GWLP_ID), STN_CLICKED ), (LPARAM)hwnd); return 0; case WM_LBUTTONDBLCLK: case WM_NCLBUTTONDBLCLK: if (full_style & SS_NOTIFY) SendMessageW( GetParent(hwnd), WM_COMMAND, - MAKEWPARAM( GetWindowLongW(hwnd,GWL_ID), STN_DBLCLK ), (LPARAM)hwnd); + MAKEWPARAM( GetWindowLongPtrW(hwnd,GWLP_ID), STN_DBLCLK ), (LPARAM)hwnd); return 0; case STM_GETIMAGE: + return (LRESULT)STATIC_GetImage( hwnd, wParam, full_style ); #ifndef __REACTOS__ case STM_GETICON16: #endif case STM_GETICON: - return GetWindowLongA( hwnd, HICON_GWL_OFFSET ); + return (LRESULT)STATIC_GetImage( hwnd, IMAGE_ICON, full_style ); case STM_SETIMAGE: switch(wParam) { case IMAGE_BITMAP: lResult = (LRESULT)STATIC_SetBitmap( hwnd, (HBITMAP)lParam, full_style ); break; +// case IMAGE_ENHMETAFILE: +// lResult = (LRESULT)STATIC_SetEnhMetaFile( hwnd, (HENHMETAFILE)lParam, full_style ); +// break; case IMAGE_ICON: + case IMAGE_CURSOR: lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)lParam, full_style ); break; default: -#ifndef __REACTOS__ FIXME("STM_SETIMAGE: Unhandled type %x\n", wParam); -#endif break; } - InvalidateRect( hwnd, NULL, TRUE ); + STATIC_TryPaintFcn( hwnd, full_style ); break; #ifndef __REACTOS__ @@ -434,7 +539,7 @@ #endif case STM_SETICON: lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)wParam, full_style ); - InvalidateRect( hwnd, NULL, TRUE ); + STATIC_TryPaintFcn( hwnd, full_style ); break; default: @@ -465,27 +570,31 @@ static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style ) { DRAWITEMSTRUCT dis; - LONG id = GetWindowLongA( hwnd, GWL_ID ); + HFONT font, oldFont = NULL; + UINT id = (UINT)GetWindowLongPtrW( hwnd, GWLP_ID ); dis.CtlType = ODT_STATIC; dis.CtlID = id; dis.itemID = 0; dis.itemAction = ODA_DRAWENTIRE; - dis.itemState = 0; + dis.itemState = IsWindowEnabled(hwnd) ? 0 : ODS_DISABLED; dis.hwndItem = hwnd; dis.hDC = hdc; dis.itemData = 0; GetClientRect( hwnd, &dis.rcItem ); + font = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); + if (font) oldFont = SelectObject( hdc, font ); SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd ); SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); + if (font) SelectObject( hdc, oldFont ); } static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, DWORD style ) { RECT rc; HBRUSH hBrush; - HFONT hFont; + HFONT hFont, hOldFont = NULL; WORD wFormat; INT len; WCHAR *text; @@ -507,11 +616,11 @@ break; case SS_SIMPLE: - wFormat = DT_LEFT | DT_SINGLELINE | DT_VCENTER; + wFormat = DT_LEFT | DT_SINGLELINE; break; case SS_LEFTNOWORDWRAP: - wFormat = DT_LEFT | DT_EXPANDTABS | DT_VCENTER; + wFormat = DT_LEFT | DT_EXPANDTABS; break; default: @@ -519,28 +628,56 @@ } if (style & SS_NOPREFIX) - wFormat |= DT_NOPREFIX; - if (style & SS_CENTERIMAGE) - wFormat |= DT_VCENTER; - - if ((hFont = (HFONT)GetWindowLongA( hwnd, HFONT_GWL_OFFSET ))) SelectObject( hdc, hFont ); - - if ((style & SS_NOPREFIX) || ((style & SS_TYPEMASK) != SS_SIMPLE)) - { - hBrush = (HBRUSH)SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)hwnd ); - if (!hBrush) /* did the app forget to call defwindowproc ? */ - hBrush = (HBRUSH)DefWindowProcW(GetParent(hwnd), WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)hwnd); + wFormat |= DT_NOPREFIX; + + if ((style & SS_TYPEMASK) != SS_SIMPLE) + { + if (style & SS_CENTERIMAGE) + wFormat |= DT_SINGLELINE | DT_VCENTER; + if (style & SS_EDITCONTROL) + wFormat |= DT_EDITCONTROL; + if (style & SS_ENDELLIPSIS) + wFormat |= DT_SINGLELINE | DT_END_ELLIPSIS; + if (style & SS_PATHELLIPSIS) + wFormat |= DT_SINGLELINE | DT_PATH_ELLIPSIS; + if (style & SS_WORDELLIPSIS) + wFormat |= DT_SINGLELINE | DT_WORD_ELLIPSIS; + } + + if ((hFont = (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ))) + hOldFont = (HFONT)SelectObject( hdc, hFont ); + + /* SS_SIMPLE controls: WM_CTLCOLORSTATIC is sent, but the returned + brush is not used */ + hBrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); + + if ((style & SS_TYPEMASK) != SS_SIMPLE) + { FillRect( hdc, &rc, hBrush ); - } if (!IsWindowEnabled(hwnd)) SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT)); + } if (!(len = SendMessageW( hwnd, WM_GETTEXTLENGTH, 0, 0 ))) return; if (!(text = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ))) return; SendMessageW( hwnd, WM_GETTEXT, len + 1, (LPARAM)text ); + + if (((style & SS_TYPEMASK) == SS_SIMPLE) && (style & SS_NOPREFIX)) + { + /* Windows uses the faster ExtTextOut() to draw the text and + to paint the whole client rectangle with the text background + color. Reference: "Static Controls" by Kyle Marsh, 1992 */ + ExtTextOutW( hdc, rc.left, rc.top, ETO_CLIPPED | ETO_OPAQUE, + &rc, text, len, NULL ); + } + else + { DrawTextW( hdc, text, -1, &rc, wFormat ); + } + HeapFree( GetProcessHeap(), 0, text ); + + if (hFont) + SelectObject( hdc, hOldFont ); } static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ) @@ -582,82 +719,114 @@ DeleteObject( hBrush ); } - +/* Modified for ReactOS */ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) { - RECT rc; + RECT rc, iconRect; HBRUSH hbrush; HICON hIcon; - INT x, y; + ICONINFO info; GetClientRect( hwnd, &rc ); - hbrush = (HBRUSH)SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)hwnd ); - FillRect( hdc, &rc, hbrush ); + hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); hIcon = (HICON)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); - if (style & SS_CENTERIMAGE) - { -#ifndef __REACTOS__ - CURSORICONINFO *info = hIcon ? (CURSORICONINFO *)GlobalLock16(HICON_16(hIcon)) : NULL; - x = (rc.right - rc.left)/2 - (info ? info->nWidth/2 : 0); - y = (rc.bottom - rc.top)/2 - (info ? info->nHeight/2 : 0); -#else - ICONINFO info; + if (!hIcon || (!GetIconInfo(hIcon, &info))) + { + FillRect(hdc, &rc, hbrush); + } + else + { BITMAP bm; - - if (!GetIconInfo(hIcon, &info)) - return; - if (!GetObjectW(info.hbmColor, sizeof(BITMAP), &bm)) - return; - x = (rc.right - rc.left)/2 - bm.bmWidth/2; - y = (rc.bottom - rc.top)/2 - bm.bmHeight/2; -#endif - } - else - { - x = rc.left; - y = rc.top; - } - if (hIcon) - DrawIcon( hdc, x, y, hIcon ); + if (!GetObjectW(info.hbmColor, sizeof(BITMAP), &bm)) return; + if (style & SS_CENTERIMAGE) + { + iconRect.left = (rc.right - rc.left) / 2 - bm.bmWidth / 2; + iconRect.top = (rc.bottom - rc.top) / 2 - bm.bmHeight / 2; + iconRect.right = iconRect.left + bm.bmWidth; + iconRect.bottom = iconRect.top + bm.bmHeight; + FillRect( hdc, &iconRect, hbrush ); /* Wine source has &rc */ + } + else + { + FillRect( hdc, &rc, hbrush ); + DrawIconEx( hdc, rc.left, rc.top, hIcon, rc.right - rc.left, + rc.bottom - rc.top, 0, NULL, DI_NORMAL ); + } + } } static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) { HDC hMemDC; HBITMAP hBitmap, oldbitmap; + HBRUSH hbrush; /* message is still sent, even if the returned brush is not used */ - SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC, - (WPARAM)hdc, (LPARAM)hwnd ); - - if ((hBitmap = (HBITMAP)GetWindowLongA( hwnd, HICON_GWL_OFFSET ))) + hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); + + if ((hBitmap = (HBITMAP)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET )) + && (GetObjectType(hBitmap) == OBJ_BITMAP) + && (hMemDC = CreateCompatibleDC( hdc ))) { BITMAP bm; - INT x, y; - - if(GetObjectType(hBitmap) != OBJ_BITMAP) return; - if (!(hMemDC = CreateCompatibleDC( hdc ))) return; - GetObjectW(hBitmap, sizeof(bm), &bm); - oldbitmap = SelectObject(hMemDC, hBitmap); + RECT rcClient; + LOGBRUSH brush; + + GetObjectW(hBitmap, sizeof(bm), &bm); + oldbitmap = SelectObject(hMemDC, hBitmap); + + /* Set the background color for monochrome bitmaps + to the color of the background brush */ + if (GetObjectW( hbrush, sizeof(brush), &brush )) + { + if (brush.lbStyle == BS_SOLID) + SetBkColor(hdc, brush.lbColor); + } + GetClientRect(hwnd, &rcClient); if (style & SS_CENTERIMAGE) { - RECT rcClient; - GetClientRect(hwnd, &rcClient); + INT x, y; x = (rcClient.right - rcClient.left)/2 - bm.bmWidth/2; y = (rcClient.bottom - rcClient.top)/2 - bm.bmHeight/2; + FillRect( hdc, &rcClient, hbrush ); + BitBlt(hdc, x, y, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, + SRCCOPY); } else { - x = 0; - y = 0; - } - BitBlt(hdc, x, y, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, - SRCCOPY); - SelectObject(hMemDC, oldbitmap); - DeleteDC(hMemDC); - } -} + StretchBlt(hdc, 0, 0, rcClient.right - rcClient.left, + rcClient.bottom - rcClient.top, hMemDC, + 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); + } + SelectObject(hMemDC, oldbitmap); + DeleteDC(hMemDC); + } + else + { + RECT rcClient; + GetClientRect( hwnd, &rcClient ); + FillRect( hdc, &rcClient, hbrush ); + } +} + + +//static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style ) +//{ +// HENHMETAFILE hEnhMetaFile; +// RECT rc; +// HBRUSH hbrush; +// +// GetClientRect(hwnd, &rc); +// hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); +// FillRect(hdc, &rc, hbrush); +// if ((hEnhMetaFile = (HENHMETAFILE)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ))) +// { +// /* The control's current font is not selected into the +// device context! */ +// if (GetObjectType(hEnhMetaFile) == OBJ_ENHMETAFILE) +// PlayEnhMetaFile(hdc, hEnhMetaFile, &rc); +// } +//} static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style )

1 0

[hpoussin] 22512: Export KdComPortInUse Print a header when debugging to serial port
by hpoussin＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: hpoussin Date: Fri Jun 23 01:26:31 2006 New Revision: 22512 URL: http://svn.reactos.ru/svn/reactos?rev=22512&view=rev Log: Export KdComPortInUse Print a header when debugging to serial port Modified: trunk/reactos/ntoskrnl/kd/kdio.c trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/kd/kdio.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=2251… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdio.c (original) +++ trunk/reactos/ntoskrnl/kd/kdio.c Fri Jun 23 01:26:31 2006 @@ -26,6 +26,8 @@ /* Current Port in use. FIXME: Do we support more then one? */ ULONG KdpPort; +/* If serial debugging is enabled, is pointing to the UART base address. */ +PUCHAR *KdComPortInUse; /* DEBUG LOG FUNCTIONS *******************************************************/ @@ -97,6 +99,8 @@ if (BootPhase == 0) { + KdComPortInUse = NULL; + /* Write out the functions that we support for now */ DispatchTable->KdpInitRoutine = KdpInitDebugLog; DispatchTable->KdpPrintRoutine = KdpPrintToLog; @@ -180,9 +184,14 @@ KdpDebugMode.Serial = FALSE; return; } + KdComPortInUse = (PUCHAR*)&SerialPortInfo.BaseAddress; /* Register as a Provider */ InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); + + /* Display separator + ReactOS version at start of the debug log */ + DPRINT1("---------------------------------------------------------------\n"); + DPRINT1("ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); } else if (BootPhase == 2) { Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Fri Jun 23 01:26:31 2006 @@ -503,6 +503,7 @@ @IofCallDriver@8 @IofCompleteRequest@8 IoIsWdmVersionAvailable@8 +KdComPortInUse DATA KdDebuggerEnabled DATA KdDebuggerNotPresent DATA KdDisableDebugger@0

1 0

[hpoussin] 22511: Fix exports of device object types.
by hpoussin＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: hpoussin Date: Fri Jun 23 01:16:55 2006 New Revision: 22511 URL: http://svn.reactos.ru/svn/reactos?rev=22511&view=rev Log: Fix exports of device object types. Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=22… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Fri Jun 23 01:16:55 2006 @@ -382,19 +382,19 @@ #define FM_LOCK_WAITER_INC (0x4) /* Exported object types */ -extern NTOSAPI POBJECT_TYPE ExDesktopObjectType; -extern NTOSAPI POBJECT_TYPE ExEventObjectType; -extern NTOSAPI POBJECT_TYPE ExSemaphoreObjectType; -extern NTOSAPI POBJECT_TYPE ExWindowStationObjectType; -extern NTOSAPI ULONG IoDeviceHandlerObjectSize; -extern NTOSAPI POBJECT_TYPE IoDeviceHandlerObjectType; -extern NTOSAPI POBJECT_TYPE IoDeviceObjectType; -extern NTOSAPI POBJECT_TYPE IoDriverObjectType; -extern NTOSAPI POBJECT_TYPE IoFileObjectType; -extern NTOSAPI POBJECT_TYPE PsThreadType; -extern NTOSAPI POBJECT_TYPE LpcPortObjectType; -extern NTOSAPI POBJECT_TYPE MmSectionObjectType; -extern NTOSAPI POBJECT_TYPE SeTokenObjectType; +extern POBJECT_TYPE NTSYSAPI ExDesktopObjectType; +extern POBJECT_TYPE NTSYSAPI ExEventObjectType; +extern POBJECT_TYPE NTSYSAPI ExSemaphoreObjectType; +extern POBJECT_TYPE NTSYSAPI ExWindowStationObjectType; +extern ULONG NTSYSAPI IoDeviceHandlerObjectSize; +extern POBJECT_TYPE NTSYSAPI IoDeviceHandlerObjectType; +extern POBJECT_TYPE NTSYSAPI IoDeviceObjectType; +extern POBJECT_TYPE NTSYSAPI IoDriverObjectType; +extern POBJECT_TYPE NTSYSAPI IoFileObjectType; +extern POBJECT_TYPE NTSYSAPI PsThreadType; +extern POBJECT_TYPE NTSYSAPI LpcPortObjectType; +extern POBJECT_TYPE NTSYSAPI MmSectionObjectType; +extern POBJECT_TYPE NTSYSAPI SeTokenObjectType; extern NTOSAPI CCHAR KeNumberProcessors;

1 0

[janderwald] 22510: msvc compilation fix
by janderwald＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: janderwald Date: Fri Jun 23 01:16:28 2006 New Revision: 22510 URL: http://svn.reactos.ru/svn/reactos?rev=22510&view=rev Log: msvc compilation fix Modified: trunk/reactos/dll/win32/aclui/misc.c Modified: trunk/reactos/dll/win32/aclui/misc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/aclui/misc.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/aclui/misc.c (original) +++ trunk/reactos/dll/win32/aclui/misc.c Fri Jun 23 01:16:28 2006 @@ -288,7 +288,7 @@ if (vSid != NULL && V_VT(vSid) == (VT_ARRAY | VT_UI1)) { hRet = SafeArrayAccessData(V_ARRAY(vSid), - (void HUGEP**)&pSid); + (void **)&pSid); if (FAILED(hRet)) { break;

1 0

[hpoussin] 22509: Last 4 parameters of GetDiskFreeSpaceW are optional. Fix bug 1608.
by hpoussin＠svn.reactos.org 22 Jun '06

22 Jun '06

Author: hpoussin Date: Fri Jun 23 00:50:53 2006 New Revision: 22509 URL: http://svn.reactos.ru/svn/reactos?rev=22509&view=rev Log: Last 4 parameters of GetDiskFreeSpaceW are optional. Fix bug 1608. Modified: trunk/reactos/dll/win32/kernel32/file/volume.c Modified: trunk/reactos/dll/win32/kernel32/file/volume.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/file/vol… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/volume.c (original) +++ trunk/reactos/dll/win32/kernel32/file/volume.c Fri Jun 23 00:50:53 2006 @@ -256,10 +256,14 @@ return FALSE; } - *lpBytesPerSector = FileFsSize.BytesPerSector; - *lpSectorsPerCluster = FileFsSize.SectorsPerAllocationUnit; - *lpNumberOfFreeClusters = FileFsSize.AvailableAllocationUnits.u.LowPart; - *lpTotalNumberOfClusters = FileFsSize.TotalAllocationUnits.u.LowPart; + if (lpSectorsPerCluster) + *lpSectorsPerCluster = FileFsSize.SectorsPerAllocationUnit; + if (lpBytesPerSector) + *lpBytesPerSector = FileFsSize.BytesPerSector; + if (lpNumberOfFreeClusters) + *lpNumberOfFreeClusters = FileFsSize.AvailableAllocationUnits.u.LowPart; + if (lpTotalNumberOfClusters) + *lpTotalNumberOfClusters = FileFsSize.TotalAllocationUnits.u.LowPart; CloseHandle(hFile); return TRUE;

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