October 2012 - Wine-Commits

Henri Verbeet : d3d9/tests: Avoid LPDIRECT3DTEXTURE9.
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: wine Branch: master Commit: 369fb5185f199e8c53ba90480fcf169d5099fcb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=369fb5185f199e8c53ba90480… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 30 01:01:44 2012 +0100 d3d9/tests: Avoid LPDIRECT3DTEXTURE9. --- dlls/d3d9/tests/visual.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b6763099..03678d0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6934,11 +6934,10 @@ static void srgbtexture_test(IDirect3DDevice9 *device) * texture stage state to render a quad using that texture. The resulting * color components should be 0x36 (~ 0.21), per this formula: * linear_color = ((srgb_color + 0.055) / 1.055) ^ 2.4 - * This is true where srgb_color > 0.04045. - */ + * This is true where srgb_color > 0.04045. */ + struct IDirect3DTexture9 *texture = NULL; IDirect3D9 *d3d = NULL; HRESULT hr; - LPDIRECT3DTEXTURE9 texture = NULL; LPDIRECT3DSURFACE9 surface = NULL; D3DLOCKED_RECT lr; DWORD color;

1 0

Daniel Lehman : msvcp: Sync istream<>::peek implementations.
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: wine Branch: master Commit: c868db7668ffc24319d65d8a4843864f19d677fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c868db7668ffc24319d65d8a4… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Oct 26 10:18:58 2012 -0700 msvcp: Sync istream<>::peek implementations. --- dlls/msvcp100/ios.c | 8 ++++++++ dlls/msvcp60/ios.c | 8 ++++++++ dlls/msvcp71/ios.c | 8 ++++++++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp100/ios.c b/dlls/msvcp100/ios.c index 278abd8..32f36ce 100644 --- a/dlls/msvcp100/ios.c +++ b/dlls/msvcp100/ios.c @@ -5821,6 +5821,10 @@ int __thiscall basic_istream_char_peek(basic_istream_char *this) if(basic_istream_char_sentry_create(this, TRUE)) ret = basic_streambuf_char_sgetc(basic_ios_char_rdbuf_get(base)); basic_istream_char_sentry_destroy(this); + + if (ret == EOF) + basic_ios_char_setstate(base, IOSTATE_eofbit); + return ret; } @@ -6949,6 +6953,10 @@ unsigned short __thiscall basic_istream_wchar_peek(basic_istream_wchar *this) if(basic_istream_wchar_sentry_create(this, TRUE)) ret = basic_streambuf_wchar_sgetc(basic_ios_wchar_rdbuf_get(base)); basic_istream_wchar_sentry_destroy(this); + + if (ret == WEOF) + basic_ios_wchar_setstate(base, IOSTATE_eofbit); + return ret; } diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 71ff193..0bccd5f 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7212,6 +7212,10 @@ int __thiscall basic_istream_char_peek(basic_istream_char *this) if(basic_istream_char_sentry_create(this, TRUE)) ret = basic_streambuf_char_sgetc(basic_ios_char_rdbuf_get(base)); basic_istream_char_sentry_destroy(this); + + if (ret == EOF) + basic_ios_char_setstate(base, IOSTATE_eofbit); + return ret; } @@ -8467,6 +8471,10 @@ unsigned short __thiscall basic_istream_wchar_peek(basic_istream_wchar *this) if(basic_istream_wchar_sentry_create(this, TRUE)) ret = basic_streambuf_wchar_sgetc(basic_ios_wchar_rdbuf_get(base)); basic_istream_wchar_sentry_destroy(this); + + if (ret == WEOF) + basic_ios_wchar_setstate(base, IOSTATE_eofbit); + return ret; } diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index be8f744..280ce86 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -7544,6 +7544,10 @@ int __thiscall basic_istream_char_peek(basic_istream_char *this) if(basic_istream_char_sentry_create(this, TRUE)) ret = basic_streambuf_char_sgetc(basic_ios_char_rdbuf_get(base)); basic_istream_char_sentry_destroy(this); + + if (ret == EOF) + basic_ios_char_setstate(base, IOSTATE_eofbit); + return ret; } @@ -8802,6 +8806,10 @@ unsigned short __thiscall basic_istream_wchar_peek(basic_istream_wchar *this) if(basic_istream_wchar_sentry_create(this, TRUE)) ret = basic_streambuf_wchar_sgetc(basic_ios_wchar_rdbuf_get(base)); basic_istream_wchar_sentry_destroy(this); + + if (ret == WEOF) + basic_ios_wchar_setstate(base, IOSTATE_eofbit); + return ret; }

1 0

Daniel Lehman : msvcp90: Set eof state in istream<>::peek if got eof.
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: wine Branch: master Commit: 32be163545459bf85c58895bcb315dcdfd7d22b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32be163545459bf85c58895bc… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Sep 27 17:27:15 2012 -0700 msvcp90: Set eof state in istream<>::peek if got eof. --- dlls/msvcp90/ios.c | 8 +++++ dlls/msvcp90/tests/ios.c | 75 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7e84f93..a11f90c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -7575,6 +7575,10 @@ int __thiscall basic_istream_char_peek(basic_istream_char *this) if(basic_istream_char_sentry_create(this, TRUE)) ret = basic_streambuf_char_sgetc(basic_ios_char_rdbuf_get(base)); basic_istream_char_sentry_destroy(this); + + if (ret == EOF) + basic_ios_char_setstate(base, IOSTATE_eofbit); + return ret; } @@ -8837,6 +8841,10 @@ unsigned short __thiscall basic_istream_wchar_peek(basic_istream_wchar *this) if(basic_istream_wchar_sentry_create(this, TRUE)) ret = basic_streambuf_wchar_sgetc(basic_ios_wchar_rdbuf_get(base)); basic_istream_wchar_sentry_destroy(this); + + if (ret == WEOF) + basic_ios_wchar_setstate(base, IOSTATE_eofbit); + return ret; } diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 8573778..c184cdb 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -359,19 +359,21 @@ static void (*__thiscall p_basic_stringstream_wchar_vbase_dtor)(basic_stringstre /* istream */ static basic_istream_char* (*__thiscall p_basic_istream_char_read_uint64)(basic_istream_char*, unsigned __int64*); static basic_istream_char* (*__thiscall p_basic_istream_char_read_double)(basic_istream_char*, double*); -static int (*__thiscall p_basic_istream_char_get)(basic_istream_char*); -static MSVCP_bool (*__thiscall p_basic_istream_char_ipfx)(basic_istream_char*, MSVCP_bool); +static int (*__thiscall p_basic_istream_char_get)(basic_istream_char*); +static MSVCP_bool (*__thiscall p_basic_istream_char_ipfx)(basic_istream_char*, MSVCP_bool); static basic_istream_char* (*__thiscall p_basic_istream_char_ignore)(basic_istream_char*, streamsize, int); static basic_istream_char* (*__thiscall p_basic_istream_char_seekg)(basic_istream_char*, streamoff, int); static basic_istream_char* (*__thiscall p_basic_istream_char_seekg_fpos)(basic_istream_char*, fpos_int); +static int (*__thiscall p_basic_istream_char_peek)(basic_istream_char*); static basic_istream_wchar* (*__thiscall p_basic_istream_wchar_read_uint64)(basic_istream_wchar*, unsigned __int64*); static basic_istream_wchar* (*__thiscall p_basic_istream_wchar_read_double)(basic_istream_wchar*, double *); -static int (*__thiscall p_basic_istream_wchar_get)(basic_istream_wchar*); -static MSVCP_bool (*__thiscall p_basic_istream_wchar_ipfx)(basic_istream_wchar*, MSVCP_bool); +static int (*__thiscall p_basic_istream_wchar_get)(basic_istream_wchar*); +static MSVCP_bool (*__thiscall p_basic_istream_wchar_ipfx)(basic_istream_wchar*, MSVCP_bool); static basic_istream_wchar* (*__thiscall p_basic_istream_wchar_ignore)(basic_istream_wchar*, streamsize, unsigned short); static basic_istream_wchar* (*__thiscall p_basic_istream_wchar_seekg)(basic_istream_wchar*, streamoff, int); static basic_istream_wchar* (*__thiscall p_basic_istream_wchar_seekg_fpos)(basic_istream_wchar*, fpos_int); +static unsigned short (*__thiscall p_basic_istream_wchar_peek)(basic_istream_wchar*); /* ostream */ static basic_ostream_char* (*__thiscall p_basic_ostream_char_print_double)(basic_ostream_char*, double); @@ -540,7 +542,8 @@ static BOOL init(void) "?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)_JH@Z"); SET(p_basic_istream_char_seekg_fpos, "?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)V?$fpos(a)H@2@@Z"); - + SET(p_basic_istream_char_peek, + "?peek@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAHXZ"); SET(p_basic_istream_wchar_read_uint64, "??5?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV01(a)AEA_K@Z"); @@ -556,6 +559,8 @@ static BOOL init(void) "?seekg@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV12(a)_JH@Z"); SET(p_basic_istream_wchar_seekg_fpos, "?seekg@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAAEAV12(a)V?$fpos(a)H@2@@Z"); + SET(p_basic_istream_wchar_peek, + "?peek@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEAAGXZ"); SET(p_basic_ostream_char_print_double, "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)N@Z"); @@ -629,6 +634,8 @@ static BOOL init(void) "?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)JH@Z"); SET(p_basic_istream_char_seekg_fpos, "?seekg@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z"); + SET(p_basic_istream_char_peek, + "?peek@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEHXZ"); SET(p_basic_istream_wchar_read_uint64, "??5?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV01(a)AA_K@Z"); @@ -644,6 +651,8 @@ static BOOL init(void) "?seekg@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV12(a)JH@Z"); SET(p_basic_istream_wchar_seekg_fpos, "?seekg@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEAAV12(a)V?$fpos(a)H@2@@Z"); + SET(p_basic_istream_wchar_peek, + "?peek@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QAEGXZ"); SET(p_basic_ostream_char_print_double, "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)N@Z"); @@ -1358,6 +1367,61 @@ static void test_istream_seekg_fpos(void) } +static void test_istream_peek(void) +{ + unsigned short testus, nextus, peekus; + basic_stringstream_wchar wss; + basic_stringstream_char ss; + basic_string_wchar wstr; + basic_string_char str; + IOSB_iostate state; + int i, next, peek; + wchar_t wide[64]; + + struct _test_istream_peek { + const char *str; + int peek; + int next; + IOSB_iostate state; + } tests[] = { + { "", EOF, EOF, IOSTATE_eofbit }, + { "ABCDEF", 'A', 'A', IOSTATE_goodbit }, + }; + + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { + /* char version */ + call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); + call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); + + peek = (int)call_func1(p_basic_istream_char_peek, &ss.base.base1); + state = (IOSB_iostate)call_func1(p_ios_base_rdstate, &ss.basic_ios.base); + next = (int)call_func1(p_basic_istream_char_get, &ss.base.base1); + + ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); + ok(tests[i].next == next, "wrong next, expected = %c (%i) found = %c (%i)\n", tests[i].next, tests[i].next, next, next); + ok(peek == next, "wrong peek, expected %c (%i) found = %c (%i)\n", peek, peek, next, next); + + call_func1(p_basic_stringstream_char_vbase_dtor, &ss); + + /* wchar_t version */ + AtoW(wide, tests[i].str, strlen(tests[i].str)); + call_func2(p_basic_string_wchar_ctor_cstr, &wstr, wide); + call_func4(p_basic_stringstream_wchar_ctor_str, &wss, &wstr, OPENMODE_out|OPENMODE_in, TRUE); + + peekus = (unsigned short)(int)call_func1(p_basic_istream_wchar_peek, &wss.base.base1); + state = (IOSB_iostate)call_func1(p_ios_base_rdstate, &wss.basic_ios.base); + nextus = (unsigned short)(int)call_func1(p_basic_istream_wchar_get, &wss.base.base1); + + ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); + testus = tests[i].next == EOF ? WEOF : (unsigned short)tests[i].next; + ok(testus == nextus, "wrong next, expected = %c (%i) found = %c (%i)\n", testus, testus, nextus, nextus); + ok(peekus == nextus, "wrong peek, expected %c (%i) found = %c (%i)\n", peekus, peekus, nextus, nextus); + + call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); + } +} + + START_TEST(ios) { if(!init()) @@ -1370,6 +1434,7 @@ START_TEST(ios) test_istream_ignore(); test_istream_seekg(); test_istream_seekg_fpos(); + test_istream_peek(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); }

1 0

André Hentschel : dplayx: Reorder some code to avoid memory leak (coverity).
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: wine Branch: master Commit: 3dd7c64c257ac801a0679a7b2be5388fe68ccce5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd7c64c257ac801a0679a7b2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 29 20:16:36 2012 +0100 dplayx: Reorder some code to avoid memory leak (coverity). --- dlls/dplayx/dplay.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 7636546..29212bc 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -1126,10 +1126,6 @@ DP_SetGroupData( lpGroupData lpGData, DWORD dwFlags, /* Reallocate for new data */ if( lpData != NULL ) { - LPVOID lpNewData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof( dwDataSize ) ); - CopyMemory( lpNewData, lpData, dwDataSize ); - if( dwFlags & DPSET_LOCAL ) { lpGData->lpLocalData = lpData; @@ -1137,7 +1133,8 @@ DP_SetGroupData( lpGroupData lpGData, DWORD dwFlags, } else { - lpGData->lpRemoteData = lpNewData; + lpGData->lpRemoteData = HeapAlloc( GetProcessHeap(), 0, dwDataSize ); + CopyMemory( lpGData->lpRemoteData, lpData, dwDataSize ); lpGData->dwRemoteDataSize = dwDataSize; } } @@ -1330,9 +1327,6 @@ DP_SetPlayerData( lpPlayerData lpPData, DWORD dwFlags, /* Reallocate for new data */ if( lpData != NULL ) { - LPVOID lpNewData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof( dwDataSize ) ); - CopyMemory( lpNewData, lpData, dwDataSize ); if( dwFlags & DPSET_LOCAL ) { @@ -1341,7 +1335,8 @@ DP_SetPlayerData( lpPlayerData lpPData, DWORD dwFlags, } else { - lpPData->lpRemoteData = lpNewData; + lpPData->lpRemoteData = HeapAlloc( GetProcessHeap(), 0, dwDataSize ); + CopyMemory( lpPData->lpRemoteData, lpData, dwDataSize ); lpPData->dwRemoteDataSize = dwDataSize; } }

1 0

Henri Verbeet : d3d9/tests: Avoid LPDIRECT3DSURFACE9.
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: wine Branch: master Commit: 32f8548d6778894cd4ffe63bb9640106589a331d URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f8548d6778894cd4ffe63bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 30 01:01:46 2012 +0100 d3d9/tests: Avoid LPDIRECT3DSURFACE9. --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 8d49fa4..5bb50f7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6936,9 +6936,9 @@ static void srgbtexture_test(IDirect3DDevice9 *device) * linear_color = ((srgb_color + 0.055) / 1.055) ^ 2.4 * This is true where srgb_color > 0.04045. */ struct IDirect3DTexture9 *texture = NULL; + struct IDirect3DSurface9 *surface = NULL; IDirect3D9 *d3d = NULL; HRESULT hr; - LPDIRECT3DSURFACE9 surface = NULL; D3DLOCKED_RECT lr; DWORD color; float quad[] = {

1 0

Jacek Caban : d3dx9mesh.h: Fixed D3DXConvertMeshSubsetToStrips declaration.
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: wine Branch: master Commit: 12caf31af2986d4e2923760b889efe2f2a25d593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12caf31af2986d4e2923760b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 30 09:56:00 2012 +0100 d3dx9mesh.h: Fixed D3DXConvertMeshSubsetToStrips declaration. --- include/d3dx9mesh.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index ff45762..149c199 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -770,7 +770,7 @@ HRESULT WINAPI D3DXComputeTangentFrameEx(LPD3DXMESH, DWORD, DWORD, DWORD, DWORD, HRESULT WINAPI D3DXComputeTangent(LPD3DXMESH, DWORD, DWORD, DWORD, DWORD, CONST DWORD *); HRESULT WINAPI D3DXConvertMeshSubsetToSingleStrip(struct ID3DXBaseMesh *mesh_in, DWORD attribute_id, DWORD ib_flags, struct IDirect3DIndexBuffer9 **index_buffer, DWORD *index_count); -HRESULT WINAPI D3DXConvertMeshSubsetToStrips(struct ID3DXBaseMesh mesh_in, DWORD attribute_id, +HRESULT WINAPI D3DXConvertMeshSubsetToStrips(struct ID3DXBaseMesh *mesh_in, DWORD attribute_id, DWORD ib_flags, struct IDirect3DIndexBuffer9 **index_buffer, DWORD *index_count, struct ID3DXBuffer **strip_lengths, DWORD *strip_count); HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD, D3DVERTEXELEMENT9[MAX_FVF_DECL_SIZE]);

1 0

Alexandre Julliard : testbot/scripts: Use exit instead of return to set the script exit status.
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: tools Branch: master Commit: 85cffa35d83404131335a6805cf887f584136eb5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=85cffa35d83404131335a680… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 29 19:01:56 2012 +0100 testbot/scripts: Use exit instead of return to set the script exit status. --- testbot/scripts/initd | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/scripts/initd b/testbot/scripts/initd index 262fa54..8853f6c 100755 --- a/testbot/scripts/initd +++ b/testbot/scripts/initd @@ -108,16 +108,16 @@ then if $PING -q then log_success_msg "The WineTestBot server is running" - return 0 + exit 0 fi log_failure_msg "The WineTestBot server is running but not responding" - return 1 + exit 1 elif [ "$status" = 4 ]; then log_failure_msg "could not access PID file for the WineTestBot server" - return $status + exit $status else log_failure_msg "The WineTestBot server is not running" - return $status + exit $status fi ;;

1 0

Francois Gouget : testbot: Autodetect where the WineTestBot is running from .
by Alexandre Julliard Oct. 30, 2012

Oct. 30, 2012

Module: tools Branch: master Commit: ec745f28cd7491880662fc6fe0119d2d7ed4d11e URL: http://source.winehq.org/git/tools.git/?a=commit;h=ec745f28cd7491880662fc6f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Oct 29 20:10:36 2012 +0100 testbot: Autodetect where the WineTestBot is running from. This avoids having to hardcode paths in the configuration file. --- testbot/bin/CheckForWinetestUpdate.pl | 9 +++++---- testbot/bin/Engine.pl | 9 +++++---- testbot/bin/Janitor.pl | 9 +++++---- testbot/bin/PingEngine.pl | 9 +++++---- testbot/bin/RevertVM.pl | 9 +++++---- testbot/bin/WinePatchesMLSubmit.pl | 9 +++++---- testbot/bin/WinePatchesWebGet.pl | 9 +++++---- testbot/bin/WinePatchesWebNotify.pl | 9 +++++---- testbot/bin/WineRunBuild.pl | 9 +++++---- testbot/bin/WineRunReconfig.pl | 9 +++++---- testbot/bin/WineRunTask.pl | 9 +++++---- testbot/bin/WineSendLog.pl | 9 +++++---- testbot/bin/build/Build.pl | 11 ++++++----- testbot/bin/build/Reconfig.pl | 13 +++++++------ testbot/doc/vhost_winetestbot.conf | 6 +++++- testbot/lib/WineTestBot/Config.pm | 10 +++++----- testbot/scripts/CheckWineTestBot.pl | 9 +++++---- testbot/scripts/TestAgent | 17 +++++++++-------- 18 files changed, 97 insertions(+), 77 deletions(-) diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl index de8befb..5ca5aa9 100755 --- a/testbot/bin/CheckForWinetestUpdate.pl +++ b/testbot/bin/CheckForWinetestUpdate.pl @@ -22,13 +22,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use Fcntl; use File::Compare; diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 7834619..b3cfbee 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -20,13 +20,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use Errno qw(EAGAIN); use Fcntl; diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 6ae3c8f..6c398d7 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -21,13 +21,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use WineTestBot::Config; use WineTestBot::Jobs; diff --git a/testbot/bin/PingEngine.pl b/testbot/bin/PingEngine.pl index 4faddf6..ef43807 100755 --- a/testbot/bin/PingEngine.pl +++ b/testbot/bin/PingEngine.pl @@ -20,13 +20,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use WineTestBot::Engine::Notify; diff --git a/testbot/bin/RevertVM.pl b/testbot/bin/RevertVM.pl index ee46218..7104a28 100755 --- a/testbot/bin/RevertVM.pl +++ b/testbot/bin/RevertVM.pl @@ -23,13 +23,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use WineTestBot::Config; use WineTestBot::Log; diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index 9ab8b3c..7ee4ecf 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -22,13 +22,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use File::Copy; use WineTestBot::Config; diff --git a/testbot/bin/WinePatchesWebGet.pl b/testbot/bin/WinePatchesWebGet.pl index d6b3f2b..ed84a50 100755 --- a/testbot/bin/WinePatchesWebGet.pl +++ b/testbot/bin/WinePatchesWebGet.pl @@ -21,13 +21,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use LWP::UserAgent; use HTTP::Request; diff --git a/testbot/bin/WinePatchesWebNotify.pl b/testbot/bin/WinePatchesWebNotify.pl index 185a0f1..6940d76 100755 --- a/testbot/bin/WinePatchesWebNotify.pl +++ b/testbot/bin/WinePatchesWebNotify.pl @@ -21,13 +21,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use File::Copy; use WineTestBot::Config; diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 86f03c7..cc0746f 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -21,13 +21,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use WineTestBot::Config; use WineTestBot::Jobs; diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 89fe3da..9cc1e5e 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -21,13 +21,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use WineTestBot::Config; use WineTestBot::Jobs; diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index bfbffe8..9ec499f 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -20,13 +20,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use POSIX qw(:fcntl_h); use WineTestBot::Config; diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 95814fe..768e129 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -21,13 +21,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use Algorithm::Diff; use WineTestBot::Config; diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index a37537e..7a20c1a 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -22,14 +22,15 @@ use strict; -my $Dir; sub BEGIN { - $main::BuildEnv = 1; - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } + $::BuildEnv = 1; } -use lib "$Dir/../../lib"; use WineTestBot::Config; diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index daa03b1..89296bc 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -22,14 +22,15 @@ use strict; -my $Dir; sub BEGIN { - $main::BuildEnv = 1; - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; -} -use lib "$Dir/../../lib"; + if ($0 =~ m=^(.*)/[^/]+/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } + $::BuildEnv = 1; + } use WineTestBot::Config; diff --git a/testbot/doc/vhost_winetestbot.conf b/testbot/doc/vhost_winetestbot.conf index 9c53876..735292e 100644 --- a/testbot/doc/vhost_winetestbot.conf +++ b/testbot/doc/vhost_winetestbot.conf @@ -7,7 +7,11 @@ PerlSwitches -Tw <Perl> use strict; - use lib qw(/home/winehq/tools/testbot/lib); + BEGIN + { + $::RootDir = "/home/winehq/tools/testbot"; + unshift @INC, "$::RootDir/lib"; + } use ObjectModel::CGI::Page; use WineTestBot::CGI::PageBase; SetPageBaseCreator(\&CreatePageBase); diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 98fcbb0..aa9f3e2 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -48,9 +48,9 @@ require Exporter; $JobPurgeDays $JobArchiveDays $WebHostName); @EXPORT_OK = qw($DbDataSource $DbUsername $DbPassword); -$LogDir = "/home/winehq/tools/testbot/var"; -$DataDir = "/home/winehq/tools/testbot/var"; -$BinDir = "/home/winehq/tools/testbot/bin"; +$LogDir = "$::RootDir/var"; +$DataDir = "$::RootDir/var"; +$BinDir = "$::RootDir/bin"; $MaxRevertingVMs = 1; $MaxRunningVMs = 2; @@ -77,9 +77,9 @@ $LDAPEMailAttribute = undef; $JobPurgeDays = 7; $JobArchiveDays = 0; -if (!$main::BuildEnv) +if (!$::BuildEnv) { - $main::BuildEnv = 0; + $::BuildEnv = 0; eval 'require "WineTestBot/ConfigLocal.pl";'; if ($@) { diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index f6f0666..b749eff 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -20,13 +20,14 @@ use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; use WineTestBot::Config; use WineTestBot::Engine::Notify; diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 2e9850d..a16bd5f 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -18,19 +18,20 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -use strict; - -my $name0=$0; -$name0 =~ s+^.*/++; +use strict; -my $Dir; sub BEGIN { - $0 =~ m=^(.*)/[^/]*$=; - $Dir = $1; + if ($0 =~ m=^(.*)/[^/]+/[^/]+$=) + { + $::RootDir = $1; + unshift @INC, "$::RootDir/lib"; + } } -use lib "$Dir/../lib"; + +my $name0=$0; +$name0 =~ s+^.*/++; use WineTestBot::Config; use WineTestBot::TestAgent;

1 0

Hans Leidekker : msi: Add a length parameter to msi_set_property and use it where appropriate.
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: 0f1d3474a820875268c99c4985cc702d9124abe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f1d3474a820875268c99c498… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 29 12:15:21 2012 +0100 msi: Add a length parameter to msi_set_property and use it where appropriate. --- dlls/msi/action.c | 32 ++++---- dlls/msi/appsearch.c | 4 +- dlls/msi/custom.c | 20 ++--- dlls/msi/dialog.c | 4 +- dlls/msi/events.c | 10 +- dlls/msi/install.c | 7 +- dlls/msi/msipriv.h | 2 +- dlls/msi/package.c | 208 +++++++++++++++++++++++++------------------------- dlls/msi/patch.c | 2 +- dlls/msi/upgrade.c | 2 +- 10 files changed, 144 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f1d3474a820875268c99…

1 0

Nikolay Sivov : dwrite: Implement initial script itemization for AnalyzeScript().
by Alexandre Julliard Oct. 29, 2012

Oct. 29, 2012

Module: wine Branch: master Commit: 89fcb115392a4914c13a96f786ad9142c3c711ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=89fcb115392a4914c13a96f78… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 29 10:10:01 2012 -0400 dwrite: Implement initial script itemization for AnalyzeScript(). --- dlls/dwrite/analyzer.c | 97 +++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/analyzer.c | 9 +++- 2 files changed, 101 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index b929a67..6fa8354 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -27,6 +27,91 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +enum scriptcode { + Script_Arabic = 0, + Script_Latin = 38, + Script_Latin_Symb = 77, + Script_Unknown = (UINT16)-1 +}; + +struct script_range { + UINT16 script; + DWORD first; + DWORD last; +}; + +static const struct script_range script_ranges[] = { + /* C0 Controls: U+0000–U+001F */ + /* ASCII punctuation and symbols: U+0020–U+002F */ + /* ASCII digits: U+0030–U+0039 */ + /* ASCII punctuation and symbols: U+003A–U+0040 */ + { Script_Latin_Symb, 0x00, 0x040 }, + /* Latin uppercase: U+0041–U+005A */ + { Script_Latin, 0x41, 0x5a }, + /* ASCII punctuation and symbols: U+005B–U+0060 */ + { Script_Latin_Symb, 0x5b, 0x060 }, + /* Latin lowercase: U+0061–U+007A */ + { Script_Latin, 0x61, 0x7a }, + /* ASCII punctuation and symbols, control char DEL: U+007B–U+007F */ + { Script_Latin_Symb, 0x7b, 0x7f }, + /* Arabic: U+0600–U+06FF */ + { Script_Arabic, 0x600, 0x6ef }, + /* unsuppoted range */ + { Script_Unknown } +}; + +static UINT16 get_char_script( WCHAR c ) +{ + DWORD ch = c; + int i; + + for (i = 0; i < sizeof(script_ranges)/sizeof(struct script_range); i++) + { + const struct script_range *range = &script_ranges[i]; + if (range->script == Script_Unknown || (range->first <= ch && range->last >= ch)) + return range->script; + } + + return Script_Unknown; +} + +static HRESULT analyze_script(const WCHAR *text, UINT32 len, IDWriteTextAnalysisSink *sink) +{ + DWRITE_SCRIPT_ANALYSIS sa; + UINT32 pos, i, length; + + if (!len) return S_OK; + + sa.script = get_char_script(*text); + sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT; + + pos = 0; + length = 1; + + for (i = 1; i < len; i++) + { + UINT16 script = get_char_script(text[i]); + + /* Script_Latin_Symb script type is ignored when preceded or followed by another script */ + if (sa.script == Script_Latin_Symb) sa.script = script; + if (script == Script_Latin_Symb) script = sa.script; + /* this is a length of a sequence to be reported next */ + if (sa.script == script) length++; + + if (sa.script != script) + { + HRESULT hr = IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, length, &sa); + if (FAILED(hr)) return hr; + pos = i; + length = 1; + sa.script = script; + } + } + + /* 1 length case or normal completion call */ + return IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, length, &sa); +} + static HRESULT WINAPI dwritetextanalyzer_QueryInterface(IDWriteTextAnalyzer *iface, REFIID riid, void **obj) { TRACE("(%s %p)\n", debugstr_guid(riid), obj); @@ -55,8 +140,16 @@ static ULONG WINAPI dwritetextanalyzer_Release(IDWriteTextAnalyzer *iface) static HRESULT WINAPI dwritetextanalyzer_AnalyzeScript(IDWriteTextAnalyzer *iface, IDWriteTextAnalysisSource* source, UINT32 position, UINT32 length, IDWriteTextAnalysisSink* sink) { - FIXME("(%p %u %u %p): stub\n", source, position, length, sink); - return E_NOTIMPL; + const WCHAR *text; + HRESULT hr; + UINT32 len; + + TRACE("(%p %u %u %p)\n", source, position, length, sink); + + hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, position, &text, &len); + if (FAILED(hr)) return hr; + + return analyze_script(text, len, sink); } static HRESULT WINAPI dwritetextanalyzer_AnalyzeBidi(IDWriteTextAnalyzer *iface, diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 4ce2a73..70b3703 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -404,6 +404,11 @@ enum scriptcode { static struct sa_test sa_tests[] = { { + /* just 1 char string */ + {'t',0}, 1, + { { 0, 1, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { {'t','e','s','t',0}, 1, { { 0, 4, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, @@ -451,7 +456,7 @@ static struct sa_test sa_tests[] = { { 7, 4, { Script_Arabic, DWRITE_SCRIPT_SHAPES_DEFAULT } }, } }, - + /* keep this as end marker */ { {0} } }; @@ -493,9 +498,7 @@ static void test_AnalyzeScript(void) init_expected_sa(expected_seq, ptr); hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &analysissource, 0, lstrlenW(g_source), &analysissink); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == E_NOTIMPL) break; ok_sequence(sequences, ANALYZER_ID, expected_seq[0]->sequence, "AnalyzeScript", FALSE); ptr++; }

1 0