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

Nikolay Sivov : dwrite: Store OpenType language tag in shaping cache.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: c9bb307c358c0b9361d4168b9fcea60856cfc157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9bb307c358c0b9361d4168b9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 6 05:01:22 2014 +0400 dwrite: Store OpenType language tag in shaping cache. --- dlls/dwrite/analyzer.c | 2 +- dlls/dwrite/dwrite_private.h | 6 +++++- dlls/dwrite/opentype.c | 4 ---- dlls/dwrite/shape.c | 10 +++++++++- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index e2fac55..5851e90 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -926,7 +926,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, } *actual_glyph_count = g; - hr = create_scriptshaping_cache(fontface, &cache); + hr = create_scriptshaping_cache(fontface, locale, &cache); if (FAILED(hr)) goto done; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 3eb7957..5a2b5a3 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -19,6 +19,10 @@ #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); @@ -136,7 +140,7 @@ enum SCRIPT_JUSTIFY }; struct scriptshaping_cache; -extern HRESULT create_scriptshaping_cache(IDWriteFontFace*,struct scriptshaping_cache**) DECLSPEC_HIDDEN; +extern HRESULT create_scriptshaping_cache(IDWriteFontFace*,const WCHAR*,struct scriptshaping_cache**) DECLSPEC_HIDDEN; extern void release_scriptshaping_cache(struct scriptshaping_cache*) DECLSPEC_HIDDEN; struct scriptshaping_ops diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 532c126..318adcf 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -25,10 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); -#define DWRITE_MAKE_OPENTYPE_TAG(ch0, ch1, ch2, ch3) \ - ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ - ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) - #define MS_TTCF_TAG DWRITE_MAKE_OPENTYPE_TAG('t','t','c','f') #define MS_OTTO_TAG DWRITE_MAKE_OPENTYPE_TAG('O','T','T','O') diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index bf09861..dbf5c67 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -29,9 +29,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); struct scriptshaping_cache { IDWriteFontFace *fontface; + UINT32 language_tag; }; -HRESULT create_scriptshaping_cache(IDWriteFontFace *fontface, struct scriptshaping_cache **cache) +HRESULT create_scriptshaping_cache(IDWriteFontFace *fontface, const WCHAR *locale, struct scriptshaping_cache **cache) { struct scriptshaping_cache *ret; @@ -42,6 +43,13 @@ HRESULT create_scriptshaping_cache(IDWriteFontFace *fontface, struct scriptshapi ret->fontface = fontface; IDWriteFontFace_AddRef(fontface); + ret->language_tag = DWRITE_MAKE_OPENTYPE_TAG('d','f','l','t'); + if (locale) { + WCHAR tag[5]; + if (GetLocaleInfoEx(locale, LOCALE_SOPENTYPELANGUAGETAG, tag, sizeof(tag)/sizeof(WCHAR))) + ret->language_tag = DWRITE_MAKE_OPENTYPE_TAG(tag[0],tag[1],tag[2],tag[3]); + } + *cache = ret; return S_OK;

1 0

Stefan Leichter : ksuser: New stub dll.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: ee19362f9ad47af52f8730f6cbf3cfc6454ee417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee19362f9ad47af52f8730f6c… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Oct 4 11:38:57 2014 +0200 ksuser: New stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/ksuser/Makefile.in | 4 ++++ dlls/ksuser/ksuser.spec | 4 ++++ dlls/ksuser/main.c | 38 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+) diff --git a/configure b/configure index 2a6de7a..4125ac9 100755 --- a/configure +++ b/configure @@ -1068,6 +1068,7 @@ enable_joy_cpl enable_jscript enable_jsproxy enable_kernel32 +enable_ksuser enable_ktmw32 enable_loadperf enable_localspl @@ -17034,6 +17035,7 @@ wine_fn_config_dll kernel32 enable_kernel32 clean,implib,mc wine_fn_config_test dlls/kernel32/tests kernel32_test wine_fn_config_dll keyboard.drv16 enable_win16 wine_fn_config_dll krnl386.exe16 enable_win16 implib kernel +wine_fn_config_dll ksuser enable_ksuser wine_fn_config_dll ktmw32 enable_ktmw32 wine_fn_config_dll loadperf enable_loadperf implib wine_fn_config_dll localspl enable_localspl po diff --git a/configure.ac b/configure.ac index f1f721d..6a3dc46 100644 --- a/configure.ac +++ b/configure.ac @@ -2943,6 +2943,7 @@ WINE_CONFIG_DLL(kernel32,,[clean,implib,mc]) WINE_CONFIG_TEST(dlls/kernel32/tests) WINE_CONFIG_DLL(keyboard.drv16,enable_win16) WINE_CONFIG_DLL(krnl386.exe16,enable_win16,[implib],[kernel]) +WINE_CONFIG_DLL(ksuser) WINE_CONFIG_DLL(ktmw32) WINE_CONFIG_DLL(loadperf,,[implib]) WINE_CONFIG_DLL(localspl,,[po]) diff --git a/dlls/ksuser/Makefile.in b/dlls/ksuser/Makefile.in new file mode 100644 index 0000000..1945a19 --- /dev/null +++ b/dlls/ksuser/Makefile.in @@ -0,0 +1,4 @@ +MODULE = ksuser.dll + +C_SRCS = \ + main.c diff --git a/dlls/ksuser/ksuser.spec b/dlls/ksuser/ksuser.spec new file mode 100644 index 0000000..51b84d2 --- /dev/null +++ b/dlls/ksuser/ksuser.spec @@ -0,0 +1,4 @@ +@ stub KsCreateAllocator +@ stub KsCreateClock +@ stub KsCreatePin +@ stub KsCreateTopologyNode diff --git a/dlls/ksuser/main.c b/dlls/ksuser/main.c new file mode 100644 index 0000000..f8cb426 --- /dev/null +++ b/dlls/ksuser/main.c @@ -0,0 +1,38 @@ +/* + * Copyright 2014 Stefan Leichter + * + * 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 "config.h" +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +static HINSTANCE instance; + +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + instance = hinst; + DisableThreadLibraryCalls( hinst ); + break; + } + return TRUE; +}

1 0

Sebastian Lackner : kernel32/tests: Add tests for K32GetModuleInformation.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 9d30002f7db68fc7facf280d65d58967f081ad68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d30002f7db68fc7facf280d6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 1 15:54:51 2014 +0200 kernel32/tests: Add tests for K32GetModuleInformation. --- dlls/kernel32/tests/module.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 0d140a4..b54b4e3 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -20,12 +20,15 @@ #include "wine/test.h" #include <windows.h> +#include <psapi.h> static DWORD (WINAPI *pGetDllDirectoryA)(DWORD,LPSTR); static DWORD (WINAPI *pGetDllDirectoryW)(DWORD,LPWSTR); static BOOL (WINAPI *pSetDllDirectoryA)(LPCSTR); static BOOL (WINAPI *pGetModuleHandleExA)(DWORD,LPCSTR,HMODULE*); static BOOL (WINAPI *pGetModuleHandleExW)(DWORD,LPCWSTR,HMODULE*); +static BOOL (WINAPI *pK32GetModuleInformation)(HANDLE process, HMODULE module, + MODULEINFO *modinfo, DWORD cb); static BOOL is_unicode_enabled = TRUE; @@ -514,7 +517,20 @@ static void init_pointers(void) MAKEFUNC(SetDllDirectoryA); MAKEFUNC(GetModuleHandleExA); MAKEFUNC(GetModuleHandleExW); + MAKEFUNC(K32GetModuleInformation); #undef MAKEFUNC + + /* not all Windows versions export this in kernel32 */ + if (!pK32GetModuleInformation) + { + HMODULE hPsapi = LoadLibraryA("psapi.dll"); + if (hPsapi) + { + pK32GetModuleInformation = (void *)GetProcAddress(hPsapi, "GetModuleInformation"); + if (!pK32GetModuleInformation) FreeLibrary(hPsapi); + } + } + } static void testGetModuleHandleEx(void) @@ -696,6 +712,34 @@ static void testGetModuleHandleEx(void) FreeLibrary( mod_kernel32 ); } +static void testK32GetModuleInformation(void) +{ + MODULEINFO info; + HMODULE mod; + BOOL ret; + + if (!pK32GetModuleInformation) + { + win_skip("K32GetModuleInformation not available\n"); + return; + } + + mod = GetModuleHandleA(NULL); + memset(&info, 0xAA, sizeof(info)); + 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"); + memset(&info, 0xAA, sizeof(info)); + ret = pK32GetModuleInformation(GetCurrentProcess(), mod, &info, sizeof(info)); + ok(ret, "K32GetModuleInformation failed for kernel32 module\n"); + ok(info.lpBaseOfDll == mod, "Wrong info.lpBaseOfDll = %p, expected %p\n", info.lpBaseOfDll, mod); + ok(info.EntryPoint != NULL, "Expected nonzero entrypoint\n"); +} + START_TEST(module) { WCHAR filenameW[MAX_PATH]; @@ -724,4 +768,5 @@ START_TEST(module) testGetProcAddress_Wrong(); testLoadLibraryEx(); testGetModuleHandleEx(); + testK32GetModuleInformation(); }

1 0

Nikolay Sivov : dwmapi: Added DwmAttachMilContent() and DwmDetachMilContent() stubs.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: fb36148f47874d911bd00adc3691a9c447a4a4d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb36148f47874d911bd00adc3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 7 14:57:15 2014 +0400 dwmapi: Added DwmAttachMilContent() and DwmDetachMilContent() stubs. --- dlls/dwmapi/dwmapi.spec | 4 ++-- dlls/dwmapi/dwmapi_main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 764f04c..e83ee22 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -20,9 +20,9 @@ 119 stub @ 120 stub @ -@ stub DwmAttachMilContent +@ stdcall DwmAttachMilContent(long) @ stdcall DwmDefWindowProc(long long long long ptr) -@ stub DwmDetachMilContent +@ stdcall DwmDetachMilContent(long) @ stdcall DwmEnableBlurBehindWindow(ptr ptr) @ stdcall DwmEnableMMCSS(long) @ stdcall DwmExtendFrameIntoClientArea(long ptr) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 6ee45af..d5fb03f 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -234,3 +234,21 @@ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) return E_NOTIMPL; } + +/********************************************************************** + * DwmAttachMilContent (DWMAPI.@) + */ +HRESULT WINAPI DwmAttachMilContent(HWND hwnd) +{ + FIXME("(%p) stub\n", hwnd); + return E_NOTIMPL; +} + +/********************************************************************** + * DwmDetachMilContent (DWMAPI.@) + */ +HRESULT WINAPI DwmDetachMilContent(HWND hwnd) +{ + FIXME("(%p) stub\n", hwnd); + return E_NOTIMPL; +}

1 0

Stefan Dösinger : d3d9/tests: Don' t load user32 functions at runtime.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 537febf2e86514feb0c75a6f8ba3896e057e7e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537febf2e86514feb0c75a6f8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 7 15:11:07 2014 +0200 d3d9/tests: Don't load user32 functions at runtime. --- dlls/d3d9/tests/d3d9ex.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 0309013..582538f 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -23,18 +23,11 @@ #define COBJMACROS #include "wine/test.h" -#include "winuser.h" -#include "wingdi.h" #include <initguid.h> #include <d3d9.h> static HMODULE d3d9_handle = 0; -static BOOL (WINAPI *pEnumDisplaySettingsExA)(const char *device_name, - DWORD mode_idx, DEVMODEA *mode, DWORD flags); -static LONG (WINAPI *pChangeDisplaySettingsExA)(const char *device_name, - DEVMODEA *mode, HWND window, DWORD flags, void *param); - static HRESULT (WINAPI *pDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **d3d9ex); static HWND create_window(void) @@ -420,8 +413,7 @@ static void test_get_adapter_displaymode_ex(void) D3DDISPLAYMODE mode; D3DDISPLAYMODEEX mode_ex; D3DDISPLAYROTATION rotation; - HANDLE hdll; - DEVMODEA startmode; + DEVMODEW startmode; LONG retval; hr = pDirect3DCreate9Ex(D3D_SDK_VERSION, &d3d9ex); @@ -447,22 +439,16 @@ static void test_get_adapter_displaymode_ex(void) hr); ok(d3d9 != NULL && d3d9 != (void *) 0xdeadbeef, "QueryInterface returned interface %p, expected != NULL && != 0xdeadbeef\n", d3d9); - /* change displayorientation*/ - hdll = GetModuleHandleA("user32.dll"); - pEnumDisplaySettingsExA = (void*)GetProcAddress(hdll, "EnumDisplaySettingsExA"); - pChangeDisplaySettingsExA = (void*)GetProcAddress(hdll, "ChangeDisplaySettingsExA"); - - if (!pEnumDisplaySettingsExA || !pChangeDisplaySettingsExA) goto out; memset(&startmode, 0, sizeof(startmode)); startmode.dmSize = sizeof(startmode); - retval = pEnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &startmode, 0); + retval = EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &startmode, 0); ok(retval, "Failed to retrieve current display mode, retval %d.\n", retval); if (!retval) goto out; startmode.dmFields = DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT; S2(U1(startmode)).dmDisplayOrientation = DMDO_180; - retval = pChangeDisplaySettingsExA(NULL, &startmode, NULL, 0, NULL); + retval = ChangeDisplaySettingsExW(NULL, &startmode, NULL, 0, NULL); if(retval == DISP_CHANGE_BADMODE) { @@ -474,7 +460,7 @@ static void test_get_adapter_displaymode_ex(void) /* try retrieve orientation info with EnumDisplaySettingsEx*/ startmode.dmFields = 0; S2(U1(startmode)).dmDisplayOrientation = 0; - ok(pEnumDisplaySettingsExA(NULL, ENUM_CURRENT_SETTINGS, &startmode, EDS_ROTATEDMODE), "EnumDisplaySettingsEx failed\n"); + ok(EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &startmode, EDS_ROTATEDMODE), "EnumDisplaySettingsEx failed\n"); /*now that orientation has changed start tests for GetAdapterDisplayModeEx: invalid Size*/ memset(&mode_ex, 0, sizeof(mode_ex)); @@ -528,7 +514,7 @@ static void test_get_adapter_displaymode_ex(void) ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0\n"); /* return to the default mode */ - pChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); + ChangeDisplaySettingsExW(NULL, NULL, NULL, 0, NULL); out: IDirect3D9_Release(d3d9); IDirect3D9Ex_Release(d3d9ex);

1 0

Henri Verbeet : wined3d: Get rid of d3dfmt_convert_surface().
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 6da1cff518e106fa9ec9763aa64da2d567c352d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da1cff518e106fa9ec9763aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 7 08:41:15 2014 +0200 wined3d: Get rid of d3dfmt_convert_surface(). --- dlls/wined3d/surface.c | 457 ++++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 11 - 2 files changed, 199 insertions(+), 269 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6da1cff518e106fa9ec97…

1 0

Henri Verbeet : wined3d: Return the destination format from d3dfmt_get_conv().
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 71b59afe03dc7cf8ecf40b8c48892528574dcad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71b59afe03dc7cf8ecf40b8c4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 7 08:41:14 2014 +0200 wined3d: Return the destination format from d3dfmt_get_conv(). --- dlls/wined3d/surface.c | 85 ++++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ee51f6b..47d5b52 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1586,12 +1586,8 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi } static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alpha_ck, - struct wined3d_format *format, enum wined3d_conversion_type *conversion_type) + enum wined3d_format_id *dst_format_id, enum wined3d_conversion_type *conversion_type) { - const struct wined3d_device *device = texture->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_format *dst_format; - enum wined3d_format_id dst_format_id; unsigned int i; static const struct @@ -1609,9 +1605,8 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_B8G8R8A8, WINED3DFMT_B8G8R8A8_UNORM}, }; - *format = *texture->resource.format; *conversion_type = WINED3D_CT_NONE; - dst_format_id = format->id; + *dst_format_id = WINED3DFMT_UNKNOWN; if (need_alpha_ck && (texture->color_key_flags & WINEDDSD_CKSRCBLT)) { @@ -1621,7 +1616,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp continue; *conversion_type = color_key_info[i].conversion_type; - dst_format_id = color_key_info[i].dst_format; + *dst_format_id = color_key_info[i].dst_format; break; } @@ -1631,22 +1626,11 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp /* FIXME: This should check if the blitter backend can do P8 conversion, * instead of checking for ARB_fragment_program. */ if (texture->resource.format->id == WINED3DFMT_P8_UINT - && !(gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain - && texture == texture->swapchain->front_buffer)) + && !(texture->resource.device->adapter->gl_info.supported[ARB_FRAGMENT_PROGRAM] + && texture->swapchain && texture == texture->swapchain->front_buffer)) { *conversion_type = WINED3D_CT_P8; - dst_format_id = WINED3DFMT_B8G8R8A8_UNORM; - } - - if (*conversion_type != WINED3D_CT_NONE) - { - dst_format = wined3d_get_format(gl_info, dst_format_id); - format->glInternal = dst_format->glInternal; - format->glGammaInternal = dst_format->glGammaInternal; - format->rtInternal = dst_format->rtInternal; - format->glFormat = dst_format->glFormat; - format->glType = dst_format->glType; - format->byte_count = dst_format->byte_count; + *dst_format_id = WINED3DFMT_B8G8R8A8_UNORM; } } @@ -1678,9 +1662,9 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P const struct wined3d_format *dst_format; const struct wined3d_gl_info *gl_info; enum wined3d_conversion_type convert; + enum wined3d_format_id format_id; struct wined3d_context *context; struct wined3d_bo_address data; - struct wined3d_format format; UINT update_w, update_h; UINT dst_w, dst_h; RECT r, dst_rect; @@ -1754,8 +1738,8 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P } /* Use wined3d_surface_blt() instead of uploading directly if we need conversion. */ - d3dfmt_get_conv(dst_surface->container, FALSE, &format, &convert); - if (convert != WINED3D_CT_NONE || format.convert) + d3dfmt_get_conv(dst_surface->container, FALSE, &format_id, &convert); + if (dst_format->convert || convert != WINED3D_CT_NONE) return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, src_rect, 0, NULL, WINED3D_TEXF_POINT); context = context_acquire(dst_surface->resource.device, NULL); @@ -3081,19 +3065,34 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb) static void surface_prepare_texture_internal(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { + const struct wined3d_format *format = surface->container->resource.format; DWORD alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; - enum wined3d_conversion_type convert; - struct wined3d_format format; if (surface->flags & alloc_flag) return; - d3dfmt_get_conv(surface->container, TRUE, &format, &convert); - if (convert != WINED3D_CT_NONE || format.convert) + if (format->convert) + { surface->flags |= SFLAG_CONVERTED; - else surface->flags &= ~SFLAG_CONVERTED; + } + else + { + enum wined3d_conversion_type convert; + enum wined3d_format_id format_id; + + d3dfmt_get_conv(surface->container, TRUE, &format_id, &convert); + if (convert != WINED3D_CT_NONE) + { + surface->flags |= SFLAG_CONVERTED; + format = wined3d_get_format(context->gl_info, format_id); + } + else + { + surface->flags &= ~SFLAG_CONVERTED; + } + } wined3d_texture_bind_and_dirtify(surface->container, context, srgb); - surface_allocate_surface(surface, context->gl_info, &format, srgb); + surface_allocate_surface(surface, context->gl_info, format, srgb); surface->flags |= alloc_flag; } @@ -4480,7 +4479,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { RECT src_rect = {0, 0, surface->resource.width, surface->resource.height}; struct wined3d_device *device = surface->resource.device; + struct wined3d_texture *texture = surface->container; enum wined3d_conversion_type convert; + enum wined3d_format_id format_id; struct wined3d_context *context; UINT width, src_pitch, dst_pitch; struct wined3d_bo_address data; @@ -4489,7 +4490,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, BYTE *mem = NULL; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && wined3d_resource_is_offscreen(&surface->container->resource) + && wined3d_resource_is_offscreen(&texture->resource) && (surface->locations & WINED3D_LOCATION_DRAWABLE)) { surface_load_fb_texture(surface, srgb); @@ -4532,8 +4533,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, /* Upload from system memory */ - d3dfmt_get_conv(surface->container, TRUE /* We need color keying */, &format, &convert); - if (srgb) { if ((surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | surface->resource.map_binding)) @@ -4569,18 +4568,23 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, context = context_acquire(device, NULL); surface_prepare_texture(surface, context, srgb); - wined3d_texture_bind_and_dirtify(surface->container, context, srgb); + wined3d_texture_bind_and_dirtify(texture, context, srgb); - if (surface->container->color_key_flags & WINEDDSD_CKSRCBLT) + if (texture->color_key_flags & WINEDDSD_CKSRCBLT) { surface->flags |= SFLAG_GLCKEY; - surface->gl_color_key = surface->container->src_blt_color_key; + surface->gl_color_key = texture->src_blt_color_key; } else surface->flags &= ~SFLAG_GLCKEY; width = surface->resource.width; src_pitch = wined3d_surface_get_pitch(surface); + format = *texture->resource.format; + d3dfmt_get_conv(texture, TRUE, &format_id, &convert); + if (convert != WINED3D_CT_NONE) + format = *wined3d_get_format(gl_info, format_id); + /* 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. */ @@ -5562,7 +5566,7 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC RECT src_rect, dst_rect; BOOL scale, convert; enum wined3d_conversion_type dst_convert_type; - struct wined3d_format dst_conv_fmt; + enum wined3d_format_id dst_conv_fmt_id; static const DWORD simple_blit = WINEDDBLT_ASYNC | WINEDDBLT_COLORFILL @@ -5677,8 +5681,9 @@ 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. */ - d3dfmt_get_conv(dst_surface->container, TRUE, &dst_conv_fmt, &dst_convert_type); - if (dst_convert_type != WINED3D_CT_NONE || dst_conv_fmt.convert || dst_surface->flags & SFLAG_CONVERTED) + d3dfmt_get_conv(dst_surface->container, TRUE, &dst_conv_fmt_id, &dst_convert_type); + if (dst_surface->flags & SFLAG_CONVERTED || dst_surface->container->resource.format->convert + || dst_convert_type != WINED3D_CT_NONE) { WARN_(d3d_perf)("Converted surface, using CPU blit.\n"); goto cpu;

1 0

Nikolay Sivov : dwrite: Move font table related data to a separate structure.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 07dc8b66e421392df0199bba1026113f838e5753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07dc8b66e421392df0199bba1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 6 16:26:31 2014 +0400 dwrite: Move font table related data to a separate structure. Eventually we should get rid of separate allocations on every TryGetFontTable(), that's not how local loader works. Instead it maps font file and returns pointers to a mapping, context is always NULL in this case. --- dlls/dwrite/font.c | 63 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 25b47ef..923996b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -97,21 +97,24 @@ struct dwrite_font { #define DWRITE_FONTTABLE_MAGIC 0xededfafa -struct dwrite_fonttable { +struct dwrite_fonttablecontext { UINT32 magic; - LPVOID context; + void *context; UINT32 file_index; }; +struct dwrite_fonttable { + void *data; + void *context; + UINT32 size; +}; + struct dwrite_fontface { IDWriteFontFace IDWriteFontFace_iface; LONG ref; struct dwrite_fontface_data *data; - - LPVOID CMAP_table; - LPVOID CMAP_context; - DWORD CMAP_size; + struct dwrite_fonttable cmap; BOOL is_system; LOGFONTW logfont; @@ -236,8 +239,8 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace *iface) if (!ref) { - if (This->CMAP_context) - IDWriteFontFace_ReleaseFontTable(iface, This->CMAP_context); + if (This->cmap.context) + IDWriteFontFace_ReleaseFontTable(iface, This->cmap.context); _free_fontface_data(This->data); heap_free(This); } @@ -353,10 +356,10 @@ static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace *iface, UIN { HRESULT hr; TRACE("(%p)->(%p %u %p)\n", This, codepoints, count, glyph_indices); - if (!This->CMAP_table) + if (!This->cmap.data) { BOOL exists = FALSE; - hr = IDWriteFontFace_TryGetFontTable(iface, MS_CMAP_TAG, (const void**)&This->CMAP_table, &This->CMAP_size, &This->CMAP_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(iface, MS_CMAP_TAG, (const void**)&This->cmap.data, &This->cmap.size, &This->cmap.context, &exists); if (FAILED(hr) || !exists) { ERR("Font does not have a CMAP table\n"); @@ -366,7 +369,7 @@ static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace *iface, UIN for (i = 0; i < count; i++) { - OpenType_CMAP_GetGlyphIndex(This->CMAP_table, codepoints[i], &glyph_indices[i], 0); + OpenType_CMAP_GetGlyphIndex(This->cmap.data, codepoints[i], &glyph_indices[i], 0); } return S_OK; } @@ -385,14 +388,14 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace *iface, UIN { HRESULT hr = S_OK; int i; - struct dwrite_fonttable *table; + struct dwrite_fonttablecontext *tablecontext; TRACE("(%p)->(%u %p %p %p %p)\n", This, table_tag, table_data, table_size, context, exists); - table = heap_alloc(sizeof(struct dwrite_fonttable)); - if (!table) + tablecontext = heap_alloc(sizeof(struct dwrite_fonttablecontext)); + if (!tablecontext) return E_OUTOFMEMORY; - table->magic = DWRITE_FONTTABLE_MAGIC; + tablecontext->magic = DWRITE_FONTTABLE_MAGIC; *exists = FALSE; for (i = 0; i < This->data->file_count && !(*exists); i++) @@ -401,16 +404,16 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace *iface, UIN hr = _dwritefontfile_GetFontFileStream(This->data->files[i], &stream); if (FAILED(hr)) continue; - table->file_index = i; + tablecontext->file_index = i; - hr = find_font_table(stream, This->data->index, table_tag, table_data, &table->context, table_size, exists); + hr = find_font_table(stream, This->data->index, table_tag, table_data, &tablecontext->context, table_size, exists); IDWriteFontFileStream_Release(stream); } if (FAILED(hr) && !*exists) - heap_free(table); + heap_free(tablecontext); else - *context = (LPVOID)table; + *context = (void*)tablecontext; return hr; } } @@ -418,23 +421,23 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace *iface, UIN static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace *iface, void *table_context) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); - struct dwrite_fonttable *table = (struct dwrite_fonttable *)table_context; + struct dwrite_fonttablecontext *tablecontext = (struct dwrite_fonttablecontext*)table_context; IDWriteFontFileStream *stream; HRESULT hr; TRACE("(%p)->(%p)\n", This, table_context); - if (table->magic != DWRITE_FONTTABLE_MAGIC) + if (tablecontext->magic != DWRITE_FONTTABLE_MAGIC) { TRACE("Invalid table magic\n"); return; } - hr = _dwritefontfile_GetFontFileStream(This->data->files[table->file_index], &stream); + hr = _dwritefontfile_GetFontFileStream(This->data->files[tablecontext->file_index], &stream); if (FAILED(hr)) return; - IDWriteFontFileStream_ReleaseFileFragment(stream, table->context); + IDWriteFontFileStream_ReleaseFileFragment(stream, tablecontext->context); IDWriteFontFileStream_Release(stream); - heap_free(table); + heap_free(tablecontext); } static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace *iface, FLOAT emSize, @@ -516,9 +519,9 @@ static HRESULT create_system_fontface(struct dwrite_font *font, IDWriteFontFace This->data->files = NULL; This->data->index = 0; This->data->simulations = DWRITE_FONT_SIMULATIONS_NONE; - This->CMAP_table = NULL; - This->CMAP_context = NULL; - This->CMAP_size = 0; + This->cmap.data = NULL; + This->cmap.context = NULL; + This->cmap.size = 0; This->is_system = TRUE; memset(&This->logfont, 0, sizeof(This->logfont)); @@ -1358,9 +1361,9 @@ HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facety This->data->type = facetype; This->data->file_count = files_number; This->data->files = heap_alloc(sizeof(*This->data->files) * files_number); - This->CMAP_table = NULL; - This->CMAP_context = NULL; - This->CMAP_size = 0; + This->cmap.data = NULL; + This->cmap.context = NULL; + This->cmap.size = 0; /* Verify font file streams */ for (i = 0; i < This->data->file_count && SUCCEEDED(hr); i++) {

1 0

Nikolay Sivov : dwrite: Introduce cache to be used by shaping engines.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: cb8556c1716c27b2252d25651c55f8c1625a87bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8556c1716c27b2252d25651… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 5 17:43:47 2014 +0400 dwrite: Introduce cache to be used by shaping engines. --- dlls/dwrite/analyzer.c | 12 +++++++++--- dlls/dwrite/dwrite_private.h | 8 ++++++-- dlls/dwrite/shape.c | 35 ++++++++++++++++++++++++++++++++--- dlls/dwrite/tests/analyzer.c | 6 ++++++ 4 files changed, 53 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 20a84c3..e2fac55 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -846,6 +846,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, DWRITE_SHAPING_GLYPH_PROPERTIES* glyph_props, UINT32* actual_glyph_count) { const struct dwritescript_properties *scriptprops; + struct scriptshaping_cache *cache; WCHAR *string; BOOL update_cluster; UINT32 i, g; @@ -925,9 +926,13 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, } *actual_glyph_count = g; + hr = create_scriptshaping_cache(fontface, &cache); + if (FAILED(hr)) + goto done; + scriptprops = &dwritescripts_properties[script]; if (scriptprops->ops && scriptprops->ops->contextual_shaping) { - hr = scriptprops->ops->contextual_shaping(fontface, is_rtl, string, length, max_glyph_count, clustermap, glyph_indices, actual_glyph_count); + hr = scriptprops->ops->contextual_shaping(cache, is_rtl, string, length, max_glyph_count, clustermap, glyph_indices, actual_glyph_count); if (FAILED(hr)) goto done; } @@ -935,11 +940,12 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface, /* FIXME: apply default features */ if (scriptprops->ops && scriptprops->ops->set_text_glyphs_props) - hr = scriptprops->ops->set_text_glyphs_props(fontface, string, length, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); + hr = scriptprops->ops->set_text_glyphs_props(cache, string, length, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); else - hr = default_shaping_ops.set_text_glyphs_props(fontface, string, length, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); + hr = default_shaping_ops.set_text_glyphs_props(cache, string, length, clustermap, glyph_indices, *actual_glyph_count, text_props, glyph_props); done: + release_scriptshaping_cache(cache); heap_free(string); return hr; diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 1624c6b..3eb7957 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -135,11 +135,15 @@ enum SCRIPT_JUSTIFY SCRIPT_JUSTIFY_ARABIC_SEEN_M }; +struct scriptshaping_cache; +extern HRESULT create_scriptshaping_cache(IDWriteFontFace*,struct scriptshaping_cache**) DECLSPEC_HIDDEN; +extern void release_scriptshaping_cache(struct scriptshaping_cache*) DECLSPEC_HIDDEN; + struct scriptshaping_ops { - HRESULT (*contextual_shaping)(IDWriteFontFace *fontface, BOOL is_rtl, const WCHAR *text, UINT32 len, UINT32 max_glyph_count, + HRESULT (*contextual_shaping)(struct scriptshaping_cache *cache, BOOL is_rtl, const WCHAR *text, UINT32 len, UINT32 max_glyph_count, UINT16 *clustermap, UINT16 *glyph_indices, UINT32* actual_glyph_count); - HRESULT (*set_text_glyphs_props)(IDWriteFontFace *fontface, const WCHAR *text, UINT32 len, UINT16 *clustermap, UINT16 *glyph_indices, + HRESULT (*set_text_glyphs_props)(struct scriptshaping_cache *cache, const WCHAR *text, UINT32 len, UINT16 *clustermap, UINT16 *glyph_indices, UINT32 glyphcount, DWRITE_SHAPING_TEXT_PROPERTIES *text_props, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props); }; diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index fdedb2b..bf09861 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -26,6 +26,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); +struct scriptshaping_cache +{ + IDWriteFontFace *fontface; +}; + +HRESULT create_scriptshaping_cache(IDWriteFontFace *fontface, struct scriptshaping_cache **cache) +{ + struct scriptshaping_cache *ret; + + ret = heap_alloc(sizeof(*ret)); + if (!ret) + return E_OUTOFMEMORY; + + ret->fontface = fontface; + IDWriteFontFace_AddRef(fontface); + + *cache = ret; + + return S_OK; +} + +void release_scriptshaping_cache(struct scriptshaping_cache *cache) +{ + if (!cache) + return; + IDWriteFontFace_Release(cache->fontface); + heap_free(cache); +} + static void shape_update_clusters_from_glyphprop(UINT32 glyphcount, UINT32 text_len, UINT16 *clustermap, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props) { UINT32 i; @@ -86,7 +115,7 @@ static INT32 map_glyph_to_text_pos(const UINT16 *clustermap, UINT32 len, UINT16 return k; } -static HRESULT default_set_text_glyphs_props(IDWriteFontFace *fontface, const WCHAR *text, UINT32 len, UINT16 *clustermap, UINT16 *glyph_indices, +static HRESULT default_set_text_glyphs_props(struct scriptshaping_cache *cache, const WCHAR *text, UINT32 len, UINT16 *clustermap, UINT16 *glyph_indices, UINT32 glyphcount, DWRITE_SHAPING_TEXT_PROPERTIES *text_props, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props) { UINT32 i; @@ -119,13 +148,13 @@ static HRESULT default_set_text_glyphs_props(IDWriteFontFace *fontface, const WC return S_OK; } -static HRESULT latn_set_text_glyphs_props(IDWriteFontFace *fontface, const WCHAR *text, UINT32 len, UINT16 *clustermap, UINT16 *glyph_indices, +static HRESULT latn_set_text_glyphs_props(struct scriptshaping_cache *cache, const WCHAR *text, UINT32 len, UINT16 *clustermap, UINT16 *glyph_indices, UINT32 glyphcount, DWRITE_SHAPING_TEXT_PROPERTIES *text_props, DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props) { HRESULT hr; UINT32 i; - hr = default_set_text_glyphs_props(fontface, text, len, clustermap, glyph_indices, glyphcount, text_props, glyph_props); + hr = default_set_text_glyphs_props(cache, text, len, clustermap, glyph_indices, glyphcount, text_props, glyph_props); for (i = 0; i < glyphcount; i++) if (glyph_props[i].isZeroWidthSpace) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 15f5ab0..1add761 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1123,6 +1123,12 @@ static void test_GetGlyphs(void) NULL, NULL, NULL, 0, maxglyphcount, clustermap, props, glyphs1, shapingprops, &actual_count); ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "got 0x%08x\n", hr); +if (0) { + /* NULL fontface - crashes on Windows */ + hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, test1W, lstrlenW(test1W), NULL, FALSE, FALSE, &sa, NULL, + NULL, NULL, NULL, 0, maxglyphcount, clustermap, props, glyphs1, shapingprops, &actual_count); +} + /* invalid script id */ maxglyphcount = 10; actual_count = 0;

1 0

Henri Verbeet : wined3d: Get rid of surface_prepare_texture_internal().
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: bd1afdb3c33d5e398b1105372a59380a26d65524 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1afdb3c33d5e398b1105372… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 7 08:41:16 2014 +0200 wined3d: Get rid of surface_prepare_texture_internal(). --- dlls/wined3d/surface.c | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 179dd19..ff7759f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3217,50 +3217,45 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb) } /* Context activation is done by the caller. */ -static void surface_prepare_texture_internal(struct wined3d_surface *surface, - struct wined3d_context *context, BOOL srgb) +void surface_prepare_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { - const struct wined3d_format *format = surface->container->resource.format; + struct wined3d_texture *texture = surface->container; DWORD alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; + const struct wined3d_format *format = texture->resource.format; + UINT sub_count = texture->level_count * texture->layer_count; const struct wined3d_color_key_conversion *conversion; + BOOL converted = FALSE; + UINT i; - if (surface->flags & alloc_flag) return; + TRACE("surface %p is a subresource of texture %p.\n", surface, texture); if (format->convert) { - surface->flags |= SFLAG_CONVERTED; + converted = TRUE; } - else if ((conversion = d3dfmt_get_conv(surface->container, TRUE))) + else if ((conversion = d3dfmt_get_conv(texture, TRUE))) { - surface->flags |= SFLAG_CONVERTED; + converted = TRUE; format = wined3d_get_format(context->gl_info, conversion->dst_format); } - else - { - surface->flags &= ~SFLAG_CONVERTED; - } - - wined3d_texture_bind_and_dirtify(surface->container, context, srgb); - surface_allocate_surface(surface, context->gl_info, format, srgb); - surface->flags |= alloc_flag; -} -/* Context activation is done by the caller. */ -void surface_prepare_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) -{ - struct wined3d_texture *texture = surface->container; - UINT sub_count = texture->level_count * texture->layer_count; - UINT i; - - TRACE("surface %p is a subresource of texture %p.\n", surface, texture); + wined3d_texture_bind_and_dirtify(texture, context, srgb); for (i = 0; i < sub_count; ++i) { struct wined3d_surface *s = surface_from_resource(texture->sub_resources[i]); - surface_prepare_texture_internal(s, context, srgb); - } - return; + if (s->flags & alloc_flag) + continue; + + if (converted) + s->flags |= SFLAG_CONVERTED; + else + s->flags &= ~SFLAG_CONVERTED; + + surface_allocate_surface(s, context->gl_info, format, srgb); + s->flags |= alloc_flag; + } } void surface_prepare_rb(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, BOOL multisample)

1 0

Henri Verbeet : ws2_32: Return an error if "out_buff" is NULL for SIO_ADDRESS_LIST_QUERY.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 32724def728e54b9023fbec9d43854e8afdbf43c URL: http://source.winehq.org/git/wine.git/?a=commit;h=32724def728e54b9023fbec9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 7 08:41:12 2014 +0200 ws2_32: Return an error if "out_buff" is NULL for SIO_ADDRESS_LIST_QUERY. --- dlls/ws2_32/socket.c | 39 ++++++++++++++++++--------------------- dlls/ws2_32/tests/sock.c | 5 +++++ 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 98ed686..aba7d3f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3947,6 +3947,10 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (GetAdaptersInfo(NULL, &size) == ERROR_BUFFER_OVERFLOW) { IP_ADAPTER_INFO *p, *table = HeapAlloc(GetProcessHeap(), 0, size); + SOCKET_ADDRESS_LIST *sa_list; + SOCKADDR_IN *sockaddr; + SOCKET_ADDRESS *sa; + unsigned int i; DWORD num; if (!table || GetAdaptersInfo(table, &size)) @@ -3962,7 +3966,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID total = sizeof(SOCKET_ADDRESS_LIST) + sizeof(SOCKET_ADDRESS) * (num - 1); total += sizeof(SOCKADDR) * num; - if (total > out_size) + if (total > out_size || !out_buff) { *ret_size = total; HeapFree(GetProcessHeap(), 0, table); @@ -3970,29 +3974,22 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID break; } - if (out_buff) - { - unsigned int i; - SOCKET_ADDRESS *sa; - SOCKET_ADDRESS_LIST *sa_list = out_buff; - SOCKADDR_IN *sockaddr; - - sa = sa_list->Address; - sockaddr = (SOCKADDR_IN *)((char *)sa + num * sizeof(SOCKET_ADDRESS)); - sa_list->iAddressCount = num; + sa_list = out_buff; + sa = sa_list->Address; + sockaddr = (SOCKADDR_IN *)((char *)sa + num * sizeof(SOCKET_ADDRESS)); + sa_list->iAddressCount = num; - for (p = table, i = 0; p; p = p->Next) - { - if (!p->IpAddressList.IpAddress.String[0]) continue; + for (p = table, i = 0; p; p = p->Next) + { + if (!p->IpAddressList.IpAddress.String[0]) continue; - sa[i].lpSockaddr = (SOCKADDR *)&sockaddr[i]; - sa[i].iSockaddrLength = sizeof(SOCKADDR); + sa[i].lpSockaddr = (SOCKADDR *)&sockaddr[i]; + sa[i].iSockaddrLength = sizeof(SOCKADDR); - sockaddr[i].sin_family = AF_INET; - sockaddr[i].sin_port = 0; - sockaddr[i].sin_addr.WS_s_addr = inet_addr(p->IpAddressList.IpAddress.String); - i++; - } + sockaddr[i].sin_family = AF_INET; + sockaddr[i].sin_port = 0; + sockaddr[i].sin_addr.WS_s_addr = inet_addr(p->IpAddressList.IpAddress.String); + i++; } HeapFree(GetProcessHeap(), 0, table); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1d61f9a..0ad6e8a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7499,6 +7499,11 @@ static void test_address_list_query(void) ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); bytes_returned = 0xdeadbeef; + ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, NULL, size, &bytes_returned, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); + ok(bytes_returned == size, "Got unexpected bytes_returned %u, expected %u.\n", bytes_returned, size); + ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, address_list, 1, &bytes_returned, NULL, NULL); ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); ok(WSAGetLastError() == WSAEINVAL, "Got unexpected error %d.\n", WSAGetLastError());

1 0

Nikolay Sivov : fusion: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: d92d108a1b0be69040d870e15f87330711d83fa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d92d108a1b0be69040d870e15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 7 09:44:30 2014 +0400 fusion: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/fusion/asmname.c | 2 +- dlls/fusion/fusion.c | 2 +- dlls/fusion/tests/asmcache.c | 13 +++++-------- dlls/fusion/tests/fusion.c | 9 +++------ 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index a17957a..f18e622 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -497,7 +497,7 @@ HRESULT IAssemblyName_GetPath(IAssemblyName *iface, LPWSTR buf, ULONG *len) if (*len <= buffer_size) lstrcpyW(buf, name->path); else - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; return S_OK; } diff --git a/dlls/fusion/fusion.c b/dlls/fusion/fusion.c index e638208..6c0bc00 100644 --- a/dlls/fusion/fusion.c +++ b/dlls/fusion/fusion.c @@ -161,7 +161,7 @@ HRESULT WINAPI GetCachePath(ASM_CACHE_FLAGS dwCacheFlags, LPWSTR pwzCachePath, len++; if (*pcchPath <= len || !pwzCachePath) - hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + hr = E_NOT_SUFFICIENT_BUFFER; else if (pwzCachePath) strcpyW(pwzCachePath, path); diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 6fe72bf..59b288a 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -1235,8 +1235,7 @@ static void test_QueryAssemblyInfo(void) "Expected ASSEMBLYINFO_FLAG_INSTALLED, got %08x\n", info.dwAssemblyFlags); ok(info.uliAssemblySizeInKB.u.HighPart == 0, "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); todo_wine { ok((info.uliAssemblySizeInKB.u.LowPart == 4), @@ -1258,8 +1257,7 @@ static void test_QueryAssemblyInfo(void) "Expected 0, got %d\n", info.uliAssemblySizeInKB.u.HighPart); ok(!lstrcmpW(info.pszCurrentAssemblyPathBuf, empty), "Assembly path was changed\n"); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); todo_wine { ok((info.uliAssemblySizeInKB.u.LowPart == 4), @@ -1321,7 +1319,7 @@ static void test_QueryAssemblyInfo(void) lstrcatW(name, otherver); hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_VALIDATE, name, &info); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, "got %08x\n", info.dwAssemblyFlags); /* short buffer, QUERYASMINFO_FLAG_GETSIZE */ @@ -1331,7 +1329,7 @@ static void test_QueryAssemblyInfo(void) lstrcatW(name, otherver); hr = IAssemblyCache_QueryAssemblyInfo(cache, QUERYASMINFO_FLAG_GETSIZE, name, &info); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, "got %08x\n", info.dwAssemblyFlags); /* display name is "wine, Version=1.0.0.00000" */ @@ -1525,8 +1523,7 @@ static void test_QueryAssemblyInfo(void) lstrcatW(name, commasep); lstrcatW(name, ver); hr = IAssemblyCache_QueryAssemblyInfo(cache, 0, name, &info); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); ok(info.cbAssemblyInfo == sizeof(ASSEMBLY_INFO), "Expected sizeof(ASSEMBLY_INFO), got %d\n", info.cbAssemblyInfo); ok(info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED, diff --git a/dlls/fusion/tests/fusion.c b/dlls/fusion/tests/fusion.c index 3fc67ef..82829d5 100644 --- a/dlls/fusion/tests/fusion.c +++ b/dlls/fusion/tests/fusion.c @@ -98,16 +98,14 @@ static void test_GetCachePath(void) /* NULL pwzCachePath, pcchPath is 0 */ size = 0; hr = pGetCachePath(ASM_CACHE_GAC, NULL, &size); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); ok(size == lstrlenW(cachepath) + 1, "Expected %d, got %d\n", lstrlenW(cachepath) + 1, size); /* NULL pwszCachePath, pcchPath is MAX_PATH */ size = MAX_PATH; hr = pGetCachePath(ASM_CACHE_GAC, NULL, &size); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); ok(size == lstrlenW(cachepath) + 1, "Expected %d, got %d\n", lstrlenW(cachepath) + 1, size); @@ -132,8 +130,7 @@ static void test_GetCachePath(void) lstrcpyW(path, nochange); size = lstrlenW(cachepath); hr = pGetCachePath(ASM_CACHE_GAC, path, &size); - ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), - "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got %08x\n", hr); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "Expected E_NOT_SUFFICIENT_BUFFER, got %08x\n", hr); ok( !lstrcmpW( nochange, path ), "Expected %s, got %s\n", wine_dbgstr_w(nochange), wine_dbgstr_w(path)); lstrcpyW(cachepath, windir);

1 0

Michael Stefaniuc : comctl32: Correctly handle the ImageList index in BeginDrag().
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 753de28cd525eca4e4ae6e904d3b543a6516ef44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=753de28cd525eca4e4ae6e904… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 7 00:59:32 2014 +0200 comctl32: Correctly handle the ImageList index in BeginDrag(). --- dlls/comctl32/imagelist.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 645068d..3b11e89 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -599,6 +599,7 @@ ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack, INT dxHotspot, INT dyHotspot) { INT cx, cy; + POINT src, dst; TRACE("(himlTrack=%p iTrack=%d dx=%d dy=%d)\n", himlTrack, iTrack, dxHotspot, dyHotspot); @@ -606,6 +607,9 @@ ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack, if (!is_valid(himlTrack)) return FALSE; + if (iTrack >= himlTrack->cCurImage) + return FALSE; + if (InternalDrag.himl) ImageList_EndDrag (); @@ -622,10 +626,12 @@ ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack, InternalDrag.dyHotspot = dyHotspot; /* copy image */ - BitBlt (InternalDrag.himl->hdcImage, 0, 0, cx, cy, himlTrack->hdcImage, iTrack * cx, 0, SRCCOPY); - - /* copy mask */ - BitBlt (InternalDrag.himl->hdcMask, 0, 0, cx, cy, himlTrack->hdcMask, iTrack * cx, 0, SRCCOPY); + imagelist_point_from_index(InternalDrag.himl, 0, &dst); + imagelist_point_from_index(himlTrack, iTrack, &src); + BitBlt(InternalDrag.himl->hdcImage, dst.x, dst.y, cx, cy, himlTrack->hdcImage, src.x, src.y, + SRCCOPY); + BitBlt(InternalDrag.himl->hdcMask, dst.x, dst.y, cx, cy, himlTrack->hdcMask, src.x, src.y, + SRCCOPY); InternalDrag.himl->cCurImage = 1;

1 0

Sebastian Lackner : kernel32/tests: Add tests for PAGE_GUARD memory protection.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 53611dfbabf0282361c684a7c9b412e38e395223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53611dfbabf0282361c684a7c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 7 02:16:38 2014 +0200 kernel32/tests: Add tests for PAGE_GUARD memory protection. --- dlls/kernel32/tests/virtual.c | 261 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 261 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53611dfbabf0282361c68…

1 0

Michael Stefaniuc : comctl32/tests: Add some ImageList_BeginDrag() tests.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 89e9d6db33d6745ed86cb3112bae47c2b87aeaf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89e9d6db33d6745ed86cb3112… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 7 01:01:56 2014 +0200 comctl32/tests: Add some ImageList_BeginDrag() tests. --- dlls/comctl32/tests/imagelist.c | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 5085c70..921a16a 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -253,6 +253,50 @@ static void check_bits(HWND hwnd, HIMAGELIST himl, int idx, int size, #endif /* VISIBLE */ } +static void test_begindrag(void) +{ + HIMAGELIST himl = createImageList(7,13); + HIMAGELIST drag; + BOOL ret; + int count; + POINT hotspot; + + count = ImageList_GetImageCount(himl); + ok(count > 2, "Tests need an ImageList with more than 2 images\n"); + + /* Two BeginDrag() without EndDrag() in between */ + ret = ImageList_BeginDrag(himl, 1, 0, 0); + drag = ImageList_GetDragImage(NULL, NULL); + ok(ret && drag, "ImageList_BeginDrag() failed\n"); + ret = ImageList_BeginDrag(himl, 0, 3, 5); + ok(!ret, "ImageList_BeginDrag() returned TRUE\n"); + drag = ImageList_GetDragImage(NULL, &hotspot); + ok(!!drag, "No active ImageList drag left\n"); + ok(hotspot.x == 0 && hotspot.y == 0, "New ImageList drag was created\n"); + ImageList_EndDrag(); + drag = ImageList_GetDragImage(NULL, NULL); + ok(!drag, "ImageList drag was not destroyed\n"); + + /* Invalid image index */ + ImageList_BeginDrag(himl, 0, 0, 0); + ret = ImageList_BeginDrag(himl, count, 3, 5); + ok(!ret, "ImageList_BeginDrag() returned TRUE\n"); + drag = ImageList_GetDragImage(NULL, &hotspot); + ok(drag && hotspot.x == 0 && hotspot.y == 0, "Active drag should not have been canceled\n"); + ImageList_EndDrag(); + drag = ImageList_GetDragImage(NULL, NULL); + ok(!drag, "ImageList drag was not destroyed\n"); + /* Invalid negative image indexes succeed */ + ret = ImageList_BeginDrag(himl, -17, 0, 0); + drag = ImageList_GetDragImage(NULL, NULL); + ok(ret && drag, "ImageList drag was created\n"); + ImageList_EndDrag(); + ret = ImageList_BeginDrag(himl, -1, 0, 0); + drag = ImageList_GetDragImage(NULL, NULL); + ok(ret && drag, "ImageList drag was created\n"); + ImageList_EndDrag(); +} + static void test_hotspot(void) { struct hotspot { @@ -2087,6 +2131,7 @@ START_TEST(imagelist) InitCommonControls(); test_create_destroy(); + test_begindrag(); test_hotspot(); test_add_remove(); test_imagecount();

1 0

Michael Stefaniuc : comctl32: Don' t start a new ImageList Drag if another one is ongoing.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 0a191f85ad3c490b499cf989f8a9cf7c627f2987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a191f85ad3c490b499cf989f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 7 01:00:46 2014 +0200 comctl32: Don't start a new ImageList Drag if another one is ongoing. --- dlls/comctl32/imagelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 3b11e89..c915472 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -611,7 +611,7 @@ ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack, return FALSE; if (InternalDrag.himl) - ImageList_EndDrag (); + return FALSE; cx = himlTrack->cx; cy = himlTrack->cy;

1 0

Nikolay Sivov : dmsynth: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 477dfbca59d6dc0fa0cf77f1534d073e68a39e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=477dfbca59d6dc0fa0cf77f15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 7 09:36:48 2014 +0400 dmsynth: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/dmsynth/synth.c | 2 +- dlls/dmsynth/synthsink.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 9850628..af8a6fd 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -511,7 +511,7 @@ static HRESULT WINAPI DMSynthImpl_IKsControl_KsProperty(IKsControl* iface, PKSPR } if (DataLength < sizeof(DWORD)) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_INSTRUMENT2)) { diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index c5a1c7e..498c390 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -223,7 +223,7 @@ static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsProperty(IKsControl* iface, P } if (DataLength < sizeof(DWORD)) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_SinkUsesDSound)) {

1 0

Nikolay Sivov : advpack: Use E_NOT_SUFFICIENT_BUFFER definition.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 6db64236a12f06cdfdef9975d09ab558c7de4be5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6db64236a12f06cdfdef9975d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 7 09:34:33 2014 +0400 advpack: Use E_NOT_SUFFICIENT_BUFFER definition. --- dlls/advpack/advpack.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 83dda08..2469f7b 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -679,7 +679,7 @@ HRESULT WINAPI TranslateInfStringA(LPCSTR pszInfFilename, LPCSTR pszInstallSecti dwBufferSize, NULL, NULL); } else - res = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + res = E_NOT_SUFFICIENT_BUFFER; } HeapFree(GetProcessHeap(), 0, bufferW); @@ -739,7 +739,7 @@ HRESULT WINAPI TranslateInfStringW(LPCWSTR pszInfFilename, LPCWSTR pszInstallSec pszBuffer, dwBufferSize, pdwRequiredSize)) { if (dwBufferSize < *pdwRequiredSize) - hret = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + hret = E_NOT_SUFFICIENT_BUFFER; else hret = SPAPI_E_LINE_NOT_FOUND; } @@ -796,7 +796,7 @@ HRESULT WINAPI TranslateInfStringExA(HINF hInf, LPCSTR pszInfFilename, dwBufferSize, NULL, NULL); } else - res = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + res = E_NOT_SUFFICIENT_BUFFER; } HeapFree(GetProcessHeap(), 0, bufferW); @@ -854,7 +854,7 @@ HRESULT WINAPI TranslateInfStringExW(HINF hInf, LPCWSTR pszInfFilename, pszBuffer, dwBufferSize, pdwRequiredSize)) { if (dwBufferSize < *pdwRequiredSize) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + return E_NOT_SUFFICIENT_BUFFER; return SPAPI_E_LINE_NOT_FOUND; }

1 0

Michael Müller : ntdll: Fix handling of page fault if a guard page and write watch is triggered at the same time.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: 9e6971590000dcc9d4b7ed9e69d51bb340cf5412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e6971590000dcc9d4b7ed9e6… Author: Michael Müller <michael(a)fds-team.de> Date: Sat Oct 4 02:48:16 2014 +0200 ntdll: Fix handling of page fault if a guard page and write watch is triggered at the same time. --- dlls/kernel32/tests/virtual.c | 1 - dlls/ntdll/virtual.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index af0e6b4..0fa2b99 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1728,7 +1728,6 @@ static void test_guard_page(void) num_guard_page_calls = 0; *value = 1; *(value + 1) = 2; - todo_wine ok( num_guard_page_calls == 1, "expected one callback of guard page handler, got %d calls\n", num_guard_page_calls ); pNtCurrentTeb()->Tib.ExceptionList = frame.Prev; diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 4819d2d..f8a5dd3 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1522,11 +1522,6 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) { void *page = ROUND_ADDR( addr, page_mask ); BYTE *vprot = &view->prot[((const char *)page - (const char *)view->base) >> page_shift]; - if (*vprot & VPROT_GUARD) - { - VIRTUAL_SetProt( view, page, page_size, *vprot & ~VPROT_GUARD ); - ret = STATUS_GUARD_PAGE_VIOLATION; - } if ((err & EXCEPTION_WRITE_FAULT) && (view->protect & VPROT_WRITEWATCH)) { if (*vprot & VPROT_WRITEWATCH) @@ -1537,6 +1532,11 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err ) /* ignore fault if page is writable now */ if (VIRTUAL_GetUnixProt( *vprot ) & PROT_WRITE) ret = STATUS_SUCCESS; } + if (*vprot & VPROT_GUARD) + { + VIRTUAL_SetProt( view, page, page_size, *vprot & ~VPROT_GUARD ); + ret = STATUS_GUARD_PAGE_VIOLATION; + } } server_leave_uninterrupted_section( &csVirtual, &sigset ); return ret;

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: wine Branch: master Commit: cf8e3c9a11bb8ab8ef9957e286625bce95ddefd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8e3c9a11bb8ab8ef9957e28… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 6 21:52:19 2014 +0200 po: Update German translation. --- po/de.po | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/po/de.po b/po/de.po index 88552ec..c13802d 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-08-13 01:33+0200\n" +"PO-Revision-Date: 2014-10-06 21:51+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -850,7 +850,7 @@ msgstr "Die Datei existiert nicht" #: comdlg32.rc:40 msgid "The selection contains a non-folder object" -msgstr "" +msgstr "Die Auswahl enthält ein Objekt, das kein Ordner ist" #: comdlg32.rc:45 msgid "Up One Level" @@ -3547,16 +3547,12 @@ msgid "Expected ')'" msgstr "')' erwartet" #: jscript.rc:40 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "Schlüsselkennung des Antragstellers" +msgstr "Bezeichner erwartet" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "';' erwartet" +msgstr "'=' erwartet" #: jscript.rc:42 msgid "Invalid character" @@ -3587,20 +3583,16 @@ msgid "Label not found" msgstr "Label nicht gefunden" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "';' erwartet" +msgstr "'@end' erwartet" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "Bedingte Kompilierung ist ausgeschaltet" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "';' erwartet" +msgstr "'@' erwartet" #: jscript.rc:54 msgid "Number expected"

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.6.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.6.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard Oct. 7, 2014

Oct. 7, 2014

Module: bugzilla Branch: master Commit: 4aa9cb17e1cb97fcef476441f57687ca7c0a67ca URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=4aa9cb17e1cb97fcef476… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 7 17:14:08 2014 +0200 Merge branch 'upstream'. ---

1 0

Henri Verbeet : ws2_32: Return WSAEINVAL if "out_size" is smaller than the minimum size for SIO_ADDRESS_LIST_QUERY.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: b914a6461b7700374f4f49ec16c556bfc1bda8f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b914a6461b7700374f4f49ec1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 3 09:19:22 2014 +0200 ws2_32: Return WSAEINVAL if "out_size" is smaller than the minimum size for SIO_ADDRESS_LIST_QUERY. --- dlls/ws2_32/socket.c | 7 +++++++ dlls/ws2_32/tests/sock.c | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 75cf0f0..98ed686 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3937,6 +3937,13 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID return SOCKET_ERROR; } + if (out_size && out_size < FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[0])) + { + *ret_size = 0; + WSASetLastError(WSAEINVAL); + return SOCKET_ERROR; + } + if (GetAdaptersInfo(NULL, &size) == ERROR_BUFFER_OVERFLOW) { IP_ADAPTER_INFO *p, *table = HeapAlloc(GetProcessHeap(), 0, size); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 4c93358..1d61f9a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7498,6 +7498,18 @@ static void test_address_list_query(void) ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); + bytes_returned = 0xdeadbeef; + ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, address_list, 1, &bytes_returned, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(WSAGetLastError() == WSAEINVAL, "Got unexpected error %d.\n", WSAGetLastError()); + ok(bytes_returned == 0, "Got unexpected bytes_returned %u.\n", bytes_returned); + + ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, address_list, + FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[0]), &bytes_returned, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); + ok(bytes_returned == size, "Got unexpected bytes_returned %u, expected %u.\n", bytes_returned, size); + HeapFree(GetProcessHeap(), 0, address_list); closesocket(s); }

1 0

Henri Verbeet : ws2_32: Return the needed buffer size for SIO_ADDRESS_LIST_QUERY.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: 4e6ebd633ac19d8ffcfdf3452a86b711d49a134c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e6ebd633ac19d8ffcfdf3452… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 3 09:19:21 2014 +0200 ws2_32: Return the needed buffer size for SIO_ADDRESS_LIST_QUERY. --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d78d9cd..75cf0f0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3957,6 +3957,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (total > out_size) { + *ret_size = total; HeapFree(GetProcessHeap(), 0, table); status = WSAEFAULT; break; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8a9cbba..4c93358 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7462,6 +7462,46 @@ static void test_completion_port(void) CloseHandle(previous_port); } +static void test_address_list_query(void) +{ + SOCKET_ADDRESS_LIST *address_list; + DWORD bytes_returned, size; + unsigned int i; + SOCKET s; + int ret; + + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(s != INVALID_SOCKET, "Failed to create socket, error %d.\n", WSAGetLastError()); + + bytes_returned = 0; + ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, NULL, 0, &bytes_returned, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); + ok(bytes_returned >= FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[0]), + "Got unexpected bytes_returned %u.\n", bytes_returned); + + size = bytes_returned; + bytes_returned = 0; + address_list = HeapAlloc(GetProcessHeap(), 0, size * 2); + ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, address_list, size * 2, &bytes_returned, NULL, NULL); + ok(!ret, "Got unexpected ret %d, error %d.\n", ret, WSAGetLastError()); + ok(bytes_returned == size, "Got unexpected bytes_returned %u, expected %u.\n", bytes_returned, size); + + bytes_returned = FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address[address_list->iAddressCount]); + for (i = 0; i < address_list->iAddressCount; ++i) + { + bytes_returned += address_list->Address[i].iSockaddrLength; + } + ok(size == bytes_returned, "Got unexpected size %u, expected %u.\n", size, bytes_returned); + + ret = WSAIoctl(s, SIO_ADDRESS_LIST_QUERY, NULL, 0, address_list, size, NULL, NULL, NULL); + ok(ret == SOCKET_ERROR, "Got unexpected ret %d.\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); + + HeapFree(GetProcessHeap(), 0, address_list); + closesocket(s); +} + static DWORD WINAPI inet_ntoa_thread_proc(void *param) { ULONG addr; @@ -7739,6 +7779,7 @@ START_TEST( sock ) test_WSAAsyncGetServByName(); test_completion_port(); + test_address_list_query(); /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0

Henri Verbeet : wined3d: Don't check for color-keying for WINED3D_CT_P8.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: fd342cce3eb780567ee3c9278e097bc7a1575d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd342cce3eb780567ee3c9278… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 6 08:24:21 2014 +0200 wined3d: Don't check for color-keying for WINED3D_CT_P8. We don't support p8 color keying either way. --- dlls/wined3d/surface.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f2be4c9..ee51f6b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1588,7 +1588,6 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alpha_ck, struct wined3d_format *format, enum wined3d_conversion_type *conversion_type) { - BOOL colorkey_active = need_alpha_ck && (texture->color_key_flags & WINEDDSD_CKSRCBLT); const struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *dst_format; @@ -1614,7 +1613,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp *conversion_type = WINED3D_CT_NONE; dst_format_id = format->id; - if (colorkey_active) + if (need_alpha_ck && (texture->color_key_flags & WINEDDSD_CKSRCBLT)) { for (i = 0; i < sizeof(color_key_info) / sizeof(*color_key_info); ++i) { @@ -1632,8 +1631,8 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp /* FIXME: This should check if the blitter backend can do P8 conversion, * instead of checking for ARB_fragment_program. */ if (texture->resource.format->id == WINED3DFMT_P8_UINT - && (!(gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain - && texture == texture->swapchain->front_buffer) || colorkey_active)) + && !(gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain + && texture == texture->swapchain->front_buffer)) { *conversion_type = WINED3D_CT_P8; dst_format_id = WINED3DFMT_B8G8R8A8_UNORM;

1 0

Henri Verbeet : wined3d: Just use glGammaInternal/ rtInternal from the destination format in d3dfmt_get_conv().
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: b0ce89d81015fe23ecc4584e1e2dea17960e5c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ce89d81015fe23ecc4584e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 6 08:24:18 2014 +0200 wined3d: Just use glGammaInternal/rtInternal from the destination format in d3dfmt_get_conv(). Using glGammaInternal or rtInternal should do the right thing in principle, although in practice they should never get used either way. --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a8e0f51..41dc2ac 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1649,8 +1649,8 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp { dst_format = wined3d_get_format(gl_info, dst_format_id); format->glInternal = dst_format->glInternal; - format->glGammaInternal = format->glInternal; - format->rtInternal = format->glInternal; + format->glGammaInternal = dst_format->glGammaInternal; + format->rtInternal = dst_format->rtInternal; format->glFormat = dst_format->glFormat; format->glType = dst_format->glType; format->conv_byte_count = dst_format->byte_count;

1 0

Piotr Caban : ieframe: Correctly set pfNoRedraw in InPlaceSite_OnInPlaceActivateEx.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: f85a94f577ecc3e7a3cf77060015bfa51274c034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f85a94f577ecc3e7a3cf77060… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 6 10:58:14 2014 +0200 ieframe: Correctly set pfNoRedraw in InPlaceSite_OnInPlaceActivateEx. --- dlls/ieframe/client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/client.c b/dlls/ieframe/client.c index c8fee31..dadbe13 100644 --- a/dlls/ieframe/client.c +++ b/dlls/ieframe/client.c @@ -297,7 +297,7 @@ static HRESULT WINAPI InPlaceSite_OnInPlaceActivateEx(IOleInPlaceSiteEx *iface, TRACE("(%p)->(%p, %x)\n", This, pfNoRedraw, dwFlags); /* FIXME: Avoid redraw, when possible */ - pfNoRedraw = FALSE; + *pfNoRedraw = FALSE; if (dwFlags) { FIXME("dwFlags not supported (%x)\n", dwFlags);

1 0

Piotr Caban : oleacc: Fix allocation error handling in ObjectFromLresult.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: 964ab4b6f22fa7930024b8d0475605b0c57a840c URL: http://source.winehq.org/git/wine.git/?a=commit;h=964ab4b6f22fa7930024b8d04… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 6 10:57:49 2014 +0200 oleacc: Fix allocation error handling in ObjectFromLresult. --- dlls/oleacc/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleacc/main.c b/dlls/oleacc/main.c index 18a43fb..e5fe6cd 100644 --- a/dlls/oleacc/main.c +++ b/dlls/oleacc/main.c @@ -219,10 +219,10 @@ HRESULT WINAPI ObjectFromLresult( LRESULT result, REFIID riid, WPARAM wParam, vo return E_FAIL; data = GlobalAlloc(GMEM_FIXED, size); - memcpy(data, view, size); - UnmapViewOfFile(view); if(!data) return E_OUTOFMEMORY; + memcpy(data, view, size); + UnmapViewOfFile(view); hr = CreateStreamOnHGlobal(data, TRUE, &stream); if(FAILED(hr)) {

1 0

Nikolay Sivov : dwrite: Initial implementation of GetGlyphs().
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: 1843972e0e223a98e0c815e7e5f6be668d15a347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1843972e0e223a98e0c815e7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 5 17:07:46 2014 +0400 dwrite: Initial implementation of GetGlyphs(). --- dlls/dwrite/Makefile.in | 3 +- dlls/dwrite/analyzer.c | 116 ++++++++++++++++++++++++++++++++-- dlls/dwrite/dwrite_private.h | 32 ++++++++++ dlls/dwrite/shape.c | 147 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/analyzer.c | 112 ++++++++++++++++++++++++++------- 5 files changed, 382 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1843972e0e223a98e0c81…

1 0

Henri Verbeet : wined3d: Don' t abuse conv_byte_count for color-key conversions.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: dffcc36dd4c0da91de692aa93c4a1ffb953d4e37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dffcc36dd4c0da91de692aa93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 6 08:24:19 2014 +0200 wined3d: Don't abuse conv_byte_count for color-key conversions. --- dlls/wined3d/surface.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 41dc2ac..9d41fef 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1653,7 +1653,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp format->rtInternal = dst_format->rtInternal; format->glFormat = dst_format->glFormat; format->glType = dst_format->glType; - format->conv_byte_count = dst_format->byte_count; + format->byte_count = dst_format->byte_count; } } @@ -4611,8 +4611,8 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, /* This code is entered for texture formats which need a fixup. */ UINT height = surface->resource.height; - /* Stick to the alignment for the converted surface too, makes it easier to load the surface */ - dst_pitch = width * format.conv_byte_count; + format.byte_count = format.conv_byte_count; + dst_pitch = wined3d_format_calculate_pitch(&format, width); dst_pitch = (dst_pitch + device->surface_alignment - 1) & ~(device->surface_alignment - 1); if (!(mem = HeapAlloc(GetProcessHeap(), 0, dst_pitch * height))) @@ -4623,7 +4623,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } format.convert(data.addr, mem, src_pitch, src_pitch * height, dst_pitch, dst_pitch * height, width, height, 1); - format.byte_count = format.conv_byte_count; src_pitch = dst_pitch; data.addr = mem; } @@ -4632,8 +4631,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, /* This code is only entered for color keying fixups */ UINT height = surface->resource.height; - /* Stick to the alignment for the converted surface too, makes it easier to load the surface */ - dst_pitch = width * format.conv_byte_count; + dst_pitch = wined3d_format_calculate_pitch(&format, width); dst_pitch = (dst_pitch + device->surface_alignment - 1) & ~(device->surface_alignment - 1); if (!(mem = HeapAlloc(GetProcessHeap(), 0, dst_pitch * height))) @@ -4644,7 +4642,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } d3dfmt_convert_surface(data.addr, mem, src_pitch, width, height, dst_pitch, convert, surface); - format.byte_count = format.conv_byte_count; src_pitch = dst_pitch; data.addr = mem; }

1 0

Jacek Caban : ieframe: Return some verbs in IEnumOLEVERB:Next.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: 2bcbbea53428ffb64295641175701900a911b756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bcbbea53428ffb6429564117… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 6 15:26:53 2014 +0200 ieframe: Return some verbs in IEnumOLEVERB:Next. --- dlls/ieframe/oleobject.c | 16 +++++++++++++- dlls/ieframe/tests/webbrowser.c | 49 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 0bcf163..d611231 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -292,8 +292,8 @@ static void release_client_site(WebBrowser *This) typedef struct { IEnumOLEVERB IEnumOLEVERB_iface; - LONG ref; + LONG iter; } EnumOLEVERB; static inline EnumOLEVERB *impl_from_IEnumOLEVERB(IEnumOLEVERB *iface) @@ -348,10 +348,20 @@ static HRESULT WINAPI EnumOLEVERB_Next(IEnumOLEVERB *iface, ULONG celt, OLEVERB { EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + static const OLEVERB verbs[] = + {{OLEIVERB_PRIMARY},{OLEIVERB_INPLACEACTIVATE},{OLEIVERB_UIACTIVATE},{OLEIVERB_SHOW},{OLEIVERB_HIDE}}; + TRACE("(%p)->(%u %p %p)\n", This, celt, rgelt, pceltFetched); + /* There are a few problems with this implementation, but that's how it seems to work in native. See tests. */ if(pceltFetched) *pceltFetched = 0; + + if(This->iter == sizeof(verbs)/sizeof(*verbs)) + return S_FALSE; + + if(celt) + *rgelt = verbs[This->iter++]; return S_OK; } @@ -365,7 +375,10 @@ static HRESULT WINAPI EnumOLEVERB_Skip(IEnumOLEVERB *iface, ULONG celt) static HRESULT WINAPI EnumOLEVERB_Reset(IEnumOLEVERB *iface) { EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); + TRACE("(%p)\n", This); + + This->iter = 0; return S_OK; } @@ -599,6 +612,7 @@ static HRESULT WINAPI OleObject_EnumVerbs(IOleObject *iface, IEnumOLEVERB **ppEn ret->IEnumOLEVERB_iface.lpVtbl = &EnumOLEVERBVtbl; ret->ref = 1; + ret->iter = 0; *ppEnumOleVerb = &ret->IEnumOLEVERB_iface; return S_OK; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 27598cf..5973900 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -1997,6 +1997,30 @@ static void test_ClassInfo(IWebBrowser2 *unk) IProvideClassInfo2_Release(class_info); } +#define expect_oleverb(a,b) _expect_oleverb(__LINE__,a,b) +static void _expect_oleverb(unsigned line, const OLEVERB *verb, LONG exverb) +{ + ok_(__FILE__,line)(verb->lVerb == exverb, "verb->lVerb = %d, expected %d\n", verb->lVerb, exverb); + ok_(__FILE__,line)(!verb->lpszVerbName, "verb->lpszVerbName = %s\n", wine_dbgstr_w(verb->lpszVerbName)); + ok_(__FILE__,line)(!verb->fuFlags, "verb->fuFlags = %x\n", verb->fuFlags); + ok_(__FILE__,line)(!verb->grfAttribs, "verb->grfAttribs = %x\n", verb->grfAttribs); +} + +#define test_next_oleverb(a,b) _test_next_oleverb(__LINE__,a,b) +static void _test_next_oleverb(unsigned line, IEnumOLEVERB *enum_verbs, LONG exverb) +{ + ULONG fetched = 0xdeadbeef; + OLEVERB verb; + HRESULT hres; + + fetched = 0xdeadbeef; + memset(&verb, 0xa, sizeof(verb)); + hres = IEnumOLEVERB_Next(enum_verbs, 1, &verb, &fetched); + ok_(__FILE__,line)(hres == S_OK, "Next failed: %08x\n", hres); + ok_(__FILE__,line)(!fetched, "fetched = %d\n", fetched); + _expect_oleverb(line, &verb, exverb); +} + static void test_EnumVerbs(IWebBrowser2 *wb) { IEnumOLEVERB *enum_verbs; @@ -2014,13 +2038,32 @@ static void test_EnumVerbs(IWebBrowser2 *wb) ok(enum_verbs != NULL, "enum_verbs == NULL\n"); fetched = 0xdeadbeef; + memset(verbs, 0xa, sizeof(verbs)); + verbs[1].lVerb = 0xdeadbeef; hres = IEnumOLEVERB_Next(enum_verbs, sizeof(verbs)/sizeof(*verbs), verbs, &fetched); ok(hres == S_OK, "Next failed: %08x\n", hres); ok(!fetched, "fetched = %d\n", fetched); + /* Although fetched==0, an element is returned. */ + expect_oleverb(verbs, OLEIVERB_PRIMARY); + /* The first argument is ignorred and always one element is returned. */ + ok(verbs[1].lVerb == 0xdeadbeef, "verbs[1].lVerb = %x\n", verbs[1].lVerb); + + test_next_oleverb(enum_verbs, OLEIVERB_INPLACEACTIVATE); + test_next_oleverb(enum_verbs, OLEIVERB_UIACTIVATE); + test_next_oleverb(enum_verbs, OLEIVERB_SHOW); + test_next_oleverb(enum_verbs, OLEIVERB_HIDE); + /* There is anouther verb, returned correctly. */ fetched = 0xdeadbeef; - hres = IEnumOLEVERB_Next(enum_verbs, 1, verbs, &fetched); - ok(hres == S_OK, "Next failed: %08x\n", hres); + memset(verbs, 0xa, sizeof(verbs)); + verbs[0].lVerb = 0xdeadbeef; + hres = IEnumOLEVERB_Next(enum_verbs, sizeof(verbs)/sizeof(*verbs), verbs, &fetched); + todo_wine ok(hres == S_OK, "Next failed: %08x\n", hres); + todo_wine ok(fetched == 1, "fetched = %d\n", fetched); + todo_wine ok(verbs[0].lVerb != 0xdeadbeef, "verbs[0].lVerb = %x\n", verbs[0].lVerb); + + hres = IEnumOLEVERB_Next(enum_verbs, sizeof(verbs)/sizeof(*verbs), verbs, &fetched); + ok(hres == S_FALSE, "Next failed: %08x\n", hres); ok(!fetched, "fetched = %d\n", fetched); hres = IEnumOLEVERB_Reset(enum_verbs); @@ -2042,6 +2085,8 @@ static void test_EnumVerbs(IWebBrowser2 *wb) ok(hres == S_OK, "Next failed: %08x\n", hres); ok(!fetched, "fetched = %d\n", fetched); + test_next_oleverb(enum_verbs, OLEIVERB_SHOW); + IEnumOLEVERB_Release(enum_verbs); }

1 0

Jacek Caban : ieframe: Fixed tests on updated IE11.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: 66cbef438bcf36f55858512aba1da82e4b5a1264 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66cbef438bcf36f55858512ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 6 15:26:39 2014 +0200 ieframe: Fixed tests on updated IE11. --- dlls/ieframe/tests/webbrowser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 0ddd360..27598cf 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -456,6 +456,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID case 144: /* TODO */ case 178: /* IE11 */ case 179: /* IE11 */ + case 180: /* IE11 */ + case 181: /* IE11 */ return E_FAIL; default: ok(0, "unexpected nCmdID %d\n", nCmdID);

1 0

Nikolay Sivov : dwrite: Mirror characters in case of RTL direction.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: 370407291111af7a8d4032b57bdb6c285cec6162 URL: http://source.winehq.org/git/wine.git/?a=commit;h=370407291111af7a8d4032b57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 5 17:16:49 2014 +0400 dwrite: Mirror characters in case of RTL direction. --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/analyzer.c | 3 +- dlls/dwrite/bidi.c | 6 + dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/mirror.c | 437 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/analyzer.c | 15 ++ tools/make_unicode | 1 + 7 files changed, 462 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=370407291111af7a8d403…

1 0

Henri Verbeet : wined3d: Print a FIXME for any unhandled format in d3dfmt_get_conv().
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: c5bf229287b820b26f8fe9d7f5cbd7ec0b369f9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5bf229287b820b26f8fe9d7f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 6 08:24:20 2014 +0200 wined3d: Print a FIXME for any unhandled format in d3dfmt_get_conv(). --- dlls/wined3d/surface.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9d41fef..f2be4c9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1625,24 +1625,18 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp dst_format_id = color_key_info[i].dst_format; break; } - } - if (texture->resource.format->id == WINED3DFMT_P8_UINT) - { - /* FIXME: This should check if the blitter backend can do P8 - * conversion, instead of checking for ARB_fragment_program. */ - if (!((gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain - && texture == texture->swapchain->front_buffer)) || colorkey_active) - { - *conversion_type = WINED3D_CT_P8; - dst_format_id = WINED3DFMT_B8G8R8A8_UNORM; - } + FIXME("Color-keying not supported with format %s.\n", debug_d3dformat(texture->resource.format->id)); } - else if (texture->resource.format->id == WINED3DFMT_B2G3R3_UNORM && colorkey_active) + + /* FIXME: This should check if the blitter backend can do P8 conversion, + * instead of checking for ARB_fragment_program. */ + if (texture->resource.format->id == WINED3DFMT_P8_UINT + && (!(gl_info->supported[ARB_FRAGMENT_PROGRAM] && texture->swapchain + && texture == texture->swapchain->front_buffer) || colorkey_active)) { - /* This texture format will never be used... So do not care about - * color-keying up until the point in time it will be needed. */ - FIXME("Color-keying not supported with WINED3DFMT_B2G3R3_UNORM.\n"); + *conversion_type = WINED3D_CT_P8; + dst_format_id = WINED3DFMT_B8G8R8A8_UNORM; } if (*conversion_type != WINED3D_CT_NONE)

1 0

Nikolay Sivov : gameux: Use CLSIDFromString() instead of shell32 equivalent.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: febb3974b51188ce03a129ada12c6a9dd934da8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=febb3974b51188ce03a129ada… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 14 22:53:29 2014 +0400 gameux: Use CLSIDFromString() instead of shell32 equivalent. --- dlls/gameux/gameexplorer.c | 5 +---- dlls/gameux/tests/gameexplorer.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 1690bd7..6bdb2e4 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -35,9 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gameux); -/* function from Shell32, not defined in header */ -extern BOOL WINAPI GUIDFromStringW(LPCWSTR psz, LPGUID pguid); - /******************************************************************************* * GameUX helper functions */ @@ -780,7 +777,7 @@ HRESULT GAMEUX_FindGameInstanceId( if(lstrcmpW(lpValue, sGDFBinaryPath)==0) { /* key found, let's copy instance id and exit */ - hr = (GUIDFromStringW(lpName, pInstanceId) ? S_OK : E_FAIL); + hr = CLSIDFromString(lpName, pInstanceId); found = TRUE; } HeapFree(GetProcessHeap(), 0, lpValue); diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 5ed780c..1f25f71 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -33,9 +33,6 @@ #include "wine/test.h" -/* function from Shell32, not defined in header */ -extern BOOL WINAPI GUIDFromStringW(LPCWSTR psz, LPGUID pguid); - /******************************************************************************* * Pointers used instead of direct calls. These procedures are not available on * older system, which causes problem while loading test binary. @@ -476,7 +473,7 @@ static void _findGameInstanceId(int line, if(lstrcmpW(lpValue, sGDFBinaryPath)==0) { /* key found, let's copy instance id and exit */ - hr = (GUIDFromStringW(lpName, pInstanceId) ? S_OK : E_FAIL); + hr = CLSIDFromString(lpName, pInstanceId); ok(SUCCEEDED(hr), "cannot convert subkey to guid: %s\n", wine_dbgstr_w(lpName));

1 0

Nikolay Sivov : gameux: Cleanup failure handling when processing main definition element, use better naming.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: d721eee1ddbd4fc56947573b83c8642d73688e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d721eee1ddbd4fc56947573b8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 14 22:39:54 2014 +0400 gameux: Cleanup failure handling when processing main definition element, use better naming. --- dlls/gameux/gameexplorer.c | 77 ++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 43 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index cbe3e8d..1690bd7 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -325,67 +325,58 @@ static HRESULT GAMEUX_ProcessGameDefinitionElement( * GameData [O] structure where data loaded from * XML element will be stored in */ -static HRESULT GAMEUX_ParseGameDefinition( - IXMLDOMElement *gdElement, - struct GAMEUX_GAME_DATA *GameData) +static HRESULT GAMEUX_ParseGameDefinition(IXMLDOMElement *gamedef, struct GAMEUX_GAME_DATA *game_data) { - static const WCHAR sGameId[] = {'g','a','m','e','I','D',0}; - - HRESULT hr = S_OK; - BSTR bstrAttribute; - VARIANT variant; - IXMLDOMNodeList *childrenList; - IXMLDOMNode *nextNode; - IXMLDOMElement *nextElement; + static const WCHAR gameidW[] = {'g','a','m','e','I','D',0}; + IXMLDOMNodeList *props; + VARIANT var; + HRESULT hr; + BSTR attr; - TRACE("(%p, %p)\n", gdElement, GameData); + TRACE("(%p, %p)\n", gamedef, game_data); - bstrAttribute = SysAllocString(sGameId); - if(!bstrAttribute) - hr = E_OUTOFMEMORY; + attr = SysAllocString(gameidW); + if (!attr) + return E_OUTOFMEMORY; - hr = IXMLDOMElement_getAttribute(gdElement, bstrAttribute, &variant); + hr = IXMLDOMElement_getAttribute(gamedef, attr, &var); + SysFreeString(attr); - if(SUCCEEDED(hr)) + if (SUCCEEDED(hr)) { - hr = ( GUIDFromStringW(V_BSTR(&variant), &GameData->guidApplicationId)==TRUE ? S_OK : E_FAIL); - - SysFreeString(V_BSTR(&variant)); + hr = CLSIDFromString(V_BSTR(&var), &game_data->guidApplicationId); + VariantClear(&var); } - SysFreeString(bstrAttribute); + if (SUCCEEDED(hr)) + hr = IXMLDOMElement_get_childNodes(gamedef, &props); - /* browse subnodes */ - if(SUCCEEDED(hr)) - hr = IXMLDOMElement_get_childNodes(gdElement, &childrenList); + if (FAILED(hr)) + return hr; - if(SUCCEEDED(hr)) + do { - do + IXMLDOMNode *prop; + + hr = IXMLDOMNodeList_nextNode(props, &prop); + if (hr == S_OK) { - hr = IXMLDOMNodeList_nextNode(childrenList, &nextNode); + IXMLDOMElement *element; - if(hr == S_OK) + hr = IXMLDOMNode_QueryInterface(prop, &IID_IXMLDOMElement, (void**)&element); + if (hr == S_OK) { - hr = IXMLDOMNode_QueryInterface(nextNode, &IID_IXMLDOMElement, - (LPVOID*)&nextElement); - - if(SUCCEEDED(hr)) - { - hr = GAMEUX_ProcessGameDefinitionElement(nextElement, GameData); - IXMLDOMElement_Release(nextElement); - } - - IXMLDOMNode_Release(nextNode); + hr = GAMEUX_ProcessGameDefinitionElement(element, game_data); + IXMLDOMElement_Release(element); } - } - while(hr == S_OK); - hr = S_OK; - IXMLDOMNodeList_Release(childrenList); + IXMLDOMNode_Release(prop); + } } + while (hr == S_OK); + IXMLDOMNodeList_Release(props); - return hr; + return FAILED(hr) ? hr : S_OK; } struct parse_gdf_thread_param

1 0

Nikolay Sivov : kernel32/nls: Added support for LOCALE_SOPENTYPELANGUAGETAG.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: 311e21d2b2814692ce7811032aee6df9fe6f9737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=311e21d2b2814692ce7811032… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Oct 4 10:01:36 2014 +0300 po: Update Lithuanian translation. --- po/lt.po | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/po/lt.po b/po/lt.po index e179796..2ee9944 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-08-05 21:59+0300\n" +"PO-Revision-Date: 2014-10-04 10:00+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -3543,16 +3543,12 @@ msgid "Expected ')'" msgstr "Tikėtasi „)“" #: jscript.rc:40 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "Subjekto rakto identifikatorius" +msgstr "Tikėtasi identifikatoriaus" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "Tikėtasi „;“" +msgstr "Tikėtasi „=“" #: jscript.rc:42 msgid "Invalid character" @@ -3583,20 +3579,16 @@ msgid "Label not found" msgstr "Žymė nerasta" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "Tikėtasi „;“" +msgstr "Tikėtasi „@end“" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "Sąlyginis kompiliavimas išjungtas" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "Tikėtasi „;“" +msgstr "Tikėtasi „@“" #: jscript.rc:54 msgid "Number expected"

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_DrawTextLayout().
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: 0d962da9d3c7a5b3b6509da66c1a05926c7554b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d962da9d3c7a5b3b6509da66… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 6 08:24:17 2014 +0200 d2d1: Implement d2d_d3d_render_target_DrawTextLayout(). --- dlls/d2d1/d2d1_private.h | 5 ++ dlls/d2d1/factory.c | 1 + dlls/d2d1/render_target.c | 138 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 143 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 7c7956b..2d1fea2 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -24,6 +24,10 @@ #include <limits.h> #define COBJMACROS #include "d2d1.h" +#ifdef D2D1_INIT_GUID +#include "initguid.h" +#endif +#include "dwrite.h" struct d2d_clip_stack { @@ -35,6 +39,7 @@ struct d2d_clip_stack struct d2d_d3d_render_target { ID2D1RenderTarget ID2D1RenderTarget_iface; + IDWriteTextRenderer IDWriteTextRenderer_iface; LONG refcount; ID3D10Device *device; diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 7919210..27370c1 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -19,6 +19,7 @@ #include "config.h" #include "wine/port.h" +#define D2D1_INIT_GUID #include "d2d1_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d2d); diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 4a69fce..f730e64 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -26,6 +26,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); #define INITIAL_CLIP_STACK_SIZE 4 +struct d2d_draw_text_layout_ctx +{ + ID2D1Brush *brush; + D2D1_DRAW_TEXT_OPTIONS options; +}; + static void d2d_point_transform(D2D1_POINT_2F *dst, const D2D1_MATRIX_3X2_F *matrix, float x, float y) { dst->x = x * matrix->_11 + y * matrix->_21 + matrix->_31; @@ -503,8 +509,19 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1RenderTarget * static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawTextLayout(ID2D1RenderTarget *iface, D2D1_POINT_2F origin, IDWriteTextLayout *layout, ID2D1Brush *brush, D2D1_DRAW_TEXT_OPTIONS options) { - FIXME("iface %p, origin {%.8e, %.8e}, layout %p, brush %p, options %#x stub!\n", + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_draw_text_layout_ctx ctx; + HRESULT hr; + + TRACE("iface %p, origin {%.8e, %.8e}, layout %p, brush %p, options %#x.\n", iface, origin.x, origin.y, layout, brush, options); + + ctx.brush = brush; + ctx.options = options; + + if (FAILED(hr = IDWriteTextLayout_Draw(layout, + &ctx, &render_target->IDWriteTextRenderer_iface, origin.x, origin.y))) + FIXME("Failed to draw text layout, hr %#x.\n", hr); } static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarget *iface, @@ -883,6 +900,124 @@ static const struct ID2D1RenderTargetVtbl d2d_d3d_render_target_vtbl = d2d_d3d_render_target_IsSupported, }; +static inline struct d2d_d3d_render_target *impl_from_IDWriteTextRenderer(IDWriteTextRenderer *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_d3d_render_target, IDWriteTextRenderer_iface); +} + +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); + + if (IsEqualGUID(iid, &IID_IDWriteTextRenderer) + || IsEqualGUID(iid, &IID_IDWritePixelSnapping) + || IsEqualGUID(iid, &IID_IUnknown)) + { + IDWriteTextRenderer_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +ULONG STDMETHODCALLTYPE d2d_text_renderer_AddRef(IDWriteTextRenderer *iface) +{ + struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + + TRACE("iface %p.\n", iface); + + return d2d_d3d_render_target_AddRef(&render_target->ID2D1RenderTarget_iface); +} + +ULONG STDMETHODCALLTYPE d2d_text_renderer_Release(IDWriteTextRenderer *iface) +{ + struct d2d_d3d_render_target *render_target = impl_from_IDWriteTextRenderer(iface); + + TRACE("iface %p.\n", iface); + + return d2d_d3d_render_target_Release(&render_target->ID2D1RenderTarget_iface); +} + +HRESULT STDMETHODCALLTYPE d2d_text_renderer_IsPixelSnappingDisabled(IDWriteTextRenderer *iface, + void *ctx, BOOL *disabled) +{ + FIXME("iface %p, ctx %p, disabled %p stub!\n", iface, ctx, disabled); + + return E_NOTIMPL; +} + +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); + + return E_NOTIMPL; +} + +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, + 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) +{ + FIXME("iface %p, ctx %p, baseline_origin_x %.8e, baseline_origin_y %.8e, " + "measuring_mode %#x, glyph_run %p, desc %p, effect %p stub!\n", + iface, ctx, baseline_origin_x, baseline_origin_y, + measuring_mode, glyph_run, desc, effect); + + return E_NOTIMPL; +} + +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", + iface, ctx, baseline_origin_x, baseline_origin_y, underline, effect); + + return E_NOTIMPL; +} + +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", + iface, ctx, baseline_origin_x, baseline_origin_y, strikethrough, effect); + + return E_NOTIMPL; +} + +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", + iface, ctx, origin_x, origin_y, object, is_sideways, is_rtl, effect); + + return E_NOTIMPL; +} + +static const struct IDWriteTextRendererVtbl d2d_text_renderer_vtbl = +{ + d2d_text_renderer_QueryInterface, + d2d_text_renderer_AddRef, + d2d_text_renderer_Release, + d2d_text_renderer_IsPixelSnappingDisabled, + d2d_text_renderer_GetCurrentTransform, + d2d_text_renderer_GetPixelsPerDip, + d2d_text_renderer_DrawGlyphRun, + d2d_text_renderer_DrawUnderline, + d2d_text_renderer_DrawStrikethrough, + d2d_text_renderer_DrawInlineObject, +}; + HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, ID2D1Factory *factory, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc) { @@ -967,6 +1102,7 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, FIXME("Ignoring render target properties.\n"); render_target->ID2D1RenderTarget_iface.lpVtbl = &d2d_d3d_render_target_vtbl; + render_target->IDWriteTextRenderer_iface.lpVtbl = &d2d_text_renderer_vtbl; render_target->refcount = 1; if (FAILED(hr = IDXGISurface_GetDevice(surface, &IID_ID3D10Device, (void **)&render_target->device)))

1 0

Nikolay Sivov : include: Added GetLocaleInfoEx() definition.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: 52e4c5a802cd24dd8d569336d323488f5f8fcd51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e4c5a802cd24dd8d569336d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 5 08:13:47 2014 +0400 include: Added GetLocaleInfoEx() definition. --- include/winnls.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/winnls.h b/include/winnls.h index 13274be..58344b4 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -835,6 +835,7 @@ WINBASEAPI INT WINAPI GetGeoInfoW(GEOID,GEOTYPE,LPWSTR,INT,LANGID); WINBASEAPI INT WINAPI GetLocaleInfoA(LCID,LCTYPE,LPSTR,INT); WINBASEAPI INT WINAPI GetLocaleInfoW(LCID,LCTYPE,LPWSTR,INT); #define GetLocaleInfo WINELIB_NAME_AW(GetLocaleInfo) +WINBASEAPI INT WINAPI GetLocaleInfoEx(LPCWSTR,LCTYPE,LPWSTR,INT); WINBASEAPI INT WINAPI GetNumberFormatA(LCID,DWORD,LPCSTR,const NUMBERFMTA*,LPSTR,INT); WINBASEAPI INT WINAPI GetNumberFormatW(LCID,DWORD,LPCWSTR,const NUMBERFMTW*,LPWSTR,INT); #define GetNumberFormat WINELIB_NAME_AW(GetNumberFormat)

1 0

Piotr Caban : msvcp90: Added locale_ctor_locale_cstr implementation.
by Alexandre Julliard Oct. 6, 2014

Oct. 6, 2014

Module: wine Branch: master Commit: d274fdb029ed7bfeee9d5bdd0d28ca9c61641659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d274fdb029ed7bfeee9d5bdd0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 4 17:32:20 2014 +0200 msvcp90: Added locale_ctor_locale_cstr implementation. --- dlls/msvcp60/locale.c | 24 ++++++++++++++++++++++-- dlls/msvcp90/locale.c | 24 ++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 326a51a..4828dd3 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -8218,8 +8218,28 @@ locale* __thiscall locale_copy_ctor(locale *this, const locale *copy) DEFINE_THISCALL_WRAPPER(locale_ctor_locale_cstr, 16) locale* __thiscall locale_ctor_locale_cstr(locale *this, const locale *loc, const char *locname, category cat) { - FIXME("(%p %p %s %d) stub\n", this, loc, locname, cat); - return NULL; + _Locinfo locinfo; + + TRACE("(%p %p %s %d)\n", this, loc, locname, cat); + + _Locinfo_ctor_cat_cstr(&locinfo, cat, locname); + if(!memcmp(basic_string_char_c_str(&locinfo.newlocname), "*", 2)) { + _Locinfo_dtor(&locinfo); + MSVCRT_operator_delete(this->ptr); + throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); + } + + this->ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!this->ptr) { + ERR("Out of memory\n"); + _Locinfo_dtor(&locinfo); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + locale__Locimp_copy_ctor(this->ptr, loc->ptr); + + locale__Locimp__Makeloc(&locinfo, cat, this->ptr, NULL); + _Locinfo_dtor(&locinfo); + return this; } /* ??0locale(a)std@@QAE(a)PBDH@Z */ diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 587aca6..551a924d 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -9958,8 +9958,28 @@ locale* __thiscall locale_copy_ctor(locale *this, const locale *copy) DEFINE_THISCALL_WRAPPER(locale_ctor_locale_cstr, 16) locale* __thiscall locale_ctor_locale_cstr(locale *this, const locale *loc, const char *locname, category cat) { - FIXME("(%p %p %s %d) stub\n", this, loc, locname, cat); - return NULL; + _Locinfo locinfo; + + TRACE("(%p %p %s %d)\n", this, loc, locname, cat); + + _Locinfo_ctor_cat_cstr(&locinfo, cat, locname); + if(!memcmp(locale_string_char_c_str(&locinfo.newlocname), "*", 2)) { + _Locinfo_dtor(&locinfo); + MSVCRT_operator_delete(this->ptr); + throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); + } + + this->ptr = MSVCRT_operator_new(sizeof(locale__Locimp)); + if(!this->ptr) { + ERR("Out of memory\n"); + _Locinfo_dtor(&locinfo); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + locale__Locimp_copy_ctor(this->ptr, loc->ptr); + + locale__Locimp__Makeloc(&locinfo, cat, this->ptr, NULL); + _Locinfo_dtor(&locinfo); + return this; } /* ??0locale(a)std@@QAE(a)PBDH@Z */

1 0

Frédéric Delanoy : French translation for release 1.7.28
by Jeremy Newman Oct. 6, 2014

Oct. 6, 2014

Module: website Branch: master Commit: 4f7e307a341f16f36bfd6d9b28f97782af62bbf8 URL: http://source.winehq.org/git/website.git/?a=commit;h=4f7e307a341f16f36bfd6d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Oct 5 08:31:20 2014 +0200 French translation for release 1.7.28 --- news/fr/2014100301.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2014100301.xml b/news/fr/2014100301.xml new file mode 100644 index 0000000..89fcd27 --- /dev/null +++ b/news/fr/2014100301.xml @@ -0,0 +1,14 @@ +<news> +<date>3 octobre 2014</date> +<title>Sortie de Wine 1.7.28</title> +<body> +<p> La version de développement 1.7.28 de Wine est disponible.</p> +<p> <a href="{$root}/announce/1.7.28">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge de la compilation conditionnelle dans JavaScript.</li> + <li>Prise en charge du texte bidirectionnel dans DirectWrite.</li> + <li>Squelettes de fonctions pour la prise en charge de DirectPlay Voice.</li> + <li>Diverses corrections de bugs.</li> +</ul></p> +<p><p>Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.28.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</p></body></news>

1 0

Julian Rüger : German translation for release 1.7.28
by Jeremy Newman Oct. 6, 2014

Oct. 6, 2014

Module: website Branch: master Commit: 69378f1d7212a97815b05997dd033d0f92f966e0 URL: http://source.winehq.org/git/website.git/?a=commit;h=69378f1d7212a97815b059… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Oct 6 14:39:48 2014 +0200 German translation for release 1.7.28 --- news/de/2014100301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/de/2014100301.xml b/news/de/2014100301.xml new file mode 100644 index 0000000..8ce8662 --- /dev/null +++ b/news/de/2014100301.xml @@ -0,0 +1,15 @@ +<news> +<date>3. Oktober 2014</date> +<title>Wine 1.7.28 freigegeben</title> +<body> +<p> Die Entwicklungsversion 1.7.28 von Wine ist jetzt verfügbar.</p> +<p> <a href="{$root}/announce/1.7.28">Neuerungen (en)</a> in dieser Version:</p> +<ul> + <li>Unterstützung für bedingte Kompilierung von JavaScript.</li> + <li>Unterstützung von bidirektionellem Text in DirectWrite.</li> + <li>Stubs für DirectPlay-Voice-Unterstützung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +<p>Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.28.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</p></body></news>

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.28
by Jeremy Newman Oct. 6, 2014

Oct. 6, 2014

Module: website Branch: master Commit: 961748b546c93956be19494a8c34bf4af30d671c URL: http://source.winehq.org/git/website.git/?a=commit;h=961748b546c93956be1949… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Oct 3 19:10:26 2014 +0200 Polish translation for release 1.7.28 --- news/pl/2014100301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2014100301.xml b/news/pl/2014100301.xml new file mode 100644 index 0000000..334c926 --- /dev/null +++ b/news/pl/2014100301.xml @@ -0,0 +1,15 @@ +<news> +<date>Październik 3, 2014</date> +<title>Wydano Wine 1.7.28</title> +<body> +<p> Wydanie rozwojowe Wine 1.7.28 jest już dostępne.</p> +<p> <a href="{$root}/announce/1.7.28">Co nowego</a> w tym wydaniu: +<ul> + <li>Wsparcie dla warunkowej kompilacji w JavaScript.</li> + <li>Wsparcie dla dwukierunkowego tekstu w DirectWrite.</li> + <li>Zalążki wsparcia dla głosu DirectPlay.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +<p>Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.28.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</p></body></news>

1 0

Alexandre Julliard : Wine release 1.7.28
by Alexandre Julliard Oct. 3, 2014

Oct. 3, 2014

Module: website Branch: master Commit: 1e07fbe25aad94a2ca4e6bcd2aaa90d33db3eadf URL: http://source.winehq.org/git/website.git/?a=commit;h=1e07fbe25aad94a2ca4e6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 3 10:04:22 2014 +0200 Wine release 1.7.28 --- news/en/2014100301.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2014100301.xml b/news/en/2014100301.xml new file mode 100644 index 0000000..bfc0422 --- /dev/null +++ b/news/en/2014100301.xml @@ -0,0 +1,15 @@ +<news> +<date>October 3, 2014</date> +<title>Wine 1.7.28 Released</title> +<body> +<p> The Wine development release 1.7.28 is now available.</p> +<p> <a href="{$root}/announce/1.7.28">What's new</a> in this release: +<ul> + <li>Support for conditional compilation in JavaScript.</li> + <li>Bidirectional text support in DirectWrite.</li> + <li>Stubs for DirectPlay Voice support.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.28.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Henri Verbeet : wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8A8.
by Alexandre Julliard Oct. 3, 2014

Oct. 3, 2014

Module: wine Branch: master Commit: 7d42d9ea91d4b38a995159542ccbc3ec05626b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d42d9ea91d4b38a995159542… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 3 09:19:20 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8A8. --- dlls/wined3d/surface.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e5f34f0..a8e0f51 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3282,14 +3282,33 @@ static void convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, uns } } +static void convert_b8g8r8a8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, + BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, + const struct wined3d_color_key *color_key) +{ + const DWORD *src_row; + unsigned int x, y; + DWORD *dst_row; + + for (y = 0; y < height; ++y) + { + src_row = (DWORD *)&src[src_pitch * y]; + dst_row = (DWORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + DWORD src_color = src_row[x]; + if (color_in_range(color_key, src_color)) + src_color &= ~0xff000000; + dst_row[x] = src_color; + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { struct wined3d_palette *palette = NULL; struct wined3d_texture *texture; - const BYTE *source; - unsigned int x, y; - BYTE *dest; TRACE("src %p, dst %p, pitch %u, width %u, height %u, outpitch %u, conversion_type %#x, surface %p.\n", src, dst, pitch, width, height, outpitch, conversion_type, surface); @@ -3325,20 +3344,8 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8A8: - for (y = 0; y < height; ++y) - { - source = src + pitch * y; - dest = dst + outpitch * y; - for (x = 0; x < width; ++x) - { - DWORD color = *(const DWORD *)source; - if (color_in_range(&texture->src_blt_color_key, color)) - color &= ~0xff000000; - *(DWORD*)dest = color; - source += 4; - dest += 4; - } - } + convert_b8g8r8a8_unorm_b8g8r8a8_unorm_color_key(src, pitch, dst, outpitch, + width, height, &texture->src_blt_color_key); break; default:

1 0

Alexandre Julliard : Release 1.7.28.
by Alexandre Julliard Oct. 3, 2014

Oct. 3, 2014

Module: wine Branch: master Commit: 14302ee5e79ef4975f72cf7786d6cf5d8c31a0d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14302ee5e79ef4975f72cf778… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 3 09:55:56 2014 +0200 Release 1.7.28. --- ANNOUNCE | 393 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 226 insertions(+), 188 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14302ee5e79ef4975f72c…

1 0

Ken Thomases : winemac: Don' t invalidate the window shadow on every draw if it' s merely shaped and not color-keyed or using per-pixel alpha.
by Alexandre Julliard Oct. 3, 2014

Oct. 3, 2014

Module: wine Branch: master Commit: 170d80dc90fc3fb23d64f2a05f081747dd5a26c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=170d80dc90fc3fb23d64f2a05… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 2 17:06:14 2014 -0500 winemac: Don't invalidate the window shadow on every draw if it's merely shaped and not color-keyed or using per-pixel alpha. This avoids flickering and tearing on some versions of OS X during frequent redrawing in a shaped window, such as when scrolling a document in Word 2007. Since we aren't guaranteed that the window surface has updated bits for us to draw, we mark the whole content view as needing redisplay and draw the window's shape in the background color on the first -drawRect: after the shape change. --- dlls/winemac.drv/cocoa_window.m | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index ba1b914..d9a421e 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -236,6 +236,17 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif if ([window contentView] != self) return; + if (window.shapeChangedSinceLastDraw && window.shape && !window.colorKeyed && !window.usePerPixelAlpha) + { + [[NSColor clearColor] setFill]; + NSRectFill(rect); + + [window.shape addClip]; + + [[NSColor windowBackgroundColor] setFill]; + NSRectFill(rect); + } + if (window.surface && window.surface_mutex && !pthread_mutex_lock(window.surface_mutex)) { @@ -289,7 +300,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif // If the window may be transparent, then we have to invalidate the // shadow every time we draw. Also, if this is the first time we've // drawn since changing from transparent to opaque. - if (![window isOpaque] || window.shapeChangedSinceLastDraw) + if (window.colorKeyed || window.usePerPixelAlpha || window.shapeChangedSinceLastDraw) { window.shapeChangedSinceLastDraw = FALSE; [window invalidateShadow]; @@ -1373,11 +1384,15 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif { if (![self isOpaque] && !self.needsTransparency) { + self.shapeChangedSinceLastDraw = TRUE; + [[self contentView] setNeedsDisplay:YES]; [self setBackgroundColor:[NSColor windowBackgroundColor]]; [self setOpaque:YES]; } else if ([self isOpaque] && self.needsTransparency) { + self.shapeChangedSinceLastDraw = TRUE; + [[self contentView] setNeedsDisplay:YES]; [self setBackgroundColor:[NSColor clearColor]]; [self setOpaque:NO]; }

1 0

Tag wine-1.7.28 : Alexandre Julliard : Release 1.7.28
by Alexandre Julliard Oct. 3, 2014

Oct. 3, 2014

Module: wine Branch: refs/tags/wine-1.7.28 Tag: dd9a271fb1a5d67040526df0e8f6b243a88ee171 URL: http://source.winehq.org/git/wine.git/?a=tag;h=dd9a271fb1a5d67040526df0e8f6… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 3 09:55:56 2014 +0200 Release 1.7.28

1 0

Henri Verbeet : wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8X8.
by Alexandre Julliard Oct. 3, 2014

Oct. 3, 2014

Module: wine Branch: master Commit: dabe5b4479521e16a040849b34dea247dd520dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dabe5b4479521e16a040849b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 3 09:19:19 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8X8. --- dlls/wined3d/surface.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7dde5e4..e5f34f0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3259,6 +3259,29 @@ static void convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsig } } +static void convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, + BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, + const struct wined3d_color_key *color_key) +{ + const DWORD *src_row; + unsigned int x, y; + DWORD *dst_row; + + for (y = 0; y < height; ++y) + { + src_row = (DWORD *)&src[src_pitch * y]; + dst_row = (DWORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + DWORD src_color = src_row[x]; + if (color_in_range(color_key, src_color)) + dst_row[x] = src_color & ~0xff000000; + else + dst_row[x] = src_color | 0xff000000; + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { @@ -3297,21 +3320,8 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8X8: - for (y = 0; y < height; ++y) - { - source = src + pitch * y; - dest = dst + outpitch * y; - for (x = 0; x < width; ++x) - { - DWORD color = *(const DWORD *)source; - if (color_in_range(&texture->src_blt_color_key, color)) - *(DWORD *)dest = color & ~0xff000000; - else - *(DWORD *)dest = color | 0xff000000; - source += 4; - dest += 4; - } - } + convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(src, pitch, dst, outpitch, + width, height, &texture->src_blt_color_key); break; case WINED3D_CT_CK_B8G8R8A8:

1 0

Henri Verbeet : wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8.
by Alexandre Julliard Oct. 3, 2014

Oct. 3, 2014

Module: wine Branch: master Commit: 548978dec49761ea6c12e8e117b1a0322b8a81b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=548978dec49761ea6c12e8e11… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 3 09:19:18 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_CK_B8G8R8. --- dlls/wined3d/surface.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 86aa235..7dde5e4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3238,6 +3238,27 @@ static void convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, uns } } +static void convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, + BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, + const struct wined3d_color_key *color_key) +{ + const BYTE *src_row; + unsigned int x, y; + DWORD *dst_row; + + for (y = 0; y < height; ++y) + { + src_row = &src[src_pitch * y]; + dst_row = (DWORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + DWORD src_color = (src_row[x * 3 + 2] << 16) | (src_row[x * 3 + 1] << 8) | src_row[x * 3]; + if (!color_in_range(color_key, src_color)) + dst_row[x] = src_color | 0xff000000; + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { @@ -3271,20 +3292,8 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8: - for (y = 0; y < height; ++y) - { - source = src + pitch * y; - dest = dst + outpitch * y; - for (x = 0; x < width; ++x) - { - DWORD color = ((DWORD)source[2] << 16) | ((DWORD)source[1] << 8) | (DWORD)source[0]; - if (!color_in_range(&texture->src_blt_color_key, color)) - color |= 0xff000000; - *(DWORD *)dest = color; - source += 3; - dest += 4; - } - } + convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(src, pitch, dst, outpitch, + width, height, &texture->src_blt_color_key); break; case WINED3D_CT_CK_B8G8R8X8:

1 0

Ken Thomases : winemac: Properly ignore attempts to set a window' s shape to its current shape.
by Alexandre Julliard Oct. 3, 2014

Oct. 3, 2014

Module: wine Branch: master Commit: 31d7f61cc3525d32c0624564f9ac9033010fb968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d7f61cc3525d32c0624564f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Oct 2 17:06:19 2014 -0500 winemac: Properly ignore attempts to set a window's shape to its current shape. NSBezierPath doesn't override the -isEqual: method to actually compare paths, so it just falls back to object identity which, in our case, makes paths seem like they're never equal. Also, memcmp()-ing the rectangle array is almost certainly faster than any general test for equality between two paths. --- dlls/winemac.drv/cocoa_window.h | 1 + dlls/winemac.drv/cocoa_window.m | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 88ef23d..574ff75 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -44,6 +44,7 @@ pthread_mutex_t* surface_mutex; NSBezierPath* shape; + NSData* shapeData; BOOL shapeChangedSinceLastDraw; BOOL colorKeyed; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d9a421e..35222c1 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -182,6 +182,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif @property (nonatomic) pthread_mutex_t* surface_mutex; @property (copy, nonatomic) NSBezierPath* shape; +(a)property (copy, nonatomic) NSData* shapeData; @property (nonatomic) BOOL shapeChangedSinceLastDraw; @property (readonly, nonatomic) BOOL needsTransparency; @@ -540,7 +541,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif @synthesize disabled, noActivate, floating, fullscreen, fakingClose, latentParentWindow, hwnd, queue; @synthesize surface, surface_mutex; - @synthesize shape, shapeChangedSinceLastDraw; + @synthesize shape, shapeData, shapeChangedSinceLastDraw; @synthesize colorKeyed, colorKeyRed, colorKeyGreen, colorKeyBlue; @synthesize usePerPixelAlpha; @synthesize imeData, commandDone; @@ -634,6 +635,7 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif [latentChildWindows release]; [latentParentWindow release]; [shape release]; + [shapeData release]; [super dealloc]; } @@ -1401,7 +1403,6 @@ static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modif - (void) setShape:(NSBezierPath*)newShape { if (shape == newShape) return; - if (shape && newShape && [shape isEqual:newShape]) return; if (shape) { @@ -2379,16 +2380,24 @@ void macdrv_set_window_shape(macdrv_window w, const CGRect *rects, int count) OnMainThread(^{ if (!rects || !count) + { window.shape = nil; + window.shapeData = nil; + } else { - NSBezierPath* path; - unsigned int i; + size_t length = sizeof(*rects) * count; + if (window.shapeData.length != length || memcmp(window.shapeData.bytes, rects, length)) + { + NSBezierPath* path; + unsigned int i; - path = [NSBezierPath bezierPath]; - for (i = 0; i < count; i++) - [path appendBezierPathWithRect:NSRectFromCGRect(rects[i])]; - window.shape = path; + path = [NSBezierPath bezierPath]; + for (i = 0; i < count; i++) + [path appendBezierPathWithRect:NSRectFromCGRect(rects[i])]; + window.shape = path; + window.shapeData = [NSData dataWithBytes:rects length:length]; + } } });

1 0

Nikolay Sivov : dwrite: Implement CreateNumberSubstitution().
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: 7c035744f6bc1cbaa763554aa9cf023d8790fa20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c035744f6bc1cbaa763554aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 1 16:14:41 2014 +0400 dwrite: Implement CreateNumberSubstitution(). --- dlls/dwrite/analyzer.c | 93 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/main.c | 4 +- dlls/dwrite/tests/analyzer.c | 36 +++++++++++++++++ include/winnls.h | 3 +- 5 files changed, 134 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 2470fa2..7c32e6b 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -165,6 +165,20 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Yiii */ { 0x69696959, 460, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 }, TRUE } }; +struct dwrite_numbersubstitution { + IDWriteNumberSubstitution IDWriteNumberSubstitution_iface; + LONG ref; + + DWRITE_NUMBER_SUBSTITUTION_METHOD method; + WCHAR *locale; + BOOL ignore_user_override; +}; + +static inline struct dwrite_numbersubstitution *impl_from_IDWriteNumberSubstitution(IDWriteNumberSubstitution *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_numbersubstitution, IDWriteNumberSubstitution_iface); +} + static inline UINT16 get_char_script(WCHAR c) { UINT16 script = get_table_entry(wine_scripts_table, c); @@ -1044,3 +1058,82 @@ HRESULT get_textanalyzer(IDWriteTextAnalyzer **ret) *ret = (IDWriteTextAnalyzer*)&textanalyzer; return S_OK; } + +static HRESULT WINAPI dwritenumbersubstitution_QueryInterface(IDWriteNumberSubstitution *iface, REFIID riid, void **obj) +{ + struct dwrite_numbersubstitution *This = impl_from_IDWriteNumberSubstitution(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IDWriteNumberSubstitution) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IDWriteNumberSubstitution_AddRef(iface); + return S_OK; + } + + *obj = NULL; + + return E_NOINTERFACE; +} + +static ULONG WINAPI dwritenumbersubstitution_AddRef(IDWriteNumberSubstitution *iface) +{ + struct dwrite_numbersubstitution *This = impl_from_IDWriteNumberSubstitution(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI dwritenumbersubstitution_Release(IDWriteNumberSubstitution *iface) +{ + struct dwrite_numbersubstitution *This = impl_from_IDWriteNumberSubstitution(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) { + heap_free(This->locale); + heap_free(This); + } + + return ref; +} + +static const struct IDWriteNumberSubstitutionVtbl numbersubstitutionvtbl = { + dwritenumbersubstitution_QueryInterface, + dwritenumbersubstitution_AddRef, + dwritenumbersubstitution_Release +}; + +HRESULT create_numbersubstitution(DWRITE_NUMBER_SUBSTITUTION_METHOD method, const WCHAR *locale, + BOOL ignore_user_override, IDWriteNumberSubstitution **ret) +{ + struct dwrite_numbersubstitution *substitution; + + *ret = NULL; + + if (method < DWRITE_NUMBER_SUBSTITUTION_METHOD_FROM_CULTURE || method > DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL) + return E_INVALIDARG; + + if (method != DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE && !IsValidLocaleName(locale)) + return E_INVALIDARG; + + substitution = heap_alloc(sizeof(*substitution)); + if (!substitution) + return E_OUTOFMEMORY; + + substitution->IDWriteNumberSubstitution_iface.lpVtbl = &numbersubstitutionvtbl; + substitution->ref = 1; + substitution->ignore_user_override = ignore_user_override; + substitution->method = method; + substitution->locale = heap_strdupW(locale); + if (locale && !substitution->locale) { + heap_free(substitution); + return E_OUTOFMEMORY; + } + + *ret = &substitution->IDWriteNumberSubstitution_iface; + return S_OK; +} diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index ccad5a8..3ca7114 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -89,6 +89,7 @@ static inline unsigned short get_table_entry(const unsigned short *table, WCHAR extern HRESULT create_font_from_logfont(const LOGFONTW*, IDWriteFont**) DECLSPEC_HIDDEN; extern HRESULT convert_fontface_to_logfont(IDWriteFontFace*, LOGFONTW*) DECLSPEC_HIDDEN; +extern HRESULT create_numbersubstitution(DWRITE_NUMBER_SUBSTITUTION_METHOD,const WCHAR *locale,BOOL,IDWriteNumberSubstitution**) DECLSPEC_HIDDEN; extern HRESULT create_textformat(const WCHAR*,IDWriteFontCollection*,DWRITE_FONT_WEIGHT,DWRITE_FONT_STYLE,DWRITE_FONT_STRETCH, FLOAT,const WCHAR*,IDWriteTextFormat**) DECLSPEC_HIDDEN; extern HRESULT create_textlayout(const WCHAR*,UINT32,IDWriteTextFormat*,FLOAT,FLOAT,IDWriteTextLayout**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 7d62871..033e89a 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -749,8 +749,8 @@ static HRESULT WINAPI dwritefactory_CreateNumberSubstitution(IDWriteFactory *ifa WCHAR const* locale, BOOL ignore_user_override, IDWriteNumberSubstitution **substitution) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); - FIXME("(%p)->(%d %s %d %p): stub\n", This, method, debugstr_w(locale), ignore_user_override, substitution); - return E_NOTIMPL; + TRACE("(%p)->(%d %s %d %p)\n", This, method, debugstr_w(locale), ignore_user_override, substitution); + return create_numbersubstitution(method, locale, ignore_user_override, substitution); } static HRESULT WINAPI dwritefactory_CreateGlyphRunAnalysis(IDWriteFactory *iface, DWRITE_GLYPH_RUN const *glyph_run, diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 45e2e07..31532ca 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1046,11 +1046,46 @@ if (0) { /* crashes on native */ ok(indices[0] == 0, "%d: got %d\n", i, indices[0]); } + IDWriteFont_Release(font); IDWriteFontFace_Release(fontface); IDWriteGdiInterop_Release(interop); IDWriteTextAnalyzer1_Release(analyzer1); } +static void test_numbersubstitution(void) +{ + static const WCHAR dummyW[] = {'d','u','m','m','y',0}; + IDWriteNumberSubstitution *substitution; + HRESULT hr; + + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE, NULL, FALSE, &substitution); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteNumberSubstitution_Release(substitution); + + /* invalid method */ + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL+1, NULL, FALSE, &substitution); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* invalid method */ + hr = IDWriteFactory_CreateNumberSubstitution(factory, -1, NULL, FALSE, &substitution); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* invalid locale */ + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL, dummyW, FALSE, &substitution); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_CONTEXTUAL, dummyW, FALSE, &substitution); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NATIONAL, dummyW, FALSE, &substitution); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* invalid locale, but it's not needed for this method */ + hr = IDWriteFactory_CreateNumberSubstitution(factory, DWRITE_NUMBER_SUBSTITUTION_METHOD_NONE, dummyW, FALSE, &substitution); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteNumberSubstitution_Release(substitution); +} + START_TEST(analyzer) { HRESULT hr; @@ -1070,6 +1105,7 @@ START_TEST(analyzer) test_AnalyzeLineBreakpoints(); test_GetScriptProperties(); test_GetTextComplexity(); + test_numbersubstitution(); IDWriteFactory_Release(factory); } diff --git a/include/winnls.h b/include/winnls.h index 9b353cb..13274be 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -863,8 +863,9 @@ WINBASEAPI BOOL WINAPI IsDBCSLeadByte(BYTE); WINBASEAPI BOOL WINAPI IsDBCSLeadByteEx(UINT,BYTE); WINNORMALIZEAPI BOOL WINAPI IsNormalizedString(NORM_FORM,LPCWSTR,INT); WINBASEAPI BOOL WINAPI IsValidCodePage(UINT); -WINBASEAPI BOOL WINAPI IsValidLocale(LCID,DWORD); WINBASEAPI BOOL WINAPI IsValidLanguageGroup(LGRPID,DWORD); +WINBASEAPI BOOL WINAPI IsValidLocale(LCID,DWORD); +WINBASEAPI BOOL WINAPI IsValidLocaleName(LPCWSTR); WINBASEAPI INT WINAPI LCIDToLocaleName(LCID,LPWSTR,INT,DWORD); WINBASEAPI INT WINAPI LCMapStringA(LCID,DWORD,LPCSTR,INT,LPSTR,INT); WINBASEAPI INT WINAPI LCMapStringW(LCID,DWORD,LPCWSTR,INT,LPWSTR,INT);

1 0

Qian Hong : jscript: Ignore BOM mark in next_token.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: 66ba778cadcc092b390cd867ac05c7b55c1f7968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66ba778cadcc092b390cd867a… Author: Qian Hong <qhong(a)codeweavers.com> Date: Thu Oct 2 14:09:10 2014 +0800 jscript: Ignore BOM mark in next_token. --- dlls/jscript/lex.c | 2 +- dlls/jscript/tests/run.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index b4a3700..af4b24b 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -241,7 +241,7 @@ static BOOL skip_comment(parser_ctx_t *ctx) static BOOL skip_spaces(parser_ctx_t *ctx) { - while(ctx->ptr < ctx->end && isspaceW(*ctx->ptr)) { + while(ctx->ptr < ctx->end && (isspaceW(*ctx->ptr) || *ctx->ptr == 0xFEFF /* UTF16 BOM */)) { if(is_endline(*ctx->ptr++)) ctx->nl = TRUE; } diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index aa1783e..452f810 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -144,6 +144,7 @@ DEFINE_EXPECT(DeleteMemberByDispID_false); #define DISPID_TESTOBJ_ONLYDISPID 0x2001 #define DISPID_TESTOBJ_WITHPROP 0x2002 +#define JS_E_OUT_OF_MEMORY 0x800a03ec #define JS_E_INVALID_CHAR 0x800a03f6 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -1966,6 +1967,56 @@ static void test_script_exprs(void) testing_expr = FALSE; } +struct bom_test +{ + WCHAR str[1024]; + HRESULT hres; +}; + +static void run_bom_tests(void) +{ + BSTR src; + int i; + HRESULT hres; + struct bom_test bom_tests[] = { + {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, + {{0xFEFF,'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, + {{'v',0xFEFF,'a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, JS_E_OUT_OF_MEMORY}, + {{'v','a','r',0xFEFF,' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, + {{'v','a','r',' ','a',' ','=',' ','1',';',' ',0xFEFF,'r','e','p','o','r','t','S','u','c','c','e','s','s','(',')',';','\0'}, S_OK}, + {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t',0xFEFF,'S','u','c','c','e','s','s','(',')',';','\0'}, JS_E_OUT_OF_MEMORY}, + {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s',0xFEFF,'(',')',';','\0'}, S_OK}, + {{'v','a','r',' ','a',' ','=',' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, + {{'v','a','r',' ','a',' ','=',0xFEFF,' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, + {{0xFEFF,'v','a','r',' ','a',' ','=',0xFEFF,0xFEFF,' ','1',';',' ','r','e','p','o','r','t','S','u','c','c','e','s','s','(',0xFEFF,')',';','\0'}, S_OK}, + {{0}} + }; + + engine_clsid = &CLSID_JScript; + + for (i = 0; bom_tests[i].str[0]; i++) + { + if(bom_tests[i].hres == S_OK) + { + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + src = SysAllocString(bom_tests[i].str); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, src); + ok(hres == S_OK, "test %s failed with %08x\n", wine_dbgstr_w(src), hres); + SysFreeString(src); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + } + else + { + src = SysAllocString(bom_tests[i].str); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, src); + todo_wine ok(hres == bom_tests[i].hres, "test %s returned with %08x\n", wine_dbgstr_w(src), hres); + SysFreeString(src); + } + } +} + static BOOL run_tests(void) { HRESULT hres; @@ -2259,6 +2310,8 @@ static BOOL run_tests(void) "Object expected", NULL); + run_bom_tests(); + return TRUE; }

1 0

Sebastian Lackner : kernel32/tests: Add tests for FindFirstFileExA with FIND_FIRST_EX_CASE_SENSITIVE flag.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: c9b4344322b29441886d297925b4c2f0c120ccba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9b4344322b29441886d29792… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 2 04:01:36 2014 +0200 kernel32/tests: Add tests for FindFirstFileExA with FIND_FIRST_EX_CASE_SENSITIVE flag. --- dlls/kernel32/tests/file.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 106e68a..0973efe 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2608,22 +2608,38 @@ static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops, DWORD flags) skip("File system supports directory filtering\n"); /* Results from the previous call are not cleared */ ok(strcmp(search_results.cFileName, "dir1") == 0, "Third entry should be 'dir1' is %s\n", search_results.cFileName); - FindClose( handle ); - goto cleanup; } + else + { + ok(ret, "Fetching fourth file failed\n"); + ok(CHECK_NAME(search_results.cFileName), "Invalid fourth entry - %s\n", search_results.cFileName); - ok(ret, "Fetching fourth file failed\n"); - ok(CHECK_NAME(search_results.cFileName), "Invalid fourth entry - %s\n", search_results.cFileName); + ok(FindNextFileA(handle, &search_results), "Fetching fifth file failed\n"); + ok(CHECK_NAME(search_results.cFileName), "Invalid fifth entry - %s\n", search_results.cFileName); - ok(FindNextFileA(handle, &search_results), "Fetching fifth file failed\n"); - ok(CHECK_NAME(search_results.cFileName), "Invalid fifth entry - %s\n", search_results.cFileName); + ok(FindNextFileA(handle, &search_results) == FALSE, "Fetching sixth file should fail\n"); + } #undef CHECK_NAME - ok(FindNextFileA(handle, &search_results) == FALSE, "Fetching sixth file should fail\n"); - FindClose( handle ); + /* Most Windows systems seem to ignore the FIND_FIRST_EX_CASE_SENSITIVE flag. Unofficial documentation + * suggests that there are registry keys and that it might depend on the used filesystem. */ + SetLastError(0xdeadbeef); + handle = pFindFirstFileExA("TEST-DIR\\*", FindExInfoStandard, &search_results, search_ops, NULL, flags); + if (flags & FIND_FIRST_EX_CASE_SENSITIVE) + { + ok(handle != INVALID_HANDLE_VALUE || GetLastError() == ERROR_PATH_NOT_FOUND, + "Unexpected error %x, expected valid handle or ERROR_PATH_NOT_FOUND\n", GetLastError()); + trace("FindFirstFileExA flag FIND_FIRST_EX_CASE_SENSITIVE is %signored\n", + (handle == INVALID_HANDLE_VALUE) ? "not " : ""); + } + else + ok(handle != INVALID_HANDLE_VALUE, "Unexpected error %x, expected valid handle\n", GetLastError()); + if (handle != INVALID_HANDLE_VALUE) + FindClose( handle ); + cleanup: DeleteFileA("test-dir\\file1"); DeleteFileA("test-dir\\file2"); @@ -4177,9 +4193,11 @@ START_TEST(file) test_FindFirstFileA(); test_FindNextFileA(); test_FindFirstFileExA(0, 0); + test_FindFirstFileExA(0, FIND_FIRST_EX_CASE_SENSITIVE); test_FindFirstFileExA(0, FIND_FIRST_EX_LARGE_FETCH); /* FindExLimitToDirectories is ignored if the file system doesn't support directory filtering */ test_FindFirstFileExA(FindExSearchLimitToDirectories, 0); + test_FindFirstFileExA(FindExSearchLimitToDirectories, FIND_FIRST_EX_CASE_SENSITIVE); test_FindFirstFileExA(FindExSearchLimitToDirectories, FIND_FIRST_EX_LARGE_FETCH); test_LockFile(); test_file_sharing();

1 0

Sebastian Lackner : kernel32/tests: Add tests for FindFirstFileExA with FIND_FIRST_EX_LARGE_FETCH flag.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: 20b5c99f1172933e1736601c39373795f8395cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20b5c99f1172933e1736601c3… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 2 03:53:30 2014 +0200 kernel32/tests: Add tests for FindFirstFileExA with FIND_FIRST_EX_LARGE_FETCH flag. --- dlls/kernel32/tests/file.c | 15 +++++++++++---- include/winbase.h | 3 +++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ddfa019..106e68a 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2562,7 +2562,7 @@ static void test_FindNextFileA(void) ok ( err == ERROR_NO_MORE_FILES, "GetLastError should return ERROR_NO_MORE_FILES\n"); } -static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops) +static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops, DWORD flags) { WIN32_FIND_DATAA search_results; HANDLE handle; @@ -2579,12 +2579,17 @@ static void test_FindFirstFileExA(FINDEX_SEARCH_OPS search_ops) _lclose(_lcreat("test-dir\\file2", 0)); CreateDirectoryA("test-dir\\dir1", NULL); SetLastError(0xdeadbeef); - handle = pFindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, search_ops, NULL, 0); + handle = pFindFirstFileExA("test-dir\\*", FindExInfoStandard, &search_results, search_ops, NULL, flags); if (handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("FindFirstFileExA is not implemented\n"); goto cleanup; } + if ((flags & FIND_FIRST_EX_LARGE_FETCH) && handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_PARAMETER) + { + win_skip("FindFirstFileExA flag FIND_FIRST_EX_LARGE_FETCH not supported, skipping test\n"); + goto cleanup; + } ok(handle != INVALID_HANDLE_VALUE, "FindFirstFile failed (err=%u)\n", GetLastError()); ok(strcmp(search_results.cFileName, ".") == 0, "First entry should be '.', is %s\n", search_results.cFileName); @@ -4171,9 +4176,11 @@ START_TEST(file) test_MoveFileW(); test_FindFirstFileA(); test_FindNextFileA(); - test_FindFirstFileExA(0); + test_FindFirstFileExA(0, 0); + test_FindFirstFileExA(0, FIND_FIRST_EX_LARGE_FETCH); /* FindExLimitToDirectories is ignored if the file system doesn't support directory filtering */ - test_FindFirstFileExA(FindExSearchLimitToDirectories); + test_FindFirstFileExA(FindExSearchLimitToDirectories, 0); + test_FindFirstFileExA(FindExSearchLimitToDirectories, FIND_FIRST_EX_LARGE_FETCH); test_LockFile(); test_file_sharing(); test_offset_in_overlapped_structure(); diff --git a/include/winbase.h b/include/winbase.h index dd5e816..edd6ad6 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -289,6 +289,9 @@ typedef enum _FINDEX_INFO_LEVELS FindExInfoMaxInfoLevel } FINDEX_INFO_LEVELS; +#define FIND_FIRST_EX_CASE_SENSITIVE 1 +#define FIND_FIRST_EX_LARGE_FETCH 2 + typedef enum _FINDEX_SEARCH_OPS { FindExSearchNameMatch,

1 0

Jacek Caban : jscript: Added support for relational CC expressions.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: e7b8459bc334f47824a4739926734bebd0425b8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7b8459bc334f47824a473992… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 14:36:40 2014 +0200 jscript: Added support for relational CC expressions. --- dlls/jscript/cc_parser.y | 8 ++++---- dlls/jscript/tests/cc.js | 29 +++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index b22aef8..18c1cb1 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -192,13 +192,13 @@ CCEqualityExpression CCRelationalExpression : CCShiftExpression { $$ = $1; } | CCRelationalExpression '<' CCShiftExpression - { FIXME("'<' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccnum($1) < get_ccnum($3)); } | CCRelationalExpression tLEQ CCShiftExpression - { FIXME("'<=' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccnum($1) <= get_ccnum($3)); } | CCRelationalExpression '>' CCShiftExpression - { FIXME("'>' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccnum($1) > get_ccnum($3)); } | CCRelationalExpression tGEQ CCShiftExpression - { FIXME("'>=' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccnum($1) >= get_ccnum($3)); } CCShiftExpression : CCAdditiveExpression { $$ = $1; } diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index 09ef285..8f45a3d 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -152,8 +152,33 @@ ok(@test === true, "@test = " + @test); @set @test = (1==false+1) ok(@test === true, "@test = " + @test); -(a)set @test = (1+true==false+1) -ok(@test === false, "@test = " + @test); +function expect(val, exval) { + ok(val === exval, "got " + val + " expected " + exval); +} + +(a)set @test = (false < 0.5) +expect(@test, true); + +(a)set @test = (true == 0 < 0.5) +expect(@test, true); + +(a)set @test = (false < 0) +expect(@test, false); + +(a)set @test = (false > 0.5) +expect(@test, false); + +(a)set @test = (1 < true) +expect(@test, false); + +(a)set @test = (1 <= true) +expect(@test, true); + +(a)set @test = (1 >= true) +expect(@test, true); + +(a)set @test = (1 >= true-1) +expect(@test, true); @if (false) this wouldn not parse

1 0

Jacek Caban : jscript: Added support for '==' CC expression.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: d9e8c013c6346a0fec875fdd51b5a85b47191713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e8c013c6346a0fec875fdd5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 14:36:35 2014 +0200 jscript: Added support for '==' CC expression. --- dlls/jscript/cc_parser.y | 2 +- dlls/jscript/tests/cc.js | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index 34ee90c..b22aef8 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -181,7 +181,7 @@ CCBitwiseANDExpression CCEqualityExpression : CCRelationalExpression { $$ = $1; } | CCEqualityExpression tEQ CCRelationalExpression - { FIXME("'==' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + { $$ = ccval_bool(get_ccnum($1) == get_ccnum($3)); } | CCEqualityExpression tNEQ CCRelationalExpression { $$ = ccval_bool(get_ccnum($1) != get_ccnum($3)); } | CCEqualityExpression tEQEQ CCRelationalExpression diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index 7ce3682..09ef285 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -146,6 +146,15 @@ ok(@test === -1, "@test = " + @test); @set @test = (true-(a)_jscript) ok(@test === 0, "@test = " + @test); +(a)set @test = (true==1) +ok(@test === true, "@test = " + @test); + +(a)set @test = (1==false+1) +ok(@test === true, "@test = " + @test); + +(a)set @test = (1+true==false+1) +ok(@test === false, "@test = " + @test); + @if (false) this wouldn not parse "@end

1 0

Henri Verbeet : wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_CK_B8G8R8X8.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: 2c7be38bb4079aab316dd5efe0306bb79344ce7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c7be38bb4079aab316dd5efe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 2 09:43:37 2014 +0200 wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_CK_B8G8R8X8. --- dlls/wined3d/surface.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 73b872f..a4a11c1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1607,7 +1607,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_B5G5R5X1, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, - {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_B8G8R8A8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, }; @@ -3264,17 +3264,17 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8X8: - /* Converting X8R8G8B8 format to R8G8B8A8 with color-keying. */ - for (y = 0; y < height; y++) + for (y = 0; y < height; ++y) { source = src + pitch * y; dest = dst + outpitch * y; - for (x = 0; x < width; x++) { - DWORD color = 0xffffff & *(const DWORD*)source; - DWORD dstcolor = color << 8; - if (!color_in_range(&surface->container->src_blt_color_key, color)) - dstcolor |= 0xff; - *(DWORD*)dest = dstcolor; + for (x = 0; x < width; ++x) + { + DWORD color = *(const DWORD *)source; + if (color_in_range(&surface->container->src_blt_color_key, color)) + *(DWORD *)dest = color & ~0xff000000; + else + *(DWORD *)dest = color | 0xff000000; source += 4; dest += 4; }

1 0

Jacek Caban : mshtml: Don' t assume that nsIDOMHTMLScriptElement inherits from nsIDOMHTMLElement in get_script_guid.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: 013b403c5813e5b87e08ff765e7db75c30eb8b98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=013b403c5813e5b87e08ff765… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 11:56:18 2014 +0200 mshtml: Don't assume that nsIDOMHTMLScriptElement inherits from nsIDOMHTMLElement in get_script_guid. --- dlls/mshtml/script.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index da6839f..4e79df5 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -849,6 +849,7 @@ static BOOL get_guid_from_language(LPCWSTR type, GUID *guid) static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *nsscript, GUID *guid) { + nsIDOMHTMLElement *nselem; const PRUnichar *language; nsAString val_str; BOOL ret = FALSE; @@ -872,7 +873,11 @@ static BOOL get_script_guid(HTMLInnerWindow *window, nsIDOMHTMLScriptElement *ns ERR("GetType failed: %08x\n", nsres); } - nsres = get_elem_attr_value((nsIDOMHTMLElement*)nsscript, languageW, &val_str, &language); + nsres = nsIDOMHTMLScriptElement_QueryInterface(nsscript, &IID_nsIDOMHTMLElement, (void**)&nselem); + assert(nsres == NS_OK); + + nsres = get_elem_attr_value(nselem, languageW, &val_str, &language); + nsIDOMHTMLElement_Release(nselem); if(NS_SUCCEEDED(nsres)) { if(*language) { ret = get_guid_from_language(language, guid);

1 0

Henri Verbeet : wined3d: Introduce a separate function for WINED3D_CT_CK_B5G5R5X1.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: dabb07aea60a81e7ec0b670215f064b28c4d1d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dabb07aea60a81e7ec0b67021… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 2 09:43:41 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_CK_B5G5R5X1. --- dlls/wined3d/surface.c | 46 ++++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6b13dd0..86aa235 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3215,6 +3215,29 @@ static void convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsig } } +static void convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsigned int src_pitch, + BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, + const struct wined3d_color_key *color_key) +{ + const WORD *src_row; + unsigned int x, y; + WORD *dst_row; + + for (y = 0; y < height; ++y) + { + src_row = (WORD *)&src[src_pitch * y]; + dst_row = (WORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + WORD src_color = src_row[x]; + if (color_in_range(color_key, src_color)) + dst_row[x] = src_color & ~0x8000; + else + dst_row[x] = src_color | 0x8000; + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { @@ -3243,26 +3266,9 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B5G5R5X1: - { - /* Converting X1R5G5B5 format to R5G5B5A1 to emulate color-keying. */ - const WORD *Source; - WORD *Dest; - TRACE("Color keyed 5551\n"); - for (y = 0; y < height; y++) { - Source = (const WORD *)(src + y * pitch); - Dest = (WORD *) (dst + y * outpitch); - for (x = 0; x < width; x++ ) { - WORD color = *Source++; - *Dest = color; - if (!color_in_range(&texture->src_blt_color_key, color)) - *Dest |= (1 << 15); - else - *Dest &= ~(1 << 15); - Dest++; - } - } - } - break; + convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key(src, pitch, dst, outpitch, + width, height, &texture->src_blt_color_key); + break; case WINED3D_CT_CK_B8G8R8: for (y = 0; y < height; ++y)

1 0

Henri Verbeet : wined3d: Just store the wined3d format in color_key_info[] .
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: 5802f72adfad0ef5bebc139a3775bc35c4274bc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5802f72adfad0ef5bebc139a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 2 09:43:38 2014 +0200 wined3d: Just store the wined3d format in color_key_info[]. --- dlls/wined3d/surface.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a4a11c1..cf057e2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1591,28 +1591,28 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp BOOL colorkey_active = need_alpha_ck && (texture->color_key_flags & WINEDDSD_CKSRCBLT); const struct wined3d_device *device = texture->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_format *dst_format; + enum wined3d_format_id dst_format_id; unsigned int i; static const struct { enum wined3d_format_id src_format; enum wined3d_conversion_type conversion_type; - GLint gl_internal; - GLint gl_format; - GLint gl_type; - unsigned int conv_byte_count; + enum wined3d_format_id dst_format; } color_key_info[] = { - {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, - {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_B5G5R5X1, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, - {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, - {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, - {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_B8G8R8A8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, + {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, WINED3DFMT_B5G5R5A1_UNORM}, + {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_B5G5R5X1, WINED3DFMT_B5G5R5A1_UNORM}, + {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, WINED3DFMT_B8G8R8A8_UNORM}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, WINED3DFMT_B8G8R8A8_UNORM}, + {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_B8G8R8A8, WINED3DFMT_B8G8R8A8_UNORM}, }; *format = *texture->resource.format; *conversion_type = WINED3D_CT_NONE; + dst_format_id = format->id; if (colorkey_active) { @@ -1622,10 +1622,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp continue; *conversion_type = color_key_info[i].conversion_type; - format->glInternal = color_key_info[i].gl_internal; - format->glFormat = color_key_info[i].gl_format; - format->glType = color_key_info[i].gl_type; - format->conv_byte_count = color_key_info[i].conv_byte_count; + dst_format_id = color_key_info[i].dst_format; break; } } @@ -1638,10 +1635,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp && texture == texture->swapchain->front_buffer)) || colorkey_active) { *conversion_type = WINED3D_CT_P8; - format->glInternal = GL_RGBA8; - format->glFormat = GL_BGRA; - format->glType = GL_UNSIGNED_INT_8_8_8_8_REV; - format->conv_byte_count = 4; + dst_format_id = WINED3DFMT_B8G8R8A8_UNORM; } } else if (texture->resource.format->id == WINED3DFMT_B2G3R3_UNORM && colorkey_active) @@ -1653,8 +1647,13 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp if (*conversion_type != WINED3D_CT_NONE) { - format->rtInternal = format->glInternal; + dst_format = wined3d_get_format(gl_info, dst_format_id); + format->glInternal = dst_format->glInternal; format->glGammaInternal = format->glInternal; + format->rtInternal = format->glInternal; + format->glFormat = dst_format->glFormat; + format->glType = dst_format->glType; + format->conv_byte_count = dst_format->byte_count; } }

1 0

Sebastian Lackner : shlwapi: Remove unnecessary internal function SHLWAPI_DupSharedHandle.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: 403ff3734ac9e9d0dcdcfc8cc63c1e6a308811a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=403ff3734ac9e9d0dcdcfc8cc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 2 14:46:39 2014 +0200 shlwapi: Remove unnecessary internal function SHLWAPI_DupSharedHandle. --- dlls/shlwapi/ordinal.c | 61 ++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 39 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 756ed34..21a75e9 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -74,13 +74,24 @@ BOOL WINAPI SHAboutInfoW(LPWSTR,DWORD); */ /************************************************************************* - * SHLWAPI_DupSharedHandle + * @ [SHLWAPI.11] + * + * Copy a sharable memory handle from one process to another. + * + * PARAMS + * hShared [I] Shared memory handle to duplicate + * dwSrcProcId [I] ID of the process owning hShared + * dwDstProcId [I] ID of the process wanting the duplicated handle + * dwAccess [I] Desired DuplicateHandle() access + * dwOptions [I] Desired DuplicateHandle() options + * + * RETURNS + * Success: A handle suitable for use by the dwDstProcId process. + * Failure: A NULL handle. * - * Internal implementation of SHLWAPI_11. */ -static HANDLE SHLWAPI_DupSharedHandle(HANDLE hShared, DWORD dwDstProcId, - DWORD dwSrcProcId, DWORD dwAccess, - DWORD dwOptions) +HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwSrcProcId, DWORD dwDstProcId, + DWORD dwAccess, DWORD dwOptions) { HANDLE hDst, hSrc; DWORD dwMyProcId = GetCurrentProcessId(); @@ -170,9 +181,8 @@ HANDLE WINAPI SHAllocShared(LPCVOID lpvData, DWORD dwSize, DWORD dwProcId) /* Release view. All further views mapped will be opaque */ UnmapViewOfFile(pMapped); - hRet = SHLWAPI_DupSharedHandle(hMap, dwProcId, - GetCurrentProcessId(), FILE_MAP_ALL_ACCESS, - DUPLICATE_SAME_ACCESS); + hRet = SHMapHandle(hMap, GetCurrentProcessId(), dwProcId, + FILE_MAP_ALL_ACCESS, DUPLICATE_SAME_ACCESS); } CloseHandle(hMap); @@ -201,8 +211,8 @@ PVOID WINAPI SHLockShared(HANDLE hShared, DWORD dwProcId) TRACE("(%p %d)\n", hShared, dwProcId); /* Get handle to shared memory for current process */ - hDup = SHLWAPI_DupSharedHandle(hShared, GetCurrentProcessId(), dwProcId, - FILE_MAP_ALL_ACCESS, 0); + hDup = SHMapHandle(hShared, dwProcId, GetCurrentProcessId(), FILE_MAP_ALL_ACCESS, 0); + /* Get View */ pMapped = MapViewOfFile(hDup, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0); CloseHandle(hDup); @@ -252,40 +262,13 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId) TRACE("(%p %d)\n", hShared, dwProcId); /* Get a copy of the handle for our process, closing the source handle */ - hClose = SHLWAPI_DupSharedHandle(hShared, GetCurrentProcessId(), dwProcId, - FILE_MAP_ALL_ACCESS,DUPLICATE_CLOSE_SOURCE); + hClose = SHMapHandle(hShared, dwProcId, GetCurrentProcessId(), + FILE_MAP_ALL_ACCESS,DUPLICATE_CLOSE_SOURCE); /* Close local copy */ return CloseHandle(hClose); } /************************************************************************* - * @ [SHLWAPI.11] - * - * Copy a sharable memory handle from one process to another. - * - * PARAMS - * hShared [I] Shared memory handle to duplicate - * dwSrcProcId [I] ID of the process owning hShared - * dwDstProcId [I] ID of the process wanting the duplicated handle - * dwAccess [I] Desired DuplicateHandle() access - * dwOptions [I] Desired DuplicateHandle() options - * - * RETURNS - * Success: A handle suitable for use by the dwDstProcId process. - * Failure: A NULL handle. - * - */ -HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwSrcProcId, DWORD dwDstProcId, - DWORD dwAccess, DWORD dwOptions) -{ - HANDLE hRet; - - hRet = SHLWAPI_DupSharedHandle(hShared, dwDstProcId, dwSrcProcId, - dwAccess, dwOptions); - return hRet; -} - -/************************************************************************* * @ [SHLWAPI.13] * * Create and register a clipboard enumerator for a web browser.

1 0

Sebastian Lackner : shlwapi: Fix swapped argument order in SHMapHandle.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: c95b182d159699447bfbff161613c5a4cbb7652a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c95b182d159699447bfbff161… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 2 14:43:33 2014 +0200 shlwapi: Fix swapped argument order in SHMapHandle. --- dlls/shlwapi/ordinal.c | 4 ++-- dlls/shlwapi/tests/ordinal.c | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index e5da1cf..756ed34 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -265,8 +265,8 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId) * * PARAMS * hShared [I] Shared memory handle to duplicate - * dwDstProcId [I] ID of the process wanting the duplicated handle * dwSrcProcId [I] ID of the process owning hShared + * dwDstProcId [I] ID of the process wanting the duplicated handle * dwAccess [I] Desired DuplicateHandle() access * dwOptions [I] Desired DuplicateHandle() options * @@ -275,7 +275,7 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId) * Failure: A NULL handle. * */ -HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwDstProcId, DWORD dwSrcProcId, +HANDLE WINAPI SHMapHandle(HANDLE hShared, DWORD dwSrcProcId, DWORD dwDstProcId, DWORD dwAccess, DWORD dwOptions) { HANDLE hRet; diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 7c7c4a0..099907b 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -548,28 +548,24 @@ static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) /* It seems like Windows Vista/2008 uses a different internal implementation * for shared memory, and calling SHMapHandle fails with ERROR_INVALID_HANDLE. */ - todo_wine ok(hmem2 != NULL || broken(hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE), "SHMapHandle failed: %u\n", GetLastError()); if (hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE) { - skip("Subprocess failed to map shared memory, skipping test\n"); + win_skip("Subprocess failed to map shared memory, skipping test\n"); return; } p = pSHLockShared(hmem2, GetCurrentProcessId()); - todo_wine ok(p != NULL, "SHLockShared failed: %u\n", GetLastError()); if (p != NULL) ok(p->value == 0x12345679, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345679); ret = pSHUnlockShared(p); - todo_wine ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); ret = pSHFreeShared(hmem2, GetCurrentProcessId()); - todo_wine ok(ret, "SHFreeShared failed: %u\n", GetLastError()); }

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: 710df5fcf1292534174d8b320268c142a074574d URL: http://source.winehq.org/git/wine.git/?a=commit;h=710df5fcf1292534174d8b320… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Oct 2 23:43:14 2014 +0900 po: Update Japanese translation. --- po/ja.po | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/po/ja.po b/po/ja.po index 0c4a284..fe43416 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-08-06 00:34+0900\n" +"PO-Revision-Date: 2014-10-02 23:14+0900\n" "Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" @@ -3532,16 +3532,12 @@ msgid "Expected ')'" msgstr "')'を期待していました" #: jscript.rc:40 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "サブジェクトキー識別子" +msgstr "識別子を期待していました" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "';'を期待していました" +msgstr "'='を期待していました" #: jscript.rc:42 msgid "Invalid character" @@ -3572,20 +3568,16 @@ msgid "Label not found" msgstr "ラベルが見つかりません" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "';'を期待していました" +msgstr "'@end'を期待していました" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "条件コンパイルはオフにされています" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "';'を期待していました" +msgstr "'@'を期待していました" #: jscript.rc:54 msgid "Number expected"

1 0

Jacek Caban : jscript: Added parser rules for missing expressions.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: a0f038963b02ca2b458326c13c07228a54a5d514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f038963b02ca2b458326c13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 2 14:36:29 2014 +0200 jscript: Added parser rules for missing expressions. --- dlls/jscript/cc_parser.y | 123 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 116 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index d25022b..34ee90c 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -37,10 +37,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); ccval_t ccval; } -%token tNEQ +%token tEQ tEQEQ tNEQ tNEQEQ tLSHIFT tRSHIFT tRRSHIFT tOR tAND tLEQ tGEQ %token <ccval> tCCValue -%type <ccval> CCUnaryExpression CCEqualityExpression CCAdditiveExpression CCMultiplicativeExpression +%type <ccval> CCUnaryExpression CCLogicalORExpression CCLogicalANDExpression +%type <ccval> CCBitwiseORExpression CCBitwiseXORExpression CCBitwiseANDExpression +%type <ccval> CCEqualityExpression CCRelationalExpression CCShiftExpression CCAdditiveExpression CCMultiplicativeExpression %{ @@ -69,14 +71,65 @@ static int cc_parser_lex(void *lval, parser_ctx_t *ctx) case '-': case '*': case '/': + case '~': + case '%': + case '^': return *ctx->ptr++; + case '=': + if(*++ctx->ptr == '=') { + if(*++ctx->ptr == '=') { + ctx->ptr++; + return tEQEQ; + } + return tEQ; + } + break; case '!': if(*++ctx->ptr == '=') { - ctx->ptr++; + if(*++ctx->ptr == '=') { + ctx->ptr++; + return tNEQEQ; + } return tNEQ; } - return '!'; + case '<': + switch(*++ctx->ptr) { + case '<': + ctx->ptr++; + return tLSHIFT; + case '=': + ctx->ptr++; + return tLEQ; + default: + return '<'; + } + case '>': + switch(*++ctx->ptr) { + case '>': + if(*++ctx->ptr == '>') { + ctx->ptr++; + return tRRSHIFT; + } + return tRSHIFT; + case '=': + ctx->ptr++; + return tGEQ; + default: + return '>'; + } + case '|': + if(*++ctx->ptr == '|') { + ctx->ptr++; + return tOR; + } + return '|'; + case '&': + if(*++ctx->ptr == '&') { + ctx->ptr++; + return tAND; + } + return '&'; } WARN("Failed to interpret %s\n", debugstr_w(ctx->ptr)); @@ -94,13 +147,67 @@ CCExpr CCUnaryExpression : tCCValue { $$ = $1; } - | '(' CCEqualityExpression ')' { $$ = $2; } + | '(' CCLogicalORExpression ')' { $$ = $2; } | '!' CCUnaryExpression { $$ = ccval_bool(!get_ccbool($2)); }; + | '~' CCUnaryExpression { FIXME("'~' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | '+' CCUnaryExpression { FIXME("'+' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | '-' CCUnaryExpression { FIXME("'-' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + +CCLogicalORExpression + : CCLogicalANDExpression { $$ = $1; } + | CCLogicalORExpression tOR CCLogicalANDExpression + { FIXME("'||' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + +CCLogicalANDExpression + : CCBitwiseORExpression { $$ = $1; } + | CCBitwiseANDExpression tAND CCBitwiseORExpression + { FIXME("'&&' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + +CCBitwiseORExpression + : CCBitwiseXORExpression { $$ = $1; } + | CCBitwiseORExpression '|' CCBitwiseXORExpression + { FIXME("'|' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + +CCBitwiseXORExpression + : CCBitwiseANDExpression { $$ = $1; } + | CCBitwiseXORExpression '^' CCBitwiseANDExpression + { FIXME("'^' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + +CCBitwiseANDExpression + : CCEqualityExpression { $$ = $1; } + | CCBitwiseANDExpression '&' CCEqualityExpression + { FIXME("'&' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } CCEqualityExpression - : CCAdditiveExpression { $$ = $1; } - | CCEqualityExpression tNEQ CCAdditiveExpression + : CCRelationalExpression { $$ = $1; } + | CCEqualityExpression tEQ CCRelationalExpression + { FIXME("'==' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | CCEqualityExpression tNEQ CCRelationalExpression { $$ = ccval_bool(get_ccnum($1) != get_ccnum($3)); } + | CCEqualityExpression tEQEQ CCRelationalExpression + { FIXME("'===' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | CCEqualityExpression tNEQEQ CCRelationalExpression + { FIXME("'!==' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + +CCRelationalExpression + : CCShiftExpression { $$ = $1; } + | CCRelationalExpression '<' CCShiftExpression + { FIXME("'<' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | CCRelationalExpression tLEQ CCShiftExpression + { FIXME("'<=' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | CCRelationalExpression '>' CCShiftExpression + { FIXME("'>' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | CCRelationalExpression tGEQ CCShiftExpression + { FIXME("'>=' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + +CCShiftExpression + : CCAdditiveExpression { $$ = $1; } + | CCShiftExpression tLSHIFT CCAdditiveExpression + { FIXME("'<<' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | CCShiftExpression tRSHIFT CCAdditiveExpression + { FIXME("'>>' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } + | CCShiftExpression tRRSHIFT CCAdditiveExpression + { FIXME("'>>>' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } CCAdditiveExpression : CCMultiplicativeExpression { $$ = $1; } @@ -115,6 +222,8 @@ CCMultiplicativeExpression { $$ = ccval_num(get_ccnum($1) * get_ccnum($3)); } | CCMultiplicativeExpression '/' CCUnaryExpression { $$ = ccval_num(get_ccnum($1) / get_ccnum($3)); } + | CCMultiplicativeExpression '%' CCUnaryExpression + { FIXME("'%%' expression not implemented\n"); ctx->hres = E_NOTIMPL; YYABORT; } %%

1 0

Frédéric Delanoy : Assorted spelling/ grammar fixes.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: 1e214eb5d354ffbb64699686913a5eb61998ed78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e214eb5d354ffbb646996869… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 2 10:30:06 2014 +0200 Assorted spelling/grammar fixes. --- dlls/ddraw/tests/visual.c | 4 ++-- dlls/kernel32/environ.c | 2 +- dlls/kernel32/locale.c | 2 +- dlls/kernel32/tests/locale.c | 2 +- dlls/shlwapi/tests/path.c | 2 +- programs/wineconsole/winecon_private.h | 2 +- programs/winhlp32/winhelp.c | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 097e8be..0385044 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -490,8 +490,8 @@ static void fog_test(IDirect3DDevice7 *device) {{ 0.0f, 0.0f, 1.5f}, 0xffff0000, 0xff000000}, }; /* Untransformed ones. Give them a different diffuse color to make the - * test look nicer. It also makes making sure that they are drawn - * correctly easier. */ + * test look nicer. It also helps making sure that they are drawn + * correctly. */ struct { struct vec4 position; diff --git a/dlls/kernel32/environ.c b/dlls/kernel32/environ.c index 18cb44c..57b6a1f 100644 --- a/dlls/kernel32/environ.c +++ b/dlls/kernel32/environ.c @@ -503,7 +503,7 @@ DWORD WINAPI GetFirmwareEnvironmentVariableA(LPCSTR name, LPCSTR guid, PVOID buf } /*********************************************************************** - * GetFirmwareEnvironmentVariableA (KERNEL32.@) + * GetFirmwareEnvironmentVariableW (KERNEL32.@) */ DWORD WINAPI GetFirmwareEnvironmentVariableW(LPCWSTR name, LPCWSTR guid, PVOID buffer, DWORD size) { diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 1ae32d5..730574b 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4324,7 +4324,7 @@ static const struct geoinfo_t *get_geoinfo_dataptr(GEOID geoid) ptr = &geoinfodata[n]; if (geoid == ptr->id) - /* we don't need empty entry */ + /* we don't need empty entries */ return *ptr->iso2W ? ptr : NULL; if (ptr->id > geoid) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index aad58b2..65172a7 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3971,7 +3971,7 @@ static void test_EnumSystemGeoID(void) ret = pEnumSystemGeoID(GEOCLASS_NATION, 0, test_geoid_enumproc); ok(ret, "got %d\n", ret); - /* only first level is enumerated, not the whole hierarchy */ + /* only the first level is enumerated, not the whole hierarchy */ geoidenum_count = 0; ret = pEnumSystemGeoID(GEOCLASS_NATION, 39070, test_geoid_enumproc2); if (ret == 0) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 1599313..1edb31e 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1626,7 +1626,7 @@ static void test_PathIsRelativeW(void) LPWSTR path; if (!pPathIsRelativeW) { - win_skip("PathIsRelativeA not available\n"); + win_skip("PathIsRelativeW not available\n"); return; } diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index 1daf581..eec4171 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -75,7 +75,7 @@ struct inner_data { void (*fnSetFont)(struct inner_data* data, const WCHAR* font, unsigned height, unsigned weight); void (*fnDeleteBackend)(struct inner_data* data); - void* private; /* data part belonging to the chosen backed */ + void* private; /* data part belonging to the chosen backend */ }; /* from wineconsole.c */ diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 195a23f..ee5eecd 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -309,7 +309,7 @@ static HLPFILE_WINDOWINFO* WINHELP_GetPopupWindowInfo(HLPFILE* hlpfile, /* Calculate horizontal size and position of a popup window */ GetWindowRect(parent->hMainWnd, &parent_rect); wi.size.cx = (parent_rect.right - parent_rect.left) / 2; - wi.size.cy = 10; /* need a non null value, so that border are taken into account while computing */ + wi.size.cy = 10; /* need a non null value, so that borders are taken into account while computing */ wi.origin.x = (short)LOWORD(mouse); wi.origin.y = (short)HIWORD(mouse);

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: 82f9e8a79ee31546df654acaf047964420a681ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f9e8a79ee31546df654acaf… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 2 10:04:36 2014 +0200 po: Update French translation. --- po/fr.po | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/po/fr.po b/po/fr.po index 6648d6a..29e5942 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-04-19 09:10+0100\n" +"PO-Revision-Date: 2014-10-02 10:04+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -3564,16 +3564,12 @@ msgid "Expected ')'" msgstr "« ) » attendu" #: jscript.rc:40 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "Identifiant de clé du sujet" +msgstr "Identifiant attendu" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "« ; » attendu" +msgstr "« = » attendu" #: jscript.rc:42 msgid "Invalid character" @@ -3604,20 +3600,16 @@ msgid "Label not found" msgstr "Étiquette introuvable" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "« ; » attendu" +msgstr "« @end » attendu" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "La compilation conditionnelle est désactivée" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "« ; » attendu" +msgstr "« @ » attendu" #: jscript.rc:54 msgid "Number expected"

1 0

Henri Verbeet : wined3d: Introduce a separate function for WINED3D_CT_P8.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: e10a46c30006d90dae9190b0ffb3985a7b3fc6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e10a46c30006d90dae9190b0f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 2 09:43:39 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_P8. --- dlls/wined3d/surface.c | 87 ++++++++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cf057e2..0f13c9d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3156,9 +3156,47 @@ static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD colo && color <= color_key->color_space_high_value; } +static void convert_p8_uint_b8g8r8a8_unorm(const BYTE *src, unsigned int src_pitch, + BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, + const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) +{ + const BYTE *src_row; + unsigned int x, y; + DWORD *dst_row; + + if (!palette) + { + /* FIXME: This should probably use the system palette. */ + FIXME("P8 surface loaded without a palette.\n"); + + for (y = 0; y < height; ++y) + { + memset(&dst[dst_pitch * y], 0, width * 4); + } + + return; + } + + for (y = 0; y < height; ++y) + { + src_row = &src[src_pitch * y]; + dst_row = (DWORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + BYTE src_color = src_row[x]; + dst_row[x] = 0xff000000 + | (palette->colors[src_color].rgbRed << 16) + | (palette->colors[src_color].rgbGreen << 8) + | palette->colors[src_color].rgbBlue; + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { + struct wined3d_palette *palette = NULL; + struct wined3d_texture *texture; const BYTE *source; unsigned int x, y; BYTE *dest; @@ -3166,43 +3204,14 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI TRACE("src %p, dst %p, pitch %u, width %u, height %u, outpitch %u, conversion_type %#x, surface %p.\n", src, dst, pitch, width, height, outpitch, conversion_type, surface); + texture = surface->container; switch (conversion_type) { case WINED3D_CT_P8: - if (surface->container->swapchain && surface->container->swapchain->palette) - { - const struct wined3d_palette *palette = surface->container->swapchain->palette; - for (y = 0; y < height; y++) - { - source = src + pitch * y; - dest = dst + outpitch * y; - for (x = 0; x < width; x++) - { - BYTE color = *source++; - *dest++ = palette->colors[color].rgbBlue; - *dest++ = palette->colors[color].rgbGreen; - *dest++ = palette->colors[color].rgbRed; - *dest++ = 0; - } - } - } - else - { - /* This should probably use the system palette, but unless - * the X server is running in P8 mode there is no such thing. - * The probably best solution is to set the fixed 20 colors - * from the default windows palette and set the rest to black, - * white, or some ugly pink. For now use black for the entire - * palette. Don't use pink everywhere. Age of Empires 2 draws - * a front buffer filled with zeroes without a palette when - * starting and we don't want the screen to flash in an ugly - * color. */ - FIXME("P8 surface loaded without a palette.\n"); - for (y = 0; y < height; ++y) - { - memset(&dst[outpitch * y], 0, width * 4); - } - } + if (texture->swapchain && texture->swapchain->palette) + palette = texture->swapchain->palette; + convert_p8_uint_b8g8r8a8_unorm(src, pitch, dst, outpitch, + width, height, palette, &texture->src_blt_color_key); break; case WINED3D_CT_CK_B5G6R5: @@ -3213,7 +3222,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; ++x) { WORD color = *(const WORD *)source; - if (!color_in_range(&surface->container->src_blt_color_key, color)) + if (!color_in_range(&texture->src_blt_color_key, color)) *(WORD *)dest = 0x8000 | ((color & 0xffc0) >> 1) | (color & 0x1f); else *(WORD *)dest = ((color & 0xffc0) >> 1) | (color & 0x1f); @@ -3235,7 +3244,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++ ) { WORD color = *Source++; *Dest = color; - if (!color_in_range(&surface->container->src_blt_color_key, color)) + if (!color_in_range(&texture->src_blt_color_key, color)) *Dest |= (1 << 15); else *Dest &= ~(1 << 15); @@ -3253,7 +3262,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; ++x) { DWORD color = ((DWORD)source[2] << 16) | ((DWORD)source[1] << 8) | (DWORD)source[0]; - if (!color_in_range(&surface->container->src_blt_color_key, color)) + if (!color_in_range(&texture->src_blt_color_key, color)) color |= 0xff000000; *(DWORD *)dest = color; source += 3; @@ -3270,7 +3279,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; ++x) { DWORD color = *(const DWORD *)source; - if (color_in_range(&surface->container->src_blt_color_key, color)) + if (color_in_range(&texture->src_blt_color_key, color)) *(DWORD *)dest = color & ~0xff000000; else *(DWORD *)dest = color | 0xff000000; @@ -3288,7 +3297,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; ++x) { DWORD color = *(const DWORD *)source; - if (color_in_range(&surface->container->src_blt_color_key, color)) + if (color_in_range(&texture->src_blt_color_key, color)) color &= ~0xff000000; *(DWORD*)dest = color; source += 4;

1 0

Hans Leidekker : msi: Include the terminating null in the buffer size for decoded stream names.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: f41ac94e0e2469e520db759835dee68e6bce944e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f41ac94e0e2469e520db75983… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 2 12:17:34 2014 +0200 msi: Include the terminating null in the buffer size for decoded stream names. --- dlls/msi/database.c | 2 +- dlls/msi/streams.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index b734031..e5ed16e 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -131,7 +131,7 @@ UINT msi_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) { HRESULT r; IStorage *stg; - WCHAR decoded[MAX_STREAM_NAME_LEN]; + WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; decode_streamname( stname, decoded ); TRACE("%s -> %s\n", debugstr_w(stname), debugstr_w(decoded)); diff --git a/dlls/msi/streams.c b/dlls/msi/streams.c index a20f196..b91fe88 100644 --- a/dlls/msi/streams.c +++ b/dlls/msi/streams.c @@ -70,7 +70,7 @@ static BOOL streams_set_table_size(MSISTREAMSVIEW *sv, UINT size) static STREAM *create_stream(MSISTREAMSVIEW *sv, LPCWSTR name, BOOL encoded, IStream *stm) { STREAM *stream; - WCHAR decoded[MAX_STREAM_NAME_LEN]; + WCHAR decoded[MAX_STREAM_NAME_LEN + 1]; stream = msi_alloc(sizeof(STREAM)); if (!stream)

1 0

Henri Verbeet : wined3d: Introduce a separate function for WINED3D_CT_CK_B5G6R5.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: e377ad45fac4b35cb76e2917f763173a1c09a0b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e377ad45fac4b35cb76e2917f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 2 09:43:40 2014 +0200 wined3d: Introduce a separate function for WINED3D_CT_CK_B5G6R5. --- dlls/wined3d/surface.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0f13c9d..6b13dd0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3192,6 +3192,29 @@ static void convert_p8_uint_b8g8r8a8_unorm(const BYTE *src, unsigned int src_pit } } +static void convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsigned int src_pitch, + BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, + const struct wined3d_color_key *color_key) +{ + const WORD *src_row; + unsigned int x, y; + WORD *dst_row; + + for (y = 0; y < height; ++y) + { + src_row = (WORD *)&src[src_pitch * y]; + dst_row = (WORD *)&dst[dst_pitch * y]; + for (x = 0; x < width; ++x) + { + WORD src_color = src_row[x]; + if (!color_in_range(color_key, src_color)) + dst_row[x] = 0x8000 | ((src_color & 0xffc0) >> 1) | (src_color & 0x1f); + else + dst_row[x] = ((src_color & 0xffc0) >> 1) | (src_color & 0x1f); + } + } +} + static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { @@ -3215,21 +3238,8 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B5G6R5: - for (y = 0; y < height; ++y) - { - source = src + pitch * y; - dest = dst + outpitch * y; - for (x = 0; x < width; ++x) - { - WORD color = *(const WORD *)source; - if (!color_in_range(&texture->src_blt_color_key, color)) - *(WORD *)dest = 0x8000 | ((color & 0xffc0) >> 1) | (color & 0x1f); - else - *(WORD *)dest = ((color & 0xffc0) >> 1) | (color & 0x1f); - source += 2; - dest += 2; - } - } + convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(src, pitch, dst, outpitch, + width, height, &texture->src_blt_color_key); break; case WINED3D_CT_CK_B5G5R5X1:

1 0

Sebastian Lackner : shlwapi/tests: Add test for SHMapHandle.
by Alexandre Julliard Oct. 2, 2014

Oct. 2, 2014

Module: wine Branch: master Commit: ef065486dd851b390b64ba7eda884e74913bf8e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef065486dd851b390b64ba7ed… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Oct 2 14:40:54 2014 +0200 shlwapi/tests: Add test for SHMapHandle. --- dlls/shlwapi/tests/ordinal.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 64b07f3..7c7c4a0 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -46,6 +46,7 @@ static HANDLE (WINAPI *pSHAllocShared)(LPCVOID,DWORD,DWORD); static LPVOID (WINAPI *pSHLockShared)(HANDLE,DWORD); static BOOL (WINAPI *pSHUnlockShared)(LPVOID); static BOOL (WINAPI *pSHFreeShared)(HANDLE,DWORD); +static HANDLE (WINAPI *pSHMapHandle)(HANDLE,DWORD,DWORD,DWORD,DWORD); static HRESULT(WINAPIV *pSHPackDispParams)(DISPPARAMS*,VARIANTARG*,UINT,...); static HRESULT(WINAPI *pIConnectionPoint_SimpleInvoke)(IConnectionPoint*,DISPID,DISPPARAMS*); static HRESULT(WINAPI *pIConnectionPoint_InvokeWithCancel)(IConnectionPoint*,DISPID,DISPPARAMS*,DWORD,DWORD); @@ -519,8 +520,10 @@ static void test_alloc_shared(int argc, char **argv) static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) { struct shared_struct val, *p; + HANDLE hmem2; BOOL ret; + /* test directly accessing shared memory of a remote process */ p = pSHLockShared(hmem, procid); ok(p != NULL || broken(p == NULL) /* Windows 7/8 */, "SHLockShared failed: %u\n", GetLastError()); if (p == NULL) @@ -539,6 +542,35 @@ static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) ret = pSHUnlockShared(p); ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); + + /* test SHMapHandle */ + hmem2 = pSHMapHandle(hmem, procid, GetCurrentProcessId(), 0, 0); + + /* It seems like Windows Vista/2008 uses a different internal implementation + * for shared memory, and calling SHMapHandle fails with ERROR_INVALID_HANDLE. */ + todo_wine + ok(hmem2 != NULL || broken(hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE), + "SHMapHandle failed: %u\n", GetLastError()); + if (hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE) + { + skip("Subprocess failed to map shared memory, skipping test\n"); + return; + } + + p = pSHLockShared(hmem2, GetCurrentProcessId()); + todo_wine + ok(p != NULL, "SHLockShared failed: %u\n", GetLastError()); + + if (p != NULL) + ok(p->value == 0x12345679, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345679); + + ret = pSHUnlockShared(p); + todo_wine + ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); + + ret = pSHFreeShared(hmem2, GetCurrentProcessId()); + todo_wine + ok(ret, "SHFreeShared failed: %u\n", GetLastError()); } static void test_fdsa(void) @@ -3014,6 +3046,7 @@ static void init_pointers(void) MAKEFUNC(SHLockShared, 8); MAKEFUNC(SHUnlockShared, 9); MAKEFUNC(SHFreeShared, 10); + MAKEFUNC(SHMapHandle, 11); MAKEFUNC(GetAcceptLanguagesA, 14); MAKEFUNC(SHSetWindowBits, 165); MAKEFUNC(SHSetParentHwnd, 167);

1 0

André Hentschel : Fix typo in WWN 376
by Jeremy Newman Oct. 2, 2014

Oct. 2, 2014

Module: website Branch: master Commit: bf6418c402ead5fd3b9fe425545eecdc27577758 URL: http://source.winehq.org/git/website.git/?a=commit;h=bf6418c402ead5fd3b9fe4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 2 00:25:19 2014 +0200 Fix typo in WWN 376 --- wwn/en/wn20140930_376.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wwn/en/wn20140930_376.xml b/wwn/en/wn20140930_376.xml index 9dccc7f..20b123f 100644 --- a/wwn/en/wn20140930_376.xml +++ b/wwn/en/wn20140930_376.xml @@ -28,7 +28,7 @@ Its main goal is to inform you of what's going on around Wine. Wine is an open s posts="0" > <p> -As you might have seen in <a href="//www.winehq.org/wwn/375">WWN 375</a>, Kai Tietz and I are working on MinGW-w64 targeting ARMv7. +As you might have seen in <a href="//www.winehq.org/wwn/369">WWN 369</a>, Kai Tietz and I are working on MinGW-w64 targeting ARMv7. </p> <p> Meanwhile I finished porting the CRT, but after a hackathon last week, we found out that we ran into a chicken-egg situation. @@ -49,7 +49,7 @@ After that the work on libgcc can begin and then we need to get a lot of things > <p> Jacek Caban, who maintains the wine-gecko code, wrote to <a href="//www.winehq.org/pipermail/wine-devel/2014-September/105276.html">wine-devel</a> about an upcoming -wine-gecko version and why it took so long after the last release. +wine-gecko version and why it took so long after the last release. Happy testing! </p> </section>

1 0

Jacek Caban : mshtml: Don' t assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmloption.c.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 256204d876cc4588cb2d38896e3beb2e6b59ce1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=256204d876cc4588cb2d38896… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 11:23:37 2014 +0200 mshtml: Don't assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmloption.c. --- dlls/mshtml/htmloption.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index b5c8b7d..c960528 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -209,11 +209,11 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR while(1) { nsIDOMNode *child; - nsres = nsIDOMHTMLOptionElement_GetFirstChild(This->nsoption, &child); + nsres = nsIDOMHTMLElement_GetFirstChild(This->element.nselem, &child); if(NS_FAILED(nsres) || !child) break; - nsres = nsIDOMHTMLOptionElement_RemoveChild(This->nsoption, child, &tmp); + nsres = nsIDOMHTMLElement_RemoveChild(This->element.nselem, child, &tmp); nsIDOMNode_Release(child); if(NS_SUCCEEDED(nsres)) { nsIDOMNode_Release(tmp); @@ -231,7 +231,7 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR return E_FAIL; } - nsres = nsIDOMHTMLOptionElement_AppendChild(This->nsoption, (nsIDOMNode*)text_node, &tmp); + nsres = nsIDOMHTMLElement_AppendChild(This->element.nselem, (nsIDOMNode*)text_node, &tmp); if(NS_SUCCEEDED(nsres)) nsIDOMNode_Release(tmp); else

1 0

Jacek Caban : mshtml: Don' t assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmlinput.c.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: f30f506d22357818e5e8813275d083f2d9f102c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f30f506d22357818e5e881327… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 11:23:25 2014 +0200 mshtml: Don't assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmlinput.c. --- dlls/mshtml/htmlinput.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index e568f4b..4ce01b5 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -256,6 +256,7 @@ static HRESULT WINAPI HTMLInputElement_get_form(IHTMLInputElement *iface, IHTMLF { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); nsIDOMHTMLFormElement *nsform; + nsIDOMNode *form_node; HTMLDOMNode *node; HRESULT hres; nsresult nsres; @@ -269,8 +270,12 @@ static HRESULT WINAPI HTMLInputElement_get_form(IHTMLInputElement *iface, IHTMLF return E_FAIL; } - hres = get_node(This->element.node.doc, (nsIDOMNode*)nsform, TRUE, &node); + nsres = nsIDOMHTMLFormElement_QueryInterface(nsform, &IID_nsIDOMNode, (void**)&form_node); nsIDOMHTMLFormElement_Release(nsform); + assert(nsres == NS_OK); + + hres = get_node(This->element.node.doc, form_node, TRUE, &node); + nsIDOMNode_Release(form_node); if (FAILED(hres)) return hres; @@ -1233,7 +1238,7 @@ static HRESULT HTMLInputElementImpl_fire_event(HTMLDOMNode *iface, eventid_t eid *handled = TRUE; - nsres = nsIDOMHTMLInputElement_Click(This->nsinput); + nsres = nsIDOMHTMLElement_Click(This->element.nselem); if(NS_FAILED(nsres)) { ERR("Click failed: %08x\n", nsres); return E_FAIL;

1 0

Jacek Caban : jscript: Added tests for @if/@elif/@else/@end.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 68c61d17e0c5af5251d440efb0ee7c5292b598f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c61d17e0c5af5251d440efb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 10:45:21 2014 +0200 jscript: Added tests for @if/@elif/@else/@end. --- dlls/jscript/tests/cc.js | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index b96f21e..32f827e 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -140,9 +140,107 @@ ok(@test === false, "@test = " + @test); @set @test = (0 != true) ok(@test === true, "@test = " + @test); +(a)if (false) + this wouldn not parse +"@end + +(a)if (false) "@end + +tmp = "@if (false) @end"; +ok(tmp.length === 16, "tmp.length = " + tmp.length); + +(a)if(true) +tmp = true +(a)end +ok(tmp === true, "tmp = " + tmp); + +(a)if(false) +(a)if this would not CC parse +this will not parse +(a)elif(true) +this will also not parse +(a)else +this also will not parse +(a)if let me complicate things a bit +(a)end enough +(a)end +(a)end + +(a)if(false) +this will not parse +(a)else +tmp = 2 +(a)else +this will not be parsed +(a)else +also this +(a)end +ok(tmp === 2, "tmp = " + tmp); + +(a)if(true) +tmp = 3; +(a)else +just skip this +(a)end +ok(tmp === 3, "tmp = " + tmp); + +(a)if(true) +tmp = 4; +(a)elif(true) +this will not parse +(a)elif nor this +(a)else +just skip this +(a)end +ok(tmp === 4, "tmp = " + tmp); + +(a)if(false) +this will not parse +(a)elif(false) +nor this would +(a)elif(true) +tmp = 5; +(a)elif nor this +(a)else +just skip this +(a)end +ok(tmp === 5, "tmp = " + tmp); + +(a)if (!@_jscript) +this would not parse +(a)if(true) +(a)else +(a)if(false) +(a)end +(a)end +(a)elif (@_jscript) +tmp = 6; +(a)elif (true) +(a)if xxx +(a)else +(a)if @elif @elif @else @end +(a)end +(a)else +this would not parse +(a)end +ok(tmp === 6, "tmp = " + tmp); + +(a)if(true) +(a)if(false) +(a)else +tmp = 7; +(a)end +(a)else +this would not parse +(a)end +ok(tmp === 7, "tmp = " + tmp); + var exception_map = { + JS_E_SYNTAX: {type: "SyntaxError", number: -2146827286}, + JS_E_MISSING_LBRACKET: {type: "SyntaxError", number: -2146827283}, JS_E_EXPECTED_IDENTIFIER: {type: "SyntaxError", number: -2146827278}, JS_E_EXPECTED_ASSIGN: {type: "SyntaxError", number: -2146827277}, + JS_E_EXPECTED_CCEND: {type: "SyntaxError", number: -2146827259}, JS_E_EXPECTED_AT: {type: "SyntaxError", number: -2146827256} }; @@ -164,5 +262,11 @@ function testException(src, id) { testException("@set test=true", "JS_E_EXPECTED_AT"); testException("@set @1=true", "JS_E_EXPECTED_IDENTIFIER"); testException("@set @test x=true", "JS_E_EXPECTED_ASSIGN"); +testException("@if false\n(a)end", "JS_E_MISSING_LBRACKET"); +testException("@if (false)\n", "JS_E_EXPECTED_CCEND"); +testException("@end\n", "JS_E_SYNTAX"); +testException("@elif\n", "JS_E_SYNTAX"); +testException("@else\n", "JS_E_SYNTAX"); +testException("@if false\n(a)elif true\n(a)end", "JS_E_MISSING_LBRACKET"); reportSuccess();

1 0

Henri Verbeet : wined3d: Convert to WINED3DFMT_B5G5R5A1_UNORM for WINED3D_CT_CK_B5G6R5.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 02b031e61acf2738a772f5a2a82277e36851518a URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b031e61acf2738a772f5a2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 1 09:18:58 2014 +0200 wined3d: Convert to WINED3DFMT_B5G5R5A1_UNORM for WINED3D_CT_CK_B5G6R5. --- dlls/wined3d/surface.c | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b24504e..2ee3db1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1604,7 +1604,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp } color_key_info[] = { - {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, 2}, + {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_B5G5R5X1, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, @@ -3207,35 +3207,22 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B5G6R5: - { - /* Converting the 565 format in 5551 packed to emulate color-keying. - - Note : in all these conversion, it would be best to average the averaging - pixels to get the color of the pixel that will be color-keyed to - prevent 'color bleeding'. This will be done later on if ever it is - too visible. - - Note2: Nvidia documents say that their driver does not support alpha + color keying - on the same surface and disables color keying in such a case - */ - const WORD *Source; - WORD *Dest; - - TRACE("Color keyed 565\n"); - - for (y = 0; y < height; y++) { - Source = (const WORD *)(src + y * pitch); - Dest = (WORD *) (dst + y * outpitch); - for (x = 0; x < width; x++ ) { - WORD color = *Source++; - *Dest = ((color & 0xffc0) | ((color & 0x1f) << 1)); + for (y = 0; y < height; ++y) + { + source = src + pitch * y; + dest = dst + outpitch * y; + for (x = 0; x < width; ++x) + { + WORD color = *(const WORD *)source; if (!color_in_range(&surface->container->src_blt_color_key, color)) - *Dest |= 0x0001; - Dest++; + *(WORD *)dest = 0x8000 | ((color & 0xffc0) >> 1) | (color & 0x1f); + else + *(WORD *)dest = ((color & 0xffc0) >> 1) | (color & 0x1f); + source += 2; + dest += 2; } } - } - break; + break; case WINED3D_CT_CK_B5G5R5X1: {

1 0

Henri Verbeet : wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_P8.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 6f8cb77ea968ebd671fae17bddccf939b995bd3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8cb77ea968ebd671fae17bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 1 09:18:57 2014 +0200 wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_P8. --- dlls/wined3d/surface.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6672525..b24504e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1638,9 +1638,9 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp && texture == texture->swapchain->front_buffer)) || colorkey_active) { *conversion_type = WINED3D_CT_P8; - format->glInternal = GL_RGBA; - format->glFormat = GL_RGBA; - format->glType = GL_UNSIGNED_BYTE; + format->glInternal = GL_RGBA8; + format->glFormat = GL_BGRA; + format->glType = GL_UNSIGNED_INT_8_8_8_8_REV; format->conv_byte_count = 4; } } @@ -3180,9 +3180,9 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++) { BYTE color = *source++; - *dest++ = palette->colors[color].rgbRed; - *dest++ = palette->colors[color].rgbGreen; *dest++ = palette->colors[color].rgbBlue; + *dest++ = palette->colors[color].rgbGreen; + *dest++ = palette->colors[color].rgbRed; *dest++ = 0; } }

1 0

Henri Verbeet : wined3d: Fix the pitch handling in the no-palette WINED3D_CT_P8 case.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 632d2fca6e27b4498002f98c88add9559e3abed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=632d2fca6e27b4498002f98c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 1 09:18:56 2014 +0200 wined3d: Fix the pitch handling in the no-palette WINED3D_CT_P8 case. --- dlls/wined3d/surface.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 272b5de..6672525 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3161,6 +3161,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI UINT outpitch, enum wined3d_conversion_type conversion_type, struct wined3d_surface *surface) { const BYTE *source; + unsigned int x, y; BYTE *dest; TRACE("src %p, dst %p, pitch %u, width %u, height %u, outpitch %u, conversion_type %#x, surface %p.\n", @@ -3171,7 +3172,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI case WINED3D_CT_P8: if (surface->container->swapchain && surface->container->swapchain->palette) { - unsigned int x, y; const struct wined3d_palette *palette = surface->container->swapchain->palette; for (y = 0; y < height; y++) { @@ -3199,9 +3199,11 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI * starting and we don't want the screen to flash in an ugly * color. */ FIXME("P8 surface loaded without a palette.\n"); - memset(dst, 0, height * outpitch); + for (y = 0; y < height; ++y) + { + memset(&dst[outpitch * y], 0, width * 4); + } } - break; case WINED3D_CT_CK_B5G6R5: @@ -3216,7 +3218,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI Note2: Nvidia documents say that their driver does not support alpha + color keying on the same surface and disables color keying in such a case */ - unsigned int x, y; const WORD *Source; WORD *Dest; @@ -3239,7 +3240,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI case WINED3D_CT_CK_B5G5R5X1: { /* Converting X1R5G5B5 format to R5G5B5A1 to emulate color-keying. */ - unsigned int x, y; const WORD *Source; WORD *Dest; TRACE("Color keyed 5551\n"); @@ -3260,9 +3260,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8: - { /* Converting R8G8B8 format to R8G8B8A8 with color-keying. */ - unsigned int x, y; for (y = 0; y < height; y++) { source = src + pitch * y; @@ -3277,13 +3275,10 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI dest += 4; } } - } - break; + break; case WINED3D_CT_CK_B8G8R8X8: - { /* Converting X8R8G8B8 format to R8G8B8A8 with color-keying. */ - unsigned int x, y; for (y = 0; y < height; y++) { source = src + pitch * y; @@ -3298,12 +3293,9 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI dest += 4; } } - } - break; + break; case WINED3D_CT_CK_B8G8R8A8: - { - unsigned int x, y; for (y = 0; y < height; ++y) { source = src + pitch * y; @@ -3318,8 +3310,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI dest += 4; } } - } - break; + break; default: ERR("Unsupported conversion type %#x.\n", conversion_type);

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 9e312d34f13fb8e7da220824f384c54aaac34b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e312d34f13fb8e7da220824f… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Oct 1 17:22:21 2014 +0300 po: Update Finnish translation. --- po/fi.po | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/po/fi.po b/po/fi.po index 01c6443..88fd213 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3534,16 +3534,12 @@ msgid "Expected ')'" msgstr "Odotettiin merkkiä ')'" #: jscript.rc:40 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "Haltijan avaimen tunniste" +msgstr "Odotettiin tunnistetta" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "Odotettiin merkkiä ';'" +msgstr "Odotettiin merkkiä '='" #: jscript.rc:42 msgid "Invalid character" @@ -3574,20 +3570,16 @@ msgid "Label not found" msgstr "Nimiötä ei löydy" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "Odotettiin merkkiä ';'" +msgstr "Odotettiin sanaa '@end'" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "Ehdollinen kääntäminen on pois käytöstä" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "Odotettiin merkkiä ';'" +msgstr "Odotettiin merkkiä '@'" #: jscript.rc:54 msgid "Number expected"

1 0

Nikolay Sivov : dwrite: Implement AnalyzeBidi().
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: fdd8454ef8fe41a1e695f8b9640d8b3f77a8e6da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd8454ef8fe41a1e695f8b96… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 30 09:56:39 2014 +0400 dwrite: Implement AnalyzeBidi(). --- dlls/dwrite/Makefile.in | 2 + dlls/dwrite/analyzer.c | 83 +++- dlls/dwrite/bidi.c | 1130 ++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/bracket.c | 106 ++++ dlls/dwrite/dwrite_private.h | 7 + tools/make_unicode | 1 + 6 files changed, 1322 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdd8454ef8fe41a1e695f…

1 0

Jacek Caban : mshtml: Don' t assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmlscript.c.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: b2c65c296f3664c78eba9665fd731c9f4c3d76ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2c65c296f3664c78eba9665f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 11:23:47 2014 +0200 mshtml: Don't assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmlscript.c. --- dlls/mshtml/htmlscript.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index dcab32f..1a61398 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -136,7 +136,7 @@ static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR return S_OK; } - nsres = nsIDOMHTMLScriptElement_GetParentNode(This->nsscript, &parent); + nsres = nsIDOMHTMLElement_GetParentNode(This->element.nselem, &parent); if(NS_FAILED(nsres) || !parent) { TRACE("No parent, not executing\n"); This->parse_on_bind = TRUE; @@ -214,7 +214,7 @@ static HRESULT WINAPI HTMLScriptElement_put_text(IHTMLScriptElement *iface, BSTR return E_FAIL; } - nsres = nsIDOMHTMLScriptElement_GetParentNode(This->nsscript, &parent); + nsres = nsIDOMHTMLElement_GetParentNode(This->element.nselem, &parent); if(NS_FAILED(nsres) || !parent) { TRACE("No parent, not executing\n"); This->parse_on_bind = TRUE; @@ -433,10 +433,16 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { HRESULT script_elem_from_nsscript(HTMLDocumentNode *doc, nsIDOMHTMLScriptElement *nsscript, HTMLScriptElement **ret) { + nsIDOMNode *nsnode; HTMLDOMNode *node; + nsresult nsres; HRESULT hres; - hres = get_node(doc, (nsIDOMNode*)nsscript, TRUE, &node); + nsres = nsIDOMHTMLScriptElement_QueryInterface(nsscript, &IID_nsIDOMNode, (void**)&nsnode); + assert(nsres == NS_OK); + + hres = get_node(doc, nsnode, TRUE, &node); + nsIDOMNode_Release(nsnode); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Implicitly turn CC on for @if instruction.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: fcd9817581533a29b540546e9a08e593087740bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd9817581533a29b540546e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 10:45:37 2014 +0200 jscript: Implicitly turn CC on for @if instruction. --- dlls/jscript/lex.c | 3 +++ dlls/jscript/tests/run.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index e541182..b4a3700 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -1051,6 +1051,9 @@ static int cc_token(parser_ctx_t *ctx, void *lval) } if(!check_keyword(ctx, ifW, NULL)) { + if(!init_cc(ctx)) + return -1; + if(!skip_spaces(ctx) || *ctx->ptr != '(') return lex_error(ctx, JS_E_MISSING_LBRACKET); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 42336a4..aa1783e 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2185,6 +2185,12 @@ static BOOL run_tests(void) parse_script_a("@set @t=2\nok(@t === 2, '@t = ' + @t);"); + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_script_a("@if(true)\nif(@_jscript) reportSuccess();\n(a)end"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Jacek Caban : jscript: Implicitly turn CC on for @set instruction.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 8b3638879795465395a27dc9ccfcfdf39acab3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3638879795465395a27dc9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 10:45:30 2014 +0200 jscript: Implicitly turn CC on for @set instruction. --- dlls/jscript/lex.c | 20 +++++++++++++------- dlls/jscript/tests/run.c | 2 ++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 3daaf47..e541182 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -852,7 +852,7 @@ static cc_var_t *find_cc_var(cc_ctx_t *cc, const WCHAR *name, unsigned name_len) return NULL; } -static int init_cc(parser_ctx_t *ctx) +static BOOL init_cc(parser_ctx_t *ctx) { cc_ctx_t *cc; @@ -865,11 +865,13 @@ static int init_cc(parser_ctx_t *ctx) static const WCHAR _jscript_versionW[] = {'_','j','s','c','r','i','p','t','_','v','e','r','s','i','o','n',0}; if(ctx->script->cc) - return 0; + return TRUE; cc = heap_alloc(sizeof(cc_ctx_t)); - if(!cc) - return lex_error(ctx, E_OUTOFMEMORY); + if(!cc) { + lex_error(ctx, E_OUTOFMEMORY); + return FALSE; + } cc->vars = NULL; @@ -879,11 +881,12 @@ static int init_cc(parser_ctx_t *ctx) || !new_cc_var(cc, _jscript_versionW, -1, ccval_num(JSCRIPT_MAJOR_VERSION + (DOUBLE)JSCRIPT_MINOR_VERSION/10.0)) || !new_cc_var(cc, _jscript_buildW, -1, ccval_num(JSCRIPT_BUILD_VERSION))) { release_cc(cc); - return lex_error(ctx, E_OUTOFMEMORY); + lex_error(ctx, E_OUTOFMEMORY); + return FALSE; } ctx->script->cc = cc; - return 0; + return TRUE; } static BOOL parse_cc_identifier(parser_ctx_t *ctx, const WCHAR **ret, unsigned *ret_len) @@ -1011,13 +1014,16 @@ static int cc_token(parser_ctx_t *ctx, void *lval) ctx->ptr++; if(!check_keyword(ctx, cc_onW, NULL)) - return init_cc(ctx); + return init_cc(ctx) ? 0 : -1; if(!check_keyword(ctx, setW, NULL)) { const WCHAR *ident; unsigned ident_len; cc_var_t *var; + if(!init_cc(ctx)) + return -1; + if(!skip_spaces(ctx)) return lex_error(ctx, JS_E_EXPECTED_AT); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index b8edd7d..42336a4 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2183,6 +2183,8 @@ static BOOL run_tests(void) CHECK_CALLED(testobj_withprop_d); CHECK_CALLED(testobj_withprop_i); + parse_script_a("@set @t=2\nok(@t === 2, '@t = ' + @t);"); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Henri Verbeet : wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_CK_B8G8R8.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 7579a96ac1bb91db154ae3b4cadfc6f232a35856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7579a96ac1bb91db154ae3b4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 1 09:18:59 2014 +0200 wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_CK_B8G8R8. --- dlls/wined3d/surface.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2ee3db1..73b872f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1606,7 +1606,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp { {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_B5G5R5X1, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, - {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, + {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_B8G8R8A8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, }; @@ -3247,17 +3247,16 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8: - /* Converting R8G8B8 format to R8G8B8A8 with color-keying. */ - for (y = 0; y < height; y++) + for (y = 0; y < height; ++y) { source = src + pitch * y; dest = dst + outpitch * y; - for (x = 0; x < width; x++) { - DWORD color = ((DWORD)source[0] << 16) + ((DWORD)source[1] << 8) + (DWORD)source[2] ; - DWORD dstcolor = color << 8; + for (x = 0; x < width; ++x) + { + DWORD color = ((DWORD)source[2] << 16) | ((DWORD)source[1] << 8) | (DWORD)source[0]; if (!color_in_range(&surface->container->src_blt_color_key, color)) - dstcolor |= 0xff; - *(DWORD*)dest = dstcolor; + color |= 0xff000000; + *(DWORD *)dest = color; source += 3; dest += 4; }

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: fcf4f1c697f775679b09ef19d69c575fa98d7b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf4f1c697f775679b09ef19d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 1 07:47:09 2014 +0400 po: Update Russian translation. --- po/ru.po | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/po/ru.po b/po/ru.po index 818c087..2edc019 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3546,16 +3546,12 @@ msgid "Expected ')'" msgstr "Ожидается «)»" #: jscript.rc:40 -#, fuzzy -#| msgid "Subject Key Identifier" msgid "Expected identifier" -msgstr "Идентификатор ключа субъекта" +msgstr "Ожидается идентификатор" #: jscript.rc:41 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '='" -msgstr "Ожидается «;»" +msgstr "Ожидается «=»" #: jscript.rc:42 msgid "Invalid character" @@ -3586,20 +3582,16 @@ msgid "Label not found" msgstr "Метка не найдена" #: jscript.rc:49 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@end'" -msgstr "Ожидается «;»" +msgstr "Ожидается «@end»" #: jscript.rc:50 msgid "Conditional compilation is turned off" msgstr "Условная компиляция отключена" #: jscript.rc:51 -#, fuzzy -#| msgid "Expected ';'" msgid "Expected '@'" -msgstr "Ожидается «;»" +msgstr "Ожидается «@»" #: jscript.rc:54 msgid "Number expected"

1 0

Alexandre Julliard : kernel32/tests: Fix overlapped status checks for 64-bit.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 5afbb6ba9e958ca21d03093165a85884827fe748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5afbb6ba9e958ca21d0309316… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 1 21:14:24 2014 +0200 kernel32/tests: Fix overlapped status checks for 64-bit. --- dlls/kernel32/tests/change.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 9226950..ad22f18 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -472,7 +472,7 @@ static void test_readdirectorychanges(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer; @@ -502,7 +502,7 @@ static void test_readdirectorychanges(void) r = pReadDirectoryChangesW(hdir,buffer,sizeof buffer,FALSE,filter,NULL,&ov,NULL); ok(r==TRUE, "should return true\n"); - ok( ov.Internal == STATUS_PENDING, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_PENDING, "ov.Internal wrong\n"); ok( ov.InternalHigh == 1, "ov.InternalHigh wrong\n"); r = WaitForSingleObject( ov.hEvent, 0 ); @@ -514,10 +514,10 @@ static void test_readdirectorychanges(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n"); - if (ov.Internal == STATUS_SUCCESS) + if ((NTSTATUS)ov.Internal == STATUS_SUCCESS) { r = GetOverlappedResult( hdir, &ov, &dwCount, TRUE ); ok( r == TRUE, "getoverlappedresult failed\n"); @@ -540,7 +540,7 @@ static void test_readdirectorychanges(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n"); /* test the recursive watch */ @@ -553,7 +553,7 @@ static void test_readdirectorychanges(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0x18, "ov.InternalHigh wrong\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer; @@ -589,7 +589,7 @@ static void test_readdirectorychanges(void) ok( pfni->FileNameLength == 6*sizeof(WCHAR), "len wrong %u\n", pfni->FileNameLength ); ok( !memcmp(pfni->FileName,&szGa[1],6*sizeof(WCHAR)), "name wrong\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); dwCount = (char *)&pfni->FileName[pfni->FileNameLength/sizeof(WCHAR)] - buffer; ok( ov.InternalHigh == dwCount, "ov.InternalHigh wrong %lu/%u\n",ov.InternalHigh, dwCount ); @@ -666,7 +666,7 @@ static void test_readdirectorychanges_null(void) r = WaitForSingleObject( ov.hEvent, 0 ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); - ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n"); ov.Internal = 0; @@ -687,7 +687,7 @@ static void test_readdirectorychanges_null(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n" ); - ok( ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_NOTIFY_ENUM_DIR, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0, "ov.InternalHigh wrong\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer; @@ -763,7 +763,7 @@ static void test_readdirectorychanges_filedir(void) r = WaitForSingleObject( ov.hEvent, 1000 ); ok( r == WAIT_OBJECT_0, "event should be ready\n" ); - ok( ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); + ok( (NTSTATUS)ov.Internal == STATUS_SUCCESS, "ov.Internal wrong\n"); ok( ov.InternalHigh == 0x12, "ov.InternalHigh wrong\n"); pfni = (PFILE_NOTIFY_INFORMATION) buffer;

1 0

Nikolay Sivov : usp10: Remove comment that's no longer true.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 5281bff120fa377703948945201dc63bb97392b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5281bff120fa3777039489452… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 1 18:34:44 2014 +0400 usp10: Remove comment that's no longer true. --- dlls/usp10/usp10.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 8769bd9..6aa6b3e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3407,10 +3407,6 @@ HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, AB * Success: S_OK * Failure: Non-zero HRESULT value. * - * BUGS - * This stub works correctly for any sequence of a single - * embedding level but not for sequences of different - * embedding levels, i.e. mixtures of RTL and LTR scripts. */ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *logtovis) {

1 0

Shuai Meng : vbscript: Implemented RGB.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 0480bbfb343e5fce6004366e85a0ab5269ad0fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0480bbfb343e5fce6004366e8… Author: Shuai Meng <mengshuaicalendr(a)gmail.com> Date: Tue Sep 30 18:31:08 2014 +0800 vbscript: Implemented RGB. --- dlls/vbscript/global.c | 20 ++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 22 ++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 2901623..93fdcc3 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -778,8 +778,24 @@ static HRESULT Global_UBound(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA static HRESULT Global_RGB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + int i, color[3]; + + TRACE("%s %s %s\n", debugstr_variant(arg), debugstr_variant(arg + 1), debugstr_variant(arg + 2)); + + assert(args_cnt == 3); + + for(i = 0; i < 3; i++) { + hres = to_int(arg + i, color + i); + if(FAILED(hres)) + return hres; + if(color[i] > 255) + color[i] = 255; + if(color[i] < 0) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + } + + return return_int(res, RGB(color[0], color[1], color[2])); } static HRESULT Global_Len(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 9e64412..e2efa98 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1242,4 +1242,26 @@ Call ok(getVT(Log(CByte(2))) = "VT_R8", "getVT(Log(CByte(2))) = " & getVT(Log(CB Call ok(getVT(Date) = "VT_DATE", "getVT(Date) = " & getVT(Date)) Call ok(getVT(Time) = "VT_DATE", "getVT(Time) = " & getVT(Time)) +Sub testRGBError(arg1, arg2, arg3, error_num) + on error resume next + Dim x + + Call Err.clear() + x = RGB(arg1, arg2, arg3) + Call ok(Err.number = error_num, "Err.number1 = " & Err.number) + + Call Err.clear() + Call RGB(arg1, arg2, arg3) + Call ok(Err.number = error_num, "Err.number2 = " & Err.number) +End Sub + +Call ok(RGB(0, &h1f&, &hf1&) = &hf11f00&, "RGB(0, &h1f&, &hf1&) = " & RGB(0, &h1f&, &hf1&)) +Call ok(getVT(RGB(0, &h1f&, &hf1&)) = "VT_I4", "getVT(RGB(&hf1&, &h1f&, &hf1&)) = " & getVT(RGB(&hf1&, &h1f&, &hf1&))) +Call ok(RGB(&hef&, &hab&, &hcd&) = &hcdabef&, "RGB(&hef&, &hab&, &hcd&) = " & RGB(&hef&, &hab&, &hcd&)) +Call ok(getVT(RGB(&hef&, &hab&, &hcd&)) = "VT_I4", "getVT(RGB(&hef&, &hab&, &hcd&)) = " & getVT(RGB(&hef&, &hab&, &hcd&))) +Call ok(RGB(&h1&, &h100&, &h111&) = &hffff01&, "RGB(&h1&, &h100&, &h111&) = " & RGB(&h1&, &h100&, &h111&)) +Call ok(getVT(RGB(&h1&, &h100&, &h111&)) = "VT_I4", "getVT(RGB(&h1&, &h100&, &h111&)) = " & getVT(RGB(&h1&, &h100&, &h111&))) +Call testRGBError(-1, &h1e&, &h3b&, 5) +Call testRGBError(&h4d&, -2, &h2f&, 5) + Call reportSuccess()

1 0

Jacek Caban : jscript: Added support for '-' CC expression.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 9b41bb0345a98d23778c91da692a5a0e97cecfc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b41bb0345a98d23778c91da6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 10:45:44 2014 +0200 jscript: Added support for '-' CC expression. --- dlls/jscript/cc_parser.y | 3 +++ dlls/jscript/tests/cc.js | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index 83d8b4e..d25022b 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -66,6 +66,7 @@ static int cc_parser_lex(void *lval, parser_ctx_t *ctx) case '(': case ')': case '+': + case '-': case '*': case '/': return *ctx->ptr++; @@ -105,6 +106,8 @@ CCAdditiveExpression : CCMultiplicativeExpression { $$ = $1; } | CCAdditiveExpression '+' CCMultiplicativeExpression { $$ = ccval_num(get_ccnum($1) + get_ccnum($3)); } + | CCAdditiveExpression '-' CCMultiplicativeExpression + { $$ = ccval_num(get_ccnum($1) - get_ccnum($3)); } CCMultiplicativeExpression : CCUnaryExpression { $$ = $1; } diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index 32f827e..7ce3682 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -140,6 +140,12 @@ ok(@test === false, "@test = " + @test); @set @test = (0 != true) ok(@test === true, "@test = " + @test); +(a)set @test = (true-2) +ok(@test === -1, "@test = " + @test); + +(a)set @test = (true-(a)_jscript) +ok(@test === 0, "@test = " + @test); + @if (false) this wouldn not parse "@end

1 0

Jacek Caban : jscript: Added support for conditional compilation @if/@elif /@else/@end.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: afba44d3244f93effbd48ecc93358f897ec713ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=afba44d3244f93effbd48ecc9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 10:45:12 2014 +0200 jscript: Added support for conditional compilation @if/@elif/@else/@end. --- dlls/jscript/lex.c | 93 ++++++++++++++++++++++++++++++++++++++++++++------- dlls/jscript/parser.h | 1 + 2 files changed, 81 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 357b905..3daaf47 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -63,6 +63,9 @@ static const WCHAR voidW[] = {'v','o','i','d',0}; static const WCHAR whileW[] = {'w','h','i','l','e',0}; static const WCHAR withW[] = {'w','i','t','h',0}; +static const WCHAR elifW[] = {'e','l','i','f',0}; +static const WCHAR endW[] = {'e','n','d',0}; + static const struct { const WCHAR *word; int token; @@ -942,6 +945,61 @@ int try_parse_ccval(parser_ctx_t *ctx, ccval_t *r) return 0; } +static int skip_code(parser_ctx_t *ctx, BOOL exec_else) +{ + int if_depth = 1; + const WCHAR *ptr; + + while(1) { + ptr = strchrW(ctx->ptr, '@'); + if(!ptr) { + WARN("No @end\n"); + return lex_error(ctx, JS_E_EXPECTED_CCEND); + } + ctx->ptr = ptr+1; + + if(!check_keyword(ctx, endW, NULL)) { + if(--if_depth) + continue; + return 0; + } + + if(exec_else && !check_keyword(ctx, elifW, NULL)) { + if(if_depth > 1) + continue; + + if(!skip_spaces(ctx) || *ctx->ptr != '(') + return lex_error(ctx, JS_E_MISSING_LBRACKET); + + if(!parse_cc_expr(ctx)) + return -1; + + if(!get_ccbool(ctx->ccval)) + continue; /* skip block of code */ + + /* continue parsing */ + ctx->cc_if_depth++; + return 0; + } + + if(exec_else && !check_keyword(ctx, elseW, NULL)) { + if(if_depth > 1) + continue; + + /* parse else block */ + ctx->cc_if_depth++; + return 0; + } + + if(!check_keyword(ctx, ifW, NULL)) { + if_depth++; + continue; + } + + ctx->ptr++; + } +} + static int cc_token(parser_ctx_t *ctx, void *lval) { unsigned id_len = 0; @@ -949,8 +1007,6 @@ static int cc_token(parser_ctx_t *ctx, void *lval) static const WCHAR cc_onW[] = {'c','c','_','o','n',0}; static const WCHAR setW[] = {'s','e','t',0}; - static const WCHAR elifW[] = {'e','l','i','f',0}; - static const WCHAR endW[] = {'e','n','d',0}; ctx->ptr++; @@ -989,23 +1045,34 @@ static int cc_token(parser_ctx_t *ctx, void *lval) } if(!check_keyword(ctx, ifW, NULL)) { - FIXME("@if not implemented\n"); - return lex_error(ctx, E_NOTIMPL); - } + if(!skip_spaces(ctx) || *ctx->ptr != '(') + return lex_error(ctx, JS_E_MISSING_LBRACKET); - if(!check_keyword(ctx, elifW, NULL)) { - FIXME("@elif not implemented\n"); - return lex_error(ctx, E_NOTIMPL); + if(!parse_cc_expr(ctx)) + return -1; + + if(get_ccbool(ctx->ccval)) { + /* continue parsing block inside if */ + ctx->cc_if_depth++; + return 0; + } + + return skip_code(ctx, TRUE); } - if(!check_keyword(ctx, elseW, NULL)) { - FIXME("@else not implemented\n"); - return lex_error(ctx, E_NOTIMPL); + if(!check_keyword(ctx, elifW, NULL) || !check_keyword(ctx, elseW, NULL)) { + if(!ctx->cc_if_depth) + return lex_error(ctx, JS_E_SYNTAX); + + return skip_code(ctx, FALSE); } if(!check_keyword(ctx, endW, NULL)) { - FIXME("@end not implemented\n"); - return lex_error(ctx, E_NOTIMPL); + if(!ctx->cc_if_depth) + return lex_error(ctx, JS_E_SYNTAX); + + ctx->cc_if_depth--; + return 0; } if(!ctx->script->cc) diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index cb4e9c4..ab5744a 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -42,6 +42,7 @@ typedef struct _parser_ctx_t { HRESULT hres; ccval_t ccval; + unsigned cc_if_depth; heap_pool_t heap; } parser_ctx_t;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3D_CT_NONE case in d3dfmt_convert_surface().
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: c5d917777a564219d455224f6234dcaae8b4df1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d917777a564219d455224f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 1 09:18:55 2014 +0200 wined3d: Get rid of the WINED3D_CT_NONE case in d3dfmt_convert_surface(). This is never used. --- dlls/wined3d/surface.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index acf3f46..272b5de 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3168,12 +3168,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI switch (conversion_type) { - case WINED3D_CT_NONE: - { - memcpy(dst, src, pitch * height); - break; - } - case WINED3D_CT_P8: if (surface->container->swapchain && surface->container->swapchain->palette) {

1 0

Joris van der Wel : server: A new function "set_sd_defaults_from_token".
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 6d19aa83bf2f302f7a658f48cb326e167b48c645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d19aa83bf2f302f7a658f48c… Author: Joris van der Wel <joris(a)jorisvanderwel.com> Date: Wed Sep 17 15:35:26 2014 +0200 server: A new function "set_sd_defaults_from_token". --- server/object.c | 25 ++++++++++++++++--------- server/object.h | 2 ++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/server/object.c b/server/object.c index 11ef0ce..ec196c1 100644 --- a/server/object.c +++ b/server/object.c @@ -423,12 +423,12 @@ struct security_descriptor *default_get_sd( struct object *obj ) return obj->sd; } -int default_set_sd( struct object *obj, const struct security_descriptor *sd, - unsigned int set_info ) +int set_sd_defaults_from_token( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info, struct token *token ) { struct security_descriptor new_sd, *new_sd_ptr; int present; - const SID *owner, *group; + const SID *owner = NULL, *group = NULL; const ACL *sacl, *dacl; char *ptr; @@ -446,9 +446,9 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, owner = sd_get_owner( obj->sd ); new_sd.owner_len = obj->sd->owner_len; } - else + else if (token) { - owner = token_get_user( current->process->token ); + owner = token_get_user( token ); new_sd.owner_len = security_sid_len( owner ); } @@ -462,9 +462,9 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, group = sd_get_group( obj->sd ); new_sd.group_len = obj->sd->group_len; } - else + else if (token) { - group = token_get_primary_group( current->process->token ); + group = token_get_primary_group( token ); new_sd.group_len = security_sid_len( group ); } @@ -494,9 +494,9 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, if (obj->sd && present) new_sd.dacl_len = obj->sd->dacl_len; - else + else if (token) { - dacl = token_get_default_dacl( current->process->token ); + dacl = token_get_default_dacl( token ); new_sd.dacl_len = dacl->AclSize; } } @@ -521,6 +521,13 @@ int default_set_sd( struct object *obj, const struct security_descriptor *sd, return 1; } +/** Set the security descriptor using the current primary token for defaults. */ +int default_set_sd( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info ) +{ + return set_sd_defaults_from_token( obj, sd, set_info, current->process->token ); +} + struct object *no_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) { diff --git a/server/object.h b/server/object.h index bb3ff21..dd93b76e 100644 --- a/server/object.h +++ b/server/object.h @@ -139,6 +139,8 @@ extern struct fd *no_get_fd( struct object *obj ); extern unsigned int no_map_access( struct object *obj, unsigned int access ); extern struct security_descriptor *default_get_sd( struct object *obj ); extern int default_set_sd( struct object *obj, const struct security_descriptor *sd, unsigned int set_info ); +extern int set_sd_defaults_from_token( struct object *obj, const struct security_descriptor *sd, + unsigned int set_info, struct token *token ); extern struct object *no_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attributes ); extern struct object *no_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options );

1 0

Sebastian Lackner : shlwapi: Fixed swapped argument order in SHLWAPI_DupSharedHandle command.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: 5e4f15db1f8cf6de4a6ef8ad0aa073b9488293d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4f15db1f8cf6de4a6ef8ad0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 1 02:39:49 2014 +0200 shlwapi: Fixed swapped argument order in SHLWAPI_DupSharedHandle command. --- dlls/shlwapi/ordinal.c | 6 +++--- dlls/shlwapi/tests/ordinal.c | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 303c63a..e5da1cf 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -106,7 +106,7 @@ static HANDLE SHLWAPI_DupSharedHandle(HANDLE hShared, DWORD dwDstProcId, if (hSrc) { /* Make handle available to dest process */ - if (!DuplicateHandle(hDst, hShared, hSrc, &hRet, + if (!DuplicateHandle(hSrc, hShared, hDst, &hRet, dwAccess, 0, dwOptions | DUPLICATE_SAME_ACCESS)) hRet = NULL; @@ -201,7 +201,7 @@ PVOID WINAPI SHLockShared(HANDLE hShared, DWORD dwProcId) TRACE("(%p %d)\n", hShared, dwProcId); /* Get handle to shared memory for current process */ - hDup = SHLWAPI_DupSharedHandle(hShared, dwProcId, GetCurrentProcessId(), + hDup = SHLWAPI_DupSharedHandle(hShared, GetCurrentProcessId(), dwProcId, FILE_MAP_ALL_ACCESS, 0); /* Get View */ pMapped = MapViewOfFile(hDup, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 0); @@ -252,7 +252,7 @@ BOOL WINAPI SHFreeShared(HANDLE hShared, DWORD dwProcId) TRACE("(%p %d)\n", hShared, dwProcId); /* Get a copy of the handle for our process, closing the source handle */ - hClose = SHLWAPI_DupSharedHandle(hShared, dwProcId, GetCurrentProcessId(), + hClose = SHLWAPI_DupSharedHandle(hShared, GetCurrentProcessId(), dwProcId, FILE_MAP_ALL_ACCESS,DUPLICATE_CLOSE_SOURCE); /* Close local copy */ return CloseHandle(hClose); diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 481a771..64b07f3 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -505,16 +505,13 @@ static void test_alloc_shared(int argc, char **argv) if (hmem2) { p = pSHLockShared(hmem2, procid); - todo_wine ok(p != NULL,"SHLockShared failed: %u\n", GetLastError()); if (p != NULL) ok(p->value == 0xDEADBEEF, "Wrong value in shared memory: %d instead of %d\n", p->value, 0xDEADBEEF); ret = pSHUnlockShared(p); - todo_wine ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); ret = pSHFreeShared(hmem2, procid); - todo_wine ok(ret, "SHFreeShared failed: %u\n", GetLastError()); } }

1 0

Sebastian Lackner : msvcp110: Export ? _BADOFF@std@@3_JB on both i386 and win64.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: a95a50925b7d7ebfe88f8d57d326b75565e74305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a95a50925b7d7ebfe88f8d57d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Sep 29 00:21:28 2014 +0200 msvcp110: Export ?_BADOFF(a)std@@3_JB on both i386 and win64. --- dlls/msvcp110/msvcp110.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 593976e..6d3118a 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1148,7 +1148,7 @@ @ stub -arch=i386 ?_Assign(a)_Concurrent_queue_iterator_base_v4@details(a)Concurrency@@IAEXABV123@@Z @ stub -arch=win64 ?_Assign(a)_Concurrent_queue_iterator_base_v4@details(a)Concurrency@@IEAAXAEBV123@@Z @ stub ?_Atexit@@YAXP6AXXZ(a)Z -@ extern -arch=win64 ?_BADOFF(a)std@@3_JB std_BADOFF +@ extern ?_BADOFF(a)std@@3_JB std_BADOFF @ stub ?_Byte_reverse_table(a)details@Concurrency@@3QBEB @ cdecl -arch=arm ?_C_str@?$_Yarn(a)D@std@@QBAPBDXZ(ptr) _Yarn_char_c_str @ thiscall -arch=i386 ?_C_str@?$_Yarn(a)D@std@@QBEPBDXZ(ptr) _Yarn_char_c_str

1 0

Sebastian Lackner : shlwapi/tests: Add SH*Shared inter-process tests.
by Alexandre Julliard Oct. 1, 2014

Oct. 1, 2014

Module: wine Branch: master Commit: cad3e3e5dcd65a946a1234d7645f797628d94409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad3e3e5dcd65a946a1234d76… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 1 02:36:47 2014 +0200 shlwapi/tests: Add SH*Shared inter-process tests. --- dlls/shlwapi/tests/ordinal.c | 101 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 93 insertions(+), 8 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index cb90d31..481a771 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -444,12 +444,20 @@ static void test_SHSearchMapInt(void) ok(i == values[0], "Len 3, expected %d, got %d\n", values[0], i); } -static void test_alloc_shared(void) +struct shared_struct { + DWORD value; + HANDLE handle; +}; + +static void test_alloc_shared(int argc, char **argv) +{ + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; DWORD procid; - HANDLE hmem; - int val; - int* p; + HANDLE hmem, hmem2 = 0; + struct shared_struct val, *p; BOOL ret; procid=GetCurrentProcessId(); @@ -458,19 +466,82 @@ static void test_alloc_shared(void) ret = pSHFreeShared(hmem, procid); ok( ret, "SHFreeShared failed: %u\n", GetLastError()); - val=0x12345678; - hmem=pSHAllocShared(&val,4,procid); + val.value = 0x12345678; + val.handle = 0; + hmem = pSHAllocShared(&val, sizeof(val), procid); ok(hmem!=NULL,"SHAllocShared(NULL...) failed: %u\n", GetLastError()); p=pSHLockShared(hmem,procid); ok(p!=NULL,"SHLockShared failed: %u\n", GetLastError()); if (p!=NULL) - ok(*p==val,"Wrong value in shared memory: %d instead of %d\n",*p,val); + ok(p->value == 0x12345678, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345678); ret = pSHUnlockShared(p); ok( ret, "SHUnlockShared failed: %u\n", GetLastError()); + sprintf(cmdline, "%s %s %d %p", argv[0], argv[1], procid, hmem); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "could not create child process error: %u\n", GetLastError()); + if (ret) + { + winetest_wait_child_process(pi.hProcess); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + p = pSHLockShared(hmem, procid); + ok(p != NULL,"SHLockShared failed: %u\n", GetLastError()); + if (p != NULL && p->value != 0x12345678) + { + ok(p->value == 0x12345679, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345679); + hmem2 = p->handle; + ok(hmem2 != NULL, "Expected handle in shared memory\n"); + } + ret = pSHUnlockShared(p); + ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); + } + ret = pSHFreeShared(hmem, procid); ok( ret, "SHFreeShared failed: %u\n", GetLastError()); + + if (hmem2) + { + p = pSHLockShared(hmem2, procid); + todo_wine + ok(p != NULL,"SHLockShared failed: %u\n", GetLastError()); + if (p != NULL) + ok(p->value == 0xDEADBEEF, "Wrong value in shared memory: %d instead of %d\n", p->value, 0xDEADBEEF); + ret = pSHUnlockShared(p); + todo_wine + ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); + + ret = pSHFreeShared(hmem2, procid); + todo_wine + ok(ret, "SHFreeShared failed: %u\n", GetLastError()); + } +} + +static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) +{ + struct shared_struct val, *p; + BOOL ret; + + p = pSHLockShared(hmem, procid); + ok(p != NULL || broken(p == NULL) /* Windows 7/8 */, "SHLockShared failed: %u\n", GetLastError()); + if (p == NULL) + { + win_skip("Subprocess failed to modify shared memory, skipping test\n"); + return; + } + + ok(p->value == 0x12345678, "Wrong value in shared memory: %d instead of %d\n", p->value, 0x12345678); + p->value++; + + val.value = 0xDEADBEEF; + val.handle = 0; + p->handle = pSHAllocShared(&val, sizeof(val), procid); + ok(p->handle != NULL, "SHAllocShared failed: %u\n", GetLastError()); + + ret = pSHUnlockShared(p); + ok(ret, "SHUnlockShared failed: %u\n", GetLastError()); } static void test_fdsa(void) @@ -3057,6 +3128,9 @@ static void test_SHSetParentHwnd(void) START_TEST(ordinal) { + char **argv; + int argc; + hShlwapi = GetModuleHandleA("shlwapi.dll"); is_win2k_and_lower = GetProcAddress(hShlwapi, "StrChrNW") == 0; is_win9x = GetProcAddress(hShlwapi, (LPSTR)99) == 0; /* StrCpyNXA */ @@ -3069,6 +3143,17 @@ START_TEST(ordinal) init_pointers(); + argc = winetest_get_mainargs(&argv); + if (argc >= 4) + { + DWORD procid; + HANDLE hmem; + sscanf(argv[2], "%d", &procid); + sscanf(argv[3], "%p", &hmem); + test_alloc_shared_remote(procid, hmem); + return; + } + hmlang = LoadLibraryA("mlang.dll"); pLcidToRfc1766A = (void *)GetProcAddress(hmlang, "LcidToRfc1766A"); @@ -3077,7 +3162,7 @@ START_TEST(ordinal) test_GetAcceptLanguagesA(); test_SHSearchMapInt(); - test_alloc_shared(); + test_alloc_shared(argc, argv); test_fdsa(); test_GetShellSecurityDescriptor(); test_SHPackDispParams();

1 0