Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 38903: - Fix debug prints - Fix initialization of IPortWavePci object - Fix IPortWavePci interface
by janderwald＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: janderwald Date: Sun Jan 18 11:44:17 2009 New Revision: 38903 URL: http://svn.reactos.org/svn/reactos?rev=38903&view=rev Log: - Fix debug prints - Fix initialization of IPortWavePci object - Fix IPortWavePci interface Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Sun Jan 18 11:44:17 2009 @@ -34,7 +34,7 @@ { IPortWavePciImpl * This = (IPortWavePciImpl*)CONTAINING_RECORD(iface, IPortWavePciImpl, lpVtblPortEvents); - DPRINT1("IServiceSink_fnQueryInterface entered\n"); + DPRINT1("IPortEvents_fnQueryInterface entered\n"); if (IsEqualGUIDAligned(refiid, &IID_IPortEvents) || IsEqualGUIDAligned(refiid, &IID_IUnknown)) @@ -53,7 +53,7 @@ IPortEvents* iface) { IPortWavePciImpl * This = (IPortWavePciImpl*)CONTAINING_RECORD(iface, IPortWavePciImpl, lpVtblPortEvents); - DPRINT1("IServiceSink_fnAddRef entered\n"); + DPRINT1("IPortEvents_fnAddRef entered\n"); return InterlockedIncrement(&This->ref); } @@ -64,7 +64,7 @@ IPortEvents* iface) { IPortWavePciImpl * This = (IPortWavePciImpl*)CONTAINING_RECORD(iface, IPortWavePciImpl, lpVtblPortEvents); - DPRINT1("IServiceSink_fnRelease entered\n"); + DPRINT1("IPortEvents_fnRelease entered\n"); InterlockedDecrement(&This->ref); if (This->ref == 0) @@ -215,7 +215,7 @@ } else if (IsEqualGUIDAligned(refiid, &IID_IServiceSink)) { - *Output = &This->lpVtbl; + *Output = &This->lpVtblServiceSink; InterlockedIncrement(&This->ref); return STATUS_SUCCESS; } @@ -305,39 +305,30 @@ NTSTATUS Status; IPortWavePciImpl * This = (IPortWavePciImpl*)iface; - DPRINT1("IPortWavePci::Init entered with This %p, DeviceObject %p Irp %p UnknownMiniport %p, UnknownAdapter %p ResourceList %p\n", + DPRINT1("IPortWavePci_fnInit entered with This %p, DeviceObject %p Irp %p UnknownMiniport %p, UnknownAdapter %p ResourceList %p\n", This, DeviceObject, Irp, UnknownMiniport, UnknownAdapter, ResourceList); if (This->bInitialized) { - DPRINT("IPortWaveCyclic_Init called again\n"); + DPRINT("IPortWavePci_fnInit called again\n"); return STATUS_SUCCESS; } Status = UnknownMiniport->lpVtbl->QueryInterface(UnknownMiniport, &IID_IMiniportWavePci, (PVOID*)&Miniport); if (!NT_SUCCESS(Status)) { - DPRINT("IPortWaveCyclic_Init called with invalid IMiniport adapter\n"); + DPRINT("IPortWavePci_fnInit called with invalid IMiniport adapter\n"); return STATUS_INVALID_PARAMETER; } /* initialize the dpc */ KeInitializeDpc(&This->Dpc, ServiceNotifyRoutine, (PVOID)This); - - Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface, &ServiceGroup); - if (!NT_SUCCESS(Status)) - { - DPRINT("IMiniportWaveCyclic_Init failed with %x\n", Status); - return Status; - } - DPRINT1("IPortWaveCyclic_Init Miniport adapter initialized\n"); /* Initialize port object */ This->Miniport = Miniport; This->pDeviceObject = DeviceObject; This->bInitialized = TRUE; This->pResourceList = ResourceList; - This->ServiceGroup = ServiceGroup; /* increment reference on miniport adapter */ @@ -345,11 +336,27 @@ /* increment reference on resource list */ ResourceList->lpVtbl->AddRef(ResourceList); + Status = Miniport->lpVtbl->Init(Miniport, UnknownAdapter, ResourceList, iface, &ServiceGroup); + if (!NT_SUCCESS(Status)) + { + DPRINT("IPortWavePci_fnInit failed with %x\n", Status); + This->bInitialized = FALSE; + /* release reference on miniport adapter */ + Miniport->lpVtbl->Release(Miniport); + /* increment reference on resource list */ + ResourceList->lpVtbl->Release(ResourceList); + return Status; + } + + /* store service group */ + This->ServiceGroup = ServiceGroup; + /* add ourselves to service group which is called when miniport receives an isr */ ServiceGroup->lpVtbl->AddMember(ServiceGroup, (PSERVICESINK)&This->lpVtblServiceSink); /* increment reference on service group */ ServiceGroup->lpVtbl->AddRef(ServiceGroup); + DPRINT("IPortWaveCyclic_Init sucessfully initialized\n"); return STATUS_SUCCESS; @@ -431,7 +438,7 @@ DEVICE_DESCRIPTION DeviceDescription; IPortWavePciImpl * This = (IPortWavePciImpl*)iface; - DPRINT1("IPortWavePci_fnNewMasterDmaChannel entered\n"); + DPRINT1("IPortWavePci_fnNewMasterDmaChannel This %p entered\n", This); Status = PcDmaMasterDescription(ResourceList, ScatterGather, Dma32BitAddresses, IgnoreCount, Dma64BitAddresses, DmaWidth, DmaSpeed, MaximumLength, DmaPort, &DeviceDescription); if (NT_SUCCESS(Status)) @@ -451,12 +458,12 @@ IPortWavePciImpl * This = (IPortWavePciImpl*)iface; - DPRINT1("IPortWavePci_fnNotify entered %p, ServiceGroup %p\n", This, This->ServiceGroup); - - if (This->ServiceGroup) - { - This->ServiceGroup->lpVtbl->RequestService (This->ServiceGroup); - } + DPRINT1("IPortWavePci_fnNotify entered %p, ServiceGroup %p\n", This, ServiceGroup); + + //if (This->ServiceGroup) + //{ + // ServiceGroup->lpVtbl->RequestService (ServiceGroup); + //} // KeInsertQueueDpc(&This->Dpc, NULL, NULL); } @@ -472,8 +479,8 @@ IPortWavePci_fnGetDeviceProperty, IPortWavePci_fnNewRegistryKey, /* IPortWavePci methods */ + IPortWavePci_fnNotify, IPortWavePci_fnNewMasterDmaChannel, - IPortWavePci_fnNotify };

1 0

[janderwald] 38902: - Fix IPortWavePci interface
by janderwald＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: janderwald Date: Sun Jan 18 11:44:10 2009 New Revision: 38902 URL: http://svn.reactos.org/svn/reactos?rev=38902&view=rev Log: - Fix IPortWavePci interface Modified: trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Sun Jan 18 11:44:10 2009 @@ -1193,6 +1193,9 @@ DEFINE_ABSTRACT_UNKNOWN() DEFINE_ABSTRACT_PORT() + STDMETHOD_(VOID, Notify)(THIS_ + IN PSERVICEGROUP ServiceGroup) PURE; + STDMETHOD_(NTSTATUS, NewMasterDmaChannel)(THIS_ OUT PDMACHANNEL* DmaChannel, IN PUNKNOWN OuterUnknown, @@ -1206,9 +1209,6 @@ IN DMA_SPEED DmaSpeed, IN ULONG MaximumLength, IN ULONG DmaPort) PURE; - - STDMETHOD_(VOID, Notify)(THIS_ - IN PSERVICEGROUP ServiceGroup) PURE; }; typedef IPortWavePci *PPORTWAVEPCI;

1 0

[cwittich] 38901: add ctxtcall.h to uuid
by cwittich＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: cwittich Date: Sun Jan 18 11:17:12 2009 New Revision: 38901 URL: http://svn.reactos.org/svn/reactos?rev=38901&view=rev Log: add ctxtcall.h to uuid Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=38… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c [iso-8859-1] Sun Jan 18 11:17:12 2009 @@ -42,6 +42,7 @@ #include "olectl.h" #include "ocidl.h" +#include "ctxtcall.h" #include "docobj.h" #include "exdisp.h"

1 0

[cwittich] 38900: add ctxtcall.idl from wine
by cwittich＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: cwittich Date: Sun Jan 18 11:14:54 2009 New Revision: 38900 URL: http://svn.reactos.org/svn/reactos?rev=38900&view=rev Log: add ctxtcall.idl from wine Added: trunk/reactos/include/psdk/ctxtcall.idl (with props) Modified: trunk/reactos/include/psdk/psdk.rbuild Added: trunk/reactos/include/psdk/ctxtcall.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ctxtcall.idl?… ============================================================================== --- trunk/reactos/include/psdk/ctxtcall.idl (added) +++ trunk/reactos/include/psdk/ctxtcall.idl [iso-8859-1] Sun Jan 18 11:14:54 2009 @@ -1,0 +1,49 @@ +/* + * Copyright (C) 2008 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "wtypes.idl"; +import "objidl.idl"; +import "unknwn.idl"; + +typedef struct tagComCallData +{ + DWORD dwDispid; + DWORD dwReserved; + void *pUserDefined; +} ComCallData; + +/*************************************************************************** + * IContextCallback + */ +[ + local, + object, + uuid(000001da-0000-0000-c000-000000000046), + pointer_default(unique) +] +interface IContextCallback : IUnknown +{ + typedef HRESULT (__stdcall *PFNCONTEXTCALL)(ComCallData *pParam); + + HRESULT ContextCallback( + [in] PFNCONTEXTCALL pCallback, + [in] ComCallData *pParam, + [in] REFIID riid, + [in] int iMethod, + [in] IUnknown *pUnk); +} Propchange: trunk/reactos/include/psdk/ctxtcall.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… ============================================================================== --- trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/psdk/psdk.rbuild [iso-8859-1] Sun Jan 18 11:14:54 2009 @@ -5,6 +5,7 @@ <file>activdbg.idl</file> <file>activscp.idl</file> <file>control.idl</file> + <file>ctxtcall.idl</file> <file>dimm.idl</file> <file>dispex.idl</file> <file>docobj.idl</file>

1 0

[mjmartin] 38899: - Fix calculation of WriteQuotaAvailable and WritePtr when moving memory. - Due to the new implementation, Quota is not charged for partial message retrievals. Therefore reset Quota Available to MaxDataLength when last message is read from buffer and check that Quota is greater than 0 before waking the write thread.
by mjmartin＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: mjmartin Date: Sun Jan 18 10:31:45 2009 New Revision: 38899 URL: http://svn.reactos.org/svn/reactos?rev=38899&view=rev Log: - Fix calculation of WriteQuotaAvailable and WritePtr when moving memory. - Due to the new implementation, Quota is not charged for partial message retrievals. Therefore reset Quota Available to MaxDataLength when last message is read from buffer and check that Quota is greater than 0 before waking the write thread. Modified: trunk/reactos/drivers/filesystems/npfs/rw.c Modified: trunk/reactos/drivers/filesystems/npfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/rw.c [iso-8859-1] Sun Jan 18 10:31:45 2009 @@ -537,10 +537,10 @@ /* Check if buffer is full and the read pointer is not at the start of the buffer */ if ((Ccb->WriteQuotaAvailable == 0) && (Ccb->ReadPtr > Ccb->Data)) { + Ccb->WriteQuotaAvailable += (ULONG_PTR)Ccb->ReadPtr - (ULONG_PTR)Ccb->Data; memcpy(Ccb->Data, Ccb->ReadPtr, (ULONG_PTR)Ccb->WritePtr - (ULONG_PTR)Ccb->ReadPtr); - Ccb->WritePtr = (PVOID)((ULONG_PTR)Ccb->WritePtr - ((ULONG_PTR)Ccb->WritePtr - (ULONG_PTR)Ccb->ReadPtr)); + Ccb->WritePtr = (PVOID)((ULONG_PTR)Ccb->WritePtr - ((ULONG_PTR)Ccb->ReadPtr - (ULONG_PTR)Ccb->Data)); Ccb->ReadPtr = Ccb->Data; - Ccb->WriteQuotaAvailable += (ULONG_PTR)Ccb->WritePtr - (ULONG_PTR)Ccb->ReadPtr; } /* For Message mode, the Message length is stored in the buffer preceeding the Message. */ @@ -560,7 +560,8 @@ /* Use the smaller value */ CopyLength = min(NextMessageLength, Length); - + ASSERT(CopyLength > 0); + ASSERT(CopyLength <= Ccb->ReadDataAvailable); /* retrieve the message from the buffer */ memcpy(Buffer, (PVOID)((ULONG_PTR)Ccb->ReadPtr + sizeof(NextMessageLength)), CopyLength); @@ -571,6 +572,7 @@ { /* Calculate the remaining message new size */ ULONG NewMessageSize = NextMessageLength-CopyLength; + /* Update ReadPtr to point to new Message size location */ Ccb->ReadPtr = (PVOID)((ULONG_PTR)Ccb->ReadPtr + CopyLength); @@ -586,16 +588,16 @@ } else { - /* This was the last Message, so just zero this messages for safety sake */ + /* This was the last Message, so just zero start of buffer for safety sake */ memset(Ccb->Data, 0, NextMessageLength + sizeof(NextMessageLength)); + + /* Reset to MaxDataLength as partial message retrievals dont + give the length back to Quota */ + Ccb->WriteQuotaAvailable = Ccb->MaxDataLength; /* reset read and write pointer to beginning of buffer */ Ccb->WritePtr = Ccb->Data; Ccb->ReadPtr = Ccb->Data; - - /* Add both the message length and the header to the WriteQuotaAvailable - as they both were removed */ - Ccb->WriteQuotaAvailable += (CopyLength + sizeof(CopyLength)); } #ifndef NDEBUG DPRINT("Length %d Buffer %x\n",CopyLength,Buffer); @@ -619,7 +621,8 @@ else { KeResetEvent(&Ccb->ReadEvent); - if (Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) + + if ((Ccb->PipeState == FILE_PIPE_CONNECTED_STATE) && (Ccb->WriteQuotaAvailable > 0)) { KeSetEvent(&Ccb->OtherSide->WriteEvent, IO_NO_INCREMENT, FALSE); } @@ -870,7 +873,7 @@ if (CopyLength > ReaderCcb->WriteQuotaAvailable) { DPRINT1("Writing %lu byte to pipe would overflow as only %lu bytes are available\n", - CopyLength, ReaderCcb->ReadDataAvailable); + CopyLength, ReaderCcb->WriteQuotaAvailable); ASSERT(FALSE); }

1 0

[sginsberg] 38898: - Fix WINEVENTPROC -- it is stdcall, not cdecl! - Correct the way FONTENUMPROC is defined, and type-cast accordingly in gdi32 - PSECURITY_DESCRIPTOR is an opaque pointer -- use PISECURITY_DESCRIPTOR instead where necessary - raddr2line: Fix a warning under Linux host
by sginsberg＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: sginsberg Date: Sun Jan 18 09:59:21 2009 New Revision: 38898 URL: http://svn.reactos.org/svn/reactos?rev=38898&view=rev Log: - Fix WINEVENTPROC -- it is stdcall, not cdecl! - Correct the way FONTENUMPROC is defined, and type-cast accordingly in gdi32 - PSECURITY_DESCRIPTOR is an opaque pointer -- use PISECURITY_DESCRIPTOR instead where necessary - raddr2line: Fix a warning under Linux host Modified: trunk/reactos/base/system/services/rpcserver.c trunk/reactos/dll/win32/advapi32/token/token.c trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/include/psdk/winable.h trunk/reactos/include/psdk/wingdi.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/psdk/winuser.h trunk/reactos/lib/rtl/bootdata.c trunk/reactos/lib/rtl/debug.c trunk/reactos/lib/rtl/sd.c trunk/reactos/tools/raddr2line.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Jan 18 09:59:21 2009 @@ -851,11 +851,11 @@ DesiredAccess |= WRITE_OWNER; if ((dwSecurityInformation & OWNER_SECURITY_INFORMATION) && - (((PSECURITY_DESCRIPTOR)lpSecurityDescriptor)->Owner == NULL)) + (((PISECURITY_DESCRIPTOR)lpSecurityDescriptor)->Owner == NULL)) return ERROR_INVALID_PARAMETER; if ((dwSecurityInformation & GROUP_SECURITY_INFORMATION) && - (((PSECURITY_DESCRIPTOR)lpSecurityDescriptor)->Group == NULL)) + (((PISECURITY_DESCRIPTOR)lpSecurityDescriptor)->Group == NULL)) return ERROR_INVALID_PARAMETER; if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, Modified: trunk/reactos/dll/win32/advapi32/token/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/token/t… ============================================================================== --- trunk/reactos/dll/win32/advapi32/token/token.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/token/token.c [iso-8859-1] Sun Jan 18 09:59:21 2009 @@ -339,7 +339,7 @@ IN PSID SidToCheck, OUT PBOOL IsMember) { - PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; + PISECURITY_DESCRIPTOR SecurityDescriptor = NULL; ACCESS_MASK GrantedAccess; struct { Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Sun Jan 18 09:59:21 2009 @@ -325,8 +325,8 @@ if (Unicode) { Ret = ((FONTENUMPROCW) EnumProc)( - &Info[i].EnumLogFontEx, - &Info[i].NewTextMetricEx, + (VOID*)&Info[i].EnumLogFontEx, + (VOID*)&Info[i].NewTextMetricEx, Info[i].FontType, lParam); } else @@ -341,8 +341,8 @@ NewTextMetricExW2A(&NewTextMetricExA, &Info[i].NewTextMetricEx); Ret = ((FONTENUMPROCA) EnumProc)( - &EnumLogFontExA, - &NewTextMetricExA, + (VOID*)&EnumLogFontExA, + (VOID*)&NewTextMetricExA, Info[i].FontType, lParam); } } @@ -1903,8 +1903,8 @@ { PNTMW_INTERNAL pNtmwi = (PNTMW_INTERNAL)((ULONG_PTR)pEfdw + pEfdw->ulNtmwiOffset); - ret = lpEnumFontFamExProcW(&pEfdw->elfexdv.elfEnumLogfontEx, - &pNtmwi->ntmw, + ret = lpEnumFontFamExProcW((VOID*)&pEfdw->elfexdv.elfEnumLogfontEx, + (VOID*)&pNtmwi->ntmw, pEfdw->dwFontType, lParam); Modified: trunk/reactos/include/psdk/winable.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winable.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winable.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winable.h [iso-8859-1] Sun Jan 18 09:59:21 2009 @@ -65,7 +65,7 @@ } INPUT,*PINPUT,*LPINPUT; #endif /* (_WIN32_WINNT < 0x0403) */ #if (WINVER < 0x0500) -typedef VOID (*WINEVENTPROC)(HWINEVENTHOOK,DWORD,HWND,LONG,LONG,DWORD,DWORD); +typedef VOID (CALLBACK* WINEVENTPROC)(HWINEVENTHOOK,DWORD,HWND,LONG,LONG,DWORD,DWORD); typedef struct tagGUITHREADINFO { DWORD cbSize; DWORD flags; Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sun Jan 18 09:59:21 2009 @@ -2697,23 +2697,62 @@ } ENUMTEXTMETRICW, *PENUMTEXTMETRICW, *LPENUMTEXTMETRICW; +#if defined(STRICT) + +#if !defined(NOTEXTMETRIC) + +typedef int (CALLBACK *OLDFONTENUMPROCA)(CONST LOGFONTA *, CONST TEXTMETRICA *, DWORD, LPARAM); +typedef int (CALLBACK *OLDFONTENUMPROCW)(CONST LOGFONTW *, CONST TEXTMETRICW *, DWORD, LPARAM); + +#else + +typedef int (CALLBACK* OLDFONTENUMPROCA)(CONST LOGFONTA *, CONST VOID *, DWORD, LPARAM); +typedef int (CALLBACK* OLDFONTENUMPROCW)(CONST LOGFONTW *, CONST VOID *, DWORD, LPARAM); + +#endif + +#ifdef UNICODE +#define OLDFONTENUMPROC OLDFONTENUMPROCW +#else +#define OLDFONTENUMPROC OLDFONTENUMPROCA +#endif + +typedef OLDFONTENUMPROCA FONTENUMPROCA; +typedef OLDFONTENUMPROCW FONTENUMPROCW; + +#ifdef UNICODE +typedef FONTENUMPROCW FONTENUMPROC; +#else +typedef FONTENUMPROCA FONTENUMPROC; +#endif + +typedef INT (CALLBACK *GOBJENUMPROC)(LPVOID, LPARAM); +typedef VOID (CALLBACK *LINEDDAPROC)(INT, INT, LPARAM); + +#else // defined(STRICT) + +typedef FARPROC OLDFONTENUMPROC; +typedef FARPROC FONTENUMPROCA; +typedef FARPROC FONTENUMPROCW; + +#ifdef UNICODE +typedef FONTENUMPROCW FONTENUMPROC; +#else +typedef FONTENUMPROCA FONTENUMPROC; +#endif + +typedef FARPROC GOBJENUMPROC; +typedef FARPROC LINEDDAPROC; + +#endif + typedef BOOL (CALLBACK *ABORTPROC)(HDC,int); + typedef int (CALLBACK *MFENUMPROC)(HDC,HANDLETABLE*,METARECORD*,int,LPARAM); typedef int (CALLBACK *ENHMFENUMPROC)(HDC,HANDLETABLE*,const ENHMETARECORD*,int,LPARAM); -typedef int (CALLBACK *OLDFONTENUMPROCA)(ENUMLOGFONTEXA*,NEWTEXTMETRICEXA*,DWORD,LPARAM); -typedef int (CALLBACK *OLDFONTENUMPROCW)(ENUMLOGFONTEXW*,NEWTEXTMETRICEXW*,DWORD,LPARAM); -typedef OLDFONTENUMPROCA FONTENUMPROCA; -typedef OLDFONTENUMPROCW FONTENUMPROCW; -#ifdef UNICODE -#define OLDFONTENUMPROC OLDFONTENUMPROCW -#else -#define OLDFONTENUMPROC OLDFONTENUMPROCA -#endif typedef int (CALLBACK *ICMENUMPROCA)(LPSTR,LPARAM); typedef int (CALLBACK *ICMENUMPROCW)(LPWSTR,LPARAM); -typedef void (CALLBACK *GOBJENUMPROC)(LPVOID,LPARAM); -typedef void (CALLBACK *LINEDDAPROC)(int,int,LPARAM); typedef UINT (CALLBACK *LPFNDEVMODE)(HWND,HMODULE,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,UINT); typedef DWORD (CALLBACK *LPFNDEVCAPS)(LPSTR,LPSTR,UINT,LPSTR,LPDEVMODEA); @@ -3114,7 +3153,6 @@ typedef LOGFONTW LOGFONT,*PLOGFONT,*LPLOGFONT; typedef TEXTMETRICW TEXTMETRIC,*PTEXTMETRIC,*LPTEXTMETRIC; #define ICMENUMPROC ICMENUMPROCW -#define FONTENUMPROC FONTENUMPROCW typedef DEVMODEW DEVMODE,*PDEVMODE,*LPDEVMODE; typedef ENUMLOGFONTEXDVW ENUMLOGFONTEXDV; typedef PENUMLOGFONTEXDVW PENUMLOGFONTEXDV; @@ -3196,7 +3234,6 @@ typedef LOGFONTA LOGFONT,*PLOGFONT,*LPLOGFONT; typedef TEXTMETRICA TEXTMETRIC,*PTEXTMETRIC,*LPTEXTMETRIC; #define ICMENUMPROC ICMENUMPROCA -#define FONTENUMPROC FONTENUMPROCA typedef DEVMODEA DEVMODE,*PDEVMODE,*LPDEVMODE; typedef ENUMLOGFONTEXDVA ENUMLOGFONTEXDV; typedef PENUMLOGFONTEXDVA PENUMLOGFONTEXDV; Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Jan 18 09:59:21 2009 @@ -3025,7 +3025,8 @@ PSID Group; PACL Sacl; PACL Dacl; -} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR, *PISECURITY_DESCRIPTOR; +} SECURITY_DESCRIPTOR, *PISECURITY_DESCRIPTOR; +typedef PVOID PSECURITY_DESCRIPTOR; #endif typedef struct _SECURITY_DESCRIPTOR_RELATIVE { BYTE Revision; Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Jan 18 09:59:21 2009 @@ -3525,7 +3525,7 @@ HWND hwndCaret; RECT rcCaret; } GUITHREADINFO,*PGUITHREADINFO,*LPGUITHREADINFO; -typedef VOID (*WINEVENTPROC)(HWINEVENTHOOK,DWORD,HWND,LONG,LONG,DWORD,DWORD); +typedef VOID (CALLBACK *WINEVENTPROC)(HWINEVENTHOOK,DWORD,HWND,LONG,LONG,DWORD,DWORD); #endif /* (WINVER >= 0x0500) */ #if (_WIN32_WINNT >= 0x0501) typedef struct { Modified: trunk/reactos/lib/rtl/bootdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bootdata.c?rev=388… ============================================================================== --- trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bootdata.c [iso-8859-1] Sun Jan 18 09:59:21 2009 @@ -17,7 +17,7 @@ static SID_IDENTIFIER_AUTHORITY LocalSystemAuthority = {SECURITY_NT_AUTHORITY}; static NTSTATUS -RtlpSysVolCreateSecurityDescriptor(OUT PSECURITY_DESCRIPTOR *SecurityDescriptor, +RtlpSysVolCreateSecurityDescriptor(OUT PISECURITY_DESCRIPTOR *SecurityDescriptor, OUT PSID *SystemSid) { PSECURITY_DESCRIPTOR AbsSD = NULL; Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=38898&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/debug.c [iso-8859-1] Sun Jan 18 09:59:21 2009 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Run-Time Library - * FILE: ntoskrnl/rtl/dbgprint.c + * FILE: lib/rtl/debug.c * PURPOSE: Debug Print and Prompt routines * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * Royce Mitchel III @@ -203,19 +203,19 @@ DbgPrint(PCCH Format, ...) { - ULONG n; + ULONG n; va_list ap; /* Call the internal routine that also handles ControlC */ va_start(ap, Format); n = vDbgPrintExWithPrefixInternal("", - -1, - DPFLTR_ERROR_LEVEL, - Format, - ap, - TRUE); + -1, + DPFLTR_ERROR_LEVEL, + Format, + ap, + TRUE); va_end(ap); - return n; + return n; } /* @@ -228,19 +228,19 @@ IN PCCH Format, ...) { - ULONG n; + ULONG n; va_list ap; /* Call the internal routine that also handles ControlC */ va_start(ap, Format); n = vDbgPrintExWithPrefixInternal("", - ComponentId, - Level, - Format, - ap, - TRUE); + ComponentId, + Level, + Format, + ap, + TRUE); va_end(ap); - return n; + return n; } /* @@ -251,19 +251,19 @@ DbgPrintReturnControlC(PCH Format, ...) { - ULONG n; + ULONG n; va_list ap; /* Call the internal routine that also handles ControlC */ va_start(ap, Format); n = vDbgPrintExWithPrefixInternal("", - -1, - DPFLTR_ERROR_LEVEL, - Format, - ap, - FALSE); + -1, + DPFLTR_ERROR_LEVEL, + Format, + ap, + FALSE); va_end(ap); - return n; + return n; } /* @@ -369,5 +369,3 @@ /* Load the symbols */ DebugService2(Name, &SymbolInfo, BREAKPOINT_UNLOAD_SYMBOLS); } - -/* EOF */ Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=38898&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sd.c [iso-8859-1] Sun Jan 18 09:59:21 2009 @@ -1018,7 +1018,7 @@ * @implemented */ BOOLEAN NTAPI -RtlValidRelativeSecurityDescriptor(IN PISECURITY_DESCRIPTOR SecurityDescriptorInput, +RtlValidRelativeSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptorInput, IN ULONG SecurityDescriptorLength, IN SECURITY_INFORMATION RequiredInformation) { @@ -1027,7 +1027,7 @@ PAGED_CODE_RTL(); if (SecurityDescriptorLength < sizeof(SECURITY_DESCRIPTOR_RELATIVE) || - SecurityDescriptorInput->Revision != SECURITY_DESCRIPTOR_REVISION1 || + pSD->Revision != SECURITY_DESCRIPTOR_REVISION1 || !(pSD->Control & SE_SELF_RELATIVE)) { return FALSE; Modified: trunk/reactos/tools/raddr2line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/raddr2line.c?rev=388… ============================================================================== --- trunk/reactos/tools/raddr2line.c [iso-8859-1] (original) +++ trunk/reactos/tools/raddr2line.c [iso-8859-1] Sun Jan 18 09:59:21 2009 @@ -85,9 +85,9 @@ else { PROSSYM_ENTRY e = &Entries[i]; - printf ( "%s:%lu (%s)\n", + printf ( "%s:%u (%s)\n", &Strings[e->FileOffset], - e->SourceLine, + (unsigned int)e->SourceLine, &Strings[e->FunctionOffset] ); return 0; }

1 0

[sginsberg] 38897: - ws2_32 Winetest: Define __ROS_LONG64__ - rpcrt4 Winetest: Fix an implicit declaration warning -- this should be sent to Wine
by sginsberg＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: sginsberg Date: Sun Jan 18 09:48:55 2009 New Revision: 38897 URL: http://svn.reactos.org/svn/reactos?rev=38897&view=rev Log: - ws2_32 Winetest: Define __ROS_LONG64__ - rpcrt4 Winetest: Fix an implicit declaration warning -- this should be sent to Wine Added: trunk/rostests/winetests/rpcrt4/warningfix.diff Modified: trunk/rostests/winetests/rpcrt4/server.c trunk/rostests/winetests/ws2_32/ws2_32.rbuild Modified: trunk/rostests/winetests/rpcrt4/server.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.c… ============================================================================== --- trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] Sun Jan 18 09:48:55 2009 @@ -352,18 +352,18 @@ } int -s_sum_parr(int *a[3]) -{ - return s_sum_pcarr(a, 3); -} - -int s_sum_pcarr(int *a[], int n) { int i, s = 0; for (i = 0; i < n; ++i) s += *a[i]; return s; +} + +int +s_sum_parr(int *a[3]) +{ + return s_sum_pcarr(a, 3); } int Added: trunk/rostests/winetests/rpcrt4/warningfix.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/warningf… ============================================================================== --- trunk/rostests/winetests/rpcrt4/warningfix.diff (added) +++ trunk/rostests/winetests/rpcrt4/warningfix.diff [iso-8859-1] Sun Jan 18 09:48:55 2009 @@ -1,0 +1,30 @@ +Index: server.c +=================================================================== +--- server.c (revision 38883) ++++ server.c (working copy) +@@ -352,12 +352,6 @@ + } + + int +-s_sum_parr(int *a[3]) +-{ +- return s_sum_pcarr(a, 3); +-} +- +-int + s_sum_pcarr(int *a[], int n) + { + int i, s = 0; +@@ -367,6 +361,12 @@ + } + + int ++s_sum_parr(int *a[3]) ++{ ++ return s_sum_pcarr(a, 3); ++} ++ ++int + s_enum_ord(e_t e) + { + switch (e) Modified: trunk/rostests/winetests/ws2_32/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/ws2_32.r… ============================================================================== --- trunk/rostests/winetests/ws2_32/ws2_32.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/ws2_32.rbuild [iso-8859-1] Sun Jan 18 09:48:55 2009 @@ -4,6 +4,7 @@ <module name="ws2_32_winetest" type="win32cui" installbase="bin" installname="ws2_32_winetest.exe" allowwarnings="true"> <compilerflag compiler="cc">-Wno-format</compilerflag> <include base="ws2_32_winetest">.</include> + <define name="__ROS_LONG64__" /> <file>protocol.c</file> <file>sock.c</file> <file>testlist.c</file>

1 0

[weiden] 38896: Strings are always NULL-terminated...
by weiden＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: weiden Date: Sun Jan 18 09:46:18 2009 New Revision: 38896 URL: http://svn.reactos.org/svn/reactos?rev=38896&view=rev Log: Strings are always NULL-terminated... Modified: trunk/reactos/dll/win32/setupapi/misc.c Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] Sun Jan 18 09:46:18 2009 @@ -1616,7 +1616,7 @@ return TRUE; } } - wcscpy(szNewString, L"\0"); + szNewString[0] = L'\0'; return FALSE; } @@ -1668,7 +1668,7 @@ wcscpy(szBuffer, L"{"); wcscat(szBuffer, rpcBuffer); - wcscat(szBuffer, L"}\0"); + wcscat(szBuffer, L"}"); wcscpy(pString, szBuffer);

1 0

[gedmurphy] 38895: you'd never guess I was English
by gedmurphy＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: gedmurphy Date: Sun Jan 18 09:15:54 2009 New Revision: 38895 URL: http://svn.reactos.org/svn/reactos?rev=38895&view=rev Log: you'd never guess I was English Modified: trunk/reactos/dll/win32/comctl32/treeview.c Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] Sun Jan 18 09:15:54 2009 @@ -2831,7 +2831,7 @@ } // - // This is correct, but is causes and infinite loop of WM_PAINT messages, resulting + // This is correct, but it causes an infinite loop of WM_PAINT messages, resulting // in continuous painting of the scroll bar in reactos. Comment out until the real // bug is found //

1 0

[gedmurphy] 38894: Reapply ros specific hack to stop the treeview scrollbars from continuous painting. I don't have time to look for the real bug at the moment. Also add Timo's propsheet and tooltip fixes
by gedmurphy＠svn.reactos.org 18 Jan '09

18 Jan '09

Author: gedmurphy Date: Sun Jan 18 09:07:11 2009 New Revision: 38894 URL: http://svn.reactos.org/svn/reactos?rev=38894&view=rev Log: Reapply ros specific hack to stop the treeview scrollbars from continuous painting. I don't have time to look for the real bug at the moment. Also add Timo's propsheet and tooltip fixes Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/propsheet.c trunk/reactos/dll/win32/comctl32/tooltips.c trunk/reactos/dll/win32/comctl32/treeview.c Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] Sun Jan 18 09:07:11 2009 @@ -1,8 +1,8 @@ Index: propsheet.c =================================================================== ---- propsheet.c (revision 25766) +--- propsheet.c (revision 38890) +++ propsheet.c (working copy) -@@ -2431,6 +2431,28 @@ +@@ -2417,6 +2417,29 @@ return FALSE; } @@ -28,10 +28,11 @@ + return TRUE; +} + ++ /****************************************************************************** * PROPSHEET_SetWizButtons * -@@ -2453,17 +2475,6 @@ +@@ -2438,17 +2461,6 @@ EnableWindow(hwndNext, FALSE); EnableWindow(hwndFinish, FALSE); @@ -49,7 +50,7 @@ if (dwFlags & PSWIZB_BACK) EnableWindow(hwndBack, TRUE); -@@ -2493,6 +2504,32 @@ +@@ -2478,6 +2490,31 @@ } else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) EnableWindow(hwndFinish, TRUE); @@ -78,41 +79,40 @@ + + /* Now try to find an edit control that deserves focus */ + EnumChildWindows(PropSheet_GetCurrentPageHwnd(hwndDlg), EnumChildProc, 0); -+ } /****************************************************************************** Index: tooltips.c =================================================================== ---- tooltips.c (revision 25790) +--- tooltips.c (revision 38890) +++ tooltips.c (working copy) -@@ -2486,7 +2486,34 @@ +@@ -2488,8 +2488,33 @@ + static LRESULT TOOLTIPS_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) { - FIXME ("hwnd=%p wParam=%lx lParam=%lx\n", hwnd, wParam, lParam); +- FIXME ("hwnd=%p wParam=%lx lParam=%lx\n", hwnd, wParam, lParam); + TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); + TTTOOL_INFO *toolPtr = infoPtr->tools; + INT nResult; -+ if (lParam == NF_QUERY) -+ { -+ if (toolPtr->bNotifyUnicode) -+ { ++ TRACE("hwnd=%p wParam=%lx lParam=%lx\n", hwnd, wParam, lParam); ++ ++ if (lParam == NF_QUERY) { ++ if (toolPtr->bNotifyUnicode) { + return NFR_UNICODE; + } else { + return NFR_ANSI; + } + } -+ else if (lParam == NF_REQUERY) -+ { ++ else if (lParam == NF_REQUERY) { + nResult = (INT) SendMessageW (toolPtr->hwnd, WM_NOTIFYFORMAT, + (WPARAM)hwnd, (LPARAM)NF_QUERY); + if (nResult == NFR_ANSI) { + toolPtr->bNotifyUnicode = FALSE; -+ TRACE(" -- WM_NOTIFYFORMAT returns: NFR_ANSI\n"); ++ TRACE(" -- WM_NOTIFYFORMAT returns: NFR_ANSI\n"); + } else if (nResult == NFR_UNICODE) { + toolPtr->bNotifyUnicode = TRUE; -+ TRACE(" -- WM_NOTIFYFORMAT returns: NFR_UNICODE\n"); ++ TRACE(" -- WM_NOTIFYFORMAT returns: NFR_UNICODE\n"); + } else { + TRACE (" -- WM_NOTIFYFORMAT returns: error!\n"); + } @@ -123,14 +123,19 @@ Index: treeview.c =================================================================== ---- D:/Wine-CVS/wine/dlls/comctl32/treeview.c Sun Jun 15 18:29:21 2008 -+++ D:/ReactOS-Trunk/reactos/dll/win32/comctl32/treeview.c Sun Jun 15 18:27:14 2008 -@@ -2826,8 +2826,6 @@ +--- treeview.c (revision 38890) ++++ treeview.c (working copy) +@@ -2830,7 +2830,12 @@ } } - TREEVIEW_UpdateScrollBars(infoPtr); -- ++ // ++ // This is correct, but is causes and infinite loop of WM_PAINT messages, resulting ++ // in continuous painting of the scroll bar in reactos. Comment out until the real ++ // bug is found ++ // ++ //TREEVIEW_UpdateScrollBars(infoPtr); + if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) infoPtr->cdmode = - TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc, rect); Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] Sun Jan 18 09:07:11 2009 @@ -2417,6 +2417,29 @@ return FALSE; } +BOOL CALLBACK +EnumChildProc(HWND hwnd, LPARAM lParam) +{ + WCHAR szType[20]; + RealGetWindowClassW(hwnd, szType, 20); + + if (strcmpW(szType, WC_EDITW) == 0) + { + if (IsWindowEnabled(hwnd) && IsWindowVisible(hwnd)) + { + SetFocus(hwnd); + return FALSE; + } + } + else + { + EnumChildWindows(hwnd, EnumChildProc, 0); + } + + return TRUE; +} + + /****************************************************************************** * PROPSHEET_SetWizButtons * @@ -2437,17 +2460,6 @@ EnableWindow(hwndBack, FALSE); EnableWindow(hwndNext, FALSE); EnableWindow(hwndFinish, FALSE); - - /* set the default pushbutton to an enabled button */ - if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) - SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); - else if (dwFlags & PSWIZB_NEXT) - SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); - else if (dwFlags & PSWIZB_BACK) - SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); - else - SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); - if (dwFlags & PSWIZB_BACK) EnableWindow(hwndBack, TRUE); @@ -2478,6 +2490,31 @@ } else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) EnableWindow(hwndFinish, TRUE); + + /* set the default pushbutton to an enabled button and give it focus */ + if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) + { + SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); + SetFocus(hwndFinish); + } + else if (dwFlags & PSWIZB_NEXT) + { + SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); + SetFocus(hwndNext); + } + else if (dwFlags & PSWIZB_BACK) + { + SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); + SetFocus(hwndBack); + } + else + { + SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); + SetFocus(GetDlgItem(hwndDlg, IDCANCEL)); + } + + /* Now try to find an edit control that deserves focus */ + EnumChildWindows(PropSheet_GetCurrentPageHwnd(hwndDlg), EnumChildProc, 0); } /****************************************************************************** Modified: trunk/reactos/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltip… ============================================================================== --- trunk/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/tooltips.c [iso-8859-1] Sun Jan 18 09:07:11 2009 @@ -2488,8 +2488,33 @@ static LRESULT TOOLTIPS_NotifyFormat (HWND hwnd, WPARAM wParam, LPARAM lParam) { - FIXME ("hwnd=%p wParam=%lx lParam=%lx\n", hwnd, wParam, lParam); - + TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr (hwnd); + TTTOOL_INFO *toolPtr = infoPtr->tools; + INT nResult; + + TRACE("hwnd=%p wParam=%lx lParam=%lx\n", hwnd, wParam, lParam); + + if (lParam == NF_QUERY) { + if (toolPtr->bNotifyUnicode) { + return NFR_UNICODE; + } else { + return NFR_ANSI; + } + } + else if (lParam == NF_REQUERY) { + nResult = (INT) SendMessageW (toolPtr->hwnd, WM_NOTIFYFORMAT, + (WPARAM)hwnd, (LPARAM)NF_QUERY); + if (nResult == NFR_ANSI) { + toolPtr->bNotifyUnicode = FALSE; + TRACE(" -- WM_NOTIFYFORMAT returns: NFR_ANSI\n"); + } else if (nResult == NFR_UNICODE) { + toolPtr->bNotifyUnicode = TRUE; + TRACE(" -- WM_NOTIFYFORMAT returns: NFR_UNICODE\n"); + } else { + TRACE (" -- WM_NOTIFYFORMAT returns: error!\n"); + } + return nResult; + } return 0; } Modified: trunk/reactos/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/treevie… ============================================================================== --- trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/treeview.c [iso-8859-1] Sun Jan 18 09:07:11 2009 @@ -2830,7 +2830,12 @@ } } - TREEVIEW_UpdateScrollBars(infoPtr); + // + // This is correct, but is causes and infinite loop of WM_PAINT messages, resulting + // in continuous painting of the scroll bar in reactos. Comment out until the real + // bug is found + // + //TREEVIEW_UpdateScrollBars(infoPtr); if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT) infoPtr->cdmode =

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