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

Akihiro Sagawa : winecfg: Update Japanese translation.
by Alexandre Julliard May 26, 2011

May 26, 2011

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 May 26, 2011

May 26, 2011

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

Marcus Meissner : wintab32: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 26, 2011

May 26, 2011

Module: wine Branch: master Commit: bf60886fb96c8e472cb570634847d8b54b6fe162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf60886fb96c8e472cb570634… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed May 25 19:09:53 2011 +0200 wintab32: Mark internal symbols with hidden visibility. --- dlls/wintab32/wintab_internal.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wintab32/wintab_internal.h b/dlls/wintab32/wintab_internal.h index b0a2e8f..18c64bf 100644 --- a/dlls/wintab32/wintab_internal.h +++ b/dlls/wintab32/wintab_internal.h @@ -147,16 +147,16 @@ typedef struct tagOPENCONTEXT } OPENCONTEXT, *LPOPENCONTEXT; int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam, - LPARAM lParam, BOOL send_always); -LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd); + LPARAM lParam, BOOL send_always) DECLSPEC_HIDDEN; +LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) DECLSPEC_HIDDEN; /* X11drv functions */ -extern int (CDECL *pLoadTabletInfo)(HWND hwnddefault); -extern int (CDECL *pGetCurrentPacket)(LPWTPACKET packet); -extern int (CDECL *pAttachEventQueueToTablet)(HWND hOwner); -extern UINT (CDECL *pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput); +extern int (CDECL *pLoadTabletInfo)(HWND hwnddefault) DECLSPEC_HIDDEN; +extern int (CDECL *pGetCurrentPacket)(LPWTPACKET packet) DECLSPEC_HIDDEN; +extern int (CDECL *pAttachEventQueueToTablet)(HWND hOwner) DECLSPEC_HIDDEN; +extern UINT (CDECL *pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput) DECLSPEC_HIDDEN; -extern HWND hwndDefault; -extern CRITICAL_SECTION csTablet; +extern HWND hwndDefault DECLSPEC_HIDDEN; +extern CRITICAL_SECTION csTablet DECLSPEC_HIDDEN; #endif /* __WINE_WINTAB_INTERNAL_H */

1 0

Marcus Meissner : wldap32: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 26, 2011

May 26, 2011

Module: wine Branch: master Commit: b122ac9c0799d9ff3ba9474e8d2ea56dffdd5fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b122ac9c0799d9ff3ba9474e8… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed May 25 19:09:54 2011 +0200 wldap32: Mark internal symbols with hidden visibility. --- dlls/wldap32/error.c | 2 -- dlls/wldap32/wldap32.h | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/error.c b/dlls/wldap32/error.c index ca088e6..2509aa1 100644 --- a/dlls/wldap32/error.c +++ b/dlls/wldap32/error.c @@ -37,8 +37,6 @@ #include "winldap_private.h" #include "wldap32.h" -extern HINSTANCE hwldap32; - WINE_DEFAULT_DEBUG_CHANNEL(wldap32); ULONG map_error( int error ) diff --git a/dlls/wldap32/wldap32.h b/dlls/wldap32/wldap32.h index bf913d0..00a85a3 100644 --- a/dlls/wldap32/wldap32.h +++ b/dlls/wldap32/wldap32.h @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -ULONG map_error( int ); +extern HINSTANCE hwldap32 DECLSPEC_HIDDEN; + +ULONG map_error( int ) DECLSPEC_HIDDEN; /* A set of helper functions to convert LDAP data structures * to and from ansi (A), wide character (W) and utf8 (U) encodings. @@ -854,5 +856,4 @@ static inline void sortkeyarrayfreeU( LDAPSortKey **sortkeyarray ) HeapFree( GetProcessHeap(), 0, sortkeyarray ); } } - #endif /* HAVE_LDAP */

1 0

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

May 26, 2011

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 : wmiutils: Mark internal symbols with hidden visibility.
by Alexandre Julliard May 26, 2011

May 26, 2011

Module: wine Branch: master Commit: ba66ceea2a218d40ee5b6f50b009418ef7f79d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba66ceea2a218d40ee5b6f50b… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed May 25 19:09:55 2011 +0200 wmiutils: Mark internal symbols with hidden visibility. --- dlls/wmiutils/wmiutils_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wmiutils/wmiutils_private.h b/dlls/wmiutils/wmiutils_private.h index 23082ce..58b4764 100644 --- a/dlls/wmiutils/wmiutils_private.h +++ b/dlls/wmiutils/wmiutils_private.h @@ -16,4 +16,4 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT WbemStatusCodeText_create(IUnknown *, LPVOID *); +HRESULT WbemStatusCodeText_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : widl: Allow using fixed size arrays as strings.
by Alexandre Julliard May 26, 2011

May 26, 2011

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 : winebuild: Fix the creation of temp files in /tmp.
by Alexandre Julliard May 26, 2011

May 26, 2011

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 : ole32: Delete the transacted storage scratch file on release.
by Alexandre Julliard May 26, 2011

May 26, 2011

Module: wine Branch: master Commit: 7efe6d98950d0ecba69a7da87e3600d166ceb9e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7efe6d98950d0ecba69a7da87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 13:27:41 2011 +0200 ole32: Delete the transacted storage scratch file on release. --- dlls/ole32/storage32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index fa9c06f..44adaed 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5062,7 +5062,7 @@ static HRESULT TransactedSnapshotImpl_Construct(StorageBaseImpl *parentStorage, (*result)->base.openFlags = parentStorage->openFlags; /* Create a new temporary storage to act as the scratch file. */ - hr = StgCreateDocfile(NULL, STGM_READWRITE|STGM_SHARE_EXCLUSIVE|STGM_CREATE, + hr = StgCreateDocfile(NULL, STGM_READWRITE|STGM_SHARE_EXCLUSIVE|STGM_CREATE|STGM_DELETEONRELEASE, 0, (IStorage**)&(*result)->scratch); if (SUCCEEDED(hr))

1 0

Alexandre Julliard : shdocvw: Delete the temporary storage file on release.
by Alexandre Julliard May 26, 2011

May 26, 2011

Module: wine Branch: master Commit: 2e1736d0eb38e60e76a68e50d96ddabc29a308b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1736d0eb38e60e76a68e50d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 13:27:55 2011 +0200 shdocvw: Delete the temporary storage file on release. --- dlls/shdocvw/intshcut.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/intshcut.c b/dlls/shdocvw/intshcut.c index 4a2dd6a..f83aa52 100644 --- a/dlls/shdocvw/intshcut.c +++ b/dlls/shdocvw/intshcut.c @@ -816,7 +816,8 @@ static InternetShortcut *create_shortcut(void) newshortcut->IPersistFile_iface.lpVtbl = &persistFileVtbl; newshortcut->IPropertySetStorage_iface.lpVtbl = &propertySetStorageVtbl; newshortcut->refCount = 0; - hr = StgCreateStorageEx(NULL, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE, STGFMT_STORAGE, 0, NULL, NULL, &IID_IPropertySetStorage, (void **) &newshortcut->property_set_storage); + hr = StgCreateStorageEx(NULL, STGM_CREATE | STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_DELETEONRELEASE, + STGFMT_STORAGE, 0, NULL, NULL, &IID_IPropertySetStorage, (void **) &newshortcut->property_set_storage); if FAILED(hr) { TRACE("Failed to create the storage object needed for the shortcut.\n");

1 0