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

Alexandre Julliard : oleaut32/tests: Fix the tmarshal test on 64-bit.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: 1c75ab091cbeca0d0db2f3fff8a10040427cdc7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c75ab091cbeca0d0db2f3fff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 20 21:17:05 2009 +0200 oleaut32/tests: Fix the tmarshal test on 64-bit. --- dlls/oleaut32/tests/tmarshal.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index b8cc57d..2d23b48 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1356,7 +1356,7 @@ static void test_DispCallFunc(void) V_VT(&varref) = VT_ERROR; V_ERROR(&varref) = DISP_E_PARAMNOTFOUND; VariantInit(&varresult); - hr = DispCallFunc(pWidget, 36, CC_STDCALL, VT_UI4, 4, rgvt, rgpvarg, &varresult); + hr = DispCallFunc(pWidget, 9*sizeof(void*), CC_STDCALL, VT_UI4, 4, rgvt, rgpvarg, &varresult); ok_ole_success(hr, DispCallFunc); VariantClear(&varresult); VariantClear(&vararg[1]); @@ -1405,7 +1405,8 @@ START_TEST(tmarshal) test_DispCallFunc(); test_StaticWidget(); - hr = UnRegisterTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, 1); + hr = UnRegisterTypeLib(&LIBID_TestTypelib, 1, 0, LOCALE_NEUTRAL, + sizeof(void*) == 8 ? SYS_WIN64 : SYS_WIN32); ok_ole_success(hr, UnRegisterTypeLib); CoUninitialize();

1 0

Francois Gouget : msctf: Fix an error message.
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: 30df52ca1e3e32b9a62a402158dd5bbb48c8d2dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=30df52ca1e3e32b9a62a40215… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 20 16:03:58 2009 +0200 msctf: Fix an error message. --- dlls/msctf/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index d312574..6f35def 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -648,7 +648,7 @@ static HRESULT WINAPI TextStoreACPSink_OnLockGranted(ITextStoreACPSink *iface, if (!This->pContext || !This->pContext->currentEditSession) { - ERR("OnLockGranted called on a context without a current edit session\nZ"); + ERR("OnLockGranted called on a context without a current edit session\n"); return E_FAIL; }

1 0

Alexandre Julliard : widl: Add support for standard target options to allow building the right typelib kind when cross-compiling .
by Alexandre Julliard May 21, 2009

May 21, 2009

Module: wine Branch: master Commit: f914b572779194e548d0c344242931d40b0d63f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f914b572779194e548d0c3442… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 11:37:34 2009 +0200 widl: Add support for standard target options to allow building the right typelib kind when cross-compiling. --- Make.rules.in | 2 +- tools/widl/widl.c | 102 +++++++++++++++++++++++++++++++++++------------- tools/widl/widl.h | 1 - tools/widl/widl.man.in | 6 +++ 4 files changed, 82 insertions(+), 29 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 5dc8884..254e8a2 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -183,7 +183,7 @@ filter: dummy $(WIDL) $(IDLFLAGS) -s -S $@ $< .idl.tlb: - $(WIDL) $(IDLFLAGS) -t -T $@ $< + $(WIDL) $(TARGETFLAGS) $(IDLFLAGS) -t -T $@ $< .c.ln: $(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 ) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 6ae8bae..98e7a51 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -53,33 +53,35 @@ static const char usage[] = "Usage: widl [options...] infile.idl\n" " or: widl [options...] --dlldata-only name1 [name2...]\n" -" -c Generate client stub\n" -" -C file Name of client stub file (default is infile_c.c)\n" -" -d n Set debug level to 'n'\n" -" -D id[=val] Define preprocessor identifier id=val\n" -" --dlldata=file Name of the dlldata file (default is dlldata.c)\n" -" -E Preprocess only\n" -" -h Generate headers\n" -" -H file Name of header file (default is infile.h)\n" -" -I path Set include search dir to path (multiple -I allowed)\n" -" --local-stubs=file Write empty stubs for call_as/local methods to file\n" -" -N Do not preprocess input\n" -" --oldnames Use old naming conventions\n" -" -p Generate proxy\n" -" -P file Name of proxy file (default is infile_p.c)\n" -" --prefix-all=p Prefix names of client stubs / server functions with 'p'\n" +" -b arch Set the target architecture\n" +" -c Generate client stub\n" +" -C file Name of client stub file (default is infile_c.c)\n" +" -d n Set debug level to 'n'\n" +" -D id[=val] Define preprocessor identifier id=val\n" +" --dlldata=file Name of the dlldata file (default is dlldata.c)\n" +" -E Preprocess only\n" +" -h Generate headers\n" +" -H file Name of header file (default is infile.h)\n" +" -I path Set include search dir to path (multiple -I allowed)\n" +" --local-stubs=file Write empty stubs for call_as/local methods to file\n" +" -m32, -m64 Set the kind of typelib to build (Win32 or Win64)\n" +" -N Do not preprocess input\n" +" --oldnames Use old naming conventions\n" +" -p Generate proxy\n" +" -P file Name of proxy file (default is infile_p.c)\n" +" --prefix-all=p Prefix names of client stubs / server functions with 'p'\n" " --prefix-client=p Prefix names of client stubs with 'p'\n" " --prefix-server=p Prefix names of server functions with 'p'\n" -" -s Generate server stub\n" -" -S file Name of server stub file (default is infile_s.c)\n" -" -t Generate typelib\n" -" -T file Name of typelib file (default is infile.tlb)\n" -" -u Generate interface identifiers file\n" -" -U file Name of interface identifiers file (default is infile_i.c)\n" -" -V Print version and exit\n" -" -W Enable pedantic warnings\n" -" --win32 Only generate 32-bit code\n" -" --win64 Only generate 64-bit code\n" +" -s Generate server stub\n" +" -S file Name of server stub file (default is infile_s.c)\n" +" -t Generate typelib\n" +" -T file Name of typelib file (default is infile.tlb)\n" +" -u Generate interface identifiers file\n" +" -U file Name of interface identifiers file (default is infile_i.c)\n" +" -V Print version and exit\n" +" -W Enable pedantic warnings\n" +" --win32 Only generate 32-bit code\n" +" --win64 Only generate 64-bit code\n" "Debug level 'n' is a bitmask with following meaning:\n" " * 0x01 Tell which resource is parsed (verbose mode)\n" " * 0x02 Dump internal structures\n" @@ -92,7 +94,6 @@ static const char usage[] = static const char version_string[] = "Wine IDL Compiler version " PACKAGE_VERSION "\n" "Copyright 2002 Ove Kaaven\n"; -int win32 = 1; int debuglevel = DEBUGLEVEL_NONE; int parser_debug, yy_flex_debug; @@ -152,7 +153,7 @@ enum { }; static const char short_options[] = - "cC:d:D:EhH:I:NpP:sS:tT:uU:VW"; + "b:cC:d:D:EhH:I:m:NpP:sS:tT:uU:VW"; static const struct option long_options[] = { { "dlldata", 1, 0, DLLDATA_OPTION }, { "dlldata-only", 0, 0, DLLDATA_ONLY_OPTION }, @@ -227,6 +228,45 @@ static void add_widl_version_define(void) wpp_add_define("__WIDL__", NULL); } +/* set the target platform */ +static void set_target( const char *target ) +{ + static const struct + { + const char *name; + syskind_t kind; + } cpu_names[] = + { + { "i386", SYS_WIN32 }, + { "i486", SYS_WIN32 }, + { "i586", SYS_WIN32 }, + { "i686", SYS_WIN32 }, + { "i786", SYS_WIN32 }, + { "x86_64", SYS_WIN64 }, + { "sparc", SYS_WIN32 }, + { "alpha", SYS_WIN32 }, + { "powerpc", SYS_WIN32 } + }; + + unsigned int i; + char *p, *spec = xstrdup( target ); + + /* target specification is in the form CPU-MANUFACTURER-OS or CPU-MANUFACTURER-KERNEL-OS */ + + if (!(p = strchr( spec, '-' ))) error( "Invalid target specification '%s'\n", target ); + *p++ = 0; + for (i = 0; i < sizeof(cpu_names)/sizeof(cpu_names[0]); i++) + { + if (!strcmp( cpu_names[i].name, spec )) + { + typelib_kind = cpu_names[i].kind; + free( spec ); + return; + } + } + error( "Unrecognized CPU '%s'\n", spec ); +} + /* clean things up when aborting on a signal */ static void exit_on_signal( int sig ) { @@ -481,6 +521,9 @@ int main(int argc,char *argv[]) do_win32 = 0; do_win64 = 1; break; + case 'b': + set_target( optarg ); + break; case 'c': do_everything = 0; do_client = 1; @@ -508,6 +551,11 @@ int main(int argc,char *argv[]) case 'I': wpp_add_include_path(optarg); break; + case 'm': + if (!strcmp( optarg, "32" )) typelib_kind = SYS_WIN32; + else if (!strcmp( optarg, "64" )) typelib_kind = SYS_WIN64; + else error( "Invalid -m argument '%s'\n", optarg ); + break; case 'N': no_preprocess = 1; break; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index d8c945f..e34e64b 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -34,7 +34,6 @@ extern int debuglevel; #define DEBUGLEVEL_PPLEX 0x0010 #define DEBUGLEVEL_PPTRACE 0x0020 -extern int win32; extern int pedantic; extern int do_everything; extern int do_header; diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in index e275292..2757cdf 100644 --- a/tools/widl/widl.man.in +++ b/tools/widl/widl.man.in @@ -31,6 +31,10 @@ will print a help message. .B General options: .IP "\fB-V\fR" Print version number and exit. +.IP "\fB-b \fIcpu-manufacturer[-kernel]-os\fR" +Set the target architecture when cross-compiling. The target +specification is in the standard autoconf format as returned by +config.sub. .PP .B Header options: .IP "\fB-h\fR" @@ -47,6 +51,8 @@ Generate a type library. .IP "\fB-T \fIfile\fR" Define the name of the type library to be generated. The default filename is \fIinfile\fR.tlb. +.IP "\fB-m32, -m64\fR" +Generate a Win32, respectively Win64, type library. .PP .B UUID file options: .IP "\fB-u\fR"

1 0

Jacek Caban : urlmon: Added IUriContainer declaration.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: e0c18d1e21b06f0d1211269e03272e2588932a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0c18d1e21b06f0d1211269e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 20 11:53:28 2009 +0200 urlmon: Added IUriContainer declaration. --- include/urlmon.idl | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 20bf28e..13c09be 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1500,6 +1500,20 @@ interface IUri : IUnknown } /***************************************************************************** + * IUriContainer interface + */ +[ + local, + object, + uuid(a158a630-ed6f-45fb-b987-f68676f57752), + pointer_default(unique) +] +interface IUriContainer : IUnknown +{ + HRESULT GetIUri([out] IUri **ppIUri); +} + +/***************************************************************************** * IInternetProtocolEx interface */ [

1 0

Kai Blin : secur32: Don't try to use ntlm_auth --use-cred-cache.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: ec443be73800258f8c921ace0f15e250617e98f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec443be73800258f8c921ace0… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed May 20 11:06:05 2009 +0200 secur32: Don't try to use ntlm_auth --use-cred-cache. If ntlm_auth actually uses the cred cache, it will not give a session key. As the Wine NTLM code depends on the session key to do transport crypto, don't attempt to use the winbind cred cache. This completely reverts my attempted fix 7788c8ed and also parts of Rob's 888a8e27 and 8a2125f9. It does not affect the code using wine's own credential cache. --- dlls/secur32/ntlm.c | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 5e2450a..2f0c5aa 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -471,7 +471,6 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( if((phContext == NULL) && (pInput == NULL)) { static char helper_protocol[] = "--helper-protocol=ntlmssp-client-1"; - static CHAR credentials_argv[] = "--use-cached-creds"; SEC_CHAR *client_argv[5]; int pwlen = 0; @@ -550,10 +549,10 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( } username = ntlm_GetUsernameArg(ui->wkui1_username, -1); - TRACE("using cached credentials\n"); + FIXME("using ntlm_auth cached credentials not supported\n"); client_argv[2] = username; - client_argv[3] = credentials_argv; + client_argv[3] = NULL; client_argv[4] = NULL; } } @@ -645,8 +644,8 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( if(fContextReq & ISC_REQ_DELEGATE) ctxt_attr |= ISC_RET_DELEGATE; - /* If no password is given, try to use cached credentials. Fall back to an empty - * password if this failed. */ + /* If no password is given, use an empty password instead. This is the + * SMB way to do "anonymous" authentication. */ if(!password && !ntlm_cred->password) { lstrcpynA(buffer, "OK", max_len-1); @@ -655,25 +654,15 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( cleanup_helper(helper); goto isc_end; } - /* If the helper replied with "PW", using cached credentials failed */ + /* If the helper replied with "PW", give an empty password. */ if(!strncmp(buffer, "PW", 2)) { TRACE("Using cached credentials failed.\n"); - ret = SEC_E_NO_CREDENTIALS; - goto isc_end; + lstrcpynA(buffer, "PW AA==", max_len-1); } else { - /* Some versions of Samba have a broken ntlm_auth that can - * return "BH" here. Catch this and abort. */ - if(!strncmp(buffer, "BH", 2)) - { - ERR("ntlm_auth replied 'BH'. This should not happen. " - "Please fix your ntlm_auth install and try again.\n"); - ret = SEC_E_INTERNAL_ERROR; - goto isc_end; - } - /* Otherwise, just do a noop on the next run */ + /* Just do a noop on the next run */ lstrcpynA(buffer, "OK", max_len-1); } }

1 0

Marcus Meissner : wininet: lpwhr cannot be NULL (Coverity 927).
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: 1d362c90a431680c3d311de728e26833377b7d2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d362c90a431680c3d311de72… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed May 20 09:33:21 2009 +0200 wininet: lpwhr cannot be NULL (Coverity 927). --- dlls/wininet/http.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 212ff9f..904939a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3832,7 +3832,7 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) TRACE("-->\n"); - if (NULL == lpwhr || lpwhr->hdr.htype != WH_HHTTPREQ) + if (lpwhr->hdr.htype != WH_HHTTPREQ) { INTERNET_SetLastError(ERROR_INVALID_PARAMETER); goto lend;

1 0

Joris Huizer : msctf: ITfContext::RequestEditSession: dwLockFlags logic corrected.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: e11935a14b1a1a40c98b3efe2fe0461fe50ca61e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11935a14b1a1a40c98b3efe2… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Tue May 19 19:50:03 2009 +0200 msctf: ITfContext::RequestEditSession: dwLockFlags logic corrected. --- dlls/msctf/context.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 6a2bed6..d312574 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -228,12 +228,12 @@ static HRESULT WINAPI Context_RequestEditSession (ITfContext *iface, } if (!(dwFlags & TF_ES_ASYNC)) - dwLockFlags &= TS_LF_SYNC; + dwLockFlags |= TS_LF_SYNC; if (dwFlags & TF_ES_READ) - dwLockFlags &= TS_LF_READ; + dwLockFlags |= TS_LF_READ; else if ((dwFlags & TF_ES_READWRITE) == TF_ES_READWRITE) - dwLockFlags &= TS_LF_READWRITE; + dwLockFlags |= TS_LF_READWRITE; /* TODO: cache this */ ITextStoreACP_GetStatus(This->pITextStoreACP, &status);

1 0

Alexandre Julliard : ntdll/tests: Add more tests for RtlVirtualUnwind.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: fb819d6491d046fed99ec879df9de08e8ccd49da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb819d6491d046fed99ec879d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 20 12:21:07 2009 +0200 ntdll/tests: Add more tests for RtlVirtualUnwind. --- dlls/ntdll/tests/exception.c | 241 ++++++++++++++++++++++++++++------------- 1 files changed, 164 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb819d6491d046fed99ec…

1 0

Alexandre Julliard : ntdll: Add support for some function epilogs in RtlVirtualUnwind.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: 1d4747c35fe5627375c98ab0cb55ec1e4e0eab4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d4747c35fe5627375c98ab0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 20 12:31:28 2009 +0200 ntdll: Add support for some function epilogs in RtlVirtualUnwind. --- dlls/ntdll/signal_x86_64.c | 132 +++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/tests/exception.c | 10 +++ 2 files changed, 141 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index c1210e9..bf78685 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1060,6 +1060,131 @@ static int get_opcode_size( struct opcode op ) } } +static BOOL is_inside_epilog( BYTE *pc ) +{ + /* add or lea must be the first instruction, and it must have a rex.W prefix */ + if ((pc[0] & 0xf8) == 0x48) + { + switch (pc[1]) + { + case 0x81: /* add $nnnn,%rsp */ + if (pc[0] == 0x48 && pc[2] == 0xc4) + { + pc += 7; + break; + } + return FALSE; + case 0x83: /* add $n,%rsp */ + if (pc[0] == 0x48 && pc[2] == 0xc4) + { + pc += 4; + break; + } + return FALSE; + case 0x8d: /* lea n(reg),%rsp */ + if (pc[0] & 0x06) return FALSE; /* rex.RX must be cleared */ + if (((pc[2] >> 3) & 7) != 4) return FALSE; /* dest reg mus be %rsp */ + if ((pc[2] & 7) == 4) return FALSE; /* no SIB byte allowed */ + if ((pc[2] >> 6) == 1) /* 8-bit offset */ + { + pc += 4; + break; + } + if ((pc[2] >> 6) == 2) /* 32-bit offset */ + { + pc += 7; + break; + } + return FALSE; + } + } + + /* now check for various pop instructions */ + + for (;;) + { + BYTE rex = 0; + + if ((*pc & 0xf0) == 0x40) rex = *pc++ & 0x0f; /* rex prefix */ + + switch (*pc) + { + case 0x58: /* pop %rax/%r8 */ + case 0x59: /* pop %rcx/%r9 */ + case 0x5a: /* pop %rdx/%r10 */ + case 0x5b: /* pop %rbx/%r11 */ + case 0x5c: /* pop %rsp/%r12 */ + case 0x5d: /* pop %rbp/%r13 */ + case 0x5e: /* pop %rsi/%r14 */ + case 0x5f: /* pop %rdi/%r15 */ + pc++; + continue; + case 0xc2: /* ret $nn */ + case 0xc3: /* ret */ + return TRUE; + /* FIXME: add various jump instructions */ + } + return FALSE; + } +} + +/* execute a function epilog, which must have been validated with is_inside_epilog() */ +static void interpret_epilog( BYTE *pc, CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr ) +{ + for (;;) + { + BYTE rex = 0; + + if ((*pc & 0xf0) == 0x40) rex = *pc++ & 0x0f; /* rex prefix */ + + switch (*pc) + { + case 0x58: /* pop %rax/r8 */ + case 0x59: /* pop %rcx/r9 */ + case 0x5a: /* pop %rdx/r10 */ + case 0x5b: /* pop %rbx/r11 */ + case 0x5c: /* pop %rsp/r12 */ + case 0x5d: /* pop %rbp/r13 */ + case 0x5e: /* pop %rsi/r14 */ + case 0x5f: /* pop %rdi/r15 */ + set_int_reg( context, ctx_ptr, *pc - 0x58 + (rex & 1) * 8, *(ULONG64 *)context->Rsp ); + context->Rsp += sizeof(ULONG64); + pc++; + continue; + case 0x81: /* add $nnnn,%rsp */ + context->Rsp += *(LONG *)(pc + 2); + pc += 2 + sizeof(LONG); + continue; + case 0x83: /* add $n,%rsp */ + context->Rsp += (signed char)pc[2]; + pc += 3; + continue; + case 0x8d: + if ((pc[1] >> 6) == 1) /* lea n(reg),%rsp */ + { + context->Rsp = get_int_reg( context, (pc[1] & 7) + (rex & 1) * 8 ) + (signed char)pc[2]; + pc += 3; + } + else /* lea nnnn(reg),%rsp */ + { + context->Rsp = get_int_reg( context, (pc[1] & 7) + (rex & 1) * 8 ) + *(LONG *)(pc + 2); + pc += 2 + sizeof(LONG); + } + continue; + case 0xc2: /* ret $nn */ + context->Rip = *(ULONG64 *)context->Rsp; + context->Rsp += sizeof(ULONG64) + *(WORD *)(pc + 1); + return; + case 0xc3: /* ret */ + context->Rip = *(ULONG64 *)context->Rsp; + context->Rsp += sizeof(ULONG64); + return; + /* FIXME: add various jump instructions */ + } + return; + } +} + /********************************************************************** * RtlVirtualUnwind (NTDLL.@) */ @@ -1100,7 +1225,12 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, else { prolog_offset = ~0; - /* FIXME: check for function epilog */ + if (is_inside_epilog( (BYTE *)pc )) + { + interpret_epilog( (BYTE *)pc, context, ctx_ptr ); + *frame_ret = frame; + return NULL; + } } for (i = 0; i < info->count; i += get_opcode_size(info->opcodes[i])) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index c3cc797..ff4125f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1116,6 +1116,9 @@ static void test_virtual_unwind(void) { 0x1c, 0x40, TRUE, 0x128, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, { 0x1d, 0x40, TRUE, 0x128, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, { 0x24, 0x40, TRUE, 0x128, { {rsp,0x130}, {rbp,0x120}, {rbx,0x130}, {rsi,0x138}, {-1,-1}}}, + { 0x2b, 0x40, FALSE, 0x128, { {rsp,0x130}, {rbp,0x120}, {-1,-1}}}, + { 0x32, 0x40, FALSE, 0x008, { {rsp,0x010}, {rbp,0x000}, {-1,-1}}}, + { 0x33, 0x40, FALSE, 0x000, { {rsp,0x008}, {-1,-1}}}, }; @@ -1165,6 +1168,13 @@ static void test_virtual_unwind(void) { 0x04, 0x50, FALSE, 0x020, { {rsp,0x028}, {rbx,0x018}, {rbp,0x010}, {rsi,0x008}, {rdi,0x000}, {-1,-1} }}, { 0x06, 0x50, FALSE, 0x028, { {rsp,0x030}, {rbx,0x020}, {rbp,0x018}, {rsi,0x010}, {rdi,0x008}, {r12,0x000}, {-1,-1} }}, { 0x0a, 0x50, TRUE, 0x058, { {rsp,0x060}, {rbx,0x050}, {rbp,0x048}, {rsi,0x040}, {rdi,0x038}, {r12,0x030}, {-1,-1} }}, + { 0x0c, 0x50, FALSE, 0x058, { {rsp,0x060}, {rbx,0x050}, {rbp,0x048}, {rsi,0x040}, {rdi,0x038}, {r12,0x030}, {-1,-1} }}, + { 0x10, 0x50, FALSE, 0x028, { {rsp,0x030}, {rbx,0x020}, {rbp,0x018}, {rsi,0x010}, {rdi,0x008}, {r12,0x000}, {-1,-1} }}, + { 0x12, 0x50, FALSE, 0x020, { {rsp,0x028}, {rbx,0x018}, {rbp,0x010}, {rsi,0x008}, {rdi,0x000}, {-1,-1} }}, + { 0x13, 0x50, FALSE, 0x018, { {rsp,0x020}, {rbx,0x010}, {rbp,0x008}, {rsi,0x000}, {-1,-1} }}, + { 0x14, 0x50, FALSE, 0x010, { {rsp,0x018}, {rbx,0x008}, {rbp,0x000}, {-1,-1} }}, + { 0x15, 0x50, FALSE, 0x008, { {rsp,0x010}, {rbx,0x000}, {-1,-1} }}, + { 0x16, 0x50, FALSE, 0x000, { {rsp,0x008}, {-1,-1} }}, }; static const struct unwind_test tests[] =

1 0

Luke Benstead : ddraw: Add tests for DirectDrawSurface reference counting.
by Alexandre Julliard May 20, 2009

May 20, 2009

Module: wine Branch: master Commit: 73abda63d782abf53eaae2428237e024a3881d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=73abda63d782abf53eaae2428… Author: Luke Benstead <kazade(a)gmail.com> Date: Tue May 19 21:27:08 2009 +0100 ddraw: Add tests for DirectDrawSurface reference counting. --- dlls/ddraw/tests/dsurface.c | 114 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 114 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index a0f69b1..c3280fb 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -26,6 +26,7 @@ #include <assert.h> #include "wine/test.h" #include "ddraw.h" +#include "d3d.h" #include "unknwn.h" static LPDIRECTDRAW lpDD = NULL; @@ -966,6 +967,118 @@ static void GetDDInterface_7(void) IDirectDrawSurface7_Release(dsurface7); } +static ULONG getRefcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + +static void IFaceRefCount(void) +{ + LPDIRECTDRAWSURFACE surf; + DDSURFACEDESC surface; + HRESULT ret; + IDirectDrawSurface2 *surf2; + IDirectDrawSurface2 *surf2a; + IDirectDrawSurface4 *surf4; + IDirectDrawSurface7 *surf7a; + IDirectDrawSurface7 *surf7b; + IDirect3DTexture* tex; + IDirect3DTexture2* tex2; + IDirectDrawGammaControl* gamma; + ULONG ref; + + /* Create a surface */ + ZeroMemory(&surface, sizeof(surface)); + surface.dwSize = sizeof(surface); + surface.dwFlags = DDSD_CAPS; + surface.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + ret = IDirectDraw_CreateSurface(lpDD, &surface, &surf, NULL); + + if (ret != DD_OK) + { + ok(FALSE, "Could not create surface, skipping test\n"); + return; + } + + ref = getRefcount((IUnknown *) surf); + ok(ref == 1, "Refcount is %u, expected 1\n", ref); /* Check the ref count is one */ + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface2, (void **) &surf2); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); /* Check the ref count is one */ + ref = getRefcount((IUnknown *) surf2); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); /* This should also be one */ + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface2, (void **) &surf2a); + ref = getRefcount((IUnknown *) surf2); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); /* Surf2's refcount should be 2 now, but surf should be 1 */ + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface4, (void **) &surf4); + ref = getRefcount((IUnknown *) surf4); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface7, (void **) &surf7a); + ref = getRefcount((IUnknown *) surf7a); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawSurface7, (void **) &surf7b); + ref = getRefcount((IUnknown *) surf7b); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + + /* IDirect3DTexture interface (unlike the others) alters the original IDirectDrawSurface ref count */ + IDirectDrawSurface_QueryInterface(surf, &IID_IDirect3DTexture, (void **) &tex); + ref = getRefcount((IUnknown *) tex); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirect3DTexture2, (void **) &tex2); + ref = getRefcount((IUnknown *) tex); + todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); + ref = getRefcount((IUnknown *) tex2); + todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 3, "Refcount is %u, expected 3\n", ref); + + IDirectDrawSurface_QueryInterface(surf, &IID_IDirectDrawGammaControl, (void **) &gamma); + ref = getRefcount((IUnknown *) gamma); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + ref = IDirect3DTexture2_Release(tex2); /* Release the texture */ + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 2, "Refcount is %u, expected 2\n", ref); + + ref = IDirect3DTexture_Release(tex); /* Release the texture */ + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + ref = getRefcount((IUnknown *) surf); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + ref = IDirectDrawGammaControl_Release(gamma); /* Release the gamma control */ + todo_wine ok(ref == 0, "Refcount is %u, expected 0\n", ref); + + ref = IDirectDrawSurface2_Release(surf2); /* Release one of the 2 surf2 interfaces */ + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + ref = IDirectDrawSurface2_Release(surf2a); /* Release the other */ + todo_wine ok(ref == 0, "Refcount is %u, expected 0\n", ref); + + ref = IDirectDrawSurface4_Release(surf4); + todo_wine ok(ref == 0, "Refcount is %u, expected 0\n", ref); + + ref = IDirectDrawSurface7_Release(surf7a); + todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + + ref = IDirectDrawSurface7_Release(surf7b); + todo_wine ok(ref == 0, "Refcount is %u, expected 0\n", ref); + + ref = IDirectDrawSurface_Release(surf); + ok(ref == 0, "Refcount is %u, expected 0\n", ref); +} + #define MAXEXPECTED 8 /* Can match up to 8 expected surfaces */ struct enumstruct { @@ -2908,6 +3021,7 @@ START_TEST(dsurface) GetDDInterface_2(); GetDDInterface_4(); GetDDInterface_7(); + IFaceRefCount(); EnumTest(); AttachmentTest(); AttachmentTest7();

1 0