https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6b67ef6e101ab1b1d98d3…
commit 6b67ef6e101ab1b1d98d3c285213cde96628deda
Author: Mark Jansen <mark.jansen(a)reactos.org>
AuthorDate: Sat Sep 1 21:40:12 2018 +0200
Commit: Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Wed Sep 12 21:33:45 2018 +0200
[WIN32K] Realize PTEXTOBJ in FontGetObject if it was not initialized
---
win32ss/gdi/ntgdi/font.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/win32ss/gdi/ntgdi/font.c b/win32ss/gdi/ntgdi/font.c
index 7d1aebbb66..ecf16c6baf 100644
--- a/win32ss/gdi/ntgdi/font.c
+++ b/win32ss/gdi/ntgdi/font.c
@@ -109,7 +109,7 @@ GreGetKerningPairs(
currently selected font. If not valid, GetCharacterPlacement ignores the
value.
- M$ must use a preset "compiled in" support for each language based releases.
+ MS must use a preset "compiled in" support for each language based releases.
ReactOS uses FreeType, this will need to be supported. ATM this is hard coded
for GCPCLASS_LATIN!
@@ -295,6 +295,18 @@ FontGetObject(PTEXTOBJ plfont, ULONG cjBuffer, PVOID pvBuffer)
ULONG cjMaxSize;
ENUMLOGFONTEXDVW *plf = &plfont->logfont;
+ if (!(plfont->fl & TEXTOBJECT_INIT))
+ {
+ NTSTATUS Status;
+ DPRINT1("FontGetObject font not initialized!\n");
+
+ Status = TextIntRealizeFont(plfont->BaseObject.hHmgr, plfont);
+ if (!NT_SUCCESS(Status))
+ {
+ DPRINT1("FontGetObject(TextIntRealizeFont) Status = 0x%lx\n", Status);
+ }
+ }
+
/* If buffer is NULL, only the size is requested */
if (pvBuffer == NULL) return sizeof(LOGFONTW);
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee4ee2fc1db4baf16f87a…
commit ee4ee2fc1db4baf16f87a28cf2378d983dc7e18c
Author: Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Wed Sep 12 17:53:49 2018 +0200
Commit: Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Wed Sep 12 17:53:49 2018 +0200
[NETAPI32] Remove the obsolete file group.c
---
dll/win32/netapi32/CMakeLists.txt | 1 -
dll/win32/netapi32/group.c | 25 -------------------------
2 files changed, 26 deletions(-)
diff --git a/dll/win32/netapi32/CMakeLists.txt b/dll/win32/netapi32/CMakeLists.txt
index d714bb24b8..dab40b16eb 100644
--- a/dll/win32/netapi32/CMakeLists.txt
+++ b/dll/win32/netapi32/CMakeLists.txt
@@ -20,7 +20,6 @@ list(APPEND SOURCE
dfs.c
display.c
dssetup.c
- group.c
group_new.c
local_group.c
misc.c
diff --git a/dll/win32/netapi32/group.c b/dll/win32/netapi32/group.c
deleted file mode 100644
index e6300f2bb2..0000000000
--- a/dll/win32/netapi32/group.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2002 Andriy Palamarchuk
- *
- * netapi32 access functions
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "netapi32.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
-
-/* EOF */