Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 39184: Branch for the 0.3.8 release
by cfinck＠svn.reactos.org 28 Jan '09

28 Jan '09

Author: cfinck Date: Wed Jan 28 13:27:45 2009 New Revision: 39184 URL: http://svn.reactos.org/svn/reactos?rev=39184&view=rev Log: Branch for the 0.3.8 release Added: branches/ros-branch-0_3_8/ - copied from r39183, trunk/

1 0

[mkupfer] 39183: one more attempt to fix clock size, absolute coord values for hands and clock replaced by scale of client size
by mkupfer＠svn.reactos.org 28 Jan '09

28 Jan '09

Author: mkupfer Date: Wed Jan 28 12:00:23 2009 New Revision: 39183 URL: http://svn.reactos.org/svn/reactos?rev=39183&view=rev Log: one more attempt to fix clock size, absolute coord values for hands and clock replaced by scale of client size Modified: trunk/reactos/dll/cpl/timedate/clock.c Modified: trunk/reactos/dll/cpl/timedate/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/clock.c?r… ============================================================================== --- trunk/reactos/dll/cpl/timedate/clock.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/clock.c [iso-8859-1] Wed Jan 28 12:00:23 2009 @@ -27,7 +27,6 @@ static const WCHAR szClockWndClass[] = L"ClockWndClass"; - static VOID RotatePoint(POINT pt[], INT iNum, INT iAngle) { @@ -47,10 +46,10 @@ } -static VOID +static INT DrawClock(HDC hdc, PCLOCKDATA pClockData) { - INT iAngle; + INT iAngle,Radius; POINT pt[3]; HBRUSH hBrushOld; HPEN hPenOld = NULL; @@ -59,12 +58,15 @@ hBrushOld = SelectObject(hdc, pClockData->hGreyBrush); hPenOld = GetCurrentObject(hdc, OBJ_PEN); + + // TODO: check if this conversion is correct resp. usable + Radius = min(pClockData->cxClient,pClockData->cyClient) * 2; for (iAngle = 0; iAngle < 360; iAngle += 6) { /* starting coords */ pt[0].x = 0; - pt[0].y = 180; + pt[0].y = Radius; /* rotate start coords */ RotatePoint(pt, 1, iAngle); @@ -93,15 +95,18 @@ SelectObject(hdc, hBrushOld); SelectObject(hdc, hPenOld); + return Radius; } static VOID -DrawHands(HDC hdc, SYSTEMTIME * pst, BOOL fChange) -{ - static POINT pt[3][5] = { {{0, -30}, {20, 0}, {0, 100}, {-20, 0}, {0, -30}}, - {{0, -40}, {10, 0}, {0, 160}, {-10, 0}, {0, -40}}, - {{0, 0}, { 0, 0}, {0, 0}, { 0, 0}, {0, 160}} }; +DrawHands(HDC hdc, SYSTEMTIME * pst, BOOL fChange, INT Radius) +{ + POINT pt[3][5] = { {{0, (INT)-Radius/6}, {(INT)Radius/9, 0}, + {0, (INT)Radius/1.8}, {(INT)-Radius/9, 0}, {0, (INT)-Radius/6}}, + {{0, (INT)-Radius/4.5}, {(INT)Radius/18, 0}, {0, (INT) Radius*0.89}, + {(INT)-Radius/18, 0}, {0, (INT)-Radius/4.5}}, + {{0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, (INT) Radius*0.89}} }; INT i, iAngle[3]; POINT ptTemp[3][5]; @@ -176,7 +181,7 @@ if (hBmp) { HBRUSH hWinBrush, hWinBrushOld; - INT oldMap; + INT oldMap, Radius; POINT oldOrg; hBmpOld = SelectObject(hdcMem, hBmp); @@ -196,8 +201,8 @@ pClockData->cyClient / 2, &oldOrg); - DrawClock(hdcMem, pClockData); - DrawHands(hdcMem, &pClockData->stPrevious, TRUE); + Radius = DrawClock(hdcMem, pClockData); + DrawHands(hdcMem, &pClockData->stPrevious, TRUE, Radius); SetMapMode(hdcMem, oldMap); SetViewportOrgEx(hdcMem, oldOrg.x, oldOrg.y, NULL);

1 0

[janderwald] 39182: - Fix exhaustive debug message flood
by janderwald＠svn.reactos.org 28 Jan '09

28 Jan '09

Author: janderwald Date: Wed Jan 28 10:30:19 2009 New Revision: 39182 URL: http://svn.reactos.org/svn/reactos?rev=39182&view=rev Log: - Fix exhaustive debug message flood Modified: trunk/reactos/subsystems/win32/csrss/win32csr/alias.c trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/alias.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/alias.c [iso-8859-1] Wed Jan 28 10:30:19 2009 @@ -11,9 +11,8 @@ /* INCLUDES ******************************************************************/ +#define NDEBUG #include "w32csr.h" - -#define NDEBUG #include <debug.h> typedef struct tagALIAS_ENTRY Modified: 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 [iso-8859-1] Wed Jan 28 10:30:19 2009 @@ -7,8 +7,8 @@ * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) */ +#define NDEBUG #include "w32csr.h" -//#define NDEBUG #include <debug.h> typedef struct APPSWITCH_ITEM Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Wed Jan 28 10:30:19 2009 @@ -8,9 +8,8 @@ /* INCLUDES ******************************************************************/ +#define NDEBUG #include "w32csr.h" - -#define NDEBUG #include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] Wed Jan 28 10:30:19 2009 @@ -7,9 +7,8 @@ * ReactOS Operating System */ +#define NDEBUG #include "w32csr.h" - -#define NDEBUG #include <debug.h> #define DESKTOP_WINDOW_ATOM 32880 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] Wed Jan 28 10:30:19 2009 @@ -7,10 +7,8 @@ */ /* INCLUDES ******************************************************************/ - +#define NDEBUG #include "w32csr.h" - -#define NDEBUG #include <debug.h> /* Not defined in any header file */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c [iso-8859-1] Wed Jan 28 10:30:19 2009 @@ -7,12 +7,10 @@ */ /* INCLUDES ******************************************************************/ - +#define NDEBUG #include "w32csr.h" #include <sddl.h> #include "resource.h" - -#define NDEBUG #include <debug.h> static HWND LogonNotifyWindow = NULL; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Wed Jan 28 10:30:19 2009 @@ -8,9 +8,8 @@ /* INCLUDES ******************************************************************/ +#define NDEBUG #include "w32csr.h" - -#define NDEBUG #include <debug.h> /* Not defined in any header file */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c [iso-8859-1] Wed Jan 28 10:30:19 2009 @@ -6,9 +6,8 @@ * PURPOSE: Implementation of text-mode consoles */ +#define NDEBUG #include "w32csr.h" - -#define NDEBUG #include <debug.h> CRITICAL_SECTION ActiveConsoleLock;

1 0

[janderwald] 39181: - Add wdmaud and sysaudio to bootcd
by janderwald＠svn.reactos.org 28 Jan '09

28 Jan '09

Author: janderwald Date: Wed Jan 28 10:19:37 2009 New Revision: 39181 URL: http://svn.reactos.org/svn/reactos?rev=39181&view=rev Log: - Add wdmaud and sysaudio to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Jan 28 10:19:37 2009 @@ -437,6 +437,8 @@ drivers\video\miniport\vbe\vbemp.sys 2 drivers\video\videoprt\videoprt.sys 2 +drivers\wdm\audio\sysaudio\sysaudio.sys 2 +drivers\wdm\audio\legacy\wdmaud\wdmaud.sys 2 drivers\wdm\audio\backpln\portcls\portcls.sys 2 drivers\wdm\audio\drm\drmk\drmk.sys 2 drivers\wmi\wmilib.sys 2 @@ -692,3 +694,4 @@ modules\windows\vmx_svga.inf 6 optional modules\windows\kvmnet.sys 2 optional modules\windows\kvmnet.inf 6 optional +

1 0

[gschneider] 39180: Set the header size as expected instead of setting the bitmap width
by gschneider＠svn.reactos.org 28 Jan '09

28 Jan '09

Author: gschneider Date: Wed Jan 28 09:43:02 2009 New Revision: 39180 URL: http://svn.reactos.org/svn/reactos?rev=39180&view=rev Log: Set the header size as expected instead of setting the bitmap width Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Wed Jan 28 09:43:02 2009 @@ -834,7 +834,7 @@ /* Fill rest of DIBSECTION */ PDIBSECTION pds = buffer; - pds->dsBmih.biSize = + pds->dsBmih.biSize = sizeof(BITMAPINFOHEADER); pds->dsBmih.biWidth = pds->dsBm.bmWidth; pds->dsBmih.biHeight = pds->dsBm.bmHeight; pds->dsBmih.biPlanes = pds->dsBm.bmPlanes;

1 0

[gschneider] 39179: - bcSize holds the size of the BITMAPHEADER structure (not the image size) and should already be set - Clean up unneeded comments
by gschneider＠svn.reactos.org 28 Jan '09

28 Jan '09

Author: gschneider Date: Wed Jan 28 09:35:57 2009 New Revision: 39179 URL: http://svn.reactos.org/svn/reactos?rev=39179&view=rev Log: - bcSize holds the size of the BITMAPHEADER structure (not the image size) and should already be set - Clean up unneeded comments Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Jan 28 09:35:57 2009 @@ -657,10 +657,7 @@ coreheader->bcWidth = psurf->SurfObj.sizlBitmap.cx; coreheader->bcPlanes = 1; coreheader->bcBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); - /* Resulting height may be smaller than original height */ coreheader->bcHeight = psurf->SurfObj.sizlBitmap.cy; - coreheader->bcSize = DIB_GetDIBWidthBytes(coreheader->bcWidth, - coreheader->bcBitCount) * coreheader->bcHeight; if (psurf->SurfObj.lDelta > 0) coreheader->bcHeight = -coreheader->bcHeight; } @@ -668,7 +665,6 @@ if (Info->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER)) { Info->bmiHeader.biWidth = psurf->SurfObj.sizlBitmap.cx; - /* Resulting height may be smaller than original height */ Info->bmiHeader.biHeight = psurf->SurfObj.sizlBitmap.cy; Info->bmiHeader.biPlanes = 1; Info->bmiHeader.biBitCount = BitsPerFormat(psurf->SurfObj.iBitmapFormat); @@ -890,9 +886,6 @@ if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; - coreheader->bcSize = DIB_GetDIBWidthBytes(DestSize.cx, - coreheader->bcBitCount) * DestSize.cy; - hDestBitmap = EngCreateBitmap(DestSize, DIB_GetDIBWidthBytes(DestSize.cx, coreheader->bcBitCount), BitmapFormat(coreheader->bcBitCount, BI_RGB),

1 0

[janderwald] 39178: - Implement enumerating available virtual audio devices and opening them
by janderwald＠svn.reactos.org 28 Jan '09

28 Jan '09

Author: janderwald Date: Wed Jan 28 09:24:57 2009 New Revision: 39178 URL: http://svn.reactos.org/svn/reactos?rev=39178&view=rev Log: - Implement enumerating available virtual audio devices and opening them Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] Wed Jan 28 09:24:57 2009 @@ -40,6 +40,8 @@ DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; RtlZeroMemory(DeviceExtension, sizeof(WDMAUD_DEVICE_EXTENSION)); + InitializeListHead(&DeviceExtension->SysAudioDeviceList); + Status = KsAllocateDeviceHeader(&DeviceExtension->DeviceHeader, 0, NULL); if (!NT_SUCCESS(Status)) { @@ -91,6 +93,37 @@ } NTSTATUS +WdmAudOpenSysAudioDevice( + IN LPWSTR DeviceName, + OUT PHANDLE Handle) +{ + UNICODE_STRING SymbolicLink; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + RtlInitUnicodeString(&SymbolicLink, DeviceName); + InitializeObjectAttributes(&ObjectAttributes, &SymbolicLink, OBJ_OPENIF | OBJ_KERNEL_HANDLE, NULL, NULL); + + Status = IoCreateFile(Handle, + SYNCHRONIZE | GENERIC_READ | GENERIC_WRITE, + &ObjectAttributes, + &IoStatusBlock, + NULL, + 0, + 0, + FILE_OPEN, + FILE_SYNCHRONOUS_IO_NONALERT, + NULL, + 0, + CreateFileTypeNone, + NULL, + IO_NO_PARAMETER_CHECKING | IO_FORCE_ACCESS_CHECK); + + return Status; +} + +NTSTATUS NTAPI DeviceInterfaceChangeCallback( IN PVOID NotificationStructure, @@ -102,6 +135,72 @@ return STATUS_SUCCESS; } +NTSTATUS +WdmAudOpenSysAudioDeviceInterfaces( + IN PWDMAUD_DEVICE_EXTENSION DeviceExtension, + IN LPWSTR SymbolicLinkList) +{ + NTSTATUS Status; + HANDLE Handle; + SYSAUDIO_ENTRY * Entry; + UINT Length; + PFILE_OBJECT FileObject; + ULONG Result; + ULONG BytesReturned; + KSPROPERTY KsPropset = {{STATIC_KSPROPSETID_Sysaudio}, KSPROPERTY_SYSAUDIO_DEVICE_DEFAULT, KSPROPERTY_TYPE_SET}; + + while(*SymbolicLinkList) + { + Length = wcslen(SymbolicLinkList) + 1; + Status = WdmAudOpenSysAudioDevice(SymbolicLinkList, &Handle); + if (NT_SUCCESS(Status)) + { + Status = ObReferenceObjectByHandle(Handle, + FILE_READ_DATA | FILE_WRITE_DATA, + IoFileObjectType, + KernelMode, + (PVOID*)&FileObject, + NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("ObReferenceObjectByHandle failed with %x\n", Status); + ZwClose(Handle); + } + + Entry = (SYSAUDIO_ENTRY*)ExAllocatePool(NonPagedPool, sizeof(SYSAUDIO_ENTRY) + Length * sizeof(WCHAR)); + if (!Entry) + { + ZwClose(Handle); + ObDereferenceObject((PVOID)FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Entry->Handle = Handle; + Entry->SymbolicLink.Length = Length * sizeof(WCHAR); + Entry->SymbolicLink.MaximumLength = Length * sizeof(WCHAR); + Entry->SymbolicLink.Buffer = (LPWSTR) (Entry + 1); + Entry->FileObject = FileObject; + wcscpy(Entry->SymbolicLink.Buffer, SymbolicLinkList); + + InsertTailList(&DeviceExtension->SysAudioDeviceList, &Entry->Entry); + + /* set device as default device */ + KsSynchronousIoControlDevice(FileObject, + KernelMode, + IOCTL_KS_PROPERTY, + (PVOID)&KsPropset, + sizeof(KSPROPERTY), + (PVOID)&Result, + sizeof(ULONG), + &BytesReturned); + + DeviceExtension->NumSysAudioDevices++; + } + SymbolicLinkList += Length; + } + return STATUS_SUCCESS; +} NTSTATUS NTAPI @@ -110,6 +209,7 @@ IN PIRP Irp) { NTSTATUS Status; + LPWSTR SymbolicLinkList; PWDMAUD_DEVICE_EXTENSION DeviceExtension; DPRINT1("WdmAudCreate\n"); @@ -125,6 +225,18 @@ return Status; } #endif + + Status = IoGetDeviceInterfaces(&KSCATEGORY_SYSAUDIO, + NULL, + 0, + &SymbolicLinkList); + + if (NT_SUCCESS(Status)) + { + WdmAudOpenSysAudioDeviceInterfaces(DeviceExtension, SymbolicLinkList); + ExFreePool(SymbolicLinkList); + } + Status = IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange, PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES, Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Wed Jan 28 09:24:57 2009 @@ -9,8 +9,20 @@ typedef struct { + LIST_ENTRY Entry; + HANDLE Handle; + UNICODE_STRING SymbolicLink; + PFILE_OBJECT FileObject; +}SYSAUDIO_ENTRY; + + +typedef struct +{ KSDEVICE_HEADER DeviceHeader; PVOID SysAudioNotification; + + ULONG NumSysAudioDevices; + LIST_ENTRY SysAudioDeviceList; }WDMAUD_DEVICE_EXTENSION, *PWDMAUD_DEVICE_EXTENSION;

1 0

[cwittich] 39177: -sync RtlDeleteTimer with wine Giannis Adamopoulos (johnyadams at hotmail dot com)
by cwittich＠svn.reactos.org 28 Jan '09

28 Jan '09

Author: cwittich Date: Wed Jan 28 08:08:13 2009 New Revision: 39177 URL: http://svn.reactos.org/svn/reactos?rev=39177&view=rev Log: -sync RtlDeleteTimer with wine Giannis Adamopoulos (johnyadams at hotmail dot com) Modified: trunk/reactos/lib/rtl/timerqueue.c Modified: trunk/reactos/lib/rtl/timerqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/timerqueue.c?rev=3… ============================================================================== --- trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/timerqueue.c [iso-8859-1] Wed Jan 28 08:08:13 2009 @@ -505,10 +505,13 @@ HANDLE CompletionEvent) { struct queue_timer *t = Timer; - struct timer_queue *q = t->q; + struct timer_queue *q; NTSTATUS status = STATUS_PENDING; HANDLE event = NULL; + if (!Timer) + return STATUS_INVALID_PARAMETER_1; + q = t->q; if (CompletionEvent == INVALID_HANDLE_VALUE) status = NtCreateEvent(&event, EVENT_ALL_ACCESS, NULL, FALSE, FALSE); else if (CompletionEvent)

1 0

[cwittich] 39176: fix formatting
by cwittich＠svn.reactos.org 28 Jan '09

28 Jan '09

Author: cwittich Date: Wed Jan 28 07:55:37 2009 New Revision: 39176 URL: http://svn.reactos.org/svn/reactos?rev=39176&view=rev Log: fix formatting Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Jan 28 07:55:37 2009 @@ -1132,23 +1132,23 @@ // If the second color is white, create a monochrome bitmap fColor = (col != RGB(0xff,0xff,0xff)); } - else fColor = TRUE; - } - else if (data->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) - { - RGBTRIPLE *rgb = ((BITMAPCOREINFO *)data)->bmciColors; - DWORD col = RGB( rgb->rgbtRed, rgb->rgbtGreen, rgb->rgbtBlue); - - if ((col == RGB(0,0,0))) - { - rgb++; - col = RGB( rgb->rgbtRed, rgb->rgbtGreen, rgb->rgbtBlue ); - fColor = (col != RGB(0xff,0xff,0xff)); - } - else fColor = TRUE; - } - else - { + else fColor = TRUE; + } + else if (data->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + RGBTRIPLE *rgb = ((BITMAPCOREINFO *)data)->bmciColors; + DWORD col = RGB( rgb->rgbtRed, rgb->rgbtGreen, rgb->rgbtBlue); + + if ((col == RGB(0,0,0))) + { + rgb++; + col = RGB( rgb->rgbtRed, rgb->rgbtGreen, rgb->rgbtBlue ); + fColor = (col != RGB(0xff,0xff,0xff)); + } + else fColor = TRUE; + } + else + { DPRINT("(%ld): wrong size for data\n", data->bmiHeader.biSize ); return 0; }

1 0

[cwittich] 39175: calculate toolbar height instead of use the hardcoded value 35
by cwittich＠svn.reactos.org 28 Jan '09

28 Jan '09

Author: cwittich Date: Wed Jan 28 06:28:11 2009 New Revision: 39175 URL: http://svn.reactos.org/svn/reactos?rev=39175&view=rev Log: calculate toolbar height instead of use the hardcoded value 35 Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.c 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] Wed Jan 28 06:28:11 2009 @@ -379,9 +379,10 @@ lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_ROT_CLOCKW); break; } + return TRUE; } } - return TRUE; + break; } case WM_SIZING: { @@ -395,8 +396,10 @@ } case WM_SIZE: { - MoveWindow(hDispWnd, 1, 1, LOWORD(lParam)-1, HIWORD(lParam)-35, TRUE); + RECT rc; SendMessage(hToolBar, TB_AUTOSIZE, 0, 0); + SendMessage(hToolBar, TB_GETITEMRECT, 1, (LPARAM)&rc); + MoveWindow(hDispWnd, 1, 1, LOWORD(lParam)-1, HIWORD(lParam)-rc.bottom, TRUE); return 0L; } case WM_DESTROY:

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