February 2018 - Wine-commits

Alex Henrie : schannel/tests: Relax GetInfo return value test.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: b834a9842c3992724a3b6c11acbd6ede09332b39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b834a9842c3992724a3b6c11… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Feb 18 21:06:51 2018 -0700 schannel/tests: Relax GetInfo return value test. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schannel/tests/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index fb350d5..fc913c1 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -219,11 +219,11 @@ static void testGetInfo(void) return; } status = pTables->GetInfo(&PackageInfo); - ok(status == STATUS_SUCCESS || + ok(SUCCEEDED(status) || status == SEC_E_UNSUPPORTED_FUNCTION, /* win2k3 */ "status: 0x%x\n", status); - if (status == STATUS_SUCCESS) + if (SUCCEEDED(status)) { ok(PackageInfo.fCapabilities == LSA_BASE_CAPS || PackageInfo.fCapabilities == (LSA_BASE_CAPS|SECPKG_FLAG_APPCONTAINER_PASSTHROUGH),

1 0

Huw Davies : riched20: Don't use logfont-style underlining for links.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: ff8fba389dc2e69cac1dd6d18b73065eb1477e10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff8fba389dc2e69cac1dd6d1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 19 09:36:00 2018 +0000 riched20: Don't use logfont-style underlining for links. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/style.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 48d57e8..0b85d69 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -306,7 +306,8 @@ ME_LogFontFromStyle(ME_Context* c, LOGFONTW *lf, const ME_Style *s) lf->lfWeight = s->fmt.wWeight; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_ITALIC) lf->lfItalic = 1; - if ((s->fmt.dwEffects & s->fmt.dwMask & (CFM_UNDERLINE | CFE_LINK)) && + if ((s->fmt.dwEffects & s->fmt.dwMask & CFM_UNDERLINE) && + !(s->fmt.dwEffects & CFE_LINK) && s->fmt.bUnderlineType == CFU_CF1UNDERLINE) lf->lfUnderline = 1; if (s->fmt.dwEffects & s->fmt.dwMask & CFM_STRIKEOUT)

1 0

Huw Davies : riched20: Return the underline pen as the return value.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 08c15246ca3de32f5f375d261c51b70e98b02665 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08c15246ca3de32f5f375d26… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 19 09:36:01 2018 +0000 riched20: Return the underline pen as the return value. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index b4b6697..d3b908a 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -216,9 +216,8 @@ static COLORREF get_back_color( ME_Context *c, ME_Style *style, BOOL highlight ) return color; } -static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) +static HPEN get_underline_pen( ME_Style *style, COLORREF color ) { - *pen = NULL; /* Choose the pen type for underlining the text. */ if (style->fmt.dwEffects & CFE_UNDERLINE) { @@ -227,11 +226,9 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) case CFU_UNDERLINE: case CFU_UNDERLINEWORD: /* native seems to map it to simple underline (MSDN) */ case CFU_UNDERLINEDOUBLE: /* native seems to map it to simple underline (MSDN) */ - *pen = CreatePen( PS_SOLID, 1, color ); - break; + return CreatePen( PS_SOLID, 1, color ); case CFU_UNDERLINEDOTTED: - *pen = CreatePen( PS_DOT, 1, color ); - break; + return CreatePen( PS_DOT, 1, color ); default: FIXME( "Unknown underline type (%u)\n", style->fmt.bUnderlineType ); /* fall through */ @@ -240,14 +237,14 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) break; } } - return; + return NULL; } static void draw_underline( ME_Context *c, ME_Run *run, int x, int y, COLORREF color ) { HPEN pen; - get_underline_pen( run->style, color, &pen ); + pen = get_underline_pen( run->style, color ); if (pen) { HPEN old_pen = SelectObject( c->hDC, pen );

1 0

Huw Davies : riched20: Underline links.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: ec2bcdf279116fdff38f11eb1326116898b21d4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec2bcdf279116fdff38f11eb… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 19 09:36:02 2018 +0000 riched20: Underline links. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index d3b908a..fcc4e10 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -218,6 +218,9 @@ static COLORREF get_back_color( ME_Context *c, ME_Style *style, BOOL highlight ) static HPEN get_underline_pen( ME_Style *style, COLORREF color ) { + if (style->fmt.dwEffects & CFE_LINK) + return CreatePen( PS_SOLID, 1, color ); + /* Choose the pen type for underlining the text. */ if (style->fmt.dwEffects & CFE_UNDERLINE) {

1 0

Huw Davies : winedbg: Fix the operand order of some XMM instructions.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: e5b9057ba00f7e6ad35361f954557eee55d8f64b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5b9057ba00f7e6ad35361f9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 19 11:52:05 2018 +0000 winedbg: Fix the operand order of some XMM instructions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/db_disasm.c | 30 +++++++++++++++--------------- programs/winedbg/db_disasm64.c | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c index c745617..b8a2152 100644 --- a/programs/winedbg/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -301,23 +301,23 @@ static const struct inst db_inst_0f4x[] = { }; static const struct inst db_inst_0f5x[] = { -/*50*/ { "movmskps",TRUE, NONE, op2(E, XMM), 0 }, -/*51*/ { "sqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*52*/ { "rsqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*53*/ { "rcpps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*54*/ { "andps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*55*/ { "andnps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*56*/ { "orps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*57*/ { "xorps", TRUE, NONE, op2(XMM, EXMM), 0 }, - -/*58*/ { "addps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*59*/ { "mulps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*50*/ { "movmskps",TRUE, NONE, op2(EXMM, R), 0 }, +/*51*/ { "sqrtps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*52*/ { "rsqrtps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*53*/ { "rcpps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*54*/ { "andps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*55*/ { "andnps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*56*/ { "orps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*57*/ { "xorps", TRUE, NONE, op2(EXMM, XMM), 0 }, + +/*58*/ { "addps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*59*/ { "mulps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, /*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, -/*5c*/ { "subps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5d*/ { "minps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5e*/ { "divps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5f*/ { "maxps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*5c*/ { "subps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5d*/ { "minps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5e*/ { "divps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5f*/ { "maxps", TRUE, NONE, op2(EXMM, XMM), 0 }, }; static const struct inst db_inst_0f6x[] = { diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index 3db0b5e..b1556ad 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -351,23 +351,23 @@ static const struct inst db_inst_0f4x[] = { }; static const struct inst db_inst_0f5x[] = { -/*50*/ { "movmskps",TRUE, NONE, op2(E, XMM), 0 }, -/*51*/ { "sqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*52*/ { "rsqrtps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*53*/ { "rcpps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*54*/ { "andps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*55*/ { "andnps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*56*/ { "orps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*57*/ { "xorps", TRUE, NONE, op2(XMM, EXMM), 0 }, - -/*58*/ { "addps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*59*/ { "mulps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*50*/ { "movmskps",TRUE, NONE, op2(EXMM, R), 0 }, +/*51*/ { "sqrtps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*52*/ { "rsqrtps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*53*/ { "rcpps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*54*/ { "andps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*55*/ { "andnps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*56*/ { "orps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*57*/ { "xorps", TRUE, NONE, op2(EXMM, XMM), 0 }, + +/*58*/ { "addps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*59*/ { "mulps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, /*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, -/*5c*/ { "subps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5d*/ { "minps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5e*/ { "divps", TRUE, NONE, op2(XMM, EXMM), 0 }, -/*5f*/ { "maxps", TRUE, NONE, op2(XMM, EXMM), 0 }, +/*5c*/ { "subps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5d*/ { "minps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5e*/ { "divps", TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5f*/ { "maxps", TRUE, NONE, op2(EXMM, XMM), 0 }, }; static const struct inst db_inst_0f6x[] = {

1 0

Huw Davies : winedbg: Add cvtdq2ps and cvtps2pd opcodes.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: ca9f7cc5eb9f312ffcae9cabf32a96e233258e16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca9f7cc5eb9f312ffcae9cab… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Feb 19 11:52:06 2018 +0000 winedbg: Add cvtdq2ps and cvtps2pd opcodes. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/db_disasm.c | 4 ++-- programs/winedbg/db_disasm64.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c index b8a2152..fc25e1c 100644 --- a/programs/winedbg/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -312,8 +312,8 @@ static const struct inst db_inst_0f5x[] = { /*58*/ { "addps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*59*/ { "mulps", TRUE, NONE, op2(EXMM, XMM), 0 }, -/*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, -/*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, +/*5a*/ { "cvtps2pd",TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5b*/ { "cvtdq2ps",TRUE, NONE, op2(EXMM, XMM), 0 }, /*5c*/ { "subps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5d*/ { "minps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5e*/ { "divps", TRUE, NONE, op2(EXMM, XMM), 0 }, diff --git a/programs/winedbg/db_disasm64.c b/programs/winedbg/db_disasm64.c index b1556ad..4d9aca9 100644 --- a/programs/winedbg/db_disasm64.c +++ b/programs/winedbg/db_disasm64.c @@ -362,8 +362,8 @@ static const struct inst db_inst_0f5x[] = { /*58*/ { "addps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*59*/ { "mulps", TRUE, NONE, op2(EXMM, XMM), 0 }, -/*5a*/ { "(bad)", FALSE, NONE, 0, 0 }, -/*5b*/ { "(bad)", FALSE, NONE, 0, 0 }, +/*5a*/ { "cvtps2pd",TRUE, NONE, op2(EXMM, XMM), 0 }, +/*5b*/ { "cvtdq2ps",TRUE, NONE, op2(EXMM, XMM), 0 }, /*5c*/ { "subps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5d*/ { "minps", TRUE, NONE, op2(EXMM, XMM), 0 }, /*5e*/ { "divps", TRUE, NONE, op2(EXMM, XMM), 0 },

1 0

Nikolay Sivov : user32: Don' t convert message arguments when calling dialog procedure.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 9640990e43e351ff2702713cde9fae7203a8ed9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9640990e43e351ff2702713c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 14 08:37:06 2018 +0300 user32: Don't convert message arguments when calling dialog procedure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dialog.c | 108 +++++++++++++++++++++++++++++++++++++-------- dlls/user32/winproc.c | 54 +++++++++++++++++------ 2 files changed, 130 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9640990e43e351ff2702…

1 0

Alexandre Julliard : ntdll: Hardcode the windows and system directories.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 12276796c95007fc12eb38a41ca25b4daee7e1b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12276796c95007fc12eb38a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 19:38:29 2018 +0100 ntdll: Hardcode the windows and system directories. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 5 ----- dlls/ntdll/directory.c | 10 ++-------- dlls/ntdll/loader.c | 46 +++++++--------------------------------------- dlls/ntdll/loadorder.c | 6 ++---- dlls/ntdll/ntdll.spec | 1 - dlls/ntdll/ntdll_misc.h | 4 ++-- dlls/ntdll/rtlstr.c | 1 + dlls/ntdll/thread.c | 2 ++ 8 files changed, 16 insertions(+), 59 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 62dc815..bbadae0 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -958,8 +958,6 @@ done: */ static void init_windows_dirs(void) { - extern void CDECL __wine_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir ); - static const WCHAR windirW[] = {'w','i','n','d','i','r',0}; static const WCHAR winsysdirW[] = {'w','i','n','s','y','s','d','i','r',0}; static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0}; @@ -1013,9 +1011,6 @@ static void init_windows_dirs(void) TRACE_(file)( "WindowsDir = %s\n", debugstr_w(DIR_Windows) ); TRACE_(file)( "SystemDir = %s\n", debugstr_w(DIR_System) ); - - /* set the directories in ntdll too */ - __wine_init_windows_dir( DIR_Windows, DIR_System ); } diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 3b76f9b..4655a634 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -205,8 +205,6 @@ static RTL_RUN_ONCE init_once = RTL_RUN_ONCE_INIT; /* at some point we may want to allow Winelib apps to set this */ static const BOOL is_case_sensitive = FALSE; -UNICODE_STRING system_dir = { 0, 0, NULL }; /* system directory */ - static struct file_identity windir; static RTL_CRITICAL_SECTION dir_section; @@ -2378,14 +2376,10 @@ static int get_redirect_path( char *unix_name, int pos, const WCHAR *name, int l #endif /*********************************************************************** - * DIR_init_windows_dir + * init_directories */ -void DIR_init_windows_dir( const WCHAR *win, const WCHAR *sys ) +void init_directories(void) { - /* FIXME: should probably store paths as NT file names */ - - RtlCreateUnicodeString( &system_dir, sys ); - #ifndef _WIN64 if (is_wow64) init_redirects(); #endif diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 77a16b3..3fcbbf7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -63,6 +63,10 @@ WINE_DECLARE_DEBUG_CHANNEL(imports); typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID); typedef void (CALLBACK *LDRENUMPROC)(LDR_MODULE *, void *, BOOLEAN *); +/* system directory with trailing backslash */ +const WCHAR system_dir[] = {'C',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','t','e','m','3','2','\\',0}; + static BOOL imports_fixup_done = FALSE; /* set once the imports have been fixed up, before attaching them */ static BOOL process_detaching = FALSE; /* set on process detach to avoid deadlocks with thread detach */ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ @@ -1521,12 +1525,10 @@ static WCHAR *get_builtin_fullname( const WCHAR *path, const char *filename ) } if ((fullname = RtlAllocateHeap( GetProcessHeap(), 0, - system_dir.MaximumLength + (len + 1) * sizeof(WCHAR) ))) + (strlenW(system_dir) + len + 1) * sizeof(WCHAR) ))) { - memcpy( fullname, system_dir.Buffer, system_dir.Length ); - p = fullname + system_dir.Length / sizeof(WCHAR); - if (p > fullname && p[-1] != '\\') *p++ = '\\'; - ascii_to_unicode( p, filename, len + 1 ); + strcpyW( fullname, system_dir ); + ascii_to_unicode( fullname + strlenW(fullname), filename, len + 1 ); } return fullname; } @@ -3284,40 +3286,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) } -/****************************************************************** - * __wine_init_windows_dir (NTDLL.@) - * - * Windows and system dir initialization once kernel32 has been loaded. - */ -void CDECL __wine_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir ) -{ - PLIST_ENTRY mark, entry; - LPWSTR buffer, p; - - strcpyW( user_shared_data->NtSystemRoot, windir ); - DIR_init_windows_dir( windir, sysdir ); - - /* prepend the system dir to the name of the already created modules */ - mark = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; - for (entry = mark->Flink; entry != mark; entry = entry->Flink) - { - LDR_MODULE *mod = CONTAINING_RECORD( entry, LDR_MODULE, InLoadOrderModuleList ); - - assert( mod->Flags & LDR_WINE_INTERNAL ); - - buffer = RtlAllocateHeap( GetProcessHeap(), 0, - system_dir.Length + mod->FullDllName.Length + 2*sizeof(WCHAR) ); - if (!buffer) continue; - strcpyW( buffer, system_dir.Buffer ); - p = buffer + strlenW( buffer ); - if (p > buffer && p[-1] != '\\') *p++ = '\\'; - strcpyW( p, mod->FullDllName.Buffer ); - RtlInitUnicodeString( &mod->FullDllName, buffer ); - RtlInitUnicodeString( &mod->BaseDllName, p ); - } -} - - /*********************************************************************** * __wine_process_init */ diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index 157d2cb..c6c0245 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -434,7 +434,6 @@ enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) enum loadorder ret = LO_INVALID; HANDLE std_key, app_key = 0; WCHAR *module, *basename; - UNICODE_STRING path_str; int len; if (!init_done) init_load_order(); @@ -445,10 +444,9 @@ enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path ) /* Strip path information if the module resides in the system directory */ - RtlInitUnicodeString( &path_str, path ); - if (RtlPrefixUnicodeString( &system_dir, &path_str, TRUE )) + if (!strncmpiW( system_dir, path, strlenW( system_dir ))) { - const WCHAR *p = path + system_dir.Length / sizeof(WCHAR); + const WCHAR *p = path + strlenW( system_dir ); while (*p == '\\' || *p == '/') p++; if (!strchrW( p, '\\' ) && !strchrW( p, '/' )) path = p; } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 29d4f58..0f70feb 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1496,4 +1496,3 @@ # Filesystem @ cdecl wine_nt_to_unix_file_name(ptr ptr long long) @ cdecl wine_unix_to_nt_file_name(ptr ptr) -@ cdecl __wine_init_windows_dir(wstr wstr) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 8a64338..3fbccba 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -113,7 +113,7 @@ extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY FARPROC origfun, DWORD ordinal, const WCHAR *user ) DECLSPEC_HIDDEN; extern void RELAY_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; extern void SNOOP_SetupDLL( HMODULE hmod ) DECLSPEC_HIDDEN; -extern UNICODE_STRING system_dir DECLSPEC_HIDDEN; +extern const WCHAR system_dir[] DECLSPEC_HIDDEN; typedef LONG (WINAPI *PUNHANDLED_EXCEPTION_FILTER)(PEXCEPTION_POINTERS); extern PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter DECLSPEC_HIDDEN; @@ -155,7 +155,7 @@ extern int get_file_info( const char *path, struct stat *st, ULONG *attr ) DECLS extern NTSTATUS fill_file_info( const struct stat *st, ULONG attr, void *ptr, FILE_INFORMATION_CLASS class ) DECLSPEC_HIDDEN; extern NTSTATUS server_get_unix_name( HANDLE handle, ANSI_STRING *unix_name ) DECLSPEC_HIDDEN; -extern void DIR_init_windows_dir( const WCHAR *windir, const WCHAR *sysdir ) DECLSPEC_HIDDEN; +extern void init_directories(void) DECLSPEC_HIDDEN; extern BOOL DIR_is_hidden_file( const UNICODE_STRING *name ) DECLSPEC_HIDDEN; extern NTSTATUS DIR_unmount_device( HANDLE handle ) DECLSPEC_HIDDEN; extern NTSTATUS DIR_get_unix_cwd( char **cwd ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index 3013658..190bc01 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -61,6 +61,7 @@ void CDECL __wine_init_codepages( const union cptable *ansi, const union cptable oem_table = oem; unix_table = ucp; NlsAnsiCodePage = ansi->info.codepage; + init_directories(); } int ntdll_umbstowcs(DWORD flags, const char* src, int srclen, WCHAR* dst, int dstlen) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index c999d4b..9ec94d6 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -53,6 +53,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(thread); #endif struct _KUSER_SHARED_DATA *user_shared_data = NULL; +static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0}; PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter = NULL; void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) = NULL; @@ -298,6 +299,7 @@ HANDLE thread_init(void) exit(1); } user_shared_data = addr; + memcpy( user_shared_data->NtSystemRoot, default_windirW, sizeof(default_windirW) ); /* allocate and initialize the PEB */

1 0

Alexandre Julliard : makefiles: Split the makefile generation into multiple functions.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 4eb9ad983ecc33d24ccf68692590605dcd02914a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eb9ad983ecc33d24ccf6869… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 09:53:42 2018 +0100 makefiles: Split the makefile generation into multiple functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1617 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 889 insertions(+), 728 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4eb9ad983ecc33d24ccf…

1 0

Alexandre Julliard : makefiles: Add support for a generic SOURCES variable.
by Alexandre Julliard 19 Feb '18

19 Feb '18

Module: wine Branch: master Commit: 54a123f4ef96d554180ccce1f69eb71726da1c5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=54a123f4ef96d554180ccce1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 17 11:39:05 2018 +0100 makefiles: Add support for a generic SOURCES variable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 444 +++++++++++++++++++++++++-------------------------- tools/make_makefiles | 29 ++-- tools/makedep.c | 1 + 3 files changed, 239 insertions(+), 235 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54a123f4ef96d554180c…

1 0