February 2011 - Wine-commits

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflection::GetConstantBufferByName().
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: dd934099e14d0edc8f27d63f4201cb111248e9dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd934099e14d0edc8f27d63f4… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 20 21:21:18 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflection::GetConstantBufferByName(). --- dlls/d3dcompiler_43/reflection.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 3c4d138..4aeb70f 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -237,9 +237,31 @@ static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompil static struct ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetConstantBufferByName( ID3D11ShaderReflection *iface, LPCSTR name) { - FIXME("iface %p, name \"%s\" stub!\n", iface, name); + struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + unsigned int i; - return NULL; + TRACE("iface %p, name %s\n", iface, debugstr_a(name)); + + if (!name) + { + WARN("Invalid argument specified\n"); + return &null_constant_buffer.ID3D11ShaderReflectionConstantBuffer_iface; + } + + for (i = 0; i < This->constant_buffer_count; ++i) + { + struct d3dcompiler_shader_reflection_constant_buffer *d = &This->constant_buffers[i]; + + if (!strcmp(d->name, name)) + { + TRACE("Returning ID3D11ShaderReflectionConstantBuffer %p.\n", d); + return &d->ID3D11ShaderReflectionConstantBuffer_iface; + } + } + + WARN("Invalid name specified\n"); + + return &null_constant_buffer.ID3D11ShaderReflectionConstantBuffer_iface; } static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindingDesc(

1 0

Rico Schüller : d3dcompiler: Implement ID3D11ShaderReflectionConstantBuffer::GetDesc().
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: c6ec32aec72d3ac04c326e90785d4054c9116190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ec32aec72d3ac04c326e907… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 20 21:21:21 2011 +0100 d3dcompiler: Implement ID3D11ShaderReflectionConstantBuffer::GetDesc(). --- dlls/d3dcompiler_43/reflection.c | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 4aeb70f..d1f2fb7 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -480,12 +480,37 @@ const struct ID3D11ShaderReflectionVtbl d3dcompiler_shader_reflection_vtbl = /* ID3D11ShaderReflectionConstantBuffer methods */ +static inline struct d3dcompiler_shader_reflection_constant_buffer *impl_from_ID3D11ShaderReflectionConstantBuffer(ID3D11ShaderReflectionConstantBuffer *iface) +{ + return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection_constant_buffer, ID3D11ShaderReflectionConstantBuffer_iface); +} + static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetDesc( ID3D11ShaderReflectionConstantBuffer *iface, D3D11_SHADER_BUFFER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3dcompiler_shader_reflection_constant_buffer *This = impl_from_ID3D11ShaderReflectionConstantBuffer(iface); - return E_NOTIMPL; + TRACE("iface %p, desc %p\n", iface, desc); + + if (This == &null_constant_buffer) + { + WARN("Null constant buffer specified\n"); + return E_FAIL; + } + + if (!desc) + { + WARN("Invalid argument specified\n"); + return E_FAIL; + } + + desc->Name = This->name; + desc->Type = This->type; + desc->Variables = This->variable_count; + desc->Size = This->size; + desc->uFlags = This->flags; + + return S_OK; } static ID3D11ShaderReflectionVariable * STDMETHODCALLTYPE d3dcompiler_shader_reflection_constant_buffer_GetVariableByIndex(

1 0

Rico Schüller : d3dcompiler: Parse reflection variables.
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 0e8d142ea6f0a1eb0b2641706932e95fdef5a6ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8d142ea6f0a1eb0b2641706… Author: Rico Schüller <kgbricola(a)web.de> Date: Sun Feb 20 21:21:23 2011 +0100 d3dcompiler: Parse reflection variables. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 13 +++ dlls/d3dcompiler_43/reflection.c | 158 ++++++++++++++++++++++++++++- 2 files changed, 169 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index bec51e5..948a0c5 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -64,6 +64,17 @@ struct d3dcompiler_shader_signature char *string_data; }; +struct d3dcompiler_shader_reflection_variable +{ + ID3D11ShaderReflectionVariable ID3D11ShaderReflectionVariable_iface; + + char *name; + UINT start_offset; + UINT size; + UINT flags; + LPVOID default_value; +}; + struct d3dcompiler_shader_reflection_constant_buffer { ID3D11ShaderReflectionConstantBuffer ID3D11ShaderReflectionConstantBuffer_iface; @@ -75,6 +86,8 @@ struct d3dcompiler_shader_reflection_constant_buffer UINT variable_count; UINT size; UINT flags; + + struct d3dcompiler_shader_reflection_variable *variables; }; /* ID3D11ShaderReflection */ diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index d1f2fb7..27b1cd2 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -60,6 +60,22 @@ static BOOL copy_name(const char *ptr, char **name) return TRUE; } +static BOOL copy_value(const char *ptr, void **value, DWORD size) +{ + if (!ptr || !size) return TRUE; + + *value = HeapAlloc(GetProcessHeap(), 0, size); + if (!*value) + { + ERR("Failed to allocate vlaue memory.\n"); + return FALSE; + } + + memcpy(*value, ptr, size); + + return TRUE; +} + static void free_signature(struct d3dcompiler_shader_signature *sig) { TRACE("Free signature %p\n", sig); @@ -68,8 +84,28 @@ static void free_signature(struct d3dcompiler_shader_signature *sig) HeapFree(GetProcessHeap(), 0, sig->string_data); } +static void free_variable(struct d3dcompiler_shader_reflection_variable *var) +{ + if (var) + { + HeapFree(GetProcessHeap(), 0, var->name); + HeapFree(GetProcessHeap(), 0, var->default_value); + } +} + static void free_constant_buffer(struct d3dcompiler_shader_reflection_constant_buffer *cb) { + if (cb->variables) + { + unsigned int i; + + for (i = 0; i < cb->variable_count; ++i) + { + free_variable(&cb->variables[i]); + } + HeapFree(GetProcessHeap(), 0, cb->variables); + } + HeapFree(GetProcessHeap(), 0, cb->name); } @@ -537,6 +573,49 @@ const struct ID3D11ShaderReflectionConstantBufferVtbl d3dcompiler_shader_reflect d3dcompiler_shader_reflection_constant_buffer_GetVariableByName, }; +/* ID3D11ShaderReflectionVariable methods */ + +static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetDesc( + ID3D11ShaderReflectionVariable *iface, D3D11_SHADER_VARIABLE_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static ID3D11ShaderReflectionType * STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetType( + ID3D11ShaderReflectionVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static ID3D11ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetBuffer( + ID3D11ShaderReflectionVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_variable_GetInterfaceSlot( + ID3D11ShaderReflectionVariable *iface, UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return 0; +} + +const struct ID3D11ShaderReflectionVariableVtbl d3dcompiler_shader_reflection_variable_vtbl = +{ + /* ID3D11ShaderReflectionVariable methods */ + d3dcompiler_shader_reflection_variable_GetDesc, + d3dcompiler_shader_reflection_variable_GetType, + d3dcompiler_shader_reflection_variable_GetBuffer, + d3dcompiler_shader_reflection_variable_GetInterfaceSlot, +}; + static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, const char *data, DWORD data_size) { const char *ptr = data; @@ -647,6 +726,75 @@ static HRESULT d3dcompiler_parse_stat(struct d3dcompiler_shader_reflection *r, c return E_FAIL; } +static HRESULT d3dcompiler_parse_variables(struct d3dcompiler_shader_reflection_constant_buffer *cb, + const char *data, DWORD data_size, const char *ptr) +{ + struct d3dcompiler_shader_reflection_variable *variables; + unsigned int i; + HRESULT hr; + + variables = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cb->variable_count * sizeof(*variables)); + if (!variables) + { + ERR("Failed to allocate variables memory.\n"); + return E_OUTOFMEMORY; + } + + for (i = 0; i < cb->variable_count; i++) + { + struct d3dcompiler_shader_reflection_variable *v = &variables[i]; + DWORD offset; + + v->ID3D11ShaderReflectionVariable_iface.lpVtbl = &d3dcompiler_shader_reflection_variable_vtbl; + + read_dword(&ptr, &offset); + if (!copy_name(data + offset, &v->name)) + { + ERR("Failed to copy name.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + TRACE("Variable name: %s.\n", debugstr_a(v->name)); + + read_dword(&ptr, &v->start_offset); + TRACE("Variable offset: %u\n", v->start_offset); + + read_dword(&ptr, &v->size); + TRACE("Variable size: %u\n", v->size); + + read_dword(&ptr, &v->flags); + TRACE("Variable flags: %u\n", v->flags); + + /* todo: Parse types */ + read_dword(&ptr, &offset); + FIXME("Variable type offset: %x\n", offset); + + read_dword(&ptr, &offset); + TRACE("Variable default value offset: %x\n", offset); + if (!copy_value(data + offset, &v->default_value, offset ? v->size : 0)) + { + ERR("Failed to copy name.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + if ((cb->reflection->target & 0xffff) >= 0x500) + skip_dword_unknown(&ptr, 4); + } + + cb->variables = variables; + + return S_OK; + +err_out: + for (i = 0; i < cb->variable_count; i++) + { + free_variable(&variables[i]); + } + HeapFree(GetProcessHeap(), 0, variables); + return hr; +} + static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, const char *data, DWORD data_size) { const char *ptr = data; @@ -779,9 +927,15 @@ static HRESULT d3dcompiler_parse_rdef(struct d3dcompiler_shader_reflection *r, c read_dword(&ptr, &cb->variable_count); TRACE("Variable count: %u\n", cb->variable_count); - /* todo: Parse variables */ read_dword(&ptr, &offset); - FIXME("Variable offset: %x\n", offset); + TRACE("Variable offset: %x\n", offset); + + hr = d3dcompiler_parse_variables(cb, data, data_size, data + offset); + if (hr != S_OK) + { + FIXME("Failed to parse variables."); + goto err_out; + } read_dword(&ptr, &cb->size); TRACE("Cbuffer size: %u\n", cb->size);

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 65c35aad8e8e8f019b246ab71887965815f0b16e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c35aad8e8e8f019b246ab71… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Feb 18 18:17:51 2011 +0100 po: Update French translation. --- po/fr.po | 198 +++++++++++++++++++++++--------------------------------------- 1 files changed, 74 insertions(+), 124 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65c35aad8e8e8f019b246…

1 0

Dmitry Timoshkov : user32: Cope with failing SetForegroundWindow().
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: cf6c76b3b4a984e207d32c35f8f10b1f2ed14534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf6c76b3b4a984e207d32c35f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Feb 20 15:16:03 2011 +0800 user32: Cope with failing SetForegroundWindow(). --- dlls/user32/tests/win.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index e440a96..cca222f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3346,6 +3346,7 @@ static void test_SetParent(void) HWND desktop = GetDesktopWindow(); HMENU hMenu; HWND ret, parent, child1, child2, child3, child4, sibling, popup; + BOOL bret; parent = CreateWindowExA(0, "static", NULL, WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, 0, 0, 0, NULL); @@ -3474,9 +3475,13 @@ todo_wine SetFocus(parent); check_active_state(parent, 0, parent); + bret = SetForegroundWindow(popup); todo_wine { - ok(SetForegroundWindow(popup), "SetForegroundWindow() failed\n"); - check_active_state(popup, 0, popup); + ok(bret || broken(!bret), "SetForegroundWindow() failed\n"); + if (!bret) + check_active_state(popup, 0, popup); + else + check_active_state(popup, popup, popup); } ok(DestroyWindow(parent), "DestroyWindow() failed\n");

1 0

Dmitry Timoshkov : gdi32: Add dumping of child GDI font cache.
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 00c8250ff87cbc615b39051c228339d712aa7c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00c8250ff87cbc615b39051c2… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 21 18:20:01 2011 +0800 gdi32: Add dumping of child GDI font cache. --- dlls/gdi32/freetype.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 81c8e46..e0a93f8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3880,6 +3880,13 @@ static void dump_gdi_font_list(void) TRACE("gdiFont=%p %s %d\n", gdiFont, debugstr_w(gdiFont->font_desc.lf.lfFaceName), gdiFont->font_desc.lf.lfHeight); } + + TRACE("---------- Child gdiFont Cache ----------\n"); + LIST_FOR_EACH(elem_ptr, &child_font_list) { + gdiFont = LIST_ENTRY(elem_ptr, struct tagGdiFont, entry); + TRACE("gdiFont=%p %s %d\n", + gdiFont, debugstr_w(gdiFont->font_desc.lf.lfFaceName), gdiFont->font_desc.lf.lfHeight); + } } /*************************************************************

1 0

Dmitry Timoshkov : gdi32: Go through all hfontlist entries not just the first one when checking whether font is in the child font list .
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 20bdd203aa82c3a20dbc4ffe4c5d93474a784fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20bdd203aa82c3a20dbc4ffe4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Feb 21 18:20:59 2011 +0800 gdi32: Go through all hfontlist entries not just the first one when checking whether font is in the child font list. --- dlls/gdi32/freetype.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e0a93f8..edddde1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3908,14 +3908,16 @@ BOOL WineEngDestroyFontInstance(HFONT handle) LIST_FOR_EACH_ENTRY(gdiFont, &child_font_list, struct tagGdiFont, entry) { - struct list *first_hfont = list_head(&gdiFont->hfontlist); - hflist = LIST_ENTRY(first_hfont, HFONTLIST, entry); - if(hflist->hfont == handle) - { - TRACE("removing child font %p from child list\n", gdiFont); - list_remove(&gdiFont->entry); - LeaveCriticalSection( &freetype_cs ); - return TRUE; + hfontlist_elem_ptr = list_head(&gdiFont->hfontlist); + while(hfontlist_elem_ptr) { + hflist = LIST_ENTRY(hfontlist_elem_ptr, struct tagHFONTLIST, entry); + hfontlist_elem_ptr = list_next(&gdiFont->hfontlist, hfontlist_elem_ptr); + if(hflist->hfont == handle) { + TRACE("removing child font %p from child list\n", gdiFont); + list_remove(&gdiFont->entry); + LeaveCriticalSection( &freetype_cs ); + return TRUE; + } } }

1 0

Alexandre Julliard : cabarc: Set the initial cabinet number to 0.
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 55013410f75c221cb8efde05ce82d735a2f0fa35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55013410f75c221cb8efde05c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 19 13:06:20 2011 +0100 cabarc: Set the initial cabinet number to 0. --- programs/cabarc/cabarc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cabarc/cabarc.c b/programs/cabarc/cabarc.c index 2d1de8a..a11ebfb 100644 --- a/programs/cabarc/cabarc.c +++ b/programs/cabarc/cabarc.c @@ -244,7 +244,7 @@ static BOOL CDECL fci_get_temp( char *name, int size, void *ptr ) static BOOL CDECL fci_get_next_cab( CCAB *cab, ULONG prev_size, void *ptr ) { - return format_cab_name( cab->szCab, cab->iCab, opt_cab_file ); + return format_cab_name( cab->szCab, cab->iCab + 1, opt_cab_file ); } static LONG CDECL fci_status( UINT type, ULONG cb1, ULONG cb2, void *ptr ) @@ -561,7 +561,7 @@ static int new_cabinet( char *cab_dir ) cab.cbReserveCFHeader = opt_reserve_space; cab.cbReserveCFFolder = 0; cab.cbReserveCFData = 0; - cab.iCab = 1; + cab.iCab = 0; cab.iDisk = 0; cab.setID = opt_cabinet_id; cab.szDisk[0] = 0;

1 0

Alexandre Julliard : kernel32: Use debugstr_a to avoid overflow with user-specified string.
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 0fd822f46526df49f5fa29627afbace7ce3d242c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fd822f46526df49f5fa29627… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 19 13:06:40 2011 +0100 kernel32: Use debugstr_a to avoid overflow with user-specified string. --- dlls/kernel32/debugger.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index e9b5992..3abffdf 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -253,7 +253,7 @@ void WINAPI OutputDebugStringA( LPCSTR str ) } SERVER_END_REQ; - WARN("%s\n", str); + WARN("%s\n", debugstr_a(str)); /* send string to a system-wide monitor */ /* FIXME should only send to monitor if no debuggers are attached */

1 0

Alexandre Julliard : ntdll: Improve the error reporting for invalid PE file architectures.
by Alexandre Julliard 21 Feb '11

21 Feb '11

Module: wine Branch: master Commit: 9eba2de390907870dcc516d4fe5ea28fcdea7360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eba2de390907870dcc516d4f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 19 14:10:58 2011 +0100 ntdll: Improve the error reporting for invalid PE file architectures. --- dlls/ntdll/virtual.c | 88 +++++++++++++++++++++++++++++++------------------- 1 files changed, 55 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index c22455d..0913b71 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1030,6 +1030,60 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot /*********************************************************************** + * check_architecture + * + * Check the architecture of a PE binary. + */ +static NTSTATUS check_architecture( const IMAGE_NT_HEADERS *nt ) +{ + static const char *arch; + +#ifdef __i386__ + if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_I386) return STATUS_SUCCESS; + if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64) + { + if (nt->FileHeader.Characteristics & IMAGE_FILE_DLL) /* don't warn for a 64-bit exe */ + WARN( "loading amd64 dll in 32-bit mode will fail\n" ); + return STATUS_INVALID_IMAGE_FORMAT; + } +#elif defined(__x86_64__) + if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64) return STATUS_SUCCESS; + if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_I386) + { + if (nt->FileHeader.Characteristics & IMAGE_FILE_DLL) /* don't warn for a 32-bit exe */ + WARN( "loading 32-bit dll in 64-bit mode will fail\n" ); + return STATUS_INVALID_IMAGE_FORMAT; + } +#elif defined(__ARMEL__) + if (nt->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM || + nt->FileHeader.Machine == IMAGE_FILE_MACHINE_THUMB) + return STATUS_SUCCESS; +#endif + + switch (nt->FileHeader.Machine) + { + case IMAGE_FILE_MACHINE_UNKNOWN: arch = "Unknown"; break; + case IMAGE_FILE_MACHINE_I860: arch = "I860"; break; + case IMAGE_FILE_MACHINE_I386: arch = "I386"; break; + case IMAGE_FILE_MACHINE_R3000: arch = "R3000"; break; + case IMAGE_FILE_MACHINE_R4000: arch = "R4000"; break; + case IMAGE_FILE_MACHINE_R10000: arch = "R10000"; break; + case IMAGE_FILE_MACHINE_ALPHA: arch = "Alpha"; break; + case IMAGE_FILE_MACHINE_POWERPC: arch = "PowerPC"; break; + case IMAGE_FILE_MACHINE_IA64: arch = "IA-64"; break; + case IMAGE_FILE_MACHINE_ALPHA64: arch = "Alpha-64"; break; + case IMAGE_FILE_MACHINE_AMD64: arch = "AMD-64"; break; + case IMAGE_FILE_MACHINE_ARM: arch = "ARM"; break; + case IMAGE_FILE_MACHINE_THUMB: arch = "ARM Thumb"; break; + case IMAGE_FILE_MACHINE_SPARC: arch = "SPARC"; break; + default: arch = wine_dbg_sprintf( "Unknown-%04x", nt->FileHeader.Machine ); break; + } + ERR( "Trying to load PE image for unsupported architecture %s\n", arch ); + return STATUS_INVALID_IMAGE_FORMAT; +} + + +/*********************************************************************** * stat_mapping_file * * Stat the underlying file for a memory view. @@ -1110,39 +1164,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz imports = nt->OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_IMPORT; if (!imports->Size || !imports->VirtualAddress) imports = NULL; - /* check the architecture */ - -#ifdef __x86_64__ - if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_AMD64) -#elif defined(__ARMEL__) - if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_ARM && - nt->FileHeader.Machine != IMAGE_FILE_MACHINE_THUMB) -#else - if (nt->FileHeader.Machine != IMAGE_FILE_MACHINE_I386) -#endif - { - MESSAGE("Trying to load PE image for unsupported architecture ("); - switch (nt->FileHeader.Machine) - { - case IMAGE_FILE_MACHINE_UNKNOWN: MESSAGE("Unknown"); break; - case IMAGE_FILE_MACHINE_I860: MESSAGE("I860"); break; - case IMAGE_FILE_MACHINE_I386: MESSAGE("I386"); break; - case IMAGE_FILE_MACHINE_R3000: MESSAGE("R3000"); break; - case IMAGE_FILE_MACHINE_R4000: MESSAGE("R4000"); break; - case IMAGE_FILE_MACHINE_R10000: MESSAGE("R10000"); break; - case IMAGE_FILE_MACHINE_ALPHA: MESSAGE("Alpha"); break; - case IMAGE_FILE_MACHINE_POWERPC: MESSAGE("PowerPC"); break; - case IMAGE_FILE_MACHINE_IA64: MESSAGE("IA-64"); break; - case IMAGE_FILE_MACHINE_ALPHA64: MESSAGE("Alpha-64"); break; - case IMAGE_FILE_MACHINE_AMD64: MESSAGE("AMD-64"); break; - case IMAGE_FILE_MACHINE_ARM: MESSAGE("ARM"); break; - case IMAGE_FILE_MACHINE_THUMB: MESSAGE("ARM Thumb"); break; - case IMAGE_FILE_MACHINE_SPARC: MESSAGE("SPARC"); break; - default: MESSAGE("Unknown-%04x", nt->FileHeader.Machine); break; - } - MESSAGE(")\n"); - goto error; - } + if (check_architecture( nt )) goto error; /* check for non page-aligned binary */

1 0