Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
60b5dc04
Commit
60b5dc04
authored
Nov 15, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Nov 15, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Rename the IWineD3DPaletteImpl "Flags" field to "flags".
parent
ce4de8ff
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
11 deletions
+12
-11
palette.c
dlls/wined3d/palette.c
+8
-7
surface.c
dlls/wined3d/surface.c
+1
-1
surface_base.c
dlls/wined3d/surface_base.c
+2
-2
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/palette.c
View file @
60b5dc04
...
...
@@ -93,10 +93,10 @@ static HRESULT WINAPI IWineD3DPaletteImpl_GetEntries(IWineD3DPalette *iface, DW
TRACE
(
"(%p)->(%08x,%d,%d,%p)
\n
"
,
This
,
Flags
,
Start
,
Count
,
PalEnt
);
if
(
Flags
)
return
WINED3DERR_INVALIDCALL
;
/* unchecked */
if
(
Start
+
Count
>
IWineD3DPaletteImpl_Size
(
This
->
F
lags
))
if
(
Start
+
Count
>
IWineD3DPaletteImpl_Size
(
This
->
f
lags
))
return
WINED3DERR_INVALIDCALL
;
if
(
This
->
F
lags
&
WINEDDPCAPS_8BITENTRIES
)
if
(
This
->
f
lags
&
WINEDDPCAPS_8BITENTRIES
)
{
unsigned
int
i
;
LPBYTE
entry
=
(
LPBYTE
)
PalEnt
;
...
...
@@ -117,9 +117,10 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface,
IWineD3DResourceImpl
*
res
;
TRACE
(
"(%p)->(%08x,%d,%d,%p)
\n
"
,
This
,
Flags
,
Start
,
Count
,
PalEnt
);
TRACE
(
"Palette flags: %#x
\n
"
,
This
->
F
lags
);
TRACE
(
"Palette flags: %#x
.
\n
"
,
This
->
f
lags
);
if
(
This
->
Flags
&
WINEDDPCAPS_8BITENTRIES
)
{
if
(
This
->
flags
&
WINEDDPCAPS_8BITENTRIES
)
{
unsigned
int
i
;
const
BYTE
*
entry
=
(
const
BYTE
*
)
PalEnt
;
...
...
@@ -130,7 +131,7 @@ static HRESULT WINAPI IWineD3DPaletteImpl_SetEntries(IWineD3DPalette *iface,
memcpy
(
This
->
palents
+
Start
,
PalEnt
,
Count
*
sizeof
(
PALETTEENTRY
));
/* When WINEDDCAPS_ALLOW256 isn't set we need to override entry 0 with black and 255 with white */
if
(
!
(
This
->
F
lags
&
WINEDDPCAPS_ALLOW256
))
if
(
!
(
This
->
f
lags
&
WINEDDPCAPS_ALLOW256
))
{
TRACE
(
"WINEDDPCAPS_ALLOW256 set, overriding palette entry 0 with black and 255 with white
\n
"
);
This
->
palents
[
0
].
peRed
=
0
;
...
...
@@ -171,7 +172,7 @@ static HRESULT WINAPI IWineD3DPaletteImpl_GetCaps(IWineD3DPalette *iface, DWORD
IWineD3DPaletteImpl
*
This
=
(
IWineD3DPaletteImpl
*
)
iface
;
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
Caps
);
*
Caps
=
This
->
F
lags
;
*
Caps
=
This
->
f
lags
;
return
WINED3D_OK
;
}
...
...
@@ -204,7 +205,7 @@ HRESULT wined3d_palette_init(IWineD3DPaletteImpl *palette, IWineD3DDeviceImpl *d
palette
->
ref
=
1
;
palette
->
parent
=
parent
;
palette
->
device
=
device
;
palette
->
F
lags
=
flags
;
palette
->
f
lags
=
flags
;
palette
->
palNumEntries
=
IWineD3DPaletteImpl_Size
(
flags
);
palette
->
hpal
=
CreatePalette
((
const
LOGPALETTE
*
)
&
palette
->
palVersion
);
...
...
dlls/wined3d/surface.c
View file @
60b5dc04
...
...
@@ -2267,7 +2267,7 @@ void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL
{
table
[
i
][
3
]
=
0x00
;
}
else
if
(
pal
->
F
lags
&
WINEDDPCAPS_ALPHA
)
else
if
(
pal
->
f
lags
&
WINEDDPCAPS_ALPHA
)
{
table
[
i
][
3
]
=
pal
->
palents
[
i
].
peFlags
;
}
...
...
dlls/wined3d/surface_base.c
View file @
60b5dc04
...
...
@@ -221,14 +221,14 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetPalette(IWineD3DSurface *iface, IWineD
if
(
This
->
palette
)
if
(
This
->
resource
.
usage
&
WINED3DUSAGE_RENDERTARGET
)
This
->
palette
->
F
lags
&=
~
WINEDDPCAPS_PRIMARYSURFACE
;
This
->
palette
->
f
lags
&=
~
WINEDDPCAPS_PRIMARYSURFACE
;
This
->
palette
=
PalImpl
;
if
(
PalImpl
)
{
if
(
This
->
resource
.
usage
&
WINED3DUSAGE_RENDERTARGET
)
PalImpl
->
F
lags
|=
WINEDDPCAPS_PRIMARYSURFACE
;
PalImpl
->
f
lags
|=
WINEDDPCAPS_PRIMARYSURFACE
;
return
IWineD3DSurface_RealizePalette
(
iface
);
}
...
...
dlls/wined3d/wined3d_private.h
View file @
60b5dc04
...
...
@@ -2978,7 +2978,7 @@ struct IWineD3DPaletteImpl {
PALETTEENTRY
palents
[
256
];
/*| */
/* This is to store the palette in 'screen format' */
int
screen_palents
[
256
];
DWORD
F
lags
;
DWORD
f
lags
;
};
HRESULT
wined3d_palette_init
(
IWineD3DPaletteImpl
*
palette
,
IWineD3DDeviceImpl
*
device
,
...
...
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