April 2006 - Wine-Commits - list.winehq.org

James Hawkins : advpack: Implement LaunchINFSectionW.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: 924d91ca057b25dd7d136b0109efad2ece3b321a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=924d91ca057b25dd7d136b0… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Apr 20 10:09:44 2006 -0500 advpack: Implement LaunchINFSectionW. --- dlls/advpack/install.c | 45 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 40 insertions(+), 5 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index af8213e..6432406 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -516,14 +516,49 @@ INT WINAPI LaunchINFSectionA(HWND hWnd, * 'A' Always reboot. * 'I' Reboot if needed (default). * 'N' No reboot. - * - * BUGS - * Unimplemented. */ INT WINAPI LaunchINFSectionW(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT show) { - FIXME("(%p, %p, %s, %i): stub\n", hWnd, hInst, debugstr_w(cmdline), show); - return 0; + ADVInfo info; + LPWSTR cmdline_copy, cmdline_ptr; + LPWSTR inf_filename, install_sec; + LPWSTR str_flags; + DWORD flags = 0; + HRESULT hr = S_OK; + + TRACE("(%p, %p, %s, %d)\n", hWnd, hInst, debugstr_w(cmdline), show); + + if (!cmdline) + return E_INVALIDARG; + + cmdline_copy = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmdline) + 1) * sizeof(WCHAR)); + cmdline_ptr = cmdline_copy; + lstrcpyW(cmdline_copy, cmdline); + + inf_filename = get_parameter(&cmdline_ptr, ','); + install_sec = get_parameter(&cmdline_ptr, ','); + + str_flags = get_parameter(&cmdline_ptr, ','); + if (str_flags) + flags = atolW(str_flags); + + ZeroMemory(&info, sizeof(ADVInfo)); + + hr = install_init(inf_filename, install_sec, NULL, flags, &info); + if (hr != S_OK) + goto done; + + hr = spapi_install(&info); + if (hr != S_OK) + goto done; + + hr = adv_install(&info); + +done: + install_release(&info); + HeapFree(GetProcessHeap(), 0, cmdline_copy); + + return hr; } /***********************************************************************

1 0

James Hawkins : advpack: Implement ExecuteCabW.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: c14fe5a6beb4b2ca64c24e7dcdef077c2d8b236b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c14fe5a6beb4b2ca64c24e7… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Apr 20 10:09:16 2006 -0500 advpack: Implement ExecuteCabW. --- dlls/advpack/install.c | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 6bab9c0..af8213e 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -443,14 +443,33 @@ HRESULT WINAPI ExecuteCabA(HWND hwnd, CA * RETURNS * Success: S_OK. * Failure: E_FAIL. - * - * BUGS - * Unimplemented */ HRESULT WINAPI ExecuteCabW(HWND hwnd, CABINFOW* pCab, LPVOID pReserved) { - FIXME("(%p, %p, %p): stub\n", hwnd, pCab, pReserved); - return E_FAIL; + ADVInfo info; + HRESULT hr; + + TRACE("(%p, %p, %p)\n", hwnd, pCab, pReserved); + + ZeroMemory(&info, sizeof(ADVInfo)); + + if (pCab->pszCab && *pCab->pszCab) + FIXME("Cab archive not extracted!\n"); + + hr = install_init(pCab->pszInf, pCab->pszSection, pCab->szSrcPath, pCab->dwFlags, &info); + if (hr != S_OK) + goto done; + + hr = spapi_install(&info); + if (hr != S_OK) + goto done; + + hr = adv_install(&info); + +done: + install_release(&info); + + return S_OK; } /***********************************************************************

1 0

James Hawkins : advpack: Implement the RunPostSetupCommands callback.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: 401becab3ebc24808f983407d2992ee02a0641b5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=401becab3ebc24808f98340… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Apr 20 10:09:00 2006 -0500 advpack: Implement the RunPostSetupCommands callback. --- dlls/advpack/install.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index e7911ca..6bab9c0 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -58,6 +58,9 @@ typedef HRESULT (*iterate_fields_func)(H /* Advanced INF commands */ static const WCHAR RegisterOCXs[] = {'R','e','g','i','s','t','e','r','O','C','X','s',0}; +static const WCHAR RunPostSetupCommands[] = { + 'R','u','n','P','o','s','t','S','e','t','u','p','C','o','m','m','a','n','d','s',0 +}; /* Advanced INF callbacks */ static HRESULT register_ocxs_callback(HINF hinf, PCWSTR field, void *arg) @@ -93,6 +96,30 @@ static HRESULT register_ocxs_callback(HI return hr; } +static HRESULT run_post_setup_commands_callback(HINF hinf, PCWSTR field, void *arg) +{ + ADVInfo *info = (ADVInfo *)arg; + INFCONTEXT context; + HRESULT hr = S_OK; + DWORD size; + + BOOL ok = SetupFindFirstLineW(hinf, field, NULL, &context); + + for (; ok; ok = SetupFindNextLine(&context, &context)) + { + WCHAR buffer[MAX_INF_STRING_LENGTH]; + + if (!SetupGetLineTextW(&context, NULL, NULL, NULL, buffer, + MAX_INF_STRING_LENGTH, &size)) + continue; + + if (launch_exe(buffer, info->working_dir, NULL)) + hr = E_FAIL; + } + + return hr; +} + /* sequentially returns pointers to parameters in a parameter list * returns NULL if the parameter is empty, e.g. one,,three */ LPWSTR get_parameter(LPWSTR *params, WCHAR separator) @@ -222,6 +249,13 @@ static HRESULT adv_install(ADVInfo *info hr = iterate_section_fields(info->hinf, info->install_sec, RegisterOCXs, register_ocxs_callback, NULL); + if (hr != S_OK) + return hr; + + hr = iterate_section_fields(info->hinf, info->install_sec, RunPostSetupCommands, + run_post_setup_commands_callback, info); + if (hr != S_OK) + return hr; return hr; }

1 0

James Hawkins : advpack: Implement the RegisterOCXs callback.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: c4ca63418f68487a9ed77de8c935daedf0b01a14 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4ca63418f68487a9ed77de… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Apr 20 10:08:44 2006 -0500 advpack: Implement the RegisterOCXs callback. --- dlls/advpack/advpack_private.h | 1 + dlls/advpack/install.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index 8da353c..0921159 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -21,6 +21,7 @@ #ifndef __ADVPACK_PRIVATE_H #define __ADVPACK_PRIVATE_H +HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg); LPWSTR get_parameter(LPWSTR *params, WCHAR separator); void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir); diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 252fd89..e7911ca 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -62,8 +62,35 @@ static const WCHAR RegisterOCXs[] = {'R' /* Advanced INF callbacks */ static HRESULT register_ocxs_callback(HINF hinf, PCWSTR field, void *arg) { - FIXME("Unhandled command: RegisterOCXs\n"); - return E_FAIL; + HMODULE hm; + INFCONTEXT context; + HRESULT hr = S_OK; + + BOOL ok = SetupFindFirstLineW(hinf, field, NULL, &context); + + for (; ok; ok = SetupFindNextLine(&context, &context)) + { + WCHAR buffer[MAX_INF_STRING_LENGTH]; + + /* get OCX filename */ + if (!SetupGetStringFieldW(&context, 1, buffer, + sizeof(buffer) / sizeof(WCHAR), NULL)) + continue; + + hm = LoadLibraryExW(buffer, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + if (!hm) + { + hr = E_FAIL; + continue; + } + + if (do_ocx_reg(hm, TRUE)) + hr = E_FAIL; + + FreeLibrary(hm); + } + + return hr; } /* sequentially returns pointers to parameters in a parameter list

1 0

Jeff Latimer : usp10: Set defaults for ScriptGetFontProperties.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: 9be30c83cae96a9e85e168948d13b00b6277baea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9be30c83cae96a9e85e1689… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Thu Apr 20 21:57:06 2006 +1000 usp10: Set defaults for ScriptGetFontProperties. Set defaults similar to Win XP for Kashida and set the default char in ScriptGetFontProperties. --- dlls/usp10/usp10.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index cc8b922..d1be349 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -123,6 +123,7 @@ HRESULT WINAPI ScriptGetFontProperties(H { HDC phdc; Scriptcache *pScriptcache; + TEXTMETRICW ptm; TRACE("%p,%p,%p\n", hdc, psc, sfp); if (!hdc && !*psc) { @@ -146,9 +147,12 @@ HRESULT WINAPI ScriptGetFontProperties(H /* return something sensible? */ if (NULL != sfp) { sfp->wgBlank = 0; - sfp->wgDefault = 0; + if (GetTextMetricsW(phdc, &ptm)) + sfp->wgDefault = ptm.tmDefaultChar; + else + sfp->wgDefault = 0; sfp->wgInvalid = 0; - sfp->wgKashida = 1; + sfp->wgKashida = 0xffff; sfp->iKashidaWidth = 0; } return 0;

1 0

Jeff Latimer : usp10: Remove the need to pass chars to ScriptPlace.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: 9c6c83e97fbdba3325dd4fca15b6bb2bc72d70e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9c6c83e97fbdba3325dd4fc… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Thu Apr 20 21:50:44 2006 +1000 usp10: Remove the need to pass chars to ScriptPlace. --- dlls/usp10/usp10.c | 63 ++++++++++++++++++++++++++-------------------------- 1 files changed, 31 insertions(+), 32 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index b0e7ce8..cc8b922 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -70,9 +70,6 @@ static const SCRIPT_PROPERTIES *Global_S typedef struct scriptcache { HDC hdc; - DWORD GlyphToChar[256]; - int HaveWidths; - ABC CharWidths[256]; } Scriptcache; BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) @@ -127,7 +124,7 @@ HRESULT WINAPI ScriptGetFontProperties(H HDC phdc; Scriptcache *pScriptcache; - FIXME("%p,%p,%p\n", hdc, psc, sfp); + TRACE("%p,%p,%p\n", hdc, psc, sfp); if (!hdc && !*psc) { TRACE("No Script_Cache (psc) and no hdc. Ask for one. Hdc=%p, psc=%p\n", hdc, *psc); return E_PENDING; @@ -136,9 +133,8 @@ HRESULT WINAPI ScriptGetFontProperties(H pScriptcache = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(Scriptcache) ); pScriptcache->hdc = (HDC) hdc; phdc = hdc; - pScriptcache->HaveWidths = 0; *psc = (Scriptcache *) pScriptcache; - } else + } else if (*psc) { pScriptcache = (Scriptcache *) *psc; phdc = pScriptcache->hdc; @@ -303,6 +299,7 @@ HRESULT WINAPI ScriptIsComplex(const WCH FIXME("(%s,%d,0x%lx): stub\n", debugstr_wn(pwcInChars, cInChars), cInChars, dwFlags); return E_NOTIMPL; } + /*********************************************************************** * ScriptShape (USP10.@) * @@ -333,10 +330,9 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRI return E_PENDING; } else if (hdc && !*psc) { - pScriptcache = HeapAlloc( GetProcessHeap(), 0, sizeof(Scriptcache) ); + pScriptcache = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(Scriptcache) ); pScriptcache->hdc = (HDC) hdc; phdc = hdc; - pScriptcache->HaveWidths = 0; *psc = (Scriptcache *) pScriptcache; } else if (*psc) { @@ -354,16 +350,14 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRI TRACE("After: "); for (cnt = 0; cnt < cChars; cnt++) { TRACE("%04x",pwOutGlyphs[cnt]); - pScriptcache->GlyphToChar[pwOutGlyphs[cnt]] = pwcChars[cnt]; /* save for ScriptPlace */ } - TRACE("\n"); + TRACE("\n"); } else { TRACE("After: "); for (cnt = 0; cnt < cChars; cnt++) { /* no translate so set up */ pwOutGlyphs[cnt] = pwcChars[cnt]; /* copy in to out and */ TRACE("%04x",pwOutGlyphs[cnt]); - pScriptcache->GlyphToChar[pwcChars[cnt]] = pwcChars[cnt]; /* set up a dummy table */ } TRACE("\n"); } @@ -417,34 +411,41 @@ HRESULT WINAPI ScriptPlace(HDC hdc, SCRI /* Here we need to calculate the width of the run unit. At this point the input string * has been converted to glyphs and we till need to translate back to the original chars - * to get the correct ABC widths. To make life easier the ABC widths are saved in the - * SCRIPT_CACHE. This is ok as the cache must be invalidated if the font or font size - * changes. */ + * to get the correct ABC widths. */ - lpABC = pScriptcache->CharWidths; + lpABC = HeapAlloc(GetProcessHeap(), 0 , sizeof(ABC)*cGlyphs); pABC->abcA = 0; pABC->abcB = 0; pABC->abcC = 0; - if (!pScriptcache->HaveWidths) { - if (GetCharABCWidthsW(phdc, 0, 255, lpABC )) - pScriptcache->HaveWidths = 1; - else { - WARN("Could not get ABC values\n"); + if (!GetCharABCWidthsI(phdc, 0, cGlyphs, (WORD *) pwGlyphs, lpABC )) + { + WARN("Could not get ABC values\n"); + for (wcnt = 0; wcnt < cGlyphs; wcnt++) { + piAdvance[wcnt] = 0; + pGoffset[wcnt].du = 0; + pGoffset[wcnt].dv = 0; } } - - for (wcnt = 0; wcnt < cGlyphs ; wcnt++) { /* add up the char lengths */ - TRACE(" Glyph=%04x, abcA=%d, abcB=%d, abcC=%d wcnt=%d\n", - pwGlyphs[wcnt], - lpABC[pScriptcache->GlyphToChar[pwGlyphs[wcnt]]].abcA, - lpABC[pScriptcache->GlyphToChar[pwGlyphs[wcnt]]].abcB, - lpABC[pScriptcache->GlyphToChar[pwGlyphs[wcnt]]].abcC, wcnt); - pABC->abcA += lpABC[pScriptcache->GlyphToChar[pwGlyphs[wcnt]]].abcA; - pABC->abcB += lpABC[pScriptcache->GlyphToChar[pwGlyphs[wcnt]]].abcB; - pABC->abcC += lpABC[pScriptcache->GlyphToChar[pwGlyphs[wcnt]]].abcC; + else + { + for (wcnt = 0; wcnt < cGlyphs ; wcnt++) { /* add up the char lengths */ + TRACE(" Glyph=%04x, abcA=%d, abcB=%d, abcC=%d wcnt=%d\n", + pwGlyphs[wcnt], + lpABC[wcnt].abcA, + lpABC[wcnt].abcB, + lpABC[wcnt].abcC, wcnt); + pABC->abcA += lpABC[wcnt].abcA; + pABC->abcB += lpABC[wcnt].abcB; + pABC->abcC += lpABC[wcnt].abcC; + piAdvance[wcnt] = lpABC[wcnt].abcA + lpABC[wcnt].abcB + lpABC[wcnt].abcC; + pGoffset[wcnt].du = 0; + pGoffset[wcnt].dv = 0; + } } TRACE("Total for run: abcA=%d, abcB=%d, abcC=%d\n", pABC->abcA, pABC->abcB, pABC->abcC); + HeapFree(GetProcessHeap(), 0, lpABC ); + return 0; } @@ -469,7 +470,6 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SC pScriptcache = HeapAlloc( GetProcessHeap(), 0, sizeof(Scriptcache) ); pScriptcache->hdc = hdc; phdc = hdc; - pScriptcache->HaveWidths = 0; *psc = pScriptcache; } else if (*psc) { @@ -486,7 +486,6 @@ HRESULT WINAPI ScriptGetCMap(HDC hdc, SC TRACE("After: "); for (cnt = 0; cnt < cChars; cnt++) { TRACE("%04x",pwOutGlyphs[cnt]); - pScriptcache->GlyphToChar[pwOutGlyphs[cnt]] = pwcInChars[cnt]; /* save for ScriptPlace */ } TRACE("\n");

1 0

Alexandre Julliard : server: Remove some no longer needed ptrace code to set registers.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: f6cb551d7f65c2098607a80d95302afb829d4df9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f6cb551d7f65c2098607a80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 20 17:46:16 2006 +0200 server: Remove some no longer needed ptrace code to set registers. Also make sure the debug registers are properly copied to the context when set. --- server/context_i386.c | 489 ++++++++++--------------------------------------- 1 files changed, 99 insertions(+), 390 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f6cb551d7f65c209860…

1 0

Alexandre Julliard : ntdll: Use NtSetContextThread in NtRaiseException.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: 2bfe47e85261f81091aa21b9212e5ff297156cc9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2bfe47e85261f81091aa21b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 20 15:40:42 2006 +0200 ntdll: Use NtSetContextThread in NtRaiseException. --- dlls/ntdll/exception.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 4444ba1..8b1fc68 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -77,8 +77,6 @@ #else # error You must define GET_IP for this CPU #endif -extern void DECLSPEC_NORETURN __wine_call_from_32_restore_regs( const CONTEXT *context ); - /******************************************************************* * EXC_RaiseHandler * @@ -369,9 +367,7 @@ #endif NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_chance ) { NTSTATUS status = raise_exception( rec, context, first_chance ); -#ifdef DEFINE_REGS_ENTRYPOINT - if (status == STATUS_SUCCESS) __wine_call_from_32_restore_regs( context ); -#endif + if (status == STATUS_SUCCESS) NtSetContextThread( GetCurrentThread(), context ); return status; }

1 0

Alexandre Julliard : ntdll: Get registers on the client side for NtGetContextThread on the current thread .
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: d2ad6f83556449bcd8a798191cfc8f0ae8b6d950 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d2ad6f83556449bcd8a7981… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 20 15:40:28 2006 +0200 ntdll: Get registers on the client side for NtGetContextThread on the current thread. --- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_i386.c | 32 ++++++++++++++++--- dlls/ntdll/signal_powerpc.c | 11 ++++++ dlls/ntdll/signal_sparc.c | 11 ++++++ dlls/ntdll/signal_x86_64.c | 11 ++++++ dlls/ntdll/thread.c | 74 ++++++++++++++++++++++++++----------------- server/context_i386.c | 5 +-- 7 files changed, 109 insertions(+), 36 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 35cbd5b..fa18e46 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -32,6 +32,7 @@ #define MAX_NT_PATH_LENGTH 277 /* exceptions */ extern void wait_suspend( CONTEXT *context ); extern void WINAPI __regs_RtlRaiseException( PEXCEPTION_RECORD, PCONTEXT ); +extern void get_cpu_context( CONTEXT *context ); extern void set_cpu_context( const CONTEXT *context ); /* debug helper */ diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 39b20d0..398dbdf 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -704,6 +704,20 @@ #endif /*********************************************************************** + * save_fpu + * + * Save the thread FPU context. + */ +inline static void save_fpu( CONTEXT *context ) +{ +#ifdef __GNUC__ + context->ContextFlags |= CONTEXT_FLOATING_POINT; + __asm__ __volatile__( "fnsave %0; fwait" : "=m" (context->FloatSave) ); +#endif +} + + +/*********************************************************************** * restore_fpu * * Restore the FPU context to a sigcontext. @@ -762,10 +776,7 @@ #ifdef FPU_sig else #endif { -#ifdef __GNUC__ - context->ContextFlags |= CONTEXT_FLOATING_POINT; - __asm__ __volatile__( "fnsave %0; fwait" : "=m" (context->FloatSave) ); -#endif + save_fpu( context ); } } @@ -824,6 +835,19 @@ #endif /*********************************************************************** + * get_cpu_context + * + * Register function to get the context of the current thread. + */ +void WINAPI __regs_get_cpu_context( CONTEXT *context, CONTEXT *regs ) +{ + *context = *regs; + save_fpu( context ); +} +DEFINE_REGS_ENTRYPOINT( get_cpu_context, 4, 4 ); + + +/*********************************************************************** * set_cpu_context * * Set the new CPU context. Used by NtSetContextThread. diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 50d48d4..cbe4f80 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -269,6 +269,17 @@ #undef C /*********************************************************************** + * get_cpu_context + * + * Get the context of the current thread. + */ +void get_cpu_context( CONTEXT *context ) +{ + FIXME("not implemented\n"); +} + + +/*********************************************************************** * set_cpu_context * * Set the new CPU context. diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index 4ae3340..0bf8dac 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -149,6 +149,17 @@ static void restore_fpu( CONTEXT *contex /*********************************************************************** + * get_cpu_context + * + * Get the context of the current thread. + */ +void get_cpu_context( CONTEXT *context ) +{ + FIXME("not implemented\n"); +} + + +/*********************************************************************** * set_cpu_context * * Set the new CPU context. diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 87d40b5..4ae61e7 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -199,6 +199,17 @@ static void restore_context( const CONTE /*********************************************************************** + * get_cpu_context + * + * Get the context of the current thread. + */ +void get_cpu_context( CONTEXT *context ) +{ + FIXME("not implemented\n"); +} + + +/*********************************************************************** * set_cpu_context * * Set the new CPU context. diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index b4226f9..67e6930 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -921,47 +921,64 @@ NTSTATUS WINAPI NtGetContextThread( HAND NTSTATUS ret; CONTEXT ctx; DWORD dummy, i; - BOOL self = FALSE; + DWORD needed_flags = context->ContextFlags; + BOOL self = (handle == GetCurrentThread()); - SERVER_START_REQ( get_thread_context ) - { - req->handle = handle; - req->flags = context->ContextFlags; - req->suspend = 0; - wine_server_set_reply( req, &ctx, sizeof(ctx) ); - ret = wine_server_call( req ); - self = reply->self; - } - SERVER_END_REQ; +#ifdef __i386__ + /* on i386 debug registers always require a server call */ + if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386)) self = FALSE; +#endif - if (ret == STATUS_PENDING) + if (!self) { - if (NtSuspendThread( handle, &dummy ) == STATUS_SUCCESS) + SERVER_START_REQ( get_thread_context ) + { + req->handle = handle; + req->flags = context->ContextFlags; + req->suspend = 0; + wine_server_set_reply( req, &ctx, sizeof(ctx) ); + ret = wine_server_call( req ); + self = reply->self; + } + SERVER_END_REQ; + + if (ret == STATUS_PENDING) { - for (i = 0; i < 100; i++) + if (NtSuspendThread( handle, &dummy ) == STATUS_SUCCESS) { - SERVER_START_REQ( get_thread_context ) + for (i = 0; i < 100; i++) { - req->handle = handle; - req->flags = context->ContextFlags; - req->suspend = 0; - wine_server_set_reply( req, &ctx, sizeof(ctx) ); - ret = wine_server_call( req ); + SERVER_START_REQ( get_thread_context ) + { + req->handle = handle; + req->flags = context->ContextFlags; + req->suspend = 0; + wine_server_set_reply( req, &ctx, sizeof(ctx) ); + ret = wine_server_call( req ); + } + SERVER_END_REQ; + if (ret != STATUS_PENDING) break; + NtYieldExecution(); } - SERVER_END_REQ; - if (ret != STATUS_PENDING) break; - NtYieldExecution(); + NtResumeThread( handle, &dummy ); } - NtResumeThread( handle, &dummy ); + if (ret == STATUS_PENDING) ret = STATUS_ACCESS_DENIED; } + if (ret) return ret; + copy_context( context, &ctx, context->ContextFlags & ctx.ContextFlags ); + needed_flags &= ~ctx.ContextFlags; } - if (ret == STATUS_SUCCESS) + if (self) { - copy_context( context, &ctx, context->ContextFlags ); + if (needed_flags) + { + get_cpu_context( &ctx ); + copy_context( context, &ctx, ctx.ContextFlags & needed_flags ); + } #ifdef __i386__ /* update the cached version of the debug registers */ - if (self && (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386))) + if (context->ContextFlags & (CONTEXT_DEBUG_REGISTERS & ~CONTEXT_i386)) { struct ntdll_thread_regs * const regs = ntdll_get_thread_regs(); regs->dr0 = context->Dr0; @@ -973,8 +990,7 @@ #ifdef __i386__ } #endif } - else if (ret == STATUS_PENDING) ret = STATUS_ACCESS_DENIED; - return ret; + return STATUS_SUCCESS; } diff --git a/server/context_i386.c b/server/context_i386.c index ce7fd9b..0a3a329 100644 --- a/server/context_i386.c +++ b/server/context_i386.c @@ -550,10 +550,9 @@ void get_thread_context( struct thread * flags &= ~CONTEXT_i386; /* get rid of CPU id */ if (thread->context) /* thread is inside an exception event or suspended */ - { copy_context( context, thread->context, flags ); - flags &= CONTEXT_DEBUG_REGISTERS; - } + + flags &= CONTEXT_DEBUG_REGISTERS; if (flags && suspend_for_ptrace( thread )) {

1 0

Ivan Gyurdiev : wined3d: Trace corrections/improvements.
by Alexandre Julliard April 20, 2006

April 20, 2006

Module: wine Branch: refs/heads/master Commit: 63ef9788dd14cf65f29b9f249447f8c2998141d9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=63ef9788dd14cf65f29b9f2… Author: Ivan Gyurdiev <ivg2(a)cornell.edu> Date: Wed Apr 19 23:53:48 2006 -0400 wined3d: Trace corrections/improvements. --- dlls/wined3d/pixelshader.c | 52 ++++++++++++++++++++++++++++++++----------- dlls/wined3d/vertexshader.c | 43 ++++++++++++++++++++++++++++-------- 2 files changed, 73 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index b121f7b..4a98bf5 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -1591,8 +1591,8 @@ inline static void pshader_program_dump_ case 14: TRACE("_d4"); break; case 15: TRACE("_d2"); break; case 1: TRACE("_x2"); break; - case 3: TRACE("_x4"); break; - case 7: TRACE("_x8"); break; + case 2: TRACE("_x4"); break; + case 3: TRACE("_x8"); break; default: TRACE("_unhandled_shift(%ld)", shift); break; } @@ -1628,7 +1628,7 @@ #define EXTENDED_REG 0x1800 TRACE("1-"); } - switch (regtype /* << D3DSP_REGTYPE_SHIFT (I don't know why this was here)*/) { + switch (regtype) { case D3DSPR_TEMP: TRACE("r%lu", reg); break; @@ -1663,7 +1663,11 @@ #define EXTENDED_REG 0x1800 case D3DSPR_LOOP: TRACE("aL%s%lu", (param & D3DVS_ADDRMODE_RELATIVE) ? "a0.x + " : "", reg); break; + case D3DSPR_SAMPLER: + TRACE("s%lu", reg); + break; default: + TRACE("unhandled_rtype(%lx)", regtype); break; } @@ -1725,11 +1729,32 @@ #define EXTENDED_REG 0x1800 } } -inline static void pshader_program_dump_decl_usage(IWineD3DPixelShaderImpl *This, DWORD token) { +inline static void pshader_program_dump_decl_usage( + IWineD3DPixelShaderImpl *This, DWORD decl, DWORD param) { + + DWORD regtype = ((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT) | + ((param & D3DSP_REGTYPE_MASK2) >> D3DSP_REGTYPE_SHIFT2); + TRACE("dcl_"); - switch(token & 0xFFFF) { + + if (regtype == D3DSPR_SAMPLER) { + DWORD ttype = decl & D3DSP_TEXTURETYPE_MASK; + + switch (ttype) { + case D3DSTT_2D: TRACE("2d "); break; + case D3DSTT_CUBE: TRACE("cube "); break; + case D3DSTT_VOLUME: TRACE("volume "); break; + default: TRACE("unknown_ttype(%08lx) ", ttype); + } + + } else { + + DWORD usage = decl & D3DSP_DCL_USAGE_MASK; + DWORD idx = (decl & D3DSP_DCL_USAGEINDEX_MASK) >> D3DSP_DCL_USAGEINDEX_SHIFT; + + switch(usage) { case D3DDECLUSAGE_POSITION: - TRACE("%s%ld ", "position",(token & 0xF0000) >> 16); + TRACE("%s%ld ", "position", idx); break; case D3DDECLUSAGE_BLENDINDICES: TRACE("%s ", "blend"); @@ -1738,20 +1763,20 @@ inline static void pshader_program_dump_ TRACE("%s ", "weight"); break; case D3DDECLUSAGE_NORMAL: - TRACE("%s%ld ", "normal",(token & 0xF0000) >> 16); + TRACE("%s%ld ", "normal", idx); break; case D3DDECLUSAGE_PSIZE: TRACE("%s ", "psize"); break; case D3DDECLUSAGE_COLOR: - if((token & 0xF0000) >> 16 == 0) { + if(idx == 0) { TRACE("%s ", "color"); } else { - TRACE("%s%ld ", "specular", ((token & 0xF0000) >> 16) - 1); + TRACE("%s%ld ", "specular", (idx - 1)); } break; case D3DDECLUSAGE_TEXCOORD: - TRACE("%s%ld ", "texture", (token & 0xF0000) >> 16); + TRACE("%s%ld ", "texture", idx); break; case D3DDECLUSAGE_TANGENT: TRACE("%s ", "tangent"); @@ -1763,7 +1788,7 @@ inline static void pshader_program_dump_ TRACE("%s ", "tessfactor"); break; case D3DDECLUSAGE_POSITIONT: - TRACE("%s%ld ", "positionT",(token & 0xF0000) >> 16); + TRACE("%s%ld ", "positionT", idx); break; case D3DDECLUSAGE_FOG: TRACE("%s ", "fog"); @@ -1775,7 +1800,8 @@ inline static void pshader_program_dump_ TRACE("%s ", "sample"); break; default: - FIXME("Unrecognised dcl %08lx", token & 0xFFFF); + FIXME("Unrecognised dcl %08lx", usage); + } } } @@ -1824,7 +1850,7 @@ HRESULT WINAPI IWineD3DPixelShaderImpl_S } else { if (curOpcode->opcode == D3DSIO_DCL) { - pshader_program_dump_decl_usage(This, *pToken); + pshader_program_dump_decl_usage(This, *pToken, *(pToken + 1)); ++pToken; ++len; pshader_program_dump_ps_param(*pToken, 0); diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 0912077..7cd05e3 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -830,6 +830,9 @@ #define EXTENDED_REG 0x1800 case D3DSPR_LOOP: TRACE("aL%s%lu", (param & D3DVS_ADDRMODE_RELATIVE) ? "a0.x + " : "", reg); break; + case D3DSPR_SAMPLER: + TRACE("s%lu", reg); + break; default: FIXME("Unknown %lu reg %lu\n",regtype, reg); break; @@ -870,11 +873,32 @@ #define EXTENDED_REG 0x1800 } } -inline static void vshader_program_dump_decl_usage(IWineD3DVertexShaderImpl *This, DWORD token) { +inline static void vshader_program_dump_decl_usage( + IWineD3DVertexShaderImpl *This, DWORD decl, DWORD param) { + + DWORD regtype = ((param & D3DSP_REGTYPE_MASK) >> D3DSP_REGTYPE_SHIFT) | + ((param & D3DSP_REGTYPE_MASK2) >> D3DSP_REGTYPE_SHIFT2); + TRACE("dcl_"); - switch(token & 0xFFFF) { + + if (regtype == D3DSPR_SAMPLER) { + DWORD ttype = decl & D3DSP_TEXTURETYPE_MASK; + + switch (ttype) { + case D3DSTT_2D: TRACE("2d "); break; + case D3DSTT_CUBE: TRACE("cube "); break; + case D3DSTT_VOLUME: TRACE("volume "); break; + default: TRACE("unknown_ttype(%08lx) ", ttype); + } + + } else { + + DWORD usage = decl & D3DSP_DCL_USAGE_MASK; + DWORD idx = (decl & D3DSP_DCL_USAGEINDEX_MASK) >> D3DSP_DCL_USAGEINDEX_SHIFT; + + switch(usage) { case D3DDECLUSAGE_POSITION: - TRACE("%s%ld ", "position",(token & 0xF0000) >> 16); + TRACE("%s%ld ", "position", idx); break; case D3DDECLUSAGE_BLENDINDICES: TRACE("%s ", "blend"); @@ -883,20 +907,20 @@ inline static void vshader_program_dump_ TRACE("%s ", "weight"); break; case D3DDECLUSAGE_NORMAL: - TRACE("%s%ld ", "normal",(token & 0xF0000) >> 16); + TRACE("%s%ld ", "normal", idx); break; case D3DDECLUSAGE_PSIZE: TRACE("%s ", "psize"); break; case D3DDECLUSAGE_COLOR: - if((token & 0xF0000) >> 16 == 0) { + if(idx == 0) { TRACE("%s ", "color"); } else { TRACE("%s ", "specular"); } break; case D3DDECLUSAGE_TEXCOORD: - TRACE("%s%ld ", "texture", (token & 0xF0000) >> 16); + TRACE("%s%ld ", "texture", idx); break; case D3DDECLUSAGE_TANGENT: TRACE("%s ", "tangent"); @@ -908,7 +932,7 @@ inline static void vshader_program_dump_ TRACE("%s ", "tessfactor"); break; case D3DDECLUSAGE_POSITIONT: - TRACE("%s%ld ", "positionT",(token & 0xF0000) >> 16); + TRACE("%s%ld ", "positionT", idx); break; case D3DDECLUSAGE_FOG: TRACE("%s ", "fog"); @@ -920,7 +944,8 @@ inline static void vshader_program_dump_ TRACE("%s ", "sample"); break; default: - FIXME("Unrecognised dcl %08lx", token & 0xFFFF); + FIXME("Unrecognised dcl %08lx", usage); + } } } @@ -2157,7 +2182,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ } else { if (curOpcode->opcode == D3DSIO_DCL) { - vshader_program_dump_decl_usage(This, *pToken); + vshader_program_dump_decl_usage(This, *pToken, *(pToken + 1)); ++pToken; ++len; vshader_program_dump_vs_param(*pToken, 0);

1 0