wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

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

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

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

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

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: 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 LPWSTR.
by Alexandre Julliard 24 Mar '17

24 Mar '17

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

Henri Verbeet : winex11: Use GLX_OML_sync_control to synchronise buffer swaps with X11DRV_FLUSH_GL_DRAWABLE requests.
by Alexandre Julliard 24 Mar '17

24 Mar '17

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

Paul Gofman : d3dx9: Fix a warning output in preshader.
by Alexandre Julliard 24 Mar '17

24 Mar '17

Module: wine Branch: master Commit: 3b99567192f30475b415c748f5e57b427fb67e10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b99567192f30475b415c748f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Mar 23 18:06:57 2017 +0300 d3dx9: Fix a warning output in preshader. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index b650f33..9aedc99 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1088,16 +1088,11 @@ static HRESULT init_set_constants(struct d3dx_const_tab *const_tab, ID3DXConstan return ret; } -static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_ins *ins, - const struct d3dx_pres_operand *opr, unsigned int comp) +static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_operand *opr, unsigned int comp) { if (!regstore_is_val_set_reg(rs, opr->table, (opr->offset + comp) / table_info[opr->table].reg_component_count)) - { - WARN("Using uninitialized input "); - dump_arg(rs, opr, comp); - TRACE(".\n"); - dump_ins(rs, ins); - } + WARN("Using uninitialized input, table %u, offset %u.\n", opr->table, opr->offset + comp); + return regstore_get_double(rs, opr->table, opr->offset + comp); } @@ -1130,7 +1125,7 @@ static HRESULT execute_preshader(struct d3dx_preshader *pres) } for (k = 0; k < oi->input_count; ++k) for (j = 0; j < ins->component_count; ++j) - args[k * ins->component_count + j] = exec_get_arg(&pres->regs, ins, &ins->inputs[k], + args[k * ins->component_count + j] = exec_get_arg(&pres->regs, &ins->inputs[k], ins->scalar_op && !k ? 0 : j); res = oi->func(args, ins->component_count); @@ -1142,7 +1137,7 @@ static HRESULT execute_preshader(struct d3dx_preshader *pres) for (j = 0; j < ins->component_count; ++j) { for (k = 0; k < oi->input_count; ++k) - args[k] = exec_get_arg(&pres->regs, ins, &ins->inputs[k], ins->scalar_op && !k ? 0 : j); + args[k] = exec_get_arg(&pres->regs, &ins->inputs[k], ins->scalar_op && !k ? 0 : j); res = oi->func(args, ins->component_count); exec_set_arg(&pres->regs, &ins->output, j, res); }

1 0

Andrey Gusev : api-ms-win-core-quirks-l1-1-0: Add dll.
by Alexandre Julliard 23 Mar '17

23 Mar '17

Module: wine Branch: master Commit: ec8485ec10e3c27b89ec5f1289bc8a3cdad5f3f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8485ec10e3c27b89ec5f128… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Mar 23 17:12:57 2017 +0200 api-ms-win-core-quirks-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-quirks-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-quirks-l1-1-0.spec | 8 ++++++++ tools/make_specfiles | 4 ++++ 5 files changed, 16 insertions(+) diff --git a/configure b/configure index 6d38e34..2c94936 100755 --- a/configure +++ b/configure @@ -945,6 +945,7 @@ enable_api_ms_win_core_processthreads_l1_1_2 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_psapi_l1_1_0 enable_api_ms_win_core_psapi_obsolete_l1_1_0 +enable_api_ms_win_core_quirks_l1_1_0 enable_api_ms_win_core_realtime_l1_1_0 enable_api_ms_win_core_registry_l1_1_0 enable_api_ms_win_core_registryuserspecific_l1_1_0 @@ -17679,6 +17680,7 @@ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-2 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-psapi-l1-1-0 enable_api_ms_win_core_psapi_l1_1_0 wine_fn_config_dll api-ms-win-core-psapi-obsolete-l1-1-0 enable_api_ms_win_core_psapi_obsolete_l1_1_0 +wine_fn_config_dll api-ms-win-core-quirks-l1-1-0 enable_api_ms_win_core_quirks_l1_1_0 wine_fn_config_dll api-ms-win-core-realtime-l1-1-0 enable_api_ms_win_core_realtime_l1_1_0 wine_fn_config_dll api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 wine_fn_config_dll api-ms-win-core-registryuserspecific-l1-1-0 enable_api_ms_win_core_registryuserspecific_l1_1_0 diff --git a/configure.ac b/configure.ac index 22cb7e2..bd3f876 100644 --- a/configure.ac +++ b/configure.ac @@ -2733,6 +2733,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-obsolete-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-quirks-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-realtime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-registryuserspecific-l1-1-0) diff --git a/dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in b/dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in new file mode 100644 index 0000000..9486e8b --- /dev/null +++ b/dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-quirks-l1-1-0.dll diff --git a/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec new file mode 100644 index 0000000..761120f --- /dev/null +++ b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec @@ -0,0 +1,8 @@ +@ stub QuirkGetData +@ stub QuirkGetData2 +@ stub QuirkIsEnabled +@ stub QuirkIsEnabled2 +@ stub QuirkIsEnabled3 +@ stub QuirkIsEnabledForPackage +@ stub QuirkIsEnabledForPackage2 +@ stub QuirkIsEnabledForProcess diff --git a/tools/make_specfiles b/tools/make_specfiles index 383ab07..bd0314f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -255,6 +255,10 @@ my @dll_groups = "api-ms-win-core-bem-l1-1-0", ], [ + "kernelbase", + "api-ms-win-core-quirks-l1-1-0", + ], + [ "ole32", "api-ms-win-downlevel-ole32-l1-1-0", "api-ms-win-core-com-l1-1-0",

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2017