March 2017 - Wine-Commits - list.winehq.org

Piotr Caban : msvcrt: Implement caching in Concurrency::Alloc.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: c5d733e1ac84375402f7bc8d762e0a4e905eb1af URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d733e1ac84375402f7bc8d7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 24 12:45:21 2017 +0100 msvcrt: Implement caching in Concurrency::Alloc. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/heap.c | 17 ---------- dlls/msvcrt/scheduler.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index ba07bb0..3ae2599 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -864,20 +864,3 @@ void msvcrt_destroy_heap(void) if(sb_heap) HeapDestroy(sb_heap); } - -/* ?Alloc(a)Concurrency@@YAPAXI(a)Z */ -/* ?Alloc(a)Concurrency@@YAPEAX_K(a)Z */ -void * CDECL Concurrency_Alloc(MSVCRT_size_t size) -{ - void *p = MSVCRT_malloc(size); - FIXME("(%ld) returning %p\n", size, p); - return p; -} - -/* ?Free(a)Concurrency@@YAXPAX(a)Z */ -/* ?Free(a)Concurrency@@YAXPEAX(a)Z */ -void CDECL Concurrency_Free(void* mem) -{ - FIXME("(%p) stub\n", mem); - MSVCRT_free(mem); -} diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 1ab7906..84566cf 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -64,9 +64,21 @@ typedef struct { #define call_Context_dtor(this, flags) CALL_VTBL_FUNC(this, 20, \ Context*, (Context*, unsigned int), (this, flags)) +union allocator_cache_entry { + struct _free { + int depth; + union allocator_cache_entry *next; + } free; + struct _alloc { + int bucket; + char mem[1]; + } alloc; +}; + typedef struct { Context context; unsigned int id; + union allocator_cache_entry *allocator_cache[8]; } ExternalContextBase; extern const vtable_ptr MSVCRT_ExternalContextBase_vtable; static void ExternalContextBase_ctor(ExternalContextBase*); @@ -205,6 +217,16 @@ MSVCRT_bool __thiscall ExternalContextBase_IsSynchronouslyBlocked(const External static void ExternalContextBase_dtor(ExternalContextBase *this) { + union allocator_cache_entry *next, *cur; + int i; + + /* TODO: move the allocator cache to scheduler so it can be reused */ + for(i=0; i<sizeof(this->allocator_cache)/sizeof(this->allocator_cache[0]); i++) { + for(cur = this->allocator_cache[i]; cur; cur=next) { + next = cur->free.next; + MSVCRT_operator_delete(cur); + } + } } DEFINE_THISCALL_WRAPPER(ExternalContextBase_vector_dtor, 8) @@ -230,8 +252,72 @@ Context* __thiscall ExternalContextBase_vector_dtor(ExternalContextBase *this, u static void ExternalContextBase_ctor(ExternalContextBase *this) { TRACE("(%p)->()\n", this); + this->context.vtable = &MSVCRT_ExternalContextBase_vtable; this->id = InterlockedIncrement(&context_id); + memset(this->allocator_cache, 0, sizeof(this->allocator_cache)); +} + +/* ?Alloc(a)Concurrency@@YAPAXI(a)Z */ +/* ?Alloc(a)Concurrency@@YAPEAX_K(a)Z */ +void * CDECL Concurrency_Alloc(MSVCRT_size_t size) +{ + ExternalContextBase *context = (ExternalContextBase*)get_current_context(); + union allocator_cache_entry *p; + + size += FIELD_OFFSET(union allocator_cache_entry, alloc.mem); + if (size < sizeof(*p)) + size = sizeof(*p); + + if (context->context.vtable != &MSVCRT_ExternalContextBase_vtable) { + p = MSVCRT_operator_new(size); + p->alloc.bucket = -1; + }else { + int i; + + C_ASSERT(sizeof(union allocator_cache_entry) <= 1 << 4); + for(i=0; i<sizeof(context->allocator_cache)/sizeof(context->allocator_cache[0]); i++) + if (1 << (i+4) >= size) break; + + if(i==sizeof(context->allocator_cache)/sizeof(context->allocator_cache[0])) { + p = MSVCRT_operator_new(size); + p->alloc.bucket = -1; + }else if (context->allocator_cache[i]) { + p = context->allocator_cache[i]; + context->allocator_cache[i] = p->free.next; + p->alloc.bucket = i; + }else { + p = MSVCRT_operator_new(1 << (i+4)); + p->alloc.bucket = i; + } + } + + TRACE("(%ld) returning %p\n", size, p->alloc.mem); + return p->alloc.mem; +} + +/* ?Free(a)Concurrency@@YAXPAX(a)Z */ +/* ?Free(a)Concurrency@@YAXPEAX(a)Z */ +void CDECL Concurrency_Free(void* mem) +{ + union allocator_cache_entry *p = (union allocator_cache_entry*)((char*)mem-FIELD_OFFSET(union allocator_cache_entry, alloc.mem)); + ExternalContextBase *context = (ExternalContextBase*)get_current_context(); + int bucket = p->alloc.bucket; + + TRACE("(%p)\n", mem); + + if (context->context.vtable != &MSVCRT_ExternalContextBase_vtable) { + MSVCRT_operator_delete(p); + }else { + if(bucket >= 0 && bucket < sizeof(context->allocator_cache)/sizeof(context->allocator_cache[0]) && + (!context->allocator_cache[bucket] || context->allocator_cache[bucket]->free.depth < 20)) { + p->free.next = context->allocator_cache[bucket]; + p->free.depth = p->free.next ? p->free.next->free.depth+1 : 0; + context->allocator_cache[bucket] = p; + }else { + MSVCRT_operator_delete(p); + } + } } extern const vtable_ptr MSVCRT_type_info_vtable;

1 0

Henri Verbeet : usp10: Avoid LPCVOID.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: 1403087954b4e8299e2fe6f51850bccd25d8f4e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1403087954b4e8299e2fe6f51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 23 22:49:41 2017 +0100 usp10: Avoid LPCVOID. And cleanup a few style issues along the way. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 9 +++++---- dlls/usp10/shape.c | 3 ++- dlls/usp10/usp10_internal.h | 13 +++++++------ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index e3c7a56..6cc1b5d 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -815,7 +815,7 @@ void OpenType_GDEF_UpdateGlyphProps(ScriptCache *psc, const WORD *pwGlyphs, cons **********/ static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count); -static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) +static int GSUB_is_glyph_covered(const void *table, unsigned int glyph) { const OT_CoverageFormat1* cf1; @@ -1486,7 +1486,8 @@ static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD return GSUB_E_NOGLYPH; } -INT OpenType_apply_GSUB_lookup(LPCVOID table, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) +int OpenType_apply_GSUB_lookup(const void *table, unsigned int lookup_index, WORD *glyphs, + unsigned int glyph_index, int write_dir, int *glyph_count) { const GSUB_Header *header = (const GSUB_Header *)table; const OT_LookupList *lookup = (const OT_LookupList*)((const BYTE*)header + GET_BE_WORD(header->LookupList)); @@ -2769,7 +2770,7 @@ HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, } -static void GSUB_initialize_feature_cache(LPCVOID table, LoadedLanguage *language) +static void GSUB_initialize_feature_cache(const void *table, LoadedLanguage *language) { int i; @@ -2812,7 +2813,7 @@ static void GSUB_initialize_feature_cache(LPCVOID table, LoadedLanguage *languag } } -static void GPOS_expand_feature_cache(LPCVOID table, LoadedLanguage *language) +static void GPOS_expand_feature_cache(const void *table, LoadedLanguage *language) { int i, count; const OT_LangSys *lang = language->gpos_table; diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 7ed2142..2f47f89 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -542,7 +542,8 @@ static const ScriptShapeData ShapingData[] = extern scriptData scriptInformation[]; -static INT GSUB_apply_feature_all_lookups(LPCVOID header, LoadedFeature *feature, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) +static int GSUB_apply_feature_all_lookups(const void *header, LoadedFeature *feature, + WORD *glyphs, unsigned int glyph_index, int write_dir, int *glyph_count) { int i; int out_index = GSUB_E_NOGLYPH; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 3ad6d10..d4d3434 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -144,15 +144,15 @@ enum usp10_script typedef struct { OPENTYPE_TAG tag; CHAR tableType; - LPCVOID feature; + const void *feature; INT lookup_count; WORD *lookups; } LoadedFeature; typedef struct { OPENTYPE_TAG tag; - LPCVOID gsub_table; - LPCVOID gpos_table; + const void *gsub_table; + const void *gpos_table; BOOL features_initialized; INT feature_count; LoadedFeature *features; @@ -160,8 +160,8 @@ typedef struct { typedef struct { OPENTYPE_TAG tag; - LPCVOID gsub_table; - LPCVOID gpos_table; + const void *gsub_table; + const void *gpos_table; LoadedLanguage default_language; BOOL languages_initialized; INT language_count; @@ -273,7 +273,8 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWORD pgi, DWORD flags) DECLSPEC_HIDDEN; void OpenType_GDEF_UpdateGlyphProps(ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, const WORD cChars, SCRIPT_GLYPHPROP *pGlyphProp) DECLSPEC_HIDDEN; -INT OpenType_apply_GSUB_lookup(LPCVOID table, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) DECLSPEC_HIDDEN; +int OpenType_apply_GSUB_lookup(const void *table, unsigned int lookup_index, WORD *glyphs, + unsigned int glyph_index, int write_dir, int *glyph_count) DECLSPEC_HIDDEN; unsigned int OpenType_apply_GPOS_lookup(const ScriptCache *psc, const OUTLINETEXTMETRICW *otm, const LOGFONTW *logfont, const SCRIPT_ANALYSIS *analysis, int *advance, unsigned int lookup_index, const WORD *glyphs, unsigned int glyph_index, unsigned int glyph_count, GOFFSET *goffset) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : advpack: Don't trace the contents of an output buffer ( Valgrind).
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: c0b37037f5f00d2f68036ddeaf58aac3b7e5497f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b37037f5f00d2f68036ddea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 24 15:49:21 2017 +0100 advpack: Don't trace the contents of an output buffer (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 2469f7b..d2ce60e 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -763,9 +763,9 @@ HRESULT WINAPI TranslateInfStringExA(HINF hInf, LPCSTR pszInfFilename, HRESULT res; DWORD len = 0; - TRACE("(%p, %s, %s, %s, %s, %d, %p, %p)\n", hInf, debugstr_a(pszInfFilename), + TRACE("(%p, %s, %s, %s, %p, %d, %p, %p)\n", hInf, debugstr_a(pszInfFilename), debugstr_a(pszTranslateSection), debugstr_a(pszTranslateKey), - debugstr_a(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved); + pszBuffer, dwBufferSize, pdwRequiredSize, pvReserved); if (!pszInfFilename || !pszTranslateSection || !pszTranslateKey || !pdwRequiredSize) @@ -843,9 +843,9 @@ HRESULT WINAPI TranslateInfStringExW(HINF hInf, LPCWSTR pszInfFilename, LPWSTR pszBuffer, DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved) { - TRACE("(%p, %s, %s, %s, %s, %d, %p, %p)\n", hInf, debugstr_w(pszInfFilename), + TRACE("(%p, %s, %s, %s, %p, %d, %p, %p)\n", hInf, debugstr_w(pszInfFilename), debugstr_w(pszTranslateSection), debugstr_w(pszTranslateKey), - debugstr_w(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved); + pszBuffer, dwBufferSize, pdwRequiredSize, pvReserved); if (!hInf || !pszInfFilename || !pszTranslateSection || !pszTranslateKey) return E_INVALIDARG;

1 0

Hans Leidekker : advapi32/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: fbec6c540aaa6b6452abf8226e80787ab95e5cf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbec6c540aaa6b6452abf8226… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 24 15:49:22 2017 +0100 advapi32/tests: Fix a memory leak (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/crypt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 84a54a1..13671eb 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -255,6 +255,9 @@ static void test_incorrect_api_usage(void) ok (result, "%d\n", GetLastError()); if (!result) return; + result = pCryptDestroyKey(hKey); + ok (result, "%d\n", GetLastError()); + result = pCryptGenKey(hProv, CALG_RC4, 0, &hKey2); ok (result, "%d\n", GetLastError()); if (!result) return;

1 0

Henri Verbeet : winex11: Use GLX_OML_sync_control to synchronise buffer swaps with X11DRV_FLUSH_GL_DRAWABLE requests.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: e75bc6228ebcbdc1a3877a6ac6954611dedf8a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e75bc6228ebcbdc1a3877a6ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 23 23:58:10 2017 +0100 winex11: Use GLX_OML_sync_control to synchronise buffer swaps with X11DRV_FLUSH_GL_DRAWABLE requests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/init.c | 3 --- dlls/winex11.drv/opengl.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index af2fd92..7efd603 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -375,9 +375,6 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d RECT rect = physDev->dc_rect; OffsetRect( &rect, -physDev->dc_rect.left, -physDev->dc_rect.top ); - /* The GL drawable may be lagged behind if we don't flush first, so - * flush the display make sure we copy up-to-date data */ - XFlush( gdi_display ); XSetFunction( gdi_display, physDev->gc, GXcopy ); XCopyArea( gdi_display, data->gl_drawable, physDev->drawable, physDev->gc, 0, 0, rect.right, rect.bottom, diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 76cc3cc..28f033d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -418,6 +418,12 @@ static const char *(*pglXQueryCurrentRendererStringMESA)(int attribute); static Bool (*pglXQueryRendererIntegerMESA)(Display *dpy, int screen, int renderer, int attribute, unsigned int *value); static const char *(*pglXQueryRendererStringMESA)(Display *dpy, int screen, int renderer, int attribute); +/* OpenML GLX Extensions */ +static Bool (*pglXWaitForSbcOML)( Display *dpy, GLXDrawable drawable, + INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc ); +static INT64 (*pglXSwapBuffersMscOML)( Display *dpy, GLXDrawable drawable, + INT64 target_msc, INT64 divisor, INT64 remainder ); + /* Standard OpenGL */ static void (*pglFinish)(void); static void (*pglFlush)(void); @@ -750,6 +756,12 @@ static BOOL WINAPI init_opengl( INIT_ONCE *once, void *param, void **context ) pglXQueryRendererStringMESA = pglXGetProcAddressARB( (const GLubyte *)"glXQueryRendererStringMESA" ); } + if (has_extension( WineGLInfo.glxExtensions, "GLX_OML_sync_control" )) + { + pglXWaitForSbcOML = pglXGetProcAddressARB( (const GLubyte *)"glXWaitForSbcOML" ); + pglXSwapBuffersMscOML = pglXGetProcAddressARB( (const GLubyte *)"glXSwapBuffersMscOML" ); + } + X11DRV_WineGL_LoadExtensions(); init_pixel_formats( gdi_display ); return TRUE; @@ -3298,6 +3310,7 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) struct x11drv_escape_flush_gl_drawable escape; struct gl_drawable *gl; struct wgl_context *ctx = NtCurrentTeb()->glContext; + INT64 ust, msc, sbc, target_sbc = 0; TRACE("(%p)\n", hdc); @@ -3330,6 +3343,12 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) gl->rect.right - gl->rect.left, gl->rect.bottom - gl->rect.top ); break; } + if (pglXSwapBuffersMscOML) + { + pglFlush(); + target_sbc = pglXSwapBuffersMscOML( gdi_display, gl->drawable, 0, 0, 0 ); + break; + } pglXSwapBuffers(gdi_display, gl->drawable); break; case DC_GL_CHILD_WIN: @@ -3337,10 +3356,19 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) escape.gl_drawable = gl->window; /* fall through */ default: + if (pglXSwapBuffersMscOML) + { + pglFlush(); + target_sbc = pglXSwapBuffersMscOML( gdi_display, gl->drawable, 0, 0, 0 ); + break; + } pglXSwapBuffers(gdi_display, gl->drawable); break; } + if (escape.gl_drawable && pglXWaitForSbcOML) + pglXWaitForSbcOML( gdi_display, gl->drawable, target_sbc, &ust, &msc, &sbc ); + release_gl_drawable( gl ); if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL );

1 0

Hugh McMaster : reg/tests: Add mixed line concatenation and comment tests.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: ddb1c9374241a9a0cad7185679aa1db75feb65eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddb1c9374241a9a0cad718567… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Mar 24 10:27:07 2017 +0000 reg/tests: Add mixed line concatenation and comment tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index f6d623f..1be83d8 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1190,6 +1190,36 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line7\"=hex(7):4c,69,6e,\\;comment\n" + " 65,20,\\;comment\n" + " 63,6f,6e,\\;comment\n" + " 63,61,74,\\;comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Multi-Line7", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line8\"=hex(7):4c,69,6e,\\;#comment\n" + " 65,20,\\;#comment\n" + " 63,6f,6e,\\;#comment\n" + " 63,61,74,\\;#comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Multi-Line8", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line9\"=hex(7):4c,69,6e,\\;comment\n" + " 65,20,\\;comment\n" + " 63,6f,6e,\\;comment\n" + " 63,61,74,\\#comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line9"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -1605,6 +1635,36 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line7\"=hex(7):4c,00,69,00,6e,00,\\;comment\n" + " 65,00,20,00,\\;comment\n" + " 63,00,6f,00,6e,00,\\;comment\n" + " 63,00,61,00,74,00,\\;comment\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Multi-Line7", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line8\"=hex(7):4c,00,69,00,6e,00,\\;#comment\n" + " 65,00,20,00,\\;#comment\n" + " 63,00,6f,00,6e,00,\\;#comment\n" + " 63,00,61,00,74,00,\\;#comment\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Multi-Line8", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line9\"=hex(7):4c,00,69,00,6e,00,\\;comment\n" + " 65,00,20,00,\\;comment\n" + " 63,00,6f,00,6e,00,\\;comment\n" + " 63,00,61,00,74,00,\\#comment\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Multi-Line9"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Francois Gouget : wined3d: Fix a trailing new-line in an ERR() message.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: 2620a78fb0540263e507a517f3c6f98c3c4917ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=2620a78fb0540263e507a517f… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 24 03:41:57 2017 +0100 wined3d: Fix a trailing new-line in an ERR() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 556d555..e8b0515 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -815,7 +815,7 @@ static void create_default_samplers(struct wined3d_device *device, struct wined3 desc.mip_filter = WINED3D_TEXF_LINEAR; if (FAILED(hr = wined3d_sampler_create(device, &desc, NULL, &device->null_sampler))) { - ERR("Failed to create null sampler, hr %#x.n", hr); + ERR("Failed to create null sampler, hr %#x.\n", hr); device->null_sampler = NULL; } }

1 0

Nikolay Sivov : readme: Update Russian translation.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: 159d3642e147694c3596d96a0646249e2146a2c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=159d3642e147694c3596d96a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 24 09:08:25 2017 +0300 readme: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- documentation/README.ru | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/documentation/README.ru b/documentation/README.ru index c228fc6..616737e 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -13,11 +13,10 @@ GNU LGPL, файл LICENSE содержит информацию по лицен 2. БЫСТРЫЙ СТАРТ -Каждый раз, когда вы компилируете исходный код, рекомендуется использовать -Wine Installer для компоновки и установки Wine. В каталоге, содержащем -исходный код Wine (в нём находится этот файл), введите: +В каталоге, содержащем исходный код Wine, выполните: -./tools/wineinstall +./configure +make Запустите программу с помощью команды «wine имя_программы». Источники дополнительной информации перечислены в конце этого файла. Ознакомьтесь с @@ -47,7 +46,7 @@ Solaris: Лучше всего компоновать Wine инструментами GNU (gcc, gas, и т.д.). Внимание: установка gas *НЕ* гарантирует что gcc будет его использовать. Необходимо перекомпилировать gcc после - установки gas или создать ссылку на cc, как и на ld в инструментах gnu. (?) + установки gas или создать ссылку на cc, как и на ld в инструментах gnu. NetBSD: Убедитесь что, параметры USER_LDT, SYSVSHM, SYSVSEM и SYSVMSG @@ -70,7 +69,7 @@ Mac OS X: Разумеется, вам необходим «make» (лучше всего использовать GNU make). - Вам также понадобятся flex (версии 2.5 или старше) и bison. + Вам также понадобятся flex версии 2.5.33 или более новой и bison. Поддержка дополнительных библиотек: Конфигурационный скрипт выведет список дополнительных библиотек, которые не были @@ -86,30 +85,20 @@ Mac OS X: 4. КОМПИЛЯЦИЯ -Если вы не хотите использовать wineinstall, введите следующие команды -для компоновки Wine: +Для компиляции, выполните: ./configure -make depend make -Это скомпонует программу «wine», библиотеки и бинарные файлы, +В результате вы получите программу «wine», библиотеки и бинарные файлы, необходимые для работы Wine. -Программа «wine» будет загружать и выполнять программы Windows. +Программа «wine» нужна для загрузки и выполнения программ Windows. Библиотека «libwine» («Winelib») может быть использована для компилирования и компоновки исходного кода Windows под Unix. Для вывода конфигурационных настроек введите ./configure --help. -Для обновления до нового релиза используя патч, сначала перейдите в -корневой каталог релиза (он содержит README файл). -Затем введите «make clean» и пропачьте релиз: - - bunzip2 -c patch-file | patch -p1 - -где «patch-file» - имя файла с патчем (что-то вроде -wine-1.0.x.diff.bz2). Затем введите «./configure», и после этого -«make depend && make». +За дополнительной информацией обратитесь к https://wiki.winehq.org/Building_Wine 5. УСТАНОВКА @@ -169,8 +158,9 @@ IRC: Онлайн помощь доступна на канале #WineHQ на Git: Текущие разработки Wine доступны через Git. Смотрите http://www.winehq.org/site/git для дополнительной информации. -Если вы что-то добавили или исправили ошибку, пришлите патч (в формате 'diff -u') -на wine-patches(a)winehq.org для его включения в следующий релиз. +Если вы что-то добавили или исправили ошибку, пожалуйста отправьте патч +(предпочтительно сгенерированный с помощью git-format-patch) на wine-patches(a)winehq.org +для его включения в следующий релиз. -- Alexandre Julliard

1 0

Henri Verbeet : usp10: Avoid LPWSTR.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: a204e589b5123182323ceba6850c4b674cd3ebb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a204e589b5123182323ceba68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 23 22:49:40 2017 +0100 usp10: Avoid LPWSTR. And cleanup a few style issues along the way. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/indic.c | 3 ++- dlls/usp10/shape.c | 51 ++++++++++++++++++++++++++------------------- dlls/usp10/usp10.c | 7 +++++-- dlls/usp10/usp10_internal.h | 6 ++++-- 4 files changed, 40 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a204e589b5123182323ce…

1 0

Andrey Gusev : api-ms-win-core-winrt-roparameterizediid-l1-1-0: Add dll.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: ba01cb2f49996f39ee1f31e2bf7eaf5cc765a6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba01cb2f49996f39ee1f31e2b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Mar 23 16:10:23 2017 +0200 api-ms-win-core-winrt-roparameterizediid-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec | 3 +++ tools/make_specfiles | 1 + 5 files changed, 8 insertions(+) diff --git a/configure b/configure index b9619dc..6d38e34 100755 --- a/configure +++ b/configure @@ -978,6 +978,7 @@ enable_api_ms_win_core_winrt_error_l1_1_1 enable_api_ms_win_core_winrt_errorprivate_l1_1_1 enable_api_ms_win_core_winrt_l1_1_0 enable_api_ms_win_core_winrt_registration_l1_1_0 +enable_api_ms_win_core_winrt_roparameterizediid_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_core_wow64_l1_1_0 enable_api_ms_win_core_xstate_l1_1_0 @@ -17711,6 +17712,7 @@ wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-1 enable_api_ms_win_core_win wine_fn_config_dll api-ms-win-core-winrt-errorprivate-l1-1-1 enable_api_ms_win_core_winrt_errorprivate_l1_1_1 wine_fn_config_dll api-ms-win-core-winrt-l1-1-0 enable_api_ms_win_core_winrt_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-registration-l1-1-0 enable_api_ms_win_core_winrt_registration_l1_1_0 +wine_fn_config_dll api-ms-win-core-winrt-roparameterizediid-l1-1-0 enable_api_ms_win_core_winrt_roparameterizediid_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-core-wow64-l1-1-0 enable_api_ms_win_core_wow64_l1_1_0 wine_fn_config_dll api-ms-win-core-xstate-l1-1-0 enable_api_ms_win_core_xstate_l1_1_0 diff --git a/configure.ac b/configure.ac index d4f2ff4..22cb7e2 100644 --- a/configure.ac +++ b/configure.ac @@ -2766,6 +2766,7 @@ WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-winrt-errorprivate-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-winrt-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-registration-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-winrt-roparameterizediid-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-wow64-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-xstate-l1-1-0) diff --git a/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/Makefile.in b/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/Makefile.in new file mode 100644 index 0000000..efcc104 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-winrt-roparameterizediid-l1-1-0.dll diff --git a/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec b/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec new file mode 100644 index 0000000..9fb16ab --- /dev/null +++ b/dlls/api-ms-win-core-winrt-roparameterizediid-l1-1-0/api-ms-win-core-winrt-roparameterizediid-l1-1-0.spec @@ -0,0 +1,3 @@ +@ stub RoFreeParameterizedTypeExtra +@ stub RoGetParameterizedTypeInstanceIID +@ stub RoParameterizedTypeExtraGetTypeSignature diff --git a/tools/make_specfiles b/tools/make_specfiles index b39e02b..383ab07 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -325,6 +325,7 @@ my @dll_groups = "api-ms-win-core-winrt-errorprivate-l1-1-1", "api-ms-win-core-winrt-l1-1-0", "api-ms-win-core-winrt-registration-l1-1-0", + "api-ms-win-core-winrt-roparameterizediid-l1-1-0", "api-ms-win-core-winrt-string-l1-1-0", ], [

1 0