October 2018 - Wine-Commits

Hans Leidekker : wbemdisp: Implement ISWbemPropertySet::get_Count.
by Alexandre Julliard Oct. 12, 2018

Oct. 12, 2018

Module: wine Branch: master Commit: ce923c3f57574262b966c881ad42516c2d3dd803 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce923c3f57574262b966c881… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 12 19:17:32 2018 +0200 wbemdisp: Implement ISWbemPropertySet::get_Count. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40534 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 15 +++++++++++++-- dlls/wbemdisp/tests/wbemdisp.c | 6 ++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 78b81d8..c307e34 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -438,8 +438,19 @@ static HRESULT WINAPI propertyset_Item( ISWbemPropertySet *iface, BSTR name, static HRESULT WINAPI propertyset_get_Count( ISWbemPropertySet *iface, LONG *count ) { - FIXME( "\n" ); - return E_NOTIMPL; + static const WCHAR propcountW[] = {'_','_','P','R','O','P','E','R','T','Y','_','C','O','U','N','T',0}; + struct propertyset *propertyset = impl_from_ISWbemPropertySet( iface ); + HRESULT hr; + VARIANT val; + + TRACE( "%p, %p\n", propertyset, count ); + + hr = IWbemClassObject_Get( propertyset->object, propcountW, 0, &val, NULL, NULL ); + if (SUCCEEDED(hr)) + { + *count = V_I4( &val ); + } + return hr; } static HRESULT WINAPI propertyset_Add( ISWbemPropertySet *iface, BSTR name, WbemCimtypeEnum type, diff --git a/dlls/wbemdisp/tests/wbemdisp.c b/dlls/wbemdisp/tests/wbemdisp.c index 68c0e3b..57baf84 100644 --- a/dlls/wbemdisp/tests/wbemdisp.c +++ b/dlls/wbemdisp/tests/wbemdisp.c @@ -302,6 +302,7 @@ static void test_locator(void) ISWbemProperty *prop; ISWbemSecurity *security; VARIANT var; + LONG count; WbemImpersonationLevelEnum imp_level; WbemAuthenticationLevelEnum auth_level; @@ -379,6 +380,11 @@ static void test_locator(void) ok( hr == S_OK, "got %x\n", hr ); SysFreeString( procid_bstr ); + count = 0; + hr = ISWbemPropertySet_get_Count( prop_set, &count ); + ok( hr == S_OK, "got %x\n", hr ); + ok( count > 0, "got %d\n", count ); + hr = ISWbemProperty_get_Value( prop, &var ); ok( hr == S_OK, "got %x\n", hr ); ok( V_VT(&var) == VT_BSTR, "got %x\n", V_VT(&var) );

1 0

Zebediah Figura : rpcrt4: Handle non-ref pointers in calc_arg_size().
by Alexandre Julliard Oct. 12, 2018

Oct. 12, 2018

Module: wine Branch: master Commit: be9f5f4aaff6299f11021370e02d2874dcbfb8a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be9f5f4aaff6299f11021370… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 11 11:59:17 2018 -0500 rpcrt4: Handle non-ref pointers in calc_arg_size(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index a645a24..9e434a5 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -216,6 +216,9 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) default: FIXME("Unhandled type %02x\n", *pFormat); /* fallthrough */ + case FC_UP: + case FC_OP: + case FC_FP: case FC_IP: size = sizeof(void *); break;

1 0

Zebediah Figura : rpcrt4: Correctly handle simple ref pointers in calc_arg_size().
by Alexandre Julliard Oct. 12, 2018

Oct. 12, 2018

Module: wine Branch: master Commit: 5be461cd71a5a91bc573ad98808d7fa0a6219799 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5be461cd71a5a91bc573ad98… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Oct 11 11:59:18 2018 -0500 rpcrt4: Correctly handle simple ref pointers in calc_arg_size(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 9e434a5..18ce74d 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -156,8 +156,7 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) case FC_RP: if (pFormat[1] & FC_SIMPLE_POINTER) { - FIXME("Simple reference pointer (type %#x).\n", pFormat[2]); - size = sizeof(void *); + size = 0; break; } size = calc_arg_size(pStubMsg, &pFormat[2] + *(const SHORT*)&pFormat[2]);

1 0

Louis Lenders : prntvtp: Add stub for PTOpenProviderEx.
by Alexandre Julliard Oct. 12, 2018

Oct. 12, 2018

Module: wine Branch: master Commit: 03800be0daf82ec31933af363e2e1cea12485337 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03800be0daf82ec31933af36… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Oct 12 13:59:20 2018 +0200 prntvtp: Add stub for PTOpenProviderEx. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45925 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/main.c | 6 ++++++ dlls/prntvpt/prntvpt.spec | 2 +- include/prntvpt.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index 72b1dcf..cdf1b6c 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -55,3 +55,9 @@ HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provid FIXME("%s, %d, %p: stub\n", debugstr_w(printer), version, provider); return E_NOTIMPL; } + +HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version) +{ + FIXME("%s, %d, %d, %p, %p: stub\n", debugstr_w(printer), max_version, pref_version, provider, used_version); + return E_NOTIMPL; +} diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec index bf9a8ca..5581fa4 100644 --- a/dlls/prntvpt/prntvpt.spec +++ b/dlls/prntvpt/prntvpt.spec @@ -1,6 +1,6 @@ @ stdcall PTQuerySchemaVersionSupport(wstr ptr) @ stdcall PTOpenProvider(wstr long ptr) -@ stub PTOpenProviderEx +@ stdcall PTOpenProviderEx(wstr long long ptr ptr) @ stub PTCloseProvider @ stub BindPTProviderThunk @ stub PTGetPrintCapabilities diff --git a/include/prntvpt.h b/include/prntvpt.h index 55ecbbe..8b873dd 100644 --- a/include/prntvpt.h +++ b/include/prntvpt.h @@ -26,6 +26,7 @@ extern "C" { DECLARE_HANDLE(HPTPROVIDER); HRESULT WINAPI PTOpenProvider(const WCHAR *printer, DWORD version, HPTPROVIDER *provider); +HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD pref_version, HPTPROVIDER *provider, DWORD *used_version); #ifdef __cplusplus }

1 0

Michał Janiszewski : winevulkan: Remove unused variable in make_vulkan.
by Alexandre Julliard Oct. 12, 2018

Oct. 12, 2018

Module: wine Branch: master Commit: 66e0e071520d8ce7236b103e48992fb939eaa09a URL: https://source.winehq.org/git/wine.git/?a=commit;h=66e0e071520d8ce7236b103e… Author: Michał Janiszewski <janisozaur(a)gmail.com> Date: Fri Oct 12 00:07:55 2018 +0200 winevulkan: Remove unused variable in make_vulkan. Signed-off-by: Michał Janiszewski <janisozaur(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ec861bd..e96645d 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1778,10 +1778,8 @@ class ConversionFunction(object): if self.direction == Direction.OUTPUT: params = ["const {0}_host *in".format(self.type), "{0} *out".format(self.type), "uint32_t count"] - return_type = self.type else: params = ["const {0} *in".format(self.type), "{0} *out_host".format(self.type), "uint32_t count"] - return_type = "{0}_host".format(self.type) # Generate function prototype. body = "static inline void {0}(".format(self.name)

1 0

Hans Leidekker : msi: Fix memory leaks.
by Alexandre Julliard Oct. 12, 2018

Oct. 12, 2018

Module: wine Branch: master Commit: 965ca1b4de78600366cde437c97a7208a954b18b URL: https://source.winehq.org/git/wine.git/?a=commit;h=965ca1b4de78600366cde437… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 12 16:44:02 2018 +0200 msi: Fix memory leaks. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 97bde52..3cb0f31 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -538,46 +538,49 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) if (r != ERROR_SUCCESS) return r; + hPackage = alloc_msi_remote_handle( remote_package ); + if (!hPackage) + { + ERR( "failed to create handle for %x\n", remote_package ); + midl_user_free( dll ); + midl_user_free( proc ); + return ERROR_INSTALL_FAILURE; + } + hModule = LoadLibraryW( dll ); if (!hModule) { ERR( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); + midl_user_free( dll ); + midl_user_free( proc ); + MsiCloseHandle( hPackage ); return ERROR_SUCCESS; } fn = (MsiCustomActionEntryPoint) GetProcAddress( hModule, proc ); - if (fn) + if (!fn) WARN( "GetProcAddress(%s) failed\n", debugstr_a(proc) ); + else { - hPackage = alloc_msi_remote_handle( remote_package ); - if (hPackage) + handle_msi_break(proc); + + __TRY { - TRACE("calling %s\n", debugstr_a(proc)); - handle_msi_break(proc); - - __TRY - { - r = custom_proc_wrapper(fn, hPackage); - } - __EXCEPT_PAGE_FAULT - { - ERR("Custom action (%s:%s) caused a page fault: %08x\n", - debugstr_w(dll), debugstr_a(proc), GetExceptionCode()); - r = ERROR_SUCCESS; - } - __ENDTRY; - - MsiCloseHandle( hPackage ); + r = custom_proc_wrapper( fn, hPackage ); } - else - ERR("failed to create handle for %x\n", remote_package ); + __EXCEPT_PAGE_FAULT + { + ERR( "Custom action (%s:%s) caused a page fault: %08x\n", + debugstr_w(dll), debugstr_a(proc), GetExceptionCode() ); + r = ERROR_SUCCESS; + } + __ENDTRY; } - else - ERR("GetProcAddress(%s) failed\n", debugstr_a(proc)); FreeLibrary(hModule); midl_user_free(dll); midl_user_free(proc); + MsiCloseHandle(hPackage); return r; }

1 0

Alexandre Julliard : Release 3.18.
by Alexandre Julliard Oct. 12, 2018

Oct. 12, 2018

Module: wine Branch: master Commit: 3f4455c0f043650151873d899e6f7526b994fa93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f4455c0f043650151873d89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 13 00:59:01 2018 +0200 Release 3.18. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 667 ++++++++++++++++++++++++++------------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 293 insertions(+), 395 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f4455c0f04365015187…

1 0

Alexandre Julliard : server: Also return CPU type in the mapping image information.
by Alexandre Julliard Oct. 11, 2018

Oct. 11, 2018

Module: wine Branch: master Commit: 33584dc12ce9ec4aaa2adc77b581beff448134de URL: https://source.winehq.org/git/wine.git/?a=commit;h=33584dc12ce9ec4aaa2adc77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 11 15:12:29 2018 +0200 server: Also return CPU type in the mapping image information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 3 ++- server/mapping.c | 5 +++++ server/protocol.def | 1 + server/trace.c | 4 +++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index e8611ce..3114c1c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -700,6 +700,7 @@ typedef struct unsigned int header_size; unsigned int file_size; unsigned int checksum; + cpu_type_t cpu; } pe_image_info_t; #define IMAGE_FLAGS_ComPlusNativeReady 0x01 #define IMAGE_FLAGS_ComPlusILOnly 0x02 @@ -6531,6 +6532,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 565 +#define SERVER_PROTOCOL_VERSION 566 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/mapping.c b/server/mapping.c index 2955766..affe8fc 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -600,14 +600,17 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s switch (nt.FileHeader.Machine) { case IMAGE_FILE_MACHINE_I386: + mapping->image.cpu = CPU_x86; if (cpu_mask & (CPU_FLAG(CPU_x86) | CPU_FLAG(CPU_x86_64))) break; return STATUS_INVALID_IMAGE_FORMAT; case IMAGE_FILE_MACHINE_ARM: case IMAGE_FILE_MACHINE_THUMB: case IMAGE_FILE_MACHINE_ARMNT: + mapping->image.cpu = CPU_ARM; if (cpu_mask & (CPU_FLAG(CPU_ARM) | CPU_FLAG(CPU_ARM64))) break; return STATUS_INVALID_IMAGE_FORMAT; case IMAGE_FILE_MACHINE_POWERPC: + mapping->image.cpu = CPU_POWERPC; if (cpu_mask & CPU_FLAG(CPU_POWERPC)) break; return STATUS_INVALID_IMAGE_FORMAT; default: @@ -643,9 +646,11 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s switch (nt.FileHeader.Machine) { case IMAGE_FILE_MACHINE_AMD64: + mapping->image.cpu = CPU_x86_64; if (cpu_mask & (CPU_FLAG(CPU_x86) | CPU_FLAG(CPU_x86_64))) break; return STATUS_INVALID_IMAGE_FORMAT; case IMAGE_FILE_MACHINE_ARM64: + mapping->image.cpu = CPU_ARM64; if (cpu_mask & (CPU_FLAG(CPU_ARM) | CPU_FLAG(CPU_ARM64))) break; return STATUS_INVALID_IMAGE_FORMAT; default: diff --git a/server/protocol.def b/server/protocol.def index 1a76f22..e72dea6 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -716,6 +716,7 @@ typedef struct unsigned int header_size; unsigned int file_size; unsigned int checksum; + cpu_type_t cpu; } pe_image_info_t; #define IMAGE_FLAGS_ComPlusNativeReady 0x01 #define IMAGE_FLAGS_ComPlusILOnly 0x02 diff --git a/server/trace.c b/server/trace.c index 5140ab1..6ccc777 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1177,10 +1177,12 @@ static void dump_varargs_pe_image_info( const char *prefix, data_size_t size ) dump_uint64( ",stack_commit=", &info.stack_commit ); fprintf( stderr, ",zerobits=%08x,subsystem=%08x,subsystem_low=%04x,subsystem_high=%04x,gp=%08x" ",image_charact=%04x,dll_charact=%04x,machine=%04x,contains_code=%u,image_flags=%02x" - ",loader_flags=%08x,header_size=%08x,file_size=%08x,checksum=%08x}", + ",loader_flags=%08x,header_size=%08x,file_size=%08x,checksum=%08x", info.zerobits, info.subsystem, info.subsystem_low, info.subsystem_high, info.gp, info.image_charact, info.dll_charact, info.machine, info.contains_code, info.image_flags, info.loader_flags, info.header_size, info.file_size, info.checksum ); + dump_cpu_type( ",cpu=", &info.cpu ); + fputc( '}', stderr ); remove_data( size ); }

1 0

Alexandre Julliard : kernel32: Build a standard process parameters structure in CreateProcess().
by Alexandre Julliard Oct. 11, 2018

Oct. 11, 2018

Module: wine Branch: master Commit: 79e2afaaaeefb5ffcd3a09ea8668b4a9354993f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79e2afaaaeefb5ffcd3a09ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 11 17:48:25 2018 +0200 kernel32: Build a standard process parameters structure in CreateProcess(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 208 ++++++++++++++++++++++++++---------------------- 1 file changed, 115 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=79e2afaaaeefb5ffcd3a…

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Oct. 11, 2018

Oct. 11, 2018

Module: wine Branch: master Commit: 8fd5c6cb523b16c0e7ddb4477d2b700b581d504f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fd5c6cb523b16c0e7ddb447… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Oct 12 00:35:40 2018 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 108 +++++++++++++++++++++------------------------------------------ 1 file changed, 35 insertions(+), 73 deletions(-) diff --git a/po/ja.po b/po/ja.po index c7d6090..4ec0f12 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-05-24 20:49+0900\n" +"PO-Revision-Date: 2018-10-11 00:24+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: Japanese\n" "Language: ja\n" @@ -405,16 +405,12 @@ msgid "&Retry" msgstr "再試行(&R)" #: comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "タブを隠す(&T)" +msgstr "詳細を隠す" #: comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "詳細" +msgstr "詳細を見る" #: comctl32.rc:31 cryptui.rc:230 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 @@ -3434,46 +3430,36 @@ msgid "Publishers..." msgstr "発行元..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "LAN 接続" +msgstr "接続" #: inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Wine 設定" +msgstr "自動設定" #: inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Web プロキシの自動検出を使う" #: inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "プロキシの自動構成スクリプトを使う" #: inetcpl.rc:128 inetcpl.rc:132 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "アドレス" +msgstr "アドレス:" #: inetcpl.rc:130 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "ローカルサーバ(&L)" +msgstr "プロキシサーバ" #: inetcpl.rc:131 msgid "Use a proxy server" -msgstr "" +msgstr "プロキシサーバを利用する" #: inetcpl.rc:134 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "ポートなし" +msgstr "ポート:" #: inetcpl.rc:31 msgid "Internet Settings" @@ -3736,18 +3722,20 @@ msgid "" "'writable' attribute on the property descriptor cannot be set to 'true' on " "this object" msgstr "" +"このオブジェクトにおけるプロパティ記述子の 'writable' 属性は 'true' に設定で" +"きません" #: jscript.rc:70 msgid "Cannot redefine non-configurable property '|'" -msgstr "" +msgstr "変更不可のプロパティ '|' は再定義できません" #: jscript.rc:71 msgid "Cannot modify non-writable property '|'" -msgstr "" +msgstr "書換不可のプロパティ '|' は変更できません" #: jscript.rc:72 msgid "Property cannot have both accessors and a value" -msgstr "" +msgstr "プロパティはアクセサと値の両方になることはできません" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" @@ -10736,6 +10724,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"シンボリックリンクを作成します。\n" +"\n" +"構文: MKLINK [オプション] リンク名対象\n" +"\n" +"オプション:\n" +"/d ディレクトリのシンボリックリンクを作成します。\n" +"/h ハードリンクを作成します。\n" +"/j ディレクトリのジャンクションを作成します。\n" +"リンク名は新しいシンボリックリンクの名前です。\n" +"対象はリンク名が指すパスです。\n" #: cmd.rc:312 msgid "" @@ -11041,10 +11039,8 @@ msgid "Error: Invalid option '%c'.\n" msgstr "エラー: 無効なオプション '%c'。\n" #: hostname.rc:32 -#, fuzzy -#| msgid "Error: Could not find process \"%1\".\n" msgid "Error: Could not get hostname: %u.\n" -msgstr "エラー: プロセス(%1)が見つかりません。\n" +msgstr "エラー: ホスト名が得られません: %u\n" #: hostname.rc:33 msgid "" @@ -12840,10 +12836,8 @@ msgid "Confirm Value Delete" msgstr "値の削除確認" #: regedit.rc:210 -#, fuzzy -#| msgid "Are you sure you want to delete the registry value '%1'?" msgid "Are you sure you want to delete the selected registry value?" -msgstr "本当にレジストリ値 '%1' を削除しますか?" +msgstr "本当に選択したレジストリ値を削除しますか?" #: regedit.rc:216 msgid "Search complete. The string '%1' was not found." @@ -14205,11 +14199,11 @@ msgstr "色(&O):" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "MIME タイプ" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "ファイル関連付けの管理(&A)" #: winecfg.rc:308 msgid "Folders" @@ -14822,6 +14816,8 @@ msgid "" "A program on your system has crashed, but WineDbg was unable to attach to " "the process to obtain a backtrace." msgstr "" +"プログラムがシステム上でクラッシュしましたが、バックトレースを取得する " +"WineDbg がプロセスにアタッチできませんでした。" #: winedbg.rc:41 msgid "(unidentified)" @@ -15114,7 +15110,7 @@ msgstr "地雷" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "すべての結果が失われます。よろしいですか?" #: winemine.rc:30 msgid "WineMine" @@ -15683,41 +15679,6 @@ msgid "D" msgstr "D" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15765,7 +15726,7 @@ msgstr "" "\tディレクトリとみなします。\n" "[/S] ディレクトリとサブディレクトリをコピーします。\n" "[/E] 空ディレクトリを含め、ディレクトリとサブディレクトリをコピー。\n" -"[/Q] コピー中にファイル名を一覧にしません。すなわち寡黙です。\n" +"[/Q] コピー中にファイル名を一覧にしないので、寡黙です。\n" "[/F] コピー中に完全な送り元と送り先の名前を表示します。\n" "[/L] 操作を模擬実行し、コピー予定のファイル名を表示します。\n" "[/W] コピーを開始する前に確認のメッセージを表示します。\n" @@ -15781,6 +15742,7 @@ msgstr "" "[/A] アーカイブ属性のファイルだけコピーします。\n" "[/M] アーカイブ属性のファイルだけコピーし、アーカイブ属性を\n" "\t取り除きます。\n" +"[/K] ファイル属性をコピー。これがない場合、属性はコピーされません。\n" "[/D | /D:月-日-年] 新しいファイルや指定された日付以降に変更された\n" "\t\tファイルをコピーします。日付が指定されない場合は、\n" "\t\tコピー先がコピー元より古いファイルだけコピーします。\n"

1 0