wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Eric Pouech : dbghelp: Set is_first and is_last flags on the fly in symt_add_func_line.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 707a2273ecb5fca392da22594d49be1122e9c171 URL: https://source.winehq.org/git/wine.git/?a=commit;h=707a2273ecb5fca392da2259… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 7 09:27:01 2021 +0200 dbghelp: Set is_first and is_last flags on the fly in symt_add_func_line. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index ee68967ce5d..e91f0dd1e07 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -320,6 +320,8 @@ void symt_add_func_line(struct module* module, struct symt_function* func, unsigned source_idx, int line_num, ULONG_PTR offset) { struct line_info* dli; + unsigned vlen; + struct line_info* prev; BOOL last_matches = FALSE; int i; @@ -340,19 +342,24 @@ void symt_add_func_line(struct module* module, struct symt_function* func, break; } } - + vlen = vector_length(&func->vlines); + prev = vlen ? vector_at(&func->vlines, vlen - 1) : NULL; if (!last_matches) { /* we shouldn't have line changes on first line of function */ dli = vector_add(&func->vlines, &module->pool); dli->is_source_file = 1; - dli->is_first = dli->is_last = 0; + dli->is_first = (prev == NULL); + dli->is_last = 0; dli->line_number = 0; dli->u.source_file = source_idx; } + /* clear previous last */ + if (prev) prev->is_last = 0; dli = vector_add(&func->vlines, &module->pool); dli->is_source_file = 0; - dli->is_first = dli->is_last = 0; + dli->is_first = 0; /* only a source file can be first */ + dli->is_last = 1; dli->line_number = line_num; dli->u.pc_offset = func->address + offset; } @@ -465,9 +472,6 @@ struct symt_hierarchy_point* symt_add_function_point(struct module* module, BOOL symt_normalize_function(struct module* module, const struct symt_function* func) { - unsigned len; - struct line_info* dli; - assert(func); /* We aren't adding any more locals or line numbers to this function. * Free any spare memory that we might have allocated. @@ -477,12 +481,6 @@ BOOL symt_normalize_function(struct module* module, const struct symt_function* /* EPP vector_pool_normalize(&func->vlines, &module->pool); */ /* EPP vector_pool_normalize(&func->vchildren, &module->pool); */ - len = vector_length(&func->vlines); - if (len--) - { - dli = vector_at(&func->vlines, 0); dli->is_first = 1; - dli = vector_at(&func->vlines, len); dli->is_last = 1; - } return TRUE; }

1 0

Eric Pouech : dbghelp: Rewrite SymGetLinePrev* with internal_line_t.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: cd8b85e4a9f5477bfd137ef5a03ad0bf3d55f891 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd8b85e4a9f5477bfd137ef5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 7 09:26:55 2021 +0200 dbghelp: Rewrite SymGetLinePrev* with internal_line_t. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 118 +++++++++++++++++++++------------------------- 2 files changed, 55 insertions(+), 65 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 1d95c7a21ff..39820a98566 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -95,7 +95,7 @@ @ stdcall SymGetLineNextW64(long ptr) @ stdcall SymGetLinePrev(long ptr) @ stdcall SymGetLinePrev64(long ptr) -@ stub SymGetLinePrevW64 +@ stdcall SymGetLinePrevW64(long ptr) @ stdcall SymGetModuleBase(long long) @ stdcall SymGetModuleBase64(long int64) @ stdcall SymGetModuleInfo(long long ptr) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 25bb21edeaa..ee68967ce5d 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1719,32 +1719,6 @@ BOOL WINAPI SymGetSymPrev(HANDLE hProcess, PIMAGEHLP_SYMBOL Symbol) return FALSE; } -/****************************************************************** - * copy_line_64_from_32 (internal) - * - */ -static void copy_line_64_from_32(IMAGEHLP_LINE64* l64, const IMAGEHLP_LINE* l32) - -{ - l64->Key = l32->Key; - l64->LineNumber = l32->LineNumber; - l64->FileName = l32->FileName; - l64->Address = l32->Address; -} - -/****************************************************************** - * copy_line_32_from_64 (internal) - * - */ -static void copy_line_32_from_64(IMAGEHLP_LINE* l32, const IMAGEHLP_LINE64* l64) - -{ - l32->Key = l64->Key; - l32->LineNumber = l64->LineNumber; - l32->FileName = l64->FileName; - l32->Address = l64->Address; -} - /****************************************************************** * SymGetLineFromAddr (DBGHELP.@) * @@ -1796,50 +1770,33 @@ BOOL WINAPI SymGetLineFromAddrW64(HANDLE hProcess, DWORD64 dwAddr, return internal_line_copy_toW64(&intl, Line); } -/****************************************************************** - * SymGetLinePrev64 (DBGHELP.@) - * - */ -BOOL WINAPI SymGetLinePrev64(HANDLE hProcess, PIMAGEHLP_LINE64 Line) +static BOOL symt_get_func_line_prev(HANDLE hProcess, struct internal_line_t* intl, void* key, DWORD64 addr) { struct module_pair pair; struct line_info* li; - BOOL in_search = FALSE; - - TRACE("(%p %p)\n", hProcess, Line); - - if (Line->SizeOfStruct < sizeof(*Line)) return FALSE; + struct line_info* srcli; pair.pcs = process_find_by_handle(hProcess); if (!pair.pcs) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, Line->Address, DMT_UNKNOWN); + pair.requested = module_find_by_addr(pair.pcs, addr, DMT_UNKNOWN); if (!module_get_debug(&pair)) return FALSE; - if (Line->Key == 0) return FALSE; - li = Line->Key; - /* things are a bit complicated because when we encounter a DLIT_SOURCEFILE - * element we have to go back until we find the prev one to get the real - * source file name for the DLIT_OFFSET element just before - * the first DLIT_SOURCEFILE - */ + if (key == NULL) return FALSE; + + li = key; + while (!li->is_first) { li--; if (!li->is_source_file) { - Line->LineNumber = li->line_number; - Line->Address = li->u.pc_offset; - Line->Key = li; - if (!in_search) return TRUE; - } - else - { - if (in_search) - { - Line->FileName = (char*)source_get(pair.effective, li->u.source_file); - return TRUE; - } - in_search = TRUE; + intl->line_number = li->line_number; + intl->address = li->u.pc_offset; + intl->key = li; + /* search source file */ + for (srcli = li; !srcli->is_source_file; srcli--); + + return internal_line_set_nameA(pair.pcs, intl, (char*)source_get(pair.effective, srcli->u.source_file), FALSE); } } SetLastError(ERROR_NO_MORE_ITEMS); /* FIXME */ @@ -1847,18 +1804,51 @@ BOOL WINAPI SymGetLinePrev64(HANDLE hProcess, PIMAGEHLP_LINE64 Line) } /****************************************************************** - * SymGetLinePrev (DBGHELP.@) + * SymGetLinePrev64 (DBGHELP.@) + * + */ +BOOL WINAPI SymGetLinePrev64(HANDLE hProcess, PIMAGEHLP_LINE64 Line) +{ + struct internal_line_t intl; + + TRACE("(%p %p)\n", hProcess, Line); + + if (Line->SizeOfStruct < sizeof(*Line)) return FALSE; + init_internal_line(&intl, FALSE); + if (!symt_get_func_line_prev(hProcess, &intl, Line->Key, Line->Address)) return FALSE; + return internal_line_copy_toA64(&intl, Line); +} + +/****************************************************************** + * SymGetLinePrev (DBGHELP.@) * */ BOOL WINAPI SymGetLinePrev(HANDLE hProcess, PIMAGEHLP_LINE Line) { - IMAGEHLP_LINE64 line64; + struct internal_line_t intl; - line64.SizeOfStruct = sizeof(line64); - copy_line_64_from_32(&line64, Line); - if (!SymGetLinePrev64(hProcess, &line64)) return FALSE; - copy_line_32_from_64(Line, &line64); - return TRUE; + TRACE("(%p %p)\n", hProcess, Line); + + if (Line->SizeOfStruct < sizeof(*Line)) return FALSE; + init_internal_line(&intl, FALSE); + if (!symt_get_func_line_prev(hProcess, &intl, Line->Key, Line->Address)) return FALSE; + return internal_line_copy_toA32(&intl, Line); +} + +/****************************************************************** + * SymGetLinePrevW64 (DBGHELP.@) + * + */ +BOOL WINAPI SymGetLinePrevW64(HANDLE hProcess, PIMAGEHLP_LINEW64 Line) +{ + struct internal_line_t intl; + + TRACE("(%p %p)\n", hProcess, Line); + + if (Line->SizeOfStruct < sizeof(*Line)) return FALSE; + init_internal_line(&intl, TRUE); + if (!symt_get_func_line_prev(hProcess, &intl, Line->Key, Line->Address)) return FALSE; + return internal_line_copy_toW64(&intl, Line); } static BOOL symt_get_func_line_next(HANDLE hProcess, struct internal_line_t* intl, void* key, DWORD64 addr)

1 0

Eric Pouech : dbghelp: Implement all SymGetLineNext* functions using internal_line_t.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 8557fd5b347b8b573b7b3ed640b31206c3e18ee1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8557fd5b347b8b573b7b3ed6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 7 09:26:49 2021 +0200 dbghelp: Implement all SymGetLineNext* functions using internal_line_t. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 69 +++++++++++++++++++++++++++++++---------------- 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 73455c547e8..1d95c7a21ff 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -92,7 +92,7 @@ @ stdcall SymGetLineFromNameW64(long wstr wstr long ptr ptr) @ stdcall SymGetLineNext(long ptr) @ stdcall SymGetLineNext64(long ptr) -@ stub SymGetLineNextW64 +@ stdcall SymGetLineNextW64(long ptr) @ stdcall SymGetLinePrev(long ptr) @ stdcall SymGetLinePrev64(long ptr) @ stub SymGetLinePrevW64 diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index d79b32a0b5a..25bb21edeaa 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1861,24 +1861,35 @@ BOOL WINAPI SymGetLinePrev(HANDLE hProcess, PIMAGEHLP_LINE Line) return TRUE; } -static BOOL symt_get_func_line_next(const struct module* module, PIMAGEHLP_LINE64 line) +static BOOL symt_get_func_line_next(HANDLE hProcess, struct internal_line_t* intl, void* key, DWORD64 addr) { + struct module_pair pair; struct line_info* li; + struct line_info* srcli; + + if (key == NULL) return FALSE; + pair.pcs = process_find_by_handle(hProcess); + if (!pair.pcs) return FALSE; + pair.requested = module_find_by_addr(pair.pcs, addr, DMT_UNKNOWN); + if (!module_get_debug(&pair)) return FALSE; - if (line->Key == 0) return FALSE; - li = line->Key; + /* search current source file */ + for (srcli = key; !srcli->is_source_file; srcli--); + + li = key; while (!li->is_last) { li++; if (!li->is_source_file) { - line->LineNumber = li->line_number; - line->Address = li->u.pc_offset; - line->Key = li; - return TRUE; + intl->line_number = li->line_number; + intl->address = li->u.pc_offset; + intl->key = li; + return internal_line_set_nameA(pair.pcs, intl, (char*)source_get(pair.effective, srcli->u.source_file), FALSE); } - line->FileName = (char*)source_get(module, li->u.source_file); + srcli = li; } + SetLastError(ERROR_NO_MORE_ITEMS); /* FIXME */ return FALSE; } @@ -1888,19 +1899,14 @@ static BOOL symt_get_func_line_next(const struct module* module, PIMAGEHLP_LINE6 */ BOOL WINAPI SymGetLineNext64(HANDLE hProcess, PIMAGEHLP_LINE64 Line) { - struct module_pair pair; + struct internal_line_t intl; TRACE("(%p %p)\n", hProcess, Line); if (Line->SizeOfStruct < sizeof(*Line)) return FALSE; - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, Line->Address, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; - - if (symt_get_func_line_next(pair.effective, Line)) return TRUE; - SetLastError(ERROR_NO_MORE_ITEMS); /* FIXME */ - return FALSE; + init_internal_line(&intl, FALSE); + if (!symt_get_func_line_next(hProcess, &intl, Line->Key, Line->Address)) return FALSE; + return internal_line_copy_toA64(&intl, Line); } /****************************************************************** @@ -1909,13 +1915,30 @@ BOOL WINAPI SymGetLineNext64(HANDLE hProcess, PIMAGEHLP_LINE64 Line) */ BOOL WINAPI SymGetLineNext(HANDLE hProcess, PIMAGEHLP_LINE Line) { - IMAGEHLP_LINE64 line64; + struct internal_line_t intl; - line64.SizeOfStruct = sizeof(line64); - copy_line_64_from_32(&line64, Line); - if (!SymGetLineNext64(hProcess, &line64)) return FALSE; - copy_line_32_from_64(Line, &line64); - return TRUE; + TRACE("(%p %p)\n", hProcess, Line); + + if (Line->SizeOfStruct < sizeof(*Line)) return FALSE; + init_internal_line(&intl, FALSE); + if (!symt_get_func_line_next(hProcess, &intl, Line->Key, Line->Address)) return FALSE; + return internal_line_copy_toA32(&intl, Line); +} + +/****************************************************************** + * SymGetLineNextW64 (DBGHELP.@) + * + */ +BOOL WINAPI SymGetLineNextW64(HANDLE hProcess, PIMAGEHLP_LINEW64 Line) +{ + struct internal_line_t intl; + + TRACE("(%p %p)\n", hProcess, Line); + + if (Line->SizeOfStruct < sizeof(*Line)) return FALSE; + init_internal_line(&intl, TRUE); + if (!symt_get_func_line_next(hProcess, &intl, Line->Key, Line->Address)) return FALSE; + return internal_line_copy_toW64(&intl, Line); } /***********************************************************************

1 0

Eric Pouech : dbghelp: Add internal_line_t structure as help in Line manipulation.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: fabc4f7e124a50a22da258987d8ca410203e90d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fabc4f7e124a50a22da25898… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 7 09:26:43 2021 +0200 dbghelp: Add internal_line_t structure as help in Line manipulation. the rationale is that: - the file name in IMAGEHLP_LINE* structures is returned as a pointer to an internal buffer - in the W64 variant of APIs, two calls to fetch_buffer() are currently needed (one for first A allocation, second for W conversion) - this generate bugs as it's assumed the two buffers are different so the internal_line_t purpose is to factorize the implementations of the 3 variants (A32, A64, W64) into a single code path this insures a unique allocation, and at most, one conversion Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 206 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 146 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fabc4f7e124a50a22da2…

1 0

Eric Pouech : dbghelp: Make symt_fill_func_line_info() and symt_get_func_line_next() static functions inside symbol.c.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: d459301de64b2152671464ab951048f6322c3c3d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d459301de64b2152671464ab… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 7 09:26:36 2021 +0200 dbghelp: Make symt_fill_func_line_info() and symt_get_func_line_next() static functions inside symbol.c. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 4 ---- dlls/dbghelp/stabs.c | 6 ++++-- dlls/dbghelp/symbol.c | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 0c324a827e9..162e8bc004d 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -772,10 +772,6 @@ extern struct symt_hierarchy_point* enum SymTagEnum point, const struct location* loc, const char* name) DECLSPEC_HIDDEN; -extern BOOL symt_fill_func_line_info(const struct module* module, - const struct symt_function* func, - DWORD64 addr, IMAGEHLP_LINE64* line) DECLSPEC_HIDDEN; -extern BOOL symt_get_func_line_next(const struct module* module, PIMAGEHLP_LINE64 line) DECLSPEC_HIDDEN; extern struct symt_thunk* symt_new_thunk(struct module* module, struct symt_compiland* parent, diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index b011c123482..bdafb98bbd4 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1193,14 +1193,16 @@ static void stabs_finalize_function(struct module* module, struct symt_function* { IMAGEHLP_LINE64 il; struct location loc; + DWORD disp; if (!func) return; symt_normalize_function(module, func); /* To define the debug-start of the function, we use the second line number. * Not 100% bullet proof, but better than nothing */ - if (symt_fill_func_line_info(module, func, func->address, &il) && - symt_get_func_line_next(module, &il)) + il.SizeOfStruct = sizeof(il); + if (SymGetLineFromAddr64(module->process->handle, func->address, &disp, &il) && + SymGetLineNext64(module->process->handle, &il)) { loc.kind = loc_absolute; loc.offset = il.Address - func->address; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 09407e04fc0..b0e96569f15 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1521,8 +1521,8 @@ BOOL WINAPI SymGetSymFromName(HANDLE hProcess, PCSTR Name, PIMAGEHLP_SYMBOL Symb * * fills information about a file */ -BOOL symt_fill_func_line_info(const struct module* module, const struct symt_function* func, - DWORD64 addr, IMAGEHLP_LINE64* line) +static BOOL symt_fill_func_line_info(const struct module* module, const struct symt_function* func, + DWORD64 addr, IMAGEHLP_LINE64* line) { struct line_info* dli = NULL; BOOL found = FALSE; @@ -1775,7 +1775,7 @@ BOOL WINAPI SymGetLinePrev(HANDLE hProcess, PIMAGEHLP_LINE Line) return TRUE; } -BOOL symt_get_func_line_next(const struct module* module, PIMAGEHLP_LINE64 line) +static BOOL symt_get_func_line_next(const struct module* module, PIMAGEHLP_LINE64 line) { struct line_info* li;

1 0

Giovanni Mascellani : tzres: Take timezone display names from Unicode CLDR database.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: c825fc45be4d96d9978ea0af222310ead6107425 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c825fc45be4d96d9978ea0af… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Sep 6 17:36:28 2021 +0200 tzres: Take timezone display names from Unicode CLDR database. The name from CLDR is made available both in the Display and MUI_Display fields, reproducing the Windows behavior. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 2 +- dlls/tzres/tzres.rc | 138 +++++ loader/wine.inf.in | 414 ++++++++++----- po/ar.po | 1082 +++++++++++++++++++++++++++++---------- po/ast.po | 1082 +++++++++++++++++++++++++++++---------- po/bg.po | 1082 +++++++++++++++++++++++++++++---------- po/ca.po | 1096 ++++++++++++++++++++++++++++++---------- po/cs.po | 1082 +++++++++++++++++++++++++++++---------- po/da.po | 1082 +++++++++++++++++++++++++++++---------- po/de.po | 1096 ++++++++++++++++++++++++++++++---------- po/el.po | 1082 +++++++++++++++++++++++++++++---------- po/en.po | 1080 +++++++++++++++++++++++++++++---------- po/en_US.po | 1080 +++++++++++++++++++++++++++++---------- po/eo.po | 1082 +++++++++++++++++++++++++++++---------- po/es.po | 1096 ++++++++++++++++++++++++++++++---------- po/fa.po | 1081 +++++++++++++++++++++++++++++---------- po/fi.po | 1096 ++++++++++++++++++++++++++++++---------- po/fr.po | 1082 +++++++++++++++++++++++++++++---------- po/he.po | 1082 +++++++++++++++++++++++++++++---------- po/hi.po | 1082 +++++++++++++++++++++++++++++---------- po/hr.po | 1082 +++++++++++++++++++++++++++++---------- po/hu.po | 1082 +++++++++++++++++++++++++++++---------- po/it.po | 1082 +++++++++++++++++++++++++++++---------- po/ja.po | 1096 ++++++++++++++++++++++++++++++---------- po/ko.po | 1096 ++++++++++++++++++++++++++++++---------- po/lt.po | 1096 ++++++++++++++++++++++++++++++---------- po/ml.po | 1082 +++++++++++++++++++++++++++++---------- po/nb_NO.po | 1082 +++++++++++++++++++++++++++++---------- po/nl.po | 1096 ++++++++++++++++++++++++++++++---------- po/or.po | 1082 +++++++++++++++++++++++++++++---------- po/pa.po | 1082 +++++++++++++++++++++++++++++---------- po/pl.po | 1096 ++++++++++++++++++++++++++++++---------- po/pt_BR.po | 1096 ++++++++++++++++++++++++++++++---------- po/pt_PT.po | 1082 +++++++++++++++++++++++++++++---------- po/rm.po | 1082 +++++++++++++++++++++++++++++---------- po/ro.po | 1082 +++++++++++++++++++++++++++++---------- po/ru.po | 1082 +++++++++++++++++++++++++++++---------- po/si.po | 1096 ++++++++++++++++++++++++++++++---------- po/sk.po | 1082 +++++++++++++++++++++++++++++---------- po/sl.po | 1082 +++++++++++++++++++++++++++++---------- po/sr_RS(a)cyrillic.po | 1081 +++++++++++++++++++++++++++++---------- po/sr_RS(a)latin.po | 1081 +++++++++++++++++++++++++++++---------- po/sv.po | 1082 +++++++++++++++++++++++++++++---------- po/ta.po | 1082 +++++++++++++++++++++++++++++---------- po/te.po | 1082 +++++++++++++++++++++++++++++---------- po/th.po | 1081 +++++++++++++++++++++++++++++---------- po/tr.po | 1096 ++++++++++++++++++++++++++++++---------- po/uk.po | 1096 ++++++++++++++++++++++++++++++---------- po/wa.po | 1081 +++++++++++++++++++++++++++++---------- po/wine.pot | 1082 +++++++++++++++++++++++++++++---------- po/zh_CN.po | 1096 ++++++++++++++++++++++++++++++---------- po/zh_TW.po | 1082 +++++++++++++++++++++++++++++---------- 52 files changed, 40673 insertions(+), 13086 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c825fc45be4d96d9978e…

1 0

Giovanni Mascellani : tzres: Regenerate TZ data from de facto standard sources.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 3e370f761a24878ae4047fd7803673d108bea430 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e370f761a24878ae4047fd7… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Sep 6 17:36:27 2021 +0200 tzres: Regenerate TZ data from de facto standard sources. The sources used to regenerate data are: * The Olson database, tracing all world time zone changes since 1970, widely used under Unix systems and dedicated to the public domain. * Unicode CLDR's windowsZones.xml, used by Windows itself as source for naming timezones and providing the correspondance with the Olson zones. It is licensed under a MIT-styled license. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/time.c | 22 +- dlls/tzres/tzres.rc | 52 ++ loader/wine.inf.in | 1800 +++++++++++++++++++++++++++++++++++++------- po/ar.po | 674 +++++++++++------ po/ast.po | 674 +++++++++++------ po/bg.po | 606 +++++++++------ po/ca.po | 678 +++++++++++------ po/cs.po | 674 +++++++++++------ po/da.po | 674 +++++++++++------ po/de.po | 674 +++++++++++------ po/el.po | 606 +++++++++------ po/en.po | 606 +++++++++------ po/en_US.po | 606 +++++++++------ po/eo.po | 674 +++++++++++------ po/es.po | 678 +++++++++++------ po/fa.po | 644 ++++++++++------ po/fi.po | 674 +++++++++++------ po/fr.po | 674 +++++++++++------ po/he.po | 674 +++++++++++------ po/hi.po | 606 +++++++++------ po/hr.po | 674 +++++++++++------ po/hu.po | 674 +++++++++++------ po/it.po | 674 +++++++++++------ po/ja.po | 678 +++++++++++------ po/ko.po | 678 +++++++++++------ po/lt.po | 674 +++++++++++------ po/ml.po | 606 +++++++++------ po/nb_NO.po | 674 +++++++++++------ po/nl.po | 674 +++++++++++------ po/or.po | 606 +++++++++------ po/pa.po | 606 +++++++++------ po/pl.po | 678 +++++++++++------ po/pt_BR.po | 678 +++++++++++------ po/pt_PT.po | 674 +++++++++++------ po/rm.po | 606 +++++++++------ po/ro.po | 674 +++++++++++------ po/ru.po | 606 +++++++++------ po/si.po | 678 +++++++++++------ po/sk.po | 674 +++++++++++------ po/sl.po | 674 +++++++++++------ po/sr_RS(a)cyrillic.po | 648 ++++++++++------ po/sr_RS(a)latin.po | 648 ++++++++++------ po/sv.po | 674 +++++++++++------ po/ta.po | 606 +++++++++------ po/te.po | 606 +++++++++------ po/th.po | 644 ++++++++++------ po/tr.po | 678 +++++++++++------ po/uk.po | 678 +++++++++++------ po/wa.po | 644 ++++++++++------ po/wine.pot | 606 +++++++++------ po/zh_CN.po | 678 +++++++++++------ po/zh_TW.po | 674 +++++++++++------ 52 files changed, 22960 insertions(+), 10954 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e370f761a24878ae404…

1 0

Jacek Caban : gdi32: Don't use gdi_private.h and ntgdi_private.h at the same time.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 3361a2f2ba6c42b9f4849c102dbe2c38df6c477b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3361a2f2ba6c42b9f4849c10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 14:11:38 2021 +0200 gdi32: Don't use gdi_private.h and ntgdi_private.h at the same time. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 2 +- dlls/gdi32/dib.c | 2 +- dlls/gdi32/emfdc.c | 2 +- dlls/gdi32/enhmetafile.c | 4 +++- dlls/gdi32/gdi_private.h | 16 ++++++++++++++++ dlls/gdi32/metadc.c | 1 - dlls/gdi32/metafile.c | 23 ++++++++++++++++++++++- dlls/gdi32/ntgdi_private.h | 3 ++- 8 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index d8eaa1093f3..4ed09e91eb1 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -30,7 +30,7 @@ #include "winternl.h" #include "winerror.h" #include "ntgdi_private.h" -#include "gdi_private.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(dc); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index b504e8c1a01..f539df6d41e 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -93,7 +93,7 @@ static const struct gdi_obj_funcs dib_funcs = * * Return the size of the bitmap info structure including color table. */ -int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) +static int bitmap_info_size( const BITMAPINFO *info, WORD coloruse ) { unsigned int colors, size, masks = 0; diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 2e237ff26ae..df4515aee8e 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -21,9 +21,9 @@ */ #include <assert.h> +#include <stdlib.h> #include "gdi_private.h" -#include "ntgdi_private.h" #include "winnls.h" #include "wine/debug.h" diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index a3147c9b0c4..4b1ccaa9206 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -35,13 +35,15 @@ #include <stdlib.h> #include <string.h> #include <assert.h> +#include <math.h> + #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winnls.h" #include "winerror.h" -#include "ntgdi_private.h" #include "gdi_private.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index af152e10644..2dddf361d5b 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -23,6 +23,7 @@ #define __WINE_GDI_PRIVATE_H #include <stdarg.h> +#include <limits.h> #include "windef.h" #include "winbase.h" @@ -273,4 +274,19 @@ extern HENHMETAFILE EMF_Create_HENHMETAFILE( ENHMETAHEADER *emh, DWORD filesize, extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void *bits, UINT *usage ) DECLSPEC_HIDDEN; +static inline int get_dib_stride( int width, int bpp ) +{ + return ((width * bpp + 31) >> 3) & ~3; +} + +/* only for use on sanitized BITMAPINFO structures */ +static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse ) +{ + if (info->bmiHeader.biCompression == BI_BITFIELDS) + return sizeof(BITMAPINFOHEADER) + 3 * sizeof(DWORD); + if (coloruse == DIB_PAL_COLORS) + return sizeof(BITMAPINFOHEADER) + info->bmiHeader.biClrUsed * sizeof(WORD); + return FIELD_OFFSET( BITMAPINFO, bmiColors[info->bmiHeader.biClrUsed] ); +} + #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/metadc.c b/dlls/gdi32/metadc.c index f988118f29a..6b93dab63ce 100644 --- a/dlls/gdi32/metadc.c +++ b/dlls/gdi32/metadc.c @@ -22,7 +22,6 @@ #include <stdarg.h> -#include "ntgdi_private.h" #include "gdi_private.h" #include "winnls.h" #include "wine/wingdi16.h" diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 07f467914cc..3a49ec6be3d 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -56,7 +56,7 @@ #include "winnls.h" #include "winternl.h" #include "gdi_private.h" -#include "ntgdi_private.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(metafile); @@ -110,6 +110,27 @@ HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) return handle; } +static int bitmap_info_size( const BITMAPINFO *info, WORD coloruse ) +{ + unsigned int colors, size, masks = 0; + + if (info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)info; + colors = (core->bcBitCount <= 8) ? 1 << core->bcBitCount : 0; + return sizeof(BITMAPCOREHEADER) + colors * + ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBTRIPLE) : sizeof(WORD)); + } + else /* assume BITMAPINFOHEADER */ + { + if (info->bmiHeader.biClrUsed) colors = min( info->bmiHeader.biClrUsed, 256 ); + else colors = info->bmiHeader.biBitCount > 8 ? 0 : 1 << info->bmiHeader.biBitCount; + if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; + size = max( info->bmiHeader.biSize, sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) ); + return size + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); + } +} + /****************************************************************** * convert_points * diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 1e379649591..7f21608b244 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -180,7 +180,6 @@ extern void DC_InitDC( DC * dc ) DECLSPEC_HIDDEN; extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; /* dib.c */ -extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; extern BOOL fill_color_table_from_pal_colors( BITMAPINFO *info, HDC hdc ) DECLSPEC_HIDDEN; extern const RGBQUAD *get_default_color_table( int bpp ) DECLSPEC_HIDDEN; extern void fill_default_color_table( BITMAPINFO *info ) DECLSPEC_HIDDEN; @@ -645,6 +644,8 @@ static inline void copy_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *src ) extern void CDECL free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; +void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN; + extern HMODULE gdi32_module DECLSPEC_HIDDEN; #endif /* __WINE_NTGDI_PRIVATE_H */

1 0

Jacek Caban : gdi32: Move metafile defines to gdi_private.h.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: 691cb12e5bf04be5547d874c3ed6a4e58b49ddcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=691cb12e5bf04be5547d874c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 14:11:28 2021 +0200 gdi32: Move metafile defines to gdi_private.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdi_private.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/ntgdi_private.h | 43 ------------------------------------------- 2 files changed, 45 insertions(+), 43 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 7ed11a17e2e..af152e10644 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -42,6 +42,35 @@ static inline DWORD gdi_handle_type( HGDIOBJ obj ) return handle & NTGDI_HANDLE_TYPE_MASK; } +/* metafile defines */ + +#define META_EOF 0x0000 + +#define METAFILE_MEMORY 1 +#define METAFILE_DISK 2 + +#define MFVERSION 0x300 + +/* Undocumented value for DIB's iUsage: Indicates a mono DIB w/o pal entries */ +#define DIB_PAL_MONO 2 + +/* Format of comment record added by GetWinMetaFileBits */ +#include <pshpack2.h> +typedef struct +{ + DWORD comment_id; /* WMFC */ + DWORD comment_type; /* Always 0x00000001 */ + DWORD version; /* Always 0x00010000 */ + WORD checksum; + DWORD flags; /* Always 0 */ + DWORD num_chunks; + DWORD chunk_size; + DWORD remaining_size; + DWORD emf_size; + BYTE emf_data[1]; +} emf_in_wmf_comment; +#include <poppack.h> + static inline BOOL is_meta_dc( HDC hdc ) { return gdi_handle_type( hdc ) == NTGDI_OBJ_METADC; @@ -124,7 +153,20 @@ extern INT METADC_StretchDIBits( HDC hdc, INT x_dst, INT y_dst, INT width_dst, INT x_src, INT y_src, INT width_src, INT height_src, const void *bits, const BITMAPINFO *info, UINT coloruse, DWORD rop ) DECLSPEC_HIDDEN; + +extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; + /* enhanced metafiles */ + +#define WMFC_MAGIC 0x43464d57 + +typedef struct +{ + EMR emr; + INT nBreakExtra; + INT nBreakCount; +} EMRSETTEXTJUSTIFICATION, *PEMRSETTEXTJUSTIFICATION; + extern BOOL EMFDC_AbortPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_AlphaBlend( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT width_dst, INT height_dst, HDC hdc_src, INT x_src, INT y_src, INT width_src, INT height_src, @@ -225,6 +267,9 @@ extern BOOL EMFDC_StrokeAndFillPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_StrokePath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; extern BOOL EMFDC_WidenPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; +extern HENHMETAFILE EMF_Create_HENHMETAFILE( ENHMETAHEADER *emh, DWORD filesize, + BOOL on_disk ) DECLSPEC_HIDDEN; + extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void *bits, UINT *usage ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index 3f241a87dbc..1e379649591 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -30,21 +30,6 @@ #include "ntgdi.h" #include "wine/gdi_driver.h" -/* Metafile defines */ -#define META_EOF 0x0000 -/* values of mtType in METAHEADER. Note however that the disk image of a disk - based metafile has mtType == 1 */ -#define METAFILE_MEMORY 1 -#define METAFILE_DISK 2 -#define MFHEADERSIZE (sizeof(METAHEADER)) -#define MFVERSION 0x300 - -typedef struct { - EMR emr; - INT nBreakExtra; - INT nBreakCount; -} EMRSETTEXTJUSTIFICATION, *PEMRSETTEXTJUSTIFICATION; - /* extra stock object: default 1x1 bitmap for memory DCs */ #define DEFAULT_BITMAP (STOCK_LAST+1) @@ -237,9 +222,6 @@ extern const struct gdi_dc_funcs font_driver DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs *DRIVER_load_driver( LPCWSTR name ) DECLSPEC_HIDDEN; extern BOOL DRIVER_GetDriverName( LPCWSTR device, LPWSTR driver, DWORD size ) DECLSPEC_HIDDEN; -/* enhmetafile.c */ -extern HENHMETAFILE EMF_Create_HENHMETAFILE(ENHMETAHEADER *emh, DWORD filesize, BOOL on_disk ) DECLSPEC_HIDDEN; - /* font.c */ struct font_gamma_ramp @@ -410,28 +392,6 @@ extern BOOL set_map_mode( DC *dc, int mode ) DECLSPEC_HIDDEN; extern void combine_transform( XFORM *result, const XFORM *xform1, const XFORM *xform2 ) DECLSPEC_HIDDEN; -/* metafile.c */ -extern HMETAFILE MF_Create_HMETAFILE(METAHEADER *mh) DECLSPEC_HIDDEN; - -/* Format of comment record added by GetWinMetaFileBits */ -#include <pshpack2.h> -typedef struct -{ - DWORD comment_id; /* WMFC */ - DWORD comment_type; /* Always 0x00000001 */ - DWORD version; /* Always 0x00010000 */ - WORD checksum; - DWORD flags; /* Always 0 */ - DWORD num_chunks; - DWORD chunk_size; - DWORD remaining_size; - DWORD emf_size; - BYTE emf_data[1]; -} emf_in_wmf_comment; -#include <poppack.h> - -#define WMFC_MAGIC 0x43464d57 - /* driver.c */ extern BOOL is_display_device( LPCWSTR name ) DECLSPEC_HIDDEN; @@ -566,9 +526,6 @@ static inline DC *get_physdev_dc( PHYSDEV dev ) return get_nulldrv_dc( dev ); } -/* Undocumented value for DIB's iUsage: Indicates a mono DIB w/o pal entries */ -#define DIB_PAL_MONO 2 - BOOL WINAPI FontIsLinked(HDC); BOOL WINAPI SetVirtualResolution(HDC hdc, DWORD horz_res, DWORD vert_res, DWORD horz_size, DWORD vert_size);

1 0

Jacek Caban : gdi32: Move get_full_gdi_handle to objects.c.
by Alexandre Julliard 07 Sep '21

07 Sep '21

Module: wine Branch: master Commit: c0cdf0652f9f8c630d6c0e6a82e580d43d42463a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0cdf0652f9f8c630d6c0e6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 14:11:15 2021 +0200 gdi32: Move get_full_gdi_handle to objects.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/emfdc.c | 2 +- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdidc.c | 1 + dlls/gdi32/gdiobj.c | 18 ------------------ dlls/gdi32/metadc.c | 2 +- dlls/gdi32/ntgdi_private.h | 1 - dlls/gdi32/objects.c | 10 ++++++++++ dlls/gdi32/palette.c | 3 --- 8 files changed, 14 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index 0fb2d99dcef..2e237ff26ae 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -121,7 +121,7 @@ static UINT emfdc_add_handle( struct emf *emf, HGDIOBJ obj ) emf->handles, emf->handles_size * sizeof(emf->handles[0]) ); } - emf->handles[index] = get_full_gdi_handle( obj ); + emf->handles[index] = obj; emf->cur_handles++; if (emf->cur_handles > emf->emh->nHandles) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 7a4a8773f3f..7ed11a17e2e 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -31,6 +31,7 @@ void set_gdi_client_ptr( HGDIOBJ handle, void *ptr ) DECLSPEC_HIDDEN; void *get_gdi_client_ptr( HGDIOBJ handle, DWORD type ) DECLSPEC_HIDDEN; DC_ATTR *get_dc_attr( HDC hdc ) DECLSPEC_HIDDEN; +HGDIOBJ get_full_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; void GDI_hdc_using_object( HGDIOBJ obj, HDC hdc, void (*delete)( HDC hdc, HGDIOBJ handle )) DECLSPEC_HIDDEN; void GDI_hdc_not_using_object( HGDIOBJ obj, HDC hdc ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 7f1a5a9cd24..d5645595984 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1838,6 +1838,7 @@ HPALETTE WINAPI SelectPalette( HDC hdc, HPALETTE palette, BOOL force_background { DC_ATTR *dc_attr; + palette = get_full_gdi_handle( palette ); if (is_meta_dc( hdc )) return ULongToHandle( METADC_SelectPalette( hdc, palette ) ); if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; if (dc_attr->emf && !EMFDC_SelectPalette( dc_attr, palette )) return 0; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 70148cdcb77..5787231d087 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -817,24 +817,6 @@ void *free_gdi_handle( HGDIOBJ handle ) } -/*********************************************************************** - * get_full_gdi_handle - * - * Return the full GDI handle from a possibly truncated value. - */ -HGDIOBJ get_full_gdi_handle( HGDIOBJ handle ) -{ - GDI_HANDLE_ENTRY *entry; - - if (!HIWORD( handle )) - { - EnterCriticalSection( &gdi_section ); - if ((entry = handle_entry( handle ))) handle = entry_to_handle( entry ); - LeaveCriticalSection( &gdi_section ); - } - return handle; -} - /*********************************************************************** * get_any_obj_ptr * diff --git a/dlls/gdi32/metadc.c b/dlls/gdi32/metadc.c index f4b313ba5db..f988118f29a 100644 --- a/dlls/gdi32/metadc.c +++ b/dlls/gdi32/metadc.c @@ -491,7 +491,7 @@ static UINT metadc_add_handle( struct metadc *metadc, HGDIOBJ obj ) metadc->handles, metadc->handles_size * sizeof(metadc->handles[0]) ); } - metadc->handles[index] = get_full_gdi_handle( obj ); + metadc->handles[index] = obj; metadc->cur_handles++; if (metadc->cur_handles > metadc->mh->mtNoObjects) diff --git a/dlls/gdi32/ntgdi_private.h b/dlls/gdi32/ntgdi_private.h index b8273e8a405..3f241a87dbc 100644 --- a/dlls/gdi32/ntgdi_private.h +++ b/dlls/gdi32/ntgdi_private.h @@ -392,7 +392,6 @@ extern BOOL translate_charset_info( DWORD *src, CHARSETINFO *cs, DWORD flags ) D extern HGDIOBJ alloc_gdi_handle( struct gdi_obj_header *obj, DWORD type, const struct gdi_obj_funcs *funcs ) DECLSPEC_HIDDEN; extern void *free_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; -extern HGDIOBJ get_full_gdi_handle( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void *GDI_GetObjPtr( HGDIOBJ, DWORD ) DECLSPEC_HIDDEN; extern void *get_any_obj_ptr( HGDIOBJ, DWORD * ) DECLSPEC_HIDDEN; extern void GDI_ReleaseObj( HGDIOBJ ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 5b1145c52a2..97b0fec5ecf 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -123,6 +123,12 @@ void *get_gdi_client_ptr( HGDIOBJ obj, DWORD type ) return (void *)(UINT_PTR)entry->UserPointer; } +HGDIOBJ get_full_gdi_handle( HGDIOBJ obj ) +{ + GDI_HANDLE_ENTRY *entry = handle_entry( obj ); + return entry ? entry_to_handle( entry ) : 0; +} + /*********************************************************************** * GetObjectType (GDI32.@) */ @@ -171,6 +177,7 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj ) struct hdc_list *hdc_list = NULL; struct wine_rb_entry *entry; + obj = get_full_gdi_handle( obj ); switch (gdi_handle_type( obj )) { case NTGDI_OBJ_DC: @@ -302,6 +309,7 @@ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ obj ) TRACE( "(%p,%p)\n", hdc, obj ); + obj = get_full_gdi_handle( obj ); if (is_meta_dc( hdc )) return METADC_SelectObject( hdc, obj ); if (!(dc_attr = get_dc_attr( hdc ))) return 0; if (dc_attr->emf && !EMFDC_SelectObject( dc_attr, obj )) return 0; @@ -747,6 +755,7 @@ UINT WINAPI GetPaletteEntries( HPALETTE palette, UINT start, UINT count, PALETTE UINT WINAPI SetPaletteEntries( HPALETTE palette, UINT start, UINT count, const PALETTEENTRY *entries ) { + palette = get_full_gdi_handle( palette ); return NtGdiDoPalette( palette, start, count, (void *)entries, NtGdiSetPaletteEntries, FALSE ); } @@ -755,6 +764,7 @@ UINT WINAPI SetPaletteEntries( HPALETTE palette, UINT start, UINT count, */ BOOL WINAPI AnimatePalette( HPALETTE palette, UINT start, UINT count, const PALETTEENTRY *entries ) { + palette = get_full_gdi_handle( palette ); return NtGdiDoPalette( palette, start, count, (void *)entries, NtGdiAnimatePalette, FALSE ); } diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index a14ba9aeb08..e48d4501c6d 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -201,7 +201,6 @@ static UINT set_palette_entries( HPALETTE hpalette, UINT start, UINT count, TRACE("hpal=%p,start=%i,count=%i\n",hpalette,start,count ); - hpalette = get_full_gdi_handle( hpalette ); if (hpalette == get_stock_object(DEFAULT_PALETTE)) return 0; palPtr = GDI_GetObjPtr( hpalette, NTGDI_OBJ_PAL ); if (!palPtr) return 0; @@ -254,7 +253,6 @@ static BOOL animate_palette( HPALETTE hPal, UINT StartIndex, UINT NumEntries, { TRACE("%p (%i - %i)\n", hPal, StartIndex,StartIndex+NumEntries); - hPal = get_full_gdi_handle( hPal ); if( hPal != get_stock_object(DEFAULT_PALETTE) ) { PALETTEOBJ * palPtr; @@ -520,7 +518,6 @@ HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg) TRACE("%p %p\n", hdc, hpal ); - hpal = get_full_gdi_handle( hpal ); if (GetObjectType(hpal) != OBJ_PAL) { WARN("invalid selected palette %p\n",hpal);

1 0

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 September 2021