January 2006 - Wine-commits

Marcus Meissner : iphlpapi: Allocate space enough to handle all the possible ipv4 addresses.
by Alexandre Julliard 30 Jan '06

30 Jan '06

Module: wine Branch: refs/heads/master Commit: b970b2203725f52eeb1cf0374a482a931d275d84 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b970b2203725f52eeb1cf03… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Jan 30 18:16:22 2006 +0100 iphlpapi: Allocate space enough to handle all the possible ipv4 addresses. --- dlls/iphlpapi/iphlpapi_main.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 1759c1e..063e9f7 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -654,9 +654,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER * precisely enough space. */ size = sizeof(IP_ADAPTER_INFO) * numNonLoopbackInterfaces; - if (numIPAddresses > numNonLoopbackInterfaces) - size += (numIPAddresses - numNonLoopbackInterfaces) * - sizeof(IP_ADDR_STRING); + size += numIPAddresses * sizeof(IP_ADDR_STRING); if (!pAdapterInfo || *pOutBufLen < size) { *pOutBufLen = size; ret = ERROR_BUFFER_OVERFLOW; @@ -670,9 +668,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER table = getNonLoopbackInterfaceIndexTable(); if (table) { size = sizeof(IP_ADAPTER_INFO) * table->numIndexes; - if (ipAddrTable->dwNumEntries > numNonLoopbackInterfaces) - size += (ipAddrTable->dwNumEntries - numNonLoopbackInterfaces) * - sizeof(IP_ADDR_STRING); + size += ipAddrTable->dwNumEntries * sizeof(IP_ADDR_STRING); if (*pOutBufLen < size) { *pOutBufLen = size; ret = ERROR_INSUFFICIENT_BUFFER;

1 0

Mike McCormack : kernel: Add some more tests for FindFirstChangeNotification.
by Alexandre Julliard 30 Jan '06

30 Jan '06

Module: wine Branch: refs/heads/master Commit: bd185ff3de84edf0ff38bb1ba18d34a1b9969b8c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bd185ff3de84edf0ff38bb1… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 30 18:14:12 2006 +0100 kernel: Add some more tests for FindFirstChangeNotification. --- dlls/kernel/tests/change.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/kernel/tests/change.c b/dlls/kernel/tests/change.c index 5afe4fe..2ad35f8 100644 --- a/dlls/kernel/tests/change.c +++ b/dlls/kernel/tests/change.c @@ -2,6 +2,7 @@ * Tests for file change notification functions * * Copyright (c) 2004 Hans Leidekker + * Copyright 2006 Mike McCormack for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -242,7 +243,79 @@ static void test_FindFirstChangeNotifica ok(ret, "RemoveDirectoryA error: %ld\n", GetLastError()); } +/* this test concentrates more on the wait behaviour of the handle */ +static void test_ffcn(void) +{ + DWORD filter; + HANDLE handle; + LONG r; + WCHAR path[MAX_PATH], subdir[MAX_PATH]; + static const WCHAR szBoo[] = { '\\','b','o','o',0 }; + static const WCHAR szHoo[] = { '\\','h','o','o',0 }; + + r = GetTempPathW( MAX_PATH, path ); + ok( r != 0, "temp path failed\n"); + if (!r) + return; + + lstrcatW( path, szBoo ); + lstrcpyW( subdir, path ); + lstrcatW( subdir, szHoo ); + + RemoveDirectoryW( subdir ); + RemoveDirectoryW( path ); + + r = CreateDirectoryW(path, NULL); + ok( r == TRUE, "failed to create directory\n"); + + filter = FILE_NOTIFY_CHANGE_FILE_NAME; + filter |= FILE_NOTIFY_CHANGE_DIR_NAME; + + handle = FindFirstChangeNotificationW( path, 1, filter); + ok( handle != INVALID_HANDLE_VALUE, "invalid handle\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == STATUS_TIMEOUT, "should time out\n"); + + r = CreateDirectoryW( subdir, NULL ); + ok( r == TRUE, "failed to create subdir\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = FindNextChangeNotification(handle); + ok( r == TRUE, "find next failed\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == STATUS_TIMEOUT, "should time out\n"); + + r = RemoveDirectoryW( subdir ); + ok( r == TRUE, "failed to remove subdir\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = FindNextChangeNotification(handle); + ok( r == TRUE, "find next failed\n"); + + r = FindNextChangeNotification(handle); + ok( r == TRUE, "find next failed\n"); + + r = FindCloseChangeNotification(handle); + ok( r == TRUE, "should succeed\n"); + + r = RemoveDirectoryW( path ); + ok( r == TRUE, "failed to remove dir\n"); +} + START_TEST(change) { test_FindFirstChangeNotification(); + test_ffcn(); }

1 0

Mike McCormack : server: Initial inotify support.
by Alexandre Julliard 30 Jan '06

30 Jan '06

Module: wine Branch: refs/heads/master Commit: fdf0c684f56d8d679def550b92875fcddd219d9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fdf0c684f56d8d679def550… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 30 18:15:31 2006 +0100 server: Initial inotify support. --- server/change.c | 238 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 223 insertions(+), 15 deletions(-) diff --git a/server/change.c b/server/change.c index ca78093..ef437aa 100644 --- a/server/change.c +++ b/server/change.c @@ -28,6 +28,10 @@ #include <stdlib.h> #include <signal.h> #include <sys/stat.h> +#include <errno.h> +#ifdef HAVE_SYS_ERRNO_H +#include <sys/errno.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -39,6 +43,8 @@ #include "request.h" #include "winternl.h" +/* dnotify support */ + #ifdef linux #ifndef F_NOTIFY #define F_NOTIFY 1026 @@ -52,6 +58,92 @@ #endif #endif +/* inotify support */ + +#if defined(__linux__) && defined(__i386__) + +#define SYS_inotify_init 291 +#define SYS_inotify_add_watch 292 +#define SYS_inotify_rm_watch 293 + +struct inotify_event { + int wd; + unsigned int mask; + unsigned int cookie; + unsigned int len; + char name[1]; +}; + +#define IN_ACCESS 0x00000001 +#define IN_MODIFY 0x00000002 +#define IN_ATTRIB 0x00000004 +#define IN_CLOSE_WRITE 0x00000008 +#define IN_CLOSE_NOWRITE 0x00000010 +#define IN_OPEN 0x00000020 +#define IN_MOVED_FROM 0x00000040 +#define IN_MOVED_TO 0x00000080 +#define IN_CREATE 0x00000100 +#define IN_DELETE 0x00000200 +#define IN_DELETE_SELF 0x00000400 + +static inline int inotify_init( void ) +{ + int ret; + __asm__ __volatile__( "int $0x80" + : "=a" (ret) + : "0" (SYS_inotify_init)); + if (ret<0) { errno = -ret; ret = -1; } + return ret; +} + +static inline int inotify_add_watch( int fd, const char *name, unsigned int mask ) +{ + int ret; + __asm__ __volatile__( "pushl %%ebx;\n\t" + "movl %2,%%ebx;\n\t" + "int $0x80;\n\t" + "popl %%ebx" + : "=a" (ret) : "0" (SYS_inotify_add_watch), + "r" (fd), "c" (name), "d" (mask) ); + if (ret<0) { errno = -ret; ret = -1; } + return ret; +} + +static inline int inotify_remove_watch( int fd, int wd ) +{ + int ret; + __asm__ __volatile__( "pushl %%ebx;\n\t" + "movl %2,%%ebx;\n\t" + "int $0x80;\n\t" + "popl %%ebx" + : "=a" (ret) : "0" (SYS_inotify_rm_watch), + "r" (fd), "c" (wd) ); + if (ret<0) { errno = -ret; ret = -1; } + return ret; +} + +#else + +static inline int inotify_init( void ) +{ + errno = ENOSYS; + return -1; +} + +static inline int inotify_add_watch( int fd, const char *name, unsigned int mask ) +{ + errno = ENOSYS; + return -1; +} + +static inline int inotify_remove_watch( int fd, int wd ) +{ + errno = ENOSYS; + return -1; +} + +#endif + struct dir { struct object obj; /* object header */ @@ -61,6 +153,8 @@ struct dir unsigned int filter; /* notification filter */ int notified; /* SIGIO counter */ long signaled; /* the file changed */ + struct fd *inotify_fd; /* inotify file descriptor */ + int wd; /* inotify watch descriptor */ }; static struct fd *dir_get_fd( struct object *obj ); @@ -100,9 +194,11 @@ static const struct fd_ops dir_fd_ops = static struct list change_list = LIST_INIT(change_list); -static void adjust_changes( int fd, unsigned int filter ) +static void dnotify_adjust_changes( struct dir *dir ) { #if defined(F_SETSIG) && defined(F_NOTIFY) + int fd = get_unix_fd( dir->fd ); + unsigned int filter = dir->filter; unsigned int val; if ( 0 > fcntl( fd, F_SETSIG, SIGIO) ) return; @@ -159,11 +255,13 @@ struct object *create_dir_obj( struct fd dir = alloc_object( &dir_ops ); if (!dir) return NULL; - + dir->event = NULL; dir->filter = 0; dir->notified = 0; dir->signaled = 0; + dir->inotify_fd = NULL; + dir->wd = -1; grab_object( fd ); dir->fd = fd; set_fd_user( fd, &dir_fd_ops, &dir->obj ); @@ -189,37 +287,38 @@ static int dir_signaled( struct object * /* enter here directly from SIGIO signal handler */ void do_change_notify( int unix_fd ) { - struct list *ptr; + struct dir *dir; /* FIXME: this is O(n) ... probably can be improved */ - LIST_FOR_EACH( ptr, &change_list ) + LIST_FOR_EACH_ENTRY( dir, &change_list, struct dir, entry ) { - struct dir *dir = LIST_ENTRY( ptr, struct dir, entry ); if (get_unix_fd( dir->fd ) != unix_fd) continue; interlocked_xchg_add( &dir->notified, 1 ); break; } } +static void dir_signal_changed( struct dir *dir ) +{ + if (dir->event) + set_event( dir->event ); + else + wake_up( &dir->obj, 0 ); +} + /* SIGIO callback, called synchronously with the poll loop */ void sigio_callback(void) { - struct list *ptr; + struct dir *dir; - LIST_FOR_EACH( ptr, &change_list ) + LIST_FOR_EACH_ENTRY( dir, &change_list, struct dir, entry ) { - struct dir *dir = LIST_ENTRY( ptr, struct dir, entry ); long count = interlocked_xchg( &dir->notified, 0 ); if (count) { dir->signaled += count; if (dir->signaled == count) /* was it 0? */ - { - if (dir->event) - set_event( dir->event ); - else - wake_up( &dir->obj, 0 ); - } + dir_signal_changed( dir ); } } } @@ -248,6 +347,13 @@ static void dir_destroy( struct object * if (dir->filter) remove_change( dir ); + if (dir->inotify_fd) + { + if (dir->wd != -1) + inotify_remove_watch( get_unix_fd( dir->inotify_fd ), dir->wd ); + release_object( dir->inotify_fd ); + } + if (dir->event) { set_event( dir->event ); @@ -272,6 +378,101 @@ static int dir_get_info( struct fd *fd ) return 0; } + +static int inotify_get_poll_events( struct fd *fd ); +static void inotify_poll_event( struct fd *fd, int event ); +static int inotify_get_info( struct fd *fd ); + +static const struct fd_ops inotify_fd_ops = +{ + inotify_get_poll_events, /* get_poll_events */ + inotify_poll_event, /* poll_event */ + no_flush, /* flush */ + inotify_get_info, /* get_file_info */ + default_fd_queue_async, /* queue_async */ + default_fd_cancel_async, /* cancel_async */ +}; + +static int inotify_get_poll_events( struct fd *fd ) +{ + return POLLIN; +} + +static void inotify_do_change_notify( struct dir *dir ) +{ + dir->signaled++; + dir_signal_changed( dir ); +} + +static void inotify_poll_event( struct fd *fd, int event ) +{ + int r, ofs, unix_fd; + char buffer[0x1000]; + struct inotify_event *ie; + struct dir *dir = get_fd_user( fd ); + + unix_fd = get_unix_fd( fd ); + r = read( unix_fd, buffer, sizeof buffer ); + if (r < 0) + { + fprintf(stderr,"inotify_poll_event(): inotify read failed!\n"); + return; + } + + for( ofs = 0; ofs < r; ) + { + ie = (struct inotify_event*) &buffer[ofs]; + if (!ie->len) + break; + inotify_do_change_notify( dir ); + ofs += (sizeof (*ie) + ie->len - 1); + } +} + +static int inotify_get_info( struct fd *fd ) +{ + return 0; +} + +static void inotify_adjust_changes( struct dir *dir ) +{ + int filter = dir->filter; + unsigned int mask = 0; + char link[32]; + + if (filter & FILE_NOTIFY_CHANGE_FILE_NAME) + mask |= (IN_MOVED_FROM | IN_MOVED_TO | IN_DELETE | IN_CREATE); + if (filter & FILE_NOTIFY_CHANGE_DIR_NAME) + mask |= (IN_MOVED_FROM | IN_MOVED_TO | IN_DELETE | IN_CREATE | IN_DELETE_SELF); + if (filter & FILE_NOTIFY_CHANGE_ATTRIBUTES) + mask |= IN_ATTRIB; + if (filter & FILE_NOTIFY_CHANGE_SIZE) + mask |= IN_MODIFY; + if (filter & FILE_NOTIFY_CHANGE_LAST_WRITE) + mask |= IN_MODIFY; + if (filter & FILE_NOTIFY_CHANGE_LAST_ACCESS) + mask |= IN_ACCESS; + if (filter & FILE_NOTIFY_CHANGE_CREATION) + mask |= IN_CREATE; + if (filter & FILE_NOTIFY_CHANGE_SECURITY) + mask |= IN_ATTRIB; + + sprintf( link, "/proc/self/fd/%u", get_unix_fd( dir->fd ) ); + dir->wd = inotify_add_watch( get_unix_fd( dir->inotify_fd ), link, mask ); + if (dir->wd != -1) + set_fd_events( dir->inotify_fd, POLLIN ); +} + +static struct fd *create_inotify_fd( struct dir *dir ) +{ + int unix_fd; + + unix_fd = inotify_init(); + if (unix_fd<0) + return NULL; + return create_anonymous_fd( &inotify_fd_ops, unix_fd, &dir->obj ); +} + /* enable change notifications for a directory */ DECL_HANDLER(read_directory_changes) { @@ -311,7 +512,14 @@ DECL_HANDLER(read_directory_changes) if (dir->signaled>0) dir->signaled--; - adjust_changes( get_unix_fd( dir->fd ), dir->filter ); + if (!dir->inotify_fd) + dir->inotify_fd = create_inotify_fd( dir ); + + /* setup the real notification */ + if (dir->inotify_fd) + inotify_adjust_changes( dir ); + else + dnotify_adjust_changes( dir ); set_error(STATUS_PENDING);

1 0

José Manuel Ferrer Ortiz : winecfg: Spanish translation update.
by Alexandre Julliard 30 Jan '06

30 Jan '06

Module: wine Branch: refs/heads/master Commit: cb8fe1dd41dfe4df1a15fce2fec0baee7b254843 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cb8fe1dd41dfe4df1a15fce… Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> Date: Mon Jan 30 18:15:42 2006 +0100 winecfg: Spanish translation update. --- programs/winecfg/Es.rc | 38 +++++++++++++++++++++----------------- 1 files changed, 21 insertions(+), 17 deletions(-) diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index 748c90f..c91a426 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -2,7 +2,7 @@ * WineCfg resources * Spanish Language Support * - * Copyright 2003-2005 Jos� Manuel Ferrer Ortiz + * Copyright 2003-2006 Jos� Manuel Ferrer Ortiz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -46,13 +46,13 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Configuraci�n de aplicaciones",IDC_STATIC, 8,4,244,240 - LTEXT "Wine puede imitar distintas versiones de Windows para cada aplicaci�n. Esta pesta�a est� asociada con las de Librer�as y Gr�ficos, para permitirle tambi�n cambiar en �stas tanto la configuraci�n global como la de cada aplicaci�n.", + LTEXT "Wine puede imitar distintas versiones de Windows para cada aplicaci�n. Esta pesta�a est� vinculada a las de Librer�as y Gr�ficos para poder cambiar en ellas la configuraci�n global y/o la de por aplicaci�n.", IDC_STATIC,15,20,227,30 CONTROL "Aplicaciones",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,50,230,150 PUSHBUTTON "&A�adir aplicaci�n...",IDC_APP_ADDAPP, 90,204,75,14 PUSHBUTTON "&Eliminar aplicaci�n...",IDC_APP_REMOVEAPP, 170,204,75,14 - LTEXT "&Versi�n a imitar:",IDC_STATIC,17,226,58,8 + LTEXT "&Versi�n a imitar:",IDC_STATIC,17,226,58,16 COMBOBOX IDC_WINVER,83,224,163,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -63,28 +63,31 @@ BEGIN LTEXT "Profundidad de color: ",IDC_STATIC,8,10,70,30 COMBOBOX IDC_SCREEN_DEPTH,80,8,170,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Configuraci�n de ventanas",IDC_STATIC,8,25,244,110 + GROUPBOX "Configuraci�n de ventanas",IDC_STATIC,8,25,244,180 + CONTROL "Permitir a los programas DirectX retener el rat�n en sus ventanas",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 CONTROL "Habilitar doble buffer del escritorio",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 - + LTEXT "Si las ventanas son gestionadas por su gestor de ventanas, tendr�n los bordes est�ndar, respetar�n su escritorio virtual y aparecer�n en su lista de ventanas.\n\nSi las ventanas no son gestionadas, estar�n desconectadas de su gestor de ventanas. Esto significa que las ventanas no se integrar�n tanto con su escritorio, pero la emulaci�n ser� m�s precisa por lo que puede hacer que algunos programas funcionen mejor.", + IDC_STATIC,15,58,228,80 + CONTROL "Permitir al gestor de ventanas controlar las ventanas",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,132,230,8 /* FIXME: the wording of this explanation could be a lot better */ LTEXT "Puede elegir entre emular un escritorio de ventanas, donde todas las ventanas est�n confinadas a una 'pantalla virtual', o bien que las ventanas se sit�en en su escritorio est�ndar.", - IDC_STATIC,15,73,228,28 - LTEXT "Dimensiones:",IDC_DESKTOP_SIZE,15,115,44,8,WS_DISABLED - LTEXT "X",IDC_DESKTOP_BY,108,115,8,8,WS_DISABLED + IDC_STATIC,15,146,228,28 + LTEXT "Dimensiones:",IDC_DESKTOP_SIZE,15,188,44,8,WS_DISABLED + LTEXT "X",IDC_DESKTOP_BY,108,188,8,8,WS_DISABLED CONTROL "Emular un escritorio virtual",IDC_ENABLE_DESKTOP,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 + BS_AUTOCHECKBOX | WS_TABSTOP,15,173,230,10 - EDITTEXT IDC_DESKTOP_WIDTH,64,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - EDITTEXT IDC_DESKTOP_HEIGHT,117,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_WIDTH,64,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED + EDITTEXT IDC_DESKTOP_HEIGHT,117,188,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED - GROUPBOX " Direct3D ",IDC_STATIC,8,140,244,120 + GROUPBOX " Direct3D ",IDC_STATIC,8,210,244,50 - LTEXT "Soporte Vertex Shader: ",IDC_STATIC,15,150,80,30 - COMBOBOX IDC_D3D_VSHADER_MODE,100,148,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Soporte Vertex Shader: ",IDC_STATIC,15,220,80,30 + COMBOBOX IDC_D3D_VSHADER_MODE,100,218,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Permitir Pixel Shader (si hay soporte por hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,165,230,10 + CONTROL "Permitir Pixel Shader (si hay soporte por hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,237,230,10 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -159,8 +162,8 @@ IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Driver Selection ",IDC_STATIC,8,4,244,195 - LTEXT "Manejador audio:",IDC_STATIC,15,20,227,30 + GROUPBOX "Selecci�n de manejador",IDC_STATIC,8,4,244,195 + LTEXT "Seleccione un manejador de sonido marcando la casilla del deseado. Para deshabilitar el sonido no seleccione ninguno. La selecci�n de m�s de un manejador no se recomienda. Configure un manejador haciendo doble click sobre �l.",IDC_STATIC,15,20,227,30 CONTROL "Dispositivos",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 PUSHBUTTON "Panel de control",IDC_AUDIO_CONTROL_PANEL,170,50,59,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 @@ -199,4 +202,5 @@ BEGIN IDS_WINECFG_TITLE "Configuraci�n de Wine" IDS_THEMEFILE "Ficheros de tema" IDS_THEMEFILE_SELECT "Seleccione un fichero de tema" + IDS_AUDIO_MISSING "Actualmente no hay ning�n manejador de audio especificado en el registro.\n\nSe ha seleccionado un manejador recomendado para usted. Puede usar este manejador o seleccionar otro manejador disponible.\n\nDebe pulsar Aplicar para que la selecci�n surja efecto." END

1 0

lostwages/templates/en download.template
by Jeremy Newman 30 Jan '06

30 Jan '06

ChangeSet ID: 22600 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/01/30 10:29:06 Modified files: templates/en : download.template Log message: Tony Lambregts <tony.lambregts(a)gmail.com> update note to the WineTools link to direct users to the author Patch: http://cvs.winehq.org/patch.py?id=22600 Old revision New revision Changes Path 1.74 1.75 +2 -1 lostwages/templates/en/download.template Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.74 lostwages/templates/en/download.template:1.75 --- lostwages/templates/en/download.template:1.74 30 Jan 2006 16:29: 6 -0000 +++ lostwages/templates/en/download.template 30 Jan 2006 16:29: 6 -0000 @@ -133,7 +133,8 @@ for post-installation instructions.</b>< <b>Note:</b> WineTools only recommended if installation or operability of Windows software failed on pure Wine. Since WineTools radically alters your Wine configuration please do not report bugs in programs with WineTools - installed. + installed. Instead contact the author of WineTools + <a href="mailto:thadden(a)web.de">Joachim von Thadden</a>. </div> </td> </tr>

1 0

wiki/. wikiconfig.py
by Dimi Paun 30 Jan '06

30 Jan '06

ChangeSet ID: 1138637199749623421420441 CVSROOT: /cvsroot/wine Module name: wiki Changes by: dimi(a)sc8-pr-cvs1.sourceforge.net 2006/01/30 08:06:39 Modified files: . : wikiconfig.py Log message: Allow robots to follow normal links for the time being. Old revision New revision Changes Path 1.4 1.5 +3 -0 wiki/wikiconfig.py Index: wiki/wikiconfig.py diff -u -p wiki/wikiconfig.py:1.4 wiki/wikiconfig.py:1.5 --- wiki/wikiconfig.py 30 Jan 2006 16: 6:39 -0000 +++ /dev/null 30 Jan 2006 16: 6:39 -0000 @@ -143,6 +143,9 @@ class Config(DefaultConfig): # Content options --------------------------------------------------- + # Allow normal links to be followed (for now at least) + html_head_normal = '''<meta name="robots" content="index,follow">\n''' + # Show users hostnames in RecentChanges show_hosts = 1

1 0

Alexandre Julliard : Fixed creation of PS_ALTERNATE pens.
by Alexandre Julliard 30 Jan '06

30 Jan '06

Module: wine Branch: refs/heads/master Commit: 6b76244bf42a82f523f1c6c22607187dc1ce9c7d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6b76244bf42a82f523f1c6c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 15:02:53 2006 +0100 Fixed creation of PS_ALTERNATE pens. --- dlls/comctl32/treeview.c | 5 ++++- dlls/user/uitools.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index df71326..b333fa3 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2316,11 +2316,14 @@ TREEVIEW_DrawItemLines(TREEVIEW_INFO *in { HPEN hOldPen, hNewPen; HTREEITEM parent; + LOGBRUSH lb; /* * Get a dotted grey pen */ - hNewPen = CreatePen(PS_ALTERNATE, 0, infoPtr->clrLine); + lb.lbStyle = BS_SOLID; + lb.lbColor = infoPtr->clrLine; + hNewPen = ExtCreatePen(PS_COSMETIC|PS_ALTERNATE, 1, &lb, 0, NULL); hOldPen = SelectObject(hdc, hNewPen); MoveToEx(hdc, item->stateOffset, centery, NULL); diff --git a/dlls/user/uitools.c b/dlls/user/uitools.c index be23841..9e8f3bb 100644 --- a/dlls/user/uitools.c +++ b/dlls/user/uitools.c @@ -1480,9 +1480,12 @@ BOOL WINAPI DrawFocusRect( HDC hdc, cons HBRUSH hOldBrush; HPEN hOldPen, hNewPen; INT oldDrawMode, oldBkMode; + LOGBRUSH lb; hOldBrush = SelectObject(hdc, GetStockObject(NULL_BRUSH)); - hNewPen = CreatePen(PS_ALTERNATE, 1, GetSysColor(COLOR_WINDOWTEXT)); + lb.lbStyle = BS_SOLID; + lb.lbColor = GetSysColor(COLOR_WINDOWTEXT); + hNewPen = ExtCreatePen(PS_COSMETIC|PS_ALTERNATE, 1, &lb, 0, NULL); hOldPen = SelectObject(hdc, hNewPen); oldDrawMode = SetROP2(hdc, R2_XORPEN); oldBkMode = SetBkMode(hdc, TRANSPARENT);

1 0

Tobias Loew : comctl32: Fix tab-control flickering.
by Alexandre Julliard 30 Jan '06

30 Jan '06

Module: wine Branch: refs/heads/master Commit: 1911eed08e4d1b46e90c60eb4004a187aaa63acd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1911eed08e4d1b46e90c60e… Author: Tobias Loew <tobi(a)die-loews.de> Date: Mon Jan 30 14:57:26 2006 +0100 comctl32: Fix tab-control flickering. --- dlls/comctl32/tab.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index dd9dbe5..5c9443c 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -261,9 +261,11 @@ static inline LRESULT TAB_SetCurSel (TAB if (iItem >= 0 && iItem < infoPtr->uNumItem) { prevItem=infoPtr->iSelected; - infoPtr->iSelected=iItem; - TAB_EnsureSelectionVisible(infoPtr); - TAB_InvalidateTabArea(infoPtr); + if (infoPtr->iSelected != iItem) { + infoPtr->iSelected=iItem; + TAB_EnsureSelectionVisible(infoPtr); + TAB_InvalidateTabArea(infoPtr); + } } return prevItem; }

1 0

Maarten Lankhorst : x11drv: Fix AlphaBlend read boundaries.
by Alexandre Julliard 30 Jan '06

30 Jan '06

Module: wine Branch: refs/heads/master Commit: 0cbf8062a1818ab1f7bc8f9a06c5f7812eee87f9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0cbf8062a1818ab1f7bc8f9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Jan 30 14:57:08 2006 +0100 x11drv: Fix AlphaBlend read boundaries. --- dlls/x11drv/xrender.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/x11drv/xrender.c b/dlls/x11drv/xrender.c index 81e7398..a782ea5 100644 --- a/dlls/x11drv/xrender.c +++ b/dlls/x11drv/xrender.c @@ -1554,14 +1554,14 @@ BOOL X11DRV_AlphaBlend(X11DRV_PDEVICE *d top_down = TRUE; dstbits += widthSrc * (heightSrc - 1) * 4; y2 = ySrc; - y = y2 + heightSrc; + y = y2 + heightSrc - 1; } else { y = dib.dsBmih.biHeight - ySrc - 1; - y2 = y - heightSrc; + y2 = y - heightSrc + 1; } - for(; y > y2; y--) { + for(; y >= y2; y--) { memcpy(dstbits, (char *)dib.dsBm.bmBits + y * dib.dsBm.bmWidthBytes + xSrc * 4, widthSrc * 4); dstbits += (top_down ? -1 : 1) * widthSrc * 4;

1 0

Mike McCormack : msi: Add an implementation of MsiGetDatabaseState.
by Alexandre Julliard 30 Jan '06

30 Jan '06

Module: wine Branch: refs/heads/master Commit: 43b27144f06a739dde09d565bd0c6f80eed940d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=43b27144f06a739dde09d56… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 30 14:56:52 2006 +0100 msi: Add an implementation of MsiGetDatabaseState. --- dlls/msi/database.c | 17 +++++++++++++++++ dlls/msi/msi.spec | 2 +- include/msiquery.h | 9 +++++++++ 3 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 4da5338..9d3f7d6 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -344,3 +344,20 @@ end: return r; } + +MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle ) +{ + MSIDBSTATE ret = MSIDBSTATE_READ; + MSIDATABASE *db; + + TRACE("%ld\n", handle); + + db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ); + if (!db) + return MSIDBSTATE_ERROR; + if (db->mode != MSIDBOPEN_READONLY ) + ret = MSIDBSTATE_WRITE; + msiobj_release( &db->hdr ); + + return ret; +} diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 802adef..7c0ea81 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -45,7 +45,7 @@ 49 stdcall MsiGetActiveDatabase(long) 50 stdcall MsiGetComponentStateA(long str ptr ptr) 51 stdcall MsiGetComponentStateW(long wstr ptr ptr) -52 stub MsiGetDatabaseState +52 stdcall MsiGetDatabaseState(long) 53 stub MsiGetFeatureCostA 54 stub MsiGetFeatureCostW 55 stub MsiGetFeatureInfoA diff --git a/include/msiquery.h b/include/msiquery.h index 09e5c16..c85ca1c 100644 --- a/include/msiquery.h +++ b/include/msiquery.h @@ -127,6 +127,13 @@ typedef enum tagMSIDBERROR MSIDBERROR_BADLOCALIZEATTRIB = 29 } MSIDBERROR; +typedef enum tagMSIDBSTATE +{ + MSIDBSTATE_ERROR = -1, + MSIDBSTATE_READ = 0, + MSIDBSTATE_WRITE = 1 +} MSIDBSTATE; + /* view manipulation */ UINT WINAPI MsiViewFetch(MSIHANDLE,MSIHANDLE*); UINT WINAPI MsiViewExecute(MSIHANDLE,MSIHANDLE); @@ -138,6 +145,8 @@ MSIDBERROR WINAPI MsiViewGetErrorA(MSIHA MSIDBERROR WINAPI MsiViewGetErrorW(MSIHANDLE,LPWSTR,DWORD*); #define MsiViewGetError WINELIB_NAME_AW(MsiViewGetError) +MSIDBSTATE WINAPI MsiGetDatabaseState(MSIHANDLE); + /* record manipulation */ MSIHANDLE WINAPI MsiCreateRecord(unsigned int); UINT WINAPI MsiRecordClearData(MSIHANDLE);

1 0