November 2008 - Wine-Commits

Alexandre Julliard : wintrust: Fix a buffer overflow.
by Alexandre Julliard Nov. 18, 2008

Nov. 18, 2008

Module: wine Branch: master Commit: 04eb1e6a63fdebfb0a3e2640ea37401b064999ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=04eb1e6a63fdebfb0a3e2640e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 17 17:08:40 2008 +0100 wintrust: Fix a buffer overflow. --- dlls/wintrust/wintrust_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index a4bfe75..f9d3329 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -757,7 +757,7 @@ static BOOL WINAPI WINTRUST_enumUsages(PCCRYPT_OID_INFO pInfo, void *pvArg) for (cUsages = 0, ptr = *usages; *ptr; ptr++, cUsages++) ; *usages = WINTRUST_ReAlloc((CRYPT_OID_INFO *)*usages, - (cUsages + 1) * sizeof(PCCRYPT_OID_INFO)); + (cUsages + 2) * sizeof(PCCRYPT_OID_INFO)); } if (*usages) {

1 0

Austin English : dd debian lenny repository info
by Jeremy Newman Nov. 17, 2008

Nov. 17, 2008

Module: website Branch: master Commit: d558be14d7d298b62c8cc6dee98e24848498b452 URL: http://source.winehq.org/git/website.git/?a=commit;h=d558be14d7d298b62c8cc6… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 17 14:23:19 2008 -0600 dd debian lenny repository info --- templates/en/download.template | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/templates/en/download.template b/templates/en/download.template index 54a2b03..55fc963 100644 --- a/templates/en/download.template +++ b/templates/en/download.template @@ -39,6 +39,15 @@ for post-installation instructions. <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr> + <tr bgcolor="#ffffff"> + <td align=center><a href="http://forum.winehq.org/viewtopic.php?t=2716"> + <img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> + </td> + <td> <a href="http://forum.winehq.org/viewtopic.php?t=2716">Debian</a> + binary and source .debs for Debian Lenny (5.0)</td> + <td><a href="mailto:lamalennyreport(a)altervista.org">Maurilio Genovese</a></td> + </tr> + <tr bgcolor="#ffffff"> <td align="center"><a href="http://www.freshports.org/emulators/wine/"> <img src="{$root}/images/distro/freebsd.png" width="50" height="54" alt="FreeBSD" border="0"></a>

1 0

Matthew Blissett : download-deb: add CLI instructions back in
by Jeremy Newman Nov. 17, 2008

Nov. 17, 2008

Module: website Branch: master Commit: 4e4e05eaf00d99da7b0d5211deac892e0c728d34 URL: http://source.winehq.org/git/website.git/?a=commit;h=4e4e05eaf00d99da7b0d52… Author: Matthew Blissett <matthew.r.blissett(a)gmail.com> Date: Thu Nov 13 17:20:18 2008 -0600 download-deb: add CLI instructions back in Some users requested it. I forgot the commands, so adding them back in, for clarity. --- templates/en/download-deb.template | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/templates/en/download-deb.template b/templates/en/download-deb.template index b7b557e..4e227d4 100644 --- a/templates/en/download-deb.template +++ b/templates/en/download-deb.template @@ -57,6 +57,31 @@ you have Wine installed, the system's update manager will now inform you of the latest Wine beta release and prompt you to upgrade. If you haven't installed Wine yet, go to Applications->Add/Remove and search for Wine. +<h2>Command Line Instructions for Installing Wine:</h2> + +An alternate method for adding the Wine repositories and installing Wine is through the command line, as follows: + +First, open a terminal window (Applications->Accessories->Terminal). On +Debian, you will need to open a root terminal. Then add the repository's key +to your system's list of trusted APT keys by copy and pasting the following into your terminal: + +wget -q http://wine.budgetdedicated.com/apt/387EE263.gpg -O- | sudo apt-key add - + +Next, add the repository to your system's list of APT sources: + +For Ubuntu Intrepid (8.10): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/intrepid.list -O /etc/apt/sources.list.d/winehq.list +For Ubuntu Hardy (8.04): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/hardy.list -O /etc/apt/sources.list.d/winehq.list +For Debian Etch (4.0): +sudo wget http://wine.budgetdedicated.com/apt/sources.list.d/etch.list -O /etc/apt/sources.list.d/winehq.list + +Then update APT's package information by running 'sudo apt-get update'. + +If you are using Ubuntu, you can now install Wine by <a href="apt://wine"> +clicking this link</a>. Alternatively, you can install by going to +Applications->Add/Remove and searching for Wine. + <h2>Upgrading to a new version of Ubuntu</h2> If you are upgrading the entire system, such as going from Ubuntu 8.04 to

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Nov. 17, 2008

Nov. 17, 2008

Module: wine Branch: master Commit: 3b140ccb0ef81113eba2146cc12af093a428ddd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b140ccb0ef81113eba2146cc… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 17 15:02:01 2008 +0100 Assorted spelling fixes. --- dlls/mshtml/tests/htmldoc.c | 10 +++++----- dlls/mshtml/tests/protocol.c | 4 ++-- dlls/ole32/tests/compobj.c | 4 ++-- dlls/oleacc/tests/main.c | 4 ++-- dlls/user32/cursoricon.c | 2 +- include/commctrl.rh | 2 +- programs/regedit/regproc.c | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index a8f1e30..6b77e5b 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -3746,27 +3746,27 @@ static void test_QueryInterface(IUnknown *unk) qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(unk, &IID_IRunnableObject, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); - ok(qi == NULL, "qirunnable=%p, ezpected NULL\n", qi); + ok(qi == NULL, "qirunnable=%p, expected NULL\n", qi); qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); - ok(qi == NULL, "qi=%p, ezpected NULL\n", qi); + ok(qi == NULL, "qi=%p, expected NULL\n", qi); qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(unk, &IID_IHTMLDOMNode2, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); - ok(qi == NULL, "qi=%p, ezpected NULL\n", qi); + ok(qi == NULL, "qi=%p, expected NULL\n", qi); qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(unk, &IID_IPersistPropertyBag, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); - ok(qi == NULL, "qi=%p, ezpected NULL\n", qi); + ok(qi == NULL, "qi=%p, expected NULL\n", qi); qi = (void*)0xdeadbeef; hres = IUnknown_QueryInterface(unk, &IID_UndocumentedScriptIface, (void**)&qi); ok(hres == E_NOINTERFACE, "QueryInterface returned %08x, expected E_NOINTERFACE\n", hres); - ok(qi == NULL, "qi=%p, ezpected NULL\n", qi); + ok(qi == NULL, "qi=%p, expected NULL\n", qi); } static void init_test(enum load_state_t ls) { diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index c63034d..36355bf 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -368,7 +368,7 @@ static void test_res_protocol(void) sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == E_FAIL, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == 1, "size=%u, ezpected 1\n", size); + ok(size == 1, "size=%u, expected 1\n", size); buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf, @@ -664,7 +664,7 @@ static void test_about_protocol(void) sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == E_FAIL, "ParseUrl failed: %08x\n", hres); ok(buf[0] == '?', "buf changed\n"); - ok(size == 1, "size=%u, ezpected 1\n", size); + ok(size == 1, "size=%u, expected 1\n", size); buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, PARSE_DOMAIN, 0, buf, diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index b30e939..714fca8 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -199,12 +199,12 @@ static void test_StringFromGUID2(void) /* Test corner cases for buffer size */ len = StringFromGUID2(&CLSID_StdFont,str,50); ok(len == 39, "len: %d (expected 39)\n", len); - ok(!lstrcmpiW(str, wszCLSID_StdFont),"string wan't equal for CLSID_StdFont\n"); + ok(!lstrcmpiW(str, wszCLSID_StdFont),"string wasn't equal for CLSID_StdFont\n"); memset(str,0,sizeof str); len = StringFromGUID2(&CLSID_StdFont,str,39); ok(len == 39, "len: %d (expected 39)\n", len); - ok(!lstrcmpiW(str, wszCLSID_StdFont),"string wan't equal for CLSID_StdFont\n"); + ok(!lstrcmpiW(str, wszCLSID_StdFont),"string wasn't equal for CLSID_StdFont\n"); len = StringFromGUID2(&CLSID_StdFont,str,38); ok(len == 0, "len: %d (expected 0)\n", len); diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index bd00294..269c2f9 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -104,7 +104,7 @@ static void test_getroletext(void) CHAR buff2[100]; WCHAR buff2W[100]; - /* NT4 and W2K don't clear the buffer on a non existing role in the A-call */ + /* NT4 and W2K don't clear the buffer on a nonexistent role in the A-call */ memset(buff2, 0, sizeof(buff2)); ret = GetRoleTextA(role, NULL, 0); @@ -118,7 +118,7 @@ static void test_getroletext(void) ok(ret == lstrlenA(buff2), "GetRoleTextA: returned length doesn't match returned buffer for role %d\n", role); - /* Win98 and WinMe don't clear the buffer on a non existing role in the W-call */ + /* Win98 and WinMe don't clear the buffer on a nonexistent role in the W-call */ memset(buff2W, 0, sizeof(buff2W)); ret = GetRoleTextW(role, NULL, 0); diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index d854351..b57ce2a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1005,7 +1005,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, * cursors and then update user32 and winex11.drv to load all frames. * * Hopefully this will at least make some games (C&C3, etc.) more playable - * in the mean time. + * in the meantime. */ FIXME("Loading all frames for .ani cursors not implemented.\n"); icon_data = fram_chunk.data + (2 * sizeof(DWORD)); diff --git a/include/commctrl.rh b/include/commctrl.rh index 1f41cdb..b958a79 100644 --- a/include/commctrl.rh +++ b/include/commctrl.rh @@ -164,7 +164,7 @@ #define ACS_AUTOPLAY 0x0004 #define ACS_TIMER 0x0008 -/* Month Calender Control */ +/* Month Calendar Control */ #define MCS_DAYSTATE 0x0001 #define MCS_MULTISELECT 0x0002 #define MCS_WEEKNUMBERS 0x0004 diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 2cfa092..c070ab0 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -67,7 +67,7 @@ if (!(p)) \ } /****************************************************************************** - * Allocates memory and convers input from multibyte to wide chars + * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller */ WCHAR* GetWideString(const char* strA) @@ -86,7 +86,7 @@ WCHAR* GetWideString(const char* strA) } /****************************************************************************** - * Allocates memory and convers input from multibyte to wide chars + * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller */ WCHAR* GetWideStringN(const char* strA, int chars, DWORD *len) @@ -106,7 +106,7 @@ WCHAR* GetWideStringN(const char* strA, int chars, DWORD *len) } /****************************************************************************** - * Allocates memory and convers input from wide chars to multibyte + * Allocates memory and converts input from wide chars to multibyte * Returned string must be freed by the caller */ char* GetMultiByteString(const WCHAR* strW) @@ -125,7 +125,7 @@ char* GetMultiByteString(const WCHAR* strW) } /****************************************************************************** - * Allocates memory and convers input from wide chars to multibyte + * Allocates memory and converts input from wide chars to multibyte * Returned string must be freed by the caller */ char* GetMultiByteStringN(const WCHAR* strW, int chars, DWORD* len)

1 0

Alexandre Julliard : ntdll: Don't set noexec protection on builtin dlls, some broken apps clear the execute permission.
by Alexandre Julliard Nov. 17, 2008

Nov. 17, 2008

Module: wine Branch: master Commit: 92cf3d19000f8ad7c80e1f457e02def145d8517a URL: http://source.winehq.org/git/wine.git/?a=commit;h=92cf3d19000f8ad7c80e1f457… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 17 15:56:54 2008 +0100 ntdll: Don't set noexec protection on builtin dlls, some broken apps clear the execute permission. --- dlls/ntdll/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 097f61a..fc7620d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1333,7 +1333,7 @@ static void load_builtin_callback( void *module, const char *filename ) return; } virtual_create_system_view( module, nt->OptionalHeader.SizeOfImage, - VPROT_SYSTEM | VPROT_IMAGE | VPROT_NOEXEC | VPROT_COMMITTED | + VPROT_SYSTEM | VPROT_IMAGE | VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY | VPROT_EXEC ); /* create the MODREF */

1 0

Francois Gouget : crypt32: Fix Spelling of 'superseded'.
by Alexandre Julliard Nov. 17, 2008

Nov. 17, 2008

Module: wine Branch: master Commit: 30b089668b261c8fe04a9c4edf2d790d5cd032f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b089668b261c8fe04a9c4ed… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 17 15:02:48 2008 +0100 crypt32: Fix Spelling of 'superseded'. --- dlls/crypt32/crypt32_En.rc | 2 +- dlls/crypt32/crypt32_Pt.rc | 194 ++++++++++++++++++++++---------------------- dlls/crypt32/cryptres.h | 2 +- dlls/crypt32/object.c | 4 +- 4 files changed, 101 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=30b089668b261c8fe04a9…

1 0

Francois Gouget : d3d10core: Fix spelling of 'unknown'.
by Alexandre Julliard Nov. 17, 2008

Nov. 17, 2008

Module: wine Branch: master Commit: 13a279ef0a8fa3898e6407114784ff313f2b6557 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13a279ef0a8fa3898e6407114… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 17 15:03:06 2008 +0100 d3d10core: Fix spelling of 'unknown'. --- dlls/d3d10core/d3d10core_main.c | 2 +- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/d3d10core_main.c b/dlls/d3d10core/d3d10core_main.c index 9190ca3..446096d 100644 --- a/dlls/d3d10core/d3d10core_main.c +++ b/dlls/d3d10core/d3d10core_main.c @@ -82,7 +82,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba object = (struct d3d10_device *)*layer_base; object->vtbl = &d3d10_device_vtbl; - object->inner_unknown_vtbl = &d3d10_device_inner_unkown_vtbl; + object->inner_unknown_vtbl = &d3d10_device_inner_unknown_vtbl; object->refcount = 1; object->outer_unknown = device_object; diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index b33845c..16bb323 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -34,7 +34,7 @@ const char *debug_dxgi_format(DXGI_FORMAT format); /* IDirect3D10Device */ extern const struct ID3D10DeviceVtbl d3d10_device_vtbl; -extern const struct IUnknownVtbl d3d10_device_inner_unkown_vtbl; +extern const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl; struct d3d10_device { const struct ID3D10DeviceVtbl *vtbl; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ab92c47..567c93a 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -876,7 +876,7 @@ const struct ID3D10DeviceVtbl d3d10_device_vtbl = d3d10_device_GetTextFilterSize, }; -const struct IUnknownVtbl d3d10_device_inner_unkown_vtbl = +const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl = { /* IUnknown methods */ d3d10_device_inner_QueryInterface,

1 0

Francois Gouget : inetcomm: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Nov. 17, 2008

Nov. 17, 2008

Module: wine Branch: master Commit: 7c2f5f065a1abccc649a6da9da6076061b408f4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c2f5f065a1abccc649a6da9d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 17 15:01:31 2008 +0100 inetcomm: Fix compilation on systems that don't support nameless unions. --- dlls/inetcomm/pop3transport.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/inetcomm/pop3transport.c b/dlls/inetcomm/pop3transport.c index 30dd187..0377164 100644 --- a/dlls/inetcomm/pop3transport.c +++ b/dlls/inetcomm/pop3transport.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define NONAMELESSUNION #include <stdarg.h> #include <stdio.h> @@ -350,12 +351,12 @@ static HRESULT POP3Transport_ParseResponse(POP3Transport *This, char *pszRespons { switch (This->command) { - case POP3_UIDL: hr = parse_uidl_response(This, &pResponse->rUidlInfo); break; - case POP3_STAT: hr = parse_stat_response(This, &pResponse->rStatInfo); break; - case POP3_LIST: hr = parse_list_response(This, &pResponse->rListInfo); break; - case POP3_DELE: hr = parse_dele_response(This, &pResponse->dwPopId); break; - case POP3_RETR: hr = parse_retr_response(This, &pResponse->rRetrInfo); break; - case POP3_TOP: hr = parse_top_response(This, &pResponse->rTopInfo); break; + case POP3_UIDL: hr = parse_uidl_response(This, &pResponse->u.rUidlInfo); break; + case POP3_STAT: hr = parse_stat_response(This, &pResponse->u.rStatInfo); break; + case POP3_LIST: hr = parse_list_response(This, &pResponse->u.rListInfo); break; + case POP3_DELE: hr = parse_dele_response(This, &pResponse->u.dwPopId); break; + case POP3_RETR: hr = parse_retr_response(This, &pResponse->u.rRetrInfo); break; + case POP3_TOP: hr = parse_top_response(This, &pResponse->u.rTopInfo); break; default: This->state = STATE_DONE; break;

1 0

Francois Gouget : d3dx9_36/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Nov. 17, 2008

Nov. 17, 2008

Module: wine Branch: master Commit: 90b04c7b9310a47d88908511d5edaf99a9705669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90b04c7b9310a47d88908511d… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 17 15:01:24 2008 +0100 d3dx9_36/tests: Fix compilation on systems that don't support nameless unions. --- dlls/d3dx9_36/tests/math.c | 192 ++++++++++++++++++++++---------------------- 1 files changed, 96 insertions(+), 96 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index cc71b33..f3bb482 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -137,22 +137,22 @@ static void test_Matrix_AffineTransformation2D(void) scale = 20.0f; - exp_mat.m[0][0] = 10.0f; - exp_mat.m[1][0] = -17.320507f; - exp_mat.m[2][0] = 0.0f; - exp_mat.m[3][0] = -1.035898f; - exp_mat.m[0][1] = 17.320507f; - exp_mat.m[1][1] = 10.0f; - exp_mat.m[2][1] = 0.0f; - exp_mat.m[3][1] = 6.401924f; - exp_mat.m[0][2] = 0.0f; - exp_mat.m[1][2] = 0.0f; - exp_mat.m[2][2] = 20.0f; - exp_mat.m[3][2] = 0.0f; - exp_mat.m[0][3] = 0.0f; - exp_mat.m[1][3] = 0.0f; - exp_mat.m[2][3] = 0.0f; - exp_mat.m[3][3] = 1.0f; + U(exp_mat).m[0][0] = 10.0f; + U(exp_mat).m[1][0] = -17.320507f; + U(exp_mat).m[2][0] = 0.0f; + U(exp_mat).m[3][0] = -1.035898f; + U(exp_mat).m[0][1] = 17.320507f; + U(exp_mat).m[1][1] = 10.0f; + U(exp_mat).m[2][1] = 0.0f; + U(exp_mat).m[3][1] = 6.401924f; + U(exp_mat).m[0][2] = 0.0f; + U(exp_mat).m[1][2] = 0.0f; + U(exp_mat).m[2][2] = 20.0f; + U(exp_mat).m[3][2] = 0.0f; + U(exp_mat).m[0][3] = 0.0f; + U(exp_mat).m[1][3] = 0.0f; + U(exp_mat).m[2][3] = 0.0f; + U(exp_mat).m[3][3] = 1.0f; D3DXMatrixAffineTransformation2D(&got_mat, scale, &center, angle, &position); @@ -167,22 +167,22 @@ static void test_Matrix_AffineTransformation2D(void) scale = 20.0f; - exp_mat.m[0][0] = 10.0f; - exp_mat.m[1][0] = -17.320507f; - exp_mat.m[2][0] = 0.0f; - exp_mat.m[3][0] = 4.964102f; - exp_mat.m[0][1] = 17.320507f; - exp_mat.m[1][1] = 10.0f; - exp_mat.m[2][1] = 0.0f; - exp_mat.m[3][1] = -0.598076f; - exp_mat.m[0][2] = 0.0f; - exp_mat.m[1][2] = 0.0f; - exp_mat.m[2][2] = 20.0f; - exp_mat.m[3][2] = 0.0f; - exp_mat.m[0][3] = 0.0f; - exp_mat.m[1][3] = 0.0f; - exp_mat.m[2][3] = 0.0f; - exp_mat.m[3][3] = 1.0f; + U(exp_mat).m[0][0] = 10.0f; + U(exp_mat).m[1][0] = -17.320507f; + U(exp_mat).m[2][0] = 0.0f; + U(exp_mat).m[3][0] = 4.964102f; + U(exp_mat).m[0][1] = 17.320507f; + U(exp_mat).m[1][1] = 10.0f; + U(exp_mat).m[2][1] = 0.0f; + U(exp_mat).m[3][1] = -0.598076f; + U(exp_mat).m[0][2] = 0.0f; + U(exp_mat).m[1][2] = 0.0f; + U(exp_mat).m[2][2] = 20.0f; + U(exp_mat).m[3][2] = 0.0f; + U(exp_mat).m[0][3] = 0.0f; + U(exp_mat).m[1][3] = 0.0f; + U(exp_mat).m[2][3] = 0.0f; + U(exp_mat).m[3][3] = 1.0f; D3DXMatrixAffineTransformation2D(&got_mat, scale, &center, angle, NULL); @@ -197,22 +197,22 @@ static void test_Matrix_AffineTransformation2D(void) scale = 20.0f; - exp_mat.m[0][0] = 10.0f; - exp_mat.m[1][0] = -17.320507f; - exp_mat.m[2][0] = 0.0f; - exp_mat.m[3][0] = -6.0f; - exp_mat.m[0][1] = 17.320507f; - exp_mat.m[1][1] = 10.0f; - exp_mat.m[2][1] = 0.0f; - exp_mat.m[3][1] = 7.0f; - exp_mat.m[0][2] = 0.0f; - exp_mat.m[1][2] = 0.0f; - exp_mat.m[2][2] = 20.0f; - exp_mat.m[3][2] = 0.0f; - exp_mat.m[0][3] = 0.0f; - exp_mat.m[1][3] = 0.0f; - exp_mat.m[2][3] = 0.0f; - exp_mat.m[3][3] = 1.0f; + U(exp_mat).m[0][0] = 10.0f; + U(exp_mat).m[1][0] = -17.320507f; + U(exp_mat).m[2][0] = 0.0f; + U(exp_mat).m[3][0] = -6.0f; + U(exp_mat).m[0][1] = 17.320507f; + U(exp_mat).m[1][1] = 10.0f; + U(exp_mat).m[2][1] = 0.0f; + U(exp_mat).m[3][1] = 7.0f; + U(exp_mat).m[0][2] = 0.0f; + U(exp_mat).m[1][2] = 0.0f; + U(exp_mat).m[2][2] = 20.0f; + U(exp_mat).m[3][2] = 0.0f; + U(exp_mat).m[0][3] = 0.0f; + U(exp_mat).m[1][3] = 0.0f; + U(exp_mat).m[2][3] = 0.0f; + U(exp_mat).m[3][3] = 1.0f; D3DXMatrixAffineTransformation2D(&got_mat, scale, NULL, angle, &position); @@ -224,22 +224,22 @@ static void test_Matrix_AffineTransformation2D(void) scale = -20.0f; - exp_mat.m[0][0] = 14.142133f; - exp_mat.m[1][0] = -14.142133f; - exp_mat.m[2][0] = 0.0f; - exp_mat.m[3][0] = 0.0f; - exp_mat.m[0][1] = 14.142133; - exp_mat.m[1][1] = 14.142133f; - exp_mat.m[2][1] = 0.0f; - exp_mat.m[3][1] = 0.0f; - exp_mat.m[0][2] = 0.0f; - exp_mat.m[1][2] = 0.0f; - exp_mat.m[2][2] = -20.0f; - exp_mat.m[3][2] = 0.0f; - exp_mat.m[0][3] = 0.0f; - exp_mat.m[1][3] = 0.0f; - exp_mat.m[2][3] = 0.0f; - exp_mat.m[3][3] = 1.0f; + U(exp_mat).m[0][0] = 14.142133f; + U(exp_mat).m[1][0] = -14.142133f; + U(exp_mat).m[2][0] = 0.0f; + U(exp_mat).m[3][0] = 0.0f; + U(exp_mat).m[0][1] = 14.142133; + U(exp_mat).m[1][1] = 14.142133f; + U(exp_mat).m[2][1] = 0.0f; + U(exp_mat).m[3][1] = 0.0f; + U(exp_mat).m[0][2] = 0.0f; + U(exp_mat).m[1][2] = 0.0f; + U(exp_mat).m[2][2] = -20.0f; + U(exp_mat).m[3][2] = 0.0f; + U(exp_mat).m[0][3] = 0.0f; + U(exp_mat).m[1][3] = 0.0f; + U(exp_mat).m[2][3] = 0.0f; + U(exp_mat).m[3][3] = 1.0f; D3DXMatrixAffineTransformation2D(&got_mat, scale, NULL, angle, NULL); @@ -607,22 +607,22 @@ static void test_Matrix_Transformation2D(void) sca_rot = 5.0f*D3DX_PI/4.0f; - exp_mat.m[0][0] = -4.245192f; - exp_mat.m[1][0] = -0.147116f; - exp_mat.m[2][0] = 0.0f; - exp_mat.m[3][0] = 45.265373f; - exp_mat.m[0][1] = 7.647113f; - exp_mat.m[1][1] = 8.745192f; - exp_mat.m[2][1] = 0.0f; - exp_mat.m[3][1] = -13.401899f; - exp_mat.m[0][2] = 0.0f; - exp_mat.m[1][2] = 0.0f; - exp_mat.m[2][2] = 0.0f; - exp_mat.m[3][2] = 0.0f; - exp_mat.m[0][3] = 0.0f; - exp_mat.m[1][3] = 0.0f; - exp_mat.m[2][3] = 0.0f; - exp_mat.m[3][3] = 1.0f; + U(exp_mat).m[0][0] = -4.245192f; + U(exp_mat).m[1][0] = -0.147116f; + U(exp_mat).m[2][0] = 0.0f; + U(exp_mat).m[3][0] = 45.265373f; + U(exp_mat).m[0][1] = 7.647113f; + U(exp_mat).m[1][1] = 8.745192f; + U(exp_mat).m[2][1] = 0.0f; + U(exp_mat).m[3][1] = -13.401899f; + U(exp_mat).m[0][2] = 0.0f; + U(exp_mat).m[1][2] = 0.0f; + U(exp_mat).m[2][2] = 0.0f; + U(exp_mat).m[3][2] = 0.0f; + U(exp_mat).m[0][3] = 0.0f; + U(exp_mat).m[1][3] = 0.0f; + U(exp_mat).m[2][3] = 0.0f; + U(exp_mat).m[3][3] = 1.0f; D3DXMatrixTransformation2D(&got_mat, &sca_center, sca_rot, &sca, &rot_center, rot, &trans); @@ -640,22 +640,22 @@ static void test_Matrix_Transformation2D(void) sca_rot = 5.0f*D3DX_PI/4.0f; - exp_mat.m[0][0] = 0.0f; - exp_mat.m[1][0] = 0.0f; - exp_mat.m[2][0] = 0.0f; - exp_mat.m[3][0] = 2.830127f; - exp_mat.m[0][1] = 0.0f; - exp_mat.m[1][1] = 0.0f; - exp_mat.m[2][1] = 0.0f; - exp_mat.m[3][1] = 12.294229f; - exp_mat.m[0][2] = 0.0f; - exp_mat.m[1][2] = 0.0f; - exp_mat.m[2][2] = 0.0f; - exp_mat.m[3][2] = 0.0f; - exp_mat.m[0][3] = 0.0f; - exp_mat.m[1][3] = 0.0f; - exp_mat.m[2][3] = 0.0f; - exp_mat.m[3][3] = 1.0f; + U(exp_mat).m[0][0] = 0.0f; + U(exp_mat).m[1][0] = 0.0f; + U(exp_mat).m[2][0] = 0.0f; + U(exp_mat).m[3][0] = 2.830127f; + U(exp_mat).m[0][1] = 0.0f; + U(exp_mat).m[1][1] = 0.0f; + U(exp_mat).m[2][1] = 0.0f; + U(exp_mat).m[3][1] = 12.294229f; + U(exp_mat).m[0][2] = 0.0f; + U(exp_mat).m[1][2] = 0.0f; + U(exp_mat).m[2][2] = 0.0f; + U(exp_mat).m[3][2] = 0.0f; + U(exp_mat).m[0][3] = 0.0f; + U(exp_mat).m[1][3] = 0.0f; + U(exp_mat).m[2][3] = 0.0f; + U(exp_mat).m[3][3] = 1.0f; D3DXMatrixTransformation2D(&got_mat, &sca_center, sca_rot, NULL, NULL, rot, &trans);

1 0

Paul Vriens : user32/tests: Fix a test failure on Win9x, WinMe and NT4.
by Alexandre Julliard Nov. 17, 2008

Nov. 17, 2008

Module: wine Branch: master Commit: 919bd612035d1841d5b9d7de20aef2fbafbe1799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=919bd612035d1841d5b9d7de2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Nov 17 14:17:05 2008 +0100 user32/tests: Fix a test failure on Win9x, WinMe and NT4. --- dlls/user32/tests/monitor.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index d858f72..441b94f 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -213,8 +213,10 @@ static void test_ChangeDisplaySettingsEx(void) dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; dm.dmPelsWidth = width; res = pChangeDisplaySettingsExA(NULL, &dm, NULL, CDS_TEST, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL, - "ChangeDisplaySettingsExA returned %d, expected DISP_CHANGE_SUCCESSFUL\n", res); + ok(res == DISP_CHANGE_SUCCESSFUL || + res == DISP_CHANGE_BADMODE || /* Win98, WinMe */ + res == DISP_CHANGE_FAILED, /* NT4 */ + "ChangeDisplaySettingsExA returned unexpected %d\n", res); memset(&dmW, 0, sizeof(dmW)); dmW.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT;

1 0