February 2006 - Wine-Commits

Jacek Caban : mshtml: Fix post data parsing.
by Alexandre Julliard Feb. 17, 2006

Feb. 17, 2006

Module: wine Branch: refs/heads/master Commit: d2389dc0cf16511266884df583f5d86fd5357cf0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d2389dc0cf16511266884df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 17 11:37:11 2006 +0100 mshtml: Fix post data parsing. --- dlls/mshtml/navigate.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index f2367ea..c1cd9f6 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -404,6 +404,8 @@ static void parse_post_data(nsIInputStre nsIInputStream_Available(post_data_stream, &available); post_data = GlobalAlloc(0, available+1); nsIInputStream_Read(post_data_stream, post_data, available, &post_data_len); + + TRACE("post_data = %s\n", debugstr_an(post_data, post_data_len)); ptr = ptr2 = post_data; @@ -452,8 +454,8 @@ static void parse_post_data(nsIInputStre } if(headers_len) { - memmove(post_data, ptr, ptr-(const char*)post_data); post_data_len -= ptr-(const char*)post_data; + memmove(post_data, ptr, post_data_len); post_data = GlobalReAlloc(post_data, post_data_len+1, 0); } @@ -476,7 +478,7 @@ void hlink_frame_navigate(NSContainer *c if(post_data_stream) { parse_post_data(post_data_stream, &headers, &post_data, &post_data_len); - TRACE("%s %s\n", debugstr_w(headers), debugstr_a(post_data)); + TRACE("headers = %s post_data = %s\n", debugstr_w(headers), debugstr_a(post_data)); } callback = BSCallback_Create(container->doc, uri, post_data, post_data_len, headers);

1 0

Alexandre Julliard : libwine: Try the current load path in priority before the
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: 9dffd134ddcab7d87f2507e3bc37a8ee8029f5dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9dffd134ddcab7d87f2507e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 16 20:26:55 2006 +0100 libwine: Try the current load path in priority before the WINELOADER/WINESERVER environment variables in wine_exec_wine_binary. --- dlls/kernel/process.c | 10 ++-------- dlls/ntdll/server.c | 20 ++------------------ include/wine/library.h | 2 +- libs/wine/config.c | 32 ++++++++++++++++++-------------- loader/glibc.c | 40 ++++++++++++++++++++++------------------ 5 files changed, 45 insertions(+), 59 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index c81ba03..5a7678d 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -1481,14 +1481,8 @@ static BOOL create_process( HANDLE hFile if (winedebug) putenv( winedebug ); if (unixdir) chdir(unixdir); - if (argv) - { - /* first, try for a WINELOADER environment variable */ - const char *loader = getenv("WINELOADER"); - if (loader) wine_exec_wine_binary( loader, argv, NULL, TRUE ); - /* now use the standard search strategy */ - wine_exec_wine_binary( NULL, argv, NULL, TRUE ); - } + if (argv) wine_exec_wine_binary( NULL, argv, getenv("WINELOADER") ); + err = errno; write( execfd[1], &err, sizeof(err) ); _exit(1); diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 88c0015..dd9baeb 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -589,7 +589,6 @@ void wine_server_release_fd( obj_handle_ static void start_server( const char *oldcwd ) { static int started; /* we only try once */ - char *path, *p; char *argv[3]; if (!started) @@ -602,22 +601,7 @@ static void start_server( const char *ol argv[0] = "wineserver"; argv[1] = TRACE_ON(server) ? "-d" : NULL; argv[2] = NULL; - /* if server is explicitly specified, use this */ - if ((p = getenv("WINESERVER"))) - { - if (p[0] != '/' && oldcwd[0] == '/') /* make it an absolute path */ - { - if (!(path = malloc( strlen(oldcwd) + strlen(p) + 1 ))) - fatal_error( "out of memory\n" ); - sprintf( path, "%s/%s", oldcwd, p ); - p = path; - } - wine_exec_wine_binary( p, argv, NULL, FALSE ); - fatal_perror( "could not exec the server '%s'\n" - " specified in the WINESERVER environment variable", p ); - } - /* now use the standard search strategy */ - wine_exec_wine_binary( argv[0], argv, NULL, FALSE ); + wine_exec_wine_binary( argv[0], argv, getenv("WINESERVER") ); fatal_error( "could not exec wineserver\n" ); } waitpid( pid, &status, 0 ); @@ -809,7 +793,7 @@ static void create_config_dir(void) argv[3] = "--prefix"; argv[4] = tmp_dir; argv[5] = NULL; - wine_exec_wine_binary( argv[0], (char **)argv, NULL, FALSE ); + wine_exec_wine_binary( argv[0], (char **)argv, NULL ); rmdir( tmp_dir ); fatal_perror( "could not exec wineprefixcreate" ); } diff --git a/include/wine/library.h b/include/wine/library.h index aa689c0..e92262c 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -33,7 +33,7 @@ extern const char *wine_get_config_dir(v extern const char *wine_get_server_dir(void); extern const char *wine_get_user_name(void); extern void wine_init_argv0_path( const char *argv0 ); -extern void wine_exec_wine_binary( const char *name, char **argv, char **envp, int use_preloader ); +extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ); /* dll loading */ diff --git a/libs/wine/config.c b/libs/wine/config.c index e2bdc5a..77dbb5d 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -375,7 +375,7 @@ const char *wine_get_user_name(void) } /* exec a binary using the preloader if requested; helper for wine_exec_wine_binary */ -static void preloader_exec( char **argv, char **envp, int use_preloader ) +static void preloader_exec( char **argv, int use_preloader ) { #ifdef linux if (use_preloader) @@ -396,36 +396,40 @@ static void preloader_exec( char **argv, new_argv = xmalloc( (last_arg - argv + 2) * sizeof(*argv) ); memcpy( new_argv + 1, argv, (last_arg - argv + 1) * sizeof(*argv) ); new_argv[0] = full_name; - if (envp) execve( full_name, new_argv, envp ); - else execv( full_name, new_argv ); + execv( full_name, new_argv ); free( new_argv ); free( full_name ); return; } #endif - if (envp) execve( argv[0], argv, envp ); - else execv( argv[0], argv ); + execv( argv[0], argv ); } /* exec a wine internal binary (either the wine loader or the wine server) */ -void wine_exec_wine_binary( const char *name, char **argv, char **envp, int use_preloader ) +void wine_exec_wine_binary( const char *name, char **argv, const char *env_var ) { static const char bindir[] = BINDIR; const char *path, *pos, *ptr; + int use_preloader = 0; - if (name && strchr( name, '/' )) + if (!name) /* no name means default loader */ { - argv[0] = (char *)name; - preloader_exec( argv, envp, use_preloader ); - return; + name = argv0_name; + use_preloader = 1; } - else if (!name) name = argv0_name; /* first, bin directory from the current libdir or argv0 */ argv[0] = get_path_from_libdir( bindir, argv0_path, name ); - preloader_exec( argv, envp, use_preloader ); + preloader_exec( argv, use_preloader ); free( argv[0] ); + /* then specified environment variable */ + if (env_var) + { + argv[0] = (char *)env_var; + preloader_exec( argv, use_preloader ); + } + /* now search in the Unix path */ if ((path = getenv( "PATH" ))) { @@ -439,7 +443,7 @@ void wine_exec_wine_binary( const char * memcpy( argv[0], pos, ptr - pos ); strcpy( argv[0] + (ptr - pos), "/" ); strcat( argv[0] + (ptr - pos), name ); - preloader_exec( argv, envp, use_preloader ); + preloader_exec( argv, use_preloader ); pos = ptr; } free( argv[0] ); @@ -450,5 +454,5 @@ void wine_exec_wine_binary( const char * strcpy( argv[0], bindir ); strcat( argv[0], "/" ); strcat( argv[0], name ); - preloader_exec( argv, envp, use_preloader ); + preloader_exec( argv, use_preloader ); } diff --git a/loader/glibc.c b/loader/glibc.c index 0cdf408..4d15d5c 100644 --- a/loader/glibc.c +++ b/loader/glibc.c @@ -67,6 +67,19 @@ static const char *get_threading(void) return ret ? "wine-pthread" : "wine-kthread"; } +/* build a new full path from the specified path and name */ +static const char *build_new_path( const char *path, const char *name ) +{ + const char *p; + char *ret; + + if (!(p = strrchr( path, '/' ))) return name; + p++; + ret = xmalloc( (p - path) + strlen(name) + 1 ); + memcpy( ret, path, p - path ); + strcpy( ret + (p - path), name ); + return ret; +} /********************************************************************** * main @@ -75,31 +88,22 @@ int main( int argc, char *argv[] ) { const char *loader = getenv( "WINELOADER" ); const char *threads = get_threading(); + const char *new_argv0 = build_new_path( argv[0], threads ); + + wine_init_argv0_path( new_argv0 ); if (loader) { - const char *path; - char *new_name, *new_loader; - - if ((path = strrchr( loader, '/' ))) path++; - else path = loader; - - new_name = xmalloc( (path - loader) + strlen(threads) + 1 ); - memcpy( new_name, loader, path - loader ); - strcpy( new_name + (path - loader), threads ); - /* update WINELOADER with the new name */ - new_loader = xmalloc( sizeof("WINELOADER=") + strlen(new_name) ); + const char *new_name = build_new_path( loader, threads ); + char *new_loader = xmalloc( sizeof("WINELOADER=") + strlen(new_name) ); strcpy( new_loader, "WINELOADER=" ); strcat( new_loader, new_name ); putenv( new_loader ); - wine_exec_wine_binary( new_name, argv, NULL, TRUE ); + loader = new_name; } - else - { - wine_init_argv0_path( argv[0] ); - wine_exec_wine_binary( threads, argv, NULL, TRUE ); - } - fprintf( stderr, "wine: could not exec %s\n", argv[0] ); + + wine_exec_wine_binary( NULL, argv, loader ); + fprintf( stderr, "wine: could not exec %s\n", threads ); exit(1); }

1 0

Alexandre Julliard : libwine: Don't rely on argv[0] in wine_exec_wine_binary if we can get
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: 767ad69a456f4ba2e35d297069188a0e5773a62c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=767ad69a456f4ba2e35d297… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 16 20:06:20 2006 +0100 libwine: Don't rely on argv[0] in wine_exec_wine_binary if we can get the directory from the library itself. Only try the hardcoded BINDIR if everything else failed. --- libs/wine/config.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 7b4c969..e2bdc5a 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -154,7 +154,7 @@ static const char *get_runtime_libdir(vo } /* determine the proper location of the given path based on the current libdir */ -static char *get_path_from_libdir( const char *path, const char *filename ) +static char *get_path_from_libdir( const char *path, const char *fallback, const char *filename ) { char *p, *ret; const char *libdir = get_runtime_libdir(); @@ -184,6 +184,7 @@ static char *get_path_from_libdir( const } else { + if (fallback) path = fallback; ret = xmalloc( strlen(path) + strlen(filename) + 2 ); strcpy( ret, path ); p = ret + strlen(ret); @@ -229,7 +230,7 @@ const char *get_default_dlldir(void) { static const char *dlldir; - if (!dlldir) dlldir = get_path_from_libdir( DLLDIR, "" ); + if (!dlldir) dlldir = get_path_from_libdir( DLLDIR, NULL, "" ); return dlldir; } @@ -409,6 +410,7 @@ static void preloader_exec( char **argv, /* exec a wine internal binary (either the wine loader or the wine server) */ void wine_exec_wine_binary( const char *name, char **argv, char **envp, int use_preloader ) { + static const char bindir[] = BINDIR; const char *path, *pos, *ptr; if (name && strchr( name, '/' )) @@ -419,21 +421,11 @@ void wine_exec_wine_binary( const char * } else if (!name) name = argv0_name; - /* first, try bin directory */ - argv[0] = get_path_from_libdir( BINDIR, name ); + /* first, bin directory from the current libdir or argv0 */ + argv[0] = get_path_from_libdir( bindir, argv0_path, name ); preloader_exec( argv, envp, use_preloader ); free( argv[0] ); - /* now try the path of argv0 of the current binary */ - if (argv0_path) - { - argv[0] = xmalloc( strlen(argv0_path) + strlen(name) + 1 ); - strcpy( argv[0], argv0_path ); - strcat( argv[0], name ); - preloader_exec( argv, envp, use_preloader ); - free( argv[0] ); - } - /* now search in the Unix path */ if ((path = getenv( "PATH" ))) { @@ -452,4 +444,11 @@ void wine_exec_wine_binary( const char * } free( argv[0] ); } + + /* and finally try BINDIR */ + argv[0] = xmalloc( sizeof(bindir) + 1 + strlen(name) ); + strcpy( argv[0], bindir ); + strcat( argv[0], "/" ); + strcat( argv[0], name ); + preloader_exec( argv, envp, use_preloader ); }

1 0

Alexandre Julliard : libwine: Only use the library directory if it' s an absolute path.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: ca6fd0d4eceae51f816457f425111a811d6ef057 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ca6fd0d4eceae51f816457f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 16 20:03:06 2006 +0100 libwine: Only use the library directory if it's an absolute path. --- libs/wine/config.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 33aa87a..7b4c969 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -139,10 +139,10 @@ static const char *get_runtime_libdir(vo #ifdef HAVE_DLADDR Dl_info info; - char *p; - if (!libdir && dladdr( get_runtime_libdir, &info ) && (p = strrchr( info.dli_fname, '/' ))) + if (!libdir && dladdr( get_runtime_libdir, &info ) && info.dli_fname[0] == '/') { + const char *p = strrchr( info.dli_fname, '/' ); unsigned int len = p - info.dli_fname; if (!len) len++; /* include initial slash */ libdir = xmalloc( len + 1 );

1 0

Paul Vriens : winecfg: Localize the app specific title.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: 3c3a7724fc009ac2a968992c76b16a8d5e8177d1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3c3a7724fc009ac2a968992… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Thu Feb 16 19:44:53 2006 +0100 winecfg: Localize the app specific title. --- programs/winecfg/Bg.rc | 1 + programs/winecfg/De.rc | 1 + programs/winecfg/En.rc | 1 + programs/winecfg/Es.rc | 1 + programs/winecfg/Fi.rc | 1 + programs/winecfg/Fr.rc | 1 + programs/winecfg/Ja.rc | 1 + programs/winecfg/Ko.rc | 1 + programs/winecfg/Nl.rc | 1 + programs/winecfg/No.rc | 1 + programs/winecfg/Ru.rc | 1 + programs/winecfg/Tr.rc | 1 + programs/winecfg/resource.h | 1 + programs/winecfg/winecfg.c | 11 +++++------ 14 files changed, 18 insertions(+), 6 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index 88b63a9..7c57470 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -210,6 +210,7 @@ BEGIN IDS_TAB_AUDIO "��" IDS_TAB_ABOUT "��" IDS_WINECFG_TITLE "�� Wine" + IDS_WINECFG_TITLE_APP "Wine configuration for %s" IDS_THEMEFILE "�� " IDS_THEMEFILE_SELECT "�� " IDS_AUDIO_MISSING "�� .\n\n�� .\n�� .\n\n�� , �� ." diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index d8b5e54..aabba0d 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -204,6 +204,7 @@ BEGIN IDS_TAB_AUDIO "Audio" IDS_TAB_ABOUT "�ber" IDS_WINECFG_TITLE "Wine-Konfiguration" + IDS_WINECFG_TITLE_APP "Wine-Konfiguration f�r %s" IDS_THEMEFILE "Motiv-Dateien" IDS_THEMEFILE_SELECT "Motiv-Datei ausw�hlen" IDS_AUDIO_MISSING "Zur Zeit ist kein Audio Treiber in der Registry eingetragen.\n\nEin bevorzugter Treiber wurde f�r Sie ausgew�hlt.\nSie k�nnen diesen Treiber nutzen oder einen anderen ausw�hlen, sofern dieser vorhanden ist.\n\nSie m�ssen auf Anwenden klicken, damit die �nderung �bernommen wird." diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 482a589..243913b 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -206,6 +206,7 @@ BEGIN IDS_TAB_AUDIO "Audio" IDS_TAB_ABOUT "About" IDS_WINECFG_TITLE "Wine configuration" + IDS_WINECFG_TITLE_APP "Wine configuration for %s" IDS_THEMEFILE "Theme files" IDS_THEMEFILE_SELECT "Select a theme file" IDS_AUDIO_MISSING "There is no audio driver currently specified in the registry.\n\nA recommended driver has been selected for you.\nYou can use this driver or select another driver if available.\n\nYou must click Apply for the selection to take effect." diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index e86159b..c8c7e3f 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -204,6 +204,7 @@ BEGIN IDS_TAB_AUDIO "Audio" IDS_TAB_ABOUT "Acerca de" IDS_WINECFG_TITLE "Configuraci�n de Wine" + IDS_WINECFG_TITLE_APP "Wine configuration for %s" 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." diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc index 436d474..2da0364 100644 --- a/programs/winecfg/Fi.rc +++ b/programs/winecfg/Fi.rc @@ -200,6 +200,7 @@ BEGIN IDS_TAB_AUDIO "��ni" IDS_TAB_ABOUT "Tietoja" IDS_WINECFG_TITLE "Winen asetukset" + IDS_WINECFG_TITLE_APP "Wine configuration for %s" IDS_THEMEFILE "Teema -tiedostot" IDS_THEMEFILE_SELECT "Valitse teeman tiedosto" IDS_SHELL_FOLDER "Shell Folder" diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 326c0b8..b8bee8d 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -202,6 +202,7 @@ BEGIN IDS_TAB_AUDIO "Audio" IDS_TAB_ABOUT "A propos" IDS_WINECFG_TITLE "Configuration de Wine" + IDS_WINECFG_TITLE_APP "Wine configuration for %s" IDS_THEMEFILE "Fichiers de th�mes" IDS_THEMEFILE_SELECT "S�lectionnez un fichier de th�me" IDS_SHELL_FOLDER "Dossier syst�me" diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index 11854cb..4d4ec8e 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -203,6 +203,7 @@ BEGIN IDS_TAB_AUDIO "�I�[�f�B�I" IDS_TAB_ABOUT "Wine�ɂ��" IDS_WINECFG_TITLE "Wine�ݒ�" + IDS_WINECFG_TITLE_APP "Wine configuration for %s" IDS_THEMEFILE "�e�[�}�t�@�C��" IDS_THEMEFILE_SELECT "�e�[�}�t�@�C��I��ł��" IDS_SHELL_FOLDER "Shell Folder" diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 8318ecc..8fe62c0 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -208,6 +208,7 @@ BEGIN IDS_TAB_AUDIO "��" IDS_TAB_ABOUT "��" IDS_WINECFG_TITLE "Wine ��" + IDS_WINECFG_TITLE_APP "Wine configuration for %s" IDS_THEMEFILE "�׸� ��" IDS_THEMEFILE_SELECT "�׸� �� " IDS_AUDIO_MISSING "��Ʈ��  �� ̹�� ϴ�.\n\n�� ̹�� ϱ⸦ ��õ�մϴ�.\n�� ̹�� ٸ� ��̹�� ֽ��ϴ�.\n\n�� ݵ�� ϰ� Ŭ��ؾ� �˴ϴ�." diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 6d0e61c..6aefbb6 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -206,6 +206,7 @@ BEGIN IDS_TAB_AUDIO "Audio" IDS_TAB_ABOUT "Info" IDS_WINECFG_TITLE "Wine configuratie" + IDS_WINECFG_TITLE_APP "Wine configuratie voor %s" IDS_THEMEFILE "Thema-bestanden" IDS_THEMEFILE_SELECT "Thema-bestanden kiezen" IDS_AUDIO_MISSING "Op dit moment is er geen audio stuurbestand gespecificeerd in de registry.\n\nEen aanbevolen stuurbestand is voor u geselecteerd.\nU kunt dit stuurbestand gebruiken of (indien beschikbaar) een ander selecteren.\n\nKlik op 'Toepassen' om deze selectie te activeren." diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index feb4b61..a4bfad9 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -203,6 +203,7 @@ BEGIN IDS_TAB_AUDIO "Lyd" IDS_TAB_ABOUT "Om" IDS_WINECFG_TITLE "Oppsett av Wine" + IDS_WINECFG_TITLE_APP "Wine configuration for %s" IDS_THEMEFILE "Temafiler" IDS_THEMEFILE_SELECT "Velg en temafil" IDS_AUDIO_MISSING "Ingen lyddriver er oppgitt i registeret.\n\nEn anbefalt driver er valgt for deg;\nbruk den eller velg en annen,\n\nog trykk �Bruk� for at endringene skal tre i kraft." diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 125a011..147439d 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -205,6 +205,7 @@ BEGIN IDS_TAB_AUDIO "��" IDS_TAB_ABOUT "� ��" IDS_WINECFG_TITLE "�� Wine" + IDS_WINECFG_TITLE_APP "Wine configuration for %s" IDS_THEMEFILE "�� " IDS_THEMEFILE_SELECT "�� " IDS_SHELL_FOLDER "Shell Folder" diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc index d83ec94..1c16ebb 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc @@ -203,6 +203,7 @@ BEGIN IDS_TAB_AUDIO "Ses" IDS_TAB_ABOUT "Hakk�nda" IDS_WINECFG_TITLE "Wine yap�land�rmas�" + IDS_WINECFG_TITLE_APP "Wine configuration for %s" IDS_THEMEFILE "Tema dosyalar�" IDS_THEMEFILE_SELECT "Tema dosyas� se�in" IDS_AUDIO_MISSING "Sistem kayd�nda belirlenmi� bir ses s�r�c�s� yok.\n\n�nerilen bir s�r�c� sizin i�in se�ildi.\nBu s�r�c�y� kullanabilir veya varsa ba�ka bir s�r�c�y� se�ebilirsiniz.\n\nSe�imin etkili olabilmesi i�in Uygula'y� t�klamal�s�n�z." diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index effe459..52b239e 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -41,6 +41,7 @@ #define IDS_THEMEFILE_SELECT 15 #define IDS_SHELL_FOLDER 16 #define IDS_LINKS_TO 17 +#define IDS_WINECFG_TITLE_APP 18 /* App specific title */ #define IDD_MAINDLG 101 #define IDB_WINE 104 #define IDD_ABOUTCFG 107 diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index df2b05f..748f214 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -53,23 +53,22 @@ HMENU hPopupMenus = 0; */ void set_window_title(HWND dialog) { - char *newtitle; + char newtitle[256]; /* update the window title */ if (current_app) { - const char *template = "Wine Configuration for %s"; - newtitle = HeapAlloc(GetProcessHeap(), 0, strlen(template) + strlen(current_app) + 1); - sprintf(newtitle, template, current_app); + char apptitle[256]; + LoadString(GetModuleHandle(NULL), IDS_WINECFG_TITLE_APP, apptitle, 256); + sprintf(newtitle, apptitle, current_app); } else { - newtitle = strdupA("Wine Configuration"); + LoadString(GetModuleHandle(NULL), IDS_WINECFG_TITLE, newtitle, 256); } WINE_TRACE("setting title to %s\n", newtitle); SendMessage(GetParent(dialog), PSM_SETTITLE, 0, (LPARAM) newtitle); - HeapFree(GetProcessHeap(), 0, newtitle); }

1 0

Juan Lang : crypt32: More encoding/decoding.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: 11fe62de8fb334ed89da1765b80d231281833250 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=11fe62de8fb334ed89da176… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Feb 16 19:39:27 2006 +0100 crypt32: More encoding/decoding. Add support for encoding/decoding basic constraints and enhanced key usage, with tests. --- dlls/crypt32/encode.c | 223 ++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/encode.c | 197 +++++++++++++++++++++++++++++++++++--- 2 files changed, 399 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=11fe62de8fb334ed89d…

1 0

Juan Lang : crypt32: Simplify CertOpenSystemStore, fix CertDuplicateCertificateContext.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: 15e5dc29c158615acdaf06decd5f0c5f2cf76528 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15e5dc29c158615acdaf06d… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Thu Feb 16 19:38:45 2006 +0100 crypt32: Simplify CertOpenSystemStore, fix CertDuplicateCertificateContext. - now that CertOpenStore is correct for system stores, simplify CertOpenSystemStore - correct CertDuplicateCertificateStore, with a test --- dlls/crypt32/cert.c | 138 +++++++++++++++++++++++++-------------------- dlls/crypt32/tests/cert.c | 46 +++++++++++++++ 2 files changed, 124 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=15e5dc29c158615acda…

1 0

YunSong Hwang : progman: Updated Korean translation.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: dc8f5ee48b9bc71ca0314baf2064be7f42779cf4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc8f5ee48b9bc71ca0314ba… Author: YunSong Hwang <hys545(a)dreamwiz.com> Date: Thu Feb 16 19:38:19 2006 +0100 progman: Updated Korean translation. --- programs/progman/Ko.rc | 329 +++++++++++++++++++++++++++++++--------------- programs/progman/rsrc.rc | 2 2 files changed, 221 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=dc8f5ee48b9bc71ca03…

1 0

Huw Davies : msxml3: Implement comment node.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: a545fee7192a7edabca3203e8db02913c370e7a1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a545fee7192a7edabca3203… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 16 19:37:53 2006 +0100 msxml3: Implement comment node. --- dlls/msxml3/Makefile.in | 1 dlls/msxml3/comment.c | 588 +++++++++++++++++++++++++++++++++++++++++++ dlls/msxml3/msxml_private.h | 3 dlls/msxml3/node.c | 9 - 4 files changed, 597 insertions(+), 4 deletions(-) create mode 100644 dlls/msxml3/comment.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a545fee7192a7edabca…

1 0

Huw Davies : msxml3: Fix get_text on text nodes.
by Alexandre Julliard Feb. 16, 2006

Feb. 16, 2006

Module: wine Branch: refs/heads/master Commit: 04d5d0a63075432d57b9171ccac4e58720c996b3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=04d5d0a63075432d57b9171… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 16 19:33:39 2006 +0100 msxml3: Fix get_text on text nodes. --- dlls/msxml3/node.c | 22 +++++++++++--- dlls/msxml3/tests/domdoc.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index d7efe62..e9ed366 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -511,7 +511,6 @@ static HRESULT WINAPI xmlnode_get_text( BSTR* text) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - xmlNodePtr child; BSTR str = NULL; TRACE("%p\n", This); @@ -519,10 +518,25 @@ static HRESULT WINAPI xmlnode_get_text( if ( !text ) return E_INVALIDARG; - child = This->node->children; - if ( child && child->type == XML_TEXT_NODE ) - str = bstr_from_xmlChar( child->content ); + switch(This->node->type) + { + case XML_ELEMENT_NODE: + case XML_ATTRIBUTE_NODE: + { + xmlNodePtr child = This->node->children; + if ( child && child->type == XML_TEXT_NODE ) + str = bstr_from_xmlChar( child->content ); + break; + } + case XML_TEXT_NODE: + str = bstr_from_xmlChar( This->node->content ); + break; + + default: + FIXME("Unhandled node type %d\n", This->node->type); + } + TRACE("%p %s\n", This, debugstr_w(str) ); *text = str; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c791a5e..1b5eb23 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -69,11 +69,13 @@ static const WCHAR szDocument[] = { static const WCHAR szOpen[] = { 'o','p','e','n',0 }; static const WCHAR szdl[] = { 'd','l',0 }; +static const WCHAR szvr[] = { 'v','r',0 }; static const WCHAR szlc[] = { 'l','c',0 }; static const WCHAR szbs[] = { 'b','s',0 }; static const WCHAR szstr1[] = { 's','t','r','1',0 }; static const WCHAR szstr2[] = { 's','t','r','2',0 }; static const WCHAR szstar[] = { '*',0 }; +static const WCHAR szfn1_txt[] = {'f','n','1','.','t','x','t',0}; void test_domdoc( void ) { @@ -835,6 +837,73 @@ static void test_getElementsByTagName(vo IXMLDOMDocument_Release( doc ); } +static void test_get_text(void) +{ + HRESULT r; + BSTR str; + VARIANT_BOOL b; + IXMLDOMDocument *doc; + IXMLDOMNode *node, *node2, *node3; + IXMLDOMNodeList *node_list; + IXMLDOMNamedNodeMap *node_map; + + r = CoCreateInstance( &CLSID_DOMDocument, NULL, + CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); + if( r != S_OK ) + return; + + str = SysAllocString( szComplete4 ); + r = IXMLDOMDocument_loadXML( doc, str, &b ); + ok( r == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + str = SysAllocString( szbs ); + r = IXMLDOMDocument_getElementsByTagName( doc, str, &node_list ); + ok( r == S_OK, "ret %08lx\n", r ); + SysFreeString(str); + + r = IXMLDOMNodeList_get_item( node_list, 0, &node ); + ok( r == S_OK, "ret %08lx\n", r ); + IXMLDOMNodeList_Release( node_list ); + + r = IXMLDOMNode_get_text( node, &str ); + ok( r == S_OK, "ret %08lx\n", r ); +todo_wine { + ok( !memcmp(str, szfn1_txt, sizeof(szfn1_txt)), "wrong string\n" ); + } + ok( !memcmp(str, szfn1_txt, sizeof(szfn1_txt)-4), "wrong string\n" ); + SysFreeString(str); + + r = IXMLDOMNode_get_attributes( node, &node_map ); + ok( r == S_OK, "ret %08lx\n", r ); + + str = SysAllocString( szvr ); + r = IXMLDOMNamedNodeMap_getNamedItem( node_map, str, &node2 ); + ok( r == S_OK, "ret %08lx\n", r ); + SysFreeString(str); + + r = IXMLDOMNode_get_text( node2, &str ); + ok( r == S_OK, "ret %08lx\n", r ); + ok( !memcmp(str, szstr2, sizeof(szstr2)), "wrong string\n" ); + SysFreeString(str); + + r = IXMLDOMNode_get_firstChild( node2, &node3 ); + ok( r == S_OK, "ret %08lx\n", r ); + + r = IXMLDOMNode_get_text( node3, &str ); + ok( r == S_OK, "ret %08lx\n", r ); + ok( !memcmp(str, szstr2, sizeof(szstr2)), "wrong string\n" ); + SysFreeString(str); + + + IXMLDOMNode_Release( node3 ); + IXMLDOMNode_Release( node2 ); + IXMLDOMNamedNodeMap_Release( node_map ); + IXMLDOMNode_Release( node ); + IXMLDOMDocument_Release( doc ); +} + START_TEST(domdoc) { HRESULT r; @@ -847,6 +916,7 @@ START_TEST(domdoc) test_refs(); test_create(); test_getElementsByTagName(); + test_get_text(); CoUninitialize(); }

1 0