diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index b51e0373ac640456e9fbac3aa0c5326928d6067e..17b29c520342b3803257d4b1591f8c202f4f6bfd 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3016,7 +3016,7 @@ TREEVIEW_Expand (HWND hwnd, WPARAM wParam, LPARAM lParam) if (! wineItem) { ERR( - "Catastropic situation, cannot retreive item #%d\n", + "Catastrophic situation, cannot retrieve item #%d\n", expand); return FALSE; } diff --git a/graphics/x11drv/dib.c b/graphics/x11drv/dib.c index 3bc007153cfe4fe06d0ef41216ead30b5617f47b..06c7d63234d8bf691d64301a60df079ae48fc35c 100644 --- a/graphics/x11drv/dib.c +++ b/graphics/x11drv/dib.c @@ -2602,7 +2602,7 @@ int X11DRV_DIB_SetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) descr->infoWidth, lines, 32, 0 ); bmpImage->data = calloc( lines, bmpImage->bytes_per_line ); if(bmpImage->data == NULL) { - ERR("Out of memory!"); + ERR("Out of memory!\n"); XDestroyImage( bmpImage ); return lines; } @@ -2705,7 +2705,7 @@ int X11DRV_DIB_GetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) descr->infoWidth, lines, 32, 0 ); bmpImage->data = calloc( lines, bmpImage->bytes_per_line ); if(bmpImage->data == NULL) { - ERR("Out of memory!"); + ERR("Out of memory!\n"); XDestroyImage( bmpImage ); return lines; } } diff --git a/include/miscemu.h b/include/miscemu.h index a6ddb1e949e9fae79b32cb3a93b5b6252b24c070..78074862dd9f3ada6bd203292fbbda8c45b74f4f 100644 --- a/include/miscemu.h +++ b/include/miscemu.h @@ -245,7 +245,7 @@ extern void ASPI_DOS_HandleInt(CONTEXT86 *context); /* NOTE: Interrupts might get called from three modes: real mode, 16-bit, and * (via DeviceIoControl) 32-bit. For automatic conversion of pointer * parameters, interrupt handlers should use CTX_SEG_OFF_TO_LIN with - * the contents of a segement register as second and the contents of + * the contents of a segment register as second and the contents of * a *32-bit* general register as third parameter, e.g. * CTX_SEG_OFF_TO_LIN( context, DS_reg(context), EDX_reg(context) ) * This will generate a linear pointer in all three cases: diff --git a/misc/comm.c b/misc/comm.c index 82cd707874a789765f907d0a4bc88751b1fa653d..94322d7ab4522b5a5fd0cf725453312a80b24fcb 100644 --- a/misc/comm.c +++ b/misc/comm.c @@ -508,7 +508,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue) /* not enough memory */ tcsetattr(COM[port].fd,TCSANOW,&m_stat[port]); close(COM[port].fd); - ERR("out of memory"); + ERR("out of memory\n"); return IE_MEMORY; } diff --git a/misc/version.c b/misc/version.c index b6ff64d491601a71608c45756f40e35f94f0ae52..5c6fa62414f2bb9f9df579575ed59f5842650ea0 100644 --- a/misc/version.c +++ b/misc/version.c @@ -63,7 +63,7 @@ static VERSION_DATA VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN98 */ { - 0x07005F03, /* FIXME: need DOS value from real Win98 */ + 0x070A5F03, 0xC0000A04, { sizeof(OSVERSIONINFOA), 4, 10, 0x40A07CE, diff --git a/msdos/int2f.c b/msdos/int2f.c index ff620506faa8109dcdb6da574fc4827afbd63246..dca31b574e483029cbb2744b56e181a7279a970a 100644 --- a/msdos/int2f.c +++ b/msdos/int2f.c @@ -82,7 +82,7 @@ void WINAPI INT_Int2fHandler( CONTEXT86 *context ) DI_reg(context) = 0x0000; break; case 0x08: - FIXME("No real-mode handler for errors yet! (bye!)"); + FIXME("No real-mode handler for errors yet! (bye!)\n"); break; default: INT_BARF(context, 0x2f);