From f16b401e28f89707b8892289d8775d5c085e7b22 Mon Sep 17 00:00:00 2001 From: Andreas Mohr Date: Wed, 27 Feb 2002 21:34:54 +0000 Subject: [PATCH] Various cosmetic changes. --- dlls/kernel/comm.c | 60 +++++++++++++++++++++----------------------- dlls/kernel/string.c | 18 ++++++------- misc/registry.c | 5 +++- objects/gdiobj.c | 36 +++++++++----------------- relay32/builtin32.c | 4 +-- 5 files changed, 56 insertions(+), 67 deletions(-) diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c index 5d000ad6ab2..34e3afafd8d 100644 --- a/dlls/kernel/comm.c +++ b/dlls/kernel/comm.c @@ -3,33 +3,34 @@ * * Copyright 1996 Marcus Meissner * - * Mar 31, 1999. Ove Kåven - * - Implemented buffers and EnableCommNotification. - * * Apr 3, 1999. Lawson Whitney * - Fixed the modem control part of EscapeCommFunction16. * + * Mar 31, 1999. Ove Kåven + * - Implemented buffers and EnableCommNotification. + * * Mar 3, 1999. Ove Kåven * - Use port indices instead of unixfds for win16 * - Moved things around (separated win16 and win32 routines) * - Added some hints on how to implement buffers and EnableCommNotification. * + * Oktober 98, Rein Klazes [RHK] + * A program that wants to monitor the modem status line (RLSD/DCD) may + * poll the modem status register in the commMask structure. I update the bit + * in GetCommError, waiting for an implementation of communication events. + * + * July 6, 1998. Fixes and comments by Valentijn Sessink + * [V] + * + * August 12, 1997. Take a bash at SetCommEventMask - Lawson Whitney + * + * * May 26, 1997. Fixes and comments by Rick Richardson [RER] * - ptr->fd wasn't getting cleared on close. * - GetCommEventMask() and GetCommError() didn't do much of anything. * IMHO, they are still wrong, but they at least implement the RXCHAR * event and return I/O queue sizes, which makes the app I'm interested * in (analog devices EZKIT DSP development system) work. - * - * August 12, 1997. Take a bash at SetCommEventMask - Lawson Whitney - * - * July 6, 1998. Fixes and comments by Valentijn Sessink - * [V] - * Oktober 98, Rein Klazes [RHK] - * A program that wants to monitor the modem status line (RLSD/DCD) may - * poll the modem status register in the commMask structure. I update the bit - * in GetCommError, waiting for an implementation of communication events. - * */ #include "config.h" @@ -231,7 +232,7 @@ BOOL WINAPI COMM_BuildOldCommDCB(LPCSTR device, LPDCB lpdcb) * * RETURNS * - * True on success, false on an malformed control string. + * True on success, false on a malformed control string. */ BOOL WINAPI BuildCommDCBA( LPCSTR device, /* [in] The ascii device control string used to update the DCB. */ @@ -244,7 +245,7 @@ BOOL WINAPI BuildCommDCBA( * BuildCommDCBAndTimeoutsA (KERNEL32.@) * * Updates a device control block data structure with values from an - * ascii device control string. Taking time out values from a time outs + * ascii device control string. Taking timeout values from a timeouts * struct if desired by the control string. * * RETURNS @@ -254,7 +255,7 @@ BOOL WINAPI BuildCommDCBA( BOOL WINAPI BuildCommDCBAndTimeoutsA( LPCSTR device, /* [in] The ascii device control string. */ LPDCB lpdcb, /* [out] The device control block to be updated. */ - LPCOMMTIMEOUTS lptimeouts) /* [in] The time outs to use if asked to set them by the control string. */ + LPCOMMTIMEOUTS lptimeouts) /* [in] The timeouts to use if asked to set them by the control string. */ { int port; char *ptr,*temp; @@ -337,7 +338,7 @@ BOOL WINAPI BuildCommDCBAndTimeoutsA( * BuildCommDCBAndTimeoutsW (KERNEL32.@) * * Updates a device control block data structure with values from an - * unicode device control string. Taking time out values from a time outs + * unicode device control string. Taking timeout values from a timeouts * struct if desired by the control string. * * RETURNS @@ -347,7 +348,7 @@ BOOL WINAPI BuildCommDCBAndTimeoutsA( BOOL WINAPI BuildCommDCBAndTimeoutsW( LPCWSTR devid, /* [in] The unicode device control string. */ LPDCB lpdcb, /* [out] The device control block to be updated. */ - LPCOMMTIMEOUTS lptimeouts) /* [in] The time outs to use if asked to set them by the control string. */ + LPCOMMTIMEOUTS lptimeouts) /* [in] The timeouts to use if asked to set them by the control string. */ { BOOL ret = FALSE; LPSTR devidA; @@ -740,8 +741,8 @@ BOOL WINAPI SetupComm( /***************************************************************************** * GetCommMask (KERNEL32.@) * - * Obtain the events associated with a communication device that will cause a call - * WaitCommEvent to return. + * Obtain the events associated with a communication device that will cause + * a call WaitCommEvent to return. * * RETURNS * @@ -780,7 +781,7 @@ BOOL WINAPI GetCommMask( */ BOOL WINAPI SetCommMask( HANDLE handle, /* [in] The communications device. */ - DWORD evtmask) /* [in] The events that to be monitored. */ + DWORD evtmask) /* [in] The events that are to be monitored. */ { BOOL ret; @@ -910,7 +911,7 @@ BOOL WINAPI SetCommState( break; #endif #ifdef B460800 - case 460600: + case 460800: port.c_cflag |= B460800; break; #endif @@ -1348,14 +1349,14 @@ BOOL WINAPI TransmitCommChar( HANDLE hComm, /* [in] The communication device in need of a command character. */ CHAR chTransmit) /* [in] The character to transmit. */ { - FIXME("(%x,'%c'), use win32 handle!\n",hComm,chTransmit); + FIXME("(%x,'%c'), stub ! Use win32 handle!\n",hComm,chTransmit); return TRUE; } /***************************************************************************** * GetCommTimeouts (KERNEL32.@) * - * Obtains the request time out values for the communications device. + * Obtains the request timeout values for the communications device. * * RETURNS * @@ -1364,7 +1365,7 @@ BOOL WINAPI TransmitCommChar( */ BOOL WINAPI GetCommTimeouts( HANDLE hComm, /* [in] The communications device. */ - LPCOMMTIMEOUTS lptimeouts) /* [out] The struct of request time outs. */ + LPCOMMTIMEOUTS lptimeouts) /* [out] The struct of request timeouts. */ { BOOL ret; @@ -1406,7 +1407,7 @@ BOOL WINAPI GetCommTimeouts( * * RETURNS * - * True if the time outs were set, false otherwise. + * True if the timeouts were set, false otherwise. */ BOOL WINAPI SetCommTimeouts( HANDLE hComm, /* [in] handle of COMM device */ @@ -1814,9 +1815,6 @@ BOOL WINAPI CommConfigDialogW( * * BUGS * - * The signature is missing a the parameter for the size of the COMMCONFIG - * structure/buffer it should be - * BOOL WINAPI GetCommConfig(HANDLE hFile,LPCOMMCONFIG lpCommConfig,LPDWORD lpdwSize) */ BOOL WINAPI GetCommConfig( HANDLE hFile, /* [in] The communications device. */ @@ -1851,7 +1849,7 @@ BOOL WINAPI GetCommConfig( /*********************************************************************** * SetCommConfig (KERNEL32.@) * - * Sets the configuration of the commications device. + * Sets the configuration of the communications device. * * RETURNS * @@ -1971,7 +1969,7 @@ BOOL WINAPI GetDefaultCommConfigA( lpCC->dwProviderOffset = 0L; lpCC->dwProviderSize = 0L; - (void) sprintf( temp, "COM%c:38400,n,8,1", lpszName[3]); + sprintf( temp, "COM%c:38400,n,8,1", lpszName[3]); FIXME("setting %s as default\n", temp); return BuildCommDCBA( temp, lpdcb); diff --git a/dlls/kernel/string.c b/dlls/kernel/string.c index 531776fed68..d3433ffe138 100644 --- a/dlls/kernel/string.c +++ b/dlls/kernel/string.c @@ -24,15 +24,6 @@ static void *user32_proc_address(const char *proc_name) } -/*********************************************************************** - * Reserved5 (KERNEL.87) - */ -INT16 WINAPI KERNEL_lstrcmp16( LPCSTR str1, LPCSTR str2 ) -{ - return (INT16)strcmp( str1, str2 ); -} - - /*********************************************************************** * k32CharToOemBuffA (KERNEL32.11) */ @@ -182,3 +173,12 @@ SEGPTR WINAPI KERNEL_AnsiLower16( SEGPTR strOrChar ) } else return tolower((char)strOrChar); } + + +/*********************************************************************** + * Reserved5 (KERNEL.87) + */ +INT16 WINAPI KERNEL_lstrcmp16( LPCSTR str1, LPCSTR str2 ) +{ + return (INT16)strcmp( str1, str2 ); +} diff --git a/misc/registry.c b/misc/registry.c index a6e397cfb84..c89de50ee36 100644 --- a/misc/registry.c +++ b/misc/registry.c @@ -911,7 +911,10 @@ static int _nt_dump_lf(LPSTR key_name, char *base, int subkeys, nt_lf *lf, FILE return TRUE; error2: - ERR("unknown node id 0x%04x, please report!\n", lf->id); + if (lf->id == 0x686c) + FIXME("unknown Win XP node id 0x686c: do we need to add support for it ?\n"); + else + ERR("unknown node id 0x%04x, please report!\n", lf->id); return TRUE; error1: diff --git a/objects/gdiobj.c b/objects/gdiobj.c index 4381f20fdc4..0b1c5dc3ac5 100644 --- a/objects/gdiobj.c +++ b/objects/gdiobj.c @@ -860,24 +860,24 @@ BOOL WINAPI UnrealizeObject( HGDIOBJ obj ) } +/* Solid colors to enumerate */ +static const COLORREF solid_colors[] = +{ RGB(0x00,0x00,0x00), RGB(0xff,0xff,0xff), +RGB(0xff,0x00,0x00), RGB(0x00,0xff,0x00), +RGB(0x00,0x00,0xff), RGB(0xff,0xff,0x00), +RGB(0xff,0x00,0xff), RGB(0x00,0xff,0xff), +RGB(0x80,0x00,0x00), RGB(0x00,0x80,0x00), +RGB(0x80,0x80,0x00), RGB(0x00,0x00,0x80), +RGB(0x80,0x00,0x80), RGB(0x00,0x80,0x80), +RGB(0x80,0x80,0x80), RGB(0xc0,0xc0,0xc0) +}; + /*********************************************************************** * EnumObjects (GDI.71) */ INT16 WINAPI EnumObjects16( HDC16 hdc, INT16 nObjType, GOBJENUMPROC16 lpEnumFunc, LPARAM lParam ) { - /* Solid colors to enumerate */ - static const COLORREF solid_colors[] = - { RGB(0x00,0x00,0x00), RGB(0xff,0xff,0xff), - RGB(0xff,0x00,0x00), RGB(0x00,0xff,0x00), - RGB(0x00,0x00,0xff), RGB(0xff,0xff,0x00), - RGB(0xff,0x00,0xff), RGB(0x00,0xff,0xff), - RGB(0x80,0x00,0x00), RGB(0x00,0x80,0x00), - RGB(0x80,0x80,0x00), RGB(0x00,0x00,0x80), - RGB(0x80,0x00,0x80), RGB(0x00,0x80,0x80), - RGB(0x80,0x80,0x80), RGB(0xc0,0xc0,0xc0) - }; - INT16 i, retval = 0; LOGPEN16 pen; LOGBRUSH16 brush; @@ -943,18 +943,6 @@ INT16 WINAPI EnumObjects16( HDC16 hdc, INT16 nObjType, INT WINAPI EnumObjects( HDC hdc, INT nObjType, GOBJENUMPROC lpEnumFunc, LPARAM lParam ) { - /* Solid colors to enumerate */ - static const COLORREF solid_colors[] = - { RGB(0x00,0x00,0x00), RGB(0xff,0xff,0xff), - RGB(0xff,0x00,0x00), RGB(0x00,0xff,0x00), - RGB(0x00,0x00,0xff), RGB(0xff,0xff,0x00), - RGB(0xff,0x00,0xff), RGB(0x00,0xff,0xff), - RGB(0x80,0x00,0x00), RGB(0x00,0x80,0x00), - RGB(0x80,0x80,0x00), RGB(0x00,0x00,0x80), - RGB(0x80,0x00,0x80), RGB(0x00,0x80,0x80), - RGB(0x80,0x80,0x80), RGB(0xc0,0xc0,0xc0) - }; - INT i, retval = 0; LOGPEN pen; LOGBRUSH brush; diff --git a/relay32/builtin32.c b/relay32/builtin32.c index 531f74f0157..9e67f6f51a4 100644 --- a/relay32/builtin32.c +++ b/relay32/builtin32.c @@ -135,7 +135,7 @@ WINE_MODREF *BUILTIN32_LoadLibraryExA(LPCSTR path, DWORD flags) if (!(wm = MODULE_FindModule( path ))) wm = MODULE_FindModule( dllname ); if (!wm) { - ERR( "loaded .so but dll %s still not found\n", dllname ); + ERR( "loaded .so but dll %s still not found - library environment problem or version conflict, check your setup.\n", dllname ); /* wine_dll_unload( handle );*/ return NULL; } @@ -151,7 +151,7 @@ WINE_MODREF *BUILTIN32_LoadLibraryExA(LPCSTR path, DWORD flags) * BUILTIN32_Init * * Initialize loading callbacks and return HMODULE of main exe. - * 'main' is the main exe in case if was already loaded from a PE file. + * 'main' is the main exe in case it was already loaded from a PE file. */ HMODULE BUILTIN32_LoadExeModule( HMODULE main ) {