wine-commits January 2015

wine-commits@winehq.org

2 participants
302 discussions

Charles Davis : server: Use mach_vm_* functions instead of the old vm_* functions.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: 4fe1977743e136386013e11ac8ac3b658a14fedf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fe1977743e136386013e11ac… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Jan 22 23:25:26 2015 -0700 server: Use mach_vm_* functions instead of the old vm_* functions. --- server/mach.c | 53 ++++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/server/mach.c b/server/mach.c index 03c88ec..be84457 100644 --- a/server/mach.c +++ b/server/mach.c @@ -48,6 +48,7 @@ #include <mach/mach.h> #include <mach/mach_error.h> #include <mach/thread_act.h> +#include <mach/mach_vm.h> #include <servers/bootstrap.h> static mach_port_t server_mach_port; @@ -277,9 +278,10 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t { kern_return_t ret; mach_msg_type_number_t bytes_read; - vm_offset_t offset, data; - vm_address_t aligned_address; - vm_size_t aligned_size; + mach_vm_offset_t offset; + vm_offset_t data; + mach_vm_address_t aligned_address; + mach_vm_size_t aligned_size; unsigned int page_size = get_page_size(); mach_port_t process_port = get_process_port( process ); @@ -288,7 +290,7 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t set_error( STATUS_ACCESS_DENIED ); return 0; } - if ((vm_address_t)ptr != ptr) + if ((mach_vm_address_t)ptr != ptr) { set_error( STATUS_ACCESS_DENIED ); return 0; @@ -301,15 +303,15 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t } offset = ptr % page_size; - aligned_address = (vm_address_t)(ptr - offset); + aligned_address = (mach_vm_address_t)(ptr - offset); aligned_size = (size + offset + page_size - 1) / page_size * page_size; - ret = vm_read( process_port, aligned_address, aligned_size, &data, &bytes_read ); + ret = mach_vm_read( process_port, aligned_address, aligned_size, &data, &bytes_read ); if (ret != KERN_SUCCESS) mach_set_error( ret ); else { memcpy( dest, (char *)data + offset, size ); - vm_deallocate( mach_task_self(), data, bytes_read ); + mach_vm_deallocate( mach_task_self(), data, bytes_read ); } task_resume( process_port ); return (ret == KERN_SUCCESS); @@ -319,11 +321,12 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t size, const char *src ) { kern_return_t ret; - vm_address_t aligned_address, region_address; - vm_size_t aligned_size, region_size; + mach_vm_address_t aligned_address, region_address; + mach_vm_size_t aligned_size, region_size; mach_msg_type_number_t info_size, bytes_read; - vm_offset_t offset, task_mem = 0; - struct vm_region_basic_info info; + mach_vm_offset_t offset; + vm_offset_t task_mem = 0; + struct vm_region_basic_info_64 info; mach_port_t dummy; unsigned int page_size = get_page_size(); mach_port_t process_port = get_process_port( process ); @@ -333,14 +336,14 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t set_error( STATUS_ACCESS_DENIED ); return 0; } - if ((vm_address_t)ptr != ptr) + if ((mach_vm_address_t)ptr != ptr) { set_error( STATUS_ACCESS_DENIED ); return 0; } offset = ptr % page_size; - aligned_address = (vm_address_t)(ptr - offset); + aligned_address = (mach_vm_address_t)(ptr - offset); aligned_size = (size + offset + page_size - 1) / page_size * page_size; if ((ret = task_suspend( process_port )) != KERN_SUCCESS) @@ -349,7 +352,7 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t return 0; } - ret = vm_read( process_port, aligned_address, aligned_size, &task_mem, &bytes_read ); + ret = mach_vm_read( process_port, aligned_address, aligned_size, &task_mem, &bytes_read ); if (ret != KERN_SUCCESS) { mach_set_error( ret ); @@ -357,7 +360,7 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t } region_address = aligned_address; info_size = sizeof(info); - ret = vm_region( process_port, &region_address, &region_size, VM_REGION_BASIC_INFO, + ret = mach_vm_region( process_port, &region_address, &region_size, VM_REGION_BASIC_INFO_64, (vm_region_info_t)&info, &info_size, &dummy ); if (ret != KERN_SUCCESS) { @@ -371,7 +374,7 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t set_error( ERROR_ACCESS_DENIED ); goto failed; } - ret = vm_protect( process_port, aligned_address, aligned_size, 0, VM_PROT_READ | VM_PROT_WRITE ); + ret = mach_vm_protect( process_port, aligned_address, aligned_size, 0, VM_PROT_READ | VM_PROT_WRITE ); if (ret != KERN_SUCCESS) { mach_set_error( ret ); @@ -385,19 +388,19 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t memcpy( (char*)task_mem + offset, src, size ); - ret = vm_write( process_port, aligned_address, task_mem, bytes_read ); + ret = mach_vm_write( process_port, aligned_address, task_mem, bytes_read ); if (ret != KERN_SUCCESS) mach_set_error( ret ); else { - vm_deallocate( mach_task_self(), task_mem, bytes_read ); + mach_vm_deallocate( mach_task_self(), task_mem, bytes_read ); /* restore protection */ - vm_protect( process_port, aligned_address, aligned_size, 0, info.protection ); + mach_vm_protect( process_port, aligned_address, aligned_size, 0, info.protection ); task_resume( process_port ); return 1; } failed: - if (task_mem) vm_deallocate( mach_task_self(), task_mem, bytes_read ); + if (task_mem) mach_vm_deallocate( mach_task_self(), task_mem, bytes_read ); task_resume( process_port ); return 0; } @@ -427,11 +430,11 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, if ((ret = task_suspend( process_port )) == KERN_SUCCESS) { - vm_offset_t offset = process->ldt_copy % page_size; - vm_address_t aligned_address = (vm_address_t)(process->ldt_copy - offset); - vm_size_t aligned_size = (total_size + offset + page_size - 1) / page_size * page_size; + mach_vm_offset_t offset = process->ldt_copy % page_size; + mach_vm_address_t aligned_address = (mach_vm_address_t)(process->ldt_copy - offset); + mach_vm_size_t aligned_size = (total_size + offset + page_size - 1) / page_size * page_size; - ret = vm_read( process_port, aligned_address, aligned_size, &data, &bytes_read ); + ret = mach_vm_read( process_port, aligned_address, aligned_size, &data, &bytes_read ); if (ret != KERN_SUCCESS) mach_set_error( ret ); else { @@ -439,7 +442,7 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, memcpy( base, ldt + entry, sizeof(int) ); memcpy( limit, ldt + entry + 8192, sizeof(int) ); memcpy( flags, (char *)(ldt + 2 * 8192) + entry, 1 ); - vm_deallocate( mach_task_self(), data, bytes_read ); + mach_vm_deallocate( mach_task_self(), data, bytes_read ); } task_resume( process_port ); }

1 0

Alistair Leslie-Hughes : dplay: Add missing defines.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: f3c34daaeb1515728a9d059805e51b80194f61d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c34daaeb1515728a9d05980… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 6 11:08:17 2015 +1100 dplay: Add missing defines. --- include/wine/dplaysp.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/wine/dplaysp.h b/include/wine/dplaysp.h index 95361d1..1459232 100644 --- a/include/wine/dplaysp.h +++ b/include/wine/dplaysp.h @@ -38,8 +38,15 @@ typedef BOOL (CALLBACK *LPENUMMRUCALLBACK)( LPCVOID lpData, /* For SP. Top 16 bits is dplay, bottom 16 is SP */ #define DPSP_MAJORVERSION 0x00060000 -#define DPSP_DX5VERSION 0x00050000 + #define DPSP_DX3VERSION 0x00040000 +#define DPSP_DX5VERSION 0x00050000 +#define DPSP_DX6VERSION 0x00090000 +#define DPSP_DX61VERSION 0x000a0000 +#define DPSP_DX61AVERSION 0x000b0000 +#define DPSP_DX71VERSION 0x000c0000 +#define DPSP_DX8VERSION 0x000d0000 +#define DPSP_DX9VERSION 0x000e0000 #define DPSP_MAJORVERSIONMASK 0xFFFF0000 #define DPSP_MINORVERSIONMASK 0x0000FFFF

1 0

Charles Davis : kernel32: Don't use %gs on 64-bit Mac OS.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: 193d15cc3c5830c8986c028743900ab6833943a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=193d15cc3c5830c8986c02874… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Jan 22 23:30:54 2015 -0700 kernel32: Don't use %gs on 64-bit Mac OS. --- dlls/kernel32/thread.c | 2 +- include/winbase.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 5b9a683..0abfdf1 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -607,7 +607,7 @@ __ASM_STDCALL_FUNC( GetCurrentThreadId, 0, ".byte 0x64\n\tmovl 0x24,%eax\n\tret" /* HANDLE WINAPI GetProcessHeap(void) */ __ASM_STDCALL_FUNC( GetProcessHeap, 0, ".byte 0x64\n\tmovl 0x30,%eax\n\tmovl 0x18(%eax),%eax\n\tret"); -#elif defined(__x86_64__) +#elif defined(__x86_64__) && !defined(__APPLE__) /*********************************************************************** * SetLastError (KERNEL32.@) diff --git a/include/winbase.h b/include/winbase.h index 5ac55b7..3055d5f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2783,7 +2783,7 @@ static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) /* A few optimizations for gcc */ -#if defined(__GNUC__) && !defined(__MINGW32__) && (defined(__i386__) || defined(__x86_64__)) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2))) +#if defined(__GNUC__) && !defined(__MINGW32__) && (defined(__i386__) || (defined(__x86_64__) && !defined(__APPLE__))) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2))) static FORCEINLINE DWORD WINAPI GetLastError(void) {

1 0

Charles Davis : kernel32: Recognize 64-bit Mach-O modules, too.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: 2ace215b9a9a971b08dc319529249494b2897bc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ace215b9a9a971b08dc31952… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Jan 22 23:30:55 2015 -0700 kernel32: Recognize 64-bit Mach-O modules, too. --- dlls/kernel32/module.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 2a87e66..f495e81 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -289,10 +289,11 @@ void MODULE_get_binary_info( HANDLE hfile, struct binary_info *info ) } } /* Mach-o File with Endian set to Big Endian or Little Endian */ - else if (header.macho.magic == 0xfeedface || header.macho.magic == 0xcefaedfe) + else if (header.macho.magic == 0xfeedface || header.macho.magic == 0xcefaedfe || + header.macho.magic == 0xfeedfacf || header.macho.magic == 0xcffaedfe) { if ((header.macho.cputype >> 24) == 1) info->flags |= BINARY_FLAG_64BIT; - if (header.macho.magic == 0xcefaedfe) + if (header.macho.magic == 0xcefaedfe || header.macho.magic == 0xcffaedfe) { header.macho.filetype = RtlUlongByteSwap( header.macho.filetype ); header.macho.cputype = RtlUlongByteSwap( header.macho.cputype );

1 0

Charles Davis : winebuild: Make emitting mod_*_func sections on Mac OS respect the pointer size.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: 6f6e42498d1a150ef71107a9762229c85bdca326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f6e42498d1a150ef71107a97… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Jan 22 23:25:25 2015 -0700 winebuild: Make emitting mod_*_func sections on Mac OS respect the pointer size. --- tools/winebuild/spec32.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 35fe144..98060b5 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -426,8 +426,8 @@ static void output_asm_constructor( const char *constructor ) { /* Mach-O doesn't have an init section */ output( "\n\t.mod_init_func\n" ); - output( "\t.align %d\n", get_alignment(4) ); - output( "\t.long %s\n", asm_name(constructor) ); + output( "\t.align %d\n", get_alignment(get_ptr_size()) ); + output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name(constructor) ); } else {

1 0

Vincent Povirk : xmllite: Length is optional in IXmlReader:: GetQualifiedName.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: fd5a8a9db894edc880c394385fcba37dfe09f486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd5a8a9db894edc880c394385… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jan 22 16:19:36 2015 -0600 xmllite: Length is optional in IXmlReader::GetQualifiedName. --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index cf61939..cf89fb7 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2671,7 +2671,7 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam TRACE("(%p)->(%p %p)\n", This, name, len); *name = This->strvalues[StringValue_QualifiedName].str; - *len = This->strvalues[StringValue_QualifiedName].len; + if (len) *len = This->strvalues[StringValue_QualifiedName].len; return S_OK; }

1 0

Qian Hong : atl100/tests: Added tests for AtlAxCreateControlEx.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 412a070e49ae97918ae7fe4a7a9db7547acf89b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=412a070e49ae97918ae7fe4a7… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jan 16 16:09:50 2015 +0800 atl100/tests: Added tests for AtlAxCreateControlEx. --- dlls/atl100/tests/atl.c | 191 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 173 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=412a070e49ae97918ae7f…

1 0

Qian Hong : atl: Improved content type handling of AtlAxCreateControlEx.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: ec52a1f55700989f014851eef0a25641f8bc983a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec52a1f55700989f014851eef… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Jan 16 16:09:36 2015 +0800 atl: Improved content type handling of AtlAxCreateControlEx. --- dlls/atl/Makefile.in | 2 +- dlls/atl/atl_ax.c | 69 +++++++++++++++++++++++++++++++++++++++---------- dlls/atl100/Makefile.in | 2 +- dlls/atl100/tests/atl.c | 8 +++--- dlls/atl110/Makefile.in | 2 +- dlls/atl80/Makefile.in | 2 +- dlls/atl90/Makefile.in | 2 +- 7 files changed, 65 insertions(+), 22 deletions(-) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 34ae9b8..826a5bf 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -1,6 +1,6 @@ MODULE = atl.dll IMPORTLIB = atl -IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 +IMPORTS = uuid oleaut32 ole32 user32 gdi32 advapi32 shlwapi EXTRADEFS = -D_ATL_VER=_ATL_VER_30 C_SRCS = \ diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index d16cdfd..15b0550 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -35,6 +35,7 @@ #include "atlbase.h" #include "atliface.h" #include "atlwin.h" +#include "shlwapi.h" #include "wine/unicode.h" @@ -991,6 +992,48 @@ HRESULT WINAPI AtlAxCreateControl(LPCOLESTR lpszName, HWND hWnd, NULL, NULL, NULL ); } +enum content +{ + IsEmpty = 0, + IsGUID = 1, + IsHTML = 2, + IsURL = 3, + IsUnknown = 4 +}; + +static enum content get_content_type(LPCOLESTR name, CLSID *control_id) +{ + WCHAR new_urlW[MAX_PATH]; + DWORD size = MAX_PATH; + WCHAR mshtml_prefixW[] = {'m','s','h','t','m','l',':','\0'}; + + if (!name || !name[0]) + { + WARN("name %s\n", wine_dbgstr_w(name)); + return IsEmpty; + } + + if (CLSIDFromString(name, control_id) == S_OK || + CLSIDFromProgID(name, control_id) == S_OK) + return IsGUID; + + if (PathIsURLW (name) || + UrlApplySchemeW(name, new_urlW, &size, URL_APPLY_GUESSSCHEME|URL_APPLY_GUESSFILE) == S_OK) + { + *control_id = CLSID_WebBrowser; + return IsURL; + } + + if (!strncmpiW(name, mshtml_prefixW, 7)) + { + FIXME("mshtml prefix not implemented\n"); + *control_id = CLSID_WebBrowser; + return IsHTML; + } + + return IsUnknown; +} + /*********************************************************************** * AtlAxCreateControlEx [atl100.@] * @@ -1005,24 +1048,24 @@ HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR lpszName, HWND hWnd, CLSID controlId; HRESULT hRes; IOleObject *pControl; - IUnknown *pUnkControl; + IUnknown *pUnkControl = NULL; IPersistStreamInit *pPSInit; - IUnknown *pContainer; - enum {IsGUID=0,IsHTML=1,IsURL=2} content; + IUnknown *pContainer = NULL; + enum content content; TRACE("(%s %p %p %p %p %p %p)\n", debugstr_w(lpszName), hWnd, pStream, ppUnkContainer, ppUnkControl, iidSink, punkSink); - hRes = CLSIDFromString( lpszName, &controlId ); - if ( FAILED(hRes) ) - hRes = CLSIDFromProgID( lpszName, &controlId ); - if ( SUCCEEDED( hRes ) ) - content = IsGUID; - else { - /* FIXME - check for MSHTML: prefix! */ - content = IsURL; - controlId = CLSID_WebBrowser; - } + if (ppUnkContainer) *ppUnkContainer = NULL; + if (ppUnkControl) *ppUnkControl = NULL; + + content = get_content_type(lpszName, &controlId); + + if (content == IsEmpty) + return S_OK; + + if (content == IsUnknown) + return CO_E_CLASSSTRING; hRes = CoCreateInstance( &controlId, 0, CLSCTX_ALL, &IID_IOleObject, (void**) &pControl ); diff --git a/dlls/atl100/Makefile.in b/dlls/atl100/Makefile.in index 916bd8e..719afe0 100644 --- a/dlls/atl100/Makefile.in +++ b/dlls/atl100/Makefile.in @@ -1,6 +1,6 @@ MODULE = atl100.dll IMPORTLIB = atl100 -IMPORTS = uuid ole32 oleaut32 user32 gdi32 advapi32 +IMPORTS = uuid ole32 oleaut32 user32 gdi32 advapi32 shlwapi EXTRADEFS = -D_ATL_VER=_ATL_VER_100 PARENTSRC = ../atl diff --git a/dlls/atl100/tests/atl.c b/dlls/atl100/tests/atl.c index 8cf0a32..699af0a 100644 --- a/dlls/atl100/tests/atl.c +++ b/dlls/atl100/tests/atl.c @@ -643,8 +643,8 @@ static void test_ax_win(void) ok(hwnd != NULL, "CreateWindow failed!\n"); control = (IUnknown *)0xdeadbeef; res = AtlAxGetControl(hwnd, &control); - todo_wine ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); - todo_wine ok(!control, "returned %p\n", control); + ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); + ok(!control, "returned %p\n", control); if (control) IUnknown_Release(control); DestroyWindow(hwnd); @@ -652,8 +652,8 @@ static void test_ax_win(void) ok(hwnd != NULL, "CreateWindow failed!\n"); control = (IUnknown *)0xdeadbeef; res = AtlAxGetControl(hwnd, &control); - todo_wine ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); - todo_wine ok(!control, "returned %p\n", control); + ok(res == E_FAIL, "Expected E_FAIL, returned %08x\n", res); + ok(!control, "returned %p\n", control); if (control) IUnknown_Release(control); DestroyWindow(hwnd); diff --git a/dlls/atl110/Makefile.in b/dlls/atl110/Makefile.in index ced0f18..49ba933 100644 --- a/dlls/atl110/Makefile.in +++ b/dlls/atl110/Makefile.in @@ -1,5 +1,5 @@ MODULE = atl110.dll -IMPORTS = oleaut32 ole32 user32 gdi32 advapi32 uuid +IMPORTS = oleaut32 ole32 user32 gdi32 advapi32 uuid shlwapi EXTRADEFS = -D_ATL_VER=_ATL_VER_110 PARENTSRC = ../atl diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index 4b7bbd7..b3a5a9c 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -1,6 +1,6 @@ MODULE = atl80.dll IMPORTLIB = atl80 -IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid +IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid shlwapi EXTRADEFS = -D_ATL_VER=_ATL_VER_80 PARENTSRC = ../atl diff --git a/dlls/atl90/Makefile.in b/dlls/atl90/Makefile.in index 5fed63b..d3aebe6 100644 --- a/dlls/atl90/Makefile.in +++ b/dlls/atl90/Makefile.in @@ -1,5 +1,5 @@ MODULE = atl90.dll -IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid +IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid shlwapi EXTRADEFS = -D_ATL_VER=_ATL_VER_90 PARENTSRC = ../atl

1 0

Gerald Pfeifer : makefiles: Support building with non-default LD.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 189ffc2e7313e901822caa7f76d1fe3961e922e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=189ffc2e7313e901822caa7f7… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Jan 14 10:52:48 2015 +0100 makefiles: Support building with non-default LD. --- Make.vars.in | 1 + configure | 93 +++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 1 + tools/winegcc/Makefile.in | 1 + tools/winegcc/winegcc.c | 2 + 5 files changed, 98 insertions(+) diff --git a/Make.vars.in b/Make.vars.in index ee8ee39..e825f4b 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -40,6 +40,7 @@ RANLIB = @RANLIB@ STRIP = @STRIP@ LN_S = @LN_S@ TOOLSDIR = @TOOLSDIR@ +LD = @LD@ LDFLAGS = @LDFLAGS@ DLLFLAGS = @DLLFLAGS@ PRELINK = @PRELINK@ diff --git a/configure b/configure index 817ddd7..c0aa93e 100755 --- a/configure +++ b/configure @@ -732,6 +732,7 @@ BISON FLEX TOOLSDIR TARGETFLAGS +LD CPPBIN ac_ct_CXX CXXFLAGS @@ -4737,6 +4738,98 @@ cat >>confdefs.h <<_ACEOF #define EXEEXT "$ac_exeext" _ACEOF +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. +set dummy ${ac_tool_prefix}ld; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$LD"; then + ac_cv_prog_LD="$LD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_LD="${ac_tool_prefix}ld" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +LD=$ac_cv_prog_LD +if test -n "$LD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_LD"; then + ac_ct_LD=$LD + # Extract the first word of "ld", so it can be a program name with args. +set dummy ld; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_LD+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_LD"; then + ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_LD="ld" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_LD=$ac_cv_prog_ac_ct_LD +if test -n "$ac_ct_LD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LD" >&5 +$as_echo "$ac_ct_LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_LD" = x; then + LD="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + LD=$ac_ct_LD + fi +else + LD="$ac_cv_prog_LD" +fi + case $host in *-darwin*) diff --git a/configure.ac b/configure.ac index df3c37b..ab8945a 100644 --- a/configure.ac +++ b/configure.ac @@ -122,6 +122,7 @@ AC_PROG_CXX dnl We can't use AC_PROG_CPP for winegcc, it uses by default $(CC) -E AC_CHECK_TOOL(CPPBIN,cpp,cpp) AC_DEFINE_UNQUOTED(EXEEXT,["$ac_exeext"],[Define to the file extension for executables.]) +AC_CHECK_TOOL(LD,ld) case $host in *-darwin*) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index 3975ca5..370a2e4 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -16,6 +16,7 @@ winegcc_EXTRADEFS = \ -DCC="\"$(CC)\"" \ -DCPP="\"$(CPPBIN)\"" \ -DCXX="\"$(CXX)\"" \ + -DLD="\"$(LD)\"" \ -DPRELINK="\"$(PRELINK)\"" winegcc$(EXEEXT): winegcc.o utils.o diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index a2f09d2..3b2794e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1034,6 +1034,8 @@ static void build(struct options* opts) /* run winebuild to generate the .spec.o file */ spec_args = get_winebuild_args( opts ); strarray_add( spec_args, strmake( "--cc-cmd=%s", build_tool_name( opts, "gcc", CC ))); + strarray_add( spec_args, strmake( "--ld-cmd=%s", build_tool_name( opts, "ld", LD ))); + spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size ));

1 0

Erich E. Hoover : winex11.drv: Update the check for broken nVidia RandR to test for the number of resolutions instead of the number of modes.
by Alexandre Julliard 22 Jan '15

22 Jan '15

Module: wine Branch: master Commit: 8e9e4a657f29ff018c6296ced1f115ca8731e5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9e4a657f29ff018c6296ced… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sat Aug 9 13:15:09 2014 -0600 winex11.drv: Update the check for broken nVidia RandR to test for the number of resolutions instead of the number of modes. --- dlls/winex11.drv/xrandr.c | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index fc09020..e9670c3 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -386,6 +386,7 @@ static XRRCrtcInfo *xrandr12_get_primary_crtc_info( XRRScreenResources *resource static int xrandr12_init_modes(void) { + unsigned int only_one_resolution = 1, mode_count; XRRScreenResources *resources; XRROutputInfo *output_info; XRRCrtcInfo *crtc_info; @@ -434,21 +435,6 @@ static int xrandr12_init_modes(void) goto done; } - /* Recent (304.64, possibly earlier) versions of the nvidia driver only - * report a DFP's native mode through RandR 1.2 / 1.3. Standard DMT modes - * are only listed through RandR 1.0 / 1.1. This is completely useless, - * but NVIDIA considers this a feature, so it's unlikely to change. The - * best we can do is to fall back to RandR 1.0 and encourage users to - * consider more cooperative driver vendors when we detect such a - * configuration. */ - if (output_info->nmode == 1 && XQueryExtension( gdi_display, "NV-CONTROL", &i, &j, &ret )) - { - ERR_(winediag)("Broken NVIDIA RandR detected, falling back to RandR 1.0. " - "Please consider using the Nouveau driver instead.\n"); - ret = -1; - goto done; - } - if (!(xrandr12_modes = HeapAlloc( GetProcessHeap(), 0, sizeof(*xrandr12_modes) * output_info->nmode ))) { ERR("Failed to allocate xrandr mode info array.\n"); @@ -480,6 +466,32 @@ static int xrandr12_init_modes(void) } } + mode_count = X11DRV_Settings_GetModeCount(); + for (i = 1; i < mode_count; ++i) + { + if (dd_modes[i].width != dd_modes[0].width || dd_modes[i].height != dd_modes[0].height) + { + only_one_resolution = 0; + break; + } + } + + /* Recent (304.64, possibly earlier) versions of the nvidia driver only + * report a DFP's native mode through RandR 1.2 / 1.3. Standard DMT modes + * are only listed through RandR 1.0 / 1.1. This is completely useless, + * but NVIDIA considers this a feature, so it's unlikely to change. The + * best we can do is to fall back to RandR 1.0 and encourage users to + * consider more cooperative driver vendors when we detect such a + * configuration. */ + if (only_one_resolution && XQueryExtension( gdi_display, "NV-CONTROL", &i, &j, &ret )) + { + ERR_(winediag)("Broken NVIDIA RandR detected, falling back to RandR 1.0. " + "Please consider using the Nouveau driver instead.\n"); + ret = -1; + HeapFree( GetProcessHeap(), 0, xrandr12_modes ); + goto done; + } + X11DRV_Settings_AddDepthModes(); ret = 0;

1 0

← Newer
1
2
3
4
5
6
7
8
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2015