June 2008 - Wine-Commits - list.winehq.org

Rob Shearman : Update generated packing tests using current headers.
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: 9060d2aaab3887bcb48591fceada9d90d20b9a16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9060d2aaab3887bcb48591fce… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jun 16 23:22:17 2008 +0100 Update generated packing tests using current headers. --- dlls/rpcrt4/tests/generated.c | 47 ++++++++++++++++++++++++++------------- dlls/wininet/tests/generated.c | 4 +- 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index b281d0b..2307f08 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -308,12 +308,12 @@ static void test_pack_ARRAY_INFO(void) { /* ARRAY_INFO (pack 4) */ TEST_TYPE(ARRAY_INFO, 24, 4); - TEST_FIELD(ARRAY_INFO, long, Dimension, 0, 4, 4); - TEST_FIELD(ARRAY_INFO, unsigned long *, BufferConformanceMark, 4, 4, 4); - TEST_FIELD(ARRAY_INFO, unsigned long *, BufferVarianceMark, 8, 4, 4); - TEST_FIELD(ARRAY_INFO, unsigned long *, MaxCountArray, 12, 4, 4); - TEST_FIELD(ARRAY_INFO, unsigned long *, OffsetArray, 16, 4, 4); - TEST_FIELD(ARRAY_INFO, unsigned long *, ActualCountArray, 20, 4, 4); + TEST_FIELD(ARRAY_INFO, LONG, Dimension, 0, 4, 4); + TEST_FIELD(ARRAY_INFO, ULONG *, BufferConformanceMark, 4, 4, 4); + TEST_FIELD(ARRAY_INFO, ULONG *, BufferVarianceMark, 8, 4, 4); + TEST_FIELD(ARRAY_INFO, ULONG *, MaxCountArray, 12, 4, 4); + TEST_FIELD(ARRAY_INFO, ULONG *, OffsetArray, 16, 4, 4); + TEST_FIELD(ARRAY_INFO, ULONG *, ActualCountArray, 20, 4, 4); } static void test_pack_COMM_FAULT_OFFSETS(void) @@ -328,8 +328,8 @@ static void test_pack_CS_STUB_INFO(void) { /* CS_STUB_INFO (pack 4) */ TEST_TYPE(CS_STUB_INFO, 12, 4); - TEST_FIELD(CS_STUB_INFO, unsigned long, WireCodeset, 0, 4, 4); - TEST_FIELD(CS_STUB_INFO, unsigned long, DesiredReceivingCodeset, 4, 4, 4); + TEST_FIELD(CS_STUB_INFO, ULONG, WireCodeset, 0, 4, 4); + TEST_FIELD(CS_STUB_INFO, ULONG, DesiredReceivingCodeset, 4, 4, 4); TEST_FIELD(CS_STUB_INFO, void *, CSArrayInfo, 8, 4, 4); } @@ -344,7 +344,7 @@ static void test_pack_FULL_PTR_TO_REFID_ELEMENT(void) TEST_TYPE(FULL_PTR_TO_REFID_ELEMENT, 16, 4); TEST_FIELD(FULL_PTR_TO_REFID_ELEMENT, struct _FULL_PTR_TO_REFID_ELEMENT *, Next, 0, 4, 4); TEST_FIELD(FULL_PTR_TO_REFID_ELEMENT, void *, Pointer, 4, 4, 4); - TEST_FIELD(FULL_PTR_TO_REFID_ELEMENT, unsigned long, RefId, 8, 4, 4); + TEST_FIELD(FULL_PTR_TO_REFID_ELEMENT, ULONG, RefId, 8, 4, 4); TEST_FIELD(FULL_PTR_TO_REFID_ELEMENT, unsigned char, State, 12, 1, 1); } @@ -404,8 +404,8 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD(MIDL_STUB_MESSAGE, unsigned char *, BufferStart, 8, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, unsigned char *, BufferEnd, 12, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, unsigned char *, BufferMark, 16, 4, 4); - TEST_FIELD(MIDL_STUB_MESSAGE, unsigned long, BufferLength, 20, 4, 4); - TEST_FIELD(MIDL_STUB_MESSAGE, unsigned long, MemorySize, 24, 4, 4); + TEST_FIELD(MIDL_STUB_MESSAGE, ULONG, BufferLength, 20, 4, 4); + TEST_FIELD(MIDL_STUB_MESSAGE, ULONG, MemorySize, 24, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, unsigned char *, Memory, 28, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, int, IsClient, 32, 4, 4); TEST_FIELD(MIDL_STUB_MESSAGE, int, ReuseBuffer, 36, 4, 4); @@ -416,8 +416,8 @@ static void test_pack_MIDL_STUB_MESSAGE(void) TEST_FIELD(MIDL_STUB_MESSAGE, unsigned char, fBufferValid, 56, 1, 1); TEST_FIELD(MIDL_STUB_MESSAGE, unsigned char, uFlags, 57, 1, 1); TEST_FIELD(MIDL_STUB_MESSAGE, ULONG_PTR, MaxCount, 60, 4, 4); - TEST_FIELD(MIDL_STUB_MESSAGE, unsigned long, Offset, 64, 4, 4); - TEST_FIELD(MIDL_STUB_MESSAGE, unsigned long, ActualCount, 68, 4, 4); + TEST_FIELD(MIDL_STUB_MESSAGE, ULONG, Offset, 64, 4, 4); + TEST_FIELD(MIDL_STUB_MESSAGE, ULONG, ActualCount, 68, 4, 4); } static void test_pack_MIDL_STUBLESS_PROXY_INFO(void) @@ -464,6 +464,19 @@ static void test_pack_NDR_SCONTEXT(void) TEST_TYPE(NDR_SCONTEXT, 4, 4); } +static void test_pack_NDR_USER_MARSHAL_INFO(void) +{ + /* NDR_USER_MARSHAL_INFO (pack 4) */ + TEST_FIELD(NDR_USER_MARSHAL_INFO, ULONG, InformationLevel, 0, 4, 4); +} + +static void test_pack_NDR_USER_MARSHAL_INFO_LEVEL1(void) +{ + /* NDR_USER_MARSHAL_INFO_LEVEL1 (pack 4) */ + TEST_FIELD(NDR_USER_MARSHAL_INFO_LEVEL1, void *, Buffer, 0, 4, 4); + TEST_FIELD(NDR_USER_MARSHAL_INFO_LEVEL1, ULONG, BufferSize, 4, 4, 4); +} + static void test_pack_PARRAY_INFO(void) { /* PARRAY_INFO */ @@ -563,7 +576,7 @@ static void test_pack_SCONTEXT_QUEUE(void) { /* SCONTEXT_QUEUE (pack 4) */ TEST_TYPE(SCONTEXT_QUEUE, 8, 4); - TEST_FIELD(SCONTEXT_QUEUE, unsigned long, NumberOfObjects, 0, 4, 4); + TEST_FIELD(SCONTEXT_QUEUE, ULONG, NumberOfObjects, 0, 4, 4); TEST_FIELD(SCONTEXT_QUEUE, NDR_SCONTEXT *, ArrayOfObjects, 4, 4, 4); } @@ -580,10 +593,10 @@ static void test_pack_STUB_THUNK(void) static void test_pack_USER_MARSHAL_CB(void) { /* USER_MARSHAL_CB (pack 4) */ - TEST_FIELD(USER_MARSHAL_CB, unsigned long, Flags, 0, 4, 4); + TEST_FIELD(USER_MARSHAL_CB, ULONG, Flags, 0, 4, 4); TEST_FIELD(USER_MARSHAL_CB, PMIDL_STUB_MESSAGE, pStubMsg, 4, 4, 4); TEST_FIELD(USER_MARSHAL_CB, PFORMAT_STRING, pReserve, 8, 4, 4); - TEST_FIELD(USER_MARSHAL_CB, unsigned long, Signature, 12, 4, 4); + TEST_FIELD(USER_MARSHAL_CB, ULONG, Signature, 12, 4, 4); } static void test_pack_USER_MARSHAL_FREEING_ROUTINE(void) @@ -649,6 +662,8 @@ static void test_pack(void) test_pack_NDR_NOTIFY_ROUTINE(); test_pack_NDR_RUNDOWN(); test_pack_NDR_SCONTEXT(); + test_pack_NDR_USER_MARSHAL_INFO(); + test_pack_NDR_USER_MARSHAL_INFO_LEVEL1(); test_pack_PARRAY_INFO(); test_pack_PFORMAT_STRING(); test_pack_PFULL_PTR_TO_REFID_ELEMENT(); diff --git a/dlls/wininet/tests/generated.c b/dlls/wininet/tests/generated.c index e88b3bf..2d6cdd0 100644 --- a/dlls/wininet/tests/generated.c +++ b/dlls/wininet/tests/generated.c @@ -397,7 +397,7 @@ static void test_pack_INTERNET_ASYNC_RESULT(void) { /* INTERNET_ASYNC_RESULT (pack 4) */ TEST_TYPE(INTERNET_ASYNC_RESULT, 8, 4); - TEST_FIELD(INTERNET_ASYNC_RESULT, DWORD, dwResult, 0, 4, 4); + TEST_FIELD(INTERNET_ASYNC_RESULT, DWORD_PTR, dwResult, 0, 4, 4); TEST_FIELD(INTERNET_ASYNC_RESULT, DWORD, dwError, 4, 4, 4); } @@ -408,7 +408,7 @@ static void test_pack_INTERNET_AUTH_NOTIFY_DATA(void) TEST_FIELD(INTERNET_AUTH_NOTIFY_DATA, DWORD, cbStruct, 0, 4, 4); TEST_FIELD(INTERNET_AUTH_NOTIFY_DATA, DWORD, dwOptions, 4, 4, 4); TEST_FIELD(INTERNET_AUTH_NOTIFY_DATA, PFN_AUTH_NOTIFY, pfnNotify, 8, 4, 4); - TEST_FIELD(INTERNET_AUTH_NOTIFY_DATA, DWORD, dwContext, 12, 4, 4); + TEST_FIELD(INTERNET_AUTH_NOTIFY_DATA, DWORD_PTR, dwContext, 12, 4, 4); } static void test_pack_INTERNET_BUFFERSA(void)

1 0

Vladimir Pankratov : mshtml: Update Russian translation.
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: 605d1e2f1e869927f9fe6d6fa74d5f35cbbf820c URL: http://source.winehq.org/git/wine.git/?a=commit;h=605d1e2f1e869927f9fe6d6fa… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jun 17 13:07:10 2008 +0500 mshtml: Update Russian translation. --- dlls/mshtml/Ru.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/Ru.rc b/dlls/mshtml/Ru.rc index 3c8207f..a16273b 100644 --- a/dlls/mshtml/Ru.rc +++ b/dlls/mshtml/Ru.rc @@ -27,17 +27,17 @@ STRINGTABLE DISCARDABLE IDS_INSTALLING "��..." } -ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 85 +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 261, 85 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "�� Wine Gecko" FONT 8, "MS Shell Dlg" { LTEXT "�� HTML ��. �� Wine �� " \ "�� Gecko (Mozilla HTML engine). �� , �� Wine " \ - "�� Gecko.", ID_DWL_STATUS, 10, 10, 240, 30, SS_LEFT - CONTROL "��", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 - DEFPUSHBUTTON "&��", ID_DWL_INSTALL, 200, 60, 50, 15, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&��", IDCANCEL, 140, 60, 50, 15, WS_GROUP | WS_TABSTOP + "�� Gecko.", ID_DWL_STATUS, 10, 10, 240, 33, SS_LEFT + CONTROL "��", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 46, 240, 12 + DEFPUSHBUTTON "&��", ID_DWL_INSTALL, 200, 63, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&��", IDCANCEL, 140, 63, 50, 15, WS_GROUP | WS_TABSTOP } IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65

1 0

Vladimir Pankratov : shell32: Update Russian translation.
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: 2cb5773d7baefd56b4d83cbee63231569aa93fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb5773d7baefd56b4d83cbee… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jun 17 13:06:51 2008 +0500 shell32: Update Russian translation. --- dlls/shell32/shell32_Ru.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shell32_Ru.rc b/dlls/shell32/shell32_Ru.rc index ec7ace6..48a403e 100644 --- a/dlls/shell32/shell32_Ru.rc +++ b/dlls/shell32/shell32_Ru.rc @@ -137,12 +137,12 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 } -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 +SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "� %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "OK", IDOK, 153, 133, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 153, 133, 60, 12, WS_TABSTOP PUSHBUTTON "&�� Wine...", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30

1 0

Simon Richter : widl: Write string lengths in host endianness.
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: b5614f763fe8e1f5c725cf26b693985a5ba6de5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5614f763fe8e1f5c725cf26b… Author: Simon Richter <Simon.Richter(a)hogyros.de> Date: Tue Jun 17 07:46:14 2008 +0200 widl: Write string lengths in host endianness. Type libraries are currently parsed in host endianness, so byte arrays that are going to be interpreted as integers need to be written in the appropriate byte order. --- tools/widl/write_msft.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 35c1f05..97ec4ec 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -296,16 +296,23 @@ static int ctl2_encode_name( length = strlen(name); memcpy(converted_name + 4, name, length); - converted_name[0] = length & 0xff; converted_name[length + 4] = 0; - converted_name[1] = 0x00; value = lhash_val_of_name_sys(typelib->typelib_header.varflags & 0x0f, typelib->typelib_header.lcid, converted_name + 4); +#ifdef WORDS_BIGENDIAN + converted_name[3] = length & 0xff; + converted_name[2] = 0x00; + converted_name[1] = value; + converted_name[0] = value >> 8; +#else + converted_name[0] = length & 0xff; + converted_name[1] = 0x00; converted_name[2] = value; converted_name[3] = value >> 8; +#endif for (offset = (4 - length) & 3; offset; offset--) converted_name[length + offset + 3] = 0x57; @@ -339,8 +346,14 @@ static int ctl2_encode_string( length = strlen(string); memcpy(converted_string + 2, string, length); + +#ifdef WORDS_BIGENDIAN + converted_string[1] = length & 0xff; + converted_string[0] = (length >> 8) & 0xff; +#else converted_string[0] = length & 0xff; converted_string[1] = (length >> 8) & 0xff; +#endif if(length < 3) { /* strings of this length are padded with up to 8 bytes incl the 2 byte length */ for(offset = 0; offset < 4; offset++)

1 0

Albert Lee : ws2_32: WS_getaddrinfo TRACE message can crash Wine.
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: b4057a6f39cd28298c5a1577b01d58369879ecc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4057a6f39cd28298c5a1577b… Author: Albert Lee <trisk(a)acm.jhu.edu> Date: Sun Jun 15 03:01:20 2008 -0400 ws2_32: WS_getaddrinfo TRACE message can crash Wine. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 889f88f..e41a646 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3454,7 +3454,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr /* getaddrinfo(3) is thread safe, no need to wrap in CS */ result = getaddrinfo(nodename, servname, punixhints, &unixaires); - TRACE("%s, %s %p -> %p %d\n", nodename, servname, hints, res, result); + TRACE("%s, %s %p -> %p %d\n", debugstr_a(nodename), debugstr_a(servname), hints, res, result); HeapFree(GetProcessHeap(), 0, node); HeapFree(GetProcessHeap(), 0, serv);

1 0

James Hawkins : ddraw: Reset the viewport data before each test.
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: 5dcec4de497de9a9c5ffbd3ef4a5f289b95f52ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dcec4de497de9a9c5ffbd3ef… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sat Jun 14 17:31:44 2008 -0500 ddraw: Reset the viewport data before each test. --- dlls/ddraw/tests/d3d.c | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 43cdb3a..f4e4970 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1011,6 +1011,19 @@ static void D3D1_releaseObjects(void) if (DirectDraw1) IDirectDraw_Release(DirectDraw1); } +#define SET_VP_DATA(vp_data) \ + vp_data.dwSize = sizeof(vp_data); \ + vp_data.dwX = 0; \ + vp_data.dwY = 0; \ + vp_data.dwWidth = 256; \ + vp_data.dwHeight = 256; \ + vp_data.dvMaxX = 256; \ + vp_data.dvMaxY = 256; \ + vp_data.dvScaleX = 5; \ + vp_data.dvScaleY = 5; \ + vp_data.dvMinZ = -25; \ + vp_data.dvMaxZ = 60; + static void Direct3D1Test(void) { HRESULT hr; @@ -1153,17 +1166,7 @@ static void Direct3D1Test(void) } } - vp_data.dwSize = sizeof(vp_data); - vp_data.dwX = 0; - vp_data.dwY = 0; - vp_data.dwWidth = 256; - vp_data.dwHeight = 256; - vp_data.dvMaxX = 256; - vp_data.dvMaxY = 256; - vp_data.dvScaleX = 5; - vp_data.dvScaleY = 5; - vp_data.dvMinZ = -25; - vp_data.dvMaxZ = 60; + SET_VP_DATA(vp_data); hr = IDirect3DViewport_SetViewport(Viewport, &vp_data); ok(hr == D3D_OK, "IDirect3DViewport_SetViewport returned %08x\n", hr); hr = IDirect3DViewport_TransformVertices(Viewport, sizeof(testverts) / sizeof(testverts[0]), @@ -1184,6 +1187,7 @@ static void Direct3D1Test(void) cmp[i].x, cmp[i].y, cmp[i].z, cmp[i].rhw); } + SET_VP_DATA(vp_data); vp_data.dwX = 10; vp_data.dwY = 20; hr = IDirect3DViewport_SetViewport(Viewport, &vp_data); @@ -1266,6 +1270,7 @@ static void Direct3D1Test(void) outH[i].dwFlags, Flags[i]); } + SET_VP_DATA(vp_data); vp_data.dwWidth = 10; vp_data.dwHeight = 1000; hr = IDirect3DViewport_SetViewport(Viewport, &vp_data); @@ -1288,6 +1293,8 @@ static void Direct3D1Test(void) "Cliptest %d differs. Got %08x expexted %08x\n", i + 1, outH[i].dwFlags, Flags[i]); } + + SET_VP_DATA(vp_data); vp_data.dwWidth = 256; vp_data.dwHeight = 256; vp_data.dvScaleX = 1; @@ -1317,6 +1324,7 @@ static void Direct3D1Test(void) * and with clipping on the offscreen flag is set if only one vertex * is transformed, and this vertex is offscreen. */ + SET_VP_DATA(vp_data); vp_data.dwWidth = 5; vp_data.dwHeight = 5; vp_data.dvScaleX = 10000; @@ -1348,6 +1356,7 @@ static void Direct3D1Test(void) transformdata.lpIn = (void *) offscreentest; transformdata.dwInSize = sizeof(offscreentest[0]); + SET_VP_DATA(vp_data); vp_data.dwWidth = 257; vp_data.dwHeight = 257; vp_data.dvScaleX = 1;

1 0

Rob Shearman : rpcrt4: Zero the memory of the s1 structure in test_simple_struct to avoid a Valgrind warning .
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: 3f92030e2d429f0458c725077c880af0e79ba972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f92030e2d429f0458c725077… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Jun 14 17:30:40 2008 +0100 rpcrt4: Zero the memory of the s1 structure in test_simple_struct to avoid a Valgrind warning. --- dlls/rpcrt4/tests/ndr_marshall.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 84a3891..ecb9f57 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -933,6 +933,9 @@ static void test_simple_struct(void) }; + /* zero the entire structure, including the holes */ + memset(&s1, 0, sizeof(s1)); + /* FC_STRUCT */ s1.s = 0x1234; s1.c = 0xa5; @@ -956,7 +959,7 @@ static void test_simple_struct(void) } /* zero the entire structure, including the hole */ - memset(&ps1, 0, sizeof(&ps1)); + memset(&ps1, 0, sizeof(ps1)); /* FC_PSTRUCT */ ps1.l1 = 0xdeadbeef;

1 0

Rob Shearman : rpcrt4: Reduce the timeout of waiting on the stop event in the server test to one second .
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: fd8cb3f9c25d13428e1ff65c65b54b3cc0e84342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd8cb3f9c25d13428e1ff65c6… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Jun 14 16:42:32 2008 +0100 rpcrt4: Reduce the timeout of waiting on the stop event in the server test to one second. The stop event should already be signaled by the time we get to that point since we wait until the child processes terminate in the server process and the stop event is signaled in the context of one of the child processes. Don't call RpcMgmtWaitServerListening if the call to WaitForSingleObject failed since it is likely that s_stop() hasn't been called and therefore the call to RpcMgmtWaitServerListening won't ever return. --- dlls/rpcrt4/tests/server.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 5f6da37..6c0527f 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -1242,6 +1242,7 @@ server(void) RPC_STATUS status, iptcp_status, np_status; RPC_STATUS (RPC_ENTRY *pRpcServerRegisterIfEx)(RPC_IF_HANDLE,UUID*, RPC_MGR_EPV*, unsigned int,unsigned int,RPC_IF_CALLBACK_FN*); + DWORD ret; iptcp_status = RpcServerUseProtseqEp(iptcp, 20, port, NULL); ok(iptcp_status == RPC_S_OK, "RpcServerUseProtseqEp(ncacn_ip_tcp) failed with status %ld\n", iptcp_status); @@ -1278,10 +1279,16 @@ server(void) return; } - ok(WAIT_OBJECT_0 == WaitForSingleObject(stop_event, 60000), "WaitForSingleObject\n"); - status = RpcMgmtWaitServerListen(); - todo_wine { - ok(status == RPC_S_OK, "RpcMgmtWaitServerListening failed with status %ld\n", status); + ret = WaitForSingleObject(stop_event, 1000); + ok(WAIT_OBJECT_0 == ret, "WaitForSingleObject\n"); + /* if the stop event didn't fire then RpcMgmtWaitServerListen will wait + * forever, so don't bother calling it in this case */ + if (ret == WAIT_OBJECT_0) + { + status = RpcMgmtWaitServerListen(); + todo_wine { + ok(status == RPC_S_OK, "RpcMgmtWaitServerListening failed with status %ld\n", status); + } } }

1 0

Rob Shearman : rpcrt4: Save the previous BufferLength in test_ndr_buffer and use it when testing the expected buffer length after the NdrFreeBuffer call .
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: 9ce356c966b79f33e2d537521dc22191aad642af URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce356c966b79f33e2d537521… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Jun 14 16:31:46 2008 +0100 rpcrt4: Save the previous BufferLength in test_ndr_buffer and use it when testing the expected buffer length after the NdrFreeBuffer call. This fixes a test failure on Win2003 upwards when the allocated length appears to be rounded up to a multiple of 4. --- dlls/rpcrt4/tests/ndr_marshall.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 3683027..84a3891 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1795,6 +1795,7 @@ static void test_ndr_buffer(void) unsigned char *binding; RPC_BINDING_HANDLE Handle; RPC_STATUS status; + ULONG prev_buffer_length; StubDesc.RpcInterfaceInformation = (void *)&IFoo___RpcServerInterface; @@ -1832,11 +1833,12 @@ todo_wine ok(StubMsg.BufferLength == 0, "BufferLength should have left as 0 instead of being set to %d\n", StubMsg.BufferLength); ok(StubMsg.fBufferValid == TRUE, "fBufferValid should have been TRUE instead of 0x%x\n", StubMsg.fBufferValid); + prev_buffer_length = RpcMessage.BufferLength; StubMsg.BufferLength = 1; NdrFreeBuffer(&StubMsg); ok(RpcMessage.Handle != NULL, "RpcMessage.Handle should not have been NULL\n"); ok(RpcMessage.Buffer != NULL, "RpcMessage.Buffer should not have been NULL\n"); - ok(RpcMessage.BufferLength == 10, "RpcMessage.BufferLength should have been left as 10 instead of %d\n", RpcMessage.BufferLength); + ok(RpcMessage.BufferLength == prev_buffer_length, "RpcMessage.BufferLength should have been left as %d instead of %d\n", prev_buffer_length, RpcMessage.BufferLength); ok(StubMsg.Buffer != NULL, "Buffer should not have been NULL\n"); ok(StubMsg.BufferLength == 1, "BufferLength should have left as 1 instead of being set to %d\n", StubMsg.BufferLength); ok(StubMsg.fBufferValid == FALSE, "fBufferValid should have been FALSE instead of 0x%x\n", StubMsg.fBufferValid);

1 0

Rob Shearman : rpcrt4: Fix ndr_marshall tests to cope with using pointer ids instead of using pointer values .
by Alexandre Julliard June 18, 2008

June 18, 2008

Module: wine Branch: master Commit: c9ef063e12d2c2ef7ef5ccafad525b3cd31ba61d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ef063e12d2c2ef7ef5ccafa… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Jun 14 16:29:35 2008 +0100 rpcrt4: Fix ndr_marshall tests to cope with using pointer ids instead of using pointer values. This fixes a number of test failures on XP SP3 and Win2003 upwards. --- dlls/rpcrt4/tests/ndr_marshall.c | 112 +++++++++++++++++++++++++++++++------- 1 files changed, 93 insertions(+), 19 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 26f67a7..3683027 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -97,6 +97,41 @@ static const RPC_SERVER_INTERFACE IFoo___RpcServerInterface = }; static RPC_IF_HANDLE IFoo_v0_0_s_ifspec = (RPC_IF_HANDLE)& IFoo___RpcServerInterface; +static BOOL use_pointer_ids = FALSE; + +static void determine_pointer_marshalling_style(void) +{ + RPC_MESSAGE RpcMessage; + MIDL_STUB_MESSAGE StubMsg; + MIDL_STUB_DESC StubDesc; + char ch = 0xde; + + static const unsigned char fmtstr_up_char[] = + { + 0x12, 0x8, /* FC_UP [simple_pointer] */ + 0x2, /* FC_CHAR */ + 0x5c, /* FC_PAD */ + }; + + StubDesc = Object_StubDesc; + StubDesc.pFormatTypes = NULL; + + NdrClientInitializeNew( + &RpcMessage, + &StubMsg, + &StubDesc, + 0); + + StubMsg.BufferLength = 8; + StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = HeapAlloc(GetProcessHeap(), 0, StubMsg.BufferLength); + NdrPointerMarshall(&StubMsg, (unsigned char*)&ch, fmtstr_up_char); + ok(StubMsg.Buffer == StubMsg.BufferStart + 5, "%p %p\n", StubMsg.Buffer, StubMsg.BufferStart); + + use_pointer_ids = (*(unsigned int *)StubMsg.BufferStart != (unsigned int)&ch); + trace("Pointer marshalling using %s\n", use_pointer_ids ? "pointer ids" : "pointer value"); + + HeapFree(GetProcessHeap(), 0, StubMsg.BufferStart); +} static void test_ndr_simple_type(void) { @@ -423,8 +458,11 @@ static void test_simple_types(void) ch = 0xa5; ch_ptr = &ch; - *(void**)wiredata = ch_ptr; - wiredata[sizeof(void*)] = ch; + if (use_pointer_ids) + *(unsigned int *)wiredata = 0x20000; + else + *(unsigned int *)wiredata = (unsigned int)ch_ptr; + wiredata[4] = ch; test_pointer_marshal(fmtstr_up_char, ch_ptr, 1, wiredata, 5, NULL, 0, "up_char"); test_pointer_marshal(fmtstr_up_byte, ch_ptr, 1, wiredata, 5, NULL, 0, "up_byte"); @@ -437,21 +475,30 @@ static void test_simple_types(void) test_pointer_marshal(fmtstr_rpup_char2, ch_ptr, 1, wiredata, 5, NULL, 0, "rpup_char2"); s = 0xa597; - *(void**)wiredata = &s; - *(unsigned short*)(wiredata + sizeof(void*)) = s; + if (use_pointer_ids) + *(unsigned int *)wiredata = 0x20000; + else + *(unsigned int *)wiredata = (unsigned int)&s; + *(unsigned short*)(wiredata + 4) = s; test_pointer_marshal(fmtstr_up_wchar, &s, 2, wiredata, 6, NULL, 0, "up_wchar"); test_pointer_marshal(fmtstr_up_short, &s, 2, wiredata, 6, NULL, 0, "up_short"); test_pointer_marshal(fmtstr_up_ushort, &s, 2, wiredata, 6, NULL, 0, "up_ushort"); i = 0x7fff; - *(void**)wiredata = &i; - *(unsigned short*)(wiredata + sizeof(void*)) = i; + if (use_pointer_ids) + *(unsigned int *)wiredata = 0x20000; + else + *(unsigned int *)wiredata = (unsigned int)&i; + *(unsigned short*)(wiredata + 4) = i; test_pointer_marshal(fmtstr_up_enum16, &i, 2, wiredata, 6, NULL, 0, "up_enum16"); l = 0xcafebabe; - *(void**)wiredata = &l; - *(unsigned long*)(wiredata + sizeof(void*)) = l; + if (use_pointer_ids) + *(unsigned int *)wiredata = 0x20000; + else + *(unsigned int *)wiredata = (unsigned int)&l; + *(unsigned long*)(wiredata + 4) = l; test_pointer_marshal(fmtstr_up_long, &l, 4, wiredata, 8, NULL, 0, "up_long"); test_pointer_marshal(fmtstr_up_ulong, &l, 4, wiredata, 8, NULL, 0, "up_ulong"); @@ -459,20 +506,29 @@ static void test_simple_types(void) test_pointer_marshal(fmtstr_up_errorstatus, &l, 4, wiredata, 8, NULL, 0, "up_errorstatus"); ll = ((ULONGLONG)0xcafebabe) << 32 | 0xdeadbeef; - *(void**)wiredata = &ll; - *(void**)(wiredata + sizeof(void*)) = NULL; - *(ULONGLONG*)(wiredata + 2 * sizeof(void*)) = ll; + if (use_pointer_ids) + *(unsigned int *)wiredata = 0x20000; + else + *(unsigned int *)wiredata = (unsigned int)&ll; + *(unsigned int **)(wiredata + 4) = 0; + *(ULONGLONG*)(wiredata + 8) = ll; test_pointer_marshal(fmtstr_up_longlong, &ll, 8, wiredata, 16, NULL, 0, "up_longlong"); f = 3.1415f; - *(void**)wiredata = &f; - *(float*)(wiredata + sizeof(void*)) = f; + if (use_pointer_ids) + *(unsigned int *)wiredata = 0x20000; + else + *(unsigned int *)wiredata = (unsigned int)&f; + *(float*)(wiredata + 4) = f; test_pointer_marshal(fmtstr_up_float, &f, 4, wiredata, 8, NULL, 0, "up_float"); d = 3.1415; - *(void**)wiredata = &d; - *(void**)(wiredata + sizeof(void*)) = NULL; - *(double*)(wiredata + 2 * sizeof(void*)) = d; + if (use_pointer_ids) + *(unsigned int *)wiredata = 0x20000; + else + *(unsigned int *)wiredata = (unsigned int)&d; + *(unsigned int *)(wiredata + 4) = 0; + *(double*)(wiredata + 8) = d; test_pointer_marshal(fmtstr_up_double, &d, 8, wiredata, 16, NULL, 0, "up_double"); } @@ -888,7 +944,10 @@ static void test_simple_struct(void) memcpy(wiredata, &s1, wiredatalen); test_simple_struct_marshal(fmtstr_simple_struct + 4, &s1, 24, wiredata, 24, NULL, 0, "struct"); - *(void**)wiredata = &s1; + if (use_pointer_ids) + *(unsigned int *)wiredata = 0x20000; + else + *(unsigned int *)wiredata = (unsigned int)&s1; memcpy(wiredata + 4, &s1, wiredatalen); if (0) { @@ -905,12 +964,25 @@ static void test_simple_struct(void) ps1.pl1 = &l; c = 'a'; ps1.pc1 = &c; - memcpy(wiredata + 4, &ps1, 12); + *(unsigned int *)(wiredata + 4) = 0xdeadbeef; + if (use_pointer_ids) + { + *(unsigned int *)(wiredata + 8) = 0x20000; + *(unsigned int *)(wiredata + 12) = 0x20004; + } + else + { + *(unsigned int *)(wiredata + 8) = (unsigned int)&l; + *(unsigned int *)(wiredata + 12) = (unsigned int)&c; + } memcpy(wiredata + 16, &l, 4); memcpy(wiredata + 20, &c, 1); test_simple_struct_marshal(fmtstr_pointer_struct + 4, &ps1, 17, wiredata + 4, 17, ps1_cmp, 2, "pointer_struct"); - *(void**)wiredata = &ps1; + if (use_pointer_ids) + *(unsigned int *)wiredata = 0x20000; + else + *(unsigned int *)wiredata = (unsigned int)&ps1; if (0) { /* one of the unmarshallings crashes Wine */ @@ -1823,6 +1895,8 @@ static void test_NdrMapCommAndFaultStatus(void) START_TEST( ndr_marshall ) { + determine_pointer_marshalling_style(); + test_ndr_simple_type(); test_simple_types(); test_nontrivial_pointer_types();

1 0