December 2008 - Wine-commits

Christian Costa : devenum: Fix traces and fixmes.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: ffdd34f8ff75b9db10e474f947696dc873d899d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffdd34f8ff75b9db10e474f94… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Dec 7 11:38:12 2008 +0100 devenum: Fix traces and fixmes. --- dlls/devenum/mediacatenum.c | 47 ++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 6cd2e61..6c20524 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -48,7 +48,8 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_QueryInterface( LPVOID *ppvObj) { RegPropBagImpl *This = (RegPropBagImpl *)iface; - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObj); if (This == NULL || ppvObj == NULL) return E_POINTER; @@ -70,7 +71,8 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_QueryInterface( static ULONG WINAPI DEVENUM_IPropertyBag_AddRef(LPPROPERTYBAG iface) { RegPropBagImpl *This = (RegPropBagImpl *)iface; - TRACE("\n"); + + TRACE("(%p)->() AddRef from %d\n", iface, This->ref); return InterlockedIncrement(&This->ref); } @@ -83,7 +85,7 @@ static ULONG WINAPI DEVENUM_IPropertyBag_Release(LPPROPERTYBAG iface) RegPropBagImpl *This = (RegPropBagImpl *)iface; ULONG ref; - TRACE("\n"); + TRACE("(%p)->() ReleaseThis->ref from %d\n", iface, This->ref); ref = InterlockedDecrement(&This->ref); if (ref == 0) { @@ -344,7 +346,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetClassID( CLSID* pClassID) { MediaCatMoniker *This = (MediaCatMoniker *)iface; - FIXME("(%p)->(%p)\n", This, pClassID); + FIXME("(%p)->(%p): stub\n", This, pClassID); if (pClassID == NULL) return E_POINTER; @@ -354,21 +356,21 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetClassID( static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsDirty(LPMONIKER iface) { - FIXME("()\n"); + FIXME("(%p)->(): stub\n", iface); return S_FALSE; } static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Load(LPMONIKER iface, IStream* pStm) { - FIXME("(%p)\n", pStm); + FIXME("(%p)->(%p): stub\n", iface, pStm); return E_NOTIMPL; } static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Save(LPMONIKER iface, IStream* pStm, BOOL fClearDirty) { - FIXME("(%p, %s)\n", pStm, fClearDirty ? "true" : "false"); + FIXME("(%p)->(%p, %s): stub\n", iface, pStm, fClearDirty ? "true" : "false"); return STG_E_CANTSAVE; } @@ -377,7 +379,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetSizeMax( LPMONIKER iface, ULARGE_INTEGER* pcbSize) { - FIXME("(%p)\n", pcbSize); + FIXME("(%p)->(%p): stub\n", iface, pcbSize); ZeroMemory(pcbSize, sizeof(*pcbSize)); @@ -488,7 +490,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Reduce( IMoniker** ppmkToLeft, IMoniker** ppmkReduced) { - TRACE("(%p, %d, %p, %p)\n", pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced); + TRACE("(%p)->(%p, %d, %p, %p)\n", iface, pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced); if (ppmkToLeft) *ppmkToLeft = NULL; @@ -503,7 +505,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_ComposeWith( BOOL fOnlyIfNotGeneric, IMoniker** ppmkComposite) { - FIXME("(%p, %s, %p): stub\n", pmkRight, fOnlyIfNotGeneric ? "true" : "false", ppmkComposite); + FIXME("(%p)->(%p, %s, %p): stub\n", iface, pmkRight, fOnlyIfNotGeneric ? "true" : "false", ppmkComposite); /* FIXME: use CreateGenericComposite? */ *ppmkComposite = NULL; @@ -516,7 +518,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Enum( BOOL fForward, IEnumMoniker** ppenumMoniker) { - FIXME("(%s, %p): stub\n", fForward ? "true" : "false", ppenumMoniker); + FIXME("(%p)->(%s, %p): stub\n", iface, fForward ? "true" : "false", ppenumMoniker); *ppenumMoniker = NULL; @@ -527,7 +529,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsEqual( LPMONIKER iface, IMoniker* pmkOtherMoniker) { - FIXME("(%p)\n", pmkOtherMoniker); + FIXME("(%p)->(%p): stub\n", iface, pmkOtherMoniker); return E_NOTIMPL; } @@ -536,7 +538,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Hash( LPMONIKER iface, DWORD* pdwHash) { - TRACE("(%p)\n", pdwHash); + TRACE("(%p)->(%p)\n", iface, pdwHash); *pdwHash = 0; @@ -549,7 +551,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsRunning( IMoniker* pmkToLeft, IMoniker* pmkNewlyRunning) { - FIXME("(%p, %p, %p)\n", pbc, pmkToLeft, pmkNewlyRunning); + FIXME("(%p)->(%p, %p, %p): stub\n", iface, pbc, pmkToLeft, pmkNewlyRunning); return S_FALSE; } @@ -560,7 +562,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetTimeOfLastChange( IMoniker* pmkToLeft, FILETIME* pFileTime) { - TRACE("(%p, %p, %p)\n", pbc, pmkToLeft, pFileTime); + TRACE("(%p)->(%p, %p, %p)\n", iface, pbc, pmkToLeft, pFileTime); pFileTime->dwLowDateTime = 0xFFFFFFFF; pFileTime->dwHighDateTime = 0x7FFFFFFF; @@ -572,7 +574,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_Inverse( LPMONIKER iface, IMoniker** ppmk) { - TRACE("(%p)\n", ppmk); + TRACE("(%p)->(%p)\n", iface, ppmk); *ppmk = NULL; @@ -584,7 +586,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_CommonPrefixWith( IMoniker* pmkOtherMoniker, IMoniker** ppmkPrefix) { - TRACE("(%p, %p)\n", pmkOtherMoniker, ppmkPrefix); + TRACE("(%p)->(%p, %p)\n", iface, pmkOtherMoniker, ppmkPrefix); *ppmkPrefix = NULL; @@ -596,7 +598,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_RelativePathTo( IMoniker* pmkOther, IMoniker** ppmkRelPath) { - TRACE("(%p, %p)\n", pmkOther, ppmkRelPath); + TRACE("(%p)->(%p, %p)\n", iface, pmkOther, ppmkRelPath); *ppmkRelPath = pmkOther; @@ -614,7 +616,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_GetDisplayName( static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; LONG received = sizeof(wszFriendlyName); - TRACE("(%p, %p, %p)\n", pbc, pmkToLeft, ppszDisplayName); + TRACE("(%p)->(%p, %p, %p)\n", iface, pbc, pmkToLeft, ppszDisplayName); *ppszDisplayName = NULL; @@ -637,7 +639,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_ParseDisplayName( ULONG* pchEaten, IMoniker** ppmkOut) { - FIXME("(%p, %p, %s, %p, %p)\n", pbc, pmkToLeft, debugstr_w(pszDisplayName), pchEaten, ppmkOut); + FIXME("(%p)->(%p, %p, %s, %p, %p)\n", iface, pbc, pmkToLeft, debugstr_w(pszDisplayName), pchEaten, ppmkOut); *pchEaten = 0; *ppmkOut = NULL; @@ -649,7 +651,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsSystemMoniker( LPMONIKER iface, DWORD* pdwMksys) { - TRACE("(%p)\n", pdwMksys); + TRACE("(%p)->(%p)\n", iface, pdwMksys); return S_FALSE; } @@ -708,7 +710,8 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_QueryInterface( LPVOID *ppvObj) { EnumMonikerImpl *This = (EnumMonikerImpl *)iface; - TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); + + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObj); if (This == NULL || ppvObj == NULL) return E_POINTER;

1 0

Jeff Zaroyko : imaadp32: Report the same driver details as windows.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: d31adc8eae00360afbde142796fbe2a1f75cc3cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d31adc8eae00360afbde14279… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Sun Dec 7 18:41:15 2008 +1100 imaadp32: Report the same driver details as windows. --- dlls/imaadp32.acm/imaadp32.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 1b44c0b..f784f59 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -472,17 +472,17 @@ static LRESULT ADPCM_DriverDetails(PACMDRIVERDETAILSW add) { add->fccType = ACMDRIVERDETAILS_FCCTYPE_AUDIOCODEC; add->fccComp = ACMDRIVERDETAILS_FCCCOMP_UNDEFINED; - add->wMid = 0xFF; - add->wPid = 0x00; - add->vdwACM = 0x01000000; - add->vdwDriver = 0x01000000; + add->wMid = 0x1; + add->wPid = 0x22; + add->vdwACM = 0x3320000; + add->vdwDriver = 0x04000000; add->fdwSupport = ACMDRIVERDETAILS_SUPPORTF_CODEC; add->cFormatTags = 2; /* PCM, IMA ADPCM */ add->cFilterTags = 0; add->hicon = NULL; - MultiByteToWideChar( CP_ACP, 0, "WINE-ADPCM", -1, + MultiByteToWideChar( CP_ACP, 0, "Microsoft IMA ADPCM", -1, add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, "Wine IMA ADPCM converter", -1, + MultiByteToWideChar( CP_ACP, 0, "Microsoft IMA ADPCM CODEC", -1, add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1, add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR) ); @@ -500,7 +500,7 @@ static LRESULT ADPCM_DriverDetails(PACMDRIVERDETAILSW add) static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) { static const WCHAR szPcm[]={'P','C','M',0}; - static const WCHAR szImaAdPcm[]={'I','M','A',' ','A','d','P','C','M',0}; + static const WCHAR szImaAdPcm[]={'I','M','A',' ','A','D','P','C','M',0}; switch (dwQuery) {

1 0

Jeff Zaroyko : msadp32.acm: Make the szFormatTag the same as windows.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: cb5ac00cd92d3af8e67d56972f1fa20464f1d46d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5ac00cd92d3af8e67d56972… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Sun Dec 7 17:41:00 2008 +1100 msadp32.acm: Make the szFormatTag the same as windows. --- dlls/msadp32.acm/msadp32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 5a0a964..40b8260 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -346,7 +346,7 @@ static LRESULT ADPCM_DriverDetails(PACMDRIVERDETAILSW add) static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) { static const WCHAR szPcm[]={'P','C','M',0}; - static const WCHAR szMsAdPcm[]={'M','S',' ','A','d','P','C','M',0}; + static const WCHAR szMsAdPcm[]={'M','i','c','r','o','s','o','f','t',' ','A','D','P','C','M',0}; switch (dwQuery) {

1 0

Alexandre Julliard : kernel32/tests: Fixed the handle test for Win9x.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: ffb44032ad122c7f16d1bbd4842d0c22b0c8d8eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffb44032ad122c7f16d1bbd48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 8 21:19:39 2008 +0100 kernel32/tests: Fixed the handle test for Win9x. --- dlls/kernel32/tests/process.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index e5f5e7e..0568b52 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1526,7 +1526,9 @@ static void test_Handles(void) BOOL ret; DWORD code; - ok( handle == (HANDLE)~(ULONG_PTR)0, "invalid current process handle %p\n", handle ); + ok( handle == (HANDLE)~(ULONG_PTR)0 || + handle == (HANDLE)(ULONG_PTR)0x7fffffff /* win9x */, + "invalid current process handle %p\n", handle ); ret = GetExitCodeProcess( handle, &code ); ok( ret, "GetExitCodeProcess failed err %u\n", GetLastError() ); #ifdef _WIN64

1 0

Alexandre Julliard : ntdll: Added stubs for RtlLookupFunctionEntry and RtlVirtualUnwind.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: 50d6b7fb54e69e11c5d3657a803fe184ebec76cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d6b7fb54e69e11c5d3657a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 8 19:29:06 2008 +0100 ntdll: Added stubs for RtlLookupFunctionEntry and RtlVirtualUnwind. --- dlls/kernel32/kernel32.spec | 2 ++ dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/signal_x86_64.c | 24 ++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index a5a9bc6..76dd351 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -923,8 +923,10 @@ @ stdcall -register RtlCaptureContext(ptr) ntdll.RtlCaptureContext # @ stub RtlCaptureStackBackTrace ( -> ntdll.RtlCaptureStackBackTrace) @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory +@ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall RtlUnwind(ptr ptr ptr long) ntdll.RtlUnwind +@ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) ntdll.RtlVirtualUnwind @ stdcall RtlZeroMemory(ptr long) ntdll.RtlZeroMemory @ stdcall -i386 -norelay SMapLS() @ stdcall -i386 -norelay SMapLS_IP_EBP_12() diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c94f2fb..d4c8d4e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -730,6 +730,7 @@ @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) @ stub RtlLookupElementGenericTable # @ stub RtlLookupElementGenericTableAvl +@ stdcall -arch=x86_64 RtlLookupFunctionEntry(long ptr ptr) @ stdcall RtlMakeSelfRelativeSD(ptr ptr ptr) @ stdcall RtlMapGenericMask(long ptr) # @ stub RtlMapSecurityErrorToNtStatus @@ -908,6 +909,7 @@ @ stub RtlValidateProcessHeaps # @ stub RtlValidateUnicodeString @ stdcall RtlVerifyVersionInfo(ptr long double) +@ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) @ stub RtlWalkFrameChain @ stdcall RtlWalkHeap(long ptr) @ stub RtlWriteMemoryStream diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 47b2ff7..4020be0 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -518,6 +518,30 @@ void signal_init_process(void) /********************************************************************** + * RtlLookupFunctionEntry (NTDLL.@) + */ +PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG64 pc, ULONG64 *base, + UNWIND_HISTORY_TABLE *table ) +{ + FIXME("stub\n"); + return NULL; +} + + +/********************************************************************** + * RtlVirtualUnwind (NTDLL.@) + */ +PVOID WINAPI RtlVirtualUnwind ( ULONG type, ULONG64 base, ULONG64 pc, + RUNTIME_FUNCTION *function, CONTEXT *context, + PVOID *data, ULONG64 *frame, + KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr ) +{ + FIXME("stub\n"); + return NULL; +} + + +/********************************************************************** * __wine_enter_vm86 (NTDLL.@) */ void __wine_enter_vm86( CONTEXT *context )

1 0

Alexandre Julliard : winebuild: Make the cpu flag more generic to allow supporting a given entry point on multiple platforms .
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: fa616418add27e0036ff2e762fa7b6b5e161a7b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa616418add27e0036ff2e762… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 8 17:07:50 2008 +0100 winebuild: Make the cpu flag more generic to allow supporting a given entry point on multiple platforms. --- tools/winebuild/build.h | 11 ++++++--- tools/winebuild/main.c | 26 +--------------------- tools/winebuild/parser.c | 43 +++++++++++++++++++++++++++++-------- tools/winebuild/utils.c | 26 +++++++++++++++++++++++ tools/winebuild/winebuild.man.in | 6 ++-- 5 files changed, 71 insertions(+), 41 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index 326a838..45c75f7 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -127,14 +127,16 @@ extern enum target_platform target_platform; #define FLAG_NONAME 0x02 /* don't export function by name */ #define FLAG_RET16 0x04 /* function returns a 16-bit value */ #define FLAG_RET64 0x08 /* function returns a 64-bit value */ -#define FLAG_I386 0x10 /* function is i386 only */ -#define FLAG_REGISTER 0x20 /* use register calling convention */ -#define FLAG_PRIVATE 0x40 /* function is private (cannot be imported) */ -#define FLAG_ORDINAL 0x80 /* function should be imported by ordinal */ +#define FLAG_REGISTER 0x10 /* use register calling convention */ +#define FLAG_PRIVATE 0x20 /* function is private (cannot be imported) */ +#define FLAG_ORDINAL 0x40 /* function should be imported by ordinal */ #define FLAG_FORWARD 0x100 /* function is a forwarded name */ #define FLAG_EXT_LINK 0x200 /* function links to an external symbol */ +#define FLAG_CPU(cpu) (0x01000 << (cpu)) +#define FLAG_CPU_MASK 0x1f000 + #define MAX_ORDINALS 65535 /* global functions */ @@ -177,6 +179,7 @@ extern DLLSPEC *alloc_dll_spec(void); extern void free_dll_spec( DLLSPEC *spec ); extern const char *make_c_identifier( const char *str ); extern const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ); +extern enum target_cpu get_cpu_from_name( const char *name ); extern unsigned int get_alignment(unsigned int align); extern unsigned int get_page_size(void); extern unsigned int get_ptr_size(void); diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 3f2dcf2..31ef8a0 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -104,23 +104,6 @@ static enum exec_mode_values exec_mode = MODE_NONE; static const struct { const char *name; - enum target_cpu cpu; -} cpu_names[] = -{ - { "i386", CPU_x86 }, - { "i486", CPU_x86 }, - { "i586", CPU_x86 }, - { "i686", CPU_x86 }, - { "i786", CPU_x86 }, - { "x86_64", CPU_x86_64 }, - { "sparc", CPU_SPARC }, - { "alpha", CPU_ALPHA }, - { "powerpc", CPU_POWERPC } -}; - -static const struct -{ - const char *name; enum target_platform platform; } platform_names[] = { @@ -182,13 +165,8 @@ static void set_target( const char *target ) if (!(p = strchr( spec, '-' ))) fatal_error( "Invalid target specification '%s'\n", target ); *p++ = 0; - for (i = 0; i < sizeof(cpu_names)/sizeof(cpu_names[0]); i++) - { - if (!strcmp( cpu_names[i].name, spec )) break; - } - if (i < sizeof(cpu_names)/sizeof(cpu_names[0])) target_cpu = cpu_names[i].cpu; - else fatal_error( "Unrecognized CPU '%s'\n", spec ); - + if ((target_cpu = get_cpu_from_name( spec )) == -1) + fatal_error( "Unrecognized CPU '%s'\n", spec ); platform = p; if ((p = strrchr( p, '-' ))) platform = p + 1; diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index bcbf951..84281c5 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -67,7 +67,6 @@ static const char * const FlagNames[] = "noname", /* FLAG_NONAME */ "ret16", /* FLAG_RET16 */ "ret64", /* FLAG_RET64 */ - "i386", /* FLAG_I386 */ "register", /* FLAG_REGISTER */ "private", /* FLAG_PRIVATE */ "ordinal", /* FLAG_ORDINAL */ @@ -378,7 +377,7 @@ static int parse_spec_stub( ORDDEF *odp, DLLSPEC *spec ) { odp->u.func.arg_types[0] = '\0'; odp->link_name = xstrdup(""); - odp->flags |= FLAG_I386; /* don't bother generating stubs for Winelib */ + odp->flags |= FLAG_CPU(CPU_x86); /* don't bother generating stubs for Winelib */ return 1; } @@ -428,14 +427,38 @@ static const char *parse_spec_flags( ORDDEF *odp ) do { if (!(token = GetToken(0))) break; - for (i = 0; FlagNames[i]; i++) - if (!strcmp( FlagNames[i], token )) break; - if (!FlagNames[i]) + if (!strncmp( token, "arch=", 5)) { - error( "Unknown flag '%s'\n", token ); - return NULL; + char *args = xstrdup( token + 5 ); + char *cpu_name = strtok( args, "," ); + while (cpu_name) + { + enum target_cpu cpu = get_cpu_from_name( cpu_name ); + if (cpu == -1) + { + error( "Unknown architecture '%s'\n", cpu_name ); + return NULL; + } + odp->flags |= FLAG_CPU( cpu ); + cpu_name = strtok( NULL, "," ); + } + free( args ); + } + else if (!strcmp( token, "i386" )) /* backwards compatibility */ + { + odp->flags |= FLAG_CPU(CPU_x86); + } + else + { + for (i = 0; FlagNames[i]; i++) + if (!strcmp( FlagNames[i], token )) break; + if (!FlagNames[i]) + { + error( "Unknown flag '%s'\n", token ); + return NULL; + } + odp->flags |= 1 << i; } - odp->flags |= 1 << i; token = GetToken(0); } while (token && *token == '-'); @@ -506,9 +529,9 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec ) assert( 0 ); } - if ((target_cpu != CPU_x86) && (odp->flags & FLAG_I386)) + if ((odp->flags & FLAG_CPU_MASK) && !(odp->flags & FLAG_CPU(target_cpu))) { - /* ignore this entry point on non-Intel archs */ + /* ignore this entry point */ spec->nb_entry_points--; return 1; } diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 8f137d8..39162fa 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -39,6 +39,23 @@ static const char *tmp_files[MAX_TMP_FILES]; static unsigned int nb_tmp_files; +static const struct +{ + const char *name; + enum target_cpu cpu; +} cpu_names[] = +{ + { "i386", CPU_x86 }, + { "i486", CPU_x86 }, + { "i586", CPU_x86 }, + { "i686", CPU_x86 }, + { "i786", CPU_x86 }, + { "x86_64", CPU_x86_64 }, + { "sparc", CPU_SPARC }, + { "alpha", CPU_ALPHA }, + { "powerpc", CPU_POWERPC } +}; + /* atexit handler to clean tmp files */ static void cleanup_tmp_files(void) { @@ -417,6 +434,15 @@ const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ) return buffer; } +/* parse a cpu name and return the corresponding value */ +enum target_cpu get_cpu_from_name( const char *name ) +{ + unsigned int i; + + for (i = 0; i < sizeof(cpu_names)/sizeof(cpu_names[0]); i++) + if (!strcmp( cpu_names[i].name, name )) return cpu_names[i].cpu; + return -1; +} /***************************************************************** * Function: get_alignment diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index d135968..2e8aa75 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -269,9 +269,6 @@ The function returns a 16-bit value (Win16 only). .B -ret64 The function returns a 64-bit value (Win32 only). .TP -.B -i386 -The entry point is only available on i386 platforms. -.TP .B -register The function uses CPU register to pass arguments. .TP @@ -282,6 +279,9 @@ accessed through GetProcAddress. .B -ordinal The entry point will be imported by ordinal instead of by name. The name is still exported. +.TP +.BI -arch= cpu[,cpu] +The entry point is only available on the specified CPU architecture(s). .SS "Function ordinals" Syntax: .br

1 0

Alexandre Julliard : include: Implemented inline asm functions for x86_64. Export Interlocked* only on i386.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: f06d99f67a5d5dd1b7d8e56ae1056bf1df32ef1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f06d99f67a5d5dd1b7d8e56ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 8 19:25:25 2008 +0100 include: Implemented inline asm functions for x86_64. Export Interlocked* only on i386. --- dlls/kernel32/kernel32.spec | 10 ++-- dlls/kernel32/sync.c | 89 ----------------------- include/winbase.h | 162 ++++++++++++++++++++++++++++++++++--------- include/wine/port.h | 16 ++++- 4 files changed, 147 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f06d99f67a5d5dd1b7d8e…

1 0

Alexandre Julliard : include: Added some definitions for x86_64 exception handling.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: 345aff3f1775b2b84c1e8cfc35de0aaaa6d085ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=345aff3f1775b2b84c1e8cfc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 8 19:27:59 2008 +0100 include: Added some definitions for x86_64 exception handling. --- include/winnt.h | 246 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/winternl.h | 141 ++++++++++++++++++++++++++++-- 2 files changed, 381 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=345aff3f1775b2b84c1e8…

1 0

Alexandre Julliard : server: Make user handles ints instead of pointers.
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: d764107434e6eb3411516378b5caa4498c8a271f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d764107434e6eb3411516378b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 8 16:57:38 2008 +0100 server: Make user handles ints instead of pointers. --- include/wine/server_protocol.h | 2 +- server/clipboard.c | 2 +- server/protocol.def | 2 +- server/queue.c | 8 +- server/sock.c | 2 +- server/trace.c | 216 ++++++++++++++++++++-------------------- server/user.c | 12 +- server/window.c | 2 +- tools/make_requests | 2 +- 9 files changed, 124 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d764107434e6eb3411516…

1 0

Alexandre Julliard : server: Add functions for conversions between server user handles and pointer-style handles .
by Alexandre Julliard 09 Dec '08

09 Dec '08

Module: wine Branch: master Commit: 7fdadbb377ac35b265e731eaec42c07d07160a3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fdadbb377ac35b265e731eae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 8 16:58:20 2008 +0100 server: Add functions for conversions between server user handles and pointer-style handles. --- dlls/kernel32/console.c | 2 +- dlls/user32/caret.c | 20 +++--- dlls/user32/class.c | 8 +- dlls/user32/clipboard.c | 76 ++++++----------------- dlls/user32/defwnd.c | 4 +- dlls/user32/focus.c | 36 ++++++----- dlls/user32/hook.c | 28 ++++---- dlls/user32/input.c | 8 +- dlls/user32/message.c | 40 ++++++------ dlls/user32/painting.c | 18 +++--- dlls/user32/property.c | 8 +- dlls/user32/win.c | 115 +++++++++++++++++++----------------- dlls/user32/winpos.c | 23 ++++--- dlls/winex11.drv/clipboard.c | 6 +- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 4 +- dlls/winex11.drv/window.c | 4 +- dlls/ws2_32/socket.c | 2 +- include/wine/server.h | 6 ++ programs/wineconsole/wineconsole.c | 2 +- 20 files changed, 197 insertions(+), 215 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fdadbb377ac35b265e73…

1 0