Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
beb2dfec
Commit
beb2dfec
authored
17 years ago
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
17 years ago
Browse files
Options
Downloads
Patches
Plain Diff
gdi32: Add a GdiConvertToDevmodeW test, make it pass under Wine.
parent
2f83e460
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/gdi32/driver.c
+9
-5
9 additions, 5 deletions
dlls/gdi32/driver.c
dlls/gdi32/tests/dc.c
+50
-0
50 additions, 0 deletions
dlls/gdi32/tests/dc.c
with
59 additions
and
5 deletions
dlls/gdi32/driver.c
+
9
−
5
View file @
beb2dfec
...
...
@@ -413,8 +413,12 @@ DEVMODEW * WINAPI GdiConvertToDevmodeW(const DEVMODEA *dmA)
DEVMODEW
*
dmW
;
WORD
dmW_size
;
dmW_size
=
dmA
->
dmSize
+
CCHDEVICENAME
;
if
(
dmA
->
dmSize
>=
(
const
char
*
)
dmA
->
dmFormName
-
(
const
char
*
)
dmA
+
CCHFORMNAME
)
dmW_size
=
dmA
->
dmSize
;
if
(
dmW_size
>
sizeof
(
DEVMODEA
))
dmW_size
=
sizeof
(
DEVMODEA
);
dmW_size
+=
CCHDEVICENAME
;
if
(
dmA
->
dmSize
>=
FIELD_OFFSET
(
DEVMODEA
,
dmFormName
)
+
CCHFORMNAME
)
dmW_size
+=
CCHFORMNAME
;
dmW
=
HeapAlloc
(
GetProcessHeap
(),
0
,
dmW_size
+
dmA
->
dmDriverExtra
);
...
...
@@ -425,12 +429,12 @@ DEVMODEW * WINAPI GdiConvertToDevmodeW(const DEVMODEA *dmA)
/* copy slightly more, to avoid long computations */
memcpy
(
&
dmW
->
dmSpecVersion
,
&
dmA
->
dmSpecVersion
,
dmA
->
dmSize
-
CCHDEVICENAME
);
if
(
dmA
->
dmSize
>=
(
const
char
*
)
dmA
->
dmFormName
-
(
const
char
*
)
dmA
+
CCHFORMNAME
)
if
(
dmA
->
dmSize
>=
FIELD_OFFSET
(
DEVMODEA
,
dmFormName
)
+
CCHFORMNAME
)
{
MultiByteToWideChar
(
CP_ACP
,
0
,
(
const
char
*
)
dmA
->
dmFormName
,
CCHFORMNAME
,
dmW
->
dmFormName
,
CCHFORMNAME
);
if
(
dmA
->
dmSize
>
(
const
char
*
)
&
dmA
->
dmLogPixels
-
(
const
char
*
)
dmA
)
memcpy
(
&
dmW
->
dmLogPixels
,
&
dmA
->
dmLogPixels
,
dmA
->
dmSize
-
((
const
char
*
)
&
dmA
->
dmLogPixels
-
(
const
char
*
)
dmA
));
if
(
dmA
->
dmSize
>
FIELD_OFFSET
(
DEVMODEA
,
dmLogPixels
)
)
memcpy
(
&
dmW
->
dmLogPixels
,
&
dmA
->
dmLogPixels
,
dmA
->
dmSize
-
FIELD_OFFSET
(
DEVMODEA
,
dmLogPixels
));
}
if
(
dmA
->
dmDriverExtra
)
...
...
This diff is collapsed.
Click to expand it.
dlls/gdi32/tests/dc.c
+
50
−
0
View file @
beb2dfec
...
...
@@ -173,8 +173,58 @@ static void test_savedc(void)
DeleteDC
(
hdc
);
}
static
void
test_GdiConvertToDevmodeW
(
void
)
{
DEVMODEW
*
(
WINAPI
*
pGdiConvertToDevmodeW
)(
const
DEVMODEA
*
);
DEVMODEA
dmA
;
DEVMODEW
*
dmW
;
BOOL
ret
;
pGdiConvertToDevmodeW
=
(
void
*
)
GetProcAddress
(
GetModuleHandleA
(
"gdi32.dll"
),
"GdiConvertToDevmodeW"
);
if
(
!
pGdiConvertToDevmodeW
)
{
skip
(
"GdiConvertToDevmodeW is not available on this platform
\n
"
);
return
;
}
ret
=
EnumDisplaySettingsA
(
NULL
,
ENUM_CURRENT_SETTINGS
,
&
dmA
);
ok
(
ret
,
"EnumDisplaySettingsExA error %u
\n
"
,
GetLastError
());
ok
(
dmA
.
dmSize
>=
FIELD_OFFSET
(
DEVMODEA
,
dmICMMethod
),
"dmSize is too small: %04x
\n
"
,
dmA
.
dmSize
);
ok
(
dmA
.
dmSize
<=
sizeof
(
DEVMODEA
),
"dmSize is too large: %04x
\n
"
,
dmA
.
dmSize
);
dmW
=
pGdiConvertToDevmodeW
(
&
dmA
);
ok
(
dmW
->
dmSize
>=
FIELD_OFFSET
(
DEVMODEW
,
dmICMMethod
),
"dmSize is too small: %04x
\n
"
,
dmW
->
dmSize
);
ok
(
dmW
->
dmSize
<=
sizeof
(
DEVMODEW
),
"dmSize is too large: %04x
\n
"
,
dmW
->
dmSize
);
HeapFree
(
GetProcessHeap
(),
0
,
dmW
);
dmA
.
dmSize
=
FIELD_OFFSET
(
DEVMODEA
,
dmFields
)
+
sizeof
(
dmA
.
dmFields
);
dmW
=
pGdiConvertToDevmodeW
(
&
dmA
);
ok
(
dmW
->
dmSize
==
FIELD_OFFSET
(
DEVMODEW
,
dmFields
)
+
sizeof
(
dmW
->
dmFields
),
"expected %04x, got %04x
\n
"
,
FIELD_OFFSET
(
DEVMODEW
,
dmFields
)
+
sizeof
(
dmW
->
dmFields
),
dmW
->
dmSize
);
HeapFree
(
GetProcessHeap
(),
0
,
dmW
);
dmA
.
dmICMMethod
=
DMICMMETHOD_NONE
;
dmA
.
dmSize
=
FIELD_OFFSET
(
DEVMODEA
,
dmICMMethod
)
+
sizeof
(
dmA
.
dmICMMethod
);
dmW
=
pGdiConvertToDevmodeW
(
&
dmA
);
ok
(
dmW
->
dmSize
==
FIELD_OFFSET
(
DEVMODEW
,
dmICMMethod
)
+
sizeof
(
dmW
->
dmICMMethod
),
"expected %04x, got %04x
\n
"
,
FIELD_OFFSET
(
DEVMODEW
,
dmICMMethod
)
+
sizeof
(
dmW
->
dmICMMethod
),
dmW
->
dmSize
);
ok
(
dmW
->
dmICMMethod
==
DMICMMETHOD_NONE
,
"expected DMICMMETHOD_NONE, got %u
\n
"
,
dmW
->
dmICMMethod
);
HeapFree
(
GetProcessHeap
(),
0
,
dmW
);
dmA
.
dmSize
=
1024
;
dmW
=
pGdiConvertToDevmodeW
(
&
dmA
);
ok
(
dmW
->
dmSize
==
FIELD_OFFSET
(
DEVMODEW
,
dmPanningHeight
)
+
sizeof
(
dmW
->
dmPanningHeight
),
"expected %04x, got %04x
\n
"
,
FIELD_OFFSET
(
DEVMODEW
,
dmPanningHeight
)
+
sizeof
(
dmW
->
dmPanningHeight
),
dmW
->
dmSize
);
HeapFree
(
GetProcessHeap
(),
0
,
dmW
);
}
START_TEST
(
dc
)
{
test_savedc
();
test_savedc_2
();
test_GdiConvertToDevmodeW
();
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment