November 2007 - Wine-commits

Alexandre Julliard : Wine release 0.9.50
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: website Branch: master Commit: 6f24523983ec47213417e05c35c9870e622cb66d URL: http://source.winehq.org/git/website.git/?a=commit;h=6f24523983ec47213417e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 30 18:50:28 2007 +0100 Wine release 0.9.50 --- include/winehq.conf | 2 +- news/2007113001.xml | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/include/winehq.conf b/include/winehq.conf index 9e9d477..dc762fb 100644 --- a/include/winehq.conf +++ b/include/winehq.conf @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.49 +snapshot_date: 0.9.50 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 diff --git a/news/2007113001.xml b/news/2007113001.xml new file mode 100644 index 0000000..33dba44 --- /dev/null +++ b/news/2007113001.xml @@ -0,0 +1,24 @@ +<news> +<date>November 30, 2007</date> +<title>Wine 0.9.50 Released</title> +<body> +<p>Wine 0.9.50 was released today, with the following main changes:</p> + +<ul> +<li>Completed I/O completion.</li> +<li>Improved user credentials management, including Mac Keychain support.</li> +<li>More Valgrinding.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.50.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.50">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Tag wine-0.9.50 : Alexandre Julliard : Release 0.9.50
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: refs/tags/wine-0.9.50 Tag: 6394f670f55f20739283d120e8f23c830702f4f7 URL: http://source.winehq.org/git/wine.git/?a=tag;h=6394f670f55f20739283d120e8f2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 30 18:38:15 2007 +0100 Release 0.9.50

1 0

Alexandre Julliard : Release 0.9.50.
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: master Commit: dec68336781cd2692d5a04afa8d548f57ea5d4a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec68336781cd2692d5a04afa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 30 18:38:15 2007 +0100 Release 0.9.50. --- ANNOUNCE | 1121 +++++++++++++++++----------------- ChangeLog | 2044 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2616 insertions(+), 569 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dec68336781cd2692d5a0…

1 0

Jacek Caban : mshtml.idl: Added IHTMLTable declaration.
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: master Commit: ce81e30f5379d3f846901274b4b1ebbbee6a6c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce81e30f5379d3f846901274b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 13:21:50 2007 +0100 mshtml.idl: Added IHTMLTable declaration. --- include/mshtmdid.h | 47 ++++++ include/mshtml.idl | 426 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 473 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce81e30f5379d3f846901…

1 0

Jacek Caban : mshtml: Added IHTMLTable interface stub implementation.
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: master Commit: 77ee756c91dfbacc4d42ae4f58f6b145bdc97876 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ee756c91dfbacc4d42ae4f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 13:29:02 2007 +0100 mshtml: Added IHTMLTable interface stub implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 3 + dlls/mshtml/htmltable.c | 557 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 4 files changed, 562 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77ee756c91dfbacc4d42a…

1 0

Stefan Dösinger : user32: Destroying the current cursor results in an error.
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: master Commit: abf524031081d6f8c5fb37da722e3f295d753176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf524031081d6f8c5fb37da7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 29 00:08:35 2007 +0100 user32: Destroying the current cursor results in an error. --- dlls/user32/cursoricon.c | 2 +- dlls/user32/tests/cursoricon.c | 47 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index d528bee..8a2a005 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1347,7 +1347,7 @@ WORD WINAPI DestroyIcon32( HGLOBAL16 handle, UINT16 flags ) if ( get_user_thread_info()->cursor == HICON_32(handle) ) { WARN_(cursor)("Destroying active cursor!\n" ); - SetCursor( 0 ); + return FALSE; } /* Try shared cursor/icon first */ diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 84b9fe3..9858e32 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -373,6 +373,52 @@ static void test_CreateIcon(void) DeleteObject(hbmColor); } +static void test_DestroyCursor(void) +{ + static const BYTE bmp_bits[4096]; + ICONINFO cursorInfo; + HCURSOR cursor, cursor2; + BOOL ret; + DWORD error; + UINT display_bpp; + HDC hdc; + + hdc = GetDC(0); + display_bpp = GetDeviceCaps(hdc, BITSPIXEL); + ReleaseDC(0, hdc); + + cursorInfo.fIcon = FALSE; + cursorInfo.xHotspot = 0; + cursorInfo.yHotspot = 0; + cursorInfo.hbmMask = CreateBitmap(32, 32, 1, 1, bmp_bits); + cursorInfo.hbmColor = CreateBitmap(32, 32, 1, display_bpp, bmp_bits); + + cursor = CreateIconIndirect(&cursorInfo); + ok(cursor != NULL, "CreateIconIndirect returned %p\n", cursor); + if(!cursor) { + return; + } + SetCursor(cursor); + + SetLastError(0xdeadbeef); + ret = DestroyCursor(cursor); + ok(!ret, "DestroyCursor on the active cursor succeeded\n"); + error = GetLastError(); + ok(error == 0xdeadbeef, "Last error: %u\n", error); + + cursor2 = GetCursor(); + ok(cursor2 == cursor, "Active was set to %p when trying to destroy it\n", cursor2); + + SetCursor(NULL); + + /* Trying to destroy the cursor properly fails now for some reason with ERROR_INVALID_CURSOR_HANDLE */ + ret = DestroyCursor(cursor); + /* ok(ret, "DestroyCursor failed, GetLastError=%d\n", GetLastError()); */ + + DeleteObject(cursorInfo.hbmMask); + DeleteObject(cursorInfo.hbmColor); +} + START_TEST(cursoricon) { test_CopyImage_Bitmap(1); @@ -382,4 +428,5 @@ START_TEST(cursoricon) test_CopyImage_Bitmap(24); test_CopyImage_Bitmap(32); test_CreateIcon(); + test_DestroyCursor(); }

1 0

Francois Gouget : d3dx8/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: master Commit: c186233892f66d26283f517c6fef63bdc859bcb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c186233892f66d26283f517c6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Nov 30 12:10:32 2007 +0100 d3dx8/tests: Fix compilation on systems that don't support nameless unions. --- dlls/d3dx8/tests/math.c | 54 +++++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 6fb5736..a8471b3 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -200,17 +200,17 @@ static void D3DXMatrixTest(void) angle = D3DX_PI/3.0f; /*____________D3DXMatrixAffineTransformation______*/ - expectedmat.m[0][0] = -459.239990f; expectedmat.m[0][1] = -576.719971f; expectedmat.m[0][2] = -263.440002f; expectedmat.m[0][3] = 0.0f; - expectedmat.m[1][0] = 519.760010f; expectedmat.m[1][1] = -352.440002f; expectedmat.m[1][2] = -277.679993f; expectedmat.m[1][3] = 0.0f; - expectedmat.m[2][0] = 363.119995f; expectedmat.m[2][1] = -121.040001f; expectedmat.m[2][2] = -117.479996f; expectedmat.m[2][3] = 0.0f; - expectedmat.m[3][0] = -1239.0f; expectedmat.m[3][1] = 667.0f; expectedmat.m[3][2] = 567.0f; expectedmat.m[3][3] = 1.0f; + U(expectedmat).m[0][0] = -459.239990f; U(expectedmat).m[0][1] = -576.719971f; U(expectedmat).m[0][2] = -263.440002f; U(expectedmat).m[0][3] = 0.0f; + U(expectedmat).m[1][0] = 519.760010f; U(expectedmat).m[1][1] = -352.440002f; U(expectedmat).m[1][2] = -277.679993f; U(expectedmat).m[1][3] = 0.0f; + U(expectedmat).m[2][0] = 363.119995f; U(expectedmat).m[2][1] = -121.040001f; U(expectedmat).m[2][2] = -117.479996f; U(expectedmat).m[2][3] = 0.0f; + U(expectedmat).m[3][0] = -1239.0f; U(expectedmat).m[3][1] = 667.0f; U(expectedmat).m[3][2] = 567.0f; U(expectedmat).m[3][3] = 1.0f; D3DXMatrixAffineTransformation(&gotmat,3.56f,&at,&q,&axis); expect_mat(expectedmat,gotmat); /* Test the NULL case */ - expectedmat.m[0][0] = -459.239990f; expectedmat.m[0][1] = -576.719971f; expectedmat.m[0][2] = -263.440002f; expectedmat.m[0][3] = 0.0f; - expectedmat.m[1][0] = 519.760010f; expectedmat.m[1][1] = -352.440002f; expectedmat.m[1][2] = -277.679993f; expectedmat.m[1][3] = 0.0f; - expectedmat.m[2][0] = 363.119995f; expectedmat.m[2][1] = -121.040001f; expectedmat.m[2][2] = -117.479996f; expectedmat.m[2][3] = 0.0f; - expectedmat.m[3][0] = 1.0f; expectedmat.m[3][1] = -3.0f; expectedmat.m[3][2] = 7.0f; expectedmat.m[3][3] = 1.0f; + U(expectedmat).m[0][0] = -459.239990f; U(expectedmat).m[0][1] = -576.719971f; U(expectedmat).m[0][2] = -263.440002f; U(expectedmat).m[0][3] = 0.0f; + U(expectedmat).m[1][0] = 519.760010f; U(expectedmat).m[1][1] = -352.440002f; U(expectedmat).m[1][2] = -277.679993f; U(expectedmat).m[1][3] = 0.0f; + U(expectedmat).m[2][0] = 363.119995f; U(expectedmat).m[2][1] = -121.040001f; U(expectedmat).m[2][2] = -117.479996f; U(expectedmat).m[2][3] = 0.0f; + U(expectedmat).m[3][0] = 1.0f; U(expectedmat).m[3][1] = -3.0f; U(expectedmat).m[3][2] = 7.0f; U(expectedmat).m[3][3] = 1.0f; D3DXMatrixAffineTransformation(&gotmat,3.56f,NULL,&q,&axis); expect_mat(expectedmat,gotmat); @@ -220,10 +220,10 @@ static void D3DXMatrixTest(void) ok(fabs( gotfloat - expectedfloat ) < admitted_error, "Expected: %f, Got: %f\n", expectedfloat, gotfloat); /*____________D3DXMatrixInverse______________*/ - expectedmat.m[0][0] = 16067.0f/73944.0f; expectedmat.m[0][1] = -10165.0f/147888.0f; expectedmat.m[0][2] = -2729.0f/147888.0f; expectedmat.m[0][3] = -1631.0f/49296.0f; - expectedmat.m[1][0] = -565.0f/36972.0f; expectedmat.m[1][1] = 2723.0f/73944.0f; expectedmat.m[1][2] = -1073.0f/73944.0f; expectedmat.m[1][3] = 289.0f/24648.0f; - expectedmat.m[2][0] = -389.0f/2054.0f; expectedmat.m[2][1] = 337.0f/4108.0f; expectedmat.m[2][2] = 181.0f/4108.0f; expectedmat.m[2][3] = 317.0f/4108.0f; - expectedmat.m[3][0] = 163.0f/5688.0f; expectedmat.m[3][1] = -101.0f/11376.0f; expectedmat.m[3][2] = -73.0f/11376.0f; expectedmat.m[3][3] = -127.0f/3792.0f; + U(expectedmat).m[0][0] = 16067.0f/73944.0f; U(expectedmat).m[0][1] = -10165.0f/147888.0f; U(expectedmat).m[0][2] = -2729.0f/147888.0f; U(expectedmat).m[0][3] = -1631.0f/49296.0f; + U(expectedmat).m[1][0] = -565.0f/36972.0f; U(expectedmat).m[1][1] = 2723.0f/73944.0f; U(expectedmat).m[1][2] = -1073.0f/73944.0f; U(expectedmat).m[1][3] = 289.0f/24648.0f; + U(expectedmat).m[2][0] = -389.0f/2054.0f; U(expectedmat).m[2][1] = 337.0f/4108.0f; U(expectedmat).m[2][2] = 181.0f/4108.0f; U(expectedmat).m[2][3] = 317.0f/4108.0f; + U(expectedmat).m[3][0] = 163.0f/5688.0f; U(expectedmat).m[3][1] = -101.0f/11376.0f; U(expectedmat).m[3][2] = -73.0f/11376.0f; U(expectedmat).m[3][3] = -127.0f/3792.0f; expectedfloat = -147888.0f; D3DXMatrixInverse(&gotmat,&determinant,&mat); expect_mat(expectedmat,gotmat); @@ -273,10 +273,10 @@ static void D3DXMatrixTest(void) expect_mat(expectedmat,gotmat); /*____________D3DXMatrixMultiplyTranspose____*/ - expectedmat.m[0][0] = 73.0f; expectedmat.m[0][1] = 231.0f; expectedmat.m[0][2] = 239.0f; expectedmat.m[0][3] = -164.0f; - expectedmat.m[1][0] = 193.0f; expectedmat.m[1][1] = 551.0f; expectedmat.m[1][2] = 523.0f; expectedmat.m[1][3] = -320.0; - expectedmat.m[2][0] = -197.0f; expectedmat.m[2][1] = -489.0f; expectedmat.m[2][2] = -400.0f; expectedmat.m[2][3] = 187.0f; - expectedmat.m[3][0] = -77.0f; expectedmat.m[3][1] = -169.0f; expectedmat.m[3][2] = -116.0f; expectedmat.m[3][3] = 31.0f; + U(expectedmat).m[0][0] = 73.0f; U(expectedmat).m[0][1] = 231.0f; U(expectedmat).m[0][2] = 239.0f; U(expectedmat).m[0][3] = -164.0f; + U(expectedmat).m[1][0] = 193.0f; U(expectedmat).m[1][1] = 551.0f; U(expectedmat).m[1][2] = 523.0f; U(expectedmat).m[1][3] = -320.0; + U(expectedmat).m[2][0] = -197.0f; U(expectedmat).m[2][1] = -489.0f; U(expectedmat).m[2][2] = -400.0f; U(expectedmat).m[2][3] = 187.0f; + U(expectedmat).m[3][0] = -77.0f; U(expectedmat).m[3][1] = -169.0f; U(expectedmat).m[3][2] = -116.0f; U(expectedmat).m[3][3] = 31.0f; D3DXMatrixMultiplyTranspose(&gotmat,&mat,&mat2); expect_mat(expectedmat,gotmat); @@ -975,17 +975,17 @@ static void D3X8Vector3Test(void) U(mat).m[2][0] = 9.0f; U(mat).m[2][1] = 10.0f; U(mat).m[2][2] = 11.0f; U(mat).m[2][3] = 12.0f; U(mat).m[3][0] = 13.0f; U(mat).m[3][1] = 14.0f; U(mat).m[3][2] = 15.0f; U(mat).m[3][3] = 16.0f; - view.m[0][1] = 5.0f; view.m[0][2] = 7.0f; view.m[0][3] = 8.0f; - view.m[1][0] = 11.0f; view.m[1][2] = 16.0f; view.m[1][3] = 33.0f; - view.m[2][0] = 19.0f; view.m[2][1] = -21.0f; view.m[2][3] = 43.0f; - view.m[3][0] = 2.0f; view.m[3][1] = 3.0f; view.m[3][2] = -4.0f; - view.m[0][0] = 10.0f; view.m[1][1] = 20.0f; view.m[2][2] = 30.0f; - view.m[3][3] = -40.0f; - - world.m[0][0] = 21.0f; world.m[0][1] = 2.0f; world.m[0][2] = 3.0f; world.m[0][3] = 4.0; - world.m[1][0] = 5.0f; world.m[1][1] = 23.0f; world.m[1][2] = 7.0f; world.m[1][3] = 8.0f; - world.m[2][0] = -8.0f; world.m[2][1] = -7.0f; world.m[2][2] = 25.0f; world.m[2][3] = -5.0f; - world.m[3][0] = -4.0f; world.m[3][1] = -3.0f; world.m[3][2] = -2.0f; world.m[3][3] = 27.0f; + U(view).m[0][1] = 5.0f; U(view).m[0][2] = 7.0f; U(view).m[0][3] = 8.0f; + U(view).m[1][0] = 11.0f; U(view).m[1][2] = 16.0f; U(view).m[1][3] = 33.0f; + U(view).m[2][0] = 19.0f; U(view).m[2][1] = -21.0f; U(view).m[2][3] = 43.0f; + U(view).m[3][0] = 2.0f; U(view).m[3][1] = 3.0f; U(view).m[3][2] = -4.0f; + U(view).m[0][0] = 10.0f; U(view).m[1][1] = 20.0f; U(view).m[2][2] = 30.0f; + U(view).m[3][3] = -40.0f; + + U(world).m[0][0] = 21.0f; U(world).m[0][1] = 2.0f; U(world).m[0][2] = 3.0f; U(world).m[0][3] = 4.0; + U(world).m[1][0] = 5.0f; U(world).m[1][1] = 23.0f; U(world).m[1][2] = 7.0f; U(world).m[1][3] = 8.0f; + U(world).m[2][0] = -8.0f; U(world).m[2][1] = -7.0f; U(world).m[2][2] = 25.0f; U(world).m[2][3] = -5.0f; + U(world).m[3][0] = -4.0f; U(world).m[3][1] = -3.0f; U(world).m[3][2] = -2.0f; U(world).m[3][3] = 27.0f; coeff1 = 2.0f; coeff2 = 5.0f; scale = -6.5f;

1 0

Rob Shearman : rpcrt4: Improve PointerUnmarshall to cope with keeping the non-NULL source pointer of a client unmarshall .
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: master Commit: b676309db3fbde48ba0a7ca202172f37c443e0c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b676309db3fbde48ba0a7ca20… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 29 17:35:34 2007 +0000 rpcrt4: Improve PointerUnmarshall to cope with keeping the non-NULL source pointer of a client unmarshall. This will enable various types with embedded pointers to handle [in,out] parameters correctly by keeping the existing memory. --- dlls/rpcrt4/ndr_marshall.c | 98 ++++++++++++++++++++++++++++++++------------ 1 files changed, 71 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b676309db3fbde48ba0a7…

1 0

Rob Shearman : rpcrt4: Fix NdrSimpleStructUnmarshall to cope with [in, out] embedded pointers.
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: master Commit: c735a14788011a139b55751c051809d14df9dde8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c735a14788011a139b55751c0… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 29 17:35:40 2007 +0000 rpcrt4: Fix NdrSimpleStructUnmarshall to cope with [in, out] embedded pointers. --- dlls/rpcrt4/ndr_marshall.c | 26 +++++++++++++------------- dlls/rpcrt4/tests/server.c | 1 - 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index f895376..8300b64 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -1715,28 +1715,28 @@ unsigned char * WINAPI NdrSimpleStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char fMustAlloc) { unsigned size = *(const WORD*)(pFormat+2); + unsigned char *saved_buffer; TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); ALIGN_POINTER(pStubMsg->Buffer, pFormat[1] + 1); - pStubMsg->BufferMark = pStubMsg->Buffer; - - if (fMustAlloc) { + if (fMustAlloc) *ppMemory = NdrAllocate(pStubMsg, size); - safe_copy_from_buffer(pStubMsg, *ppMemory, size); - } else { - if (!pStubMsg->IsClient && !*ppMemory) { + else + { + if (!pStubMsg->IsClient && !*ppMemory) /* for servers, we just point straight into the RPC buffer */ *ppMemory = pStubMsg->Buffer; - safe_buffer_increment(pStubMsg, size); - } - else - /* for clients, memory should be provided by caller */ - safe_copy_from_buffer(pStubMsg, *ppMemory, size); } - if (pFormat[0] != RPC_FC_STRUCT) - EmbeddedPointerUnmarshall(pStubMsg, *ppMemory, *ppMemory, pFormat+4, TRUE /* FIXME */); + saved_buffer = pStubMsg->BufferMark = pStubMsg->Buffer; + safe_buffer_increment(pStubMsg, size); + if (pFormat[0] == RPC_FC_PSTRUCT) + EmbeddedPointerUnmarshall(pStubMsg, saved_buffer, *ppMemory, pFormat+4, fMustAlloc); + + TRACE("copying %p to %p\n", saved_buffer, *ppMemory); + if (*ppMemory != saved_buffer) + memcpy(*ppMemory, saved_buffer, size); return NULL; } diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index ad0dd73..20e6033 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -876,7 +876,6 @@ pointer_tests(void) name.size = 10; name.name = buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, name.size); get_name(&name); - todo_wine ok(name.name == buffer, "[in,out] pointer should have stayed as %p but instead changed to %p\n", name.name, buffer); HeapFree(GetProcessHeap(), 0, name.name);

1 0

Sven Paschukat : ctapi32: Added null terminator to library name.
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: master Commit: a080af035e767e6793fd8fa3c076537386feb6b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a080af035e767e6793fd8fa3c… Author: Sven Paschukat <Sven.Paschukat(a)T-Online.de> Date: Thu Nov 29 21:36:09 2007 +0100 ctapi32: Added null terminator to library name. --- dlls/ctapi32/ctapi32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ctapi32/ctapi32.c b/dlls/ctapi32/ctapi32.c index 2af4632..5c330bd 100644 --- a/dlls/ctapi32/ctapi32.c +++ b/dlls/ctapi32/ctapi32.c @@ -66,7 +66,7 @@ static int load_functions(void) { buffer_w[size / sizeof(WCHAR)] = '\0'; len = WideCharToMultiByte(CP_UNIXCP, 0, buffer_w, -1, buffer, sizeof(buffer), NULL, NULL); if (len) - memcpy(soname, buffer, len - 1); + memcpy(soname, buffer, len); } RegCloseKey(key_handle); }

1 0