wine-commits February 2011

wine-commits@winehq.org

2 participants
674 discussions

Henri Verbeet : wined3d: Recognize some Northern Islands cards in select_card_ati_mesa().
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 14050e125de3895dd9a0afba0af96d5bae143e74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14050e125de3895dd9a0afba0… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Feb 28 08:05:37 2011 +0100 wined3d: Recognize some Northern Islands cards in select_card_ati_mesa(). --- dlls/wined3d/directx.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 3 +++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d80df10..3288989 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1090,6 +1090,9 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5700, "ATI Radeon HD 5700 Series", DRIVER_ATI_R600, 512 }, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5800, "ATI Radeon HD 5800 Series", DRIVER_ATI_R600, 1024}, {HW_VENDOR_ATI, CARD_ATI_RADEON_HD5900, "ATI Radeon HD 5900 Series", DRIVER_ATI_R600, 1024}, + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD6310, "AMD Radeon HD 6310 Graphics", DRIVER_ATI_R600, 1024}, + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD6800, "AMD Radeon HD 6800 Series", DRIVER_ATI_R600, 1024}, + {HW_VENDOR_ATI, CARD_ATI_RADEON_HD6900, "AMD Radeon HD 6900 Series", DRIVER_ATI_R600, 2048}, /* Intel cards */ {HW_VENDOR_INTEL, CARD_INTEL_I830G, "Intel(R) 82830M Graphics Controller", DRIVER_INTEL_GMA800, 32 }, {HW_VENDOR_INTEL, CARD_INTEL_I855G, "Intel(R) 82852/82855 GM/GME Graphics Controller", DRIVER_INTEL_GMA800, 32 }, @@ -1727,6 +1730,10 @@ static enum wined3d_pci_device select_card_ati_mesa(const struct wined3d_gl_info } cards[] = { + /* Northern Islands */ + {"CAYMAN", CARD_ATI_RADEON_HD6900}, + {"BARTS", CARD_ATI_RADEON_HD6800}, + {"PALM", CARD_ATI_RADEON_HD6310}, /* Evergreen */ {"HEMLOCK", CARD_ATI_RADEON_HD5900}, {"CYPRESS", CARD_ATI_RADEON_HD5800}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a262cca..455fb1c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1359,6 +1359,9 @@ enum wined3d_pci_device CARD_ATI_RADEON_HD5850 = 0x6898, CARD_ATI_RADEON_HD5870 = 0x6899, CARD_ATI_RADEON_HD5900 = 0x689c, + CARD_ATI_RADEON_HD6310 = 0x9803, + CARD_ATI_RADEON_HD6800 = 0x6739, + CARD_ATI_RADEON_HD6900 = 0x6719, CARD_NVIDIA_RIVA_128 = 0x0018, CARD_NVIDIA_RIVA_TNT = 0x0020,

1 0

Henri Verbeet : wined3d: Filter sRGB capabilities during format initialization.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: d9d2fe31e324dc25ea5b442aeba661715fae9a18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d2fe31e324dc25ea5b442ae… Author: Henri Verbeet <hverbeet(a)gmail.com> Date: Mon Feb 28 08:05:36 2011 +0100 wined3d: Filter sRGB capabilities during format initialization. --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/utils.c | 8 ++++++++ dlls/wined3d/volumetexture.c | 3 +-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 899011e..d80df10 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3159,7 +3159,7 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, static BOOL CheckSrgbReadCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) { - return adapter->gl_info.supported[EXT_TEXTURE_SRGB] && (format->flags & WINED3DFMT_FLAG_SRGB_READ); + return format->flags & WINED3DFMT_FLAG_SRGB_READ; } static BOOL CheckSrgbWriteCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 220e5fe..4c91644 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1197,6 +1197,14 @@ static BOOL init_format_texture_info(struct wined3d_gl_info *gl_info) format->flags |= format_texture_info[i].flags; format->heightscale = 1.0f; + /* Filter sRGB capabilities if EXT_texture_sRGB is not supported. */ + if (!gl_info->supported[EXT_TEXTURE_SRGB] + && format->glGammaInternal != format->glInternal) + { + format->glGammaInternal = format->glInternal; + format->flags &= ~(WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); + } + /* Texture conversion stuff */ format->convert = format_texture_info[i].convert; format->conv_byte_count = format_texture_info[i].conv_byte_count; diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 7da1cf1..37c51bb 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -40,7 +40,6 @@ static HRESULT volumetexture_bind(IWineD3DBaseTextureImpl *texture, BOOL srgb) static void volumetexture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3DSRGB srgb) { IWineD3DDeviceImpl *device = texture->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_context *context = NULL; BOOL srgb_mode = texture->baseTexture.is_srgb; BOOL srgb_was_toggled = FALSE; @@ -49,7 +48,7 @@ static void volumetexture_preload(IWineD3DBaseTextureImpl *texture, enum WINED3D TRACE("texture %p, srgb %#x.\n", texture, srgb); if (!device->isInDraw) context = context_acquire(device, NULL); - else if (gl_info->supported[EXT_TEXTURE_SRGB] && texture->baseTexture.bindCount > 0) + else if (texture->baseTexture.bindCount > 0) { srgb_mode = device->stateBlock->state.sampler_states[texture->baseTexture.sampler][WINED3DSAMP_SRGBTEXTURE]; srgb_was_toggled = texture->baseTexture.is_srgb != srgb_mode;

1 0

Thomas Mullaly : mshtml/tests: Make IDispatch Vtbl const.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 6f18cc59dd80ce80e4375338c700147ab6449449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f18cc59dd80ce80e4375338c… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Feb 21 21:06:52 2011 -0500 mshtml/tests: Make IDispatch Vtbl const. --- dlls/mshtml/tests/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 17d23c5..b58bb10 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2755,7 +2755,7 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF return E_FAIL; } -static IDispatchVtbl DispatchVtbl = { +static const IDispatchVtbl DispatchVtbl = { Dispatch_QueryInterface, Dispatch_AddRef, Dispatch_Release,

1 0

Nikolay Sivov : msxml3: Reject xmlns attribute to be added to element.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 0c16c79c711129d077f05c8ca8af6387a21d7745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c16c79c711129d077f05c8ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 28 02:27:30 2011 +0300 msxml3: Reject xmlns attribute to be added to element. --- dlls/msxml3/element.c | 12 +++- dlls/msxml3/tests/domdoc.c | 138 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index b7b623c..9573de9 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1178,6 +1178,7 @@ static HRESULT WINAPI domelem_setAttributeNode( IXMLDOMAttribute** old) { domelem *This = impl_from_IXMLDOMElement( iface ); + static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; xmlChar *name, *value; BSTR nameW, prefix; xmlAttrPtr attr; @@ -1188,11 +1189,16 @@ static HRESULT WINAPI domelem_setAttributeNode( if (!attribute) return E_INVALIDARG; - if (old) *old = NULL; - hr = IXMLDOMAttribute_get_nodeName(attribute, &nameW); if (hr != S_OK) return hr; + /* adding xmlns attribute doesn't change a tree or existing namespace definition */ + if (!strcmpW(nameW, xmlnsW)) + { + SysFreeString(nameW); + return DISP_E_UNKNOWNNAME; + } + hr = IXMLDOMAttribute_get_nodeValue(attribute, &valueW); if (hr != S_OK) { @@ -1200,6 +1206,8 @@ static HRESULT WINAPI domelem_setAttributeNode( return hr; } + if (old) *old = NULL; + TRACE("attribute: %s=%s\n", debugstr_w(nameW), debugstr_w(V_BSTR(&valueW))); hr = IXMLDOMAttribute_get_prefix(attribute, &prefix); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index abd1f4b..552e52b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7213,6 +7213,7 @@ static void test_setAttributeNode(void) IXMLDOMAttribute *attr, *attr2, *ret_attr; VARIANT_BOOL b; HRESULT hr; + VARIANT v; BSTR str; doc = create_document(&IID_IXMLDOMDocument); @@ -7240,6 +7241,11 @@ static void test_setAttributeNode(void) ok( hr == S_OK, "got 0x%08x\n", hr); ok( ret_attr == NULL, "got %p\n", ret_attr); + b = VARIANT_FALSE; + hr = IXMLDOMElement_hasChildNodes(elem, &b); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + attr2 = NULL; hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("attr"), &attr2); ok( hr == S_OK, "got 0x%08x\n", hr); @@ -7278,8 +7284,134 @@ static void test_setAttributeNode(void) IXMLDOMElement_Release(elem); IXMLDOMDocument_Release(doc2); + IXMLDOMAttribute_Release(attr); + IXMLDOMDocument_Release(doc); + + hr = CoCreateInstance( &CLSID_DOMDocument40, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc ); + if (hr != S_OK) + { + win_skip("DOMDocument40 is not available (0x%08x)\n", hr); + return; + } + + /* try attribute with xmlns name */ + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("test"), _bstr_("http://winehq.org/default"), (IXMLDOMNode**)&elem); + ok( hr == S_OK, "got 0x%08x\n", hr); + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ATTRIBUTE; + + attr = NULL; + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("xmlns"), NULL, (IXMLDOMNode**)&attr); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(attr != NULL, "got %p\n", attr); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("http://winehq.org/default"); + hr = IXMLDOMAttribute_put_nodeValue(attr, v); + ok( hr == S_OK, "got 0x%08x\n", hr); + + ret_attr = (void*)0xdeadbeef; + hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr); + ok(hr == DISP_E_UNKNOWNNAME, "got 0x%08x\n", hr); + ok(ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr); + + /* no child node added actually */ + b = VARIANT_TRUE; + hr = IXMLDOMElement_hasChildNodes(elem, &b); + ok( hr == S_FALSE, "got 0x%08x\n", hr); + ok(b == VARIANT_FALSE, "got %d\n", b); + + /* a single namespace definition as output */ + hr = IXMLDOMElement_get_xml(elem, &str); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok( lstrcmpW(str, _bstr_("<test xmlns=\"http://winehq.org/default\"/>")) == 0, + "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + /* alter value isn't possible after creation? */ + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("http://winehq.org/default1"); + hr = IXMLDOMAttribute_put_nodeValue(attr, v); + ok( hr == S_OK, "got 0x%08x\n", hr); + + IXMLDOMElement_Release(elem); IXMLDOMAttribute_Release(attr); + + /* try to alter it with different attribute value */ + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("test"), _bstr_("http://winehq.org/default"), (IXMLDOMNode**)&elem); + ok( hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ATTRIBUTE; + + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("xmlns"), NULL, (IXMLDOMNode**)&attr); + ok( hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("http://winehq.org/default1"); + hr = IXMLDOMAttribute_put_nodeValue(attr, v); + ok( hr == S_OK, "got 0x%08x\n", hr); + + ret_attr = (void*)0xdeadbeef; + hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr); + ok( hr == DISP_E_UNKNOWNNAME, "got 0x%08x\n", hr); + ok(ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr); + + /* no child node added actually */ + b = VARIANT_TRUE; + hr = IXMLDOMElement_hasChildNodes(elem, &b); + ok( hr == S_FALSE, "got 0x%08x\n", hr); + ok(b == VARIANT_FALSE, "got %d\n", b); + + /* initial value preserved */ + hr = IXMLDOMElement_get_xml(elem, &str); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok( lstrcmpW(str, _bstr_("<test xmlns=\"http://winehq.org/default\"/>")) == 0, + "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMElement_Release(elem); + IXMLDOMAttribute_Release(attr); + + /* now create without default namespace and add it as attribute */ + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("test"), NULL, (IXMLDOMNode**)&elem); + ok( hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ATTRIBUTE; + + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("xmlns"), NULL, (IXMLDOMNode**)&attr); + ok( hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = _bstr_("http://winehq.org/default"); + hr = IXMLDOMAttribute_put_nodeValue(attr, v); + ok( hr == S_OK, "got 0x%08x\n", hr); + + ret_attr = (void*)0xdeadbeef; + hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr); + ok(hr == DISP_E_UNKNOWNNAME, "got 0x%08x\n", hr); + ok(ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr); + + /* no child node added */ + b = VARIANT_TRUE; + hr = IXMLDOMElement_hasChildNodes(elem, &b); + ok( hr == S_FALSE, "got 0x%08x\n", hr); + ok(b == VARIANT_FALSE, "got %d\n", b); + + IXMLDOMElement_Release(elem); + IXMLDOMAttribute_Release(attr); + IXMLDOMDocument_Release(doc); free_bstrs(); } @@ -7346,6 +7478,12 @@ static void test_createNode(void) hr = IXMLDOMNode_get_prefix(node, &prefix); ok( hr == S_FALSE, "got 0x%08x\n", hr); ok(prefix == 0, "expected empty prefix, got %p\n", prefix); + /* check dump */ + hr = IXMLDOMNode_get_xml(node, &str); + ok( hr == S_OK, "got 0x%08x\n", hr); + ok( lstrcmpW(str, _bstr_("<test xmlns=\"http://winehq.org/default\"/>")) == 0, + "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&elem); ok( hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : msxml3/tests: Remove broken test and parameter check.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 4e5075bcc46e5a1081fd2c9128f46672cc517f58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e5075bcc46e5a1081fd2c912… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 27 23:38:30 2011 +0300 msxml3/tests: Remove broken test and parameter check. --- dlls/msxml3/nodelist.c | 3 --- dlls/msxml3/tests/domdoc.c | 6 ------ 2 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 53cf5f5..749b179 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -71,9 +71,6 @@ static HRESULT WINAPI xmlnodelist_QueryInterface( { TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); - if(!ppvObject) - return E_INVALIDARG; - if ( IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IXMLDOMNodeList ) ) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6aad135..abd1f4b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1942,9 +1942,6 @@ todo_wine if (list) { - r = IXMLDOMNodeList_QueryInterface(list, &IID_IDispatch, NULL); - ok( r == E_INVALIDARG || r == E_POINTER, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_item(list, 0, NULL); ok(r == E_INVALIDARG, "Exected E_INVALIDARG got %08x\n", r); @@ -2738,9 +2735,6 @@ static void test_get_text(void) IXMLDOMNode_Release(nodeRoot); } - r = IXMLDOMNodeList_QueryInterface(node_list, &IID_IDispatch, NULL); - ok( r == E_INVALIDARG, "ret %08x\n", r ); - r = IXMLDOMNodeList_get_length( node_list, NULL ); ok( r == E_INVALIDARG, "ret %08x\n", r );

1 0

Marcus Meissner : kernel32: Avoid shadowing "status" variable.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: a91b65960f4b65273cf14fd355c3cf424762814c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91b65960f4b65273cf14fd35… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Feb 25 17:20:51 2011 +0100 kernel32: Avoid shadowing "status" variable. --- dlls/kernel32/volume.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 106b4fb..912f215 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1103,7 +1103,6 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) } else { - NTSTATUS status; WCHAR *buffer; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(dosdevW) + strlenW(devname)*sizeof(WCHAR) )))

1 0

Marcus Meissner : server: Avoid shadowing a global variable.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 7f602db55bced64fd05a632b6821b8c99abefcbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f602db55bced64fd05a632b6… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Feb 25 16:36:07 2011 +0100 server: Avoid shadowing a global variable. --- server/atom.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/server/atom.c b/server/atom.c index eb0b782..a124426 100644 --- a/server/atom.c +++ b/server/atom.c @@ -334,19 +334,19 @@ static struct atom_table *get_table( obj_handle_t h, int create ) /* add an atom in the global table; used for window properties */ atom_t add_global_atom( struct winstation *winstation, const struct unicode_str *str ) { - struct atom_table *global_table = get_global_table( winstation, 1 ); - if (!global_table) return 0; - return add_atom( global_table, str ); + struct atom_table *table = get_global_table( winstation, 1 ); + if (!table) return 0; + return add_atom( table, str ); } /* find an atom in the global table; used for window properties */ atom_t find_global_atom( struct winstation *winstation, const struct unicode_str *str ) { - struct atom_table *global_table = get_global_table( winstation, 0 ); + struct atom_table *table = get_global_table( winstation, 0 ); struct atom_entry *entry; - if (!str->len || str->len > MAX_ATOM_LEN || !global_table) return 0; - if ((entry = find_atom_entry( global_table, str, atom_hash(global_table, str) ))) + if (!str->len || str->len > MAX_ATOM_LEN || !table) return 0; + if ((entry = find_atom_entry( table, str, atom_hash(table, str) ))) return entry->atom; return 0; } @@ -356,10 +356,10 @@ int grab_global_atom( struct winstation *winstation, atom_t atom ) { if (atom >= MIN_STR_ATOM) { - struct atom_table *global_table = get_global_table( winstation, 0 ); - if (global_table) + struct atom_table *table = get_global_table( winstation, 0 ); + if (table) { - struct atom_entry *entry = get_atom_entry( global_table, atom ); + struct atom_entry *entry = get_atom_entry( table, atom ); if (entry) entry->count++; return (entry != NULL); } @@ -373,8 +373,8 @@ void release_global_atom( struct winstation *winstation, atom_t atom ) { if (atom >= MIN_STR_ATOM) { - struct atom_table *global_table = get_global_table( winstation, 0 ); - if (global_table) delete_atom( global_table, atom, 1 ); + struct atom_table *table = get_global_table( winstation, 0 ); + if (table) delete_atom( table, atom, 1 ); } }

1 0

Gerald Pfeifer : wpp: Add explicit casts when mixing unsigned and signed integers.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: 0d92426d2b5c45dad3f11d7b524726a931bb6b88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d92426d2b5c45dad3f11d7b5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Feb 26 21:01:02 2011 +0100 wpp: Add explicit casts when mixing unsigned and signed integers. --- libs/wpp/ppy.y | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/wpp/ppy.y b/libs/wpp/ppy.y index a66072d..f2805e1 100644 --- a/libs/wpp/ppy.y +++ b/libs/wpp/ppy.y @@ -61,7 +61,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.si = v1.val.si OP (signed) v2.val.ui; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.si = v1.val.ui OP v2.val.si; \ + r.val.si = (signed) v1.val.ui OP v2.val.si; \ else \ r.val.ui = v1.val.ui OP v2.val.ui; @@ -72,7 +72,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.sl = v1.val.sl OP (signed long) v2.val.ul; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.sl = v1.val.ul OP v2.val.sl; \ + r.val.sl = (signed long) v1.val.ul OP v2.val.sl; \ else \ r.val.ul = v1.val.ul OP v2.val.ul; @@ -83,7 +83,7 @@ else if(cv_signed(v1) && !cv_signed(v2)) \ r.val.sll = v1.val.sll OP (wrc_sll_t) v2.val.ull; \ else if(!cv_signed(v1) && cv_signed(v2)) \ - r.val.sll = v1.val.ull OP v2.val.sll; \ + r.val.sll = (wrc_sll_t) v1.val.ull OP v2.val.sll; \ else \ r.val.ull = v1.val.ull OP v2.val.ull;

1 0

Alexandre Julliard : server: Work around Mac OS not being able to set global breakpoint flags.
by Alexandre Julliard 28 Feb '11

28 Feb '11

Module: wine Branch: master Commit: e7a032c13144058d780b3c563b0f7c612a5223ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a032c13144058d780b3c563… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Feb 26 12:41:36 2011 +0100 server: Work around Mac OS not being able to set global breakpoint flags. --- server/mach.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/mach.c b/server/mach.c index f9490f3..f890321 100644 --- a/server/mach.c +++ b/server/mach.c @@ -211,6 +211,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign mach_msg_type_number_t count = sizeof(state) / sizeof(int); mach_msg_type_name_t type; mach_port_t port, process_port = get_process_port( thread->process ); + unsigned int dr7; /* all other regs are handled on the client side */ assert( flags == SERVER_CTX_DEBUG_REGISTERS ); @@ -223,6 +224,9 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign return; } + /* Mac OS doesn't allow setting the global breakpoint flags */ + dr7 = (context->debug.i386_regs.dr7 & ~0xaa) | ((context->debug.i386_regs.dr7 & 0xaa) >> 1); + #if __DARWIN_UNIX03 && defined(_STRUCT_X86_DEBUG_STATE32) state.__dr0 = context->debug.i386_regs.dr0; state.__dr1 = context->debug.i386_regs.dr1; @@ -231,7 +235,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.__dr4 = 0; state.__dr5 = 0; state.__dr6 = context->debug.i386_regs.dr6; - state.__dr7 = context->debug.i386_regs.dr7; + state.__dr7 = dr7; #else state.dr0 = context->debug.i386_regs.dr0; state.dr1 = context->debug.i386_regs.dr1; @@ -240,7 +244,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.dr4 = 0; state.dr5 = 0; state.dr6 = context->debug.i386_regs.dr6; - state.dr7 = context->debug.i386_regs.dr7; + state.dr7 = dr7; #endif if (!thread_set_state( port, x86_DEBUG_STATE32, (thread_state_t)&state, count )) {

1 0

Jeremy Newman : removing and redirecting myths page to the wiki
by Jeremy Newman 28 Feb '11

28 Feb '11

Module: website Branch: master Commit: d6856ffcf1bfba577230b4768b11b2ee5b1f112a URL: http://source.winehq.org/git/website.git/?a=commit;h=d6856ffcf1bfba577230b4… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Feb 28 10:40:31 2011 -0600 removing and redirecting myths page to the wiki --- templates/en/myths.template | 270 ------------------------------------------- templates/he/myths.template | 270 ------------------------------------------- templates/pl/myths.template | 270 ------------------------------------------- 3 files changed, 0 insertions(+), 810 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=d6856ffcf1bfba5772…

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2011