Added many missing *Pxxx types.

Removed a few *LPxxx types that are not supposed to be there (in particular LPICONINFO). Added a few missing *LPCxxx types (MENUITEMINFO, SCROLLINFO, DLGITEMTEMPLATE). WINHELP and PE_ACCEL are internal types. MULTIKEYHELP and HELPWININFO both have an A and W variant. NUMBERFMT, CURRENCYFMT and the related API belong to winnls.h. Added missing ARW_xxx defines (for sysmetrics).

Added many missing *Pxxx types.
67c96913 · Francois Gouget · Alexandre Julliard · 986f1974 · 67c96913 · 67c96913
Commit 67c96913 authored Oct 12, 2000 by Francois Gouget Committed by Alexandre Julliard Oct 12, 2000
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 4 deletions

resource.c dlls/user/resource.c +10 -0

winuser.h include/winuser.h +0 -0

cursoricon.c windows/cursoricon.c +2 -2

winhelp.c windows/winhelp.c +13 -2

No files found.
--- a/dlls/user/resource.c
+++ b/dlls/user/resource.c
@@ -19,6 +19,16 @@
 DEFAULT_DEBUG_CHANNEL(resource);
 DECLARE_DEBUG_CHANNEL(accel);

+/* this is the 8 byte accel struct used in Win32 resources (internal only) */
+typedef struct
+{
+    BYTE   fVirt;
+    BYTE   pad0;
+    WORD   key;
+    WORD   cmd;
+    WORD   pad1;
+} PE_ACCEL, *LPPE_ACCEL;
+
 /**********************************************************************
 *			LoadAccelerators16	[USER.177]
 */

--- a/include/winuser.h
+++ b/include/winuser.h
--- a/windows/cursoricon.c
+++ b/windows/cursoricon.c
@@ -1772,7 +1772,7 @@ BOOL16 WINAPI GetIconInfo16(HICON16 hIcon,LPICONINFO16 iconinfo)
 /**********************************************************************
 *          GetIconInfo		(USER32.242)
 */
-BOOL WINAPI GetIconInfo(HICON hIcon,LPICONINFO iconinfo) {
+BOOL WINAPI GetIconInfo(HICON hIcon,PICONINFO iconinfo) {
    CURSORICONINFO	*ciconinfo;

    ciconinfo = GlobalLock16(hIcon);
@@ -1809,7 +1809,7 @@ BOOL WINAPI GetIconInfo(HICON hIcon,LPICONINFO iconinfo) {
 /**********************************************************************
 *          CreateIconIndirect		(USER32.78)
 */
-HICON WINAPI CreateIconIndirect(LPICONINFO iconinfo)
+HICON WINAPI CreateIconIndirect(PICONINFO iconinfo)
 {
    BITMAP bmpXor,bmpAnd;
    HICON hObj;

--- a/windows/winhelp.c
+++ b/windows/winhelp.c
@@ -18,6 +18,17 @@
 DEFAULT_DEBUG_CHANNEL(win);


+/* WinHelp internal structure */
+typedef struct
+{
+    WORD size;
+    WORD command;
+    LONG data;
+    LONG reserved;
+    WORD ofsFilename;
+    WORD ofsData;
+} WINHELP,*LPWINHELP;
+
 /**********************************************************************
 *             WinHelp16   (USER.171)
 */
@@ -89,10 +100,10 @@ BOOL WINAPI WinHelpA( HWND hWnd, LPCSTR lpHelpFile, UINT wCommand,
 			dsize = dwData ? strlen( (LPSTR)dwData )+1: 0;
 			break;
 		case HELP_MULTIKEY:
-			dsize = ((LPMULTIKEYHELP)dwData)->mkSize;
+			dsize = ((LPMULTIKEYHELPA)dwData)->mkSize;
 			break;
 		case HELP_SETWINPOS:
-			dsize = ((LPHELPWININFO)dwData)->wStructSize;
+			dsize = ((LPHELPWININFOA)dwData)->wStructSize;
 			break;
 		default:
 			WARN("Unknown help command %d\n",wCommand);