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
March
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
October 2012
----- 2025 -----
March 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
960 discussions
Start a n
N
ew thread
Henri Verbeet : wined3d: Implement WINED3DSIH_ITOF in the GLSL shader backend.
by Alexandre Julliard
12 Oct '12
12 Oct '12
Module: wine Branch: master Commit: b7cd93240d139e2140826931dba2ba7d617b782e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b7cd93240d139e2140826931d…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 12 13:03:55 2012 +0200 wined3d: Implement WINED3DSIH_ITOF in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2ac51b2..dd1c8e0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2560,6 +2560,23 @@ static void shader_glsl_to_int(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "int(%s));\n", src_param.param_str); } +static void shader_glsl_to_float(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param src_param; + unsigned int mask_size; + DWORD write_mask; + + write_mask = shader_glsl_append_dst(buffer, ins); + mask_size = shader_glsl_get_write_mask_size(write_mask); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); + + if (mask_size > 1) + shader_addline(buffer, "vec%u(%s));\n", mask_size, src_param.param_str); + else + shader_addline(buffer, "float(%s));\n", src_param.param_str); +} + /** Process the RCP (reciprocal or inverse) opcode in GLSL (dst = 1 / src) */ static void shader_glsl_rcp(const struct wined3d_shader_instruction *ins) { @@ -5302,7 +5319,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, /* WINED3DSIH_IMUL */ NULL, - /* WINED3DSIH_ITOF */ NULL, + /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ NULL, /* WINED3DSIH_LIT */ shader_glsl_lit,
1
0
0
0
Henri Verbeet : wined3d: Implement WINED3DSIH_FTOI in the GLSL shader backend.
by Alexandre Julliard
12 Oct '12
12 Oct '12
Module: wine Branch: master Commit: d48a0bc4274d491f252ee5b89ff3557ea7f8b1ce URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d48a0bc4274d491f252ee5b89…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 12 13:03:54 2012 +0200 wined3d: Implement WINED3DSIH_FTOI in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e4f9477..2ac51b2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2543,6 +2543,23 @@ static void shader_glsl_expp(const struct wined3d_shader_instruction *ins) } } +static void shader_glsl_to_int(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param src_param; + unsigned int mask_size; + DWORD write_mask; + + write_mask = shader_glsl_append_dst(buffer, ins); + mask_size = shader_glsl_get_write_mask_size(write_mask); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); + + if (mask_size > 1) + shader_addline(buffer, "ivec%u(%s));\n", mask_size, src_param.param_str); + else + shader_addline(buffer, "int(%s));\n", src_param.param_str); +} + /** Process the RCP (reciprocal or inverse) opcode in GLSL (dst = 1 / src) */ static void shader_glsl_rcp(const struct wined3d_shader_instruction *ins) { @@ -5277,7 +5294,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_EXP */ shader_glsl_map2gl, /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_FRC */ shader_glsl_map2gl, - /* WINED3DSIH_FTOI */ NULL, + /* WINED3DSIH_FTOI */ shader_glsl_to_int, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_IADD */ shader_glsl_binop, /* WINED3DSIH_IEQ */ NULL,
1
0
0
0
Nikolay Sivov : dwrite: Store text format properties.
by Alexandre Julliard
12 Oct '12
12 Oct '12
Module: wine Branch: master Commit: 2c0c4132247b670f964e6aba99b4f7515653024c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2c0c4132247b670f964e6aba9…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 12 09:12:57 2012 -0400 dwrite: Store text format properties. --- dlls/dwrite/dwrite_private.h | 3 ++- dlls/dwrite/layout.c | 21 ++++++++++++++++++++- dlls/dwrite/main.c | 8 ++++++-- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index c569495..d5890bb 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -54,7 +54,8 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) } extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; -extern HRESULT create_textformat(IDWriteTextFormat**) DECLSPEC_HIDDEN; +extern HRESULT create_textformat(const WCHAR*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, + FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(IDWriteTextLayout**) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index bb48a51..64f3c0d 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -40,6 +40,15 @@ struct dwrite_textlayout { struct dwrite_textformat { IDWriteTextFormat IDWriteTextFormat_iface; LONG ref; + + WCHAR *family_name; + WCHAR *locale; + + DWRITE_FONT_WEIGHT weight; + DWRITE_FONT_STYLE style; + DWRITE_FONT_STRETCH stretch; + + FLOAT size; }; static inline struct dwrite_textlayout *impl_from_IDWriteTextLayout(IDWriteTextLayout *iface) @@ -689,7 +698,11 @@ static ULONG WINAPI dwritetextformat_Release(IDWriteTextFormat *iface) TRACE("(%p)->(%d)\n", This, ref); if (!ref) + { + heap_free(This->family_name); + heap_free(This->locale); heap_free(This); + } return S_OK; } @@ -904,7 +917,8 @@ static const IDWriteTextFormatVtbl dwritetextformatvtbl = { dwritetextformat_GetLocaleName }; -HRESULT create_textformat(IDWriteTextFormat **format) +HRESULT create_textformat(const WCHAR *family_name, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, + DWRITE_FONT_STRETCH stretch, FLOAT size, const WCHAR *locale, IDWriteTextFormat **format) { struct dwrite_textformat *This; @@ -913,6 +927,11 @@ HRESULT create_textformat(IDWriteTextFormat **format) This->IDWriteTextFormat_iface.lpVtbl = &dwritetextformatvtbl; This->ref = 1; + This->family_name = heap_strdupW(family_name); + This->locale = heap_strdupW(locale); + This->weight = weight; + This->style = style; + This->size = size; *format = &This->IDWriteTextFormat_iface; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 7b54710..20aed56 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -479,9 +479,13 @@ static HRESULT WINAPI dwritefactory_CreateTextFormat(IDWriteFactory *iface, WCHA IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, FLOAT size, WCHAR const *locale, IDWriteTextFormat **format) { - FIXME("(%s %p %d %d %d %f %s %p): semi-stub\n", debugstr_w(family_name), collection, weight, style, stretch, + TRACE("(%s %p %d %d %d %f %s %p)\n", debugstr_w(family_name), collection, weight, style, stretch, size, debugstr_w(locale), format); - return create_textformat(format); + + if (collection) + FIXME("font collection not supported\n"); + + return create_textformat(family_name, weight, style, stretch, size, locale, format); } static HRESULT WINAPI dwritefactory_CreateTypography(IDWriteFactory *iface, IDWriteTypography **typography)
1
0
0
0
Nikolay Sivov : dwrite: Implement GetWeight() for IDWriteFont.
by Alexandre Julliard
12 Oct '12
12 Oct '12
Module: wine Branch: master Commit: 0358413e35eec41d0444182390a679f6f0457d25 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0358413e35eec41d044418239…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 12 08:43:57 2012 -0400 dwrite: Implement GetWeight() for IDWriteFont. --- dlls/dwrite/font.c | 55 +++++++++++++++++++++++++--------------------- dlls/dwrite/tests/font.c | 3 -- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d91a424..e7beee5 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -105,6 +105,7 @@ struct dwrite_font { IDWriteFontFace *face; DWRITE_FONT_STYLE style; DWRITE_FONT_STRETCH stretch; + DWRITE_FONT_WEIGHT weight; }; struct dwrite_fontface { @@ -371,8 +372,8 @@ static HRESULT WINAPI dwritefont_GetFontFamily(IDWriteFont *iface, IDWriteFontFa static DWRITE_FONT_WEIGHT WINAPI dwritefont_GetWeight(IDWriteFont *iface) { struct dwrite_font *This = impl_from_IDWriteFont(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return This->weight; } static DWRITE_FONT_STRETCH WINAPI dwritefont_GetStretch(IDWriteFont *iface) @@ -592,28 +593,30 @@ static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **fa return S_OK; } -static DWRITE_FONT_STRETCH get_font_stretch(HDC hdc) +static void get_font_properties(struct dwrite_font *font, HDC hdc) { - DWRITE_FONT_STRETCH stretch; TT_OS2_V2 tt_os2; LONG size; - /* default stretch to normal */ - stretch = DWRITE_FONT_STRETCH_NORMAL; + /* default stretch and weight to normal */ + font->stretch = DWRITE_FONT_STRETCH_NORMAL; + font->weight = DWRITE_FONT_WEIGHT_NORMAL; size = GetFontData(hdc, MS_OS2_TAG, 0, NULL, 0); - if (size == GDI_ERROR) return stretch; - - if (size > sizeof(tt_os2)) size = sizeof(tt_os2); + if (size != GDI_ERROR) + { + if (size > sizeof(tt_os2)) size = sizeof(tt_os2); - memset(&tt_os2, 0, sizeof(tt_os2)); - if (GetFontData(hdc, MS_OS2_TAG, 0, &tt_os2, size) != size) return stretch; + memset(&tt_os2, 0, sizeof(tt_os2)); + if (GetFontData(hdc, MS_OS2_TAG, 0, &tt_os2, size) != size) return; - /* DWRITE_FONT_STRETCH enumeration values directly match font data values */ - if (GET_BE_WORD(tt_os2.usWidthClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) - stretch = GET_BE_WORD(tt_os2.usWidthClass); + /* DWRITE_FONT_STRETCH enumeration values directly match font data values */ + if (GET_BE_WORD(tt_os2.usWidthClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) + font->stretch = GET_BE_WORD(tt_os2.usWidthClass); - return stretch; + font->weight = GET_BE_WORD(tt_os2.usWeightClass); + TRACE("stretch=%d, weight=%d\n", font->stretch, font->weight); + } } HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) @@ -622,7 +625,6 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) struct dwrite_font *This; IDWriteFontFamily *family; OUTLINETEXTMETRICW *otm; - DWRITE_FONT_STRETCH stretch; HRESULT hr; HFONT hfont; HDC hdc; @@ -630,8 +632,15 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) *font = NULL; + This = heap_alloc(sizeof(struct dwrite_font)); + if (!This) return E_OUTOFMEMORY; + hfont = CreateFontIndirectW(logfont); - if (!hfont) return DWRITE_E_NOFONT; + if (!hfont) + { + heap_free(This); + return DWRITE_E_NOFONT; + } hdc = CreateCompatibleDC(0); SelectObject(hdc, hfont); @@ -641,7 +650,7 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) otm->otmSize = ret; ret = GetOutlineTextMetricsW(hdc, otm->otmSize, otm); - stretch = get_font_stretch(hdc); + get_font_properties(This, hdc); DeleteDC(hdc); DeleteObject(hfont); @@ -652,13 +661,10 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) hr = create_fontfamily(familyname, &family); heap_free(otm); - if (hr != S_OK) return hr; - - This = heap_alloc(sizeof(struct dwrite_font)); - if (!This) + if (hr != S_OK) { - IDWriteFontFamily_Release(family); - return E_OUTOFMEMORY; + heap_free(This); + return hr; } This->IDWriteFont_iface.lpVtbl = &dwritefontvtbl; @@ -666,7 +672,6 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) This->face = NULL; This->family = family; This->style = logfont->lfItalic ? DWRITE_FONT_STYLE_ITALIC : DWRITE_FONT_STYLE_NORMAL; - This->stretch = stretch; *font = &This->IDWriteFont_iface; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 81e17fd..70c714c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -91,7 +91,6 @@ if (0) /* now check properties */ weight = IDWriteFont_GetWeight(font); -todo_wine ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "got %d\n", weight); style = IDWriteFont_GetStyle(font); @@ -115,7 +114,6 @@ todo_wine EXPECT_HR(hr, S_OK); weight = IDWriteFont_GetWeight(font); - todo_wine ok(weight == weights[i][1], "%d: got %d, expected %d\n", i, weight, weights[i][1]); IDWriteFont_Release(font); @@ -132,7 +130,6 @@ todo_wine EXPECT_HR(hr, S_OK); weight = IDWriteFont_GetWeight(font); -todo_wine ok(weight == DWRITE_FONT_WEIGHT_NORMAL || broken(weight == DWRITE_FONT_WEIGHT_BOLD) /* win7 w/o SP */, "got %d\n", weight); IDWriteFont_Release(font);
1
0
0
0
Nikolay Sivov : dwrite: Use proper table field as stretch value.
by Alexandre Julliard
12 Oct '12
12 Oct '12
Module: wine Branch: master Commit: ab91abd755b7c7a59ff25aadcbc8bd3d1b6d6e03 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ab91abd755b7c7a59ff25aadc…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 12 08:28:03 2012 -0400 dwrite: Use proper table field as stretch value. --- dlls/dwrite/font.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c218c25..d91a424 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -610,8 +610,8 @@ static DWRITE_FONT_STRETCH get_font_stretch(HDC hdc) if (GetFontData(hdc, MS_OS2_TAG, 0, &tt_os2, size) != size) return stretch; /* DWRITE_FONT_STRETCH enumeration values directly match font data values */ - if (GET_BE_WORD(tt_os2.usWeightClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) - stretch = GET_BE_WORD(tt_os2.usWeightClass); + if (GET_BE_WORD(tt_os2.usWidthClass) <= DWRITE_FONT_STRETCH_ULTRA_EXPANDED) + stretch = GET_BE_WORD(tt_os2.usWidthClass); return stretch; }
1
0
0
0
Marcus Meissner : crypt32: Initialize bytesNeeded (Coverity).
by Alexandre Julliard
12 Oct '12
12 Oct '12
Module: wine Branch: master Commit: 9a51a9926a03097a85ba627623dcccddb8c7abb4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9a51a9926a03097a85ba62762…
Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Oct 11 22:58:33 2012 +0200 crypt32: Initialize bytesNeeded (Coverity). --- dlls/crypt32/decode.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index bfd61d0..a4934a7 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -1912,7 +1912,7 @@ static BOOL WINAPI CRYPT_AsnDecodeName(DWORD dwCertEncodingType, sizeof(CERT_NAME_INFO), CRYPT_AsnDecodeRdn, sizeof(CERT_RDN), TRUE, offsetof(CERT_RDN, rgRDNAttr) }; - DWORD bytesNeeded; + DWORD bytesNeeded = 0; ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, NULL, &bytesNeeded, @@ -2009,7 +2009,7 @@ static BOOL WINAPI CRYPT_AsnDecodeUnicodeName(DWORD dwCertEncodingType, sizeof(CERT_NAME_INFO), CRYPT_AsnDecodeUnicodeRdn, sizeof(CERT_RDN), TRUE, offsetof(CERT_RDN, rgRDNAttr) }; - DWORD bytesNeeded; + DWORD bytesNeeded = 0; ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, NULL, &bytesNeeded, @@ -2455,7 +2455,7 @@ static BOOL CRYPT_AsnDecodeNoticeReference(const BYTE *pbEncoded, FALSE, TRUE, offsetof(CERT_POLICY_QUALIFIER_NOTICE_REFERENCE, rgNoticeNumbers), 0 }, }; - DWORD bytesNeeded; + DWORD bytesNeeded = 0; TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, pvStructInfo ? *pcbStructInfo : 0); @@ -2672,7 +2672,7 @@ static BOOL WINAPI CRYPT_AsnDecodePolicyQualifierUserNotice( __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; ret = CRYPT_AsnDecodePolicyQualifierUserNoticeInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, @@ -2766,7 +2766,7 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSAttribute(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; ret = CRYPT_AsnDecodePKCSAttributeInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL); @@ -2907,7 +2907,7 @@ static BOOL WINAPI CRYPT_AsnDecodePubKeyInfo(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; if ((ret = CRYPT_AsnDecodePubKeyInfoInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL))) @@ -3409,7 +3409,7 @@ static BOOL WINAPI CRYPT_AsnDecodeAltName(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; if ((ret = CRYPT_AsnDecodeAltNameInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL))) @@ -3997,7 +3997,7 @@ static BOOL WINAPI CRYPT_AsnDecodeOctets(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; if (!cbEncoded) { @@ -4106,7 +4106,7 @@ static BOOL WINAPI CRYPT_AsnDecodeBits(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; if (!cbEncoded) { @@ -4200,7 +4200,7 @@ static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; if (!cbEncoded) { @@ -4293,7 +4293,7 @@ static BOOL WINAPI CRYPT_AsnDecodeInteger(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; if (pbEncoded[0] != ASN_INTEGER) { @@ -4401,7 +4401,7 @@ static BOOL WINAPI CRYPT_AsnDecodeUnsignedInteger(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; if ((ret = CRYPT_AsnDecodeUnsignedIntegerInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_ENCODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL))) @@ -4657,7 +4657,7 @@ static BOOL WINAPI CRYPT_AsnDecodeUtcTime(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; ret = CRYPT_AsnDecodeUtcTimeInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL); @@ -4788,7 +4788,7 @@ static BOOL WINAPI CRYPT_AsnDecodeChoiceOfTime(DWORD dwCertEncodingType, __TRY { - DWORD bytesNeeded; + DWORD bytesNeeded = 0; ret = CRYPT_AsnDecodeChoiceOfTimeInternal(pbEncoded, cbEncoded, dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL); @@ -4933,7 +4933,7 @@ static BOOL CRYPT_AsnDecodeDistPointName(const BYTE *pbEncoded, if (pbEncoded[0] == (ASN_CONTEXT | ASN_CONSTRUCTOR | 0)) { - DWORD bytesNeeded, dataLen; + DWORD bytesNeeded = 0, dataLen; if ((ret = CRYPT_GetLen(pbEncoded, cbEncoded, &dataLen))) {
1
0
0
0
Vincas Miliūnas : kernel32: Added implementation for OpenFileById.
by Alexandre Julliard
12 Oct '12
12 Oct '12
Module: wine Branch: master Commit: aba4619dfe3ed96a12c2df19e3ec30208671351d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=aba4619dfe3ed96a12c2df19e…
Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Fri Oct 12 13:35:37 2012 +0300 kernel32: Added implementation for OpenFileById. --- dlls/kernel32/file.c | 51 +++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/file.c | 2 - 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index cac1e98..41abe49 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -2601,6 +2601,57 @@ error: /* We get here if there was an error opening the file */ return HFILE_ERROR; } + +/*********************************************************************** + * OpenFileById (KERNEL32.@) + */ +HANDLE WINAPI OpenFileById( HANDLE handle, LPFILE_ID_DESCRIPTOR id, DWORD access, + DWORD share, LPSECURITY_ATTRIBUTES sec_attr, DWORD flags ) +{ + UINT options; + HANDLE result; + OBJECT_ATTRIBUTES attr; + NTSTATUS status; + IO_STATUS_BLOCK io; + UNICODE_STRING objectName; + + if (!id) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return INVALID_HANDLE_VALUE; + } + + options = FILE_OPEN_BY_FILE_ID; + if (flags & FILE_FLAG_BACKUP_SEMANTICS) + options |= FILE_OPEN_FOR_BACKUP_INTENT; + else + options |= FILE_NON_DIRECTORY_FILE; + if (flags & FILE_FLAG_NO_BUFFERING) options |= FILE_NO_INTERMEDIATE_BUFFERING; + if (!(flags & FILE_FLAG_OVERLAPPED)) options |= FILE_SYNCHRONOUS_IO_NONALERT; + if (flags & FILE_FLAG_RANDOM_ACCESS) options |= FILE_RANDOM_ACCESS; + flags &= FILE_ATTRIBUTE_VALID_FLAGS; + + objectName.Length = sizeof(ULONGLONG); + objectName.Buffer = (WCHAR *)&id->u.FileId; + attr.Length = sizeof(attr); + attr.RootDirectory = handle; + attr.Attributes = 0; + attr.ObjectName = &objectName; + attr.SecurityDescriptor = sec_attr ? sec_attr->lpSecurityDescriptor : NULL; + attr.SecurityQualityOfService = NULL; + if (sec_attr && sec_attr->bInheritHandle) attr.Attributes |= OBJ_INHERIT; + + status = NtCreateFile( &result, access, &attr, &io, NULL, flags, + share, OPEN_EXISTING, options, NULL, 0 ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return INVALID_HANDLE_VALUE; + } + return result; +} + + /*********************************************************************** * K32EnumDeviceDrivers (KERNEL32.@) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 57f7aff..b7efa0f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -886,6 +886,7 @@ @ stdcall OpenEventA(long long str) @ stdcall OpenEventW(long long wstr) @ stdcall OpenFile(str ptr long) +@ stdcall OpenFileById(long ptr long long ptr long) @ stdcall OpenFileMappingA(long long str) @ stdcall OpenFileMappingW(long long wstr) @ stdcall OpenJobObjectA(long long str) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 6cc79c0..11e0044 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3419,7 +3419,6 @@ static void test_OpenFileById(void) SetLastError(0xdeadbeef); handle = pOpenFileById(directory, NULL, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, 0); - todo_wine ok(handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_PARAMETER, "OpenFileById: expected ERROR_INVALID_PARAMETER, got error %u.\n", GetLastError()); @@ -3427,7 +3426,6 @@ static void test_OpenFileById(void) fileIdDescr.Type = FileIdType; U(fileIdDescr).FileId = bothDirInfo->FileId; handle = pOpenFileById(directory, &fileIdDescr, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, 0); - todo_wine ok(handle != INVALID_HANDLE_VALUE, "OpenFileById: failed to open the file, got error %u.\n", GetLastError()); ret = ReadFile(handle, buffer, sizeof(buffer), &count, NULL);
1
0
0
0
Vincas Miliūnas : kernel32/tests: Added tests for OpenFileById.
by Alexandre Julliard
12 Oct '12
12 Oct '12
Module: wine Branch: master Commit: be1c0edfcfeca7d9d051aaa7d394b9f6bbe4889e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=be1c0edfcfeca7d9d051aaa7d…
Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Fri Oct 12 13:35:25 2012 +0300 kernel32/tests: Added tests for OpenFileById. --- dlls/kernel32/tests/file.c | 109 ++++++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 16 ++++++ 2 files changed, 125 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 41fca60..6cc79c0 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -32,6 +32,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winnls.h" static HANDLE (WINAPI *pFindFirstFileExA)(LPCSTR,FINDEX_INFO_LEVELS,LPVOID,FINDEX_SEARCH_OPS,LPVOID,DWORD); static BOOL (WINAPI *pReplaceFileA)(LPCSTR, LPCSTR, LPCSTR, DWORD, LPVOID, LPVOID); @@ -40,6 +41,7 @@ static UINT (WINAPI *pGetSystemWindowsDirectoryA)(LPSTR, UINT); static BOOL (WINAPI *pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD); static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); static BOOL (WINAPI *pGetFileInformationByHandleEx)(HANDLE, FILE_INFO_BY_HANDLE_CLASS, LPVOID, DWORD); +static HANDLE (WINAPI *pOpenFileById)(HANDLE, LPFILE_ID_DESCRIPTOR, DWORD, DWORD, LPSECURITY_ATTRIBUTES, DWORD); /* keep filename and filenameW the same */ static const char filename[] = "testfile.xxx"; @@ -75,6 +77,7 @@ static void InitFunctionPointers(void) pGetVolumeNameForVolumeMountPointA = (void *) GetProcAddress(hkernel32, "GetVolumeNameForVolumeMountPointA"); pQueueUserAPC = (void *) GetProcAddress(hkernel32, "QueueUserAPC"); pGetFileInformationByHandleEx = (void *) GetProcAddress(hkernel32, "GetFileInformationByHandleEx"); + pOpenFileById = (void *) GetProcAddress(hkernel32, "OpenFileById"); } static void test__hread( void ) @@ -3332,6 +3335,111 @@ static void test_GetFileInformationByHandleEx(void) DeleteFile(tempFileName); } +static void test_OpenFileById(void) +{ + char tempPath[MAX_PATH], tempFileName[MAX_PATH], buffer[256], tickCount[256]; + WCHAR tempFileNameW[MAX_PATH]; + BOOL ret, found; + DWORD ret2, count, tempFileNameLen; + HANDLE directory, handle, tempFile; + FILE_ID_BOTH_DIR_INFO *bothDirInfo; + FILE_ID_DESCRIPTOR fileIdDescr; + + if (!pGetFileInformationByHandleEx || !pOpenFileById) + { + win_skip("GetFileInformationByHandleEx or OpenFileById is missing.\n"); + return; + } + + ret2 = GetTempPathA(sizeof(tempPath), tempPath); + ok(ret2, "OpenFileById: GetTempPath failed, got error %u.\n", GetLastError()); + + /* ensure the existance of a file in the temp folder */ + ret2 = GetTempFileNameA(tempPath, "abc", 0, tempFileName); + ok(ret2, "OpenFileById: GetTempFileNameA failed, got error %u.\n", GetLastError()); + ok(GetFileAttributesA(tempFileName) != INVALID_FILE_ATTRIBUTES, + "OpenFileById: GetFileAttributesA failed to find the temp file, got error %u\n", GetLastError()); + + ret2 = MultiByteToWideChar(CP_ACP, 0, tempFileName + strlen(tempPath), -1, tempFileNameW, sizeof(tempFileNameW)); + ok(ret2, "OpenFileById: MultiByteToWideChar failed to convert tempFileName, got error %u.\n", GetLastError()); + tempFileNameLen = ret2 - 1; + + tempFile = CreateFileA(tempFileName, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(tempFile != INVALID_HANDLE_VALUE, "OpenFileById: failed to create a temp file, " + "got error %u.\n", GetLastError()); + ret2 = sprintf(tickCount, "%u", GetTickCount()); + ret = WriteFile(tempFile, tickCount, ret2, &count, NULL); + ok(ret, "OpenFileById: WriteFile failed, got error %u.\n", GetLastError()); + CloseHandle(tempFile); + + directory = CreateFileA(tempPath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); + ok(directory != INVALID_HANDLE_VALUE, "OpenFileById: failed to open the temp folder, " + "got error %u.\n", GetLastError()); + + /* get info about the temp folder itself */ + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)buffer; + ret = pGetFileInformationByHandleEx(directory, FileIdBothDirectoryInfo, buffer, sizeof(buffer)); + ok(ret, "OpenFileById: failed to query for FileIdBothDirectoryInfo, got error %u.\n", GetLastError()); + ok(bothDirInfo->FileNameLength == sizeof(WCHAR) && bothDirInfo->FileName[0] == '.', + "OpenFileById: failed to return the temp folder at the first entry, got error %u.\n", GetLastError()); + + /* open the temp folder itself */ + fileIdDescr.dwSize = sizeof(fileIdDescr); + fileIdDescr.Type = FileIdType; + U(fileIdDescr).FileId = bothDirInfo->FileId; + handle = pOpenFileById(directory, &fileIdDescr, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, 0); + todo_wine + ok(handle != INVALID_HANDLE_VALUE, "OpenFileById: failed to open the temp folder itself, got error %u.\n", GetLastError()); + CloseHandle(handle); + + /* find the temp file in the temp folder */ + found = FALSE; + while (!found) + { + ret = pGetFileInformationByHandleEx(directory, FileIdBothDirectoryInfo, buffer, sizeof(buffer)); + ok(ret, "OpenFileById: failed to query for FileIdBothDirectoryInfo, got error %u.\n", GetLastError()); + if (!ret) + break; + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)buffer; + while (TRUE) + { + if (tempFileNameLen == bothDirInfo->FileNameLength / sizeof(WCHAR) && + memcmp(tempFileNameW, bothDirInfo->FileName, bothDirInfo->FileNameLength) == 0) + { + found = TRUE; + break; + } + if (!bothDirInfo->NextEntryOffset) + break; + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)(((char *)bothDirInfo) + bothDirInfo->NextEntryOffset); + } + } + ok(found, "OpenFileById: failed to find the temp file in the temp folder.\n"); + + SetLastError(0xdeadbeef); + handle = pOpenFileById(directory, NULL, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, 0); + todo_wine + ok(handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_PARAMETER, + "OpenFileById: expected ERROR_INVALID_PARAMETER, got error %u.\n", GetLastError()); + + fileIdDescr.dwSize = sizeof(fileIdDescr); + fileIdDescr.Type = FileIdType; + U(fileIdDescr).FileId = bothDirInfo->FileId; + handle = pOpenFileById(directory, &fileIdDescr, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, 0); + todo_wine + ok(handle != INVALID_HANDLE_VALUE, "OpenFileById: failed to open the file, got error %u.\n", GetLastError()); + + ret = ReadFile(handle, buffer, sizeof(buffer), &count, NULL); + buffer[count] = 0; + ok(ret, "OpenFileById: ReadFile failed, got error %u.\n", GetLastError()); + ok(strcmp(tickCount, buffer) == 0, "OpenFileById: invalid contents of the temp file.\n"); + + CloseHandle(handle); + CloseHandle(directory); + DeleteFile(tempFileName); +} + START_TEST(file) { InitFunctionPointers(); @@ -3372,4 +3480,5 @@ START_TEST(file) test_ReplaceFileA(); test_ReplaceFileW(); test_GetFileInformationByHandleEx(); + test_OpenFileById(); } diff --git a/include/winbase.h b/include/winbase.h index 2e97048..a9abb30 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -740,6 +740,22 @@ typedef struct _BY_HANDLE_FILE_INFORMATION DWORD nFileIndexLow; } BY_HANDLE_FILE_INFORMATION, *PBY_HANDLE_FILE_INFORMATION, *LPBY_HANDLE_FILE_INFORMATION ; +typedef enum _FILE_ID_TYPE { + FileIdType, + ObjectIdType, + ExtendedFileIdType, + MaximumFileIdType +} FILE_ID_TYPE, *PFILE_ID_TYPE; + +typedef struct _FILE_ID_DESCRIPTOR { + DWORD dwSize; + FILE_ID_TYPE Type; + union { + LARGE_INTEGER FileId; + GUID ObjectId; + } DUMMYUNIONNAME; +} FILE_ID_DESCRIPTOR, *LPFILE_ID_DESCRIPTOR; + typedef enum _FILE_INFO_BY_HANDLE_CLASS { FileBasicInfo, FileStandardInfo,
1
0
0
0
Vincas Miliūnas : kernel32: Added implementation of FileIdBothDirectoryInfo for GetFileInformationByHandleEx .
by Alexandre Julliard
12 Oct '12
12 Oct '12
Module: wine Branch: master Commit: 6314cf0295ae64705aeeb24ba162c2136c6ea436 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=6314cf0295ae64705aeeb24ba…
Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Wed Oct 10 19:37:57 2012 +0300 kernel32: Added implementation of FileIdBothDirectoryInfo for GetFileInformationByHandleEx. --- dlls/kernel32/file.c | 53 +++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/file.c | 5 ---- dlls/ntdll/directory.c | 1 + 4 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 717ae9b..cac1e98 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -864,6 +864,59 @@ BOOL WINAPI GetFileInformationByHandle( HANDLE hFile, BY_HANDLE_FILE_INFORMATION /*********************************************************************** +* GetFileInformationByHandleEx (KERNEL32.@) +*/ +BOOL WINAPI GetFileInformationByHandleEx( HANDLE handle, FILE_INFO_BY_HANDLE_CLASS class, + LPVOID info, DWORD size ) +{ + NTSTATUS status; + IO_STATUS_BLOCK io; + + switch (class) + { + case FileBasicInfo: + case FileStandardInfo: + case FileNameInfo: + case FileRenameInfo: + case FileDispositionInfo: + case FileAllocationInfo: + case FileEndOfFileInfo: + case FileStreamInfo: + case FileCompressionInfo: + case FileAttributeTagInfo: + case FileIoPriorityHintInfo: + case FileRemoteProtocolInfo: + case FileFullDirectoryInfo: + case FileFullDirectoryRestartInfo: + case FileStorageInfo: + case FileAlignmentInfo: + case FileIdInfo: + case FileIdExtdDirectoryInfo: + case FileIdExtdDirectoryRestartInfo: + FIXME( "%p, %u, %p, %u\n", handle, class, info, size ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; + + case FileIdBothDirectoryRestartInfo: + case FileIdBothDirectoryInfo: + status = NtQueryDirectoryFile( handle, NULL, NULL, NULL, &io, info, size, + FileIdBothDirectoryInformation, FALSE, NULL, + (class == FileIdBothDirectoryRestartInfo) ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError( status ) ); + return FALSE; + } + return TRUE; + + default: + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } +} + + +/*********************************************************************** * GetFileSize (KERNEL32.@) * * Retrieve the size of a file. diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f9f8685..57f7aff 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -533,6 +533,7 @@ @ stdcall GetFileAttributesExW(wstr long ptr) @ stdcall GetFileAttributesW(wstr) @ stdcall GetFileInformationByHandle(long ptr) +@ stdcall GetFileInformationByHandleEx(long long ptr long) @ stdcall GetFileSize(long ptr) @ stdcall GetFileSizeEx(long ptr) @ stdcall GetFileTime(long ptr ptr ptr) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 71ad774..41fca60 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3303,7 +3303,6 @@ static void test_GetFileInformationByHandleEx(void) { SetLastError(0xdeadbeef); ret = pGetFileInformationByHandleEx(directory, checks[i].handleClass, checks[i].ptr, checks[i].size); - todo_wine ok(!ret && GetLastError() == checks[i].errorCode, "GetFileInformationByHandleEx: expected error %u, " "got %u.\n", checks[i].errorCode, GetLastError()); } @@ -3314,18 +3313,14 @@ static void test_GetFileInformationByHandleEx(void) ret = pGetFileInformationByHandleEx(directory, FileIdBothDirectoryInfo, buffer, sizeof(buffer)); if (!ret && GetLastError() == ERROR_NO_MORE_FILES) break; - todo_wine ok(ret, "GetFileInformationByHandleEx: failed to query for FileIdBothDirectoryInfo, got error %u.\n", GetLastError()); if (!ret) break; bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)buffer; while (TRUE) { - todo_wine ok(bothDirInfo->FileAttributes != 0xffffffff, "GetFileInformationByHandleEx: returned invalid file attributes.\n"); - todo_wine ok(bothDirInfo->FileId.u.LowPart != 0xffffffff, "GetFileInformationByHandleEx: returned invalid file id.\n"); - todo_wine ok(bothDirInfo->FileNameLength != 0xffffffff, "GetFileInformationByHandleEx: returned invalid file name length.\n"); if (!bothDirInfo->NextEntryOffset) break; diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 28b0ab3..cd2ee90 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2042,6 +2042,7 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, case FileIdBothDirectoryInformation: case FileIdFullDirectoryInformation: if (length < dir_info_size( info_class, 1 )) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; + if (!buffer) return io->u.Status = STATUS_ACCESS_VIOLATION; break; default: FIXME( "Unsupported file info class %d\n", info_class );
1
0
0
0
Vincas Miliūnas : kernel32/tests: Added tests of FileIdBothDirectoryInfo for GetFileInformationByHandleEx.
by Alexandre Julliard
12 Oct '12
12 Oct '12
Module: wine Branch: master Commit: 9cec60bb1e6d81706dd81180f4284e18183ea603 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9cec60bb1e6d81706dd81180f…
Author: Vincas Miliūnas <vincas.miliunas(a)gmail.com> Date: Fri Oct 12 13:34:54 2012 +0300 kernel32/tests: Added tests of FileIdBothDirectoryInfo for GetFileInformationByHandleEx. --- dlls/kernel32/tests/file.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 43 +++++++++++++++++++++++ 2 files changed, 123 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index c046371..71ad774 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -39,6 +39,7 @@ static BOOL (WINAPI *pReplaceFileW)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, LPVOID, LP static UINT (WINAPI *pGetSystemWindowsDirectoryA)(LPSTR, UINT); static BOOL (WINAPI *pGetVolumeNameForVolumeMountPointA)(LPCSTR, LPSTR, DWORD); static DWORD (WINAPI *pQueueUserAPC)(PAPCFUNC pfnAPC, HANDLE hThread, ULONG_PTR dwData); +static BOOL (WINAPI *pGetFileInformationByHandleEx)(HANDLE, FILE_INFO_BY_HANDLE_CLASS, LPVOID, DWORD); /* keep filename and filenameW the same */ static const char filename[] = "testfile.xxx"; @@ -73,6 +74,7 @@ static void InitFunctionPointers(void) pGetSystemWindowsDirectoryA=(void*)GetProcAddress(hkernel32, "GetSystemWindowsDirectoryA"); pGetVolumeNameForVolumeMountPointA = (void *) GetProcAddress(hkernel32, "GetVolumeNameForVolumeMountPointA"); pQueueUserAPC = (void *) GetProcAddress(hkernel32, "QueueUserAPC"); + pGetFileInformationByHandleEx = (void *) GetProcAddress(hkernel32, "GetFileInformationByHandleEx"); } static void test__hread( void ) @@ -3258,6 +3260,83 @@ static void test_CreatFile(void) DeleteFile(file_name); } +static void test_GetFileInformationByHandleEx(void) +{ + int i; + char tempPath[MAX_PATH], tempFileName[MAX_PATH], buffer[1024]; + BOOL ret; + DWORD ret2; + HANDLE directory; + FILE_ID_BOTH_DIR_INFO *bothDirInfo; + struct { + FILE_INFO_BY_HANDLE_CLASS handleClass; + void *ptr; + DWORD size; + DWORD errorCode; + } checks[] = { + {0xdeadbeef, NULL, 0, ERROR_INVALID_PARAMETER}, + {FileIdBothDirectoryInfo, NULL, 0, ERROR_BAD_LENGTH}, + {FileIdBothDirectoryInfo, NULL, sizeof(buffer), ERROR_NOACCESS}, + {FileIdBothDirectoryInfo, buffer, 0, ERROR_BAD_LENGTH}}; + + if (!pGetFileInformationByHandleEx) + { + win_skip("GetFileInformationByHandleEx is missing.\n"); + return; + } + + ret2 = GetTempPathA(sizeof(tempPath), tempPath); + ok(ret2, "GetFileInformationByHandleEx: GetTempPathA failed, got error %u.\n", GetLastError()); + + /* ensure the existence of a file in the temp folder */ + ret2 = GetTempFileNameA(tempPath, "abc", 0, tempFileName); + ok(ret2, "GetFileInformationByHandleEx: GetTempFileNameA failed, got error %u.\n", GetLastError()); + ok(GetFileAttributesA(tempFileName) != INVALID_FILE_ATTRIBUTES, "GetFileInformationByHandleEx: " + "GetFileAttributesA failed to find the temp file, got error %u.\n", GetLastError()); + + directory = CreateFileA(tempPath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); + ok(directory != INVALID_HANDLE_VALUE, "GetFileInformationByHandleEx: failed to open the temp folder, " + "got error %u.\n", GetLastError()); + + for (i = 0; i < sizeof(checks) / sizeof(checks[0]); i += 1) + { + SetLastError(0xdeadbeef); + ret = pGetFileInformationByHandleEx(directory, checks[i].handleClass, checks[i].ptr, checks[i].size); + todo_wine + ok(!ret && GetLastError() == checks[i].errorCode, "GetFileInformationByHandleEx: expected error %u, " + "got %u.\n", checks[i].errorCode, GetLastError()); + } + + while (TRUE) + { + memset(buffer, 0xff, sizeof(buffer)); + ret = pGetFileInformationByHandleEx(directory, FileIdBothDirectoryInfo, buffer, sizeof(buffer)); + if (!ret && GetLastError() == ERROR_NO_MORE_FILES) + break; + todo_wine + ok(ret, "GetFileInformationByHandleEx: failed to query for FileIdBothDirectoryInfo, got error %u.\n", GetLastError()); + if (!ret) + break; + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)buffer; + while (TRUE) + { + todo_wine + ok(bothDirInfo->FileAttributes != 0xffffffff, "GetFileInformationByHandleEx: returned invalid file attributes.\n"); + todo_wine + ok(bothDirInfo->FileId.u.LowPart != 0xffffffff, "GetFileInformationByHandleEx: returned invalid file id.\n"); + todo_wine + ok(bothDirInfo->FileNameLength != 0xffffffff, "GetFileInformationByHandleEx: returned invalid file name length.\n"); + if (!bothDirInfo->NextEntryOffset) + break; + bothDirInfo = (FILE_ID_BOTH_DIR_INFO *)(((char *)bothDirInfo) + bothDirInfo->NextEntryOffset); + } + } + + CloseHandle(directory); + DeleteFile(tempFileName); +} + START_TEST(file) { InitFunctionPointers(); @@ -3297,4 +3376,5 @@ START_TEST(file) test_RemoveDirectory(); test_ReplaceFileA(); test_ReplaceFileW(); + test_GetFileInformationByHandleEx(); } diff --git a/include/winbase.h b/include/winbase.h index c1e62a3..2e97048 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -740,6 +740,49 @@ typedef struct _BY_HANDLE_FILE_INFORMATION DWORD nFileIndexLow; } BY_HANDLE_FILE_INFORMATION, *PBY_HANDLE_FILE_INFORMATION, *LPBY_HANDLE_FILE_INFORMATION ; +typedef enum _FILE_INFO_BY_HANDLE_CLASS { + FileBasicInfo, + FileStandardInfo, + FileNameInfo, + FileRenameInfo, + FileDispositionInfo, + FileAllocationInfo, + FileEndOfFileInfo, + FileStreamInfo, + FileCompressionInfo, + FileAttributeTagInfo, + FileIdBothDirectoryInfo, + FileIdBothDirectoryRestartInfo, + FileIoPriorityHintInfo, + FileRemoteProtocolInfo, + FileFullDirectoryInfo, + FileFullDirectoryRestartInfo, + FileStorageInfo, + FileAlignmentInfo, + FileIdInfo, + FileIdExtdDirectoryInfo, + FileIdExtdDirectoryRestartInfo, + MaximumFileInfoByHandlesClass +} FILE_INFO_BY_HANDLE_CLASS, *PFILE_INFO_BY_HANDLE_CLASS; + +typedef struct _FILE_ID_BOTH_DIR_INFO { + DWORD NextEntryOffset; + DWORD FileIndex; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER EndOfFile; + LARGE_INTEGER AllocationSize; + DWORD FileAttributes; + DWORD FileNameLength; + DWORD EaSize; + CCHAR ShortNameLength; + WCHAR ShortName[12]; + LARGE_INTEGER FileId; + WCHAR FileName[1]; +} FILE_ID_BOTH_DIR_INFO, *PFILE_ID_BOTH_DIR_INFO; + #define PIPE_ACCESS_INBOUND 1 #define PIPE_ACCESS_OUTBOUND 2 #define PIPE_ACCESS_DUPLEX 3
1
0
0
0
← Newer
1
...
55
56
57
58
59
60
61
...
96
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
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
Results per page:
10
25
50
100
200