Janitorial: Use the C standard for multiline strings.

Michael Stefaniuc mstefani at redhat.de
Tue Jan 9 16:42:26 CST 2007


Using '\' at the end of the lines has the side effect of the indentation
whitespace on the continuation line being included in the string. That's
probably not what the authors intended.

The only file that has multiline strings with '\' at the end of the
lines is libs/port/getopt.c but that's copied from the glibc so i left
it alone.

---
 dlls/cabinet/fdi.c       |    8 ++++----
 dlls/ddraw/ddraw.c       |    8 ++++----
 dlls/user32/misc.c       |    4 ++--
 dlls/wined3d/device.c    |   14 +++++++-------
 dlls/wined3d/state.c     |    6 +++---
 programs/winetest/main.c |   18 +++++++++---------
 6 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c
index 70db803..8ffc0f4 100644
--- a/dlls/cabinet/fdi.c
+++ b/dlls/cabinet/fdi.c
@@ -363,8 +363,8 @@ HFDI __cdecl FDICreate(
 {
   HFDI rv;
 
-  TRACE("(pfnalloc == ^%p, pfnfree == ^%p, pfnopen == ^%p, pfnread == ^%p, pfnwrite == ^%p, \
-        pfnclose == ^%p, pfnseek == ^%p, cpuType == %d, perf == ^%p)\n", 
+  TRACE("(pfnalloc == ^%p, pfnfree == ^%p, pfnopen == ^%p, pfnread == ^%p, pfnwrite == ^%p, "
+        "pfnclose == ^%p, pfnseek == ^%p, cpuType == %d, perf == ^%p)\n",
         pfnalloc, pfnfree, pfnopen, pfnread, pfnwrite, pfnclose, pfnseek,
         cpuType, perf);
 
@@ -2450,8 +2450,8 @@ BOOL __cdecl FDICopy(
   fdi_decomp_state _decomp_state;
   fdi_decomp_state *decomp_state = &_decomp_state;
 
-  TRACE("(hfdi == ^%p, pszCabinet == ^%p, pszCabPath == ^%p, flags == %0d, \
-        pfnfdin == ^%p, pfnfdid == ^%p, pvUser == ^%p)\n",
+  TRACE("(hfdi == ^%p, pszCabinet == ^%p, pszCabPath == ^%p, flags == %0d, "
+        "pfnfdin == ^%p, pfnfdid == ^%p, pvUser == ^%p)\n",
         hfdi, pszCabinet, pszCabPath, flags, pfnfdin, pfnfdid, pvUser);
 
   if (!REALLY_IS_FDI(hfdi)) {
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index bb7243d..d1bef24 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -322,8 +322,8 @@ IDirectDrawImpl_SetupFullscreenWindow(IDirectDrawImpl *This,
     TRACE("(%p): Setting up window %p for exclusive mode\n", This, window);
     if( (This->style != 0) && (This->exStyle != 0) )
     {
-        ERR("(%p) Want to change the window parameters of HWND %p, but \
-             another style is stored for restauration afterwards\n", This, window);
+        ERR("(%p) Want to change the window parameters of HWND %p, but "
+            "another style is stored for restauration afterwards\n", This, window);
     }
 
     /* Get the parameters and save them */
@@ -2259,8 +2259,8 @@ IDirectDrawImpl_CreateSurface(IDirectDraw7 *iface,
                 if( (rect.right - rect.left) <= 1 ||
                     (rect.bottom - rect.top) <= 1 )
                 {
-                    FIXME("Wanted to get surface dimensions from window %p, but it has only \
-                           a size of %dx%d. Using full screen dimensions\n",
+                    FIXME("Wanted to get surface dimensions from window %p, but it has only "
+                           "a size of %dx%d. Using full screen dimensions\n",
                            window, rect.right - rect.left, rect.bottom - rect.top);
                 }
                 else
diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c
index 842819b..bd1c9f7 100644
--- a/dlls/user32/misc.c
+++ b/dlls/user32/misc.c
@@ -526,8 +526,8 @@ DWORD WINAPI RegisterTasklist (DWORD x)
  */
 HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hnd, LPVOID notifyfilter, DWORD flags)
 {
-    FIXME("(hwnd=%p, filter=%p,flags=0x%08x),\n\
-          returns a fake device notification handle!\n", hnd,notifyfilter,flags );
+    FIXME("(hwnd=%p, filter=%p,flags=0x%08x),\n"
+          "\treturns a fake device notification handle!\n", hnd,notifyfilter,flags );
     return (HDEVNOTIFY) 0xcafecafe;
 }
 
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index d997292..3300cdd 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -860,17 +860,17 @@ static HRESULT  WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, U
     switch(Pool) {
     case WINED3DPOOL_SCRATCH:
         if(!Lockable)
-            FIXME("Create surface called with a pool of SCRATCH and a Lockable of FALSE \
-                which are mutually exclusive, setting lockable to true\n");
+            FIXME("Create surface called with a pool of SCRATCH and a Lockable of FALSE "
+                "which are mutually exclusive, setting lockable to TRUE\n");
                 Lockable = TRUE;
     break;
     case WINED3DPOOL_SYSTEMMEM:
-        if(!Lockable) FIXME("Create surface called with a pool of SYSTEMMEM and a Lockable of FALSE, \
-                                    this is acceptable but unexpected (I can't know how the surface can be usable!)\n");
+        if(!Lockable) FIXME("Create surface called with a pool of SYSTEMMEM and a Lockable of FALSE, "
+                                    "this is acceptable but unexpected (I can't know how the surface can be usable!)\n");
     case WINED3DPOOL_MANAGED:
-        if(Usage == WINED3DUSAGE_DYNAMIC) FIXME("Create surface called with a pool of MANAGED and a \
-                                                Usage of DYNAMIC which are mutually exclusive, not doing \
-                                                anything just telling you.\n");
+        if(Usage == WINED3DUSAGE_DYNAMIC) FIXME("Create surface called with a pool of MANAGED and a "
+                                                "Usage of DYNAMIC which are mutually exclusive, not doing "
+                                                "anything just telling you.\n");
     break;
     case WINED3DPOOL_DEFAULT: /*TODO: Create offscreen plain can cause this check to fail..., find out if it should */
         if(!(Usage & WINED3DUSAGE_DYNAMIC) && !(Usage & WINED3DUSAGE_RENDERTARGET)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index af899e5..8cdd758 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -601,9 +601,9 @@ state_stencil(DWORD state, IWineD3DStateBlockImpl *stateblock) {
     if( stateblock->set.renderState[WINED3DRS_CCW_STENCILPASS] )
         stencilPass_ccw = StencilOp(stateblock->renderState[WINED3DRS_CCW_STENCILPASS]);
 
-    TRACE("(onesided %d, twosided %d, ref %x, mask %x,  \
-            GL_FRONT: func: %x, fail %x, zfail %x, zpass %x  \
-            GL_BACK: func: %x, fail %x, zfail %x, zpass %x )\n",
+    TRACE("(onesided %d, twosided %d, ref %x, mask %x, "
+          "GL_FRONT: func: %x, fail %x, zfail %x, zpass %x "
+          "GL_BACK: func: %x, fail %x, zfail %x, zpass %x )\n",
     onesided_enable, twosided_enable, ref, mask,
     func, stencilFail, depthFail, stencilPass,
     func_ccw, stencilFail_ccw, depthFail_ccw, stencilPass_ccw);
diff --git a/programs/winetest/main.c b/programs/winetest/main.c
index c2f6881..2488e30 100644
--- a/programs/winetest/main.c
+++ b/programs/winetest/main.c
@@ -555,15 +555,15 @@ run_tests (char *logname)
 static void
 usage (void)
 {
-    fprintf (stderr, "\
-Usage: winetest [OPTION]...\n\n\
-  -c       console mode, no GUI\n\
-  -e       preserve the environment\n\
-  -h       print this message and exit\n\
-  -q       quiet mode, no output at all\n\
-  -o FILE  put report into FILE, do not submit\n\
-  -s FILE  submit FILE, do not run tests\n\
-  -t TAG   include TAG of characters [-.0-9a-zA-Z] in the report\n");
+    fprintf (stderr,
+"Usage: winetest [OPTION]...\n\n"
+"  -c       console mode, no GUI\n"
+"  -e       preserve the environment\n"
+"  -h       print this message and exit\n"
+"  -q       quiet mode, no output at all\n"
+"  -o FILE  put report into FILE, do not submit\n"
+"  -s FILE  submit FILE, do not run tests\n"
+"  -t TAG   include TAG of characters [-.0-9a-zA-Z] in the report\n");
 }
 
 int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst,
-- 
1.4.4.2


-- 
Michael Stefaniuc               Tel.: +49-711-96437-199
Sr. Network Engineer            Fax.: +49-711-96437-111
Red Hat GmbH                    Email: mstefani at redhat.com
Hauptstaetterstr. 58            http://www.redhat.de/
D-70178 Stuttgart
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20070109/cd783f3d/attachment.pgp


More information about the wine-patches mailing list