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

Józef Kucia : wined3d: Forbid creating typeless render target views.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: b511775b1b8712d3f8f6200b7b73b472c9602608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b511775b1b8712d3f8f6200b7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:37 2016 +0200 wined3d: Forbid creating typeless render target views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 9 ++++++++- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index ae58b62..52e3f1e 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -98,6 +98,13 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * view->format = wined3d_get_format(gl_info, desc->format_id); view->format_flags = view->format->flags[resource->gl_type]; + + if (wined3d_format_is_typeless(view->format)) + { + WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view->format->id)); + return E_INVALIDARG; + } + if (resource->type == WINED3D_RTYPE_BUFFER) { view->sub_resource_idx = 0; @@ -277,7 +284,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ const struct wined3d_format *view_format; view_format = wined3d_get_format(gl_info, desc->format_id); - if (view_format->id == view_format->typeless_id) + if (wined3d_format_is_typeless(view_format)) { WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view_format->id)); return E_INVALIDARG; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e46e47..0ef2414 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3574,6 +3574,11 @@ void wined3d_format_get_float_color_key(const struct wined3d_format *format, const struct wined3d_color_key_conversion * wined3d_format_get_color_key_conversion( const struct wined3d_texture *texture, BOOL need_alpha_ck) DECLSPEC_HIDDEN; +static inline BOOL wined3d_format_is_typeless(const struct wined3d_format *format) +{ + return format->id == format->typeless_id && format->id != WINED3DFMT_UNKNOWN; +} + static inline void *wined3d_calloc(SIZE_T count, SIZE_T size) { if (count > ~(SIZE_T)0 / size)

1 0

Józef Kucia : wined3d: Forbid creating RTVs with layer count equal 0.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 838ecc1cb86f18702f2d59304c164cd0a64f605d URL: http://source.winehq.org/git/wine.git/?a=commit;h=838ecc1cb86f18702f2d59304… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:35 2016 +0200 wined3d: Forbid creating RTVs with layer count equal 0. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 5973668..6a9800c 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -118,6 +118,7 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * if (desc->u.texture.level_idx >= texture->level_count || desc->u.texture.layer_idx >= depth_or_layer_count + || !desc->u.texture.layer_count || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) return WINED3DERR_INVALIDCALL;

1 0

Józef Kucia : wined3d: Forbid creating SRVs with level or layer count equal to 0.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 5f4fc0a93722c8bee5b3dfeee2c598b63442ecc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4fc0a93722c8bee5b3dfeee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:32 2016 +0200 wined3d: Forbid creating SRVs with level or layer count equal to 0. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 68b134f..5973668 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -298,8 +298,10 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ struct wined3d_texture *texture = texture_from_resource(resource); unsigned int i; - if (desc->u.texture.level_idx >= texture->level_count + if (!desc->u.texture.level_count + || desc->u.texture.level_idx >= texture->level_count || desc->u.texture.level_count > texture->level_count - desc->u.texture.level_idx + || !desc->u.texture.layer_count || desc->u.texture.layer_idx >= texture->layer_count || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) return E_INVALIDARG;

1 0

Hadrien Boizard : usp10: Use wine_dbgstr_point in TRACES.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 37840f84ff1cf53998a6f06e7b93190f653ffc63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37840f84ff1cf53998a6f06e7… Author: Hadrien Boizard <h.boizard(a)gmail.com> Date: Tue Jun 14 19:01:56 2016 +0200 usp10: Use wine_dbgstr_point in TRACES. Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 613fb05..d7afbe1 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1300,14 +1300,14 @@ static void apply_pair_value( const void *pos_table, WORD val_fmt1, WORD val_fmt if (val_fmt1) { GPOS_get_value_record_offsets( pos_table, &val_rec1, val_fmt1, ppem, adjust, advance ); - TRACE( "Glyph 1 resulting cumulative offset is %i,%i design units\n", adjust[0].x, adjust[0].y ); - TRACE( "Glyph 1 resulting cumulative advance is %i,%i design units\n", advance[0].x, advance[0].y ); + TRACE( "Glyph 1 resulting cumulative offset is %s design units\n", wine_dbgstr_point(&adjust[0]) ); + TRACE( "Glyph 1 resulting cumulative advance is %s design units\n", wine_dbgstr_point(&advance[0]) ); } if (val_fmt2) { GPOS_get_value_record_offsets( pos_table, &val_rec2, val_fmt2, ppem, adjust + 1, advance + 1 ); - TRACE( "Glyph 2 resulting cumulative offset is %i,%i design units\n", adjust[1].x, adjust[1].y ); - TRACE( "Glyph 2 resulting cumulative advance is %i,%i design units\n", advance[1].x, advance[1].y ); + TRACE( "Glyph 2 resulting cumulative offset is %s design units\n", wine_dbgstr_point(&adjust[1]) ); + TRACE( "Glyph 2 resulting cumulative advance is %s design units\n", wine_dbgstr_point(&advance[1]) ); } } @@ -1424,7 +1424,7 @@ static VOID GPOS_apply_CursiveAttachment(const OT_LookupTable *look, const SCRIP GPOS_get_anchor_values((const BYTE*)cpf1 + offset, &exit_pt, ppem); offset = GET_BE_WORD(cpf1->EntryExitRecord[index_entry].EntryAnchor); GPOS_get_anchor_values((const BYTE*)cpf1 + offset, &entry_pt, ppem); - TRACE("Found linkage %x[%i,%i] %x[%i,%i]\n",glyphs[glyph_index], exit_pt.x,exit_pt.y, glyphs[glyph_index+write_dir], entry_pt.x, entry_pt.y); + TRACE("Found linkage %x[%s] %x[%s]\n",glyphs[glyph_index], wine_dbgstr_point(&exit_pt), glyphs[glyph_index+write_dir], wine_dbgstr_point(&entry_pt)); pt->x = entry_pt.x - exit_pt.x; pt->y = entry_pt.y - exit_pt.y; return; @@ -1505,11 +1505,11 @@ static int GPOS_apply_MarkToBase(ScriptCache *psc, const OT_LookupTable *look, c GPOS_get_anchor_values((const BYTE*)ba + offset, &base_pt, ppem); offset = GET_BE_WORD(mr->MarkAnchor); GPOS_get_anchor_values((const BYTE*)ma + offset, &mark_pt, ppem); - TRACE("Offset on base is %i,%i design units\n",base_pt.x,base_pt.y); - TRACE("Offset on mark is %i,%i design units\n",mark_pt.x, mark_pt.y); + TRACE("Offset on base is %s design units\n",wine_dbgstr_point(&base_pt)); + TRACE("Offset on mark is %s design units\n",wine_dbgstr_point(&mark_pt)); pt->x += base_pt.x - mark_pt.x; pt->y += base_pt.y - mark_pt.y; - TRACE("Resulting cumulative offset is %i,%i design units\n",pt->x,pt->y); + TRACE("Resulting cumulative offset is %s design units\n",wine_dbgstr_point(pt)); rc = base_glyph; } } @@ -1597,11 +1597,11 @@ static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A GPOS_get_anchor_values((const BYTE*)lt + offset, &ligature_pt, ppem); offset = GET_BE_WORD(mr->MarkAnchor); GPOS_get_anchor_values((const BYTE*)ma + offset, &mark_pt, ppem); - TRACE("Offset on ligature is %i,%i design units\n",ligature_pt.x,ligature_pt.y); - TRACE("Offset on mark is %i,%i design units\n",mark_pt.x, mark_pt.y); + TRACE("Offset on ligature is %s design units\n",wine_dbgstr_point(&ligature_pt)); + TRACE("Offset on mark is %s design units\n",wine_dbgstr_point(&mark_pt)); pt->x += ligature_pt.x - mark_pt.x; pt->y += ligature_pt.y - mark_pt.y; - TRACE("Resulting cumulative offset is %i,%i design units\n",pt->x,pt->y); + TRACE("Resulting cumulative offset is %s design units\n",wine_dbgstr_point(pt)); } } } @@ -1662,11 +1662,11 @@ static BOOL GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALY GPOS_get_anchor_values((const BYTE*)m2a + offset, &mark2_pt, ppem); offset = GET_BE_WORD(mr->MarkAnchor); GPOS_get_anchor_values((const BYTE*)ma + offset, &mark_pt, ppem); - TRACE("Offset on mark2 is %i,%i design units\n",mark2_pt.x,mark2_pt.y); - TRACE("Offset on mark is %i,%i design units\n",mark_pt.x, mark_pt.y); + TRACE("Offset on mark2 is %s design units\n",wine_dbgstr_point(&mark2_pt)); + TRACE("Offset on mark is %s design units\n",wine_dbgstr_point(&mark_pt)); pt->x += mark2_pt.x - mark_pt.x; pt->y += mark2_pt.y - mark_pt.y; - TRACE("Resulting cumulative offset is %i,%i design units\n",pt->x,pt->y); + TRACE("Resulting cumulative offset is %s design units\n",wine_dbgstr_point(pt)); rc = TRUE; } }

1 0

Matteo Bruni : d3dx9: Fix a couple of stub signatures in the spec files.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 3054c0fd1bc8e641bf505978937fcaac014612c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3054c0fd1bc8e641bf5059789… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 16 00:00:50 2016 +0200 d3dx9: Fix a couple of stub signatures in the spec files. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 4 ++-- dlls/d3dx9_25/d3dx9_25.spec | 4 ++-- dlls/d3dx9_26/d3dx9_26.spec | 4 ++-- dlls/d3dx9_27/d3dx9_27.spec | 4 ++-- dlls/d3dx9_28/d3dx9_28.spec | 4 ++-- dlls/d3dx9_29/d3dx9_29.spec | 4 ++-- dlls/d3dx9_30/d3dx9_30.spec | 4 ++-- dlls/d3dx9_31/d3dx9_31.spec | 4 ++-- dlls/d3dx9_32/d3dx9_32.spec | 4 ++-- dlls/d3dx9_33/d3dx9_33.spec | 4 ++-- dlls/d3dx9_34/d3dx9_34.spec | 4 ++-- dlls/d3dx9_35/d3dx9_35.spec | 4 ++-- dlls/d3dx9_36/d3dx9_36.spec | 4 ++-- dlls/d3dx9_37/d3dx9_37.spec | 4 ++-- dlls/d3dx9_38/d3dx9_38.spec | 4 ++-- dlls/d3dx9_39/d3dx9_39.spec | 4 ++-- dlls/d3dx9_40/d3dx9_40.spec | 4 ++-- dlls/d3dx9_41/d3dx9_41.spec | 4 ++-- dlls/d3dx9_42/d3dx9_42.spec | 4 ++-- dlls/d3dx9_43/d3dx9_43.spec | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3054c0fd1bc8e641bf505…

1 0

Andrey Gusev : d3dx10: Add D3DX10FilterTexture stub.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 768926b13d3afa1e34cc91f706972a4f73488db6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=768926b13d3afa1e34cc91f70… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 16 00:00:49 2016 +0200 d3dx10: Add D3DX10FilterTexture stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 7 +++++++ include/d3dx10tex.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 492a588..99aa8f3 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -47,7 +47,7 @@ @ stub D3DX10CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromResourceA(ptr long str ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromResourceW(ptr long wstr ptr ptr ptr ptr) -@ stub D3DX10FilterTexture(ptr long long) +@ stdcall D3DX10FilterTexture(ptr long long) @ stdcall D3DX10GetFeatureLevel1(ptr ptr) @ stub D3DX10GetImageInfoFromFileA(str ptr ptr ptr) @ stub D3DX10GetImageInfoFromFileW(wstr ptr ptr ptr) diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 71d6ae8..0c1ff80 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -188,6 +188,13 @@ HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive return hr; } +HRESULT WINAPI D3DX10FilterTexture(ID3D10Resource *texture, UINT src_level, UINT filter) +{ + FIXME("texture %p, src_level %u, filter %#x stub!\n", texture, src_level, filter); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1) { TRACE("device %p, device1 %p.\n", device, device1); diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index 9142c82..a0d5aa7 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -108,6 +108,8 @@ extern "C" { HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, SIZE_T src_data_size, D3DX10_IMAGE_LOAD_INFO *loadinfo, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult); +HRESULT WINAPI D3DX10FilterTexture(ID3D10Resource *texture, UINT src_level, UINT filter); + HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *img_info, HRESULT *hresult);

1 0

Ken Thomases : kernel32: Overhaul the locale determination on the Mac.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: d90f29d817517b7c7bd6737f268598f0ccd5295a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90f29d817517b7c7bd6737f2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jun 15 14:34:04 2016 -0500 kernel32: Overhaul the locale determination on the Mac. The C library locale is inadequate for conveying the Mac user settings between LOCALE_Init() and setup_unix_locales(). The set of locales supported by the C library can't express the combinations allowed in user settings. Setting LANG to a user-settings-derived locale when there's no corresponding C library locale is actually worse than leaving it unset. It will prevent the C library from honoring the LC_* variables (other than LC_ALL). That's why Terminal.app won't set LANG in that case, it just sets LC_CTYPE=UTF-8. This commit makes Wine follow similar logic in not setting LANG if the C library doesn't support the Mac user settings. Rather, it uses a wrapper around setlocale() to query the locale. That wrapper returns a value representing the Mac user settings if the C library comes up empty. It also has logic to handle Terminal's setting LC_CTYPE=UTF-8, since parse_locale_name() can't handle that properly. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 206 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 150 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d90f29d817517b7c7bd67…

1 0

Alexandre Julliard : gdi32: Remove the no longer needed (and broken) null driver implementation of some path functions.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 04e7215fafce4bb77c7e83be23c52c187d37170f URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e7215fafce4bb77c7e83be2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 14:16:12 2016 +0900 gdi32: Remove the no longer needed (and broken) null driver implementation of some path functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 312 ++++-------------------------------------------------- 1 file changed, 23 insertions(+), 289 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04e7215fafce4bb77c7e8…

1 0

Andrey Gusev : include: Add D3DX10_FILTER_FLAG type declaration.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: ddf84783119623507f544a2042aaeddb6b705104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf84783119623507f544a204… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 16 00:00:48 2016 +0200 include: Add D3DX10_FILTER_FLAG type declaration. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dx10tex.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index d44edf2..9142c82 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -19,6 +19,27 @@ #ifndef __D3DX10TEX_H__ #define __D3DX10TEX_H__ +typedef enum D3DX10_FILTER_FLAG +{ + D3DX10_FILTER_NONE = 0x00000001, + D3DX10_FILTER_POINT = 0x00000002, + D3DX10_FILTER_LINEAR = 0x00000003, + D3DX10_FILTER_TRIANGLE = 0x00000004, + D3DX10_FILTER_BOX = 0x00000005, + + D3DX10_FILTER_MIRROR_U = 0x00010000, + D3DX10_FILTER_MIRROR_V = 0x00020000, + D3DX10_FILTER_MIRROR_W = 0x00040000, + D3DX10_FILTER_MIRROR = 0x00070000, + + D3DX10_FILTER_DITHER = 0x00080000, + D3DX10_FILTER_DITHER_DIFFUSION = 0x00100000, + + D3DX10_FILTER_SRGB_IN = 0x00200000, + D3DX10_FILTER_SRGB_OUT = 0x00400000, + D3DX10_FILTER_SRGB = 0x00600000, +} D3DX10_FILTER_FLAG; + typedef enum D3DX10_IMAGE_FILE_FORMAT { D3DX10_IFF_BMP = 0,

1 0

Austin English : kernel32: Implement GetLargePageMinimum.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 4d313e6475383e5aa1ebd8c0917f1f11f5c81f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d313e6475383e5aa1ebd8c09… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jun 15 23:43:46 2016 +0200 kernel32: Implement GetLargePageMinimum. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-memory-l1-1-1.spec | 2 +- dlls/kernel32/cpu.c | 12 ++++++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/process.c | 16 ++++++++++++++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec index 5d3eb13..959e65d 100644 --- a/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec +++ b/dlls/api-ms-win-core-memory-l1-1-1/api-ms-win-core-memory-l1-1-1.spec @@ -3,7 +3,7 @@ @ stdcall CreateFileMappingW(long ptr long long long wstr) kernel32.CreateFileMappingW @ stdcall CreateMemoryResourceNotification(long) kernel32.CreateMemoryResourceNotification @ stdcall FlushViewOfFile(ptr long) kernel32.FlushViewOfFile -@ stub GetLargePageMinimum +@ stdcall GetLargePageMinimum() kernel32.GetLargePageMinimum @ stub GetProcessWorkingSetSizeEx @ stdcall GetSystemFileCacheSize(ptr ptr ptr) kernel32.GetSystemFileCacheSize @ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index f48fcf0..3a7a5e8 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -291,3 +291,15 @@ err: } return TRUE; } + +/*********************************************************************** + * GetLargePageMinimum (KERNEL32.@) + */ +SIZE_T WINAPI GetLargePageMinimum(void) +{ +#if defined(__i386___) || defined(__x86_64__) + return 2 * 1024 * 1024; +#endif + FIXME("Not implemented on your platform/architecture.\n"); + return 0; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ec7155b6e..0fc4dcb 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -696,7 +696,7 @@ @ stdcall GetHandleInformation(long ptr) @ stub -i386 GetLSCallbackTarget @ stub -i386 GetLSCallbackTemplate -# @ stub GetLargePageMinimum +@ stdcall GetLargePageMinimum() @ stdcall GetLargestConsoleWindowSize(long) @ stdcall GetLastError() @ stub GetLinguistLangSize diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 61dcdc2..ad7885c 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -88,6 +88,7 @@ static BOOL (WINAPI *pProcess32Next)(HANDLE, PROCESSENTRY32*); static BOOL (WINAPI *pThread32First)(HANDLE, THREADENTRY32*); static BOOL (WINAPI *pThread32Next)(HANDLE, THREADENTRY32*); static BOOL (WINAPI *pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*); +static SIZE_T (WINAPI *pGetLargePageMinimum)(void); /* ############################### */ static char base[MAX_PATH]; @@ -252,6 +253,7 @@ static BOOL init(void) pThread32First = (void *)GetProcAddress(hkernel32, "Thread32First"); pThread32Next = (void *)GetProcAddress(hkernel32, "Thread32Next"); pGetLogicalProcessorInformationEx = (void *)GetProcAddress(hkernel32, "GetLogicalProcessorInformationEx"); + pGetLargePageMinimum = (void *)GetProcAddress(hkernel32, "GetLargePageMinimum"); return TRUE; } @@ -3138,6 +3140,19 @@ static void test_GetLogicalProcessorInformationEx(void) HeapFree(GetProcessHeap(), 0, info); } +static void test_largepages(void) +{ + SIZE_T size; + + if (!pGetLargePageMinimum) { + skip("No GetLargePageMinimum support.\n"); + return; + } + size = pGetLargePageMinimum(); + + ok((size == 0) || (size == 2*1024*1024) || (size == 4*1024*1024), "GetLargePageMinimum reports %ld size\n", size); +} + START_TEST(process) { HANDLE job; @@ -3210,6 +3225,7 @@ START_TEST(process) test_GetNumaProcessorNode(); test_session_info(); test_GetLogicalProcessorInformationEx(); + test_largepages(); /* things that can be tested: * lookup: check the way program to be executed is searched

1 0