Porting fixes.
This commit is contained in:
parent
a97c7d2fb3
commit
402b79a1e8
|
@ -21,6 +21,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "wine/port.h"
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
|
@ -21,6 +21,9 @@
|
||||||
* - proper handling of 16-bit stack and signal stack
|
* - proper handling of 16-bit stack and signal stack
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
#include "wine/port.h"
|
||||||
|
|
||||||
#include <setjmp.h>
|
#include <setjmp.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "wine/port.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
|
@ -18,6 +18,9 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
#include "wine/port.h"
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
#include "ntstatus.h"
|
#include "ntstatus.h"
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
#include "wine/port.h"
|
#include "wine/port.h"
|
||||||
|
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#ifdef HAVE_SYS_TYPES_H
|
#ifdef HAVE_SYS_TYPES_H
|
||||||
|
|
|
@ -37,6 +37,7 @@
|
||||||
#include "module.h"
|
#include "module.h"
|
||||||
#include "options.h"
|
#include "options.h"
|
||||||
#include "kernel_private.h"
|
#include "kernel_private.h"
|
||||||
|
#include "wine/exception.h"
|
||||||
#include "wine/server.h"
|
#include "wine/server.h"
|
||||||
#include "wine/unicode.h"
|
#include "wine/unicode.h"
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
#include "wine/port.h"
|
#include "wine/port.h"
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
|
@ -20,6 +20,9 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
#include "wine/port.h"
|
||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
|
@ -41,6 +41,7 @@
|
||||||
#include "module.h"
|
#include "module.h"
|
||||||
#include "thread.h"
|
#include "thread.h"
|
||||||
#include "wine/winbase16.h"
|
#include "wine/winbase16.h"
|
||||||
|
#include "wine/exception.h"
|
||||||
#include "wine/library.h"
|
#include "wine/library.h"
|
||||||
#include "wine/pthread.h"
|
#include "wine/pthread.h"
|
||||||
#include "wine/server.h"
|
#include "wine/server.h"
|
||||||
|
|
|
@ -19,6 +19,9 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
#include "wine/port.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "wine/port.h"
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
|
@ -21,6 +21,9 @@
|
||||||
* - a whole lot
|
* - a whole lot
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
#include "wine/port.h"
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
#include <stdio.h>
|
||||||
#ifdef HAVE_UNISTD_H
|
#ifdef HAVE_UNISTD_H
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#ifdef HAVE_UNISTD_H
|
#ifdef HAVE_UNISTD_H
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <stdio.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#ifdef HAVE_UNISTD_H
|
#ifdef HAVE_UNISTD_H
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "wine/port.h"
|
||||||
|
|
||||||
#define MAXHOSTNAME 100 /* from http.c */
|
#define MAXHOSTNAME 100 /* from http.c */
|
||||||
|
|
||||||
|
|
|
@ -1073,12 +1073,11 @@ BOOL WINAPI AddJobW(HANDLE hPrinter, DWORD Level, LPBYTE pData, DWORD cbBuf,
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* GetPrintProcessorDirectoryA [WINSPOOL.@]
|
* GetPrintProcessorDirectoryA [WINSPOOL.@]
|
||||||
*/
|
*/
|
||||||
BOOL WINAPI GetPrintProcessorDirectoryA(LPSTR server, LPSTR environ,
|
BOOL WINAPI GetPrintProcessorDirectoryA(LPSTR server, LPSTR env,
|
||||||
DWORD level, LPBYTE Info,
|
DWORD level, LPBYTE Info,
|
||||||
DWORD cbBuf, LPDWORD needed)
|
DWORD cbBuf, LPDWORD needed)
|
||||||
{
|
{
|
||||||
FIXME("(%s,%s,%ld,%p,0x%08lx): stub\n", server, environ, level, Info,
|
FIXME("(%s,%s,%ld,%p,0x%08lx): stub\n", server, env, level, Info, cbBuf);
|
||||||
cbBuf);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,8 +28,9 @@
|
||||||
#define XMD_H
|
#define XMD_H
|
||||||
#include "basetsd.h"
|
#include "basetsd.h"
|
||||||
#include <X11/extensions/xf86vmode.h>
|
#include <X11/extensions/xf86vmode.h>
|
||||||
#include "x11drv.h"
|
#endif /* HAVE_LIBXXF86VM */
|
||||||
|
|
||||||
|
#include "x11drv.h"
|
||||||
#include "x11ddraw.h"
|
#include "x11ddraw.h"
|
||||||
#include "xvidmode.h"
|
#include "xvidmode.h"
|
||||||
|
|
||||||
|
@ -40,6 +41,8 @@
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(xvidmode);
|
WINE_DEFAULT_DEBUG_CHANNEL(xvidmode);
|
||||||
|
|
||||||
|
#ifdef HAVE_LIBXXF86VM
|
||||||
|
|
||||||
extern int usexvidmode;
|
extern int usexvidmode;
|
||||||
|
|
||||||
static int xf86vm_event, xf86vm_error, xf86vm_major, xf86vm_minor;
|
static int xf86vm_event, xf86vm_error, xf86vm_major, xf86vm_minor;
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "wine/port.h"
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
@ -55,6 +56,7 @@
|
||||||
#include "file.h"
|
#include "file.h"
|
||||||
#include "winternl.h"
|
#include "winternl.h"
|
||||||
#include "wine/server.h"
|
#include "wine/server.h"
|
||||||
|
#include "wine/exception.h"
|
||||||
#include "excpt.h"
|
#include "excpt.h"
|
||||||
|
|
||||||
#include "smb.h"
|
#include "smb.h"
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
#include <winbase.h>
|
#include <winbase.h>
|
||||||
#include <winreg.h>
|
#include <winreg.h>
|
||||||
#include <winternl.h>
|
#include <winternl.h>
|
||||||
#include <wine/exception.h>
|
|
||||||
#include <wine/server_protocol.h>
|
#include <wine/server_protocol.h>
|
||||||
|
|
||||||
/* client communication functions */
|
/* client communication functions */
|
||||||
|
|
|
@ -169,7 +169,9 @@ void wine_set_pe_load_area( void *base, size_t size )
|
||||||
*/
|
*/
|
||||||
void wine_free_pe_load_area(void)
|
void wine_free_pe_load_area(void)
|
||||||
{
|
{
|
||||||
|
#ifdef HAVE_MMAP
|
||||||
if (pe_area) munmap( pe_area, pe_area_size );
|
if (pe_area) munmap( pe_area, pe_area_size );
|
||||||
|
#endif
|
||||||
pe_area = NULL;
|
pe_area = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -88,7 +88,7 @@ void setDriveValue(char letter, const char *valueName, const char *newValue) {
|
||||||
|
|
||||||
/* copies a drive configuration branch */
|
/* copies a drive configuration branch */
|
||||||
void copyDrive(char srcLetter, char destLetter) {
|
void copyDrive(char srcLetter, char destLetter) {
|
||||||
char *driveSection = alloca(strlen("Drive X")+1);
|
char driveSection[sizeof("Drive X")];
|
||||||
char *path, *label, *type, *serial, *fs;
|
char *path, *label, *type, *serial, *fs;
|
||||||
|
|
||||||
WINE_TRACE("srcLetter=%c, destLetter=%c\n", srcLetter, destLetter);
|
WINE_TRACE("srcLetter=%c, destLetter=%c\n", srcLetter, destLetter);
|
||||||
|
@ -115,7 +115,7 @@ void copyDrive(char srcLetter, char destLetter) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void removeDrive(char letter) {
|
void removeDrive(char letter) {
|
||||||
char *driveSection = alloca(strlen("Drive X")+1);
|
char driveSection[sizeof("Drive X")];
|
||||||
sprintf(driveSection, "Drive %c", letter);
|
sprintf(driveSection, "Drive %c", letter);
|
||||||
addTransaction(driveSection, NULL, ACTION_REMOVE, NULL);
|
addTransaction(driveSection, NULL, ACTION_REMOVE, NULL);
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "wine/port.h"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
|
@ -27,7 +27,6 @@
|
||||||
#include "windef.h"
|
#include "windef.h"
|
||||||
#include "winbase.h"
|
#include "winbase.h"
|
||||||
#include "ntstatus.h"
|
#include "ntstatus.h"
|
||||||
#include "wine/exception.h"
|
|
||||||
|
|
||||||
#ifdef __i386__
|
#ifdef __i386__
|
||||||
#define STEP_FLAG 0x00000100 /* single step flag */
|
#define STEP_FLAG 0x00000100 /* single step flag */
|
||||||
|
|
|
@ -30,6 +30,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "wine/port.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
|
@ -19,6 +19,9 @@
|
||||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
|
#include "wine/port.h"
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
@ -31,6 +34,7 @@
|
||||||
#include "winuser.h"
|
#include "winuser.h"
|
||||||
#include "winternl.h"
|
#include "winternl.h"
|
||||||
#include "excpt.h"
|
#include "excpt.h"
|
||||||
|
#include "wine/exception.h"
|
||||||
#include "wine/library.h"
|
#include "wine/library.h"
|
||||||
#include "winnls.h"
|
#include "winnls.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue