June 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : rpcrt4: Return the stack size from the ObjectStubless function so that the thunks are independent from the number of arguments .
by Alexandre Julliard June 2, 2009

June 2, 2009

Module: wine Branch: master Commit: ce3c45934baf09d7d2d917322ba2ca88fdfcaa68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce3c45934baf09d7d2d917322… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 20:52:40 2009 +0200 rpcrt4: Return the stack size from the ObjectStubless function so that the thunks are independent from the number of arguments. --- dlls/rpcrt4/cproxy.c | 60 +++++++++++++++++++++++++------------------------- 1 files changed, 30 insertions(+), 30 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index f5fb6f3..22af343 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -20,6 +20,9 @@ * TODO: Handle non-i386 architectures */ +#include "config.h" +#include "wine/port.h" + #include <stdarg.h> #define COBJMACROS @@ -65,50 +68,50 @@ static const IRpcProxyBufferVtbl StdProxy_Vtbl; struct StublessThunk { BYTE push; DWORD index; - BYTE call; + BYTE jmp; LONG handler; - BYTE ret; - WORD bytes; - BYTE pad[3]; }; #include "poppack.h" -/* adjust the stack size since we don't use Windows's method */ -#define STACK_ADJUST sizeof(DWORD) - -#define FILL_STUBLESS(x,idx,stk) \ +#define FILL_STUBLESS(x,idx) \ x->push = 0x68; /* pushl [immediate] */ \ x->index = (idx); \ - x->call = 0xe8; /* call [near] */ \ - x->handler = (char*)ObjectStubless - (char*)&x->ret; \ - x->ret = 0xc2; /* ret [immediate] */ \ - x->bytes = stk; \ - x->pad[0] = 0x8d; /* leal (%esi),%esi */ \ - x->pad[1] = 0x76; \ - x->pad[2] = 0x00; - -static HRESULT WINAPI ObjectStubless(DWORD index) + x->jmp = 0xe9; /* jmp */ \ + x->handler = (char*)call_stubless_func - (char*)(&x->handler + 1); + +extern void call_stubless_func(void); +__ASM_GLOBAL_FUNC(call_stubless_func, + "pushl %esp\n\t" /* pointer to index */ + "call " __ASM_NAME("ObjectStubless") "\n\t" + "popl %edx\n\t" /* args size */ + "movl (%esp),%ecx\n\t" /* return address */ + "addl %edx,%esp\n\t" + "jmp *%ecx" ); + +HRESULT WINAPI ObjectStubless(DWORD *args) { - char *args = (char*)(&index + 2); - LPVOID iface = *(LPVOID*)args; + DWORD index = args[0]; + LPVOID iface = (LPVOID)args[2]; - ICOM_THIS_MULTI(StdProxyImpl,PVtbl,iface); + ICOM_THIS_MULTI(StdProxyImpl,PVtbl,iface); + + const MIDL_STUBLESS_PROXY_INFO *stubless = This->stubless; + const PFORMAT_STRING fs = stubless->ProcFormatString + stubless->FormatStringOffset[index]; - PFORMAT_STRING fs = This->stubless->ProcFormatString + This->stubless->FormatStringOffset[index]; - unsigned bytes = *(const WORD*)(fs+8) - STACK_ADJUST; - TRACE("(%p)->(%d)([%d bytes]) ret=%08x\n", iface, index, bytes, *(DWORD*)(args+bytes)); + /* store bytes to remove from stack */ + args[0] = *(const WORD*)(fs + 8); + TRACE("(%p)->(%d)([%d bytes]) ret=%08x\n", iface, index, args[0], args[1]); - return NdrClientCall2(This->stubless->pStubDesc, fs, args); + return NdrClientCall2(stubless->pStubDesc, fs, args + 2); } #else /* __i386__ */ /* can't do that on this arch */ struct StublessThunk { int dummy; }; -#define FILL_STUBLESS(x,idx,stk) \ +#define FILL_STUBLESS(x,idx) \ ERR("stubless proxies are not supported on this architecture\n"); -#define STACK_ADJUST 0 #endif /* __i386__ */ @@ -157,10 +160,7 @@ HRESULT StdProxy_Construct(REFIID riid, for (i=0; i<count; i++) { struct StublessThunk *thunk = &This->thunks[i]; if (vtbl->Vtbl[i] == (LPVOID)-1) { - PFORMAT_STRING fs = stubless->ProcFormatString + stubless->FormatStringOffset[i]; - unsigned bytes = *(const WORD*)(fs+8) - STACK_ADJUST; - TRACE("method %d: stacksize=%d\n", i, bytes); - FILL_STUBLESS(thunk, i, bytes) + FILL_STUBLESS(thunk, i) This->PVtbl[i] = thunk; } else {

1 0

Alexandre Julliard : rpcrt4: Change the allocation of delegated stub methods so that we never need to free them .
by Alexandre Julliard June 2, 2009

June 2, 2009

Module: wine Branch: master Commit: 0357ad0894a61071d3304d8976b766fdc9cec892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0357ad0894a61071d3304d897… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 16:40:44 2009 +0200 rpcrt4: Change the allocation of delegated stub methods so that we never need to free them. --- dlls/rpcrt4/cstub.c | 84 +++++++++++++++++++++++++++++--------------------- 1 files changed, 49 insertions(+), 35 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index aed1432..b9ff153 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -113,7 +113,6 @@ typedef struct { DWORD ref; DWORD size; - void **methods; IUnknownVtbl vtbl; /* remaining entries in vtbl */ } ref_counted_vtbl; @@ -161,45 +160,67 @@ typedef struct { } vtbl_method_t; #include "poppack.h" -static void fill_table(IUnknownVtbl *vtbl, void **methods, DWORD num) +#define BLOCK_SIZE 1024 +#define MAX_BLOCKS 64 /* 64k methods should be enough for anybody */ + +static const vtbl_method_t *method_blocks[MAX_BLOCKS]; + +static const vtbl_method_t *allocate_block( unsigned int num ) { - vtbl_method_t *method; - void **entry; - DWORD i; + unsigned int i; + vtbl_method_t *prev, *block; + + block = VirtualAlloc( NULL, BLOCK_SIZE * sizeof(*block), + MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE ); + if (!block) return NULL; + + for (i = 0; i < BLOCK_SIZE; i++) + { + block[i].mov1 = 0x0424448b; + block[i].mov2 = 0x408b; + block[i].sixteen = 0x10; + block[i].mov3 = 0x04244489; + block[i].mov4 = 0x008b; + block[i].mov5 = 0x808b; + block[i].offset = (BLOCK_SIZE * num + i + 3) << 2; + block[i].jmp = 0xe0ff; + block[i].pad[0] = 0x8d; + block[i].pad[1] = 0x76; + block[i].pad[2] = 0x00; + } + VirtualProtect( block, BLOCK_SIZE * sizeof(*block), PAGE_EXECUTE_READ, NULL ); + prev = InterlockedCompareExchangePointer( (void **)&method_blocks[num], block, NULL ); + if (prev) /* someone beat us to it */ + { + VirtualFree( block, 0, MEM_RELEASE ); + block = prev; + } + return block; +} + +static BOOL fill_delegated_stub_table(IUnknownVtbl *vtbl, DWORD num) +{ + const void **entry = (const void **)(vtbl + 1); + DWORD i, j; vtbl->QueryInterface = delegating_QueryInterface; vtbl->AddRef = delegating_AddRef; vtbl->Release = delegating_Release; - - method = (vtbl_method_t*)methods; - entry = (void**)(vtbl + 1); - - for(i = 3; i < num; i++) + for (i = 0; i < (num - 3 + BLOCK_SIZE - 1) / BLOCK_SIZE; i++) { - *entry = method; - method->mov1 = 0x0424448b; - method->mov2 = 0x408b; - method->sixteen = 0x10; - method->mov3 = 0x04244489; - method->mov4 = 0x008b; - method->mov5 = 0x808b; - method->offset = i << 2; - method->jmp = 0xe0ff; - method->pad[0] = 0x8d; - method->pad[1] = 0x76; - method->pad[2] = 0x00; - - method++; - entry++; + const vtbl_method_t *block = method_blocks[i]; + if (!block && !(block = allocate_block( i ))) return FALSE; + for (j = 0; j < BLOCK_SIZE && j < num - 3 - i * BLOCK_SIZE; j++) *entry++ = &block[j]; } + return TRUE; } #else /* __i386__ */ -typedef struct {int dummy;} vtbl_method_t; -static void fill_table(IUnknownVtbl *vtbl, void **methods, DWORD num) +static BOOL fill_delegated_stub_table(IUnknownVtbl *vtbl, DWORD num) { ERR("delegated stubs are not supported on this architecture\n"); + return FALSE; } #endif /* __i386__ */ @@ -216,21 +237,15 @@ void create_delegating_vtbl(DWORD num_methods) EnterCriticalSection(&delegating_vtbl_section); if(!current_vtbl.table || num_methods > current_vtbl.table->size) { - DWORD size; - DWORD old_protect; if(current_vtbl.table && current_vtbl.table->ref == 0) { TRACE("freeing old table\n"); - VirtualFree(current_vtbl.table->methods, 0, MEM_RELEASE); HeapFree(GetProcessHeap(), 0, current_vtbl.table); } - size = (num_methods - 3) * sizeof(vtbl_method_t); current_vtbl.table = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(ref_counted_vtbl, vtbl) + num_methods * sizeof(void*)); current_vtbl.table->ref = 0; current_vtbl.table->size = num_methods; - current_vtbl.table->methods = VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE); - fill_table(&current_vtbl.table->vtbl, current_vtbl.table->methods, num_methods); - VirtualProtect(current_vtbl.table->methods, size, PAGE_EXECUTE_READ, &old_protect); + fill_delegated_stub_table(&current_vtbl.table->vtbl, num_methods); } LeaveCriticalSection(&delegating_vtbl_section); } @@ -256,7 +271,6 @@ static void release_delegating_vtbl(IUnknownVtbl *vtbl) if(table->ref == 0 && table != current_vtbl.table) { TRACE("... and we're not current so free'ing\n"); - VirtualFree(current_vtbl.table->methods, 0, MEM_RELEASE); HeapFree(GetProcessHeap(), 0, table); } LeaveCriticalSection(&delegating_vtbl_section);

1 0

Alexandre Julliard : rpcrt4: Allocate the delegated stubs vtbl only once it is really needed.
by Alexandre Julliard June 2, 2009

June 2, 2009

Module: wine Branch: master Commit: 6f4902380278fbcdedc8d78228cf3b41fc5429e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4902380278fbcdedc8d7822… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 16:55:14 2009 +0200 rpcrt4: Allocate the delegated stubs vtbl only once it is really needed. --- dlls/rpcrt4/cpsf.c | 8 +------ dlls/rpcrt4/cpsf.h | 2 - dlls/rpcrt4/cstub.c | 55 ++++++++++++++++++++++++-------------------------- 3 files changed, 27 insertions(+), 38 deletions(-) diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index 9b91466..5d7ffe7 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -160,7 +160,6 @@ HRESULT WINAPI NdrDllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv, *ppv = NULL; if (!pPSFactoryBuffer->lpVtbl) { const ProxyFileInfo **pProxyFileList2; - DWORD max_delegating_vtbl_size = 0; pPSFactoryBuffer->lpVtbl = &CStdPSFactory_Vtbl; pPSFactoryBuffer->RefCount = 0; pPSFactoryBuffer->pProxyFileList = pProxyFileList; @@ -173,19 +172,14 @@ HRESULT WINAPI NdrDllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv, void **pRpcStubVtbl = (void **)&(*pProxyFileList2)->pStubVtblList[i]->Vtbl; unsigned int j; - if ((*pProxyFileList2)->pDelegatedIIDs && (*pProxyFileList2)->pDelegatedIIDs[i]) { + if ((*pProxyFileList2)->pDelegatedIIDs && (*pProxyFileList2)->pDelegatedIIDs[i]) pSrcRpcStubVtbl = (void * const *)&CStdStubBuffer_Delegating_Vtbl; - if ((*pProxyFileList2)->pStubVtblList[i]->header.DispatchTableCount > max_delegating_vtbl_size) - max_delegating_vtbl_size = (*pProxyFileList2)->pStubVtblList[i]->header.DispatchTableCount; - } for (j = 0; j < sizeof(IRpcStubBufferVtbl)/sizeof(void *); j++) if (!pRpcStubVtbl[j]) pRpcStubVtbl[j] = pSrcRpcStubVtbl[j]; } } - if(max_delegating_vtbl_size > 0) - create_delegating_vtbl(max_delegating_vtbl_size); } if (pclsid && IsEqualGUID(rclsid, pclsid)) return IPSFactoryBuffer_QueryInterface((LPPSFACTORYBUFFER)pPSFactoryBuffer, iid, ppv); diff --git a/dlls/rpcrt4/cpsf.h b/dlls/rpcrt4/cpsf.h index 9b401b8..58645fb 100644 --- a/dlls/rpcrt4/cpsf.h +++ b/dlls/rpcrt4/cpsf.h @@ -38,8 +38,6 @@ const MIDL_SERVER_INFO *CStdStubBuffer_GetServerInfo(IRpcStubBuffer *iface); const IRpcStubBufferVtbl CStdStubBuffer_Vtbl; const IRpcStubBufferVtbl CStdStubBuffer_Delegating_Vtbl; -void create_delegating_vtbl(DWORD num_methods); - HRESULT create_stub(REFIID iid, IUnknown *pUnk, IRpcStubBuffer **ppstub); #endif /* __WINE_CPSF_H */ diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index b9ff153..8e947f2 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -117,10 +117,7 @@ typedef struct /* remaining entries in vtbl */ } ref_counted_vtbl; -static struct -{ - ref_counted_vtbl *table; -} current_vtbl; +static ref_counted_vtbl *current_vtbl; static HRESULT WINAPI delegating_QueryInterface(IUnknown *pUnk, REFIID iid, void **ppv) @@ -225,38 +222,38 @@ static BOOL fill_delegated_stub_table(IUnknownVtbl *vtbl, DWORD num) #endif /* __i386__ */ -void create_delegating_vtbl(DWORD num_methods) +static IUnknownVtbl *get_delegating_vtbl(DWORD num_methods) { - TRACE("%d\n", num_methods); - if(num_methods <= 3) - { - ERR("should have more than %d methods\n", num_methods); - return; - } + IUnknownVtbl *ret; + + if (num_methods < 256) num_methods = 256; /* avoid frequent reallocations */ EnterCriticalSection(&delegating_vtbl_section); - if(!current_vtbl.table || num_methods > current_vtbl.table->size) + + if(!current_vtbl || num_methods > current_vtbl->size) { - if(current_vtbl.table && current_vtbl.table->ref == 0) + ref_counted_vtbl *table = HeapAlloc(GetProcessHeap(), 0, + FIELD_OFFSET(ref_counted_vtbl, vtbl) + num_methods * sizeof(void*)); + if (!table) + { + LeaveCriticalSection(&delegating_vtbl_section); + return NULL; + } + + table->ref = 0; + table->size = num_methods; + fill_delegated_stub_table(&table->vtbl, num_methods); + + if (current_vtbl && current_vtbl->ref == 0) { TRACE("freeing old table\n"); - HeapFree(GetProcessHeap(), 0, current_vtbl.table); + HeapFree(GetProcessHeap(), 0, current_vtbl); } - current_vtbl.table = HeapAlloc(GetProcessHeap(), 0, FIELD_OFFSET(ref_counted_vtbl, vtbl) + num_methods * sizeof(void*)); - current_vtbl.table->ref = 0; - current_vtbl.table->size = num_methods; - fill_delegated_stub_table(&current_vtbl.table->vtbl, num_methods); + current_vtbl = table; } - LeaveCriticalSection(&delegating_vtbl_section); -} -static IUnknownVtbl *get_delegating_vtbl(void) -{ - IUnknownVtbl *ret; - - EnterCriticalSection(&delegating_vtbl_section); - current_vtbl.table->ref++; - ret = &current_vtbl.table->vtbl; + current_vtbl->ref++; + ret = &current_vtbl->vtbl; LeaveCriticalSection(&delegating_vtbl_section); return ret; } @@ -268,7 +265,7 @@ static void release_delegating_vtbl(IUnknownVtbl *vtbl) EnterCriticalSection(&delegating_vtbl_section); table->ref--; TRACE("ref now %d\n", table->ref); - if(table->ref == 0 && table != current_vtbl.table) + if(table->ref == 0 && table != current_vtbl) { TRACE("... and we're not current so free'ing\n"); HeapFree(GetProcessHeap(), 0, table); @@ -308,7 +305,7 @@ HRESULT CStdStubBuffer_Delegating_Construct(REFIID riid, return E_OUTOFMEMORY; } - This->base_obj = get_delegating_vtbl(); + This->base_obj = get_delegating_vtbl( vtbl->header.DispatchTableCount ); r = create_stub(delegating_iid, (IUnknown*)&This->base_obj, &This->base_stub); if(FAILED(r)) {

1 0

Rico Schüller : d3d10: Replace a few more unknown in parse_fx10.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 3838f4b21a044884282c4e3129b1873b3d2f3656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3838f4b21a044884282c4e312… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat May 30 14:13:19 2009 +0200 d3d10: Replace a few more unknown in parse_fx10. --- dlls/d3d10/d3d10_private.h | 2 ++ dlls/d3d10/effect.c | 23 +++++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index fc8e932..c5a74aa 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -93,6 +93,8 @@ struct d3d10_effect DWORD version; DWORD localbuffers_count; DWORD localobjects_count; + DWORD sharedbuffers_count; + DWORD sharedobjects_count; DWORD technique_count; DWORD index_offset; DWORD dephstencilstate_count; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index eff753f..8316db8 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -462,12 +462,15 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->localobjects_count); TRACE("Localobjects count: %u\n", e->localobjects_count); + read_dword(&ptr, &e->sharedbuffers_count); + TRACE("Sharedbuffers count: %u\n", e->sharedbuffers_count); + + /* Number of variables in shared buffers? */ read_dword(&ptr, &unknown); FIXME("Unknown 1: %u\n", unknown); - read_dword(&ptr, &unknown); - FIXME("Unknown 2: %u\n", unknown); - read_dword(&ptr, &unknown); - FIXME("Unknown 3: %u\n", unknown); + + read_dword(&ptr, &e->sharedobjects_count); + TRACE("Sharedobjects count: %u\n", e->sharedobjects_count); read_dword(&ptr, &e->technique_count); TRACE("Technique count: %u\n", e->technique_count); @@ -476,9 +479,9 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s TRACE("Index offset: %#x\n", e->index_offset); read_dword(&ptr, &unknown); - FIXME("Unknown 4: %u\n", unknown); + FIXME("Unknown 2: %u\n", unknown); read_dword(&ptr, &unknown); - FIXME("Unknown 5: %u\n", unknown); + FIXME("Unknown 3: %u\n", unknown); read_dword(&ptr, &e->dephstencilstate_count); TRACE("Depthstencilstate count: %u\n", e->dephstencilstate_count); @@ -493,15 +496,15 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s TRACE("Samplerstate count: %u\n", e->samplerstate_count); read_dword(&ptr, &unknown); - FIXME("Unknown 6: %u\n", unknown); + FIXME("Unknown 4: %u\n", unknown); read_dword(&ptr, &unknown); - FIXME("Unknown 7: %u\n", unknown); + FIXME("Unknown 5: %u\n", unknown); /* Number of function calls in all passes? */ read_dword(&ptr, &unknown); - FIXME("Unknown 8: %u\n", unknown); + FIXME("Unknown 6: %u\n", unknown); read_dword(&ptr, &unknown); - FIXME("Unknown 9: %u\n", unknown); + FIXME("Unknown 7: %u\n", unknown); return parse_fx10_body(e, ptr, data_size - (ptr - data)); }

1 0

Nicolas Le Cam : winetest: Add option -d to specify tests output directory.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 55b51f3b1e39e962beb513464cfcb4721922a0a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55b51f3b1e39e962beb513464… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sun May 31 13:43:52 2009 +0200 winetest: Add option -d to specify tests output directory. --- programs/winetest/main.c | 37 ++++++++++++++++++++++++------------- 1 files changed, 24 insertions(+), 13 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 381328c..7009ce8 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -612,7 +612,7 @@ extract_test_proc (HMODULE hModule, LPCTSTR lpszType, } static char * -run_tests (char *logname) +run_tests (char *logname, char *outdir) { int i; char *strres, *eol, *nextline; @@ -659,16 +659,22 @@ run_tests (char *logname) report (R_FATAL, "Could not open logfile: %u", GetLastError()); /* try stable path for ZoneAlarm */ - strcpy( tempdir, tmppath ); - strcat( tempdir, "wct" ); - if (!CreateDirectoryA( tempdir, NULL )) - { - if (!GetTempFileNameA( tmppath, "wct", 0, tempdir )) - report (R_FATAL, "Can't name temporary dir (check %%TEMP%%)."); - DeleteFileA( tempdir ); + if (!outdir) { + strcpy( tempdir, tmppath ); + strcat( tempdir, "wct" ); + if (!CreateDirectoryA( tempdir, NULL )) - report (R_FATAL, "Could not create directory: %s", tempdir); + { + if (!GetTempFileNameA( tmppath, "wct", 0, tempdir )) + report (R_FATAL, "Can't name temporary dir (check %%TEMP%%)."); + DeleteFileA( tempdir ); + if (!CreateDirectoryA( tempdir, NULL )) + report (R_FATAL, "Could not create directory: %s", tempdir); + } } + else + strcpy( tempdir, outdir); + report (R_DIR, tempdir); xprintf ("Version 4\n"); @@ -749,7 +755,8 @@ run_tests (char *logname) report (R_STATUS, "Cleaning up"); CloseHandle( logfile ); logfile = 0; - remove_dir (tempdir); + if (!outdir) + remove_dir (tempdir); heap_free(wine_tests); heap_free(curpath); @@ -816,6 +823,7 @@ usage (void) " --help print this message and exit\n" " --version print the build version and exit\n" " -c console mode, no GUI\n" +" -d DIR Use DIR as temp directory (default: %%TEMP%%\\wct)" " -e preserve the environment\n" " -h print this message and exit\n" " -p shutdown when the tests are done\n" @@ -828,7 +836,7 @@ usage (void) int main( int argc, char *argv[] ) { - char *logname = NULL; + char *logname = NULL, *outdir = NULL; const char *extract = NULL; const char *cp, *submit = NULL; int reset_env = 1; @@ -915,6 +923,9 @@ int main( int argc, char *argv[] ) extract_only (extract); break; + case 'd': + outdir = argv[++i]; + break; default: report (R_ERROR, "invalid option: -%c", argv[i][1]); usage (); @@ -953,12 +964,12 @@ int main( int argc, char *argv[] ) } if (!logname) { - logname = run_tests (NULL); + logname = run_tests (NULL, outdir); if (build_id[0] && !nb_filters && report (R_ASK, MB_YESNO, "Do you want to submit the test results?") == IDYES) if (!send_file (logname) && !DeleteFileA(logname)) report (R_WARNING, "Can't remove logfile: %u", GetLastError()); - } else run_tests (logname); + } else run_tests (logname, outdir); report (R_STATUS, "Finished"); } if (poweroff)

1 0

Rico Schüller : d3d10: Improve parse_fx10.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 99a4287f5daefc54a1c179d033575585408fbbcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a4287f5daefc54a1c179d03… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri May 29 23:35:07 2009 +0200 d3d10: Improve parse_fx10. --- dlls/d3d10/d3d10_private.h | 6 ++++++ dlls/d3d10/effect.c | 42 +++++++++++++++++++++++++++--------------- 2 files changed, 33 insertions(+), 15 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 1488b99..fc8e932 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -90,9 +90,15 @@ struct d3d10_effect LONG refcount; ID3D10Device *device; + DWORD version; + DWORD localbuffers_count; + DWORD localobjects_count; DWORD technique_count; DWORD index_offset; + DWORD dephstencilstate_count; DWORD blendstate_count; + DWORD rasterizerstate_count; + DWORD samplerstate_count; struct d3d10_effect_technique *techniques; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index eecf511..eff753f 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -448,19 +448,26 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s const char *ptr = data; DWORD unknown; - /* version info? */ - skip_dword_unknown(&ptr, 2); + /* Compiled target version (e.g. fx_4_0=0xfeff1001, fx_4_1=0xfeff1011). */ + read_dword(&ptr, &e->version); + TRACE("Target: %#x\n", e->version); + read_dword(&ptr, &e->localbuffers_count); + TRACE("Localbuffers count: %u\n", e->localbuffers_count); + + /* Number of variables in local buffers? */ read_dword(&ptr, &unknown); FIXME("Unknown 0: %u\n", unknown); + + read_dword(&ptr, &e->localobjects_count); + TRACE("Localobjects count: %u\n", e->localobjects_count); + read_dword(&ptr, &unknown); FIXME("Unknown 1: %u\n", unknown); read_dword(&ptr, &unknown); FIXME("Unknown 2: %u\n", unknown); read_dword(&ptr, &unknown); FIXME("Unknown 3: %u\n", unknown); - read_dword(&ptr, &unknown); - FIXME("Unknown 4: %u\n", unknown); read_dword(&ptr, &e->technique_count); TRACE("Technique count: %u\n", e->technique_count); @@ -469,27 +476,32 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s TRACE("Index offset: %#x\n", e->index_offset); read_dword(&ptr, &unknown); + FIXME("Unknown 4: %u\n", unknown); + read_dword(&ptr, &unknown); FIXME("Unknown 5: %u\n", unknown); + + read_dword(&ptr, &e->dephstencilstate_count); + TRACE("Depthstencilstate count: %u\n", e->dephstencilstate_count); + + read_dword(&ptr, &e->blendstate_count); + TRACE("Blendstate count: %u\n", e->blendstate_count); + + read_dword(&ptr, &e->rasterizerstate_count); + TRACE("Rasterizerstate count: %u\n", e->rasterizerstate_count); + + read_dword(&ptr, &e->samplerstate_count); + TRACE("Samplerstate count: %u\n", e->samplerstate_count); + read_dword(&ptr, &unknown); FIXME("Unknown 6: %u\n", unknown); read_dword(&ptr, &unknown); FIXME("Unknown 7: %u\n", unknown); - read_dword(&ptr, &e->blendstate_count); - TRACE("Blendstate count: %u\n", e->blendstate_count); - + /* Number of function calls in all passes? */ read_dword(&ptr, &unknown); FIXME("Unknown 8: %u\n", unknown); read_dword(&ptr, &unknown); FIXME("Unknown 9: %u\n", unknown); - read_dword(&ptr, &unknown); - FIXME("Unknown 10: %u\n", unknown); - read_dword(&ptr, &unknown); - FIXME("Unknown 11: %u\n", unknown); - read_dword(&ptr, &unknown); - FIXME("Unknown 12: %u\n", unknown); - read_dword(&ptr, &unknown); - FIXME("Unknown 13: %u\n", unknown); return parse_fx10_body(e, ptr, data_size - (ptr - data)); }

1 0

Nicolas Le Cam : winetest: Only call GetTempPath once.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 62ab6ab1c5847ac0f8765fa66c51d7df24bc82f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62ab6ab1c5847ac0f8765fa66… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Sun May 31 13:33:17 2009 +0200 winetest: Only call GetTempPath once. --- programs/winetest/main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 69496bd..381328c 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -658,9 +658,6 @@ run_tests (char *logname) if (logfile == INVALID_HANDLE_VALUE) report (R_FATAL, "Could not open logfile: %u", GetLastError()); - if (!GetTempPathA( MAX_PATH, tmppath )) - report (R_FATAL, "Can't name temporary dir (check %%TEMP%%)."); - /* try stable path for ZoneAlarm */ strcpy( tempdir, tmppath ); strcat( tempdir, "wct" );

1 0

Alexandre Julliard : user32/tests: Remove tests for internal DDE handle format, we don' t care how the handles are implemented.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 750fcebadbf9e27137dcf21ed2de022feb081a64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=750fcebadbf9e27137dcf21ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 1 14:39:48 2009 +0200 user32/tests: Remove tests for internal DDE handle format, we don't care how the handles are implemented. --- dlls/user32/tests/dde.c | 36 ------------------------------------ 1 files changed, 0 insertions(+), 36 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 840406e..6625837 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1615,12 +1615,6 @@ static void test_DdeCreateDataHandle(void) ok(hdata != NULL, "Expected non-NULL hdata\n"); ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); - ptr = GlobalLock(hdata); - todo_wine - { - ok(ptr == NULL, "Expected NULL, got %p\n", ptr); - } - ptr = DdeAccessData(hdata, &size); ok(ptr != NULL, "Expected non-NULL ptr\n"); ok(size == 260, "Expected 260, got %d\n", size); @@ -1638,12 +1632,6 @@ static void test_DdeCreateDataHandle(void) ok(hdata != NULL, "Expected non-NULL hdata\n"); ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); - ptr = GlobalLock(hdata); - todo_wine - { - ok(ptr == NULL, "Expected NULL, got %p\n", ptr); - } - ptr = DdeAccessData(hdata, &size); ok(ptr != NULL, "Expected non-NULL ptr\n"); ok(size == 0, "Expected 0, got %d\n", size); @@ -1661,12 +1649,6 @@ static void test_DdeCreateDataHandle(void) ok(hdata != NULL, "Expected non-NULL hdata\n"); ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); - ptr = GlobalLock(hdata); - todo_wine - { - ok(ptr == NULL, "Expected NULL, got %p\n", ptr); - } - ptr = DdeAccessData(hdata, &size); ok(ptr != NULL, "Expected non-NULL ptr\n"); ok(size == 262, "Expected 262, got %d\n", size); @@ -1688,12 +1670,6 @@ static void test_DdeCreateDataHandle(void) ok(hdata != NULL, "Expected non-NULL hdata\n"); ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); - ptr = GlobalLock(hdata); - todo_wine - { - ok(ptr == NULL, "Expected NULL, got %p\n", ptr); - } - ptr = DdeAccessData(hdata, &size); ok(ptr != NULL, "Expected non-NULL ptr\n"); ok(!lstrcmpA((LPSTR)ptr, "data"), "Expected data, got %s\n", ptr); @@ -1712,12 +1688,6 @@ static void test_DdeCreateDataHandle(void) ok(hdata != NULL, "Expected non-NULL hdata\n"); ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); - ptr = GlobalLock(hdata); - todo_wine - { - ok(ptr == NULL, "Expected NULL, got %p\n", ptr); - } - ptr = DdeAccessData(hdata, &size); ok(ptr != NULL, "Expected non-NULL ptr\n"); ok(!lstrcmpA((LPSTR)ptr, "data"), "Expected data, got %s\n", ptr); @@ -1736,12 +1706,6 @@ static void test_DdeCreateDataHandle(void) ok(hdata != NULL, "Expected non-NULL hdata\n"); ok(err == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", err); - ptr = GlobalLock(hdata); - todo_wine - { - ok(ptr == NULL, "Expected NULL, got %p\n", ptr); - } - ptr = DdeAccessData(hdata, &size); ok(ptr != NULL, "Expected non-NULL ptr\n"); ok(!lstrcmpA((LPSTR)ptr, "data"), "Expected data, got %s\n", ptr);

1 0

André Hentschel : winedbg: Add German translation.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 426e541ba5ffe64a36c41bf5e6ed9c6c57df9acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=426e541ba5ffe64a36c41bf5e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 31 18:18:33 2009 +0200 winedbg: Add German translation. --- programs/winedbg/rsrc.rc | 1 + programs/winedbg/rsrc_De.rc | 57 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/programs/winedbg/rsrc.rc b/programs/winedbg/rsrc.rc index 745ab61..50c5efb 100644 --- a/programs/winedbg/rsrc.rc +++ b/programs/winedbg/rsrc.rc @@ -23,6 +23,7 @@ #include "resource.h" +#include "rsrc_De.rc" #include "rsrc_En.rc" #include "rsrc_Ko.rc" #include "rsrc_Lt.rc" diff --git a/programs/winedbg/rsrc_De.rc b/programs/winedbg/rsrc_De.rc new file mode 100644 index 0000000..ccc616b --- /dev/null +++ b/programs/winedbg/rsrc_De.rc @@ -0,0 +1,57 @@ +/* + * English Language Support + * + * Copyright 2009 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) + +LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT + +IDM_DEBUG_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Debug", ID_DEBUG + END +END + +IDD_CRASH_DLG DIALOGEX 100, 100, 273, 175 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Programm Fehler" +FONT 8, "Tahoma" +BEGIN + LTEXT "",IDC_STATIC_BG,0,0,273,52,WS_BORDER,0 + LTEXT "Im Programm %s traten schwerwiegende Fehler auf \ + und es muss beendet werden. Wir entschuldigen uns für die Unannehmlichkeit.", + IDC_STATIC_TXT1,27,10,224,30 + LTEXT "Die Ursache kann ein Problem im Programm oder ein Fehler in Wine sein. \ + Sie können unter http://appdb.winehq.org Tipps zum ausführen \ + der Anwendung einholen.\n\n\ + Tritt dieses Problem unter Windows nicht auf und wurde es noch nicht \ + gemeldet, können Sie unter http://bugs.winehq.org einen Eintrag hinterlassen.",IDC_STATIC_TXT2,27,60,224,100 + DEFPUSHBUTTON "Schließen", IDOK, 205, 151, 60, 16, WS_TABSTOP +END + +STRINGTABLE +BEGIN + IDS_AUTO_CAPTION "Wine Programm absturz" + IDS_INVALID_PARAMS "Interne Fehler - ungültige Parameter empfangen" + IDS_UNIDENTIFIED "(unbekannt)" +END + +#pragma code_page(default)

1 0

Andrew Eikum : gdiplus: Stubs for GdipAddPathString and GdipAddPathStringI.
by Alexandre Julliard June 1, 2009

June 1, 2009

Module: wine Branch: master Commit: 8d6ee56119d79529530532c070577d1d4de8f2de URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6ee56119d79529530532c07… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Sun May 31 14:59:23 2009 -0500 gdiplus: Stubs for GdipAddPathString and GdipAddPathStringI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphicspath.c | 12 ++++++++++++ include/gdiplusflat.h | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index dff3cf3..b6d9377 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -29,8 +29,8 @@ @ stdcall GdipAddPathRectangleI(ptr long long long long) @ stdcall GdipAddPathRectangles(ptr ptr long) @ stdcall GdipAddPathRectanglesI(ptr ptr long) -@ stub GdipAddPathString -@ stub GdipAddPathStringI +@ stdcall GdipAddPathString(ptr wstr long ptr long long ptr ptr) +@ stdcall GdipAddPathStringI(ptr wstr long ptr long long ptr ptr) @ stdcall GdipAlloc(long) @ stdcall GdipBeginContainer2(ptr ptr) @ stub GdipBeginContainer diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8ffe531..1375cc3 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -831,6 +831,18 @@ GpStatus WINGDIPAPI GdipAddPathPolygonI(GpPath *path, GDIPCONST GpPoint *points, return status; } +GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFontFamily* family, INT style, REAL emSize, GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat* format) +{ + FIXME("(%p, %p, %d, %p, %d, %f, %p, %p): stub\n", path, string, length, family, style, emSize, layoutRect, format); + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipAddPathStringI(GpPath* path, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFontFamily* family, INT style, REAL emSize, GDIPCONST Rect* layoutRect, GDIPCONST GpStringFormat* format) +{ + FIXME("(%p, %p, %d, %p, %d, %f, %p, %p): stub\n", path, string, length, family, style, emSize, layoutRect, format); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipClonePath(GpPath* path, GpPath **clone) { TRACE("(%p, %p)\n", path, clone); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index a7ee536..c2c96c5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -281,6 +281,8 @@ GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipAddPathRectangleI(GpPath*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipAddPathRectangles(GpPath*,GDIPCONST GpRectF*,INT); GpStatus WINGDIPAPI GdipAddPathRectanglesI(GpPath*,GDIPCONST GpRect*,INT); +GpStatus WINGDIPAPI GdipAddPathString(GpPath*,GDIPCONST WCHAR*,INT,GDIPCONST GpFontFamily*,INT,REAL,GDIPCONST RectF*,GDIPCONST GpStringFormat*); +GpStatus WINGDIPAPI GdipAddPathStringI(GpPath*,GDIPCONST WCHAR*,INT,GDIPCONST GpFontFamily*,INT,REAL,GDIPCONST Rect*,GDIPCONST GpStringFormat*); GpStatus WINGDIPAPI GdipClearPathMarkers(GpPath*); GpStatus WINGDIPAPI GdipClonePath(GpPath*,GpPath**); GpStatus WINGDIPAPI GdipClosePathFigure(GpPath*);

1 0