January 2015 - Wine-commits

Tag wine-1.7.35 : Alexandre Julliard : Release 1.7.35
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: refs/tags/wine-1.7.35 Tag: 1cad291389670e0b6bebdb710cf06003b15ff219 URL: http://source.winehq.org/git/wine.git/?a=tag;h=1cad291389670e0b6bebdb710cf0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 23 21:06:28 2015 +0100 Release 1.7.35

1 0

Michael Stefaniuc : wintrust/tests: Remove an unused assignment ( PVS-Studio).
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: 971cf7001471d7138ed86c417887076a92ac1ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=971cf7001471d7138ed86c417… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 23 11:49:11 2015 +0100 wintrust/tests: Remove an unused assignment (PVS-Studio). --- dlls/wintrust/tests/crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 0e77f93..d7e76b1 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -790,7 +790,7 @@ static void test_create_catalog_file(void) /* Only enumerate the attributes */ trace("Only attributes\n"); - attrcount = membercount = 0; + attrcount = 0; catcdf = pCryptCATCDFOpen(cdffileW, NULL); catattr = NULL;

1 0

Jacek Caban : mshtml: Added Exec(OLECMDID_OPTICAL_ZOOM) implementation.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: 13d899ec0f72b413b34c44024374d5bbacd23b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=13d899ec0f72b413b34c44024… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 23 14:38:16 2015 +0100 mshtml: Added Exec(OLECMDID_OPTICAL_ZOOM) implementation. --- dlls/mshtml/mshtml_private.h | 3 ++- dlls/mshtml/nsembed.c | 22 ++++++++++++++++++++++ dlls/mshtml/olecmd.c | 11 +++++++++-- dlls/mshtml/oleobj.c | 22 ++-------------------- dlls/mshtml/tests/htmldoc.c | 2 +- 5 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a53fcec..5c3c1ec 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -818,8 +818,9 @@ void register_nsservice(nsIComponentRegistrar*,nsIServiceManager*) DECLSPEC_HIDD void init_nsio(nsIComponentManager*,nsIComponentRegistrar*) DECLSPEC_HIDDEN; void release_nsio(void) DECLSPEC_HIDDEN; BOOL is_gecko_path(const char*) DECLSPEC_HIDDEN; +void set_viewer_zoom(NSContainer*,float) DECLSPEC_HIDDEN; -void init_node_cc(void); +void init_node_cc(void) DECLSPEC_HIDDEN; HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 2854ac3..8f3fceb 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1149,6 +1149,28 @@ BOOL is_gecko_path(const char *path) return ret; } +void set_viewer_zoom(NSContainer *nscontainer, float factor) +{ + nsIContentViewer *content_viewer; + nsIDocShell *doc_shell; + nsresult nsres; + + TRACE("Setting to %f\n", factor); + + nsres = get_nsinterface((nsISupports*)nscontainer->navigation, &IID_nsIDocShell, (void**)&doc_shell); + assert(nsres == NS_OK); + + nsres = nsIDocShell_GetContentViewer(doc_shell, &content_viewer); + assert(nsres == NS_OK && content_viewer); + nsIDocShell_Release(doc_shell); + + nsres = nsIContentViewer_SetFullZoom(content_viewer, factor); + if(NS_FAILED(nsres)) + ERR("SetFullZoom failed: %08x\n", nsres); + + nsIContentViewer_Release(content_viewer); +} + struct nsWeakReference { nsIWeakReference nsIWeakReference_iface; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 5916010..f4bf002 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -548,8 +548,15 @@ static HRESULT exec_get_print_template(HTMLDocument *This, DWORD nCmdexecopt, VA static HRESULT exec_optical_zoom(HTMLDocument *This, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { - FIXME("(%p)->(%d %p %p)\n", This, nCmdexecopt, pvaIn, pvaOut); - return E_NOTIMPL; + TRACE("(%p)->(%d %s %p)\n", This, nCmdexecopt, debugstr_variant(pvaIn), pvaOut); + + if(!pvaIn || V_VT(pvaIn) != VT_I4) { + FIXME("Unsupported argument %s\n", debugstr_variant(pvaIn)); + return E_NOTIMPL; + } + + set_viewer_zoom(This->doc_obj->nscontainer, (float)V_I4(pvaIn)/100); + return S_OK; } static HRESULT query_mshtml_copy(HTMLDocument *This, OLECMD *cmd) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index aeb83a0..7809eb0 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -229,12 +229,9 @@ void set_document_navigation(HTMLDocumentObj *doc, BOOL doc_can_navigate) static void load_settings(HTMLDocumentObj *doc) { - nsIContentViewer *content_viewer; - nsIDocShell *doc_shell; HKEY settings_key; DWORD val, size; LONG res; - nsresult nsres; static const WCHAR ie_keyW[] = { 'S','O','F','T','W','A','R','E','\\', @@ -250,23 +247,8 @@ static void load_settings(HTMLDocumentObj *doc) size = sizeof(val); res = RegGetValueW(settings_key, zoomW, zoom_factorW, RRF_RT_REG_DWORD, NULL, &val, &size); RegCloseKey(settings_key); - if(res != ERROR_SUCCESS) - return; - - TRACE("Setting ZoomFactor to %u\n", val); - - nsres = get_nsinterface((nsISupports*)doc->nscontainer->navigation, &IID_nsIDocShell, (void**)&doc_shell); - assert(nsres == NS_OK); - - nsres = nsIDocShell_GetContentViewer(doc_shell, &content_viewer); - assert(nsres == NS_OK && content_viewer); - nsIDocShell_Release(doc_shell); - - nsres = nsIContentViewer_SetFullZoom(content_viewer, (float)val/100000); - if(NS_FAILED(nsres)) - ERR("SetFullZoom failed: %08x\n", nsres); - - nsIContentViewer_Release(content_viewer); + if(res == ERROR_SUCCESS) + set_viewer_zoom(doc->nscontainer, (float)val/100000); } static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite *pClientSite) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 16d6b45..3b332d1 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6641,7 +6641,7 @@ static void test_exec_optical_zoom(IHTMLDocument2 *doc, int factor) SET_EXPECT(GetOverrideKeyPath); hres = IOleCommandTarget_Exec(cmdtrg, NULL, OLECMDID_OPTICAL_ZOOM, OLECMDEXECOPT_DODEFAULT, &v, NULL); - todo_wine ok(hres == S_OK || broken(hres == OLECMDERR_E_NOTSUPPORTED) /* IE6 */, "Exec failed: %08x\n", hres); + ok(hres == S_OK || broken(hres == OLECMDERR_E_NOTSUPPORTED) /* IE6 */, "Exec failed: %08x\n", hres); CLEAR_CALLED(GetOverrideKeyPath); IOleCommandTarget_Release(cmdtrg);

1 0

Andrew Eikum : wined3d: Fix spec file entry for wined3d_texture_create.
by Alexandre Julliard 23 Jan '15

23 Jan '15

Module: wine Branch: master Commit: 7b45103c4ab380215a0854c5d912573ec216c659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b45103c4ab380215a0854c5d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jan 23 10:19:20 2015 -0600 wined3d: Fix spec file entry for wined3d_texture_create. --- dlls/wined3d/wined3d.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 63e18c7..aca33f4 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -258,7 +258,7 @@ @ cdecl wined3d_swapchain_set_window(ptr ptr) @ cdecl wined3d_texture_add_dirty_region(ptr long ptr) -@ cdecl wined3d_texture_create(ptr ptr long long ptr ptr ptr) +@ cdecl wined3d_texture_create(ptr ptr long long ptr ptr ptr ptr) @ cdecl wined3d_texture_decref(ptr) @ cdecl wined3d_texture_generate_mipmaps(ptr) @ cdecl wined3d_texture_get_autogen_filter_type(ptr)

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

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

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 : 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

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 : 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