September 2021 - Wine-Commits

Eric Pouech : dbghelp: Implement all SymGetLineNext* functions using internal_line_t.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

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: Rewrite SymGetLinePrev* with internal_line_t.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

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

Giovanni Mascellani : tzres: Take timezone display names from Unicode CLDR database.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

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

Eric Pouech : dbghelp: Make symt_fill_func_line_info() and symt_get_func_line_next() static functions inside symbol.c.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

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

Eric Pouech : dbghelp: Get rid of useless symt_normalize_func().
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: cee52d598853dbf07ca492f4a8755b4ce65d9eb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cee52d598853dbf07ca492f4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 7 09:27:07 2021 +0200 dbghelp: Get rid of useless symt_normalize_func(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 2 -- dlls/dbghelp/dwarf.c | 1 - dlls/dbghelp/msc.c | 3 --- dlls/dbghelp/stabs.c | 1 - dlls/dbghelp/symbol.c | 14 -------------- 5 files changed, 21 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 162e8bc004d..f9191ae1205 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -745,8 +745,6 @@ extern struct symt_function* const char* name, ULONG_PTR addr, ULONG_PTR size, struct symt* type) DECLSPEC_HIDDEN; -extern BOOL symt_normalize_function(struct module* module, - const struct symt_function* func) DECLSPEC_HIDDEN; extern void symt_add_func_line(struct module* module, struct symt_function* func, unsigned source_idx, int line_num, diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 319f5c2673c..af84fb660b8 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1983,7 +1983,6 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, symt_add_function_point(ctx->module, subpgm.func, SymTagCustom, &subpgm.frame, NULL); } - if (subpgm.func) symt_normalize_function(subpgm.ctx->module, subpgm.func); return di->symt; } diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 36ab355d0a3..c3e243879b2 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1827,7 +1827,6 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo } else if (curr_func) { - symt_normalize_function(msc_dbg->module, curr_func); curr_func = NULL; } break; @@ -2035,8 +2034,6 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo } } - if (curr_func) symt_normalize_function(msc_dbg->module, curr_func); - return TRUE; } diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index bdafb98bbd4..7008f60ea82 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1196,7 +1196,6 @@ static void stabs_finalize_function(struct module* module, struct symt_function* 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 */ diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index e91f0dd1e07..8f192662b7d 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -470,20 +470,6 @@ struct symt_hierarchy_point* symt_add_function_point(struct module* module, return sym; } -BOOL symt_normalize_function(struct module* module, const struct symt_function* func) -{ - assert(func); - /* We aren't adding any more locals or line numbers to this function. - * Free any spare memory that we might have allocated. - */ - assert(func->symt.tag == SymTagFunction); - -/* EPP vector_pool_normalize(&func->vlines, &module->pool); */ -/* EPP vector_pool_normalize(&func->vchildren, &module->pool); */ - - return TRUE; -} - struct symt_thunk* symt_new_thunk(struct module* module, struct symt_compiland* compiland, const char* name, THUNK_ORDINAL ord,

1 0

Eric Pouech : dbghelp: Set is_first and is_last flags on the fly in symt_add_func_line.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

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

Giovanni Mascellani : tzres: Regenerate TZ data from de facto standard sources.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

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/tests: Add more metafile brush tests.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: 08d377c02fbbd63c351e927dfc8525680ce34c28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d377c02fbbd63c351e927d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 7 14:09:47 2021 +0200 gdi32/tests: Add more metafile brush tests. Based on brush.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/tests/metafile.c | 351 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 346 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08d377c02fbbd63c351e…

1 0

Alexandre Julliard : winecfg: Build with msvcrt.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: fe9799314b30e801094a6cfef8a15bf403857285 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe9799314b30e801094a6cfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 7 13:23:32 2021 +0200 winecfg: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/Makefile.in | 2 ++ programs/winecfg/appdefaults.c | 3 +-- programs/winecfg/audio.c | 11 ++++------- programs/winecfg/drive.c | 3 --- programs/winecfg/driveui.c | 1 - programs/winecfg/libraries.c | 14 ++------------ programs/winecfg/theme.c | 8 ++------ programs/winecfg/winecfg.c | 3 +-- programs/winecfg/x11drvdlg.c | 19 +++++++++---------- 9 files changed, 21 insertions(+), 43 deletions(-) diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index a2746f7d4ac..d39d3e50410 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -2,6 +2,8 @@ MODULE = winecfg.exe APPMODE = -mwindows IMPORTS = uuid comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ about.c \ appdefaults.c \ diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 5155a845264..19901f7b542 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -29,7 +29,6 @@ #include <stdlib.h> #include <assert.h> #include "wine/heap.h" -#include "wine/unicode.h" #include "winecfg.h" #include "resource.h" @@ -337,7 +336,7 @@ static void on_add_app_click(HWND dialog) ARRAY_SIZE(selectExecutableStr)); LoadStringW (GetModuleHandleW(NULL), IDS_EXECUTABLE_FILTER, programsFilter, ARRAY_SIZE(programsFilter)); - snprintfW( filter, MAX_PATH, filterW, programsFilter, 0, 0 ); + swprintf( filter, MAX_PATH, filterW, programsFilter, 0, 0 ); ofn.lpstrTitle = selectExecutableStr; ofn.lpstrFilter = filter; diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index a293c4710fd..039dc033d23 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -22,9 +22,6 @@ #define WIN32_LEAN_AND_MEAN #define NONAMELESSUNION -#include "config.h" -#include "wine/port.h" - #include <assert.h> #include <stdlib.h> #include <stdio.h> @@ -319,7 +316,7 @@ static void initAudioDlg (HWND hDlg) SendDlgItemMessageW(hDlg, IDC_AUDIOOUT_DEVICE, CB_SETITEMDATA, i + 1, (LPARAM)&render_devs[i]); - if(reg_out_dev && !lstrcmpW(render_devs[i].id, reg_out_dev)){ + if(reg_out_dev && !wcscmp(render_devs[i].id, reg_out_dev)){ SendDlgItemMessageW(hDlg, IDC_AUDIOOUT_DEVICE, CB_SETCURSEL, i + 1, 0); SendDlgItemMessageW(hDlg, IDC_SPEAKERCONFIG_SPEAKERS, CB_SETCURSEL, render_devs[i].speaker_config, 0); } @@ -328,7 +325,7 @@ static void initAudioDlg (HWND hDlg) 0, (LPARAM)render_devs[i].name.pwszVal); SendDlgItemMessageW(hDlg, IDC_VOICEOUT_DEVICE, CB_SETITEMDATA, i + 1, (LPARAM)&render_devs[i]); - if(reg_vout_dev && !lstrcmpW(render_devs[i].id, reg_vout_dev)) + if(reg_vout_dev && !wcscmp(render_devs[i].id, reg_vout_dev)) SendDlgItemMessageW(hDlg, IDC_VOICEOUT_DEVICE, CB_SETCURSEL, i + 1, 0); lvitem.mask = LVIF_TEXT | LVIF_PARAM; @@ -360,14 +357,14 @@ static void initAudioDlg (HWND hDlg) 0, (LPARAM)capture_devs[i].name.pwszVal); SendDlgItemMessageW(hDlg, IDC_AUDIOIN_DEVICE, CB_SETITEMDATA, i + 1, (LPARAM)&capture_devs[i]); - if(reg_in_dev && !lstrcmpW(capture_devs[i].id, reg_in_dev)) + if(reg_in_dev && !wcscmp(capture_devs[i].id, reg_in_dev)) SendDlgItemMessageW(hDlg, IDC_AUDIOIN_DEVICE, CB_SETCURSEL, i + 1, 0); SendDlgItemMessageW(hDlg, IDC_VOICEIN_DEVICE, CB_ADDSTRING, 0, (LPARAM)capture_devs[i].name.pwszVal); SendDlgItemMessageW(hDlg, IDC_VOICEIN_DEVICE, CB_SETITEMDATA, i + 1, (LPARAM)&capture_devs[i]); - if(reg_vin_dev && !lstrcmpW(capture_devs[i].id, reg_vin_dev)) + if(reg_vin_dev && !wcscmp(capture_devs[i].id, reg_vin_dev)) SendDlgItemMessageW(hDlg, IDC_VOICEIN_DEVICE, CB_SETCURSEL, i + 1, 0); } diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index bfe9a48e94d..bab1546a96c 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -21,9 +21,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <assert.h> #include <stdarg.h> #include <stdio.h> diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 6c574d6f3a0..0d3e1b42396 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -33,7 +33,6 @@ #include <shlwapi.h> #include <shlobj.h> -#include <wine/unicode.h> #include <wine/debug.h> #include "winecfg.h" diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index 0c5fcc65ced..d9b29517cd9 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -20,26 +20,16 @@ * */ -#include "config.h" -#include "wine/port.h" - #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <commdlg.h> -#include <wine/debug.h> #include <stdio.h> -#include <dirent.h> #include <assert.h> #include <stdlib.h> -#ifdef HAVE_SYS_STAT_H -#include <sys/stat.h> -#endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif #include "winecfg.h" #include "resource.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(winecfg); @@ -197,7 +187,7 @@ static DWORD mode_to_id(enum dllmode mode) } /* helper for is_builtin_only */ -static int compare_dll( const void *ptr1, const void *ptr2 ) +static int __cdecl compare_dll( const void *ptr1, const void *ptr2 ) { const char * const *name1 = ptr1; const char * const *name2 = ptr2; diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 151dc486659..ebacab9a943 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -22,9 +22,6 @@ * */ -#include "config.h" -#include "wine/port.h" - #include <stdarg.h> #include <stdlib.h> #include <stdio.h> @@ -39,7 +36,6 @@ #include <shlobj.h> #include <shlwapi.h> #include <wine/debug.h> -#include <wine/unicode.h> #include "resource.h" #include "winecfg.h" @@ -744,13 +740,13 @@ static void init_shell_folder_listview_headers(HWND dialog) { listColumn.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; listColumn.pszText = szShellFolder; - listColumn.cchTextMax = strlenW(listColumn.pszText); + listColumn.cchTextMax = lstrlenW(listColumn.pszText); listColumn.cx = width; SendDlgItemMessageW(dialog, IDC_LIST_SFPATHS, LVM_INSERTCOLUMNW, 0, (LPARAM) &listColumn); listColumn.pszText = szLinksTo; - listColumn.cchTextMax = strlenW(listColumn.pszText); + listColumn.cchTextMax = lstrlenW(listColumn.pszText); listColumn.cx = viewRect.right - viewRect.left - width - 1; SendDlgItemMessageW(dialog, IDC_LIST_SFPATHS, LVM_INSERTCOLUMNW, 1, (LPARAM) &listColumn); diff --git a/programs/winecfg/winecfg.c b/programs/winecfg/winecfg.c index c4c05bd186a..58e62e64421 100644 --- a/programs/winecfg/winecfg.c +++ b/programs/winecfg/winecfg.c @@ -34,7 +34,6 @@ #include <limits.h> #include <windows.h> #include <winreg.h> -#include <wine/unicode.h> #include <wine/debug.h> #include <wine/list.h> @@ -623,7 +622,7 @@ static void process_setting(struct setting *s) static const WCHAR softwareW[] = {'S','o','f','t','w','a','r','e','\\'}; HKEY key; BOOL needs_wow64 = (is_win64 && s->root == HKEY_LOCAL_MACHINE && s->path && - !strncmpiW(s->path, softwareW, ARRAY_SIZE(softwareW))); + !wcsnicmp(s->path, softwareW, ARRAY_SIZE(softwareW))); if (s->value) { diff --git a/programs/winecfg/x11drvdlg.c b/programs/winecfg/x11drvdlg.c index 34b194d04a6..0b704210295 100644 --- a/programs/winecfg/x11drvdlg.c +++ b/programs/winecfg/x11drvdlg.c @@ -28,7 +28,6 @@ #include <stdio.h> #include <windows.h> -#include <wine/unicode.h> #include <wine/debug.h> #include "resource.h" @@ -78,7 +77,7 @@ static void update_gui_for_desktop_mode(HWND dialog) updating_ui = TRUE; buf = get_reg_keyW(config_key, explorer_desktopsW, desktop_name, NULL); - if (buf && (bufindex = strchrW(buf, 'x'))) + if (buf && (bufindex = wcschr(buf, 'x'))) { *bufindex++ = 0; @@ -195,7 +194,7 @@ static void set_from_desktop_edits(HWND dialog) HeapFree(GetProcessHeap(), 0, width); width = strdupW(def_width); } - else if (atoiW(width) < atoiW(min_width)) + else if (wcstol(width, NULL, 10) < wcstol(min_width, NULL, 10)) { HeapFree(GetProcessHeap(), 0, width); width = strdupW(min_width); @@ -204,16 +203,16 @@ static void set_from_desktop_edits(HWND dialog) HeapFree(GetProcessHeap(), 0, height); height = strdupW(def_height); } - else if (atoiW(height) < atoiW(min_height)) + else if (wcstol(height, NULL, 10) < wcstol(min_height, NULL, 10)) { HeapFree(GetProcessHeap(), 0, height); height = strdupW(min_height); } - new = HeapAlloc(GetProcessHeap(), 0, (strlenW(width) + strlenW(height) + 2) * sizeof(WCHAR)); - strcpyW( new, width ); - strcatW( new, x ); - strcatW( new, height ); + new = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(width) + lstrlenW(height) + 2) * sizeof(WCHAR)); + lstrcpyW( new, width ); + lstrcatW( new, x ); + lstrcatW( new, height ); set_reg_keyW(config_key, explorer_desktopsW, desktop_name, new); set_reg_keyW(config_key, keypathW(explorerW), desktopW, desktop_name); @@ -360,8 +359,8 @@ static void update_font_preview(HWND hDlg) GetObjectW(hfont, sizeof(lf), &lf); - if (strcmpW(lf.lfFaceName, tahomaW) != 0) - strcpyW(lf.lfFaceName, tahomaW); + if (wcscmp(lf.lfFaceName, tahomaW) != 0) + lstrcpyW(lf.lfFaceName, tahomaW); else DeleteObject(hfont); lf.lfHeight = MulDiv(-10, dpi, 72);

1 0

Alexandre Julliard : winecfg: Use mountmgr to manage shell folders.
by Alexandre Julliard Sept. 7, 2021

Sept. 7, 2021

Module: wine Branch: master Commit: 01a2b9c6282f9ff5480563cc5e4be12ce2f907a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01a2b9c6282f9ff5480563cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 7 13:18:37 2021 +0200 winecfg: Use mountmgr to manage shell folders. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/drive.c | 52 ++++++++++++++++++++++++++++++++ programs/winecfg/theme.c | 75 +++++----------------------------------------- programs/winecfg/winecfg.h | 2 ++ 3 files changed, 61 insertions(+), 68 deletions(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index a5fc3bfd73a..bfe9a48e94d 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -370,3 +370,55 @@ void apply_drive_changes(void) } CloseHandle( mgr ); } + + +void query_shell_folder( const WCHAR *path, char *dest, unsigned int len ) +{ + UNICODE_STRING nt_name; + HANDLE mgr; + + if ((mgr = open_mountmgr()) == INVALID_HANDLE_VALUE) return; + + if (!RtlDosPathNameToNtPathName_U( path, &nt_name, NULL, NULL )) + { + CloseHandle( mgr ); + return; + } + DeviceIoControl( mgr, IOCTL_MOUNTMGR_QUERY_SHELL_FOLDER, nt_name.Buffer, nt_name.Length, + dest, len, NULL, NULL ); + RtlFreeUnicodeString( &nt_name ); +} + +void set_shell_folder( const WCHAR *path, const char *dest ) +{ + struct mountmgr_shell_folder *ioctl; + UNICODE_STRING nt_name; + HANDLE mgr; + DWORD len; + + if ((mgr = open_mountmgr()) == INVALID_HANDLE_VALUE) return; + + if (!RtlDosPathNameToNtPathName_U( path, &nt_name, NULL, NULL )) + { + CloseHandle( mgr ); + return; + } + + len = sizeof(*ioctl) + nt_name.Length; + if (dest) len += strlen(dest) + 1; + + if (!(ioctl = HeapAlloc( GetProcessHeap(), 0, len ))) return; + ioctl->folder_offset = sizeof(*ioctl); + ioctl->folder_size = nt_name.Length; + memcpy( (char *)ioctl + ioctl->folder_offset, nt_name.Buffer, nt_name.Length ); + if (dest) + { + ioctl->symlink_offset = ioctl->folder_offset + ioctl->folder_size; + strcpy( (char *)ioctl + ioctl->symlink_offset, dest ); + } + else ioctl->symlink_offset = 0; + + DeviceIoControl( mgr, IOCTL_MOUNTMGR_DEFINE_SHELL_FOLDER, ioctl, len, NULL, 0, NULL, NULL ); + HeapFree( GetProcessHeap(), 0, ioctl ); + RtlFreeUnicodeString( &nt_name ); +} diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index b3a3eeed3ba..151dc486659 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -28,12 +28,6 @@ #include <stdarg.h> #include <stdlib.h> #include <stdio.h> -#ifdef HAVE_SYS_STAT_H -#include <sys/stat.h> -#endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif #define COBJMACROS @@ -765,25 +759,14 @@ static void init_shell_folder_listview_headers(HWND dialog) { /* Reads the currently set shell folder symbol link targets into asfiInfo. */ static void read_shell_folder_link_targets(void) { WCHAR wszPath[MAX_PATH]; - HRESULT hr; int i; for (i=0; i<ARRAY_SIZE(asfiInfo); i++) { asfiInfo[i].szLinkTarget[0] = '\0'; - hr = SHGetFolderPathW(NULL, asfiInfo[i].nFolder|CSIDL_FLAG_DONT_VERIFY, NULL, - SHGFP_TYPE_CURRENT, wszPath); - if (SUCCEEDED(hr)) { - char *pszUnixPath = wine_get_unix_file_name(wszPath); - if (pszUnixPath) { - struct stat statPath; - if (!lstat(pszUnixPath, &statPath) && S_ISLNK(statPath.st_mode)) { - int cLen = readlink(pszUnixPath, asfiInfo[i].szLinkTarget, FILENAME_MAX-1); - if (cLen >= 0) asfiInfo[i].szLinkTarget[cLen] = '\0'; - } - HeapFree(GetProcessHeap(), 0, pszUnixPath); - } - } - } + if (SUCCEEDED( SHGetFolderPathW( NULL, asfiInfo[i].nFolder | CSIDL_FLAG_DONT_VERIFY, NULL, + SHGFP_TYPE_CURRENT, wszPath ))) + query_shell_folder( wszPath, asfiInfo[i].szLinkTarget, FILENAME_MAX ); + } } static void update_shell_folder_listview(HWND dialog) { @@ -904,56 +887,12 @@ static void on_shell_folder_edit_changed(HWND hDlg) { static void apply_shell_folder_changes(void) { WCHAR wszPath[MAX_PATH]; - char szBackupPath[FILENAME_MAX], szUnixPath[FILENAME_MAX], *pszUnixPath = NULL; int i; - struct stat statPath; - HRESULT hr; for (i=0; i<ARRAY_SIZE(asfiInfo); i++) { - /* Ignore nonexistent link targets */ - if (asfiInfo[i].szLinkTarget[0] && stat(asfiInfo[i].szLinkTarget, &statPath)) - continue; - - hr = SHGetFolderPathW(NULL, asfiInfo[i].nFolder|CSIDL_FLAG_CREATE, NULL, - SHGFP_TYPE_CURRENT, wszPath); - if (FAILED(hr)) continue; - - /* Retrieve the corresponding unix path. */ - pszUnixPath = wine_get_unix_file_name(wszPath); - if (!pszUnixPath) continue; - lstrcpyA(szUnixPath, pszUnixPath); - HeapFree(GetProcessHeap(), 0, pszUnixPath); - - /* Derive name for folder backup. */ - lstrcpyA(szBackupPath, szUnixPath); - lstrcatA(szBackupPath, ".winecfg"); - - if (lstat(szUnixPath, &statPath)) continue; - - /* Move old folder/link out of the way. */ - if (S_ISLNK(statPath.st_mode)) { - if (unlink(szUnixPath)) continue; /* Unable to remove link. */ - } else { - if (!*asfiInfo[i].szLinkTarget) { - continue; /* We are done. Old was real folder, as new shall be. */ - } else { - if (rename(szUnixPath, szBackupPath)) { /* Move folder out of the way. */ - continue; /* Unable to move old folder. */ - } - } - } - - /* Create new link/folder. */ - if (*asfiInfo[i].szLinkTarget) { - symlink(asfiInfo[i].szLinkTarget, szUnixPath); - } else { - /* If there's a backup folder, restore it. Else create new folder. */ - if (!lstat(szBackupPath, &statPath) && S_ISDIR(statPath.st_mode)) { - rename(szBackupPath, szUnixPath); - } else { - mkdir(szUnixPath, 0777); - } - } + if (SUCCEEDED( SHGetFolderPathW( NULL, asfiInfo[i].nFolder | CSIDL_FLAG_CREATE, NULL, + SHGFP_TYPE_CURRENT, wszPath ))) + set_shell_folder( wszPath, asfiInfo[i].szLinkTarget ); } } diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index d022cd3d688..17516aa4a14 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -117,6 +117,8 @@ BOOL add_drive(char letter, const char *targetpath, const char *device, const WCHAR *label, DWORD serial, DWORD type); void delete_drive(struct drive *pDrive); void apply_drive_changes(void); +void query_shell_folder( const WCHAR *path, char *dest, unsigned int len ); +void set_shell_folder( const WCHAR *path, const char *dest ); BOOL browse_for_unix_folder(HWND dialog, WCHAR *pszPath); extern struct drive drives[26]; /* one for each drive letter */

1 0