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

Henri Verbeet : usp10: Avoid LPCVOID.
by Alexandre Julliard 24 Mar '17

24 Mar '17

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

Henri Verbeet : usp10: Avoid LPVOID.
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: 213d3588a715418524986fcc4bafd8ef28f53db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=213d3588a715418524986fcc4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 23 22:49:42 2017 +0100 usp10: Avoid LPVOID. 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/usp10_internal.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index d4d3434..f906885 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -180,11 +180,11 @@ typedef struct { BOOL sfnt; CacheGlyphPage *page[NUM_PAGES]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; - LPVOID GSUB_Table; - LPVOID GDEF_Table; - LPVOID CMAP_Table; - LPVOID CMAP_format12_Table; - LPVOID GPOS_Table; + void *GSUB_Table; + void *GDEF_Table; + void *CMAP_Table; + void *CMAP_format12_Table; + void *GPOS_Table; BOOL scripts_initialized; INT script_count; LoadedScript *scripts;

1 0

Henri Verbeet : usp10: Introduce a helper function to lookup a script in the script cache.
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: 2a0ffc985205ea7f4ebbf585ebc13d0f8922d258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0ffc985205ea7f4ebbf585e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 23 22:49:43 2017 +0100 usp10: Introduce a helper function to lookup a script in the script cache. 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 | 92 ++++++++++++++++++++++----------------------------- 1 file changed, 39 insertions(+), 53 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 6cc1b5d..e5e7ece 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2481,6 +2481,19 @@ unsigned int OpenType_apply_GPOS_lookup(const ScriptCache *script_cache, const O lookup_index, glyphs, glyph_index, glyph_count, goffset); } +static LoadedScript *usp10_script_cache_get_script(ScriptCache *script_cache, OPENTYPE_TAG tag) +{ + size_t i; + + for (i = 0; i < script_cache->script_count; ++i) + { + if (script_cache->scripts[i].tag == tag) + return &script_cache->scripts[i]; + } + + return NULL; +} + static void GSUB_initialize_script_cache(ScriptCache *psc) { int i; @@ -2510,6 +2523,7 @@ static void GPOS_expand_script_cache(ScriptCache *psc) int i, count; const OT_ScriptList *script; const GPOS_Header* header = (const GPOS_Header*)psc->GPOS_Table; + LoadedScript *loaded_script; if (!header) return; @@ -2539,24 +2553,18 @@ static void GPOS_expand_script_cache(ScriptCache *psc) { for (i = 0; i < count; i++) { - int j; int offset = GET_BE_WORD(script->ScriptRecord[i].Script); OPENTYPE_TAG tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); - for (j = 0; j < psc->script_count; j++) - { - if (psc->scripts[j].tag == tag) - { - psc->scripts[j].gpos_table = ((const BYTE*)script + offset); - break; - } - } - if (j == psc->script_count) + + if (!(loaded_script = usp10_script_cache_get_script(psc, tag))) { psc->script_count++; - psc->scripts = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,psc->scripts, sizeof(LoadedScript) * psc->script_count); - psc->scripts[j].tag = tag; - psc->scripts[j].gpos_table = ((const BYTE*)script + offset); + psc->scripts = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + psc->scripts, psc->script_count * sizeof(*psc->scripts)); + loaded_script = &psc->scripts[psc->script_count - 1]; + loaded_script->tag = tag; } + loaded_script->gpos_table = (const BYTE *)script + offset; } } } @@ -2574,32 +2582,30 @@ static void _initialize_script_cache(ScriptCache *psc) HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) { int i; + const LoadedScript *script; HRESULT rc = S_OK; _initialize_script_cache(psc); *pcTags = psc->script_count; - if (!searchingFor && cMaxTags < *pcTags) + if (searchingFor) + { + if (!(script = usp10_script_cache_get_script(psc, searchingFor))) + return USP_E_SCRIPT_NOT_IN_FONT; + + *pScriptTags = script->tag; + *pcTags = 1; + return S_OK; + } + + if (cMaxTags < *pcTags) rc = E_OUTOFMEMORY; - else if (searchingFor) - rc = USP_E_SCRIPT_NOT_IN_FONT; - for (i = 0; i < psc->script_count; i++) + cMaxTags = min(cMaxTags, psc->script_count); + for (i = 0; i < cMaxTags; ++i) { - if (i < cMaxTags) - pScriptTags[i] = psc->scripts[i].tag; - - if (searchingFor) - { - if (searchingFor == psc->scripts[i].tag) - { - pScriptTags[0] = psc->scripts[i].tag; - *pcTags = 1; - rc = S_OK; - break; - } - } + pScriptTags[i] = psc->scripts[i].tag; } return rc; } @@ -2714,17 +2720,7 @@ HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, LoadedScript *script = NULL; _initialize_script_cache(psc); - - for (i = 0; i < psc->script_count; i++) - { - if (psc->scripts[i].tag == script_tag) - { - script = &psc->scripts[i]; - break; - } - } - - if (!script) + if (!(script = usp10_script_cache_get_script(psc, script_tag))) return E_INVALIDARG; _initialize_language_cache(script); @@ -2904,22 +2900,12 @@ static void _initialize_feature_cache(ScriptCache *psc, LoadedLanguage *language HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, char tableType, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature) { int i; + LoadedScript *script; HRESULT rc = S_OK; - LoadedScript *script = NULL; LoadedLanguage *language = NULL; _initialize_script_cache(psc); - - for (i = 0; i < psc->script_count; i++) - { - if (psc->scripts[i].tag == script_tag) - { - script = &psc->scripts[i]; - break; - } - } - - if (!script) + if (!(script = usp10_script_cache_get_script(psc, script_tag))) { *pcTags = 0; if (!filtered)

1 0

Hugh McMaster : regedit/tests: Add mixed line concatenation and comment tests.
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: f8afd05d6c1414bd5f09ac1c1ce3364bee705d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8afd05d6c1414bd5f09ac1c1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Mar 24 10:26:54 2017 +0000 regedit/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/regedit/tests/regedit.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 5d096aa..37ac2c1 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -610,6 +610,33 @@ static void test_comments(void) " 65,6e,61,74,69,6f,6e,00,00\n\n"); todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line3\"=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"); + todo_wine verify_reg(hkey, "Multi-Line3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line4\"=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"); + todo_wine verify_reg(hkey, "Multi-Line4", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line5\"=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"); + verify_reg_nonexist(hkey, "Multi-Line5"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : reg/tests: Add mixed line concatenation and comment tests.
by Alexandre Julliard 24 Mar '17

24 Mar '17

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 24 Mar '17

24 Mar '17

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

Francois Gouget : ddraw: Make ddraw_surface_release_iface() static.
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: b7d0b4d8a6f7199e73b5e225ad6440614fb74161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7d0b4d8a6f7199e73b5e225a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 24 03:43:45 2017 +0100 ddraw: Make ddraw_surface_release_iface() static. 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/ddraw/ddraw_private.h | 1 - dlls/ddraw/surface.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7d640f7..38ae28a7 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -215,7 +215,6 @@ struct wined3d_rendertarget_view *ddraw_surface_get_rendertarget_view(struct ddr void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; -ULONG ddraw_surface_release_iface(struct ddraw_surface *This) DECLSPEC_HIDDEN; HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RECT *rect, BOOL read) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 247fb86..4c84783 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -529,7 +529,7 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) wined3d_texture_decref(surface->wined3d_texture); } -ULONG ddraw_surface_release_iface(struct ddraw_surface *This) +static ULONG ddraw_surface_release_iface(struct ddraw_surface *This) { ULONG iface_count;

1 0

Nikolay Sivov : readme: Update Russian translation.
by Alexandre Julliard 24 Mar '17

24 Mar '17

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

Piotr Caban : msvcp100: Improve is_current_task_group_canceling function stub.
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: 7ec727b31c98802a7e9ab1cfbae9e3539a279c2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ec727b31c98802a7e9ab1cfb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 24 12:45:10 2017 +0100 msvcp100: Improve is_current_task_group_canceling function stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 10 ++++------ dlls/msvcp90/msvcp90.h | 4 ++++ dlls/msvcp90/msvcp_main.c | 10 +++++++++- 7 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 6841678..7042598 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2068,7 +2068,7 @@ @ extern ?is_bounded(a)_Num_base@std@@2_NB std_Num_base_is_bounded @ extern ?is_bounded(a)_Num_float_base@std@@2_NB std_Num_float_base_is_bounded @ extern ?is_bounded(a)_Num_int_base@std@@2_NB std_Num_int_base_is_bounded -@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ() is_current_task_group_canceling @ extern ?is_exact(a)_Num_base@std@@2_NB std_Num_base_is_exact @ extern ?is_exact(a)_Num_float_base@std@@2_NB std_Num_float_base_is_exact @ extern ?is_exact(a)_Num_int_base@std@@2_NB std_Num_int_base_is_exact diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 602cb2b..52524c5 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -2832,7 +2832,7 @@ @ cdecl -arch=arm ?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ thiscall -arch=i386 ?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ cdecl -arch=win64 ?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch -@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ() is_current_task_group_canceling @ stub ?is_task_cancellation_requested(a)Concurrency@@YA_NXZ @ cdecl -arch=arm ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ(ptr) basic_istream_char_isfx @ thiscall -arch=i386 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) basic_istream_char_isfx diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index a839575..173728a 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -2774,7 +2774,7 @@ @ cdecl -arch=arm ?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ thiscall -arch=i386 ?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ cdecl -arch=win64 ?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch -@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ() is_current_task_group_canceling @ cdecl -arch=arm ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ(ptr) basic_istream_char_isfx @ thiscall -arch=i386 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) basic_istream_char_isfx @ cdecl -arch=win64 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ(ptr) basic_istream_char_isfx diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 6bc6e5a..8a03b41 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -2774,7 +2774,7 @@ @ cdecl -arch=arm ?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z(ptr long long) msvcp120.?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z @ thiscall -arch=i386 ?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z(ptr long long) msvcp120.?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z @ cdecl -arch=win64 ?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z(ptr long long) msvcp120.?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z -@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) msvcp120.?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ() msvcp120.?is_current_task_group_canceling(a)Concurrency@@YA_NXZ @ cdecl -arch=arm ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ(ptr) msvcp120.?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ @ thiscall -arch=i386 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) msvcp120.?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ @ cdecl -arch=win64 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ(ptr) msvcp120.?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 81a6f81..fa5ac1d 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1400,15 +1400,13 @@ void __cdecl _Unlock_shared_ptr_spin_lock(void) } #endif +#if _MSVCP_VER >= 100 /* ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ */ -MSVCP_bool __cdecl is_current_task_group_canceling(void *this) +MSVCP_bool __cdecl is_current_task_group_canceling(void) { - static int once; - - if (!once++) - FIXME("(%p) stub\n", this); - return FALSE; + return Context_IsCurrentTaskCollectionCanceling(); } +#endif #if _MSVCP_VER >= 140 typedef struct { diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 86b787b..d751186 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -72,6 +72,10 @@ extern void (__thiscall *critical_section_unlock)(critical_section*); extern MSVCP_bool (__thiscall *critical_section_trylock)(critical_section*); #endif +#if _MSVCP_VER >= 100 +extern MSVCP_bool (__cdecl *Context_IsCurrentTaskCollectionCanceling)(void); +#endif + /* basic_string<char, char_traits<char>, allocator<char>> */ typedef struct { diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 377ae01..3898c9d 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -68,6 +68,10 @@ void (__thiscall *critical_section_unlock)(critical_section*); MSVCP_bool (__thiscall *critical_section_trylock)(critical_section*); #endif +#if _MSVCP_VER >= 100 +MSVCP_bool (__cdecl *Context_IsCurrentTaskCollectionCanceling)(void); +#endif + #define VERSION_STRING(ver) #ver #if _MSVCP_VER >= 140 #define MSVCRT_NAME(ver) "ucrtbase.dll" @@ -133,7 +137,7 @@ int __cdecl sprintf(char *buf, const char *fmt, ...) static void init_cxx_funcs(void) { HMODULE hmod = GetModuleHandleA( MSVCRT_NAME(_MSVCP_VER) ); -#if _MSVCP_VER >= 110 +#if _MSVCP_VER >= 100 HMODULE hcon = hmod; #endif @@ -187,6 +191,10 @@ static void init_cxx_funcs(void) #endif } #endif /* _MSVCP_VER >= 110 */ + +#if _MSVCP_VER >= 100 + Context_IsCurrentTaskCollectionCanceling = (void*)GetProcAddress(hcon, "?IsCurrentTaskCollectionCanceling(a)Context@Concurrency@@SA_NXZ"); +#endif } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

1 0

Alexandre Julliard : po: Regenerate the po files.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: wine Branch: master Commit: 130febe09268e22fd42c05f02f1ac38fd0368efb URL: http://source.winehq.org/git/wine.git/?a=commit;h=130febe09268e22fd42c05f02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 23 15:29:42 2017 +0100 po: Regenerate the po files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 123 +++++++++++++++++++++++++------------------------- po/bg.po | 123 +++++++++++++++++++++++++------------------------- po/ca.po | 123 +++++++++++++++++++++++++------------------------- po/cs.po | 123 +++++++++++++++++++++++++------------------------- po/da.po | 123 +++++++++++++++++++++++++------------------------- po/de.po | 123 +++++++++++++++++++++++++------------------------- po/el.po | 125 ++++++++++++++++++++++++++------------------------- po/en.po | 123 +++++++++++++++++++++++++------------------------- po/en_US.po | 123 +++++++++++++++++++++++++------------------------- po/eo.po | 123 +++++++++++++++++++++++++------------------------- po/es.po | 123 +++++++++++++++++++++++++------------------------- po/fa.po | 123 +++++++++++++++++++++++++------------------------- po/fi.po | 123 +++++++++++++++++++++++++------------------------- po/fr.po | 123 +++++++++++++++++++++++++------------------------- po/he.po | 123 +++++++++++++++++++++++++------------------------- po/hi.po | 123 +++++++++++++++++++++++++------------------------- po/hr.po | 123 +++++++++++++++++++++++++------------------------- po/hu.po | 123 +++++++++++++++++++++++++------------------------- po/it.po | 123 +++++++++++++++++++++++++------------------------- po/ja.po | 123 +++++++++++++++++++++++++------------------------- po/ko.po | 123 +++++++++++++++++++++++++------------------------- po/lt.po | 123 +++++++++++++++++++++++++------------------------- po/ml.po | 123 +++++++++++++++++++++++++------------------------- po/nb_NO.po | 123 +++++++++++++++++++++++++------------------------- po/nl.po | 123 +++++++++++++++++++++++++------------------------- po/or.po | 123 +++++++++++++++++++++++++------------------------- po/pa.po | 123 +++++++++++++++++++++++++------------------------- po/pl.po | 123 +++++++++++++++++++++++++------------------------- po/pt_BR.po | 123 +++++++++++++++++++++++++------------------------- po/pt_PT.po | 123 +++++++++++++++++++++++++------------------------- po/rm.po | 123 +++++++++++++++++++++++++------------------------- po/ro.po | 123 +++++++++++++++++++++++++------------------------- po/ru.po | 123 +++++++++++++++++++++++++------------------------- po/sk.po | 123 +++++++++++++++++++++++++------------------------- po/sl.po | 123 +++++++++++++++++++++++++------------------------- po/sr_RS(a)cyrillic.po | 123 +++++++++++++++++++++++++------------------------- po/sr_RS(a)latin.po | 123 +++++++++++++++++++++++++------------------------- po/sv.po | 123 +++++++++++++++++++++++++------------------------- po/te.po | 123 +++++++++++++++++++++++++------------------------- po/th.po | 125 ++++++++++++++++++++++++++------------------------- po/tr.po | 123 +++++++++++++++++++++++++------------------------- po/uk.po | 123 +++++++++++++++++++++++++------------------------- po/wa.po | 123 +++++++++++++++++++++++++------------------------- po/wine.pot | 123 +++++++++++++++++++++++++------------------------- po/zh_CN.po | 123 +++++++++++++++++++++++++------------------------- po/zh_TW.po | 123 +++++++++++++++++++++++++------------------------- 46 files changed, 2854 insertions(+), 2808 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=130febe09268e22fd42c0…

1 0