October 2014 - Wine-Commits

Nikolay Sivov : dwrite: Use better integer types for cmap helpers.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: d3cdec0e66ef4222dea4b663b33ce871d7254eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3cdec0e66ef4222dea4b663b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 07:32:27 2014 +0400 dwrite: Use better integer types for cmap helpers. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 5 ++--- dlls/dwrite/opentype.c | 33 +++++++++++++++++---------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index b3bd1df..f4a19c7 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -108,7 +108,7 @@ extern HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE /* Opentype font table functions */ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_table(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,UINT32,const void**,void**,UINT32*,BOOL*) DECLSPEC_HIDDEN; -extern VOID OpenType_CMAP_GetGlyphIndex(LPVOID data, DWORD utf32c, LPWORD pgi, DWORD flags) DECLSPEC_HIDDEN; +extern void opentype_cmap_get_glyphindex(void*,UINT32,UINT16*) DECLSPEC_HIDDEN; extern VOID get_font_properties(LPCVOID os2, LPCVOID head, LPCVOID post, DWRITE_FONT_METRICS *metrics, DWRITE_FONT_STRETCH *stretch, DWRITE_FONT_WEIGHT *weight, DWRITE_FONT_STYLE *style) DECLSPEC_HIDDEN; extern HRESULT bidi_computelevels(const WCHAR*,UINT32,UINT8,UINT8*,UINT8*); diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 69b7746..e3edbaa 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -391,9 +391,8 @@ static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace2 *iface, UI } for (i = 0; i < count; i++) - { - OpenType_CMAP_GetGlyphIndex(This->cmap.data, codepoints[i], &glyph_indices[i], 0); - } + opentype_cmap_get_glyphindex(This->cmap.data, codepoints[i], &glyph_indices[i]); + return S_OK; } } diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 9af04fd..dba3e31 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -96,6 +96,12 @@ typedef struct { WORD endCode[1]; } CMAP_SegmentMapping_0; +enum OPENTYPE_CMAP_TABLE_FORMAT +{ + OPENTYPE_CMAP_TABLE_SEGMENT_MAPPING = 4, + OPENTYPE_CMAP_TABLE_SEGMENTED_COVERAGE = 12 +}; + /* PANOSE is 10 bytes in size, need to pack the structure properly */ #include "pshpack2.h" typedef struct @@ -301,7 +307,7 @@ static int compare_group(const void *a, const void* b) return 0; } -static void CMAP4_GetGlyphIndex(CMAP_SegmentMapping_0* format, DWORD utf32c, LPWORD pgi) +static void CMAP4_GetGlyphIndex(CMAP_SegmentMapping_0* format, UINT32 utf32c, UINT16 *pgi) { WORD *startCode; SHORT *idDelta; @@ -340,9 +346,9 @@ static void CMAP4_GetGlyphIndex(CMAP_SegmentMapping_0* format, DWORD utf32c, LPW } } -static void CMAP12_GetGlyphIndex(CMAP_SegmentedCoverage* format, DWORD utf32c, LPWORD pgi) +static void CMAP12_GetGlyphIndex(CMAP_SegmentedCoverage* format, UINT32 utf32c, UINT16 *pgi) { - CMAP_SegmentedCoverage_group *group = NULL; + CMAP_SegmentedCoverage_group *group; group = bsearch(&utf32c, format->groups, GET_BE_DWORD(format->nGroups), sizeof(CMAP_SegmentedCoverage_group), compare_group); @@ -354,17 +360,12 @@ static void CMAP12_GetGlyphIndex(CMAP_SegmentedCoverage* format, DWORD utf32c, L } } -VOID OpenType_CMAP_GetGlyphIndex(LPVOID data, DWORD utf32c, LPWORD pgi, DWORD flags) +void opentype_cmap_get_glyphindex(void *data, UINT32 utf32c, UINT16 *pgi) { + CMAP_Header *CMAP_Table = data; int i; - CMAP_Header *CMAP_Table = NULL; - - if (flags & GGI_MARK_NONEXISTING_GLYPHS) - *pgi = 0xffff; - else - *pgi = 0; - CMAP_Table = data; + *pgi = 0; for (i = 0; i < GET_BE_WORD(CMAP_Table->numTables); i++) { @@ -376,18 +377,18 @@ VOID OpenType_CMAP_GetGlyphIndex(LPVOID data, DWORD utf32c, LPWORD pgi, DWORD fl table = (WORD*)(((BYTE*)CMAP_Table) + GET_BE_DWORD(CMAP_Table->tables[i].offset)); type = GET_BE_WORD(*table); - TRACE("Type %i\n", type); + TRACE("table type %i\n", type); /* Break when we find a handled type */ - switch(type) + switch (type) { - case 4: + case OPENTYPE_CMAP_TABLE_SEGMENT_MAPPING: CMAP4_GetGlyphIndex((CMAP_SegmentMapping_0*) table, utf32c, pgi); break; - case 12: + case OPENTYPE_CMAP_TABLE_SEGMENTED_COVERAGE: CMAP12_GetGlyphIndex((CMAP_SegmentedCoverage*) table, utf32c, pgi); break; default: - TRACE("Type %i unhandled.\n", type); + TRACE("table type %i unhandled.\n", type); } } }

1 0

Matteo Bruni : wined3d: ps_2_0 shaders don' t support int or bool constants.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: 69c72c969f3d91f247ee15d82fbbe8afd52ce166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69c72c969f3d91f247ee15d82… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 16 01:32:21 2014 +0200 wined3d: ps_2_0 shaders don't support int or bool constants. --- dlls/wined3d/shader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9227346..5ae4abc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -403,7 +403,8 @@ static void shader_set_limits(struct wined3d_shader *shader) /* min_version, max_version, sampler, constant_int, constant_float, constant_bool, packed_output, packed_input */ {WINED3D_SHADER_VERSION(1, 0), WINED3D_SHADER_VERSION(1, 3), { 4, 0, 8, 0, 0, 0}}, {WINED3D_SHADER_VERSION(1, 4), WINED3D_SHADER_VERSION(1, 4), { 6, 0, 8, 0, 0, 0}}, - {WINED3D_SHADER_VERSION(2, 0), WINED3D_SHADER_VERSION(2, 1), {16, 16, 32, 16, 0, 0}}, + {WINED3D_SHADER_VERSION(2, 0), WINED3D_SHADER_VERSION(2, 0), {16, 0, 32, 0, 0, 0}}, + {WINED3D_SHADER_VERSION(2, 1), WINED3D_SHADER_VERSION(2, 1), {16, 16, 32, 16, 0, 0}}, {WINED3D_SHADER_VERSION(3, 0), WINED3D_SHADER_VERSION(3, 0), {16, 16, 224, 16, 0, 12}}, {WINED3D_SHADER_VERSION(4, 0), WINED3D_SHADER_VERSION(4, 0), {16, 0, 0, 0, 0, 32}}, {0}

1 0

Matteo Bruni : d3d9/tests: Port the unsupported shaders test to D3D9Ex.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: 894298d5023a60b0c048cc2bf63c1079e752e42d URL: http://source.winehq.org/git/wine.git/?a=commit;h=894298d5023a60b0c048cc2bf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 16 01:32:18 2014 +0200 d3d9/tests: Port the unsupported shaders test to D3D9Ex. --- dlls/d3d8/tests/device.c | 4 +- dlls/d3d9/tests/d3d9ex.c | 311 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 4 +- 3 files changed, 315 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=894298d5023a60b0c048c…

1 0

Iván Matellanes : msvcrt: Added _fseeki64_nolock implementation.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: 5077d8c1371fe3e8e263119a6cc05d0e9766cdba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5077d8c1371fe3e8e263119a6… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 15 16:47:07 2014 +0200 msvcrt: Added _fseeki64_nolock implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 18 +++++++++++++++--- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 50e2420..280d188 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -842,7 +842,7 @@ @ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l @ stub _fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 -@ stub _fseeki64_nolock +@ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen @ cdecl _fstat32(long ptr) MSVCRT__fstat32 @ stub _fstat32i64 diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index f2d2f30..5b74e9c 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1190,7 +1190,7 @@ @ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l @ stub _fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 -@ stub _fseeki64_nolock +@ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen @ cdecl _fstat32(long ptr) MSVCRT__fstat32 @ stub _fstat32i64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 77a03c4..9d695cd 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -509,7 +509,7 @@ @ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l @ stub _fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 -@ stub _fseeki64_nolock +@ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen @ cdecl _fstat32(long ptr) MSVCRT__fstat32 @ stub _fstat32i64 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 59fba3d..45ea0f9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -491,7 +491,7 @@ @ varargs _fscanf_s_l(ptr str ptr) MSVCRT__fscanf_s_l @ stub _fseek_nolock @ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64 -@ stub _fseeki64_nolock +@ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock @ cdecl _fsopen(str str long) MSVCRT__fsopen @ cdecl _fstat32(long ptr) MSVCRT__fstat32 @ stub _fstat32i64 diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 49cb14d..9f7da57 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1246,16 +1246,29 @@ int CDECL MSVCRT__locking(int fd, int mode, LONG nbytes) */ int CDECL MSVCRT__fseeki64(MSVCRT_FILE* file, __int64 offset, int whence) { + int ret; + + MSVCRT__lock_file(file); + ret = MSVCRT__fseeki64_nolock(file, offset, whence); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _fseeki64_nolock (MSVCRT.@) + */ +int CDECL MSVCRT__fseeki64_nolock(MSVCRT_FILE* file, __int64 offset, int whence) +{ int ret; - MSVCRT__lock_file(file); /* Flush output if needed */ if(file->_flag & MSVCRT__IOWRT) msvcrt_flush_buffer(file); if(whence == SEEK_CUR && file->_flag & MSVCRT__IOREAD ) { whence = SEEK_SET; - offset += MSVCRT__ftelli64(file); + offset += MSVCRT__ftelli64_nolock(file); } /* Discard buffered input */ @@ -1269,7 +1282,6 @@ int CDECL MSVCRT__fseeki64(MSVCRT_FILE* file, __int64 offset, int whence) file->_flag &= ~MSVCRT__IOEOF; ret = (MSVCRT__lseeki64(file->_file,offset,whence) == -1)?-1:0; - MSVCRT__unlock_file(file); return ret; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 41f3632..85484bc 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -919,6 +919,7 @@ int __cdecl MSVCRT_fgetc(MSVCRT_FILE*); int __cdecl MSVCRT_ungetc(int,MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_ungetwc(MSVCRT_wint_t,MSVCRT_FILE*); +int __cdecl MSVCRT__fseeki64_nolock(MSVCRT_FILE*,__int64,int); __int64 __cdecl MSVCRT__ftelli64(MSVCRT_FILE* file); __int64 __cdecl MSVCRT__ftelli64_nolock(MSVCRT_FILE*); void __cdecl MSVCRT__exit(int); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index dbe9231..1e816ce 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -130,6 +130,7 @@ int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); +int __cdecl _fseeki64_nolock(FILE*,__int64,int); __msvcrt_long __cdecl _ftell_nolock(FILE*); __int64 __cdecl _ftelli64_nolock(FILE*);

1 0

Matteo Bruni : d3dcompiler: Fix tracing of expression operators.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: a02f76637d1b1b1ed1b8d0ceb9d08b231480a6f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a02f76637d1b1b1ed1b8d0ceb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 16 01:32:22 2014 +0200 d3dcompiler: Fix tracing of expression operators. This hunk should have been in d25486fba4b87981618e0f55a5a7388db95c204f. --- dlls/d3dcompiler_43/utils.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 858277a..8de102f 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -2083,6 +2083,11 @@ static const char *debug_expr_op(const struct hlsl_ir_expr *expr) "sat", + "pre++", + "pre--", + "post++", + "post--", + "+", "-", "*", @@ -2113,11 +2118,6 @@ static const char *debug_expr_op(const struct hlsl_ir_expr *expr) "pow", - "pre++", - "pre--", - "post++", - "post--", - "lerp", ",",

1 0

Vincent Povirk : mscoree: Use mono_runtime_quit in shutdown process.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: 6ef156e656b76a71e76e9b6d126dc958aa8df3c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef156e656b76a71e76e9b6d1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 15 16:26:09 2014 -0500 mscoree: Use mono_runtime_quit in shutdown process. --- dlls/mscoree/corruntimehost.c | 2 +- dlls/mscoree/metahost.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index ce73134..6a037f8 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1124,7 +1124,7 @@ __int32 WINAPI _CorExeMain(void) if (domain) { mono_thread_manage(); - mono_jit_cleanup(domain); + mono_runtime_quit(); } return exit_code; diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index f07145b..9cbad22 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -88,7 +88,6 @@ static void (CDECL *mono_free)(void *); static MonoImage* (CDECL *mono_image_open)(const char *fname, MonoImageOpenStatus *status); MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status); static void (CDECL *mono_install_assembly_preload_hook)(MonoAssemblyPreLoadFunc func, void *user_data); -void (CDECL *mono_jit_cleanup)(MonoDomain *domain); int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); MonoDomain* (CDECL *mono_jit_init)(const char *file); static int (CDECL *mono_jit_set_trace_options)(const char* options); @@ -100,6 +99,7 @@ static void (CDECL *mono_profiler_install)(MonoProfiler *prof, MonoProfileFunc s MonoType* (CDECL *mono_reflection_type_from_name)(char *name, MonoImage *image); MonoObject* (CDECL *mono_runtime_invoke)(MonoMethod *method, void *obj, void **params, MonoObject **exc); void (CDECL *mono_runtime_object_init)(MonoObject *this_obj); +void (CDECL *mono_runtime_quit)(void); static void (CDECL *mono_set_dirs)(const char *assembly_dir, const char *config_dir); static void (CDECL *mono_set_verbose_level)(DWORD level); MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); @@ -197,7 +197,6 @@ static HRESULT load_mono(CLRRuntimeInfo *This) LOAD_MONO_FUNCTION(mono_free); LOAD_MONO_FUNCTION(mono_image_open); LOAD_MONO_FUNCTION(mono_install_assembly_preload_hook); - LOAD_MONO_FUNCTION(mono_jit_cleanup); LOAD_MONO_FUNCTION(mono_jit_exec); LOAD_MONO_FUNCTION(mono_jit_init); LOAD_MONO_FUNCTION(mono_jit_set_trace_options); @@ -209,6 +208,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This) LOAD_MONO_FUNCTION(mono_reflection_type_from_name); LOAD_MONO_FUNCTION(mono_runtime_invoke); LOAD_MONO_FUNCTION(mono_runtime_object_init); + LOAD_MONO_FUNCTION(mono_runtime_quit); LOAD_MONO_FUNCTION(mono_set_dirs); LOAD_MONO_FUNCTION(mono_set_verbose_level); LOAD_MONO_FUNCTION(mono_stringify_assembly_name); diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index a451344..af329f8 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -145,7 +145,6 @@ extern MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); extern MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name); extern MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count); extern MonoAssembly* (CDECL *mono_domain_assembly_open)(MonoDomain *domain, const char *name); -extern void (CDECL *mono_jit_cleanup)(MonoDomain *domain); extern int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); extern MonoDomain* (CDECL *mono_jit_init)(const char *file); extern MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status); @@ -156,6 +155,7 @@ extern void* (CDECL *mono_object_unbox)(MonoObject *obj); extern MonoType* (CDECL *mono_reflection_type_from_name)(char *name, MonoImage *image); extern MonoObject* (CDECL *mono_runtime_invoke)(MonoMethod *method, void *obj, void **params, MonoObject **exc); extern void (CDECL *mono_runtime_object_init)(MonoObject *this_obj); +extern void (CDECL *mono_runtime_quit)(void); extern MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); extern MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); extern void (CDECL *mono_thread_manage)(void);

1 0

Nikolay Sivov : mscoree: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 16, 2014

Oct. 16, 2014

Module: wine Branch: master Commit: a99d8cb21bd0f658518a16459172974593f17fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=a99d8cb21bd0f658518a16459… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 16 00:00:23 2014 +0400 mscoree: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/mscoree/metahost.c | 6 +++--- dlls/mscoree/tests/metahost.c | 2 +- dlls/mscoree/tests/mscoree.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 2383068..f07145b 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -360,7 +360,7 @@ static HRESULT WINAPI CLRRuntimeInfo_GetVersionString(ICLRRuntimeInfo* iface, if (buffer_size >= *pcchBuffer) MultiByteToWideChar(CP_UTF8, 0, version, -1, pwzBuffer, buffer_size); else - hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + hr = E_NOT_SUFFICIENT_BUFFER; } return hr; @@ -421,7 +421,7 @@ static HRESULT WINAPI CLRRuntimeInfo_GetRuntimeDirectory(ICLRRuntimeInfo* iface, if (buffer_size >= size) strcpyW(pwzBuffer, system_dir); else - hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + hr = E_NOT_SUFFICIENT_BUFFER; } return hr; @@ -1051,7 +1051,7 @@ HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface, if (buffer_size >= *pcchBuffer) MultiByteToWideChar(CP_UTF8, 0, version, -1, pwzBuffer, buffer_size); else - hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + hr = E_NOT_SUFFICIENT_BUFFER; } } diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c index d00bb4f..5a8b3e0 100644 --- a/dlls/mscoree/tests/metahost.c +++ b/dlls/mscoree/tests/metahost.c @@ -122,7 +122,7 @@ static void test_enumruntimes(void) count = 1; hr = ICLRRuntimeInfo_GetVersionString(runtime_info, buf, &count); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetVersionString returned %x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetVersionString returned %x\n", hr); ok(count > 1, "GetVersionString returned count %u\n", count); count = 0xdeadbeef; diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index fcea603..30b068d 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -92,7 +92,7 @@ static void test_versioninfo(void) return; } - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),"GetCORVersion returned %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetCORVersion returned %08x\n", hr); hr = pGetCORVersion(version, MAX_PATH, &size); ok(hr == S_OK,"GetCORVersion returned %08x\n", hr); @@ -107,12 +107,12 @@ static void test_versioninfo(void) path_len = size; hr = pGetCORSystemDirectory(path, path_len-1 , &size); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetCORSystemDirectory returned %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetCORSystemDirectory returned %08x\n", hr); if (0) /* crashes on <= w2k3 */ { hr = pGetCORSystemDirectory(NULL, MAX_PATH , &size); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetCORSystemDirectory returned %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetCORSystemDirectory returned %08x\n", hr); } hr = pGetCORSystemDirectory(path, MAX_PATH , NULL); @@ -140,7 +140,7 @@ static void test_versioninfo(void) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, 1, &path_len, version, MAX_PATH, &size); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetRequestedRuntimeInfo returned %08x\n", hr); /* if one of the buffers is NULL, the other one is still happily filled */ memset(version, 0, sizeof(version));

1 0

Akihiro Sagawa : server: KeyNameInformation returns the full name of the key.
by Alexandre Julliard Oct. 15, 2014

Oct. 15, 2014

Module: wine Branch: master Commit: e94d2e045960978f8c48c4e9527f88f1229bf4be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e94d2e045960978f8c48c4e95… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 14 00:25:00 2014 +0900 server: KeyNameInformation returns the full name of the key. --- dlls/ntdll/tests/reg.c | 19 ++++++++++++++----- server/registry.c | 25 ++++++++++++++++++++++++- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 22048f9..08af73e 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1285,7 +1285,7 @@ static void test_NtQueryKey(void) HANDLE key; NTSTATUS status; OBJECT_ATTRIBUTES attr; - ULONG len; + ULONG length, len; KEY_NAME_INFORMATION *info = NULL; UNICODE_STRING str; @@ -1293,21 +1293,30 @@ static void test_NtQueryKey(void) status = pNtOpenKey(&key, KEY_READ, &attr); ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); - status = pNtQueryKey(key, KeyNameInformation, NULL, 0, &len); + status = pNtQueryKey(key, KeyNameInformation, NULL, 0, &length); if (status == STATUS_INVALID_PARAMETER) { win_skip("KeyNameInformation is not supported\n"); pNtClose(key); return; } todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08x\n", status); + info = HeapAlloc(GetProcessHeap(), 0, length); - info = HeapAlloc(GetProcessHeap(), 0, len); - status = pNtQueryKey(key, KeyNameInformation, info, len, &len); + /* non-zero buffer size, but insufficient */ + status = pNtQueryKey(key, KeyNameInformation, info, sizeof(*info), &len); + ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryKey Failed: 0x%08x\n", status); + ok(length == len, "got %d, expected %d\n", len, length); + ok(info->NameLength == winetestpath.Length, "got %d, expected %d\n", + info->NameLength, winetestpath.Length); + + /* correct buffer size */ + status = pNtQueryKey(key, KeyNameInformation, info, length, &len); ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08x\n", status); + ok(length == len, "got %d, expected %d\n", len, length); str.Buffer = info->Name; str.Length = info->NameLength; - todo_wine ok(pRtlCompareUnicodeString(&winetestpath, &str, TRUE) == 0, + ok(pRtlCompareUnicodeString(&winetestpath, &str, TRUE) == 0, "got %s, expected %s\n", wine_dbgstr_wn(str.Buffer, str.Length/sizeof(WCHAR)), wine_dbgstr_wn(winetestpath.Buffer, winetestpath.Length/sizeof(WCHAR))); diff --git a/server/registry.c b/server/registry.c index 1436bfe..4aaaf03 100644 --- a/server/registry.c +++ b/server/registry.c @@ -864,10 +864,12 @@ static struct key *create_key_recursive( struct key *key, const struct unicode_s static void enum_key( const struct key *key, int index, int info_class, struct enum_key_reply *reply ) { + static const WCHAR backslash[] = { '\\' }; int i; data_size_t len, namelen, classlen; data_size_t max_subkey = 0, max_class = 0; data_size_t max_value = 0, max_data = 0; + const struct key *k; char *data; if (index != -1) /* -1 means use the specified key directly */ @@ -885,8 +887,14 @@ static void enum_key( const struct key *key, int index, int info_class, switch(info_class) { - case KeyBasicInformation: case KeyNameInformation: + namelen = 0; + for (k = key; k != root_key; k = k->parent) + namelen += k->namelen + sizeof(backslash); + if (!namelen) return; + namelen += sizeof(root_name) - sizeof(backslash); + /* fall through */ + case KeyBasicInformation: classlen = 0; /* only return the name */ /* fall through */ case KeyNodeInformation: @@ -935,6 +943,21 @@ static void enum_key( const struct key *key, int index, int info_class, memcpy( data, key->name, namelen ); memcpy( data + namelen, key->class, len - namelen ); } + else if (info_class == KeyNameInformation) + { + data_size_t pos = namelen; + reply->namelen = namelen; + for (k = key; k != root_key; k = k->parent) + { + pos -= k->namelen; + if (pos < len) memcpy( data + namelen, k->name, + min( k->namelen, len - pos ) ); + pos -= sizeof(backslash); + if (pos < len) memcpy( data + namelen, backslash, + min( sizeof(backslash), len - pos ) ); + } + memcpy( data, root_name, min( sizeof(root_name) - sizeof(backslash), len ) ); + } else { reply->namelen = len;

1 0

Nikolay Sivov : dwrite: Refuse to create IDWriteFontFace with invalid collection index.
by Alexandre Julliard Oct. 15, 2014

Oct. 15, 2014

Module: wine Branch: master Commit: d8a66e634c969925b9022a23eefb42ff3314247d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a66e634c969925b9022a23e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 12 18:18:10 2014 +0400 dwrite: Refuse to create IDWriteFontFace with invalid collection index. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 5 ++++- dlls/dwrite/opentype.c | 43 +++++++++++++++---------------------------- dlls/dwrite/tests/font.c | 10 +++++++--- 4 files changed, 27 insertions(+), 33 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index af3ae79..b3bd1df 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -107,7 +107,7 @@ extern HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE /* Opentype font table functions */ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; -extern HRESULT find_font_table(IDWriteFontFileStream *stream, UINT32 font_index, UINT32 tag, const void** table_data, void** table_context, UINT32 *table_size, BOOL* found) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_table(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,UINT32,const void**,void**,UINT32*,BOOL*) DECLSPEC_HIDDEN; extern VOID OpenType_CMAP_GetGlyphIndex(LPVOID data, DWORD utf32c, LPWORD pgi, DWORD flags) DECLSPEC_HIDDEN; extern VOID get_font_properties(LPCVOID os2, LPCVOID head, LPCVOID post, DWRITE_FONT_METRICS *metrics, DWRITE_FONT_STRETCH *stretch, DWRITE_FONT_WEIGHT *weight, DWRITE_FONT_STYLE *style) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 3291054..a220501 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -429,7 +429,7 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace2 *iface, UI continue; tablecontext->file_index = i; - hr = find_font_table(stream, This->data->index, table_tag, table_data, &tablecontext->context, table_size, exists); + hr = opentype_get_font_table(stream, This->data->type, This->data->index, table_tag, table_data, &tablecontext->context, table_size, exists); IDWriteFontFileStream_Release(stream); } @@ -1619,6 +1619,9 @@ HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facety *font_face = NULL; + if (facetype != DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION && index) + return E_INVALIDARG; + This = heap_alloc(sizeof(struct dwrite_fontface)); if (!This) return E_OUTOFMEMORY; This->data = heap_alloc(sizeof(struct dwrite_fontface_data)); diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 26ad333..9af04fd 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -225,48 +225,35 @@ HRESULT opentype_analyze_font(IDWriteFontFileStream *stream, UINT32* font_count, return S_OK; } -HRESULT find_font_table(IDWriteFontFileStream *stream, UINT32 font_index, UINT32 tag, const void** table_data, void** table_context, UINT32 *table_size, BOOL* found) +HRESULT opentype_get_font_table(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_TYPE type, UINT32 font_index, UINT32 tag, + const void **table_data, void **table_context, UINT32 *table_size, BOOL *found) { - const CHAR *first_data; - void *first_context; HRESULT hr; TTC_SFNT_V1 *font_header = NULL; void *sfnt_context; TT_TableRecord *table_record = NULL; void *table_record_context; + int table_count, table_offset = 0; int i; - int table_count; - int table_offset = 0; *found = FALSE; - hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&first_data, 0, 4, &first_context); - if (SUCCEEDED(hr)) - { - if (DWRITE_MAKE_OPENTYPE_TAG(first_data[0], first_data[1], first_data[2], first_data[3]) == MS_TTCF_TAG) - { - const TTC_Header_V1 *ttc_header; - void * ttc_context; - hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&ttc_header, 0, sizeof(*ttc_header), &ttc_context); - if (SUCCEEDED(hr)) - { - table_offset = GET_BE_DWORD(ttc_header->OffsetTable[0]); - if (font_index >= GET_BE_DWORD(ttc_header->numFonts)) - hr = E_INVALIDARG; - else - hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&font_header, table_offset, sizeof(*font_header), &sfnt_context); - IDWriteFontFileStream_ReleaseFileFragment(stream, ttc_context); - } - } - else - { - if (font_index > 0) + if (type == DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION) { + const TTC_Header_V1 *ttc_header; + void * ttc_context; + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&ttc_header, 0, sizeof(*ttc_header), &ttc_context); + if (SUCCEEDED(hr)) { + table_offset = GET_BE_DWORD(ttc_header->OffsetTable[0]); + if (font_index >= GET_BE_DWORD(ttc_header->numFonts)) hr = E_INVALIDARG; else - hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&font_header, 0, sizeof(*font_header), &sfnt_context); + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&font_header, table_offset, sizeof(*font_header), &sfnt_context); + IDWriteFontFileStream_ReleaseFileFragment(stream, ttc_context); } - IDWriteFontFileStream_ReleaseFileFragment(stream, first_context); } + else + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&font_header, 0, sizeof(*font_header), &sfnt_context); + if (FAILED(hr)) return hr; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 582cab0..65cd398 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -982,10 +982,14 @@ static void test_FontLoader(void) ok(face == DWRITE_FONT_FACE_TYPE_TRUETYPE, "got %i\n", face); ok(count == 1, "got %i\n", count); - hr = IDWriteFactory_CreateFontFace(factory, face, 1, &ffile, 0, 0, &fface); - ok(hr == S_OK, "got 0x%08x\n",hr); + /* invalid index */ + hr = IDWriteFactory_CreateFontFace(factory, face, 1, &ffile, 1, DWRITE_FONT_SIMULATIONS_NONE, &fface); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateFontFace(factory, face, 1, &ffile, 0, DWRITE_FONT_SIMULATIONS_NONE, &fface); + ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFace_GetGlyphIndices(fface, codePoints, 1, indices); - ok(hr == S_OK, "got0x%08x\n",hr); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(indices[0] == 6, "got index %i\n",indices[0]); IDWriteFontFace_Release(fface); IDWriteFontFile_Release(ffile);

1 0

Jacek Caban : mshtml: Added HTMLTextAreaElement::get_form implementation.
by Alexandre Julliard Oct. 15, 2014

Oct. 15, 2014

Module: wine Branch: master Commit: 57243f0dec78b6a40a09cfbdd93525ceaf741867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57243f0dec78b6a40a09cfbdd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 15 11:43:20 2014 +0200 mshtml: Added HTMLTextAreaElement::get_form implementation. --- dlls/mshtml/htmltextarea.c | 30 ++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 9fb8453..f756e08 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -196,8 +196,34 @@ static HRESULT WINAPI HTMLTextAreaElement_get_disabled(IHTMLTextAreaElement *ifa static HRESULT WINAPI HTMLTextAreaElement_get_form(IHTMLTextAreaElement *iface, IHTMLFormElement **p) { HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMHTMLFormElement *nsform; + nsIDOMNode *nsnode; + HTMLDOMNode *node; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLTextAreaElement_GetForm(This->nstextarea, &nsform); + assert(nsres == NS_OK); + + if(!nsform) { + *p = NULL; + return S_OK; + } + + nsres = nsIDOMHTMLFormElement_QueryInterface(nsform, &IID_nsIDOMNode, (void**)&nsnode); + nsIDOMHTMLFormElement_Release(nsform); + assert(nsres == NS_OK); + + hres = get_node(This->element.node.doc, nsnode, TRUE, &node); + nsIDOMNode_Release(nsnode); + if(FAILED(hres)) + return hres; + + hres = IHTMLDOMNode_QueryInterface(&node->IHTMLDOMNode_iface, &IID_IHTMLFormElement, (void**)p); + IHTMLDOMNode_Release(&node->IHTMLDOMNode_iface); + return hres; } static HRESULT WINAPI HTMLTextAreaElement_put_defaultValue(IHTMLTextAreaElement *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e1e18dc..5dc9a8f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1672,6 +1672,20 @@ static void _test_textarea_type(unsigned line, IUnknown *unk) SysFreeString(type); } +#define get_textarea_form(t) _get_textarea_form(__LINE__,t) +static IHTMLFormElement *_get_textarea_form(unsigned line, IUnknown *unk) +{ + IHTMLTextAreaElement *textarea = _get_textarea_iface(line, unk); + IHTMLFormElement *form; + HRESULT hres; + + hres = IHTMLTextAreaElement_get_form(textarea, &form); + IHTMLTextAreaElement_Release(textarea); + ok_(__FILE__,line)(hres == S_OK, "get_type failed: %08x\n", hres); + + return form; +} + #define test_comment_text(c,t) _test_comment_text(__LINE__,c,t) static void _test_comment_text(unsigned line, IUnknown *unk, const char *extext) { @@ -7807,12 +7821,35 @@ static void test_elems2(IHTMLDocument2 *doc) test_elem_set_innerhtml((IUnknown*)div, "<textarea id=\"ta\"></textarea>"); elem = get_elem_by_id(doc, "ta", TRUE); if(elem) { + IHTMLFormElement *form; + test_textarea_value((IUnknown*)elem, NULL); test_textarea_put_value((IUnknown*)elem, "test"); test_textarea_readonly((IUnknown*)elem, VARIANT_FALSE); test_textarea_put_readonly((IUnknown*)elem, VARIANT_TRUE); test_textarea_put_readonly((IUnknown*)elem, VARIANT_FALSE); test_textarea_type((IUnknown*)elem); + + form = get_textarea_form((IUnknown*)elem); + ok(!form, "form = %p\n", form); + + IHTMLElement_Release(elem); + } + + test_elem_set_innerhtml((IUnknown*)div, "<form id=\"fid\"><textarea id=\"ta\"></textarea></form>"); + elem = get_elem_by_id(doc, "ta", TRUE); + if(elem) { + IHTMLFormElement *form; + + elem2 = get_elem_by_id(doc, "fid", TRUE); + ok(elem2 != NULL, "elem2 == NULL\n"); + + form = get_textarea_form((IUnknown*)elem); + ok(form != NULL, "form = NULL\n"); + ok(iface_cmp((IUnknown*)form, (IUnknown*)elem2), "form != elem2\n"); + + IHTMLFormElement_Release(form); + IHTMLElement_Release(elem2); IHTMLElement_Release(elem); }

1 0

Nikolay Sivov : dwrite: Block negative max height/width for layout.
by Alexandre Julliard Oct. 15, 2014

Oct. 15, 2014

Module: wine Branch: master Commit: 617f668f49ddd6293799c29f8614fee4af60991d URL: http://source.winehq.org/git/wine.git/?a=commit;h=617f668f49ddd6293799c29f8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 14 10:03:28 2014 +0400 dwrite: Block negative max height/width for layout. --- dlls/dwrite/layout.c | 8 ++++++++ dlls/dwrite/tests/layout.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index c48a7c1..0afd466 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -772,6 +772,10 @@ static HRESULT WINAPI dwritetextlayout_SetMaxWidth(IDWriteTextLayout2 *iface, FL { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); TRACE("(%p)->(%.1f)\n", This, maxWidth); + + if (maxWidth < 0.0) + return E_INVALIDARG; + This->maxwidth = maxWidth; return S_OK; } @@ -780,6 +784,10 @@ static HRESULT WINAPI dwritetextlayout_SetMaxHeight(IDWriteTextLayout2 *iface, F { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); TRACE("(%p)->(%.1f)\n", This, maxHeight); + + if (maxHeight < 0.0) + return E_INVALIDARG; + This->maxheight = maxHeight; return S_OK; } diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index bff9d15..0975ee8 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -550,6 +550,7 @@ static void test_fontweight(void) IDWriteTextLayout *layout; DWRITE_FONT_WEIGHT weight; DWRITE_TEXT_RANGE range; + FLOAT size; HRESULT hr; hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_BOLD, DWRITE_FONT_STYLE_NORMAL, @@ -581,6 +582,48 @@ static void test_fontweight(void) ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "got %d\n", weight); ok(range.length == 6, "got %d\n", range.length); + size = IDWriteTextLayout_GetMaxWidth(layout); + ok(size == 100.0, "got %.2f\n", size); + + hr = IDWriteTextLayout_SetMaxWidth(layout, 0.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + size = IDWriteTextLayout_GetMaxWidth(layout); + ok(size == 0.0, "got %.2f\n", size); + + hr = IDWriteTextLayout_SetMaxWidth(layout, -1.0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + size = IDWriteTextLayout_GetMaxWidth(layout); + ok(size == 0.0, "got %.2f\n", size); + + hr = IDWriteTextLayout_SetMaxWidth(layout, 100.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + size = IDWriteTextLayout_GetMaxWidth(layout); + ok(size == 100.0, "got %.2f\n", size); + + size = IDWriteTextLayout_GetMaxHeight(layout); + ok(size == 100.0, "got %.2f\n", size); + + hr = IDWriteTextLayout_SetMaxHeight(layout, 0.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + size = IDWriteTextLayout_GetMaxHeight(layout); + ok(size == 0.0, "got %.2f\n", size); + + hr = IDWriteTextLayout_SetMaxHeight(layout, -1.0); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + size = IDWriteTextLayout_GetMaxHeight(layout); + ok(size == 0.0, "got %.2f\n", size); + + hr = IDWriteTextLayout_SetMaxHeight(layout, 100.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + + size = IDWriteTextLayout_GetMaxHeight(layout); + ok(size == 100.0, "got %.2f\n", size); + IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(fmt2); IDWriteTextFormat_Release(format);

1 0

Hans Leidekker : msi: Don't skip the media check for the first volume.
by Alexandre Julliard Oct. 15, 2014

Oct. 15, 2014

Module: wine Branch: master Commit: 5cb10c96b26d07b7d0aabe3b8e337c7ce144b8af URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb10c96b26d07b7d0aabe3b8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 15 15:30:23 2014 +0200 msi: Don't skip the media check for the first volume. Some installers require the first volume to be reinserted. --- dlls/msi/media.c | 9 +-------- dlls/msi/msipriv.h | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 8646069..c26ac41 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -298,9 +298,6 @@ static UINT CDECL msi_media_get_disk_info(MSIPACKAGE *package, MSIMEDIAINFO *mi) mi->cabinet = strdupW(MSI_RecordGetString(row, 4)); mi->volume_label = strdupW(MSI_RecordGetString(row, 5)); - if (!mi->first_volume) - mi->first_volume = strdupW(mi->volume_label); - msiobj_release(&row->hdr); return ERROR_SUCCESS; } @@ -673,7 +670,6 @@ void msi_free_media_info(MSIMEDIAINFO *mi) msi_free(mi->disk_prompt); msi_free(mi->cabinet); msi_free(mi->volume_label); - msi_free(mi->first_volume); msi_free(mi); } @@ -719,9 +715,6 @@ UINT msi_load_media_info(MSIPACKAGE *package, UINT Sequence, MSIMEDIAINFO *mi) mi->volume_label = strdupW(MSI_RecordGetString(row, 5)); msiobj_release(&row->hdr); - if (!mi->first_volume) - mi->first_volume = strdupW(mi->volume_label); - msi_set_sourcedir_props(package, FALSE); source_dir = msi_dup_property(package->db, szSourceDir); lstrcpyW(mi->sourcedir, source_dir); @@ -891,7 +884,7 @@ UINT ready_media( MSIPACKAGE *package, BOOL compressed, MSIMEDIAINFO *mi ) } } /* check volume matches, change media if not */ - if (mi->volume_label && mi->disk_id > 1 && strcmpW( mi->first_volume, mi->volume_label )) + if (mi->volume_label && mi->disk_id > 1) { WCHAR *source = msi_dup_property( package->db, szSourceDir ); BOOL match = source_matches_volume( mi, source ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 75d1920..d0b2247 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -154,7 +154,6 @@ typedef struct tagMSIMEDIAINFO UINT last_sequence; LPWSTR disk_prompt; LPWSTR cabinet; - LPWSTR first_volume; LPWSTR volume_label; BOOL is_continuous; BOOL is_extracted;

1 0

Sebastian Lackner : kernel32/tests: Add test to show ATL thunk emulator exceptions are not passed to usermode.
by Alexandre Julliard Oct. 15, 2014

Oct. 15, 2014

Module: wine Branch: master Commit: 511a849046e7a1d46d89e80bb9a6c209b79e9481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=511a849046e7a1d46d89e80bb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Oct 11 00:35:02 2014 +0200 kernel32/tests: Add test to show ATL thunk emulator exceptions are not passed to usermode. --- dlls/kernel32/tests/virtual.c | 72 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 66 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 434d880..d258190 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -35,7 +35,7 @@ #define NUM_THREADS 4 #define MAPPING_SIZE 0x100000 -static HINSTANCE hkernel32; +static HINSTANCE hkernel32, hntdll; static LPVOID (WINAPI *pVirtualAllocEx)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD); static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); static UINT (WINAPI *pGetWriteWatch)(DWORD,LPVOID,SIZE_T,LPVOID*,ULONG_PTR*,ULONG*); @@ -44,6 +44,8 @@ static NTSTATUS (WINAPI *pNtAreMappedFilesTheSame)(PVOID,PVOID); static NTSTATUS (WINAPI *pNtMapViewOfSection)(HANDLE, HANDLE, PVOID *, ULONG, SIZE_T, const LARGE_INTEGER *, SIZE_T *, ULONG, ULONG, ULONG); static DWORD (WINAPI *pNtUnmapViewOfSection)(HANDLE, PVOID); static struct _TEB * (WINAPI *pNtCurrentTeb)(void); +static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG, PVECTORED_EXCEPTION_HANDLER); +static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); /* ############################### */ @@ -1843,6 +1845,33 @@ static DWORD execute_fault_seh_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR return ExceptionContinueExecution; } +static LONG CALLBACK execute_fault_vec_handler( EXCEPTION_POINTERS *ExceptionInfo ) +{ + PEXCEPTION_RECORD rec = ExceptionInfo->ExceptionRecord; + DWORD old_prot; + BOOL success; + + trace( "exception: %08x flags:%x addr:%p info[0]:%ld info[1]:%p\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, + rec->ExceptionInformation[0], (void *)rec->ExceptionInformation[1] ); + + ok( rec->NumberParameters == 2, "NumberParameters is %d instead of 2\n", rec->NumberParameters ); + ok( rec->ExceptionCode == STATUS_ACCESS_VIOLATION, + "ExceptionCode is %08x instead of STATUS_ACCESS_VIOLATION\n", rec->ExceptionCode ); + + if (rec->ExceptionCode == STATUS_ACCESS_VIOLATION) + num_execute_fault_calls++; + + if (rec->ExceptionInformation[0] == EXCEPTION_READ_FAULT) + return EXCEPTION_CONTINUE_SEARCH; + + success = VirtualProtect( (void *)rec->ExceptionInformation[1], 16, PAGE_EXECUTE_READWRITE, &old_prot ); + ok( success, "VirtualProtect failed %u\n", GetLastError() ); + ok( old_prot == PAGE_NOACCESS, "wrong old prot %x\n", old_prot ); + + return EXCEPTION_CONTINUE_EXECUTION; +} + static inline DWORD send_message_excpt( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { EXCEPTION_REGISTRATION_RECORD frame; @@ -2021,6 +2050,34 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + /* The following test shows that on Windows, even a vectored exception handler + * cannot intercept internal exceptions thrown by the ATL thunk emulation layer. */ + + if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && !(dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION)) + { + if (pRtlAddVectoredExceptionHandler && pRtlRemoveVectoredExceptionHandler) + { + PVOID vectored_handler; + + success = VirtualProtect( base, size, PAGE_NOACCESS, &old_prot ); + ok( success, "VirtualProtect failed %u\n", GetLastError() ); + + vectored_handler = pRtlAddVectoredExceptionHandler( TRUE, &execute_fault_vec_handler ); + ok( vectored_handler != 0, "RtlAddVectoredExceptionHandler failed\n" ); + + num_execute_fault_calls = 0; + ret = SendMessageA( hWnd, WM_USER, 0, 0 ); + + pRtlRemoveVectoredExceptionHandler( vectored_handler ); + + ok( ret == 43, "call returned wrong result, expected 43, got %d\n", ret ); + todo_wine + ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + } + else + win_skip( "RtlAddVectoredExceptionHandler or RtlRemoveVectoredExceptionHandler not found\n" ); + } + /* Restore the JMP instruction, set to executable, and then destroy the Window */ memcpy( base, code_jmp, sizeof(code_jmp) ); @@ -3265,15 +3322,18 @@ START_TEST(virtual) } hkernel32 = GetModuleHandleA("kernel32.dll"); + hntdll = GetModuleHandleA("ntdll.dll"); + pVirtualAllocEx = (void *) GetProcAddress(hkernel32, "VirtualAllocEx"); pVirtualFreeEx = (void *) GetProcAddress(hkernel32, "VirtualFreeEx"); pGetWriteWatch = (void *) GetProcAddress(hkernel32, "GetWriteWatch"); pResetWriteWatch = (void *) GetProcAddress(hkernel32, "ResetWriteWatch"); - pNtAreMappedFilesTheSame = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), - "NtAreMappedFilesTheSame" ); - pNtMapViewOfSection = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtMapViewOfSection"); - pNtUnmapViewOfSection = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtUnmapViewOfSection"); - pNtCurrentTeb = (void *)GetProcAddress( GetModuleHandleA("ntdll.dll"), "NtCurrentTeb" ); + pNtAreMappedFilesTheSame = (void *)GetProcAddress( hntdll, "NtAreMappedFilesTheSame" ); + pNtMapViewOfSection = (void *)GetProcAddress( hntdll, "NtMapViewOfSection" ); + pNtUnmapViewOfSection = (void *)GetProcAddress( hntdll, "NtUnmapViewOfSection" ); + pNtCurrentTeb = (void *)GetProcAddress( hntdll, "NtCurrentTeb" ); + pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlAddVectoredExceptionHandler" ); + pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" ); test_shared_memory(FALSE); test_shared_memory_ro(FALSE, FILE_MAP_READ|FILE_MAP_WRITE);

1 0

Stefan Dösinger : d3d9/tests: Allow a width and height to be passed to create_device() in the d3d9ex tests.
by Alexandre Julliard Oct. 15, 2014

Oct. 15, 2014

Module: wine Branch: master Commit: a426d335a4f4a7a5f5e02ab67610bbcebd0f5ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a426d335a4f4a7a5f5e02ab67… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 14 23:17:01 2014 +0200 d3d9/tests: Allow a width and height to be passed to create_device() in the d3d9ex tests. --- dlls/d3d9/tests/d3d9ex.c | 49 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 582538f..03b693c 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -30,6 +30,14 @@ static HMODULE d3d9_handle = 0; static HRESULT (WINAPI *pDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **d3d9ex); +struct device_desc +{ + HWND device_window; + unsigned int width; + unsigned int height; + BOOL windowed; +}; + static HWND create_window(void) { WNDCLASSA wc = {0}; @@ -42,7 +50,7 @@ static HWND create_window(void) 0, 0, 640, 480, 0, 0, 0, 0); } -static IDirect3DDevice9Ex *create_device(HWND device_window, HWND focus_window, BOOL windowed) +static IDirect3DDevice9Ex *create_device(HWND focus_window, const struct device_desc *desc) { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9Ex *device; @@ -52,23 +60,31 @@ static IDirect3DDevice9Ex *create_device(HWND device_window, HWND focus_window, if (FAILED(pDirect3DCreate9Ex(D3D_SDK_VERSION, &d3d9))) return NULL; - present_parameters.Windowed = windowed; - present_parameters.hDeviceWindow = device_window; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; present_parameters.BackBufferWidth = 640; present_parameters.BackBufferHeight = 480; present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + present_parameters.hDeviceWindow = focus_window; + present_parameters.Windowed = TRUE; present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; + if (desc) + { + present_parameters.BackBufferWidth = desc->width; + present_parameters.BackBufferHeight = desc->height; + present_parameters.hDeviceWindow = desc->device_window; + present_parameters.Windowed = desc->windowed; + } + mode.Size = sizeof(mode); - mode.Width = 640; - mode.Height = 480; + mode.Width = present_parameters.BackBufferWidth; + mode.Height = present_parameters.BackBufferHeight; mode.RefreshRate = 0; mode.Format = D3DFMT_A8R8G8B8; mode.ScanLineOrdering = 0; - m = windowed ? NULL : &mode; + m = present_parameters.Windowed ? NULL : &mode; if (SUCCEEDED(IDirect3D9Ex_CreateDeviceEx(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, m, &device))) goto done; @@ -326,7 +342,7 @@ static void test_swapchain_get_displaymode_ex(void) window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); - if (!(device = create_device(window, window, TRUE))) + if (!(device = create_device(window, NULL))) { skip("Failed to create a D3D device, skipping swapchain GetDisplayModeEx tests.\n"); goto out; @@ -537,7 +553,7 @@ static void test_user_memory(void) D3DCAPS9 caps; window = create_window(); - if (!(device = create_device(window, window, TRUE))) + if (!(device = create_device(window, NULL))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -667,7 +683,7 @@ static void test_reset(void) UINT mode_count = 0; window = create_window(); - if (!(device = create_device(window, window, TRUE))) + if (!(device = create_device(window, NULL))) { skip("Failed to create a D3D device, skipping test.\n"); DestroyWindow(window); @@ -1035,7 +1051,7 @@ static void test_reset_resources(void) window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); - if (!(device = create_device(window, window, TRUE))) + if (!(device = create_device(window, NULL))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -1101,7 +1117,7 @@ static void test_vidmem_accounting(void) window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); - if (!(device = create_device(window, window, TRUE))) + if (!(device = create_device(window, NULL))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -1148,7 +1164,7 @@ static void test_user_memory_getdc(void) window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); - if (!(device = create_device(window, window, TRUE))) + if (!(device = create_device(window, NULL))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; @@ -1187,10 +1203,15 @@ static void test_lost_device(void) HWND window; HRESULT hr; BOOL ret; + struct device_desc desc; window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL); - if (!(device = create_device(window, window, FALSE))) + desc.device_window = window; + desc.width = 640; + desc.height = 480; + desc.windowed = FALSE; + if (!(device = create_device(window, &desc))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done;

1 0

Sebastian Lackner : ntdll: Improve check_atl_thunk to prevent passing exceptions to the usermode application.
by Alexandre Julliard Oct. 15, 2014

Oct. 15, 2014

Module: wine Branch: master Commit: 34b2d920b47122007b65d435e064d018fb37b21f URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b2d920b47122007b65d435e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 14 06:22:55 2014 +0200 ntdll: Improve check_atl_thunk to prevent passing exceptions to the usermode application. --- dlls/kernel32/tests/virtual.c | 1 - dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/signal_i386.c | 20 +++++------ dlls/ntdll/virtual.c | 78 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index d258190..73b753e 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2071,7 +2071,6 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) pRtlRemoveVectoredExceptionHandler( vectored_handler ); ok( ret == 43, "call returned wrong result, expected 43, got %d\n", ret ); - todo_wine ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); } else diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 4370084..aac9320 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -169,6 +169,8 @@ extern BOOL virtual_is_valid_code_address( const void *addr, SIZE_T size ) DECLS extern NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_write( void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; +extern SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T size ) DECLSPEC_HIDDEN; +extern SIZE_T virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_T size ) DECLSPEC_HIDDEN; extern void VIRTUAL_SetForceExec( BOOL enable ) DECLSPEC_HIDDEN; extern void virtual_release_address_space(void) DECLSPEC_HIDDEN; extern void virtual_set_large_address_space(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 7f01554..f97799c 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1633,26 +1633,24 @@ struct atl_thunk static BOOL check_atl_thunk( EXCEPTION_RECORD *rec, CONTEXT *context ) { const struct atl_thunk *thunk = (const struct atl_thunk *)rec->ExceptionInformation[1]; + struct atl_thunk thunk_copy; BOOL ret = FALSE; - if (!virtual_is_valid_code_address( thunk, sizeof(*thunk) )) return FALSE; + if (virtual_uninterrupted_read_memory( thunk, &thunk_copy, sizeof(*thunk) ) != sizeof(*thunk)) + return FALSE; - __TRY + if (thunk_copy.movl == 0x042444c7 && thunk_copy.jmp == 0xe9) { - if (thunk->movl == 0x042444c7 && thunk->jmp == 0xe9) + if (virtual_uninterrupted_write_memory( (DWORD *)context->Esp + 1, + &thunk_copy.this, sizeof(DWORD) ) == sizeof(DWORD)) { - *((DWORD *)context->Esp + 1) = thunk->this; - context->Eip = (DWORD_PTR)(&thunk->func + 1) + thunk->func; + context->Eip = (DWORD_PTR)(&thunk->func + 1) + thunk_copy.func; TRACE( "emulating ATL thunk at %p, func=%08x arg=%08x\n", - thunk, context->Eip, *((DWORD *)context->Esp + 1) ); + thunk, context->Eip, thunk_copy.this ); ret = TRUE; } } - __EXCEPT_PAGE_FAULT - { - return FALSE; - } - __ENDTRY + return ret; } diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d2bb152..4c4c05d 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1672,6 +1672,84 @@ BOOL virtual_check_buffer_for_write( void *ptr, SIZE_T size ) /*********************************************************************** + * virtual_uninterrupted_read_memory + * + * Similar to NtReadVirtualMemory, but without wineserver calls. Moreover + * permissions are checked before accessing each page, to ensure that no + * exceptions can happen. + */ +SIZE_T virtual_uninterrupted_read_memory( const void *addr, void *buffer, SIZE_T size ) +{ + struct file_view *view; + sigset_t sigset; + SIZE_T bytes_read = 0; + + if (!size) return 0; + + server_enter_uninterrupted_section( &csVirtual, &sigset ); + if ((view = VIRTUAL_FindView( addr, size ))) + { + if (!(view->protect & VPROT_SYSTEM)) + { + void *page = ROUND_ADDR( addr, page_mask ); + BYTE *p = view->prot + (((const char *)page - (const char *)view->base) >> page_shift); + + while (bytes_read < size && (VIRTUAL_GetUnixProt( *p++ ) & PROT_READ)) + { + SIZE_T block_size = min( size, page_size - ((UINT_PTR)addr & page_mask) ); + memcpy( buffer, addr, block_size ); + + addr = (const void *)((const char *)addr + block_size); + buffer = (void *)((char *)buffer + block_size); + bytes_read += block_size; + } + } + } + server_leave_uninterrupted_section( &csVirtual, &sigset ); + return bytes_read; +} + + +/*********************************************************************** + * virtual_uninterrupted_write_memory + * + * Similar to NtWriteVirtualMemory, but without wineserver calls. Moreover + * permissions are checked before accessing each page, to ensure that no + * exceptions can happen. + */ +SIZE_T virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_T size ) +{ + struct file_view *view; + sigset_t sigset; + SIZE_T bytes_written = 0; + + if (!size) return 0; + + server_enter_uninterrupted_section( &csVirtual, &sigset ); + if ((view = VIRTUAL_FindView( addr, size ))) + { + if (!(view->protect & VPROT_SYSTEM)) + { + void *page = ROUND_ADDR( addr, page_mask ); + BYTE *p = view->prot + (((const char *)page - (const char *)view->base) >> page_shift); + + while (bytes_written < size && (VIRTUAL_GetUnixProt( *p++ ) & PROT_WRITE)) + { + SIZE_T block_size = min( size, page_size - ((UINT_PTR)addr & page_mask) ); + memcpy( addr, buffer, block_size ); + + addr = (void *)((char *)addr + block_size); + buffer = (const void *)((const char *)buffer + block_size); + bytes_written += block_size; + } + } + } + server_leave_uninterrupted_section( &csVirtual, &sigset ); + return bytes_written; +} + + +/*********************************************************************** * VIRTUAL_SetForceExec * * Whether to force exec prot on all views.

1 0

Nikolay Sivov : msdmo: Implement IEnumDMO_Clone(), fix trace messages.
by Alexandre Julliard Oct. 15, 2014

Oct. 15, 2014

Module: wine Branch: master Commit: 1f93f5350b017cea0881310bc6a373041000a9ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f93f5350b017cea0881310bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 15 08:38:55 2014 +0400 msdmo: Implement IEnumDMO_Clone(), fix trace messages. --- dlls/msdmo/dmoreg.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index f271da6..e8f67c5 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -436,43 +436,38 @@ lerr: return hr; } - /****************************************************************************** * IEnumDMO_fnAddRef */ static ULONG WINAPI IEnumDMO_fnAddRef(IEnumDMO * iface) { IEnumDMOImpl *This = impl_from_IEnumDMO(iface); - return InterlockedIncrement(&This->ref); + ULONG refCount = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, refCount); + return refCount; } - /************************************************************************** * EnumDMO_QueryInterface */ -static HRESULT WINAPI IEnumDMO_fnQueryInterface( - IEnumDMO* iface, - REFIID riid, - LPVOID *ppvObj) +static HRESULT WINAPI IEnumDMO_fnQueryInterface(IEnumDMO* iface, REFIID riid, void **ppvObj) { + IEnumDMOImpl *This = impl_from_IEnumDMO(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObj); + *ppvObj = NULL; if (IsEqualIID(riid, &IID_IEnumDMO) || IsEqualIID(riid, &IID_IUnknown)) { *ppvObj = iface; + IEnumDMO_fnAddRef(iface); } - if(*ppvObj) - { - IEnumDMO_fnAddRef(*ppvObj); - return S_OK; - } - - return E_NOINTERFACE; + return *ppvObj ? S_OK : E_NOINTERFACE; } - /****************************************************************************** * IEnumDMO_fnRelease */ @@ -481,6 +476,8 @@ static ULONG WINAPI IEnumDMO_fnRelease(IEnumDMO * iface) IEnumDMOImpl *This = impl_from_IEnumDMO(iface); ULONG refCount = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, refCount); + if (!refCount) { IEnumDMOImpl_Destructor(This); @@ -512,7 +509,7 @@ static HRESULT WINAPI IEnumDMO_fnNext( IEnumDMOImpl *This = impl_from_IEnumDMO(iface); - TRACE("--> (%p) %d %p %p %p\n", iface, cItemsToFetch, pCLSID, Names, pcItemsFetched); + TRACE("(%p)->(%d %p %p %p)\n", This, cItemsToFetch, pCLSID, Names, pcItemsFetched); if (!pCLSID || !Names || !pcItemsFetched) return E_POINTER; @@ -651,6 +648,7 @@ static HRESULT WINAPI IEnumDMO_fnSkip(IEnumDMO * iface, DWORD cItemsToSkip) { IEnumDMOImpl *This = impl_from_IEnumDMO(iface); + TRACE("(%p)->(%d)\n", This, cItemsToSkip); This->index += cItemsToSkip; return S_OK; @@ -664,6 +662,7 @@ static HRESULT WINAPI IEnumDMO_fnReset(IEnumDMO * iface) { IEnumDMOImpl *This = impl_from_IEnumDMO(iface); + TRACE("(%p)\n", This); This->index = -1; return S_OK; @@ -673,13 +672,12 @@ static HRESULT WINAPI IEnumDMO_fnReset(IEnumDMO * iface) /****************************************************************************** * IEnumDMO_fnClone */ -static HRESULT WINAPI IEnumDMO_fnClone(IEnumDMO * iface, IEnumDMO **ppEnum) +static HRESULT WINAPI IEnumDMO_fnClone(IEnumDMO *iface, IEnumDMO **ppEnum) { IEnumDMOImpl *This = impl_from_IEnumDMO(iface); - - FIXME("(%p)->() to (%p)->() E_NOTIMPL\n", This, ppEnum); - - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, ppEnum); + return IEnumDMO_Constructor(This->guidCategory, This->dwFlags, This->cInTypes, This->pInTypes, + This->cOutTypes, This->pOutTypes, ppEnum); }

1 0

André Hentschel : winhttp/tests: Fix typo.
by Alexandre Julliard Oct. 15, 2014

Oct. 15, 2014

Module: wine Branch: master Commit: 19fe621dfdcfeb83ca227e2ecf0df5a8d6f8cbf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19fe621dfdcfeb83ca227e2ec… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 14 14:55:05 2014 +0200 winhttp/tests: Fix typo. --- dlls/winhttp/tests/winhttp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index cf2312f..1c56923 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -876,7 +876,7 @@ static void test_secure_connection(void) ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT, &info, &size ); ok(ret, "failed to retrieve certificate info %u\n", GetLastError()); - if (!ret) + if (ret) { trace("lpszSubjectInfo %s\n", wine_dbgstr_w(info.lpszSubjectInfo)); trace("lpszIssuerInfo %s\n", wine_dbgstr_w(info.lpszIssuerInfo));

1 0

Nikolay Sivov : msdmo: Cleanup IEnumDMO creation code.
by Alexandre Julliard Oct. 15, 2014

Oct. 15, 2014

Module: wine Branch: master Commit: 06c52ce9404423370158e4186d115b2c8bade4a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c52ce9404423370158e4186… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 15 08:26:08 2014 +0400 msdmo: Cleanup IEnumDMO creation code. --- dlls/msdmo/dmoreg.c | 134 ++++++++++++++++++++++++++-------------------------- 1 file changed, 68 insertions(+), 66 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index e0c0719..f271da6 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -352,79 +352,88 @@ static BOOL IEnumDMOImpl_Destructor(IEnumDMOImpl* This) /************************************************************************** * IEnumDMO_Constructor */ -static IEnumDMO * IEnumDMO_Constructor( +static HRESULT IEnumDMO_Constructor( REFGUID guidCategory, DWORD dwFlags, DWORD cInTypes, const DMO_PARTIAL_MEDIATYPE *pInTypes, DWORD cOutTypes, - const DMO_PARTIAL_MEDIATYPE *pOutTypes) + const DMO_PARTIAL_MEDIATYPE *pOutTypes, + IEnumDMO **obj) { - UINT size; IEnumDMOImpl* lpedmo; - BOOL ret = FALSE; + HRESULT hr = S_OK; + UINT size; + + *obj = NULL; lpedmo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IEnumDMOImpl)); + if (!lpedmo) + return E_OUTOFMEMORY; - if (lpedmo) - { - lpedmo->ref = 1; - lpedmo->IEnumDMO_iface.lpVtbl = &edmovt; - lpedmo->index = -1; - lpedmo->guidCategory = guidCategory; - lpedmo->dwFlags = dwFlags; + lpedmo->IEnumDMO_iface.lpVtbl = &edmovt; + lpedmo->ref = 1; + lpedmo->index = -1; + lpedmo->guidCategory = guidCategory; + lpedmo->dwFlags = dwFlags; - if (cInTypes > 0) + if (cInTypes > 0) + { + size = cInTypes * sizeof(DMO_PARTIAL_MEDIATYPE); + lpedmo->pInTypes = HeapAlloc(GetProcessHeap(), 0, size); + if (!lpedmo->pInTypes) { - size = cInTypes * sizeof(DMO_PARTIAL_MEDIATYPE); - lpedmo->pInTypes = HeapAlloc(GetProcessHeap(), 0, size); - if (!lpedmo->pInTypes) - goto lerr; - memcpy(lpedmo->pInTypes, pInTypes, size); - lpedmo->cInTypes = cInTypes; + hr = E_OUTOFMEMORY; + goto lerr; } + memcpy(lpedmo->pInTypes, pInTypes, size); + lpedmo->cInTypes = cInTypes; + } - if (cOutTypes > 0) + if (cOutTypes > 0) + { + size = cOutTypes * sizeof(DMO_PARTIAL_MEDIATYPE); + lpedmo->pOutTypes = HeapAlloc(GetProcessHeap(), 0, size); + if (!lpedmo->pOutTypes) { - size = cOutTypes * sizeof(DMO_PARTIAL_MEDIATYPE); - lpedmo->pOutTypes = HeapAlloc(GetProcessHeap(), 0, size); - if (!lpedmo->pOutTypes) - goto lerr; - memcpy(lpedmo->pOutTypes, pOutTypes, size); - lpedmo->cOutTypes = cOutTypes; + hr = E_OUTOFMEMORY; + goto lerr; } + memcpy(lpedmo->pOutTypes, pOutTypes, size); + lpedmo->cOutTypes = cOutTypes; + } - /* If not filtering by category enum from media objects root */ - if (IsEqualGUID(guidCategory, &GUID_NULL)) - { - if (ERROR_SUCCESS == RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, - 0, KEY_READ, &lpedmo->hkey)) - ret = TRUE; - } - else - { - WCHAR szguid[64]; - WCHAR szKey[MAX_PATH]; - - wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories, - GUIDToString(szguid, guidCategory)); - if (ERROR_SUCCESS == RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, - 0, KEY_READ, &lpedmo->hkey)) - ret = TRUE; - } + /* If not filtering by category enum from media objects root */ + if (IsEqualGUID(guidCategory, &GUID_NULL)) + { + if (!RegOpenKeyExW(HKEY_CLASSES_ROOT, szDMORootKey, 0, KEY_READ, &lpedmo->hkey)) + hr = E_FAIL; + } + else + { + WCHAR szguid[64]; + WCHAR szKey[MAX_PATH]; -lerr: - if(!ret) - { - IEnumDMOImpl_Destructor(lpedmo); - HeapFree(GetProcessHeap(),0,lpedmo); - lpedmo = NULL; - } + wsprintfW(szKey, szCat3Fmt, szDMORootKey, szDMOCategories, + GUIDToString(szguid, guidCategory)); + if (!RegOpenKeyExW(HKEY_CLASSES_ROOT, szKey, 0, KEY_READ, &lpedmo->hkey)) + hr = E_FAIL; } - TRACE("returning %p\n", lpedmo); +lerr: - return (IEnumDMO*)lpedmo; + if (FAILED(hr)) + { + IEnumDMOImpl_Destructor(lpedmo); + HeapFree(GetProcessHeap(), 0, lpedmo); + } + else + { + TRACE("returning %p\n", lpedmo); + *obj = &lpedmo->IEnumDMO_iface; + } + + return hr; } @@ -446,14 +455,13 @@ static HRESULT WINAPI IEnumDMO_fnQueryInterface( REFIID riid, LPVOID *ppvObj) { - IEnumDMOImpl *This = impl_from_IEnumDMO(iface); - *ppvObj = NULL; - if(IsEqualIID(riid, &IID_IUnknown)) - *ppvObj = This; - else if(IsEqualIID(riid, &IID_IEnumDMO)) - *ppvObj = This; + if (IsEqualIID(riid, &IID_IEnumDMO) || + IsEqualIID(riid, &IID_IUnknown)) + { + *ppvObj = iface; + } if(*ppvObj) { @@ -689,17 +697,11 @@ HRESULT WINAPI DMOEnum( const DMO_PARTIAL_MEDIATYPE *pOutTypes, IEnumDMO **ppEnum) { - HRESULT hres = E_FAIL; - TRACE("guidCategory=%p dwFlags=0x%08x cInTypes=%d cOutTypes=%d\n", guidCategory, dwFlags, cInTypes, cOutTypes); - *ppEnum = IEnumDMO_Constructor(guidCategory, dwFlags, cInTypes, - pInTypes, cOutTypes, pOutTypes); - if (*ppEnum) - hres = S_OK; - - return hres; + return IEnumDMO_Constructor(guidCategory, dwFlags, cInTypes, + pInTypes, cOutTypes, pOutTypes, ppEnum); }

1 0

Qian Hong : ntoskrnl.exe: Export InitSafeBootMode.
by Alexandre Julliard Oct. 15, 2014

Oct. 15, 2014

Module: wine Branch: master Commit: 1ec64dcd239e10fb5f90e0a4ffea7bdedec742be URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ec64dcd239e10fb5f90e0a4f… Author: Qian Hong <qhong(a)codeweavers.com> Date: Tue Oct 14 23:14:00 2014 +0800 ntoskrnl.exe: Export InitSafeBootMode. --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 + dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 17a0d39..7bb96fb 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -44,6 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); WINE_DECLARE_DEBUG_CHANNEL(relay); BOOLEAN KdDebuggerEnabled = FALSE; +ULONG InitSafeBootMode = 0; extern LONG CALLBACK vectored_handler( EXCEPTION_POINTERS *ptrs ); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index b9de94b..11aaa2b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -302,7 +302,7 @@ @ stub InbvSetScrollRegion @ stub InbvSetTextColor @ stub InbvSolidColorFill -@ stub InitSafeBootMode +@ extern InitSafeBootMode @ stdcall IoAcquireCancelSpinLock(ptr) @ stdcall IoAcquireRemoveLockEx(ptr ptr ptr long long) @ stub IoAcquireVpbSpinLock

1 0

Henri Verbeet : d3d8/tests: Allow a width and height to be passed to create_device().
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: 62771c7dda35d535f461f3500c1d70a1ac115146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62771c7dda35d535f461f3500… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 14 13:56:45 2014 +0200 d3d8/tests: Allow a width and height to be passed to create_device(). --- dlls/d3d8/tests/device.c | 188 +++++++++++++++++++++++++++++------------------ 1 file changed, 115 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62771c7dda35d535f461f…

1 0

Shuai Meng : vbscript: Implemented Timer.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: 7a4860104772597b70444238b82887bd0932f783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a4860104772597b70444238b… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Mon Oct 13 17:18:24 2014 +0800 vbscript: Implemented Timer. --- dlls/vbscript/global.c | 19 +++++++++++++++++-- dlls/vbscript/tests/api.vbs | 2 ++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 93fdcc3..bbbe22c 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -130,6 +130,16 @@ static inline HRESULT return_double(VARIANT *res, double val) return S_OK; } +static inline HRESULT return_float(VARIANT *res, float val) +{ + if(res) { + V_VT(res) = VT_R4; + V_R4(res) = val; + } + + return S_OK; +} + static inline HRESULT return_null(VARIANT *res) { if(res) @@ -760,8 +770,13 @@ static HRESULT Global_Rnd(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_Timer(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SYSTEMTIME lt; + double sec; + + GetLocalTime(&lt); + sec = lt.wHour * 3600 + lt.wMinute * 60 + lt.wSecond + lt.wMilliseconds / 1000.0; + return return_float(res, sec); + } static HRESULT Global_LBound(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index e2efa98..1b68d2e 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1264,4 +1264,6 @@ Call ok(getVT(RGB(&h1&, &h100&, &h111&)) = "VT_I4", "getVT(RGB(&h1&, &h100&, &h1 Call testRGBError(-1, &h1e&, &h3b&, 5) Call testRGBError(&h4d&, -2, &h2f&, 5) +Call ok(getVT(Timer) = "VT_R4", "getVT(Timer) = " & getVT(Timer)) + Call reportSuccess()

1 0

Nikolay Sivov : dwrite: Create single shared factory.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: 100698771286eb6ba98dc4f06824a12c285ac212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=100698771286eb6ba98dc4f06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 9 09:05:27 2014 +0400 dwrite: Create single shared factory. --- dlls/dwrite/main.c | 155 +++++++++++++++++++++++++++++++++++++---------- dlls/dwrite/tests/font.c | 55 +++++++++++++++-- 2 files changed, 175 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=100698771286eb6ba98dc…

1 0

Nikolay Sivov : widl: Generate method macros/ wrappers for overridden methods.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: c27af4774e769824f0ebe6f1e5733fc2c99659d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c27af4774e769824f0ebe6f1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 13 14:23:22 2014 +0400 widl: Generate method macros/wrappers for overridden methods. --- dlls/dwrite/tests/layout.c | 15 +++++++---- tools/widl/header.c | 67 +++++++++++++++++++++++++++++++++++++--------- 2 files changed, 65 insertions(+), 17 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 2e4618a..bff9d15 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -478,7 +478,7 @@ static void test_GetLocaleName(void) static const WCHAR strW[] = {'s','t','r','i','n','g',0}; static const WCHAR ruW[] = {'r','u',0}; IDWriteTextLayout *layout; - IDWriteTextFormat *format; + IDWriteTextFormat *format, *format2; WCHAR buff[10]; UINT32 len; HRESULT hr; @@ -489,13 +489,17 @@ static void test_GetLocaleName(void) hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 0, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); ok(hr == S_OK, "got 0x%08x\n", hr); - len = IDWriteTextLayout_GetLocaleNameLength(layout); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextFormat, (void**)&format2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + len = IDWriteTextFormat_GetLocaleNameLength(format2); ok(len == 2, "got %u\n", len); len = IDWriteTextFormat_GetLocaleNameLength(format); ok(len == 2, "got %u\n", len); - hr = IDWriteTextLayout_GetLocaleName(layout, buff, len); + hr = IDWriteTextFormat_GetLocaleName(format2, buff, len); ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); - hr = IDWriteTextLayout_GetLocaleName(layout, buff, len+1); + hr = IDWriteTextFormat_GetLocaleName(format2, buff, len+1); ok(hr == S_OK, "got 0x%08x\n", hr); ok(!lstrcmpW(buff, ruW), "got %s\n", wine_dbgstr_w(buff)); hr = IDWriteTextFormat_GetLocaleName(format, buff, len); @@ -506,6 +510,7 @@ static void test_GetLocaleName(void) IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); + IDWriteTextFormat_Release(format2); } static void test_CreateEllipsisTrimmingSign(void) @@ -571,7 +576,7 @@ static void test_fontweight(void) range.length = 0; weight = DWRITE_FONT_WEIGHT_BOLD; - hr = layout->lpVtbl->IDWriteTextLayout_GetFontWeight(layout, 0, &weight, &range); + hr = IDWriteTextLayout_GetFontWeight(layout, 0, &weight, &range); ok(hr == S_OK, "got 0x%08x\n", hr); ok(weight == DWRITE_FONT_WEIGHT_NORMAL, "got %d\n", weight); ok(range.length == 6, "got %d\n", range.length); diff --git a/tools/widl/header.c b/tools/widl/header.c index f0f0156..c23faf4 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -828,6 +828,32 @@ static int is_inherited_method(const type_t *iface, const var_t *func) return 0; } +static int is_override_method(const type_t *iface, const type_t *child, const var_t *func) +{ + if (iface == child) + return 0; + + do + { + const statement_t *stmt; + STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(child)) + { + const var_t *funccmp = stmt->u.var; + + if (!is_callas(func->attrs)) + { + char inherit_name[256]; + /* compare full name including property prefix */ + strcpy(inherit_name, get_name(funccmp)); + if (!strcmp(inherit_name, get_name(func))) return 1; + } + } + } + while ((child = type_iface_get_inherit(child)) && child != iface); + + return 0; +} + static int is_aggregate_return(const var_t *func) { enum type_type type = type_get_type(type_function_get_rettype(func->type)); @@ -835,13 +861,23 @@ static int is_aggregate_return(const var_t *func) type == TYPE_COCLASS || type == TYPE_INTERFACE; } -static void write_method_macro(FILE *header, const type_t *iface, const char *name) +static char *get_vtbl_entry_name(const type_t *iface, const var_t *func) +{ + static char buff[255]; + if (is_inherited_method(iface, func)) + sprintf(buff, "%s_%s", iface->name, get_name(func)); + else + sprintf(buff, "%s", get_name(func)); + return buff; +} + +static void write_method_macro(FILE *header, const type_t *iface, const type_t *child, const char *name) { const statement_t *stmt; int first_iface = 1; if (type_iface_get_inherit(iface)) - write_method_macro(header, type_iface_get_inherit(iface), name); + write_method_macro(header, type_iface_get_inherit(iface), child, name); STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { @@ -853,8 +889,10 @@ static void write_method_macro(FILE *header, const type_t *iface, const char *na first_iface = 0; } - if (!is_callas(func->attrs) && !is_inherited_method(iface, func) && - !is_aggregate_return(func)) { + if (is_override_method(iface, child, func)) + continue; + + if (!is_callas(func->attrs) && !is_aggregate_return(func)) { const var_t *arg; fprintf(header, "#define %s_%s(This", name, get_name(func)); @@ -863,7 +901,7 @@ static void write_method_macro(FILE *header, const type_t *iface, const char *na fprintf(header, ",%s", arg->name); fprintf(header, ") "); - fprintf(header, "(This)->lpVtbl->%s(This", get_name(func)); + fprintf(header, "(This)->lpVtbl->%s(This", get_vtbl_entry_name(iface, func)); if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry ) fprintf(header, ",%s", arg->name); @@ -929,13 +967,13 @@ static void write_cpp_method_def(FILE *header, const type_t *iface) } } -static void write_inline_wrappers(FILE *header, const type_t *iface, const char *name) +static void write_inline_wrappers(FILE *header, const type_t *iface, const type_t *child, const char *name) { const statement_t *stmt; int first_iface = 1; if (type_iface_get_inherit(iface)) - write_inline_wrappers(header, type_iface_get_inherit(iface), name); + write_inline_wrappers(header, type_iface_get_inherit(iface), child, name); STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { @@ -947,7 +985,10 @@ static void write_inline_wrappers(FILE *header, const type_t *iface, const char first_iface = 0; } - if (!is_callas(func->attrs) && !is_inherited_method(iface, func)) { + if (is_override_method(iface, child, func)) + continue; + + if (!is_callas(func->attrs)) { const var_t *arg; fprintf(header, "static FORCEINLINE "); @@ -960,13 +1001,13 @@ static void write_inline_wrappers(FILE *header, const type_t *iface, const char indent(header, 0); fprintf(header, "%sThis->lpVtbl->%s(This", is_void(type_function_get_rettype(func->type)) ? "" : "return ", - get_name(func)); + get_vtbl_entry_name(iface, func)); } else { indent(header, 0); write_type_decl_left(header, type_function_get_rettype(func->type)); fprintf(header, " __ret;\n"); indent(header, 0); - fprintf(header, "return *This->lpVtbl->%s(This,&__ret", get_name(func)); + fprintf(header, "return *This->lpVtbl->%s(This,&__ret", get_vtbl_entry_name(iface, func)); } if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry ) @@ -1188,6 +1229,7 @@ static void write_com_interface_end(FILE *header, type_t *iface) { int dispinterface = is_attr(iface->attrs, ATTR_DISPINTERFACE); const UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); + type_t *type; if (uuid) write_guid(header, dispinterface ? "DIID" : "IID", iface->name, uuid); @@ -1245,9 +1287,10 @@ static void write_com_interface_end(FILE *header, type_t *iface) /* dispinterfaces don't have real functions, so don't write macros for them, * only for the interface this interface inherits from, i.e. IDispatch */ fprintf(header, "#ifndef WIDL_C_INLINE_WRAPPERS\n"); - write_method_macro(header, dispinterface ? type_iface_get_inherit(iface) : iface, iface->name); + type = dispinterface ? type_iface_get_inherit(iface) : iface; + write_method_macro(header, type, type, iface->name); fprintf(header, "#else\n"); - write_inline_wrappers(header, dispinterface ? type_iface_get_inherit(iface) : iface, iface->name); + write_inline_wrappers(header, type, type, iface->name); fprintf(header, "#endif\n"); fprintf(header, "#endif\n"); fprintf(header, "\n");

1 0

Matteo Bruni : d3d9/tests: Add some tests for shaders using more than the maximum number of supported constants.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: d897db7605a2c9fbdbbce82952bac75ce0c16503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d897db7605a2c9fbdbbce8295… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 9 18:00:58 2014 +0200 d3d9/tests: Add some tests for shaders using more than the maximum number of supported constants. --- dlls/d3d9/tests/device.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 02c8227..8d0f6b7 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5150,6 +5150,182 @@ float4 main(const float4 color : COLOR) : SV_TARGET 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; +#if 0 + vs_1_1 + dcl_position v0 + def c255, 1.0, 1.0, 1.0, 1.0 + add r0, v0, c255 + mov oPos, r0 +#endif + static const DWORD vs_1_255[] = + { + 0xfffe0101, + 0x0000001f, 0x80000000, 0x900f0000, + 0x00000051, 0xa00f00ff, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x00000002, 0x800f0000, 0x90e40000, 0xa0e400ff, + 0x00000001, 0xc00f0000, 0x80e40000, + 0x0000ffff + }; +#if 0 + vs_1_1 + dcl_position v0 + def c256, 1.0, 1.0, 1.0, 1.0 + add r0, v0, c256 + mov oPos, r0 +#endif + static const DWORD vs_1_256[] = + { + 0xfffe0101, + 0x0000001f, 0x80000000, 0x900f0000, + 0x00000051, 0xa00f0100, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x00000002, 0x800f0000, 0x90e40000, 0xa0e40100, + 0x00000001, 0xc00f0000, 0x80e40000, + 0x0000ffff + }; +#if 0 + vs_3_0 + dcl_position v0 + dcl_position o0 + def c256, 1.0, 1.0, 1.0, 1.0 + add r0, v0, c256 + mov o0, r0 +#endif + static const DWORD vs_3_256[] = + { + 0xfffe0300, + 0x0200001f, 0x80000000, 0x900f0000, + 0x0200001f, 0x80000000, 0xe00f0000, + 0x05000051, 0xa00f0100, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x03000002, 0x800f0000, 0x90e40000, 0xa0e40100, + 0x02000001, 0xe00f0000, 0x80e40000, + 0x0000ffff + }; +#if 0 + /* This shader source generates syntax errors with the native shader assembler + * due to the constant register index values. + * The bytecode was modified by hand to use the intended values. */ + vs_3_0 + dcl_position v0 + dcl_position o0 + defi i16, 1, 1, 1, 1 + rep i16 + add r0, r0, v0 + endrep + mov o0, r0 +#endif + static const DWORD vs_3_i16[] = + { + 0xfffe0300, + 0x0200001f, 0x80000000, 0x900f0000, + 0x0200001f, 0x80000000, 0xe00f0000, + 0x05000030, 0xf00f0010, 0x00000001, 0x00000001, 0x00000001, 0x00000001, + 0x01000026, 0xf0e40010, + 0x03000002, 0x800f0000, 0x80e40000, 0x90e40000, + 0x00000027, + 0x02000001, 0xe00f0000, 0x80e40000, + 0x0000ffff + }; +#if 0 + /* This shader source generates syntax errors with the native shader assembler + * due to the constant register index values. + * The bytecode was modified by hand to use the intended values. */ + vs_3_0 + dcl_position v0 + dcl_position o0 + defb b16, true + mov r0, v0 + if b16 + add r0, r0, v0 + endif + mov o0, r0 +#endif + static const DWORD vs_3_b16[] = + { + 0xfffe0300, + 0x0200001f, 0x80000000, 0x900f0000, + 0x0200001f, 0x80000000, 0xe00f0000, + 0x0200002f, 0xe00f0810, 0x00000001, + 0x02000001, 0x800f0000, 0x90e40000, + 0x01000028, 0xe0e40810, + 0x03000002, 0x800f0000, 0x80e40000, 0x90e40000, + 0x0000002b, + 0x02000001, 0xe00f0000, 0x80e40000, + 0x0000ffff + }; +#if 0 + /* This shader source generates syntax errors with the native shader assembler + * due to the constant register index values. + * The bytecode was modified by hand to use the intended values. */ + ps_1_1 + def c8, 1.0, 1.0, 1.0, 1.0 + add r0, v0, c8 +#endif + static const DWORD ps_1_8[] = + { + 0xffff0101, + 0x00000051, 0xa00f0008, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x00000002, 0x800f0000, 0x90e40000, 0xa0e40008, + 0x0000ffff + }; +#if 0 + /* This shader source generates syntax errors with the native shader assembler + * due to the constant register index values. + * The bytecode was modified by hand to use the intended values. */ + ps_2_0 + def c32, 1.0, 1.0, 1.0, 1.0 + add oC0, v0, c32 +#endif + static const DWORD ps_2_32[] = + { + 0xffff0200, + 0x05000051, 0xa00f0020, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x03000002, 0x800f0000, 0x90e40000, 0xa0e40020, + 0x0000ffff + }; +#if 0 + /* This shader source generates syntax errors with the native shader assembler + * due to the constant register index values. + * The bytecode was modified by hand to use the intended values. */ + ps_3_0 + dcl_color0 v0 + def c224, 1.0, 1.0, 1.0, 1.0 + add oC0, v0, c224 +#endif + static const DWORD ps_3_224[] = + { + 0xffff0300, + 0x0200001f, 0x8000000a, 0x900f0000, + 0x05000051, 0xa00f00e0, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, + 0x03000002, 0x800f0800, 0x90e40000, 0xa0e400e0, + 0x0000ffff + }; +#if 0 + /* This shader source generates syntax errors with the native shader assembler + * due to the constant register index values. + * The bytecode was modified by hand to use the intended values. */ + ps_2_0 + defb b0, true + defi i0, 1, 1, 1, 1 + rep i0 + if b0 + add r0, r0, v0 + endif + endrep + mov oC0, r0 +#endif + static const DWORD ps_2_0_boolint[] = + { + 0xffff0200, + 0x0200002f, 0xe00f0800, 0x00000001, + 0x05000030, 0xf00f0000, 0x00000001, 0x00000001, 0x00000001, 0x00000001, + 0x01000026, 0xf0e40000, + 0x01000028, 0xe0e40800, + 0x03000002, 0x800f0000, 0x80e40000, 0x90e40000, + 0x0000002b, + 0x00000027, + 0x02000001, 0x800f0800, 0x80e40000, + 0x0000ffff + }; IDirect3DVertexShader9 *vs = NULL; IDirect3DPixelShader9 *ps = NULL; @@ -5186,10 +5362,52 @@ float4 main(const float4 color : COLOR) : SV_TARGET { hr = IDirect3DDevice9_CreateVertexShader(device, vs_3_0, &vs); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + if (caps.VertexShaderVersion <= D3DVS_VERSION(1, 1) && caps.MaxVertexShaderConst < 256) + { + hr = IDirect3DDevice9_CreateVertexShader(device, vs_1_255, &vs); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + } + else + { + skip("GPU supports SM2+, skipping SM1 test.\n"); + } + + skip("This GPU doesn't support SM3, skipping test with shader using unsupported constants.\n"); } else + { skip("This GPU supports SM3, skipping unsupported shader test.\n"); + hr = IDirect3DDevice9_CreateVertexShader(device, vs_1_255, &vs); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DVertexShader9_Release(vs); + hr = IDirect3DDevice9_CreateVertexShader(device, vs_1_256, &vs); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateVertexShader(device, vs_3_256, &vs); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateVertexShader(device, vs_3_i16, &vs); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateVertexShader(device, vs_3_b16, &vs); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + } + + if (caps.PixelShaderVersion < D3DPS_VERSION(3, 0)) + { + skip("This GPU doesn't support SM3, skipping test with shader using unsupported constants.\n"); + goto cleanup; + } + hr = IDirect3DDevice9_CreatePixelShader(device, ps_1_8, &ps); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, ps_2_32, &ps); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, ps_3_224, &ps); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, ps_2_0_boolint, &ps); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + if (ps) + IDirect3DPixelShader9_Release(ps); + +cleanup: refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d);

1 0

Nikolay Sivov : dwrite: Added parameter check for registering/ unregistering collection loaders.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: 28e9b3f42121a3828717d72da7c77a14301273b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e9b3f42121a3828717d72da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 14:49:12 2014 +0400 dwrite: Added parameter check for registering/unregistering collection loaders. --- dlls/dwrite/main.c | 10 ++++++++-- dlls/dwrite/tests/font.c | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 033e89a..0379feb 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -491,11 +491,14 @@ static HRESULT WINAPI dwritefactory_CreateCustomFontCollection(IDWriteFactory *i static HRESULT WINAPI dwritefactory_RegisterFontCollectionLoader(IDWriteFactory *iface, IDWriteFontCollectionLoader *loader) { - int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); + int i; TRACE("(%p)->(%p)\n", This, loader); + if (!loader) + return E_INVALIDARG; + for (i = 0; i < This->loader_count; i++) if (This->loaders[i] == loader) return DWRITE_E_ALREADYREGISTERED; @@ -527,11 +530,14 @@ static HRESULT WINAPI dwritefactory_RegisterFontCollectionLoader(IDWriteFactory static HRESULT WINAPI dwritefactory_UnregisterFontCollectionLoader(IDWriteFactory *iface, IDWriteFontCollectionLoader *loader) { - int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); + int i; TRACE("(%p)->(%p)\n", This, loader); + if (!loader) + return E_INVALIDARG; + for (i = 0; i < This->loader_count; i++) if (This->loaders[i] == loader) break; if (i == This->loader_count) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 945bfbf..efe3743 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -855,6 +855,12 @@ static void test_CustomFontCollection(void) IDWriteFontCollectionLoader collection2 = { &dwritefontcollectionloadervtbl }; HRESULT hr; + hr = IDWriteFactory_RegisterFontCollectionLoader(factory, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_UnregisterFontCollectionLoader(factory, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IDWriteFactory_RegisterFontCollectionLoader(factory, &collection); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFactory_RegisterFontCollectionLoader(factory, &collection2);

1 0

Nikolay Sivov : dwrite: Update to IDWriteFontFace2.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: a1ff4f904e7e2ae0e8ba7a7f31085b64ec813ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ff4f904e7e2ae0e8ba7a7f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 10 10:01:24 2014 +0400 dwrite: Update to IDWriteFontFace2. --- dlls/dwrite/font.c | 255 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 205 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1ff4f904e7e2ae0e8ba7…

1 0

Nikolay Sivov : dwrite: Update to IDWriteFont2.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: 1f9ca4775a9951e3060ffd0c34b64e91fdfcfb9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f9ca4775a9951e3060ffd0c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 10 09:28:58 2014 +0400 dwrite: Update to IDWriteFont2. --- dlls/dwrite/font.c | 148 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 88 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f9ca4775a9951e3060ff…

1 0

Akihiro Sagawa : kernel32: Fix incorrect lastpart in GetFullPathNameA with DBCS.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: 4aea5ca72b3af995606ab4784792608637548291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aea5ca72b3af995606ab4784… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 14 00:24:58 2014 +0900 kernel32: Fix incorrect lastpart in GetFullPathNameA with DBCS. --- dlls/kernel32/path.c | 16 ++++++---------- dlls/kernel32/tests/path.c | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 09fb04b..c4a37b2 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -251,12 +251,12 @@ DWORD WINAPI GetFullPathNameA( LPCSTR name, DWORD len, LPSTR buffer, LPSTR *lastpart ) { WCHAR *nameW; - WCHAR bufferW[MAX_PATH]; + WCHAR bufferW[MAX_PATH], *lastpartW = NULL; DWORD ret; if (!(nameW = FILE_name_AtoW( name, FALSE ))) return 0; - ret = GetFullPathNameW( nameW, MAX_PATH, bufferW, NULL); + ret = GetFullPathNameW( nameW, MAX_PATH, bufferW, &lastpartW); if (!ret) return 0; if (ret > MAX_PATH) @@ -267,14 +267,10 @@ DWORD WINAPI GetFullPathNameA( LPCSTR name, DWORD len, LPSTR buffer, ret = copy_filename_WtoA( bufferW, buffer, len ); if (ret < len && lastpart) { - LPSTR p = buffer + strlen(buffer) - 1; - - if (*p != '\\') - { - while ((p > buffer + 2) && (*p != '\\')) p--; - *lastpart = p + 1; - } - else *lastpart = NULL; + if (lastpartW) + *lastpart = buffer + FILE_name_WtoA( bufferW, lastpartW - bufferW, NULL, 0 ); + else + *lastpart = NULL; } return ret; } diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 0f07ea6..44f14d0 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1828,6 +1828,7 @@ static void test_GetFullPathNameA(void) char output[MAX_PATH], *filepart; DWORD ret; int i; + UINT acp; const struct { @@ -1864,6 +1865,27 @@ static void test_GetFullPathNameA(void) "[%d] Expected GetLastError() to return 0xdeadbeef, got %u\n", i, GetLastError()); } + + acp = GetACP(); + if (acp != 932) + skip("Skipping DBCS(Japanese) GetFullPathNameA test in this codepage (%d)\n", acp); + else { + const struct dbcs_case { + const char *input; + const char *expected; + } testset[] = { + { "c:\\a\\\x95\x5c\x97\xa0.txt", "\x95\x5c\x97\xa0.txt" }, + { "c:\\\x83\x8f\x83\x43\x83\x93\\wine.c", "wine.c" }, + { "c:\\demo\\\x97\xa0\x95\x5c", "\x97\xa0\x95\x5c" } + }; + for (i = 0; i < sizeof(testset)/sizeof(testset[0]); i++) { + ret = GetFullPathNameA(testset[i].input, sizeof(output), + output, &filepart); + ok(ret, "[%d] GetFullPathName error %u\n", i, GetLastError()); + ok(!lstrcmpA(filepart, testset[i].expected), + "[%d] expected %s got %s\n", i, testset[i].expected, filepart); + } + } } static void test_GetFullPathNameW(void)

1 0

Matteo Bruni : wined3d: Fail to create shaders using more than the supported number of constants.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: f24e62b303a08a2c10e21bc462759aa0937bcd5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24e62b303a08a2c10e21bc46… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 9 18:00:57 2014 +0200 wined3d: Fail to create shaders using more than the supported number of constants. --- dlls/wined3d/shader.c | 401 ++++++++++++++++++++++++++++---------------------- 1 file changed, 222 insertions(+), 179 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f24e62b303a08a2c10e21…

1 0

André Hentschel : winedump: Fix compiler warnings.
by Alexandre Julliard Oct. 14, 2014

Oct. 14, 2014

Module: wine Branch: master Commit: 8fc9a84960ad146b805e925bdf387729453624a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc9a84960ad146b805e925bd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 13 22:44:11 2014 +0200 winedump: Fix compiler warnings. --- tools/winedump/pe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 36ea137..aedd98e 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -790,7 +790,7 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) if (fnc->u.s.C || fnc->u.s.L) { strcat(intregs, ", "); - if (fnc->u.s.C || fnc->u.s.L && !fnc->u.s.H) + if (fnc->u.s.C || (fnc->u.s.L && !fnc->u.s.H)) strcat(intregspop, ", "); } } @@ -810,7 +810,7 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) if (fnc->u.s.C || fnc->u.s.L) { strcat(intregs, ", "); - if (fnc->u.s.C || fnc->u.s.L && !fnc->u.s.H) + if (fnc->u.s.C || (fnc->u.s.L && !fnc->u.s.H)) strcat(intregspop, ", "); } } @@ -822,7 +822,7 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) if (fnc->u.s.C || fnc->u.s.L) { strcat(intregs, ", "); - if (fnc->u.s.C || fnc->u.s.L && !fnc->u.s.H) + if (fnc->u.s.C || (fnc->u.s.L && !fnc->u.s.H)) strcat(intregspop, ", "); } }

1 0

Jactry Zeng : mshtml/tests: Fix typo.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: d165c05f27dc8988fc906f25fe3c553a4007feb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d165c05f27dc8988fc906f25f… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sat Oct 11 11:56:29 2014 +0800 mshtml/tests: Fix typo. --- dlls/mshtml/tests/nav_test.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/nav_test.html b/dlls/mshtml/tests/nav_test.html index bc629a4..536b238 100644 --- a/dlls/mshtml/tests/nav_test.html +++ b/dlls/mshtml/tests/nav_test.html @@ -34,7 +34,7 @@ function window_navigate_test() { var iframe = document.getElementById("testframe"); iframe.onload = function() { - iframe.onlod = null; + iframe.onload = null; var href = iframe.contentWindow.location.href; ok(href === "about:blank", "Unexpected href " + href); next_test();

1 0

Iván Matellanes : msvcrt: Added _fwrite_nolock() implementation.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: 25d7a1bbbf794cbd8ad245636a52c5f8f94304a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d7a1bbbf794cbd8ad245636… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Oct 9 19:51:59 2014 +0200 msvcrt: Added _fwrite_nolock() implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 17 ++++++++++++++--- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 7 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5175884..406e9e7 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -863,7 +863,7 @@ @ stub _fwprintf_p @ stub _fwprintf_p_l @ stub _fwprintf_s_l -@ stub _fwrite_nolock +@ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock @ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l @ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l @ cdecl _gcvt(double long str) MSVCRT__gcvt diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 8ba85fe..0c62d69 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1211,7 +1211,7 @@ @ stub _fwprintf_p @ stub _fwprintf_p_l @ stub _fwprintf_s_l -@ stub _fwrite_nolock +@ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock @ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l @ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l @ cdecl _gcvt(double long str) MSVCRT__gcvt diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2d1cb95..7123a06 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -530,7 +530,7 @@ @ stub _fwprintf_p @ stub _fwprintf_p_l @ stub _fwprintf_s_l -@ stub _fwrite_nolock +@ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock @ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l @ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l @ cdecl _gcvt(double long str) MSVCRT__gcvt diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f43f811..41ce183 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -512,7 +512,7 @@ @ stub _fwprintf_p @ stub _fwprintf_p_l @ stub _fwprintf_s_l -@ stub _fwrite_nolock +@ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock @ varargs _fwscanf_l(ptr wstr ptr) MSVCRT__fwscanf_l @ varargs _fwscanf_s_l(ptr wstr ptr) MSVCRT__fwscanf_s_l @ cdecl _gcvt(double long str) MSVCRT__gcvt diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 51bd7bc..9a0effd 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3707,13 +3707,25 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) */ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_size_t nmemb, MSVCRT_FILE* file) { + int ret; + + MSVCRT__lock_file(file); + ret = MSVCRT__fwrite_nolock(ptr, size, nmemb, file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _fwrite_nolock (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__fwrite_nolock(const void *ptr, MSVCRT_size_t size, MSVCRT_size_t nmemb, MSVCRT_FILE* file) +{ MSVCRT_size_t wrcnt=size * nmemb; int written = 0; if (size == 0) return 0; - MSVCRT__lock_file(file); - while(wrcnt) { if(file->_cnt < 0) { WARN("negative file->_cnt value in %p\n", file); @@ -3761,7 +3773,6 @@ MSVCRT_size_t CDECL MSVCRT_fwrite(const void *ptr, MSVCRT_size_t size, MSVCRT_si } } - MSVCRT__unlock_file(file); return written / size; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9065ebe..b5cf8b7 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -926,6 +926,7 @@ MSVCRT_ulong* __cdecl MSVCRT___doserrno(void); int* __cdecl MSVCRT__errno(void); char* __cdecl MSVCRT_getenv(const char*); MSVCRT_size_t __cdecl MSVCRT__fread_nolock(void*,MSVCRT_size_t,MSVCRT_size_t,MSVCRT_FILE*); +MSVCRT_size_t __cdecl MSVCRT__fwrite_nolock(const void*,MSVCRT_size_t,MSVCRT_size_t,MSVCRT_FILE*); int __cdecl MSVCRT_fclose(MSVCRT_FILE*); int __cdecl MSVCRT__fclose_nolock(MSVCRT_FILE*); void __cdecl MSVCRT_terminate(void); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index f84a17f..0170d2e 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -128,6 +128,7 @@ int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); +size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*); int __cdecl _fclose_nolock(FILE*); void __cdecl clearerr(FILE*);

1 0

Sebastian Lackner : ntdll: Only check for ATL thunk if allowed by execute option flags.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: 1c957ceb96efd6dbea58460af1561effa6c7c8ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c957ceb96efd6dbea58460af… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Oct 11 00:08:41 2014 +0200 ntdll: Only check for ATL thunk if allowed by execute option flags. Checking for ATL thunks can be disabled by setting MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION. --- dlls/kernel32/tests/virtual.c | 4 ---- dlls/ntdll/signal_i386.c | 7 ++++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 4627c5a..434d880 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1997,7 +1997,6 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) ok( ret == 43, "call returned wrong result, expected 43, got %d\n", ret ); ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION)) - todo_wine ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); else ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); @@ -2013,7 +2012,6 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) ok( ret == 43, "call returned wrong result, expected 43, got %d\n", ret ); ok( num_guard_page_calls == 1, "expected one STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION)) - todo_wine ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); else ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); @@ -2164,7 +2162,6 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) ok( ret == 43, "call returned wrong result, expected 43, got %d\n", ret ); ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION)) - todo_wine ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); else ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); @@ -2193,7 +2190,6 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) ok( ret == 43, "call returned wrong result, expected 43, got %d\n", ret ); ok( num_guard_page_calls == 1, "expected one STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION)) - todo_wine ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); else ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index b9b45a8..7f01554 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1830,12 +1830,13 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT) { ULONG flags; - if (check_atl_thunk( rec, context )) + NtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, + &flags, sizeof(flags), NULL ); + + if (!(flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION) && check_atl_thunk( rec, context )) goto done; /* send EXCEPTION_EXECUTE_FAULT only if data execution prevention is enabled */ - NtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, - &flags, sizeof(flags), NULL ); if (!(flags & MEM_EXECUTE_OPTION_DISABLE)) rec->ExceptionInformation[0] = EXCEPTION_READ_FAULT; }

1 0

Sebastian Lackner : ntdll: reset_write_watches shouldn' t remove enforced exec permissions.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: e16996bb3d5d5f12d2a5524bb86a2503d61d44ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16996bb3d5d5f12d2a5524bb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 8 21:28:25 2014 +0200 ntdll: reset_write_watches shouldn't remove enforced exec permissions. --- dlls/kernel32/tests/virtual.c | 6 +----- dlls/ntdll/virtual.c | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 2d2554b..4627c5a 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2112,11 +2112,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) ret = send_message_excpt( hWnd, WM_USER, 0, 0 ); ok( ret == 42, "call returned wrong result, expected 42, got %d\n", ret ); ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); - if (dep_flags & MEM_EXECUTE_OPTION_DISABLE) - ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); - else - todo_wine - ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); /* Now a bit more complicated, the page containing the code is protected with * PAGE_GUARD memory protection. */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 3c9a4b5..d2bb152 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -693,12 +693,12 @@ static void reset_write_watches( struct file_view *view, void *base, SIZE_T size p[i] |= VPROT_WRITEWATCH; prot = VIRTUAL_GetUnixProt( p[i] ); if (prot == unix_prot) continue; - mprotect( addr, count << page_shift, unix_prot ); + mprotect_exec( addr, count << page_shift, unix_prot, view->protect ); addr += count << page_shift; unix_prot = prot; count = 0; } - if (count) mprotect( addr, count << page_shift, unix_prot ); + if (count) mprotect_exec( addr, count << page_shift, unix_prot, view->protect ); }

1 0

Sebastian Lackner : kernel32/tests: Add tests for DEP combined with guard pages and write watches.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: 9a806d0f1c10289241500519beda73f1ac556586 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a806d0f1c10289241500519b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 8 20:54:50 2014 +0200 kernel32/tests: Add tests for DEP combined with guard pages and write watches. --- dlls/kernel32/tests/virtual.c | 449 ++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 1 + 2 files changed, 450 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a806d0f1c10289241500…

1 0

Sebastian Lackner : ntdll: Ensure force_exec_prot is also used for views with write watch permissions.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: aa3c6111d9361d3fddb4cdbe2365e356e740f1b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa3c6111d9361d3fddb4cdbe2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 8 21:26:28 2014 +0200 ntdll: Ensure force_exec_prot is also used for views with write watch permissions. --- dlls/kernel32/tests/virtual.c | 8 +++++--- dlls/ntdll/virtual.c | 36 +++++++++++++++++++++++------------- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 4d8277d..2d2554b 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -2102,7 +2102,6 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) if (dep_flags & MEM_EXECUTE_OPTION_DISABLE) ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); else - todo_wine ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); count = 64; @@ -2113,7 +2112,11 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) ret = send_message_excpt( hWnd, WM_USER, 0, 0 ); ok( ret == 42, "call returned wrong result, expected 42, got %d\n", ret ); ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls ); - ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + if (dep_flags & MEM_EXECUTE_OPTION_DISABLE) + ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); + else + todo_wine + ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); /* Now a bit more complicated, the page containing the code is protected with * PAGE_GUARD memory protection. */ @@ -2127,7 +2130,6 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) if (dep_flags & MEM_EXECUTE_OPTION_DISABLE) ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); else - todo_wine ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); ret = send_message_excpt( hWnd, WM_USER, 0, 0 ); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index f8a5dd3..3c9a4b5 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -591,6 +591,25 @@ static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot, BOOL image /*********************************************************************** + * mprotect_exec + * + * Wrapper for mprotect, adds PROT_EXEC if forced by force_exec_prot + */ +static inline int mprotect_exec( void *base, size_t size, int unix_prot, unsigned int view_protect ) +{ + if (force_exec_prot && !(view_protect & VPROT_NOEXEC) && + (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) + { + TRACE( "forcing exec permission on %p-%p\n", base, (char *)base + size - 1 ); + if (!mprotect( base, size, unix_prot | PROT_EXEC )) return 0; + /* exec + write may legitimately fail, in that case fall back to write only */ + if (!(unix_prot & PROT_WRITE)) return -1; + } + + return mprotect( base, size, unix_prot ); +} + +/*********************************************************************** * VIRTUAL_SetProt * * Change the protection of a range of pages. @@ -624,12 +643,12 @@ static BOOL VIRTUAL_SetProt( struct file_view *view, /* [in] Pointer to view */ p[i] = vprot | (p[i] & VPROT_WRITEWATCH); prot = VIRTUAL_GetUnixProt( p[i] ); if (prot == unix_prot) continue; - mprotect( addr, count << page_shift, unix_prot ); + mprotect_exec( addr, count << page_shift, unix_prot, view->protect ); addr += count << page_shift; unix_prot = prot; count = 0; } - if (count) mprotect( addr, count << page_shift, unix_prot ); + if (count) mprotect_exec( addr, count << page_shift, unix_prot, view->protect ); VIRTUAL_DEBUG_DUMP_VIEW( view ); return TRUE; } @@ -646,18 +665,9 @@ static BOOL VIRTUAL_SetProt( struct file_view *view, /* [in] Pointer to view */ return TRUE; } - if (force_exec_prot && !(view->protect & VPROT_NOEXEC) && - (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) - { - TRACE( "forcing exec permission on %p-%p\n", base, (char *)base + size - 1 ); - if (!mprotect( base, size, unix_prot | PROT_EXEC )) goto done; - /* exec + write may legitimately fail, in that case fall back to write only */ - if (!(unix_prot & PROT_WRITE)) return FALSE; - } - - if (mprotect( base, size, unix_prot )) return FALSE; /* FIXME: last error */ + if (mprotect_exec( base, size, unix_prot, view->protect )) /* FIXME: last error */ + return FALSE; -done: memset( p, vprot, size >> page_shift ); VIRTUAL_DEBUG_DUMP_VIEW( view ); return TRUE;

1 0

Sebastian Lackner : ntdll: Avoid recursive exception handler calls when handling guard pages.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: 0cf3d78167cef061aa8d187ea051a1402bdf45fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf3d78167cef061aa8d187ea… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 8 21:11:55 2014 +0200 ntdll: Avoid recursive exception handler calls when handling guard pages. The ATL check leads to problems when a page is protected with guard page protection. raise_segv_exception is called with EXCEPTION_EXECUTE_FAULT. The ATL check tries to read the memory, and triggers another exception handler. This time the virtual_handle_fault check is executed, and removes the guard page protection. Afterwards, when the ATL check returns, the exception is _not_ catched by virtual_handle_fault, but instead passed to the application. --- dlls/kernel32/tests/virtual.c | 2 -- dlls/ntdll/signal_i386.c | 10 ++++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 501934d..4d8277d 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1818,7 +1818,6 @@ static DWORD execute_fault_seh_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTR if (rec->ExceptionCode == STATUS_GUARD_PAGE_VIOLATION) { - todo_wine ok( rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT || broken(!(flags & MEM_EXECUTE_OPTION_DISABLE) && rec->ExceptionInformation[0] == EXCEPTION_READ_FAULT), /* Windows 2000 */ "ExceptionInformation[0] is %d instead of %d\n", (DWORD)rec->ExceptionInformation[0], EXCEPTION_EXECUTE_FAULT ); @@ -1971,7 +1970,6 @@ static void test_atl_thunk_emulation( ULONG dep_flags ) if (dep_flags & MEM_EXECUTE_OPTION_DISABLE) ok( num_execute_fault_calls == 1, "expected one STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); else - todo_wine ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls ); ret = send_message_excpt( hWnd, WM_USER, 0, 0 ); diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 12aa5a4..b9b45a8 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -1821,17 +1821,19 @@ static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context case EXCEPTION_ACCESS_VIOLATION: if (rec->NumberParameters == 2) { - if (rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT && check_atl_thunk( rec, context )) - goto done; if (rec->ExceptionInformation[1] == 0xffffffff && check_invalid_gs( context )) goto done; if (!(rec->ExceptionCode = virtual_handle_fault( (void *)rec->ExceptionInformation[1], rec->ExceptionInformation[0] ))) goto done; - /* send EXCEPTION_EXECUTE_FAULT only if data execution prevention is enabled */ - if (rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT) + if (rec->ExceptionCode == EXCEPTION_ACCESS_VIOLATION && + rec->ExceptionInformation[0] == EXCEPTION_EXECUTE_FAULT) { ULONG flags; + if (check_atl_thunk( rec, context )) + goto done; + + /* send EXCEPTION_EXECUTE_FAULT only if data execution prevention is enabled */ NtQueryInformationProcess( GetCurrentProcess(), ProcessExecuteFlags, &flags, sizeof(flags), NULL ); if (!(flags & MEM_EXECUTE_OPTION_DISABLE))

1 0

Jacek Caban : mshtml: Added IHTMLElement:: language property implementation.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: c6c0c6b52aa72a8c8b0ff23d76569c08e3d151a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6c0c6b52aa72a8c8b0ff23d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 10 18:03:11 2014 +0200 mshtml: Added IHTMLElement::language property implementation. --- dlls/mshtml/htmlelem.c | 14 ++++++++++---- dlls/mshtml/tests/dom.c | 35 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/jstest.html | 9 +++++++++ 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 2906581..7843ad6 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -837,18 +837,24 @@ static HRESULT WINAPI HTMLElement_get_title(IHTMLElement *iface, BSTR *p) return return_nsstr(nsres, &title_str, p); } +static const WCHAR languageW[] = {'l','a','n','g','u','a','g','e',0}; + static HRESULT WINAPI HTMLElement_put_language(IHTMLElement *iface, BSTR v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return elem_string_attr_setter(This, languageW, v); } static HRESULT WINAPI HTMLElement_get_language(IHTMLElement *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return elem_string_attr_getter(This, languageW, TRUE, p); } static HRESULT WINAPI HTMLElement_put_onselectstart(IHTMLElement *iface, VARIANT v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ab81ead..304a575 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3138,6 +3138,36 @@ static void _test_elem_id(unsigned line, IUnknown *unk, const char *exid) SysFreeString(id); } +#define test_elem_language(e,i) _test_elem_language(__LINE__,e,i) +static void _test_elem_language(unsigned line, IHTMLElement *elem, const char *exlang) +{ + BSTR lang = (void*)0xdeadbeef; + HRESULT hres; + + hres = IHTMLElement_get_language(elem, &lang); + ok_(__FILE__,line) (hres == S_OK, "get_language failed: %08x\n", hres); + + if(exlang) + ok_(__FILE__,line) (!strcmp_wa(lang, exlang), "unexpected language %s\n", wine_dbgstr_w(lang)); + else + ok_(__FILE__,line) (!lang, "language=%s\n", wine_dbgstr_w(lang)); + + SysFreeString(lang); +} + +#define set_elem_language(e,i) _set_elem_language(__LINE__,e,i) +static void _set_elem_language(unsigned line, IHTMLElement *elem, const char *lang) +{ + BSTR str = a2bstr(lang); + HRESULT hres; + + hres = IHTMLElement_put_language(elem, str); + ok_(__FILE__,line) (hres == S_OK, "get_language failed: %08x\n", hres); + SysFreeString(str); + + _test_elem_language(line, elem, lang); +} + #define test_elem_put_id(u,i) _test_elem_put_id(__LINE__,u,i) static void _test_elem_put_id(unsigned line, IUnknown *unk, const char *new_id) { @@ -7135,6 +7165,8 @@ static void test_elems(IHTMLDocument2 *doc) hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLScriptElement, (void**)&script); ok(hres == S_OK, "Could not get IHTMLScriptElement interface: %08x\n", hres); + test_elem_language(elem, NULL); + if(hres == S_OK) { VARIANT_BOOL vb; @@ -7174,6 +7206,9 @@ static void test_elems(IHTMLDocument2 *doc) } IHTMLScriptElement_Release(script); + + set_elem_language(elem, "vbscript"); + set_elem_language(elem, "xxx"); } elem = get_elem_by_id(doc, "in", TRUE); diff --git a/dlls/mshtml/tests/jstest.html b/dlls/mshtml/tests/jstest.html index 7861196..792e28e 100644 --- a/dlls/mshtml/tests/jstest.html +++ b/dlls/mshtml/tests/jstest.html @@ -215,6 +215,14 @@ function test_whitespace_nodes() { "t.rows[0].cells[0].childNodes.length = " + t.rows[0].cells[0].childNodes.length); } +function test_language_attribute() { + document.body.innerHTML = '<div id="did" language="test"></div>'; + var elem = document.getElementById("did"); + ok(elem.language === "test", "elem.language = " + elem.language); + elem.language = 1; + ok(elem.language === "1", "elem.language = " + elem.language); +} + var globalVar = false; function runTests() { @@ -238,6 +246,7 @@ function runTests() { test_forin(); test_customtag(); test_whitespace_nodes(); + test_language_attribute(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r);

1 0

Nikolay Sivov : dwrite: Update to IDWriteTextFormat1.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: 120422e93b64e84cc3b1209496da14fcc9213e3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=120422e93b64e84cc3b120949… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 10 13:57:28 2014 +0400 dwrite: Update to IDWriteTextFormat1. --- dlls/dwrite/layout.c | 205 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 135 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=120422e93b64e84cc3b12…

1 0

Nikolay Sivov : dwrite: Update to IDWriteTextLayout2.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: 45f9540d2be8d71543efc38fc993b8bbfd5b90c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f9540d2be8d71543efc38fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 10 13:38:54 2014 +0400 dwrite: Update to IDWriteTextLayout2. --- dlls/dwrite/layout.c | 401 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 255 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45f9540d2be8d71543efc…

1 0

Francois Gouget : dwrite: Avoid redefining the DWRITE_GLYPH_RUN typedef.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: 8127fd959917d609aaaa737da0d5bd27a41af1f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8127fd959917d609aaaa737da… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 10 08:37:07 2014 +0200 dwrite: Avoid redefining the DWRITE_GLYPH_RUN typedef. --- include/d2d1.idl | 3 +++ include/dwrite.idl | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/d2d1.idl b/include/d2d1.idl index 4934acc..1623e46 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -37,7 +37,10 @@ interface IDWriteTextLayout; interface IWICBitmapSource; interface IWICBitmap; +cpp_quote("#ifndef __dwrite_h__") +/* already defined in dwrite.h but needed for WIDL */ typedef struct DWRITE_GLYPH_RUN DWRITE_GLYPH_RUN; +cpp_quote("#endif /* __dwrite_h__ */") typedef D2D_POINT_2F D2D1_POINT_2F; typedef D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F; diff --git a/include/dwrite.idl b/include/dwrite.idl index 1888215..2ae5164 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -382,7 +382,11 @@ typedef struct DWRITE_TRIMMING UINT32 delimiterCount; } DWRITE_TRIMMING; -typedef struct DWRITE_GLYPH_RUN +cpp_quote("#ifndef __d2d1_h__") +typedef struct DWRITE_GLYPH_RUN DWRITE_GLYPH_RUN; +cpp_quote("#endif /* __d2d1_h__ */") + +struct DWRITE_GLYPH_RUN { IDWriteFontFace* fontFace; FLOAT fontEmSize; @@ -392,7 +396,7 @@ typedef struct DWRITE_GLYPH_RUN DWRITE_GLYPH_OFFSET const* glyphOffsets; BOOL isSideways; UINT32 bidiLevel; -} DWRITE_GLYPH_RUN; +}; typedef struct DWRITE_GLYPH_RUN_DESCRIPTION {

1 0

André Hentschel : server: Update CPU type dumping.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: 8b07523c561e17feb8f5ced1173950e960609d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b07523c561e17feb8f5ced11… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 13 01:32:26 2014 +0200 server: Update CPU type dumping. --- server/trace.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/trace.c b/server/trace.c index cb8da0c..8458f22 100644 --- a/server/trace.c +++ b/server/trace.c @@ -127,6 +127,8 @@ static void dump_cpu_type( const char *prefix, const cpu_type_t *code ) CASE(x86); CASE(x86_64); CASE(POWERPC); + CASE(ARM); + CASE(ARM64); default: fprintf( stderr, "%s%u", prefix, *code ); break; #undef CASE }

1 0

Jacek Caban : mshtml: Use proper codepage in nsIIOService::NewURI.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: 0d023f1968eb325f5ef58d1cc589d67cc39c1671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d023f1968eb325f5ef58d1cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Oct 11 17:35:19 2014 +0200 mshtml: Use proper codepage in nsIIOService::NewURI. --- dlls/mshtml/main.c | 32 ++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsio.c | 19 ++++++++++++++++--- 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index ce9222f..e5cf325 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -35,6 +35,7 @@ #include "optary.h" #include "rpcproxy.h" #include "shlguid.h" +#include "mlang.h" #include "wine/debug.h" @@ -50,6 +51,35 @@ DWORD mshtml_tls = TLS_OUT_OF_INDEXES; static HINSTANCE shdoclc = NULL; static HDC display_dc; static WCHAR *status_strings[IDS_STATUS_LAST-IDS_STATUS_FIRST+1]; +static IMultiLanguage2 *mlang; + +UINT cp_from_charset_string(BSTR charset) +{ + MIMECSETINFO info; + HRESULT hres; + + if(!mlang) { + IMultiLanguage2 *new_mlang; + + hres = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, + &IID_IMultiLanguage2, (void**)&new_mlang); + if(FAILED(hres)) { + ERR("Could not create CMultiLanguage instance\n"); + return CP_UTF8; + } + + if(InterlockedCompareExchangePointer((void**)&mlang, new_mlang, NULL)) + IMultiLanguage2_Release(new_mlang); + } + + hres = IMultiLanguage2_GetCharsetInfo(mlang, charset, &info); + if(FAILED(hres)) { + FIXME("GetCharsetInfo failed: %08x\n", hres); + return CP_UTF8; + } + + return info.uiInternetEncoding; +} static void thread_detach(void) { @@ -83,6 +113,8 @@ static void process_detach(void) TlsFree(mshtml_tls); if(display_dc) DeleteObject(display_dc); + if(mlang) + IMultiLanguage2_Release(mlang); free_strings(); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 31c08ad..b69fd26 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1195,6 +1195,7 @@ static inline void windowref_release(windowref_t *ref) heap_free(ref); } +UINT cp_from_charset_string(BSTR) DECLSPEC_HIDDEN; HDC get_display_dc(void) DECLSPEC_HIDDEN; HINSTANCE get_shdoclc(void) DECLSPEC_HIDDEN; void set_statustext(HTMLDocumentObj*,INT,LPCWSTR) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index b5c766c..78ad0a6 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3317,6 +3317,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * WCHAR new_spec[INTERNET_MAX_URL_LENGTH]; HTMLOuterWindow *window = NULL; const char *spec = NULL; + UINT cp = CP_UTF8; IUri *urlmon_uri; nsresult nsres; HRESULT hres; @@ -3343,10 +3344,22 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * } } - if(aOriginCharset && strcasecmp(aOriginCharset, "utf-8")) - FIXME("Unsupported charset %s\n", debugstr_a(aOriginCharset)); + if(aOriginCharset && *aOriginCharset && strncasecmp(aOriginCharset, "utf", 3)) { + BSTR charset; + int len; - MultiByteToWideChar(CP_UTF8, 0, spec, -1, new_spec, sizeof(new_spec)/sizeof(WCHAR)); + len = MultiByteToWideChar(CP_UTF8, 0, aOriginCharset, -1, NULL, 0); + charset = SysAllocStringLen(NULL, len-1); + if(!charset) + return NS_ERROR_OUT_OF_MEMORY; + MultiByteToWideChar(CP_UTF8, 0, aOriginCharset, -1, charset, len); + + cp = cp_from_charset_string(charset); + + SysFreeString(charset); + } + + MultiByteToWideChar(cp, 0, spec, -1, new_spec, sizeof(new_spec)/sizeof(WCHAR)); if(base_wine_uri) { hres = combine_url(base_wine_uri->uri, new_spec, &urlmon_uri);

1 0

André Hentschel : winedump: Improved dumping of exception info on ARM.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: 9006dcb059e40452b4a35c4c553b8425c941f998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9006dcb059e40452b4a35c4c5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 13 01:34:11 2014 +0200 winedump: Improved dumping of exception info on ARM. --- tools/winedump/pe.c | 454 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 429 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9006dcb059e40452b4a35…

1 0

Jacek Caban : jscript: Don' t use builtin property for exposing ActiveXObject constructor.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: 0eec97e29bed40ea0770e06714eecf11eff43282 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eec97e29bed40ea0770e0671… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 13 12:36:30 2014 +0200 jscript: Don't use builtin property for exposing ActiveXObject constructor. --- dlls/jscript/global.c | 24 ++++++++++-------------- dlls/jscript/jscript.h | 1 - dlls/jscript/tests/lang.js | 3 +++ 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 4d1350f..5ae6019 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -249,14 +249,6 @@ static HRESULT JSGlobal_RegExp(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u return constructor_call(ctx->regexp_constr, flags, argc, argv, r); } -static HRESULT JSGlobal_ActiveXObject(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - TRACE("\n"); - - return constructor_call(ctx->activex_constr, flags, argc, argv, r); -} - static HRESULT JSGlobal_VBArray(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -1087,7 +1079,6 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W } static const builtin_prop_t JSGlobal_props[] = { - {ActiveXObjectW, JSGlobal_ActiveXObject, PROPF_CONSTR|1}, {ArrayW, JSGlobal_Array, PROPF_CONSTR|1}, {BooleanW, JSGlobal_Boolean, PROPF_CONSTR|1}, {CollectGarbageW, JSGlobal_CollectGarbage, PROPF_METHOD}, @@ -1146,10 +1137,6 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; - hres = create_activex_constr(ctx, &ctx->activex_constr); - if(FAILED(hres)) - return hres; - hres = create_array_constr(ctx, object_prototype, &ctx->array_constr); if(FAILED(hres)) return hres; @@ -1187,7 +1174,7 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) HRESULT init_global(script_ctx_t *ctx) { - jsdisp_t *math, *object_prototype; + jsdisp_t *math, *object_prototype, *constr; HRESULT hres; if(ctx->global) @@ -1215,6 +1202,15 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; + hres = create_activex_constr(ctx, &constr); + if(FAILED(hres)) + return hres; + + hres = jsdisp_propput_dontenum(ctx->global, ActiveXObjectW, jsval_obj(constr)); + jsdisp_release(constr); + if(FAILED(hres)) + return hres; + hres = jsdisp_propput_dontenum(ctx->global, undefinedW, jsval_undefined()); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 0273b00..1e306b6 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -395,7 +395,6 @@ struct _script_ctx_t { jsdisp_t *global; jsdisp_t *function_constr; - jsdisp_t *activex_constr; jsdisp_t *array_constr; jsdisp_t *bool_constr; jsdisp_t *date_constr; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index ccbdb51..a55bf75 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1450,6 +1450,9 @@ function returnTest() { ok(returnTest() === undefined, "returnTest = " + returnTest()); +ActiveXObject = 1; +ok(ActiveXObject === 1, "ActiveXObject = " + ActiveXObject); + /* Keep this test in the end of file */ undefined = 6; ok(undefined === 6, "undefined = " + undefined);

1 0

Qian Hong : mshtml: Add DIID_DispHTMLFormElement support for HTMLFormElement_QI.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: ef63bacf2d1deadd95127aec993defbebd7499eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef63bacf2d1deadd95127aec9… Author: Qian Hong <qhong(a)codeweavers.com> Date: Sat Oct 11 09:18:36 2014 +0800 mshtml: Add DIID_DispHTMLFormElement support for HTMLFormElement_QI. --- dlls/mshtml/htmlform.c | 3 +++ dlls/mshtml/tests/dom.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index b85cf4d..e901dbe 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -582,6 +582,9 @@ static HRESULT HTMLFormElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IHTMLFormElement, riid)) { TRACE("(%p)->(IID_IHTMLFormElement %p)\n", This, ppv); *ppv = &This->IHTMLFormElement_iface; + }else if(IsEqualGUID(&DIID_DispHTMLFormElement, riid)) { + TRACE("(%p)->(DIID_DispHTMLFormElement %p)\n", This, ppv); + *ppv = &This->IHTMLFormElement_iface; } if(*ppv) { diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 304a575..e1e18dc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -381,6 +381,7 @@ static const IID * const form_iids[] = { ELEM_IFACES, &IID_IHTMLFormElement, &IID_IConnectionPointContainer, + &DIID_DispHTMLFormElement, NULL };

1 0

Iván Matellanes : msvcrt: Added _fread_nolock() implementation.
by Alexandre Julliard Oct. 13, 2014

Oct. 13, 2014

Module: wine Branch: master Commit: 206ea48f203dc6001828b99db261bf493235f683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=206ea48f203dc6001828b99db… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Oct 9 19:51:55 2014 +0200 msvcrt: Added _fread_nolock() implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 18 ++++++++++++++---- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 4 +++- 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2796576..5175884 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -832,7 +832,7 @@ @ cdecl _fputchar(long) MSVCRT__fputchar @ stub _fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar -@ stub _fread_nolock +@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock @ stub _fread_nolock_s @ cdecl _free_locale(ptr) MSVCRT__free_locale @ stub _freea diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index ae6c356..8ba85fe 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1180,7 +1180,7 @@ @ cdecl _fputchar(long) MSVCRT__fputchar @ stub _fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar -@ stub _fread_nolock +@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock @ stub _fread_nolock_s @ cdecl _free_locale(ptr) MSVCRT__free_locale @ stub _freea diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index fc38453..2d1cb95 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -499,7 +499,7 @@ @ cdecl _fputchar(long) MSVCRT__fputchar @ stub _fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar -@ stub _fread_nolock +@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock @ stub _fread_nolock_s @ cdecl _free_locale(ptr) MSVCRT__free_locale @ stub _freea diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 4267c2c..f43f811 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -481,7 +481,7 @@ @ cdecl _fputchar(long) MSVCRT__fputchar @ stub _fputwc_nolock @ cdecl _fputwchar(long) MSVCRT__fputwchar -@ stub _fread_nolock +@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock @ stub _fread_nolock_s @ cdecl _free_locale(ptr) MSVCRT__free_locale @ stub _freea diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c57861a..51bd7bc 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3957,6 +3957,20 @@ int CDECL MSVCRT__fputchar(int c) */ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nmemb, MSVCRT_FILE* file) { + int ret; + + MSVCRT__lock_file(file); + ret = MSVCRT__fread_nolock(ptr, size, nmemb, file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _fread_nolock (MSVCRT.@) + */ +MSVCRT_size_t CDECL MSVCRT__fread_nolock(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nmemb, MSVCRT_FILE* file) +{ MSVCRT_size_t rcnt=size * nmemb; MSVCRT_size_t read=0; MSVCRT_size_t pread=0; @@ -3964,8 +3978,6 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm if(!rcnt) return 0; - MSVCRT__lock_file(file); - /* first buffered data */ if(file->_cnt>0) { int pcnt= (rcnt>file->_cnt)? file->_cnt:rcnt; @@ -3979,7 +3991,6 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm if(file->_flag & MSVCRT__IORW) { file->_flag |= MSVCRT__IOREAD; } else { - MSVCRT__unlock_file(file); return 0; } } @@ -4028,7 +4039,6 @@ MSVCRT_size_t CDECL MSVCRT_fread(void *ptr, MSVCRT_size_t size, MSVCRT_size_t nm if (i < 1) break; } read+=pread; - MSVCRT__unlock_file(file); return read / size; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 200e35c..9065ebe 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -925,6 +925,7 @@ void __cdecl MSVCRT_abort(void); MSVCRT_ulong* __cdecl MSVCRT___doserrno(void); int* __cdecl MSVCRT__errno(void); char* __cdecl MSVCRT_getenv(const char*); +MSVCRT_size_t __cdecl MSVCRT__fread_nolock(void*,MSVCRT_size_t,MSVCRT_size_t,MSVCRT_FILE*); int __cdecl MSVCRT_fclose(MSVCRT_FILE*); int __cdecl MSVCRT__fclose_nolock(MSVCRT_FILE*); void __cdecl MSVCRT_terminate(void); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 184dd2b..f84a17f 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -127,9 +127,11 @@ int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); +size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); +int __cdecl _fclose_nolock(FILE*); + void __cdecl clearerr(FILE*); int __cdecl fclose(FILE*); -int __cdecl _fclose_nolock(FILE*); int __cdecl feof(FILE*); int __cdecl ferror(FILE*); int __cdecl fflush(FILE*);

1 0

André Hentschel : Add WWN 377
by Jeremy Newman Oct. 10, 2014

Oct. 10, 2014

Module: website Branch: master Commit: 0df841bdc75c6206734e8e8d71afd86014d85ce1 URL: http://source.winehq.org/git/website.git/?a=commit;h=0df841bdc75c6206734e8e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 10 21:53:19 2014 +0200 Add WWN 377 --- news/de/2014101001.xml | 11 ++ news/en/2014101001.xml | 11 ++ wwn/en/wn20141010_377.xml | 349 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 371 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=0df841bdc75c620673…

1 0

Matteo Bruni : gdi32/tests: Add a test for GetGlyphOutline with an insufficient buffer.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: a71f25d239ed7dd65f9fa7a3b7baa371e74f2ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71f25d239ed7dd65f9fa7a3b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 9 18:00:56 2014 +0200 gdi32/tests: Add a test for GetGlyphOutline with an insufficient buffer. --- dlls/gdi32/tests/font.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 852c858..eff1793 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4365,7 +4365,11 @@ static void test_GetGlyphOutline(void) SetLastError(0xdeadbeef); ret = GetGlyphOutlineW(hdc, ' ', GGO_NATIVE, &gm, 0, NULL, &mat); if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + { ok(ret == 0, "GetGlyphOutlineW should return 0 buffer size for space char\n"); + ok(gm.gmBlackBoxX == 1, "Expected 1, got %u\n", gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "Expected 1, got %u\n", gm.gmBlackBoxY); + } /* requesting buffer size for space char + error */ memset(&gm, 0, sizeof(gm)); @@ -4375,8 +4379,16 @@ static void test_GetGlyphOutline(void) { ok(ret == GDI_ERROR, "GetGlyphOutlineW should return GDI_ERROR\n"); ok(GetLastError() == 0xdeadbeef, "expected 0xdeadbeef, got %u\n", GetLastError()); + ok(gm.gmBlackBoxX == 0, "Expected 0, got %u\n", gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 0, "Expected 0, got %u\n", gm.gmBlackBoxY); } + /* test GetGlyphOutline with a buffer too small */ + SetLastError(0xdeadbeef); + ret = GetGlyphOutlineA(hdc, 'A', GGO_NATIVE, &gm, sizeof(i), &i, &mat); + if (GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) + ok(ret == GDI_ERROR, "GetGlyphOutlineW should return an error when the buffer size is too small.\n"); + for (i = 0; i < sizeof(fmt) / sizeof(fmt[0]); ++i) { DWORD dummy;

1 0

Jacek Caban : mshtml: Added IHTMLScriptElement:: get_readyState implementation.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 37869b7a08913e19864dc00026cdba0ce28929cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=37869b7a08913e19864dc0002… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:09:07 2014 +0200 mshtml: Added IHTMLScriptElement::get_readyState implementation. --- dlls/mshtml/htmlscript.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 1a61398..61e1ee3 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -281,8 +281,10 @@ static HRESULT WINAPI HTMLScriptElement_get_defer(IHTMLScriptElement *iface, VAR static HRESULT WINAPI HTMLScriptElement_get_readyState(IHTMLScriptElement *iface, BSTR *p) { HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_readystate_string(This->readystate, p); } static HRESULT WINAPI HTMLScriptElement_put_onerror(IHTMLScriptElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Use IUri for script binding.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 8a9d4cf147ebdfbab807fbbcd5a5dfc041d7fea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a9d4cf147ebdfbab807fbbcd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:08:31 2014 +0200 mshtml: Use IUri for script binding. --- dlls/mshtml/script.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 790bac1..a4bd47f 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -826,17 +826,25 @@ static const BSCallbackVtbl ScriptBSCVtbl = { }; -static HRESULT bind_script_to_text(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) +static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, WCHAR **ret) { ScriptBSC *bsc; + IMoniker *mon; WCHAR *text; HRESULT hres; + hres = CreateURLMonikerEx2(NULL, uri, &mon, URL_MK_UNIFORM); + if(FAILED(hres)) + return hres; + bsc = heap_alloc_zero(sizeof(*bsc)); - if(!bsc) + if(!bsc) { + IMoniker_Release(mon); return E_OUTOFMEMORY; + } init_bscallback(&bsc->bsc, &ScriptBSCVtbl, mon, 0); + IMoniker_Release(mon); bsc->hres = E_FAIL; hres = start_binding(window, &bsc->bsc, NULL); @@ -892,13 +900,12 @@ static HRESULT bind_script_to_text(HTMLInnerWindow *window, IMoniker *mon, WCHAR *ret = text; return S_OK; - } static void parse_extern_script(ScriptHost *script_host, const WCHAR *src) { - IMoniker *mon; WCHAR *text; + IUri *uri; HRESULT hres; static const WCHAR wine_schemaW[] = {'w','i','n','e',':'}; @@ -906,12 +913,12 @@ static void parse_extern_script(ScriptHost *script_host, const WCHAR *src) if(strlenW(src) > sizeof(wine_schemaW)/sizeof(WCHAR) && !memcmp(src, wine_schemaW, sizeof(wine_schemaW))) src += sizeof(wine_schemaW)/sizeof(WCHAR); - hres = CreateURLMoniker(NULL, src, &mon); + hres = create_uri(src, 0, &uri); if(FAILED(hres)) return; - hres = bind_script_to_text(script_host->window, mon, &text); - IMoniker_Release(mon); + hres = bind_script_to_text(script_host->window, uri, &text); + IUri_Release(uri); if(FAILED(hres) || !text) return;

1 0

Jacek Caban : mshtml: Moved BOM enum to binding.h.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 7e4db7df488f946406d920224bfc14f07c72050b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e4db7df488f946406d920224… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:07:33 2014 +0200 mshtml: Moved BOM enum to binding.h. --- dlls/mshtml/binding.h | 8 +++++++- dlls/mshtml/navigate.c | 8 ++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 63ac882..764ae61 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -25,6 +25,12 @@ typedef enum { METHOD_POST } REQUEST_METHOD; +typedef enum { + BOM_NONE, + BOM_UTF8, + BOM_UTF16 +} binding_bom_t; + typedef struct { nsIHttpChannel nsIHttpChannel_iface; nsIUploadChannel nsIUploadChannel_iface; @@ -71,7 +77,7 @@ struct BSCallback { ULONG readed; DWORD bindf; BOOL bindinfo_ready; - int bom; + binding_bom_t bom; IMoniker *mon; IBinding *binding; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 195f82e..8234c02 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -52,12 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR emptyW[] = {0}; static const WCHAR text_htmlW[] = {'t','e','x','t','/','h','t','m','l',0}; -enum { - BOM_NONE, - BOM_UTF8, - BOM_UTF16 -}; - struct nsProtocolStream { nsIInputStream nsIInputStream_iface; @@ -1203,6 +1197,8 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) break; case BOM_UTF16: This->nschannel->charset = heap_strdupA(UTF16_STR); + case BOM_NONE: + /* FIXME: Get charset from HTTP headers */; } if(!This->nschannel->content_type) {

1 0

Matteo Bruni : gdi32: Don't overflow the buffer in GetGlyphOutline.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 112a7f7f97168c7afe73f38351e9345bc2a7657a URL: http://source.winehq.org/git/wine.git/?a=commit;h=112a7f7f97168c7afe73f3835… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 9 18:00:55 2014 +0200 gdi32: Don't overflow the buffer in GetGlyphOutline. --- dlls/gdi32/freetype.c | 401 ++++++++++++++++++++++++++++---------------------- 1 file changed, 229 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=112a7f7f97168c7afe73f…

1 0

Jacek Caban : mshtml: Added support for onreadystatechange event for script elements.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: d11abc0992053f3cda7b89263c5fcd95910956e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d11abc0992053f3cda7b89263… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:08:47 2014 +0200 mshtml: Added support for onreadystatechange event for script elements. --- dlls/mshtml/htmlscript.h | 1 + dlls/mshtml/script.c | 55 +++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlscript.h b/dlls/mshtml/htmlscript.h index 8a0c1e5..8698be8 100644 --- a/dlls/mshtml/htmlscript.h +++ b/dlls/mshtml/htmlscript.h @@ -24,6 +24,7 @@ typedef struct { nsIDOMHTMLScriptElement *nsscript; BOOL parsed; BOOL parse_on_bind; + READYSTATE readystate; } HTMLScriptElement; typedef struct { diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index a4bd47f..6630047 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -29,6 +29,7 @@ #include "ole2.h" #include "activscp.h" #include "activdbg.h" +#include "shlwapi.h" #include "wine/debug.h" @@ -701,7 +702,15 @@ static ScriptHost *create_script_host(HTMLInnerWindow *window, const GUID *guid) return ret; } -static void parse_text(ScriptHost *script_host, LPCWSTR text) +static void set_script_elem_readystate(HTMLScriptElement *script_elem, READYSTATE readystate) +{ + script_elem->readystate = readystate; + + if(readystate != READYSTATE_INTERACTIVE) + fire_event(script_elem->element.node.doc, EVENTID_READYSTATECHANGE, FALSE, script_elem->element.node.nsnode, NULL, NULL); +} + +static void parse_elem_text(ScriptHost *script_host, HTMLScriptElement *script_elem, LPCWSTR text) { EXCEPINFO excepinfo; VARIANT var; @@ -709,6 +718,8 @@ static void parse_text(ScriptHost *script_host, LPCWSTR text) TRACE("%s\n", debugstr_w(text)); + set_script_elem_readystate(script_elem, READYSTATE_INTERACTIVE); + VariantInit(&var); memset(&excepinfo, 0, sizeof(excepinfo)); TRACE(">>>\n"); @@ -725,6 +736,9 @@ static void parse_text(ScriptHost *script_host, LPCWSTR text) typedef struct { BSCallback bsc; + HTMLScriptElement *script_elem; + DWORD scheme; + DWORD size; char *buf; HRESULT hres; @@ -739,6 +753,11 @@ static void ScriptBSC_destroy(BSCallback *bsc) { ScriptBSC *This = impl_from_BSCallback(bsc); + if(This->script_elem) { + IHTMLScriptElement_Release(&This->script_elem->IHTMLScriptElement_iface); + This->script_elem = NULL; + } + heap_free(This->buf); heap_free(This); } @@ -750,6 +769,12 @@ static HRESULT ScriptBSC_init_bindinfo(BSCallback *bsc) static HRESULT ScriptBSC_start_binding(BSCallback *bsc) { + ScriptBSC *This = impl_from_BSCallback(bsc); + + /* FIXME: We should find a better to decide if 'loading' state is supposed to be used by the protocol. */ + if(This->scheme == URL_SCHEME_HTTPS || This->scheme == URL_SCHEME_HTTP) + set_script_elem_readystate(This->script_elem, READYSTATE_LOADING); + return S_OK; } @@ -759,13 +784,18 @@ static HRESULT ScriptBSC_stop_binding(BSCallback *bsc, HRESULT result) This->hres = result; - if(FAILED(result)) { + if(SUCCEEDED(result)) { + if(This->script_elem->readystate == READYSTATE_LOADING) + set_script_elem_readystate(This->script_elem, READYSTATE_LOADED); + }else { FIXME("binding failed %08x\n", result); heap_free(This->buf); This->buf = NULL; This->size = 0; } + IHTMLScriptElement_Release(&This->script_elem->IHTMLScriptElement_iface); + This->script_elem = NULL; return S_OK; } @@ -826,7 +856,7 @@ static const BSCallbackVtbl ScriptBSCVtbl = { }; -static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, WCHAR **ret) +static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, HTMLScriptElement *script_elem, WCHAR **ret) { ScriptBSC *bsc; IMoniker *mon; @@ -847,6 +877,13 @@ static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, WCHAR **r IMoniker_Release(mon); bsc->hres = E_FAIL; + hres = IUri_GetScheme(uri, &bsc->scheme); + if(FAILED(hres)) + bsc->scheme = URL_SCHEME_UNKNOWN; + + IHTMLScriptElement_AddRef(&script_elem->IHTMLScriptElement_iface); + bsc->script_elem = script_elem; + hres = start_binding(window, &bsc->bsc, NULL); if(SUCCEEDED(hres)) hres = bsc->hres; @@ -902,7 +939,7 @@ static HRESULT bind_script_to_text(HTMLInnerWindow *window, IUri *uri, WCHAR **r return S_OK; } -static void parse_extern_script(ScriptHost *script_host, const WCHAR *src) +static void parse_extern_script(ScriptHost *script_host, HTMLScriptElement *script_elem, LPCWSTR src) { WCHAR *text; IUri *uri; @@ -917,12 +954,12 @@ static void parse_extern_script(ScriptHost *script_host, const WCHAR *src) if(FAILED(hres)) return; - hres = bind_script_to_text(script_host->window, uri, &text); + hres = bind_script_to_text(script_host->window, uri, script_elem, &text); IUri_Release(uri); if(FAILED(hres) || !text) return; - parse_text(script_host, text); + parse_elem_text(script_host, script_elem, text); heap_free(text); } @@ -940,7 +977,7 @@ static void parse_inline_script(ScriptHost *script_host, HTMLScriptElement *scri if(NS_FAILED(nsres)) { ERR("GetText failed: %08x\n", nsres); }else if(*text) { - parse_text(script_host, text); + parse_elem_text(script_host, script_elem, text); } nsAString_Finish(&text_str); @@ -976,12 +1013,14 @@ static void parse_script_elem(ScriptHost *script_host, HTMLScriptElement *script ERR("GetSrc failed: %08x\n", nsres); }else if(*src) { script_elem->parsed = TRUE; - parse_extern_script(script_host, src); + parse_extern_script(script_host, script_elem, src); }else { parse_inline_script(script_host, script_elem); } nsAString_Finish(&src_str); + + set_script_elem_readystate(script_elem, READYSTATE_COMPLETE); } static GUID get_default_script_guid(HTMLInnerWindow *window)

1 0

Jacek Caban : mshtml: Moved script binding callback to script.c.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 87efdc304717936fca392c000b16838e2d31671b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87efdc304717936fca392c000… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:08:01 2014 +0200 mshtml: Moved script binding callback to script.c. --- dlls/mshtml/binding.h | 16 ++++- dlls/mshtml/navigate.c | 182 +------------------------------------------------ dlls/mshtml/script.c | 177 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 191 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87efdc304717936fca392…

1 0

Austin English : systeminfo: Add stub program.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: cf7fa95980035f7af86e9ea656668e5c856f4aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7fa95980035f7af86e9ea65… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 7 14:00:57 2014 -0500 systeminfo: Add stub program. --- configure | 2 ++ configure.ac | 1 + programs/systeminfo/Makefile.in | 5 +++++ programs/systeminfo/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/configure b/configure index 4125ac9..2228ce3 100755 --- a/configure +++ b/configure @@ -1364,6 +1364,7 @@ enable_services enable_spoolsv enable_start enable_svchost +enable_systeminfo enable_taskkill enable_tasklist enable_taskmgr @@ -17476,6 +17477,7 @@ wine_fn_config_test programs/services/tests services.exe_test wine_fn_config_program spoolsv enable_spoolsv install wine_fn_config_program start enable_start install,po wine_fn_config_program svchost enable_svchost install +wine_fn_config_program systeminfo enable_systeminfo install wine_fn_config_program taskkill enable_taskkill install,po wine_fn_config_program tasklist enable_tasklist install wine_fn_config_program taskmgr enable_taskmgr install,po diff --git a/configure.ac b/configure.ac index 6a3dc46..240ce29 100644 --- a/configure.ac +++ b/configure.ac @@ -3384,6 +3384,7 @@ WINE_CONFIG_TEST(programs/services/tests) WINE_CONFIG_PROGRAM(spoolsv,,[install]) WINE_CONFIG_PROGRAM(start,,[install,po]) WINE_CONFIG_PROGRAM(svchost,,[install]) +WINE_CONFIG_PROGRAM(systeminfo,,[install]) WINE_CONFIG_PROGRAM(taskkill,,[install,po]) WINE_CONFIG_PROGRAM(tasklist,,[install]) WINE_CONFIG_PROGRAM(taskmgr,,[install,po]) diff --git a/programs/systeminfo/Makefile.in b/programs/systeminfo/Makefile.in new file mode 100644 index 0000000..72e4791 --- /dev/null +++ b/programs/systeminfo/Makefile.in @@ -0,0 +1,5 @@ +MODULE = systeminfo.exe +APPMODE = -mconsole -municode + +C_SRCS = \ + main.c diff --git a/programs/systeminfo/main.c b/programs/systeminfo/main.c new file mode 100644 index 0000000..e7bb30e --- /dev/null +++ b/programs/systeminfo/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2014 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(systeminfo); + +int wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Jacek Caban : mshtml: Moved READYSTATE to string conversion to separated function.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 845f5cccf039acaec939dd8dfc97e308c57490f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=845f5cccf039acaec939dd8df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 9 16:08:15 2014 +0200 mshtml: Moved READYSTATE to string conversion to separated function. --- dlls/mshtml/htmldoc.c | 16 +--------------- dlls/mshtml/htmlelem.c | 21 +++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index a8d6d76..c91298f 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -592,27 +592,13 @@ static HRESULT WINAPI HTMLDocument_get_readyState(IHTMLDocument2 *iface, BSTR *p { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - static const WCHAR wszUninitialized[] = {'u','n','i','n','i','t','i','a','l','i','z','e','d',0}; - static const WCHAR wszLoading[] = {'l','o','a','d','i','n','g',0}; - static const WCHAR wszLoaded[] = {'l','o','a','d','e','d',0}; - static const WCHAR wszInteractive[] = {'i','n','t','e','r','a','c','t','i','v','e',0}; - static const WCHAR wszComplete[] = {'c','o','m','p','l','e','t','e',0}; - - static const LPCWSTR readystate_str[] = { - wszUninitialized, - wszLoading, - wszLoaded, - wszInteractive, - wszComplete - }; TRACE("(%p)->(%p)\n", iface, p); if(!p) return E_POINTER; - *p = SysAllocString(readystate_str[This->window->readystate]); - return S_OK; + return get_readystate_string(This->window->readystate, p); } static HRESULT WINAPI HTMLDocument_get_frames(IHTMLDocument2 *iface, IHTMLFramesCollection2 **p) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 3037c10..2906581 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -218,6 +218,27 @@ HRESULT elem_string_attr_setter(HTMLElement *elem, const WCHAR *name, const WCHA return S_OK; } +HRESULT get_readystate_string(READYSTATE readystate, BSTR *p) +{ + static const WCHAR uninitializedW[] = {'u','n','i','n','i','t','i','a','l','i','z','e','d',0}; + static const WCHAR loadingW[] = {'l','o','a','d','i','n','g',0}; + static const WCHAR loadedW[] = {'l','o','a','d','e','d',0}; + static const WCHAR interactiveW[] = {'i','n','t','e','r','a','c','t','i','v','e',0}; + static const WCHAR completeW[] = {'c','o','m','p','l','e','t','e',0}; + + static const LPCWSTR readystate_strs[] = { + uninitializedW, + loadingW, + loadedW, + interactiveW, + completeW + }; + + assert(readystate <= READYSTATE_COMPLETE); + *p = SysAllocString(readystate_strs[readystate]); + return *p ? S_OK : E_OUTOFMEMORY; +} + typedef struct { DispatchEx dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 78d61f0..31c08ad 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -851,6 +851,7 @@ void set_download_state(HTMLDocumentObj*,int) DECLSPEC_HIDDEN; void call_docview_84(HTMLDocumentObj*) DECLSPEC_HIDDEN; void set_ready_state(HTMLOuterWindow*,READYSTATE) DECLSPEC_HIDDEN; +HRESULT get_readystate_string(READYSTATE,BSTR*) DECLSPEC_HIDDEN; HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectionObject**) DECLSPEC_HIDDEN; HRESULT HTMLTxtRange_Create(HTMLDocumentNode*,nsIDOMRange*,IHTMLTxtRange**) DECLSPEC_HIDDEN;

1 0

Aric Stewart : dwrite: Build non-system font collections as a list of font families.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 8a5707111a5ecda83374fd9e82f305518b55d976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a5707111a5ecda83374fd9e8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 8 09:52:07 2014 -0500 dwrite: Build non-system font collections as a list of font families. --- dlls/dwrite/font.c | 167 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 133 insertions(+), 34 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index a00b784..77121ec 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -55,6 +55,8 @@ struct dwrite_font_data { }; struct dwrite_fontfamily_data { + LONG ref; + IDWriteLocalizedStrings *familyname; struct dwrite_font_data **fonts; @@ -69,6 +71,10 @@ struct dwrite_fontcollection { WCHAR **families; UINT32 count; int alloc; + + struct dwrite_fontfamily_data **family_data; + DWORD data_count; + int data_alloc; }; struct dwrite_fontfamily { @@ -127,6 +133,7 @@ struct dwrite_fontfile { }; static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFontFamily **family); +static HRESULT create_fontfamily_from_data(struct dwrite_fontfamily_data *data, IDWriteFontCollection *collection, IDWriteFontFamily **family); static HRESULT create_font_base(IDWriteFont **font); static HRESULT create_font_from_data(struct dwrite_font_data *data, IDWriteFont **font); @@ -201,6 +208,21 @@ static VOID _free_font_data(struct dwrite_font_data *data) heap_free(data); } +static VOID _free_fontfamily_data(struct dwrite_fontfamily_data *data) +{ + int i; + if (!data) + return; + i = InterlockedDecrement(&data->ref); + if (i > 0) + return; + for (i = 0; i < data->font_count; i++) + _free_font_data(data->fonts[i]); + heap_free(data->fonts); + IDWriteLocalizedStrings_Release(data->familyname); + heap_free(data); +} + static HRESULT WINAPI dwritefontface_QueryInterface(IDWriteFontFace *iface, REFIID riid, void **obj) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); @@ -746,15 +768,9 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) if (!ref) { - int i; - IDWriteLocalizedStrings_Release(This->data->familyname); - if (This->collection) IDWriteFontCollection_Release(This->collection); - for (i = 0; i < This->data->font_count; i++) - _free_font_data(This->data->fonts[i]); - heap_free(This->data->fonts); - heap_free(This->data); + _free_fontfamily_data(This->data); heap_free(This); } @@ -909,6 +925,9 @@ static ULONG WINAPI dwritefontcollection_Release(IDWriteFontCollection *iface) for (i = 0; i < This->count; i++) heap_free(This->families[i]); heap_free(This->families); + for (i = 0; i < This->data_count; i++) + _free_fontfamily_data(This->family_data[i]); + heap_free(This->family_data); heap_free(This); } @@ -919,6 +938,8 @@ static UINT32 WINAPI dwritefontcollection_GetFontFamilyCount(IDWriteFontCollecti { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); TRACE("(%p)\n", This); + if (This->data_count) + return This->data_count; return This->count; } @@ -931,18 +952,31 @@ static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection * TRACE("(%p)->(%u %p)\n", This, index, family); - if (index >= This->count) + if (This->data_count) { - *family = NULL; - return E_FAIL; + if (index >= This->data_count) + { + *family = NULL; + return E_FAIL; + } + else + return create_fontfamily_from_data(This->family_data[index], iface, family); } + else + { + if (index >= This->count) + { + *family = NULL; + return E_FAIL; + } - hr = create_localizedstrings(&familyname); - if (FAILED(hr)) - return hr; - add_localizedstring(familyname, enusW, This->families[index]); + hr = create_localizedstrings(&familyname); + if (FAILED(hr)) + return hr; + add_localizedstring(familyname, enusW, This->families[index]); - return create_fontfamily(familyname, family); + return create_fontfamily(familyname, family); + } } static HRESULT WINAPI dwritefontcollection_FindFamilyName(IDWriteFontCollection *iface, const WCHAR *name, UINT32 *index, BOOL *exists) @@ -952,16 +986,44 @@ static HRESULT WINAPI dwritefontcollection_FindFamilyName(IDWriteFontCollection TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(name), index, exists); - for (i = 0; i < This->count; i++) - if (!strcmpW(This->families[i], name)) + if (This->data_count) + { + for (i = 0; i < This->data_count; i++) { - *index = i; - *exists = TRUE; - return S_OK; + HRESULT hr; + IDWriteLocalizedStrings *family_name = This->family_data[i]->familyname; + int j; + for (j = 0; j < IDWriteLocalizedStrings_GetCount(family_name); j ++) + { + WCHAR buffer[255]; + hr = IDWriteLocalizedStrings_GetString(family_name, j, buffer, 255); + if (SUCCEEDED(hr)) + { + if (!strcmpW(buffer, name)) + { + *index = i; + *exists = TRUE; + return S_OK; + } + } + } } + *index = (UINT32)-1; + *exists = FALSE; + } + else + { + for (i = 0; i < This->count; i++) + if (!strcmpW(This->families[i], name)) + { + *index = i; + *exists = TRUE; + return S_OK; + } - *index = (UINT32)-1; - *exists = FALSE; + *index = (UINT32)-1; + *exists = FALSE; + } return S_OK; } @@ -1023,6 +1085,20 @@ HRESULT get_system_fontcollection(IDWriteFontCollection **collection) This->alloc = 50; This->count = 0; This->families = heap_alloc(This->alloc*sizeof(WCHAR*)); + if (!This->families) + { + heap_free(This); + return E_OUTOFMEMORY; + } + This->data_count = 0; + This->data_alloc = 2; + This->family_data = heap_alloc(sizeof(*This->family_data)*2); + if (!This->family_data) + { + heap_free(This->families); + heap_free(This); + return E_OUTOFMEMORY; + } TRACE("building system font collection:\n"); @@ -1039,7 +1115,7 @@ HRESULT get_system_fontcollection(IDWriteFontCollection **collection) return S_OK; } -static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFontFamily **family) +static HRESULT create_fontfamily_from_data(struct dwrite_fontfamily_data *data, IDWriteFontCollection *collection, IDWriteFontFamily **family) { struct dwrite_fontfamily *This; @@ -1047,26 +1123,49 @@ static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFon This = heap_alloc(sizeof(struct dwrite_fontfamily)); if (!This) return E_OUTOFMEMORY; - This->data = heap_alloc(sizeof(struct dwrite_fontfamily_data)); - if (!This->data) - { - heap_free(This); - return E_OUTOFMEMORY; - } This->IDWriteFontFamily_iface.lpVtbl = &fontfamilyvtbl; This->ref = 1; - This->data->font_count = 0; - This->data->alloc = 2; - This->data->fonts = heap_alloc(sizeof(*This->data->fonts) * 2); - This->collection = NULL; - This->data->familyname = familyname; + This->collection = collection; + if (collection) + IDWriteFontCollection_AddRef(collection); + This->data = data; + InterlockedIncrement(&This->data->ref); *family = &This->IDWriteFontFamily_iface; return S_OK; } +static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFontFamily **family) +{ + struct dwrite_fontfamily_data *data; + HRESULT ret; + + data = heap_alloc(sizeof(struct dwrite_fontfamily_data)); + if (!data) return E_OUTOFMEMORY; + + data->ref = 0; + data->font_count = 0; + data->alloc = 2; + data->fonts = heap_alloc(sizeof(*data->fonts) * 2); + if (!data->fonts) + { + heap_free(data); + return E_OUTOFMEMORY; + } + data->familyname = familyname; + + ret = create_fontfamily_from_data(data, NULL, family); + if (FAILED(ret)) + { + heap_free(data->fonts); + heap_free(data); + } + + return ret; +} + static HRESULT create_font_from_data(struct dwrite_font_data *data, IDWriteFont **font) { struct dwrite_font *This;

1 0

David Heidelberger : dbghelp: Implement DW_TAG_const_type in dwarf2_parse_udt_type.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: df5ff98b073fd6554fe7399e68ce4c106e483d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5ff98b073fd6554fe7399e6… Author: David Heidelberger <david.heidelberger(a)ixit.cz> Date: Sun Oct 5 16:26:09 2014 +0200 dbghelp: Implement DW_TAG_const_type in dwarf2_parse_udt_type. --- dlls/dbghelp/dwarf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e7c36b0..a89cf11 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1453,6 +1453,9 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, case DW_TAG_subprogram: dwarf2_parse_subprogram(ctx, child); break; + case DW_TAG_const_type: + dwarf2_parse_const_type(ctx, child); + break; case DW_TAG_structure_type: case DW_TAG_class_type: case DW_TAG_union_type:

1 0

Henri Verbeet : d3d9/tests: Use create_device() in test_scissor_size().
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 1bec6ab0bc0c16f3b580165f7cb337e9510cce3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bec6ab0bc0c16f3b580165f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 11:50:49 2014 +0200 d3d9/tests: Use create_device() in test_scissor_size(). --- dlls/d3d9/tests/device.c | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 16a9177..02c8227 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -2938,6 +2938,7 @@ static void test_display_formats(void) static void test_scissor_size(void) { + struct device_desc device_desc; IDirect3D9 *d3d9_ptr; unsigned int i; static struct { @@ -2954,7 +2955,6 @@ static void test_scissor_size(void) for(i=0; i<sizeof(scts)/sizeof(scts[0]); i++) { IDirect3DDevice9 *device_ptr = 0; - D3DPRESENT_PARAMETERS present_parameters; HRESULT hr; HWND hwnd = 0; RECT scissorrect; @@ -2968,30 +2968,14 @@ static void test_scissor_size(void) scts[i].backy = screen_height; } - ZeroMemory(&present_parameters, sizeof(present_parameters)); - present_parameters.Windowed = scts[i].window; - present_parameters.hDeviceWindow = hwnd; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferWidth = scts[i].backx; - present_parameters.BackBufferHeight = scts[i].backy; - present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; - present_parameters.EnableAutoDepthStencil = TRUE; - present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; - - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - if(FAILED(hr)) { - present_parameters.AutoDepthStencilFormat = D3DFMT_D16; - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - if(FAILED(hr)) { - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); - } - } - ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D_CreateDevice returned: %08x\n", hr); - - if (!device_ptr) + device_desc.device_window = hwnd; + device_desc.width = scts[i].backx; + device_desc.height = scts[i].backy; + device_desc.windowed = scts[i].window; + if (!(device_ptr = create_device(d3d9_ptr, hwnd, &device_desc))) { + skip("Failed to create a 3D device, skipping test.\n"); DestroyWindow(hwnd); - skip("Creating the device failed\n"); goto err_out; } @@ -3001,9 +2985,7 @@ static void test_scissor_size(void) ok(scissorrect.right == scts[i].backx && scissorrect.bottom == scts[i].backy && scissorrect.top == 0 && scissorrect.left == 0, "Scissorrect missmatch (%d, %d) should be (%d, %d)\n", scissorrect.right, scissorrect.bottom, scts[i].backx, scts[i].backy); /* check the scissorrect values after a reset */ - present_parameters.BackBufferWidth = screen_width; - present_parameters.BackBufferHeight = screen_height; - hr = IDirect3DDevice9_Reset(device_ptr, &present_parameters); + hr = reset_device(device_ptr, hwnd, scts[i].window); ok(hr == D3D_OK, "IDirect3DDevice9_Reset failed with %08x\n", hr); hr = IDirect3DDevice9_TestCooperativeLevel(device_ptr); ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr);

1 0

Henri Verbeet : d3d9/tests: Allow a width and height to be passed to create_device().
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 2291c72caf14cd46d5533d9d2b2742510330e0ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=2291c72caf14cd46d5533d9d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 11:50:48 2014 +0200 d3d9/tests: Allow a width and height to be passed to create_device(). --- dlls/d3d9/tests/device.c | 241 ++++++++++++++++++++++++++++------------------- 1 file changed, 143 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2291c72caf14cd46d5533…

1 0

Henri Verbeet : wined3d: Track texture coordinate normalization per-texture.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 180071229802f259fe1a1b099faad8e7154f4194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=180071229802f259fe1a1b099… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 11:50:47 2014 +0200 wined3d: Track texture coordinate normalization per-texture. --- dlls/wined3d/surface.c | 4 +--- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8019a11..75f48de 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3299,7 +3299,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st bottom = src_surface->resource.height - src_rect->top; } - if (src_surface->flags & SFLAG_NORMCOORD) + if (src_surface->container->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) { left /= src_surface->pow2Width; right /= src_surface->pow2Width; @@ -5547,8 +5547,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text list_init(&surface->overlays); /* Flags */ - if (target != GL_TEXTURE_RECTANGLE_ARB) - surface->flags |= SFLAG_NORMCOORD; if (flags & WINED3D_SURFACE_DISCARD) surface->flags |= SFLAG_DISCARD; if (lockable || desc->format == WINED3DFMT_D16_LOCKABLE) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1eb2abb..25e2107 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -349,7 +349,7 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, context2 = context_acquire(device, backbuffer); context_apply_blit_state(context2, device); - if (backbuffer->flags & SFLAG_NORMCOORD) + if (backbuffer->container->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) { tex_left /= src_w; tex_right /= src_w; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 420355b..4f962f1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -81,7 +81,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->level_count = level_count; texture->filter_type = (desc->usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3D_TEXF_LINEAR : WINED3D_TEXF_NONE; texture->lod = 0; - texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT; + texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS; if (surface_flags & WINED3D_SURFACE_PIN_SYSMEM) texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM; @@ -1209,7 +1209,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 texture->pow2_matrix[15] = 1.0f; texture->target = GL_TEXTURE_RECTANGLE_ARB; texture->flags |= WINED3D_TEXTURE_COND_NP2; - texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; + texture->flags &= ~(WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS); if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) texture->min_mip_lookup = minMipLookup_noMip; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d7e8fb4..25d2406 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2131,6 +2131,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_CONVERTED 0x00000080 #define WINED3D_TEXTURE_PIN_SYSMEM 0x00000100 #define WINED3D_TEXTURE_DYNAMIC_MAP 0x00000200 +#define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000400 struct wined3d_texture { @@ -2351,11 +2352,10 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_DIBSECTION 0x00000001 /* Has a DIB section attached for GetDC. */ #define SFLAG_DISCARD 0x00000002 /* ??? */ #define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ -#define SFLAG_NORMCOORD 0x00000008 /* Set if GL texture coordinates are normalized (non-texture rectangle). */ +#define SFLAG_LOST 0x00000008 /* Surface lost flag for ddraw. */ #define SFLAG_GLCKEY 0x00000010 /* The GL texture was created with a color key. */ #define SFLAG_CLIENT 0x00000020 /* GL_APPLE_client_storage is used with this surface. */ #define SFLAG_DCINUSE 0x00000040 /* Set between GetDC and ReleaseDC calls. */ -#define SFLAG_LOST 0x00000080 /* Surface lost flag for ddraw. */ struct wined3d_sampler {

1 0

Henri Verbeet : wined3d: Track SFLAG_DYNLOCK per-texture.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: c5459881a30c8e7d4d6c9bb8fd2d73e040c54e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5459881a30c8e7d4d6c9bb8f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 11:50:46 2014 +0200 wined3d: Track SFLAG_DYNLOCK per-texture. --- dlls/wined3d/surface.c | 20 +++++++++++--------- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3339c5b..8019a11 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -589,11 +589,11 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) { /* In some conditions the surface memory must not be freed: * WINED3D_TEXTURE_CONVERTED: Converting the data back would take too long - * SFLAG_DYNLOCK: Avoid freeing the data for performance + * WINED3D_TEXTURE_DYNAMIC_MAP: Avoid freeing the data for performance * SFLAG_CLIENT: OpenGL uses our memory as backup */ - if (surface->resource.map_count - || surface->flags & (SFLAG_DYNLOCK | SFLAG_CLIENT) - || surface->container->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_PIN_SYSMEM)) + if (surface->resource.map_count || surface->flags & SFLAG_CLIENT + || surface->container->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_PIN_SYSMEM + | WINED3D_TEXTURE_DYNAMIC_MAP)) return; wined3d_resource_free_sysmem(&surface->resource); @@ -1450,8 +1450,8 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * get a boxed texture with width pow2width and not a texture of width resource.width. * * Performance should not be an issue, because applications normally do not lock the surfaces when - * rendering. If an app does, the SFLAG_DYNLOCK flag will kick in and the memory copy won't be released, - * and doesn't have to be re-read. */ + * rendering. If an app does, the WINED3D_TEXTURE_DYNAMIC_MAP flag will kick in and the memory copy + * won't be released, and doesn't have to be re-read. */ src_data = mem; dst_data = data.addr; TRACE("(%p) : Repacking the surface data from pitch %d to pitch %d\n", surface, src_pitch, dst_pitch); @@ -2617,13 +2617,15 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, /* Performance optimization: Count how often a surface is mapped, if it is * mapped regularly do not throw away the system memory copy. This avoids * the need to download the surface from OpenGL all the time. The surface - * is still downloaded if the OpenGL texture is changed. */ - if (!(surface->flags & SFLAG_DYNLOCK) && surface->resource.map_binding == WINED3D_LOCATION_SYSMEM) + * is still downloaded if the OpenGL texture is changed. Note that this + * only really makes sense for managed textures.*/ + if (!(surface->container->flags & WINED3D_TEXTURE_DYNAMIC_MAP) + && surface->resource.map_binding == WINED3D_LOCATION_SYSMEM) { if (++surface->lockCount > MAXLOCKCOUNT) { TRACE("Surface is mapped regularly, not freeing the system memory copy any more.\n"); - surface->flags |= SFLAG_DYNLOCK; + surface->container->flags |= WINED3D_TEXTURE_DYNAMIC_MAP; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd4668e..d7e8fb4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2130,6 +2130,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_SRGB_VALID 0x00000040 #define WINED3D_TEXTURE_CONVERTED 0x00000080 #define WINED3D_TEXTURE_PIN_SYSMEM 0x00000100 +#define WINED3D_TEXTURE_DYNAMIC_MAP 0x00000200 struct wined3d_texture { @@ -2351,11 +2352,10 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_DISCARD 0x00000002 /* ??? */ #define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ #define SFLAG_NORMCOORD 0x00000008 /* Set if GL texture coordinates are normalized (non-texture rectangle). */ -#define SFLAG_DYNLOCK 0x00000010 /* Surface is often locked by the application. */ +#define SFLAG_GLCKEY 0x00000010 /* The GL texture was created with a color key. */ #define SFLAG_CLIENT 0x00000020 /* GL_APPLE_client_storage is used with this surface. */ #define SFLAG_DCINUSE 0x00000040 /* Set between GetDC and ReleaseDC calls. */ #define SFLAG_LOST 0x00000080 /* Surface lost flag for ddraw. */ -#define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ struct wined3d_sampler {

1 0

Henri Verbeet : wined3d: Track system memory pinning per-texture.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: d6a511e0220c5cb2c2b1c18d9698d46d342affb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a511e0220c5cb2c2b1c18d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 11:50:45 2014 +0200 wined3d: Track system memory pinning per-texture. --- dlls/wined3d/surface.c | 23 ++++++++++++----------- dlls/wined3d/texture.c | 23 +++++++++++++---------- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 527601f..3339c5b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -592,8 +592,8 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) * SFLAG_DYNLOCK: Avoid freeing the data for performance * SFLAG_CLIENT: OpenGL uses our memory as backup */ if (surface->resource.map_count - || surface->flags & (SFLAG_DYNLOCK | SFLAG_CLIENT | SFLAG_PIN_SYSMEM) - || surface->container->flags & WINED3D_TEXTURE_CONVERTED) + || surface->flags & (SFLAG_DYNLOCK | SFLAG_CLIENT) + || surface->container->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_PIN_SYSMEM)) return; wined3d_resource_free_sysmem(&surface->resource); @@ -625,12 +625,14 @@ static void surface_release_client_storage(struct wined3d_surface *surface) static BOOL surface_use_pbo(const struct wined3d_surface *surface) { const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; + struct wined3d_texture *texture = surface->container; - return surface->resource.pool == WINED3D_POOL_DEFAULT + return texture->resource.pool == WINED3D_POOL_DEFAULT && surface->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] - && !surface->resource.format->convert - && !(surface->flags & (SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)); + && !texture->resource.format->convert + && !(texture->flags & WINED3D_TEXTURE_PIN_SYSMEM) + && !(surface->flags & SFLAG_NONPOW2); } static HRESULT surface_private_setup(struct wined3d_surface *surface) @@ -1481,8 +1483,8 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi if (surface->resource.map_count) { - WARN("Uploading a surface that is currently mapped, setting SFLAG_PIN_SYSMEM.\n"); - surface->flags |= SFLAG_PIN_SYSMEM; + WARN("Uploading a surface that is currently mapped, setting WINED3D_TEXTURE_PIN_SYSMEM.\n"); + surface->container->flags |= WINED3D_TEXTURE_PIN_SYSMEM; } if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) @@ -2742,7 +2744,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) if (FAILED(hr)) return WINED3DERR_INVALIDCALL; if (!(surface->resource.map_binding == WINED3D_LOCATION_USER_MEMORY - || surface->flags & SFLAG_PIN_SYSMEM + || surface->container->flags & WINED3D_TEXTURE_PIN_SYSMEM || surface->pbo)) surface->resource.map_binding = WINED3D_LOCATION_DIB; } @@ -2776,7 +2778,8 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) surface->resource.map_count--; surface->flags &= ~SFLAG_DCINUSE; - if (surface->resource.map_binding == WINED3D_LOCATION_USER_MEMORY || (surface->flags & SFLAG_PIN_SYSMEM + if (surface->resource.map_binding == WINED3D_LOCATION_USER_MEMORY + || (surface->container->flags & WINED3D_TEXTURE_PIN_SYSMEM && surface->resource.map_binding != WINED3D_LOCATION_DIB)) { /* The game Salammbo modifies the surface contents without mapping the surface between @@ -5546,8 +5549,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text surface->flags |= SFLAG_NORMCOORD; if (flags & WINED3D_SURFACE_DISCARD) surface->flags |= SFLAG_DISCARD; - if (flags & WINED3D_SURFACE_PIN_SYSMEM) - surface->flags |= SFLAG_PIN_SYSMEM; if (lockable || desc->format == WINED3DFMT_D16_LOCKABLE) surface->resource.access_flags |= WINED3D_RESOURCE_ACCESS_CPU; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fb0f0e8..420355b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -28,19 +28,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); WINE_DECLARE_DEBUG_CHANNEL(winediag); static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_texture_ops *texture_ops, - UINT layer_count, UINT level_count, const struct wined3d_resource_desc *desc, struct wined3d_device *device, - void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) + UINT layer_count, UINT level_count, const struct wined3d_resource_desc *desc, DWORD surface_flags, + struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops, + const struct wined3d_resource_ops *resource_ops) { const struct wined3d_format *format = wined3d_get_format(&device->adapter->gl_info, desc->format); HRESULT hr; TRACE("texture %p, texture_ops %p, layer_count %u, level_count %u, resource_type %s, format %s, " "multisample_type %#x, multisample_quality %#x, usage %s, pool %s, width %u, height %u, depth %u, " - "device %p, parent %p, parent_ops %p, resource_ops %p.\n", + "surface_flags %#x, device %p, parent %p, parent_ops %p, resource_ops %p.\n", texture, texture_ops, layer_count, level_count, debug_d3dresourcetype(desc->resource_type), debug_d3dformat(desc->format), desc->multisample_type, desc->multisample_quality, debug_d3dusage(desc->usage), debug_d3dpool(desc->pool), desc->width, desc->height, desc->depth, - device, parent, parent_ops, resource_ops); + surface_flags, device, parent, parent_ops, resource_ops); if ((format->flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BLOCKS_NO_VERIFY)) == WINED3DFMT_FLAG_BLOCKS) { @@ -81,6 +82,8 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->filter_type = (desc->usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3D_TEXF_LINEAR : WINED3D_TEXF_NONE; texture->lod = 0; texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT; + if (surface_flags & WINED3D_SURFACE_PIN_SYSMEM) + texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) { @@ -1053,8 +1056,8 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wi } } - if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, - desc, device, parent, parent_ops, &texture_resource_ops))) + if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, desc, + surface_flags, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x\n", hr); return hr; @@ -1178,8 +1181,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 TRACE("Calculated levels = %u.\n", levels); } - if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, - desc, device, parent, parent_ops, &texture_resource_ops))) + if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, desc, + surface_flags, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; @@ -1404,8 +1407,8 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct } } - if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, - desc, device, parent, parent_ops, &texture_resource_ops))) + if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, desc, + 0, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 810da0f..dd4668e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2129,6 +2129,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000020 #define WINED3D_TEXTURE_SRGB_VALID 0x00000040 #define WINED3D_TEXTURE_CONVERTED 0x00000080 +#define WINED3D_TEXTURE_PIN_SYSMEM 0x00000100 struct wined3d_texture { @@ -2351,11 +2352,10 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ #define SFLAG_NORMCOORD 0x00000008 /* Set if GL texture coordinates are normalized (non-texture rectangle). */ #define SFLAG_DYNLOCK 0x00000010 /* Surface is often locked by the application. */ -#define SFLAG_PIN_SYSMEM 0x00000020 /* Keep the surface in sysmem, at the same address. */ +#define SFLAG_CLIENT 0x00000020 /* GL_APPLE_client_storage is used with this surface. */ #define SFLAG_DCINUSE 0x00000040 /* Set between GetDC and ReleaseDC calls. */ #define SFLAG_LOST 0x00000080 /* Surface lost flag for ddraw. */ #define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ -#define SFLAG_CLIENT 0x00000200 /* GL_APPLE_client_storage is used with this surface. */ struct wined3d_sampler {

1 0

André Hentschel : kernel32/tests: Skip on faked version values.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 8e917352e1aaf4734b2175ee04b90c55ed7b6964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e917352e1aaf4734b2175ee0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 6 22:31:43 2014 +0200 kernel32/tests: Skip on faked version values. --- dlls/kernel32/tests/version.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index e27ea4c..a47e52c 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -23,23 +23,29 @@ #include "wine/test.h" #include "winbase.h" +#include "winternl.h" static BOOL (WINAPI * pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); static BOOL (WINAPI * pVerifyVersionInfoA)(LPOSVERSIONINFOEXA, DWORD, DWORDLONG); static ULONGLONG (WINAPI * pVerSetConditionMask)(ULONGLONG, DWORD, BYTE); +static NTSTATUS (WINAPI * pRtlGetVersion)(RTL_OSVERSIONINFOEXW *); -#define KERNEL32_GET_PROC(func) \ - p##func = (void *)GetProcAddress(hKernel32, #func); +#define GET_PROC(func) \ + p##func = (void *)GetProcAddress(hmod, #func); static void init_function_pointers(void) { - HMODULE hKernel32; + HMODULE hmod; - hKernel32 = GetModuleHandleA("kernel32.dll"); + hmod = GetModuleHandleA("kernel32.dll"); - KERNEL32_GET_PROC(GetProductInfo); - KERNEL32_GET_PROC(VerifyVersionInfoA); - KERNEL32_GET_PROC(VerSetConditionMask); + GET_PROC(GetProductInfo); + GET_PROC(VerifyVersionInfoA); + GET_PROC(VerSetConditionMask); + + hmod = GetModuleHandleA("ntdll.dll"); + + GET_PROC(RtlGetVersion); } static void test_GetProductInfo(void) @@ -170,6 +176,21 @@ static void test_VerifyVersionInfo(void) info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); GetVersionExA((OSVERSIONINFOA *)&info); servicepack = info.wServicePackMajor; + + /* Win8.1+ returns Win8 version in GetVersionEx when there's no app manifest targeting 8.1 */ + if (info.dwMajorVersion == 6 && info.dwMinorVersion == 2) + { + RTL_OSVERSIONINFOEXW rtlinfo; + rtlinfo.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); + ok(SUCCEEDED(pRtlGetVersion(&rtlinfo)), "RtlGetVersion failed\n"); + + if (rtlinfo.dwMajorVersion != 6 || rtlinfo.dwMinorVersion != 2) + { + win_skip("GetVersionEx and VerifyVersionInfo are faking values\n"); + return; + } + } + memset(&info, 0, sizeof(info)); ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION,

1 0

André Hentschel : winetest: Detect real version values.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 6d498018cc8d85a7126fe72ef4192cd3480f8405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d498018cc8d85a7126fe72ef… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 19:52:59 2014 +0200 winetest: Detect real version values. --- programs/winetest/main.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index cde618f..2afa813 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -32,6 +32,7 @@ #include <stdio.h> #include <assert.h> #include <windows.h> +#include <winternl.h> #include <mshtml.h> #include "winetest.h" @@ -323,11 +324,14 @@ static void print_version (void) # error CPU unknown #endif OSVERSIONINFOEXA ver; + RTL_OSVERSIONINFOEXW rtlver; BOOL ext; int is_win2k3_r2, is_admin, is_elevated; const char *(CDECL *wine_get_build_id)(void); + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); void (CDECL *wine_get_host_version)( const char **sysname, const char **release ); BOOL (WINAPI *pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); + NTSTATUS (WINAPI *pRtlGetVersion)(RTL_OSVERSIONINFOEXW *); ver.dwOSVersionInfoSize = sizeof(ver); if (!(ext = GetVersionExA ((OSVERSIONINFOA *) &ver))) @@ -336,6 +340,27 @@ static void print_version (void) if (!GetVersionExA ((OSVERSIONINFOA *) &ver)) report (R_FATAL, "Can't get OS version."); } + + /* try to get non-faked values */ + if (ver.dwMajorVersion == 6 && ver.dwMinorVersion == 2) + { + rtlver.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); + + pRtlGetVersion = (void *)GetProcAddress(hntdll, "RtlGetVersion"); + pRtlGetVersion(&rtlver); + + ver.dwMajorVersion = rtlver.dwMajorVersion; + ver.dwMinorVersion = rtlver.dwMinorVersion; + ver.dwBuildNumber = rtlver.dwBuildNumber; + ver.dwPlatformId = rtlver.dwPlatformId; + ver.wServicePackMajor = rtlver.wServicePackMajor; + ver.wServicePackMinor = rtlver.wServicePackMinor; + ver.wSuiteMask = rtlver.wSuiteMask; + ver.wProductType = rtlver.wProductType; + + WideCharToMultiByte(CP_ACP, 0, rtlver.szCSDVersion, -1, ver.szCSDVersion, sizeof(ver.szCSDVersion), NULL, NULL); + } + xprintf (" Platform=%s%s\n", platform, is_wow64 ? " (WOW64)" : ""); xprintf (" bRunningUnderWine=%d\n", running_under_wine ()); xprintf (" bRunningOnVisibleDesktop=%d\n", running_on_visible_desktop ()); @@ -358,8 +383,8 @@ static void print_version (void) ver.dwMajorVersion, ver.dwMinorVersion, ver.dwBuildNumber, ver.dwPlatformId, ver.szCSDVersion); - wine_get_build_id = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_build_id"); - wine_get_host_version = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_host_version"); + wine_get_build_id = (void *)GetProcAddress(hntdll, "wine_get_build_id"); + wine_get_host_version = (void *)GetProcAddress(hntdll, "wine_get_host_version"); if (wine_get_build_id) xprintf( " WineBuild=%s\n", wine_get_build_id() ); if (wine_get_host_version) {

1 0

André Hentschel : ntdll: Add support for Win 8.1.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 778c2ab6f9c7dc1d5ff0d340d8e4571a888cdb8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=778c2ab6f9c7dc1d5ff0d340d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 21:27:45 2014 +0200 ntdll: Add support for Win 8.1. --- dlls/ntdll/version.c | 8 ++++++++ programs/winecfg/appdefaults.c | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 57e586a..a6340eb 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -57,6 +57,7 @@ typedef enum WIN2K8R2,/* Windows 2008 R2 */ WIN7, /* Windows 7 */ WIN8, /* Windows 8 */ + WIN81, /* Windows 8.1 */ NB_WINDOWS_VERSIONS } WINDOWS_VERSION; @@ -177,6 +178,12 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = {' ',0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, + /* WIN81 */ + { + sizeof(RTL_OSVERSIONINFOEXW), 6, 3, 0x2580, VER_PLATFORM_WIN32_NT, + {' ',0}, + 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + }, }; @@ -199,6 +206,7 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] = "win2008r2,win2k8r2", /* WIN2K8R2 */ "win7", /* WIN7 */ "win8", /* WIN8 */ + "win81", /* WIN81 */ }; diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 3b83860..6106b23 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -49,6 +49,7 @@ static const struct const char *szProductType; } win_versions[] = { + { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, { "win7", "Windows 7", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"},

1 0

André Hentschel : slc: Add stub for SLGetWindowsInformation.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: e97746a538467835db2a278e442d67116dda853b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e97746a538467835db2a278e4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 21:27:30 2014 +0200 slc: Add stub for SLGetWindowsInformation. --- dlls/slc/slc.c | 9 ++++++++- dlls/slc/slc.spec | 2 +- include/slpublic.h | 13 ++++++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index e7416f1..1b02c9b 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -28,7 +28,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(slc); -DWORD WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwValue) +HRESULT WINAPI SLGetWindowsInformation(LPCWSTR name, SLDATATYPE *type, UINT *val, LPBYTE *size) +{ + FIXME("(%s %p %p %p) stub\n", debugstr_w(name), type, val, size ); + + return SL_E_RIGHT_NOT_GRANTED; +} + +HRESULT WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwValue) { FIXME("(%s) stub\n", debugstr_w(lpszValueName) ); diff --git a/dlls/slc/slc.spec b/dlls/slc/slc.spec index 45cd1ba..af5545c 100644 --- a/dlls/slc/slc.spec +++ b/dlls/slc/slc.spec @@ -25,7 +25,7 @@ @ stub SLGetSAMLicense @ stub SLGetSLIDList @ stub SLGetServiceInformation -@ stub SLGetWindowsInformation +@ stdcall SLGetWindowsInformation(wstr ptr ptr ptr) @ stdcall SLGetWindowsInformationDWORD(wstr ptr) @ stub SLInstallLicense @ stub SLInstallProofOfPurchase diff --git a/include/slpublic.h b/include/slpublic.h index a2c6d42..c8bb559 100644 --- a/include/slpublic.h +++ b/include/slpublic.h @@ -29,7 +29,18 @@ extern "C" { #define SLCAPI DECLSPEC_IMPORT #endif -SLCAPI DWORD WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwValue); +typedef enum _tagSLDATATYPE +{ + SL_DATA_NONE = REG_NONE, + SL_DATA_SZ = REG_SZ, + SL_DATA_DWORD = REG_DWORD, + SL_DATA_BINARY = REG_BINARY, + SL_DATA_MULTI_SZ = REG_MULTI_SZ, + SL_DATA_SUM = 100, +} SLDATATYPE; + +SLCAPI HRESULT WINAPI SLGetWindowsInformation(LPCWSTR, SLDATATYPE*, UINT*, LPBYTE*); +SLCAPI HRESULT WINAPI SLGetWindowsInformationDWORD(LPCWSTR, LPDWORD); #ifdef __cplusplus

1 0

Austin English : wsnmp32: Add stub for SnmpOpen.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 80c3a8f8bc58fff8725f52e23a4f9860af0f95e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80c3a8f8bc58fff8725f52e23… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 7 11:12:16 2014 -0500 wsnmp32: Add stub for SnmpOpen. --- dlls/wsnmp32/wsnmp32.c | 6 ++++++ dlls/wsnmp32/wsnmp32.spec | 2 +- include/winsnmp.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wsnmp32/wsnmp32.c b/dlls/wsnmp32/wsnmp32.c index 721842f..3dc54cb 100644 --- a/dlls/wsnmp32/wsnmp32.c +++ b/dlls/wsnmp32/wsnmp32.c @@ -45,6 +45,12 @@ SNMPAPI_STATUS WINAPI SnmpCleanup( void ) return SNMPAPI_SUCCESS; } +HSNMP_SESSION WINAPI SnmpOpen( HWND hwnd, UINT msg ) +{ + FIXME( "%p %u\n", hwnd, msg ); + return SNMPAPI_FAILURE; +} + SNMPAPI_STATUS WINAPI SnmpSetRetransmitMode( smiUINT32 retransmit_mode ) { FIXME( "%u\n", retransmit_mode ); diff --git a/dlls/wsnmp32/wsnmp32.spec b/dlls/wsnmp32/wsnmp32.spec index 197092a..61e48ba 100644 --- a/dlls/wsnmp32/wsnmp32.spec +++ b/dlls/wsnmp32/wsnmp32.spec @@ -11,7 +11,7 @@ 120 stub SnmpGetVendorInfo 200 stdcall SnmpStartup(ptr ptr ptr ptr ptr) 201 stdcall SnmpCleanup() -202 stub SnmpOpen +202 stdcall SnmpOpen(ptr long) 203 stub SnmpClose 204 stub SnmpSendMsg 205 stub SnmpRecvMsg diff --git a/include/winsnmp.h b/include/winsnmp.h index 64765de..79a5e88 100644 --- a/include/winsnmp.h +++ b/include/winsnmp.h @@ -27,6 +27,7 @@ typedef int smiINT, *smiLPINT; typedef smiINT smiINT32, *smiLPINT32; typedef unsigned int smiUINT32, *smiLPUINT32; typedef smiUINT32 SNMPAPI_STATUS; +typedef HANDLE HSNMP_SESSION; #define SNMPAPI_NO_SUPPORT 0 #define SNMPAPI_V1_SUPPORT 1 @@ -44,6 +45,7 @@ typedef smiUINT32 SNMPAPI_STATUS; #define SNMPAPI_SUCCESS 1 SNMPAPI_STATUS WINAPI SnmpCleanup(void); +HSNMP_SESSION WINAPI SnmpOpen(HWND,UINT); SNMPAPI_STATUS WINAPI SnmpSetRetransmitMode(smiUINT32); SNMPAPI_STATUS WINAPI SnmpSetTranslateMode(smiUINT32); SNMPAPI_STATUS WINAPI SnmpStartup(smiLPUINT32,smiLPUINT32,smiLPUINT32,smiLPUINT32,smiLPUINT32);

1 0

Austin English : ntdsapi: Add stubs for DsBindA/W.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 35b90ece93aeaec2affc571b1420a9ec569125f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b90ece93aeaec2affc571b1… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 7 11:46:05 2014 -0500 ntdsapi: Add stubs for DsBindA/W. --- dlls/ntdsapi/ntdsapi.c | 18 ++++++++++++++++++ dlls/ntdsapi/ntdsapi.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 1ffbd9d..4ca3b09 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -48,6 +48,24 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) } /*********************************************************************** + * DsBindA (NTDSAPI.@) + */ +DWORD WINAPI DsBindA(LPCSTR controller, LPCSTR domain, HANDLE *handle) + { + FIXME("(%s,%s, %p): stub!\n", debugstr_a(controller), debugstr_a(domain), handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * DsBindW (NTDSAPI.@) + */ +DWORD WINAPI DsBindW(LPCWSTR controller, LPCWSTR domain, HANDLE *handle) + { + FIXME("(%s,%s, %p): stub!\n", debugstr_w(controller), debugstr_w(domain), handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** * DsMakeSpnW (NTDSAPI.@) */ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, diff --git a/dlls/ntdsapi/ntdsapi.spec b/dlls/ntdsapi/ntdsapi.spec index f4ae6f8..b3ed8be 100644 --- a/dlls/ntdsapi/ntdsapi.spec +++ b/dlls/ntdsapi/ntdsapi.spec @@ -1,7 +1,7 @@ @ stub DsAddSidHistoryA @ stub DsAddSidHistoryW -@ stub DsBindA -@ stub DsBindW +@ stdcall DsBindA(str str ptr) +@ stdcall DsBindW(wstr wstr ptr) @ stub DsBindWithCredA @ stub DsBindWithCredW @ stub DsBindWithSpnA

1 0

André Hentschel : setupapi: Add stubs for CM_Get_Device_Interface_List_SizeA/W.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: f272c126072dc96da2c1fce1118b09e9126c3013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f272c126072dc96da2c1fce11… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 21:27:27 2014 +0200 setupapi: Add stubs for CM_Get_Device_Interface_List_SizeA/W. --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index e38f720..f442157 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -84,8 +84,8 @@ @ stub CM_Get_Device_Interface_ListW @ stub CM_Get_Device_Interface_List_ExA @ stub CM_Get_Device_Interface_List_ExW -@ stub CM_Get_Device_Interface_List_SizeA -@ stub CM_Get_Device_Interface_List_SizeW +@ stdcall CM_Get_Device_Interface_List_SizeA(ptr ptr str long) setupapi.CM_Get_Device_Interface_List_SizeA +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW @ stdcall CM_Get_Device_Interface_List_Size_ExA(ptr ptr str long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExA @ stdcall CM_Get_Device_Interface_List_Size_ExW(ptr ptr wstr long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExW @ stub CM_Get_First_Log_Conf diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 48ab1e4..4fcf298 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -95,8 +95,8 @@ @ stub CM_Get_Device_Interface_ListW @ stub CM_Get_Device_Interface_List_ExA @ stub CM_Get_Device_Interface_List_ExW -@ stub CM_Get_Device_Interface_List_SizeA -@ stub CM_Get_Device_Interface_List_SizeW +@ stdcall CM_Get_Device_Interface_List_SizeA(ptr ptr str long) +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) @ stdcall CM_Get_Device_Interface_List_Size_ExA(ptr ptr str long ptr) @ stdcall CM_Get_Device_Interface_List_Size_ExW(ptr ptr wstr long ptr) @ stub CM_Get_First_Log_Conf diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index c07278e..673bbbf 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -367,6 +367,26 @@ CONFIGRET WINAPI CM_Locate_DevNode_ExW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceI } /*********************************************************************** + * CM_Get_Device_Interface_List_SizeA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeA(PULONG len, LPGUID class, DEVINSTID_A id, + ULONG flags) +{ + FIXME("%p %p %s 0x%08x: stub\n", len, class, debugstr_a(id), flags); + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_Device_Interface_List_SizeW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeW(PULONG len, LPGUID class, DEVINSTID_W id, + ULONG flags) +{ + FIXME("%p %p %s 0x%08x: stub\n", len, class, debugstr_w(id), flags); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Get_Device_Interface_List_Size_ExA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExA(PULONG len, LPGUID class, DEVINSTID_A id,

1 0

YongHao Hu : msvcp90/tests: Add cout<< float test.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: d33ce5629f3482a3525316d12e94af21daf43745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33ce5629f3482a3525316d12… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Tue Oct 7 09:48:06 2014 +0800 msvcp90/tests: Add cout<< float test. --- dlls/msvcp90/tests/ios.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 6eb23a9..470dc37 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -464,6 +464,8 @@ static fpos_int* (*__thiscall p_basic_istream_wchar_tellg)(basic_istr static basic_istream_wchar* (*__cdecl p_basic_istream_wchar_getline_bstr_delim)(basic_istream_wchar*, basic_string_wchar*, wchar_t); /* ostream */ +static basic_ostream_char* (*__thiscall p_basic_ostream_char_print_float)(basic_ostream_char*, float); + static basic_ostream_char* (*__thiscall p_basic_ostream_char_print_double)(basic_ostream_char*, double); static basic_ostream_wchar* (*__thiscall p_basic_ostream_wchar_print_double)(basic_ostream_wchar*, double); @@ -544,6 +546,7 @@ static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void /* to silence compiler errors */ static void * (WINAPI *call_thiscall_func2_ptr_dbl)( void *func, void *this, double a ); +static void * (WINAPI *call_thiscall_func2_ptr_flt)( void *func, void *this, float a ); static void * (WINAPI *call_thiscall_func2_ptr_fpos)( void *func, void *this, fpos_int a ); static void init_thiscall_thunk(void) @@ -562,6 +565,7 @@ static void init_thiscall_thunk(void) call_thiscall_func5 = (void *)thunk; call_thiscall_func2_ptr_dbl = (void *)thunk; + call_thiscall_func2_ptr_flt = (void *)thunk; call_thiscall_func2_ptr_fpos = (void *)thunk; } @@ -574,6 +578,7 @@ static void init_thiscall_thunk(void) (const void*)(c), (const void *)(d)) #define call_func2_ptr_dbl(func,_this,a) call_thiscall_func2_ptr_dbl(func,_this,a) +#define call_func2_ptr_flt(func,_this,a) call_thiscall_func2_ptr_flt(func,_this,a) #define call_func2_ptr_fpos(func,_this,a) call_thiscall_func2_ptr_fpos(func,_this,a) #else @@ -586,6 +591,7 @@ static void init_thiscall_thunk(void) #define call_func5(func,_this,a,b,c,d) func(_this,a,b,c,d) #define call_func2_ptr_dbl call_func2 +#define call_func2_ptr_flt call_func2 #define call_func2_ptr_fpos call_func2 #endif /* __i386__ */ @@ -682,6 +688,9 @@ static BOOL init(void) SET(p_basic_istream_wchar_getline_bstr_delim, "??$getline(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@YAAEAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AEAV10@AEAV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)_W@Z"); + SET(p_basic_ostream_char_print_float, + "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)M@Z"); + SET(p_basic_ostream_char_print_double, "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV01(a)N@Z"); @@ -796,6 +805,9 @@ static BOOL init(void) SET(p_basic_istream_wchar_getline_bstr_delim, "??$getline(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@AAV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)_W@Z"); + SET(p_basic_ostream_char_print_float, + "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV01(a)M@Z"); + SET(p_basic_ostream_char_print_double, "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAAAAV01(a)N@Z"); @@ -909,6 +921,9 @@ static BOOL init(void) SET(p_basic_istream_wchar_getline_bstr_delim, "??$getline(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@YAAAV?$basic_istream(a)_WU?$char_traits(a)_W@std@@@0(a)AAV10@AAV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@0(a)_W@Z"); + SET(p_basic_ostream_char_print_float, + "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)M@Z"); + SET(p_basic_ostream_char_print_double, "??6?$basic_ostream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV01(a)N@Z"); @@ -1951,6 +1966,26 @@ static void test_ostream_print_ushort(void) call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); } +static void test_ostream_print_float(void) +{ + static const char float_str[] = "3.14159"; + + basic_stringstream_char ss; + basic_string_char pstr; + const char *str; + float val; + val = 3.14159; + + call_func1(p_basic_stringstream_char_ctor, &ss); + call_func2_ptr_flt(p_basic_ostream_char_print_float, &ss.base.base2, val); + call_func2(p_basic_stringstream_char_str_get, &ss, &pstr); + str = call_func1(p_basic_string_char_cstr, &pstr); + ok(!strcmp(float_str, str), "str = %s\n", str); + + call_func1(p_basic_string_char_dtor, &pstr); + call_func1(p_basic_stringstream_char_vbase_dtor, &ss); +} + static void test_ostream_print_double(void) { static const char double_str[] = "3.14159"; @@ -2008,6 +2043,7 @@ START_TEST(ios) test_istream_tellg(); test_istream_getline(); test_ostream_print_ushort(); + test_ostream_print_float(); test_ostream_print_double(); test_ostream_wchar_print_double();

1 0

YongHao Hu : msvcp90/tests: Add cout<< double test.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: edb68e7b225f6a87cadd3db9fa256dce0e23938e URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb68e7b225f6a87cadd3db9f… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Tue Oct 7 09:47:21 2014 +0800 msvcp90/tests: Add cout<< double test. --- dlls/msvcp90/tests/ios.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index 76107b0..6eb23a9 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -1951,6 +1951,46 @@ static void test_ostream_print_ushort(void) call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); } +static void test_ostream_print_double(void) +{ + static const char double_str[] = "3.14159"; + + basic_stringstream_char ss; + basic_string_char pstr; + const char *str; + double val; + val = 3.14159; + + call_func1(p_basic_stringstream_char_ctor, &ss); + call_func2_ptr_dbl(p_basic_ostream_char_print_double, &ss.base.base2, val); + call_func2(p_basic_stringstream_char_str_get, &ss, &pstr); + str = call_func1(p_basic_string_char_cstr, &pstr); + ok(!strcmp(double_str, str), "str = %s\n", str); + + call_func1(p_basic_string_char_dtor, &pstr); + call_func1(p_basic_stringstream_char_vbase_dtor, &ss); +} + +static void test_ostream_wchar_print_double(void) +{ + static const wchar_t double_str[] = { '3', '.', '1', '4', '1', '5', '9', 0 }; + + basic_stringstream_wchar wss; + basic_string_wchar pwstr; + const wchar_t *wstr; + double val; + val = 3.14159; + + call_func1(p_basic_stringstream_wchar_ctor, &wss); + call_func2_ptr_dbl(p_basic_ostream_wchar_print_double, &wss.base.base2, val); + + call_func2(p_basic_stringstream_wchar_str_get, &wss, &pwstr); + wstr = call_func1(p_basic_string_wchar_cstr, &pwstr); + + ok(!lstrcmpW(double_str, wstr), "wstr = %s\n", wine_dbgstr_w(wstr)); + call_func1(p_basic_string_wchar_dtor, &pwstr); + call_func1(p_basic_stringstream_wchar_vbase_dtor, &wss); +} START_TEST(ios) { @@ -1968,6 +2008,8 @@ START_TEST(ios) test_istream_tellg(); test_istream_getline(); test_ostream_print_ushort(); + test_ostream_print_double(); + test_ostream_wchar_print_double(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n");

1 0

Nikolay Sivov : urlmon: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 8735cfc08693c9552ad98ceec95e2470a739a5d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8735cfc08693c9552ad98ceec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 08:42:56 2014 +0400 urlmon: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/urlmon/sec_mgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index e1c7ec8..cfc68de 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -740,7 +740,7 @@ static HRESULT generate_security_id(IUri *uri, BYTE *secid, DWORD *secid_len, DW if(len+sizeof(DWORD) > *secid_len) { SysFreeString(display_uri); - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; } WideCharToMultiByte(CP_ACP, 0, display_uri, -1, (LPSTR)secid, len, NULL, NULL); @@ -776,7 +776,7 @@ static HRESULT generate_security_id(IUri *uri, BYTE *secid, DWORD *secid_len, DW if(len+sizeof(DWORD) > *secid_len) { SysFreeString(host); SysFreeString(scheme); - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; } WideCharToMultiByte(CP_ACP, 0, scheme, -1, (LPSTR)secid, len, NULL, NULL);

1 0

Austin English : kernel32: Add a stub for GetSystemFileCacheSize.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 2a5299ea32a473dd6341ab6a1e55aa1634eaa677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a5299ea32a473dd6341ab6a1… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 7 14:34:51 2014 -0500 kernel32: Add a stub for GetSystemFileCacheSize. --- .../api-ms-win-core-memory-l1-1-1.spec | 2 +- dlls/kernel32/heap.c | 7 +++++++ dlls/kernel32/kernel32.spec | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) 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 891582a..f0cd496 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 @@ -5,7 +5,7 @@ @ stdcall FlushViewOfFile(ptr long) kernel32.FlushViewOfFile @ stub GetLargePageMinimum @ stub GetProcessWorkingSetSizeEx -@ stub GetSystemFileCacheSize +@ stdcall GetSystemFileCacheSize(ptr ptr ptr) kernel32.GetSystemFileCacheSize @ stdcall GetWriteWatch(long ptr long ptr ptr ptr) kernel32.GetWriteWatch @ stdcall MapViewOfFile(long long long long long) kernel32.MapViewOfFile @ stdcall MapViewOfFileEx(long long long long long ptr) kernel32.MapViewOfFileEx diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index db1b401..5a16a12 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1447,3 +1447,10 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) lpBuffer->dwAvailPhys, lpBuffer->dwTotalPageFile, lpBuffer->dwAvailPageFile, lpBuffer->dwTotalVirtual, lpBuffer->dwAvailVirtual ); } + +BOOL WINAPI GetSystemFileCacheSize(PSIZE_T mincache, PSIZE_T maxcache, PDWORD flags) +{ + FIXME("stub: %p %p %p\n", mincache, maxcache, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2de2119..e82a64d 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -637,6 +637,7 @@ @ stdcall GetStringTypeExA(long long str long ptr) @ stdcall GetStringTypeExW(long long wstr long ptr) @ stdcall GetStringTypeW(long wstr long ptr) +@ stdcall GetSystemFileCacheSize(ptr ptr ptr) @ stdcall GetSystemDefaultLCID() @ stdcall GetSystemDefaultLangID() @ stdcall GetSystemDefaultLocaleName(ptr long)

1 0

Iván Matellanes : msvcrt: Added _fclose_nolock() implementation.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 9fda14a9d62d5b30a4611eb45d1b8bd6c8db147e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fda14a9d62d5b30a4611eb45… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Tue Oct 7 13:35:29 2014 +0200 msvcrt: Added _fclose_nolock() implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 17 ++++++++++++++--- dlls/msvcrt/msvcrt.h | 1 + include/msvcrt/stdio.h | 1 + 7 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 84ddcc9..2796576 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -794,7 +794,7 @@ @ cdecl _execvpe(str ptr ptr) @ cdecl _exit(long) MSVCRT__exit @ cdecl _expand(ptr long) -@ stub _fclose_nolock +@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock @ cdecl _fcloseall() MSVCRT__fcloseall @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 36c4137..ae6c356 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1142,7 +1142,7 @@ @ cdecl _execvpe(str ptr ptr) @ cdecl _exit(long) MSVCRT__exit @ cdecl _expand(ptr long) -@ stub _fclose_nolock +@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock @ cdecl _fcloseall() MSVCRT__fcloseall @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1745f64..fc38453 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -461,7 +461,7 @@ @ cdecl _execvpe(str ptr ptr) @ cdecl _exit(long) MSVCRT__exit @ cdecl _expand(ptr long) -@ stub _fclose_nolock +@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock @ cdecl _fcloseall() MSVCRT__fcloseall @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ba3757a..4267c2c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -443,7 +443,7 @@ @ cdecl _execvpe(str ptr ptr) @ cdecl _exit(long) MSVCRT__exit @ cdecl _expand(ptr long) -@ stub _fclose_nolock +@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock @ cdecl _fcloseall() MSVCRT__fcloseall @ cdecl _fcvt(double long ptr ptr) MSVCRT__fcvt @ cdecl _fcvt_s(ptr long double long ptr ptr) MSVCRT__fcvt_s diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7ce8b59..c57861a 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3373,9 +3373,22 @@ int CDECL MSVCRT__putw(int val, MSVCRT_FILE* file) */ int CDECL MSVCRT_fclose(MSVCRT_FILE* file) { - int r, flag; + int ret; MSVCRT__lock_file(file); + ret = MSVCRT__fclose_nolock(file); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* + * _fclose_nolock (MSVCRT.@) + */ +int CDECL MSVCRT__fclose_nolock(MSVCRT_FILE* file) +{ + int r, flag; + flag = file->_flag; MSVCRT_free(file->_tmpfname); file->_tmpfname = NULL; @@ -3386,9 +3399,7 @@ int CDECL MSVCRT_fclose(MSVCRT_FILE* file) MSVCRT_free(file->_base); r=MSVCRT__close(file->_file); - file->_flag = 0; - MSVCRT__unlock_file(file); return ((r == -1) || (flag & MSVCRT__IOERR) ? MSVCRT_EOF : 0); } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 54cd11a..200e35c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -926,6 +926,7 @@ MSVCRT_ulong* __cdecl MSVCRT___doserrno(void); int* __cdecl MSVCRT__errno(void); char* __cdecl MSVCRT_getenv(const char*); int __cdecl MSVCRT_fclose(MSVCRT_FILE*); +int __cdecl MSVCRT__fclose_nolock(MSVCRT_FILE*); void __cdecl MSVCRT_terminate(void); MSVCRT_FILE* __cdecl MSVCRT__iob_func(void); MSVCRT_clock_t __cdecl MSVCRT_clock(void); diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 737003d..184dd2b 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -129,6 +129,7 @@ int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); void __cdecl clearerr(FILE*); int __cdecl fclose(FILE*); +int __cdecl _fclose_nolock(FILE*); int __cdecl feof(FILE*); int __cdecl ferror(FILE*); int __cdecl fflush(FILE*);

1 0

Nikolay Sivov : dwrite: Pass stream pointer to OpenType parsing code.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 1e65a32e2659b667c47d6662089fd52c798a17d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e65a32e2659b667c47d66620… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 14:14:51 2014 +0400 dwrite: Pass stream pointer to OpenType parsing code. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 15 +++++---------- dlls/dwrite/opentype.c | 14 ++++++++++++-- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 736292e..af3ae79 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -106,7 +106,7 @@ extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DE extern HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace **font_face) DECLSPEC_HIDDEN; /* Opentype font table functions */ -extern HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) DECLSPEC_HIDDEN; +extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; extern HRESULT find_font_table(IDWriteFontFileStream *stream, UINT32 font_index, UINT32 tag, const void** table_data, void** table_context, UINT32 *table_size, BOOL* found) DECLSPEC_HIDDEN; extern VOID OpenType_CMAP_GetGlyphIndex(LPVOID data, DWORD utf32c, LPWORD pgi, DWORD flags) DECLSPEC_HIDDEN; extern VOID get_font_properties(LPCVOID os2, LPCVOID head, LPCVOID post, DWRITE_FONT_METRICS *metrics, DWRITE_FONT_STRETCH *stretch, DWRITE_FONT_WEIGHT *weight, DWRITE_FONT_STYLE *style) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index def64ce..a00b784 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1276,12 +1276,10 @@ static HRESULT WINAPI dwritefontfile_GetLoader(IDWriteFontFile *iface, IDWriteFo static HRESULT WINAPI dwritefontfile_Analyze(IDWriteFontFile *iface, BOOL *isSupportedFontType, DWRITE_FONT_FILE_TYPE *fontFileType, DWRITE_FONT_FACE_TYPE *fontFaceType, UINT32 *numberOfFaces) { - HRESULT hr; - const void *font_data; - void *context; + struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface); IDWriteFontFileStream *stream; + HRESULT hr; - struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface); FIXME("(%p)->(%p, %p, %p, %p): Stub\n", This, isSupportedFontType, fontFileType, fontFaceType, numberOfFaces); *isSupportedFontType = FALSE; @@ -1293,12 +1291,9 @@ static HRESULT WINAPI dwritefontfile_Analyze(IDWriteFontFile *iface, BOOL *isSup hr = IDWriteFontFileLoader_CreateStreamFromKey(This->loader, This->reference_key, This->key_size, &stream); if (FAILED(hr)) return S_OK; - hr = IDWriteFontFileStream_ReadFileFragment(stream, &font_data, 0, 28, &context); - if (SUCCEEDED(hr)) - { - hr = analyze_opentype_font(font_data, numberOfFaces, fontFileType, fontFaceType, isSupportedFontType); - IDWriteFontFileStream_ReleaseFileFragment(stream, context); - } + + hr = opentype_analyze_font(stream, numberOfFaces, fontFileType, fontFaceType, isSupportedFontType); + /* TODO: Further Analysis */ IDWriteFontFileStream_Release(stream); return S_OK; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 318adcf..26ad333 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -180,11 +180,19 @@ typedef struct } TT_OS2_V2; #include "poppack.h" -HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) +HRESULT opentype_analyze_font(IDWriteFontFileStream *stream, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) { /* TODO: Do font validation */ - const char* tag = font_data; + const void *font_data; + const char* tag; + void *context; + HRESULT hr; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &font_data, 0, sizeof(TTC_Header_V1), &context); + if (FAILED(hr)) + return hr; + + tag = font_data; *supported = FALSE; *file_type = DWRITE_FONT_FILE_TYPE_UNKNOWN; if (face_type) @@ -212,6 +220,8 @@ HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_ { *file_type = DWRITE_FONT_FILE_TYPE_CFF; } + + IDWriteFontFileStream_ReleaseFileFragment(stream, context); return S_OK; }

1 0

Nikolay Sivov : uxtheme: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: d861dc5e613f4c19644d3f71951f7b108d426323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d861dc5e613f4c19644d3f719… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 08:44:50 2014 +0400 uxtheme: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/uxtheme/tests/system.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index eab7b34..49eba64 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -474,9 +474,9 @@ static void test_GetCurrentThemeName(void) hRes = pGetCurrentThemeName(currentTheme, 2, NULL, 0, NULL, 0); if (bThemeActive) todo_wine - ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) || + ok(hRes == E_NOT_SUFFICIENT_BUFFER || broken(hRes == E_FAIL /* WinXP SP1 */), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); + "Expected E_NOT_SUFFICIENT_BUFFER, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); @@ -486,9 +486,9 @@ static void test_GetCurrentThemeName(void) currentSize, sizeof(currentSize) / sizeof(WCHAR)); if (bThemeActive) todo_wine - ok(hRes == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) || + ok(hRes == E_NOT_SUFFICIENT_BUFFER || broken(hRes == E_FAIL /* WinXP SP1 */), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); + "Expected E_NOT_SUFFICIENT_BUFFER, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes);

1 0

Nikolay Sivov : msi: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 8f971bfee6cb88b2f9048e274b701538688b1151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f971bfee6cb88b2f9048e274… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 08:27:49 2014 +0400 msi: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/msi/assembly.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 2f321db..a25b19d 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -251,7 +251,7 @@ static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_n memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, display_name, &info ); - if (hr == S_OK /* sxs version */ || hr == HRESULT_FROM_WIN32( ERROR_INSUFFICIENT_BUFFER )) + if (hr == S_OK /* sxs version */ || hr == E_NOT_SUFFICIENT_BUFFER) { return (info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED); } @@ -357,7 +357,7 @@ static enum clr_version get_clr_version( const WCHAR *filename ) if (!pGetFileVersion) return CLR_VERSION_V10; hr = pGetFileVersion( filename, NULL, 0, &len ); - if (hr != HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) return CLR_VERSION_V11; + if (hr != E_NOT_SUFFICIENT_BUFFER) return CLR_VERSION_V11; if ((strW = msi_alloc( len * sizeof(WCHAR) ))) { hr = pGetFileVersion( filename, strW, len, &len );

1 0

Nikolay Sivov : dwrite: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 37a02acc6a727930295178bbcda239b4381bb1c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37a02acc6a727930295178bbc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 7 09:38:34 2014 +0400 dwrite: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/dwrite/analyzer.c | 2 +- dlls/dwrite/tests/analyzer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 5851e90..1a05335 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -860,7 +860,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, script = analysis->script > Script_LastId ? Script_Unknown : analysis->script; if (max_glyph_count < length) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; if (substitution) FIXME("number substitution is not supported.\n"); diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 1add761..233f072 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1121,7 +1121,7 @@ static void test_GetGlyphs(void) sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT; hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, test1W, lstrlenW(test1W), fontface, FALSE, FALSE, &sa, NULL, NULL, NULL, NULL, 0, maxglyphcount, clustermap, props, glyphs1, shapingprops, &actual_count); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "got 0x%08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); if (0) { /* NULL fontface - crashes on Windows */

1 0

Alistair Leslie-Hughes : ws2_32: Make SOCKET output consistent.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: a5df09b4047b11b2534fa699b8b887c8af7f724a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5df09b4047b11b2534fa699b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 8 09:27:19 2014 +1100 ws2_32: Make SOCKET output consistent. --- dlls/ws2_32/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8b60fb3..0bcce40 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2293,7 +2293,7 @@ static int WS2_register_async_shutdown( SOCKET s, int type ) struct ws2_async *wsa; NTSTATUS status; - TRACE("s %ld type %d\n", s, type); + TRACE("s %04lx type %d\n", s, type); wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct ws2_async, iovec[1] )); if ( !wsa ) @@ -3744,7 +3744,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID int fd; DWORD status = 0, total = 0; - TRACE("%ld, %s, %p, %d, %p, %d, %p, %p, %p\n", + TRACE("%04lx, %s, %p, %d, %p, %d, %p, %p, %p\n", s, debugstr_wsaioctl(code), in_buff, in_size, out_buff, out_size, ret_size, overlapped, completion); switch (code)

1 0

Austin English : kernel32: Add a stub for SetSystemFileCacheSize.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 96e920e01f90a2d9c343ad57986f8bf0ad1eb63f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e920e01f90a2d9c343ad579… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 7 14:35:03 2014 -0500 kernel32: Add a stub for SetSystemFileCacheSize. --- .../api-ms-win-core-memory-l1-1-1.spec | 2 +- dlls/kernel32/heap.c | 7 +++++++ dlls/kernel32/kernel32.spec | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) 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 f0cd496..5d3eb13 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 @@ -16,7 +16,7 @@ @ stdcall ReadProcessMemory(long ptr ptr long ptr) kernel32.ReadProcessMemory @ stdcall ResetWriteWatch(ptr long) kernel32.ResetWriteWatch @ stub SetProcessWorkingSetSizeEx -@ stub SetSystemFileCacheSize +@ stdcall SetSystemFileCacheSize(long long long) kernel32.SetSystemFileCacheSize @ stdcall UnmapViewOfFile(ptr) kernel32.UnmapViewOfFile @ stub UnmapViewOfFileEx @ stdcall VirtualAlloc(ptr long long long) kernel32.VirtualAlloc diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 5a16a12..9037f8e 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1454,3 +1454,10 @@ BOOL WINAPI GetSystemFileCacheSize(PSIZE_T mincache, PSIZE_T maxcache, PDWORD fl SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI SetSystemFileCacheSize(SIZE_T mincache, SIZE_T maxcache, DWORD flags) +{ + FIXME("stub: %ld %ld %d\n", mincache, maxcache, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index e82a64d..d08f90c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1167,6 +1167,7 @@ @ stdcall SetProcessShutdownParameters(long long) @ stdcall SetProcessWorkingSetSize(long long long) @ stdcall SetStdHandle(long long) +@ stdcall SetSystemFileCacheSize(long long long) @ stdcall SetSystemPowerState(long long) @ stdcall SetSystemTime(ptr) @ stdcall SetSystemTimeAdjustment(long long)

1 0

Henri Verbeet : wined3d: Track format conversion per-texture.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 710694d9ca654f3d01a74a06240b0c6252b135be URL: http://source.winehq.org/git/wine.git/?a=commit;h=710694d9ca654f3d01a74a062… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 08:47:22 2014 +0200 wined3d: Track format conversion per-texture. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/surface.c | 16 +++++++++------- dlls/wined3d/texture.c | 17 ++++++----------- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 52b9d9d..6fbe296 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7469,7 +7469,7 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct arbfp_blit_type type; struct arbfp_blit_desc *desc; - if (surface->flags & SFLAG_CONVERTED) + if (surface->container->flags & WINED3D_TEXTURE_CONVERTED) { gl_info->gl_ops.gl.p_glEnable(textype); checkGLcall("glEnable(textype)"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0967220..527601f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -588,11 +588,12 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { /* In some conditions the surface memory must not be freed: - * SFLAG_CONVERTED: Converting the data back would take too long + * WINED3D_TEXTURE_CONVERTED: Converting the data back would take too long * SFLAG_DYNLOCK: Avoid freeing the data for performance * SFLAG_CLIENT: OpenGL uses our memory as backup */ - if (surface->resource.map_count || surface->flags & (SFLAG_CONVERTED | SFLAG_DYNLOCK - | SFLAG_CLIENT | SFLAG_PIN_SYSMEM)) + if (surface->resource.map_count + || surface->flags & (SFLAG_DYNLOCK | SFLAG_CLIENT | SFLAG_PIN_SYSMEM) + || surface->container->flags & WINED3D_TEXTURE_CONVERTED) return; wined3d_resource_free_sysmem(&surface->resource); @@ -1323,7 +1324,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct struct wined3d_bo_address data; /* Only support read back of converted P8 surfaces. */ - if (surface->flags & SFLAG_CONVERTED && format->id != WINED3DFMT_P8_UINT) + if (surface->container->flags & WINED3D_TEXTURE_CONVERTED && format->id != WINED3DFMT_P8_UINT) { ERR("Trying to read back converted surface %p with format %s.\n", surface, debug_d3dformat(format->id)); return; @@ -4189,8 +4190,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, format = *wined3d_get_format(gl_info, conversion->dst_format); /* Don't use PBOs for converted surfaces. During PBO conversion we look at - * SFLAG_CONVERTED but it isn't set (yet) in all cases it is getting - * called. */ + * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is + * getting called. */ if ((format.convert || conversion) && surface->pbo) { TRACE("Removing the pbo attached to surface %p.\n", surface); @@ -5285,7 +5286,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC /* We want to avoid invalidating the sysmem location for converted * surfaces, since otherwise we'd have to convert the data back when * locking them. */ - if (dst_surface->flags & SFLAG_CONVERTED || dst_surface->container->resource.format->convert + if (dst_surface->container->flags & WINED3D_TEXTURE_CONVERTED + || dst_surface->container->resource.format->convert || wined3d_format_get_color_key_conversion(dst_surface->container, TRUE)) { WARN_(d3d_perf)("Converted surface, using CPU blit.\n"); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index bc75305..fb0f0e8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -765,7 +765,7 @@ void wined3d_texture_force_reload(struct wined3d_texture *texture) unsigned int sub_count = texture->level_count * texture->layer_count; unsigned int i; - texture->flags &= ~(WINED3D_TEXTURE_RGB_ALLOCATED | WINED3D_TEXTURE_SRGB_ALLOCATED); + texture->flags &= ~(WINED3D_TEXTURE_RGB_ALLOCATED | WINED3D_TEXTURE_SRGB_ALLOCATED | WINED3D_TEXTURE_CONVERTED); for (i = 0; i < sub_count; ++i) { texture->texture_ops->texture_sub_resource_invalidate_location(texture->sub_resources[i], @@ -850,7 +850,6 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi const struct wined3d_format *format = texture->resource.format; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_color_key_conversion *conversion; - BOOL converted = FALSE; GLenum internal; UINT i; @@ -858,11 +857,11 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi if (format->convert) { - converted = TRUE; + texture->flags |= WINED3D_TEXTURE_CONVERTED; } else if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) { - converted = TRUE; + texture->flags |= WINED3D_TEXTURE_CONVERTED; format = wined3d_get_format(gl_info, conversion->dst_format); TRACE("Using format %s for color key conversion.\n", debug_d3dformat(format->id)); } @@ -889,11 +888,6 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi GLsizei width = surface->pow2Width; const BYTE *mem = NULL; - if (converted) - surface->flags |= SFLAG_CONVERTED; - else - surface->flags &= ~SFLAG_CONVERTED; - if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) { height *= format->height_scale.numerator; @@ -905,13 +899,14 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi if (gl_info->supported[APPLE_CLIENT_STORAGE]) { - if (surface->flags & (SFLAG_NONPOW2 | SFLAG_DIBSECTION | SFLAG_CONVERTED) + if (surface->flags & (SFLAG_NONPOW2 | SFLAG_DIBSECTION) + || texture->flags & WINED3D_TEXTURE_CONVERTED || !surface->resource.heap_memory) { /* In some cases we want to disable client storage. * SFLAG_NONPOW2 has a bigger opengl texture than the client memory, and different pitches * SFLAG_DIBSECTION: Dibsections may have read / write protections on the memory. Avoid issues... - * SFLAG_CONVERTED: The conversion destination memory is freed after loading the surface + * WINED3D_TEXTURE_CONVERTED: The conversion destination memory is freed after loading the surface * heap_memory == NULL: Not defined in the extension. Seems to disable client storage effectively */ surface->flags &= ~SFLAG_CLIENT; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5ec5088..810da0f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2128,6 +2128,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_RGB_VALID 0x00000010 #define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000020 #define WINED3D_TEXTURE_SRGB_VALID 0x00000040 +#define WINED3D_TEXTURE_CONVERTED 0x00000080 struct wined3d_texture { @@ -2345,7 +2346,7 @@ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3 void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) DECLSPEC_HIDDEN; /* Surface flags: */ -#define SFLAG_CONVERTED 0x00000001 /* Converted for color keying or palettized. */ +#define SFLAG_DIBSECTION 0x00000001 /* Has a DIB section attached for GetDC. */ #define SFLAG_DISCARD 0x00000002 /* ??? */ #define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ #define SFLAG_NORMCOORD 0x00000008 /* Set if GL texture coordinates are normalized (non-texture rectangle). */ @@ -2355,7 +2356,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_LOST 0x00000080 /* Surface lost flag for ddraw. */ #define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ #define SFLAG_CLIENT 0x00000200 /* GL_APPLE_client_storage is used with this surface. */ -#define SFLAG_DIBSECTION 0x00000400 /* Has a DIB section attached for GetDC. */ struct wined3d_sampler {

1 0

Henri Verbeet : wined3d: Only prepare the texture in device_update_volume( ).
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 4c454fd4abc29a8a45ef35c97a52dfe5070993cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c454fd4abc29a8a45ef35c97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 08:47:21 2014 +0200 wined3d: Only prepare the texture in device_update_volume(). --- dlls/wined3d/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index aa97c7d..ee3636e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3481,7 +3481,8 @@ static HRESULT device_update_volume(struct wined3d_device *device, context = context_acquire(device, NULL); - wined3d_volume_load(dst_volume, context, FALSE); + /* Only a prepare, since we're uploading the entire volume. */ + wined3d_texture_prepare_texture(dst_volume->container, context, FALSE); data.buffer_object = 0; data.addr = src.data;

1 0

Henri Verbeet : wined3d: Track texture allocation per-texture.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: ee8a5b7dd1e554ef32229c766715f23ba17c9f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee8a5b7dd1e554ef32229c766… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 08:47:20 2014 +0200 wined3d: Track texture allocation per-texture. --- dlls/wined3d/surface.c | 13 +++--------- dlls/wined3d/texture.c | 47 +++++++++++++++++++++++++++++++----------- dlls/wined3d/volume.c | 8 +++---- dlls/wined3d/wined3d_private.h | 14 ++++++------- 4 files changed, 49 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee8a5b7dd1e554ef32229…

1 0

Henri Verbeet : wined3d: Handle GL texture allocation in the texture code.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 0c0a2adc71a288cef99e2a08627ef7ab11c2f3ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0a2adc71a288cef99e2a086… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 08:47:19 2014 +0200 wined3d: Handle GL texture allocation in the texture code. --- dlls/wined3d/context.c | 4 +- dlls/wined3d/surface.c | 127 +------------------------------- dlls/wined3d/texture.c | 161 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/volume.c | 62 +--------------- dlls/wined3d/wined3d_private.h | 11 ++- 5 files changed, 180 insertions(+), 185 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c0a2adc71a288cef99e2…

1 0

Henri Verbeet : wined3d: Move the color key conversion helpers to util.c.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 77646173a0a6e12a6a52857aa34029228f82d959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77646173a0a6e12a6a52857aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 8 08:47:18 2014 +0200 wined3d: Move the color key conversion helpers to util.c. --- dlls/wined3d/surface.c | 215 +---------------------------------------- dlls/wined3d/utils.c | 201 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 9 ++ 3 files changed, 214 insertions(+), 211 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77646173a0a6e12a6a528…

1 0

Nikolay Sivov : shlwapi: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 6ebe8d5a2a4006b61eb888ceaa7eb50106ab6312 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ebe8d5a2a4006b61eb888cea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 08:36:01 2014 +0400 shlwapi: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/shlwapi/ordinal.c | 4 ++-- dlls/shlwapi/tests/ordinal.c | 18 +++++++++--------- dlls/shlwapi/tests/string.c | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 21a75e9..8d3f1eb 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -453,7 +453,7 @@ exit: * Success: S_OK. langbuf is set to the language string found. * Failure: E_FAIL, If any arguments are invalid, error occurred, or Explorer * does not contain the setting. - * HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), If the buffer is not big enough + * E_NOT_SUFFICIENT_BUFFER, If the buffer is not big enough */ HRESULT WINAPI GetAcceptLanguagesW( LPWSTR langbuf, LPDWORD buflen) { @@ -506,7 +506,7 @@ HRESULT WINAPI GetAcceptLanguagesW( LPWSTR langbuf, LPDWORD buflen) } *buflen = 0; - return __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; } /************************************************************************* diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 099907b..d8a4f68 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -290,14 +290,14 @@ static void test_GetAcceptLanguagesA(void) When the buffer is large enough, the default language is returned When the buffer is too small for that fallback, win7_32 and w2k8_64 - fail with HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), win8 fails - with HRESULT_FROM_WIN32(ERROR_MORE_DATA), other versions succeed and - return a partial result while older os succeed and overflow the buffer */ + fail with E_NOT_SUFFICIENT_BUFFER, win8 fails with HRESULT_FROM_WIN32(ERROR_MORE_DATA), + other versions succeed and return a partial result while older os succeed + and overflow the buffer */ ok(((hr == E_INVALIDARG) && (len == 0)) || (((hr == S_OK) && !lstrcmpA(buffer, language) && (len == lstrlenA(language))) || ((hr == S_OK) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == E_NOT_SUFFICIENT_BUFFER) && !len) || ((hr == __HRESULT_FROM_WIN32(ERROR_MORE_DATA)) && len == exactsize)), "==_#%d: got 0x%x with %d and %s\n", i, hr, len, buffer); @@ -309,7 +309,7 @@ static void test_GetAcceptLanguagesA(void) ok(((hr == E_INVALIDARG) && (len == 0)) || (((hr == S_OK) && !lstrcmpA(buffer, language) && (len == lstrlenA(language))) || ((hr == S_OK) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == E_NOT_SUFFICIENT_BUFFER) && !len) || ((hr == __HRESULT_FROM_WIN32(ERROR_MORE_DATA)) && len == exactsize - 1)), "-1_#%d: got 0x%x with %d and %s\n", i, hr, len, buffer); } @@ -321,7 +321,7 @@ static void test_GetAcceptLanguagesA(void) ok(((hr == E_INVALIDARG) && (len == 0)) || (((hr == S_OK) && !lstrcmpA(buffer, language) && (len == lstrlenA(language))) || ((hr == S_OK) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == E_NOT_SUFFICIENT_BUFFER) && !len) || ((hr == __HRESULT_FROM_WIN32(ERROR_MORE_DATA)) && len == 1)), "=1_#%d: got 0x%x with %d and %s\n", i, hr, len, buffer); @@ -353,7 +353,7 @@ static void test_GetAcceptLanguagesA(void) buffer[maxlen] = 0; hr = pGetAcceptLanguagesA( buffer, &len); ok( (((hr == S_OK) || (hr == E_INVALIDARG)) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == E_NOT_SUFFICIENT_BUFFER) && !len) || ((hr == __HRESULT_FROM_WIN32(ERROR_CANNOT_COPY)) && !len), "=2: got 0x%x with %d and %s\n", hr, len, buffer); @@ -362,11 +362,11 @@ static void test_GetAcceptLanguagesA(void) buffer[maxlen] = 0; hr = pGetAcceptLanguagesA( buffer, &len); /* When the buffer is too small, win7_32 and w2k8_64 and above fail with - HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), win8 ERROR_CANNOT_COPY, + E_NOT_SUFFICIENT_BUFFER, win8 ERROR_CANNOT_COPY, other versions succeed and return a partial 0 terminated result while other versions fail with E_INVALIDARG and return a partial unterminated result */ ok( (((hr == S_OK) || (hr == E_INVALIDARG)) && !memcmp(buffer, language, len)) || - ((hr == __HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER)) && !len) || + ((hr == E_NOT_SUFFICIENT_BUFFER) && !len) || ((hr == __HRESULT_FROM_WIN32(ERROR_CANNOT_COPY)) && !len), "=1: got 0x%x with %d and %s\n", hr, len, buffer); diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index e5f0283..c72b774 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -1058,7 +1058,7 @@ if (0) memset(wbuf, 0xbf, sizeof(wbuf)); strret.uType = STRRET_WSTR; U(strret).pOleStr = StrDupW(wstr1); - expect_eq2(pStrRetToBufW(&strret, NULL, wbuf, 10), S_OK, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) /* Vista */, HRESULT, "%x"); + expect_eq2(pStrRetToBufW(&strret, NULL, wbuf, 10), S_OK, E_NOT_SUFFICIENT_BUFFER /* Vista */, HRESULT, "%x"); expect_eq(wbuf[9], 0, WCHAR, "%x"); expect_eq(wbuf[10], (WCHAR)0xbfbf, WCHAR, "%x"); } @@ -1070,7 +1070,7 @@ if (0) memset(buf, 0xbf, sizeof(buf)); strret.uType = STRRET_CSTR; StrCpyNA(U(strret).cStr, str1, MAX_PATH); - expect_eq2(pStrRetToBufA(&strret, NULL, buf, 10), S_OK, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) /* Vista */, HRESULT, "%x"); + expect_eq2(pStrRetToBufA(&strret, NULL, buf, 10), S_OK, E_NOT_SUFFICIENT_BUFFER /* Vista */, HRESULT, "%x"); expect_eq(buf[9], 0, CHAR, "%x"); expect_eq(buf[10], (CHAR)0xbf, CHAR, "%x"); }

1 0

Nikolay Sivov : shell32: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 730e744e3bd6b706612fe0f90a7efb2e600f114f URL: http://source.winehq.org/git/wine.git/?a=commit;h=730e744e3bd6b706612fe0f90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 08:31:10 2014 +0400 shell32: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/shell32/shellpath.c | 2 +- dlls/shell32/shfldr_desktop.c | 2 +- dlls/shell32/tests/shellpath.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index e361483..f92d56e 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -2097,7 +2097,7 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) DWORD ret = ExpandEnvironmentStringsW(szSrc, szDest, MAX_PATH); if (ret > MAX_PATH) - hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + hr = E_NOT_SUFFICIENT_BUFFER; else if (ret == 0) hr = HRESULT_FROM_WIN32(GetLastError()); else diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 695e558..815a421 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -247,7 +247,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, else { /* should never reach here, but for completeness */ - hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + hr = E_NOT_SUFFICIENT_BUFFER; } } } diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index efdfbbd..e2277ec 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -878,7 +878,7 @@ if (0) { /* crashes */ ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08x\n", hr); } hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, len); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "expected 0x8007007a, got 0x%08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "expected E_NOT_SUFFICIENT_BUFFER, got 0x%08x\n", hr); hr = pSHGetFolderPathEx(&FOLDERID_Desktop, 0, NULL, buffer, len + 1); ok(hr == S_OK, "expected S_OK, got 0x%08x\n", hr);

1 0

Nikolay Sivov : propsys: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: a7b848f32e981ce044d5b7f7c143f4d27903d1a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7b848f32e981ce044d5b7f7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 8 08:39:26 2014 +0400 propsys: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/propsys/propsys_main.c | 6 +++--- dlls/propsys/tests/propsys.c | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 6713adf..7631023 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -293,12 +293,12 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch /* GUIDSTRING_MAX accounts for null terminator, +1 for space character. */ if (cch <= GUIDSTRING_MAX + 1) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; if (!pkey) { psz[0] = '\0'; - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; } sprintfW(psz, guid_fmtW, pkey->fmtid.Data1, pkey->fmtid.Data2, @@ -336,7 +336,7 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch *p++ = *ptr--; } - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; } } diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index fc595f9..99d1c460 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -108,19 +108,19 @@ static void test_PSStringFromPropertyKey(void) {NULL, NULL, 0, E_POINTER}, {&prop, NULL, 0, E_POINTER}, {&prop, NULL, PKEYSTR_MAX, E_POINTER}, - {NULL, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {NULL, out, PKEYSTR_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_fillerW, FALSE, 0, TRUE, fillerW}, - {&prop, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {&prop, out, GUIDSTRING_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {&prop, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, - {&prop, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncatedW, TRUE, S_OK, TRUE, truncatedW}, - {&prop, out, PKEYSTR_MAX - 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated2W, TRUE, S_OK, TRUE, truncated2W}, - {&prop, out, PKEYSTR_MAX - 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated3W, TRUE, S_OK, TRUE, truncated3W}, + {NULL, out, 0, E_NOT_SUFFICIENT_BUFFER, fillerW}, + {NULL, out, PKEYSTR_MAX, E_NOT_SUFFICIENT_BUFFER, zero_fillerW, FALSE, 0, TRUE, fillerW}, + {&prop, out, 0, E_NOT_SUFFICIENT_BUFFER, fillerW}, + {&prop, out, GUIDSTRING_MAX, E_NOT_SUFFICIENT_BUFFER, fillerW}, + {&prop, out, GUIDSTRING_MAX + 1, E_NOT_SUFFICIENT_BUFFER, fillerW}, + {&prop, out, GUIDSTRING_MAX + 2, E_NOT_SUFFICIENT_BUFFER, zero_truncatedW, TRUE, S_OK, TRUE, truncatedW}, + {&prop, out, PKEYSTR_MAX - 2, E_NOT_SUFFICIENT_BUFFER, zero_truncated2W, TRUE, S_OK, TRUE, truncated2W}, + {&prop, out, PKEYSTR_MAX - 1, E_NOT_SUFFICIENT_BUFFER, zero_truncated3W, TRUE, S_OK, TRUE, truncated3W}, {&prop, out, PKEYSTR_MAX, S_OK, expectedW}, - {&prop2, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated4W, TRUE, S_OK, TRUE, truncated4W}, + {&prop2, out, GUIDSTRING_MAX + 2, E_NOT_SUFFICIENT_BUFFER, zero_truncated4W, TRUE, S_OK, TRUE, truncated4W}, {&prop2, out, GUIDSTRING_MAX + 6, S_OK, expected2W}, {&prop2, out, PKEYSTR_MAX, S_OK, expected2W}, - {&prop3, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW}, + {&prop3, out, GUIDSTRING_MAX + 1, E_NOT_SUFFICIENT_BUFFER, fillerW}, {&prop3, out, GUIDSTRING_MAX + 2, S_OK, expected3W}, {&prop3, out, PKEYSTR_MAX, S_OK, expected3W}, };

1 0

André Hentschel : winedump: Update minidump output.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: fdc7728219835e0223ea46543e8dad19e41b6777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdc7728219835e0223ea46543… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 21:54:38 2014 +0200 winedump: Update minidump output. --- tools/winedump/minidump.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 321264b..2641868 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -342,10 +342,19 @@ void mdmp_dump(void) break; case 1: if (msi->u.s.ProductType == 1) str = "Win7"; - else if (msi->u.s.ProductType == 3) str = "Server 2008"; + else if (msi->u.s.ProductType == 3) str = "Server 2008 R2"; + else str = "6-????"; + break; + case 2: + if (msi->u.s.ProductType == 1) str = "Win8"; + else if (msi->u.s.ProductType == 3) str = "Server 2012"; + else str = "6-????"; + break; + case 3: + if (msi->u.s.ProductType == 1) str = "Win8.1"; + else if (msi->u.s.ProductType == 3) str = "Server 2012 R2"; else str = "6-????"; break; - case 2: str = "Win8"; break; default: str = "6-????"; break; } break;

1 0

André Hentschel : winetest: Add Windows 8.1 to group Win8.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: tools Branch: master Commit: 83d9d7a28fe40a2e148301217430dd13fbde1041 URL: http://source.winehq.org/git/tools.git/?a=commit;h=83d9d7a28fe40a2e14830121… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 21:41:36 2014 +0200 winetest: Add Windows 8.1 to group Win8. --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index 676f089..61e85ca 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -203,7 +203,7 @@ if ($plid==1 && $major==4) { } elsif ($product==3) { $version = "2008"; } - } elsif ($minor == 2) { + } elsif ($minor == 2 || $minor == 3) { $version = "win8"; } }

1 0

Michael Müller : ntdll: Wait until builtin dlls are unloaded before releasing the virtual view.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 15d013067d7cacaa8f127586b5d03336c8c2fd1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d013067d7cacaa8f127586b… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Oct 4 02:51:51 2014 +0200 ntdll: Wait until builtin dlls are unloaded before releasing the virtual view. --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3c2fc56..e1444d2 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2642,8 +2642,8 @@ static void free_modref( WINE_MODREF *wm ) free_tls_slot( &wm->ldr ); RtlReleaseActivationContext( wm->ldr.ActivationContext ); - NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress ); if (wm->ldr.Flags & LDR_WINE_INTERNAL) wine_dll_unload( wm->ldr.SectionHandle ); + NtUnmapViewOfSection( NtCurrentProcess(), wm->ldr.BaseAddress ); if (cached_modref == wm) cached_modref = NULL; RtlFreeUnicodeString( &wm->ldr.FullDllName ); RtlFreeHeap( GetProcessHeap(), 0, wm->deps );

1 0

André Hentschel : winhttp/tests: Fix potential crash on BSD.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 6e4d52a752c319855546e4851f40c7077af6c3c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4d52a752c319855546e4851… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 2 00:33:11 2014 +0200 winhttp/tests: Fix potential crash on BSD. --- dlls/winhttp/tests/winhttp.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 27fb212..cf2312f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -876,12 +876,15 @@ static void test_secure_connection(void) ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT, &info, &size ); ok(ret, "failed to retrieve certificate info %u\n", GetLastError()); - trace("lpszSubjectInfo %s\n", wine_dbgstr_w(info.lpszSubjectInfo)); - trace("lpszIssuerInfo %s\n", wine_dbgstr_w(info.lpszIssuerInfo)); - trace("lpszProtocolName %s\n", wine_dbgstr_w(info.lpszProtocolName)); - trace("lpszSignatureAlgName %s\n", wine_dbgstr_w(info.lpszSignatureAlgName)); - trace("lpszEncryptionAlgName %s\n", wine_dbgstr_w(info.lpszEncryptionAlgName)); - trace("dwKeySize %u\n", info.dwKeySize); + if (!ret) + { + trace("lpszSubjectInfo %s\n", wine_dbgstr_w(info.lpszSubjectInfo)); + trace("lpszIssuerInfo %s\n", wine_dbgstr_w(info.lpszIssuerInfo)); + trace("lpszProtocolName %s\n", wine_dbgstr_w(info.lpszProtocolName)); + trace("lpszSignatureAlgName %s\n", wine_dbgstr_w(info.lpszSignatureAlgName)); + trace("lpszEncryptionAlgName %s\n", wine_dbgstr_w(info.lpszEncryptionAlgName)); + trace("dwKeySize %u\n", info.dwKeySize); + } ret = WinHttpReceiveResponse(req, NULL); ok(ret, "failed to receive response %u\n", GetLastError());

1 0

Sebastian Lackner : ntdll: Set ldr.EntryPoint for main executable.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 5272ca241b78cec4884d3dd7edca496b302b4508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5272ca241b78cec4884d3dd7e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Aug 2 18:27:20 2014 +0200 ntdll: Set ldr.EntryPoint for main executable. --- dlls/kernel32/tests/module.c | 1 - dlls/ntdll/loader.c | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index b54b4e3..bb22c24 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -729,7 +729,6 @@ static void testK32GetModuleInformation(void) ret = pK32GetModuleInformation(GetCurrentProcess(), mod, &info, sizeof(info)); ok(ret, "K32GetModuleInformation failed for main module\n"); ok(info.lpBaseOfDll == mod, "Wrong info.lpBaseOfDll = %p, expected %p\n", info.lpBaseOfDll, mod); - todo_wine ok(info.EntryPoint != NULL, "Expected nonzero entrypoint\n"); mod = GetModuleHandleA("kernel32.dll"); diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 18ae29c..3c2fc56 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -934,9 +934,10 @@ static WINE_MODREF *alloc_module( HMODULE hModule, LPCWSTR filename ) else p = wm->ldr.FullDllName.Buffer; RtlInitUnicodeString( &wm->ldr.BaseDllName, p ); - if ((nt->FileHeader.Characteristics & IMAGE_FILE_DLL) && !is_dll_native_subsystem( hModule, nt, p )) + if (!(nt->FileHeader.Characteristics & IMAGE_FILE_DLL) || !is_dll_native_subsystem( hModule, nt, p )) { - wm->ldr.Flags |= LDR_IMAGE_IS_DLL; + if (nt->FileHeader.Characteristics & IMAGE_FILE_DLL) + wm->ldr.Flags |= LDR_IMAGE_IS_DLL; if (nt->OptionalHeader.AddressOfEntryPoint) wm->ldr.EntryPoint = (char *)hModule + nt->OptionalHeader.AddressOfEntryPoint; } @@ -1062,7 +1063,7 @@ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved if (wm->ldr.Flags & LDR_DONT_RESOLVE_REFS) return STATUS_SUCCESS; if (wm->ldr.TlsIndex != -1) call_tls_callbacks( wm->ldr.BaseAddress, reason ); - if (!entry) return STATUS_SUCCESS; + if (!entry || !(wm->ldr.Flags & LDR_IMAGE_IS_DLL)) return STATUS_SUCCESS; if (TRACE_ON(relay)) {

1 0

Francois Gouget : d2d1: Make the IDWriteTextRenderer methods static.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 9f8d22186934f1db3ff1ac2ea3b652da6fbf14a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f8d22186934f1db3ff1ac2ea… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Oct 7 18:34:27 2014 +0200 d2d1: Make the IDWriteTextRenderer methods static. --- dlls/d2d1/render_target.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index f730e64..a50f473 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -905,7 +905,7 @@ static inline struct d2d_d3d_render_target *impl_from_IDWriteTextRenderer(IDWrit return CONTAINING_RECORD(iface, struct d2d_d3d_render_target, IDWriteTextRenderer_iface); } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_QueryInterface(IDWriteTextRenderer *iface, REFIID iid, void **out) +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_QueryInterface(IDWriteTextRenderer *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -924,7 +924,7 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_QueryInterface(IDWriteTextRenderer * return E_NOINTERFACE; } -ULONG STDMETHODCALLTYPE d2d_text_renderer_AddRef(IDWriteTextRenderer *iface) +static ULONG STDMETHODCALLTYPE d2d_text_renderer_AddRef(IDWriteTextRenderer *iface) { struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); @@ -933,7 +933,7 @@ ULONG STDMETHODCALLTYPE d2d_text_renderer_AddRef(IDWriteTextRenderer *iface) return d2d_d3d_render_target_AddRef(&render_target->ID2D1RenderTarget_iface); } -ULONG STDMETHODCALLTYPE d2d_text_renderer_Release(IDWriteTextRenderer *iface) +static ULONG STDMETHODCALLTYPE d2d_text_renderer_Release(IDWriteTextRenderer *iface) { struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); @@ -942,7 +942,7 @@ ULONG STDMETHODCALLTYPE d2d_text_renderer_Release(IDWriteTextRenderer *iface) return d2d_d3d_render_target_Release(&render_target->ID2D1RenderTarget_iface); } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_IsPixelSnappingDisabled(IDWriteTextRenderer *iface, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_IsPixelSnappingDisabled(IDWriteTextRenderer *iface, void *ctx, BOOL *disabled) { FIXME("iface %p, ctx %p, disabled %p stub!\n", iface, ctx, disabled); @@ -950,7 +950,7 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_IsPixelSnappingDisabled(IDWriteTextR return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetCurrentTransform(IDWriteTextRenderer *iface, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetCurrentTransform(IDWriteTextRenderer *iface, void *ctx, DWRITE_MATRIX *transform) { FIXME("iface %p, ctx %p, transform %p stub!\n", iface, ctx, transform); @@ -958,14 +958,14 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetCurrentTransform(IDWriteTextRende return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetPixelsPerDip(IDWriteTextRenderer *iface, void *ctx, float *ppd) +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_GetPixelsPerDip(IDWriteTextRenderer *iface, void *ctx, float *ppd) { FIXME("iface %p, ctx %p, ppd %p stub!\n", iface, ctx, ppd); return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRenderer *iface, void *ctx, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRenderer *iface, void *ctx, float baseline_origin_x, float baseline_origin_y, DWRITE_MEASURING_MODE measuring_mode, const DWRITE_GLYPH_RUN *glyph_run, const DWRITE_GLYPH_RUN_DESCRIPTION *desc, IUnknown *effect) { @@ -977,7 +977,7 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawGlyphRun(IDWriteTextRenderer *if return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRenderer *iface, void *ctx, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRenderer *iface, void *ctx, float baseline_origin_x, float baseline_origin_y, const DWRITE_UNDERLINE *underline, IUnknown *effect) { FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, underline %p, effect %p stub!\n", @@ -986,7 +986,7 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawUnderline(IDWriteTextRenderer *i return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteTextRenderer *iface, void *ctx, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteTextRenderer *iface, void *ctx, float baseline_origin_x, float baseline_origin_y, const DWRITE_STRIKETHROUGH *strikethrough, IUnknown *effect) { FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, strikethrough %p, effect %p stub!\n", @@ -995,7 +995,7 @@ HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteTextRendere return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawInlineObject(IDWriteTextRenderer *iface, void *ctx, +static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawInlineObject(IDWriteTextRenderer *iface, void *ctx, float origin_x, float origin_y, IDWriteInlineObject *object, BOOL is_sideways, BOOL is_rtl, IUnknown *effect) { FIXME("iface %p, ctx %p, origin_x %.8e, origin_y %.8e, object %p, is_sideways %#x, is_rtl %#x, effect %p stub!\n",

1 0

Nikolay Sivov : msxml3: Implement 'name' and 'nodeName' properties for doctype node.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: d7eec962e2280f4cc3d11343f738ea3cac328db6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7eec962e2280f4cc3d11343f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 7 18:15:42 2014 +0400 msxml3: Implement 'name' and 'nodeName' properties for doctype node. --- dlls/msxml3/doctype.c | 8 ++++---- dlls/msxml3/tests/domdoc.c | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c index c045c79..322b6c2 100644 --- a/dlls/msxml3/doctype.c +++ b/dlls/msxml3/doctype.c @@ -155,8 +155,8 @@ static HRESULT WINAPI domdoctype_get_nodeName( BSTR* p ) { domdoctype *This = impl_from_IXMLDOMDocumentType( iface ); - FIXME("(%p)->(%p): stub\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI domdoctype_get_nodeValue( @@ -489,8 +489,8 @@ static HRESULT WINAPI domdoctype_get_name( BSTR *p) { domdoctype *This = impl_from_IXMLDOMDocumentType( iface ); - FIXME("(%p)->(%p): stub\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return node_get_nodeName(&This->node, p); } static HRESULT WINAPI domdoctype_get_entities( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 881679e..038df04 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8912,9 +8912,12 @@ static void test_appendChild(void) static void test_get_doctype(void) { + static const WCHAR emailW[] = {'e','m','a','i','l',0}; IXMLDOMDocumentType *doctype; IXMLDOMDocument *doc; + VARIANT_BOOL b; HRESULT hr; + BSTR s; doc = create_document(&IID_IXMLDOMDocument); @@ -8926,6 +8929,28 @@ static void test_get_doctype(void) ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(doctype == NULL, "got %p\n", doctype); + hr = IXMLDOMDocument_loadXML(doc, _bstr_(szEmailXML), &b); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + doctype = NULL; + hr = IXMLDOMDocument_get_doctype(doc, &doctype); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(doctype != NULL, "got %p\n", doctype); + + hr = IXMLDOMDocumentType_get_name(doctype, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IXMLDOMDocumentType_get_name(doctype, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(emailW, s), "got name %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocumentType_get_nodeName(doctype, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(emailW, s), "got name %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + IXMLDOMDocumentType_Release(doctype); IXMLDOMDocument_Release(doc); }

1 0

Jacek Caban : ieframe: Don' t crash if output parameter is NULL in WebBrowser:: get_RegisterAsDropTarget.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 379b9f67758b9236317b902357aa474b30ba927e URL: http://source.winehq.org/git/wine.git/?a=commit;h=379b9f67758b9236317b90235… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 7 10:22:51 2014 +0200 ieframe: Don't crash if output parameter is NULL in WebBrowser::get_RegisterAsDropTarget. --- dlls/ieframe/tests/webbrowser.c | 4 ++++ dlls/ieframe/webbrowser.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 5973900..fa37169 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2321,6 +2321,10 @@ static void test_ie_funcs(IWebBrowser2 *wb) ok(sName!=NULL, "get_Name return a NULL string.\n"); SysFreeString(sName); + /* RegisterAsDropTarget */ + hres = IWebBrowser2_get_RegisterAsDropTarget(wb, NULL); + ok(hres == E_INVALIDARG, "get_RegisterAsDropTarget returned: %08x\n", hres); + /* Quit */ hres = IWebBrowser2_Quit(wb); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index a3233e1..1f58bbb 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -943,7 +943,12 @@ static HRESULT WINAPI WebBrowser_get_RegisterAsDropTarget(IWebBrowser2 *iface, VARIANT_BOOL *pbRegister) { WebBrowser *This = impl_from_IWebBrowser2(iface); + FIXME("(%p)->(%p)\n", This, pbRegister); + + if(!pbRegister) + return E_INVALIDARG; + *pbRegister=0; return S_OK; }

1 0

Henri Verbeet : ws2_32: Simplify some address calculations for SIO_ADDRESS_LIST_QUERY.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: c0e49c5c40c064e4a7a4ddaeaf039ca0813b7d84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e49c5c40c064e4a7a4ddaea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 7 08:41:13 2014 +0200 ws2_32: Simplify some address calculations for SIO_ADDRESS_LIST_QUERY. --- dlls/ws2_32/socket.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index aba7d3f..8b60fb3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3963,9 +3963,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID for (p = table, num = 0; p; p = p->Next) if (p->IpAddressList.IpAddress.String[0]) num++; - total = sizeof(SOCKET_ADDRESS_LIST) + sizeof(SOCKET_ADDRESS) * (num - 1); - total += sizeof(SOCKADDR) * num; - + total = FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[num]) + num * sizeof(*sockaddr); if (total > out_size || !out_buff) { *ret_size = total; @@ -3976,7 +3974,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID sa_list = out_buff; sa = sa_list->Address; - sockaddr = (SOCKADDR_IN *)((char *)sa + num * sizeof(SOCKET_ADDRESS)); + sockaddr = (SOCKADDR_IN *)&sa[num]; sa_list->iAddressCount = num; for (p = table, i = 0; p; p = p->Next)

1 0

Nikolay Sivov : dwrite: Use public macro to define OpenType tags.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 3b1e8bf824b7506ad718271f2dbbac084b1e2c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b1e8bf824b7506ad718271f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 7 09:23:26 2014 +0400 dwrite: Use public macro to define OpenType tags. --- dlls/dwrite/dwrite_private.h | 4 ---- dlls/dwrite/font.c | 12 ++++-------- include/dwrite.idl | 6 ++++++ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 5a2b5a3..736292e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -19,10 +19,6 @@ #include "wine/debug.h" #include "wine/unicode.h" -#define DWRITE_MAKE_OPENTYPE_TAG(ch0, ch1, ch2, ch3) \ - ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ - ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) - static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 923996b..def64ce 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -25,14 +25,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); -#define MS_MAKE_TAG(ch0, ch1, ch2, ch3) \ - ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ - ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) - -#define MS_HEAD_TAG MS_MAKE_TAG('h','e','a','d') -#define MS_OS2_TAG MS_MAKE_TAG('O','S','/','2') -#define MS_POST_TAG MS_MAKE_TAG('p','o','s','t') -#define MS_CMAP_TAG MS_MAKE_TAG('c','m','a','p') +#define MS_HEAD_TAG DWRITE_MAKE_OPENTYPE_TAG('h','e','a','d') +#define MS_OS2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') +#define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t') +#define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') struct dwrite_fontface_data { LONG ref; diff --git a/include/dwrite.idl b/include/dwrite.idl index bc530fc..1888215 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -222,6 +222,12 @@ typedef enum DWRITE_LINE_SPACING_METHOD DWRITE_LINE_SPACING_METHOD_UNIFORM } DWRITE_LINE_SPACING_METHOD; +cpp_quote("#define DWRITE_MAKE_OPENTYPE_TAG(a,b,c,d) ( \\") +cpp_quote(" ((UINT32)(UINT8)(d) << 24) | \\") +cpp_quote(" ((UINT32)(UINT8)(c) << 16) | \\") +cpp_quote(" ((UINT32)(UINT8)(b) << 8) | \\") +cpp_quote(" (UINT32)(UINT8)(a))") + typedef enum DWRITE_FONT_FEATURE_TAG { DWRITE_FONT_FEATURE_TAG_ALTERNATIVE_FRACTIONS = 0x63726661, /* 'afrc' */

1 0