January 2013 - Wine-commits

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

18 Jan '13

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: Initialize properly object in CreateEnumObject.
by Alexandre Julliard 18 Jan '13

18 Jan '13

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

Christian Costa : d3dx9_36: Implement ID3DXFileDataImpl_Lock and ID3DXFileDataImpl_Unlock + tests.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 45e43dc5d047909609db2d90a1df4a58b390823f URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e43dc5d047909609db2d90a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Jan 18 08:49:17 2013 +0100 d3dx9_36: Implement ID3DXFileDataImpl_Lock and ID3DXFileDataImpl_Unlock + tests. --- dlls/d3dx9_36/tests/xfile.c | 47 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/xfile.c | 23 +++++++++++++++++--- 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 3ab30a9..6c29f5e 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -46,6 +46,12 @@ char templates[] = "DWORD flags;" "}\n"; +static char objects[] = +"xof 0302txt 0064\n" +"Header Object\n" +"{\n" +"1; 2; 3;\n" +"}\n"; static void test_templates(void) { @@ -79,8 +85,49 @@ static void test_templates(void) d3dxfile->lpVtbl->Release(d3dxfile); } +static void test_lock_unlock(void) +{ + ID3DXFile *d3dxfile; + D3DXF_FILELOADMEMORY memory; + ID3DXFileEnumObject *enum_object; + ID3DXFileData *data_object; + const void *data; + SIZE_T size; + HRESULT ret; + + ret = D3DXFileCreate(&d3dxfile); + ok(ret == S_OK, "D3DXCreateFile failed with %#x\n", ret); + + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates, (SIZE_T)(sizeof(templates) - 1)); + ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); + + memory.lpMemory = objects; + memory.dSize = sizeof(objects) - 1; + + ret = d3dxfile->lpVtbl->CreateEnumObject(d3dxfile, &memory, D3DXF_FILELOAD_FROMMEMORY, &enum_object); + ok(ret == S_OK, "CreateEnumObject failed with %#x\n", ret); + + ret = enum_object->lpVtbl->GetChild(enum_object, 0, &data_object); + ok(ret == S_OK, "GetChild failed with %#x\n", ret); + + ret = data_object->lpVtbl->Unlock(data_object); + ok(ret == S_OK, "Unlock failed with %#x\n", ret); + ret = data_object->lpVtbl->Lock(data_object, &size, &data); + ok(ret == S_OK, "Lock failed with %#x\n", ret); + ret = data_object->lpVtbl->Lock(data_object, &size, &data); + ok(ret == S_OK, "Lock failed with %#x\n", ret); + ret = data_object->lpVtbl->Unlock(data_object); + ok(ret == S_OK, "Unlock failed with %#x\n", ret); + ret = data_object->lpVtbl->Unlock(data_object); + ok(ret == S_OK, "Unlock failed with %#x\n", ret); + + data_object->lpVtbl->Release(data_object); + enum_object->lpVtbl->Release(enum_object); + d3dxfile->lpVtbl->Release(d3dxfile); +} START_TEST(xfile) { test_templates(); + test_lock_unlock(); } diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index d54ef0f..afc0def 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -178,17 +178,32 @@ static HRESULT WINAPI ID3DXFileDataImpl_GetId(ID3DXFileData *iface, GUID *guid) static HRESULT WINAPI ID3DXFileDataImpl_Lock(ID3DXFileData *iface, SIZE_T *size, const void **data) { - FIXME("(%p)->(%p, %p): stub\n", iface, size, data); + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); + DWORD dxfile_size; + HRESULT ret; - return E_NOTIMPL; + TRACE("(%p)->(%p, %p)\n", iface, size, data); + + if (!size || !data) + return E_POINTER; + + ret = IDirectXFileData_GetData(This->dxfile_data, NULL, &dxfile_size, (void**)data); + if (ret != DXFILE_OK) + return error_dxfile_to_d3dxfile(ret); + + *size = dxfile_size; + + return S_OK; } static HRESULT WINAPI ID3DXFileDataImpl_Unlock(ID3DXFileData *iface) { - FIXME("(%p)->(): stub\n", iface); + TRACE("(%p)->()\n", iface); - return E_NOTIMPL; + /* Nothing to do */ + + return S_OK; }

1 0

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

18 Jan '13

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

Alexandre Julliard : d3dx9_36/tests: Remove useless casts.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: d72394e7fa1ddc6083d5294d47075246466baf63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72394e7fa1ddc6083d5294d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 18 12:30:27 2013 +0100 d3dx9_36/tests: Remove useless casts. --- dlls/d3dx9_36/tests/xfile.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 747fcadf..1238bcd 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" -static char templates_bad_file_type1[] = +static const char templates_bad_file_type1[] = "xOf 0302txt 0064\n"; -static char templates_bad_file_version[] = +static const char templates_bad_file_version[] = "xof 0102txt 0064\n"; -static char templates_bad_file_type2[] = +static const char templates_bad_file_type2[] = "xof 0302foo 0064\n"; -static char templates_bad_file_float_size[] = +static const char templates_bad_file_float_size[] = "xof 0302txt 0050\n"; -static char templates_parse_error[] = +static const char templates_parse_error[] = "xof 0302txt 0064" "foobar;\n"; -static char templates[] = +static const char templates[] = "xof 0302txt 0064" "template Header" "{" @@ -64,22 +64,22 @@ static void test_templates(void) ret = D3DXFileCreate(&d3dxfile); ok(ret == S_OK, "D3DXCreateFile failed with %#x\n", ret); - ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates_bad_file_type1, (SIZE_T)(sizeof(templates_bad_file_type1) - 1)); + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates_bad_file_type1, sizeof(templates_bad_file_type1) - 1); ok(ret == D3DXFERR_BADFILETYPE, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_BADFILETYPE); - ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates_bad_file_version, (SIZE_T)(sizeof(templates_bad_file_version) - 1)); + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates_bad_file_version, sizeof(templates_bad_file_version) - 1); ok(ret == D3DXFERR_BADFILEVERSION, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_BADFILEVERSION); - ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates_bad_file_type2, (SIZE_T)(sizeof(templates_bad_file_type2) - 1)); + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates_bad_file_type2, sizeof(templates_bad_file_type2) - 1); ok(ret == D3DXFERR_BADFILETYPE, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_BADFILETYPE); - ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates_bad_file_float_size, (SIZE_T)(sizeof(templates_bad_file_float_size) - 1)); + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates_bad_file_float_size, sizeof(templates_bad_file_float_size) - 1); ok(ret == D3DXFERR_BADFILEFLOATSIZE, "RegisterTemplates returned %#x, expected %#x\n", ret, D3DXFERR_BADFILEFLOATSIZE); - ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates_parse_error, (SIZE_T)(sizeof(templates_parse_error) - 1)); + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates_parse_error, sizeof(templates_parse_error) - 1); 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)); + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates, sizeof(templates) - 1); ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); d3dxfile->lpVtbl->Release(d3dxfile); @@ -98,7 +98,7 @@ static void test_lock_unlock(void) ret = D3DXFileCreate(&d3dxfile); ok(ret == S_OK, "D3DXCreateFile failed with %#x\n", ret); - ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, (const void *)templates, (SIZE_T)(sizeof(templates) - 1)); + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates, sizeof(templates) - 1); ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); memory.lpMemory = objects;

1 0

Hans Leidekker : wbemprox: Reject empty queries.
by Alexandre Julliard 18 Jan '13

18 Jan '13

Module: wine Branch: master Commit: 9d9c17de2b6cb1139c014ff2ab6c465db488d653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9c17de2b6cb1139c014ff2a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 18 10:22:49 2013 +0100 wbemprox: Reject empty queries. --- dlls/wbemprox/services.c | 2 +- dlls/wbemprox/tests/query.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 663d2d0..4bcd824 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -527,7 +527,7 @@ static HRESULT WINAPI wbem_services_ExecQuery( TRACE("%p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strQueryLanguage), debugstr_w(strQuery), lFlags, pCtx, ppEnum); - if (!strQueryLanguage || !strQuery) return WBEM_E_INVALID_PARAMETER; + if (!strQueryLanguage || !strQuery || !strQuery[0]) return WBEM_E_INVALID_PARAMETER; if (strcmpiW( strQueryLanguage, wqlW )) return WBEM_E_INVALID_QUERY_TYPE; return exec_query( strQuery, ppEnum ); } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 71c613a..1096caa 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -69,6 +69,7 @@ static HRESULT exec_query( IWbemServices *services, const WCHAR *str, IEnumWbemC static void test_select( IWbemServices *services ) { + static const WCHAR emptyW[] = {0}; static const WCHAR sqlW[] = {'S','Q','L',0}; static const WCHAR query1[] = {'S','E','L','E','C','T',' ','H','O','T','F','I','X','I','D',' ','F','R','O','M',' ', @@ -113,6 +114,11 @@ static void test_select( IWbemServices *services ) hr = IWbemServices_ExecQuery( services, sql, NULL, 0, NULL, &result ); ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + SysFreeString( query ); + query = SysAllocString( emptyW ); + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == WBEM_E_INVALID_PARAMETER, "query failed %08x\n", hr ); + for (i = 0; i < sizeof(test)/sizeof(test[0]); i++) { hr = exec_query( services, test[i], &result );

1 0

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

17 Jan '13

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

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

17 Jan '13

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

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 17 Jan '13

17 Jan '13

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

Jacek Caban : mshtml: Added support for DOCUMENT_TYPE_NODE in nsnode_to_nsstring_rec.
by Alexandre Julliard 17 Jan '13

17 Jan '13

Module: wine Branch: master Commit: 292e2359bbdfd3259dee82f3f85ce099d8e764ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=292e2359bbdfd3259dee82f3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 17 15:24:24 2013 +0100 mshtml: Added support for DOCUMENT_TYPE_NODE in nsnode_to_nsstring_rec. --- dlls/mshtml/nsembed.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 109b6ad..fdb11ed 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -951,7 +951,7 @@ static HRESULT nsnode_to_nsstring_rec(nsIContentSerializer *serializer, nsIDOMNo break; } case DOCUMENT_TYPE_NODE: - WARN("Ignoring DOCUMENT_TYPE_NODE\n"); + nsIContentSerializer_AppendDoctype(serializer, nscontent, str); break; case DOCUMENT_FRAGMENT_NODE: break;

1 0