wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

Recent CVS update changed printer configs?
by Carl Sopchak 17 Jun '02

17 Jun '02

Hi, I have been using Wine to run QuickBooks for a few months now. When I originally got it set up, I had to define a "pseudo printer" in order for the checks to print from the manual feed tray. I did this by copying the ppd file for my printer, and in the PaperSize: Letter section added the postscript code to set manual feed on, then defining a printer in the system registry that used this ppd file. I also changed the ps.c program to (always) turn off manual feed at the end of the postscript output. This "pseudo printer" is not configured in LPRng: I want the output to go to the default (and only) physical printer on my system. Now, I do CVS updates about once a week, as I'm also hoping to get Quicken running under Wine. (No luck yet, as Quicken's internet configuration doesn't run. I'll start working to debug this in about a week or two...) My updates have been simply "cvs update && ./configure && make depend && make && make install". My last update was last Friday (6/14). Today, when I tried to print checks from QuickBooks, my "pseudo printer" was no longer defined, so the printer did not print from the manual feed tray. It's been about a month since I last tried to print checks. (It worked right then...) Has there been a commit to CVS that changed how printing is configured? I have not made any changes to any of my configuration files since I got QuickBooks initially running. Does anyone have any suggestions as to how I could get this going again? Thanks for the help, Carl

1 0

TWAIN.h patch (late reply)
by Steven Edwards 17 Jun '02

17 Jun '02

I will submit a proper patch for it in a few days. Thanks Steven __________________________________________________ Do You Yahoo!? Yahoo! - Official partner of 2002 FIFA World Cup http://fifaworldcup.yahoo.com

1 0

notepad vs write
by Ann and Jason Edmeades 17 Jun '02

17 Jun '02

Hi, A program I am debugging has a 'View Readme' button which when clicked attempts to load the readme into write. Just a suggestion, but perhaps when we install the default applications we could have a symbolic link or dummy application which launches the wine version of notepad instead? Regards, Jason

3 2

Patch to make server understand NT path names
by Mike McCormack 17 Jun '02

17 Jun '02

Hi All, This patch is the start of my work to make the wineserver understand NT path names. It's still quite raw, but works for simple read-only cases. The end goal is to have all file access go through the NT native interface, thus dll-seperate the kernel32 file API from our ntdll. I've made the following changes: * the create_file server call is modified so that it takes a unicode path. * if the above path starts with a backslash, it is interpretted as a WinNT style path name. * created two new server objects, directory and virtual directory. * created the NT root directory is a virtual directory containing another virtual directory named \DosDevices * created the virtual directory DosDevices containing each drive as a subdirectory. With these changes, directories will become server objects, and we can procede to modify the client side code to use the new directory objects. Anyway, with all this, my test program can open (NtOpenFile) and dump(NtReadFile) a file with names like this, as it does on WinNT. \DosDevices\C:\test.txt \DosDevices\C:\Tmp\asdf There's still lots of work to do on this: * create a hash of currently open directory objects * use [Drive] entry to convert between unicode and ascii * implement NtQueryDirectoryFile so we can read directories * rewrite the client side code to use it * debug and test it all Anyway I've put this out early so you can all compla^H^H^H comment on it and don't have to totally rewrite it after completing it to my own satisfaction ;-) Give me a yell is there's stuff missing or you want my test program... remember to run tools/make_requests Mike License: LGPL ChangeLog: * add NT style path handling to wineserver ? server/dir.c ? server/drive.c ? server/ntroot.c ? server/registry.h ? server/x Index: dlls/ntdll/file.c =================================================================== RCS file: /home/wine/wine/dlls/ntdll/file.c,v retrieving revision 1.14 diff -u -r1.14 file.c --- dlls/ntdll/file.c 14 Jun 2002 00:36:20 -0000 1.14 +++ dlls/ntdll/file.c 16 Jun 2002 16:14:30 -0000 @@ -58,12 +58,15 @@ ULONG ShareAccess, ULONG OpenOptions) { +#if 0 ULONG len = 0; PSTR filename; CHAR szDosDevices[] = "\\DosDevices\\"; DOS_FULL_NAME full_name; + UNICODE_STRING unix_name; +#endif NTSTATUS r; - + FIXME("(%p,0x%08lx,%p,%p,0x%08lx,0x%08lx) partial stub\n", FileHandle, DesiredAccess, ObjectAttributes, IoStatusBlock, ShareAccess, OpenOptions); @@ -77,8 +80,9 @@ return STATUS_OBJECT_NAME_NOT_FOUND; } +#if 0 /* create an ascii string from the unicode filename */ - RtlUnicodeToMultiByteSize( &len, ObjectAttributes->ObjectName->Buffer, + RtlUnicodeToMultiByteSize( &len, ObjectAttributes->ObjectName->Buffer, ObjectAttributes->ObjectName->Length ); filename = RtlAllocateHeap( GetProcessHeap(), 0, len + 1); RtlUnicodeToMultiByteN(filename, len, NULL, ObjectAttributes->ObjectName->Buffer, @@ -94,7 +98,10 @@ &full_name)) return STATUS_OBJECT_NAME_NOT_FOUND; - /* FIXME: modify server protocol so + RtlCreateUnicodeStringFromAsciiz(&unix_name, full_name.long_name); +#endif + + /* FIXME: modify server protocol so create file takes an OBJECT_ATTRIBUTES structure */ SERVER_START_REQ( create_file ) { @@ -103,13 +110,20 @@ req->sharing = ShareAccess; req->create = OPEN_EXISTING; req->attrs = 0; - req->drive_type = GetDriveTypeA( full_name.short_name ); - wine_server_add_data( req, full_name.long_name, strlen(full_name.long_name) ); - SetLastError(0); + req->drive_type = -1; +#if 0 + wine_server_add_data( req, unix_name.Buffer, unix_name.Length ); +#else + wine_server_add_data( req, ObjectAttributes->ObjectName->Buffer, ObjectAttributes->ObjectName->Length ); +#endif r = wine_server_call( req ); *FileHandle = reply->handle; } SERVER_END_REQ; + +#if 0 + RtlFreeUnicodeString(&unix_name); +#endif return r; } Index: dlls/ntdll/ntdll.spec =================================================================== RCS file: /home/wine/wine/dlls/ntdll/ntdll.spec,v retrieving revision 1.68 diff -u -r1.68 ntdll.spec --- dlls/ntdll/ntdll.spec 10 Jun 2002 02:28:00 -0000 1.68 +++ dlls/ntdll/ntdll.spec 16 Jun 2002 16:14:31 -0000 @@ -252,7 +252,7 @@ @ stdcall NtWaitForSingleObject(long long long) NtWaitForSingleObject @ stub NtWaitHighEventPair @ stub NtWaitLowEventPair -@ stub NtWriteFile +@ stdcall NtWriteFile(long long long long long long long long long) NtWriteFile @ stub NtWriteRequestData @ stub NtWriteVirtualMemory @ stub PfxFindPrefix @@ -757,7 +757,7 @@ @ stdcall ZwWaitForSingleObject(long long long) NtWaitForSingleObject @ stub ZwWaitHighEventPair @ stub ZwWaitLowEventPair -@ stub ZwWriteFile +@ stdcall ZwWriteFile(long long long long long long long long long) NtWriteFile @ stub ZwWriteRequestData @ stub ZwWriteVirtualMemory @ cdecl _CIpow() NTDLL__CIpow Index: files/file.c =================================================================== RCS file: /home/wine/wine/files/file.c,v retrieving revision 1.149 diff -u -r1.149 file.c --- files/file.c 5 Jun 2002 00:47:38 -0000 1.149 +++ files/file.c 16 Jun 2002 16:14:33 -0000 @@ -378,6 +378,8 @@ { unsigned int err; HANDLE ret; + WCHAR name[MAX_PATH]; + int len = MultiByteToWideChar(CP_ACP,0,filename,-1,name,MAX_PATH); for (;;) { @@ -389,7 +391,7 @@ req->create = creation; req->attrs = attributes; req->drive_type = drive_type; - wine_server_add_data( req, filename, strlen(filename) ); + wine_server_add_data( req, name, len*sizeof(WCHAR) ); SetLastError(0); err = wine_server_call( req ); ret = reply->handle; @@ -403,7 +405,7 @@ if ((err == STATUS_MEDIA_WRITE_PROTECTED) || (err == STATUS_ACCESS_DENIED)) { TRACE("Write access failed for file '%s', trying without " - "write access\n", filename); + "write access\n", debugstr_w(name)); access &= ~GENERIC_WRITE; continue; } @@ -411,7 +413,7 @@ if (err) SetLastError( RtlNtStatusToDosError(err) ); - if (!ret) WARN("Unable to create file '%s' (GLE %ld)\n", filename, GetLastError()); + if (!ret) WARN("Unable to create file '%s' (GLE %ld)\n", debugstr_wn(name,len), GetLastError()); return ret; } } Index: server/Makefile.in =================================================================== RCS file: /home/wine/wine/server/Makefile.in,v retrieving revision 1.33 diff -u -r1.33 Makefile.in --- server/Makefile.in 9 May 2002 04:31:40 -0000 1.33 +++ server/Makefile.in 16 Jun 2002 16:14:33 -0000 @@ -14,6 +14,7 @@ context_sparc.c \ debugger.c \ device.c \ + dir.c \ event.c \ file.c \ handle.c \ @@ -21,6 +22,7 @@ mapping.c \ mutex.c \ named_pipe.c \ + ntroot.c \ object.c \ pipe.c \ process.c \ Index: server/atom.c =================================================================== RCS file: /home/wine/wine/server/atom.c,v retrieving revision 1.14 diff -u -r1.14 atom.c --- server/atom.c 26 Apr 2002 19:05:17 -0000 1.14 +++ server/atom.c 16 Jun 2002 16:14:33 -0000 @@ -77,6 +77,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ atom_table_destroy /* destroy */ }; Index: server/change.c =================================================================== RCS file: /home/wine/wine/server/change.c,v retrieving revision 1.12 diff -u -r1.12 change.c --- server/change.c 10 Mar 2002 00:18:36 -0000 1.12 +++ server/change.c 16 Jun 2002 16:14:33 -0000 @@ -52,6 +52,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ no_destroy /* destroy */ }; Index: server/console.c =================================================================== RCS file: /home/wine/wine/server/console.c,v retrieving revision 1.40 diff -u -r1.40 console.c --- server/console.c 2 Jun 2002 21:22:22 -0000 1.40 +++ server/console.c 16 Jun 2002 16:14:34 -0000 @@ -57,6 +57,8 @@ no_flush, /* flush */ console_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ console_input_destroy /* destroy */ }; @@ -86,6 +88,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ console_input_events_destroy /* destroy */ }; @@ -127,6 +131,8 @@ no_flush, /* flush */ console_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ screen_buffer_destroy /* destroy */ }; Index: server/debugger.c =================================================================== RCS file: /home/wine/wine/server/debugger.c,v retrieving revision 1.42 diff -u -r1.42 debugger.c --- server/debugger.c 30 May 2002 20:12:58 -0000 1.42 +++ server/debugger.c 16 Jun 2002 16:14:34 -0000 @@ -78,6 +78,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ debug_event_destroy /* destroy */ }; @@ -99,6 +101,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ debug_ctx_destroy /* destroy */ }; Index: server/device.c =================================================================== RCS file: /home/wine/wine/server/device.c,v retrieving revision 1.14 diff -u -r1.14 device.c --- server/device.c 10 Mar 2002 00:18:36 -0000 1.14 +++ server/device.c 16 Jun 2002 16:14:35 -0000 @@ -59,6 +59,8 @@ no_flush, /* flush */ device_get_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ no_destroy /* destroy */ }; Index: server/event.c =================================================================== RCS file: /home/wine/wine/server/event.c,v retrieving revision 1.24 diff -u -r1.24 event.c --- server/event.c 30 May 2002 20:12:58 -0000 1.24 +++ server/event.c 16 Jun 2002 16:14:35 -0000 @@ -56,6 +56,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ no_destroy /* destroy */ }; Index: server/file.c =================================================================== RCS file: /home/wine/wine/server/file.c,v retrieving revision 1.58 diff -u -r1.58 file.c --- server/file.c 30 May 2002 20:12:58 -0000 1.58 +++ server/file.c 16 Jun 2002 16:14:35 -0000 @@ -44,12 +44,17 @@ #include "thread.h" #include "request.h" #include "async.h" +#include "unicode.h" + +#include "winnt.h" +#include "winreg.h" +#include "registry.h" struct file { struct object obj; /* object header */ struct file *next; /* next file in hashing list */ - char *name; /* file name */ + WCHAR *name; /* file name */ unsigned int access; /* file access (GENERIC_READ/WRITE) */ unsigned int flags; /* flags (FILE_FLAG_*) */ unsigned int sharing; /* file sharing mode */ @@ -85,20 +90,22 @@ file_flush, /* flush */ file_get_info, /* get_file_info */ file_queue_async, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ file_destroy /* destroy */ }; -static int get_name_hash( const char *name ) +static int get_name_hash( const WCHAR *name ) { int hash = 0; - while (*name) hash ^= (unsigned char)*name++; + while (*name) hash ^= (unsigned short)*name++; return hash % NAME_HASH_SIZE; } /* check if the desired access is possible without violating */ /* the sharing mode of other opens of the same file */ -static int check_sharing( const char *name, int hash, unsigned int access, +static int check_sharing( const WCHAR *name, int hash, unsigned int access, unsigned int sharing ) { struct file *file; @@ -107,7 +114,7 @@ for (file = file_hash[hash]; file; file = file->next) { - if (strcmp( file->name, name )) continue; + if (strcmpW( file->name, name )) continue; existing_sharing &= file->sharing; existing_access |= file->access; } @@ -144,20 +151,21 @@ return file; } - -static struct file *create_file( const char *nameptr, size_t len, unsigned int access, +struct object *create_file( const WCHAR *nameptr, size_t len, unsigned int access, unsigned int sharing, int create, unsigned int attrs, int drive_type ) { struct file *file; int hash, flags; struct stat st; - char *name; + WCHAR *name, szwCom[] = {'.','c','o','m',0 }, szwExe[] = {'.','e','x','e',0 }; int fd = -1; mode_t mode; - if (!(name = mem_alloc( len + 1 ))) return NULL; - memcpy( name, nameptr, len ); + /* fprintf(stderr,"opening: "); dump_strW(name,len,stderr,"[]"); fprintf(stderr,"\n"); */ + + if (!(name = mem_alloc( (len+1)*sizeof (WCHAR) ))) return NULL; + memcpy( name, nameptr, len*sizeof (WCHAR) ); name[len] = 0; /* check sharing mode */ @@ -183,11 +191,11 @@ mode = (attrs & FILE_ATTRIBUTE_READONLY) ? 0444 : 0666; if (len >= 4 && - (!strcasecmp( name + len - 4, ".exe" ) || !strcasecmp( name + len - 4, ".com" ))) + (!strcmpiW( name + len - 4, szwExe ) || !strcmpiW( name + len - 4, szwCom ))) mode |= 0111; /* FIXME: should set error to STATUS_OBJECT_NAME_COLLISION if file existed before */ - if ((fd = open( name, flags | O_NONBLOCK | O_LARGEFILE, mode )) == -1 ) + if ((fd = openw( name, flags | O_NONBLOCK | O_LARGEFILE, mode )) == -1 ) goto file_error; /* refuse to open a directory */ if (fstat( fd, &st ) == -1) goto file_error; @@ -205,7 +213,7 @@ file->name = name; file->next = file_hash[hash]; file_hash[hash] = file; - return file; + return &file->obj; file_error: file_set_error(); @@ -218,7 +226,7 @@ /* check if two file objects point to the same file */ int is_same_file( struct file *file1, struct file *file2 ) { - return !strcmp( file1->name, file2->name ); + return !strcmpW( file1->name, file2->name ); } /* get the type of drive the file is on */ @@ -264,7 +272,9 @@ { struct file *file = (struct file *)obj; assert( obj->ops == &file_ops ); - fprintf( stderr, "File fd=%d flags=%08x name='%s'\n", file->obj.fd, file->flags, file->name ); + fprintf( stderr, "File fd=%d flags=%08x name=", file->obj.fd, file->flags ); + dump_strW(file->name,strlenW(file->name),stderr,"[]"); + fprintf( stderr, "\n" ); } static int file_get_poll_events( struct object *obj ) @@ -427,7 +437,7 @@ while (*pptr && *pptr != file) pptr = &(*pptr)->next; assert( *pptr ); *pptr = (*pptr)->next; - if (file->flags & FILE_FLAG_DELETE_ON_CLOSE) unlink( file->name ); + if (file->flags & FILE_FLAG_DELETE_ON_CLOSE) unlinkw( file->name ); free( file->name ); } if (file->flags & FILE_FLAG_OVERLAPPED) @@ -564,13 +574,13 @@ if (!access_time || !write_time) { struct stat st; - if (stat( file->name, &st ) == -1) goto error; + if (statw( file->name, &st ) == -1) goto error; if (!access_time) access_time = st.st_atime; if (!write_time) write_time = st.st_mtime; } utimbuf.actime = access_time; utimbuf.modtime = write_time; - if (utime( file->name, &utimbuf ) == -1) goto error; + if (utimew( file->name, &utimbuf ) == -1) goto error; release_object( file ); return 1; error: @@ -596,11 +606,29 @@ /* create a file */ DECL_HANDLER(create_file) { - struct file *file; + struct object *file = NULL; + const WCHAR *name = get_req_data(); + int len = get_req_data_size()/sizeof (WCHAR); reply->handle = 0; - if ((file = create_file( get_req_data(), get_req_data_size(), req->access, - req->sharing, req->create, req->attrs, req->drive_type ))) + + if(len && (name[0]=='\\')) /* nt path name */ + { + if(root) + { + root->ops->open_child(root, name+1, len-1, req->access, + req->sharing, req->create, req->attrs, &file ); + } + else + set_error(STATUS_ACCESS_DENIED); + } + else + { + file = create_file( name, len, req->access, + req->sharing, req->create, req->attrs, req->drive_type ); + } + + if (file) { reply->handle = alloc_handle( current->process, file, req->access, req->inherit ); release_object( file ); Index: server/handle.c =================================================================== RCS file: /home/wine/wine/server/handle.c,v retrieving revision 1.21 diff -u -r1.21 handle.c --- server/handle.c 30 May 2002 20:12:58 -0000 1.21 +++ server/handle.c 16 Jun 2002 16:14:35 -0000 @@ -110,6 +110,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ handle_table_destroy /* destroy */ }; Index: server/main.c =================================================================== RCS file: /home/wine/wine/server/main.c,v retrieving revision 1.24 diff -u -r1.24 main.c --- server/main.c 3 Apr 2002 22:51:18 -0000 1.24 +++ server/main.c 16 Jun 2002 16:14:35 -0000 @@ -34,6 +34,7 @@ /* command-line options */ int debug_level = 0; int master_socket_timeout = 3; /* master socket timeout in seconds, default is 3 s */ +struct object *root; /* root of the NT filesystem */ /* parse-line args */ /* FIXME: should probably use getopt, and add a (more complete?) help option */ @@ -109,8 +110,10 @@ if (debug_level) fprintf( stderr, "Server: starting (pid=%ld)\n", (long) getpid() ); init_registry(); + root = get_ntroot(); select_loop(); close_registry(); + release_object(root); if (debug_level) fprintf( stderr, "Server: exiting (pid=%ld)\n", (long) getpid() ); #ifdef DEBUG_OBJECTS Index: server/mapping.c =================================================================== RCS file: /home/wine/wine/server/mapping.c,v retrieving revision 1.33 diff -u -r1.33 mapping.c --- server/mapping.c 30 May 2002 20:12:58 -0000 1.33 +++ server/mapping.c 16 Jun 2002 16:14:36 -0000 @@ -67,6 +67,8 @@ no_flush, /* flush */ mapping_get_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ mapping_destroy /* destroy */ }; Index: server/mutex.c =================================================================== RCS file: /home/wine/wine/server/mutex.c,v retrieving revision 1.21 diff -u -r1.21 mutex.c --- server/mutex.c 26 Apr 2002 19:05:18 -0000 1.21 +++ server/mutex.c 16 Jun 2002 16:14:36 -0000 @@ -60,6 +60,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ mutex_destroy /* destroy */ }; Index: server/named_pipe.c =================================================================== RCS file: /home/wine/wine/server/named_pipe.c,v retrieving revision 1.14 diff -u -r1.14 named_pipe.c --- server/named_pipe.c 31 May 2002 23:06:53 -0000 1.14 +++ server/named_pipe.c 16 Jun 2002 16:14:36 -0000 @@ -96,6 +96,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ named_pipe_destroy /* destroy */ }; @@ -118,6 +120,8 @@ no_flush, /* flush */ pipe_user_get_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ pipe_user_destroy /* destroy */ }; Index: server/object.h =================================================================== RCS file: /home/wine/wine/server/object.h,v retrieving revision 1.43 diff -u -r1.43 object.h --- server/object.h 30 May 2002 20:12:58 -0000 1.43 +++ server/object.h 16 Jun 2002 16:14:36 -0000 @@ -65,6 +65,11 @@ int (*get_file_info)(struct object *,struct get_file_info_reply *, int *flags); /* queue an async operation - see register_async handler in async.c*/ void (*queue_async)(struct object *, void* ptr, unsigned int status, int type, int count); + /* enumerate child objects (directory listing) */ + int (*enumerate)(struct object *, unsigned int index, WCHAR **name, int *len); + /* get child handle */ + int (*open_child)(struct object *, const WCHAR *nameptr, size_t len, unsigned int access, + unsigned int sharing, int create, unsigned int attrs, struct object **); /* destroy on refcount == 0 */ void (*destroy)(struct object *); }; @@ -167,6 +172,9 @@ extern int create_anonymous_file(void); extern struct file *create_temp_file( int access ); extern void file_set_error(void); +extern struct object *create_file( const WCHAR *nameptr, size_t len, unsigned int access, + unsigned int sharing, int create, unsigned int attrs, + int drive_type ); /* serial functions */ @@ -194,7 +202,14 @@ extern int grab_global_atom( atom_t atom ); extern void release_global_atom( atom_t atom ); +/* NT filesystem root */ +extern struct object* get_ntroot(void); +extern struct object* get_dir(WCHAR *name, int len); + /* global variables */ + + /* root of the NT filesystem */ +extern struct object *root; /* command-line options */ extern int debug_level; Index: server/pipe.c =================================================================== RCS file: /home/wine/wine/server/pipe.c,v retrieving revision 1.24 diff -u -r1.24 pipe.c --- server/pipe.c 30 May 2002 20:12:58 -0000 1.24 +++ server/pipe.c 16 Jun 2002 16:14:36 -0000 @@ -68,6 +68,8 @@ no_flush, /* flush */ pipe_get_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ pipe_destroy /* destroy */ }; Index: server/process.c =================================================================== RCS file: /home/wine/wine/server/process.c,v retrieving revision 1.87 diff -u -r1.87 process.c --- server/process.c 2 Jun 2002 21:22:22 -0000 1.87 +++ server/process.c 16 Jun 2002 16:14:37 -0000 @@ -69,6 +69,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ process_destroy /* destroy */ }; @@ -109,6 +111,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ startup_info_destroy /* destroy */ }; Index: server/protocol.def =================================================================== RCS file: /home/wine/wine/server/protocol.def,v retrieving revision 1.39 diff -u -r1.39 protocol.def --- server/protocol.def 2 Jun 2002 21:22:22 -0000 1.39 +++ server/protocol.def 16 Jun 2002 16:14:38 -0000 @@ -572,7 +572,7 @@ int create; /* file create action */ unsigned int attrs; /* file attributes for creation */ int drive_type; /* type of drive the file is on */ - VARARG(filename,string); /* file name */ + VARARG(filename,unicode_str); /* file name */ @REPLY obj_handle_t handle; /* handle to the file */ @END Index: server/queue.c =================================================================== RCS file: /home/wine/wine/server/queue.c,v retrieving revision 1.25 diff -u -r1.25 queue.c --- server/queue.c 26 Apr 2002 19:05:18 -0000 1.25 +++ server/queue.c 16 Jun 2002 16:14:39 -0000 @@ -130,6 +130,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, + NULL, msg_queue_destroy /* destroy */ }; Index: server/registry.c =================================================================== RCS file: /home/wine/wine/server/registry.c,v retrieving revision 1.39 diff -u -r1.39 registry.c --- server/registry.c 31 May 2002 23:06:53 -0000 1.39 +++ server/registry.c 16 Jun 2002 16:14:39 -0000 @@ -47,7 +47,9 @@ #include "winreg.h" #include "winnt.h" /* registry definitions */ #include "ntddk.h" +#include "registry.h" +#if 0 /* a registry key */ struct key { @@ -91,6 +93,8 @@ #define IS_SPECIAL_ROOT_HKEY(h) (((unsigned int)(h) >= HKEY_SPECIAL_ROOT_FIRST) && \ ((unsigned int)(h) <= HKEY_SPECIAL_ROOT_LAST)) +#endif + static struct key *special_root_keys[NB_SPECIAL_ROOT_KEYS]; /* the real root key */ @@ -160,6 +164,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ key_destroy /* destroy */ }; @@ -503,7 +509,7 @@ /* open a subkey */ /* warning: the key name must be writeable (use copy_path) */ -static struct key *open_key( struct key *key, WCHAR *name ) +struct key *open_key( struct key *key, WCHAR *name ) { int index; WCHAR *path; @@ -722,7 +728,7 @@ } /* find the named value of a given key and return its index in the array */ -static struct key_value *find_value( const struct key *key, const WCHAR *name, int *index ) +struct key_value *find_value( const struct key *key, const WCHAR *name, int *index ) { int i, min, max, res; @@ -927,7 +933,7 @@ } /* get the registry key corresponding to an hkey handle */ -static struct key *get_hkey_obj( obj_handle_t hkey, unsigned int access ) +struct key *get_hkey_obj( obj_handle_t hkey, unsigned int access ) { struct key *key; Index: server/request.c =================================================================== RCS file: /home/wine/wine/server/request.c,v retrieving revision 1.64 diff -u -r1.64 request.c --- server/request.c 30 May 2002 20:12:58 -0000 1.64 +++ server/request.c 16 Jun 2002 16:14:40 -0000 @@ -81,6 +81,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ no_destroy /* destroy */ }; Index: server/semaphore.c =================================================================== RCS file: /home/wine/wine/server/semaphore.c,v retrieving revision 1.21 diff -u -r1.21 semaphore.c --- server/semaphore.c 30 May 2002 20:12:58 -0000 1.21 +++ server/semaphore.c 16 Jun 2002 16:14:40 -0000 @@ -56,6 +56,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ no_destroy /* destroy */ }; Index: server/serial.c =================================================================== RCS file: /home/wine/wine/server/serial.c,v retrieving revision 1.22 diff -u -r1.22 serial.c --- server/serial.c 30 May 2002 20:12:58 -0000 1.22 +++ server/serial.c 16 Jun 2002 16:14:40 -0000 @@ -95,6 +95,8 @@ no_flush, /* flush */ serial_get_info, /* get_file_info */ serial_queue_async, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ destroy_serial /* destroy */ }; Index: server/smb.c =================================================================== RCS file: /home/wine/wine/server/smb.c,v retrieving revision 1.3 diff -u -r1.3 smb.c --- server/smb.c 31 May 2002 23:06:53 -0000 1.3 +++ server/smb.c 16 Jun 2002 16:14:40 -0000 @@ -78,6 +78,8 @@ no_flush, /* flush */ smb_get_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ destroy_smb /* destroy */ }; Index: server/snapshot.c =================================================================== RCS file: /home/wine/wine/server/snapshot.c,v retrieving revision 1.15 diff -u -r1.15 snapshot.c --- server/snapshot.c 26 Apr 2002 19:05:18 -0000 1.15 +++ server/snapshot.c 16 Jun 2002 16:14:40 -0000 @@ -68,6 +68,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ snapshot_destroy /* destroy */ }; Index: server/sock.c =================================================================== RCS file: /home/wine/wine/server/sock.c,v retrieving revision 1.35 diff -u -r1.35 sock.c --- server/sock.c 31 May 2002 23:06:53 -0000 1.35 +++ server/sock.c 16 Jun 2002 16:14:41 -0000 @@ -102,6 +102,8 @@ no_flush, /* flush */ sock_get_info, /* get_file_info */ sock_queue_async, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ sock_destroy /* destroy */ }; Index: server/thread.c =================================================================== RCS file: /home/wine/wine/server/thread.c,v retrieving revision 1.80 diff -u -r1.80 thread.c --- server/thread.c 30 May 2002 20:12:58 -0000 1.80 +++ server/thread.c 16 Jun 2002 16:14:41 -0000 @@ -92,6 +92,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ destroy_thread /* destroy */ }; Index: server/timer.c =================================================================== RCS file: /home/wine/wine/server/timer.c,v retrieving revision 1.15 diff -u -r1.15 timer.c --- server/timer.c 26 Apr 2002 19:05:18 -0000 1.15 +++ server/timer.c 16 Jun 2002 16:14:41 -0000 @@ -63,6 +63,8 @@ no_flush, /* flush */ no_get_file_info, /* get_file_info */ NULL, /* queue_async */ + NULL, /* enumerate */ + NULL, /* get_child_handle */ timer_destroy /* destroy */ }; Index: server/trace.c =================================================================== RCS file: /home/wine/wine/server/trace.c,v retrieving revision 1.135 diff -u -r1.135 trace.c --- server/trace.c 2 Jun 2002 21:22:22 -0000 1.135 +++ server/trace.c 16 Jun 2002 16:14:43 -0000 @@ -769,7 +769,7 @@ fprintf( stderr, " attrs=%08x,", req->attrs ); fprintf( stderr, " drive_type=%d,", req->drive_type ); fprintf( stderr, " filename=" ); - dump_varargs_string( cur_size ); + dump_varargs_unicode_str( cur_size ); } static void dump_create_file_reply( const struct create_file_reply *req ) Index: server/unicode.c =================================================================== RCS file: /home/wine/wine/server/unicode.c,v retrieving revision 1.4 diff -u -r1.4 unicode.c --- server/unicode.c 26 Apr 2002 19:05:18 -0000 1.4 +++ server/unicode.c 16 Jun 2002 16:14:43 -0000 @@ -24,8 +24,18 @@ #include <ctype.h> #include <stdio.h> +#include <fcntl.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <dirent.h> +#include <errno.h> + +#include "thread.h" #include "unicode.h" +static const union cptable *ansi_cptable; + + /* dump a Unicode string with proper escaping */ int dump_strW( const WCHAR *str, size_t len, FILE *f, char escape[2] ) { @@ -68,3 +78,85 @@ count += pos - buffer; return count; } + +int strcasecmpnW(const WCHAR *x, const WCHAR *y, int n) +{ + int i; + for(i=0; i<n; i++) + { + if((x[i]&~0x20)>(y[i]&~0x20)) + return 1; + if((x[i]&~0x20)<(y[i]&~0x20)) + return -1; + } + return 0; +} + +/* FIXME: hardcoded to ANSI for the time being */ + +int file_unicode_to_apath(const WCHAR *path_w, char *path_a, int len) +{ + if(!ansi_cptable) + ansi_cptable = cp_get_table( 1252 ); + return cp_wcstombs( ansi_cptable, 0, path_w, -1, path_a, len, NULL, NULL); +} + +int file_apath_to_unicode(const char *path_a, WCHAR *path_w, int len) +{ + if(!ansi_cptable) + ansi_cptable = cp_get_table( 1252 ); + return cp_mbstowcs( ansi_cptable, 0, path_a, -1, path_w, len); +} + +int openw(const WCHAR *name, int access, int mode) +{ + char name_a[MAX_PATH]; + name_a[0]=0; + file_unicode_to_apath(name,name_a,MAX_PATH); + return open(name_a,access,mode); +} + +int unlinkw(const WCHAR *name) +{ + char name_a[MAX_PATH]; + name_a[0]=0; + file_unicode_to_apath(name,name_a,MAX_PATH); + return unlink(name_a); +} + +int statw(const WCHAR *name, struct stat *st) +{ + char name_a[MAX_PATH]; + name_a[0]=0; + file_unicode_to_apath(name,name_a,MAX_PATH); + return stat(name_a,st); +} + +int utimew(const WCHAR *name, struct utimbuf *utimbuf) +{ + char name_a[MAX_PATH]; + name_a[0]=0; + file_unicode_to_apath(name,name_a,MAX_PATH); + return utime(name_a,utimbuf); +} + +DIR *opendirw(const WCHAR *name) +{ + char name_a[MAX_PATH]; + name_a[0]=0; + file_unicode_to_apath(name,name_a,MAX_PATH); + return opendir(name_a); +} + +static struct direntw g_de; + +struct direntw *readdirw(DIR *dir) +{ + struct dirent *de = readdir(dir); + if(!de) + return NULL; + g_de.d_name[0]=0; + file_apath_to_unicode(de->d_name, g_de.d_name, sizeof(g_de.d_name)/sizeof(WCHAR)); + return &g_de; +} + Index: server/unicode.h =================================================================== RCS file: /home/wine/wine/server/unicode.h,v retrieving revision 1.8 diff -u -r1.8 unicode.h --- server/unicode.h 10 Mar 2002 00:18:36 -0000 1.8 +++ server/unicode.h 16 Jun 2002 16:14:43 -0000 @@ -22,6 +22,9 @@ #define __WINE_SERVER_UNICODE_H #include <stdio.h> +#include <dirent.h> +#include <sys/time.h> +#include <utime.h> #include "windef.h" #include "wine/unicode.h" @@ -35,4 +38,20 @@ extern int dump_strW( const WCHAR *str, size_t len, FILE *f, char escape[2] ); +extern int strcasecmpnW(const WCHAR *x, const WCHAR *y, int n); + +extern int openw(const WCHAR *name, int access, int mode); +extern int unlinkw(const WCHAR *name); +extern int statw(const WCHAR *name, struct stat *st); +extern int utimew(const WCHAR *name, struct utimbuf *utimbuf); + +struct direntw +{ + WCHAR d_name[NAME_MAX+1]; +}; + +extern DIR *opendirw(const WCHAR *name); +extern struct direntw *readdirw(DIR *dir); + #endif /* __WINE_SERVER_UNICODE_H */ + --- /dev/null Mon Jul 18 08:46:18 1994 +++ server/ntroot.c Mon Jun 17 09:27:22 2002 @@ -0,0 +1,302 @@ +/* + * Server-side NT virtual directory management + * + * Copyright (C) 1998 Alexandre Julliard + * Copyright (C) 2002 Mike McCormack + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <assert.h> +#include <fcntl.h> +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <errno.h> +#ifdef HAVE_SYS_ERRNO_H +#include <sys/errno.h> +#endif +#include <sys/stat.h> +#include <sys/time.h> +#include <sys/types.h> +#include <time.h> +#include <unistd.h> +#include <utime.h> + +#include "winerror.h" +#include "winbase.h" + +#include "handle.h" +#include "thread.h" +#include "request.h" +#include "async.h" +#include "unicode.h" + +#include "winnt.h" +#include "winreg.h" +#include "registry.h" + +struct vdir +{ + struct object obj; /* object header */ + int count; + struct object **children; + WCHAR **names; +}; + +static void vdir_dump( struct object *obj, int verbose ); +static int vdir_enumerate(struct object *, unsigned int index, WCHAR **name, int *len); +static int vdir_get_child( struct object *obj, const WCHAR *nameptr, size_t len, unsigned int access, + unsigned int sharing, int create, unsigned int attrs, struct object **); +static void vdir_destroy(struct object *obj); + +static const struct object_ops vdir_ops = +{ + sizeof(struct vdir), /* size */ + vdir_dump, /* dump */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + NULL, /* satisfied */ + NULL, /* get_poll_events */ + NULL, /* poll_event */ + no_get_fd, /* get_fd */ + no_flush, /* flush */ + no_get_file_info, /* get_file_info */ + NULL, /* queue_async */ + vdir_enumerate, /* enumerate */ + vdir_get_child, /* get_child_handle */ + vdir_destroy /* destroy */ +}; + +/* struct vdir *root = NULL; */ + +static WCHAR szwDosDev[] = {'D','o','s','D','e','v','i','c','e','s', 0 }; +static WCHAR szwPath[] = {'P','a','t','h', 0 }; +static WCHAR szwKeyName[] = { 'D','r','i','v','e',' ' }; +static WCHAR szwProfile[] = { 'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\', + 'W','i','n','e','\\', + 'C','o','n','f','i','g','\\',0 }; + +static void vdir_dump( struct object *obj, int verbose ) +{ + struct vdir *vdir = (struct vdir *)obj; + int i; + + assert( obj->ops == &vdir_ops ); + fprintf( stderr, "%d nodes", vdir->count ); + for(i=0; i<vdir->count; i++) + { + fprintf( stderr, "node %d : " , i); + dump_strW(vdir->names[i],strlenW(vdir->names[i]),stderr,"[]"); + fprintf( stderr, "\n" ); + } +} + +static void vdir_destroy( struct object *obj ) +{ + struct vdir *vdir = (struct vdir *)obj; + int i; + + assert( obj->ops == &vdir_ops ); + for(i=0; i<vdir->count; i++) + { + free(vdir->names[i]); + release_object(vdir->children[i]); + } + free(vdir->names); + free(vdir->children); +} + +/* FIXME: detect duplicates? */ +static void add_child_node(struct vdir* dir, struct object *obj, WCHAR *name, int len) +{ + int count = (dir->count + 0x10) & ~0x0f; + WCHAR *str; + + if(len<0) + len = strlenW(name); + + /* duplicate the string */ + str = malloc( (len+1) * sizeof (WCHAR) ); + memcpy(str, name, len*sizeof(WCHAR)); + str[len]=0; + + /* allocate more memory if necessary */ + dir->children = (struct object **)realloc(dir->children, sizeof (struct object*)*count); + dir->names = (WCHAR**)realloc(dir->names, sizeof (WCHAR*)*count); + + dir->children[dir->count] = obj; + dir->names[dir->count] = str; + dir->count++; + + grab_object(obj); +} + +static int vdir_enumerate(struct object *obj, unsigned int index, WCHAR **name, int *len) +{ + struct vdir *dir = (struct vdir *)obj; + + assert(obj->ops = &vdir_ops); + + if (index >= dir->count) + return STATUS_NO_MORE_FILES; + strcpyW(*name, dir->names[index] ); + *len = strlenW(dir->names[index]); + + return STATUS_SUCCESS; +} + +static int vdir_get_child( + struct object *obj, const WCHAR *nameptr, size_t len, unsigned int access, + unsigned int sharing, int create, unsigned int attrs, struct object **object) +{ + struct vdir *dir = (struct vdir *)obj; + int i, x; + + assert(obj->ops = &vdir_ops); + + /* x is the length of the first section of the pathname */ + for(x=0; x<len; x++) + if(nameptr[x]=='\\') + break; + + for(i=0; i<dir->count; i++) + { + if(strlenW(dir->names[i]) != x) + continue; + if(memcmp(nameptr, dir->names[i], x*sizeof(WCHAR))) /* case sensitive */ + continue; + if(nameptr[x]=='\\') + x++; + if(x>=len) + { + *object = dir->children[i]; + grab_object(*object); + return STATUS_SUCCESS; + } + + return dir->children[i]->ops->open_child(dir->children[i], + &nameptr[x], len - x, access, sharing, create, attrs, object); + } + return STATUS_OBJECT_NAME_NOT_FOUND; +} + +/* given a pointer to a registry key [Drive X] and the DosDevices node, + create a directory object and add it to DosDevices as drive X: */ +static int create_drive(struct vdir *dosdev, struct key *key) +{ + struct object *obj; + struct key_value *val; + int index, len; + WCHAR szName[3]; + + if(!key) + return -1; + + /* check this key is of the form [Drive X] */ + len = strlenW(key->name); + if (len != (1 + sizeof szwKeyName/sizeof (WCHAR))) + return -1; + if (memcmp(key->name, szwKeyName, sizeof szwKeyName) ) + return -1; + + /* construct the name for this drive */ + szName[0] = key->name[len-1]; + szName[1] = ':'; + szName[2] = 0; + + /* find the Path= entry in the registry key */ + val = find_value(key, szwPath, &index); + if(!val) + return -1; + + obj = get_dir(val->data, val->len/sizeof (WCHAR)); + if(!obj) + return -1; + + add_child_node(dosdev, obj, szName, 2); + + release_object(obj); + + return 0; +} + +/* create and fill the DosDevices node */ + +static struct object* get_dosdevs(void) +{ + struct vdir *dosdevs = alloc_object(&vdir_ops, -1); + struct key *keylm, *key; + int i; + + if(!dosdevs) + return NULL; + + dosdevs->children = NULL; + dosdevs->names = NULL; + dosdevs->count = 0; + + keylm = get_hkey_obj(HKEY_LOCAL_MACHINE, KEY_ALL_ACCESS); + if(!keylm) + goto end; + + key = open_key(keylm, szwProfile); + release_object(keylm); + if(!key) + goto end; + + /* FIXME : we should change [Drive X] to \\Drive\\X */ + for(i=0; i<key->last_subkey; i++) + create_drive(dosdevs, key->subkeys[i]); + + release_object(key); + + return &dosdevs->obj; +end: + release_object(dosdevs); + return NULL; +} + +/* create the root object of the NT filesystem */ + +struct object* get_ntroot(void) +{ + struct vdir *root; + struct object *dosdevs = get_dosdevs(); + + if(!dosdevs) + return NULL; + + root = alloc_object(&vdir_ops, -1); + if(!root) + { + release_object(dosdevs); + return NULL; + } + root->children = NULL; + root->names = NULL; + root->count = 0; + + add_child_node(root, dosdevs, szwDosDev, -1); + release_object(dosdevs); + + return (struct object *)root; +} + --- /dev/null Mon Jul 18 08:46:18 1994 +++ server/dir.c Mon Jun 17 09:29:51 2002 @@ -0,0 +1,283 @@ +/* + * Server-side directory management + * + * Copyright (C) 1998 Alexandre Julliard + * Copyright (C) 2002 Mike McCormack + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <assert.h> +#include <fcntl.h> +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <errno.h> +#ifdef HAVE_SYS_ERRNO_H +#include <sys/errno.h> +#endif +#include <sys/stat.h> +#include <sys/time.h> +#include <sys/types.h> +#include <time.h> +#include <unistd.h> +#include <utime.h> + +#include "winerror.h" +#include "winbase.h" + +#include "handle.h" +#include "thread.h" +#include "request.h" +#include "unicode.h" + +#include "winnt.h" + +struct entry +{ + struct stat st; + int len; + WCHAR name[1]; +}; + +struct dir +{ + struct object obj; /* object header */ + WCHAR *name; /* file name */ + int drive_type; /* type of drive the file is on */ + int count; + struct entry **children; +}; + +static void dir_dump( struct object *obj, int verbose ); +static void dir_destroy( struct object *obj ); +static int dir_enumerate(struct object *obj, unsigned int index, WCHAR **name, int *len); +static int dir_get_child( struct object *obj, const WCHAR *nameptr, size_t len, unsigned int access, + unsigned int sharing, int create, unsigned int attrs, struct object **); + + +static const struct object_ops dir_ops = +{ + sizeof(struct dir), /* size */ + dir_dump, /* dump */ + no_add_queue, /* add_queue */ + NULL, /* remove_queue */ + NULL, /* signaled */ + NULL, /* satisfied */ + NULL, /* get_poll_events */ + NULL, /* poll_event */ + no_get_fd, /* get_fd */ + no_flush, /* flush */ + no_get_file_info, /* get_file_info */ + NULL, /* queue_async */ + dir_enumerate, /* enumerate */ + dir_get_child, /* get_child_handle */ + dir_destroy /* destroy */ +}; + +static void dir_dump( struct object *obj, int verbose ) +{ + struct dir *dir = (struct dir *) obj; + + assert(obj->ops = &dir_ops); + fprintf(stderr,"dump: "); + dump_strW(dir->name,strlenW(dir->name),stderr,"[]"); + fprintf(stderr,", %d entries\n",dir->count); +} + +static void dir_destroy( struct object *obj ) +{ + struct dir *dir = (struct dir *) obj; + int i; + + assert(obj->ops = &dir_ops); + + for(i=0; i<dir->count; i++) + free(dir->children[i]); + free(dir->children); + free(dir->name); +} + +static int find_entry(struct dir *dir, const WCHAR *name, int len) +{ + int i; + + /* check for duplicate case insensitive entries */ + for(i=0; i<dir->count; i++) + { + if( len != dir->children[i]->len) + continue; + if( strcasecmpnW(name, dir->children[i]->name, len)) + continue; + return i; + } + return -1; +} + +static int dir_enumerate(struct object *obj, unsigned int index, WCHAR **name, int *len) +{ + struct dir *dir = (struct dir *) obj; + + assert(obj->ops = &dir_ops); + + if(index >= dir->count) + return STATUS_NO_MORE_FILES; + + /* FIXME: check the filesystem hasn't changed in the meantime */ + + *name = dir->children[index]->name; + *len = dir->children[index]->len; + + return STATUS_SUCCESS; +} + +static int dir_get_child( struct object *obj, const WCHAR *name, size_t len, unsigned int access, + unsigned int sharing, int create, unsigned int attrs, struct object **object) +{ + int size, x, n; + WCHAR full_name[MAX_PATH]; + struct dir *dir = (struct dir*) obj; + + assert(obj->ops == &dir_ops); + + /* x is the length of the first section of the pathname */ + for(x=0; x<len; x++) + if(name[x]=='\\') + break; + + n = find_entry(dir, name, x); + if(n<0) + return STATUS_OBJECT_NAME_NOT_FOUND; + + strcpyW(full_name, dir->name); + size = strlenW(full_name); + if(full_name[size-1]!='/') + { + full_name[size++]='/'; + full_name[size]=0; + } + + memcpy(&full_name[size], dir->children[n]->name, len*sizeof(WCHAR)); + size += len; + full_name[size] = 0; + + if(name[x]=='\\') + x++; + + if(S_ISDIR(dir->children[n]->st.st_mode)) + { + struct object *next = get_dir(full_name, size); + int r; + + r = next->ops->open_child( next, name+x, len-x, access, + sharing, create, attrs, object); + release_object(next); + return r; + } + else + { + *object = create_file( full_name, size, access, sharing, create, attrs, 0); + + if(*object) + return STATUS_SUCCESS; + } + + return STATUS_OBJECT_NAME_NOT_FOUND; +} + +int add_entry(struct dir *dir, WCHAR *name, int len) +{ + struct entry *ent = malloc(sizeof (struct entry) + len * sizeof(WCHAR)); + WCHAR path[MAX_PATH]; + int sz; + + if(0<=find_entry(dir, name, len)) + goto err; + + sz = strlenW(dir->name); + strcpyW(path, dir->name); + if(path[sz-1]!='/') + { + path[sz++]='/'; + path[sz]=0; + } + memcpy(&path[sz], name, len*sizeof (WCHAR)); + path[sz+len] = 0; + + if(0>statw(path, &ent->st)) + goto err; + memcpy(ent->name, name, len*sizeof (WCHAR)); + ent->len = len; + + /* reallocate the array */ + dir->children = realloc(dir->children, (dir->count+1)*sizeof(struct entry*)); + if(!dir->children) + { + fprintf(stderr,"empty\n"); + goto err; + } + dir->children[dir->count++] = ent; + + return 0; +err: + free(ent); + return -1; +} + +struct object* create_dir(WCHAR *path, int len) +{ + DIR *d = opendirw(path); + struct dir *dir; + + if(!d) + return NULL; + + dir = alloc_object(&dir_ops, -1); + if(!dir) + return NULL; + + dir->name = (WCHAR*) malloc(len*sizeof(WCHAR)); + memcpy(dir->name, path, len*sizeof(WCHAR)); + dir->drive_type = 0; + dir->count = 0; + dir->children = NULL; + + while(1) + { + struct direntw *de = readdirw(d); + if(!de) + break; + if( (de->d_name[0]=='.') && (de->d_name[1]==0) ) + continue; + if( (de->d_name[0]=='.') && (de->d_name[1]=='.') && (de->d_name[2]==0) ) + continue; + + add_entry(dir, de->d_name, strlenW(de->d_name)); + } + closedir(d); + + return &dir->obj; +} + +struct object* get_dir(WCHAR *path, int len) +{ + /* FIXME: need to create a hash of cached directory entries here + perhaps this can go in with the existing file hash? */ + + return create_dir(path, len); +} --- /dev/null Mon Jul 18 08:46:18 1994 +++ server/registry.h Wed Jun 12 04:48:44 2002 @@ -0,0 +1,53 @@ + +#ifndef SERVER_REGISTRY_H +#define SERVER_REGISTRY_H + +/* a registry key */ +struct key +{ + struct object obj; /* object header */ + WCHAR *name; /* key name */ + WCHAR *class; /* key class */ + struct key *parent; /* parent key */ + int last_subkey; /* last in use subkey */ + int nb_subkeys; /* count of allocated subkeys */ + struct key **subkeys; /* subkeys array */ + int last_value; /* last in use value */ + int nb_values; /* count of allocated values in array */ + struct key_value *values; /* values array */ + short flags; /* flags */ + short level; /* saving level */ + time_t modif; /* last modification time */ +}; + +/* key flags */ +#define KEY_VOLATILE 0x0001 /* key is volatile (not saved to disk) */ +#define KEY_DELETED 0x0002 /* key has been deleted */ +#define KEY_ROOT 0x0004 /* key is a root key */ + +/* a key value */ +struct key_value +{ + WCHAR *name; /* value name */ + int type; /* value type */ + size_t len; /* value data length in bytes */ + void *data; /* pointer to value data */ +}; + +#define MIN_SUBKEYS 8 /* min. number of allocated subkeys per key */ +#define MIN_VALUES 8 /* min. number of allocated values per key */ + + +/* the special root keys */ +#define HKEY_SPECIAL_ROOT_FIRST HKEY_CLASSES_ROOT +#define HKEY_SPECIAL_ROOT_LAST HKEY_DYN_DATA +#define NB_SPECIAL_ROOT_KEYS (HKEY_SPECIAL_ROOT_LAST - HKEY_SPECIAL_ROOT_FIRST + 1) +#define IS_SPECIAL_ROOT_HKEY(h) (((unsigned int)(h) >= HKEY_SPECIAL_ROOT_FIRST) && \ + ((unsigned int)(h) <= HKEY_SPECIAL_ROOT_LAST)) + +struct key *get_hkey_obj( obj_handle_t hkey, unsigned int access ); +struct key_value *find_value( const struct key *key, const WCHAR *name, int *index ); +struct key *open_key( struct key *key, WCHAR *name ); + +#endif /* SERVER_REGISTRY_H */ +

1 0

Re: Accept lphc == NULL in listboxes
by Tony Lambregts 16 Jun '02

16 Jun '02

Uwe Bonnes wrote: >Changelog: > controls/listbox.c: LISTBOX_HandleLButtonDownCombo/ > ComboLBWndProc_common > Accept lphc == NULL in more places > >This makes the properities list boxes in Xilinx Webpack work. As there are >other places where lphc == NULL is handled, it shouldn't be the wrong way. >The application was somehow unwilling to get debugged. Running the suite >from the commandline, it entered the debugger and looped endless. Running it >with winedbg, the loader hanged. Only with some application ("tkstartwdog >-C", also know as a problem causer in other EDA applications) of the >toolchain as a separate process and starting the target process ("_pn.exe -C >WebPACK4.2 -U MTOC.chm") in the debugger showed up the problem. Running the >target process in a normal wine process made the application catch the >exeption, show up a messagebox about that and crash in another place. > >Bye > > Not to be a PITA but there is no patch... Tony Lambregts

1 0

replacements for DAO/MSHTML/MSXML
by juergen.schmied＠debitel.net 16 Jun '02

16 Jun '02

Hi! I'm currently looking for a replacement of this components to port a application to linux. Has anybody already had this problems and how did you solve it? How big are the nessesary changes? Are there components usable for both operating systems with similar functions? ------ PS: I found the Mozilla Active X control at http://www.iol.ie/~locka/mozilla/mozilla.htm it should be binary compatible. Couldn't we use it for implementing shdocvw ??? ------ Thanks Juergen

2 1

Mingw Wine port bug
by Steven Edwards 15 Jun '02

15 Jun '02

I'm getting multiple definintion errors when building certain parts of wine under mingw. Anyone have a idea for the solution? Building Comdlg32.dll - ../../ole/libwine_uuid.a(uuid.o)(.text+0x9c0):uuid.c: multiple definition of `CL SID_ShellDesktop' D:/mingw/bin/../lib/gcc-lib/mingw32/2.95.3-7/../../../libshell32.a(shell32.o)(.t ext+0x0)://d/src/mingw/w32api/lib/shell32.c: first defined here ../../ole/libwine_uuid.a(uuid.o)(.text+0x9d0):uuid.c: multiple definition of `CL SID_ShellLink' D:/mingw/bin/../lib/gcc-lib/mingw32/2.95.3-7/../../../libshell32.a(shell32.o)(.t ext+0x10)://d/src/mingw/w32api/lib/shell32.c: first defined here ../../ole/libwine_uuid.a(uuid.o)(.text+0xa30):uuid.c: multiple definition of `FM TID_Intshcut' D:/mingw/bin/../lib/gcc-lib/mingw32/2.95.3-7/../../../libshell32.a(shell32.o)(.t ext+0x20)://d/src/mingw/w32api/lib/shell32.c: first defined here ../../ole/libwine_uuid.a(uuid.o)(.text+0xa40):uuid.c: multiple definition of `FM TID_InternetSite' D:/mingw/bin/../lib/gcc-lib/mingw32/2.95.3-7/../../../libshell32.a(shell32.o)(.t ext+0x30)://d/src/mingw/w32api/lib/shell32.c: first defined here ../../ole/libwine_uuid.a(uuid.o)(.text+0xa50):uuid.c: multiple definition of `CG ID_Explorer' D:/mingw/bin/../lib/gcc-lib/mingw32/2.95.3-7/../../../libshell32.a(shell32.o)(.t ext+0x40)://d/src/mingw/w32api/lib/shell32.c: first defined here ../../ole/libwine_uuid.a(uuid.o)(.text+0xa60):uuid.c: multiple definition of `CG ID_ShellDocView' D:/mingw/bin/../lib/gcc-lib/mingw32/2.95.3-7/../../../libshell32.a(shell32.o)(.t ext+0x50)://d/src/mingw/w32api/lib/shell32.c: first defined here ../../ole/libwine_uuid.a(uuid.o)(.text+0xa90):uuid.c: multiple definition of `II D_INewShortcutHookA' __________________________________________________ Do You Yahoo!? Yahoo! - Official partner of 2002 FIFA World Cup http://fifaworldcup.yahoo.com

2 2

arts driver problems
by Rizsanyi Zsolt 15 Jun '02

15 Jun '02

Hi! I'm trying to set up wine to use arts for audio output. So I have uncommented from the config file the "Drivers" = "winearts.drv" line. But when an application tries to open the sound device, it hangs. I have put various trace messages in the winearts driver, and seen that when wine calls arts_init that function never returns. It's not an arts configuration problem because MPlayer runs perfectly with the arts audio output. But I have checked the source of MPlayer, and the arts code there seems basically the same. Have anybody experienced something like this? Or has any idea about this? Thanks Zsolt Rizsanyi

2 1

Re: Old unicode standard
by David.Goodenough＠DGA.co.uk 15 Jun '02

15 Jun '02

Well volume 1 of the 1.0 version has an entire appendix, 11 pages in all. Volume 2 of 1.0 does not seem to have anything on directionality (as 1.0 names it). 2.0 has 10 pages at the end of chapter 3 on Bi-Directional behavior. Typing all this lot up could take a while, and our scanner is broken at the moment (its my wife's, and I must encourage her to go get it fixed as its warrantee will run out soon if she does not get a move on). David Shachar Shemesh <wine-devel(a)sun.consum To: andi(a)rhlx01.fht-esslingen.de, David.Goodenough(a)dga.co.uk er.org.il> cc: Wine Devel <wine-devel(a)winehq.com> Subject: Re: Old unicode standard 06/15/02 10:35 AM Andreas Mohr wrote: >Hmm, which approximate time frame is this ? >1998 ? 94 ? 89 ? :-) > > > I'm talking about the 1991-2 time frame. I believe this makes it ~Unicode 1.0. A later version could come in handy as well. See later on. David.Goodenough(a)dga.co.uk wrote: >Shachar, > >I have the version 1.0 and 2.0 books, what exactly do you want to know? In >wha?t form would you like the information > >David > > I am interested in the BiDi algorythm as defined by these standards. Any format that you can send me is fine. If you would just like to summarize the algorythm, that would be great, but I'm afraid that would amount to huge amounts of work. LIke I said - I would have used the online library, only it doesn't go back that much. It seems from the information MS released in the MSDN that they are using Version 1.0 of the BiDi algorythm. This goes a great way in understanding why their reordering is so crummy. That leaves us the question of what do we do now. MS defines only 12 BiDi types. These are not enough to implement the 3.0 BiDi algorythm. I don't know whether the types defined are compatible with the 2.0 algorythm. There is also the question of whether we want to support MS's bugs, in addition to their features. What version I need depends on what's in the 2.0 standard. If the algorythm there depends on the same 12 types MS defined, I'm leaning torwards implementing that. If it requires further types (as the 3.0 algorythm does), I think I'll go with the 1.0 standard. We may add a special command line feature, available only if a library such as freebidi is available, that will send the strings to an outside library for reordering, which will give us 3.0 support for very little extra work (with performance penalties). Shachar

1 0

WM_GETTEXTLENGTH returns double size
by Andriy Palamarchuk 15 Jun '02

15 Jun '02

This happens in code which unmaps message, mapped from ASCII to Unicode. See windows/winproc.c, function WINPROC_UnmapMsg32ATo32W: case WM_GETTEXTLENGTH: case CB_GETLBTEXTLEN: case LB_GETTEXTLEN: /* there may be one DBCS char for each Unicode char */ return result * 2; What is the correct way to handle double-byte characters in this situation? How Windows handles this? At least can we return double values when system metrics SM_DBCSENABLED is true? We could have a switch in the config file for this system metrics. I came across this issue when used default combo box control implementation in Delphi 6. I assume the same issue also exists for edit controls. The returned length is correct if I comment out the code above. Existing behavior is a possible cause of bug in entering serial numbers - when cursor jumps to the next edit field when only half of text is entered. Thanks, Andriy __________________________________________________ Do You Yahoo!? Yahoo! - Official partner of 2002 FIFA World Cup http://fifaworldcup.yahoo.com

3 18

Old unicode standard
by Shachar Shemesh 15 Jun '02

15 Jun '02

Hi all, I am trying to find any references to the old unicode standard. In particular, I need the Bidirectional algorythm used with ~unicode 1.0. If anyone can help, it would be greatly apretiated. If you don't have the 1.0 standard, but do have a later standard (but not 3.0, which is what is available on the unicode web site), that would probably be a great help too. Shachar

3 3

please report this (quicken error)
by Shane Shields 15 Jun '02

15 Jun '02

hi all ive been lurking for a while and reading some very lively discussions but thats off topic. the reason ive come out of my hole is the following messages. just being a good (?) citizen. let me know what other information you need and how i can collect it. regards shane locutus:/mnt/hdc/c/QUICKENW$ wine qw fixme:keyboard:X11DRV_KEYBOARD_DetectLayout Your keyboard layout was not found! Using closest match instead (Turkish keyboard layout) for scancode mapping. Please define your layout in windows/x11drv/keyboard.c and submit them to us for inclusion into future Wine releases. See the Wine User Guide, chapter "Keyboard" for more information. err:clipping:CLIPPING_UpdateGCRegion DC is dirty. Please report this. err:clipping:CLIPPING_UpdateGCRegion DC is dirty. Please report this. err:clipping:CLIPPING_UpdateGCRegion DC is dirty. Please report this. err:clipping:CLIPPING_UpdateGCRegion DC is dirty. Please report this. err:clipping:CLIPPING_UpdateGCRegion DC is dirty. Please report this. err:clipping:CLIPPING_UpdateGCRegion DC is dirty. Please report this. err:clipping:CLIPPING_UpdateGCRegion DC is dirty. Please report this. err:clipping:CLIPPING_UpdateGCRegion DC is dirty. Please report this. err:clipping:CLIPPING_UpdateGCRegion DC is dirty. Please report this. err:clipping:CLIPPING_UpdateGCRegion DC is dirty. Please report this. err:clipping:CLIPPING_UpdateGCRegion DC is dirty. Please report this. err:clipping:CLIPPING_UpdateGCRegion DC is dirty. Please report this. err:clipping:CLIPPING_UpdateGCRegion DC is dirty. Please report this. err:clipping:CLIPPING_UpdateGCRegion DC is dirty. Please report this. err:win:WinHelpA can't start winhlp32.exe -x ? locutus:/mnt/hdc/c/QUICKENW$ -- To drink the WINE of success you must first seek the sayings of source Anyone sending unwanted advertising e-mail to this address will be charged $25 for network traffic and computing time. By extracting my address from this message or its header, you agree to these terms.

1 0

Re: Old unicode standard
by David.Goodenough＠DGA.co.uk 14 Jun '02

14 Jun '02

Shachar, I have the version 1.0 and 2.0 books, what exactly do you want to know? In wha?t form would you like the information David Shachar Shemesh <wine-devel(a)sun.consum To: Wine Devel <wine-devel(a)winehq.com> er.org.il> cc: Sent by: Subject: Old unicode standard wine-devel-admin@wineh q.com 06/14/02 01:04 PM Hi all, I am trying to find any references to the old unicode standard. In particular, I need the Bidirectional algorythm used with ~unicode 1.0. If anyone can help, it would be greatly apretiated. If you don't have the 1.0 standard, but do have a later standard (but not 3.0, which is what is available on the unicode web site), that would probably be a great help too. Shachar

1 0

Taking a step back :(
by Dustin Navea 14 Jun '02

14 Jun '02

sigh, hey guys i have some bad news, but no too bad... due to me having to work 6 if not 7 days a week now and the school being closed for the summer, i am going to have to take a step back from wine development for a few months... i just don't have the time, energy, or chance to be on the computer (let alone the internet) as much as i used to, and so my inbox is getting packed... but i will be back when 1 of 2 things happens... 1) i get internet at my house (hopefully in the next couple of months) or 2) the school opens again for the fall semester... either way, i will be back though, sorry it has to be like this, but thats the way it goes sometimes.... so, TTFN -Dustin P.S. I will still be monitoring wine-announce and wine-cvs, but im removing myself from devel, bugs, and patches...jeremy, please don't drop my bugzliia priveleges ;) thanks guys... __________________________________________________ Do You Yahoo!? Yahoo! - Official partner of 2002 FIFA World Cup http://fifaworldcup.yahoo.com

1 0

winedbg debugging
by Ann and Jason Edmeades 14 Jun '02

14 Jun '02

I am using winedbg and find it really annoying the 'display' option. I put a break point in a routine and use display varName to ensure I can see the variable everytime we hit the breakpoint. This works nicely until the program happens upon a RaiseException, and this variable is no longer in scope. This traps and goes into gdb. I quit gbd, wine traps again and invokes gdb until I end up using killall wine to proceed. Is there any way to avoid this or at leat put and exception handler around the display handling? Jason PS Why dont the up/down arrows work to recall commands? PgUp/PgDn do!

2 1

Re: PATCH - twain.h
by Francois Gouget 14 Jun '02

14 Jun '02

On Fri, 14 Jun 2002, Steven Edwards wrote: > I dont know if this is proper or not but mingw already > defines WIN32 _WIN32 and __declspec(spec) > > Changelog: Fix Warnings > > cvs diff -u twain.h > Index: twain.h > =================================================================== > RCS file: /home/wine/wine/dlls/twain/twain.h,v > retrieving revision 1.3 > diff -u -r1.3 twain.h > --- twain.h 31 May 2002 23:40:53 -0000 1.3 > +++ twain.h 14 Jun 2002 10:42:57 -0000 > @@ -56,9 +56,11 @@ > > #define FAR > #define huge > +#ifndef __MINGW__ > #define WIN32 > #define _WIN32 > #define __declspec(spec) > +#endif I don't think the twain.h header should define any of these macros, including FAR and huge. The main issue is that _WIN32 is normally defined by the compiler. As an alternative we could define it in one of the Wine headers, but why define _WIN32 rather than _WIN64? Maybe we could add the following in basestd.h: #if !defined(_WIN32) && !defined(_WIN64) #define _WIN32 #endif WIN32 is not normally defined by the compiler but it is part of the default set of macros defined my Visual C++ project. So maybe we should add: #ifdef _WIN32 #define WIN32 #endif Does anyone else care to comment on the above? Then * FAR is defined in winnt.h so there is no need to redefine it * __declspec is defined in winnt.h too * huge will not be needed if WIN32 is defined -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Linux: Because rebooting is for adding new hardware

2 1

Problems running IE with latest release
by Con Hennessy 14 Jun '02

14 Jun '02

Hi, I am trying to run IE version 4 ( I think ) however I am getting "unhandled exceptions". When I use the following command "wine --dll commctrl,comctl32=n iexplore.exe" I get : err:heap:HEAP_CreateSystemHeap system heap base address 0x65430000 not available err:font:AddFontFileToList Unable to load font file "/mnt/windows/windows/fonts/desktop.ini" err = 55 err:font:AddFontFileToList Unable to load font file "/mnt/windows/windows/fonts/modern.fon" err = 2 wine: Unhandled exception, starting debugger... err:seh:EXC_DefaultHandling Unhandled exception code c0000005 flags 0 addr 0x1581e3e4 I also tried to use : wine --dll shell,shell32,commctrl,comctl32=n --dll kernel32,netbios,netapi32,user32=b iexplore.exe but with the same results. I know how to turn tracing on, but am not sure what exactly is the problem. I've had a go at turning on the traces and got the following : 0807a828:Ret kernel32.CloseHandle() retval=00000001 ret=16013d94 0807a828:Call kernel32.OpenEventA(001f0003,00000000,16013e30 "HookSwitchHookEnabledEvent") ret=16013dbd 0807a828: open_event( access=001f0003, inherit=0, name=L"HookSwitchHookEnabledEvent" ) 0807a828: open_event() = OBJECT_NAME_NOT_FOUND { handle=0 } 0807a828:Ret kernel32.OpenEventA() retval=00000000 ret=16013dbd 0807a828:Call kernel32.TlsAlloc() ret=16013e03 0807a828:Ret kernel32.TlsAlloc() retval=00000002 ret=16013e03 0807a828:Ret PE DLL (proc=0x16013bbe,module=16012000,type=1,res=(nil)) retval=1 0807a828:trace:module:MODULE_InitDLL (0x159036b4,PROCESS_ATTACH,(nil)) - RETURN 1 0807a828:trace:module:MODULE_DllProcessAttach (ole32.dll,(nil)) - END 0807a828:trace:module:MODULE_InitDLL (shdocvw.dll,PROCESS_ATTACH,(nil)) - CALL 0807a828:trace:module:MODULE_InitDLL (0x1590349c,PROCESS_ATTACH,(nil)) - RETURN 1 0807a828:trace:module:MODULE_DllProcessAttach (shdocvw.dll,(nil)) - END 0807a828:Ret kernel32.LoadLibraryA() retval=16006000 ret=00401328 0807a828:Call kernel32.GetProcAddress(16006000,00000068) ret=00401346 0807a828:trace:win32:MODULE_GetProcAddress (16006000,0x68) 0807a828:trace:win32:PE_FindExportedFunction (104) 0807a828:Ret kernel32.GetProcAddress() retval=160070fc ret=00401346 0807a828:Call ntdll.RtlRaiseException(15b26d80) ret=16007059 0807a828:trace:seh:EXC_RtlRaiseException code=80000100 flags=1 addr=0x401726 0807a828:trace:seh:EXC_RtlRaiseException info[0]=1600da80 0807a828:trace:seh:EXC_RtlRaiseException info[1]=1600da94 0807a828:trace:seh:EXC_RtlRaiseException stub=104 0807a828: queue_exception_event( first=1, record={context={flags=00010007,eax=15b26d78,ebx=156885c4,ecx=1569f6e5,edx=15b26d80,esi=15651564,edi=00000001,ebp=15b26ce0,eip=15636943,esp=15b26cc4,eflags=00200212,cs=0023,ds=002b,es=002b,fs=008f,gs=0000,dr0=158c58c4,dr1=1569f6b1,dr2=1581600d,dr3=158c58c4,dr6=1569f6b1,dr7=158c58c4,float={1569f6a8,15816ff5,1581600d,15b269c0,15816ff5,15b269f0,1581600d,158c58c4,1569f6d5,158c58c4,15b269f0,15b26ad0,158122f4,15b269e8,15816ff5,15b26a18,1569f6d5,1569faa7,00000000,158c58c4,34303118,15b26af8,158122f4,15b26a18,15669fb0,15b26b88,158122e3,15b26a18}},rec={code=80000100,flags=1,rec=(nil),addr=0x401726,params={1600da80,1600da94}} ) 0807a828: queue_exception_event() = 0 { handle=0 } 0807a828:trace:seh:EXC_CallHandler calling handler at 0x15651b64 code=80000100 flags=1 0807a828: queue_exception_event( first=0, record={context={flags=00010007,eax=15b26d78,ebx=156885c4,ecx=1569f6e5,edx=15b26d80,esi=15651564,edi=00000001,ebp=15b26ce0,eip=15636943,esp=15b26cc4,eflags=00200212,cs=0023,ds=002b,es=002b,fs=008f,gs=0000,dr0=158c58c4,dr1=1569f6b1,dr2=1581600d,dr3=158c58c4,dr6=1569f6b1,dr7=158c58c4,float={1569f6a8,15816ff5,1581600d,15b269c0,15816ff5,15b269f0,1581600d,158c58c4,1569f6d5,158c58c4,15b269f0,15b26ad0,158122f4,15b269e8,15816ff5,15b26a18,1569f6d5,1569faa7,00000000,158c58c4,34303118,15b26af8,158122f4,15b26a18,15669fb0,15b26b88,158122e3,15b26a18}},rec={code=80000100,flags=1,rec=(nil),addr=0x401726,params={1600da80,1600da94}} ) 0807a828: queue_exception_event() = 0 { handle=0 } 0807a828: create_event( manual_reset=1, initial_state=0, inherit=1, name=L"" ) 0807a828: create_event() = 0 { handle=56 } wine: Unhandled exception, starting debugger... 0807a828:trace:heap:RtlAllocateHeap (158d0000,00000002,0000006c): returning 15902fa0 0807a828:trace:reg:NtOpenKey (0x80000002,L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug\0000\5555\008d\0000\5246\4545\3554\1590`\158d\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa\aaaa"...,f003f,0x15b2680c) 0807a828: open_key( parent=-2147483646, access=000f003f, name=L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug" ) Open key ERROR 0807a828: open_key() = OBJECT_NAME_NOT_FOUND { hkey=0 } 0807a828:trace:reg:NtOpenKey <- 0x0000 0807a828:trace:heap:RtlFreeHeap (158d0000,00000002,15902fa0): returning TRUE 0807a828:trace:seh:EXC_RtlRaiseException code=c0000005 flags=0 addr=0x1581e3e4 0807a828:trace:seh:EXC_RtlRaiseException info[0]=00000001 0807a828:trace:seh:EXC_RtlRaiseException info[1]=00000000 0807a828: queue_exception_event( first=1, record={context={flags=00000000,eax=ea985977,ebx=156885c4,ecx=ea98593f,edx=1567a6c1,esi=00000000,edi=15b26964,ebp=15b26668,eip=1581e3e4,esp=15b26664,eflags=00210203,cs=0023,ds=002b,es=002b,fs=008f,gs=0000,dr0=00000000,dr1=00000000,dr2=00000000,dr3=00000000,dr6=00000000,dr7=00000000,float={00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000}},rec={code=c0000005,flags=0,rec=(nil),addr=0x1581e3e4,params={1,0}} ) 0807a828: queue_exception_event() = 0 { handle=0 } 0807a828:trace:seh:EXC_CallHandler calling handler at 0x15651120 code=c0000005 flags=0 0807a828:trace:seh:EXC_CallHandler handler returned 2 0807a828:trace:seh:EXC_CallHandler calling handler at 0x15651b64 code=c0000005 flags=10 0807a828:trace:seh:EXC_CallHandler handler returned 1 0807a828: queue_exception_event( first=0, record={context={flags=00000000,eax=ea985977,ebx=156885c4,ecx=ea98593f,edx=1567a6c1,esi=00000000,edi=15b26964,ebp=15b26668,eip=1581e3e4,esp=15b26664,eflags=00210203,cs=0023,ds=002b,es=002b,fs=008f,gs=0000,dr0=00000000,dr1=00000000,dr2=00000000,dr3=00000000,dr6=00000000,dr7=00000000,float={00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000,00000000}},rec={code=c0000005,flags=0,rec=(nil),addr=0x1581e3e4,params={1,0}} ) 0807a828: queue_exception_event() = 0 { handle=0 } 0807a828:err:seh:EXC_DefaultHandling Unhandled exception code c0000005 flags 0 addr 0x1581e3e4 0807a828: terminate_process( handle=-1, exit_code=1 ) 0807a828: terminate_process() = 0 { self=1 } 0807a828: *killed* exit_code=1 yamed@plato:~/kde_> /home/yamed/.wine/user.reg: saving key \\User\\yamed /home/yamed/.wine/system.reg: saving key \\Machine /home/yamed/.wine/userdef.reg: saving key \\User\\.Default Server: exiting (pid=23764) Anyone able to help, or make any suggestion ? Thanks, CP

4 7

Re: wine/dlls/winsock socket.c ws2_32.spec
by Martin Wilck 14 Jun '02

14 Jun '02

> - hackish implementation of WSADuplicateSocket. + DuplicateHandle(GetCurrentProcess(), s, + hProcess, (LPHANDLE)&lpProtocolInfo->dwCatalogEntryId, + 0, FALSE, DUPLICATE_SAME_ACCESS); + CloseHandle(hProcess); + lpProtocolInfo->dwServiceFlags4 = 0xff00ff00; /* magic */ The Winsock SPI docs say that service providers should use the lpProtocolInfo->dwProviderReserved field. I recommend that that be used in Wine, too. Also, I don't think you need the "magic" field - simply test if dwProviderReserved is a valid handle. Martin -- Martin Wilck Phone: +49 5251 8 15113 Fujitsu Siemens Computers Fax: +49 5251 8 20409 Heinz-Nixdorf-Ring 1 mailto:Martin.Wilck@Fujitsu-Siemens.com D-33106 Paderborn http://www.fujitsu-siemens.com/primergy

1 0

problem with mixed data/audio
by Michal Seliga 14 Jun '02

14 Jun '02

I found one problem with mixed CD's.Started with no music in one game, but later I found that using windows cdplayer audio CD's play right with wine but when first track is data whole CD is unplayable. I think I tracked down the problem to functions in dlls/winmm/mcicda/mcicda.c (?) and /dlls/ntdll/cdrom.c I want to try to find fix myself (I feel it is time to start to work on something), but if anyone thinks it is cleanly his playground I will provide as much info as I can get... So let me know if I should start to try to understand wine code or if I should let it be... Until now I spent about one-two hours on it si I made no real progess (I only learn how it works...) problem is that it calculates bad frames for first datatrack (it thinks it has more then 66 minutes, which is about 3x more then it really has.... dagrab shows that first track uses frames 150..99xxx and wine writes to its log 150...288xxx. After this it cannot find next track and in log I see 'device doesn't play' or does someone work on it already? I searched bugzilla but found nothing... so bye for now... (some filenames, numbers and messages are from my bad memory but I guess you know what's going on ;-)

2 1

Merge rpcrt/ole32 from Rewind
by juergen.schmied＠debitel.net 14 Jun '02

14 Jun '02

Hi! I started to merge this files in. This patches are done to a loder wine version so it does not merge in a clean way. Some code is allready implemented twice. So I do: - merge as far as I can - if a function is implemented twice I comment one implementation out but leave the code in (mainly the standard marshaler parts). I can't decide how to merge it. - the final cleanup should be done by the ones who are familiar with that code (Marcus?) - any objections against the rpcrt4 stuff? Ove himself says its not very clean but we dont have any better code yet. Is this OK? juergen

3 2

ole help please! invoke fn issue
by Ann and Jason Edmeades 14 Jun '02

14 Jun '02

Hi all, Playing further with my VB program and native oleaut32 I've hit an 'interesting issue' with the Microsoft Date/Time picker. typelib.c in dlls\oleaut32 assumes all parms are dwords and picks the lval of a variant (which for most of the types of variant is the dword containing the important information). However as shown by the following trace: trace:ole:ITypeInfo_fnInvoke (0x404560ac)(0x40418fac,id=20,flags=0x00000004,0x405c5d84,(nil),0x405c5d64,0 x405c5d94) partial stub! trace:ole:dump_DispParms args=1 named args=1 trace:ole:dump_Variant (0x405c5dec) trace:ole:dump_Variant VARTYPE: VT_DATE trace:ole:dump_Variant (?)-882854389 L"Value"(1) parm0: L"\00e5MSComCtl2WWW" memid is 00000014 Param 0: tdesc.vartype 12 (VT_VARIANT) u.parmadesc.flags 1 u.parmadesc.lpex (nil) funckind: 1 (pure virtual) invkind: 4 (property put) callconv: 4 (stdcall) oVft: 224 cParamsOpt: 0 wFlags: 3c helpstring: L"Returns/sets the current date." entry: (null) 08072560:Call ntdll.RtlAllocateHeap(40370000,00000000,00000008) ret=408bfcc3 08072560:Ret ntdll.RtlAllocateHeap() retval=4041a160 ret=408bfcc3 08072560:Call ntdll.RtlAllocateHeap(40370000,00000008,00000004) ret=408bfce4 08072560:Ret ntdll.RtlAllocateHeap() retval=4041a180 ret=408bfce4 trace:ole:ITypeInfo_fnInvoke set 0 to disparg type 7 vs 12 This shows that the function takes one parm and that parm is a variant. We pass the value contained in the parm and it fails. We need to ensure the whole variant is put on the stack for the called function. Since we currently only call with dword parms this wont work. I have managed to get further by a dirty hack: DWORD numArgWords = 0; args[0] = (DWORD)pIUnk; for (i=0;i<pFDesc->funcdesc.cParams;i++) { if (i<pDispParams->cArgs) { TRACE("set %d to disparg type %d vs %d\n",i, V_VT(&pDispParams->rgvarg[pDispParams->cArgs-i-1]), pFDesc->funcdesc.lprgelemdescParam[i].tdesc.vt ); if (pFDesc->funcdesc.lprgelemdescParam[i].tdesc.vt != VT_VARIANT) { args[i+1] = V_UNION(&pDispParams->rgvarg[pDispParams->cArgs-i-1],lVal); numArgWords = numArgWords+1; } else { TRACE("Faking variant on stack as more args \n"); memcpy(&args[i+1], &pDispParams->rgvarg[pDispParams->cArgs-i-1], sizeof(VARIANT)); numArgWords = numArgWords + sizeof(VARIANT)/4; } } else { TYPEDESC *tdesc = &(pFDesc->funcdesc.lprgelemdescParam[i].tdesc); TRACE("set %d to pointer for get (type is %d)\n",i,tdesc->vt); /*FIXME: give pointers for the rest, so propertyget works*/ args[i+1] = (DWORD)&args2[i]; numArgWords = numArgWords+1; /* If pointer to variant, pass reference to variant * in result variant array. */ if ((tdesc->vt == VT_PTR) && (tdesc->u.lptdesc->vt == VT_VARIANT) && pVarResult ) args[i+1] = (DWORD)(pVarResult+(i-pDispParams->cArgs)); } } TRACE("_invoke with %ld args\n", numArgWords+1); res = _invoke((*(DWORD***)pIUnk)[pFDesc->funcdesc.oVft/4], pFDesc->funcdesc.callconv, numArgWords+1, args ); This hack takes the parm and puts the variant into that arg and subsequent ones, meaning the stack to the called function should look as it would be. Unfortunately as it stands this would only work with one parm, so my question is how it is supposed to be fixed. I could potentially change args[i+1] to args[numArgWords+1] but it still feels very hacky. If I have been ignorant of something please bear with me - I've never touched com programming before! Regards, Jason

3 2

dlls/ddraw build problem
by Steven Edwards 14 Jun '02

14 Jun '02

Hola, While everyone is looking at the new directx stuff can someone check and see if there is a easy way to fix this? dsurface/dib.o(.text+0x38a):dib.c: undefined reference to `DIB_CreateDIBSection' D:\mingw\bin\dllwrap.exe: D:\mingw\bin\gcc exited with status 1 make: *** [ddraw.dll] Error 1 >From the changelog on 2000-04-29 Ove implemented this in graphics/x11drv/dib.c, include/bitmap.h, include/gdi.h, include/x11drv.h, objects/dib.c. I havent had time to look at the new DIB engine patches from transgamming to see if they could fix this, so if they do then please send this email to /dev/null. Thanks Steven __________________________________________________ Do You Yahoo!? Yahoo! - Official partner of 2002 FIFA World Cup http://fifaworldcup.yahoo.com

2 4

Repeated: Breakage in -relay and -snoop
by Uwe Bonnes 13 Jun '02

13 Jun '02

Hallo, since last week, e.g a commandline like "wine <xxx> --debugmsg -relay=RtlEnterCriticalSection" inhibits _any_ relay message to be logged. Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

3 4

Re: FW: [ros-kernel] wine dll
by juergen.schmied＠debitel.net 13 Jun '02

13 Jun '02

For now and a any thinkable time this won't work without native shell32, shlwapi, shdocvw and some more shell stuff since big parts of the user interface are in there. It would be more useful to replace just one dll at one time with a wine dll. If you like to test the shell stuff, there is a registry key somewhere to set a different shell - like winfile. juergen "Steven Edwards" <Steven_Ed4153(a)yahoo.com> schrieb: > tested system: windows 2000 server build 2195 > pc tested: AMD Athon XP 1600, 256 ram > > first copied all dll to the windows dir. and booted. > win2k dies durning the winlogon. somewhere... > restored: > * urlmon.dll > * oleaut32.dll > * odbc32.dll > * oledlg.dll > * olepro32.dll > * winnls.dll > windows died again. > > restored: wintrust.dll, comcat.dll, crtdll.dll > result : windows died > > restored: tapi32.dll > result: windows died > > restored: dciman32.dll, dinput.dll > result: windows died > > restored: imm32.dll > result: windows died > > restored: mapi32.dll > result: windows died > > restored: dplayx.dll, mpr.dll > result: windows died > > restored: netapi.dll > result: windows showed a dialog saying that libwine*.dll was not found. > > copied: libwine.dll, libwine_tsx11.dll, libwine_unicode.dll. > result: winlogon.exe reports: msgina.dll could not be loaded, a restart button > is found, so I press it... > > restored: comctl32.dll > result: * the same dialog openes > * mstask.exe, says it cannt find the procedure: PathFintExtensionW(), at shlwapi.dll > * dns.exe, says ir cannt find the procedure: DwEnumEntryDetails(), at rasapi32.dll > > restored: shlwapi.dll, rasapi32.dll > result: after gzilion years (two minutes?) windows loaded, no error reported > I logged in as administrator, explorer did not load. > I press alt-ctrl-del to bring the sequrity dialog. I choosed to run the > task manager. I choose File/New task, and a dialog saying that ordinal 135 was not found in > shdocvm.dll, pressed OK. I runned again explorer. It did not load. I run windows commander, > (the browse command worked fine). Windows commander load ok. Run from the task manager notepad, > loads OK, and wrote this :) > > put wine dll: comctl32.dll > result: winlogon.exe reports: msgina.dll could not be loaded, a restart button. > > restored comctl32.dll and run a few programs. > windows commander runs. > notepad runs > winamp runs > several programs from the systemroot run, and thease gave me errors. > > systomroot\setup.exe : procedure entry not found: CheckSumMappedFile()(a)imagehelp.dll > systomroot\sigverif.exe: procedure entry not found: ImageAddCertificate()(a)imagehelp.dll > systomroot\ntbooks.exe : the instruction at "0x64d2b8c6" referenced at "0x0000" could not be "read".. ok, cancel to debug... (the window title says hh.exe) > procedure entry not found: ImageAddCertificate()(a)imagehelp.dll > systomroot\rundll32.exe: procedure entry not found: ImageDirectoryEntryToData()(a)imagehelp.dll > >

1 0

FW: [ros-kernel] wine dll's on a real system. (Mingw Win2k)
by Steven Edwards 13 Jun '02

13 Jun '02

If anyone is interested in the win2k test results then here they are. Thanks Steven "Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson -----Original Message----- From: reactos-kernel-admin(a)lists.sourceforge.net [mailto:reactos-kernel-admin@lists.sourceforge.net] On Behalf Of Diego Iastrubni Sent: Wednesday, June 12, 2002 10:55 AM To: reactos-kernel(a)lists.sourceforge.net Subject: [ros-kernel] wine dll's on a real system. Hello gang, I got the wine dll's from Steven and installed them on a win2k server I have, on a ADM Athlon XP1600, 256 ram, and servral gb of disk. I documented what I saw, and the results are not good. :-(, This is the first round, so I will be patient. a few notes: * windows dies means I see the screen getting black and I see the bios again * please ingnore the spelling/ grammar orros in the text attached. * if you can, you can tell me if there is a way to see which programs use which dll, that would make my life easier. - diego -- bureaucracy, n: A method for transforming energy into solid waste.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel