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
a22d6133
Commit
a22d6133
authored
Jun 05, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gdiplus: Build with msvcrt.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
cd01ad22
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
11 deletions
+10
-11
Makefile.in
dlls/gdiplus/Makefile.in
+2
-0
font.c
dlls/gdiplus/font.c
+4
-5
graphics.c
dlls/gdiplus/graphics.c
+4
-5
metafile.c
dlls/gdiplus/metafile.c
+0
-1
No files found.
dlls/gdiplus/Makefile.in
View file @
a22d6133
...
...
@@ -3,6 +3,8 @@ IMPORTLIB = gdiplus
IMPORTS
=
uuid shlwapi ole32 user32 gdi32
DELAYIMPORTS
=
windowscodecs
EXTRADLLFLAGS
=
-mno-cygwin
C_SRCS
=
\
brush.c
\
customlinecap.c
\
...
...
dlls/gdiplus/font.c
View file @
a22d6133
...
...
@@ -25,7 +25,6 @@
#include "winnls.h"
#include "winreg.h"
#include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL
(
gdiplus
);
...
...
@@ -507,7 +506,7 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW
lf
->
lfClipPrecision
=
CLIP_DEFAULT_PRECIS
;
lf
->
lfQuality
=
DEFAULT_QUALITY
;
lf
->
lfPitchAndFamily
=
0
;
strcpyW
(
lf
->
lfFaceName
,
font
->
family
->
FamilyName
);
l
strcpyW
(
lf
->
lfFaceName
,
font
->
family
->
FamilyName
);
TRACE
(
"=> %s,%d
\n
"
,
debugstr_w
(
lf
->
lfFaceName
),
lf
->
lfHeight
);
...
...
@@ -710,7 +709,7 @@ static GpStatus find_installed_font(const WCHAR *name, struct font_metrics *fm)
{
HFONT
hfont
,
old_font
;
strcpyW
(
fm
->
facename
,
lf
.
lfFaceName
);
l
strcpyW
(
fm
->
facename
,
lf
.
lfFaceName
);
hfont
=
CreateFontIndirectW
(
&
lf
);
old_font
=
SelectObject
(
hdc
,
hfont
);
...
...
@@ -1632,7 +1631,7 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm,
if
(
lfw
->
lfFaceName
[
0
]
==
'@'
)
return
1
;
if
(
fonts
->
count
&&
strcmpiW
(
lfw
->
lfFaceName
,
fonts
->
FontFamilies
[
fonts
->
count
-
1
]
->
FamilyName
)
==
0
)
if
(
fonts
->
count
&&
wcsicmp
(
lfw
->
lfFaceName
,
fonts
->
FontFamilies
[
fonts
->
count
-
1
]
->
FamilyName
)
==
0
)
return
1
;
if
(
fonts
->
allocated
==
fonts
->
count
)
...
...
@@ -1664,7 +1663,7 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm,
/* skip duplicates */
for
(
i
=
0
;
i
<
fonts
->
count
;
i
++
)
{
if
(
strcmpiW
(
family
->
FamilyName
,
fonts
->
FontFamilies
[
i
]
->
FamilyName
)
==
0
)
if
(
wcsicmp
(
family
->
FamilyName
,
fonts
->
FontFamilies
[
i
]
->
FamilyName
)
==
0
)
{
GdipDeleteFontFamily
(
family
);
return
1
;
...
...
dlls/gdiplus/graphics.c
View file @
a22d6133
...
...
@@ -24,7 +24,6 @@
#include "winbase.h"
#include "winuser.h"
#include "wingdi.h"
#include "wine/unicode.h"
#define COBJMACROS
#include "objbase.h"
...
...
@@ -2225,7 +2224,7 @@ void get_log_fontW(const GpFont *font, GpGraphics *graphics, LOGFONTW *lf)
lf
->
lfClipPrecision
=
CLIP_DEFAULT_PRECIS
;
lf
->
lfQuality
=
DEFAULT_QUALITY
;
lf
->
lfPitchAndFamily
=
0
;
strcpyW
(
lf
->
lfFaceName
,
font
->
family
->
FamilyName
);
l
strcpyW
(
lf
->
lfFaceName
,
font
->
family
->
FamilyName
);
}
static
void
get_font_hfont
(
GpGraphics
*
graphics
,
GDIPCONST
GpFont
*
font
,
...
...
@@ -5114,7 +5113,7 @@ GpStatus gdip_format_string(HDC hdc,
for
(
i
=
0
,
j
=
0
;
i
<
length
;
i
++
){
/* FIXME: This makes the indexes passed to callback inaccurate. */
if
(
!
is
printW
(
string
[
i
])
&&
(
string
[
i
]
!=
'\n'
))
if
(
!
is
wprint
(
string
[
i
])
&&
(
string
[
i
]
!=
'\n'
))
continue
;
/* FIXME: tabs should be handled using tabstops from stringformat */
...
...
@@ -6941,7 +6940,7 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT
return
InvalidParameter
;
if
(
length
==
-
1
)
length
=
strlenW
(
text
);
length
=
l
strlenW
(
text
);
if
(
length
==
0
)
{
...
...
@@ -7302,7 +7301,7 @@ static GpStatus draw_driver_string(GpGraphics *graphics, GDIPCONST UINT16 *text,
GpStatus
stat
=
NotImplemented
;
if
(
length
==
-
1
)
length
=
strlenW
(
text
);
length
=
l
strlenW
(
text
);
if
(
graphics
->
hdc
&&
!
graphics
->
alpha_hdc
&&
((
flags
&
DriverStringOptionsRealizedAdvance
)
||
length
<=
1
)
&&
...
...
dlls/gdiplus/metafile.c
View file @
a22d6133
...
...
@@ -25,7 +25,6 @@
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "wine/unicode.h"
#define COBJMACROS
#include "objbase.h"
...
...
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