January 2019 - Wine-commits

Nikolay Sivov : dwrite: Validate 'sbix' data before using it.
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: f73ba331c18577942a371b98a724f2a44f6565ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=f73ba331c18577942a371b98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 29 10:06:44 2019 +0300 dwrite: Validate 'sbix' data before using it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 125 +++++++++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 57 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 261d00c..35cf838 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -243,30 +243,34 @@ typedef struct { USHORT numberOfHMetrics; } TT_HHEA; -typedef struct { +struct sbix_header +{ WORD version; WORD flags; - DWORD numStrikes; - DWORD strikeOffset[1]; -} sbix_header; + DWORD num_strikes; + DWORD strike_offset[1]; +}; -typedef struct { +struct sbix_strike +{ WORD ppem; WORD ppi; - DWORD glyphDataOffsets[1]; -} sbix_strike; + DWORD glyphdata_offsets[1]; +}; -typedef struct { +struct sbix_glyph_data +{ WORD originOffsetX; WORD originOffsetY; - DWORD graphicType; + DWORD graphic_type; BYTE data[1]; -} sbix_glyph_data; +}; -typedef struct { +struct maxp +{ DWORD version; - WORD numGlyphs; -} maxp; + WORD num_glyphs; +}; struct cblc_header { @@ -2221,67 +2225,74 @@ static BOOL opentype_has_font_table(IDWriteFontFace4 *fontface, UINT32 tag) return exists; } -static DWORD opentype_get_sbix_formats(IDWriteFontFace4 *fontface) +static unsigned int opentype_get_sbix_formats(IDWriteFontFace4 *fontface) { - UINT32 size, s, num_strikes; - const sbix_header *header; - UINT16 g, num_glyphs; - BOOL exists = FALSE; - const maxp *maxp; - const void *data; - DWORD ret = 0; - void *context; - HRESULT hr; + unsigned int num_strikes, num_glyphs, i, j, ret = 0; + const struct sbix_header *sbix_header; + struct dwrite_fonttable table; - hr = IDWriteFontFace4_TryGetFontTable(fontface, MS_MAXP_TAG, &data, &size, &context, &exists); - if (FAILED(hr) || !exists) + memset(&table, 0, sizeof(table)); + table.exists = TRUE; + + if (!get_fontface_table(fontface, MS_MAXP_TAG, &table)) return 0; - maxp = data; - num_glyphs = GET_BE_WORD(maxp->numGlyphs); + num_glyphs = table_read_be_word(&table, FIELD_OFFSET(struct maxp, num_glyphs)); - IDWriteFontFace4_ReleaseFontTable(fontface, context); + IDWriteFontFace4_ReleaseFontTable(fontface, table.context); - if (FAILED(IDWriteFontFace4_TryGetFontTable(fontface, MS_SBIX_TAG, &data, &size, &context, &exists))) { - WARN("Failed to get 'sbix' table, %#x\n", hr); - return 0; - } + memset(&table, 0, sizeof(table)); + table.exists = TRUE; - header = data; - num_strikes = GET_BE_DWORD(header->numStrikes); + if (!get_fontface_table(fontface, MS_SBIX_TAG, &table)) + return 0; - for (s = 0; s < num_strikes; s++) { - sbix_strike *strike = (sbix_strike *)((BYTE *)header + GET_BE_DWORD(header->strikeOffset[s])); + num_strikes = table_read_be_dword(&table, FIELD_OFFSET(struct sbix_header, num_strikes)); + sbix_header = table_read_ensure(&table, 0, FIELD_OFFSET(struct sbix_header, strike_offset[num_strikes])); - for (g = 0; g < num_glyphs; g++) { - DWORD offset = GET_BE_DWORD(strike->glyphDataOffsets[g]); - DWORD offset_next = GET_BE_DWORD(strike->glyphDataOffsets[g + 1]); - sbix_glyph_data *glyph_data; - DWORD format; + if (sbix_header) + { + for (i = 0; i < num_strikes; ++i) + { + unsigned int strike_offset = GET_BE_DWORD(sbix_header->strike_offset[i]); + const struct sbix_strike *strike = table_read_ensure(&table, strike_offset, + FIELD_OFFSET(struct sbix_strike, glyphdata_offsets[num_glyphs + 1])); - if (offset == offset_next) + if (!strike) continue; - glyph_data = (sbix_glyph_data *)((BYTE *)strike + offset); - switch (format = glyph_data->graphicType) + for (j = 0; j < num_glyphs; j++) { - case MS_PNG__TAG: - ret |= DWRITE_GLYPH_IMAGE_FORMATS_PNG; - break; - case MS_JPG__TAG: - ret |= DWRITE_GLYPH_IMAGE_FORMATS_JPEG; - break; - case MS_TIFF_TAG: - ret |= DWRITE_GLYPH_IMAGE_FORMATS_TIFF; - break; - default: - format = GET_BE_DWORD(format); - FIXME("unexpected bitmap format %s\n", debugstr_an((char *)&format, 4)); + unsigned int offset = GET_BE_DWORD(strike->glyphdata_offsets[j]); + unsigned int next_offset = GET_BE_DWORD(strike->glyphdata_offsets[j + 1]); + const struct sbix_glyph_data *glyph_data; + + if (offset == next_offset) + continue; + + glyph_data = table_read_ensure(&table, strike_offset + offset, sizeof(*glyph_data)); + if (!glyph_data) + continue; + + switch (glyph_data->graphic_type) + { + case MS_PNG__TAG: + ret |= DWRITE_GLYPH_IMAGE_FORMATS_PNG; + break; + case MS_JPG__TAG: + ret |= DWRITE_GLYPH_IMAGE_FORMATS_JPEG; + break; + case MS_TIFF_TAG: + ret |= DWRITE_GLYPH_IMAGE_FORMATS_TIFF; + break; + default: + FIXME("unexpected bitmap format %s\n", debugstr_tag(GET_BE_DWORD(glyph_data->graphic_type))); + } } } } - IDWriteFontFace4_ReleaseFontTable(fontface, context); + IDWriteFontFace4_ReleaseFontTable(fontface, table.context); return ret; }

1 0

Nikolay Sivov : dwrite: Validate 'VDMX' data before using it.
by Alexandre Julliard 29 Jan '19

29 Jan '19

Module: wine Branch: master Commit: 2ca9aa16b2e68cc3e4bfa4fe45c6676a6aed0b89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ca9aa16b2e68cc3e4bfa4fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 29 10:06:45 2019 +0300 dwrite: Validate 'VDMX' data before using it. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 3 +- dlls/dwrite/font.c | 5 +-- dlls/dwrite/opentype.c | 82 ++++++++++++++++++++++++++------------------ 3 files changed, 54 insertions(+), 36 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 2d20b41..3595503 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -229,7 +229,8 @@ extern HRESULT opentype_get_font_info_strings(const void*,DWRITE_INFORMATIONAL_S extern HRESULT opentype_get_font_familyname(struct file_stream_desc*,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_facename(struct file_stream_desc*,WCHAR*,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN; -extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; +extern BOOL opentype_get_vdmx_size(const struct dwrite_fonttable *table, INT ppem, UINT16 *ascent, + UINT16 *descent) DECLSPEC_HIDDEN; extern unsigned int opentype_get_cpal_palettecount(const struct dwrite_fonttable *table) DECLSPEC_HIDDEN; extern unsigned int opentype_get_cpal_paletteentrycount(const struct dwrite_fonttable *table) DECLSPEC_HIDDEN; extern HRESULT opentype_get_cpal_entries(const struct dwrite_fonttable *table, unsigned int palette, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 372578e..d1e4fb9 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -374,9 +374,10 @@ static FLOAT get_font_prop_vec_dotproduct(const struct dwrite_font_propvec *left return left->stretch * right->stretch + left->style * right->style + left->weight * right->weight; } -static const void* get_fontface_vdmx(struct dwrite_fontface *fontface) +static const struct dwrite_fonttable *get_fontface_vdmx(struct dwrite_fontface *fontface) { - return get_fontface_table(&fontface->IDWriteFontFace4_iface, MS_VDMX_TAG, &fontface->vdmx); + get_fontface_table(&fontface->IDWriteFontFace4_iface, MS_VDMX_TAG, &fontface->vdmx); + return &fontface->vdmx; } static const struct dwrite_fonttable *get_fontface_gasp(struct dwrite_fontface *fontface) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 35cf838..f92febd 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -343,14 +343,14 @@ typedef struct { TT_NameRecord nameRecord[1]; } TT_NAME_V0; -struct VDMX_Header +struct vdmx_header { WORD version; - WORD numRecs; - WORD numRatios; + WORD num_recs; + WORD num_ratios; }; -struct VDMX_Ratio +struct vdmx_ratio { BYTE bCharSet; BYTE xRatio; @@ -358,20 +358,21 @@ struct VDMX_Ratio BYTE yEndRatio; }; -struct VDMX_group -{ - WORD recs; - BYTE startsz; - BYTE endsz; -}; - -struct VDMX_vTable +struct vdmx_vtable { WORD yPelHeight; SHORT yMax; SHORT yMin; }; +struct vdmx_group +{ + WORD recs; + BYTE startsz; + BYTE endsz; + struct vdmx_vtable entries[1]; +}; + typedef struct { CHAR FeatureTag[4]; WORD Feature; @@ -1911,13 +1912,14 @@ HRESULT opentype_get_typographic_features(IDWriteFontFace *fontface, UINT32 scri return *count > max_tagcount ? E_NOT_SUFFICIENT_BUFFER : S_OK; } -static const struct VDMX_group *find_vdmx_group(const struct VDMX_Header *hdr) +static unsigned int find_vdmx_group(const struct vdmx_header *hdr) { - WORD num_ratios, i, group_offset = 0; - struct VDMX_Ratio *ratios = (struct VDMX_Ratio*)(hdr + 1); + WORD num_ratios, i; + const struct vdmx_ratio *ratios = (struct vdmx_ratio *)(hdr + 1); BYTE dev_x_ratio = 1, dev_y_ratio = 1; + unsigned int group_offset = 0; - num_ratios = GET_BE_WORD(hdr->numRatios); + num_ratios = GET_BE_WORD(hdr->num_ratios); for (i = 0; i < num_ratios; i++) { @@ -1932,42 +1934,56 @@ static const struct VDMX_group *find_vdmx_group(const struct VDMX_Header *hdr) break; } } - if (group_offset) - return (const struct VDMX_group *)((BYTE *)hdr + group_offset); - return NULL; + + return group_offset; } -BOOL opentype_get_vdmx_size(const void *data, INT emsize, UINT16 *ascent, UINT16 *descent) +BOOL opentype_get_vdmx_size(const struct dwrite_fonttable *vdmx, INT emsize, UINT16 *ascent, UINT16 *descent) { - const struct VDMX_Header *hdr = (const struct VDMX_Header*)data; - const struct VDMX_group *group; - const struct VDMX_vTable *tables; - WORD recs, i; + unsigned int num_ratios, num_recs, group_offset, i; + const struct vdmx_header *header; + const struct vdmx_group *group; + + if (!vdmx->exists) + return FALSE; + + num_ratios = table_read_be_word(vdmx, FIELD_OFFSET(struct vdmx_header, num_ratios)); + num_recs = table_read_be_word(vdmx, FIELD_OFFSET(struct vdmx_header, num_recs)); + + header = table_read_ensure(vdmx, 0, sizeof(*header) + num_ratios * sizeof(struct vdmx_ratio) + + num_recs * sizeof(*group)); + + if (!header) + return FALSE; - if (!data) + group_offset = find_vdmx_group(header); + if (!group_offset) return FALSE; - group = find_vdmx_group(hdr); + num_recs = table_read_be_word(vdmx, group_offset); + group = table_read_ensure(vdmx, group_offset, FIELD_OFFSET(struct vdmx_group, entries[num_recs])); + if (!group) return FALSE; - recs = GET_BE_WORD(group->recs); - if (emsize < group->startsz || emsize >= group->endsz) return FALSE; + if (emsize < group->startsz || emsize >= group->endsz) + return FALSE; - tables = (const struct VDMX_vTable *)(group + 1); - for (i = 0; i < recs; i++) { - WORD ppem = GET_BE_WORD(tables[i].yPelHeight); + for (i = 0; i < num_recs; ++i) + { + WORD ppem = GET_BE_WORD(group->entries[i].yPelHeight); if (ppem > emsize) { FIXME("interpolate %d\n", emsize); return FALSE; } if (ppem == emsize) { - *ascent = (SHORT)GET_BE_WORD(tables[i].yMax); - *descent = -(SHORT)GET_BE_WORD(tables[i].yMin); + *ascent = (SHORT)GET_BE_WORD(group->entries[i].yMax); + *descent = -(SHORT)GET_BE_WORD(group->entries[i].yMin); return TRUE; } } + return FALSE; }

1 0

Zebediah Figura : wined3d: Store vertex shader boolean constants in the wined3d_stateblock_state structure.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 28b0f53f6e1f7c5cdd5ead1a77dc4341509b54d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28b0f53f6e1f7c5cdd5ead1a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 22:44:55 2019 -0600 wined3d: Store vertex shader boolean constants in the wined3d_stateblock_state structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 17 +++++++++-------- dlls/wined3d/stateblock.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 14cb620..331def2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2396,23 +2396,24 @@ HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, if (count > WINED3D_MAX_CONSTS_B - start_idx) count = WINED3D_MAX_CONSTS_B - start_idx; - memcpy(&device->update_state->vs_consts_b[start_idx], constants, count * sizeof(*constants)); - if (TRACE_ON(d3d)) - { - for (i = 0; i < count; ++i) - TRACE("Set BOOL constant %u to %#x.\n", start_idx + i, constants[i]); - } + memcpy(&device->update_stateblock_state->vs_consts_b[start_idx], constants, count * sizeof(*constants)); if (device->recording) { for (i = start_idx; i < count + start_idx; ++i) device->recording->changed.vertexShaderConstantsB |= (1u << i); + return WINED3D_OK; } - else + + memcpy(&device->state.vs_consts_b[start_idx], constants, count * sizeof(*constants)); + if (TRACE_ON(d3d)) { - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_B, start_idx, count, constants); + for (i = 0; i < count; ++i) + TRACE("Set BOOL constant %u to %#x.\n", start_idx + i, constants[i]); } + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_B, start_idx, count, constants); + return WINED3D_OK; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index dd1e638..112d8b7 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -727,9 +727,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) unsigned int idx = stateblock->contained_vs_consts_b[i]; TRACE("Setting vs_consts_b[%u] to %s.\n", - idx, src_state->vs_consts_b[idx] ? "TRUE" : "FALSE"); + idx, state->vs_consts_b[idx] ? "TRUE" : "FALSE"); - stateblock->state.vs_consts_b[idx] = src_state->vs_consts_b[idx]; + stateblock->stateblock_state.vs_consts_b[idx] = state->vs_consts_b[idx]; } /* Pixel shader float constants. */ @@ -1020,8 +1020,9 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) } for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i) { + state->vs_consts_b[i] = stateblock->stateblock_state.vs_consts_b[i]; wined3d_device_set_vs_consts_b(device, stateblock->contained_vs_consts_b[i], - 1, &stateblock->state.vs_consts_b[stateblock->contained_vs_consts_b[i]]); + 1, &stateblock->stateblock_state.vs_consts_b[stateblock->contained_vs_consts_b[i]]); } apply_lights(device, &stateblock->state); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fedf2b8..52106f2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2973,6 +2973,7 @@ struct wined3d_stateblock_state struct wined3d_shader *vs; struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I]; + BOOL vs_consts_b[WINED3D_MAX_CONSTS_B]; }; struct wined3d_device

1 0

Zebediah Figura : wined3d: Store the pixel shader in the wined3d_stateblock_state structure.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 0e493a2d80d85ec07e51fd8927cb24b10cb4a6e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e493a2d80d85ec07e51fd89… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 27 22:44:56 2019 -0600 wined3d: Store the pixel shader in the wined3d_stateblock_state structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 15 +++++++++++---- dlls/wined3d/stateblock.c | 28 ++++++++++++++++++++-------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 331def2..28e113a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2534,21 +2534,28 @@ HRESULT CDECL wined3d_device_get_vs_consts_f(const struct wined3d_device *device void CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader) { - struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_PIXEL]; + struct wined3d_shader *prev = device->state.shader[WINED3D_SHADER_TYPE_PIXEL]; TRACE("device %p, shader %p.\n", device, shader); + if (shader) + wined3d_shader_incref(shader); + if (device->update_stateblock_state->ps) + wined3d_shader_decref(device->update_stateblock_state->ps); + device->update_stateblock_state->ps = shader; if (device->recording) + { device->recording->changed.pixelShader = TRUE; + return; + } if (shader == prev) return; if (shader) wined3d_shader_incref(shader); - device->update_state->shader[WINED3D_SHADER_TYPE_PIXEL] = shader; - if (!device->recording) - wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_PIXEL, shader); + device->state.shader[WINED3D_SHADER_TYPE_PIXEL] = shader; + wined3d_cs_emit_set_shader(device->cs, WINED3D_SHADER_TYPE_PIXEL, shader); if (prev) wined3d_shader_decref(prev); } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 112d8b7..2b916a9 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -530,6 +530,12 @@ void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) state->vs = NULL; wined3d_shader_decref(shader); } + + if ((shader = state->ps)) + { + state->ps = NULL; + wined3d_shader_decref(shader); + } } void state_cleanup(struct wined3d_state *state) @@ -953,14 +959,13 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) stateblock->state.sampler_states[stage][state] = src_state->sampler_states[stage][state]; } - if (stateblock->changed.pixelShader && stateblock->state.shader[WINED3D_SHADER_TYPE_PIXEL] - != src_state->shader[WINED3D_SHADER_TYPE_PIXEL]) + if (stateblock->changed.pixelShader && stateblock->stateblock_state.ps != state->ps) { - if (src_state->shader[WINED3D_SHADER_TYPE_PIXEL]) - wined3d_shader_incref(src_state->shader[WINED3D_SHADER_TYPE_PIXEL]); - if (stateblock->state.shader[WINED3D_SHADER_TYPE_PIXEL]) - wined3d_shader_decref(stateblock->state.shader[WINED3D_SHADER_TYPE_PIXEL]); - stateblock->state.shader[WINED3D_SHADER_TYPE_PIXEL] = src_state->shader[WINED3D_SHADER_TYPE_PIXEL]; + if (state->ps) + wined3d_shader_incref(state->ps); + if (stateblock->stateblock_state.ps) + wined3d_shader_decref(stateblock->stateblock_state.ps); + stateblock->stateblock_state.ps = state->ps; } wined3d_state_record_lights(&stateblock->state, src_state); @@ -1028,7 +1033,14 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) apply_lights(device, &stateblock->state); if (stateblock->changed.pixelShader) - wined3d_device_set_pixel_shader(device, stateblock->state.shader[WINED3D_SHADER_TYPE_PIXEL]); + { + if (stateblock->stateblock_state.ps) + wined3d_shader_incref(stateblock->stateblock_state.ps); + if (state->ps) + wined3d_shader_decref(state->ps); + state->ps = stateblock->stateblock_state.ps; + wined3d_device_set_pixel_shader(device, stateblock->stateblock_state.ps); + } /* Pixel Shader Constants. */ for (i = 0; i < stateblock->num_contained_ps_consts_f; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 52106f2..b638d87 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2974,6 +2974,8 @@ struct wined3d_stateblock_state struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I]; BOOL vs_consts_b[WINED3D_MAX_CONSTS_B]; + + struct wined3d_shader *ps; }; struct wined3d_device

1 0

Daniel Lehman : msvcrt: _towlower_l only lowercase A-Z in C locale.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 6a71e7c9ee1f5378b4744323b8f4b99855e0f22b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a71e7c9ee1f5378b4744323… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Jan 28 12:08:11 2019 +0100 msvcrt: _towlower_l only lowercase A-Z in C locale. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 2 -- dlls/msvcrt/wcs.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index a159132..4f8b8b0 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3633,7 +3633,6 @@ static void test_C_locale(void) ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); } else - todo_wine_if(ret != i) ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); ret = p_towupper(i); @@ -3664,7 +3663,6 @@ static void test_C_locale(void) ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); } else - todo_wine_if(ret != j) ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); ret = p__towupper_l(j, locale); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a6d7c1f..d96da44 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2494,6 +2494,19 @@ int CDECL MSVCRT_towupper(MSVCRT_wint_t c) */ int CDECL MSVCRT__towlower_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) { + MSVCRT_pthreadlocinfo locinfo; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) { + if(c >= 'A' && c <= 'Z') + return c + 'a' - 'A'; + return c; + } + return tolowerW(c); }

1 0

Daniel Lehman : msvcrt: _towupper_l only uppercase a-z in C locale.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 2c308c9fa2b3481d58cdea2863c0f935440ca397 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c308c9fa2b3481d58cdea28… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Jan 28 12:08:19 2019 +0100 msvcrt: _towupper_l only uppercase a-z in C locale. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 2 -- dlls/msvcrt/wcs.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 4f8b8b0..d0cc51b 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3642,7 +3642,6 @@ static void test_C_locale(void) ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); } else - todo_wine_if(ret != i) ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); } @@ -3672,7 +3671,6 @@ static void test_C_locale(void) ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); } else - todo_wine_if(ret != j) ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index d96da44..28e82ec 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2478,6 +2478,19 @@ MSVCRT_size_t CDECL MSVCRT_wcsnlen(const MSVCRT_wchar_t *s, MSVCRT_size_t maxlen */ int CDECL MSVCRT__towupper_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) { + MSVCRT_pthreadlocinfo locinfo; + + if(!locale) + locinfo = get_locinfo(); + else + locinfo = locale->locinfo; + + if(!locinfo->lc_handle[MSVCRT_LC_CTYPE]) { + if(c >= 'a' && c <= 'z') + return c + 'A' - 'a'; + return c; + } + return toupperW(c); }

1 0

Daniel Lehman : ucrtbase/tests: Add tests for C locale.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 20f5abf4fb269a2ee596456fac1aa249b67705a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20f5abf4fb269a2ee596456f… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Jan 28 12:08:27 2019 +0100 ucrtbase/tests: Add tests for C locale. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/string.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 34f5a78..38aa6b3 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <wchar.h> #include <stdio.h> +#include <locale.h> #include <windef.h> #include <winbase.h> @@ -90,6 +91,13 @@ static double (__cdecl *p_strtod)(const char*, char** end); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t,_locale_t); static size_t (__cdecl *p___strncnt)(const char*, size_t); +static int (__cdecl *p_towlower)(wint_t); +static int (__cdecl *p__towlower_l)(wint_t, _locale_t); +static int (__cdecl *p_towupper)(wint_t); +static int (__cdecl *p__towupper_l)(wint_t, _locale_t); +static char* (__cdecl *p_setlocale)(int, const char*); +static _locale_t (__cdecl *p__create_locale)(int, const char*); +static void (__cdecl *p__free_locale)(_locale_t); static BOOL init(void) { @@ -107,6 +115,13 @@ static BOOL init(void) p__memicmp = (void*)GetProcAddress(module, "_memicmp"); p__memicmp_l = (void*)GetProcAddress(module, "_memicmp_l"); p___strncnt = (void*)GetProcAddress(module, "__strncnt"); + p_towlower = (void*)GetProcAddress(module, "towlower"); + p__towlower_l = (void*)GetProcAddress(module, "_towlower_l"); + p_towupper = (void*)GetProcAddress(module, "towupper"); + p__towupper_l = (void*)GetProcAddress(module, "_towupper_l"); + p_setlocale = (void*)GetProcAddress(module, "setlocale"); + p__create_locale = (void*)GetProcAddress(module, "_create_locale"); + p__free_locale = (void*)GetProcAddress(module, "_free_locale"); return TRUE; } @@ -285,6 +300,63 @@ static void test___strncnt(void) "Cannot reset invalid parameter handler\n"); } +static void test_C_locale(void) +{ + int i, j; + wint_t ret, exp; + _locale_t locale; + static const char *locales[] = { NULL, "C" }; + + /* C locale only converts case for [a-zA-Z] */ + p_setlocale(LC_ALL, "C"); + for (i = 0; i <= 0xffff; i++) + { + ret = p_towlower(i); + if (i >= 'A' && i <= 'Z') + { + exp = i + 'a' - 'A'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + + ret = p_towupper(i); + if (i >= 'a' && i <= 'z') + { + exp = i + 'A' - 'a'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + ok(ret == i, "expected self %x, got %x for C locale\n", i, ret); + } + + for (i = 0; i < ARRAY_SIZE(locales); i++) { + locale = locales[i] ? p__create_locale(LC_ALL, locales[i]) : NULL; + + for (j = 0; j <= 0xffff; j++) { + ret = p__towlower_l(j, locale); + if (j >= 'A' && j <= 'Z') + { + exp = j + 'a' - 'A'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); + + ret = p__towupper_l(j, locale); + if (j >= 'a' && j <= 'z') + { + exp = j + 'A' - 'a'; + ok(ret == exp, "expected %x, got %x for C locale\n", exp, ret); + } + else + ok(ret == j, "expected self %x, got %x for C locale\n", j, ret); + } + + p__free_locale(locale); + } +} + START_TEST(string) { if (!init()) return; @@ -292,4 +364,5 @@ START_TEST(string) test__memicmp(); test__memicmp_l(); test___strncnt(); + test_C_locale(); }

1 0

Alexandre Julliard : kernel32/tests: Add helper function for machine type manipulations.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 27193d36af35f7cae981eba70aebe44b4c282c49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27193d36af35f7cae981eba7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 28 18:22:08 2019 +0100 kernel32/tests: Add helper function for machine type manipulations. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 50 +++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 23dfc93..cc5af21 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -167,6 +167,32 @@ static IMAGE_SECTION_HEADER section = static const char filler[0x1000]; static const char section_data[0x10] = "section data"; +/* return an alternate machine of the same 32/64 bitness */ +static WORD get_alt_machine( WORD orig_machine ) +{ + switch (orig_machine) + { + case IMAGE_FILE_MACHINE_I386: return IMAGE_FILE_MACHINE_ARMNT; + case IMAGE_FILE_MACHINE_AMD64: return IMAGE_FILE_MACHINE_ARM64; + case IMAGE_FILE_MACHINE_ARMNT: return IMAGE_FILE_MACHINE_I386; + case IMAGE_FILE_MACHINE_ARM64: return IMAGE_FILE_MACHINE_AMD64; + } + return 0; +} + +/* return the machine of the alternate 32/64 bitness */ +static WORD get_alt_bitness_machine( WORD orig_machine ) +{ + switch (orig_machine) + { + case IMAGE_FILE_MACHINE_I386: return IMAGE_FILE_MACHINE_AMD64; + case IMAGE_FILE_MACHINE_AMD64: return IMAGE_FILE_MACHINE_I386; + case IMAGE_FILE_MACHINE_ARMNT: return IMAGE_FILE_MACHINE_ARM64; + case IMAGE_FILE_MACHINE_ARM64: return IMAGE_FILE_MACHINE_ARMNT; + } + return 0; +} + static DWORD create_test_dll( const IMAGE_DOS_HEADER *dos_header, UINT dos_size, const IMAGE_NT_HEADERS *nt_header, char dll_name[MAX_PATH] ) { @@ -692,7 +718,7 @@ static void test_Loader(void) SIZE_T size; BOOL ret; NTSTATUS status; - WORD alt_machine, orig_machine = nt_header_template.FileHeader.Machine; + WORD orig_machine = nt_header_template.FileHeader.Machine; IMAGE_NT_HEADERS nt_header; IMAGE_COR20_HEADER cor_header; @@ -1013,26 +1039,12 @@ static void test_Loader(void) ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(status == STATUS_SUCCESS), /* win2k */ "NtCreateSection error %08x\n", status ); - switch (orig_machine) - { - case IMAGE_FILE_MACHINE_I386: alt_machine = IMAGE_FILE_MACHINE_ARMNT; break; - case IMAGE_FILE_MACHINE_AMD64: alt_machine = IMAGE_FILE_MACHINE_ARM64; break; - case IMAGE_FILE_MACHINE_ARMNT: alt_machine = IMAGE_FILE_MACHINE_I386; break; - case IMAGE_FILE_MACHINE_ARM64: alt_machine = IMAGE_FILE_MACHINE_AMD64; break; - } - nt_header.FileHeader.Machine = alt_machine; + nt_header.FileHeader.Machine = get_alt_machine( orig_machine ); status = map_image_section( &nt_header, &section, section_data, __LINE__ ); ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(status == STATUS_SUCCESS), /* win2k */ "NtCreateSection error %08x\n", status ); - switch (orig_machine) - { - case IMAGE_FILE_MACHINE_I386: alt_machine = IMAGE_FILE_MACHINE_AMD64; break; - case IMAGE_FILE_MACHINE_AMD64: alt_machine = IMAGE_FILE_MACHINE_I386; break; - case IMAGE_FILE_MACHINE_ARMNT: alt_machine = IMAGE_FILE_MACHINE_ARM64; break; - case IMAGE_FILE_MACHINE_ARM64: alt_machine = IMAGE_FILE_MACHINE_ARMNT; break; - } - nt_header.FileHeader.Machine = alt_machine; + nt_header.FileHeader.Machine = get_alt_bitness_machine( orig_machine ); status = map_image_section( &nt_header, &section, section_data, __LINE__ ); ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(status == STATUS_SUCCESS), /* win2k */ "NtCreateSection error %08x\n", status ); @@ -1118,7 +1130,7 @@ static void test_Loader(void) ok( status == (is_wow64 ? STATUS_INVALID_IMAGE_FORMAT : STATUS_INVALID_IMAGE_WIN_64), "NtCreateSection error %08x\n", status ); - nt64.FileHeader.Machine = alt_machine; + nt64.FileHeader.Machine = get_alt_bitness_machine( orig_machine ); status = map_image_section( (IMAGE_NT_HEADERS *)&nt64, &section, section_data, __LINE__ ); ok( status == (is_wow64 ? STATUS_SUCCESS : STATUS_INVALID_IMAGE_WIN_64), "NtCreateSection error %08x\n", status ); @@ -1232,7 +1244,7 @@ static void test_Loader(void) ok( status == STATUS_INVALID_IMAGE_FORMAT || broken(!status) /* win8 */, "NtCreateSection error %08x\n", status ); - nt32.FileHeader.Machine = alt_machine; + nt32.FileHeader.Machine = get_alt_bitness_machine( orig_machine ); status = map_image_section( (IMAGE_NT_HEADERS *)&nt32, &section, section_data, __LINE__ ); ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status );

1 0

Alexandre Julliard : kernel32/tests: Try loading the dll also for matching platform type.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: 5613526bd41a76b3e0effa10868ced85b77d8efb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5613526bd41a76b3e0effa10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 28 18:25:00 2019 +0100 kernel32/tests: Try loading the dll also for matching platform type. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 54 +++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index cc5af21..89a3f31 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -508,6 +508,14 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE return image.ImageContainsCode && (!cor_header || !(cor_header->Flags & COMIMAGE_FLAGS_ILONLY)); } +static UINT get_com_dir_size( const IMAGE_NT_HEADERS *nt ) +{ + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + return ((const IMAGE_NT_HEADERS32 *)nt)->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; + else + return ((const IMAGE_NT_HEADERS64 *)nt)->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; +} + /* helper to test image section mapping */ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAGE_SECTION_HEADER *sections, const void *section_data, int line ) @@ -517,7 +525,7 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG HANDLE file, map; NTSTATUS status; ULONG file_size; - BOOL has_code; + BOOL has_code, il_only = FALSE, want_32bit = FALSE, wrong_machine = FALSE; HMODULE mod; file_size = create_test_dll_sections( &dos_header, nt_header, sections, section_data, dll_name ); @@ -528,6 +536,13 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG size.QuadPart = file_size; status = pNtCreateSection(&map, STANDARD_RIGHTS_REQUIRED | SECTION_MAP_READ | SECTION_QUERY, NULL, &size, PAGE_READONLY, SEC_IMAGE, file ); + if (get_com_dir_size( nt_header )) + { + /* invalid COR20 header seems to corrupt internal loader state on Windows */ + if (get_com_dir_size( nt_header ) < sizeof(IMAGE_COR20_HEADER)) goto done; + if (!((const IMAGE_COR20_HEADER *)section_data)->Flags) goto done; + } + if (!status) { SECTION_BASIC_INFORMATION info; @@ -540,21 +555,22 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG ok( info.Size.QuadPart == file_size, "NtQuerySection wrong size %x%08x / %08x\n", info.Size.u.HighPart, info.Size.u.LowPart, file_size ); has_code = query_image_section( line, dll_name, nt_header, section_data ); + + if (get_com_dir_size( nt_header )) + { + const IMAGE_COR20_HEADER *cor_header = section_data; + il_only = (cor_header->Flags & COMIMAGE_FLAGS_ILONLY) != 0; + if (il_only) want_32bit = (cor_header->Flags & COMIMAGE_FLAGS_32BITREQUIRED) != 0; + } + + SetLastError( 0xdeadbeef ); + mod = LoadLibraryExA( dll_name, 0, DONT_RESOLVE_DLL_REFERENCES ); /* test loading dll of wrong 32/64 bitness */ if (nt_header->OptionalHeader.Magic == (is_win64 ? IMAGE_NT_OPTIONAL_HDR32_MAGIC : IMAGE_NT_OPTIONAL_HDR64_MAGIC)) { - SetLastError( 0xdeadbeef ); - mod = LoadLibraryExA( dll_name, 0, DONT_RESOLVE_DLL_REFERENCES ); - if (!has_code && nt_header->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + if (!has_code && is_win64) { - BOOL il_only = FALSE, want_32bit = FALSE; - if (((const IMAGE_NT_HEADERS32 *)nt_header)->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress) - { - const IMAGE_COR20_HEADER *cor_header = section_data; - il_only = (cor_header->Flags & COMIMAGE_FLAGS_ILONLY) != 0; - if (il_only) want_32bit = (cor_header->Flags & COMIMAGE_FLAGS_32BITREQUIRED) != 0; - } ok( mod != NULL || want_32bit || broken(il_only), /* <= win7 */ "%u: loading failed err %u\n", line, GetLastError() ); } @@ -563,9 +579,19 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG ok( !mod, "%u: loading succeeded\n", line ); ok( GetLastError() == ERROR_BAD_EXE_FORMAT, "%u: wrong error %u\n", line, GetLastError() ); } - if (mod) FreeLibrary( mod ); } + else + { + wrong_machine = (nt_header->FileHeader.Machine == get_alt_machine( nt_header_template.FileHeader.Machine )); + + ok( mod != NULL || broken(il_only) || /* <= win7 */ + broken( wrong_machine ), /* win8 */ + "%u: loading failed err %u\n", line, GetLastError() ); + } + if (mod) FreeLibrary( mod ); } + +done: if (map) CloseHandle( map ); CloseHandle( file ); DeleteFileA( dll_name ); @@ -736,6 +762,7 @@ static void test_Loader(void) nt_header.OptionalHeader.SizeOfImage = td[i].size_of_image; nt_header.OptionalHeader.SizeOfHeaders = td[i].size_of_headers; + section.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ; file_size = create_test_dll( &dos_header, td[i].size_of_dos_header, &nt_header, dll_name ); SetLastError(0xdeadbeef); @@ -3728,7 +3755,6 @@ START_TEST(loader) return; } - test_Loader(); test_filenames(); test_ResolveDelayLoadedAPI(); test_ImportDescriptors(); @@ -3736,4 +3762,6 @@ START_TEST(loader) test_import_resolution(); test_ExitProcess(); test_InMemoryOrderModuleList(); + /* loader test must be last, it can corrupt the internal loader state on Windows */ + test_Loader(); }

1 0

Alexandre Julliard : kernel32/tests: Add tests for dll fallback when image type doesn' t match current platform.
by Alexandre Julliard 28 Jan '19

28 Jan '19

Module: wine Branch: master Commit: b1dbe76d7a61740004be6328d1b26ea058d0204e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1dbe76d7a61740004be6328… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 28 18:25:43 2019 +0100 kernel32/tests: Add tests for dll fallback when image type doesn't match current platform. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 118 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 114 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 89a3f31..165c05e 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -29,6 +29,7 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "winnls.h" #include "wine/test.h" #include "delayloadhandler.h" @@ -67,6 +68,9 @@ static NTSTATUS (WINAPI *pNtAllocateVirtualMemory)(HANDLE, PVOID *, ULONG, SIZE_ static NTSTATUS (WINAPI *pNtFreeVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG); static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG *, ULONG_PTR *); static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); +static NTSTATUS (WINAPI *pLdrLoadDll)(LPCWSTR,DWORD,const UNICODE_STRING *,HMODULE*); +static NTSTATUS (WINAPI *pLdrUnloadDll)(HMODULE); +static void (WINAPI *pRtlInitUnicodeString)(PUNICODE_STRING,LPCWSTR); static void (WINAPI *pRtlAcquirePebLock)(void); static void (WINAPI *pRtlReleasePebLock)(void); static PVOID (WINAPI *pResolveDelayLoadedAPI)(PVOID, PCIMAGE_DELAYLOAD_DESCRIPTOR, @@ -508,6 +512,53 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE return image.ImageContainsCode && (!cor_header || !(cor_header->Flags & COMIMAGE_FLAGS_ILONLY)); } +static const WCHAR wldr_nameW[] = {'w','l','d','r','t','e','s','t','.','d','l','l',0}; +static WCHAR load_test_name[MAX_PATH], load_fallback_name[MAX_PATH]; +static WCHAR load_path[MAX_PATH]; + +static void init_load_path( const char *fallback_dll ) +{ + static const WCHAR pathW[] = {'P','A','T','H',0}; + static const WCHAR ldrW[] = {'l','d','r',0}; + static const WCHAR sepW[] = {';',0}; + static const WCHAR bsW[] = {'\\',0}; + WCHAR path[MAX_PATH]; + + GetTempPathW( MAX_PATH, path ); + GetTempFileNameW( path, ldrW, 0, load_test_name ); + GetTempFileNameW( path, ldrW, 0, load_fallback_name ); + DeleteFileW( load_test_name ); + ok( CreateDirectoryW( load_test_name, NULL ), "failed to create dir\n" ); + DeleteFileW( load_fallback_name ); + ok( CreateDirectoryW( load_fallback_name, NULL ), "failed to create dir\n" ); + lstrcpyW( load_path, load_test_name ); + lstrcatW( load_path, sepW ); + lstrcatW( load_path, load_fallback_name ); + lstrcatW( load_path, sepW ); + GetEnvironmentVariableW( pathW, load_path + lstrlenW(load_path), + ARRAY_SIZE(load_path) - lstrlenW(load_path) ); + lstrcatW( load_test_name, bsW ); + lstrcatW( load_test_name, wldr_nameW ); + lstrcatW( load_fallback_name, bsW ); + lstrcatW( load_fallback_name, wldr_nameW ); + MultiByteToWideChar( CP_ACP, 0, fallback_dll, -1, path, MAX_PATH ); + MoveFileW( path, load_fallback_name ); +} + +static void delete_load_path(void) +{ + WCHAR *p; + + DeleteFileW( load_test_name ); + for (p = load_test_name + lstrlenW(load_test_name) - 1; *p != '\\'; p--) ; + *p = 0; + RemoveDirectoryW( load_test_name ); + DeleteFileW( load_fallback_name ); + for (p = load_fallback_name + lstrlenW(load_fallback_name) - 1; *p != '\\'; p--) ; + *p = 0; + RemoveDirectoryW( load_fallback_name ); +} + static UINT get_com_dir_size( const IMAGE_NT_HEADERS *nt ) { if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) @@ -521,12 +572,14 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG const void *section_data, int line ) { char dll_name[MAX_PATH]; + WCHAR path[MAX_PATH]; + UNICODE_STRING name; LARGE_INTEGER size; HANDLE file, map; - NTSTATUS status; + NTSTATUS status, expect_status, ldr_status; ULONG file_size; - BOOL has_code, il_only = FALSE, want_32bit = FALSE, wrong_machine = FALSE; - HMODULE mod; + BOOL has_code = FALSE, il_only = FALSE, want_32bit = FALSE, expect_fallback = FALSE, wrong_machine = FALSE; + HMODULE mod = 0, ldr_mod; file_size = create_test_dll_sections( &dos_header, nt_header, sections, section_data, dll_name ); @@ -536,6 +589,8 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG size.QuadPart = file_size; status = pNtCreateSection(&map, STANDARD_RIGHTS_REQUIRED | SECTION_MAP_READ | SECTION_QUERY, NULL, &size, PAGE_READONLY, SEC_IMAGE, file ); + expect_status = status; + if (get_com_dir_size( nt_header )) { /* invalid COR20 header seems to corrupt internal loader state on Windows */ @@ -587,8 +642,56 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG ok( mod != NULL || broken(il_only) || /* <= win7 */ broken( wrong_machine ), /* win8 */ "%u: loading failed err %u\n", line, GetLastError() ); + if (!mod && wrong_machine) expect_status = STATUS_INVALID_IMAGE_FORMAT; } if (mod) FreeLibrary( mod ); + expect_fallback = !mod; + } + + /* test fallback to another dll further in the load path */ + + MultiByteToWideChar( CP_ACP, 0, dll_name, -1, path, MAX_PATH ); + CopyFileW( path, load_test_name, FALSE ); + pRtlInitUnicodeString( &name, wldr_nameW ); + ldr_status = pLdrLoadDll( load_path, 0, &name, &ldr_mod ); + if (!ldr_status) + { + GetModuleFileNameW( ldr_mod, path, MAX_PATH ); + if (!lstrcmpiW( path, load_test_name )) + { + if (!expect_status) + ok( !expect_fallback, "%u: got test dll but expected fallback\n", line ); + else + ok( !expect_fallback, "%u: got test dll but expected failure %x\n", line, expect_status ); + } + else if (!lstrcmpiW( path, load_fallback_name )) + { + trace( "%u: loaded fallback\n", line ); + if (!expect_status) + ok( expect_fallback || + /* win10 also falls back for 32-bit dll without code, even though it could be loaded */ + (is_win64 && !has_code && + nt_header->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC), + "%u: got fallback but expected test dll\n", line ); + else + ok( broken(expect_status == STATUS_INVALID_IMAGE_FORMAT), /* <= vista */ + "%u: got fallback but expected failure %x\n", line, expect_status ); + } + else ok( 0, "%u: got unexpected path %s instead of %s\n", line, wine_dbgstr_w(path), wine_dbgstr_w(load_test_name)); + pLdrUnloadDll( ldr_mod ); + } + else if (ldr_status == STATUS_DLL_INIT_FAILED || ldr_status == STATUS_ACCESS_VIOLATION) + { + /* some dlls with invalid entry point will crash, but this means we loaded the test dll */ + ok( !expect_fallback, "%u: got test dll but expected fallback\n", line ); + } + else todo_wine_if( !expect_status ) + { + ok( ldr_status == expect_status || + broken(il_only && !expect_status && ldr_status == STATUS_INVALID_IMAGE_FORMAT), + "%u: wrong status %x/%x\n", line, ldr_status, expect_status ); + ok( !expect_fallback || broken(il_only) || broken(wrong_machine), + "%u: failed with %x expected fallback\n", line, ldr_status ); } done: @@ -995,7 +1098,6 @@ static void test_Loader(void) nt_header.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); nt_header.OptionalHeader.SectionAlignment = page_size; - nt_header.OptionalHeader.AddressOfEntryPoint = 0x1234; nt_header.OptionalHeader.DllCharacteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT; nt_header.OptionalHeader.FileAlignment = page_size; nt_header.OptionalHeader.SizeOfHeaders = sizeof(dos_header) + sizeof(nt_header) + sizeof(IMAGE_SECTION_HEADER); @@ -1006,6 +1108,10 @@ static void test_Loader(void) section.VirtualAddress = page_size; section.Misc.VirtualSize = page_size; + create_test_dll_sections( &dos_header, &nt_header, &section, section_data, dll_name ); + init_load_path( dll_name ); + + nt_header.OptionalHeader.AddressOfEntryPoint = 0x1234; status = map_image_section( &nt_header, &section, section_data, __LINE__ ); ok( status == STATUS_SUCCESS, "NtCreateSection error %08x\n", status ); @@ -1336,6 +1442,7 @@ static void test_Loader(void) } section.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ; + delete_load_path(); } static void test_filenames(void) @@ -3721,6 +3828,9 @@ START_TEST(loader) pNtFreeVirtualMemory = (void *)GetProcAddress(ntdll, "NtFreeVirtualMemory"); pLdrLockLoaderLock = (void *)GetProcAddress(ntdll, "LdrLockLoaderLock"); pLdrUnlockLoaderLock = (void *)GetProcAddress(ntdll, "LdrUnlockLoaderLock"); + pLdrLoadDll = (void *)GetProcAddress(ntdll, "LdrLoadDll"); + pLdrUnloadDll = (void *)GetProcAddress(ntdll, "LdrUnloadDll"); + pRtlInitUnicodeString = (void *)GetProcAddress(ntdll, "RtlInitUnicodeString"); pRtlAcquirePebLock = (void *)GetProcAddress(ntdll, "RtlAcquirePebLock"); pRtlReleasePebLock = (void *)GetProcAddress(ntdll, "RtlReleasePebLock"); pRtlImageDirectoryEntryToData = (void *)GetProcAddress(ntdll, "RtlImageDirectoryEntryToData");

1 0