winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
July 2012
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
712 discussions
Start a n
N
ew thread
Hans Leidekker : wbemprox: Add support for creating new tables.
by Alexandre Julliard
13 Jul '12
13 Jul '12
Module: wine Branch: master Commit: 91049f5e753ae09ab569023e64a95e33901af2e0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=91049f5e753ae09ab569023e6…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 13 11:35:39 2012 +0200 wbemprox: Add support for creating new tables. --- dlls/wbemprox/Makefile.in | 1 + dlls/wbemprox/builtin.c | 17 +-- dlls/wbemprox/main.c | 1 + dlls/wbemprox/query.c | 176 +------------------------ dlls/wbemprox/table.c | 280 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 14 ++ 6 files changed, 303 insertions(+), 186 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=91049f5e753ae09ab5690…
1
0
0
0
Hans Leidekker : wbemprox: Add a partial StdRegProv class implementation.
by Alexandre Julliard
13 Jul '12
13 Jul '12
Module: wine Branch: master Commit: 4e6eb13c41f46fb4c6208dad1a1e13ac6b77fac2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4e6eb13c41f46fb4c6208dad1…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 13 11:35:09 2012 +0200 wbemprox: Add a partial StdRegProv class implementation. --- dlls/wbemprox/builtin.c | 96 ++++++++++++++++++++++++++++++++++++-- dlls/wbemprox/query.c | 29 +++++++++-- dlls/wbemprox/wbemprox_private.h | 3 + 3 files changed, 119 insertions(+), 9 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e6eb13c41f46fb4c6208…
1
0
0
0
Hans Leidekker : wbemprox: Return a null variant instead of an empty string if the property isn't set .
by Alexandre Julliard
13 Jul '12
13 Jul '12
Module: wine Branch: master Commit: cd5cad6959abe025e836091cfd4f22c101529ef2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cd5cad6959abe025e836091cf…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 13 11:34:42 2012 +0200 wbemprox: Return a null variant instead of an empty string if the property isn't set. --- dlls/wbemprox/query.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 1d2eca7..77a3bf3 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -728,6 +728,9 @@ static void set_variant( VARTYPE vartype, LONGLONG val, BSTR val_bstr, VARIANT * V_VT( ret ) = VT_UI4; V_UI4( ret ) = val; return; + case VT_NULL: + V_VT( ret ) = VT_NULL; + return; default: ERR("unhandled variant type %u\n", vartype); return; @@ -758,8 +761,13 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR { case CIM_STRING: case CIM_DATETIME: - vartype = VT_BSTR; - val_bstr = SysAllocString( (const WCHAR *)(INT_PTR)val ); + if (val) + { + vartype = VT_BSTR; + val_bstr = SysAllocString( (const WCHAR *)(INT_PTR)val ); + } + else + vartype = VT_NULL; break; case CIM_SINT16: if (!vartype) vartype = VT_I2;
1
0
0
0
Hans Leidekker : wbemprox: Implement Win32_NetworkAdapter. MACAddress and Win32_NetworkAdapter.PNPDeviceID.
by Alexandre Julliard
13 Jul '12
13 Jul '12
Module: wine Branch: master Commit: 5acdba54a0534a41ec8267bb4d4bb8d1dfb551f0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5acdba54a0534a41ec8267bb4…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 13 11:34:17 2012 +0200 wbemprox: Implement Win32_NetworkAdapter.MACAddress and Win32_NetworkAdapter.PNPDeviceID. --- dlls/wbemprox/builtin.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 53f9c6d..7993d6e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -88,6 +88,8 @@ static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; static const WCHAR prop_interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; +static const WCHAR prop_macaddressW[] = + {'M','A','C','A','d','d','r','e','s','s',0}; static const WCHAR prop_manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR prop_modelW[] = @@ -104,6 +106,8 @@ static const WCHAR prop_osarchitectureW[] = {'O','S','A','r','c','h','i','t','e','c','t','u','r','e',0}; static const WCHAR prop_oslanguageW[] = {'O','S','L','a','n','g','u','a','g','e',0}; +static const WCHAR prop_pnpdeviceidW[] = + {'P','N','P','D','e','v','i','c','e','I','D',0}; static const WCHAR prop_pprocessidW[] = {'P','a','r','e','n','t','P','r','o','c','e','s','s','I','D',0}; static const WCHAR prop_processidW[] = @@ -162,7 +166,9 @@ static const struct column col_networkadapter[] = { { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_interfaceindexW, CIM_UINT32, VT_I4 }, + { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_netconnectionstatusW, CIM_UINT16, VT_I4 }, + { prop_pnpdeviceidW, CIM_STRING }, { prop_speedW, CIM_UINT64 } }; static const struct column col_os[] = @@ -221,6 +227,10 @@ static const WCHAR compsys_manufacturerW[] = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; +static const WCHAR networkadapter_pnpdeviceidW[]= + {'P','C','I','\\','V','E','N','_','8','0','8','6','&','D','E','V','_','1','0','0','E','&', + 'S','U','B','S','Y','S','_','0','0','1','E','8','0','8','6','&','R','E','V','_','0','2','\\', + '3','&','2','6','7','A','6','1','6','A','&','1','&','1','8',0}; static const WCHAR os_captionW[] = {'M','i','c','r','o','s','o','f','t',' ','W','i','n','d','o','w','s',' ','X','P',' ', 'V','e','r','s','i','o','n',' ','=',' ','5','.','1','.','2','6','0','0',0}; @@ -268,7 +278,9 @@ struct record_networkadapter { const WCHAR *device_id; INT32 interface_index; + const WCHAR *mac_address; UINT16 netconnection_status; + const WCHAR *pnpdevice_id; UINT64 speed; }; struct record_operatingsystem @@ -439,6 +451,17 @@ static UINT16 get_connection_status( IF_OPER_STATUS status ) } return 0; } +static WCHAR *get_mac_address( const BYTE *addr, DWORD len ) +{ + static const WCHAR fmtW[] = + {'%','0','2','x',':','%','0','2','x',':','%','0','2','x',':', + '%','0','2','x',':','%','0','2','x',':','%','0','2','x',0}; + WCHAR *ret; + + if (len != 6 || !(ret = heap_alloc( 18 * sizeof(WCHAR) ))) return NULL; + sprintfW( ret, fmtW, addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] ); + return ret; +} static void fill_networkadapter( struct table *table ) { @@ -470,7 +493,9 @@ static void fill_networkadapter( struct table *table ) sprintfW( device_id, fmtW, aa->u.s.IfIndex ); rec->device_id = heap_strdupW( device_id ); rec->interface_index = aa->u.s.IfIndex; + rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); rec->netconnection_status = get_connection_status( aa->OperStatus ); + rec->pnpdevice_id = networkadapter_pnpdeviceidW; rec->speed = 1000000; offset += sizeof(*rec); }
1
0
0
0
Dmitry Timoshkov : windowscodecs: Test pixel format of the loaded TIFF image.
by Alexandre Julliard
13 Jul '12
13 Jul '12
Module: wine Branch: master Commit: 6d1a13a7d655e4cfec54fe49a038517d2686d7da URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6d1a13a7d655e4cfec54fe49a…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 13 11:47:07 2012 +0900 windowscodecs: Test pixel format of the loaded TIFF image. --- dlls/windowscodecs/tests/tiffformat.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index fb57b91..0874053 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <stdio.h> #define COBJMACROS @@ -93,6 +94,18 @@ static const struct tiff_1bpp_data }; #include "poppack.h" +static const char *debugstr_guid(const GUID *guid) +{ + static char buf[50]; + + if (!guid) return "(null)"; + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], + guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], + guid->Data4[5], guid->Data4[6], guid->Data4[7]); + return buf; +} + static IWICBitmapDecoder *create_decoder(IWICImagingFactory *factory, const void *image_data, UINT image_size) { @@ -130,6 +143,7 @@ static void test_tiff_palette(void) IWICBitmapDecoder *decoder; IWICBitmapFrameDecode *frame; IWICPalette *palette; + GUID format; hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void **)&factory); @@ -141,6 +155,11 @@ static void test_tiff_palette(void) hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame); ok(hr == S_OK, "GetFrame error %#x\n", hr); + hr = IWICBitmapFrameDecode_GetPixelFormat(frame, &format); + ok(hr == S_OK, "GetPixelFormat error %#x\n", hr); + ok(IsEqualGUID(&format, &GUID_WICPixelFormatBlackWhite), + "got wrong format %s\n", debugstr_guid(&format)); + hr = IWICImagingFactory_CreatePalette(factory, &palette); ok(hr == S_OK, "CreatePalette error %#x\n", hr); hr = IWICBitmapFrameDecode_CopyPalette(frame, palette);
1
0
0
0
Dmitry Timoshkov : windowscodecs: Use predefined WICBitmapPaletteTypeFixedGray16 palette instead of a handmade one .
by Alexandre Julliard
13 Jul '12
13 Jul '12
Module: wine Branch: master Commit: b82023b7c280e7becfb208ddfd7b83797e70df77 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b82023b7c280e7becfb208ddf…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 13 10:08:58 2012 +0900 windowscodecs: Use predefined WICBitmapPaletteTypeFixedGray16 palette instead of a handmade one. --- dlls/windowscodecs/converter.c | 30 +++++++++--------------------- 1 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index bd83be3..98e727e 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -82,16 +82,6 @@ static inline FormatConverter *impl_from_IWICFormatConverter(IWICFormatConverter return CONTAINING_RECORD(iface, FormatConverter, IWICFormatConverter_iface); } -static void make_grayscale_palette(WICColor *colors, UINT num_colors) -{ - int i, v; - for (i=0; i<num_colors; i++) - { - v = i * 255 / (num_colors-1); - colors[i] = 0xff000000 | v<<16 | v<<8 | v; - } -} - static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer, enum pixelformat source_format) { @@ -248,21 +238,19 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe IWICPalette *palette; UINT actualcolors; - if (source_format == format_4bppIndexed) - { - res = PaletteImpl_Create(&palette); - if (FAILED(res)) return res; + res = PaletteImpl_Create(&palette); + if (FAILED(res)) return res; + if (source_format == format_4bppIndexed) res = IWICBitmapSource_CopyPalette(This->source, palette); - if (SUCCEEDED(res)) - res = IWICPalette_GetColors(palette, 16, colors, &actualcolors); + else + res = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedGray16, FALSE); - IWICPalette_Release(palette); + if (SUCCEEDED(res)) + res = IWICPalette_GetColors(palette, 16, colors, &actualcolors); - if (FAILED(res)) return res; - } - else - make_grayscale_palette(colors, 16); + IWICPalette_Release(palette); + if (FAILED(res)) return res; srcstride = (prc->Width+1)/2; srcdatasize = srcstride * prc->Height;
1
0
0
0
Dmitry Timoshkov : windowscodecs: Use predefined WICBitmapPaletteTypeFixedGray4 palette instead of a handmade one .
by Alexandre Julliard
13 Jul '12
13 Jul '12
Module: wine Branch: master Commit: 045ac64c1a65a59ddda67d190ab821680175d068 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=045ac64c1a65a59ddda67d190…
Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 13 10:07:37 2012 +0900 windowscodecs: Use predefined WICBitmapPaletteTypeFixedGray4 palette instead of a handmade one. --- dlls/windowscodecs/converter.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index e404464..bd83be3 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -185,21 +185,19 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe IWICPalette *palette; UINT actualcolors; - if (source_format == format_2bppIndexed) - { - res = PaletteImpl_Create(&palette); - if (FAILED(res)) return res; + res = PaletteImpl_Create(&palette); + if (FAILED(res)) return res; + if (source_format == format_2bppIndexed) res = IWICBitmapSource_CopyPalette(This->source, palette); - if (SUCCEEDED(res)) - res = IWICPalette_GetColors(palette, 4, colors, &actualcolors); + else + res = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedGray4, FALSE); - IWICPalette_Release(palette); + if (SUCCEEDED(res)) + res = IWICPalette_GetColors(palette, 4, colors, &actualcolors); - if (FAILED(res)) return res; - } - else - make_grayscale_palette(colors, 4); + IWICPalette_Release(palette); + if (FAILED(res)) return res; srcstride = (prc->Width+3)/4; srcdatasize = srcstride * prc->Height;
1
0
0
0
Alexandre Goujon : kernel32/tests: Add a IOCTL_DVD_READ_STRUCTURE ( DvdCopyrightDescriptor) test.
by Alexandre Julliard
12 Jul '12
12 Jul '12
Module: wine Branch: master Commit: 9fce6a37ecb2a09e14bd3d384132fe3b09c3dcc1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9fce6a37ecb2a09e14bd3d384…
Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Wed Jul 11 22:26:51 2012 +0200 kernel32/tests: Add a IOCTL_DVD_READ_STRUCTURE (DvdCopyrightDescriptor) test. --- dlls/kernel32/tests/volume.c | 21 +++++++++++++++++++++ dlls/ntdll/cdrom.c | 2 +- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index cf402ad..45bac31 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -749,6 +749,7 @@ static void test_dvd_read_structure(HANDLE handle) DVD_READ_STRUCTURE dvdReadStructure; DVD_LAYER_DESCRIPTOR dvdLayerDescriptor; struct COMPLETE_DVD_LAYER_DESCRIPTOR completeDvdLayerDescriptor; + DVD_COPYRIGHT_DESCRIPTOR dvdCopyrightDescriptor; dvdReadStructure.BlockByteOffset.QuadPart = 0; dvdReadStructure.SessionId = 0; @@ -818,6 +819,26 @@ static void test_dvd_read_structure(HANDLE handle) ok( (!ret && GetLastError() == ERROR_INVALID_PARAMETER), "IOCTL_DVD_READ_STRUCTURE should have failed\n"); } + + + /* DvdCopyrightDescriptor */ + dvdReadStructure.Format = 1; + + SetLastError(0xdeadbeef); + + /* Strangely, with NULL lpOutBuffer, last error is insufficient buffer, not invalid parameter as we could expect */ + ret = DeviceIoControl(handle, IOCTL_DVD_READ_STRUCTURE, &dvdReadStructure, sizeof(DVD_READ_STRUCTURE), + NULL, sizeof(DVD_COPYRIGHT_DESCRIPTOR), &nbBytes, NULL); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "IOCTL_DVD_READ_STRUCTURE should have failed %d %u\n", ret, GetLastError()); + + for(i=0; i<sizeof(DVD_COPYRIGHT_DESCRIPTOR); i++) + { + SetLastError(0xdeadbeef); + + ret = DeviceIoControl(handle, IOCTL_DVD_READ_STRUCTURE, &dvdReadStructure, sizeof(DVD_READ_STRUCTURE), + &dvdCopyrightDescriptor, i, &nbBytes, NULL); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "IOCTL_DVD_READ_STRUCTURE should have failed %d %u\n", ret, GetLastError()); + } } static void test_cdrom_ioctl(void) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index a58701e..8374761 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -3083,7 +3083,7 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, case IOCTL_DVD_READ_STRUCTURE: sz = sizeof(DVD_LAYER_DESCRIPTOR); if (lpInBuffer == NULL || nInBufferSize != sizeof(DVD_READ_STRUCTURE)) status = STATUS_INVALID_PARAMETER; - else if (nOutBufferSize < sz) status = STATUS_BUFFER_TOO_SMALL; + else if (nOutBufferSize < sz || !lpOutBuffer) status = STATUS_BUFFER_TOO_SMALL; else { TRACE("doing DVD_READ_STRUCTURE\n");
1
0
0
0
Alexandre Goujon : kernel32/tests: Add a IOCTL_DVD_READ_STRUCTURE ( DvdPhysicalDescriptor) test.
by Alexandre Julliard
12 Jul '12
12 Jul '12
Module: wine Branch: master Commit: a3b5dd2dff0d04fe317f00282ccb0488e4803015 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a3b5dd2dff0d04fe317f00282…
Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Wed Jul 11 22:26:50 2012 +0200 kernel32/tests: Add a IOCTL_DVD_READ_STRUCTURE (DvdPhysicalDescriptor) test. --- dlls/kernel32/tests/volume.c | 91 +++++++++++++++++++++++++++++++++++++++ dlls/ntdll/cdrom.c | 98 +++++++++++++++++------------------------- 2 files changed, 131 insertions(+), 58 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3b5dd2dff0d04fe317f0…
1
0
0
0
Alexandre Goujon : kernel32/tests: Add a helper to test CDROM ioctl.
by Alexandre Julliard
12 Jul '12
12 Jul '12
Module: wine Branch: master Commit: 7c27a969973d2b54215be7906bf465239d15a260 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7c27a969973d2b54215be7906…
Author: Alexandre Goujon <ale.goujon(a)gmail.com> Date: Wed Jul 11 22:26:48 2012 +0200 kernel32/tests: Add a helper to test CDROM ioctl. --- dlls/kernel32/tests/volume.c | 43 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 2755af5..b459ba6 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -730,6 +730,48 @@ static void test_GetVolumePathNamesForVolumeNameW(void) ok(error == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND got %u\n", error); } +static void test_cdrom_ioctl(void) +{ + char drive_letter, drive_path[] = "A:\\", drive_full_path[] = "\\\\.\\A:"; + DWORD bitmask; + HANDLE handle; + + bitmask = GetLogicalDrives(); + if(!bitmask) + { + trace("GetLogicalDrives failed : %u\n", GetLastError()); + return; + } + + for(drive_letter='A'; drive_letter<='Z'; drive_letter++) + { + if(!(bitmask & (1 << (drive_letter-'A') ))) + continue; + + drive_path[0] = drive_letter; + if(GetDriveTypeA(drive_path) != DRIVE_CDROM) + { + trace("Skipping %c:, not a CDROM drive.\n", drive_letter); + continue; + } + + trace("Testing with %c:\n", drive_letter); + + drive_full_path[4] = drive_letter; + handle = CreateFileA(drive_full_path, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + if(handle == INVALID_HANDLE_VALUE) + { + trace("Failed to open the device : %u\n", GetLastError()); + continue; + } + + /* Add your tests here */ + + CloseHandle(handle); + } + +} + START_TEST(volume) { hdll = GetModuleHandleA("kernel32.dll"); @@ -756,4 +798,5 @@ START_TEST(volume) test_disk_extents(); test_GetVolumePathNamesForVolumeNameA(); test_GetVolumePathNamesForVolumeNameW(); + test_cdrom_ioctl(); }
1
0
0
0
← Newer
1
...
44
45
46
47
48
49
50
...
72
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
Results per page:
10
25
50
100
200