Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[cwittich] 20036: add QueryServiceConfig2W stub to get ros-msconfig working again

by cwittich＠svn.reactos.com

add QueryServiceConfig2W stub to get ros-msconfig working again Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/service/scm.c _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2005-12-10 14:36:39 UTC (rev 20035) +++ trunk/reactos/lib/advapi32/advapi32.def 2005-12-10 15:40:52 UTC (rev 20036) @@ -449,8 +449,8 @@ ;QueryAllTracesA ;QueryAllTracesW QueryRecoveryAgentsOnEncryptedFile@8 -;QueryServiceConfig2A -;QueryServiceConfig2W +;QueryServiceConfig2A@20 +QueryServiceConfig2W@20 QueryServiceConfigA@16 QueryServiceConfigW@16 QueryServiceLockStatusA@16 _____ Modified: trunk/reactos/lib/advapi32/service/scm.c --- trunk/reactos/lib/advapi32/service/scm.c 2005-12-10 14:36:39 UTC (rev 20035) +++ trunk/reactos/lib/advapi32/service/scm.c 2005-12-10 15:40:52 UTC (rev 20036) @@ -1031,7 +1031,26 @@ } } +/********************************************************************** + * QueryServiceConfig2W + * + * @unimplemented + */ +BOOL +STDCALL +QueryServiceConfig2W +( + SC_HANDLE hService, + DWORD dwInfo, + LPBYTE lpBuffer, + DWORD cbBufSize, + LPDWORD pcbBytesNeeded) +{ + DPRINT1("QueryServiceConfigW2 is unimplemented\n"); + return FALSE; +} + /********************************************************************** * QueryServiceLockStatusA *

18 years, 9 months

[navaraf] 20035: Until the kernel handle support is finished or bootvid support is rewritten not to use driver objects open & close the handle every time (in the correct context).

by navaraf＠svn.reactos.com

Until the kernel handle support is finished or bootvid support is rewritten not to use driver objects open & close the handle every time (in the correct context). Modified: trunk/reactos/ntoskrnl/inbv/inbv.c _____ Modified: trunk/reactos/ntoskrnl/inbv/inbv.c --- trunk/reactos/ntoskrnl/inbv/inbv.c 2005-12-10 13:50:36 UTC (rev 20034) +++ trunk/reactos/ntoskrnl/inbv/inbv.c 2005-12-10 14:36:39 UTC (rev 20035) @@ -119,7 +119,7 @@ /* Notify the hal we will acquire the display. */ HalAcquireDisplayOwnership(InbvResetDisplayParameters); - Status = NtDeviceIoControlFile(BootVidDevice, + Status = ZwDeviceIoControlFile(BootVidDevice, NULL, NULL, NULL, @@ -138,7 +138,7 @@ } else { - Status = NtDeviceIoControlFile(BootVidDevice, + Status = ZwDeviceIoControlFile(BootVidDevice, NULL, NULL, NULL, @@ -155,10 +155,10 @@ BootVidDriverInstalled = FALSE; /* Notify the hal we have released the display. */ HalReleaseDisplayOwnership(); + } - NtClose(BootVidDevice); - BootVidDevice = NULL; - } + ZwClose(BootVidDevice); + BootVidDevice = NULL; }

18 years, 9 months

[fireball] 20034: Move xbox's i2c support to a separate file, and add support of xbox's LEDs switching. Currently it initializes leds to red, and immediately after base init is done (means video has been initialized) they are turned to orange (good for debugging).

by fireball＠svn.reactos.com

Move xbox's i2c support to a separate file, and add support of xbox's LEDs switching. Currently it initializes leds to red, and immediately after base init is done (means video has been initialized) they are turned to orange (good for debugging). Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxi2c.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-12-10 00:28:41 UTC (rev 20033) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c 2005-12-10 13:50:36 UTC (rev 20034) @@ -22,6 +22,9 @@ VOID XboxMachInit(const char *CmdLine) { + /* Set LEDs to red before anything is initialized */ + XboxSetLED("rrrr"); + /* Initialize our stuff */ XboxMemInit(); XboxVideoInit(); @@ -55,4 +58,7 @@ MachVtbl.DiskGetCacheableBlockCount = XboxDiskGetCacheableBlockCount; MachVtbl.RTCGetCurrentDateTime = XboxRTCGetCurrentDateTime; MachVtbl.HwDetect = XboxHwDetect; + + /* Set LEDs to orange after init */ + XboxSetLED("oooo"); } _____ Added: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxi2c.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxi2c.c 2005-12-10 00:28:41 UTC (rev 20033) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxi2c.c 2005-12-10 13:50:36 UTC (rev 20034) @@ -0,0 +1,224 @@ +/* $Id: xboxhw.c 19190 2005-11-13 04:50:55Z fireball $ + * + * FreeLoader + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <freeldr.h> + +// These functions are used only inside xbox-specific code +// thus I didn't include them in header + +#define I2C_IO_BASE 0xc000 + +static BOOL +WriteToSMBus(UCHAR Address, UCHAR bRegister, UCHAR Size, ULONG Data_to_smbus) +{ + int nRetriesToLive=50; + + while(READ_PORT_USHORT((PUSHORT) (I2C_IO_BASE+0)) & 0x0800) + { + ; // Franz's spin while bus busy with any master traffic + } + + while(nRetriesToLive--) + { + UCHAR b; + unsigned int temp; + + WRITE_PORT_UCHAR((PUCHAR)(I2C_IO_BASE + 4), (Address << 1) | 0); + WRITE_PORT_UCHAR((PUCHAR)(I2C_IO_BASE + 8), bRegister); + + switch (Size) + { + case 4: + WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 9), Data_to_smbus & 0xff); + WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 9), (Data_to_smbus >> 8) & 0xff ); + WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 9), (Data_to_smbus >> 16) & 0xff ); + WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 9), (Data_to_smbus >> 24) & 0xff ); + WRITE_PORT_USHORT((PUSHORT) (I2C_IO_BASE + 6), 4); + break; + case 2: + WRITE_PORT_USHORT((PUSHORT) (I2C_IO_BASE + 6), Data_to_smbus&0xffff); + break; + default: // 1 + WRITE_PORT_USHORT((PUSHORT) (I2C_IO_BASE + 6), Data_to_smbus&0xff); + break; + } + + + temp = READ_PORT_USHORT((PUSHORT) (I2C_IO_BASE + 0)); + WRITE_PORT_USHORT((PUSHORT) (I2C_IO_BASE + 0), temp); // clear down all preexisting errors + + switch (Size) + { + case 4: + WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 2), 0x1d); // DWORD modus + break; + case 2: + WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 2), 0x1b); // WORD modus + break; + default: // 1 + WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 2), 0x1a); // BYTE modus + break; + } + + b = 0; + + while( (b&0x36)==0 ) + { + b=READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 0)); + } + + if ((b&0x10) != 0) + { + return TRUE; + } + + StallExecutionProcessor(1); + } + + return FALSE; +} + + +static BOOL +ReadfromSMBus(UCHAR Address, UCHAR bRegister, UCHAR Size, ULONG *Data_to_smbus) +{ + int nRetriesToLive=50; + + while (0 != (READ_PORT_USHORT((PUSHORT) (I2C_IO_BASE + 0)) & 0x0800)) + { + ; /* Franz's spin while bus busy with any master traffic */ + } + + while (0 != nRetriesToLive--) + { + UCHAR b; + int temp; + + WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 4), (Address << 1) | 1); + WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 8), bRegister); + + temp = READ_PORT_USHORT((USHORT *) (I2C_IO_BASE + 0)); + WRITE_PORT_USHORT((PUSHORT) (I2C_IO_BASE + 0), temp); /* clear down all preexisting errors */ + + switch (Size) + { + case 4: + WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 2), 0x0d); /* DWORD modus ? */ + break; + case 2: + WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 2), 0x0b); /* WORD modus */ + break; + default: + WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 2), 0x0a); // BYTE + break; + } + + b = 0; + + while (0 == (b & 0x36)) + { + b = READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 0)); + } + + if (0 != (b & 0x24)) + { + /* printf("I2CTransmitByteGetReturn error %x\n", b); */ + } + + if(0 == (b & 0x10)) + { + /* printf("I2CTransmitByteGetReturn no complete, retry\n"); */ + } + else + { + switch (Size) + { + case 4: + READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 6)); + READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 9)); + READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 9)); + READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 9)); + READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 9)); + break; + case 2: + *Data_to_smbus = READ_PORT_USHORT((USHORT *) (I2C_IO_BASE + 6)); + break; + default: + *Data_to_smbus = READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 6)); + break; + } + + + return TRUE; + } + } + + return FALSE; +} + +BOOL +I2CTransmitByteGetReturn(UCHAR bPicAddressI2cFormat, UCHAR bDataToWrite, ULONG *Return) +{ + return ReadfromSMBus(bPicAddressI2cFormat, bDataToWrite, 1, Return); +} + +// transmit a word, no returned data from I2C device +static BOOL +I2CTransmitWord(UCHAR bPicAddressI2cFormat, USHORT wDataToWrite) +{ + return WriteToSMBus(bPicAddressI2cFormat,(wDataToWrite>>8)&0xff,1,(wDataToWrite &0xff)); +} + +static void +I2cSetFrontpanelLed(UCHAR b) +{ + I2CTransmitWord( 0x10, 0x800 | b); // sequencing thanks to Jarin the Penguin! + I2CTransmitWord( 0x10, 0x701); +} + +// Set the pattern of the LED. +// r = Red, g = Green, o = Orange, x = Off +// This func is taken from cromwell, all credits goes for them +void +XboxSetLED(UCHAR *pattern) { + char *x = pattern; + int r, g; + + if(strlen(pattern) == 4) { + r = g = 0; + while (*x) { + r *= 2; + g *= 2; + switch (*x) { + case 'r': + r++; + break; + case 'g': + g++; + break; + case 'o': + r++; + g++; + break; + } + x++; + } + I2cSetFrontpanelLed(((r<<4) & 0xF0) + (g & 0xF)); + } +} Property changes on: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxi2c.c ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c 2005-12-10 00:28:41 UTC (rev 20033) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxvideo.c 2005-12-10 13:50:36 UTC (rev 20034) @@ -22,8 +22,6 @@ #include <freeldr.h> -#define I2C_IO_BASE 0xc000 - static PVOID FrameBuffer; static ULONG ScreenWidth; static ULONG ScreenHeight; @@ -39,6 +37,8 @@ #define MAKE_COLOR(Red, Green, Blue) (0xff000000 | (((Red) & 0xff) << 16) | (((Green) & 0xff) << 8) | ((Blue) & 0xff)) +BOOL I2CTransmitByteGetReturn(UCHAR bPicAddressI2cFormat, UCHAR bDataToWrite, ULONG *Return); + static VOID XboxVideoOutputChar(UCHAR Char, unsigned X, unsigned Y, ULONG FgColor, ULONG BgColor) { @@ -119,91 +119,6 @@ XboxVideoOutputChar(Ch, X, Y, FgColor, BgColor); } -static BOOL -ReadfromSMBus(UCHAR Address, UCHAR bRegister, UCHAR Size, ULONG *Data_to_smbus) -{ - int nRetriesToLive=50; - - while (0 != (READ_PORT_USHORT((PUSHORT) (I2C_IO_BASE + 0)) & 0x0800)) - { - ; /* Franz's spin while bus busy with any master traffic */ - } - - while (0 != nRetriesToLive--) - { - UCHAR b; - int temp; - - WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 4), (Address << 1) | 1); - WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 8), bRegister); - - temp = READ_PORT_USHORT((USHORT *) (I2C_IO_BASE + 0)); - WRITE_PORT_USHORT((PUSHORT) (I2C_IO_BASE + 0), temp); /* clear down all preexisting errors */ - - switch (Size) - { - case 4: - WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 2), 0x0d); /* DWORD modus ? */ - break; - case 2: - WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 2), 0x0b); /* WORD modus */ - break; - default: - WRITE_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 2), 0x0a); // BYTE - break; - } - - b = 0; - - while (0 == (b & 0x36)) - { - b = READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 0)); - } - - if (0 != (b & 0x24)) - { - /* printf("I2CTransmitByteGetReturn error %x\n", b); */ - } - - if(0 == (b & 0x10)) - { - /* printf("I2CTransmitByteGetReturn no complete, retry\n"); */ - } - else - { - switch (Size) - { - case 4: - READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 6)); - READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 9)); - READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 9)); - READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 9)); - READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 9)); - break; - case 2: - *Data_to_smbus = READ_PORT_USHORT((USHORT *) (I2C_IO_BASE + 6)); - break; - default: - *Data_to_smbus = READ_PORT_UCHAR((PUCHAR) (I2C_IO_BASE + 6)); - break; - } - - - return TRUE; - } - } - - return FALSE; -} - - -static BOOL -I2CTransmitByteGetReturn(UCHAR bPicAddressI2cFormat, UCHAR bDataToWrite, ULONG *Return) -{ - return ReadfromSMBus(bPicAddressI2cFormat, bDataToWrite, 1, Return); -} - - VOID XboxVideoInit(VOID) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-12-10 00:28:41 UTC (rev 20033) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-12-10 13:50:36 UTC (rev 20034) @@ -36,6 +36,7 @@ <file>xboxdisk.c</file> <file>xboxfont.c</file> <file>xboxhw.c</file> + <file>xboxi2c.c</file> <file>xboxmem.c</file> <file>xboxrtc.c</file> <file>xboxvideo.c</file> _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h 2005-12-10 00:28:41 UTC (rev 20033) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h 2005-12-10 13:50:36 UTC (rev 20034) @@ -60,6 +60,9 @@ VOID XboxHwDetect(VOID); +VOID XboxSetLED(UCHAR *Pattern); + + #endif /* __I386_HWXBOX_H_ */ /* EOF */

18 years, 9 months

[greatlrd] 20033: Bug fix DD_Cleanup thx w3seek, Implement second check for DrvGetDrawInfo,

by greatlrd＠svn.reactos.com

Bug fix DD_Cleanup thx w3seek, Implement second check for DrvGetDrawInfo, Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c _____ Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c --- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-12-10 00:15:17 UTC (rev 20032) +++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-12-10 00:28:41 UTC (rev 20033) @@ -20,15 +20,16 @@ BOOL INTERNAL_CALL DD_Cleanup(PVOID ObjectBody) { - PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(ObjectBody, GDI_OBJECT_TYPE_DIRECTDRAW); + if (ObjectBody == NULL) + return FALSE; + + PDD_DIRECTDRAW pDirectDraw = (PDD_DIRECTDRAW) ObjectBody; DPRINT1("DD_Cleanup\n"); if (!pDirectDraw) return FALSE; pDirectDraw->DrvDisableDirectDraw(pDirectDraw->Global.dhpdev); - - GDIOBJ_UnlockObjByPtr(pDirectDraw); return TRUE; } @@ -203,7 +204,7 @@ PDD_GETDRIVERINFODATA puGetDriverInfoData) { - DWORD ddRVal; + DWORD ddRVal = 0; PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); DPRINT1("NtGdiDdGetDriverInfo\n"); @@ -214,9 +215,19 @@ return DDHAL_DRIVER_NOTHANDLED; } - if (!(pDirectDraw->Hal.dwFlags & DDHALINFO_GETDRIVERINFOSET)) + + /* it exsist two version of NtGdiDdGetDriverInfo we need check for both flags */ + if (!(pDirectDraw->Hal.dwFlags & DDHALINFO_GETDRIVERINFOSET)) + ddRVal++; + + if (!(pDirectDraw->Hal.dwFlags & DDHALINFO_GETDRIVERINFO2)) + ddRVal++; + + + /* Now we are doing the call to drv DrvGetDriverInfo */ + if (ddRVal == 2) { - DPRINT1("NtGdiDdGetDriverInfo DDHAL_DRIVER_NOTHANDLED\n"); + DPRINT1("NtGdiDdGetDriverInfo DDHAL_DRIVER_NOTHANDLED"); ddRVal = DDHAL_DRIVER_NOTHANDLED; } else @@ -249,8 +260,11 @@ PDD_DIRECTDRAW pDirectDraw = GDIOBJ_LockObj(hDirectDrawLocal, GDI_OBJECT_TYPE_DIRECTDRAW); if (pDirectDraw == NULL) + { + DPRINT1("Can not lock the DirectDraw handle\n"); return DDHAL_DRIVER_NOTHANDLED; - + } + /* backup the orignal PDev and info */ lgpl = puCreateSurfaceData->lpDD; @@ -259,7 +273,10 @@ /* make the call */ if (!(pDirectDraw->DD.dwFlags & DDHAL_CB32_CANCREATESURFACE)) + { + DPRINT1("DirectDraw HAL does not support Create Surface"); ddRVal = DDHAL_DRIVER_NOTHANDLED; + } else { ddRVal = pDirectDraw->DD.CreateSurface(puCreateSurfaceData); @@ -802,7 +819,7 @@ /* FIXME add right GDI_OBJECT_TYPE_ for everthing for now we are using same type */ /* return GDIOBJ_FreeObj(hSurface, GDI_OBJECT_TYPE_DD_SURFACE); */ - return GDIOBJ_FreeObj(hSurface, GDI_OBJECT_TYPE_DIRECTDRAW); + return GDIOBJ_FreeObj(hSurface, GDI_OBJECT_TYPE_DD_SURFACE); }

18 years, 9 months

[sgasiorek] 20032: merged changes from wine to button and combobox code.

by sgasiorek＠svn.reactos.com

merged changes from wine to button and combobox code. Modified: trunk/reactos/lib/user32/controls/button.c Modified: trunk/reactos/lib/user32/controls/combo.c _____ Modified: trunk/reactos/lib/user32/controls/button.c --- trunk/reactos/lib/user32/controls/button.c 2005-12-10 00:07:40 UTC (rev 20031) +++ trunk/reactos/lib/user32/controls/button.c 2005-12-10 00:15:17 UTC (rev 20032) @@ -24,8 +24,8 @@ /* GetWindowLong offsets for window extra information */ #define STATE_GWL_OFFSET 0 #define HFONT_GWL_OFFSET (sizeof(LONG)) -#define HIMAGE_GWL_OFFSET (2*sizeof(LONG)) -#define NB_EXTRA_BYTES (3*sizeof(LONG)) +#define HIMAGE_GWL_OFFSET (HFONT_GWL_OFFSET*sizeof(LONG)) +#define NB_EXTRA_BYTES (HIMAGE_GWL_OFFSET*sizeof(LONG)) /* Button state values */ #define BUTTON_UNCHECKED 0x00 @@ -39,6 +39,14 @@ #define BUTTON_UNKNOWN2 0x20 #define BUTTON_UNKNOWN3 0x10 +#define BUTTON_NOTIFY_PARENT(hWnd, code) \ + do { /* Notify parent which has created this button control */ \ + TRACE("notification " #code " sent to hwnd=%p\n", GetParent(hWnd)); \ + SendMessageW(GetParent(hWnd), WM_COMMAND, \ + MAKEWPARAM(GetWindowLongPtrW((hWnd),GWLP_ID), (code)), \ + (LPARAM)(hWnd)); \ + } while(0) + static UINT BUTTON_CalcLabelRect( HWND hwnd, HDC hdc, RECT *rc ); static void PB_Paint( HWND hwnd, HDC hDC, UINT action ); static void CB_Paint( HWND hwnd, HDC hDC, UINT action ); @@ -116,22 +124,22 @@ __inline static LONG get_button_state( HWND hwnd ) { - return GetWindowLongA( hwnd, STATE_GWL_OFFSET ); + return GetWindowLongW( hwnd, STATE_GWL_OFFSET ); } __inline static void set_button_state( HWND hwnd, LONG state ) { - SetWindowLongA( hwnd, STATE_GWL_OFFSET, state ); + SetWindowLongW( hwnd, STATE_GWL_OFFSET, state ); } __inline static HFONT get_button_font( HWND hwnd ) { - return (HFONT)GetWindowLongA( hwnd, HFONT_GWL_OFFSET ); + return (HFONT)GetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET ); } __inline static void set_button_font( HWND hwnd, HFONT font ) { - SetWindowLongA( hwnd, HFONT_GWL_OFFSET, (LONG)font ); + SetWindowLongPtrW( hwnd, HFONT_GWL_OFFSET, (LONG)font ); } __inline static UINT get_button_type( LONG window_style ) @@ -167,7 +175,7 @@ { RECT rect; POINT pt; - LONG style = GetWindowLongA( hWnd, GWL_STYLE ); + LONG style = GetWindowLongW( hWnd, GWL_STYLE ); UINT btn_type = get_button_type( style ); LONG state; HANDLE oldHbitmap; @@ -180,10 +188,12 @@ case WM_GETDLGCODE: switch(btn_type) { + case BS_USERBUTTON: case BS_PUSHBUTTON: return DLGC_BUTTON | DLGC_UNDEFPUSHBUTTON; case BS_DEFPUSHBUTTON: return DLGC_BUTTON | DLGC_DEFPUSHBUTTON; case BS_RADIOBUTTON: case BS_AUTORADIOBUTTON: return DLGC_BUTTON | DLGC_RADIOBUTTON; + case BS_GROUPBOX: return DLGC_STATIC; default: return DLGC_BUTTON; } @@ -222,6 +232,7 @@ } return 1; + case WM_PRINTCLIENT: case WM_PAINT: if (btnPaintFunc[btn_type]) { @@ -248,17 +259,15 @@ btn_type == BS_USERBUTTON || btn_type == BS_OWNERDRAW) { - SendMessageW( GetParent(hWnd), WM_COMMAND, - MAKEWPARAM( GetWindowLongA(hWnd,GWL_ID), BN_DOUBLECLICKED ), - (LPARAM)hWnd); + BUTTON_NOTIFY_PARENT(hWnd, BN_DOUBLECLICKED); break; } /* fall through */ case WM_LBUTTONDOWN: SetCapture( hWnd ); SetFocus( hWnd ); + set_button_state( hWnd, get_button_state( hWnd ) | BUTTON_BTNPRESSED ); SendMessageW( hWnd, BM_SETSTATE, TRUE, 0 ); - set_button_state( hWnd, get_button_state( hWnd ) | BUTTON_BTNPRESSED ); break; case WM_KEYUP: @@ -294,8 +303,7 @@ (state & BUTTON_3STATE) ? 0 : ((state & 3) + 1), 0 ); break; } - SendMessageW( GetParent(hWnd), WM_COMMAND, - MAKEWPARAM( GetWindowLongA(hWnd,GWL_ID), BN_CLICKED ), (LPARAM)hWnd); + BUTTON_NOTIFY_PARENT(hWnd, BN_CLICKED); } break; @@ -361,11 +369,20 @@ case WM_SETFOCUS: set_button_state( hWnd, get_button_state(hWnd) | BUTTON_HASFOCUS ); paint_button( hWnd, btn_type, ODA_FOCUS ); + if (style & BS_NOTIFY) + BUTTON_NOTIFY_PARENT(hWnd, BN_SETFOCUS); break; case WM_KILLFOCUS: - set_button_state( hWnd, get_button_state(hWnd) & ~BUTTON_HASFOCUS ); + state = get_button_state( hWnd ); + set_button_state( hWnd, state & ~BUTTON_HASFOCUS ); paint_button( hWnd, btn_type, ODA_FOCUS ); + + if ((state & BUTTON_BTNPRESSED) && GetCapture() == hWnd) + ReleaseCapture(); + if (style & BS_NOTIFY) + BUTTON_NOTIFY_PARENT(hWnd, BN_KILLFOCUS); + break; case WM_SYSCOLORCHANGE: @@ -379,7 +396,7 @@ if ((wParam & 0x0f) >= MAX_BTN_TYPE) break; btn_type = wParam & 0x0f; style = (style & ~0x0f) | btn_type; - SetWindowLongA( hWnd, GWL_STYLE, style ); + SetWindowLongW( hWnd, GWL_STYLE, style ); /* Only redraw if lParam flag is set.*/ if (lParam) @@ -405,12 +422,12 @@ default: return 0; } - oldHbitmap = (HBITMAP)SetWindowLongA( hWnd, HIMAGE_GWL_OFFSET, lParam ); + oldHbitmap = (HBITMAP)SetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET, lParam ); InvalidateRect( hWnd, NULL, FALSE ); return (LRESULT)oldHbitmap; case BM_GETIMAGE: - return GetWindowLongA( hWnd, HIMAGE_GWL_OFFSET ); + return GetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET ); #ifndef __REACTOS__ case BM_GETCHECK16: @@ -428,7 +445,7 @@ { if (wParam) style |= WS_TABSTOP; else style &= ~WS_TABSTOP; - SetWindowLongA( hWnd, GWL_STYLE, style ); + SetWindowLongW( hWnd, GWL_STYLE, style ); } if ((state & 3) != wParam) { @@ -556,7 +573,7 @@ */ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc) { - LONG style = GetWindowLongA( hwnd, GWL_STYLE ); + LONG style = GetWindowLongW( hwnd, GWL_STYLE ); WCHAR *text; ICONINFO iconInfo; BITMAP bm; @@ -579,7 +596,7 @@ break; case BS_ICON: - if (!GetIconInfo((HICON)GetWindowLongA( hwnd, HIMAGE_GWL_OFFSET ), &iconInfo)) + if (!GetIconInfo((HICON)GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ), &iconInfo)) goto empty_rect; GetObjectW (iconInfo.hbmColor, sizeof(BITMAP), &bm); @@ -592,7 +609,7 @@ break; case BS_BITMAP: - if (!GetObjectW( (HANDLE)GetWindowLongA( hwnd, HIMAGE_GWL_OFFSET ), sizeof(BITMAP), &bm)) + if (!GetObjectW( (HANDLE)GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ), sizeof(BITMAP), &bm)) goto empty_rect; r.right = r.left + bm.bmWidth; @@ -601,8 +618,8 @@ default: empty_rect: - r.right = r.left; - r.bottom = r.top; + rc->right = r.left; + rc->bottom = r.top; return (UINT)(LONG)-1; } @@ -671,7 +688,7 @@ HBRUSH hbr = 0; UINT flags = IsWindowEnabled(hwnd) ? DSS_NORMAL : DSS_DISABLED; LONG state = get_button_state( hwnd ); - LONG style = GetWindowLongA( hwnd, GWL_STYLE ); + LONG style = GetWindowLongW( hwnd, GWL_STYLE ); WCHAR *text = NULL; /* FIXME: To draw disabled label in Win31 look-and-feel, we probably @@ -697,12 +714,12 @@ case BS_ICON: flags |= DST_ICON; - lp = GetWindowLongA( hwnd, HIMAGE_GWL_OFFSET ); + lp = GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ); break; case BS_BITMAP: flags |= DST_BITMAP; - lp = GetWindowLongA( hwnd, HIMAGE_GWL_OFFSET ); + lp = GetWindowLongPtrW( hwnd, HIMAGE_GWL_OFFSET ); break; default: @@ -711,7 +728,7 @@ DrawStateW(hdc, hbr, lpOutputProc, lp, wp, rc->left, rc->top, rc->right - rc->left, rc->bottom - rc->top, flags); - if (text) HeapFree( GetProcessHeap(), 0, text ); + HeapFree( GetProcessHeap(), 0, text ); } /********************************************************************** @@ -721,14 +738,13 @@ { RECT rc, focus_rect, r; UINT dtFlags, uState; - HRGN hRgn; HPEN hOldPen; HBRUSH hOldBrush; INT oldBkMode; COLORREF oldTxtColor; HFONT hFont; LONG state = get_button_state( hwnd ); - LONG style = GetWindowLongA( hwnd, GWL_STYLE ); + LONG style = GetWindowLongW( hwnd, GWL_STYLE ); BOOL pushedState = (state & BUTTON_HIGHLIGHTED); HWND parent; @@ -782,16 +798,13 @@ if (pushedState) OffsetRect(&r, 1, 1); - hRgn = CreateRectRgn(rc.left, rc.top, rc.right, rc.bottom); - SelectClipRgn(hDC, hRgn); + IntersectClipRect(hDC, rc.left, rc.top, rc.right, rc.bottom); oldTxtColor = SetTextColor( hDC, GetSysColor(COLOR_BTNTEXT) ); BUTTON_DrawLabel(hwnd, hDC, dtFlags, &r); SetTextColor( hDC, oldTxtColor ); - SelectClipRgn(hDC, 0); - DeleteObject(hRgn); if (state & BUTTON_HASFOCUS) { @@ -806,6 +819,7 @@ SetBkMode(hDC, oldBkMode); } + /********************************************************************** * Check Box & Radio Button Functions */ @@ -816,10 +830,9 @@ HBRUSH hBrush; int delta; UINT dtFlags; - HRGN hRgn; HFONT hFont; LONG state = get_button_state( hwnd ); - LONG style = GetWindowLongA( hwnd, GWL_STYLE ); + LONG style = GetWindowLongW( hwnd, GWL_STYLE ); HWND parent; if (style & BS_PUSHLIKE) @@ -853,7 +866,7 @@ rtext.left += checkBoxWidth + 4; rbox.right = checkBoxWidth; } - + /* Since WM_ERASEBKGND does nothing, first prepare background */ if (action == ODA_SELECT) FillRect( hDC, &rbox, hBrush ); if (action == ODA_DRAWENTIRE) FillRect( hDC, &client, hBrush ); @@ -861,9 +874,14 @@ /* Draw label */ client = rtext; dtFlags = BUTTON_CalcLabelRect(hwnd, hDC, &rtext); + + /* Only adjust rbox when rtext is valid */ + if (dtFlags != (UINT)-1L) + { + rbox.top = rtext.top; + rbox.bottom = rtext.bottom; + } - rbox.top = rtext.top; - rbox.bottom = rtext.bottom; /* Draw the check-box bitmap */ if (action == ODA_DRAWENTIRE || action == ODA_SELECT) { @@ -881,20 +899,20 @@ /* rbox must have the correct height */ delta = rbox.bottom - rbox.top - checkBoxHeight; - + if (style & BS_TOP) { if (delta > 0) { rbox.bottom = rbox.top + checkBoxHeight; - } else { + } else { rbox.top -= -delta/2 + 1; - rbox.bottom += rbox.top + checkBoxHeight; + rbox.bottom = rbox.top + checkBoxHeight; } } else if (style & BS_BOTTOM) { if (delta > 0) { rbox.top = rbox.bottom - checkBoxHeight; } else { rbox.bottom += -delta/2 + 1; - rbox.top = rbox.bottom -= checkBoxHeight; + rbox.top = rbox.bottom - checkBoxHeight; } } else { /* Default */ if (delta > 0) { @@ -913,10 +931,9 @@ if (dtFlags == (UINT)-1L) /* Noting to draw */ return; - hRgn = CreateRectRgn(client.left, client.top, client.right, client.bottom); - SelectClipRgn(hDC, hRgn); - DeleteObject(hRgn); + IntersectClipRect(hDC, client.left, client.top, client.right, client.bottom); + if (action == ODA_DRAWENTIRE) BUTTON_DrawLabel(hwnd, hDC, dtFlags, &rtext); @@ -929,7 +946,6 @@ IntersectRect(&rtext, &rtext, &client); DrawFocusRect( hDC, &rtext ); } - SelectClipRgn(hDC, 0); } @@ -949,7 +965,7 @@ { if (!sibling) break; if ((hwnd != sibling) && - ((GetWindowLongA( sibling, GWL_STYLE) & 0x0f) == BS_AUTORADIOBUTTON)) + ((GetWindowLongW( sibling, GWL_STYLE) & 0x0f) == BS_AUTORADIOBUTTON)) SendMessageW( sibling, BM_SETCHECK, BUTTON_UNCHECKED, 0 ); sibling = GetNextDlgGroupItem( parent, sibling, FALSE ); } while (sibling != start); @@ -967,7 +983,7 @@ HFONT hFont; UINT dtFlags; TEXTMETRICW tm; - LONG style = GetWindowLongA( hwnd, GWL_STYLE ); + LONG style = GetWindowLongW( hwnd, GWL_STYLE ); HWND parent; if ((hFont = get_button_font( hwnd ))) SelectObject( hDC, hFont ); @@ -1037,7 +1053,6 @@ DrawFocusRect( hDC, &rc ); } - /********************************************************************** * Ownerdrawn Button Functions */ @@ -1048,8 +1063,9 @@ DRAWITEMSTRUCT dis; HRGN clipRegion; RECT clipRect; - UINT id = GetWindowLongA( hwnd, GWL_ID ); + LONG_PTR id = GetWindowLongPtrW( hwnd, GWLP_ID ); HWND parent; + HFONT hFont, hPrevFont = 0; dis.CtlType = ODT_BUTTON; dis.CtlID = id; @@ -1073,9 +1089,11 @@ DPtoLP(hDC, (LPPOINT) &clipRect, 2); IntersectClipRect(hDC, clipRect.left, clipRect.top, clipRect.right, clipRect.bottom); + if ((hFont = get_button_font( hwnd ))) hPrevFont = SelectObject( hDC, hFont ); parent = GetParent(hwnd); if (!parent) parent = hwnd; SendMessageW( parent, WM_CTLCOLORBTN, (WPARAM)hDC, (LPARAM)hwnd ); SendMessageW( GetParent(hwnd), WM_DRAWITEM, id, (LPARAM)&dis ); + if (hPrevFont) SelectObject(hDC, hPrevFont); SelectClipRgn(hDC, clipRegion); } _____ Modified: trunk/reactos/lib/user32/controls/combo.c --- trunk/reactos/lib/user32/controls/combo.c 2005-12-10 00:07:40 UTC (rev 20031) +++ trunk/reactos/lib/user32/controls/combo.c 2005-12-10 00:15:17 UTC (rev 20032) @@ -17,7 +17,20 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * FIXME: roll up in Netscape 3.01. + * 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. + * + * TODO: + * - ComboBox_[GS]etMinVisible() + * - CB_GETMINVISIBLE, CB_SETMINVISIBLE + * - CB_LIMITTEXT + * - CB_SETTOPINDEX */ #include <user32.h> @@ -36,7 +49,7 @@ #define CB_NOTIFY( lphc, code ) \ (SendMessageW((lphc)->owner, WM_COMMAND, \ - MAKEWPARAM(GetWindowLongA((lphc)->self,GWL_ID), (code)), (LPARAM)(lphc)->self)) + MAKEWPARAM(GetWindowLongPtrW((lphc)->self,GWLP_ID), (code)), (LPARAM)(lphc)->self)) #define CB_DISABLED( lphc ) (!IsWindowEnabled((lphc)->self)) #define CB_OWNERDRAWN( lphc ) ((lphc)->dwStyle & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) @@ -136,23 +149,23 @@ if (COMBO_Init() && (lphc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HEADCOMBO))) ) { lphc->self = hwnd; - SetWindowLongA( hwnd, 0, (LONG)lphc ); + SetWindowLongW( hwnd, 0, (LONG)lphc ); /* some braindead apps do try to use scrollbar/border flags */ lphc->dwStyle = style & ~(WS_BORDER | WS_HSCROLL | WS_VSCROLL); - SetWindowLongA( hwnd, GWL_STYLE, style & ~(WS_BORDER | WS_HSCROLL | WS_VSCROLL) ); + SetWindowLongW( hwnd, GWL_STYLE, style & ~(WS_BORDER | WS_HSCROLL | WS_VSCROLL) ); /* * We also have to remove the client edge style to make sure * we don't end-up with a non client area. */ - SetWindowLongA( hwnd, GWL_EXSTYLE, - GetWindowLongA( hwnd, GWL_EXSTYLE ) & ~WS_EX_CLIENTEDGE ); + SetWindowLongW( hwnd, GWL_EXSTYLE, + GetWindowLongW( hwnd, GWL_EXSTYLE ) & ~WS_EX_CLIENTEDGE ); if( !(style & (CBS_OWNERDRAWFIXED | CBS_OWNERDRAWVARIABLE)) ) lphc->dwStyle |= CBS_HASSTRINGS; - if( !(GetWindowLongA( hwnd, GWL_EXSTYLE ) & WS_EX_NOPARENTNOTIFY) ) + if( !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_NOPARENTNOTIFY) ) lphc->wState |= CBF_NOTIFY; TRACE("[%p], style = %08x\n", lphc, lphc->dwStyle ); @@ -174,7 +187,7 @@ if( (CB_GETTYPE(lphc) != CBS_SIMPLE) && lphc->hWndLBox ) DestroyWindow( lphc->hWndLBox ); - SetWindowLongA( lphc->self, 0, 0 ); + SetWindowLongPtrW( lphc->self, 0, 0 ); HeapFree( GetProcessHeap(), 0, lphc ); } return 0; @@ -240,7 +253,7 @@ MEASUREITEMSTRUCT measureItem; RECT clientRect; INT originalItemHeight = iTextItemHeight; - UINT id = GetWindowLongA( lphc->self, GWL_ID ); + UINT id = GetWindowLongPtrW( lphc->self, GWLP_ID ); /* * We use the client rect for the width of the item. @@ -542,8 +555,11 @@ if( CB_GETTYPE(lphc) == CBS_DROPDOWN ) lphc->droppedRect.left += COMBO_EDITBUTTONSPACE(); - ClientToScreen(hwnd, (LPPOINT)&lphc->droppedRect); - ClientToScreen(hwnd, (LPPOINT)&lphc->droppedRect.right); + if (lphc->droppedRect.bottom < lphc->droppedRect.top) + lphc->droppedRect.bottom = lphc->droppedRect.top; + if (lphc->droppedRect.right < lphc->droppedRect.left) + lphc->droppedRect.right = lphc->droppedRect.left; + MapWindowPoints( hwnd, 0, (LPPOINT)&lphc->droppedRect, 2 ); } /* create listbox popup */ @@ -583,7 +599,7 @@ lphc->droppedRect.right - lphc->droppedRect.left, lphc->droppedRect.bottom - lphc->droppedRect.top, hwnd, (HMENU)ID_CB_LISTBOX, - (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE ), lphc ); + (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ), lphc ); else lphc->hWndLBox = CreateWindowExA(lbeExStyle, "ComboLBox", NULL, lbeStyle, lphc->droppedRect.left, @@ -591,7 +607,7 @@ lphc->droppedRect.right - lphc->droppedRect.left, lphc->droppedRect.bottom - lphc->droppedRect.top, hwnd, (HMENU)ID_CB_LISTBOX, - (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE ), lphc ); + (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ), lphc ); if( lphc->hWndLBox ) { @@ -617,14 +633,14 @@ lphc->textRect.right - lphc->textRect.left, lphc->textRect.bottom - lphc->textRect.top, hwnd, (HMENU)ID_CB_EDIT, - (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE ), NULL ); + (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ), NULL ); else lphc->hWndEdit = CreateWindowExA(0, "Edit", NULL, lbeStyle, lphc->textRect.left, lphc->textRect.top, lphc->textRect.right - lphc->textRect.left, lphc->textRect.bottom - lphc->textRect.top, hwnd, (HMENU)ID_CB_EDIT, - (HINSTANCE)GetWindowLongA( hwnd, GWL_HINSTANCE ), NULL ); + (HINSTANCE)GetWindowLongPtrW( hwnd, GWLP_HINSTANCE ), NULL ); if( !lphc->hWndEdit ) bEdit = FALSE; @@ -736,7 +752,7 @@ { DRAWITEMSTRUCT dis; HRGN clipRegion; - UINT ctlid = GetWindowLongA( lphc->self, GWL_ID ); + UINT ctlid = (UINT)GetWindowLongPtrW( lphc->self, GWLP_ID ); /* setup state for DRAWITEM message. Owner will highlight */ if ( (lphc->wState & CBF_FOCUSED) && @@ -1047,8 +1063,7 @@ if( lphc->wState & CBF_FOCUSED ) SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1)); - if( pText ) - HeapFree( GetProcessHeap(), 0, pText ); + HeapFree( GetProcessHeap(), 0, pText ); } /*********************************************************************** @@ -1399,7 +1414,7 @@ static LRESULT COMBO_ItemOp( LPHEADCOMBO lphc, UINT msg, LPARAM lParam ) { HWND hWnd = lphc->self; - UINT id = GetWindowLongA( hWnd, GWL_ID ); + UINT id = (UINT)GetWindowLongPtrW( hWnd, GWLP_ID ); TRACE("[%p]: ownerdraw op %04x\n", lphc->self, msg ); @@ -1506,7 +1521,7 @@ if (!count || !buf) return 0; if( lphc->hWndLBox ) { - INT idx = SendMessageA(lphc->hWndLBox, LB_GETCURSEL, 0, 0); + INT idx = SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0); if (idx == LB_ERR) goto error; length = SendMessageA(lphc->hWndLBox, LB_GETTEXTLEN, idx, 0 ); if (length == LB_ERR) goto error; @@ -1809,7 +1824,37 @@ } } +static LRESULT COMBO_GetComboBoxInfo(LPHEADCOMBO lphc, COMBOBOXINFO *pcbi) +{ + if (!pcbi || (pcbi->cbSize < sizeof(COMBOBOXINFO))) + return FALSE; + pcbi->rcItem = lphc->textRect; + pcbi->rcButton = lphc->buttonRect; + pcbi->stateButton = 0; + if (lphc->wState & CBF_BUTTONDOWN) + pcbi->stateButton |= STATE_SYSTEM_PRESSED; + if (IsRectEmpty(&lphc->buttonRect)) + pcbi->stateButton |= STATE_SYSTEM_INVISIBLE; + pcbi->hwndCombo = lphc->self; + pcbi->hwndItem = lphc->hWndEdit; + pcbi->hwndList = lphc->hWndLBox; + return TRUE; +} + +static char *strdupA(LPCSTR str) +{ + char *ret; + DWORD len; + + if(!str) return NULL; + + len = strlen(str); + ret = HeapAlloc(GetProcessHeap(), 0, len + 1); + memcpy(ret, str, len + 1); + return ret; +} + /*********************************************************************** * ComboWndProc_common * @@ -1818,7 +1863,7 @@ static LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode ) { - LPHEADCOMBO lphc = (LPHEADCOMBO)GetWindowLongA( hwnd, 0 ); + LPHEADCOMBO lphc = (LPHEADCOMBO)GetWindowLongPtrW( hwnd, 0 ); //TRACE("[%p]: msg %s wp %08x lp %08lx\n", // hwnd, SPY_GetMsgName(message, hwnd), wParam, lParam ); @@ -2045,13 +2090,24 @@ struprW((LPWSTR)lParam); return SendMessageW(lphc->hWndLBox, LB_ADDSTRING, 0, lParam); } - else + else /* unlike the unicode version, the ansi version does not overwrite + the string if converting case */ { + char *string = NULL; + LRESULT ret; if( lphc->dwStyle & CBS_LOWERCASE ) - _strlwr((LPSTR)lParam); + { + string = strdupA((LPSTR)lParam); + _strlwr(string); + } else if( lphc->dwStyle & CBS_UPPERCASE ) - _strupr((LPSTR)lParam); - return SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, lParam); + { + string = strdupA((LPSTR)lParam); + _strupr(string); + } + ret = SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, string ? (LPARAM)string : lParam); + HeapFree(GetProcessHeap(), 0, string); + return ret; } #ifndef __REACTOS__ case CB_INSERTSTRING16: @@ -2291,6 +2347,8 @@ #endif case CB_GETEXTENDEDUI: return (lphc->wState & CBF_EUI) ? TRUE : FALSE; + case CB_GETCOMBOBOXINFO: + return COMBO_GetComboBoxInfo(lphc, (COMBOBOXINFO *)lParam); default: if (message >= WM_USER) @@ -2329,7 +2387,5 @@ BOOL WINAPI GetComboBoxInfo(HWND hwndCombo, /* [in] handle to combo box */ PCOMBOBOXINFO pcbi /* [in/out] combo box information */) { - FIXME("\n"); - return FALSE; - + return SendMessageW(hwndCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)pcbi); }

18 years, 9 months

[weiden] 20031: fixed difference in signedness warning

by weiden＠svn.reactos.com

fixed difference in signedness warning Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c _____ Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c --- trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-12-10 00:06:42 UTC (rev 20030) +++ trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-12-10 00:07:40 UTC (rev 20031) @@ -69,7 +69,7 @@ static CLIENT_ID BitmapThreadId; static PUCHAR BootimageBitmap; -static ULONG ShutdownNotify; +static LONG ShutdownNotify; static KEVENT ShutdownCompleteEvent; /* DATA **********************************************************************/

18 years, 9 months

[cwittich] 20030: fix uninitialized variable warning

by cwittich＠svn.reactos.com

fix uninitialized variable warning Modified: trunk/reactos/subsys/win32k/objects/path.c _____ Modified: trunk/reactos/subsys/win32k/objects/path.c --- trunk/reactos/subsys/win32k/objects/path.c 2005-12-09 22:58:14 UTC (rev 20029) +++ trunk/reactos/subsys/win32k/objects/path.c 2005-12-10 00:06:42 UTC (rev 20030) @@ -1021,7 +1021,7 @@ { int numStrokes, iStroke, i; INT *pNumPointsInStroke; - HRGN hrgn; + HRGN hrgn = 0; assert ( pPath!=NULL ); assert ( pHrgn!=NULL );

18 years, 9 months

[cwittich] 20029: add CertVerifyCertificateChainPolicy stub. now Genuine Check from MS reports "unsupported operating system" instead of not running at all

by cwittich＠svn.reactos.com

add CertVerifyCertificateChainPolicy stub. now Genuine Check from MS reports "unsupported operating system" instead of not running at all Modified: trunk/reactos/lib/crypt32/crypt32.spec _____ Modified: trunk/reactos/lib/crypt32/crypt32.spec --- trunk/reactos/lib/crypt32/crypt32.spec 2005-12-09 22:39:42 UTC (rev 20028) +++ trunk/reactos/lib/crypt32/crypt32.spec 2005-12-09 22:58:14 UTC (rev 20029) @@ -77,6 +77,7 @@ @ stub CertSetEnhancedKeyUsage @ stub CertStrToNameA @ stub CertStrToNameW +@ stub CertVerifyCertificateChainPolicy @ stub CertVerifyCRLRevocation @ stub CertVerifyCRLTimeValidity @ stub CertVerifyCTLUsage

18 years, 9 months

[gvg] 20028: Prefer reactos.org over reactos.com

by gvg＠svn.reactos.com

Prefer reactos.org over reactos.com Modified: trunk/reactos/subsys/system/cmd/De.rc Modified: trunk/reactos/subsys/system/cmd/En.rc Modified: trunk/reactos/subsys/system/cmd/Es.rc Modified: trunk/reactos/subsys/system/cmd/Fr.rc Modified: trunk/reactos/subsys/system/cmd/Hu.rc Modified: trunk/reactos/subsys/system/cmd/Ja.rc Modified: trunk/reactos/subsys/system/cmd/Ru.rc _____ Modified: trunk/reactos/subsys/system/cmd/De.rc --- trunk/reactos/subsys/system/cmd/De.rc 2005-12-09 22:36:49 UTC (rev 20027) +++ trunk/reactos/subsys/system/cmd/De.rc 2005-12-09 22:39:42 UTC (rev 20028) @@ -471,9 +471,9 @@ the Free Software Foundation; either version 2 of the License, or\n\ (at your option) any later version." -STRING_VERSION_HELP5, "\nSenden Sie Bug-Reports an <ros-dev(a)reactos.com>.\n\ +STRING_VERSION_HELP5, "\nSenden Sie Bug-Reports an <ros-dev(a)reactos.org>.\n\ Updates sind auf der offiziellen ReactOS-Seite verfuegbar:\n\ -http://www.reactos.com" +http://www.reactos.org" STRING_VERSION_HELP6, "\nFreeDOS Version programmiert von:\n" _____ Modified: trunk/reactos/subsys/system/cmd/En.rc --- trunk/reactos/subsys/system/cmd/En.rc 2005-12-09 22:36:49 UTC (rev 20027) +++ trunk/reactos/subsys/system/cmd/En.rc 2005-12-09 22:39:42 UTC (rev 20028) @@ -472,8 +472,8 @@ the Free Software Foundation; either version 2 of the License, or\n\ (at your option) any later version.\n" -STRING_VERSION_HELP5, "\nSend bug reports to <ros-dev(a)reactos.com>.\n\ -Updates are available at: http://www.reactos.com" +STRING_VERSION_HELP5, "\nSend bug reports to <ros-dev(a)reactos.org>.\n\ +Updates are available at: http://www.reactos.org" STRING_VERSION_HELP6, "\nFreeDOS version written by:\n" _____ Modified: trunk/reactos/subsys/system/cmd/Es.rc --- trunk/reactos/subsys/system/cmd/Es.rc 2005-12-09 22:36:49 UTC (rev 20027) +++ trunk/reactos/subsys/system/cmd/Es.rc 2005-12-09 22:39:42 UTC (rev 20028) @@ -474,8 +474,8 @@ la Fundaci¾n de Software Libre; tanto en la versi¾n 2 de la Licencia, o\n\ (seg·n tu elecci¾n) cualquier otra posterior.\n" -STRING_VERSION_HELP5, "\nManda los informes de bugs a <ros-dev(a)reactos.com>.\n\ -Actualizaciones disponibles en: http://www.reactos.com" +STRING_VERSION_HELP5, "\nManda los informes de bugs a <ros-dev(a)reactos.org>.\n\ +Actualizaciones disponibles en: http://www.reactos.org" STRING_VERSION_HELP6, "\nFreeDOS version escrita por:\n" _____ Modified: trunk/reactos/subsys/system/cmd/Fr.rc --- trunk/reactos/subsys/system/cmd/Fr.rc 2005-12-09 22:36:49 UTC (rev 20027) +++ trunk/reactos/subsys/system/cmd/Fr.rc 2005-12-09 22:39:42 UTC (rev 20028) @@ -473,8 +473,8 @@ the Free Software Foundation; either version 2 of the License, or\n\ (at your option) any later version." -STRING_VERSION_HELP5, "\nEnvoyer les rapports d'erreur Ó <ros-dev(a)reactos.com>.\n\ -Les mises Ó jour sont disponibles Ó : http://www.reactos.com" +STRING_VERSION_HELP5, "\nEnvoyer les rapports d'erreur Ó <ros-dev(a)reactos.org>.\n\ +Les mises Ó jour sont disponibles Ó : http://www.reactos.org" STRING_VERSION_HELP6, "\nVersion FreeDOS Úcrite par:\n" _____ Modified: trunk/reactos/subsys/system/cmd/Hu.rc --- trunk/reactos/subsys/system/cmd/Hu.rc 2005-12-09 22:36:49 UTC (rev 20027) +++ trunk/reactos/subsys/system/cmd/Hu.rc 2005-12-09 22:39:42 UTC (rev 20028) @@ -458,8 +458,8 @@ the Free Software Foundation; either version 2 of the License, or\n\ (at your option) any later version.\n" -STRING_VERSION_HELP5, "\nHibßkr¾l E-Maileket ide k³ldhetsz: <ros-dev(a)reactos.com>.\n\ -FrissÝtÚsek Ús egyÚb informßci¾k: http://www.reactos.com" +STRING_VERSION_HELP5, "\nHibßkr¾l E-Maileket ide k³ldhetsz: <ros-dev(a)reactos.org>.\n\ +FrissÝtÚsek Ús egyÚb informßci¾k: http://www.reactos.org" STRING_VERSION_HELP6, "\nA FreeDOS kÚszÝt§i:\n" _____ Modified: trunk/reactos/subsys/system/cmd/Ja.rc --- trunk/reactos/subsys/system/cmd/Ja.rc 2005-12-09 22:36:49 UTC (rev 20027) +++ trunk/reactos/subsys/system/cmd/Ja.rc 2005-12-09 22:39:42 UTC (rev 20028) @@ -482,8 +482,8 @@ è¾û]é?éµé?é?é?é?éÛê?ì~é?âoü[âWâçâôé?éñé?éÃéÛé®) é?ÆÞé?éÚÅîÅé?ë?é?ì? öð\n\ òzé?é¢é?ë³ò¤éÀéÚé?éãé¬é?é½é?éÀüB\n" -STRING_VERSION_HELP5, "\nâoâOò±ìÉé? <ros-dev(a)reactos.com> éÍæùé?é?é¡é¥é ?éóüB\n\ -ì?ÉVé?âoü[âWâçâôé?Äfé?âyü[âWé®éþô³ÄÞé?é½é?éÀ: http://www.reactos.com" +STRING_VERSION_HELP5, "\nâoâOò±ìÉé? <ros-dev(a)reactos.org> éÍæùé?é?é¡é¥é ?éóüB\n\ +ì?ÉVé?âoü[âWâçâôé?Äfé?âyü[âWé®éþô³ÄÞé?é½é?éÀ: http://www.reactos.org" STRING_VERSION_HELP6, "\nFreeDOS version written by:\n" _____ Modified: trunk/reactos/subsys/system/cmd/Ru.rc --- trunk/reactos/subsys/system/cmd/Ru.rc 2005-12-09 22:36:49 UTC (rev 20027) +++ trunk/reactos/subsys/system/cmd/Ru.rc 2005-12-09 22:39:42 UTC (rev 20028) @@ -480,8 +480,8 @@ the Free Software Foundation; either version 2 of the License, or\n\ (at your option) any later version.\n" -STRING_VERSION_HELP5, "\n¤¯±¹ÙÓÚ?Õ ¯?¸Õ?¹ ¯ß ¯°ÞßÛÓ§ ÝÓ <ros-dev(a)reactos.com>.\n\ -?ßÝ¯ÔÙÕÝÞ õ¯±?¾´Ý¹ ´¯ ÓõÕ±¾: http://www.reactos.com/" +STRING_VERSION_HELP5, "\n¤¯±¹ÙÓÚ?Õ ¯?¸Õ?¹ ¯ß ¯°ÞßÛÓ§ ÝÓ <ros-dev(a)reactos.org>.\n\ +?ßÝ¯ÔÙÕÝÞ õ¯±?¾´Ý¹ ´¯ ÓõÕ±¾: http://www.reactos.org/" STRING_VERSION_HELP6, "\nFreeDOS-ÔÕ±Þ ÝÓ´Þ±ÓÝÓ:\n"

18 years, 9 months

[navaraf] 20027: Add prototypes needed for GDI_DEBUG.

by navaraf＠svn.reactos.com

Add prototypes needed for GDI_DEBUG. Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c _____ Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c --- trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-12-09 22:14:27 UTC (rev 20026) +++ trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-12-09 22:36:49 UTC (rev 20027) @@ -103,6 +103,12 @@ DPRINT("%s:%i: Delay\n", __FILE__, __LINE__); \ KeDelayExecutionThread(KernelMode, FALSE, &ShortDelay) +#ifdef GDI_DEBUG +BOOLEAN STDCALL KiRosPrintAddress(PVOID Address); +VOID STDCALL KeRosDumpStackFrames(PULONG Frame, ULONG FrameCount); +ULONG STDCALL KeRosGetStackFrames(PULONG Frames, ULONG FrameCount); +#endif + /*! * Allocate GDI object table. * \param Size - number of entries in the object table.

18 years, 9 months

← Newer
1
...
44
45
46
47
48
49
50
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005