Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
e55e24a7
Commit
e55e24a7
authored
Sep 13, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 13, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d9: Avoid LPCWSTR.
parent
fc85f4f7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
13 deletions
+16
-13
d3d9_main.c
dlls/d3d9/d3d9_main.c
+9
-6
d3d9.h
include/d3d9.h
+7
-7
No files found.
dlls/d3d9/d3d9_main.c
View file @
e55e24a7
...
@@ -106,8 +106,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
...
@@ -106,8 +106,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
/***********************************************************************
/***********************************************************************
* D3DPERF_BeginEvent (D3D9.@)
* D3DPERF_BeginEvent (D3D9.@)
*/
*/
int
WINAPI
D3DPERF_BeginEvent
(
D3DCOLOR
color
,
LPCWSTR
name
)
{
int
WINAPI
D3DPERF_BeginEvent
(
D3DCOLOR
color
,
const
WCHAR
*
name
)
TRACE
(
"(color %#x, name %s) : stub
\n
"
,
color
,
debugstr_w
(
name
));
{
TRACE
(
"color 0x%08x, name %s.
\n
"
,
color
,
debugstr_w
(
name
));
return
D3DPERF_event_level
++
;
return
D3DPERF_event_level
++
;
}
}
...
@@ -151,13 +152,15 @@ BOOL WINAPI D3DPERF_QueryRepeatFrame(void) {
...
@@ -151,13 +152,15 @@ BOOL WINAPI D3DPERF_QueryRepeatFrame(void) {
/***********************************************************************
/***********************************************************************
* D3DPERF_SetMarker (D3D9.@)
* D3DPERF_SetMarker (D3D9.@)
*/
*/
void
WINAPI
D3DPERF_SetMarker
(
D3DCOLOR
color
,
LPCWSTR
name
)
{
void
WINAPI
D3DPERF_SetMarker
(
D3DCOLOR
color
,
const
WCHAR
*
name
)
FIXME
(
"(color %#x, name %s) : stub
\n
"
,
color
,
debugstr_w
(
name
));
{
FIXME
(
"color 0x%08x, name %s stub!
\n
"
,
color
,
debugstr_w
(
name
));
}
}
/***********************************************************************
/***********************************************************************
* D3DPERF_SetRegion (D3D9.@)
* D3DPERF_SetRegion (D3D9.@)
*/
*/
void
WINAPI
D3DPERF_SetRegion
(
D3DCOLOR
color
,
LPCWSTR
name
)
{
void
WINAPI
D3DPERF_SetRegion
(
D3DCOLOR
color
,
const
WCHAR
*
name
)
FIXME
(
"(color %#x, name %s) : stub
\n
"
,
color
,
debugstr_w
(
name
));
{
FIXME
(
"color 0x%08x, name %s stub!
\n
"
,
color
,
debugstr_w
(
name
));
}
}
include/d3d9.h
View file @
e55e24a7
...
@@ -2087,13 +2087,13 @@ DECLARE_INTERFACE_(IDirect3DDevice9Ex,IDirect3DDevice9)
...
@@ -2087,13 +2087,13 @@ DECLARE_INTERFACE_(IDirect3DDevice9Ex,IDirect3DDevice9)
extern
"C"
{
extern
"C"
{
#endif
/* defined(__cplusplus) */
#endif
/* defined(__cplusplus) */
int
WINAPI
D3DPERF_BeginEvent
(
D3DCOLOR
,
LPCWSTR
);
int
WINAPI
D3DPERF_BeginEvent
(
D3DCOLOR
color
,
const
WCHAR
*
name
);
int
WINAPI
D3DPERF_EndEvent
(
void
);
int
WINAPI
D3DPERF_EndEvent
(
void
);
DWORD
WINAPI
D3DPERF_GetStatus
(
void
);
DWORD
WINAPI
D3DPERF_GetStatus
(
void
);
BOOL
WINAPI
D3DPERF_QueryRepeatFrame
(
void
);
BOOL
WINAPI
D3DPERF_QueryRepeatFrame
(
void
);
void
WINAPI
D3DPERF_SetMarker
(
D3DCOLOR
,
LPCWSTR
);
void
WINAPI
D3DPERF_SetMarker
(
D3DCOLOR
color
,
const
WCHAR
*
name
);
void
WINAPI
D3DPERF_SetOptions
(
DWORD
);
void
WINAPI
D3DPERF_SetOptions
(
DWORD
options
);
void
WINAPI
D3DPERF_SetRegion
(
D3DCOLOR
,
LPCWSTR
);
void
WINAPI
D3DPERF_SetRegion
(
D3DCOLOR
color
,
const
WCHAR
*
name
);
/* Define the main entrypoint as well */
/* Define the main entrypoint as well */
IDirect3D9
*
WINAPI
Direct3DCreate9
(
UINT
SDKVersion
);
IDirect3D9
*
WINAPI
Direct3DCreate9
(
UINT
SDKVersion
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment