Commit a007f336 authored by Alexandre Julliard's avatar Alexandre Julliard

Moved a few non-standard headers into their respective dlls.

parent 1c35975a
......@@ -12,7 +12,6 @@
#include "debugger.h"
#include "thread.h"
#include "process.h"
#include "file.h"
#include "wincon.h"
#include "wingdi.h"
......
......@@ -34,7 +34,6 @@
#include "ddraw.h"
#include "d3d.h"
#include "debugtools.h"
#include "spy.h"
#include "message.h"
#include "options.h"
......
......@@ -23,7 +23,6 @@
#include "ddraw.h"
#include "d3d.h"
#include "debugtools.h"
#include "spy.h"
#include "message.h"
#include "options.h"
......
......@@ -23,7 +23,6 @@
#include "ddraw.h"
#include "d3d.h"
#include "debugtools.h"
#include "spy.h"
#include "message.h"
#include "options.h"
......
......@@ -13,7 +13,6 @@
#include "wine/winbase16.h"
#include "winerror.h"
#include "local.h"
#include "process.h"
#include "tlhelp32.h"
#include "toolhelp.h"
#include "heap.h"
......
......@@ -9,7 +9,6 @@
#include <signal.h>
#include "winnt.h"
#include "ntddk.h"
#include "process.h"
#include "global.h"
#include "wine/exception.h"
#include "stackframe.h"
......
......@@ -16,7 +16,6 @@
#include "winuser.h"
#include "winerror.h"
#include "ole2.h"
#include "process.h"
#include "commctrl.h"
#include "wine/obj_clientserver.h"
#include "wine/winbase16.h"
......@@ -215,8 +214,9 @@ HRESULT WINAPI OleInitialize(LPVOID reserved)
* NOTES
* Is DWORD really the correct return type for this function?
*/
DWORD WINAPI CoGetCurrentProcess(void) {
return (DWORD)PROCESS_Current();
DWORD WINAPI CoGetCurrentProcess(void)
{
return GetCurrentProcessId();
}
/******************************************************************************
......
......@@ -234,8 +234,8 @@ static const char * const SHELL_People[] =
"Rick Richardson",
"Douglas Ridgway",
"Robert Riggs",
"Bernhard Rosenkraenzer",
"Matthew Robertson",
"Bernhard Rosenkraenzer",
"Pavel Roskin",
"Herbert Rosmanith",
"Lilia Roumiantseva",
......
......@@ -7,10 +7,8 @@
#include "win.h"
#include "debugtools.h"
#include "winreg.h"
#include "authors.h"
#include "winnls.h"
#include "commctrl.h"
#include "spy.h"
#include "wine/obj_base.h"
#include "wine/obj_enumidlist.h"
......
......@@ -502,8 +502,6 @@ BOOL WINAPI ShellExecuteExAW (LPVOID sei)
* %S ???
* %* all following parameters (see batfile)
*/
#include "process.h" /* we can get rid of it hopefully */
#include "task.h"
BOOL WINAPI ShellExecuteExA (LPSHELLEXECUTEINFOA sei)
{ CHAR szApplicationName[MAX_PATH],szCommandline[MAX_PATH],szPidl[20];
LPSTR pos;
......
......@@ -38,7 +38,6 @@
#include "wine/obj_dragdrop.h"
#include "wine/undocshell.h"
#include "shresdef.h"
#include "spy.h"
#include "debugtools.h"
#include "winerror.h"
#include "wine/winestring.h"
......@@ -47,7 +46,7 @@
#include "pidl.h"
#include "shell32_main.h"
DEFAULT_DEBUG_CHANNEL(shell)
DEFAULT_DEBUG_CHANNEL(shell);
typedef struct
{ BOOL bIsAscending;
......@@ -1283,7 +1282,7 @@ static LRESULT ShellView_OnNotify(IShellViewImpl * This, UINT CtlID, LPNMHDR lpn
}
break;
default:
TRACE("-- %p WM_COMMAND %s unhandled\n", This, SPY_GetMsgName(lpnmh->code));
TRACE("-- %p WM_COMMAND %x unhandled\n", This, lpnmh->code);
break;;
}
return 0;
......
......@@ -6,11 +6,17 @@
*/
#include "windef.h"
#include "w32sys.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(dll)
DEFAULT_DEBUG_CHANNEL(dll);
typedef struct
{
BYTE bMajor;
BYTE bMinor;
WORD wBuildNumber;
BOOL16 fDebug;
} WIN32SINFO, *LPWIN32SINFO;
/***********************************************************************
* GetWin32sInfo (W32SYS.12)
......
......@@ -37,7 +37,6 @@
#include "wine/winbase16.h"
#include "wine/winestring.h"
#include "drive.h"
#include "device.h"
#include "file.h"
#include "global.h"
#include "heap.h"
......
#ifndef __WINE_DEVICE_H
#define __WINE_DEVICE_H
#include "winbase.h"
extern HANDLE DEVICE_Open( LPCSTR filename, DWORD access,
LPSECURITY_ATTRIBUTES sa );
#endif
......@@ -73,4 +73,7 @@ extern int DOSFS_FindNext( const char *path, const char *short_mask,
const char *long_mask, int drive, BYTE attr,
int skip, WIN32_FIND_DATAA *entry );
/* win32/device.c */
extern HANDLE DEVICE_Open( LPCSTR filename, DWORD access, LPSECURITY_ATTRIBUTES sa );
#endif /* __WINE_FILE_H */
/*
* W32SYS
*
* Copyright (c) 1996 Anand Kumria
*/
#ifndef __WINE_W32SYS_H
#define __WINE_W32SYS_H
#include "windef.h"
typedef struct _WIN32SINFO {
BYTE bMajor;
BYTE bMinor;
WORD wBuildNumber;
BOOL16 fDebug;
} WIN32SINFO, *LPWIN32SINFO;
#endif /* __WINE_W32SYS_H */
#! /usr/bin/perl
#
# Generate AUTHORS and include/authors.h
# Generate AUTHORS and dlls/shell32/authors.h
#
open(AUTHORS,"<AUTHORS") or die "Can't open AUTHORS";
open(NEWAUTHORS,">AUTHORS.new");
......@@ -37,7 +37,7 @@ print NEWAUTHORS "and $authors[$#authors].\n";
print "Created AUTHORS.new\n";
# Build authors.h file
open(NEWAUTHORS_H,">include/authors.h");
open(NEWAUTHORS_H,">dlls/shell32/authors.h");
print NEWAUTHORS_H <<EOF;
#ifndef __WINE_AUTHORS_H
......@@ -55,4 +55,4 @@ for ($i = 0; $i <= $#authors; $i++)
print NEWAUTHORS_H " 0\n};\n";
print NEWAUTHORS_H "\n#endif /* __WINE_AUTHORS_H */\n";
print "Created include/authors.h\n";
print "Created dlls/shell32/authors.h\n";
......@@ -23,7 +23,6 @@
#include "winbase.h"
#include "winerror.h"
#include "file.h"
#include "device.h"
#include "process.h"
#include "heap.h"
#include "debugtools.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment