May 2011 - Wine-commits - list.winehq.org

Marcus Meissner : wuapi: Mark internal symbols with hidden visibility.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 3429b72bdefeb831591494f831a3b9b11899e25d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3429b72bdefeb831591494f83… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed May 25 19:09:56 2011 +0200 wuapi: Mark internal symbols with hidden visibility. --- dlls/wuapi/wuapi_private.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wuapi/wuapi_private.h b/dlls/wuapi/wuapi_private.h index 9c10daf..e1db05a 100644 --- a/dlls/wuapi/wuapi_private.h +++ b/dlls/wuapi/wuapi_private.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -extern HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj ); -extern HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ); -extern HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ); -extern HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ); -extern HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ); +extern HRESULT AutomaticUpdates_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT UpdateSession_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT UpdateSearcher_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT UpdateDownloader_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN; +extern HRESULT UpdateInstaller_create( IUnknown *pUnkOuter, LPVOID *ppObj ) DECLSPEC_HIDDEN;

1 0

Marcus Meissner : winspool.drv: Mark internal symbols with hidden visibility.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 6ade35ef0fdd1134201fc5b47a7308a229ac4abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ade35ef0fdd1134201fc5b47… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed May 25 19:09:52 2011 +0200 winspool.drv: Mark internal symbols with hidden visibility. --- dlls/winspool.drv/wspool.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/wspool.h b/dlls/winspool.drv/wspool.h index bb7922b..06c2823 100644 --- a/dlls/winspool.drv/wspool.h +++ b/dlls/winspool.drv/wspool.h @@ -22,12 +22,12 @@ #include <windef.h> #include <winuser.h> -extern HINSTANCE WINSPOOL_hInstance; +extern HINSTANCE WINSPOOL_hInstance DECLSPEC_HIDDEN; -extern PRINTPROVIDOR * backend; -extern BOOL load_backend(void); +extern PRINTPROVIDOR * backend DECLSPEC_HIDDEN; +extern BOOL load_backend(void) DECLSPEC_HIDDEN; -extern void WINSPOOL_LoadSystemPrinters(void); +extern void WINSPOOL_LoadSystemPrinters(void) DECLSPEC_HIDDEN; #define IDS_CAPTION 10 #define IDS_FILE_EXISTS 11

1 0

Akihiro Sagawa : winedbg: Add Japanese resource.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 884ccf9b3c691870e2adc6b4f92587d29180c8b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=884ccf9b3c691870e2adc6b4f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 25 20:49:39 2011 +0900 winedbg: Add Japanese resource. --- programs/winedbg/Makefile.in | 1 + programs/winedbg/rsrc_Ja.rc | 44 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 34d7c35..8170eb8 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -37,6 +37,7 @@ RC_SRCS = \ rsrc_Fr.rc \ rsrc_He.rc \ rsrc_It.rc \ + rsrc_Ja.rc \ rsrc_Ko.rc \ rsrc_Lt.rc \ rsrc_Nl.rc \ diff --git a/programs/winedbg/rsrc_Ja.rc b/programs/winedbg/rsrc_Ja.rc new file mode 100644 index 0000000..80b5454 --- /dev/null +++ b/programs/winedbg/rsrc_Ja.rc @@ -0,0 +1,44 @@ +/* + * Japanese Language Support + * + * Copyright 2008 Mikolaj Zalewski + * Copyright 2011 Akihiro Sagawa + * + * 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" + +#pragma code_page(65001) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "プログラムエラー" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "プログラム %s で重大な問題が発生したため、終了する必要があります。 \ + ご不便をおかけし申し訳ありません。", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "これはプログラム内の問題や Wine の欠陥によって発生することがあります。 \ + http://appdb.winehq.org でこのアプリケーションを動作させるヒントを \ + 確認するとよいでしょう。\n\n\ + この問題が Windows 上で発生することがなく、まだ報告されていない場合は \ + http://bugs.winehq.org でこの問題を報告できます。", + IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "閉じる", IDOK, 205, 151, 60, 16, WS_TABSTOP +END

1 0

Akihiro Sagawa : winecfg: Update Japanese translation.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: efa2b848114229a80c7935b0118156bb68cc08e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efa2b848114229a80c7935b01… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 25 20:49:42 2011 +0900 winecfg: Update Japanese translation. --- programs/winecfg/Ja.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index ba5f5fa..3b85efc 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -67,7 +67,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 9, "MS Shell Dlg" BEGIN GROUPBOX " ウィンドウ設定 ",IDC_STATIC,8,4,244,84 - CONTROL "Automatically capture the &mouse in full-screen windows",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + CONTROL "フルスクリーンウィンドウでマウスを自動的に捕捉する(&M)",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "ウィンドウマネージャがウィンドウを装飾するのを許可する(&D)",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 CONTROL "ウィンドウマネージャがウィンドウを制御するのを許可する(&W)",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "仮想デスクトップをエミュレートする(&D)",IDC_ENABLE_DESKTOP,"Button", @@ -140,7 +140,7 @@ BEGIN LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,18,232,76 PUSHBUTTON "追加(&A)...",IDC_BUTTON_ADD,15,98,37,14 PUSHBUTTON "削除(&R)",IDC_BUTTON_REMOVE,56,98,37,14 - PUSHBUTTON "自動検出(&D)...",IDC_BUTTON_AUTODETECT,197,98,49,14 + PUSHBUTTON "自動検出(&D)",IDC_BUTTON_AUTODETECT,197,98,49,14 /* editing drive details */ LTEXT "パス(&P):",IDC_STATIC_PATH,15,123,20,9

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 7057d37b408c6cbc87ffa5bbced387b1f6b4eeea URL: http://source.winehq.org/git/wine.git/?a=commit;h=7057d37b408c6cbc87ffa5bbc… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 25 20:49:45 2011 +0900 po: Update Japanese translation. --- po/ja.po | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/po/ja.po b/po/ja.po index 0d7551f..ae9a756 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-05-04 19:31+0900\n" +"PO-Revision-Date: 2011-05-25 20:04+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: none\n" "Language: Japanese\n" @@ -6827,13 +6827,12 @@ msgid "&About Wine" msgstr "Wineについて(&A)" #: user32.rc:46 -#, fuzzy msgid "&Close\tCtrl-F4" -msgstr "閉じる(&C)\tAlt-F4" +msgstr "閉じる(&C)\tCtrl-F4" #: user32.rc:48 msgid "Nex&t\tCtrl-F6" -msgstr "" +msgstr "次のウィンドウ(&N)\tCtrl-F6" #: user32.rc:68 regedit.rc:176 winefile.rc:100 msgid "Error" @@ -8397,18 +8396,18 @@ msgstr "入力行が長すぎます。\n" #: hostname.rc:27 msgid "Usage: hostname\n" -msgstr "" +msgstr "使い方: hostname\n" #: hostname.rc:28 -#, fuzzy msgid "Error: Invalid option '%c'.\n" -msgstr "エラー: キー名が無効です\n" +msgstr "エラー: 無効なオプション '%c'\n" #: hostname.rc:29 msgid "" "Error: Setting the system hostname is not possible with the hostname " "utility.\n" msgstr "" +"エラー: hostname ユーティリティではシステムのホスト名を設定できません。\n" #: ipconfig.rc:27 msgid "Usage: ipconfig [ /? | /all ]\n" @@ -8768,9 +8767,8 @@ msgid "&View TypeLib..." msgstr "TypeLib の表示(&V)..." #: oleview.rc:32 -#, fuzzy msgid "&System Configuration" -msgstr "システム設定(&S)..." +msgstr "システム設定(&S)" #: oleview.rc:33 msgid "&Run the Registry Editor" @@ -9054,18 +9052,16 @@ msgid "&Copy...\tF8" msgstr "コピー(&C)...\tF8" #: progman.rc:35 -#, fuzzy msgid "&Properties\tAlt+Enter" -msgstr "プロパティ(&I)\tAlt+Enter" +msgstr "プロパティ(&P)\tAlt+Enter" #: progman.rc:37 msgid "&Execute..." msgstr "実行(&E)..." #: progman.rc:39 -#, fuzzy msgid "E&xit Windows" -msgstr "Windowsの終了(&X)..." +msgstr "Windowsの終了(&X)" #: progman.rc:41 taskmgr.rc:41 winefile.rc:63 winhlp32.rc:44 msgid "&Options"

1 0

Alexandre Julliard : widl: Allow using fixed size arrays as strings.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 56e65b453456ef49595e4194b1313753d9b7e5ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e65b453456ef49595e4194b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 25 19:34:26 2011 +0200 widl: Allow using fixed size arrays as strings. --- tools/widl/parser.y | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3850e65..fc1076f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2560,11 +2560,14 @@ static void check_remoting_args(const var_t *func) error_loc_info(&arg->loc_info, "out interface pointer \'%s\' of function \'%s\' is not a double pointer\n", arg->name, funcname); break; case TGT_STRING: - if (is_ptr(type) || - (is_array(type) && - (!type_array_has_conformance(type) || - type_array_get_conformance(type)->type == EXPR_VOID))) - error_loc_info(&arg->loc_info, "out parameter \'%s\' of function \'%s\' cannot be an unsized string\n", arg->name, funcname); + if (is_array(type)) + { + /* needs conformance or fixed dimension */ + if (type_array_has_conformance(type) && + type_array_get_conformance(type)->type != EXPR_VOID) break; + if (!type_array_has_conformance(type) && type_array_get_dim(type)) break; + } + error_loc_info(&arg->loc_info, "out parameter \'%s\' of function \'%s\' cannot be an unsized string\n", arg->name, funcname); break; case TGT_INVALID: /* already error'd before we get here */

1 0

Alexandre Julliard : widl: Set the correct stack size for parameters in the proc format string.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 52cb5b20f794cd328587f4adabfa1e0bb62ce8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52cb5b20f794cd328587f4ada… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 25 20:32:12 2011 +0200 widl: Set the correct stack size for parameters in the proc format string. --- tools/widl/typegen.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 4bdc94c..36358a8 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -342,6 +342,31 @@ static int get_padding(const var_list_t *fields) return ROUNDING(offset, salign); } +static unsigned int get_stack_size( const type_t *type, const attr_list_t *attrs, int *by_value ) +{ + unsigned int stack_size; + int by_val; + + switch (typegen_detect_type( type, attrs, TDT_ALL_TYPES )) + { + case TGT_BASIC: + case TGT_ENUM: + case TGT_RANGE: + case TGT_STRUCT: + case TGT_UNION: + case TGT_USER_TYPE: + stack_size = type_memsize( type ); + by_val = (pointer_size < 8 || stack_size <= pointer_size); /* FIXME: should be platform-specific */ + break; + default: + by_val = 0; + break; + } + if (!by_val) stack_size = pointer_size; + if (by_value) *by_value = by_val; + return ROUND_SIZE( stack_size, pointer_size ); +} + unsigned char get_struct_fc(const type_t *type) { int has_pointer = 0; @@ -871,7 +896,8 @@ static unsigned int write_procformatstring_type(FILE *file, int indent, else print_file(file, indent, "0x4d, /* FC_IN_PARAM */\n"); - print_file(file, indent, "0x01,\n"); + size = get_stack_size( type, attrs, NULL ); + print_file(file, indent, "0x%02x,\n", size / pointer_size ); print_file(file, indent, "NdrFcShort(0x%x), /* type offset = %u */\n", type->typestring_offset, type->typestring_offset); size = 4; /* includes param type prefix */

1 0

Alexandre Julliard : configure: Make sure the winetest directory exists before building tests.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: dbbed381d0e477dfbac33d60a7df358dc913de29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbbed381d0e477dfbac33d60a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 12:04:45 2011 +0200 configure: Make sure the winetest directory exists before building tests. --- aclocal.m4 | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 8793e4b..ca227f4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -396,7 +396,7 @@ wine_fn_config_test () AS_VAR_IF([enable_tests],[no],,[wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all: $ac_dir .PHONY: $ac_dir -$ac_dir: $ac_dir/Makefile __builddeps__ dummy +$ac_dir: $ac_dir/Makefile programs/winetest/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE) programs/winetest: $ac_dir check test: $ac_dir/__test__ diff --git a/configure b/configure index ea832b5..b07b77d 100755 --- a/configure +++ b/configure @@ -14771,7 +14771,7 @@ else wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all: $ac_dir .PHONY: $ac_dir -$ac_dir: $ac_dir/Makefile __builddeps__ dummy +$ac_dir: $ac_dir/Makefile programs/winetest/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE) programs/winetest: $ac_dir check test: $ac_dir/__test__

1 0

Alexandre Julliard : winebuild: Fix the creation of temp files in /tmp.
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 2f4f9ee1cbf61e4540abbfe56e7d765fad6c8d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f4f9ee1cbf61e4540abbfe56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 12:20:37 2011 +0200 winebuild: Fix the creation of temp files in /tmp. --- tools/winebuild/utils.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index acd6915..2edb9e3 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -410,25 +410,30 @@ const char *get_nm_command(void) char *get_temp_file_name( const char *prefix, const char *suffix ) { char *name; - const char *ext; + const char *ext, *basename; int fd; if (!nb_tmp_files && !save_temps) atexit( cleanup_tmp_files ); if (!prefix || !prefix[0]) prefix = "winebuild"; if (!suffix) suffix = ""; - if (!(ext = strchr( prefix, '.' ))) ext = prefix + strlen(prefix); + if ((basename = strrchr( prefix, '/' ))) basename++; + else basename = prefix; + if (!(ext = strchr( basename, '.' ))) ext = prefix + strlen(prefix); name = xmalloc( sizeof("/tmp/") + (ext - prefix) + sizeof(".XXXXXX") + strlen(suffix) ); - strcpy( name, "/tmp/" ); - memcpy( name + 5, prefix, ext - prefix ); - strcpy( name + 5 + (ext - prefix), ".XXXXXX" ); + memcpy( name, prefix, ext - prefix ); + strcpy( name + (ext - prefix), ".XXXXXX" ); strcat( name, suffix ); - /* first try without the /tmp/ prefix */ - if ((fd = mkstemps( name + 5, strlen(suffix) )) != -1) - name += 5; - else if ((fd = mkstemps( name, strlen(suffix) )) == -1) - fatal_error( "could not generate a temp file\n" ); + if ((fd = mkstemps( name, strlen(suffix) )) == -1) + { + strcpy( name, "/tmp/" ); + memcpy( name + 5, basename, ext - basename ); + strcpy( name + 5 + (ext - basename), ".XXXXXX" ); + strcat( name, suffix ); + if ((fd = mkstemps( name, strlen(suffix) )) == -1) + fatal_error( "could not generate a temp file\n" ); + } close( fd ); if (nb_tmp_files >= max_tmp_files)

1 0

Alexandre Julliard : libport: Don't clear the buffer on failure in mkstemps .
by Alexandre Julliard 26 May '11

26 May '11

Module: wine Branch: master Commit: 57765b8c307d49a909cb563ea88141c69ff226e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57765b8c307d49a909cb563ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 12:21:02 2011 +0200 libport: Don't clear the buffer on failure in mkstemps. --- libs/port/mkstemps.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/libs/port/mkstemps.c b/libs/port/mkstemps.c index 1a091a7..3ca71e8 100644 --- a/libs/port/mkstemps.c +++ b/libs/port/mkstemps.c @@ -133,7 +133,5 @@ mkstemps ( value += 7777; } - /* We return the null string if we can't find a unique file name. */ - template[0] = '\0'; return -1; }

1 0