wine-commits March 2011

wine-commits@winehq.org

2 participants
849 discussions

Huw Davies : gdi32: Remove a wayward CDECL.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: f435963be4c62866841187d2c1a6572644235f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f435963be4c62866841187d2c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 4 12:09:19 2011 +0000 gdi32: Remove a wayward CDECL. --- dlls/gdi32/gdi_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3ed9356..f6c971d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -124,7 +124,7 @@ typedef struct tagDC_FUNCS INT (CDECL *pGetPixelFormat)(PHYSDEV); UINT (CDECL *pGetSystemPaletteEntries)(PHYSDEV,UINT,UINT,LPPALETTEENTRY); BOOL (CDECL *pGetTextExtentExPoint)(PHYSDEV,LPCWSTR,INT,INT,LPINT,LPINT,LPSIZE); - BOOL (CDECL *CDECL pGetTextMetrics)(PHYSDEV,TEXTMETRICW*); + BOOL (CDECL *pGetTextMetrics)(PHYSDEV,TEXTMETRICW*); INT (CDECL *pIntersectClipRect)(PHYSDEV,INT,INT,INT,INT); BOOL (CDECL *pInvertRgn)(PHYSDEV,HRGN); BOOL (CDECL *pLineTo)(PHYSDEV,INT,INT);

1 0

Rafał Mużyło : winealsa.drv: Drop redundant calls.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 110e66dc0cbd25682f1a3b39cad6c6e22f329305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=110e66dc0cbd25682f1a3b39c… Author: Rafał Mużyło <galtgendo(a)gmail.com> Date: Thu Mar 3 17:54:21 2011 +0100 winealsa.drv: Drop redundant calls. --- dlls/winealsa.drv/dscapture.c | 3 --- dlls/winealsa.drv/dsoutput.c | 3 --- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index f663b6c..0b67749 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -422,11 +422,8 @@ static snd_pcm_uframes_t CommitAll(IDsCaptureDriverBufferImpl *This, DWORD force static void CheckXRUN(IDsCaptureDriverBufferImpl* This) { snd_pcm_state_t state = snd_pcm_state(This->pcm); - snd_pcm_sframes_t delay; int err; - snd_pcm_hwsync(This->pcm); - snd_pcm_delay(This->pcm, &delay); if ( state == SND_PCM_STATE_XRUN ) { err = snd_pcm_prepare(This->pcm); diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 98fb5bb..5ea43f4 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -168,11 +168,8 @@ static snd_pcm_uframes_t CommitAll(IDsDriverBufferImpl *This) static void CheckXRUN(IDsDriverBufferImpl* This) { snd_pcm_state_t state = snd_pcm_state(This->pcm); - snd_pcm_sframes_t delay; int err; - snd_pcm_hwsync(This->pcm); - snd_pcm_delay(This->pcm, &delay); if ( state == SND_PCM_STATE_XRUN ) { err = snd_pcm_prepare(This->pcm);

1 0

Marcus Meissner : oleaut32: Local variable goes out of scope via pointer ( Coverity).
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: d9908d2abd12f0f28b2614e23d28d15e1f446b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9908d2abd12f0f28b2614e23… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Mar 4 10:43:42 2011 +0100 oleaut32: Local variable goes out of scope via pointer (Coverity). --- dlls/oleaut32/olefont.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index f86ef20..e65504c 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -338,6 +338,7 @@ HRESULT WINAPI OleCreateFontIndirect( { OLEFontImpl* newFont = 0; HRESULT hr = S_OK; + FONTDESC fd; TRACE("(%p, %s, %p)\n", lpFontDesc, debugstr_guid(riid), ppvObj); /* @@ -349,8 +350,6 @@ HRESULT WINAPI OleCreateFontIndirect( *ppvObj = 0; if (!lpFontDesc) { - FONTDESC fd; - static WCHAR fname[] = { 'S','y','s','t','e','m',0 }; fd.cbSizeofstruct = sizeof(fd);

1 0

Dmitry Timoshkov : user32: Add a test to make sure that SendInput sets a non-zero event time.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 7fb4e2ae45cff5ce72260c60587c6473e8bbfdf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb4e2ae45cff5ce72260c605… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Mar 4 14:43:31 2011 +0800 user32: Add a test to make sure that SendInput sets a non-zero event time. --- dlls/user32/tests/input.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 22120f0..d45edf1 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -369,6 +369,16 @@ static void test_Input_whitebox(void) DestroyWindow(hWndTest); } +static inline BOOL is_keyboard_message( UINT message ) +{ + return (message >= WM_KEYFIRST && message <= WM_KEYLAST); +} + +static inline BOOL is_mouse_message( UINT message ) +{ + return (message >= WM_MOUSEFIRST && message <= WM_MOUSELAST); +} + /* try to make sure pending X events have been processed before continuing */ static void empty_message_queue(void) { @@ -382,6 +392,9 @@ static void empty_message_queue(void) if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) break; while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) { + if (is_keyboard_message(msg.message) || is_mouse_message(msg.message)) + ok(msg.time != 0, "message %#x has time set to 0\n", msg.message); + TranslateMessage(&msg); DispatchMessage(&msg); }

1 0

Nikolay Sivov : msxml3: Test to show namespace definition output for children.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 14ec98bd1405a5182341c1652c4dea246e662b8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=14ec98bd1405a5182341c1652… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 4 02:04:22 2011 +0300 msxml3: Test to show namespace definition output for children. --- dlls/msxml3/tests/domdoc.c | 88 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f84947c..439207f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7984,6 +7984,7 @@ static void test_insertBefore(void) IXMLDOMNode *node, *newnode; HRESULT hr; VARIANT v; + BSTR p; doc = create_document(&IID_IXMLDOMDocument); @@ -8161,6 +8162,93 @@ static void test_insertBefore(void) IXMLDOMElement_Release(elem3); IXMLDOMElement_Release(elem4); IXMLDOMElement_Release(elem5); + + /* elements with same default namespace */ + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ELEMENT; + elem1 = NULL; + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("elem1"), _bstr_("http://winehq.org/default"), (IXMLDOMNode**)&elem1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(elem1 != NULL, "got %p\n", elem1); + + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ELEMENT; + elem2 = NULL; + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("elem2"), _bstr_("http://winehq.org/default"), (IXMLDOMNode**)&elem2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(elem2 != NULL, "got %p\n", elem2); + + /* check contents so far */ + p = NULL; + hr = IXMLDOMElement_get_xml(elem1, &p); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(p, _bstr_("<elem1 xmlns=\"http://winehq.org/default\"/>")), "got %s\n", wine_dbgstr_w(p)); + SysFreeString(p); + + p = NULL; + hr = IXMLDOMElement_get_xml(elem2, &p); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(p, _bstr_("<elem2 xmlns=\"http://winehq.org/default\"/>")), "got %s\n", wine_dbgstr_w(p)); + SysFreeString(p); + + V_VT(&v) = VT_NULL; + hr = IXMLDOMElement_insertBefore(elem1, (IXMLDOMNode*)elem2, v, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* get_xml depends on context, for top node it omits child namespace attribute, + but at child level it's still returned */ + p = NULL; + hr = IXMLDOMElement_get_xml(elem1, &p); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(!lstrcmpW(p, _bstr_("<elem1 xmlns=\"http://winehq.org/default\"><elem2/></elem1>")), + "got %s\n", wine_dbgstr_w(p)); + SysFreeString(p); + + p = NULL; + hr = IXMLDOMElement_get_xml(elem2, &p); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(p, _bstr_("<elem2 xmlns=\"http://winehq.org/default\"/>")), "got %s\n", wine_dbgstr_w(p)); + SysFreeString(p); + + IXMLDOMElement_Release(elem1); + IXMLDOMElement_Release(elem2); + + /* child without default namespace added to node with default namespace */ + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ELEMENT; + elem1 = NULL; + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("elem1"), _bstr_("http://winehq.org/default"), (IXMLDOMNode**)&elem1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(elem1 != NULL, "got %p\n", elem1); + + V_VT(&v) = VT_I4; + V_I4(&v) = NODE_ELEMENT; + elem2 = NULL; + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("elem2"), NULL, (IXMLDOMNode**)&elem2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(elem2 != NULL, "got %p\n", elem2); + + EXPECT_REF(elem2, 1); + V_VT(&v) = VT_NULL; + hr = IXMLDOMElement_insertBefore(elem1, (IXMLDOMNode*)elem2, v, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(elem2, 1); + + p = NULL; + hr = IXMLDOMElement_get_xml(elem2, &p); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(p, _bstr_("<elem2/>")), "got %s\n", wine_dbgstr_w(p)); + SysFreeString(p); + + hr = IXMLDOMElement_removeChild(elem1, (IXMLDOMNode*)elem2, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + p = NULL; + hr = IXMLDOMElement_get_xml(elem2, &p); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(p, _bstr_("<elem2/>")), "got %s\n", wine_dbgstr_w(p)); + SysFreeString(p); + IXMLDOMDocument_Release(doc); free_bstrs(); }

1 0

Nikolay Sivov : msxml3: Remove child with parent method first before insert with insertBefore().
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 179daa20b99db2173607566c250ec511a6bd280a URL: http://source.winehq.org/git/wine.git/?a=commit;h=179daa20b99db2173607566c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 4 01:03:15 2011 +0300 msxml3: Remove child with parent method first before insert with insertBefore(). --- dlls/msxml3/domdoc.c | 5 +--- dlls/msxml3/element.c | 6 +---- dlls/msxml3/node.c | 56 +++++++++++++++++++------------------------ dlls/msxml3/nodemap.c | 5 +--- dlls/msxml3/tests/domdoc.c | 53 +++++++++++++++++++++++++++++++++++++++-- 5 files changed, 78 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=179daa20b99db21736075…

1 0

Nikolay Sivov : msxml3: Test insertBefore() behaviour with node relinking, simplify common test cases.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 756ae9e3ee40b727432b116d00b9a3899dbdeaba URL: http://source.winehq.org/git/wine.git/?a=commit;h=756ae9e3ee40b727432b116d0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 3 23:12:35 2011 +0300 msxml3: Test insertBefore() behaviour with node relinking, simplify common test cases. --- dlls/msxml3/tests/domdoc.c | 236 +++++++++++++++++++++++++------------------- 1 files changed, 133 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=756ae9e3ee40b727432b1…

1 0

Juan Lang : wininet: Remove outdated comment.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: 9463a867a86a4b042dd080f3533f5ea5c140608c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9463a867a86a4b042dd080f35… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 13:37:53 2011 -0800 wininet: Remove outdated comment. --- dlls/wininet/urlcache.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index b80f65e..40e4840 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3449,8 +3449,6 @@ BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW CacheInfo, LPDW /*********************************************************************** * GetUrlCacheConfigInfoA (WININET.@) - * - * CacheInfo is some CACHE_CONFIG_INFO structure, with no MS info found by google */ BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA CacheInfo, LPDWORD size, DWORD bitmask) {

1 0

Juan Lang : wininet: Fix off-by-one error.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: d2a3832fc3d5c4c610ed5f9ec8f81cc37cff82d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a3832fc3d5c4c610ed5f9ec… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Mar 3 12:17:09 2011 -0800 wininet: Fix off-by-one error. --- dlls/wininet/urlcache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index a52de20..b80f65e 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -877,7 +877,7 @@ static BOOL URLCache_LocalFileNameToPathW( } nRequired = (path_len + DIR_LENGTH + file_name_len + 1) * sizeof(WCHAR); - if (nRequired < *lpBufferSize) + if (nRequired <= *lpBufferSize) { int dir_len;

1 0

Henri Verbeet : wined3d: Get rid of the IWineD3DBuffer typedef.
by Alexandre Julliard 04 Mar '11

04 Mar '11

Module: wine Branch: master Commit: bea8d0a713e772499669028634e3f6317c1285f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea8d0a713e77249966902863… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 3 21:49:10 2011 +0100 wined3d: Get rid of the IWineD3DBuffer typedef. --- dlls/wined3d/buffer.c | 2 - dlls/wined3d/device.c | 148 ++++++++++++++++++++-------------------- dlls/wined3d/stateblock.c | 5 +- dlls/wined3d/wined3d_private.h | 3 - 4 files changed, 76 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bea8d0a713e7724996690…

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
85
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 March 2011