Type1 Fonts

Sun Oct 21 10:44:17 CDT 2001

On Sat, 20 Oct 2001, Richard W. Knight wrote:

> Thanks again Lawson,
> I have [afmdirs] not [afmfiles]. I tried wine-20011004 but Lotus Notes
> wouldn't work with it. I went down to wine-20010824 and Notes works
> great. I just need to get the font/printing issue solved.
>
> If could send the patch you mentioned I would appreciate. As a last
> resort I'm going to rebuild wine and I'ld like to stay as current as
> possible.
>
Okay.  In case you are not too used to patches, this can apply in the
<wine> directory with -p4.  That is just the way cvs patches come if you
get them by mail.  I just applied the first 9 patches to Wine-20011004
in a batch, but this one sure looks like it is the one that fixes
sockets.

--dry-run is a nice option to try first if patch will work or just make
a mess.

Lawson
-------------- next part --------------

<base href="http://cvs.winehq.com/patch.py?id=1002311145503006032668054">
<html>
<title>Patch for root=/opt/cvs-commit, id=1002311145503006032668054</title>
<body>
<pre>
ChangeSet ID:	1002311145503006032668054
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard at wine2.	01/10/05 15:45:45

Modified files:
	server         : named_pipe.c sock.c 

Log message:
	Added get_file_info support to named pipes and sockets to avoid
	breaking the get_handle_fd request.

Patch: http://cvs.winehq.com/patch.py?id=1002311145503006032668054

Revision  Changes    Path
 1.5      +20 -1     wine/server/named_pipe.c
 1.21     +20 -1     wine/server/sock.c

--- /opt/cvs-commit/wine/server/named_pipe.c	2001/08/27 19:03:42	1.4
+++ /opt/cvs-commit/wine/server/named_pipe.c	2001/10/05 19:45:45	1.5
@@ -84,6 +84,7 @@
 static void pipe_user_dump( struct object *obj, int verbose );
 static void pipe_user_destroy( struct object *obj);
 static int pipe_user_get_fd( struct object *obj );
+static int pipe_user_get_info( struct object *obj, struct get_file_info_request *req );
 
 static const struct object_ops pipe_user_ops =
 {
@@ -97,7 +98,7 @@
     default_poll_event,           /* poll_event */
     pipe_user_get_fd,             /* get_fd */
     no_flush,                     /* flush */
-    no_get_file_info,             /* get_file_info */
+    pipe_user_get_info,           /* get_file_info */
     pipe_user_destroy             /* destroy */
 };
 
@@ -165,6 +166,24 @@
     struct pipe_user *user = (struct pipe_user *)obj;
     assert( obj->ops == &pipe_user_ops );
     return user->obj.fd;
+}
+
+static int pipe_user_get_info( struct object *obj, struct get_file_info_request *req )
+{
+    if (req)
+    {
+        req->type        = FILE_TYPE_PIPE;
+        req->attr        = 0;
+        req->access_time = 0;
+        req->write_time  = 0;
+        req->size_high   = 0;
+        req->size_low    = 0;
+        req->links       = 0;
+        req->index_high  = 0;
+        req->index_low   = 0;
+        req->serial      = 0;
+    }
+    return FD_TYPE_DEFAULT;
 }
 
 static struct named_pipe *create_named_pipe( const WCHAR *name, size_t len )

--- /opt/cvs-commit/wine/server/sock.c	2001/08/24 19:14:56	1.20
+++ /opt/cvs-commit/wine/server/sock.c	2001/10/05 19:45:45	1.21
@@ -54,6 +54,7 @@
 static int sock_get_poll_events( struct object *obj );
 static void sock_poll_event( struct object *obj, int event );
 static int sock_get_fd( struct object *obj );
+static int sock_get_info( struct object *obj, struct get_file_info_request *req );
 static void sock_destroy( struct object *obj );
 static int sock_get_error( int err );
 static void sock_set_error(void);
@@ -70,7 +71,7 @@
     sock_poll_event,              /* poll_event */
     sock_get_fd,                  /* get_fd */
     no_flush,                     /* flush */
-    no_get_file_info,             /* get_file_info */
+    sock_get_info,                /* get_file_info */
     sock_destroy                  /* destroy */
 };
 
@@ -264,6 +265,24 @@
     struct sock *sock = (struct sock *)obj;
     assert( obj->ops == &sock_ops );
     return sock->obj.fd;
+}
+
+static int sock_get_info( struct object *obj, struct get_file_info_request *req )
+{
+    if (req)
+    {
+        req->type        = FILE_TYPE_PIPE;
+        req->attr        = 0;
+        req->access_time = 0;
+        req->write_time  = 0;
+        req->size_high   = 0;
+        req->size_low    = 0;
+        req->links       = 0;
+        req->index_high  = 0;
+        req->index_low   = 0;
+        req->serial      = 0;
+    }
+    return FD_TYPE_DEFAULT;
 }
 
 static void sock_destroy( struct object *obj )

</pre>
</body>
</html>

