Skip to content

Commit 098e3c0

Browse files
committed
[WIN32K] Remove duplicated NtGdiClearBrushAttributes(), NtGdiSelectFont(), DC_hSelectFont() and gpepCSRSS
1 parent 2b0b9fb commit 098e3c0

File tree

3 files changed

+0
-73
lines changed

3 files changed

+0
-73
lines changed

win32ss/gdi/eng/stubs.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -567,19 +567,6 @@ NtGdiClearBitmapAttributes(
567567
return NULL;
568568
}
569569

570-
/*
571-
* @unimplemented
572-
*/
573-
HBRUSH
574-
APIENTRY
575-
NtGdiClearBrushAttributes(
576-
IN HBRUSH hbm,
577-
IN DWORD dwFlags)
578-
{
579-
UNIMPLEMENTED;
580-
return NULL;
581-
}
582-
583570
/*
584571
* @unimplemented
585572
*/

win32ss/gdi/font/dcfont.c

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -11,41 +11,6 @@
1111
#define NDEBUG
1212
#include <debug.h>
1313

14-
static
15-
HFONT
16-
DC_hSelectFont(PDC pdc, HFONT hlfntNew)
17-
{
18-
PLFONT plfntNew;
19-
HFONT hlfntOld;
20-
21-
/* Get the current selected font */
22-
hlfntOld = pdc->dclevel.plfnt->baseobj.hHmgr;
23-
24-
/* Check if a new font should be selected */
25-
if (hlfntNew != hlfntOld)
26-
{
27-
/* Lock the new font */
28-
plfntNew = LFONT_ShareLockFont(hlfntNew);
29-
if (plfntNew)
30-
{
31-
/* Success, dereference the old font */
32-
LFONT_ShareUnlockFont(pdc->dclevel.plfnt);
33-
34-
/* Select the new font */
35-
pdc->dclevel.plfnt = plfntNew;
36-
pdc->pdcattr->hlfntNew = hlfntNew;
37-
}
38-
else
39-
{
40-
/* Failed, restore old, return NULL */
41-
pdc->pdcattr->hlfntNew = hlfntOld;
42-
hlfntOld = NULL;
43-
}
44-
}
45-
46-
return hlfntOld;
47-
}
48-
4914
PRFONT
5015
NTAPI
5116
DC_prfnt(PDC pdc)
@@ -160,27 +125,4 @@ NtGdiSetTextJustification(
160125
return FALSE;
161126
}
162127

163-
W32KAPI
164-
HFONT
165-
APIENTRY
166-
NtGdiSelectFont(
167-
IN HDC hdc,
168-
IN HFONT hlfnt)
169-
{
170-
PDC pdc;
171-
HFONT hlfntOld;
172-
173-
/* Lock the DC */
174-
pdc = DC_LockDc(hdc);
175-
if (!pdc)
176-
{
177-
return NULL;
178-
}
179-
180-
/* Call the internal function */
181-
hlfntOld = DC_hSelectFont(pdc, hlfnt);
182128

183-
/* Unlock DC and return result */
184-
DC_UnlockDc(pdc);
185-
return hlfntOld;
186-
}

win32ss/user/ntuser/ntuser.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,6 @@ UserInitialize(VOID)
163163
return STATUS_SUCCESS;
164164
}
165165

166-
PEPROCESS gpepCSRSS;
167-
168166
VOID NTAPI GreStartupFontDrivers(VOID);
169167
/*
170168
* Called from usersrv.

0 commit comments

Comments
 (0)