Assorted typos fixes (try 2)
Andrey Gusev
andrey.goosev at gmail.com
Tue Feb 25 03:53:06 CST 2014
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20140225/c81520be/attachment.html>
-------------- next part --------------
From 2372b55da3f82c89c28e371e5893971de53d942d Mon Sep 17 00:00:00 2001
Message-Id: <2372b55da3f82c89c28e371e5893971de53d942d.1393321770.git.andrey.goosev at gmail.com>
From: Andrey Gusev <andrey.goosev at gmail.com>
Date: Sun, 23 Feb 2014 18:36:27 +0200
Subject: Assorted typos fixes (try 2)
Supersedes 102698
---
dlls/dsound/primary.c | 2 +-
dlls/dssenh/tests/dssenh.c | 2 +-
dlls/gameux/gamestatistics.c | 2 +-
dlls/gdi.exe16/gdi.c | 2 +-
dlls/gdi32/font.c | 2 +-
dlls/gdiplus/graphicspath.c | 2 +-
dlls/gdiplus/pen.c | 2 +-
dlls/gdiplus/tests/font.c | 2 +-
dlls/gdiplus/tests/region.c | 4 ++--
dlls/gphoto2.ds/gphoto2_main.c | 2 +-
dlls/ieframe/dochost.c | 2 +-
dlls/ieframe/ie.c | 2 +-
dlls/ieframe/webbrowser.c | 2 +-
dlls/imm32/tests/imm32.c | 2 +-
14 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
index a824477..12dc02b 100644
--- a/dlls/dsound/primary.c
+++ b/dlls/dsound/primary.c
@@ -1231,7 +1231,7 @@ HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl *
const DSBUFFERDESC *dsbd)
{
IDirectSoundBufferImpl *dsb;
- TRACE("%p,%p,%p)\n",device,ppdsb,dsbd);
+ TRACE("(%p,%p,%p)\n",device,ppdsb,dsbd);
if (dsbd->lpwfxFormat) {
WARN("invalid parameter: dsbd->lpwfxFormat != NULL\n");
diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c
index 75c4e4c..629a512 100644
--- a/dlls/dssenh/tests/dssenh.c
+++ b/dlls/dssenh/tests/dssenh.c
@@ -405,7 +405,7 @@ struct hash_test {
};
static const char testHashVal1[] = "I love working with Wine";
-static const char testHashVal2[] = "Wine is not an emulater.";
+static const char testHashVal2[] = "Wine is not an emulator.";
static const char testHashVal3[] = "";
static const struct hash_test hash_data[] = {
diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c
index f49d73a..c0beb04 100644
--- a/dlls/gameux/gamestatistics.c
+++ b/dlls/gameux/gamestatistics.c
@@ -846,7 +846,7 @@ static HRESULT WINAPI GameStatisticsImpl_GetStatistic(
LONG nLength;
GameStatisticsImpl *This = impl_from_IGameStatistics(iface);
- TRACE("%p, %d,%d, %p, %p\n", This, categoryIndex, statIndex, pName, pValue);
+ TRACE("%p, %d, %d, %p, %p\n", This, categoryIndex, statIndex, pName, pValue);
if(!pName || !pValue)
return E_INVALIDARG;
diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c
index 8ee37d7..9ca38c3 100644
--- a/dlls/gdi.exe16/gdi.c
+++ b/dlls/gdi.exe16/gdi.c
@@ -1031,7 +1031,7 @@ INT16 WINAPI Escape16( HDC16 hdc, INT16 escape, INT16 in_count, SEGPTR in_data,
case GETVECTORBRUSHSIZE:
case GETVECTORPENSIZE:
default:
- FIXME("unknown/unsupported 16-bit escape %x (%d,%p,%p\n",
+ FIXME("unknown/unsupported 16-bit escape %x (%d,%p,%p)\n",
escape, in_count, MapSL(in_data), out_data );
return Escape( HDC_32(hdc), escape, in_count, MapSL(in_data), out_data );
}
diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 66072af..a4ff065 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -2217,7 +2217,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags,
else if(flags & ETO_GLYPH_INDEX)
glyphs = reordered_str;
- TRACE("%p, %d, %d, %08x, %s, %s, %d, %p)\n", hdc, x, y, flags,
+ TRACE("(%p, %d, %d, %08x, %s, %s, %d, %p)\n", hdc, x, y, flags,
wine_dbgstr_rect(lprect), debugstr_wn(str, count), count, lpDx);
TRACE("align = %x bkmode = %x mapmode = %x\n", align, GetBkMode(hdc), GetMapMode(hdc));
diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c
index 882bc48..d02040e 100644
--- a/dlls/gdiplus/graphicspath.c
+++ b/dlls/gdiplus/graphicspath.c
@@ -894,7 +894,7 @@ static GpStatus format_string_callback(HDC dc,
path->pathdata.Types[path->pathdata.Count] = PathPointTypeStart;
path->pathdata.Points[path->pathdata.Count].X = x + fromfixedpoint(ph->pfxStart.x) * args->scale;
path->pathdata.Points[path->pathdata.Count++].Y = y + args->ascent - fromfixedpoint(ph->pfxStart.y) * args->scale;
- TRACE("Starting at count %i with pos %f, %f)\n", path->pathdata.Count, x, y);
+ TRACE("Starting at count %i with pos (%f, %f)\n", path->pathdata.Count, x, y);
ofs += sizeof(*ph);
while (ofs - ofs_start < ph->cb)
{
diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c
index 9b63db9..a2be541 100644
--- a/dlls/gdiplus/pen.c
+++ b/dlls/gdiplus/pen.c
@@ -709,7 +709,7 @@ GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen *pen, GpLineCap cap)
GpStatus WINGDIPAPI GdipSetPenLineCap197819(GpPen *pen, GpLineCap start,
GpLineCap end, GpDashCap dash)
{
- TRACE("%p, %d, %d, %d)\n", pen, start, end, dash);
+ TRACE("(%p, %d, %d, %d)\n", pen, start, end, dash);
if(!pen)
return InvalidParameter;
diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index 2b5cf09..6b5fd9b 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -325,7 +325,7 @@ static void test_fontfamily_properties (void)
result = 0;
stat = GdipGetCellDescent(FontFamily, FontStyleRegular, &result);
expect(Ok, stat);
- ok(result == 443, "Expected 443 got %d\n", result);
+ ok(result == 443, "Expected 443, got %d\n", result);
GdipDeleteFontFamily(FontFamily);
}
}
diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c
index 5632e4d..c029ab9 100644
--- a/dlls/gdiplus/tests/region.c
+++ b/dlls/gdiplus/tests/region.c
@@ -582,7 +582,7 @@ static void test_getregiondata(void)
expect_float(buf + 26, 70.2);
expect_dword(buf + 27, 0x01010100);
ok(*(buf + 28) == 0x00000101 || *(buf + 28) == 0x43050101 /* Win 7 */,
- "expected 00000101 or 43050101 got %08x\n", *(buf + 28));
+ "expected 00000101 or 43050101, got %08x\n", *(buf + 28));
expect_dword(buf + 29, 0xeeeeeeee);
status = GdipDeletePath(path);
@@ -730,7 +730,7 @@ static void test_getregiondata(void)
expect_dword(buf + 32, 0x03030301);
ok(*(buf + 33) == 0x00030303 /* before win7 */ ||
*(buf + 33) == 0x43030303 /* 32-bit win7 */ || *(buf + 33) == 0x4c030303 /* 64-bit win7 */,
- "expected 0x00030303 or 0x43030303 or 0x4c030303 got %08x\n", *(buf + 33));
+ "expected 0x00030303 or 0x43030303 or 0x4c030303, got %08x\n", *(buf + 33));
expect_dword(buf + 34, 0xeeeeeeee);
status = GdipDeletePath(path);
diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c
index bb8104e..4377090 100644
--- a/dlls/gphoto2.ds/gphoto2_main.c
+++ b/dlls/gphoto2.ds/gphoto2_main.c
@@ -643,7 +643,7 @@ static TW_UINT16 GPHOTO2_SourceControlHandler (
break;
default:
twRC = TWRC_FAILURE;
- FIXME("unrecognized opertion triplet\n");
+ FIXME("unrecognized operation triplet\n");
}
break;
diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c
index 8c5d4b5..78b3f9e 100644
--- a/dlls/ieframe/dochost.c
+++ b/dlls/ieframe/dochost.c
@@ -846,7 +846,7 @@ static HRESULT WINAPI DocHostUIHandler_ResizeBorder(IDocHostUIHandler2 *iface,
LPCRECT prcBorder, IOleInPlaceUIWindow *pUIWindow, BOOL fRameWindow)
{
DocHost *This = impl_from_IDocHostUIHandler2(iface);
- FIXME("(%p)->(%p %p %X)\n", This, prcBorder, pUIWindow, fRameWindow);
+ FIXME("(%p)->(%p %p %x)\n", This, prcBorder, pUIWindow, fRameWindow);
return E_NOTIMPL;
}
diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c
index 454eb0f..771ff7e 100644
--- a/dlls/ieframe/ie.c
+++ b/dlls/ieframe/ie.c
@@ -816,7 +816,7 @@ static HRESULT WINAPI IEServiceProvider_QueryService(IServiceProvider *iface,
return IHTMLWindow2_QueryInterface(&This->doc_host.html_window.IHTMLWindow2_iface, riid, ppv);
}
- FIXME("(%p)->(%s, %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv);
+ FIXME("(%p)->(%s, %s, %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv);
*ppv = NULL;
return E_NOINTERFACE;
}
diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c
index 55f757f..52ca232 100644
--- a/dlls/ieframe/webbrowser.c
+++ b/dlls/ieframe/webbrowser.c
@@ -1157,7 +1157,7 @@ static HRESULT STDMETHODCALLTYPE WBServiceProvider_QueryService(IServiceProvider
return E_FAIL;
}
- FIXME("(%p)->(%s, %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv);
+ FIXME("(%p)->(%s, %s, %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv);
*ppv = NULL;
return E_NOINTERFACE;
}
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index 7275fe3..cb04011 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -753,7 +753,7 @@ static void test_ImmGetIMCLockCount(void)
count = ImmGetIMCLockCount(0x00000000);
ok(count == 0, "NULL IMC should return 0\n");
ret = GetLastError();
- ok(ret == 0xdeadbeef, "Last Error should remain unchangedi %08x\n",ret);
+ ok(ret == 0xdeadbeef, "Last Error should remain unchanged %08x\n",ret);
count = ImmGetIMCLockCount(imc);
ok(count == 0, "Destroyed IMC should return 0\n");
ret = GetLastError();
--
1.8.1.2
More information about the wine-patches
mailing list