April 2006 - Wine-commits - list.winehq.org

Robert Reif : dsound: Fix capture test.
by Alexandre Julliard 07 Apr '06

07 Apr '06

Module: wine Branch: refs/heads/master Commit: ba6260899635323e1dc6c90995b0e0e8d53dac1a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba6260899635323e1dc6c90… Author: Robert Reif <reif(a)earthlink.net> Date: Fri Apr 7 12:06:06 2006 -0400 dsound: Fix capture test. Remove bogus release of NULL pointer code found by Coverity. --- dlls/dsound/tests/capture.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 4443a38..603f378 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -471,11 +471,6 @@ static BOOL WINAPI dscenum_callback(LPGU rc=pDirectSoundCaptureCreate(lpGuid,NULL,NULL); ok(rc==DSERR_INVALIDPARAM,"DirectSoundCaptureCreate() should have " "returned DSERR_INVALIDPARAM, returned: %s\n",DXGetErrorString8(rc)); - if (rc==DS_OK) { - ref=IDirectSoundCapture_Release(dsco); - ok(ref==0,"IDirectSoundCapture_Release() has %d references, should " - "have 0\n",ref); - } rc=pDirectSoundCaptureCreate(lpGuid,&dsco,NULL); ok((rc==DS_OK)||(rc==DSERR_NODRIVER)||(rc==E_FAIL)||(rc==DSERR_ALLOCATED),

1 0

Paul Vriens : netapi32: Move NetShareEnum from browsr.c to share.c.
by Alexandre Julliard 07 Apr '06

07 Apr '06

Module: wine Branch: refs/heads/master Commit: a233d55dbd36a78ab34705e2f2bb1c60f806f809 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a233d55dbd36a78ab34705e… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Fri Apr 7 15:59:45 2006 +0200 netapi32: Move NetShareEnum from browsr.c to share.c. --- dlls/netapi32/browsr.c | 11 ----------- dlls/netapi32/share.c | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/netapi32/browsr.c b/dlls/netapi32/browsr.c index b0ed893..7b0b68c 100644 --- a/dlls/netapi32/browsr.c +++ b/dlls/netapi32/browsr.c @@ -49,14 +49,3 @@ NET_API_STATUS WINAPI I_BrowserQueryEmul { return ERROR_NOT_SUPPORTED; } - -/************************************************************ - * NetShareEnum (NETAPI32.@) - */ -NET_API_STATUS WINAPI NetShareEnum( LPWSTR servername, DWORD level, LPBYTE* bufptr, - DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle) -{ - FIXME("%s %ld %p %ld %p %p %p\n", debugstr_w(servername), level, bufptr, - prefmaxlen, entriesread, totalentries, resume_handle); - return ERROR_NOT_SUPPORTED; -} diff --git a/dlls/netapi32/share.c b/dlls/netapi32/share.c index c81381e..4f83130 100644 --- a/dlls/netapi32/share.c +++ b/dlls/netapi32/share.c @@ -17,6 +17,7 @@ #include "wine/debug.h" #include "lm.h" +#include "winerror.h" WINE_DEFAULT_DEBUG_CHANNEL(share); @@ -56,3 +57,29 @@ NET_API_STATUS WINAPI NetSessionEnum(LPW return NERR_Success; } + +/************************************************************ + * NetShareEnum (NETAPI32.@) + * + * PARAMS + * servername [I] Pointer to a string with the name of the server + * level [I] Data information level + * bufptr [O] Buffer to the data + * prefmaxlen [I] Preferred maximum length of the data + * entriesread [O] Pointer to the number of entries enumerated + * totalentries [O] Pointer to the possible number of entries + * resume_handle [I/O] Pointer to a handle for subsequent searches + * + * RETURNS + * If successful, the function returns NERR_Success + * On failure it returns a system error code (FIXME: find out which) + * + */ +NET_API_STATUS WINAPI NetShareEnum( LPWSTR servername, DWORD level, LPBYTE* bufptr, + DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle) +{ + FIXME("Stub (%s %ld %p %ld %p %p %p)\n", debugstr_w(servername), level, bufptr, + prefmaxlen, entriesread, totalentries, resume_handle); + + return ERROR_NOT_SUPPORTED; +}

1 0

Mike Hearn : uxtheme: Fix GetThemeSysInt.
by Alexandre Julliard 07 Apr '06

07 Apr '06

Module: wine Branch: refs/heads/master Commit: d46e68da1e4ee66e708b5a30b81d6992a5866340 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d46e68da1e4ee66e708b5a3… Author: Mike Hearn <mike(a)plan99.net> Date: Fri Apr 7 15:33:56 2006 +0100 uxtheme: Fix GetThemeSysInt. TMT_FIRSTINT and TMT_LASTINT are the same value here, so the error path would always be taken. Fix to check only that the values are outside the possible range. --- dlls/uxtheme/metric.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uxtheme/metric.c b/dlls/uxtheme/metric.c index e8936dd..bfbec29 100644 --- a/dlls/uxtheme/metric.c +++ b/dlls/uxtheme/metric.c @@ -151,8 +151,8 @@ HRESULT WINAPI GetThemeSysInt(HTHEME hTh TRACE("(%p, %d)\n", hTheme, iIntID); if(!hTheme) return E_HANDLE; - if(iIntID <= TMT_FIRSTINT || iIntID >= TMT_LASTINT) { - TRACE("Unknown IntID: %d\n", iIntID); + if(iIntID < TMT_FIRSTINT || iIntID > TMT_LASTINT) { + WARN("Unknown IntID: %d\n", iIntID); return STG_E_INVALIDPARAMETER; } if((tp = MSSTYLES_FindMetric(TMT_INT, iIntID)))

1 0

Alexandre Julliard : server: Moved read/ write_process_memory and get_selector_entry to ptrace.c.
by Alexandre Julliard 07 Apr '06

07 Apr '06

Module: wine Branch: refs/heads/master Commit: cb70931f6758a6bd8ffce7f8bcb49e112795f947 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cb70931f6758a6bd8ffce7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 7 19:52:12 2006 +0200 server: Moved read/write_process_memory and get_selector_entry to ptrace.c. --- server/process.c | 131 ------------------------------------------- server/process.h | 2 + server/ptrace.c | 163 +++++++++++++++++++++++++++++++++++++++++++++++++++++- server/thread.c | 29 ---------- server/thread.h | 4 + 5 files changed, 165 insertions(+), 164 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=cb70931f6758a6bd8ff…

1 0

Mike McCormack : msi: Use a debug channel to turn on transform debugging.
by Alexandre Julliard 07 Apr '06

07 Apr '06

Module: wine Branch: refs/heads/master Commit: 819815d66c2244dc837834171839bbdb47b7f116 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=819815d66c2244dc8378341… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Apr 7 20:40:12 2006 +0900 msi: Use a debug channel to turn on transform debugging. --- dlls/msi/table.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 167dd81..ac6b824 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1604,13 +1604,12 @@ static MSIRECORD *msi_get_transform_reco USHORT mask = *rawdata++; MSICOLUMNINFO *columns = tv->columns; MSIRECORD *rec; - const int debug_transform = 0; rec = MSI_CreateRecord( tv->num_cols ); if( !rec ) return rec; - if( debug_transform ) MESSAGE("row -> "); + TRACE("row -> "); for( i=0; i<tv->num_cols; i++ ) { UINT n = bytes_per_column( &columns[i] ); @@ -1630,20 +1629,20 @@ static MSIRECORD *msi_get_transform_reco { LPCWSTR sval = msi_string_lookup_id( st, val ); MSI_RecordSetStringW( rec, i+1, sval ); - if( debug_transform ) MESSAGE("[%s]", debugstr_w(sval)); + TRACE("[%s]", debugstr_w(sval)); } else { val ^= 0x8000; MSI_RecordSetInteger( rec, i+1, val ); - if( debug_transform) MESSAGE("[0x%04x]", val ); + TRACE("[0x%04x]", val ); } break; case 4: val = rawdata[ofs] + (rawdata[ofs + 1]<<16); /* val ^= 0x80000000; */ MSI_RecordSetInteger( rec, i+1, val ); - if( debug_transform ) MESSAGE("[0x%08x]", val ); + TRACE("[0x%08x]", val ); break; default: ERR("oops - unknown column width %d\n", n); @@ -1651,7 +1650,7 @@ static MSIRECORD *msi_get_transform_reco } ofs += n/2; } - if( debug_transform) MESSAGE("\n"); + TRACE("\n"); return rec; } @@ -1659,20 +1658,18 @@ static void dump_record( MSIRECORD *rec { UINT i, n; - MESSAGE("row -> "); n = MSI_RecordGetFieldCount( rec ); for( i=1; i<=n; i++ ) { LPCWSTR sval = MSI_RecordGetString( rec, i ); if( MSI_RecordIsNull( rec, i ) ) - MESSAGE("[]"); + TRACE("row -> []\n"); else if( (sval = MSI_RecordGetString( rec, i )) ) - MESSAGE("[%s]", debugstr_w(sval)); + TRACE("row -> [%s]\n", debugstr_w(sval)); else - MESSAGE("[0x%08x]", MSI_RecordGetInteger( rec, i ) ); + TRACE("row -> [0x%08x]\n", MSI_RecordGetInteger( rec, i ) ); } - MESSAGE("\n"); } static void dump_table( string_table *st, USHORT *rawdata, UINT rawsize ) @@ -1788,7 +1785,6 @@ static UINT msi_table_load_transform( MS MSITABLEVIEW *tv = NULL; UINT r, n, sz, i, mask; MSIRECORD *rec = NULL; - const int debug_transform = 0; TRACE("%p %p %p %s\n", db, stg, st, debugstr_w(name) ); @@ -1862,20 +1858,20 @@ static UINT msi_table_load_transform( MS if( rawdata[n] & 1) { - if( debug_transform ) MESSAGE("insert [%d]: ", row); + TRACE("insert [%d]: ", row); TABLE_insert_row( &tv->view, rec ); } else if( mask & 0xff ) { - if( debug_transform ) MESSAGE("modify [%d]: ", row); + TRACE("modify [%d]: ", row); msi_table_modify_row( tv, rec, row, mask ); } else { - if( debug_transform ) MESSAGE("delete [%d]: ", row); + TRACE("delete [%d]: ", row); msi_delete_row( tv, row ); } - if( debug_transform ) dump_record( rec ); + if( TRACE_ON(msidb) ) dump_record( rec ); msiobj_release( &rec->hdr ); }

1 0

Gerald Pfeifer : gdi: Also initialize a variable in the failure case.
by Alexandre Julliard 07 Apr '06

07 Apr '06

Module: wine Branch: refs/heads/master Commit: ac6d4f7e946140693b68d9af09109de63cd45d04 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac6d4f7e946140693b68d9a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Apr 7 07:52:22 2006 +0200 gdi: Also initialize a variable in the failure case. --- dlls/gdi/tests/bitmap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/tests/bitmap.c b/dlls/gdi/tests/bitmap.c index 3fa2ee1..3c410a0 100644 --- a/dlls/gdi/tests/bitmap.c +++ b/dlls/gdi/tests/bitmap.c @@ -232,6 +232,7 @@ static INT DIB_GetWidthBytes( int width, case 32: words = width; break; default: + words=0; trace("Unknown depth %d, please report.\n", bpp ); assert(0); break;

1 0

James Hawkins : advpack: Add a few more tests for SetPerUserSecValues.
by Alexandre Julliard 07 Apr '06

07 Apr '06

Module: wine Branch: refs/heads/master Commit: d7199a483616b83cbfa7e60d821e94147cb3fc16 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d7199a483616b83cbfa7e60… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Apr 7 08:30:21 2006 -0500 advpack: Add a few more tests for SetPerUserSecValues. --- dlls/advpack/tests/advpack.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index 15cf3fc..0ff8bb9 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -425,7 +425,6 @@ static void setperusersecvalues_test() HRESULT hr; HKEY guid; - lstrcpy(peruser.szGUID, "guid"); lstrcpy(peruser.szDispName, "displayname"); lstrcpy(peruser.szLocale, "locale"); lstrcpy(peruser.szStub, "stub"); @@ -434,7 +433,25 @@ static void setperusersecvalues_test() peruser.dwIsInstalled = 1; peruser.bRollback = FALSE; + /* try a NULL pPerUser */ + hr = pSetPerUserSecValues(NULL); + todo_wine + { + ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); + } + ok(!OPEN_GUID_KEY(), "Expected guid key to not exist\n"); + + /* at the very least, szGUID must be valid */ + peruser.szGUID[0] = '\0'; + hr = pSetPerUserSecValues(&peruser); + todo_wine + { + ok(hr == S_OK, "Expected S_OK, got %ld\n", hr); + } + ok(!OPEN_GUID_KEY(), "Expected guid key to not exist\n"); + /* set initial values */ + lstrcpy(peruser.szGUID, "guid"); hr = pSetPerUserSecValues(&peruser); todo_wine {

1 0

Alexandre Julliard : server: Get rid of alignment requirements in write_process_memory request.
by Alexandre Julliard 07 Apr '06

07 Apr '06

Module: wine Branch: refs/heads/master Commit: 959bbf8b757eab6c0651c5683b1bf7cb3b8f33d2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=959bbf8b757eab6c0651c56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 7 18:41:58 2006 +0200 server: Get rid of alignment requirements in write_process_memory request. All the alignment handling is now done in the write_process_memory function inside the server. --- dlls/ntdll/virtual.c | 21 +--------------- include/wine/server_protocol.h | 4 +-- server/process.c | 54 ++++++++++++++++++++++++---------------- server/protocol.def | 4 +-- server/trace.c | 2 - 5 files changed, 36 insertions(+), 49 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 17f9081..ace9abf 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1953,32 +1953,13 @@ NTSTATUS WINAPI NtReadVirtualMemory( HAN NTSTATUS WINAPI NtWriteVirtualMemory( HANDLE process, void *addr, const void *buffer, SIZE_T size, SIZE_T *bytes_written ) { - static const unsigned int zero; - SIZE_T first_offset, last_offset, first_mask, last_mask; NTSTATUS status; - if (!size) return STATUS_INVALID_PARAMETER; - - /* compute the mask for the first int */ - first_mask = ~0; - first_offset = (ULONG_PTR)addr % sizeof(int); - memset( &first_mask, 0, first_offset ); - - /* compute the mask for the last int */ - last_offset = (size + first_offset) % sizeof(int); - last_mask = 0; - memset( &last_mask, 0xff, last_offset ? last_offset : sizeof(int) ); - SERVER_START_REQ( write_process_memory ) { req->handle = process; - req->addr = (char *)addr - first_offset; - req->first_mask = first_mask; - req->last_mask = last_mask; - if (first_offset) wine_server_add_data( req, &zero, first_offset ); + req->addr = addr; wine_server_add_data( req, buffer, size ); - if (last_offset) wine_server_add_data( req, &zero, sizeof(int) - last_offset ); - if ((status = wine_server_call( req ))) size = 0; } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 95587cd..a20e7e0 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1691,8 +1691,6 @@ struct write_process_memory_request struct request_header __header; obj_handle_t handle; void* addr; - unsigned int first_mask; - unsigned int last_mask; /* VARARG(data,bytes); */ }; struct write_process_memory_reply @@ -4361,6 +4359,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; }; -#define SERVER_PROTOCOL_VERSION 231 +#define SERVER_PROTOCOL_VERSION 232 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index fc47cf1..2b605b2 100644 --- a/server/process.c +++ b/server/process.c @@ -752,21 +752,34 @@ static int check_process_write_access( s } /* write data to a process memory space */ -/* len is the total size (in ints), max is the size we can actually read from the input buffer */ -/* we check the total size for write permissions */ -static int write_process_memory( struct process *process, int *addr, size_t len, - unsigned int first_mask, unsigned int last_mask, const int *src ) +static int write_process_memory( struct process *process, void *ptr, size_t size, const char *src ) { struct thread *thread = get_process_first_thread( process ); - int ret = 0; - - assert( !((unsigned int)addr % sizeof(int) )); /* address must be aligned */ + int ret = 0, data = 0; + size_t len; + int *addr; + unsigned int first_mask, first_offset, last_mask, last_offset; if (!thread) /* process is dead */ { set_error( STATUS_ACCESS_DENIED ); return 0; } + + /* compute the mask for the first int */ + first_mask = ~0; + first_offset = (unsigned long)ptr % sizeof(int); + memset( &first_mask, 0, first_offset ); + + /* compute the mask for the last int */ + last_offset = (size + first_offset) % sizeof(int); + if (!last_offset) last_offset = sizeof(int); + last_mask = 0; + memset( &last_mask, 0xff, last_offset ); + + addr = (int *)((char *)ptr - first_offset); + len = (size + first_offset + sizeof(int) - 1) / sizeof(int); + if (suspend_for_ptrace( thread )) { if (!check_process_write_access( thread, addr, len )) @@ -777,19 +790,25 @@ static int write_process_memory( struct /* first word is special */ if (len > 1) { - if (write_thread_int( thread, addr++, *src++, first_mask ) == -1) goto done; + memcpy( (char *)&data + first_offset, src, sizeof(int) - first_offset ); + src += sizeof(int) - first_offset; + if (write_thread_int( thread, addr++, data, first_mask ) == -1) goto done; + first_offset = 0; len--; } else last_mask &= first_mask; while (len > 1) { - if (write_thread_int( thread, addr++, *src++, ~0 ) == -1) goto done; + memcpy( &data, src, sizeof(int) ); + src += sizeof(int); + if (write_thread_int( thread, addr++, data, ~0 ) == -1) goto done; len--; } /* last word is special too */ - if (write_thread_int( thread, addr, *src, last_mask ) == -1) goto done; + memcpy( (char *)&data + first_offset, src, last_offset - first_offset ); + if (write_thread_int( thread, addr, data, last_mask ) == -1) goto done; ret = 1; done: @@ -801,12 +820,10 @@ static int write_process_memory( struct /* set the debugged flag in the process PEB */ int set_process_debug_flag( struct process *process, int flag ) { - int mask = 0, data = 0; + char data = (flag != 0); /* BeingDebugged flag is the byte at offset 2 in the PEB */ - memset( (char *)&mask + 2, 0xff, 1 ); - memset( (char *)&data + 2, flag, 1 ); - return write_process_memory( process, process->peb, 1, mask, mask, &data ); + return write_process_memory( process, (char *)process->peb + 2, 1, &data ); } /* take a snapshot of currently running processes */ @@ -1080,13 +1097,8 @@ DECL_HANDLER(write_process_memory) if ((process = get_process_from_handle( req->handle, PROCESS_VM_WRITE ))) { size_t len = get_req_data_size(); - if ((len % sizeof(int)) || ((unsigned int)req->addr % sizeof(int))) - set_error( STATUS_INVALID_PARAMETER ); - else - { - if (len) write_process_memory( process, req->addr, len / sizeof(int), - req->first_mask, req->last_mask, get_req_data() ); - } + if (len) write_process_memory( process, req->addr, len, get_req_data() ); + else set_error( STATUS_INVALID_PARAMETER ); release_object( process ); } } diff --git a/server/protocol.def b/server/protocol.def index 5db269a..ef9acb1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1239,9 +1239,7 @@ enum char_info_mode /* Write data to a process address space */ @REQ(write_process_memory) obj_handle_t handle; /* process handle */ - void* addr; /* addr to write to (must be int-aligned) */ - unsigned int first_mask; /* mask for first word */ - unsigned int last_mask; /* mask for last word */ + void* addr; /* addr to write to */ VARARG(data,bytes); /* data to write */ @END diff --git a/server/trace.c b/server/trace.c index 4b567f9..350b2ac 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1661,8 +1661,6 @@ static void dump_write_process_memory_re { fprintf( stderr, " handle=%p,", req->handle ); fprintf( stderr, " addr=%p,", req->addr ); - fprintf( stderr, " first_mask=%08x,", req->first_mask ); - fprintf( stderr, " last_mask=%08x,", req->last_mask ); fprintf( stderr, " data=" ); dump_varargs_bytes( cur_size ); }

1 0

Alexandre Julliard : server: Hide assumptions about alignment inside the read_process_memory function.
by Alexandre Julliard 07 Apr '06

07 Apr '06

Module: wine Branch: refs/heads/master Commit: 0b492c708f47484207c6e9b345e4ba7ad716125e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0b492c708f47484207c6e9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 7 19:43:44 2006 +0200 server: Hide assumptions about alignment inside the read_process_memory function. --- server/process.c | 51 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 34 insertions(+), 17 deletions(-) diff --git a/server/process.c b/server/process.c index 2b605b2..269f29b 100644 --- a/server/process.c +++ b/server/process.c @@ -709,27 +709,50 @@ void enum_processes( int (*cb)(struct pr } } - /* read data from a process memory space */ -/* len is the total size (in ints) */ -static int read_process_memory( struct process *process, const int *addr, size_t len, int *dest ) +static int read_process_memory( struct process *process, const void *ptr, size_t size, char *dest ) { struct thread *thread = get_process_first_thread( process ); - - assert( !((unsigned int)addr % sizeof(int)) ); /* address must be aligned */ + unsigned int first_offset, last_offset, len; + int data, *addr; if (!thread) /* process is dead */ { set_error( STATUS_ACCESS_DENIED ); return 0; } + + first_offset = (unsigned long)ptr % sizeof(int); + last_offset = (size + first_offset) % sizeof(int); + if (!last_offset) last_offset = sizeof(int); + + addr = (int *)((char *)ptr - first_offset); + len = (size + first_offset + sizeof(int) - 1) / sizeof(int); + if (suspend_for_ptrace( thread )) { - while (len > 0) + if (len > 1) { - if (read_thread_int( thread, addr++, dest++ ) == -1) break; + if (read_thread_int( thread, addr++, &data ) == -1) goto done; + memcpy( dest, (char *)&data + first_offset, sizeof(int) - first_offset ); + dest += sizeof(int) - first_offset; + first_offset = 0; + len--; + } + + while (len > 1) + { + if (read_thread_int( thread, addr++, &data ) == -1) goto done; + memcpy( dest, &data, sizeof(int) ); + dest += sizeof(int); len--; } + + if (read_thread_int( thread, addr++, &data ) == -1) goto done; + memcpy( dest, (char *)&data + first_offset, last_offset - first_offset ); + len--; + + done: resume_after_ptrace( thread ); } return !len; @@ -1071,19 +1094,13 @@ DECL_HANDLER(read_process_memory) if (len) { - unsigned int start_offset = (unsigned int)req->addr % sizeof(int); - unsigned int nb_ints = (len + start_offset + sizeof(int) - 1) / sizeof(int); - const int *start = (int *)((char *)req->addr - start_offset); - int *buffer = mem_alloc( nb_ints * sizeof(int) ); + char *buffer = mem_alloc( len ); if (buffer) { - if (read_process_memory( process, start, nb_ints, buffer )) - { - /* move start of requested data to start of buffer */ - if (start_offset) memmove( buffer, (char *)buffer + start_offset, len ); + if (read_process_memory( process, req->addr, len, buffer )) set_reply_data_ptr( buffer, len ); - } - else free( buffer ); + else + free( buffer ); } } release_object( process );

1 0

Stefan Dösinger : wined3d: Allow the inclusion of the wined3d headers when the ddraw headers are included .
by Alexandre Julliard 07 Apr '06

07 Apr '06

Module: wine Branch: refs/heads/master Commit: 0c5a0f244d5007c9bb58feeab04601496984de35 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0c5a0f244d5007c9bb58fee… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Fri Apr 7 13:25:45 2006 +0200 wined3d: Allow the inclusion of the wined3d headers when the ddraw headers are included. --- include/wine/wined3d_interface.h | 4 ++-- include/wine/wined3d_types.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 264e42a..2037fc8 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -27,8 +27,8 @@ # error You must include config.h to use this header #endif -#if !defined( __WINE_D3D8_H ) && !defined( __WINE_D3D9_H ) -# error You must include d3d8.h or d3d9.h header to use this header +#if !defined( __WINE_D3D_H ) && !defined( __WINE_D3D8_H ) && !defined( __WINE_D3D9_H ) +# error You must include d3d.h, d3d8.h or d3d9.h header to use this header #endif #include "wined3d_types.h" diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 02fc7fb..88132e4 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -26,8 +26,8 @@ #define __WINE_WINED3D_TYPES_H /* TODO: remove the dependency on d3d9 or d3d8 */ -#if !defined( __WINE_D3D8_H ) && !defined( __WINE_D3D9_H ) -# error You must include d3d8.h or d3d9.h header to use this header +#if !defined( __WINE_D3D_H ) && !defined( __WINE_D3D8_H ) && !defined( __WINE_D3D9_H ) +# error You must include d3d.h, d3d8.h or d3d9.h header to use this header #endif #define WINED3D_VSHADER_MAX_CONSTANTS 96

1 0