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

Henri Verbeet : wined3d: Use the device name stored in the adapter in wined3d_enum_adapter_modes().
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: e9d0367d296994edb512170fa7839a2d728de25c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d0367d296994edb512170fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 28 13:11:12 2012 +0200 wined3d: Use the device name stored in the adapter in wined3d_enum_adapter_modes(). --- dlls/wined3d/directx.c | 94 ++++++++++++++++++++++------------------------- 1 files changed, 44 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b02f01e..875c333 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2942,71 +2942,65 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad HRESULT CDECL wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, UINT mode_idx, struct wined3d_display_mode *mode) { + const struct wined3d_adapter *adapter; + const struct wined3d_format *format; + UINT format_bits; + DEVMODEW m; + UINT i = 0; + int j = 0; + TRACE("wined3d %p, adapter_idx %u, format %s, mode_idx %u, mode %p.\n", wined3d, adapter_idx, debug_d3dformat(format_id), mode_idx, mode); if (!mode || adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; - /* TODO: Store modes per adapter and read it from the adapter structure */ - if (!adapter_idx) - { - const struct wined3d_format *format = wined3d_get_format(&wined3d->adapters[adapter_idx].gl_info, format_id); - UINT format_bits = format->byte_count * CHAR_BIT; - DEVMODEW DevModeW; - UINT i = 0; - int j = 0; + adapter = &wined3d->adapters[adapter_idx]; + format = wined3d_get_format(&adapter->gl_info, format_id); + format_bits = format->byte_count * CHAR_BIT; - ZeroMemory(&DevModeW, sizeof(DevModeW)); - DevModeW.dmSize = sizeof(DevModeW); + memset(&m, 0, sizeof(m)); + m.dmSize = sizeof(m); - /* If we are filtering to a specific format (D3D9), then need to skip - all unrelated modes, but if mode is irrelevant (D3D8), then we can - just count through the ones with valid bit depths */ - while (i <= mode_idx) + while (i <= mode_idx) + { + if (!EnumDisplaySettingsExW(adapter->DeviceName, j++, &m, 0)) { - if (!EnumDisplaySettingsExW(NULL, j++, &DevModeW, 0)) - { - WARN("Invalid mode_idx %u.\n", mode_idx); - return WINED3DERR_INVALIDCALL; - } - - if (format_id == WINED3DFMT_UNKNOWN) - { - /* This is for D3D8, do not enumerate P8 here */ - if (DevModeW.dmBitsPerPel == 32 || DevModeW.dmBitsPerPel == 16) ++i; - } - else if (DevModeW.dmBitsPerPel == format_bits) - { - ++i; - } + WARN("Invalid mode_idx %u.\n", mode_idx); + return WINED3DERR_INVALIDCALL; } - mode->width = DevModeW.dmPelsWidth; - mode->height = DevModeW.dmPelsHeight; - mode->refresh_rate = DEFAULT_REFRESH_RATE; - if (DevModeW.dmFields & DM_DISPLAYFREQUENCY) - mode->refresh_rate = DevModeW.dmDisplayFrequency; - if (format_id == WINED3DFMT_UNKNOWN) - mode->format_id = pixelformat_for_depth(DevModeW.dmBitsPerPel); - else - mode->format_id = format_id; + { + /* This is for d3d8, do not enumerate P8 here. */ + if (m.dmBitsPerPel == 32 || m.dmBitsPerPel == 16) ++i; + } + else if (m.dmBitsPerPel == format_bits) + { + ++i; + } + } - if (!(DevModeW.dmFields & DM_DISPLAYFLAGS)) - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; - else if (DevModeW.u2.dmDisplayFlags & DM_INTERLACED) - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED; - else - mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE; + mode->width = m.dmPelsWidth; + mode->height = m.dmPelsHeight; + mode->refresh_rate = DEFAULT_REFRESH_RATE; + if (m.dmFields & DM_DISPLAYFREQUENCY) + mode->refresh_rate = m.dmDisplayFrequency; - TRACE("%ux%u@%u %u bpp, %s %#x.\n", mode->width, mode->height, mode->refresh_rate, - DevModeW.dmBitsPerPel, debug_d3dformat(mode->format_id), mode->scanline_ordering); - } + if (format_id == WINED3DFMT_UNKNOWN) + mode->format_id = pixelformat_for_depth(m.dmBitsPerPel); else - { - FIXME("Adapter not primary display.\n"); - } + mode->format_id = format_id; + + if (!(m.dmFields & DM_DISPLAYFLAGS)) + mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + else if (m.u2.dmDisplayFlags & DM_INTERLACED) + mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_INTERLACED; + else + mode->scanline_ordering = WINED3D_SCANLINE_ORDERING_PROGRESSIVE; + + TRACE("%ux%u@%u %u bpp, %s %#x.\n", mode->width, mode->height, mode->refresh_rate, + m.dmBitsPerPel, debug_d3dformat(mode->format_id), mode->scanline_ordering); return WINED3D_OK; }

1 0

Francois Gouget : msvcp60: Remove unused functions.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: b9b26926956ab2547654539aabf5b33dc0e19d76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b26926956ab2547654539aa… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 28 17:03:57 2012 +0200 msvcp60: Remove unused functions. --- dlls/msvcp60/main.c | 21 ------------ dlls/msvcp60/misc.c | 82 ------------------------------------------------- dlls/msvcp60/string.c | 6 --- 3 files changed, 0 insertions(+), 109 deletions(-) diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index 1dd6a49..f848a30 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -98,24 +98,3 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } - -/* ?_BADOFF(a)std@@3JB -> long const std::_BADOFF */ -/* ?_BADOFF(a)std@@3_JB -> __int64 const std::_BADOFF */ -const INT_PTR std_BADOFF = -1; - -/* ?_BADOFF_func(a)std@@YAABJXZ -> long const & __cdecl std::_BADOFF_func(void) */ -/* ?_BADOFF_func(a)std@@YAAEB_JXZ -> __int64 const & __ptr64 __cdecl std::_BADOFF_func(void) */ -const INT_PTR * __cdecl std_BADOFF_func(void) -{ - return &std_BADOFF; -} - -/* ?_Fpz(a)std@@3_JA __int64 std::_Fpz */ -__int64 std_Fpz = 0; - -/* ?_Fpz_func(a)std@@YAAA_JXZ -> __int64 & __cdecl std::_Fpz_func(void) */ -/* ?_Fpz_func(a)std@@YAAEA_JXZ -> __int64 & __ptr64 __cdecl std::_Fpz_func(void) */ -__int64 * __cdecl std_Fpz_func(void) -{ - return &std_Fpz; -} diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index 7fd234f..5390deb 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -61,34 +61,6 @@ void __thiscall mutex_unlock(mutex *this) ReleaseMutex(this->mutex); } -/* ?_Mutex_Lock(a)_Mutex@std@@CAXPAV12@@Z */ -/* ?_Mutex_Lock(a)_Mutex@std@@CAXPEAV12@@Z */ -void CDECL mutex_mutex_lock(mutex *m) -{ - mutex_lock(m); -} - -/* ?_Mutex_Unlock(a)_Mutex@std@@CAXPAV12@@Z */ -/* ?_Mutex_Unlock(a)_Mutex@std@@CAXPEAV12@@Z */ -void CDECL mutex_mutex_unlock(mutex *m) -{ - mutex_unlock(m); -} - -/* ?_Mutex_ctor(a)_Mutex@std@@CAXPAV12@@Z */ -/* ?_Mutex_ctor(a)_Mutex@std@@CAXPEAV12@@Z */ -void CDECL mutex_mutex_ctor(mutex *m) -{ - mutex_ctor(m); -} - -/* ?_Mutex_dtor(a)_Mutex@std@@CAXPAV12@@Z */ -/* ?_Mutex_dtor(a)_Mutex@std@@CAXPEAV12@@Z */ -void CDECL mutex_mutex_dtor(mutex *m) -{ - mutex_dtor(m); -} - static CRITICAL_SECTION lockit_cs; void init_lockit(void) { @@ -122,57 +94,3 @@ void __thiscall _Lockit_dtor(_Lockit *this) { LeaveCriticalSection(&lockit_cs); } - -/* wctype */ -unsigned short __cdecl wctype(const char *property) -{ - static const struct { - const char *name; - unsigned short mask; - } properties[] = { - { "alnum", _DIGIT|_ALPHA }, - { "alpha", _ALPHA }, - { "cntrl", _CONTROL }, - { "digit", _DIGIT }, - { "graph", _DIGIT|_PUNCT|_ALPHA }, - { "lower", _LOWER }, - { "print", _DIGIT|_PUNCT|_BLANK|_ALPHA }, - { "punct", _PUNCT }, - { "space", _SPACE }, - { "upper", _UPPER }, - { "xdigit", _HEX } - }; - int i; - - for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) - if(!strcmp(property, properties[i].name)) - return properties[i].mask; - - return 0; -} - -typedef void (__cdecl *MSVCP_new_handler_func)(void); -static MSVCP_new_handler_func MSVCP_new_handler; -static int __cdecl new_handler_wrapper(MSVCP_size_t unused) -{ - MSVCP_new_handler(); - return 1; -} - -/* ?set_new_handler(a)std@@YAP6AXXZP6AXXZ(a)Z */ -MSVCP_new_handler_func __cdecl set_new_handler(MSVCP_new_handler_func new_handler) -{ - MSVCP_new_handler_func old_handler = MSVCP_new_handler; - - TRACE("%p\n", new_handler); - - MSVCP_new_handler = new_handler; - MSVCRT_set_new_handler(new_handler ? new_handler_wrapper : NULL); - return old_handler; -} - -/* ?set_new_handler(a)std@@YAP6AXXZH(a)Z */ -MSVCP_new_handler_func __cdecl set_new_handler_reset(int unused) -{ - return set_new_handler(NULL); -} diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index 3138d06..a935de1 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -2154,12 +2154,6 @@ basic_string_wchar* __thiscall basic_string_wchar_ctor_cstr_alloc( return this; } -basic_string_wchar* __thiscall MSVCP_basic_string_wchar_ctor_cstr( - basic_string_wchar *this, const wchar_t *str) -{ - return basic_string_wchar_ctor_cstr_alloc(this, str, NULL); -} - /* ??0?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE(a)IGABV?$allocator(a)G@1@@Z */ /* ??0?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEAA(a)_KGAEBV?$allocator(a)G@1@@Z */ DEFINE_THISCALL_WRAPPER(basic_string_wchar_ctor_ch_alloc, 16)

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 363d39e153ff68b9ed2802e97c59d3681c3b2240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=363d39e153ff68b9ed2802e97… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jun 28 18:30:49 2012 +0300 po: Update Finnish translation. --- po/fi.po | 48 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 37 insertions(+), 11 deletions(-) diff --git a/po/fi.po b/po/fi.po index 3470853..8b0b6ec 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9632,6 +9632,32 @@ msgid "" "/ProgIDOpen Open a document using the specified progID.\n" "/? Display this help and exit.\n" msgstr "" +"Käynnistä ohjelma tai avaa dokumentti ohjelmalla, jota yleensä käytetään " +"kyseiseen tiedostopäätteeseen.\n" +"Käyttö:\n" +"start [valitsimet] ohjelman_tiedostonimi [...]\n" +"start [valitsimet] dokumentin_tiedostonimi\n" +"\n" +"Valitsimet:\n" +"\"otsikko\" Asettaa lapsi-ikkunoiden otsikon.\n" +"/d hakemisto Käynnistä ohjelma määrätyssä hakemistossa.\n" +"/b Älä luo uutta konsolia ohjelmalle.\n" +"/i Käynnistä ohjelma tuoreilla ympäristömuuttujilla.\n" +"/min Käynnistä ohjelma pienennettynä.\n" +"/max Käynnistä ohjelma suurennettuna.\n" +"/low Käynnistä ohjelma matalassa prioriteettiluokassa.\n" +"/normal Käynnistä ohjelma normaalissa prioriteetiluokassa.\n" +"/high Käynnistä ohjelma korkeassa prioriteetiluokassa.\n" +"/realtime Käynnistä ohjelma reaaliaikaisessa prioriteetiluokassa.\n" +"/abovenormal Käynnistä ohjelma normaalia korkeammassa prioriteetiluokassa.\n" +"/belownormal Käynnistä ohjelma normaalia matalammassa prioriteetiluokassa.\n" +"/node n Käynnistä ohjelma määrätyllä NUMA-solmulla.\n" +"/affinity peite Käynnistä ohjelma määrätyllä affiniteettipeitteellä.\n" +"/wait Odota, että ohjelma sulkeutuu, ja palauta sen paluuarvo.\n" +"/unix Käytä Unix-tiedostonimeä ja avaa tiedosto siten, kuin Windows " +"Explorer avaisi sen.\n" +"/ProgIDOpen Avaa dokumentti määrätyllä progID:llä.\n" +"/? Näytä tämä ohje ja lopeta.\n" #: cmd.rc:211 msgid "TIME sets or shows the current system time.\n" @@ -11457,11 +11483,11 @@ msgstr "Virhe: Joko /im tai /pid on annettava.\n" #: taskkill.rc:31 msgid "Error: Option %1 expects a command line parameter.\n" -msgstr "Virhe: Valinta %1 vaatii komentoriviparametrin.\n" +msgstr "Virhe: Valitsin %1 vaatii komentoriviparametrin.\n" #: taskkill.rc:32 msgid "Error: Options /im and /pid are mutually exclusive.\n" -msgstr "Virhe: Valinnat /im ja /pid ovat keskenään vaihtoehtoiset.\n" +msgstr "Virhe: Valitsimet /im ja /pid ovat keskenään vaihtoehtoiset.\n" #: taskkill.rc:33 msgid "Close message sent to top-level windows of process with PID %1!u!.\n" @@ -11615,15 +11641,15 @@ msgstr "Aseta &prioriteetti" #: taskmgr.rc:156 msgid "&Realtime" -msgstr "&Reaaliaika" +msgstr "&Reaaliaikainen" #: taskmgr.rc:160 msgid "&Above Normal" -msgstr "Normaalin &yläpuolella" +msgstr "Normaalia k&orkeampi" #: taskmgr.rc:164 msgid "&Below Normal" -msgstr "Normaalin &alapuolella" +msgstr "Normaalia m&atalampi" #: taskmgr.rc:169 msgid "Set &Affinity..." @@ -12111,7 +12137,7 @@ msgstr "Kontrolloi, millä suorittimilla prosessia voidaan ajaa" #: taskmgr.rc:237 msgid "Sets process to the REALTIME priority class" -msgstr "Asettaa prosessin REALTIME-prioriteettiluokkaan" +msgstr "Asettaa prosessin prioriteettiluokkaan REAALIAIKAINEN" #: taskmgr.rc:238 msgid "Sets process to the HIGH priority class" @@ -12119,15 +12145,15 @@ msgstr "Asettaa prosessin prioriteettiluokkaan KORKEA" #: taskmgr.rc:240 msgid "Sets process to the ABOVE NORMAL priority class" -msgstr "Asettaa prosessin prioriteettiluokkaan YLI KESKITASON" +msgstr "Asettaa prosessin prioriteettiluokkaan NORMAALIA KORKEAMPI" #: taskmgr.rc:242 msgid "Sets process to the NORMAL priority class" -msgstr "Asettaa prosessin prioriteettiluokkaan KESKITASO" +msgstr "Asettaa prosessin prioriteettiluokkaan NORMAALI" #: taskmgr.rc:244 msgid "Sets process to the BELOW NORMAL priority class" -msgstr "Asettaa prosessin prioriteettiluokkaan ALLE KESKITASON" +msgstr "Asettaa prosessin prioriteettiluokkaan NORMAALIA MATALAMPI" #: taskmgr.rc:245 msgid "Sets process to the LOW priority class" @@ -13096,9 +13122,9 @@ msgid "" msgstr "" "\n" "Käyttö:\n" -" wineconsole [vaihtoehdot] <komento>\n" +" wineconsole [valitsimet] <komento>\n" "\n" -"Vaihtoehdot:\n" +"Valitsimet:\n" #: wineconsole.rc:49 msgid ""

1 0

Jacek Caban : mshtml: Share nsrow reference with nsnode.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: b1ed6b2dd61811f97de9b095eb151cf4e6c50aa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ed6b2dd61811f97de9b095e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 28 11:19:41 2012 +0200 mshtml: Share nsrow reference with nsnode. --- dlls/mshtml/htmltablerow.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index db5c7f2..66cf711 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -287,19 +288,9 @@ static HRESULT HTMLTableRow_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return HTMLElement_QI(&This->element.node, riid, ppv); } -static void HTMLTableRow_destructor(HTMLDOMNode *iface) -{ - HTMLTableRow *This = impl_from_HTMLDOMNode(iface); - - if(This->nsrow) - nsIDOMHTMLTableRowElement_Release(This->nsrow); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLTableRowImplVtbl = { HTMLTableRow_QI, - HTMLTableRow_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col }; @@ -329,14 +320,13 @@ HRESULT HTMLTableRow_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HT ret->IHTMLTableRow_iface.lpVtbl = &HTMLTableRowVtbl; ret->element.node.vtbl = &HTMLTableRowImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLTableRow_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableRowElement, (void**)&ret->nsrow); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLTableRowElement iface: %08x\n", nsres); - heap_free(ret); - return E_OUTOFMEMORY; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLTableRow_dispex); + /* Share nsrow reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsrow == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Share nstextarea reference with nsnode.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: b6cfd581704753ddbc5178617e4830a668a21b90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6cfd581704753ddbc5178617… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 28 11:20:05 2012 +0200 mshtml: Share nstextarea reference with nsnode. --- dlls/mshtml/htmltextarea.c | 23 +++++++---------------- 1 files changed, 7 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 2a6fe5e..c95bde2 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -398,15 +399,6 @@ static HRESULT HTMLTextAreaElement_QI(HTMLDOMNode *iface, REFIID riid, void **pp return HTMLElement_QI(&This->element.node, riid, ppv); } -static void HTMLTextAreaElement_destructor(HTMLDOMNode *iface) -{ - HTMLTextAreaElement *This = impl_from_HTMLDOMNode(iface); - - nsIDOMHTMLTextAreaElement_Release(This->nstextarea); - - HTMLElement_destructor(&This->element.node); -} - static HRESULT HTMLTextAreaElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) { HTMLTextAreaElement *This = impl_from_HTMLDOMNode(iface); @@ -421,7 +413,7 @@ static HRESULT HTMLTextAreaElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_ static const NodeImplVtbl HTMLTextAreaElementImplVtbl = { HTMLTextAreaElement_QI, - HTMLTextAreaElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col, NULL, @@ -456,15 +448,14 @@ HRESULT HTMLTextAreaElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nse ret->IHTMLTextAreaElement_iface.lpVtbl = &HTMLTextAreaElementVtbl; ret->element.node.vtbl = &HTMLTextAreaElementImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLTextAreaElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTextAreaElement, (void**)&ret->nstextarea); - if(NS_FAILED(nsres)) { - ERR("Could not get nsDOMHTMLInputElement: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLTextAreaElement_dispex); + /* Share nstextarea reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nstextarea == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); *elem = &ret->element; return S_OK;

1 0

Jacek Caban : mshtml: Share nsstyle reference with nsnode.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 1f5b201e34507f5ae8cb4b8022161324356177ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f5b201e34507f5ae8cb4b802… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 28 11:19:51 2012 +0200 mshtml: Share nsstyle reference with nsnode. --- dlls/mshtml/htmlstyleelem.c | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index d866db2..d0eb9c0 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -17,6 +17,7 @@ */ #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -282,19 +283,9 @@ static HRESULT HTMLStyleElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } -static void HTMLStyleElement_destructor(HTMLDOMNode *iface) -{ - HTMLStyleElement *This = impl_from_HTMLDOMNode(iface); - - if(This->nsstyle) - nsIDOMHTMLStyleElement_Release(This->nsstyle); - - HTMLElement_destructor(&This->element.node); -} - static const NodeImplVtbl HTMLStyleElementImplVtbl = { HTMLStyleElement_QI, - HTMLStyleElement_destructor, + HTMLElement_destructor, HTMLElement_clone, HTMLElement_get_attr_col }; @@ -323,14 +314,14 @@ HRESULT HTMLStyleElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem ret->IHTMLStyleElement_iface.lpVtbl = &HTMLStyleElementVtbl; ret->element.node.vtbl = &HTMLStyleElementImplVtbl; + HTMLElement_Init(&ret->element, doc, nselem, &HTMLStyleElement_dispex); + nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLStyleElement, (void**)&ret->nsstyle); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMHTMLStyleElement iface: %08x\n", nsres); - heap_free(ret); - return E_FAIL; - } - HTMLElement_Init(&ret->element, doc, nselem, &HTMLStyleElement_dispex); + /* Share nsstyle reference with nsnode */ + assert(nsres == NS_OK && (nsIDOMNode*)ret->nsstyle == ret->element.node.nsnode); + nsIDOMNode_Release(ret->element.node.nsnode); + *elem = &ret->element; return S_OK; }

1 0

Francois Gouget : msvcp60: Make _Lockit_ctor_locktype() static.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 5dbdab59e5c12b42f2a1aa8d2b257f839c84415b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dbdab59e5c12b42f2a1aa8d2… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jun 28 17:01:04 2012 +0200 msvcp60: Make _Lockit_ctor_locktype() static. --- dlls/msvcp60/misc.c | 2 +- dlls/msvcp60/msvcp.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index 61cf4a5..7fd234f 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -101,7 +101,7 @@ void free_lockit(void) { DeleteCriticalSection(&lockit_cs); } -_Lockit* __thiscall _Lockit_ctor_locktype(_Lockit *this, int locktype) +static _Lockit* __thiscall _Lockit_ctor_locktype(_Lockit *this, int locktype) { EnterCriticalSection(&lockit_cs); return this; diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index 27d5366..7a4c041 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -266,7 +266,6 @@ typedef struct { void init_lockit(void); void free_lockit(void); -_Lockit* __thiscall _Lockit_ctor_locktype(_Lockit*, int); void __thiscall _Lockit_dtor(_Lockit*); /* class mutex */

1 0

Alexandre Julliard : gdi32: Add a null WGL driver.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: e059d565ab192c76c0a150ea7b30b65d624b3713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e059d565ab192c76c0a150ea7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 28 16:25:22 2012 +0200 gdi32: Add a null WGL driver. --- dlls/gdi32/driver.c | 71 ++++++++++++++++++++++++++++++++++++++++++++- dlls/winex11.drv/opengl.c | 7 +++- 2 files changed, 75 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 6bea480..ae774b0 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -50,6 +50,7 @@ static struct list drivers = LIST_INIT( drivers ); static struct graphics_driver *display_driver; const struct gdi_dc_funcs *font_driver = NULL; +static const struct wgl_funcs null_wgl_driver; static CRITICAL_SECTION driver_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -386,6 +387,11 @@ static UINT nulldrv_GetOutlineTextMetrics( PHYSDEV dev, UINT size, LPOUTLINETEXT return 0; } +static INT nulldrv_GetPixelFormat( HDC hdc ) +{ + return 0; +} + static UINT nulldrv_GetSystemPaletteEntries( PHYSDEV dev, UINT start, UINT count, PALETTEENTRY *entries ) { return 0; @@ -660,11 +666,61 @@ static BOOL nulldrv_UnrealizePalette( HPALETTE palette ) return FALSE; } -static const struct wgl_funcs *nulldrv_wine_get_wgl_driver( PHYSDEV dev, UINT version ) +static BOOL nulldrv_wglCopyContext( HGLRC src, HGLRC dst, UINT mask ) +{ + return FALSE; +} + +static HGLRC nulldrv_wglCreateContext( HDC hdc ) +{ + return 0; +} + +static HGLRC nulldrv_wglCreateContextAttribsARB( HDC hdc, HGLRC share_ctx, const int *attribs ) +{ + return 0; +} + +static BOOL nulldrv_wglDeleteContext( HGLRC hglrc ) +{ + return FALSE; +} + +static HDC nulldrv_wglGetCurrentDC(void) +{ + return 0; +} + +static PROC nulldrv_wglGetProcAddress( LPCSTR name ) { return NULL; } +static BOOL nulldrv_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC hglrc ) +{ + return FALSE; +} + +static BOOL nulldrv_wglMakeCurrent( HDC hdc, HGLRC hglrc ) +{ + return FALSE; +} + +static BOOL nulldrv_wglShareLists( HGLRC org, HGLRC dst ) +{ + return FALSE; +} + +static const struct wgl_funcs *nulldrv_wine_get_wgl_driver( PHYSDEV dev, UINT version ) +{ + if (version != WINE_GDI_DRIVER_VERSION) + { + ERR( "version mismatch, opengl32 wants %u but driver has %u\n", version, WINE_GDI_DRIVER_VERSION ); + return NULL; + } + return &null_wgl_driver; +} + const struct gdi_dc_funcs null_driver = { nulldrv_AbortDoc, /* pAbortDoc */ @@ -801,6 +857,19 @@ const struct gdi_dc_funcs null_driver = GDI_PRIORITY_NULL_DRV /* priority */ }; +static const struct wgl_funcs null_wgl_driver = +{ + nulldrv_GetPixelFormat, /* p_GetPixelFormat */ + nulldrv_wglCopyContext, /* p_wglCopyContext */ + nulldrv_wglCreateContext, /* p_wglCreateContext */ + nulldrv_wglCreateContextAttribsARB, /* p_wglCreateContextAttribsARB */ + nulldrv_wglDeleteContext, /* p_wglDeleteContext */ + nulldrv_wglGetCurrentDC, /* p_wglGetCurrentDC */ + nulldrv_wglGetProcAddress, /* p_wglGetProcAddress */ + nulldrv_wglMakeContextCurrentARB, /* p_wglMakeContextCurrentARB */ + nulldrv_wglMakeCurrent, /* p_wglMakeCurrent */ + nulldrv_wglShareLists, /* p_wglShareLists */ +}; /***************************************************************************** * DRIVER_GetDriverName diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index eb8b79d..952fca9 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -3444,8 +3444,11 @@ static const struct wgl_funcs * glxdrv_wine_get_wgl_driver( PHYSDEV dev, UINT ve ERR( "version mismatch, opengl32 wants %u but driver has %u\n", version, WINE_GDI_DRIVER_VERSION ); return NULL; } - if (!has_opengl()) return NULL; - return &glxdrv_wgl_funcs; + + if (has_opengl()) return &glxdrv_wgl_funcs; + + dev = GET_NEXT_PHYSDEV( dev, wine_get_wgl_driver ); + return dev->funcs->wine_get_wgl_driver( dev, version ); } static const struct gdi_dc_funcs glxdrv_funcs =

1 0

Alexandre Julliard : gdi32: Remove the remaining OpenGL entry points from the DC driver.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 6a9dcd51a2151de98749e6f589a9d29c2c1127b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9dcd51a2151de98749e6f58… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 28 16:38:33 2012 +0200 gdi32: Remove the remaining OpenGL entry points from the DC driver. --- dlls/gdi32/dibdrv/dc.c | 5 ----- dlls/gdi32/driver.c | 30 ------------------------------ dlls/gdi32/enhmfdrv/init.c | 5 ----- dlls/gdi32/freetype.c | 5 ----- dlls/gdi32/mfdrv/init.c | 5 ----- dlls/gdi32/path.c | 5 ----- dlls/wineps.drv/init.c | 5 ----- dlls/winex11.drv/init.c | 41 ----------------------------------------- dlls/winex11.drv/opengl.c | 5 ----- dlls/winex11.drv/xrender.c | 5 ----- include/wine/gdi_driver.h | 7 +------ 11 files changed, 1 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a9dcd51a2151de98749e…

1 0

Hans Leidekker : wbemprox: Implement IEnumWbemClassObject::Clone.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 02b00ffb27f9a275b338c069d380154918da7f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b00ffb27f9a275b338c069d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 28 09:25:39 2012 +0200 wbemprox: Implement IEnumWbemClassObject::Clone. --- dlls/wbemprox/class.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index e826202..d60f726 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -148,8 +148,11 @@ static HRESULT WINAPI enum_class_object_Clone( IEnumWbemClassObject *iface, IEnumWbemClassObject **ppEnum ) { - FIXME("%p, %p\n", iface, ppEnum); - return E_NOTIMPL; + struct enum_class_object *ec = impl_from_IEnumWbemClassObject( iface ); + + TRACE("%p, %p\n", iface, ppEnum); + + return EnumWbemClassObject_create( NULL, ec->query, (void **)ppEnum ); } static HRESULT WINAPI enum_class_object_Skip(

1 0