July 2012 - Wine-Commits - list.winehq.org

Henri Verbeet : winex11: Simplify the XRandR mode matching code a bit.
by Alexandre Julliard July 13, 2012

July 13, 2012

Module: wine Branch: master Commit: 92e04256a91b77483cfa7dd6ca17459091046862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e04256a91b77483cfa7dd6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 13 12:53:10 2012 +0200 winex11: Simplify the XRandR mode matching code a bit. --- dlls/winex11.drv/xrandr.c | 130 +++++++++++++++++++-------------------------- 1 files changed, 54 insertions(+), 76 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 83137a4..dfe392e 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -50,12 +50,8 @@ MAKE_FUNCPTR(XRRSizes) extern int usexrandr; static struct x11drv_mode_info *dd_modes; -static unsigned int dd_mode_count; -static XRRScreenSize *real_xrandr_sizes; -static short **real_xrandr_rates; -static int real_xrandr_sizes_count; -static int *real_xrandr_rates_count; -static unsigned int real_xrandr_modes_count; +static SizeID *xrandr_modes; +static unsigned int xrandr_mode_count; static int load_xrandr(void) { @@ -112,15 +108,13 @@ static int X11DRV_XRandR_GetCurrentMode(void) rate = pXRRConfigCurrentRate (sc); pXRRFreeScreenConfigInfo(sc); wine_tsx11_unlock(); - for (i = 0; i < real_xrandr_modes_count; i++) + for (i = 0; i < xrandr_mode_count; ++i) { - if ( (dd_modes[i].width == real_xrandr_sizes[size].width ) && - (dd_modes[i].height == real_xrandr_sizes[size].height) && - (dd_modes[i].refresh_rate == rate ) ) - { - res = i; - break; - } + if (xrandr_modes[i] == size && dd_modes[i].refresh_rate == rate) + { + res = i; + break; + } } if (res == -1) { @@ -136,52 +130,28 @@ static LONG X11DRV_XRandR_SetCurrentMode(int mode) Rotation rot; Window root; XRRScreenConfiguration *sc; - Status stat = RRSetConfigSuccess; + Status stat; short rate; - unsigned int i; - int j; wine_tsx11_lock(); root = RootWindow (gdi_display, DefaultScreen(gdi_display)); sc = pXRRGetScreenInfo (gdi_display, root); size = pXRRConfigCurrentConfiguration (sc, &rot); - mode = mode%real_xrandr_modes_count; + mode = mode % xrandr_mode_count; TRACE("Changing Resolution to %dx%d @%d Hz\n", dd_modes[mode].width, dd_modes[mode].height, dd_modes[mode].refresh_rate); - for (i = 0; i < real_xrandr_sizes_count; i++) - { - if ( (dd_modes[mode].width == real_xrandr_sizes[i].width ) && - (dd_modes[mode].height == real_xrandr_sizes[i].height) ) - { - size = i; - if (real_xrandr_rates_count[i]) - { - for (j=0; j < real_xrandr_rates_count[i]; j++) - { - if (dd_modes[mode].refresh_rate == real_xrandr_rates[i][j]) - { - rate = real_xrandr_rates[i][j]; - TRACE("Resizing X display to %dx%d @%d Hz\n", - dd_modes[mode].width, dd_modes[mode].height, rate); - stat = pXRRSetScreenConfigAndRate (gdi_display, sc, root, - size, rot, rate, CurrentTime); - break; - } - } - } - else - { - TRACE("Resizing X display to %dx%d <default Hz>\n", - dd_modes[mode].width, dd_modes[mode].height); - stat = pXRRSetScreenConfig (gdi_display, sc, root, size, rot, CurrentTime); - } - break; - } - } + size = xrandr_modes[mode]; + rate = dd_modes[mode].refresh_rate; + + if (rate) + stat = pXRRSetScreenConfigAndRate( gdi_display, sc, root, size, rot, rate, CurrentTime ); + else + stat = pXRRSetScreenConfig( gdi_display, sc, root, size, rot, CurrentTime ); + pXRRFreeScreenConfigInfo(sc); wine_tsx11_unlock(); if (stat == RRSetConfigSuccess) @@ -196,30 +166,29 @@ static LONG X11DRV_XRandR_SetCurrentMode(int mode) static void xrandr_init_modes(void) { + XRRScreenSize *sizes; + int sizes_count; int i, j, nmodes = 0; - real_xrandr_sizes = pXRRSizes( gdi_display, DefaultScreen(gdi_display), &real_xrandr_sizes_count); - if (real_xrandr_sizes_count <= 0) return; + sizes = pXRRSizes( gdi_display, DefaultScreen(gdi_display), &sizes_count ); + if (sizes_count <= 0) return; - TRACE("XRandR: found %u sizes.\n", real_xrandr_sizes_count); - real_xrandr_rates = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(short *) * real_xrandr_sizes_count ); - real_xrandr_rates_count = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(int) * real_xrandr_sizes_count ); - for (i = 0; i < real_xrandr_sizes_count; ++i) + TRACE("XRandR: found %d sizes.\n", sizes_count); + for (i = 0; i < sizes_count; ++i) { - real_xrandr_rates[i] = pXRRRates( gdi_display, DefaultScreen(gdi_display), - i, &real_xrandr_rates_count[i] ); - TRACE("- at %d: %dx%d (%d rates):", i, real_xrandr_sizes[i].width, - real_xrandr_sizes[i].height, real_xrandr_rates_count[i]); - if (real_xrandr_rates_count[i]) + int rates_count; + short *rates; + + rates = pXRRRates( gdi_display, DefaultScreen(gdi_display), i, &rates_count ); + TRACE("- at %d: %dx%d (%d rates):", i, sizes[i].width, sizes[i].height, rates_count); + if (rates_count) { - nmodes += real_xrandr_rates_count[i]; - for (j = 0; j < real_xrandr_rates_count[i]; ++j) + nmodes += rates_count; + for (j = 0; j < rates_count; ++j) { if (j > 0) TRACE(","); - TRACE(" %d", real_xrandr_rates[i][j]); + TRACE(" %d", rates[j]); } } else @@ -230,37 +199,46 @@ static void xrandr_init_modes(void) TRACE(" Hz\n"); } - real_xrandr_modes_count = nmodes; TRACE("XRandR modes: count=%d\n", nmodes); + if (!(xrandr_modes = HeapAlloc( GetProcessHeap(), 0, sizeof(*xrandr_modes) * nmodes ))) + { + ERR("Failed to allocate xrandr mode info array.\n"); + return; + } + dd_modes = X11DRV_Settings_SetHandlers( "XRandR", X11DRV_XRandR_GetCurrentMode, X11DRV_XRandR_SetCurrentMode, nmodes, 1 ); - for (i = 0; i < real_xrandr_sizes_count; ++i) + xrandr_mode_count = 0; + for (i = 0; i < sizes_count; ++i) { - if (real_xrandr_rates_count[i]) + int rates_count; + short *rates; + + rates = pXRRRates( gdi_display, DefaultScreen(gdi_display), i, &rates_count ); + + if (rates_count) { - for (j = 0; j < real_xrandr_rates_count[i]; ++j) + for (j = 0; j < rates_count; ++j) { - X11DRV_Settings_AddOneMode( real_xrandr_sizes[i].width, - real_xrandr_sizes[i].height, - 0, real_xrandr_rates[i][j] ); + X11DRV_Settings_AddOneMode( sizes[i].width, sizes[i].height, 0, rates[j] ); + xrandr_modes[xrandr_mode_count++] = i; } } else { - X11DRV_Settings_AddOneMode( real_xrandr_sizes[i].width, - real_xrandr_sizes[i].height, - 0, 0 ); + X11DRV_Settings_AddOneMode( sizes[i].width, sizes[i].height, 0, 0 ); + xrandr_modes[xrandr_mode_count++] = i; } } X11DRV_Settings_AddDepthModes(); - dd_mode_count = X11DRV_Settings_GetModeCount(); + nmodes = X11DRV_Settings_GetModeCount(); - TRACE("Available DD modes: count=%d\n", dd_mode_count); + TRACE("Available DD modes: count=%d\n", nmodes); TRACE("Enabling XRandR\n"); }

1 0

Nikolay Sivov : ole32: COM cleanup for IStorage interface of base storage implementation.
by Alexandre Julliard July 13, 2012

July 13, 2012

Module: wine Branch: master Commit: 0c658860b12213d4ce6d972cde27398da5398e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c658860b12213d4ce6d972cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 13 14:37:58 2012 +0400 ole32: COM cleanup for IStorage interface of base storage implementation. --- dlls/ole32/stg_prop.c | 2 +- dlls/ole32/storage32.c | 135 +++++++++++++++++++++-------------------------- dlls/ole32/storage32.h | 16 ++---- 3 files changed, 66 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c658860b12213d4ce6d9…

1 0

Henri Verbeet : ddraw: Get rid of some redundant TRACE_ON invocations.
by Alexandre Julliard July 13, 2012

July 13, 2012

Module: wine Branch: master Commit: d4fa0d8de292db5c25563646a8797e0d0c2b7ca0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fa0d8de292db5c25563646a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 13 12:53:08 2012 +0200 ddraw: Get rid of some redundant TRACE_ON invocations. --- dlls/ddraw/surface.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 3f9f78f..bb594be 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -712,14 +712,11 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa surf = This->complex_array[i]; if(!surf) break; - if (TRACE_ON(ddraw)) - { - TRACE("Surface: (%p) caps: %x,%x,%x,%x\n", surf, - surf->surface_desc.ddsCaps.dwCaps, - surf->surface_desc.ddsCaps.dwCaps2, - surf->surface_desc.ddsCaps.dwCaps3, - surf->surface_desc.ddsCaps.dwCaps4); - } + TRACE("Surface: (%p) caps: %#x, %#x, %#x, %#x.\n", surf, + surf->surface_desc.ddsCaps.dwCaps, + surf->surface_desc.ddsCaps.dwCaps2, + surf->surface_desc.ddsCaps.dwCaps3, + surf->surface_desc.ddsCaps.dwCaps4); if (((surf->surface_desc.ddsCaps.dwCaps & our_caps.dwCaps) == our_caps.dwCaps) && ((surf->surface_desc.ddsCaps.dwCaps2 & our_caps.dwCaps2) == our_caps.dwCaps2)) { @@ -745,14 +742,11 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa while( (surf = surf->next_attached) ) { - if (TRACE_ON(ddraw)) - { - TRACE("Surface: (%p) caps: %x,%x,%x,%x\n", surf, - surf->surface_desc.ddsCaps.dwCaps, - surf->surface_desc.ddsCaps.dwCaps2, - surf->surface_desc.ddsCaps.dwCaps3, - surf->surface_desc.ddsCaps.dwCaps4); - } + TRACE("Surface: (%p) caps: %#x, %#x, %#x, %#x.\n", surf, + surf->surface_desc.ddsCaps.dwCaps, + surf->surface_desc.ddsCaps.dwCaps2, + surf->surface_desc.ddsCaps.dwCaps3, + surf->surface_desc.ddsCaps.dwCaps4); if (((surf->surface_desc.ddsCaps.dwCaps & our_caps.dwCaps) == our_caps.dwCaps) && ((surf->surface_desc.ddsCaps.dwCaps2 & our_caps.dwCaps2) == our_caps.dwCaps2)) {

1 0

Jacek Caban : mshtml: Added HTMLElement::onkeypress implementation.
by Alexandre Julliard July 13, 2012

July 13, 2012

Module: wine Branch: master Commit: 6942dd0862f487e3228fc6aa8c4be161d36dd5cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6942dd0862f487e3228fc6aa8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 13 14:44:59 2012 +0200 mshtml: Added HTMLElement::onkeypress implementation. --- dlls/mshtml/htmlelem.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 62df8b8..82967d8 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -568,15 +568,19 @@ static HRESULT WINAPI HTMLElement_get_onkeyup(IHTMLElement *iface, VARIANT *p) static HRESULT WINAPI HTMLElement_put_onkeypress(IHTMLElement *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_KEYPRESS, &v); } static HRESULT WINAPI HTMLElement_get_onkeypress(IHTMLElement *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_KEYPRESS, p); } static HRESULT WINAPI HTMLElement_put_onmouseout(IHTMLElement *iface, VARIANT v)

1 0

Jacek Caban : mshtml: Moved invoking DISPID_VALUE to separated function.
by Alexandre Julliard July 13, 2012

July 13, 2012

Module: wine Branch: master Commit: 01af42a4270d67027ba44cb93e39f16aa4a5e4ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=01af42a4270d67027ba44cb93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 13 14:46:26 2012 +0200 mshtml: Moved invoking DISPID_VALUE to separated function. --- dlls/mshtml/dispex.c | 77 ++++++++++++++++++++++++++++---------------------- 1 files changed, 43 insertions(+), 34 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 66dad69..39dfa64 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -646,6 +646,47 @@ static func_disp_t *create_func_disp(DispatchEx *obj, func_info_t *info) return ret; } +static HRESULT invoke_disp_value(DispatchEx *This, IDispatch *func_disp, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + DISPID named_arg = DISPID_THIS; + DISPPARAMS new_dp = {NULL, &named_arg, 0, 1}; + IDispatchEx *dispex; + HRESULT hres; + + if(dp->cNamedArgs) { + FIXME("named args not supported\n"); + return E_NOTIMPL; + } + + new_dp.rgvarg = heap_alloc((dp->cArgs+1)*sizeof(VARIANTARG)); + if(!new_dp.rgvarg) + return E_OUTOFMEMORY; + + new_dp.cArgs = dp->cArgs+1; + memcpy(new_dp.rgvarg+1, dp->rgvarg, dp->cArgs*sizeof(VARIANTARG)); + + V_VT(new_dp.rgvarg) = VT_DISPATCH; + V_DISPATCH(new_dp.rgvarg) = (IDispatch*)&This->IDispatchEx_iface; + + hres = IDispatch_QueryInterface(func_disp, &IID_IDispatchEx, (void**)&dispex); + TRACE(">>>\n"); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, lcid, flags, &new_dp, res, ei, caller); + IDispatchEx_Release(dispex); + }else { + ULONG err = 0; + hres = IDispatch_Invoke(func_disp, DISPID_VALUE, &IID_NULL, lcid, flags, &new_dp, res, ei, &err); + } + if(SUCCEEDED(hres)) + TRACE("<<< %s\n", debugstr_variant(res)); + else + WARN("<<< %08x\n", hres); + + heap_free(new_dp.rgvarg); + return hres; +} + static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei) { @@ -1108,45 +1149,13 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc if(!pvarRes) return E_INVALIDARG; /* fall through */ - case DISPATCH_METHOD: { - DISPID named_arg = DISPID_THIS; - DISPPARAMS dp = {NULL, &named_arg, 0, 1}; - IDispatchEx *dispex; - + case DISPATCH_METHOD: if(V_VT(&prop->var) != VT_DISPATCH) { FIXME("invoke %s\n", debugstr_variant(&prop->var)); return E_NOTIMPL; } - if(pdp->cNamedArgs) { - FIXME("named args not supported\n"); - return E_NOTIMPL; - } - - dp.rgvarg = heap_alloc((pdp->cArgs+1)*sizeof(VARIANTARG)); - if(!dp.rgvarg) - return E_OUTOFMEMORY; - - dp.cArgs = pdp->cArgs+1; - memcpy(dp.rgvarg+1, pdp->rgvarg, pdp->cArgs*sizeof(VARIANTARG)); - - V_VT(dp.rgvarg) = VT_DISPATCH; - V_DISPATCH(dp.rgvarg) = (IDispatch*)&This->IDispatchEx_iface; - - hres = IDispatch_QueryInterface(V_DISPATCH(&prop->var), &IID_IDispatchEx, (void**)&dispex); - TRACE("%s call\n", debugstr_w(This->dynamic_data->props[idx].name)); - if(SUCCEEDED(hres)) { - hres = IDispatchEx_InvokeEx(dispex, DISPID_VALUE, lcid, wFlags, &dp, pvarRes, pei, pspCaller); - IDispatchEx_Release(dispex); - }else { - ULONG err = 0; - hres = IDispatch_Invoke(V_DISPATCH(&prop->var), DISPID_VALUE, &IID_NULL, lcid, wFlags, pdp, pvarRes, pei, &err); - } - TRACE("%s ret %08x\n", debugstr_w(This->dynamic_data->props[idx].name), hres); - - heap_free(dp.rgvarg); - return hres; - } + return invoke_disp_value(This, V_DISPATCH(&prop->var), lcid, wFlags, pdp, pvarRes, pei, pspCaller); case DISPATCH_PROPERTYGET: if(prop->flags & DYNPROP_DELETED) return DISP_E_UNKNOWNNAME;

1 0

Jacek Caban : mshtml: Added support for calling functions returned by builtin getters.
by Alexandre Julliard July 13, 2012

July 13, 2012

Module: wine Branch: master Commit: 61ded412a2ced9ee7af7b50ad393ad2c23170e58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ded412a2ced9ee7af7b50ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 13 14:46:41 2012 +0200 mshtml: Added support for calling functions returned by builtin getters. --- dlls/mshtml/dispex.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 39dfa64..bbe6098 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -849,7 +849,7 @@ static HRESULT builtin_propget(DispatchEx *This, func_info_t *func, DISPPARAMS * IUnknown *iface; HRESULT hres; - if(dp->cArgs) { + if(dp && dp->cArgs) { FIXME("cArgs %d\n", dp->cArgs); return E_NOTIMPL; } @@ -961,7 +961,25 @@ static HRESULT invoke_builtin_prop(DispatchEx *This, DISPID id, LCID lcid, WORD hres = builtin_propget(This, func, dp, res); break; default: - hres = typeinfo_invoke(This, func, flags, dp, res, ei); + if(!func->get_vtbl_off) { + hres = typeinfo_invoke(This, func, flags, dp, res, ei); + }else { + VARIANT v; + + hres = builtin_propget(This, func, NULL, &v); + if(FAILED(hres)) + return hres; + + if(V_VT(&v) != VT_DISPATCH) { + FIXME("Not a function %s\n", debugstr_variant(&v)); + VariantClear(&v); + return E_FAIL; + } + + hres = invoke_disp_value(This, V_DISPATCH(&v), lcid, flags, dp, res, ei, caller); + + IDispatch_Release(V_DISPATCH(&v)); + } } return hres;

1 0

Henri Verbeet : winex11: Fix the virtual desktop check in update_desktop_fullscreen().
by Alexandre Julliard July 13, 2012

July 13, 2012

Module: wine Branch: master Commit: 401d12085bc897e973badee3260aa41389c63c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=401d12085bc897e973badee32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 13 12:53:11 2012 +0200 winex11: Fix the virtual desktop check in update_desktop_fullscreen(). --- dlls/winex11.drv/desktop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 81a64b1..c75c54c 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -208,7 +208,7 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) Display *display = thread_display(); XEvent xev; - if (!display || root_window != DefaultRootWindow( display )) return; + if (!display || root_window == DefaultRootWindow( display )) return; xev.xclient.type = ClientMessage; xev.xclient.window = root_window;

1 0

Jacek Caban : jscript: Prefer builtin version.
by Alexandre Julliard July 13, 2012

July 13, 2012

Module: wine Branch: master Commit: 8613d5e9ccfabcff1ba7054b981a027a904f79ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=8613d5e9ccfabcff1ba7054b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 13 16:10:13 2012 +0200 jscript: Prefer builtin version. --- dlls/jscript/jscript_main.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index c7419fc..bc1aa6a 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -136,10 +136,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ + switch(fdwReason) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); jscript_hinstance = hInstDLL;

1 0

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapter. MACAddress and Win32_NetworkAdapter.PNPDeviceID.
by Alexandre Julliard July 13, 2012

July 13, 2012

Module: wine Branch: master Commit: 5acdba54a0534a41ec8267bb4d4bb8d1dfb551f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5acdba54a0534a41ec8267bb4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 13 11:34:17 2012 +0200 wbemprox: Implement Win32_NetworkAdapter.MACAddress and Win32_NetworkAdapter.PNPDeviceID. --- dlls/wbemprox/builtin.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 53f9c6d..7993d6e 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -88,6 +88,8 @@ static const WCHAR prop_handleW[] = {'H','a','n','d','l','e',0}; static const WCHAR prop_interfaceindexW[] = {'I','n','t','e','r','f','a','c','e','I','n','d','e','x',0}; +static const WCHAR prop_macaddressW[] = + {'M','A','C','A','d','d','r','e','s','s',0}; static const WCHAR prop_manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; static const WCHAR prop_modelW[] = @@ -104,6 +106,8 @@ static const WCHAR prop_osarchitectureW[] = {'O','S','A','r','c','h','i','t','e','c','t','u','r','e',0}; static const WCHAR prop_oslanguageW[] = {'O','S','L','a','n','g','u','a','g','e',0}; +static const WCHAR prop_pnpdeviceidW[] = + {'P','N','P','D','e','v','i','c','e','I','D',0}; static const WCHAR prop_pprocessidW[] = {'P','a','r','e','n','t','P','r','o','c','e','s','s','I','D',0}; static const WCHAR prop_processidW[] = @@ -162,7 +166,9 @@ 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_netconnectionstatusW, CIM_UINT16, VT_I4 }, + { prop_pnpdeviceidW, CIM_STRING }, { prop_speedW, CIM_UINT64 } }; static const struct column col_os[] = @@ -221,6 +227,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 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','\\', + '3','&','2','6','7','A','6','1','6','A','&','1','&','1','8',0}; static const WCHAR os_captionW[] = {'M','i','c','r','o','s','o','f','t',' ','W','i','n','d','o','w','s',' ','X','P',' ', 'V','e','r','s','i','o','n',' ','=',' ','5','.','1','.','2','6','0','0',0}; @@ -268,7 +278,9 @@ struct record_networkadapter { const WCHAR *device_id; INT32 interface_index; + const WCHAR *mac_address; UINT16 netconnection_status; + const WCHAR *pnpdevice_id; UINT64 speed; }; struct record_operatingsystem @@ -439,6 +451,17 @@ static UINT16 get_connection_status( IF_OPER_STATUS status ) } return 0; } +static WCHAR *get_mac_address( const BYTE *addr, DWORD len ) +{ + static const WCHAR fmtW[] = + {'%','0','2','x',':','%','0','2','x',':','%','0','2','x',':', + '%','0','2','x',':','%','0','2','x',':','%','0','2','x',0}; + WCHAR *ret; + + if (len != 6 || !(ret = heap_alloc( 18 * sizeof(WCHAR) ))) return NULL; + sprintfW( ret, fmtW, addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] ); + return ret; +} static void fill_networkadapter( struct table *table ) { @@ -470,7 +493,9 @@ static void fill_networkadapter( struct table *table ) sprintfW( device_id, fmtW, aa->u.s.IfIndex ); 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->netconnection_status = get_connection_status( aa->OperStatus ); + rec->pnpdevice_id = networkadapter_pnpdeviceidW; rec->speed = 1000000; offset += sizeof(*rec); }

1 0

Dmitry Timoshkov : windowscodecs: Use predefined WICBitmapPaletteTypeFixedGray4 palette instead of a handmade one .
by Alexandre Julliard July 13, 2012

July 13, 2012

Module: wine Branch: master Commit: 045ac64c1a65a59ddda67d190ab821680175d068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=045ac64c1a65a59ddda67d190… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 13 10:07:37 2012 +0900 windowscodecs: Use predefined WICBitmapPaletteTypeFixedGray4 palette instead of a handmade one. --- dlls/windowscodecs/converter.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index e404464..bd83be3 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -185,21 +185,19 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe IWICPalette *palette; UINT actualcolors; - if (source_format == format_2bppIndexed) - { - res = PaletteImpl_Create(&palette); - if (FAILED(res)) return res; + res = PaletteImpl_Create(&palette); + if (FAILED(res)) return res; + if (source_format == format_2bppIndexed) res = IWICBitmapSource_CopyPalette(This->source, palette); - if (SUCCEEDED(res)) - res = IWICPalette_GetColors(palette, 4, colors, &actualcolors); + else + res = IWICPalette_InitializePredefined(palette, WICBitmapPaletteTypeFixedGray4, FALSE); - IWICPalette_Release(palette); + if (SUCCEEDED(res)) + res = IWICPalette_GetColors(palette, 4, colors, &actualcolors); - if (FAILED(res)) return res; - } - else - make_grayscale_palette(colors, 4); + IWICPalette_Release(palette); + if (FAILED(res)) return res; srcstride = (prc->Width+3)/4; srcdatasize = srcstride * prc->Height;

1 0