January 2013 - Wine-Commits

Nikolay Sivov : qmgr: Remove separate release helpers.
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: 53e25cb4f60bd2d760a9b2fe8b83de3765ad89d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e25cb4f60bd2d760a9b2fe8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 18 08:39:15 2013 +0400 qmgr: Remove separate release helpers. --- dlls/qmgr/file.c | 15 ++++++--------- dlls/qmgr/job.c | 15 ++++++--------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 5fa5d09..ccba81b 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -40,14 +40,6 @@ static inline BackgroundCopyFileImpl *impl_from_IBackgroundCopyFile(IBackgroundC return CONTAINING_RECORD(iface, BackgroundCopyFileImpl, IBackgroundCopyFile_iface); } -static void BackgroundCopyFileDestructor(BackgroundCopyFileImpl *This) -{ - IBackgroundCopyJob2_Release(&This->owner->IBackgroundCopyJob2_iface); - HeapFree(GetProcessHeap(), 0, This->info.LocalName); - HeapFree(GetProcessHeap(), 0, This->info.RemoteName); - HeapFree(GetProcessHeap(), 0, This); -} - static HRESULT WINAPI BITS_IBackgroundCopyFile_QueryInterface( IBackgroundCopyFile* iface, REFIID riid, @@ -86,7 +78,12 @@ static ULONG WINAPI BITS_IBackgroundCopyFile_Release( TRACE("(%p)->(%d)\n", This, ref); if (ref == 0) - BackgroundCopyFileDestructor(This); + { + IBackgroundCopyJob2_Release(&This->owner->IBackgroundCopyJob2_iface); + HeapFree(GetProcessHeap(), 0, This->info.LocalName); + HeapFree(GetProcessHeap(), 0, This->info.RemoteName); + HeapFree(GetProcessHeap(), 0, This); + } return ref; } diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 26fc43e..4abf220 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -28,14 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); -static void BackgroundCopyJobDestructor(BackgroundCopyJobImpl *This) -{ - This->cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->cs); - HeapFree(GetProcessHeap(), 0, This->displayName); - HeapFree(GetProcessHeap(), 0, This); -} - static inline BackgroundCopyJobImpl *impl_from_IBackgroundCopyJob2(IBackgroundCopyJob2 *iface) { return CONTAINING_RECORD(iface, BackgroundCopyJobImpl, IBackgroundCopyJob2_iface); @@ -77,7 +69,12 @@ static ULONG WINAPI BITS_IBackgroundCopyJob_Release(IBackgroundCopyJob2 *iface) TRACE("(%p)->(%d)\n", This, ref); if (ref == 0) - BackgroundCopyJobDestructor(This); + { + This->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->cs); + HeapFree(GetProcessHeap(), 0, This->displayName); + HeapFree(GetProcessHeap(), 0, This); + } return ref; }

1 0

Christian Costa : d3dx9_36: Initialize properly object in CreateEnumObject.
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: 8aa700e7ba41e57e299c4033a866c4e1e02e8417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa700e7ba41e57e299c4033a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jan 18 08:49:09 2013 +0100 d3dx9_36: Initialize properly object in CreateEnumObject. --- dlls/d3dx9_36/xfile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 234e071..d54ef0f 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -492,7 +492,7 @@ static HRESULT WINAPI ID3DXFileImpl_CreateEnumObject(ID3DXFile *iface, const voi return E_NOTIMPL; } - object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY;

1 0

Nikolay Sivov : xmllite: Initial support for start tag parsing.
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: 61b46738274a7d4ad9b7bc5c5b51615feb8951bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=61b46738274a7d4ad9b7bc5c5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 18 10:04:27 2013 +0400 xmllite: Initial support for start tag parsing. --- dlls/xmllite/reader.c | 140 +++++++++++++++++++++++++++++++++++++++--- dlls/xmllite/tests/reader.c | 67 ++++++++++++++++++++ 2 files changed, 197 insertions(+), 10 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index c3f53b4..058875a 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -51,7 +51,8 @@ typedef enum XmlReadInState_Misc_DTD, XmlReadInState_DTD, XmlReadInState_DTD_Misc, - XmlReadInState_Element + XmlReadInState_Element, + XmlReadInState_Content } XmlReaderInternalState; typedef enum @@ -448,11 +449,28 @@ static void readerinput_grow(xmlreaderinput *readerinput, int length) } } -static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encoding *enc) +static inline int readerinput_is_utf8(xmlreaderinput *readerinput) { - encoded_buffer *buffer = &readerinput->buffer->encoded; static char startA[] = {'<','?'}; static char commentA[] = {'<','!'}; + encoded_buffer *buffer = &readerinput->buffer->encoded; + unsigned char *ptr = (unsigned char*)buffer->data; + + return !memcmp(buffer->data, startA, sizeof(startA)) || + !memcmp(buffer->data, commentA, sizeof(commentA)) || + /* test start byte */ + (ptr[0] == '<' && + ( + (ptr[1] && (ptr[1] <= 0x7f)) || + (buffer->data[1] >> 5) == 0x6 || /* 2 bytes */ + (buffer->data[1] >> 4) == 0xe || /* 3 bytes */ + (buffer->data[1] >> 3) == 0x1e) /* 4 bytes */ + ); +} + +static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encoding *enc) +{ + encoded_buffer *buffer = &readerinput->buffer->encoded; static WCHAR startW[] = {'<','?'}; static WCHAR commentW[] = {'<','!'}; static char utf8bom[] = {0xef,0xbb,0xbf}; @@ -464,8 +482,7 @@ static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encod /* try start symbols if we have enough data to do that, input buffer should contain first chunk already */ - if (!memcmp(buffer->data, startA, sizeof(startA)) || - !memcmp(buffer->data, commentA, sizeof(commentA))) + if (readerinput_is_utf8(readerinput)) *enc = XmlEncoding_UTF8; else if (!memcmp(buffer->data, startW, sizeof(startW)) || !memcmp(buffer->data, commentW, sizeof(commentW))) @@ -987,9 +1004,10 @@ static inline int is_namestartchar(WCHAR ch) (ch >= 0xfdf0 && ch <= 0xfffd); } -static inline int is_namechar(WCHAR ch) +/* [4 NS] NCName ::= Name - (Char* ':' Char*) */ +static inline int is_ncnamechar(WCHAR ch) { - return (ch == ':') || (ch >= 'A' && ch <= 'Z') || + return (ch >= 'A' && ch <= 'Z') || (ch == '_') || (ch >= 'a' && ch <= 'z') || (ch == '-') || (ch == '.') || (ch >= '0' && ch <= '9') || @@ -1011,6 +1029,11 @@ static inline int is_namechar(WCHAR ch) (ch >= 0xfdf0 && ch <= 0xfffd); } +static inline int is_namechar(WCHAR ch) +{ + return (ch == ':') || is_ncnamechar(ch); +} + /* [4] NameStartChar ::= ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] | [#x370-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF] @@ -1316,11 +1339,106 @@ static HRESULT reader_parse_dtd(xmlreader *reader) return S_OK; } +/* [7 NS] QName ::= PrefixedName | UnprefixedName + [8 NS] PrefixedName ::= Prefix ':' LocalPart + [9 NS] UnprefixedName ::= LocalPart + [10 NS] Prefix ::= NCName + [11 NS] LocalPart ::= NCName */ +static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *local, strval *qname) +{ + WCHAR *ptr, *start = reader_get_cur(reader); + + ptr = start; + if (!is_ncnamechar(*ptr)) return NC_E_QNAMECHARACTER; + + while (is_ncnamechar(*ptr)) + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + + /* got a qualified name */ + if (*ptr == ':') + { + prefix->str = start; + prefix->len = ptr-start; + + reader_skipn(reader, 1); + start = ptr = reader_get_cur(reader); + + while (is_ncnamechar(*ptr)) + { + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + } + else + { + prefix->str = NULL; + prefix->len = 0; + } + + local->str = start; + local->len = ptr-start; + + if (prefix->len) + TRACE("qname %s:%s\n", debugstr_wn(prefix->str, prefix->len), debugstr_wn(local->str, local->len)); + else + TRACE("ncname %s\n", debugstr_wn(local->str, local->len)); + + qname->str = prefix->str ? prefix->str : local->str; + /* count ':' too */ + qname->len = (prefix->len ? prefix->len + 1 : 0) + local->len; + + return S_OK; +} + +/* [12 NS] STag ::= '<' QName (S Attribute)* S? '>' + [14 NS] EmptyElemTag ::= '<' QName (S Attribute)* S? '/>' */ +static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *local, strval *qname) +{ + static const WCHAR endW[] = {'/','>',0}; + HRESULT hr; + + /* skip '<' */ + reader_skipn(reader, 1); + + hr = reader_parse_qname(reader, prefix, local, qname); + if (FAILED(hr)) return hr; + + reader_skipspaces(reader); + + if (!reader_cmp(reader, endW)) return S_OK; + + FIXME("only empty elements without attributes supported\n"); + return E_NOTIMPL; +} + /* [39] element ::= EmptyElemTag | STag content ETag */ static HRESULT reader_parse_element(xmlreader *reader) { - FIXME("element parsing not implemented\n"); - return E_NOTIMPL; + static const WCHAR ltW[] = {'<',0}; + strval qname, prefix, local; + HRESULT hr; + + /* check if we are really on element */ + if (reader_cmp(reader, ltW)) return S_FALSE; + reader_shrink(reader); + + /* this handles empty elements too */ + hr = reader_parse_stag(reader, &prefix, &local, &qname); + if (FAILED(hr)) return hr; + + /* FIXME: need to check for defined namespace to reject invalid prefix, + currently reject all prefixes */ + if (prefix.len) return NC_E_UNDECLAREDPREFIX; + + reader->nodetype = XmlNodeType_Element; + reader_set_strvalue(reader, StringValue_LocalName, &local); + reader_set_strvalue(reader, StringValue_QualifiedName, &qname); + + FIXME("element content parsing not implemented\n"); + return hr; } static HRESULT reader_parse_nextnode(xmlreader *reader) @@ -1389,7 +1507,9 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) case XmlReadInState_Element: hr = reader_parse_element(reader); if (FAILED(hr)) return hr; - break; + + reader->instate = XmlReadInState_Content; + return hr; default: FIXME("internal state %d not handled\n", reader->instate); return E_NOTIMPL; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index d084e7b..7394564 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1022,6 +1022,72 @@ todo_wine { IXmlReader_Release(reader); } +static struct test_entry element_tests[] = { + { "<a/>", "a", "", S_OK }, + { "<a />", "a", "", S_OK }, + { "<a:b/>", "a:b", "", NC_E_UNDECLAREDPREFIX }, + { "<:a/>", NULL, NULL, NC_E_QNAMECHARACTER }, + { "< a/>", NULL, NULL, NC_E_QNAMECHARACTER }, + { NULL } +}; + +static void test_read_element(void) +{ + struct test_entry *test = element_tests; + IXmlReader *reader; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + while (test->xml) + { + XmlNodeType type; + IStream *stream; + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + if (test->hr_broken) + ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + else + ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + if (hr == S_OK) + { + const WCHAR *str; + WCHAR *str_exp; + UINT len; + + ok(type == XmlNodeType_Element, "got %d for %s\n", type, test->xml); + + len = 0; + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + + /* value */ + len = 1; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + } + + IStream_Release(stream); + test++; + } + + IXmlReader_Release(reader); +} + START_TEST(reader) { HRESULT r; @@ -1041,6 +1107,7 @@ START_TEST(reader) test_read_comment(); test_read_pi(); test_read_dtd(); + test_read_element(); test_read_full(); test_read_xmldeclaration();

1 0

Christian Costa : winealsa.drv: Fix F0 and F7 byte insertion + memory leak and remove LP stuff in modLongData .
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: d727596a5be24073a7f79aa39f2965580f7395b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d727596a5be24073a7f79aa39… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jan 18 08:48:22 2013 +0100 winealsa.drv: Fix F0 and F7 byte insertion + memory leak and remove LP stuff in modLongData. --- dlls/winealsa.drv/midi.c | 51 ++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 7c496c5..25a722e 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -931,8 +931,8 @@ static DWORD modData(WORD wDevID, DWORD dwParam) */ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) { - int len_add = 0; - LPBYTE lpData, lpNewData = NULL; + int len_add = 0; + BYTE *lpData, *lpNewData = NULL; snd_seq_event_t event; TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize); @@ -941,7 +941,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) * but it seems to be used only for midi input. * Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption. */ - + if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; @@ -950,8 +950,8 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) return MIDIERR_NODEVICE; } - lpData = (LPBYTE) lpMidiHdr->lpData; - + lpData = (BYTE*)lpMidiHdr->lpData; + if (lpData == NULL) return MIDIERR_UNPREPARED; if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) @@ -978,25 +978,25 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) switch (MidiOutDev[wDevID].caps.wTechnology) { case MOD_FMSYNTH: - /* FIXME: I don't think there is much to do here */ - break; + /* FIXME: I don't think there is much to do here */ + HeapFree(GetProcessHeap(), 0, lpNewData); + break; case MOD_MIDIPORT: - if (lpData[0] != 0xF0) { - /* Send start of System Exclusive */ - len_add = 1; - lpData[0] = 0xF0; - memcpy(lpNewData, lpData, lpMidiHdr->dwBufferLength); - WARN("Adding missing 0xF0 marker at the beginning of " - "system exclusive byte stream\n"); - } - if (lpData[lpMidiHdr->dwBufferLength-1] != 0xF7) { - /* Send end of System Exclusive */ - memcpy(lpData + len_add, lpData, lpMidiHdr->dwBufferLength); - lpNewData[lpMidiHdr->dwBufferLength + len_add - 1] = 0xF0; - len_add++; - WARN("Adding missing 0xF7 marker at the end of " - "system exclusive byte stream\n"); - } + if (lpData[0] != 0xF0) { + /* Send start of System Exclusive */ + len_add = 1; + lpNewData[0] = 0xF0; + memcpy(lpNewData + 1, lpData, lpMidiHdr->dwBufferLength); + WARN("Adding missing 0xF0 marker at the beginning of system exclusive byte stream\n"); + } + if (lpData[lpMidiHdr->dwBufferLength-1] != 0xF7) { + /* Send end of System Exclusive */ + if (!len_add) + memcpy(lpNewData, lpData, lpMidiHdr->dwBufferLength); + lpNewData[lpMidiHdr->dwBufferLength + len_add] = 0xF7; + len_add++; + WARN("Adding missing 0xF7 marker at the end of system exclusive byte stream\n"); + } snd_seq_ev_clear(&event); snd_seq_ev_set_direct(&event); snd_seq_ev_set_source(&event, port_out); @@ -1004,9 +1004,8 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) TRACE("client = %d port = %d\n", MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData); snd_seq_event_output_direct(midiSeq, &event); - if (lpNewData) - HeapFree(GetProcessHeap(), 0, lpData); - break; + HeapFree(GetProcessHeap(), 0, lpNewData); + break; default: WARN("Technology not supported (yet) %d !\n", MidiOutDev[wDevID].caps.wTechnology);

1 0

Christian Costa : d3dx9_36: Make variables static in xfile tests.
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: 64a88a2d837b2f99dbf25acd27b7b6656a7e11e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a88a2d837b2f99dbf25acd2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jan 18 08:49:25 2013 +0100 d3dx9_36: Make variables static in xfile tests. --- dlls/d3dx9_36/tests/xfile.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 6c29f5e..747fcadf 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -20,23 +20,23 @@ #include "d3dx9.h" #include "d3dx9xof.h" -char templates_bad_file_type1[] = +static char templates_bad_file_type1[] = "xOf 0302txt 0064\n"; -char templates_bad_file_version[] = +static char templates_bad_file_version[] = "xof 0102txt 0064\n"; -char templates_bad_file_type2[] = +static char templates_bad_file_type2[] = "xof 0302foo 0064\n"; -char templates_bad_file_float_size[] = +static char templates_bad_file_float_size[] = "xof 0302txt 0050\n"; -char templates_parse_error[] = +static char templates_parse_error[] = "xof 0302txt 0064" "foobar;\n"; -char templates[] = +static char templates[] = "xof 0302txt 0064" "template Header" "{" @@ -80,7 +80,7 @@ static void test_templates(void) todo_wine ok(ret == D3DXFERR_PARSEERROR, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_PARSEERROR); ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates, (SIZE_T)(sizeof(templates) - 1)); - ok(ret == S_OK, "RegisterTemplates with %#x\n", ret); + ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); d3dxfile->lpVtbl->Release(d3dxfile); }

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Jan. 18, 2013

Jan. 18, 2013

Module: wine Branch: master Commit: d7ac251e8dc69687c8c64f4ecd63168783e2ff60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ac251e8dc69687c8c64f4ec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 18 08:38:28 2013 +0400 po: Update Russian translation. --- po/ru.po | 164 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 79 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7ac251e8dc69687c8c64…

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: f3b133db6ee6a901bd7de1d0ae7c561b18e6216c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3b133db6ee6a901bd7de1d0a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jan 17 21:55:09 2013 +0900 po: Update Japanese translation. --- po/ja.po | 91 ++++++++++++++++++++----------------------------------------- 1 files changed, 30 insertions(+), 61 deletions(-) diff --git a/po/ja.po b/po/ja.po index 5c7c934..1fb9db6 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: 2012-09-04 23:19+0900\n" +"PO-Revision-Date: 2013-01-17 20:12+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: none\n" "Language: Japanese\n" @@ -3532,7 +3532,7 @@ msgstr "文字列定数が終端していません" #: jscript.rc:39 msgid "'return' statement outside of function" -msgstr "" +msgstr "return 文が関数外にあります" #: jscript.rc:40 msgid "Can't have 'break' outside of loop" @@ -8252,44 +8252,37 @@ msgid "Security Warning" msgstr "セキュリティ警告" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "とにかく続行してしまいますか?" +msgstr "このソフトウェアをインストールしますか?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "場所:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "インストールとアンインストール" +msgstr "インストールしない" #: urlmon.rc:40 msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" +"万一インストールすると、ActiveX コンポーネントはコンピュータへのフルアクセス" +"を得ます。上記の出所を完全に信頼しない場合は、インストールをクリックしないで" +"ください。" #: urlmon.rc:48 -#, fuzzy -#| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "インストールトランスフォームの適用に失敗しました。\n" +msgstr "コンポーネントのインストールは失敗しました: %08x" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "インストール(&I)" +msgstr "インストール (%d)" #: urlmon.rc:50 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "インストール(&I)" +msgstr "インストール" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window" @@ -10088,10 +10081,8 @@ msgid "Wine Command Prompt" msgstr "Wine コマンドプロンプト" #: cmd.rc:349 -#, fuzzy -#| msgid "CMD Version %1!S!\n" msgid "Wine CMD Version %1!S!\n" -msgstr "CMD バージョン %1!S!\n" +msgstr "" #: cmd.rc:350 msgid "More? " @@ -10120,31 +10111,31 @@ msgstr " (Yes|No|All)" #: cmd.rc:356 msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" -msgstr "" +msgstr "%1 を内部または外部コマンド、バッチスクリプトとして認識できません。\n" #: cmd.rc:357 msgid "Division by zero error.\n" -msgstr "" +msgstr "0 による除算エラー。\n" #: cmd.rc:358 msgid "Expected an operand.\n" -msgstr "" +msgstr "被演算子がありません。\n" #: cmd.rc:359 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Expected an operator.\n" -msgstr "予期しないネットワークエラーです。\n" +msgstr "演算子がありません。\n" #: cmd.rc:360 msgid "Mismatch in parentheses.\n" -msgstr "" +msgstr "括弧が対応していません。\n" #: cmd.rc:361 msgid "" "Badly formed number - must be one of decimal (12),\n" " hexadecimal (0x34) or octal (056).\n" msgstr "" +"数値の形式に誤りがあります - 10 進数 (12)、16 進数 (0x34)、\n" +"8 進数 (056) のいずれかとしてください。\n" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -10194,10 +10185,8 @@ msgid "Connection-specific DNS suffix" msgstr "接続固有の DNS サフィックス" #: ipconfig.rc:33 -#, fuzzy -#| msgid "IP address" msgid "IPv4 address" -msgstr "IP アドレス" +msgstr "IPv4 アドレス" #: ipconfig.rc:34 msgid "Hostname" @@ -10240,10 +10229,8 @@ msgid "Default gateway" msgstr "デフォルトゲートウェイ" #: ipconfig.rc:47 -#, fuzzy -#| msgid "IP address" msgid "IPv6 address" -msgstr "IP アドレス" +msgstr "IPv6 アドレス" #: net.rc:27 msgid "" @@ -10376,78 +10363,60 @@ msgid "The following services are running:\n" msgstr "以下のサービスが実行中です:\n" #: netstat.rc:27 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Connections" -msgstr "LAN 接続" +msgstr "アクティブな接続" #: netstat.rc:28 msgid "Proto" msgstr "" #: netstat.rc:29 -#, fuzzy -#| msgid "Email Address" msgid "Local Address" -msgstr "電子メールアドレス" +msgstr "内部アドレス" #: netstat.rc:30 -#, fuzzy -#| msgid "Street Address" msgid "Foreign Address" -msgstr "番地" +msgstr "外部アドレス" #: netstat.rc:31 -#, fuzzy -#| msgid "Status" msgid "State" msgstr "状態" #: netstat.rc:32 -#, fuzzy -#| msgid "Interfaces" msgid "Interface Statistics" -msgstr "インターフェイス" +msgstr "インターフェイスの統計" #: netstat.rc:33 msgid "Sent" -msgstr "" +msgstr "送信" #: netstat.rc:34 msgid "Received" -msgstr "" +msgstr "受信" #: netstat.rc:35 -#, fuzzy -#| msgid "bytes" msgid "Bytes" msgstr "バイト" #: netstat.rc:36 msgid "Unicast packets" -msgstr "" +msgstr "ユニキャストパケット" #: netstat.rc:37 msgid "Non-unicast packets" -msgstr "" +msgstr "非ユニキャストパケット" #: netstat.rc:38 -#, fuzzy -#| msgid "Disclaimer" msgid "Discards" -msgstr "免責条項" +msgstr "破棄" #: netstat.rc:39 -#, fuzzy -#| msgid "Error" msgid "Errors" msgstr "エラー" #: netstat.rc:40 -#, fuzzy -#| msgid "Unknown port.\n" msgid "Unknown protocols" -msgstr "認識できないポートです。\n" +msgstr "不明なプロトコル" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Alexandre Julliard : winex11: Fallback to the standard cursor font when XCursor is missing.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: 77af9035d8165604dad7613e6d3e512506819860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77af9035d8165604dad7613e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 17 15:33:09 2013 +0100 winex11: Fallback to the standard cursor font when XCursor is missing. --- dlls/winex11.drv/mouse.c | 121 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 115 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 8870665..790c532 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -772,6 +772,8 @@ cleanup: return cursor; } +#endif /* SONAME_LIBXCURSOR */ + struct system_cursors { @@ -843,6 +845,111 @@ static const struct { riched20_cursors, {'r','i','c','h','e','d','2','0','.','d','l','l',0} } }; +struct cursor_font_fallback +{ + const char *name; + unsigned int shape; +}; + +static const struct cursor_font_fallback fallbacks[] = +{ + { "X_cursor", XC_X_cursor }, + { "arrow", XC_arrow }, + { "based_arrow_down", XC_based_arrow_down }, + { "based_arrow_up", XC_based_arrow_up }, + { "boat", XC_boat }, + { "bogosity", XC_bogosity }, + { "bottom_left_corner", XC_bottom_left_corner }, + { "bottom_right_corner", XC_bottom_right_corner }, + { "bottom_side", XC_bottom_side }, + { "bottom_tee", XC_bottom_tee }, + { "box_spiral", XC_box_spiral }, + { "center_ptr", XC_center_ptr }, + { "circle", XC_circle }, + { "clock", XC_clock }, + { "coffee_mug", XC_coffee_mug }, + { "col-resize", XC_sb_v_double_arrow }, + { "cross", XC_cross }, + { "cross_reverse", XC_cross_reverse }, + { "crosshair", XC_crosshair }, + { "diamond_cross", XC_diamond_cross }, + { "dot", XC_dot }, + { "dotbox", XC_dotbox }, + { "double_arrow", XC_double_arrow }, + { "draft_large", XC_draft_large }, + { "draft_small", XC_draft_small }, + { "draped_box", XC_draped_box }, + { "exchange", XC_exchange }, + { "fleur", XC_fleur }, + { "gobbler", XC_gobbler }, + { "gumby", XC_gumby }, + { "hand1", XC_hand1 }, + { "hand2", XC_hand2 }, + { "heart", XC_heart }, + { "icon", XC_icon }, + { "iron_cross", XC_iron_cross }, + { "left_ptr", XC_left_ptr }, + { "left_side", XC_left_side }, + { "left_tee", XC_left_tee }, + { "leftbutton", XC_leftbutton }, + { "ll_angle", XC_ll_angle }, + { "lr_angle", XC_lr_angle }, + { "man", XC_man }, + { "middlebutton", XC_middlebutton }, + { "mouse", XC_mouse }, + { "pencil", XC_pencil }, + { "pirate", XC_pirate }, + { "plus", XC_plus }, + { "question_arrow", XC_question_arrow }, + { "right_ptr", XC_right_ptr }, + { "right_side", XC_right_side }, + { "right_tee", XC_right_tee }, + { "rightbutton", XC_rightbutton }, + { "row-resize", XC_sb_h_double_arrow }, + { "rtl_logo", XC_rtl_logo }, + { "sailboat", XC_sailboat }, + { "sb_down_arrow", XC_sb_down_arrow }, + { "sb_h_double_arrow", XC_sb_h_double_arrow }, + { "sb_left_arrow", XC_sb_left_arrow }, + { "sb_right_arrow", XC_sb_right_arrow }, + { "sb_up_arrow", XC_sb_up_arrow }, + { "sb_v_double_arrow", XC_sb_v_double_arrow }, + { "shuttle", XC_shuttle }, + { "sizing", XC_sizing }, + { "spider", XC_spider }, + { "spraycan", XC_spraycan }, + { "star", XC_star }, + { "target", XC_target }, + { "tcross", XC_tcross }, + { "top_left_arrow", XC_top_left_arrow }, + { "top_left_corner", XC_top_left_corner }, + { "top_right_corner", XC_top_right_corner }, + { "top_side", XC_top_side }, + { "top_tee", XC_top_tee }, + { "trek", XC_trek }, + { "ul_angle", XC_ul_angle }, + { "umbrella", XC_umbrella }, + { "ur_angle", XC_ur_angle }, + { "watch", XC_watch }, + { "xterm", XC_xterm } +}; + +static int fallback_cmp( const void *key, const void *member ) +{ + const struct cursor_font_fallback *fallback = member; + return strcmp( key, fallback->name ); +} + +static int find_fallback_shape( const char *name ) +{ + struct cursor_font_fallback *fallback; + + if ((fallback = bsearch( name, fallbacks, sizeof(fallbacks) / sizeof(fallbacks[0]), + sizeof(*fallback), fallback_cmp ))) + return fallback->shape; + return -1; +} + /*********************************************************************** * create_xcursor_system_cursor * @@ -860,7 +967,6 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) char valueA[64]; DWORD size, ret; - if (!pXcursorLibraryLoadCursor) return 0; if (!info->szModName[0]) return 0; p = strrchrW( info->szModName, '\\' ); @@ -904,7 +1010,14 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) done: if (valueA[0]) { - cursor = pXcursorLibraryLoadCursor( gdi_display, valueA ); +#ifdef SONAME_LIBXCURSOR + if (pXcursorLibraryLoadCursor) cursor = pXcursorLibraryLoadCursor( gdi_display, valueA ); +#endif + if (!cursor) + { + int shape = find_fallback_shape( valueA ); + if (shape != -1) cursor = XCreateFontCursor( gdi_display, shape ); + } if (!cursor) WARN( "no system cursor found for %s mapped to %s\n", debugstr_w(name), debugstr_a(valueA) ); } @@ -912,8 +1025,6 @@ done: return cursor; } -#endif /* SONAME_LIBXCURSOR */ - /*********************************************************************** * create_xlib_monochrome_cursor @@ -1154,14 +1265,12 @@ static Cursor create_cursor( HANDLE handle ) info.cbSize = sizeof(info); if (!GetIconInfoExW( handle, &info )) return 0; -#ifdef SONAME_LIBXCURSOR if (use_system_cursors && (cursor = create_xcursor_system_cursor( &info ))) { DeleteObject( info.hbmColor ); DeleteObject( info.hbmMask ); return cursor; } -#endif GetObjectW( info.hbmMask, sizeof(bm), &bm ); if (!info.hbmColor) bm.bmHeight = max( 1, bm.bmHeight / 2 );

1 0

Alexandre Julliard : winex11: Check the bpp instead of the depth in the R8G8B8 format test.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: ae0ae4b9bae40ffb7f9e1963c1ed1d1764019317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae0ae4b9bae40ffb7f9e1963c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 17 14:36:51 2013 +0100 winex11: Check the bpp instead of the depth in the R8G8B8 format test. --- dlls/winex11.drv/bitblt.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 84e8751..e91ca75 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1042,7 +1042,8 @@ static BOOL matching_color_info( const XVisualInfo *vis, const BITMAPINFO *info static inline BOOL is_r8g8b8( const XVisualInfo *vis ) { - return vis->depth == 24 && vis->red_mask == 0xff0000 && vis->blue_mask == 0x0000ff; + const XPixmapFormatValues *format = pixmap_formats[vis->depth]; + return format->bits_per_pixel == 24 && vis->red_mask == 0xff0000 && vis->blue_mask == 0x0000ff; } static inline BOOL image_needs_byteswap( XImage *image, BOOL is_r8g8b8, int bit_count )

1 0

Hans Leidekker : wmiutils: Implement IWbemPath::RemoveNamespaceAt.
by Alexandre Julliard Jan. 17, 2013

Jan. 17, 2013

Module: wine Branch: master Commit: 9548eb79ad87782cf04a2d3bd86d1c4b0eecdb32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9548eb79ad87782cf04a2d3bd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 17 15:30:44 2013 +0100 wmiutils: Implement IWbemPath::RemoveNamespaceAt. --- dlls/wmiutils/path.c | 18 +++++++- dlls/wmiutils/tests/path.c | 88 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 97 insertions(+), 9 deletions(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 3f74389..73c1c62 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -525,10 +525,22 @@ static HRESULT WINAPI path_GetNamespaceAt( static HRESULT WINAPI path_RemoveNamespaceAt( IWbemPath *iface, - ULONG uIndex) + ULONG idx) { - FIXME("%p, %u\n", iface, uIndex); - return E_NOTIMPL; + struct path *path = impl_from_IWbemPath( iface ); + + TRACE("%p, %u\n", iface, idx); + + if (idx >= path->num_namespaces) return WBEM_E_INVALID_PARAMETER; + heap_free( path->namespaces[idx] ); + while (idx < path->num_namespaces - 1) + { + path->namespaces[idx] = path->namespaces[idx + 1]; + path->len_namespaces[idx] = path->len_namespaces[idx + 1]; + idx++; + } + path->num_namespaces--; + return S_OK; } static HRESULT WINAPI path_RemoveAllNamespaces( diff --git a/dlls/wmiutils/tests/path.c b/dlls/wmiutils/tests/path.c index 8441d86..049d9b3 100644 --- a/dlls/wmiutils/tests/path.c +++ b/dlls/wmiutils/tests/path.c @@ -586,6 +586,10 @@ static void test_IWbemPath_GetNamespaceAt(void) static void test_IWbemPath_RemoveAllNamespaces(void) { + static const ULONGLONG expected_flags = + WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | + WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | + WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER; IWbemPath *path; WCHAR buf[16]; ULONG len; @@ -603,9 +607,7 @@ static void test_IWbemPath_RemoveAllNamespaces(void) flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); - ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | - WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | - WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER), + ok( flags == expected_flags, "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); hr = IWbemPath_RemoveAllNamespaces( path ); @@ -614,9 +616,7 @@ static void test_IWbemPath_RemoveAllNamespaces(void) flags = 0; hr = IWbemPath_GetInfo( path, 0, &flags ); ok( hr == S_OK, "got %08x\n", hr ); - ok( flags == (WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | - WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | - WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER), + ok( flags == expected_flags, "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); buf[0] = 0; @@ -627,6 +627,81 @@ static void test_IWbemPath_RemoveAllNamespaces(void) IWbemPath_Release( path ); } +static void test_IWbemPath_RemoveNamespaceAt(void) +{ + static const ULONGLONG expected_flags = + WBEMPATH_INFO_ANON_LOCAL_MACHINE | WBEMPATH_INFO_IS_INST_REF | + WBEMPATH_INFO_HAS_SUBSCOPES | WBEMPATH_INFO_V2_COMPLIANT | + WBEMPATH_INFO_CIM_COMPLIANT | WBEMPATH_INFO_PATH_HAD_SERVER; + static const WCHAR cimv2W[] = {'c','i','m','v','2',0}; + IWbemPath *path; + WCHAR buf[16]; + ULONG len, count; + ULONGLONG flags; + HRESULT hr; + + if (!(path = create_path())) return; + + hr = IWbemPath_RemoveNamespaceAt( path, 0 ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, path17 ); + ok( hr == S_OK, "got %08x\n", hr ); + + flags = 0; + hr = IWbemPath_GetInfo( path, 0, &flags ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( flags == expected_flags, + "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + + count = 0xdeadbeef; + hr = IWbemPath_GetNamespaceCount( path, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 2, "got %u\n", count ); + + hr = IWbemPath_RemoveNamespaceAt( path, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + + flags = 0; + hr = IWbemPath_GetInfo( path, 0, &flags ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( flags == expected_flags, + "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + + count = 0xdeadbeef; + hr = IWbemPath_GetNamespaceCount( path, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 1, "got %u\n", count ); + + buf[0] = 0; + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !lstrcmpW( buf, cimv2W ), "unexpected buffer contents %s\n", wine_dbgstr_w(buf) ); + ok( len == lstrlenW( cimv2W ) + 1, "unexpected length %u\n", len ); + + hr = IWbemPath_RemoveNamespaceAt( path, 0 ); + ok( hr == S_OK, "got %08x\n", hr ); + + flags = 0; + hr = IWbemPath_GetInfo( path, 0, &flags ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( flags == expected_flags, + "got %lx%08lx\n", (unsigned long)(flags >> 32), (unsigned long)flags ); + + count = 0xdeadbeef; + hr = IWbemPath_GetNamespaceCount( path, &count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !count, "got %u\n", count ); + + buf[0] = 0; + len = sizeof(buf) / sizeof(buf[0]); + hr = IWbemPath_GetNamespaceAt( path, 0, &len, buf ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + IWbemPath_Release( path ); +} + START_TEST (path) { CoInitialize( NULL ); @@ -640,6 +715,7 @@ START_TEST (path) test_IWbemPath_SetServer(); test_IWbemPath_GetNamespaceAt(); test_IWbemPath_RemoveAllNamespaces(); + test_IWbemPath_RemoveNamespaceAt(); CoUninitialize(); }

1 0