Andrey Gusev : Assorted typos fixes.

Alexandre Julliard julliard at winehq.org
Mon Jan 13 12:46:33 CST 2014


Module: wine
Branch: master
Commit: be367393c95bd391d7ad3309d3e085d9f4be2237
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=be367393c95bd391d7ad3309d3e085d9f4be2237

Author: Andrey Gusev <andrey.goosev at gmail.com>
Date:   Sat Jan 11 17:02:02 2014 +0200

Assorted typos fixes.

---

 dlls/acledit/main.c            |    2 +-
 dlls/advapi32/security.c       |    4 ++--
 dlls/atl100/atl.c              |    2 +-
 dlls/avifil32/api.c            |    2 +-
 dlls/avifil32/avifile.c        |    2 +-
 dlls/comctl32/dpa.c            |    2 +-
 dlls/comctl32/imagelist.c      |    2 +-
 dlls/comctl32/listview.c       |    6 +++---
 dlls/comctl32/tests/trackbar.c |    2 +-
 dlls/comctl32/treeview.c       |    2 +-
 dlls/comdlg32/filedlg31.c      |    2 +-
 dlls/comdlg32/fontdlg.c        |    2 +-
 dlls/comdlg32/printdlg.c       |    8 ++++----
 dlls/crypt32/tests/store.c     |    2 +-
 14 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/dlls/acledit/main.c b/dlls/acledit/main.c
index d1a9ac7..49de8b5 100644
--- a/dlls/acledit/main.c
+++ b/dlls/acledit/main.c
@@ -55,7 +55,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 
 LONG WINAPI FMExtensionProcW(HWND hWnd, WORD wEvent, LONG lParam)
 {
-    FIXME("%p, %d, 0x%x) stub\n", hWnd, wEvent, lParam);
+    FIXME("(%p, %d, 0x%x) stub\n", hWnd, wEvent, lParam);
     return 0;
 
 }
diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index 280ba77..ac0a941 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -5302,7 +5302,7 @@ BOOL WINAPI CreateProcessAsUserW(
         LPSTARTUPINFOW lpStartupInfo,
         LPPROCESS_INFORMATION lpProcessInformation )
 {
-    FIXME("%p %s %s %p %p %d 0x%08x %p %s %p %p - semi- stub\n", hToken, 
+    FIXME("%p %s %s %p %p %d 0x%08x %p %s %p %p - semi-stub\n", hToken,
           debugstr_w(lpApplicationName), debugstr_w(lpCommandLine), lpProcessAttributes,
           lpThreadAttributes, bInheritHandles, dwCreationFlags, lpEnvironment, 
           debugstr_w(lpCurrentDirectory), lpStartupInfo, lpProcessInformation);
@@ -5801,7 +5801,7 @@ DWORD WINAPI TreeResetNamedSecurityInfoW( LPWSTR pObjectName,
                 BOOL KeepExplicit, FN_PROGRESS fnProgress,
                 PROG_INVOKE_SETTING ProgressInvokeSetting, PVOID Args)
 {
-    FIXME("(%s, %i, %i, %p, %p, %p, %p, %i, %p, %i, %p  Stub\n",
+    FIXME("(%s, %i, %i, %p, %p, %p, %p, %i, %p, %i, %p) stub\n",
         debugstr_w(pObjectName), ObjectType, SecurityInfo, pOwner, pGroup,
         pDacl, pSacl, KeepExplicit, fnProgress, ProgressInvokeSetting, Args);
 
diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c
index 9156afb..058fa22 100644
--- a/dlls/atl100/atl.c
+++ b/dlls/atl100/atl.c
@@ -391,7 +391,7 @@ HRESULT WINAPI AtlLoadTypeLib(HINSTANCE inst, LPCOLESTR lpszIndex,
  */
 HRESULT WINAPI AtlWinModuleInit(_ATL_WIN_MODULE *winmod)
 {
-    TRACE("(%p\n", winmod);
+    TRACE("(%p)\n", winmod);
 
     if(winmod->cbSize != sizeof(*winmod))
         return E_INVALIDARG;
diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c
index 6c07a2f..20985cd 100644
--- a/dlls/avifil32/api.c
+++ b/dlls/avifil32/api.c
@@ -1515,7 +1515,7 @@ HRESULT WINAPI AVISaveVA(LPCSTR szFile, CLSID *pclsidHandler,
   HRESULT hr;
   int     len;
 
-  TRACE("%s,%p,%p,%d,%p,%p)\n", debugstr_a(szFile), pclsidHandler,
+  TRACE("(%s,%p,%p,%d,%p,%p)\n", debugstr_a(szFile), pclsidHandler,
 	lpfnCallback, nStream, ppavi, plpOptions);
 
   if (szFile == NULL || ppavi == NULL || plpOptions == NULL)
diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c
index 7c14805..6295c7b 100644
--- a/dlls/avifil32/avifile.c
+++ b/dlls/avifil32/avifile.c
@@ -1292,7 +1292,7 @@ static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream *iface, DWORD fcc, void
 
   if (fcc == ckidSTREAMHANDLERDATA) {
     if (This->lpHandlerData != NULL) {
-      FIXME(": handler data already set -- overwirte?\n");
+      FIXME(": handler data already set -- overwrite?\n");
       return AVIERR_UNSUPPORTED;
     }
 
diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c
index 11dd14f..0b96df6 100644
--- a/dlls/comctl32/dpa.c
+++ b/dlls/comctl32/dpa.c
@@ -269,7 +269,7 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags,
     INT nResult, i;
     INT nIndex;
 
-    TRACE("%p %p %08x %p %p %08lx)\n",
+    TRACE("(%p %p %08x %p %p %08lx)\n",
            hdpa1, hdpa2, dwFlags, pfnCompare, pfnMerge, lParam);
 
     if (IsBadWritePtr (hdpa1, sizeof(*hdpa1)))
diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 6461df6..ec90a9c 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -2889,7 +2889,7 @@ ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount)
 	himl->hbmImage = hbmNewBitmap;
     }
     else
-	ERR("Could not create new image bitmap !\n");
+	ERR("Could not create new image bitmap!\n");
 
     if (himl->hbmMask)
     {
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 5ce7de2..bc9a04c 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -8247,7 +8247,7 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx)
     INT max_cx = 0;
     HDITEMW hdi;
 
-    TRACE("(nColumn=%d, cx=%d\n", nColumn, cx);
+    TRACE("(nColumn=%d, cx=%d)\n", nColumn, cx);
 
     /* set column width only if in report or list mode */
     if (infoPtr->uView != LV_VIEW_DETAILS && infoPtr->uView != LV_VIEW_LIST) return FALSE;
@@ -8631,7 +8631,7 @@ static HIMAGELIST LISTVIEW_SetImageList(LISTVIEW_INFO *infoPtr, INT nType, HIMAG
     INT oldHeight = infoPtr->nItemHeight;
     HIMAGELIST himlOld = 0;
 
-    TRACE("(nType=%d, himl=%p\n", nType, himl);
+    TRACE("(nType=%d, himl=%p)\n", nType, himl);
 
     switch (nType)
     {
@@ -8786,7 +8786,7 @@ static BOOL LISTVIEW_SetItemPosition(LISTVIEW_INFO *infoPtr, INT nItem, const PO
 {
     POINT Origin, Pt;
 
-    TRACE("(nItem=%d, pt=%s\n", nItem, wine_dbgstr_point(pt));
+    TRACE("(nItem=%d, pt=%s)\n", nItem, wine_dbgstr_point(pt));
 
     if (!pt || nItem < 0 || nItem >= infoPtr->nItemCount ||
 	!(infoPtr->uView == LV_VIEW_ICON || infoPtr->uView == LV_VIEW_SMALLICON)) return FALSE;
diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c
index 3ee7fda..32c9575 100644
--- a/dlls/comctl32/tests/trackbar.c
+++ b/dlls/comctl32/tests/trackbar.c
@@ -777,7 +777,7 @@ static void test_tic_settings(HWND hWndTrackbar){
     ok(r == TRUE, "Expected TRUE, got %d\n", r);
 
     r = SendMessageA(hWndTrackbar, TBM_SETTIC, 0, 20);
-    ok(r == FALSE, "Expected False, got %d\n", r);
+    ok(r == FALSE, "Expected FALSE, got %d\n", r);
 
     /* test TBM_SETTICFREQ */
     SendMessageA(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(0, 10));
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index a885543..b2eed3c 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -3428,7 +3428,7 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item,
     TREEVIEW_ITEM *nextItem, *tmpItem;
     BOOL sendsNotifications;
 
-    TRACE("(%p, %p, partial=%d, %d\n", infoPtr, item, partial, user);
+    TRACE("(%p, %p, partial=%d, %d)\n", infoPtr, item, partial, user);
 
     if (!TREEVIEW_HasChildren(infoPtr, item))
 	return FALSE;
diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c
index 5f4c676..0409915 100644
--- a/dlls/comdlg32/filedlg31.c
+++ b/dlls/comdlg32/filedlg31.c
@@ -89,7 +89,7 @@ static BOOL FD31_Init(void)
 	if (hFolder == 0 || hFolder2 == 0 || hFloppy == 0 ||
 	    hHDisk == 0 || hCDRom == 0 || hNet == 0)
 	{
-	    ERR("Error loading icons !\n");
+	    ERR("Error loading icons!\n");
 	    return FALSE;
 	}
 	initialized = TRUE;
diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c
index 68f0467..9e73ec9 100644
--- a/dlls/comdlg32/fontdlg.c
+++ b/dlls/comdlg32/fontdlg.c
@@ -632,7 +632,7 @@ static LRESULT CFn_WMInitDialog(HWND hDlg, LPARAM lParam, LPCHOOSEFONTW lpcf)
 
     if (lpcf->lStructSize != sizeof(CHOOSEFONTW))
     {
-        ERR("structure size failure !!!\n");
+        ERR("structure size failure!!!\n");
         EndDialog (hDlg, 0);
         return FALSE;
     }
diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c
index 292f764..d52b47d 100644
--- a/dlls/comdlg32/printdlg.c
+++ b/dlls/comdlg32/printdlg.c
@@ -1495,7 +1495,7 @@ static LRESULT PRINTDLG_WMInitDialog(HWND hDlg,
        PrintStructures->hNoCollateIcon == 0 ||
        PrintStructures->hPortraitIcon == 0 ||
        PrintStructures->hLandscapeIcon == 0) {
-        ERR("no icon in resourcefile\n");
+        ERR("no icon in resource file\n");
 	COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
 	EndDialog(hDlg, FALSE);
     }
@@ -1603,7 +1603,7 @@ static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg,
        PrintStructures->hNoCollateIcon == 0 ||
        PrintStructures->hPortraitIcon == 0 ||
        PrintStructures->hLandscapeIcon == 0) {
-        ERR("no icon in resourcefile\n");
+        ERR("no icon in resource file\n");
 	COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
 	EndDialog(hDlg, FALSE);
     }
@@ -2263,7 +2263,7 @@ BOOL WINAPI PrintDlgA(LPPRINTDLGA lppd)
     }
 
     if(lppd->lStructSize != sizeof(PRINTDLGA)) {
-        WARN("structure size failure !!!\n");
+        WARN("structure size failure!!!\n");
 	COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE);
 	return FALSE;
     }
@@ -2414,7 +2414,7 @@ BOOL WINAPI PrintDlgW(LPPRINTDLGW lppd)
     }
 
     if(lppd->lStructSize != sizeof(PRINTDLGW)) {
-        WARN("structure size failure !!!\n");
+        WARN("structure size failure!!!\n");
 	COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE);
 	return FALSE;
     }
diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c
index 1fa3ffa..a416a39 100644
--- a/dlls/crypt32/tests/store.c
+++ b/dlls/crypt32/tests/store.c
@@ -130,7 +130,7 @@ static void _test_store_is_empty(unsigned line, HCERTSTORE store)
     const CERT_CONTEXT *cert;
 
     cert = CertEnumCertificatesInStore(store, NULL);
-    ok_(__FILE__,line)(!cert && GetLastError() == CRYPT_E_NOT_FOUND, "store is not epmty\n");
+    ok_(__FILE__,line)(!cert && GetLastError() == CRYPT_E_NOT_FOUND, "store is not empty\n");
 }
 
 static void testMemStore(void)




More information about the wine-cvs mailing list