December 2010 - Wine-Commits

Alexandre Julliard : Updated the authors list.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: stable Commit: 2a73f144dce53ab09e46647fae207cdccf08f05e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a73f144dce53ab09e46647fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 16:37:56 2010 +0100 Updated the authors list. --- AUTHORS | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/AUTHORS b/AUTHORS index 3f7661f..69cff12 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1155,6 +1155,7 @@ Hannu Valtonen Carroll Vance Tomas Vanek Charles Vaughn +Trygve Vea Stephen R. Veit Michael Veksler Henri Verbeet @@ -1201,6 +1202,7 @@ Jeremy White Len White Lawson Whitney Tom Wickline +Eryk Wieliczko Michał Wiernowolski Martin Wilck Robert Wilhelm

1 0

Alexandre Julliard : Release 1.2.2.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: stable Commit: c371233bdc2cf1b691a6d8b98c97f73be25346b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c371233bdc2cf1b691a6d8b98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 19:37:15 2010 +0100 Release 1.2.2. --- ANNOUNCE | 583 ++++++++++++++++++++++++++----------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 254 insertions(+), 349 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c371233bdc2cf1b691a6d…

1 0

Tag wine-1.2.2 : Alexandre Julliard : Release 1.2.2
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: refs/tags/wine-1.2.2 Tag: f1c147661b67e95f29e0c41bf394efc9cfe50228 URL: http://source.winehq.org/git/wine.git/?a=tag;h=f1c147661b67e95f29e0c41bf394… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 19:37:15 2010 +0100 Release 1.2.2

1 0

Marcus Meissner : winex11.drv: Do not include XFORM. eDx and eDy into font hashing/caching.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: stable Commit: 64c9eea9b731145f89c7e2fb1b6762ca105c8936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c9eea9b731145f89c7e2fb1… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Nov 29 10:17:26 2010 +0100 winex11.drv: Do not include XFORM.eDx and eDy into font hashing/caching. (cherry picked from commit a8c50b12f5af60ddc2424e4456f1700aab8e3495) --- dlls/winex11.drv/xrender.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 4f900b2..f0ec1b1 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1067,6 +1067,9 @@ BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE *physDev, HFONT hfont) lfsz.devsize.cx = X11DRV_XWStoDS( physDev, lfsz.lf.lfWidth ); lfsz.devsize.cy = X11DRV_YWStoDS( physDev, lfsz.lf.lfHeight ); GetWorldTransform( physDev->hdc, &lfsz.xform ); + /* Not used fields, would break hashing */ + lfsz.xform.eDx = lfsz.xform.eDy = 0; + lfsz_calc_hash(&lfsz); info = get_xrender_info(physDev);

1 0

Alexandre Julliard : msi/tests: Fix a test failure on win2k.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 24d2f694cb0fec5069dac413d27bd118965aac9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=24d2f694cb0fec5069dac413d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 16:15:13 2010 +0100 msi/tests: Fix a test failure on win2k. --- dlls/msi/tests/msi.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index a03f8f4..e08f6bb 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -958,7 +958,8 @@ static void test_MsiQueryFeatureState(void) state = MsiQueryFeatureStateA("{6700E8CF-95AB-4D9C-BC2C-15840DEA7A5D}", "feature"); error = GetLastError(); ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); - ok(error == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", error); + ok(error == ERROR_SUCCESS || broken(error == ERROR_ALREADY_EXISTS) /* win2k */, + "expected ERROR_SUCCESS, got %u\n", error); /* same length as guid, but random */ SetLastError(0xdeadbeef);

1 0

Austin English : d3d8/d3d9: Fix compiler warnings on non x86/x86_64.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: b98c8ce556a858cb9b8aa9e6026ddf27d36da37c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b98c8ce556a858cb9b8aa9e60… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Dec 2 19:41:17 2010 +0000 d3d8/d3d9: Fix compiler warnings on non x86/x86_64. --- dlls/d3d8/tests/device.c | 4 ++-- dlls/d3d9/tests/device.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 1adedc3..ef040c1 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1970,6 +1970,7 @@ static inline WORD get_fpu_cw(void) static void test_fpu_setup(void) { +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) D3DPRESENT_PARAMETERS present_parameters; IDirect3DDevice8 *device; D3DDISPLAYMODE d3ddm; @@ -2032,6 +2033,7 @@ static void test_fpu_setup(void) done: if (window) DestroyWindow(window); if (d3d8) IDirect3D8_Release(d3d8); +#endif } static void test_ApplyStateBlock(void) @@ -2121,9 +2123,7 @@ START_TEST(device) } IDirect3D8_Release(d3d8); -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) test_fpu_setup(); -#endif test_display_modes(); test_shader_versions(); test_swapchain(); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index bb57917..671afbf 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2811,6 +2811,7 @@ static inline WORD get_fpu_cw(void) static void test_fpu_setup(void) { +#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) D3DPRESENT_PARAMETERS present_parameters; IDirect3DDevice9 *device; HWND window = NULL; @@ -2868,6 +2869,7 @@ static void test_fpu_setup(void) done: if (window) DestroyWindow(window); if (d3d9) IDirect3D9_Release(d3d9); +#endif } START_TEST(device) @@ -2891,9 +2893,7 @@ START_TEST(device) } IDirect3D9_Release(d3d9); -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) test_fpu_setup(); -#endif test_multi_device(); test_display_formats(); test_display_modes();

1 0

Francois Gouget : msxml3: Add a trailing '\n' to an ERR() call.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: f10c16072e02637f55957c2265370fe881e108de URL: http://source.winehq.org/git/wine.git/?a=commit;h=f10c16072e02637f55957c226… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 3 15:02:20 2010 +0100 msxml3: Add a trailing '\n' to an ERR() call. --- dlls/msxml3/domdoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index dbc9b75..fcdb83a 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2637,7 +2637,7 @@ static HRESULT WINAPI domdoc_validateNode( if (!is_wellformed(get_doc(This))) { - ERR("doc not well-formed"); + ERR("doc not well-formed\n"); if (err) *err = create_parseError(E_XML_NOTWF, NULL, NULL, NULL, 0, 0, 0); return S_FALSE;

1 0

Francois Gouget : ntdll/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 036909e8381a436f9b90747cb6f41db019898dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=036909e8381a436f9b90747cb… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 3 15:01:39 2010 +0100 ntdll/tests: Add a trailing '\n' to an ok() call. --- dlls/ntdll/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 285d9c5..c72e0f0 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1506,7 +1506,7 @@ todo_wine ok(ffvi->VolumeSerialNumber != 0, "Missing VolumeSerialNumber\n"); ok(ffvi->SupportsObjects == 1,"expected 1, got %d\n", ffvi->SupportsObjects); } - ok(ffvi->VolumeLabelLength == lstrlenW(ffvi->VolumeLabel) * sizeof(WCHAR), "expected %d, got %d", + ok(ffvi->VolumeLabelLength == lstrlenW(ffvi->VolumeLabel) * sizeof(WCHAR), "expected %d, got %d\n", lstrlenW(ffvi->VolumeLabel) * sizeof(WCHAR), ffvi->VolumeLabelLength); trace("VolumeSerialNumber: %x VolumeLabelName: %s\n", ffvi->VolumeSerialNumber, wine_dbgstr_w(ffvi->VolumeLabel));

1 0

Francois Gouget : comctl32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 1465b4d2116ef7456159fd623114df4327d17a54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1465b4d2116ef7456159fd623… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 3 15:00:42 2010 +0100 comctl32/tests: Add a trailing '\n' to an ok() call. --- dlls/comctl32/tests/rebar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 01579a7..1856502 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -827,7 +827,7 @@ static int resize_numtests = 0; check_rect("client", r, res->rc); \ } \ value = (int)SendMessage(hRebar, RB_GETROWCOUNT, 0, 0); \ - ok(res->iNumRows == value, "RB_GETROWCOUNT expected %d got %d", res->iNumRows, value); \ + ok(res->iNumRows == value, "RB_GETROWCOUNT expected %d got %d\n", res->iNumRows, value); \ if (res->heightNotify) { \ RECT rcClient; \ GetClientRect(hRebar, &rcClient); \

1 0

Austin Lund : user32/tests: Close second window in DBCS WM_CHAR tests.
by Alexandre Julliard Dec. 3, 2010

Dec. 3, 2010

Module: wine Branch: master Commit: 0fe32508a7c2f6fb6bc5d45ed5fb33f5d42f30ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fe32508a7c2f6fb6bc5d45ed… Author: Austin Lund <austin.lund(a)gmail.com> Date: Fri Dec 3 21:04:24 2010 +1000 user32/tests: Close second window in DBCS WM_CHAR tests. --- dlls/user32/tests/msg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 76d46d0..ab617c9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11581,6 +11581,7 @@ static void test_dbcs_wm_char(void) ok( !PeekMessageA( &msg, hwnd, 0, 0, PM_REMOVE ), "got message %x\n", msg.message ); DestroyWindow(hwnd); + DestroyWindow(hwnd2); } #define ID_LISTBOX 0x000f

1 0