Merge eterwine into eterhack

Conflicts:
	dlls/uxtheme/buffer.c
	programs/winecfg/about.c

diff --cc dlls/comctl32/imagelist.c
Simple merge

diff --cc dlls/kernel32/process.c
Simple merge

diff --cc dlls/ntdll/server.c
Simple merge

diff --cc dlls/usbd.sys/usbd.c
Simple merge

diff --cc dlls/uxtheme/buffer.c
index 89f0af18a709252254b8716cadc09a1f4d2d9533,f4d8229b5a2d55939f69a6efb41503eef13a6239..5a25aaf9bc49fb0dcc5c86c826fd2bc1a3867907
--- 1/dlls/uxtheme/buffer.c
--- 2/dlls/uxtheme/buffer.c
+++ b/dlls/uxtheme/buffer.c
@@@ -61,8 -61,14 +61,11 @@@ HPAINTBUFFER WINAPI BeginBufferedPaint(
                                         BP_PAINTPARAMS *pPaintParams,
                                         HDC *phdc)
  {
-     TRACE("Stub (%p %p %d %p %p)\n", hdcTarget, prcTarget, dwFormat,
-           pPaintParams, phdc);
+     static int i;
+ 
 -    TRACE("Stub (%p %p %d %p %p)\n", hdcTarget, prcTarget, dwFormat,
 -          pPaintParams, phdc);
 -
+     if (!i++)
+         FIXME("Stub (%p %p %d %p %p)\n", hdcTarget, prcTarget, dwFormat,
+               pPaintParams, phdc);
      return NULL;
  }
  

diff --cc programs/winecfg/about.c
index 5c22267348868423d3d266c3cdaee8ff6e7d03f0,d6b2a7d689ed925fc37d0f6ce42563c6b4d86a24..a0423c83962f08adbd9e634ae9a2b5742f4ca814
--- 1/programs/winecfg/about.c
--- 2/programs/winecfg/about.c
+++ b/programs/winecfg/about.c
@@@ -29,22 -29,11 +29,24 @@@
  #include <windows.h>
  #include <commctrl.h>
  #include <shellapi.h>
+ 
 +#include <wine/debug.h>
 +#include <fcntl.h>
 +
 +#define COBJMACROS
 +#include "shlobj.h"
 +#include "shlwapi.h"
 +#include "olectl.h"
 +
  #include "resource.h"
  #include "winecfg.h"
  
 +#define ETERSOFT_FUNC_VERSION
 +#include <wine/etersoft.h>
 +
 +WINE_DEFAULT_DEBUG_CHANNEL(winecfg);
 +
+ 
  static HICON logo = NULL;
  static HFONT titleFont = NULL;
  

diff --cc programs/winedevice/device.c
Simple merge