March 2013 - Wine-Commits - list.winehq.org

André Hentschel : kernel32/tests: Remove SPARC support .
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 56dbef9b1943b54b238e91591a2a3a8fd7c13105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56dbef9b1943b54b238e91591… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 20 21:09:57 2013 +0100 kernel32/tests: Remove SPARC support. --- dlls/kernel32/tests/file.c | 2 -- dlls/kernel32/tests/loader.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 3216fa5..65ff18c 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1783,8 +1783,6 @@ static BOOL create_fake_dll( LPCSTR filename ) nt->FileHeader.Machine = IMAGE_FILE_MACHINE_AMD64; #elif defined __powerpc__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_POWERPC; -#elif defined __sparc__ - nt->FileHeader.Machine = IMAGE_FILE_MACHINE_SPARC; #elif defined __arm__ nt->FileHeader.Machine = IMAGE_FILE_MACHINE_ARMNT; #elif defined __aarch64__ diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index a884779..92a2e0b 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -60,8 +60,6 @@ static IMAGE_NT_HEADERS nt_header = IMAGE_FILE_MACHINE_AMD64, /* Machine */ #elif defined __powerpc__ IMAGE_FILE_MACHINE_POWERPC, /* Machine */ -#elif defined __sparc__ - IMAGE_FILE_MACHINE_SPARC, /* Machine */ #elif defined __arm__ IMAGE_FILE_MACHINE_ARMNT, /* Machine */ #elif defined __aarch64__

1 0

Alessandro Pignotti : qedit: Implement IMediaSeeking and IMediaPosition in sample grabber.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: ae771fee02d70469756f8bb08033ee1c93291a82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae771fee02d70469756f8bb08… Author: Alessandro Pignotti <a.pignotti(a)sssup.it> Date: Tue Feb 26 14:09:42 2013 +0100 qedit: Implement IMediaSeeking and IMediaPosition in sample grabber. --- dlls/qedit/samplegrabber.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index c748c98..d2523a8 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -369,7 +369,9 @@ typedef struct _SG_Impl { IBaseFilter IBaseFilter_iface; ISampleGrabber ISampleGrabber_iface; IMemInputPin IMemInputPin_iface; - /* TODO: IMediaPosition, IMediaSeeking, IQualityControl */ + /* IMediaSeeking and IMediaPosition are implemented by ISeekingPassThru */ + IUnknown* seekthru_unk; + /* TODO: IQualityControl */ IUnknown *outer_unk; LONG ref; CRITICAL_SECTION critSect; @@ -433,6 +435,8 @@ static void SampleGrabber_cleanup(SG_Impl *This) CoTaskMemFree(This->mtype.pbFormat); if (This->bufferData) CoTaskMemFree(This->bufferData); + if(This->seekthru_unk) + IUnknown_Release(This->seekthru_unk); This->critSect.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->critSect); } @@ -455,9 +459,9 @@ static HRESULT WINAPI SampleGrabber_QueryInterface(IUnknown *iface, REFIID riid, else if (IsEqualIID(riid, &IID_IMemInputPin)) *ppv = &This->IMemInputPin_iface; else if (IsEqualIID(riid, &IID_IMediaPosition)) - FIXME("IMediaPosition not implemented\n"); + return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); else if (IsEqualIID(riid, &IID_IMediaSeeking)) - FIXME("IMediaSeeking not implemented\n"); + return IUnknown_QueryInterface(This->seekthru_unk, riid, ppv); else if (IsEqualIID(riid, &IID_IQualityControl)) FIXME("IQualityControl not implemented\n"); else @@ -1048,6 +1052,10 @@ SampleGrabber_IPin_QueryInterface(IPin *iface, REFIID riid, void **ppv) *ppv = iface; else if (IsEqualIID(riid, &IID_IMemInputPin)) *ppv = &This->sg->IMemInputPin_iface; + else if (IsEqualIID(riid, &IID_IMediaSeeking)) + return IUnknown_QueryInterface(&This->sg->IUnknown_inner, riid, ppv); + else if (IsEqualIID(riid, &IID_IMediaPosition)) + return IUnknown_QueryInterface(&This->sg->IUnknown_inner, riid, ppv); else { WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppv); return E_NOINTERFACE; @@ -1467,6 +1475,8 @@ static const IPinVtbl IPin_Out_VTable = HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) { SG_Impl* obj = NULL; + ISeekingPassThru *passthru; + HRESULT hr; TRACE("(%p,%p)\n", ppv, pUnkOuter); @@ -1514,6 +1524,13 @@ HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) else obj->outer_unk = &obj->IUnknown_inner; + hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)obj, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&obj->seekthru_unk); + if(hr) + return hr; + IUnknown_QueryInterface(obj->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru); + ISeekingPassThru_Init(passthru, FALSE, &obj->pin_in.IPin_iface); + ISeekingPassThru_Release(passthru); + *ppv = &obj->IUnknown_inner; return S_OK; }

1 0

Jacek Caban : jscript: Use jsstr_flush in jsstr_concat.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 721d3ec1b44f550f8ab6abc36543c6e215fe6c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=721d3ec1b44f550f8ab6abc36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 5 11:49:33 2013 +0100 jscript: Use jsstr_flush in jsstr_concat. --- dlls/jscript/jsstr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsstr.c b/dlls/jscript/jsstr.c index d34af0f..59dfe98 100644 --- a/dlls/jscript/jsstr.c +++ b/dlls/jscript/jsstr.c @@ -83,8 +83,8 @@ jsstr_t *jsstr_concat(jsstr_t *str1, jsstr_t *str2) if(!ret) return NULL; - memcpy(ret->str, str1->str, len1*sizeof(WCHAR)); - memcpy(ret->str+len1, str2->str, len2*sizeof(WCHAR)); + jsstr_flush(str1, ret->str); + jsstr_flush(str2, ret->str+len1); return ret; }

1 0

Piotr Caban : msvcrt: Don't set unhandled exception filter, XcptFilter is responsible for handling signals.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 62e00e527fa67e3ddb043a61f6813f471b380116 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e00e527fa67e3ddb043a61f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 5 11:05:32 2013 +0100 msvcrt: Don't set unhandled exception filter, XcptFilter is responsible for handling signals. --- dlls/msvcrt/except.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 80004c9..c96623c 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -152,13 +152,11 @@ static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) void msvcrt_init_signals(void) { SetConsoleCtrlHandler(msvcrt_console_handler, TRUE); - SetUnhandledExceptionFilter(msvcrt_exception_filter); } void msvcrt_free_signals(void) { SetConsoleCtrlHandler(msvcrt_console_handler, FALSE); - SetUnhandledExceptionFilter(NULL); } /*********************************************************************

1 0

Jacek Caban : jscript: Use jsstr_flush in construct_function.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 3f30c34827a143f8573a619fc8279755410426c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f30c34827a143f8573a619fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 5 11:49:21 2013 +0100 jscript: Use jsstr_flush in construct_function. --- dlls/jscript/function.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 056f04a..af79c42 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -751,11 +751,10 @@ HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, function_cod static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *argv, IDispatch **ret) { WCHAR *str = NULL, *ptr; - DWORD len = 0, l; + unsigned len = 0, i = 0; bytecode_t *code; jsdisp_t *function; jsstr_t **params = NULL; - unsigned int i = 0; int j = 0; HRESULT hres = S_OK; @@ -786,9 +785,7 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg ptr = str + sizeof(function_anonymousW)/sizeof(WCHAR); if(argc > 1) { while(1) { - l = jsstr_length(params[j]); - memcpy(ptr, params[j]->str, l*sizeof(WCHAR)); - ptr += l; + ptr += jsstr_flush(params[j], ptr); if(++j == argc-1) break; *ptr++ = ','; @@ -797,11 +794,8 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg } memcpy(ptr, function_beginW, sizeof(function_beginW)); ptr += sizeof(function_beginW)/sizeof(WCHAR); - if(argc) { - l = jsstr_length(params[argc-1]); - memcpy(ptr, params[argc-1]->str, l*sizeof(WCHAR)); - ptr += l; - } + if(argc) + ptr += jsstr_flush(params[argc-1], ptr); memcpy(ptr, function_endW, sizeof(function_endW)); TRACE("%s\n", debugstr_w(str));

1 0

Jacek Caban : jscript: Use jsstr_flush in Error_toString.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 55f67035c410abf2d76ed65098a2e1e181e3796c URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f67035c410abf2d76ed6509… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 5 11:49:06 2013 +0100 jscript: Use jsstr_flush in Error_toString. --- dlls/jscript/error.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 9f5cfe6..3e15144 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -85,10 +85,10 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, if(name_len && msg_len) { ret = jsstr_alloc_buf(name_len + msg_len + 2); if(ret) { - memcpy(ret->str, name->str, name_len*sizeof(WCHAR)); + jsstr_flush(name, ret->str); ret->str[name_len] = ':'; ret->str[name_len+1] = ' '; - memcpy(ret->str+name_len+2, msg->str, msg_len*sizeof(WCHAR)); + jsstr_flush(msg, ret->str+name_len+2); } }else if(name_len) { ret = name;

1 0

André Hentschel : server: Remove SPARC support.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 0effd926b6475842baefc5379b9dd932c08ff14e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0effd926b6475842baefc5379… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 20 21:10:16 2013 +0100 server: Remove SPARC support. --- dlls/ntdll/server.c | 2 -- include/wine/server_protocol.h | 6 ++---- server/protocol.def | 4 +--- server/thread.c | 6 ------ server/trace.c | 14 -------------- 5 files changed, 3 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index dd0d83e..46494e2 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -98,8 +98,6 @@ static const enum cpu_type client_cpu = CPU_x86; static const enum cpu_type client_cpu = CPU_x86_64; #elif defined(__powerpc__) static const enum cpu_type client_cpu = CPU_POWERPC; -#elif defined(__sparc__) -static const enum cpu_type client_cpu = CPU_SPARC; #elif defined(__arm__) static const enum cpu_type client_cpu = CPU_ARM; #elif defined(__aarch64__) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 8a8a0ed..6f3a5d6 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -129,7 +129,7 @@ typedef union enum cpu_type { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_SPARC + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 }; typedef int cpu_type_t; @@ -146,7 +146,6 @@ typedef struct struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs; struct { unsigned int sp, lr, pc, cpsr; } arm_regs; struct { unsigned __int64 sp, pc, pstate; } arm64_regs; - struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs; } ctl; union { @@ -156,7 +155,6 @@ typedef struct struct { unsigned int gpr[32], cr, xer; } powerpc_regs; struct { unsigned int r[13]; } arm_regs; struct { unsigned __int64 x[31]; } arm64_regs; - struct { unsigned int g[8], o[8], l[8], i[8]; } sparc_regs; } integer; union { @@ -5717,6 +5715,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 439 +#define SERVER_PROTOCOL_VERSION 440 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 7bb679a..234c41e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -145,7 +145,7 @@ typedef union /* supported CPU types */ enum cpu_type { - CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64, CPU_SPARC + CPU_x86, CPU_x86_64, CPU_POWERPC, CPU_ARM, CPU_ARM64 }; typedef int cpu_type_t; @@ -162,7 +162,6 @@ typedef struct struct { unsigned int iar, msr, ctr, lr, dar, dsisr, trap, __pad; } powerpc_regs; struct { unsigned int sp, lr, pc, cpsr; } arm_regs; struct { unsigned __int64 sp, pc, pstate; } arm64_regs; - struct { unsigned int psr, pc, npc, y, wim, tbr; } sparc_regs; } ctl; /* selected by SERVER_CTX_CONTROL */ union { @@ -172,7 +171,6 @@ typedef struct struct { unsigned int gpr[32], cr, xer; } powerpc_regs; struct { unsigned int r[13]; } arm_regs; struct { unsigned __int64 x[31]; } arm64_regs; - struct { unsigned int g[8], o[8], l[8], i[8]; } sparc_regs; } integer; /* selected by SERVER_CTX_INTEGER */ union { diff --git a/server/thread.c b/server/thread.c index fdbc144..69d547c 100644 --- a/server/thread.c +++ b/server/thread.c @@ -59,8 +59,6 @@ static const unsigned int supported_cpus = CPU_FLAG(CPU_x86); static const unsigned int supported_cpus = CPU_FLAG(CPU_x86_64) | CPU_FLAG(CPU_x86); #elif defined(__powerpc__) static const unsigned int supported_cpus = CPU_FLAG(CPU_POWERPC); -#elif defined(__sparc__) -static const unsigned int supported_cpus = CPU_FLAG(CPU_SPARC); #elif defined(__arm__) static const unsigned int supported_cpus = CPU_FLAG(CPU_ARM); #elif defined(__aarch64__) @@ -1026,7 +1024,6 @@ static unsigned int get_context_system_regs( enum cpu_type cpu ) case CPU_POWERPC: return 0; case CPU_ARM: return 0; case CPU_ARM64: return 0; - case CPU_SPARC: return 0; } return 0; } @@ -1053,9 +1050,6 @@ void break_thread( struct thread *thread ) case CPU_POWERPC: data.exception.address = thread->context->ctl.powerpc_regs.iar; break; - case CPU_SPARC: - data.exception.address = thread->context->ctl.sparc_regs.pc; - break; case CPU_ARM: data.exception.address = thread->context->ctl.arm_regs.pc; break; diff --git a/server/trace.c b/server/trace.c index c7a13d8..a183fde 100644 --- a/server/trace.c +++ b/server/trace.c @@ -114,7 +114,6 @@ static void dump_cpu_type( const char *prefix, const cpu_type_t *code ) CASE(x86); CASE(x86_64); CASE(POWERPC); - CASE(SPARC); default: fprintf( stderr, "%s%u", prefix, *code ); break; #undef CASE } @@ -599,19 +598,6 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) dump_uint64( ",x30=", &ctx.integer.arm64_regs.x[30] ); } break; - case CPU_SPARC: - if (ctx.flags & SERVER_CTX_CONTROL) - fprintf( stderr, ",psr=%08x,pc=%08x,npc=%08x,y=%08x,wim=%08x,tbr=%08x", - ctx.ctl.sparc_regs.psr, ctx.ctl.sparc_regs.pc, ctx.ctl.sparc_regs.npc, - ctx.ctl.sparc_regs.y, ctx.ctl.sparc_regs.wim, ctx.ctl.sparc_regs.tbr ); - if (ctx.flags & SERVER_CTX_INTEGER) - { - for (i = 0; i < 8; i++) fprintf( stderr, ",g%u=%08x", i, ctx.integer.sparc_regs.g[i] ); - for (i = 0; i < 8; i++) fprintf( stderr, ",o%u=%08x", i, ctx.integer.sparc_regs.o[i] ); - for (i = 0; i < 8; i++) fprintf( stderr, ",l%u=%08x", i, ctx.integer.sparc_regs.l[i] ); - for (i = 0; i < 8; i++) fprintf( stderr, ",i%u=%08x", i, ctx.integer.sparc_regs.i[i] ); - } - break; } fputc( '}', stderr ); remove_data( size );

1 0

Michael Stefaniuc : mpr: Use offsetof for the size of structs with varlen arrays.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 3c3959cfd375667361197a5ab158429418f4eade URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c3959cfd375667361197a5ab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 5 09:36:24 2013 +0100 mpr: Use offsetof for the size of structs with varlen arrays. --- dlls/mpr/pwcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/pwcache.c b/dlls/mpr/pwcache.c index efd9c23..178d40f 100644 --- a/dlls/mpr/pwcache.c +++ b/dlls/mpr/pwcache.c @@ -298,8 +298,8 @@ UINT WINAPI WNetEnumCachedPasswords( continue; /* read the value data */ - size = sizeof *entry - sizeof entry->abResource[0] + val_sz + data_sz; - entry = HeapAlloc( GetProcessHeap(), 0, sizeof *entry + val_sz + data_sz ); + size = offsetof( PASSWORD_CACHE_ENTRY, abResource[val_sz + data_sz] ); + entry = HeapAlloc( GetProcessHeap(), 0, size ); memcpy( entry->abResource, val, val_sz ); entry->cbEntry = size; entry->cbResource = val_sz;

1 0

Andrew Talbot : wineps.drv: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: 97295b3a36dc22edcc8ee02fc4f1f33c7b95e9e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97295b3a36dc22edcc8ee02fc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Mar 4 23:01:20 2013 +0000 wineps.drv: Avoid signed-unsigned integer comparisons. --- dlls/wineps.drv/afm2c.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/afm2c.c b/dlls/wineps.drv/afm2c.c index 3f8b0ce..a0427e5 100644 --- a/dlls/wineps.drv/afm2c.c +++ b/dlls/wineps.drv/afm2c.c @@ -187,7 +187,7 @@ void PSDRV_AFM2C(const AFM *afm) { char buffer[256]; FILE *of; - int i; + unsigned int i; lstrcpynA(buffer, afm->FontName, sizeof(buffer) - 2);

1 0

André Hentschel : dbghelp: Remove SPARC support.
by Alexandre Julliard March 5, 2013

March 5, 2013

Module: wine Branch: master Commit: c174b3f5ecba870950f4f40925b52487ecc3091c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c174b3f5ecba870950f4f4092… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Feb 20 21:09:53 2013 +0100 dbghelp: Remove SPARC support. --- dlls/dbghelp/Makefile.in | 1 - dlls/dbghelp/cpu_sparc.c | 106 ---------------------------------------------- dlls/dbghelp/dbghelp.c | 6 +-- 3 files changed, 2 insertions(+), 111 deletions(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in index 7cb0544..3fb7b52 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -11,7 +11,6 @@ C_SRCS = \ cpu_arm64.c \ cpu_i386.c \ cpu_ppc.c \ - cpu_sparc.c \ cpu_x86_64.c \ crc32.c \ dbghelp.c \ diff --git a/dlls/dbghelp/cpu_sparc.c b/dlls/dbghelp/cpu_sparc.c deleted file mode 100644 index 7f5bfaa..0000000 --- a/dlls/dbghelp/cpu_sparc.c +++ /dev/null @@ -1,106 +0,0 @@ -/* - * File cpu_sparc.c - * - * Copyright (C) 2009-2009, Eric Pouech - * Copyright (C) 2010, Austin English - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <assert.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "dbghelp_private.h" -#include "winternl.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); - -static unsigned sparc_get_addr(HANDLE hThread, const CONTEXT* ctx, - enum cpu_addr ca, ADDRESS64* addr) -{ - addr->Mode = AddrModeFlat; - addr->Segment = 0; /* don't need segment */ - switch (ca) - { -#ifdef __sparc__ - case cpu_addr_pc: addr->Offset = ctx->pc; return TRUE; - case cpu_addr_stack: addr->Offset = ctx->o6; return TRUE; - case cpu_addr_frame: addr->Offset = ctx->i6; return TRUE; -#endif - default: addr->Mode = -1; - return FALSE; - } -} - -static BOOL sparc_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CONTEXT* context) -{ - FIXME("not done for Sparc\n"); - return FALSE; -} - -static unsigned sparc_map_dwarf_register(unsigned regno) -{ - if (regno <= 7) - return CV_SPARC_G0 + regno; - else if (regno >= 8 && regno <= 15) - return CV_SPARC_O0 + regno - 8; - else if (regno >= 16 && regno <= 23) - return CV_SPARC_L0 + regno - 16; - else if (regno >= 24 && regno <= 31) - return CV_SPARC_I0 + regno - 24; - - FIXME("Don't know how to map register %d\n", regno); - return CV_SPARC_NOREG; -} - -static void* sparc_fetch_context_reg(CONTEXT* ctx, unsigned regno, unsigned* size) -{ - FIXME("not done for Sparc\n"); - return NULL; -} - -static const char* sparc_fetch_regname(unsigned regno) -{ - FIXME("Unknown register %x\n", regno); - return NULL; -} - -static BOOL sparc_fetch_minidump_thread(struct dump_context* dc, unsigned index, unsigned flags, const CONTEXT* ctx) -{ - FIXME("NIY\n"); - return FALSE; -} - -static BOOL sparc_fetch_minidump_module(struct dump_context* dc, unsigned index, unsigned flags) -{ - FIXME("NIY\n"); - return FALSE; -} - -DECLSPEC_HIDDEN struct cpu cpu_sparc = { - IMAGE_FILE_MACHINE_SPARC, - 4, - CV_REG_NONE, /* FIXME */ - sparc_get_addr, - sparc_stack_walk, - NULL, - sparc_map_dwarf_register, - sparc_fetch_context_reg, - sparc_fetch_regname, - sparc_fetch_minidump_thread, - sparc_fetch_minidump_module, -}; diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 9f3b82f..b61676d 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -151,9 +151,9 @@ const char* wine_dbgstr_addr(const ADDRESS64* addr) } } -extern struct cpu cpu_i386, cpu_x86_64, cpu_ppc, cpu_sparc, cpu_arm, cpu_arm64; +extern struct cpu cpu_i386, cpu_x86_64, cpu_ppc, cpu_arm, cpu_arm64; -static struct cpu* dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_ppc, &cpu_sparc, &cpu_arm, &cpu_arm64, NULL}; +static struct cpu* dbghelp_cpus[] = {&cpu_i386, &cpu_x86_64, &cpu_ppc, &cpu_arm, &cpu_arm64, NULL}; struct cpu* dbghelp_current_cpu = #if defined(__i386__) &cpu_i386 @@ -161,8 +161,6 @@ struct cpu* dbghelp_current_cpu = &cpu_x86_64 #elif defined(__powerpc__) &cpu_ppc -#elif defined(__sparc__) - &cpu_sparc #elif defined(__arm__) &cpu_arm #elif defined(__aarch64__)

1 0