October 2012 - Wine-Commits

Christian Costa : advapi32: Add stub for StopTraceA and StopTraceW.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: ed976838cba20f9e2b2a5f7f80f6a6e90cf81fe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed976838cba20f9e2b2a5f7f8… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Oct 3 23:43:54 2012 +0200 advapi32: Add stub for StopTraceA and StopTraceW. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/eventlog.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 732bf04..0cb3e15 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -727,8 +727,8 @@ @ stdcall StartServiceW(long long ptr) @ stdcall StartTraceA(ptr str ptr) @ stdcall StartTraceW(ptr wstr ptr) -# @ stub StopTraceA -# @ stub StopTraceW +@ stdcall StopTraceA(int64 str ptr) +@ stdcall StopTraceW(int64 wstr ptr) @ stdcall SynchronizeWindows31FilesAndWindowsNTRegistry(long long long long) @ stdcall SystemFunction001(ptr ptr ptr) @ stdcall SystemFunction002(ptr ptr ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 09ffa8b..38c533a 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -795,6 +795,30 @@ ULONG WINAPI StartTraceA( PTRACEHANDLE pSessionHandle, LPCSTR SessionName, PEVEN } /****************************************************************************** + * StopTraceW [ADVAPI32.@] + * + * Stop an event trace session + * + */ +ULONG WINAPI StopTraceW( TRACEHANDLE session, LPCWSTR session_name, PEVENT_TRACE_PROPERTIES properties ) +{ + FIXME("(%s, %s, %p) stub\n", wine_dbgstr_longlong(session), debugstr_w(session_name), properties); + return ERROR_SUCCESS; +} + +/****************************************************************************** + * StopTraceA [ADVAPI32.@] + * + * See StopTraceW. + * + */ +ULONG WINAPI StopTraceA( TRACEHANDLE session, LPCSTR session_name, PEVENT_TRACE_PROPERTIES properties ) +{ + FIXME("(%s, %s, %p) stub\n", wine_dbgstr_longlong(session), debugstr_a(session_name), properties); + return ERROR_SUCCESS; +} + +/****************************************************************************** * TraceEvent [ADVAPI32.@] */ ULONG WINAPI TraceEvent( TRACEHANDLE SessionHandle, PEVENT_TRACE_HEADER EventTrace )

1 0

Hans Leidekker : wbemprox: Implement Win32_Processor.UniqueId.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: 4d0a1588084d4dbf7a8032dd122d1ef15e1ceef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d0a1588084d4dbf7a8032dd1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 4 15:37:57 2012 +0200 wbemprox: Implement Win32_Processor.UniqueId. --- dlls/wbemprox/builtin.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 7c7cf24..13c96b8 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -182,6 +182,8 @@ static const WCHAR prop_totalphysicalmemoryW[] = {'T','o','t','a','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR prop_typeW[] = {'T','y','p','e',0}; +static const WCHAR prop_uniqueidW[] = + {'U','n','i','q','u','e','I','d',0}; static const WCHAR prop_versionW[] = {'V','e','r','s','i','o','n',0}; @@ -290,7 +292,8 @@ static const struct column col_processor[] = { prop_maxclockspeedW, CIM_UINT32, VT_I4 }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_numlogicalprocessorsW, CIM_UINT32, VT_I4 }, - { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_uniqueidW, CIM_STRING } }; static const struct column col_service[] = { @@ -462,6 +465,7 @@ struct record_processor const WCHAR *name; UINT32 num_logical_processors; const WCHAR *processor_id; + const WCHAR *unique_id; }; struct record_service { @@ -898,6 +902,7 @@ static void fill_processor( struct table *table ) rec->name = heap_strdupW( name ); rec->num_logical_processors = num_logical_processors; rec->processor_id = heap_strdupW( processor_id ); + rec->unique_id = NULL; offset += sizeof(*rec); }

1 0

Hans Leidekker : wbemprox: Add a partial implementation of Win32_CDROMDrive .
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: ca0d8d8f63fa893ccc96a61f3556e8ed58a09cfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca0d8d8f63fa893ccc96a61f3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 4 15:36:54 2012 +0200 wbemprox: Add a partial implementation of Win32_CDROMDrive. --- dlls/wbemprox/builtin.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 43122fe..9b46a9c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -47,6 +47,8 @@ static const WCHAR class_baseboardW[] = {'W','i','n','3','2','_','B','a','s','e','B','o','a','r','d',0}; static const WCHAR class_biosW[] = {'W','i','n','3','2','_','B','I','O','S',0}; +static const WCHAR class_cdromdriveW[] = + {'W','i','n','3','2','_','C','D','R','O','M','D','r','i','v','e',0}; static const WCHAR class_compsysW[] = {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; static const WCHAR class_logicaldiskW[] = @@ -208,6 +210,10 @@ static const struct column col_bios[] = { prop_serialnumberW, CIM_STRING }, { prop_versionW, CIM_STRING|COL_FLAG_KEY } }; +static const struct column col_cdromdrive[] = +{ + { prop_nameW, CIM_STRING } +}; static const struct column col_compsys[] = { { prop_descriptionW, CIM_STRING }, @@ -318,6 +324,8 @@ static const WCHAR bios_serialnumberW[] = {'0',0}; static const WCHAR bios_versionW[] = {'W','I','N','E',' ',' ',' ','-',' ','1',0}; +static const WCHAR cdromdrive_nameW[] = + {'W','i','n','e',' ','C','D','-','R','O','M',' ','A','T','A',' ','D','e','v','i','c','e',0}; static const WCHAR compsys_descriptionW[] = {'A','T','/','A','T',' ','C','O','M','P','A','T','I','B','L','E',0}; static const WCHAR compsys_domainW[] = @@ -357,6 +365,10 @@ struct record_bios const WCHAR *serialnumber; const WCHAR *version; }; +struct record_cdromdrive +{ + const WCHAR *name; +}; struct record_computersystem { const WCHAR *description; @@ -471,6 +483,10 @@ static const struct record_bios data_bios[] = { { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW, bios_versionW } }; +static const struct record_cdromdrive data_cdromdrive[] = +{ + { cdromdrive_nameW } +}; static const struct record_params data_params[] = { { class_stdregprovW, method_enumkeyW, 1, param_defkeyW, CIM_UINT32, 0x80000002 }, @@ -1114,6 +1130,7 @@ static struct table builtin_classes[] = { { class_baseboardW, SIZEOF(col_baseboard), col_baseboard, SIZEOF(data_baseboard), (BYTE *)data_baseboard }, { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios }, + { class_cdromdriveW, SIZEOF(col_cdromdrive), col_cdromdrive, SIZEOF(data_cdromdrive), (BYTE *)data_cdromdrive }, { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, NULL, fill_compsys }, { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, NULL, fill_logicaldisk }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, NULL, fill_networkadapter },

1 0

Hans Leidekker : wbemprox: Store a copy of the table name.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: b73bbf59734647994911c5c7c8babd295f2afe2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b73bbf59734647994911c5c7c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 4 15:36:14 2012 +0200 wbemprox: Store a copy of the table name. --- dlls/wbemprox/table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index c0e3eef..4305f1f 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -335,7 +335,7 @@ struct table *create_table( const WCHAR *name, UINT num_cols, const struct colum struct table *table; if (!(table = heap_alloc( sizeof(*table) ))) return NULL; - table->name = name; + table->name = heap_strdupW( name ); table->num_cols = num_cols; table->columns = columns; table->num_rows = num_rows;

1 0

Jacek Caban : mshtml: Use proper type for parse_proc.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: 94f3eaacf28595afd668487950ddf5e6268a4af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94f3eaacf28595afd66848795… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 4 14:59:25 2012 +0200 mshtml: Use proper type for parse_proc. --- dlls/mshtml/script.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index efde2a6..1c83acb 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -47,8 +47,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define IActiveScriptParse_Release IActiveScriptParse64_Release #define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew #define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText -#define IActiveScriptParseProcedure_Release IActiveScriptParseProcedure64_Release -#define IActiveScriptParseProcedure_ParseProcedureText IActiveScriptParseProcedure64_ParseProcedureText +#define IActiveScriptParseProcedure2_Release IActiveScriptParseProcedure2_64_Release +#define IActiveScriptParseProcedure2_ParseProcedureText IActiveScriptParseProcedure2_64_ParseProcedureText #else @@ -58,8 +58,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define IActiveScriptParse_Release IActiveScriptParse32_Release #define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew #define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText -#define IActiveScriptParseProcedure_Release IActiveScriptParseProcedure32_Release -#define IActiveScriptParseProcedure_ParseProcedureText IActiveScriptParseProcedure32_ParseProcedureText +#define IActiveScriptParseProcedure2_Release IActiveScriptParseProcedure2_32_Release +#define IActiveScriptParseProcedure2_ParseProcedureText IActiveScriptParseProcedure2_32_ParseProcedureText #endif @@ -80,7 +80,7 @@ struct ScriptHost { IActiveScript *script; IActiveScriptParse *parse; - IActiveScriptParseProcedure *parse_proc; + IActiveScriptParseProcedure2 *parse_proc; SCRIPTSTATE script_state; @@ -214,7 +214,7 @@ static void release_script_engine(ScriptHost *This) default: if(This->parse_proc) { - IActiveScriptParseProcedure_Release(This->parse_proc); + IActiveScriptParseProcedure2_Release(This->parse_proc); This->parse_proc = NULL; } @@ -968,7 +968,7 @@ IDispatch *script_parse_event(HTMLInnerWindow *window, LPCWSTR text) if(!script_host || !script_host->parse_proc) return NULL; - hres = IActiveScriptParseProcedure_ParseProcedureText(script_host->parse_proc, ptr, NULL, emptyW, + hres = IActiveScriptParseProcedure2_ParseProcedureText(script_host->parse_proc, ptr, NULL, emptyW, NULL, NULL, delimiterW, 0 /* FIXME */, 0, SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS, &disp); if(FAILED(hres)) { @@ -1129,7 +1129,7 @@ static IDispatch *parse_event_elem(HTMLDocumentNode *doc, HTMLScriptElement *scr const PRUnichar *text; nsAString_GetData(&nsstr, &text); - hres = IActiveScriptParseProcedure_ParseProcedureText(script_host->parse_proc, text, args, + hres = IActiveScriptParseProcedure2_ParseProcedureText(script_host->parse_proc, text, args, emptyW, NULL, NULL, script_endW, 0, 0, SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS, &disp); if(FAILED(hres))

1 0

Jacek Caban : jscript: Added ParseProcedureText tests.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: 1d542e3aa4dc5ebbae24e0d645583fdf6b29b934 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d542e3aa4dc5ebbae24e0d64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 4 14:57:46 2012 +0200 jscript: Added ParseProcedureText tests. --- dlls/jscript/tests/run.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 30a1f9c..e360515 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -33,6 +33,8 @@ #define IActiveScriptParse_Release IActiveScriptParse64_Release #define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew #define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText +#define IActiveScriptParseProcedure2_Release IActiveScriptParseProcedure2_64_Release +#define IActiveScriptParseProcedure2_ParseProcedureText IActiveScriptParseProcedure2_64_ParseProcedureText #else @@ -40,6 +42,8 @@ #define IActiveScriptParse_Release IActiveScriptParse32_Release #define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew #define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText +#define IActiveScriptParseProcedure2_Release IActiveScriptParseProcedure2_32_Release +#define IActiveScriptParseProcedure2_ParseProcedureText IActiveScriptParseProcedure2_32_ParseProcedureText #endif @@ -134,6 +138,7 @@ static const WCHAR testW[] = {'t','e','s','t',0}; static const CHAR testA[] = "test"; static const WCHAR test_valW[] = {'t','e','s','t','V','a','l',0}; static const CHAR test_valA[] = "testVal"; +static const WCHAR emptyW[] = {0}; static BOOL strict_dispid_check; static const char *test_name = "(null)"; @@ -1255,6 +1260,62 @@ static HRESULT parse_script(DWORD flags, BSTR script_str) return hres; } +static HRESULT invoke_procedure(const char *argsa, const char *sourcea, DISPPARAMS *dp) +{ + IActiveScriptParseProcedure2 *parse_proc; + IActiveScriptParse *parser; + IActiveScript *engine; + IDispatchEx *dispex; + EXCEPINFO ei = {0}; + BSTR source, args; + IDispatch *disp; + VARIANT res; + HRESULT hres; + + engine = create_script(); + if(!engine) + return S_OK; + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + hres = IActiveScriptParse_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParseProcedure2, (void**)&parse_proc); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + source = a2bstr(sourcea); + args = argsa ? a2bstr(argsa) : NULL; + hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, source, args, emptyW, NULL, NULL, NULL, 0, 0, + SCRIPTPROC_HOSTMANAGESSOURCE|SCRIPTPROC_IMPLICIT_THIS|SCRIPTPROC_IMPLICIT_PARENTS, &disp); + ok(hres == S_OK, "ParseProcedureText failed: %08x\n", hres); + SysFreeString(source); + SysFreeString(args); + + hres = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + IDispatch_Release(disp); + + V_VT(&res) = VT_EMPTY; + hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, 0, DISPATCH_METHOD, dp, &res, &ei, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + ok(V_VT(&res) == VT_BOOL && V_BOOL(&res), "InvokeEx returned vt %d (%x)\n", V_VT(&res), V_I4(&res)); + IDispatchEx_Release(dispex); + + IActiveScriptParseProcedure2_Release(parse_proc); + IActiveScript_Release(engine); + IActiveScriptParse_Release(parser); + + return hres; +} + static HRESULT parse_htmlscript(BSTR script_str) { IActiveScriptParse *parser; @@ -1855,6 +1916,19 @@ static BOOL run_tests(void) return TRUE; } +static void test_parse_proc(void) +{ + VARIANT args[2]; + DISPPARAMS dp = {args}; + + dp.cArgs = 0; + invoke_procedure(NULL, "return true;", &dp); + + dp.cArgs = 1; + V_VT(args) = VT_EMPTY; + invoke_procedure(NULL, "return arguments.length == 1;", &dp); +} + static void run_encoded_tests(void) { BSTR src; @@ -1963,6 +2037,8 @@ START_TEST(run) if(run_tests()) { trace("JSctipt.Encode tests...\n"); run_encoded_tests(); + trace("ParseProcedureText tests...\n"); + test_parse_proc(); } }

1 0

Henri Verbeet : wined3d: wined3d_swapchain_get_desc() never fails.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: adddf10cd8002eec3af2aa9316734a7e35eb2c7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=adddf10cd8002eec3af2aa931… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 4 13:53:28 2012 +0200 wined3d: wined3d_swapchain_get_desc() never fails. --- dlls/d3d9/swapchain.c | 5 ++--- dlls/ddraw/ddraw.c | 8 +------- dlls/dxgi/swapchain.c | 12 ++---------- dlls/wined3d/swapchain.c | 4 +--- include/wine/wined3d.h | 2 +- 5 files changed, 7 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 67ef566..57d355a 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -210,16 +210,15 @@ static HRESULT WINAPI d3d9_swapchain_GetPresentParameters(IDirect3DSwapChain9 *i { struct d3d9_swapchain *swapchain = impl_from_IDirect3DSwapChain9(iface); struct wined3d_swapchain_desc desc; - HRESULT hr; TRACE("iface %p, parameters %p.\n", iface, parameters); wined3d_mutex_lock(); - hr = wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &desc); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &desc); wined3d_mutex_unlock(); present_parameters_from_wined3d_swapchain_desc(parameters, &desc); - return hr; + return D3D_OK; } diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e83091e..e7d9302 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2900,13 +2900,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, { struct wined3d_swapchain_desc swapchain_desc; - hr = wined3d_swapchain_get_desc(ddraw->wined3d_swapchain, &swapchain_desc); - if (FAILED(hr)) - { - ERR("Failed to get present parameters.\n"); - return hr; - } - + wined3d_swapchain_get_desc(ddraw->wined3d_swapchain, &swapchain_desc); swapchain_desc.backbuffer_width = mode.width; swapchain_desc.backbuffer_height = mode.height; swapchain_desc.backbuffer_format = mode.format_id; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index fc6f0a0..65b89c2 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -192,7 +192,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain *iface, D { struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); struct wined3d_swapchain_desc wined3d_desc; - HRESULT hr; FIXME("iface %p, desc %p partial stub!\n", iface, desc); @@ -200,14 +199,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain *iface, D return E_INVALIDARG; EnterCriticalSection(&dxgi_cs); - - hr = wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); - if (FAILED(hr)) - { - LeaveCriticalSection(&dxgi_cs); - return hr; - } - + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); LeaveCriticalSection(&dxgi_cs); FIXME("Ignoring ScanlineOrdering, Scaling, SwapEffect and Flags\n"); @@ -227,7 +219,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain *iface, D desc->SwapEffect = DXGI_SWAP_EFFECT_DISCARD; desc->Flags = 0; - return hr; + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeBuffers(IDXGISwapChain *iface, diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1125cc6..2fa221a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -244,14 +244,12 @@ struct wined3d_device * CDECL wined3d_swapchain_get_device(const struct wined3d_ return swapchain->device; } -HRESULT CDECL wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchain, +void CDECL wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchain, struct wined3d_swapchain_desc *desc) { TRACE("swapchain %p, desc %p.\n", swapchain, desc); *desc = swapchain->desc; - - return WINED3D_OK; } HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *swapchain, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2b277ca..521b2b3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2369,7 +2369,7 @@ HRESULT __cdecl wined3d_swapchain_get_front_buffer_data(const struct wined3d_swa HRESULT __cdecl wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain, struct wined3d_gamma_ramp *ramp); void * __cdecl wined3d_swapchain_get_parent(const struct wined3d_swapchain *swapchain); -HRESULT __cdecl wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchain, +void __cdecl wined3d_swapchain_get_desc(const struct wined3d_swapchain *swapchain, struct wined3d_swapchain_desc *desc); HRESULT __cdecl wined3d_swapchain_get_raster_status(const struct wined3d_swapchain *swapchain, struct wined3d_raster_status *raster_status);

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapter.Manufacturer.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: fe695f3ef9e60fe493269e3a6d9f8791bb9df703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe695f3ef9e60fe493269e3a6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 4 15:38:18 2012 +0200 wbemprox: Implement Win32_NetworkAdapter.Manufacturer. --- dlls/wbemprox/builtin.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 13c96b8..9beb3e2 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -252,6 +252,7 @@ static const struct column col_networkadapter[] = { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_interfaceindexW, CIM_UINT32, VT_I4 }, { prop_macaddressW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_manufacturerW, CIM_STRING }, { prop_netconnectionstatusW, CIM_UINT16, VT_I4 }, { prop_pnpdeviceidW, CIM_STRING }, { prop_speedW, CIM_UINT64 } @@ -424,6 +425,7 @@ struct record_networkadapter const WCHAR *device_id; INT32 interface_index; const WCHAR *mac_address; + const WCHAR *manufacturer; UINT16 netconnection_status; const WCHAR *pnpdevice_id; UINT64 speed; @@ -741,6 +743,7 @@ static void fill_networkadapter( struct table *table ) rec->device_id = heap_strdupW( device_id ); rec->interface_index = aa->u.s.IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); + rec->manufacturer = compsys_manufacturerW; rec->netconnection_status = get_connection_status( aa->OperStatus ); rec->pnpdevice_id = networkadapter_pnpdeviceidW; rec->speed = 1000000;

1 0

Hans Leidekker : wbemprox: Add a partial implementation of Win32_SoundDevice.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: eeb8ea7aca1514b5a5d4effe47fb5c89b32e49ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb8ea7aca1514b5a5d4effe4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 4 15:37:32 2012 +0200 wbemprox: Add a partial implementation of Win32_SoundDevice. --- dlls/wbemprox/builtin.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 3a61417..7c7cf24 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -67,6 +67,8 @@ static const WCHAR class_processorW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; static const WCHAR class_serviceW[] = {'W','i','n','3','2','_','S','e','r','v','i','c','e',0}; +static const WCHAR class_sounddeviceW[] = + {'W','i','n','3','2','_','S','o','u','n','d','D','e','v','i','c','e',0}; static const WCHAR class_stdregprovW[] = {'S','t','d','R','e','g','P','r','o','v',0}; static const WCHAR class_videocontrollerW[] = @@ -152,6 +154,8 @@ static const WCHAR prop_processidW[] = {'P','r','o','c','e','s','s','I','D',0}; static const WCHAR prop_processoridW[] = {'P','r','o','c','e','s','s','o','r','I','d',0}; +static const WCHAR prop_productnameW[] = + {'P','r','o','d','u','c','t','N','a','m','e',0}; static const WCHAR prop_releasedateW[] = {'R','e','l','e','a','s','e','D','a','t','e',0}; static const WCHAR prop_serialnumberW[] = @@ -300,6 +304,10 @@ static const struct column col_service[] = { prop_stateW, CIM_STRING }, { prop_systemnameW, CIM_STRING|COL_FLAG_DYNAMIC } }; +static const struct column col_sounddevice[] = +{ + { prop_productnameW, CIM_STRING } +}; static const struct column col_stdregprov[] = { { method_enumkeyW, CIM_OBJECT|COL_FLAG_METHOD }, @@ -359,6 +367,8 @@ static const WCHAR os_32bitW[] = {'3','2','-','b','i','t',0}; static const WCHAR os_64bitW[] = {'6','4','-','b','i','t',0}; +static const WCHAR sounddevice_productnameW[] = + {'W','i','n','e',' ','A','u','d','i','o',' ','D','e','v','i','c','e',0}; static const WCHAR videocontroller_deviceidW[] = {'V','i','d','e','o','C','o','n','t','r','o','l','l','e','r','1',0}; @@ -465,6 +475,10 @@ struct record_service const WCHAR *state; const WCHAR *systemname; }; +struct record_sounddevice +{ + const WCHAR *productname; +}; struct record_stdregprov { class_method *enumkey; @@ -521,6 +535,10 @@ static const struct record_params data_params[] = { class_stdregprovW, method_enumvaluesW, -1, param_namesW, CIM_STRING|CIM_FLAG_ARRAY }, { class_stdregprovW, method_enumvaluesW, -1, param_typesW, CIM_SINT32|CIM_FLAG_ARRAY } }; +static const struct record_sounddevice data_sounddevice[] = +{ + { sounddevice_productnameW } +}; static const struct record_stdregprov data_stdregprov[] = { { reg_enumkey, reg_enumvalues } @@ -1162,6 +1180,7 @@ static struct table builtin_classes[] = { class_processW, SIZEOF(col_process), col_process, 0, NULL, fill_process }, { class_processorW, SIZEOF(col_processor), col_processor, 0, NULL, fill_processor }, { class_serviceW, SIZEOF(col_service), col_service, 0, NULL, fill_service }, + { class_sounddeviceW, SIZEOF(col_sounddevice), col_sounddevice, SIZEOF(data_sounddevice), (BYTE *)data_sounddevice }, { class_stdregprovW, SIZEOF(col_stdregprov), col_stdregprov, SIZEOF(data_stdregprov), (BYTE *)data_stdregprov }, { class_videocontrollerW, SIZEOF(col_videocontroller), col_videocontroller, 0, NULL, fill_videocontroller } };

1 0

Hans Leidekker : wbemprox: Add a partial implementation of Win32_DiskDrive.
by Alexandre Julliard Oct. 4, 2012

Oct. 4, 2012

Module: wine Branch: master Commit: fd37af04ff8316e141eed7cc0d8b7bb2b0e33e87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd37af04ff8316e141eed7cc0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 4 15:37:13 2012 +0200 wbemprox: Add a partial implementation of Win32_DiskDrive. --- dlls/wbemprox/builtin.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9b46a9c..3a61417 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -51,6 +51,8 @@ static const WCHAR class_cdromdriveW[] = {'W','i','n','3','2','_','C','D','R','O','M','D','r','i','v','e',0}; static const WCHAR class_compsysW[] = {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; +static const WCHAR class_diskdriveW[] = + {'W','i','n','3','2','_','D','i','s','k','D','r','i','v','e',0}; static const WCHAR class_logicaldiskW[] = {'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k',0}; static const WCHAR class_networkadapterW[] = @@ -225,6 +227,12 @@ static const struct column col_compsys[] = { prop_numprocessorsW, CIM_UINT32, VT_I4 }, { prop_totalphysicalmemoryW, CIM_UINT64 } }; +static const struct column col_diskdrive[] = +{ + { prop_manufacturerW, CIM_STRING }, + { prop_modelW, CIM_STRING }, + { prop_serialnumberW, CIM_STRING } +}; static const struct column col_logicaldisk[] = { { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, @@ -334,6 +342,10 @@ static const WCHAR compsys_manufacturerW[] = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}; static const WCHAR compsys_modelW[] = {'W','i','n','e',0}; +static const WCHAR diskdrive_modelW[] = + {'W','i','n','e',' ','D','i','s','k',' ','D','r','i','v','e',0}; +static const WCHAR diskdrive_manufacturerW[] = + {'(','S','t','a','n','d','a','r','d',' ','d','i','s','k',' ','d','r','i','v','e','s',')',0}; static const WCHAR networkadapter_pnpdeviceidW[]= {'P','C','I','\\','V','E','N','_','8','0','8','6','&','D','E','V','_','1','0','0','E','&', 'S','U','B','S','Y','S','_','0','0','1','E','8','0','8','6','&','R','E','V','_','0','2','\\', @@ -380,6 +392,12 @@ struct record_computersystem UINT32 num_processors; UINT64 total_physical_memory; }; +struct record_diskdrive +{ + const WCHAR *manufacturer; + const WCHAR *name; + const WCHAR *serialnumber; +}; struct record_logicaldisk { const WCHAR *device_id; @@ -487,6 +505,10 @@ static const struct record_cdromdrive data_cdromdrive[] = { { cdromdrive_nameW } }; +static const struct record_diskdrive data_diskdrive[] = +{ + { diskdrive_manufacturerW, diskdrive_modelW } +}; static const struct record_params data_params[] = { { class_stdregprovW, method_enumkeyW, 1, param_defkeyW, CIM_UINT32, 0x80000002 }, @@ -1132,6 +1154,7 @@ static struct table builtin_classes[] = { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios }, { class_cdromdriveW, SIZEOF(col_cdromdrive), col_cdromdrive, SIZEOF(data_cdromdrive), (BYTE *)data_cdromdrive }, { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, NULL, fill_compsys }, + { class_diskdriveW, SIZEOF(col_diskdrive), col_diskdrive, SIZEOF(data_diskdrive), (BYTE *)data_diskdrive }, { class_logicaldiskW, SIZEOF(col_logicaldisk), col_logicaldisk, 0, NULL, fill_logicaldisk }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, NULL, fill_networkadapter }, { class_osW, SIZEOF(col_os), col_os, 0, NULL, fill_os },

1 0