mirror of
https://github.com/reactos/reactos.git
synced 2025-02-25 01:39:30 +00:00
Fix GetkerningPairsA, so it can handle null count and pointer. Fix export problem for user32.
svn path=/trunk/; revision=31484
This commit is contained in:
parent
df28dbd1ee
commit
de36e54946
3 changed files with 5 additions and 5 deletions
|
@ -6,6 +6,7 @@
|
||||||
<define name="WINVER">0x0600</define>
|
<define name="WINVER">0x0600</define>
|
||||||
<define name="_WIN32_WINNT">0x0501</define>
|
<define name="_WIN32_WINNT">0x0501</define>
|
||||||
<library>ntdll</library>
|
<library>ntdll</library>
|
||||||
|
<library>user32</library>
|
||||||
<library>kernel32</library>
|
<library>kernel32</library>
|
||||||
<library>advapi32</library>
|
<library>advapi32</library>
|
||||||
<library>win32ksys</library>
|
<library>win32ksys</library>
|
||||||
|
|
|
@ -1174,9 +1174,11 @@ GetKerningPairsA( HDC hDC,
|
||||||
}
|
}
|
||||||
DPRINT("charset %d => codepage %u\n", charset, csi.ciACP);
|
DPRINT("charset %d => codepage %u\n", charset, csi.ciACP);
|
||||||
|
|
||||||
total_kern_pairs = GetKerningPairsW(hDC, 0, NULL);
|
total_kern_pairs = NtGdiGetKerningPairs(hDC, 0, NULL);
|
||||||
if (!total_kern_pairs) return 0;
|
if (!total_kern_pairs) return 0;
|
||||||
|
|
||||||
|
if (!cPairs && !kern_pairA) return total_kern_pairs;
|
||||||
|
|
||||||
kern_pairW = HeapAlloc(GetProcessHeap(), 0, total_kern_pairs * sizeof(*kern_pairW));
|
kern_pairW = HeapAlloc(GetProcessHeap(), 0, total_kern_pairs * sizeof(*kern_pairW));
|
||||||
GetKerningPairsW(hDC, total_kern_pairs, kern_pairW);
|
GetKerningPairsW(hDC, total_kern_pairs, kern_pairW);
|
||||||
|
|
||||||
|
|
|
@ -86,10 +86,7 @@ RealizePalette(HDC hDC) /* [in] Handle of device context */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
// return UserRealizePalette(hDC);
|
return UserRealizePalette(hDC);
|
||||||
|
|
||||||
//HACK!!!!!
|
|
||||||
return NtGdiRealizePalette(hDC);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue