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
b83d322d
Commit
b83d322d
authored
Dec 10, 2011
by
Rico Schüller
Committed by
Alexandre Julliard
Dec 12, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Implement D3DXSHAdd().
parent
18307391
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
67 additions
and
45 deletions
+67
-45
d3dx9_36.spec
dlls/d3dx9_36/d3dx9_36.spec
+1
-1
math.c
dlls/d3dx9_36/math.c
+12
-0
math.c
dlls/d3dx9_36/tests/math.c
+49
-1
dialog.c
dlls/user32/dialog.c
+0
-3
win.c
dlls/user32/tests/win.c
+0
-38
d3dx9math.h
include/d3dx9math.h
+5
-2
No files found.
dlls/d3dx9_36/d3dx9_36.spec
View file @
b83d322d
...
@@ -272,7 +272,7 @@
...
@@ -272,7 +272,7 @@
@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
@ stub D3DXSaveVolumeToFileA(ptr long ptr ptr ptr)
@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
@ stub D3DXSaveVolumeToFileInMemory(ptr long ptr ptr ptr)
@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
@ stub D3DXSaveVolumeToFileW(ptr long ptr ptr ptr)
@ st
ub
D3DXSHAdd(ptr long ptr ptr)
@ st
dcall
D3DXSHAdd(ptr long ptr ptr)
@ stub D3DXSHDot(long ptr ptr)
@ stub D3DXSHDot(long ptr ptr)
@ stub D3DXSHEvalConeLight(long ptr long long long long ptr ptr ptr)
@ stub D3DXSHEvalConeLight(long ptr long long long long ptr ptr ptr)
@ stub D3DXSHEvalDirection(ptr long ptr)
@ stub D3DXSHEvalDirection(ptr long ptr)
...
...
dlls/d3dx9_36/math.c
View file @
b83d322d
...
@@ -1900,3 +1900,15 @@ FLOAT *WINAPI D3DXFloat16To32Array(FLOAT *pout, CONST D3DXFLOAT16 *pin, UINT n)
...
@@ -1900,3 +1900,15 @@ FLOAT *WINAPI D3DXFloat16To32Array(FLOAT *pout, CONST D3DXFLOAT16 *pin, UINT n)
return
pout
;
return
pout
;
}
}
FLOAT
*
WINAPI
D3DXSHAdd
(
FLOAT
*
out
,
UINT
order
,
const
FLOAT
*
a
,
const
FLOAT
*
b
)
{
UINT
i
;
TRACE
(
"out %p, order %u, a %p, b %p
\n
"
,
out
,
order
,
a
,
b
);
for
(
i
=
0
;
i
<
order
*
order
;
i
++
)
out
[
i
]
=
a
[
i
]
+
b
[
i
];
return
out
;
}
dlls/d3dx9_36/tests/math.c
View file @
b83d322d
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
#define admitted_error 0.0001f
#define admitted_error 0.0001f
#define relative_error(exp, out) ((exp == 0.0f) ? fabs(exp - out) : (fabs(1.0f -
out/ exp)
))
#define relative_error(exp, out) ((exp == 0.0f) ? fabs(exp - out) : (fabs(1.0f -
(out) / (exp))
))
#define expect_color(expectedcolor,gotcolor) ok((relative_error(expectedcolor.r, gotcolor.r)<admitted_error)&&(relative_error(expectedcolor.g, gotcolor.g)<admitted_error)&&(relative_error(expectedcolor.b, gotcolor.b)<admitted_error)&&(relative_error(expectedcolor.a, gotcolor.a)<admitted_error),"Expected Color= (%f, %f, %f, %f)\n , Got Color= (%f, %f, %f, %f)\n", expectedcolor.r, expectedcolor.g, expectedcolor.b, expectedcolor.a, gotcolor.r, gotcolor.g, gotcolor.b, gotcolor.a);
#define expect_color(expectedcolor,gotcolor) ok((relative_error(expectedcolor.r, gotcolor.r)<admitted_error)&&(relative_error(expectedcolor.g, gotcolor.g)<admitted_error)&&(relative_error(expectedcolor.b, gotcolor.b)<admitted_error)&&(relative_error(expectedcolor.a, gotcolor.a)<admitted_error),"Expected Color= (%f, %f, %f, %f)\n , Got Color= (%f, %f, %f, %f)\n", expectedcolor.r, expectedcolor.g, expectedcolor.b, expectedcolor.a, gotcolor.r, gotcolor.g, gotcolor.b, gotcolor.a);
...
@@ -2293,6 +2293,53 @@ static void test_D3DXFloat_Array(void)
...
@@ -2293,6 +2293,53 @@ static void test_D3DXFloat_Array(void)
}
}
}
}
static
void
test_D3DXSHAdd
(
void
)
{
UINT
i
,
k
;
FLOAT
*
ret
=
(
FLOAT
*
)
0xdeadbeef
;
const
FLOAT
in1
[
50
]
=
{
1
.
11
f
,
1
.
12
f
,
1
.
13
f
,
1
.
14
f
,
1
.
15
f
,
1
.
16
f
,
1
.
17
f
,
1
.
18
f
,
1
.
19
f
,
1
.
20
f
,
1
.
21
f
,
1
.
22
f
,
1
.
23
f
,
1
.
24
f
,
1
.
25
f
,
1
.
26
f
,
1
.
27
f
,
1
.
28
f
,
1
.
29
f
,
1
.
30
f
,
1
.
31
f
,
1
.
32
f
,
1
.
33
f
,
1
.
34
f
,
1
.
35
f
,
1
.
36
f
,
1
.
37
f
,
1
.
38
f
,
1
.
39
f
,
1
.
40
f
,
1
.
41
f
,
1
.
42
f
,
1
.
43
f
,
1
.
44
f
,
1
.
45
f
,
1
.
46
f
,
1
.
47
f
,
1
.
48
f
,
1
.
49
f
,
1
.
50
f
,
1
.
51
f
,
1
.
52
f
,
1
.
53
f
,
1
.
54
f
,
1
.
55
f
,
1
.
56
f
,
1
.
57
f
,
1
.
58
f
,
1
.
59
f
,
1
.
60
f
,
};
const
FLOAT
in2
[
50
]
=
{
2
.
11
f
,
2
.
12
f
,
2
.
13
f
,
2
.
14
f
,
2
.
15
f
,
2
.
16
f
,
2
.
17
f
,
2
.
18
f
,
2
.
19
f
,
2
.
20
f
,
2
.
21
f
,
2
.
22
f
,
2
.
23
f
,
2
.
24
f
,
2
.
25
f
,
2
.
26
f
,
2
.
27
f
,
2
.
28
f
,
2
.
29
f
,
2
.
30
f
,
2
.
31
f
,
2
.
32
f
,
2
.
33
f
,
2
.
34
f
,
2
.
35
f
,
2
.
36
f
,
2
.
37
f
,
2
.
38
f
,
2
.
39
f
,
2
.
40
f
,
2
.
41
f
,
2
.
42
f
,
2
.
43
f
,
2
.
44
f
,
2
.
45
f
,
2
.
46
f
,
2
.
47
f
,
2
.
48
f
,
2
.
49
f
,
2
.
50
f
,
2
.
51
f
,
2
.
52
f
,
2
.
53
f
,
2
.
54
f
,
2
.
55
f
,
2
.
56
f
,
2
.
57
f
,
2
.
58
f
,
2
.
59
f
,
2
.
60
f
,
};
FLOAT
out
[
50
]
=
{
0
.
0
f
};
/*
* Order is not limited by D3DXSH_MINORDER and D3DXSH_MAXORDER!
* All values will work, test from 0-7 [D3DXSH_MINORDER = 2, D3DXSH_MAXORDER = 6]
* Exceptions will show up when out, in1 or in2 are NULL
*/
for
(
k
=
0
;
k
<
8
;
++
k
)
{
UINT
count
=
k
*
k
;
ret
=
D3DXSHAdd
(
&
out
[
0
],
k
,
&
in1
[
0
],
&
in2
[
0
]);
ok
(
ret
==
out
,
"%u: D3DXSHAdd() failed, got %p, expected %p
\n
"
,
k
,
out
,
ret
);
for
(
i
=
0
;
i
<
count
;
++
i
)
{
ok
(
relative_error
(
in1
[
i
]
+
in2
[
i
],
out
[
i
])
<
admitted_error
,
"%u-%u: D3DXSHAdd() failed, got %f, expected %f
\n
"
,
k
,
i
,
out
[
i
],
in1
[
i
]
+
in2
[
i
]);
}
ok
(
out
[
count
]
==
0
.
0
f
,
"%u-%u: D3DXSHAdd() failed, got %f, expected 0.0
\n
"
,
k
,
k
*
k
,
out
[
count
]);
}
}
START_TEST
(
math
)
START_TEST
(
math
)
{
{
D3DXColorTest
();
D3DXColorTest
();
...
@@ -2309,4 +2356,5 @@ START_TEST(math)
...
@@ -2309,4 +2356,5 @@ START_TEST(math)
test_Matrix_Transformation2D
();
test_Matrix_Transformation2D
();
test_D3DXVec_Array
();
test_D3DXVec_Array
();
test_D3DXFloat_Array
();
test_D3DXFloat_Array
();
test_D3DXSHAdd
();
}
}
dlls/user32/dialog.c
View file @
b83d322d
...
@@ -557,9 +557,6 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate,
...
@@ -557,9 +557,6 @@ static HWND DIALOG_CreateIndirect( HINSTANCE hInst, LPCVOID dlgTemplate,
rect
.
left
=
rect
.
top
=
0
;
rect
.
left
=
rect
.
top
=
0
;
rect
.
right
=
MulDiv
(
template
.
cx
,
xBaseUnit
,
4
);
rect
.
right
=
MulDiv
(
template
.
cx
,
xBaseUnit
,
4
);
rect
.
bottom
=
MulDiv
(
template
.
cy
,
yBaseUnit
,
8
);
rect
.
bottom
=
MulDiv
(
template
.
cy
,
yBaseUnit
,
8
);
if
(
template
.
style
&
DS_CONTROL
)
template
.
style
&=
~
(
WS_CAPTION
|
WS_SYSMENU
);
template
.
style
|=
DS_3DLOOK
;
template
.
style
|=
DS_3DLOOK
;
if
(
template
.
style
&
DS_MODALFRAME
)
if
(
template
.
style
&
DS_MODALFRAME
)
template
.
exStyle
|=
WS_EX_DLGMODALFRAME
;
template
.
exStyle
|=
WS_EX_DLGMODALFRAME
;
...
...
dlls/user32/tests/win.c
View file @
b83d322d
...
@@ -3903,16 +3903,6 @@ static void test_dialog_styles(void)
...
@@ -3903,16 +3903,6 @@ static void test_dialog_styles(void)
check_dialog_style
(
WS_DLGFRAME
,
WS_EX_STATICEDGE
,
WS_CLIPSIBLINGS
|
WS_CAPTION
,
WS_EX_WINDOWEDGE
|
WS_EX_STATICEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_DLGFRAME
,
WS_EX_STATICEDGE
,
WS_CLIPSIBLINGS
|
WS_CAPTION
,
WS_EX_WINDOWEDGE
|
WS_EX_STATICEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_THICKFRAME
,
WS_EX_STATICEDGE
,
WS_THICKFRAME
|
WS_CLIPSIBLINGS
|
WS_CAPTION
,
WS_EX_WINDOWEDGE
|
WS_EX_STATICEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_THICKFRAME
,
WS_EX_STATICEDGE
,
WS_THICKFRAME
|
WS_CLIPSIBLINGS
|
WS_CAPTION
,
WS_EX_WINDOWEDGE
|
WS_EX_STATICEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
DS_CONTROL
,
0
,
WS_CLIPSIBLINGS
|
WS_CAPTION
|
DS_CONTROL
,
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
DS_CONTROL
,
0
,
WS_CLIPSIBLINGS
|
WS_CAPTION
|
DS_CONTROL
,
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CAPTION
,
0
,
WS_CAPTION
|
WS_CLIPSIBLINGS
,
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_BORDER
,
0
,
WS_CAPTION
|
WS_CLIPSIBLINGS
,
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_DLGFRAME
,
0
,
WS_CAPTION
|
WS_CLIPSIBLINGS
,
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_BORDER
|
DS_CONTROL
,
0
,
WS_CAPTION
|
DS_CONTROL
|
WS_CLIPSIBLINGS
,
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_DLGFRAME
|
DS_CONTROL
,
0
,
WS_CAPTION
|
DS_CONTROL
|
WS_CLIPSIBLINGS
,
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CAPTION
|
WS_SYSMENU
,
0
,
WS_CAPTION
|
WS_SYSMENU
|
WS_CLIPSIBLINGS
,
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_SYSMENU
,
0
,
WS_CAPTION
|
WS_SYSMENU
|
WS_CLIPSIBLINGS
,
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CAPTION
|
DS_CONTROL
,
0
,
WS_CAPTION
|
DS_CONTROL
|
WS_CLIPSIBLINGS
,
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_SYSMENU
|
DS_CONTROL
,
0
,
WS_CAPTION
|
DS_CONTROL
|
WS_CLIPSIBLINGS
,
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CAPTION
|
WS_SYSMENU
|
DS_CONTROL
,
0
,
WS_CAPTION
|
DS_CONTROL
|
WS_CLIPSIBLINGS
,
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_OVERLAPPEDWINDOW
,
0
,
WS_CLIPSIBLINGS
|
WS_OVERLAPPEDWINDOW
,
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_OVERLAPPEDWINDOW
,
0
,
WS_CLIPSIBLINGS
|
WS_OVERLAPPEDWINDOW
,
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CHILD
,
0
,
WS_CHILD
,
0
);
check_dialog_style
(
WS_CHILD
,
0
,
WS_CHILD
,
0
);
check_dialog_style
(
WS_CHILD
|
WS_DLGFRAME
,
0
,
WS_CHILD
|
WS_DLGFRAME
,
WS_EX_WINDOWEDGE
);
check_dialog_style
(
WS_CHILD
|
WS_DLGFRAME
,
0
,
WS_CHILD
|
WS_DLGFRAME
,
WS_EX_WINDOWEDGE
);
...
@@ -3921,15 +3911,7 @@ static void test_dialog_styles(void)
...
@@ -3921,15 +3911,7 @@ static void test_dialog_styles(void)
check_dialog_style
(
WS_CHILD
|
WS_THICKFRAME
,
WS_EX_STATICEDGE
,
WS_CHILD
|
WS_THICKFRAME
,
WS_EX_STATICEDGE
);
check_dialog_style
(
WS_CHILD
|
WS_THICKFRAME
,
WS_EX_STATICEDGE
,
WS_CHILD
|
WS_THICKFRAME
,
WS_EX_STATICEDGE
);
check_dialog_style
(
WS_CHILD
|
DS_CONTROL
,
0
,
WS_CHILD
|
DS_CONTROL
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CHILD
|
DS_CONTROL
,
0
,
WS_CHILD
|
DS_CONTROL
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CHILD
|
WS_CAPTION
,
0
,
WS_CHILD
|
WS_CAPTION
,
WS_EX_WINDOWEDGE
);
check_dialog_style
(
WS_CHILD
|
WS_CAPTION
,
0
,
WS_CHILD
|
WS_CAPTION
,
WS_EX_WINDOWEDGE
);
check_dialog_style
(
WS_CHILD
|
WS_BORDER
,
0
,
WS_CHILD
|
WS_BORDER
,
0
);
check_dialog_style
(
WS_CHILD
|
WS_DLGFRAME
,
0
,
WS_CHILD
|
WS_DLGFRAME
,
WS_EX_WINDOWEDGE
);
check_dialog_style
(
WS_CHILD
|
WS_BORDER
|
DS_CONTROL
,
0
,
WS_CHILD
|
DS_CONTROL
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CHILD
|
WS_DLGFRAME
|
DS_CONTROL
,
0
,
WS_CHILD
|
DS_CONTROL
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CHILD
|
WS_CAPTION
|
WS_SYSMENU
,
0
,
WS_CHILD
|
WS_CAPTION
|
WS_SYSMENU
,
WS_EX_WINDOWEDGE
);
check_dialog_style
(
WS_CHILD
|
WS_CAPTION
|
WS_SYSMENU
,
0
,
WS_CHILD
|
WS_CAPTION
|
WS_SYSMENU
,
WS_EX_WINDOWEDGE
);
check_dialog_style
(
WS_CHILD
|
WS_SYSMENU
,
0
,
WS_CHILD
|
WS_SYSMENU
,
0
);
check_dialog_style
(
WS_CHILD
|
WS_CAPTION
|
DS_CONTROL
,
0
,
WS_CHILD
|
DS_CONTROL
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CHILD
|
WS_SYSMENU
|
DS_CONTROL
,
0
,
WS_CHILD
|
DS_CONTROL
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CHILD
|
WS_CAPTION
|
WS_SYSMENU
|
DS_CONTROL
,
0
,
WS_CHILD
|
DS_CONTROL
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CHILD
,
WS_EX_WINDOWEDGE
,
WS_CHILD
,
0
);
check_dialog_style
(
WS_CHILD
,
WS_EX_WINDOWEDGE
,
WS_CHILD
,
0
);
check_dialog_style
(
WS_CHILD
,
WS_EX_DLGMODALFRAME
,
WS_CHILD
,
WS_EX_WINDOWEDGE
|
WS_EX_DLGMODALFRAME
);
check_dialog_style
(
WS_CHILD
,
WS_EX_DLGMODALFRAME
,
WS_CHILD
,
WS_EX_WINDOWEDGE
|
WS_EX_DLGMODALFRAME
);
check_dialog_style
(
WS_CHILD
,
WS_EX_DLGMODALFRAME
|
WS_EX_STATICEDGE
,
WS_CHILD
,
WS_EX_STATICEDGE
|
WS_EX_WINDOWEDGE
|
WS_EX_DLGMODALFRAME
);
check_dialog_style
(
WS_CHILD
,
WS_EX_DLGMODALFRAME
|
WS_EX_STATICEDGE
,
WS_CHILD
,
WS_EX_STATICEDGE
|
WS_EX_WINDOWEDGE
|
WS_EX_DLGMODALFRAME
);
...
@@ -3939,16 +3921,6 @@ static void test_dialog_styles(void)
...
@@ -3939,16 +3921,6 @@ static void test_dialog_styles(void)
check_dialog_style
(
WS_CHILD
|
WS_POPUP
|
WS_DLGFRAME
,
WS_EX_STATICEDGE
,
WS_CHILD
|
WS_POPUP
|
WS_DLGFRAME
|
WS_CLIPSIBLINGS
,
WS_EX_STATICEDGE
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
|
WS_DLGFRAME
,
WS_EX_STATICEDGE
,
WS_CHILD
|
WS_POPUP
|
WS_DLGFRAME
|
WS_CLIPSIBLINGS
,
WS_EX_STATICEDGE
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
|
WS_THICKFRAME
,
WS_EX_STATICEDGE
,
WS_CHILD
|
WS_POPUP
|
WS_THICKFRAME
|
WS_CLIPSIBLINGS
,
WS_EX_STATICEDGE
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
|
WS_THICKFRAME
,
WS_EX_STATICEDGE
,
WS_CHILD
|
WS_POPUP
|
WS_THICKFRAME
|
WS_CLIPSIBLINGS
,
WS_EX_STATICEDGE
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
|
DS_CONTROL
,
0
,
WS_CHILD
|
WS_POPUP
|
WS_CLIPSIBLINGS
|
DS_CONTROL
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
|
DS_CONTROL
,
0
,
WS_CHILD
|
WS_POPUP
|
WS_CLIPSIBLINGS
|
DS_CONTROL
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
|
WS_CAPTION
,
0
,
WS_CHILD
|
WS_POPUP
|
WS_CAPTION
|
WS_CLIPSIBLINGS
,
WS_EX_WINDOWEDGE
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
|
WS_BORDER
,
0
,
WS_CHILD
|
WS_POPUP
|
WS_BORDER
|
WS_CLIPSIBLINGS
,
0
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
|
WS_DLGFRAME
,
0
,
WS_CHILD
|
WS_POPUP
|
WS_DLGFRAME
|
WS_CLIPSIBLINGS
,
WS_EX_WINDOWEDGE
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
|
WS_BORDER
|
DS_CONTROL
,
0
,
WS_CHILD
|
WS_POPUP
|
DS_CONTROL
|
WS_CLIPSIBLINGS
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
|
WS_DLGFRAME
|
DS_CONTROL
,
0
,
WS_CHILD
|
WS_POPUP
|
DS_CONTROL
|
WS_CLIPSIBLINGS
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
|
WS_CAPTION
|
WS_SYSMENU
,
0
,
WS_CHILD
|
WS_POPUP
|
WS_CAPTION
|
WS_SYSMENU
|
WS_CLIPSIBLINGS
,
WS_EX_WINDOWEDGE
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
|
WS_SYSMENU
,
0
,
WS_CHILD
|
WS_POPUP
|
WS_SYSMENU
|
WS_CLIPSIBLINGS
,
0
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
|
WS_CAPTION
|
DS_CONTROL
,
0
,
WS_CHILD
|
WS_POPUP
|
DS_CONTROL
|
WS_CLIPSIBLINGS
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
|
WS_SYSMENU
|
DS_CONTROL
,
0
,
WS_CHILD
|
WS_POPUP
|
DS_CONTROL
|
WS_CLIPSIBLINGS
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
|
WS_CAPTION
|
WS_SYSMENU
|
DS_CONTROL
,
0
,
WS_CHILD
|
WS_POPUP
|
DS_CONTROL
|
WS_CLIPSIBLINGS
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
,
WS_EX_APPWINDOW
,
WS_CHILD
|
WS_POPUP
|
WS_CLIPSIBLINGS
,
WS_EX_APPWINDOW
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
,
WS_EX_APPWINDOW
,
WS_CHILD
|
WS_POPUP
|
WS_CLIPSIBLINGS
,
WS_EX_APPWINDOW
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
,
WS_EX_WINDOWEDGE
,
WS_CHILD
|
WS_POPUP
|
WS_CLIPSIBLINGS
,
0
);
check_dialog_style
(
WS_CHILD
|
WS_POPUP
,
WS_EX_WINDOWEDGE
,
WS_CHILD
|
WS_POPUP
|
WS_CLIPSIBLINGS
,
0
);
check_dialog_style
(
WS_CHILD
,
WS_EX_WINDOWEDGE
,
WS_CHILD
,
0
);
check_dialog_style
(
WS_CHILD
,
WS_EX_WINDOWEDGE
,
WS_CHILD
,
0
);
...
@@ -3960,16 +3932,6 @@ static void test_dialog_styles(void)
...
@@ -3960,16 +3932,6 @@ static void test_dialog_styles(void)
check_dialog_style
(
WS_POPUP
|
WS_DLGFRAME
,
WS_EX_STATICEDGE
,
WS_POPUP
|
WS_DLGFRAME
|
WS_CLIPSIBLINGS
,
WS_EX_STATICEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_POPUP
|
WS_DLGFRAME
,
WS_EX_STATICEDGE
,
WS_POPUP
|
WS_DLGFRAME
|
WS_CLIPSIBLINGS
,
WS_EX_STATICEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_POPUP
|
WS_THICKFRAME
,
WS_EX_STATICEDGE
,
WS_POPUP
|
WS_THICKFRAME
|
WS_CLIPSIBLINGS
,
WS_EX_STATICEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_POPUP
|
WS_THICKFRAME
,
WS_EX_STATICEDGE
,
WS_POPUP
|
WS_THICKFRAME
|
WS_CLIPSIBLINGS
,
WS_EX_STATICEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_POPUP
|
DS_CONTROL
,
0
,
WS_POPUP
|
WS_CLIPSIBLINGS
|
DS_CONTROL
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_POPUP
|
DS_CONTROL
,
0
,
WS_POPUP
|
WS_CLIPSIBLINGS
|
DS_CONTROL
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_POPUP
|
WS_CAPTION
,
0
,
WS_POPUP
|
WS_CAPTION
|
WS_CLIPSIBLINGS
,
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_POPUP
|
WS_BORDER
,
0
,
WS_POPUP
|
WS_BORDER
|
WS_CLIPSIBLINGS
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_POPUP
|
WS_DLGFRAME
,
0
,
WS_POPUP
|
WS_DLGFRAME
|
WS_CLIPSIBLINGS
,
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_POPUP
|
WS_BORDER
|
DS_CONTROL
,
0
,
WS_POPUP
|
DS_CONTROL
|
WS_CLIPSIBLINGS
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_POPUP
|
WS_DLGFRAME
|
DS_CONTROL
,
0
,
WS_POPUP
|
DS_CONTROL
|
WS_CLIPSIBLINGS
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_POPUP
|
WS_CAPTION
|
WS_SYSMENU
,
0
,
WS_POPUP
|
WS_CAPTION
|
WS_SYSMENU
|
WS_CLIPSIBLINGS
,
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_POPUP
|
WS_SYSMENU
,
0
,
WS_POPUP
|
WS_SYSMENU
|
WS_CLIPSIBLINGS
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_POPUP
|
WS_CAPTION
|
DS_CONTROL
,
0
,
WS_POPUP
|
DS_CONTROL
|
WS_CLIPSIBLINGS
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_POPUP
|
WS_SYSMENU
|
DS_CONTROL
,
0
,
WS_POPUP
|
DS_CONTROL
|
WS_CLIPSIBLINGS
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_POPUP
|
WS_CAPTION
|
WS_SYSMENU
|
DS_CONTROL
,
0
,
WS_POPUP
|
DS_CONTROL
|
WS_CLIPSIBLINGS
,
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CAPTION
,
WS_EX_STATICEDGE
,
WS_CLIPSIBLINGS
|
WS_CAPTION
,
WS_EX_STATICEDGE
|
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
WS_CAPTION
,
WS_EX_STATICEDGE
,
WS_CLIPSIBLINGS
|
WS_CAPTION
,
WS_EX_STATICEDGE
|
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
0
,
WS_EX_APPWINDOW
,
WS_CLIPSIBLINGS
|
WS_CAPTION
,
WS_EX_APPWINDOW
|
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
check_dialog_style
(
0
,
WS_EX_APPWINDOW
,
WS_CLIPSIBLINGS
|
WS_CAPTION
,
WS_EX_APPWINDOW
|
WS_EX_WINDOWEDGE
|
WS_EX_CONTROLPARENT
);
...
...
include/d3dx9math.h
View file @
b83d322d
...
@@ -27,11 +27,12 @@
...
@@ -27,11 +27,12 @@
#define D3DX_PI ((FLOAT)3.141592654)
#define D3DX_PI ((FLOAT)3.141592654)
#define D3DX_1BYPI ((FLOAT)0.318309886)
#define D3DX_1BYPI ((FLOAT)0.318309886)
#define D3DXSH_MINORDER 2
#define D3DXSH_MAXORDER 6
#define D3DXToRadian(degree) ((degree) * (D3DX_PI / 180.0f))
#define D3DXToRadian(degree) ((degree) * (D3DX_PI / 180.0f))
#define D3DXToDegree(radian) ((radian) * (180.0f / D3DX_PI))
#define D3DXToDegree(radian) ((radian) * (180.0f / D3DX_PI))
typedef
struct
D3DXVECTOR2
typedef
struct
D3DXVECTOR2
{
{
#ifdef __cplusplus
#ifdef __cplusplus
...
@@ -375,6 +376,8 @@ D3DXVECTOR4* WINAPI D3DXVec4TransformArray(D3DXVECTOR4 *pout, UINT outstride, CO
...
@@ -375,6 +376,8 @@ D3DXVECTOR4* WINAPI D3DXVec4TransformArray(D3DXVECTOR4 *pout, UINT outstride, CO
D3DXFLOAT16
*
WINAPI
D3DXFloat32To16Array
(
D3DXFLOAT16
*
pout
,
CONST
FLOAT
*
pin
,
UINT
n
);
D3DXFLOAT16
*
WINAPI
D3DXFloat32To16Array
(
D3DXFLOAT16
*
pout
,
CONST
FLOAT
*
pin
,
UINT
n
);
FLOAT
*
WINAPI
D3DXFloat16To32Array
(
FLOAT
*
pout
,
CONST
D3DXFLOAT16
*
pin
,
UINT
n
);
FLOAT
*
WINAPI
D3DXFloat16To32Array
(
FLOAT
*
pout
,
CONST
D3DXFLOAT16
*
pin
,
UINT
n
);
FLOAT
*
WINAPI
D3DXSHAdd
(
FLOAT
*
out
,
UINT
order
,
CONST
FLOAT
*
a
,
CONST
FLOAT
*
b
);
#ifdef __cplusplus
#ifdef __cplusplus
}
}
#endif
#endif
...
...
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