wine-commits November 2007

wine-commits@winehq.org

3 participants
757 discussions

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: 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

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

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

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

Stefan Dösinger : wined3d: Remove the X channel fixup in render target unlocking.
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: master Commit: 94cd8c276a1b68ab633def843afa1f487f5358c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94cd8c276a1b68ab633def843… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 28 21:26:31 2007 +0100 wined3d: Remove the X channel fixup in render target unlocking. --- dlls/wined3d/surface.c | 59 +++++++---------------------------------------- 1 files changed, 9 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2030f95..0ff1bc7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1002,64 +1002,23 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This) { case WINED3DFMT_R5G6B5: case WINED3DFMT_A1R5G5B5: case WINED3DFMT_R8G8B8: - type = This->glDescription.glType; - fmt = This->glDescription.glFormat; - mem = This->resource.allocatedMemory; - bpp = This->bytesPerPixel; - break; - case WINED3DFMT_X4R4G4B4: - { - int size; - unsigned short *data; - data = (unsigned short *)This->resource.allocatedMemory; - size = (This->lockedRect.bottom - This->lockedRect.top) * (This->lockedRect.right - This->lockedRect.left); - while(size > 0) { - *data |= 0xF000; - data++; - size--; - } - type = This->glDescription.glType; - fmt = This->glDescription.glFormat; - mem = This->resource.allocatedMemory; - bpp = This->bytesPerPixel; - } - break; - case WINED3DFMT_X1R5G5B5: - { - int size; - unsigned short *data; - data = (unsigned short *)This->resource.allocatedMemory; - size = (This->lockedRect.bottom - This->lockedRect.top) * (This->lockedRect.right - This->lockedRect.left); - while(size > 0) { - *data |= 0x8000; - data++; - size--; - } type = This->glDescription.glType; fmt = This->glDescription.glFormat; mem = This->resource.allocatedMemory; bpp = This->bytesPerPixel; - } - break; + break; + /* In the past times we used to set the X channel of X8R8G8B8 and the above formats to + * 1.0 because it happened to fix the intro movie in Pirates. However, this seems wrong. + * If the game uses an X8R8G8B8 back buffer the GL alpha channel should not make any differences, + * and the bug must be somewhere else. If we really have to set the alpha channel to 1.0 in + * this case do it by clearing it after the draw instead of fixing it up in the CPU. Blending + * is disabled via CTXUSAGE_BLIT context setup, so in the glDrawPixels call it does not + * have any effects + */ case WINED3DFMT_X8R8G8B8: - { - /* make sure the X byte is set to alpha on, since it - could be any random value. This fixes the intro movie in Pirates! */ - int size; - unsigned int *data; - data = (unsigned int *)This->resource.allocatedMemory; - size = (This->lockedRect.bottom - This->lockedRect.top) * (This->lockedRect.right - This->lockedRect.left); - while(size > 0) { - *data |= 0xFF000000; - data++; - size--; - } - } - /* Fall through */ - case WINED3DFMT_A8R8G8B8: { glPixelStorei(GL_PACK_SWAP_BYTES, TRUE);

1 0

Stefan Leichter : kernel32: Added stub for FindVolumeClose.
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: master Commit: db24d3af9a6e56c3036ba0a3e5d62dae4f2676d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db24d3af9a6e56c3036ba0a3e… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Nov 29 23:41:41 2007 +0100 kernel32: Added stub for FindVolumeClose. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/volume.c | 124 ++++++++++++++++++++++++++---------------- 2 files changed, 78 insertions(+), 48 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bc3ba3a..7bc5db3 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -386,7 +386,7 @@ @ stdcall FindResourceExA(long str str long) @ stdcall FindResourceExW(long wstr wstr long) @ stdcall FindResourceW(long wstr wstr) -@ stub FindVolumeClose +@ stdcall FindVolumeClose(ptr) @ stdcall FindVolumeMountPointClose(ptr) @ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 5ebe91f..655fda1 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -58,11 +58,14 @@ enum fs_type { FS_ERROR, /* error accessing the device */ FS_UNKNOWN, /* unknown file system */ + FS_PLACEHOLDER, /* Wine placeholder for drive device */ FS_FAT1216, FS_FAT32, FS_ISO9660 }; +static const char wine_placeholder[] = "Wine device placeholder"; + static const WCHAR drive_types[][8] = { { 0 }, /* DRIVE_UNKNOWN */ @@ -161,6 +164,52 @@ static BOOL open_device_root( LPCWSTR root, HANDLE *handle ) return TRUE; } +/* get the label by reading it from a file at the root of the filesystem */ +static void get_filesystem_label( const WCHAR *device, WCHAR *label, DWORD len ) +{ + HANDLE handle; + WCHAR labelW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','l','a','b','e','l',0}; + + labelW[0] = device[4]; + handle = CreateFileW( labelW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + if (handle != INVALID_HANDLE_VALUE) + { + char buffer[256], *p; + DWORD size; + + if (!ReadFile( handle, buffer, sizeof(buffer)-1, &size, NULL )) size = 0; + CloseHandle( handle ); + p = buffer + size; + while (p > buffer && (p[-1] == ' ' || p[-1] == '\r' || p[-1] == '\n')) p--; + *p = 0; + if (!MultiByteToWideChar( CP_UNIXCP, 0, buffer, -1, label, len )) + label[len-1] = 0; + } + else label[0] = 0; +} + +/* get the serial number by reading it from a file at the root of the filesystem */ +static DWORD get_filesystem_serial( const WCHAR *device ) +{ + HANDLE handle; + WCHAR serialW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','s','e','r','i','a','l',0}; + + serialW[0] = device[4]; + handle = CreateFileW( serialW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, 0 ); + if (handle != INVALID_HANDLE_VALUE) + { + char buffer[32]; + DWORD size; + + if (!ReadFile( handle, buffer, sizeof(buffer)-1, &size, NULL )) size = 0; + CloseHandle( handle ); + buffer[size] = 0; + return strtoul( buffer, NULL, 16 ); + } + else return 0; +} /* fetch the type of a drive from the registry */ static UINT get_registry_drive_type( const WCHAR *root ) @@ -256,10 +305,15 @@ static enum fs_type VOLUME_ReadFATSuperblock( HANDLE handle, BYTE *buff ) /* try a fixed disk, with a FAT partition */ if (SetFilePointer( handle, 0, NULL, FILE_BEGIN ) != 0 || - !ReadFile( handle, buff, SUPERBLOCK_SIZE, &size, NULL ) || - size != SUPERBLOCK_SIZE) + !ReadFile( handle, buff, SUPERBLOCK_SIZE, &size, NULL )) return FS_ERROR; + if (size >= sizeof(wine_placeholder)-1 && + !memcmp( buff, wine_placeholder, sizeof(wine_placeholder)-1 )) + return FS_PLACEHOLDER; + + if (size != SUPERBLOCK_SIZE) return FS_ERROR; + /* FIXME: do really all FAT have their name beginning with * "FAT" ? (At least FAT12, FAT16 and FAT32 have :) */ @@ -332,7 +386,7 @@ static enum fs_type VOLUME_ReadCDSuperblock( HANDLE handle, BYTE *buff ) /************************************************************************** * VOLUME_GetSuperblockLabel */ -static void VOLUME_GetSuperblockLabel( enum fs_type type, const BYTE *superblock, +static void VOLUME_GetSuperblockLabel( const WCHAR *device, enum fs_type type, const BYTE *superblock, WCHAR *label, DWORD len ) { const BYTE *label_ptr = NULL; @@ -344,6 +398,9 @@ static void VOLUME_GetSuperblockLabel( enum fs_type type, const BYTE *superblock case FS_UNKNOWN: label_len = 0; break; + case FS_PLACEHOLDER: + get_filesystem_label( device, label, len ); + break; case FS_FAT1216: label_ptr = superblock + 0x2b; label_len = 11; @@ -384,13 +441,15 @@ static void VOLUME_GetSuperblockLabel( enum fs_type type, const BYTE *superblock /************************************************************************** * VOLUME_GetSuperblockSerial */ -static DWORD VOLUME_GetSuperblockSerial( enum fs_type type, const BYTE *superblock ) +static DWORD VOLUME_GetSuperblockSerial( const WCHAR *device, enum fs_type type, const BYTE *superblock ) { switch(type) { case FS_ERROR: case FS_UNKNOWN: break; + case FS_PLACEHOLDER: + return get_filesystem_serial( device ); case FS_FAT1216: return GETLONG( superblock, 0x27 ); case FS_FAT32: @@ -519,8 +578,8 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, TRACE( "%s: found fs type %d\n", debugstr_w(device), type ); if (type == FS_ERROR) return FALSE; - if (label && label_len) VOLUME_GetSuperblockLabel( type, superblock, label, label_len ); - if (serial) *serial = VOLUME_GetSuperblockSerial( type, superblock ); + if (label && label_len) VOLUME_GetSuperblockLabel( device, type, superblock, label, label_len ); + if (serial) *serial = VOLUME_GetSuperblockSerial( device, type, superblock ); goto fill_fs_info; } else TRACE( "cannot open device %s: err %d\n", debugstr_w(device), GetLastError() ); @@ -544,47 +603,8 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, break; } - if (label && label_len) - { - WCHAR labelW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','l','a','b','e','l',0}; - - labelW[0] = device[4]; - handle = CreateFileW( labelW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, 0, 0 ); - if (handle != INVALID_HANDLE_VALUE) - { - char buffer[256], *p; - DWORD size; - - if (!ReadFile( handle, buffer, sizeof(buffer)-1, &size, NULL )) size = 0; - CloseHandle( handle ); - p = buffer + size; - while (p > buffer && (p[-1] == ' ' || p[-1] == '\r' || p[-1] == '\n')) p--; - *p = 0; - if (!MultiByteToWideChar( CP_UNIXCP, 0, buffer, -1, label, label_len )) - label[label_len-1] = 0; - } - else label[0] = 0; - } - if (serial) - { - WCHAR serialW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','s','e','r','i','a','l',0}; - - serialW[0] = device[4]; - handle = CreateFileW( serialW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, 0, 0 ); - if (handle != INVALID_HANDLE_VALUE) - { - char buffer[32]; - DWORD size; - - if (!ReadFile( handle, buffer, sizeof(buffer)-1, &size, NULL )) size = 0; - CloseHandle( handle ); - buffer[size] = 0; - *serial = strtoul( buffer, NULL, 16 ); - } - else *serial = 0; - } + if (label && label_len) get_filesystem_label( device, label, label_len ); + if (serial) *serial = get_filesystem_serial( device ); fill_fs_info: /* now fill in the information that depends on the file system type */ @@ -1428,6 +1448,16 @@ HANDLE WINAPI FindFirstVolumeMountPointW(LPCWSTR root, LPWSTR mount_point, DWORD } /*********************************************************************** + * FindVolumeClose (KERNEL32.@) + */ +BOOL WINAPI FindVolumeClose(HANDLE handle) +{ + FIXME("(%p), stub!\n", handle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * FindVolumeMountPointClose (KERNEL32.@) */ BOOL WINAPI FindVolumeMountPointClose(HANDLE h)

1 0

Michael Stefaniuc : urlmon: Rename the wrappers around HeapAlloc() &Co to use the new standard naming.
by Alexandre Julliard 30 Nov '07

30 Nov '07

Module: wine Branch: master Commit: 2ad6cc19b71c2ff9f2a67476a9b8ca0e8a3587b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad6cc19b71c2ff9f2a67476a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Nov 29 22:12:34 2007 +0100 urlmon: Rename the wrappers around HeapAlloc() &Co to use the new standard naming. --- dlls/urlmon/bindctx.c | 8 +++--- dlls/urlmon/binding.c | 36 ++++++++++++++++---------------- dlls/urlmon/bindprot.c | 4 +- dlls/urlmon/file.c | 12 +++++----- dlls/urlmon/format.c | 8 +++--- dlls/urlmon/ftp.c | 4 +- dlls/urlmon/http.c | 34 +++++++++++++++--------------- dlls/urlmon/mk.c | 12 +++++----- dlls/urlmon/regsvr.c | 4 +- dlls/urlmon/sec_mgr.c | 22 +++++++++--------- dlls/urlmon/session.c | 12 +++++----- dlls/urlmon/umon.c | 50 ++++++++++++++++++++++---------------------- dlls/urlmon/umstream.c | 28 ++++++++++++------------ dlls/urlmon/urlmon_main.h | 8 +++--- 14 files changed, 121 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2ad6cc19b71c2ff9f2a67…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2007