January 2006 - Wine-commits

Mike McCormack : progman: Load license from resources.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: a100e6b7d943e793dd58b6702f1e215099c74c40 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a100e6b7d943e793dd58b67… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jan 24 14:32:01 2006 +0100 progman: Load license from resources. --- programs/progman/En.rc | 24 ++++++++++++++++ programs/progman/License_En.c | 28 ------------------- programs/progman/Makefile.in | 6 +--- programs/progman/license.c | 61 ----------------------------------------- programs/progman/license.h | 43 ----------------------------- programs/progman/main.c | 19 ++++++++++++- programs/progman/progman.h | 5 +++ 7 files changed, 48 insertions(+), 138 deletions(-) delete mode 100644 programs/progman/License_En.c delete mode 100644 programs/progman/license.c delete mode 100644 programs/progman/license.h diff --git a/programs/progman/En.rc b/programs/progman/En.rc index 278ece3..163e84b 100644 --- a/programs/progman/En.rc +++ b/programs/progman/En.rc @@ -219,3 +219,27 @@ IDS_LIBRARIES_DLL, "Libraries (*.dll)" IDS_SYMBOL_FILES, "Icon files" IDS_SYMBOLS_ICO, "Icons (*.ico)" } + +STRINGTABLE DISCARDABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT +{ +IDS_LICENSE_CAPTION, "LICENSE" +IDS_LICENSE, +"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.\n\ +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.\n\ +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" + +IDS_WARRANTY_CAPTION, "NO WARRANTY" +IDS_WARRANTY, +"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." +} diff --git a/programs/progman/License_En.c b/programs/progman/License_En.c deleted file mode 100644 index c4e1bfe..0000000 --- a/programs/progman/License_En.c +++ /dev/null @@ -1,28 +0,0 @@ -#include "windows.h" -#include "license.h" - -static CHAR LicenseCaption_En[] = "LICENSE"; -static CHAR License_En[] = -"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.\n" - -"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.\n" - -"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"; - -static CHAR NoWarrantyCaption_En[] = "NO WARRANTY"; -static CHAR NoWarranty_En[] = -"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."; - -LICENSE WineLicense_En = {License_En, LicenseCaption_En, - NoWarranty_En, NoWarrantyCaption_En}; diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in index d2af889..3ce52d5 100644 --- a/programs/progman/Makefile.in +++ b/programs/progman/Makefile.in @@ -6,17 +6,13 @@ MODULE = progman.exe APPMODE = -mwindows IMPORTS = shell32 comdlg32 user32 gdi32 kernel32 -LICENSELANG = En - C_SRCS = \ dialog.c \ group.c \ grpfile.c \ - license.c \ main.c \ program.c \ - string.c \ - $(LICENSELANG:%=License_%.c) + string.c RC_SRCS = rsrc.rc diff --git a/programs/progman/license.c b/programs/progman/license.c deleted file mode 100644 index 7ac2717..0000000 --- a/programs/progman/license.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 1996 Ulrich Schmid - * Copyright 2002 Sylvain Petreolle - * - * 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 "windows.h" -#include "license.h" - -#if 0 -static LICENSE* SelectLanguage(LPCSTR Language) -{ - if (!lstrcmp(Language, "Cz")) return(&WineLicense_Cz); - if (!lstrcmp(Language, "Da")) return(&WineLicense_Da); - if (!lstrcmp(Language, "De")) return(&WineLicense_De); - if (!lstrcmp(Language, "En")) return(&WineLicense_En); - if (!lstrcmp(Language, "Eo")) return(&WineLicense_Eo); - if (!lstrcmp(Language, "Es")) return(&WineLicense_Es); - if (!lstrcmp(Language, "Fi")) return(&WineLicense_Fi); - if (!lstrcmp(Language, "Fr")) return(&WineLicense_Fr); - if (!lstrcmp(Language, "Hu")) return(&WineLicense_Hu); - if (!lstrcmp(Language, "It")) return(&WineLicense_It); - if (!lstrcmp(Language, "Ko")) return(&WineLicense_Ko); - if (!lstrcmp(Language, "No")) return(&WineLicense_No); - if (!lstrcmp(Language, "Pl")) return(&WineLicense_Pl); - if (!lstrcmp(Language, "Po")) return(&WineLicense_Po); - if (!lstrcmp(Language, "Va")) return(&WineLicense_Va); - return(&WineLicense_En); -} -#endif - -VOID WineLicense(HWND Wnd) -{ -/* LICENSE *License = SelectLanguage(Language); */ -LICENSE *License = &WineLicense_En; - - MessageBox(Wnd, License->License, License->LicenseCaption, - MB_ICONINFORMATION | MB_OK); -} - -VOID WineWarranty(HWND Wnd) -{ -/* LICENSE *License = SelectLanguage(Language); */ -LICENSE *License = &WineLicense_En; - - MessageBox(Wnd, License->Warranty, License->WarrantyCaption, - MB_ICONEXCLAMATION | MB_OK); -} diff --git a/programs/progman/license.h b/programs/progman/license.h deleted file mode 100644 index 4820c9f..0000000 --- a/programs/progman/license.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 1996 Ulrich Schmid - * Copyright 2002 Sylvain Petreolle - * - * 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 - */ - -VOID WineLicense(HWND hWnd); -VOID WineWarranty(HWND hWnd); - -typedef struct -{ - LPCSTR License, LicenseCaption; - LPCSTR Warranty, WarrantyCaption; -} LICENSE; - -extern LICENSE WineLicense_Cz; -extern LICENSE WineLicense_Da; -extern LICENSE WineLicense_De; -extern LICENSE WineLicense_En; -extern LICENSE WineLicense_Eo; -extern LICENSE WineLicense_Es; -extern LICENSE WineLicense_Fi; -extern LICENSE WineLicense_Fr; -extern LICENSE WineLicense_Hu; -extern LICENSE WineLicense_It; -extern LICENSE WineLicense_Ko; -extern LICENSE WineLicense_No; -extern LICENSE WineLicense_Pl; -extern LICENSE WineLicense_Po; -extern LICENSE WineLicense_Va; diff --git a/programs/progman/main.c b/programs/progman/main.c index 3476bdd..d1e2a1e 100644 --- a/programs/progman/main.c +++ b/programs/progman/main.c @@ -23,7 +23,6 @@ #include <string.h> #include "windows.h" #include "windowsx.h" -#include "license.h" #include "progman.h" GLOBALS Globals; @@ -34,6 +33,8 @@ static ATOM MAIN_RegisterMainWinClass(vo static VOID MAIN_CreateMainWindow(void); static VOID MAIN_CreateMDIWindow(void); static VOID MAIN_AutoStart(void); +static VOID WineLicense(HWND Wnd); +static VOID WineWarranty(HWND Wnd); #define BUFFER_SIZE 1000 @@ -475,6 +476,22 @@ VOID MAIN_ReplaceString(HLOCAL *handle, else MAIN_MessageBoxIDS(IDS_OUT_OF_MEMORY, IDS_ERROR, MB_OK); } +VOID WineLicense(HWND Wnd) +{ + char cap[20], text[1024]; + LoadString(Globals.hInstance, IDS_LICENSE, text, sizeof text); + LoadString(Globals.hInstance, IDS_LICENSE_CAPTION, cap, sizeof cap); + MessageBox(Wnd, text, cap, MB_ICONINFORMATION | MB_OK); +} + +VOID WineWarranty(HWND Wnd) +{ + char cap[20], text[1024]; + LoadString(Globals.hInstance, IDS_WARRANTY, text, sizeof text); + LoadString(Globals.hInstance, IDS_WARRANTY_CAPTION, cap, sizeof cap); + MessageBox(Wnd, text, cap, MB_ICONEXCLAMATION | MB_OK); +} + /* Local Variables: */ /* c-file-style: "GNU" */ /* End: */ diff --git a/programs/progman/progman.h b/programs/progman/progman.h index 3ebc249..f874373 100644 --- a/programs/progman/progman.h +++ b/programs/progman/progman.h @@ -233,6 +233,11 @@ extern CHAR STRING_EXECUTE[]; #define IDS_SYMBOL_FILES 0x16 #define IDS_SYMBOLS_ICO 0x17 +#define IDS_LICENSE_CAPTION 0x20 +#define IDS_LICENSE 0x21 +#define IDS_WARRANTY_CAPTION 0x22 +#define IDS_WARRANTY 0x23 + /* Menu */ #define MAIN_MENU 0x109

1 0

Alexandre Julliard : msvcrt: Make error strings static.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 28486da99111d7bb9dbca4b97c224d60e2699f8d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=28486da99111d7bb9dbca4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 14:00:46 2006 +0100 msvcrt: Make error strings static. --- dlls/msvcrt/errno.c | 80 ++++++++++++++++++++++++++------------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 656e5ba..aee8e79 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -27,46 +27,46 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /* error strings generated with glibc strerror */ -char str_success[] = "Success"; -char str_EPERM[] = "Operation not permitted"; -char str_ENOENT[] = "No such file or directory"; -char str_ESRCH[] = "No such process"; -char str_EINTR[] = "Interrupted system call"; -char str_EIO[] = "Input/output error"; -char str_ENXIO[] = "No such device or address"; -char str_E2BIG[] = "Argument list too long"; -char str_ENOEXEC[] = "Exec format error"; -char str_EBADF[] = "Bad file descriptor"; -char str_ECHILD[] = "No child processes"; -char str_EAGAIN[] = "Resource temporarily unavailable"; -char str_ENOMEM[] = "Cannot allocate memory"; -char str_EACCES[] = "Permission denied"; -char str_EFAULT[] = "Bad address"; -char str_EBUSY[] = "Device or resource busy"; -char str_EEXIST[] = "File exists"; -char str_EXDEV[] = "Invalid cross-device link"; -char str_ENODEV[] = "No such device"; -char str_ENOTDIR[] = "Not a directory"; -char str_EISDIR[] = "Is a directory"; -char str_EINVAL[] = "Invalid argument"; -char str_ENFILE[] = "Too many open files in system"; -char str_EMFILE[] = "Too many open files"; -char str_ENOTTY[] = "Inappropriate ioctl for device"; -char str_EFBIG[] = "File too large"; -char str_ENOSPC[] = "No space left on device"; -char str_ESPIPE[] = "Illegal seek"; -char str_EROFS[] = "Read-only file system"; -char str_EMLINK[] = "Too many links"; -char str_EPIPE[] = "Broken pipe"; -char str_EDOM[] = "Numerical argument out of domain"; -char str_ERANGE[] = "Numerical result out of range"; -char str_EDEADLK[] = "Resource deadlock avoided"; -char str_ENAMETOOLONG[] = "File name too long"; -char str_ENOLCK[] = "No locks available"; -char str_ENOSYS[] = "Function not implemented"; -char str_ENOTEMPTY[] = "Directory not empty"; -char str_EILSEQ[] = "Invalid or incomplete multibyte or wide character"; -char str_generic_error[] = "Unknown error"; +static char str_success[] = "Success"; +static char str_EPERM[] = "Operation not permitted"; +static char str_ENOENT[] = "No such file or directory"; +static char str_ESRCH[] = "No such process"; +static char str_EINTR[] = "Interrupted system call"; +static char str_EIO[] = "Input/output error"; +static char str_ENXIO[] = "No such device or address"; +static char str_E2BIG[] = "Argument list too long"; +static char str_ENOEXEC[] = "Exec format error"; +static char str_EBADF[] = "Bad file descriptor"; +static char str_ECHILD[] = "No child processes"; +static char str_EAGAIN[] = "Resource temporarily unavailable"; +static char str_ENOMEM[] = "Cannot allocate memory"; +static char str_EACCES[] = "Permission denied"; +static char str_EFAULT[] = "Bad address"; +static char str_EBUSY[] = "Device or resource busy"; +static char str_EEXIST[] = "File exists"; +static char str_EXDEV[] = "Invalid cross-device link"; +static char str_ENODEV[] = "No such device"; +static char str_ENOTDIR[] = "Not a directory"; +static char str_EISDIR[] = "Is a directory"; +static char str_EINVAL[] = "Invalid argument"; +static char str_ENFILE[] = "Too many open files in system"; +static char str_EMFILE[] = "Too many open files"; +static char str_ENOTTY[] = "Inappropriate ioctl for device"; +static char str_EFBIG[] = "File too large"; +static char str_ENOSPC[] = "No space left on device"; +static char str_ESPIPE[] = "Illegal seek"; +static char str_EROFS[] = "Read-only file system"; +static char str_EMLINK[] = "Too many links"; +static char str_EPIPE[] = "Broken pipe"; +static char str_EDOM[] = "Numerical argument out of domain"; +static char str_ERANGE[] = "Numerical result out of range"; +static char str_EDEADLK[] = "Resource deadlock avoided"; +static char str_ENAMETOOLONG[] = "File name too long"; +static char str_ENOLCK[] = "No locks available"; +static char str_ENOSYS[] = "Function not implemented"; +static char str_ENOTEMPTY[] = "Directory not empty"; +static char str_EILSEQ[] = "Invalid or incomplete multibyte or wide character"; +static char str_generic_error[] = "Unknown error"; char *MSVCRT__sys_errlist[] = {

1 0

Dmitry Timoshkov : Make more arrays const.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 57a579ffcdb5505eface5208b39accc994ae6778 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=57a579ffcdb5505eface520… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Jan 24 14:00:32 2006 +0100 Make more arrays const. --- dlls/comctl32/tests/comboex.c | 12 ++++++------ dlls/comctl32/tests/progress.c | 2 +- dlls/dbghelp/symbol.c | 2 +- dlls/kernel/comm.c | 2 +- dlls/msacm/winemp3/common.c | 8 ++++---- dlls/msi/dialog.c | 2 +- dlls/msi/helpers.c | 4 ++-- dlls/ntdll/atom.c | 2 +- dlls/oleaut32/oleaut.c | 4 ++-- dlls/oleaut32/tests/typelib.c | 2 +- dlls/riched20/caret.c | 2 +- dlls/riched20/editor.c | 8 ++++---- dlls/riched20/para.c | 2 +- dlls/secur32/negotiate.c | 7 +++---- dlls/secur32/secur32.c | 12 ++++++------ dlls/secur32/secur32_priv.h | 4 ++-- dlls/urlmon/umon.c | 2 +- dlls/user/tests/edit.c | 6 +++--- dlls/winmm/mci.c | 2 +- programs/explorer/explorer.c | 4 ++-- tools/wmc/mcl.c | 38 +++++++++++++++++++------------------- tools/wrc/wrc.c | 2 +- 22 files changed, 64 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=57a579ffcdb5505efac…

1 0

Alexandre Julliard : wineprefixcreate: Only create links for files that don't exist.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 2d3bd3e45aa2c1b30cab9e37000a9783b3a57198 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d3bd3e45aa2c1b30cab9e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 13:43:33 2006 +0100 wineprefixcreate: Only create links for files that don't exist. Make a copy instead of a link if the original file is writable. --- tools/wineprefixcreate.in | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index 55c4761..876a533 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -145,7 +145,16 @@ done link_app() { - rm -f "$2" && ln -s "$dlldir/$1.exe.so" "$2" || echo "Warning: failed to create $2" + if [ ! -f "$2" ] + then + # make a copy if the original is writable + if [ -w "$dlldir/$1.exe.so" ] + then + cp "$dlldir/$1.exe.so" "$2" || echo "Warning: failed to create $2" + else + ln -s "$dlldir/$1.exe.so" "$2" || echo "Warning: failed to create $2" + fi + fi } link_app start "$CROOT/windows/command/start.exe"

1 0

Alexandre Julliard : server: Use the new set_fd_user function in create_serial().
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: ab5ca5c04829642fbf1cff1a6c530e6fe1afd313 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ab5ca5c04829642fbf1cff1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 13:31:48 2006 +0100 server: Use the new set_fd_user function in create_serial(). --- server/serial.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/server/serial.c b/server/serial.c index 08a64a0..42d274f 100644 --- a/server/serial.c +++ b/server/serial.c @@ -131,19 +131,14 @@ int is_serial_fd( struct fd *fd ) struct object *create_serial( struct fd *fd, unsigned int options ) { struct serial *serial; - int unix_fd; - - if ((unix_fd = dup( get_unix_fd(fd) )) == -1) return NULL; + int unix_fd = get_unix_fd( fd ); /* set the fd back to blocking if necessary */ if (options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) fcntl( unix_fd, F_SETFL, 0 ); - if (!(serial = alloc_object( &serial_ops ))) - { - close( unix_fd ); - return NULL; - } + if (!(serial = alloc_object( &serial_ops ))) return NULL; + serial->options = options; serial->readinterval = 0; serial->readmult = 0; @@ -155,11 +150,8 @@ struct object *create_serial( struct fd list_init( &serial->read_q ); list_init( &serial->write_q ); list_init( &serial->wait_q ); - if (!(serial->fd = create_anonymous_fd( &serial_fd_ops, unix_fd, &serial->obj ))) - { - release_object( serial ); - return NULL; - } + serial->fd = (struct fd *)grab_object( fd ); + set_fd_user( fd, &serial_fd_ops, &serial->obj ); return &serial->obj; }

1 0

Mike McCormack : server: Modify open_fd to create an fd without a user.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 9a7124e8159dc9ff3bcb3b04b970264ca77c1a47 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a7124e8159dc9ff3bcb3b0… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Jan 24 13:30:55 2006 +0100 server: Modify open_fd to create an fd without a user. Create a set_fd_user function. Update create_file() to use the above functions. --- server/fd.c | 36 ++++++++++++++++++--------------- server/file.c | 63 ++++++++++++++++++++++++++++++++------------------------- server/file.h | 6 +++-- 3 files changed, 58 insertions(+), 47 deletions(-) diff --git a/server/fd.c b/server/fd.c index 37e0ef2..ba182f4 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1224,14 +1224,14 @@ static inline void unmount_fd( struct fd } /* allocate an fd object, without setting the unix fd yet */ -struct fd *alloc_fd( const struct fd_ops *fd_user_ops, struct object *user ) +static struct fd *alloc_fd_object(void) { struct fd *fd = alloc_object( &fd_ops ); if (!fd) return NULL; - fd->fd_ops = fd_user_ops; - fd->user = user; + fd->fd_ops = NULL; + fd->user = NULL; fd->inode = NULL; fd->closed = NULL; fd->access = 0; @@ -1311,17 +1311,24 @@ static int check_sharing( struct fd *fd, return 1; } -/* open() wrapper using a struct fd */ -/* the fd must have been created with alloc_fd */ -/* on error the fd object is released */ -struct fd *open_fd( struct fd *fd, const char *name, int flags, mode_t *mode, - unsigned int access, unsigned int sharing, unsigned int options ) +/* sets the user of an fd that previously had no user */ +void set_fd_user( struct fd *fd, const struct fd_ops *user_ops, struct object *user ) +{ + assert( fd->fd_ops == NULL ); + fd->fd_ops = user_ops; + fd->user = user; +} + +/* open() wrapper that returns a struct fd with no fd user set */ +struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned int access, + unsigned int sharing, unsigned int options ) { struct stat st; struct closed_fd *closed_fd; + struct fd *fd; const char *unlink_name = ""; - assert( fd->unix_fd == -1 ); + if (!(fd = alloc_fd_object())) return NULL; if (options & FILE_DELETE_ON_CLOSE) unlink_name = name; if (!(closed_fd = mem_alloc( sizeof(*closed_fd) + strlen(unlink_name) ))) @@ -1337,9 +1344,7 @@ struct fd *open_fd( struct fd *fd, const if (errno != EEXIST || (flags & O_EXCL)) { file_set_error(); - release_object( fd ); - free( closed_fd ); - return NULL; + goto error; } } flags &= ~(O_CREAT | O_EXCL | O_TRUNC); @@ -1347,9 +1352,7 @@ struct fd *open_fd( struct fd *fd, const if ((fd->unix_fd = open( name, flags & ~O_TRUNC, *mode )) == -1) { file_set_error(); - release_object( fd ); - free( closed_fd ); - return NULL; + goto error; } closed_fd->unix_fd = fd->unix_fd; closed_fd->unlink[0] = 0; @@ -1420,10 +1423,11 @@ error: /* if the function fails the unix fd is closed */ struct fd *create_anonymous_fd( const struct fd_ops *fd_user_ops, int unix_fd, struct object *user ) { - struct fd *fd = alloc_fd( fd_user_ops, user ); + struct fd *fd = alloc_fd_object(); if (fd) { + set_fd_user( fd, fd_user_ops, user ); fd->unix_fd = unix_fd; return fd; } diff --git a/server/file.c b/server/file.c index 84215c5..bc8f63d 100644 --- a/server/file.c +++ b/server/file.c @@ -61,6 +61,8 @@ struct file unsigned int options; /* file options (FILE_DELETE_ON_CLOSE, FILE_SYNCHRONOUS...) */ }; +static unsigned int generic_file_map_access( unsigned int access ); + static void file_dump( struct object *obj, int verbose ); static struct fd *file_get_fd( struct object *obj ); static unsigned int file_map_access( struct object *obj, unsigned int access ); @@ -120,12 +122,25 @@ static struct file *create_file_for_fd( return file; } +static struct object *create_file_obj( struct fd *fd, unsigned int access, unsigned int options ) +{ + struct file *file = alloc_object( &file_ops ); + + if (!file) return NULL; + file->access = access; + file->options = options; + file->fd = fd; + grab_object( fd ); + set_fd_user( fd, &file_fd_ops, &file->obj ); + return &file->obj; +} static struct object *create_file( const char *nameptr, size_t len, unsigned int access, unsigned int sharing, int create, unsigned int options, unsigned int attrs ) { - struct file *file; + struct object *obj = NULL; + struct fd *fd; int flags, rw_mode; char *name; mode_t mode; @@ -142,7 +157,7 @@ static struct object *create_file( const case FILE_OPEN: flags = 0; break; case FILE_OPEN_IF: flags = O_CREAT; break; case FILE_OVERWRITE: flags = O_TRUNC; break; - default: set_error( STATUS_INVALID_PARAMETER ); goto error; + default: set_error( STATUS_INVALID_PARAMETER ); goto done; } mode = (attrs & FILE_ATTRIBUTE_READONLY) ? 0444 : 0666; @@ -151,14 +166,11 @@ static struct object *create_file( const (!strcasecmp( name + len - 4, ".exe" ) || !strcasecmp( name + len - 4, ".com" ))) mode |= 0111; - if (!(file = alloc_object( &file_ops ))) goto error; - - file->access = file_map_access( &file->obj, access ); - file->options = options; + access = generic_file_map_access( access ); rw_mode = 0; - if (file->access & FILE_UNIX_READ_ACCESS) rw_mode |= FILE_READ_DATA; - if (file->access & FILE_UNIX_WRITE_ACCESS) rw_mode |= FILE_WRITE_DATA; + if (access & FILE_UNIX_READ_ACCESS) rw_mode |= FILE_READ_DATA; + if (access & FILE_UNIX_WRITE_ACCESS) rw_mode |= FILE_WRITE_DATA; switch(rw_mode) { case 0: break; @@ -168,29 +180,19 @@ static struct object *create_file( const } /* FIXME: should set error to STATUS_OBJECT_NAME_COLLISION if file existed before */ - if (!(file->fd = alloc_fd( &file_fd_ops, &file->obj )) || - !(file->fd = open_fd( file->fd, name, flags | O_NONBLOCK | O_LARGEFILE, - &mode, file->access, sharing, options ))) - { - free( name ); - release_object( file ); - return NULL; - } - free( name ); + fd = open_fd( name, flags | O_NONBLOCK | O_LARGEFILE, &mode, access, sharing, options ); + if (!fd) goto done; - /* check for serial port */ - if (S_ISCHR(mode) && is_serial_fd( file->fd )) - { - struct object *obj = create_serial( file->fd, file->options ); - release_object( file ); - return obj; - } + if (S_ISCHR(mode) && is_serial_fd( fd )) + obj = create_serial( fd, options ); + else + obj = create_file_obj( fd, access, options ); - return &file->obj; + release_object( fd ); - error: +done: free( name ); - return NULL; + return obj; } /* check if two file objects point to the same file */ @@ -260,7 +262,7 @@ static struct fd *file_get_fd( struct ob return (struct fd *)grab_object( file->fd ); } -static unsigned int file_map_access( struct object *obj, unsigned int access ) +static unsigned int generic_file_map_access( unsigned int access ) { if (access & GENERIC_READ) access |= FILE_GENERIC_READ; if (access & GENERIC_WRITE) access |= FILE_GENERIC_WRITE; @@ -269,6 +271,11 @@ static unsigned int file_map_access( str return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); } +static unsigned int file_map_access( struct object *obj, unsigned int access ) +{ + return generic_file_map_access( access ); +} + static void file_destroy( struct object *obj ) { struct file *file = (struct file *)obj; diff --git a/server/file.h b/server/file.h index a4e8c7a..5b139af 100644 --- a/server/file.h +++ b/server/file.h @@ -46,13 +46,13 @@ struct fd_ops /* file descriptor functions */ -extern struct fd *alloc_fd( const struct fd_ops *fd_user_ops, struct object *user ); extern struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct object *user ); -extern struct fd *open_fd( struct fd *fd, const char *name, int flags, mode_t *mode, - unsigned int access, unsigned int sharing, unsigned int options ); +extern struct fd *open_fd( const char *name, int flags, mode_t *mode, unsigned int access, + unsigned int sharing, unsigned int options ); extern struct fd *create_anonymous_fd( const struct fd_ops *fd_user_ops, int unix_fd, struct object *user ); extern void *get_fd_user( struct fd *fd ); +extern void set_fd_user( struct fd *fd, const struct fd_ops *ops, struct object *user ); extern int get_unix_fd( struct fd *fd ); extern int is_same_file_fd( struct fd *fd1, struct fd *fd2 ); extern void fd_poll_event( struct fd *fd, int event );

1 0

Alexandre Julliard : winebuild: Get rid of the default ignored symbols list.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 433bbdf08a1ad3b47b90a40e65334485f5d1c81c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=433bbdf08a1ad3b47b90a40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 12:29:31 2006 +0100 winebuild: Get rid of the default ignored symbols list. --- tools/winebuild/import.c | 62 ---------------------------------------------- 1 files changed, 0 insertions(+), 62 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index d97d58d..43956e8 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -70,56 +70,6 @@ static int nb_delayed = 0; /* numbe static int total_imports = 0; /* total number of imported functions */ static int total_delayed = 0; /* total number of imported functions in delayed DLLs */ -/* list of symbols that are ignored by default */ -static const char * const default_ignored_symbols[] = -{ - "abs", - "acos", - "asin", - "atan", - "atan2", - "atoi", - "atol", - "bsearch", - "ceil", - "cos", - "cosh", - "exp", - "fabs", - "floor", - "fmod", - "frexp", - "labs", - "log", - "log10", - "memchr", - "memcmp", - "memcpy", - "memmove", - "memset", - "modf", - "pow", - "qsort", - "sin", - "sinh", - "sqrt", - "strcat", - "strchr", - "strcmp", - "strcpy", - "strcspn", - "strlen", - "strncat", - "strncmp", - "strncpy", - "strpbrk", - "strrchr", - "strspn", - "strstr", - "tan", - "tanh" -}; - static inline const char *ppc_reg( int reg ) { @@ -397,23 +347,12 @@ static void remove_import_dll( int index free_imports( imp ); } -/* initialize the list of ignored symbols */ -static void init_ignored_symbols(void) -{ - unsigned int i; - - for (i = 0; i < sizeof(default_ignored_symbols)/sizeof(default_ignored_symbols[0]); i++) - add_name( &ignore_symbols, default_ignored_symbols[i] ); -} - /* add a symbol to the ignored symbol list */ /* if the name starts with '-' the symbol is removed instead */ void add_ignore_symbol( const char *name ) { unsigned int i; - if (!ignore_symbols.size) init_ignored_symbols(); /* first time around, fill list with defaults */ - if (name[0] == '-') /* remove it */ { if (!name[1]) empty_name_table( &ignore_symbols ); /* remove everything */ @@ -603,7 +542,6 @@ int resolve_imports( DLLSPEC *spec ) unsigned int i, j, removed; ORDDEF *odp; - if (!ignore_symbols.size) init_ignored_symbols(); sort_names( &ignore_symbols ); for (i = 0; i < nb_imports; i++)

1 0

Alexandre Julliard : ntdll: memcpy should behave like memmove in ntdll too.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 2a192064e819bde69ce556f92c7d5d124356d39b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2a192064e819bde69ce556f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 12:28:34 2006 +0100 ntdll: memcpy should behave like memmove in ntdll too. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/string.c | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6169e82..9f68417 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -666,7 +666,7 @@ @ cdecl mbtowc(wstr str long) MSVCRT_mbtowc @ cdecl memchr(ptr long long) ntdll.memchr @ cdecl memcmp(ptr ptr long) ntdll.memcmp -@ cdecl memcpy(ptr ptr long) ntdll.memmove #sic +@ cdecl memcpy(ptr ptr long) ntdll.memcpy @ cdecl memmove(ptr ptr long) ntdll.memmove @ cdecl memset(ptr long long) ntdll.memset @ cdecl mktime(ptr) MSVCRT_mktime diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5502c76..3304ead 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1308,7 +1308,7 @@ @ cdecl -private mbstowcs(ptr str long) NTDLL_mbstowcs @ cdecl -private memchr(ptr long long) @ cdecl -private memcmp(ptr ptr long) -@ cdecl -private memcpy(ptr ptr long) +@ cdecl -private memcpy(ptr ptr long) NTDLL_memcpy @ cdecl -private memmove(ptr ptr long) @ cdecl -private memset(ptr long long) @ cdecl -private pow(double double) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index e05f7c3..45d36d8 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -21,6 +21,7 @@ */ #include "config.h" +#include "wine/port.h" #include <ctype.h> #include <stdarg.h> @@ -62,6 +63,18 @@ INT __cdecl NTDLL__memicmp( LPCSTR s1, L /********************************************************************* + * memcpy (NTDLL.@) + * + * NOTES + * Behaves like memmove. + */ +void * __cdecl NTDLL_memcpy( void *dst, const void *src, size_t n ) +{ + return memmove( dst, src, n ); +} + + +/********************************************************************* * _strupr (NTDLL.@) * * Convert a string to upper case.

1 0

Alexandre Julliard : ntdll: Mark all libc-style functions as private to make sure we link
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: a1544e0d202bd99a340b887e0fa90bf77ab5b2ef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a1544e0d202bd99a340b887… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 12:24:35 2006 +0100 ntdll: Mark all libc-style functions as private to make sure we link to the real libc functions instead. --- dlls/ntdll/ntdll.spec | 242 +++++++++++++++++++++++++------------------------ 1 files changed, 121 insertions(+), 121 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 30ad80a..5502c76 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1223,141 +1223,141 @@ @ stdcall ZwYieldExecution() NtYieldExecution # @ stub _CIcos # @ stub _CIlog -@ cdecl _CIpow() NTDLL__CIpow +@ cdecl -private _CIpow() NTDLL__CIpow # @ stub _CIsin # @ stub _CIsqrt # @ stub __isascii # @ stub __iscsym # @ stub __iscsymf # @ stub __toascii -@ stdcall -ret64 _alldiv(double double) +@ stdcall -private -ret64 _alldiv(double double) # @ stub _alldvrm -@ stdcall -ret64 _allmul(double double) -@ stdcall -i386 -norelay _alloca_probe() -@ stdcall -ret64 _allrem(double double) +@ stdcall -private -ret64 _allmul(double double) +@ stdcall -private -i386 -norelay _alloca_probe() +@ stdcall -private -ret64 _allrem(double double) # @ stub _allshl # @ stub _allshr -@ cdecl -ret64 _atoi64(str) -@ stdcall -ret64 _aulldiv(double double) +@ cdecl -private -ret64 _atoi64(str) +@ stdcall -private -ret64 _aulldiv(double double) # @ stub _aulldvrm -@ stdcall -ret64 _aullrem(double double) +@ stdcall -private -ret64 _aullrem(double double) # @ stub _aullshr -@ stdcall -i386 -norelay _chkstk() +@ stdcall -private -i386 -norelay _chkstk() @ stub _fltused -@ cdecl -ret64 _ftol() NTDLL__ftol -@ cdecl _i64toa(double ptr long) -@ cdecl _i64tow(double ptr long) -@ cdecl _itoa(long ptr long) -@ cdecl _itow(long ptr long) -@ cdecl _lfind(ptr ptr ptr long ptr) lfind -@ cdecl _ltoa(long ptr long) -@ cdecl _ltow(long ptr long) -@ cdecl _memccpy(ptr ptr long long) memccpy -@ cdecl _memicmp(str str long) NTDLL__memicmp -@ varargs _snprintf(ptr long ptr) snprintf -@ varargs _snwprintf(wstr long wstr) -@ cdecl _splitpath(str ptr ptr ptr ptr) -@ cdecl _strcmpi(str str) strcasecmp -@ cdecl _stricmp(str str) strcasecmp -@ cdecl _strlwr(str) -@ cdecl _strnicmp(str str long) strncasecmp -@ cdecl _strupr(str) -# @ stub _tolower -# @ stub _toupper -@ cdecl _ui64toa(double ptr long) -@ cdecl _ui64tow(double ptr long) -@ cdecl _ultoa(long ptr long) -@ cdecl _ultow(long ptr long) -@ cdecl _vsnprintf(ptr long str ptr) vsnprintf -@ cdecl _vsnwprintf(ptr long wstr ptr) vsnprintfW -@ cdecl _wcsicmp(wstr wstr) NTDLL__wcsicmp -@ cdecl _wcslwr(wstr) NTDLL__wcslwr -@ cdecl _wcsnicmp(wstr wstr long) NTDLL__wcsnicmp -@ cdecl _wcsupr(wstr) NTDLL__wcsupr -@ cdecl _wtoi(wstr) -@ cdecl _wtoi64(wstr) -@ cdecl _wtol(wstr) -@ cdecl abs(long) -@ cdecl atan(double) -@ cdecl atoi(str) -@ cdecl atol(str) -@ cdecl bsearch(ptr ptr long long ptr) -@ cdecl ceil(double) -@ cdecl cos(double) -@ cdecl fabs(double) -@ cdecl floor(double) -@ cdecl isalnum(long) -@ cdecl isalpha(long) -@ cdecl iscntrl(long) -@ cdecl isdigit(long) -@ cdecl isgraph(long) -@ cdecl islower(long) -@ cdecl isprint(long) -@ cdecl ispunct(long) -@ cdecl isspace(long) -@ cdecl isupper(long) -@ cdecl iswalpha(long) NTDLL_iswalpha -@ cdecl iswctype(long long) NTDLL_iswctype -@ cdecl iswdigit(long) NTDLL_iswdigit -@ cdecl iswlower(long) NTDLL_iswlower -@ cdecl iswspace(long) NTDLL_iswspace -@ cdecl iswxdigit(long) NTDLL_iswxdigit -@ cdecl isxdigit(long) -@ cdecl labs(long) -@ cdecl log(double) -@ cdecl mbstowcs(ptr str long) NTDLL_mbstowcs -@ cdecl memchr(ptr long long) -@ cdecl memcmp(ptr ptr long) -@ cdecl memcpy(ptr ptr long) -@ cdecl memmove(ptr ptr long) -@ cdecl memset(ptr long long) -@ cdecl pow(double double) -@ cdecl qsort(ptr long long ptr) -@ cdecl sin(double) -@ varargs sprintf(str str) -@ cdecl sqrt(double) -@ varargs sscanf(str str) -@ cdecl strcat(str str) -@ cdecl strchr(str long) -@ cdecl strcmp(str str) -@ cdecl strcpy(ptr str) -@ cdecl strcspn(str str) -@ cdecl strlen(str) -@ cdecl strncat(str str long) -@ cdecl strncmp(str str long) -@ cdecl strncpy(ptr str long) -@ cdecl strpbrk(str str) -@ cdecl strrchr(str long) -@ cdecl strspn(str str) -@ cdecl strstr(str str) -@ cdecl strtol(str ptr long) -@ cdecl strtoul(str ptr long) -@ varargs swprintf(wstr wstr) NTDLL_swprintf -@ cdecl tan(double) -@ cdecl tolower(long) -@ cdecl toupper(long) -@ cdecl towlower(long) NTDLL_towlower -@ cdecl towupper(long) NTDLL_towupper +@ cdecl -private -ret64 _ftol() NTDLL__ftol +@ cdecl -private _i64toa(double ptr long) +@ cdecl -private _i64tow(double ptr long) +@ cdecl -private _itoa(long ptr long) +@ cdecl -private _itow(long ptr long) +@ cdecl -private _lfind(ptr ptr ptr long ptr) lfind +@ cdecl -private _ltoa(long ptr long) +@ cdecl -private _ltow(long ptr long) +@ cdecl -private _memccpy(ptr ptr long long) memccpy +@ cdecl -private _memicmp(str str long) NTDLL__memicmp +@ varargs -private _snprintf(ptr long ptr) snprintf +@ varargs -private _snwprintf(wstr long wstr) +@ cdecl -private _splitpath(str ptr ptr ptr ptr) +@ cdecl -private _strcmpi(str str) strcasecmp +@ cdecl -private _stricmp(str str) strcasecmp +@ cdecl -private _strlwr(str) +@ cdecl -private _strnicmp(str str long) strncasecmp +@ cdecl -private _strupr(str) +# @ stub -private _tolower +# @ stub -private _toupper +@ cdecl -private _ui64toa(double ptr long) +@ cdecl -private _ui64tow(double ptr long) +@ cdecl -private _ultoa(long ptr long) +@ cdecl -private _ultow(long ptr long) +@ cdecl -private _vsnprintf(ptr long str ptr) vsnprintf +@ cdecl -private _vsnwprintf(ptr long wstr ptr) vsnprintfW +@ cdecl -private _wcsicmp(wstr wstr) NTDLL__wcsicmp +@ cdecl -private _wcslwr(wstr) NTDLL__wcslwr +@ cdecl -private _wcsnicmp(wstr wstr long) NTDLL__wcsnicmp +@ cdecl -private _wcsupr(wstr) NTDLL__wcsupr +@ cdecl -private _wtoi(wstr) +@ cdecl -private _wtoi64(wstr) +@ cdecl -private _wtol(wstr) +@ cdecl -private abs(long) +@ cdecl -private atan(double) +@ cdecl -private atoi(str) +@ cdecl -private atol(str) +@ cdecl -private bsearch(ptr ptr long long ptr) +@ cdecl -private ceil(double) +@ cdecl -private cos(double) +@ cdecl -private fabs(double) +@ cdecl -private floor(double) +@ cdecl -private isalnum(long) +@ cdecl -private isalpha(long) +@ cdecl -private iscntrl(long) +@ cdecl -private isdigit(long) +@ cdecl -private isgraph(long) +@ cdecl -private islower(long) +@ cdecl -private isprint(long) +@ cdecl -private ispunct(long) +@ cdecl -private isspace(long) +@ cdecl -private isupper(long) +@ cdecl -private iswalpha(long) NTDLL_iswalpha +@ cdecl -private iswctype(long long) NTDLL_iswctype +@ cdecl -private iswdigit(long) NTDLL_iswdigit +@ cdecl -private iswlower(long) NTDLL_iswlower +@ cdecl -private iswspace(long) NTDLL_iswspace +@ cdecl -private iswxdigit(long) NTDLL_iswxdigit +@ cdecl -private isxdigit(long) +@ cdecl -private labs(long) +@ cdecl -private log(double) +@ cdecl -private mbstowcs(ptr str long) NTDLL_mbstowcs +@ cdecl -private memchr(ptr long long) +@ cdecl -private memcmp(ptr ptr long) +@ cdecl -private memcpy(ptr ptr long) +@ cdecl -private memmove(ptr ptr long) +@ cdecl -private memset(ptr long long) +@ cdecl -private pow(double double) +@ cdecl -private qsort(ptr long long ptr) +@ cdecl -private sin(double) +@ varargs -private sprintf(str str) +@ cdecl -private sqrt(double) +@ varargs -private sscanf(str str) +@ cdecl -private strcat(str str) +@ cdecl -private strchr(str long) +@ cdecl -private strcmp(str str) +@ cdecl -private strcpy(ptr str) +@ cdecl -private strcspn(str str) +@ cdecl -private strlen(str) +@ cdecl -private strncat(str str long) +@ cdecl -private strncmp(str str long) +@ cdecl -private strncpy(ptr str long) +@ cdecl -private strpbrk(str str) +@ cdecl -private strrchr(str long) +@ cdecl -private strspn(str str) +@ cdecl -private strstr(str str) +@ cdecl -private strtol(str ptr long) +@ cdecl -private strtoul(str ptr long) +@ varargs -private swprintf(wstr wstr) NTDLL_swprintf +@ cdecl -private tan(double) +@ cdecl -private tolower(long) +@ cdecl -private toupper(long) +@ cdecl -private towlower(long) NTDLL_towlower +@ cdecl -private towupper(long) NTDLL_towupper @ stdcall vDbgPrintEx(long long str ptr) @ stdcall vDbgPrintExWithPrefix(str long long str ptr) -@ cdecl vsprintf(ptr str ptr) -@ cdecl wcscat(wstr wstr) NTDLL_wcscat -@ cdecl wcschr(wstr long) NTDLL_wcschr -@ cdecl wcscmp(wstr wstr) NTDLL_wcscmp -@ cdecl wcscpy(ptr wstr) NTDLL_wcscpy -@ cdecl wcscspn(wstr wstr) NTDLL_wcscspn -@ cdecl wcslen(wstr) NTDLL_wcslen -@ cdecl wcsncat(wstr wstr long) NTDLL_wcsncat -@ cdecl wcsncmp(wstr wstr long) NTDLL_wcsncmp -@ cdecl wcsncpy(ptr wstr long) NTDLL_wcsncpy -@ cdecl wcspbrk(wstr wstr) NTDLL_wcspbrk -@ cdecl wcsrchr(wstr long) NTDLL_wcsrchr -@ cdecl wcsspn(wstr wstr) NTDLL_wcsspn -@ cdecl wcsstr(wstr wstr) NTDLL_wcsstr -@ cdecl wcstok(wstr wstr) NTDLL_wcstok -@ cdecl wcstol(wstr ptr long) NTDLL_wcstol -@ cdecl wcstombs(ptr ptr long) NTDLL_wcstombs -@ cdecl wcstoul(wstr ptr long) NTDLL_wcstoul +@ cdecl -private vsprintf(ptr str ptr) +@ cdecl -private wcscat(wstr wstr) NTDLL_wcscat +@ cdecl -private wcschr(wstr long) NTDLL_wcschr +@ cdecl -private wcscmp(wstr wstr) NTDLL_wcscmp +@ cdecl -private wcscpy(ptr wstr) NTDLL_wcscpy +@ cdecl -private wcscspn(wstr wstr) NTDLL_wcscspn +@ cdecl -private wcslen(wstr) NTDLL_wcslen +@ cdecl -private wcsncat(wstr wstr long) NTDLL_wcsncat +@ cdecl -private wcsncmp(wstr wstr long) NTDLL_wcsncmp +@ cdecl -private wcsncpy(ptr wstr long) NTDLL_wcsncpy +@ cdecl -private wcspbrk(wstr wstr) NTDLL_wcspbrk +@ cdecl -private wcsrchr(wstr long) NTDLL_wcsrchr +@ cdecl -private wcsspn(wstr wstr) NTDLL_wcsspn +@ cdecl -private wcsstr(wstr wstr) NTDLL_wcsstr +@ cdecl -private wcstok(wstr wstr) NTDLL_wcstok +@ cdecl -private wcstol(wstr ptr long) NTDLL_wcstol +@ cdecl -private wcstombs(ptr ptr long) NTDLL_wcstombs +@ cdecl -private wcstoul(wstr ptr long) NTDLL_wcstoul ################## # Wine extensions

1 0

Alexandre Julliard : Avoid importing _strlwr/_strupr from ntdll.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: b7b7f2b67951e42f24a8e04095901c81fe129e11 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b7b7f2b67951e42f24a8e04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 12:24:05 2006 +0100 Avoid importing _strlwr/_strupr from ntdll. --- dlls/msvcrt/mbcs.c | 22 ++++++---------------- dlls/msvcrt/msvcrt.h | 7 ------- dlls/user/combo.c | 11 ++++++----- dlls/winedos/int21.c | 5 ++++- include/winternl.h | 3 --- programs/winedbg/winedbg.c | 1 - 6 files changed, 16 insertions(+), 33 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 59bb182..fe03eb6 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -109,16 +109,6 @@ static inline unsigned char *u__strnset( return (unsigned char*) _strnset( (char*)s, c, len ); } -static inline unsigned char *u__strlwr( unsigned char *s ) -{ - return (unsigned char*) _strlwr( (char*)s ); -} - -static inline unsigned char *u__strupr( unsigned char *s ) -{ - return (unsigned char*) _strupr( (char*)s ); -} - static inline size_t u_strcspn( const unsigned char *s, const unsigned char *rej ) { return strcspn( (const char *)s, (const char*)rej ); @@ -1122,12 +1112,12 @@ unsigned char* _mbsncat(unsigned char* d */ unsigned char* _mbslwr(unsigned char* s) { + unsigned char *ret = s; if (!s) return NULL; if (MSVCRT___mb_cur_max > 1) { unsigned int c; - unsigned char* p=s; while (*s) { c = _mbctolower(_mbsnextc(s)); @@ -1139,9 +1129,9 @@ unsigned char* _mbslwr(unsigned char* s) } *s++=c; } - return p; } - return u__strlwr(s); + else for ( ; *s; s++) *s = tolower(*s); + return ret; } @@ -1150,12 +1140,12 @@ unsigned char* _mbslwr(unsigned char* s) */ unsigned char* _mbsupr(unsigned char* s) { + unsigned char *ret = s; if (!s) return NULL; if (MSVCRT___mb_cur_max > 1) { unsigned int c; - unsigned char* p=s; while (*s) { c = _mbctoupper(_mbsnextc(s)); @@ -1167,9 +1157,9 @@ unsigned char* _mbsupr(unsigned char* s) } *s++=c; } - return p; } - return u__strupr(s); + else for ( ; *s; s++) *s = toupper(*s); + return ret; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3e00480..b565bed 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -641,11 +641,4 @@ int _dup2(int, int); int _pipe(int *, unsigned int, int); #endif -/* FIXME: Functions that we forward to. They shouldn't be defined - * here, but for now they're not declared in the standard headers. - */ -void _splitpath(const char*,char*,char*,char*,char*); -char* _strlwr(char*); -char* _strupr(char*); - #endif /* __WINE_MSVCRT_H */ diff --git a/dlls/user/combo.c b/dlls/user/combo.c index 12d3121..55f04f9 100644 --- a/dlls/user/combo.c +++ b/dlls/user/combo.c @@ -2088,17 +2088,17 @@ static LRESULT ComboWndProc_common( HWND else /* unlike the unicode version, the ansi version does not overwrite the string if converting case */ { - char *string = NULL; + char *p, *string = NULL; LRESULT ret; if( lphc->dwStyle & CBS_LOWERCASE ) { string = strdupA((LPSTR)lParam); - _strlwr(string); + for (p = string; *p; p++) *p = tolower(*p); } else if( lphc->dwStyle & CBS_UPPERCASE ) { string = strdupA((LPSTR)lParam); - _strupr(string); + for (p = string; *p; p++) *p = toupper(*p); } ret = SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, string ? (LPARAM)string : lParam); HeapFree(GetProcessHeap(), 0, string); @@ -2119,10 +2119,11 @@ static LRESULT ComboWndProc_common( HWND } else { + char *p; if( lphc->dwStyle & CBS_LOWERCASE ) - _strlwr((LPSTR)lParam); + for (p = (LPSTR)lParam; *p; p++) *p = tolower(*p); else if( lphc->dwStyle & CBS_UPPERCASE ) - _strupr((LPSTR)lParam); + for (p = (LPSTR)lParam; *p; p++) *p = toupper(*p); return SendMessageA(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); } case CB_DELETESTRING16: diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index 85edf2a..3c52be8 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -1989,7 +1989,10 @@ static void INT21_ExtendedCountryInforma case 0x22: /* CAPITALIZE ASCIIZ STRING */ case 0xa2: /* CAPITALIZE ASCIIZ FILENAME */ TRACE("Convert ASCIIZ string to uppercase\n"); - _strupr( (LPSTR)CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx) ); + { + char *p = CTX_SEG_OFF_TO_LIN( context, context->SegDs, context->Edx ); + for ( ; *p; p++) *p = toupper(*p); + } break; case 0x23: /* DETERMINE IF CHARACTER REPRESENTS YES/NO RESPONSE */ diff --git a/include/winternl.h b/include/winternl.h index a5a2e83..abe1745 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1685,9 +1685,6 @@ typedef enum _SYSDBG_COMMAND { * Function declarations */ -extern LPSTR _strlwr(LPSTR str); /* FIXME: Doesn't belong here */ -extern LPSTR _strupr(LPSTR str); /* FIXME: Doesn't belong here */ - #if defined(__i386__) && defined(__GNUC__) static inline void WINAPI DbgBreakPoint(void) { __asm__ __volatile__("int3"); } static inline void WINAPI DbgUserBreakPoint(void) { __asm__ __volatile__("int3"); } diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 87f9a02..ab6e5e3 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -955,7 +955,6 @@ static unsigned dbg_handle_debug_event(D buffer, (unsigned long)de->u.LoadDll.lpBaseOfDll, de->u.LoadDll.dwDebugInfoFileOffset, de->u.LoadDll.nDebugInfoSize); - _strupr(buffer); SymLoadModule(dbg_curr_process->handle, de->u.LoadDll.hFile, buffer, NULL, (unsigned long)de->u.LoadDll.lpBaseOfDll, 0); break_set_xpoints(FALSE);

1 0