August 2007 - Wine-commits - list.winehq.org

Dmitry Timoshkov : wmc: Constify some data.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: 1c994d497641094015afb4abe112e81ddf3dce99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c994d497641094015afb4abe… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Aug 30 17:18:13 2007 +0900 wmc: Constify some data. --- tools/wmc/wmc.c | 4 ++-- tools/wmc/write.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 2941219..910a654 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -31,7 +31,7 @@ #include "lang.h" #include "write.h" -static char usage[] = +static const char usage[] = "Usage: wmc [options...] [inputfile.mc]\n" " -B x Set output byte-order x={n[ative], l[ittle], b[ig]}\n" " (default is n[ative] which equals " @@ -58,7 +58,7 @@ static char usage[] = "bytes read, which should be 0x0000..0x00ff.\n" ; -static char version_string[] = +static const char version_string[] = "Wine Message Compiler version " PACKAGE_VERSION "\n" "Copyright 2000 Bertho A. Stultiens\n" ; diff --git a/tools/wmc/write.c b/tools/wmc/write.c index 5a8cd71..13b7263 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -87,7 +87,7 @@ * for normal character strings and 1 for unicode strings. */ -static char str_header[] = +static const char str_header[] = "/* This file is generated with wmc version " PACKAGE_VERSION ". Do not edit! */\n" "/* Source : %s */\n" "/* Cmdline: %s */\n"

1 0

Dmitry Timoshkov : wrc: Constify some data.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: fcd6f662acd072af2b4cd0decfcbe4ba1ed2f0ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd6f662acd072af2b4cd0dec… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Aug 30 17:18:02 2007 +0900 wrc: Constify some data. --- tools/wrc/wrc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index e91661c..828176c 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -174,9 +174,9 @@ int getopt (int argc, char *const *argv, const char *optstring); static void cleanup_files(void); static void segvhandler(int sig); -static const char* short_options = +static const char short_options[] = "D:Ef:F:hi:I:J:l:o:O:rU:v"; -static struct option long_options[] = { +static const struct option long_options[] = { { "debug", 1, 0, 6 }, { "define", 1, 0, 'D' }, { "endianess", 1, 0, 7 },

1 0

Dmitry Timoshkov : widl: Constify some data.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: c6747d57ed1b4ed984c6acd6f4ab1e67487cba87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6747d57ed1b4ed984c6acd6f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Aug 30 17:17:50 2007 +0900 widl: Constify some data. --- tools/widl/typelib.c | 5 +++-- tools/widl/widl.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 23238cf..7afeef6 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -103,7 +103,7 @@ int is_array(const type_t *t) /* List of oleauto types that should be recognized by name. * (most of) these seem to be intrinsic types in mktyplib. */ -static struct oatype { +static const struct oatype { const char *kw; unsigned short vt; } oatypes[] = { @@ -129,7 +129,8 @@ static int kw_cmp_func(const void *s1, const void *s2) static unsigned short builtin_vt(const type_t *t) { const char *kw = t->name; - struct oatype key, *kwp; + struct oatype key; + const struct oatype *kwp; key.kw = kw; #ifdef KW_BSEARCH kwp = bsearch(&key, oatypes, NTYPES, sizeof(oatypes[0]), kw_cmp_func); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 21657b6..cca1325 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -49,7 +49,7 @@ /* O = generate interpreted stubs */ /* w = select win16/win32 output (?) */ -static char usage[] = +static const char usage[] = "Usage: widl [options...] infile.idl\n" " -c Generate client stub\n" " -C file Name of client stub file (default is infile_c.c)\n" @@ -133,9 +133,9 @@ enum { PREFIX_SERVER_OPTION }; -static const char *short_options = +static const char short_options[] = "cC:d:D:EhH:I:NpP:sS:tT:uU:VW"; -static struct option long_options[] = { +static const struct option long_options[] = { { "oldnames", no_argument, 0, OLDNAMES_OPTION }, { "prefix-all", required_argument, 0, PREFIX_ALL_OPTION }, { "prefix-client", required_argument, 0, PREFIX_CLIENT_OPTION },

1 0

Dan Hipschman : widl: Handle the size_is attribute on pointers.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: 7d73123dbc8c262025783a15d1bb4eca271f8b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d73123dbc8c262025783a15d… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Wed Aug 29 16:27:20 2007 -0700 widl: Handle the size_is attribute on pointers. --- tools/widl/typelib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 0238dc2..23238cf 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -206,6 +206,8 @@ unsigned short get_type_vt(type_t *t) case RPC_FC_UP: case RPC_FC_OP: case RPC_FC_FP: + case RPC_FC_CARRAY: + case RPC_FC_CVARRAY: if(t->ref) { if (match(t->ref->name, "SAFEARRAY"))

1 0

Alexandre Julliard : server: Set the queue mask directly in get_message to avoid an extra server call.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: 2896540a34a18b8aff848d728308c5811cdd122a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2896540a34a18b8aff848d728… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 29 18:13:13 2007 +0200 server: Set the queue mask directly in get_message to avoid an extra server call. --- dlls/user32/message.c | 32 ++++++++------------------------ include/wine/server_protocol.h | 4 +++- server/protocol.def | 2 ++ server/queue.c | 2 ++ server/trace.c | 4 +++- 5 files changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index e87c428..46333b6 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2017,9 +2017,12 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags ULONG_PTR extra_info = 0; struct user_thread_info *thread_info = get_user_thread_info(); struct received_message_info info, *old_info; + unsigned int wake_mask, changed_mask = HIWORD(flags); unsigned int hw_id = 0; /* id of previous hardware message */ if (!first && !last) last = ~0; + if (!changed_mask) changed_mask = QS_ALLINPUT; + wake_mask = changed_mask & (QS_SENDMESSAGE | QS_SMRESULT); for (;;) { @@ -2038,6 +2041,8 @@ static BOOL peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags req->get_first = first; req->get_last = last; req->hw_id = hw_id; + req->wake_mask = wake_mask; + req->changed_mask = changed_mask; if (buffer_size) wine_server_set_reply( req, buffer, buffer_size ); if (!(res = wine_server_call( req ))) { @@ -2933,35 +2938,14 @@ BOOL WINAPI GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT last ) if ((first <= WM_SYSTIMER) && (last >= WM_SYSTIMER)) mask |= QS_TIMER; if ((first <= WM_PAINT) && (last >= WM_PAINT)) mask |= QS_PAINT; } - else mask |= QS_MOUSE | QS_KEY | QS_TIMER | QS_PAINT; + else mask = QS_ALLINPUT; - while (!PeekMessageW( msg, hwnd, first, last, PM_REMOVE )) + while (!PeekMessageW( msg, hwnd, first, last, PM_REMOVE | PM_NOYIELD | (mask << 16) )) { - /* wait until one of the bits is set */ - unsigned int wake_bits = 0, changed_bits = 0; DWORD dwlc; - SERVER_START_REQ( set_queue_mask ) - { - req->wake_mask = QS_SENDMESSAGE; - req->changed_mask = mask; - req->skip_wait = 1; - if (!wine_server_call( req )) - { - wake_bits = reply->wake_bits; - changed_bits = reply->changed_bits; - } - } - SERVER_END_REQ; - - if (changed_bits & mask) continue; - if (wake_bits & QS_SENDMESSAGE) continue; - - TRACE( "(%04x) mask=%08x, bits=%08x, changed=%08x, waiting\n", - GetCurrentThreadId(), mask, wake_bits, changed_bits ); - ReleaseThunkLock( &dwlc ); - USER_Driver->pMsgWaitForMultipleObjectsEx( 1, &server_queue, INFINITE, QS_ALLINPUT, 0 ); + USER_Driver->pMsgWaitForMultipleObjectsEx( 1, &server_queue, INFINITE, mask, 0 ); if (dwlc) RestoreThunkLock( dwlc ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 936728a..b1f48cb 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2499,6 +2499,8 @@ struct get_message_request unsigned int get_first; unsigned int get_last; unsigned int hw_id; + unsigned int wake_mask; + unsigned int changed_mask; }; struct get_message_reply { @@ -4731,6 +4733,6 @@ union generic_reply struct make_process_system_reply make_process_system_reply; }; -#define SERVER_PROTOCOL_VERSION 311 +#define SERVER_PROTOCOL_VERSION 312 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 0ce75f5..e210e43 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1859,6 +1859,8 @@ enum message_type unsigned int get_first; /* first message code to get */ unsigned int get_last; /* last message code to get */ unsigned int hw_id; /* id of the previous hardware message (or 0) */ + unsigned int wake_mask; /* wakeup bits mask */ + unsigned int changed_mask; /* changed bits mask */ @REPLY user_handle_t win; /* window handle */ int type; /* message type */ diff --git a/server/queue.c b/server/queue.c index 5188f0d..1e8de22 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1828,6 +1828,8 @@ DECL_HANDLER(get_message) return; } + queue->wake_mask = req->wake_mask; + queue->changed_mask = req->changed_mask; set_error( STATUS_PENDING ); /* FIXME */ } diff --git a/server/trace.c b/server/trace.c index e707e47..49f4479 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2304,7 +2304,9 @@ static void dump_get_message_request( const struct get_message_request *req ) fprintf( stderr, " get_win=%p,", req->get_win ); fprintf( stderr, " get_first=%08x,", req->get_first ); fprintf( stderr, " get_last=%08x,", req->get_last ); - fprintf( stderr, " hw_id=%08x", req->hw_id ); + fprintf( stderr, " hw_id=%08x,", req->hw_id ); + fprintf( stderr, " wake_mask=%08x,", req->wake_mask ); + fprintf( stderr, " changed_mask=%08x", req->changed_mask ); } static void dump_get_message_reply( const struct get_message_reply *req )

1 0

Alexandre Julliard : server: Message results should be stored as longs, not ints.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: b4edb573fda7859af9419520b9f92c3ec50ed20a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4edb573fda7859af9419520b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 29 18:01:10 2007 +0200 server: Message results should be stored as longs, not ints. --- include/wine/server_protocol.h | 6 +++--- server/protocol.def | 4 ++-- server/queue.c | 6 +++--- server/trace.c | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 71d0709..936728a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2523,7 +2523,7 @@ struct get_message_reply struct reply_message_request { struct request_header __header; - unsigned int result; + unsigned long result; int remove; /* VARARG(data,bytes); */ }; @@ -2556,7 +2556,7 @@ struct get_message_reply_request struct get_message_reply_reply { struct reply_header __header; - unsigned int result; + unsigned long result; /* VARARG(data,bytes); */ }; @@ -4731,6 +4731,6 @@ union generic_reply struct make_process_system_reply make_process_system_reply; }; -#define SERVER_PROTOCOL_VERSION 310 +#define SERVER_PROTOCOL_VERSION 311 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index aaf6c2e..0ce75f5 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1878,7 +1878,7 @@ enum message_type /* Reply to a sent message */ @REQ(reply_message) - unsigned int result; /* message result */ + unsigned long result; /* message result */ int remove; /* should we remove the message? */ VARARG(data,bytes); /* message data for sent messages */ @END @@ -1896,7 +1896,7 @@ enum message_type @REQ(get_message_reply) int cancel; /* cancel message if not ready? */ @REPLY - unsigned int result; /* message result */ + unsigned long result; /* message result */ VARARG(data,bytes); /* message data for sent messages */ @END diff --git a/server/queue.c b/server/queue.c index 3220fcb..5188f0d 100644 --- a/server/queue.c +++ b/server/queue.c @@ -56,8 +56,8 @@ struct message_result struct msg_queue *sender; /* sender queue */ struct msg_queue *receiver; /* receiver queue */ int replied; /* has it been replied to? */ - unsigned int result; /* reply result */ unsigned int error; /* error code to pass back to sender */ + unsigned long result; /* reply result */ struct message *callback_msg; /* message to queue for callback */ void *data; /* message reply data */ unsigned int data_size; /* size of message reply data */ @@ -437,7 +437,7 @@ static inline void remove_result_from_sender( struct message_result *result ) } /* store the message result in the appropriate structure */ -static void store_message_result( struct message_result *res, unsigned int result, +static void store_message_result( struct message_result *res, unsigned long result, unsigned int error ) { res->result = result; @@ -626,7 +626,7 @@ static void receive_message( struct msg_queue *queue, struct message *msg, } /* set the result of the current received message */ -static void reply_message( struct msg_queue *queue, unsigned int result, +static void reply_message( struct msg_queue *queue, unsigned long result, unsigned int error, int remove, const void *data, data_size_t len ) { struct message_result *res = queue->recv_result; diff --git a/server/trace.c b/server/trace.c index d0c4e0e..e707e47 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2327,7 +2327,7 @@ static void dump_get_message_reply( const struct get_message_reply *req ) static void dump_reply_message_request( const struct reply_message_request *req ) { - fprintf( stderr, " result=%08x,", req->result ); + fprintf( stderr, " result=%lx,", req->result ); fprintf( stderr, " remove=%d,", req->remove ); fprintf( stderr, " data=" ); dump_varargs_bytes( cur_size ); @@ -2347,7 +2347,7 @@ static void dump_get_message_reply_request( const struct get_message_reply_reque static void dump_get_message_reply_reply( const struct get_message_reply_reply *req ) { - fprintf( stderr, " result=%08x,", req->result ); + fprintf( stderr, " result=%lx,", req->result ); fprintf( stderr, " data=" ); dump_varargs_bytes( cur_size ); }

1 0

Alexandre Julliard : ntdll: On Mac OS, close the CDROM device before opening the parent.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: 572771ebfaf4da3f431d5cdd8660f96fca077ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=572771ebfaf4da3f431d5cdd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 29 16:44:16 2007 +0200 ntdll: On Mac OS, close the CDROM device before opening the parent. This is needed to allow ejecting DVD disks. --- dlls/ntdll/cdrom.c | 46 ++++++++++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 5dc7a92..56a138e 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -305,27 +305,28 @@ static int CDROM_MediaChanged(int dev) /****************************************************************** - * open_parent_device + * get_parent_device * - * On Mac OS, open the device for the whole disk from a fd that points to a partition. + * On Mac OS, get the device for the whole disk from a fd that points to a partition. * This is ugly and inefficient, but we have no choice since the partition fd doesn't * support the eject ioctl. */ #ifdef __APPLE__ -static int open_parent_device( int fd ) +static NTSTATUS get_parent_device( int fd, char *name, size_t len ) { + NTSTATUS status = STATUS_NO_SUCH_FILE; struct stat st; - int i, parent_fd = -1; + int i; io_service_t service; CFMutableDictionaryRef dict; CFTypeRef val; - if (fstat( fd, &st ) == -1) return -1; - if (!S_ISCHR( st.st_mode )) return -1; + if (fstat( fd, &st ) == -1) return FILE_GetNtStatus(); + if (!S_ISCHR( st.st_mode )) return STATUS_OBJECT_TYPE_MISMATCH; /* create a dictionary with the right major/minor numbers */ - if (!(dict = IOServiceMatching( kIOMediaClass ))) return -1; + if (!(dict = IOServiceMatching( kIOMediaClass ))) return STATUS_NO_MEMORY; i = major( st.st_rdev ); val = CFNumberCreate( NULL, kCFNumberIntType, &i ); @@ -360,11 +361,10 @@ static int open_parent_device( int fd ) if ((str = IORegistryEntryCreateCFProperty( service, CFSTR("BSD Name"), NULL, 0 ))) { - char name[100]; strcpy( name, "/dev/r" ); - CFStringGetCString( str, name + 6, sizeof(name) - 6, kCFStringEncodingUTF8 ); + CFStringGetCString( str, name + 6, len - 6, kCFStringEncodingUTF8 ); CFRelease( str ); - parent_fd = open( name, O_RDONLY ); + status = STATUS_SUCCESS; } IOObjectRelease( service ); break; @@ -374,7 +374,7 @@ next: IOObjectRelease( service ); service = parent; } - return parent_fd; + return status; } #endif @@ -2181,17 +2181,23 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, else { #ifdef __APPLE__ - int parent_fd = open_parent_device( fd ); - if (parent_fd != -1) + char name[100]; + + /* This is ugly as hell, but Mac OS is unable to eject from the device fd, + * it wants an fd for the whole device, and it also requires the device fd + * to be closed first, so we have to close the handle that the caller gave us. + * Also for some reason it wants the fd to be closed before we even open the parent. + */ + if ((status = get_parent_device( fd, name, sizeof(name) ))) break; + NtClose( hDevice ); + if (needs_close) close( fd ); + TRACE("opening parent %s\n", name ); + if ((fd = open( name, O_RDONLY )) == -1) { - /* This is ugly as hell, but Mac OS is unable to eject from the device fd, - * it wants an fd for the whole device, and it also requires the device fd - * to be closed first, so we have to close the handle that the caller gave us */ - NtClose( hDevice ); - if (needs_close) close( fd ); - fd = parent_fd; - needs_close = 1; + status = FILE_GetNtStatus(); + break; } + needs_close = 1; #endif status = CDROM_SetTray(fd, TRUE); }

1 0

Steven Edwards : x11drv: Remove some no longer needed wine 16bit headers.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: 13f9b0a64272b5d1c4f1b698fca0e44aff8557d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f9b0a64272b5d1c4f1b698f… Author: Steven Edwards <winehacker(a)gmail.com> Date: Wed Aug 29 03:11:23 2007 -0400 x11drv: Remove some no longer needed wine 16bit headers. --- dlls/winex11.drv/desktop.c | 1 - dlls/winex11.drv/keyboard.c | 1 - dlls/winex11.drv/x11drv_main.c | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index c9e7a61..1adb031 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -22,7 +22,6 @@ #include <X11/cursorfont.h> #include <X11/Xlib.h> -#include "wine/winuser16.h" #include "win.h" #include "ddrawi.h" #include "x11drv.h" diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 747e467..f70aee5 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -44,7 +44,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "wine/winuser16.h" #include "winnls.h" #include "win.h" #include "x11drv.h" diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index ac3bb24..b0b6d8a 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -43,7 +43,6 @@ #include "windef.h" #include "winbase.h" -#include "wine/winbase16.h" #include "winreg.h" #include "x11drv.h"

1 0

Steven Edwards : user32: Remove some no longer needed wine 16bit headers.
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: a725826ada06fa69b364dbf26f9893bf088927bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a725826ada06fa69b364dbf26… Author: Steven Edwards <winehacker(a)gmail.com> Date: Wed Aug 29 03:37:14 2007 -0400 user32: Remove some no longer needed wine 16bit headers. --- dlls/user32/class.c | 1 - dlls/user32/clipboard.c | 1 - dlls/user32/listbox.c | 1 - dlls/user32/msgbox.c | 2 -- dlls/user32/nonclient.c | 1 - dlls/user32/text.c | 1 - dlls/user32/winpos.c | 1 - dlls/user32/wsprintf.c | 1 - 8 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 51801bc..6be4cad 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -31,7 +31,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/winuser16.h" #include "wine/unicode.h" #include "win.h" #include "user_private.h" diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 7076ef2..137ace9 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -46,7 +46,6 @@ #include "wingdi.h" #include "winuser.h" #include "winerror.h" -#include "wine/winuser16.h" #include "wine/winbase16.h" #include "user_private.h" #include "win.h" diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index f422531..e2bf43b 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -40,7 +40,6 @@ #include "winbase.h" #include "wingdi.h" #include "wine/winuser16.h" -#include "wine/winbase16.h" #include "wine/unicode.h" #include "user_private.h" #include "controls.h" diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 95d98a9..3331ef5 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -25,8 +25,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/winbase16.h" -#include "wine/winuser16.h" #include "winternl.h" #include "dlgs.h" #include "user_private.h" diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 0410d66..f93b94f 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -25,7 +25,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/winuser16.h" #include "win.h" #include "user_private.h" #include "controls.h" diff --git a/dlls/user32/text.c b/dlls/user32/text.c index e6d21ca..c85bd48 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -35,7 +35,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "wine/winuser16.h" #include "wine/unicode.h" #include "winnls.h" #include "controls.h" diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 8878c67..b5e478c 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -31,7 +31,6 @@ #include "winbase.h" #include "wingdi.h" #include "winerror.h" -#include "wine/winuser16.h" #include "wine/server.h" #include "controls.h" #include "user_private.h" diff --git a/dlls/user32/wsprintf.c b/dlls/user32/wsprintf.c index 4649971..7f98bee 100644 --- a/dlls/user32/wsprintf.c +++ b/dlls/user32/wsprintf.c @@ -32,7 +32,6 @@ #include "winuser.h" #include "wine/winbase16.h" -#include "wine/winuser16.h" #include "wine/debug.h"

1 0

Huw Davies : wineps.drv: Only fail printer dc creation if the printer has no builtin fonts and there are no TrueType fonts to download .
by Alexandre Julliard 29 Aug '07

29 Aug '07

Module: wine Branch: master Commit: dba09770921e6f4583a4b79226ed4f38d5520126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dba09770921e6f4583a4b7922… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Aug 28 11:46:18 2007 +0100 wineps.drv: Only fail printer dc creation if the printer has no builtin fonts and there are no TrueType fonts to download. --- dlls/wineps.drv/init.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index a794bec..d499247 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -328,8 +328,14 @@ BOOL PSDRV_CreateDC( HDC hdc, PSDRV_PDEVICE **pdev, LPCWSTR driver, LPCWSTR devi if(!pi) return FALSE; if(!pi->Fonts) { - MESSAGE("To use WINEPS you need to install some AFM files.\n"); - return FALSE; + RASTERIZER_STATUS status; + if(!GetRasterizerCaps(&status, sizeof(status)) || + !(status.wFlags & TT_AVAILABLE) || + !(status.wFlags & TT_ENABLED)) { + MESSAGE("Disabling printer %s since it has no builtin fonts and there are no TrueType fonts available.\n", + debugstr_w(device)); + return FALSE; + } } physDev = HeapAlloc( PSDRV_Heap, HEAP_ZERO_MEMORY, sizeof(*physDev) );

1 0