August 2010 - Wine-Commits - list.winehq.org

Andrey Turkin : ntdll/tests: Do not check signedness for char types.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: fc4d5393a5c589b7a509c82d2dc7bf6bf62e01fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4d5393a5c589b7a509c82d2… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun Aug 1 12:29:37 2010 +0400 ntdll/tests: Do not check signedness for char types. --- dlls/ntdll/tests/generated.c | 4 ---- tools/winapi/winapi_test | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c index 86d6425..b7f1c9d 100644 --- a/dlls/ntdll/tests/generated.c +++ b/dlls/ntdll/tests/generated.c @@ -375,7 +375,6 @@ static void test_pack_CCHAR(void) /* CCHAR */ TEST_TYPE_SIZE (CCHAR, 1) TEST_TYPE_ALIGN (CCHAR, 1) - TEST_TYPE_SIGNED(CCHAR) } static void test_pack_CHAR(void) @@ -383,7 +382,6 @@ static void test_pack_CHAR(void) /* CHAR */ TEST_TYPE_SIZE (CHAR, 1) TEST_TYPE_ALIGN (CHAR, 1) - TEST_TYPE_SIGNED(CHAR) } static void test_pack_DWORDLONG(void) @@ -3786,7 +3784,6 @@ static void test_pack_CCHAR(void) /* CCHAR */ TEST_TYPE_SIZE (CCHAR, 1) TEST_TYPE_ALIGN (CCHAR, 1) - TEST_TYPE_SIGNED(CCHAR) } static void test_pack_CHAR(void) @@ -3794,7 +3791,6 @@ static void test_pack_CHAR(void) /* CHAR */ TEST_TYPE_SIZE (CHAR, 1) TEST_TYPE_ALIGN (CHAR, 1) - TEST_TYPE_SIGNED(CHAR) } static void test_pack_DWORDLONG(void) diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 878b1eb..92f4ae3 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -177,6 +177,10 @@ sub _find_align_kind_size($) { $align = $pointer_size; $kind = "pointer"; $size = $pointer_size; + } elsif(/^char$/) { + $align = 1; + $kind = "char"; + $size = 1; } elsif(/^(?:(signed|unsigned)\s+)?(?:__int8|char|byte)$/) { $align = 1; $kind = defined($1) ? $1 : "signed";

1 0

Jose Rostagno : notepad: Fix Spanish translation.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: b07fccd5d6d06c90959bf61aff9d74c5a603e89d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b07fccd5d6d06c90959bf61af… Author: Jose Rostagno <joserostagno(a)hotmail.com> Date: Sat Jul 31 11:40:51 2010 -0300 notepad: Fix Spanish translation. --- programs/notepad/Es.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/notepad/Es.rc b/programs/notepad/Es.rc index cdaefe7..4e098a7 100644 --- a/programs/notepad/Es.rc +++ b/programs/notepad/Es.rc @@ -65,7 +65,7 @@ POPUP "A&yuda" { MENUITEM "&Buscar...", CMD_HELP_SEARCH MENUITEM "A&yuda sobre la ayuda", CMD_HELP_ON_HELP MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "Acerca &de Notepad", CMD_HELP_ABOUT_NOTEPAD } }

1 0

Thomas Mullaly : urlmon: Silenced a noisy fixme.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 9ef60297daf237095130a361379f2c9c6e760aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef60297daf237095130a3613… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Jul 29 19:46:37 2010 -0400 urlmon: Silenced a noisy fixme. --- dlls/urlmon/uri.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 63e8626..c825b00 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -2597,17 +2597,8 @@ static HRESULT WINAPI Uri_GetScheme(IUri *iface, DWORD *pdwScheme) static HRESULT WINAPI Uri_GetZone(IUri *iface, DWORD *pdwZone) { - Uri *This = URI_THIS(iface); - FIXME("(%p)->(%p)\n", This, pdwZone); - - if(!pdwZone) - return E_INVALIDARG; - - /* Microsoft doesn't seem to have this implemented yet... See - * the comment in Uri_GetPropertyDWORD for more about this. - */ - *pdwZone = URLZONE_INVALID; - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, pdwZone); + return Uri_GetPropertyDWORD(iface, Uri_PROPERTY_ZONE,pdwZone, 0); } static HRESULT WINAPI Uri_GetProperties(IUri *iface, DWORD *pdwProperties)

1 0

Alexandre Julliard : winebuild: Add a spawn() helper function to avoid starting a shell where possible.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: b03059cbda539657716b702ea22de72a92d2e3ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b03059cbda539657716b702ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 2 12:07:53 2010 +0200 winebuild: Add a spawn() helper function to avoid starting a shell where possible. --- tools/winebuild/build.h | 16 +++++- tools/winebuild/import.c | 58 ++++++-------------- tools/winebuild/res32.c | 14 ++--- tools/winebuild/utils.c | 132 +++++++++++++++++++++++++++++++++------------- 4 files changed, 131 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b03059cbda539657716b7…

1 0

Alexandre Julliard : winegcc: Add a printf format attribute to the strmake( ) function.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: ff090a34688f7dafe1be159fb343bcb2b0e5a5e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff090a34688f7dafe1be159fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 2 12:13:25 2010 +0200 winegcc: Add a printf format attribute to the strmake() function. --- tools/winegcc/utils.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/utils.h b/tools/winegcc/utils.h index d819415..7e124c2 100644 --- a/tools/winegcc/utils.h +++ b/tools/winegcc/utils.h @@ -21,6 +21,10 @@ */ +#ifndef __GNUC__ +#define __attribute__(X) +#endif + #ifndef DECLSPEC_NORETURN # if defined(_MSC_VER) && (_MSC_VER >= 1200) && !defined(MIDL_PASS) # define DECLSPEC_NORETURN __declspec(noreturn) @@ -46,7 +50,7 @@ void error(const char* s, ...) DECLSPEC_NORETURN; void* xmalloc(size_t size); void* xrealloc(void* p, size_t size); char *xstrdup( const char *str ); -char* strmake(const char* fmt, ...); +char* strmake(const char* fmt, ...) __attribute__((__format__ (__printf__, 1, 2 ))); int strendswith(const char* str, const char* end); typedef struct {

1 0

Thomas Mullaly : urlmon: Implemented IUri_GetHostType.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 9f41866e6f56e13995885617380490a697e36214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f41866e6f56e139958856173… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Jul 12 23:02:37 2010 -0400 urlmon: Implemented IUri_GetHostType. --- dlls/urlmon/tests/uri.c | 132 ++++++++++++++++++++++------------------------- dlls/urlmon/uri.c | 23 ++++---- 2 files changed, 74 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f41866e6f56e13995885…

1 0

Alexandre Julliard : winebuild: Support an arbitrary number of temporary files.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: f51e696cca9844c81d3a4627f9e41d6cc70e7b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51e696cca9844c81d3a4627f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 2 10:11:43 2010 +0200 winebuild: Support an arbitrary number of temporary files. --- tools/winebuild/utils.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 6c99262..d5de220 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -39,9 +39,9 @@ #include "build.h" -#define MAX_TMP_FILES 8 -static const char *tmp_files[MAX_TMP_FILES]; +static const char **tmp_files; static unsigned int nb_tmp_files; +static unsigned int max_tmp_files; static const struct { @@ -66,7 +66,7 @@ static const struct static void cleanup_tmp_files(void) { unsigned int i; - for (i = 0; i < MAX_TMP_FILES; i++) if (tmp_files[i]) unlink( tmp_files[i] ); + for (i = 0; i < nb_tmp_files; i++) if (tmp_files[i]) unlink( tmp_files[i] ); } @@ -348,7 +348,6 @@ char *get_temp_file_name( const char *prefix, const char *suffix ) const char *ext; int fd; - assert( nb_tmp_files < MAX_TMP_FILES ); if (!nb_tmp_files && !save_temps) atexit( cleanup_tmp_files ); if (!prefix || !prefix[0]) prefix = "winebuild"; @@ -367,6 +366,11 @@ char *get_temp_file_name( const char *prefix, const char *suffix ) fatal_error( "could not generate a temp file\n" ); close( fd ); + if (nb_tmp_files >= max_tmp_files) + { + max_tmp_files = max( 2 * max_tmp_files, 8 ); + tmp_files = xrealloc( tmp_files, max_tmp_files * sizeof(tmp_files[0]) ); + } tmp_files[nb_tmp_files++] = name; return name; }

1 0

Luca Bennati : shdocvw: Add Italian translation.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: b96553445a533a20c0a0b8eb5bf05c7488b03bb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b96553445a533a20c0a0b8eb5… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Jul 30 13:34:25 2010 +0200 shdocvw: Add Italian translation. --- dlls/shdocvw/It.rc | 61 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/Makefile.in | 1 + 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/It.rc b/dlls/shdocvw/It.rc new file mode 100644 index 0000000..8d5782e --- /dev/null +++ b/dlls/shdocvw/It.rc @@ -0,0 +1,61 @@ +/* + * Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2010 Luca Bennati <lucak3(a)gmail.com> + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Apri URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Specifica l'URL che vuoi aprire in Internet Explorer",-1,25, 5, 150,15 + LTEXT "Apri:", -1, 2, 32, 20, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 + DEFPUSHBUTTON "&OK", IDOK, 25, 50, 50, 15 + PUSHBUTTON "&Annulla", IDCANCEL, 85, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&File" + { + POPUP "&Nuova" + { + MENUITEM "Fin&estra" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Apri...", ID_BROWSE_OPEN + MENUITEM "&Salva", ID_BROWSE_SAVE + MENUITEM "Salva &come...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Imposta pagina...", ID_BROWSE_PRINT_FORMAT + MENUITEM "S&tampa...", ID_BROWSE_PRINT + MENUITEM "Antepri&ma di stampa...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Proprietà...", ID_BROWSE_PROPERTIES + } + POPUP "&Aiuto" + { + MENUITEM "&Informazioni su Internet Explorer...", ID_BROWSE_ABOUT + } +} diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 9e2d8e1..493adf9 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -32,6 +32,7 @@ RC_SRCS = \ De.rc \ En.rc \ Fr.rc \ + It.rc \ Ko.rc \ Lt.rc \ Nl.rc \

1 0

Alexandre Julliard : winebuild: Get rid of the ignored symbol support.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 4bfdad159b28e6130efa2e8f1f579156f0ad88c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bfdad159b28e6130efa2e8f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 2 12:13:11 2010 +0200 winebuild: Get rid of the ignored symbol support. --- tools/winebuild/build.h | 1 - tools/winebuild/import.c | 20 -------------------- tools/winebuild/main.c | 16 +--------------- tools/winebuild/winebuild.man.in | 8 -------- 4 files changed, 1 insertions(+), 44 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index ceaa68a..85b8427 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -256,7 +256,6 @@ extern void output_gnu_stack_note(void); extern void add_import_dll( const char *name, const char *filename ); extern void add_delayed_import( const char *name ); -extern void add_ignore_symbol( const char *name ); extern void add_extra_ld_symbol( const char *name ); extern void read_undef_symbols( DLLSPEC *spec, char **argv ); extern void resolve_imports( DLLSPEC *spec ); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 68a4f6a..a221a9d 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -57,7 +57,6 @@ struct name_table }; static struct name_table undef_symbols; /* list of undefined symbols */ -static struct name_table ignore_symbols; /* list of symbols to ignore */ static struct name_table extra_ld_symbols; /* list of extra symbols that ld should resolve */ static struct name_table delayed_imports; /* list of delayed import dlls */ static struct name_table ext_link_imports; /* list of external symbols to link to */ @@ -339,23 +338,6 @@ static void remove_import_dll( int index ) free_imports( imp ); } -/* 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 (name[0] == '-') /* remove it */ - { - if (!name[1]) empty_name_table( &ignore_symbols ); /* remove everything */ - else for (i = 0; i < ignore_symbols.count; i++) - { - if (!strcmp( ignore_symbols.names[i], name+1 )) remove_name( &ignore_symbols, i-- ); - } - } - else add_name( &ignore_symbols, name ); -} - /* add a symbol to the list of extra symbols that ld must resolve */ void add_extra_ld_symbol( const char *name ) { @@ -582,7 +564,6 @@ void resolve_imports( DLLSPEC *spec ) unsigned int j, removed; ORDDEF *odp; - sort_names( &ignore_symbols ); check_undefined_forwards( spec ); for (i = 0; i < nb_imports; i++) @@ -591,7 +572,6 @@ void resolve_imports( DLLSPEC *spec ) for (j = removed = 0; j < undef_symbols.count; j++) { - if (find_name( undef_symbols.names[j], &ignore_symbols )) continue; odp = find_export( undef_symbols.names[j], imp->exports, imp->nb_exports ); if (odp) { diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 33800eb..f6c04fd 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -243,7 +243,6 @@ static const char usage_str[] = " --fake-module Create a fake binary module\n" " -h, --help Display this help message\n" " -H, --heap=SIZE Set the heap size for a Win16 dll\n" -" -i, --ignore=SYM[,SYM] Ignore specified symbols when resolving imports\n" " -I DIR Ignored for C flags compatibility\n" " -k, --kill-at Kill stdcall decorations in generated .def files\n" " -K, FLAGS Compiler flags (only -KPIC is supported)\n" @@ -291,7 +290,7 @@ enum long_options_values LONG_OPT_VERSION }; -static const char short_options[] = "C:D:E:F:H:I:K:L:M:N:b:d:e:f:hi:kl:m:o:r:u:vw"; +static const char short_options[] = "C:D:E:F:H:I:K:L:M:N:b:d:e:f:hkl:m:o:r:u:vw"; static const struct option long_options[] = { @@ -318,7 +317,6 @@ static const struct option long_options[] = { "filename", 1, 0, 'F' }, { "help", 0, 0, 'h' }, { "heap", 1, 0, 'H' }, - { "ignore", 1, 0, 'i' }, { "kill-at", 0, 0, 'k' }, { "library", 1, 0, 'l' }, { "library-path", 1, 0, 'L' }, @@ -413,18 +411,6 @@ static char **parse_options( int argc, char **argv, DLLSPEC *spec ) case 'h': usage(0); break; - case 'i': - { - char *str = xstrdup( optarg ); - char *token = strtok( str, "," ); - while (token) - { - add_ignore_symbol( token ); - token = strtok( NULL, "," ); - } - free( str ); - } - break; case 'k': kill_at = 1; break; diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index 2da97c7..5ea9465 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -122,14 +122,6 @@ Display a usage message and exit. Specify the size of the module local heap in bytes (only valid for Win16 modules); default is no local heap. .TP -.BI \-i,\ --ignore= [-]symbol[,[-]symbol] -Specify a list of symbols that should be ignored when resolving -undefined symbols against the imported libraries. This forces these -symbols to be resolved from the Unix C library (or from another Unix -library linked with the application). If a symbol is prefixed by '-' -it is removed from the list instead of being added; a stand-alone '-' -clears the whole list. -.TP .BI \-I\ directory Ignored for compatibility with the C compiler. .TP

1 0

Thomas Mullaly : urlmon: Implemented function for finding the domain name of a URI.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 41513ef243198d39a9926407faa82693d1917d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=41513ef243198d39a9926407f… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Jul 16 11:16:56 2010 -0400 urlmon: Implemented function for finding the domain name of a URI. --- dlls/urlmon/tests/uri.c | 291 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 153 +++++++++++++++++++++++++ 2 files changed, 444 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41513ef243198d39a9926…

1 0