marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d9: Avoid LPCWSTR.

oldstable
Henri Verbeet 2013-09-13 10:18:12 +02:00 committed by Alexandre Julliard
parent fc85f4f7d6
commit e55e24a731
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/d3d9/d3d9_main.c
View File

@ -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));
}

14
include/d3d9.h
View File

@ -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);