September 2011 - Wine-Commits

Jacek Caban : vbscript: Added compiler support for boolean literals.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 23c1fea07e5cf78c18db3876c24f00b9b2233ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c1fea07e5cf78c18db3876c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:57:16 2011 +0200 vbscript: Added compiler support for boolean literals. --- dlls/vbscript/compile.c | 60 ++++++++++++++++++++++++++++++++++++++++----- dlls/vbscript/interp.c | 12 +++++++++ dlls/vbscript/vbscript.h | 9 +++++- 3 files changed, 72 insertions(+), 9 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 49d933b..cc3b683 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -34,6 +34,8 @@ typedef struct { vbscode_t *code; } compile_ctx_t; +static HRESULT compile_expression(compile_ctx_t*,expression_t*); + static inline instr_t *instr_ptr(compile_ctx_t *ctx, unsigned id) { assert(id < ctx->instr_cnt); @@ -59,6 +61,18 @@ static unsigned push_instr(compile_ctx_t *ctx, vbsop_t op) return ctx->instr_cnt++; } +static HRESULT push_instr_int(compile_ctx_t *ctx, vbsop_t op, LONG arg) +{ + unsigned ret; + + ret = push_instr(ctx, op); + if(ret == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, ret)->arg1.lng = arg; + return S_OK; +} + static BSTR alloc_bstr_arg(compile_ctx_t *ctx, const WCHAR *str) { if(!ctx->code->bstr_pool_size) { @@ -84,12 +98,12 @@ static BSTR alloc_bstr_arg(compile_ctx_t *ctx, const WCHAR *str) return ctx->code->bstr_pool[ctx->code->bstr_cnt++]; } -static HRESULT push_instr_bstr(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) +static HRESULT push_instr_bstr_uint(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg1, unsigned arg2) { unsigned instr; BSTR bstr; - bstr = alloc_bstr_arg(ctx, arg); + bstr = alloc_bstr_arg(ctx, arg1); if(!bstr) return E_OUTOFMEMORY; @@ -98,28 +112,60 @@ static HRESULT push_instr_bstr(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) return E_OUTOFMEMORY; instr_ptr(ctx, instr)->arg1.bstr = bstr; + instr_ptr(ctx, instr)->arg2.uint = arg2; return S_OK; } -static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t *expr) +static HRESULT compile_args(compile_ctx_t *ctx, expression_t *args, unsigned *ret) { + unsigned arg_cnt = 0; HRESULT hres; - if(expr->args) { - FIXME("arguments not implemented\n"); - return E_NOTIMPL; + while(args) { + hres = compile_expression(ctx, args); + if(FAILED(hres)) + return hres; + + arg_cnt++; + args = args->next; } + *ret = arg_cnt; + return S_OK; +} + +static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t *expr) +{ + unsigned arg_cnt = 0; + HRESULT hres; + + hres = compile_args(ctx, expr->args, &arg_cnt); + if(FAILED(hres)) + return hres; + if(expr->obj_expr) { FIXME("obj_expr not implemented\n"); hres = E_NOTIMPL; }else { - hres = push_instr_bstr(ctx, OP_icallv, expr->identifier); + hres = push_instr_bstr_uint(ctx, OP_icallv, expr->identifier, arg_cnt); } return hres; } +static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) +{ + switch(expr->type) { + case EXPR_BOOL: + return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); + default: + FIXME("Unimplemented expression type %d\n", expr->type); + return E_NOTIMPL; + } + + return S_OK; +} + static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) { HRESULT hres; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index b309397..a70a4dd 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -75,12 +75,18 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, ref_t *ref) static HRESULT interp_icallv(exec_ctx_t *ctx) { BSTR identifier = ctx->instr->arg1.bstr; + const unsigned arg_cnt = ctx->instr->arg2.uint; DISPPARAMS dp = {0}; ref_t ref; HRESULT hres; TRACE("\n"); + if(arg_cnt) { + FIXME("arguments not implemented\n"); + return E_NOTIMPL; + } + hres = lookup_identifier(ctx, identifier, &ref); if(FAILED(hres)) return hres; @@ -107,6 +113,12 @@ static HRESULT interp_ret(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_bool(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static const instr_func_t op_funcs[] = { #define X(x,n,a,b) interp_ ## x, OP_LIST diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 8aca01c..c0adc57 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -69,11 +69,14 @@ HRESULT init_global(script_ctx_t*); typedef enum { ARG_NONE = 0, ARG_STR, - ARG_BSTR + ARG_BSTR, + ARG_INT, + ARG_UINT } instr_arg_type_t; #define OP_LIST \ - X(icallv, 1, ARG_BSTR, 0) \ + X(bool, 1, ARG_INT, 0) \ + X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(ret, 0, 0, 0) typedef enum { @@ -86,6 +89,8 @@ OP_LIST typedef union { const WCHAR *str; BSTR bstr; + unsigned uint; + LONG lng; } instr_arg_t; typedef struct {

1 0

Jacek Caban : vbscript: Added more tests.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 1c1da3e596caaf226e4930e145e21f4e00e416d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c1da3e596caaf226e4930e14… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:58:32 2011 +0200 vbscript: Added more tests. --- dlls/vbscript/tests/Makefile.in | 2 + dlls/vbscript/tests/lang.vbs | 21 +++++++++ dlls/vbscript/tests/rsrc.rc | 20 +++++++++ dlls/vbscript/tests/run.c | 88 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/Makefile.in b/dlls/vbscript/tests/Makefile.in index a045f9c..3424612 100644 --- a/dlls/vbscript/tests/Makefile.in +++ b/dlls/vbscript/tests/Makefile.in @@ -5,4 +5,6 @@ C_SRCS = \ run.c \ vbscript.c +RC_SRCS = rsrc.rc + @MAKE_TEST_RULES@ diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs new file mode 100644 index 0000000..642c2ff --- /dev/null +++ b/dlls/vbscript/tests/lang.vbs @@ -0,0 +1,21 @@ +' +' Copyright 2011 Jacek Caban for CodeWeavers +' +' 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 +' + +call ok(true, "true is not true?") + +reportSuccess() diff --git a/dlls/vbscript/tests/rsrc.rc b/dlls/vbscript/tests/rsrc.rc new file mode 100644 index 0000000..834df1d --- /dev/null +++ b/dlls/vbscript/tests/rsrc.rc @@ -0,0 +1,20 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * 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 + */ + +/* @makedep: lang.vbs */ +lang.vbs 40 "lang.vbs" diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 6f1a967..b8cef40 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -60,10 +60,13 @@ DEFINE_EXPECT(global_success_d); DEFINE_EXPECT(global_success_i); #define DISPID_GLOBAL_REPORTSUCCESS 1000 +#define DISPID_GLOBAL_TRACE 1001 +#define DISPID_GLOBAL_OK 1002 static const WCHAR testW[] = {'t','e','s','t',0}; static BOOL strict_dispid_check; +static const char *test_name = "(null)"; static BSTR a2bstr(const char *str) { @@ -183,6 +186,16 @@ static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { + if(!strcmp_wa(bstrName, "ok")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_OK; + return S_OK; + } + if(!strcmp_wa(bstrName, "trace")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_TRACE; + return S_OK; + } if(!strcmp_wa(bstrName, "reportSuccess")) { CHECK_EXPECT(global_success_d); test_grfdex(grfdex, fdexNameCaseInsensitive); @@ -199,6 +212,48 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { switch(id) { + case DISPID_GLOBAL_OK: { + VARIANT *b; + + ok(wFlags == INVOKE_FUNC || wFlags == (INVOKE_FUNC|INVOKE_PROPERTYGET), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 2, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + if(wFlags & INVOKE_PROPERTYGET) + ok(pvarRes != NULL, "pvarRes == NULL\n"); + else + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + + b = pdp->rgvarg+1; + if(V_VT(b) == (VT_BYREF|VT_VARIANT)) + b = V_BYREF(b); + + ok(V_VT(b) == VT_BOOL, "V_VT(b) = %d\n", V_VT(b)); + + ok(V_BOOL(b), "%s: %s\n", test_name, wine_dbgstr_w(V_BSTR(pdp->rgvarg))); + return S_OK; + } + + case DISPID_GLOBAL_TRACE: + ok(wFlags == INVOKE_FUNC, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(!pvarRes, "pvarRes != NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); + if(V_VT(pdp->rgvarg) == VT_BSTR) + trace("%s: %s\n", test_name, wine_dbgstr_w(V_BSTR(pdp->rgvarg))); + + return S_OK; case DISPID_GLOBAL_REPORTSUCCESS: CHECK_EXPECT(global_success_i); @@ -457,6 +512,37 @@ static void run_from_file(const char *filename) ok(hres == S_OK, "parse_script failed: %08x\n", hres); } +static void run_from_res(const char *name) +{ + const char *data; + DWORD size, len; + BSTR str; + HRSRC src; + HRESULT hres; + + strict_dispid_check = FALSE; + test_name = name; + + src = FindResourceA(NULL, name, (LPCSTR)40); + ok(src != NULL, "Could not find resource %s\n", name); + + size = SizeofResource(NULL, src); + data = LoadResource(NULL, src); + + len = MultiByteToWideChar(CP_ACP, 0, data, size, NULL, 0); + str = SysAllocStringLen(NULL, len); + MultiByteToWideChar(CP_ACP, 0, data, size, str, len); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + hres = parse_script(SCRIPTITEM_GLOBALMEMBERS, str); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + ok(hres == S_OK, "parse_script failed: %08x\n", hres); + SysFreeString(str); +} + static void run_tests(void) { strict_dispid_check = TRUE; @@ -481,6 +567,8 @@ static void run_tests(void) parse_script_a("Call reportSuccess"); CHECK_CALLED(global_success_d); CHECK_CALLED(global_success_i); + + run_from_res("lang.vbs"); } static BOOL check_vbscript(void)

1 0

Jörg Höhle : mmdevapi: Use UINT32 for a number of frames and UINT64 to sum them.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 08dd823c7c12c4f4a97731c09dae8c9a9c634ac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08dd823c7c12c4f4a97731c09… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Aug 16 19:53:35 2011 +0200 mmdevapi: Use UINT32 for a number of frames and UINT64 to sum them. --- dlls/winealsa.drv/mmdevdrv.c | 4 ++-- dlls/winecoreaudio.drv/mmdevdrv.c | 4 ++-- dlls/wineoss.drv/mmdevdrv.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index e471e2c..836d444 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -108,8 +108,8 @@ struct ACImpl { float *vols; BOOL initted, started; - UINT64 written_frames, held_frames, tmp_buffer_frames; - UINT32 bufsize_frames, period_us; + UINT64 written_frames; + UINT32 bufsize_frames, held_frames, tmp_buffer_frames, period_us; UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ HANDLE timer; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 78daa8c..c1a3a3a 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -124,8 +124,8 @@ struct ACImpl { AudioQueueRef aqueue; AudioObjectPropertyScope scope; HANDLE timer; - UINT32 period_ms, bufsize_frames, inbuf_frames, written_frames; - UINT64 last_time; + UINT32 period_ms, bufsize_frames, inbuf_frames; + UINT64 last_time, written_frames; AudioQueueBufferRef public_buffer; UINT32 getbuf_last; int playing; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index ed3e2ba..93f71cc 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -121,8 +121,8 @@ struct ACImpl { oss_audioinfo ai; BOOL initted, playing; - UINT64 written_frames, held_frames, tmp_buffer_frames, inbuf_frames; - UINT32 period_us, bufsize_frames; + UINT64 written_frames; + UINT32 period_us, bufsize_frames, held_frames, tmp_buffer_frames, inbuf_frames; UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ BYTE *local_buffer, *tmp_buffer;

1 0

Jacek Caban : vbscript: Added interp_string implementation.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 2cbbf5717940088f610bc2c891cfe75c4ac1d66b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cbbf5717940088f610bc2c89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 8 14:57:56 2011 +0200 vbscript: Added interp_string implementation. --- dlls/vbscript/interp.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index df296fa..d060c51 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -162,8 +162,16 @@ static HRESULT interp_bool(exec_ctx_t *ctx) static HRESULT interp_string(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + + TRACE("\n"); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(ctx->instr->arg1.str); + if(!V_BSTR(&v)) + return E_OUTOFMEMORY; + + return stack_push(ctx, &v); } static const instr_func_t op_funcs[] = {

1 0

Louis Lenders : dpnet/tests: Add tests for IDirectPlay8Peer_EnumServiceProviders.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 7844535700a65a2852a7b365e71c3c7a9950cdbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7844535700a65a2852a7b365e… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Aug 29 22:56:35 2011 +0200 dpnet/tests: Add tests for IDirectPlay8Peer_EnumServiceProviders. --- configure | 1 + configure.ac | 1 + dlls/dpnet/tests/Makefile.in | 7 ++ dlls/dpnet/tests/peer.c | 135 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 0379352..caef433 100755 --- a/configure +++ b/configure @@ -14800,6 +14800,7 @@ wine_fn_config_dll dplayx enable_dplayx implib wine_fn_config_test dlls/dplayx/tests dplayx_test wine_fn_config_dll dpnaddr enable_dpnaddr wine_fn_config_dll dpnet enable_dpnet implib +wine_fn_config_test dlls/dpnet/tests dpnet_test wine_fn_config_dll dpnhpast enable_dpnhpast wine_fn_config_dll dpnlobby enable_dpnlobby wine_fn_config_dll dpwsockx enable_dpwsockx diff --git a/configure.ac b/configure.ac index 40ea431..e12fb37 100644 --- a/configure.ac +++ b/configure.ac @@ -2493,6 +2493,7 @@ WINE_CONFIG_DLL(dplayx,,[implib]) WINE_CONFIG_TEST(dlls/dplayx/tests) WINE_CONFIG_DLL(dpnaddr) WINE_CONFIG_DLL(dpnet,,[implib]) +WINE_CONFIG_TEST(dlls/dpnet/tests) WINE_CONFIG_DLL(dpnhpast) WINE_CONFIG_DLL(dpnlobby) WINE_CONFIG_DLL(dpwsockx) diff --git a/dlls/dpnet/tests/Makefile.in b/dlls/dpnet/tests/Makefile.in new file mode 100644 index 0000000..58d5c94 --- /dev/null +++ b/dlls/dpnet/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = dpnet.dll +IMPORTS = dpnet ole32 + +C_SRCS = \ + peer.c + +(a)MAKE_TEST_RULES@ diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c new file mode 100644 index 0000000..afbea42 --- /dev/null +++ b/dlls/dpnet/tests/peer.c @@ -0,0 +1,135 @@ +/* + * Copyright 2011 Louis Lenders + * + * 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 + */ + +#define INITGUID +#define WIN32_LEAN_AND_MEAN +#include <stdio.h> + +#include <dplay8.h> +#include "wine/test.h" + +static char *show_guid(const GUID *guid, char *buf) +{ + sprintf(buf, + "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]); + + return buf; +} + +static IDirectPlay8Peer* peer = NULL; + +static HRESULT WINAPI DirectPlayMessageHandler(PVOID context, DWORD message_id, PVOID buffer) +{ + return S_OK; +} + +static void test_init_dp(void) +{ + HRESULT hr; + + hr = CoInitialize(0); + ok(hr == S_OK, "CoInitialize failed with %x\n", hr); + + hr = CoCreateInstance(&CLSID_DirectPlay8Peer, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Peer, (void **)&peer); + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + + hr = IDirectPlay8Peer_Initialize(peer, NULL, DirectPlayMessageHandler, 0); + todo_wine ok(hr == S_OK, "IDirectPlay8Peer_Initialize failed with %x\n", hr); +} + +static void test_enum_service_providers(void) +{ + DPN_SERVICE_PROVIDER_INFO *serv_prov_info; + DWORD items, size; + DWORD i; + HRESULT hr; + char guid[39] ; + + size = 0; + items = 0; + + hr = IDirectPlay8Peer_EnumServiceProviders(peer, NULL, NULL, NULL, &size, &items, 0); + todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = (DPN_SERVICE_PROVIDER_INFO*) HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Peer_EnumServiceProviders(peer, NULL, NULL, serv_prov_info, &size, &items, 0); + todo_wine ok(hr == S_OK, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(items != 0, "Found unexpectedly no service providers\n"); + + trace("number of items found: %d\n", items); + + for (i=0;i<items;i++) + { + trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info->pwszName)); + trace("Found guid: %s\n", show_guid(&serv_prov_info->guid, guid)); + + serv_prov_info++; + } + + serv_prov_info -= items; /* set pointer back */ + ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + + size = 0; + items = 0; + + hr = IDirectPlay8Peer_EnumServiceProviders(peer, &CLSID_DP8SP_TCPIP, NULL, NULL, &size, &items, 0); + todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = (DPN_SERVICE_PROVIDER_INFO*) HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Peer_EnumServiceProviders(peer, &CLSID_DP8SP_TCPIP, NULL, serv_prov_info, &size, &items, 0); + todo_wine ok(hr == S_OK, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + todo_wine ok(items != 0, "Found unexpectedly no adapter\n"); + + for (i=0;i<items;i++) + { + trace("Found adapter: %s\n", wine_dbgstr_w(serv_prov_info->pwszName)); + trace("Found adapter guid: %s\n", show_guid(&serv_prov_info->guid, guid)); + + serv_prov_info++; + } + + serv_prov_info -= items; /* set pointer back */ + ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); +} + +static void test_cleanup_dp(void) +{ + HRESULT hr; + + hr = IDirectPlay8Peer_Close(peer, 0); + ok(hr == S_OK, "IDirectPlay8Peer_Close failed with %x\n", hr); + + hr = IDirectPlay8Peer_Release(peer); + ok(hr == S_OK, "IDirectPlay8Peer_Release failed with %x\n", hr); + + CoUninitialize(); +} + +START_TEST(peer) +{ + test_init_dp(); + test_enum_service_providers(); + test_cleanup_dp(); +}

1 0

Alexander Morozov : query: Add stub for LoadIFilter.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: ba6f99c239bfd7264f868702875dd9597b022be8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba6f99c239bfd7264f8687028… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Fri Aug 19 15:16:33 2011 +0400 query: Add stub for LoadIFilter. --- dlls/query/query.spec | 2 +- dlls/query/query_main.c | 7 +++++++ dlls/shell32/recyclebin.c | 2 +- include/ntquery.h | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/query/query.spec b/dlls/query/query.spec index 612ea2d..71b9874 100644 --- a/dlls/query/query.spec +++ b/dlls/query/query.spec @@ -33,7 +33,7 @@ @ stub InitializeFILTERPerformanceData @ stub _LoadBHIFilter(a)16 @ stub LoadBinaryFilter -@ stub LoadIFilter +@ stdcall LoadIFilter(wstr ptr ptr) @ stub LoadTextFilter @ stub LocateCatalogs @ stdcall LocateCatalogsA(str long ptr ptr ptr ptr) diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c index 2d4e4ae..3414aec 100644 --- a/dlls/query/query_main.c +++ b/dlls/query/query_main.c @@ -98,3 +98,10 @@ HRESULT WINAPI LocateCatalogsW(WCHAR const *pwszScope, ULONG iBm, iBm, pwszMachine, pcMachine, pwszCat, pcCat); return CI_E_NOT_RUNNING; } + +HRESULT WINAPI LoadIFilter(WCHAR const *pwcsPath, IUnknown *pUnkOuter, void **ppIUnk) +{ + FIXME("%s %p %p\n", debugstr_w(pwcsPath), pUnkOuter, ppIUnk); + *ppIUnk = NULL; + return E_NOTIMPL; +} diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index eec9e00..4a8cec4 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -31,8 +31,8 @@ #include "winbase.h" #include "winreg.h" #include "winuser.h" -#include "ntquery.h" #include "shlwapi.h" +#include "ntquery.h" #include "shlobj.h" #include "shresdef.h" #include "shellfolder.h" diff --git a/include/ntquery.h b/include/ntquery.h index fc78c32..928dafc 100644 --- a/include/ntquery.h +++ b/include/ntquery.h @@ -74,6 +74,7 @@ STDAPI CIState(WCHAR const *, WCHAR const *, CI_STATE *); STDAPI LocateCatalogsA(CHAR const *, ULONG, CHAR *, ULONG *, CHAR *, ULONG *); STDAPI LocateCatalogsW(WCHAR const *, ULONG, WCHAR *, ULONG *, WCHAR *, ULONG *); #define LocateCatalogs WINELIB_NAME_AW(LocateCatalogs) +STDAPI LoadIFilter(WCHAR const *, IUnknown *, void **); #ifdef __cplusplus }

1 0

Francois Gouget : ddraw: Remove WINAPI on static functions where not needed .
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 489527fe44e5f61e974d7563892fce8a98e81a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=489527fe44e5f61e974d75638… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 8 11:01:41 2011 +0200 ddraw: Remove WINAPI on static functions where not needed. --- dlls/ddraw/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 081d4e1..d70e355 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -875,7 +875,7 @@ static HRESULT WINAPI ddraw_surface1_GetAttachedSurface(IDirectDrawSurface *ifac * For more details, see IWineD3DSurface::LockRect * *****************************************************************************/ -static HRESULT WINAPI surface_lock(IDirectDrawSurfaceImpl *This, +static HRESULT surface_lock(IDirectDrawSurfaceImpl *This, RECT *Rect, DDSURFACEDESC2 *DDSD, DWORD Flags, HANDLE h) { WINED3DLOCKED_RECT LockedRect;

1 0

Frédéric Delanoy : cmd: Simplify WCMD_parameter function.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 7b9af2268226665252c7c447d5ce47480efe5e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b9af2268226665252c7c447d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 6 19:19:41 2011 +0200 cmd: Simplify WCMD_parameter function. --- programs/cmd/batch.c | 78 ++++++++++++++++++-------------------------------- 1 files changed, 28 insertions(+), 50 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index a978ef1..53330ff 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -138,59 +138,37 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN */ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where) { - - int i = 0; - static WCHAR param[MAX_PATH]; - WCHAR *p; - - if (where != NULL) *where = NULL; - p = param; - while (TRUE) { - switch (*s) { - case ' ': /* Skip leading spaces */ - case '\t': /* Treat tabs as spaces */ - s++; - break; - case '"': - if (where != NULL && i==n) *where = s; - s++; - while ((*s != '\0') && (*s != '"')) { - *p++ = *s++; - } - if (i == n) { - *p = '\0'; - return param; - } - if (*s == '"') s++; - param[0] = '\0'; - i++; - p = param; - break; - /* The code to handle bracketed parms is removed because it should no longer - be necessary after the multiline support has been added and the for loop - set of data is now parseable individually. */ - case '\0': - return param; - default: - /* Only return where if it is for the right parameter */ - if (where != NULL && i==n) *where = s; - while ((*s != '\0') && (*s != ' ') && (*s != ',') && (*s != '=') && (*s != '\t')) { - *p++ = *s++; - } - if (i == n && (p!=param)) { - *p = '\0'; - return param; - } - /* Skip double delimiters, eg. dir a.a,,,,,b.b */ - if (p != param) { - param[0] = '\0'; - i++; + int curParamNb = 0; + static WCHAR param[MAX_PATH]; + WCHAR *p = s, *q; + BOOL quotesDelimited; + + if (where != NULL) *where = NULL; + param[0] = '\0'; + while (TRUE) { + while (*p && ((*p == ' ') || (*p == ',') || (*p == '=') || (*p == '\t'))) + p++; + if (*p == '\0') return param; + + quotesDelimited = (*p == '"'); + if (where != NULL && curParamNb == n) *where = p; + + if (quotesDelimited) { + q = ++p; + while (*p && *p != '"') p++; } else { - s++; /* Skip delimiter */ + q = p; + while (*p && (*p != ' ') && (*p != ',') && (*p != '=') && (*p != '\t')) + p++; } - p = param; + if (curParamNb == n) { + memcpy(param, q, (p - q) * sizeof(WCHAR)); + param[p-q] = '\0'; + return param; + } + if (quotesDelimited && *p == '"') p++; + curParamNb++; } - } } /****************************************************************************

1 0

Frédéric Delanoy : cmd: Clarify WCMD_if function.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 191056ad5cab8e309ba793bd09d55e0a2b417435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=191056ad5cab8e309ba793bd0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 6 19:19:42 2011 +0200 cmd: Clarify WCMD_if function. --- programs/cmd/builtins.c | 31 ++++++++++--------------------- 1 files changed, 10 insertions(+), 21 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1320b32..35797f1 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1497,7 +1497,8 @@ void WCMD_popd (void) { void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { - int negate = 0, test = 0; + int negate; /* Negate condition */ + int test; /* Condition evaluation result */ WCHAR condition[MAX_PATH], *command, *s; static const WCHAR notW[] = {'n','o','t','\0'}; static const WCHAR errlvlW[] = {'e','r','r','o','r','l','e','v','e','l','\0'}; @@ -1505,40 +1506,28 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { static const WCHAR defdW[] = {'d','e','f','i','n','e','d','\0'}; static const WCHAR eqeqW[] = {'=','=','\0'}; static const WCHAR parmI[] = {'/','I','\0'}; + int caseInsensitive = (strstrW(quals, parmI) != NULL); - if (!lstrcmpiW (param1, notW)) { - negate = 1; - strcpyW (condition, param2); - } - else { - strcpyW (condition, param1); - } + negate = !lstrcmpiW(param1,notW); + strcpyW(condition, (negate ? param2 : param1)); WINE_TRACE("Condition: %s\n", wine_dbgstr_w(condition)); if (!lstrcmpiW (condition, errlvlW)) { - if (errorlevel >= atoiW(WCMD_parameter (p, 1+negate, NULL))) test = 1; + test = (errorlevel >= atoiW(WCMD_parameter(p, 1+negate, NULL))); WCMD_parameter (p, 2+negate, &command); } else if (!lstrcmpiW (condition, existW)) { - if (GetFileAttributesW(WCMD_parameter (p, 1+negate, NULL)) != INVALID_FILE_ATTRIBUTES) { - test = 1; - } + test = (GetFileAttributesW(WCMD_parameter(p, 1+negate, NULL)) != INVALID_FILE_ATTRIBUTES); WCMD_parameter (p, 2+negate, &command); } else if (!lstrcmpiW (condition, defdW)) { - if (GetEnvironmentVariableW(WCMD_parameter (p, 1+negate, NULL), NULL, 0) > 0) { - test = 1; - } + test = (GetEnvironmentVariableW(WCMD_parameter(p, 1+negate, NULL), NULL, 0) > 0); WCMD_parameter (p, 2+negate, &command); } else if ((s = strstrW (p, eqeqW))) { s += 2; - if (strstrW (quals, parmI) == NULL) { - if (!lstrcmpW (condition, WCMD_parameter (s, 0, NULL))) test = 1; - } - else { - if (!lstrcmpiW (condition, WCMD_parameter (s, 0, NULL))) test = 1; - } + test = caseInsensitive ? (!lstrcmpiW(condition, WCMD_parameter(s, 0, NULL))) + : (!lstrcmpW (condition, WCMD_parameter(s, 0, NULL))); WCMD_parameter (s, 1, &command); } else {

1 0

Frédéric Delanoy : cmd: Add an output parameter to WCMD_parameter to point to the end of the extracted param , if requested.
by Alexandre Julliard Sept. 8, 2011

Sept. 8, 2011

Module: wine Branch: master Commit: 3627c289585466b1cb04601339de0d3da55becc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3627c289585466b1cb0460133… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Sep 6 19:19:43 2011 +0200 cmd: Add an output parameter to WCMD_parameter to point to the end of the extracted param, if requested. --- programs/cmd/batch.c | 12 ++++++++---- programs/cmd/builtins.c | 34 +++++++++++++++++----------------- programs/cmd/directory.c | 2 +- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 10 +++++----- 5 files changed, 32 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3627c289585466b1cb046…

1 0