Henri Verbeet : d3d9: Avoid LPCWSTR.

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Fri Sep 13 10:18:12 2013 +0200

d3d9: Avoid LPCWSTR.

---

dlls/d3d9/d3d9_main.c |   15 +++++++++------
 include/d3d9.h        |   14 +++++++-------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c
index ad2e330..2059b98 100644
--- a/dlls/d3d9/d3d9_main.c
+++ b/dlls/d3d9/d3d9_main.c
@@ -106,8 +106,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
 /***********************************************************************
  *              D3DPERF_BeginEvent (D3D9.@)
  */
-int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, LPCWSTR name) {
-    TRACE("(color %#x, name %s) : stub\n", color, debugstr_w(name));
+int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, const WCHAR *name)
+{
+    TRACE("color 0x%08x, name %s.\n", color, debugstr_w(name));

return D3DPERF_event_level++;
 }
@@ -151,13 +152,15 @@ BOOL WINAPI D3DPERF_QueryRepeatFrame(void) {
 /***********************************************************************
  *              D3DPERF_SetMarker (D3D9.@)
  */
-void WINAPI D3DPERF_SetMarker(D3DCOLOR color, LPCWSTR name) {
-    FIXME("(color %#x, name %s) : stub\n", color, debugstr_w(name));
+void WINAPI D3DPERF_SetMarker(D3DCOLOR color, const WCHAR *name)
+{
+    FIXME("color 0x%08x, name %s stub!\n", color, debugstr_w(name));
 }

/***********************************************************************
  *              D3DPERF_SetRegion (D3D9.@)
  */
-void WINAPI D3DPERF_SetRegion(D3DCOLOR color, LPCWSTR name) {
-    FIXME("(color %#x, name %s) : stub\n", color, debugstr_w(name));
+void WINAPI D3DPERF_SetRegion(D3DCOLOR color, const WCHAR *name)
+{
+    FIXME("color 0x%08x, name %s stub!\n", color, debugstr_w(name));
 }
diff --git a/include/d3d9.h b/include/d3d9.h
index ce39c10..dc6518b 100644
--- a/include/d3d9.h
+++ b/include/d3d9.h
@@ -2087,13 +2087,13 @@ DECLARE_INTERFACE_(IDirect3DDevice9Ex,IDirect3DDevice9)
 extern "C" {
 #endif  /* defined(__cplusplus) */

-int         WINAPI D3DPERF_BeginEvent(D3DCOLOR,LPCWSTR);
-int         WINAPI D3DPERF_EndEvent(void);
-DWORD       WINAPI D3DPERF_GetStatus(void);
-BOOL        WINAPI D3DPERF_QueryRepeatFrame(void);
-void        WINAPI D3DPERF_SetMarker(D3DCOLOR,LPCWSTR);
-void        WINAPI D3DPERF_SetOptions(DWORD);
-void        WINAPI D3DPERF_SetRegion(D3DCOLOR,LPCWSTR);
+int WINAPI D3DPERF_BeginEvent(D3DCOLOR color, const WCHAR *name);
+int WINAPI D3DPERF_EndEvent(void);
+DWORD WINAPI D3DPERF_GetStatus(void);
+BOOL WINAPI D3DPERF_QueryRepeatFrame(void);
+void WINAPI D3DPERF_SetMarker(D3DCOLOR color, const WCHAR *name);
+void WINAPI D3DPERF_SetOptions(DWORD options);
+void WINAPI D3DPERF_SetRegion(D3DCOLOR color, const WCHAR *name);

/* Define the main entrypoint as well */
 IDirect3D9* WINAPI Direct3DCreate9(UINT SDKVersion);