December 2012 - Wine-Commits

Piotr Caban : msvcr90: Fixed non-blocking file access tests.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: f25d91f6e7241a3b8cbe4876ba84a495a93aaa00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f25d91f6e7241a3b8cbe4876b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 6 10:59:01 2012 +0100 msvcr90: Fixed non-blocking file access tests. --- dlls/msvcr90/tests/msvcr90.c | 33 ++++++++++++--------------------- 1 files changed, 12 insertions(+), 21 deletions(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index ce8fe69..f1ac539 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -1116,7 +1116,8 @@ struct block_file_arg { FILE *read; FILE *write; - HANDLE blocked; + HANDLE init; + HANDLE finish; }; static DWORD WINAPI block_file(void *arg) @@ -1125,8 +1126,8 @@ static DWORD WINAPI block_file(void *arg) p_lock_file(files->read); p_lock_file(files->write); - SetEvent(files->blocked); - WaitForSingleObject(files->blocked, INFINITE); + SetEvent(files->init); + WaitForSingleObject(files->finish, INFINITE); p_unlock_file(files->read); p_unlock_file(files->write); return 0; @@ -1158,24 +1159,13 @@ static void test_nonblocking_file_access(void) arg.read = filer; arg.write = filew; - arg.blocked = CreateEvent(NULL, FALSE, FALSE, NULL); - ok(arg.blocked != NULL, "CreateEvent failed\n"); - if(!arg.blocked) { - p_fclose(filer); - p_fclose(filew); - p_unlink("test_file"); - return; - } + arg.init = CreateEvent(NULL, FALSE, FALSE, NULL); + arg.finish = CreateEvent(NULL, FALSE, FALSE, NULL); + ok(arg.init != NULL, "CreateEvent failed\n"); + ok(arg.finish != NULL, "CreateEvent failed\n"); thread = CreateThread(NULL, 0, block_file, (void*)&arg, 0, NULL); ok(thread != NULL, "CreateThread failed\n"); - if(!thread) { - CloseHandle(arg.blocked); - p_fclose(filer); - p_fclose(filew); - p_unlink("test_file"); - return; - } - WaitForSingleObject(arg.blocked, INFINITE); + WaitForSingleObject(arg.init, INFINITE); ret = p_fileno(filer); ok(ret, "_fileno(filer) returned %d\n", ret); @@ -1197,9 +1187,10 @@ static void test_nonblocking_file_access(void) ret = p_flsbuf('a', filew); ok(ret=='a', "_flsbuf(filew) returned %d\n", ret); - SetEvent(arg.blocked); + SetEvent(arg.finish); WaitForSingleObject(thread, INFINITE); - CloseHandle(arg.blocked); + CloseHandle(arg.init); + CloseHandle(arg.finish); CloseHandle(thread); p_fclose(filer); p_fclose(filew);

1 0

Piotr Caban : include: Added MS_ENH_RSA_AES_PROV_XP definition.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: 15632df2c9d1f8375d3a4cde3428c2e499a4a04a URL: http://source.winehq.org/git/wine.git/?a=commit;h=15632df2c9d1f8375d3a4cde3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 6 11:43:15 2012 +0100 include: Added MS_ENH_RSA_AES_PROV_XP definition. --- include/wincrypt.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index a14edab..617a9b9 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1817,6 +1817,22 @@ static const WCHAR MS_ENH_RSA_AES_PROV_W[] = { 'M','i','c','r','o','s' #endif #define MS_ENH_RSA_AES_PROV WINELIB_NAME_AW(MS_ENH_RSA_AES_PROV_) +#define MS_ENH_RSA_AES_PROV_XP_A "Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)" +#if defined(__GNUC__) +# define MS_ENH_RSA_AES_PROV_XP_W (const WCHAR []){ 'M','i','c','r','o','s','o','f','t',' ', \ + 'E','n','h','a','n','c','e','d',' ','R','S','A',' ','a','n','d',' ','A','E','S',' ',\ + 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',' ',\ + '(','P','r','o','t','o','t','y','p','e',')',0 } +#elif defined(_MSC_VER) +# define MS_ENH_RSA_AES_PROV_XP_W L"Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)" +#else +static const WCHAR MS_ENH_RSA_AES_PROV_XP_W[] = { 'M','i','c','r','o','s','o','f','t',' ', + 'E','n','h','a','n','c','e','d',' ','R','S','A',' ','a','n','d',' ','A','E','S',' ', + 'C','r','y','p','t','o','g','r','a','p','h','i','c',' ','P','r','o','v','i','d','e','r',' ', + '(','P','r','o','t','o','t','y','p','e',')',0 }; +#endif +#define MS_ENH_RSA_AES_PROV_XP WINELIB_NAME_AW(MS_ENH_RSA_AES_PROV_XP_) + /* Key Specs*/ #define AT_KEYEXCHANGE 1 #define AT_SIGNATURE 2

1 0

Nikolay Sivov : xmllite: Implement attribute iteration methods.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: f6e6b835b60a9780f68a34eb71c25e2fe382691c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6e6b835b60a9780f68a34eb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 6 16:05:19 2012 +0400 xmllite: Implement attribute iteration methods. --- dlls/xmllite/reader.c | 37 +++++++++++++++++++++++++++++++------ dlls/xmllite/tests/reader.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 8 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 0d33296..ec7fe37 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -113,6 +113,7 @@ typedef struct _xmlreader DtdProcessing dtdmode; UINT line, pos; /* reader position in XML stream */ struct list attrs; /* attributes list for current node */ + struct attribute *attr; /* current attribute */ UINT attr_count; } xmlreader; @@ -942,14 +943,32 @@ static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node static HRESULT WINAPI xmlreader_MoveToFirstAttribute(IXmlReader* iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)\n", This); + + if (!This->attr_count) return S_FALSE; + This->attr = LIST_ENTRY(list_head(&This->attrs), struct attribute, entry); + return S_OK; } static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + const struct list *next; + + TRACE("(%p)\n", This); + + if (!This->attr_count) return S_FALSE; + + if (!This->attr) + return IXmlReader_MoveToFirstAttribute(iface); + + next = list_next(&This->attrs, &This->attr->entry); + if (next) + This->attr = LIST_ENTRY(next, struct attribute, entry); + + return next ? S_OK : S_FALSE; } static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, @@ -962,8 +981,13 @@ static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + xmlreader *This = impl_from_IXmlReader(iface); + + TRACE("(%p)\n", This); + + if (!This->attr_count) return S_FALSE; + This->attr = NULL; + return S_OK; } static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *qualifiedName, @@ -1202,6 +1226,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) reader->nodetype = XmlNodeType_None; list_init(&reader->attrs); reader->attr_count = 0; + reader->attr = NULL; *obj = &reader->IXmlReader_iface; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index c44816c..099c8fb 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -591,6 +591,7 @@ static void test_read_xmldeclaration(void) HRESULT hr; XmlNodeType type; UINT count = 0; + const WCHAR *val; hr = pCreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -611,6 +612,16 @@ static void test_read_xmldeclaration(void) ok(hr == S_OK, "got %08x\n", hr); ok(count == 0, "got %d\n", count); + /* try to move without attributes */ + hr = IXmlReader_MoveToElement(reader); + ok(hr == S_FALSE, "got %08x\n", hr); + + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_FALSE, "got %08x\n", hr); + + hr = IXmlReader_MoveToFirstAttribute(reader); + ok(hr == S_FALSE, "got %08x\n", hr); + ok_pos(reader, 0, 0, -1, -1, FALSE); type = -1; @@ -622,13 +633,27 @@ static void test_read_xmldeclaration(void) ok_pos(reader, 1, 3, -1, 55, TRUE); test_read_state(reader, XmlReadState_Interactive, -1, 0); + hr = IXmlReader_GetValue(reader, &val, NULL); +todo_wine + ok(hr == S_OK, "got %08x\n", hr); + if (hr == S_OK) + ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); + /* check attributes */ hr = IXmlReader_MoveToNextAttribute(reader); - todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); ok_pos(reader, 1, 7, -1, 55, TRUE); + /* try to move from last attribute */ + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_OK, "got %08x\n", hr); + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_OK, "got %08x\n", hr); + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_FALSE, "got %08x\n", hr); + hr = IXmlReader_MoveToFirstAttribute(reader); - todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); ok_pos(reader, 1, 7, -1, 55, TRUE); hr = IXmlReader_GetAttributeCount(reader, NULL); @@ -644,6 +669,9 @@ todo_wine { ok(count == 1, "Expected 1, got %d\n", count); } + hr = IXmlReader_MoveToElement(reader); + ok(hr == S_OK, "got %08x\n", hr); + IStream_Release(stream); IXmlReader_Release(reader); }

1 0

Piotr Caban : msvcr: Move msvcrXX specific functions implementation to msvcr100.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: e7944878e6f7d3ab22255546a6727161a62aade8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7944878e6f7d3ab22255546a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 6 13:22:50 2012 +0100 msvcr: Move msvcrXX specific functions implementation to msvcr100. --- dlls/msvcr100/msvcr100.c | 323 ++++++++++++++++++++++++++++++++++++++++++ dlls/msvcr100/msvcr100.spec | 42 +++--- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 42 +++--- dlls/msvcr90/msvcr90.c | 329 ------------------------------------------- dlls/msvcr90/msvcr90.spec | 42 +++--- 7 files changed, 388 insertions(+), 394 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7944878e6f7d3ab22255…

1 0

Jacek Caban : msxml3: Use IUri for storing XMLHTTPRequest URL.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: b7a26db5758883c47129835f5812df273c29483a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a26db5758883c47129835f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 6 14:24:46 2012 +0100 msxml3: Use IUri for storing XMLHTTPRequest URL. --- dlls/msxml3/httprequest.c | 100 +++++++++++++++++++++++++------------------- 1 files changed, 57 insertions(+), 43 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 7fbb836..848a470 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -82,8 +82,8 @@ typedef struct /* request */ BINDVERB verb; BSTR custom; - BSTR siteurl; - BSTR url; + IUri *uri; + IUri *base_uri; BOOL async; struct list reqheaders; /* cached resulting custom request headers string length in WCHARs */ @@ -736,7 +736,7 @@ static HRESULT BindStatusCallback_create(httprequest* This, BindStatusCallback * { IMoniker *moniker; - hr = CreateURLMoniker(NULL, This->url, &moniker); + hr = CreateURLMonikerEx2(NULL, This->uri, &moniker, URL_MK_UNIFORM); if (hr == S_OK) { IStream *stream; @@ -772,10 +772,14 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, if (!method || !url) return E_INVALIDARG; /* free previously set data */ - SysFreeString(This->url); + if(This->uri) { + IUri_Release(This->uri); + This->uri = NULL; + } + SysFreeString(This->user); SysFreeString(This->password); - This->url = This->user = This->password = NULL; + This->user = This->password = NULL; if (!strcmpiW(method, MethodGetW)) { @@ -802,22 +806,14 @@ static HRESULT httprequest_open(httprequest *This, BSTR method, BSTR url, return E_FAIL; } - /* try to combine with site url */ - if (This->siteurl && PathIsRelativeW(url)) - { - DWORD len = INTERNET_MAX_URL_LENGTH; - WCHAR *fullW = heap_alloc(len*sizeof(WCHAR)); - - hr = UrlCombineW(This->siteurl, url, fullW, &len, 0); - if (hr == S_OK) - { - TRACE("combined url %s\n", debugstr_w(fullW)); - This->url = SysAllocString(fullW); - } - heap_free(fullW); - } + if(This->base_uri) + hr = CoInternetCombineUrlEx(This->base_uri, url, 0, &This->uri, 0); else - This->url = SysAllocString(url); + hr = CreateUri(url, 0, 0, &This->uri); + if(FAILED(hr)) { + WARN("Could not create IUri object: %08x\n", hr); + return hr; + } VariantInit(&is_async); hr = VariantChangeType(&is_async, &async, 0, VT_BOOL); @@ -1141,10 +1137,12 @@ static void httprequest_release(httprequest *This) if (This->site) IUnknown_Release( This->site ); + if (This->uri) + IUri_Release(This->uri); + if (This->base_uri) + IUri_Release(This->base_uri); SysFreeString(This->custom); - SysFreeString(This->siteurl); - SysFreeString(This->url); SysFreeString(This->user); SysFreeString(This->password); @@ -1444,6 +1442,38 @@ static HRESULT WINAPI httprequest_ObjectWithSite_GetSite( IObjectWithSite *iface return IUnknown_QueryInterface( This->site, iid, ppvSite ); } +static void get_base_uri(httprequest *This) +{ + IServiceProvider *provider; + IHTMLDocument2 *doc; + IUri *uri; + BSTR url; + HRESULT hr; + + hr = IUnknown_QueryInterface(This->site, &IID_IServiceProvider, (void**)&provider); + if(FAILED(hr)) + return; + + hr = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void**)&doc); + IServiceProvider_Release(provider); + if(FAILED(hr)) + return; + + hr = IHTMLDocument2_get_URL(doc, &url); + IHTMLDocument2_Release(doc); + if(FAILED(hr) || !url || !*url) + return; + + TRACE("host url %s\n", debugstr_w(url)); + + hr = CreateUri(url, 0, 0, &uri); + SysFreeString(url); + if(FAILED(hr)) + return; + + This->base_uri = uri; +} + static HRESULT WINAPI httprequest_ObjectWithSite_SetSite( IObjectWithSite *iface, IUnknown *punk ) { httprequest *This = impl_from_IObjectWithSite(iface); @@ -1452,32 +1482,15 @@ static HRESULT WINAPI httprequest_ObjectWithSite_SetSite( IObjectWithSite *iface if(This->site) IUnknown_Release( This->site ); + if(This->base_uri) + IUri_Release(This->base_uri); - SysFreeString(This->siteurl); - This->siteurl = NULL; This->site = punk; if (punk) { - IServiceProvider *provider; - HRESULT hr; - IUnknown_AddRef( punk ); - - hr = IUnknown_QueryInterface(This->site, &IID_IServiceProvider, (void**)&provider); - if (hr == S_OK) - { - IHTMLDocument2 *doc; - - hr = IServiceProvider_QueryService(provider, &SID_SContainerDispatch, &IID_IHTMLDocument2, (void**)&doc); - if (hr == S_OK) - { - hr = IHTMLDocument2_get_URL(doc, &This->siteurl); - IHTMLDocument2_Release(doc); - TRACE("host url %s, 0x%08x\n", debugstr_w(This->siteurl), hr); - } - IServiceProvider_Release(provider); - } + get_base_uri(This); } return S_OK; @@ -1831,7 +1844,8 @@ static void init_httprequest(httprequest *req) req->async = FALSE; req->verb = -1; req->custom = NULL; - req->url = req->siteurl = req->user = req->password = NULL; + req->uri = req->base_uri = NULL; + req->user = req->password = NULL; req->state = READYSTATE_UNINITIALIZED; req->sink = NULL;

1 0

Andrew Eikum : urlmon: Out string parameter should be ptr, not wstr.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: 533df157f83b74372a76433915a5accf974854a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533df157f83b74372a7643391… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Dec 6 11:17:47 2012 -0600 urlmon: Out string parameter should be ptr, not wstr. --- dlls/urlmon/urlmon.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/urlmon.spec b/dlls/urlmon/urlmon.spec index 72bd21d..5be0b6a 100644 --- a/dlls/urlmon/urlmon.spec +++ b/dlls/urlmon/urlmon.spec @@ -10,7 +10,7 @@ @ stdcall BindAsyncMoniker(ptr long ptr ptr ptr) @ stdcall CoGetClassObjectFromURL(ptr wstr long long wstr ptr long ptr ptr ptr) @ stub CoInstall -@ stdcall CoInternetCombineUrl(wstr wstr long wstr long ptr long) +@ stdcall CoInternetCombineUrl(wstr wstr long ptr long ptr long) @ stdcall CoInternetCombineUrlEx(ptr wstr long ptr long) @ stdcall CoInternetCompareUrl(wstr wstr long) @ stdcall CoInternetCombineIUri(ptr ptr long ptr long)

1 0

Qian Hong : ole32: Fix OleDraw() with NULL pUnk.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: 9b90ea557b12b7a0a25ce945ac4374f1aa702ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b90ea557b12b7a0a25ce945a… Author: Qian Hong <fracting(a)gmail.com> Date: Fri Dec 7 01:45:33 2012 +0800 ole32: Fix OleDraw() with NULL pUnk. --- dlls/ole32/ole2.c | 2 ++ dlls/ole32/tests/ole2.c | 7 +++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 4a36aec..1bd4c1a 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2546,6 +2546,8 @@ HRESULT WINAPI OleDraw( HRESULT hres; IViewObject *viewobject; + if (!pUnk) return E_INVALIDARG; + hres = IUnknown_QueryInterface(pUnk, &IID_IViewObject, (void**)&viewobject); diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index eb8e6d3..27653c1 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1934,9 +1934,16 @@ static void test_OleLockRunning(void) static void test_OleDraw(void) { HRESULT hr; + RECT rect; hr = OleDraw((IUnknown*)&viewobject, 0, (HDC)0x1, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = OleDraw(NULL, 0, (HDC)0x1, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = OleDraw(NULL, 0, (HDC)0x1, &rect); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); } START_TEST(ole2)

1 0

Alexandre Julliard : wined3d: Call wglSwapBuffers through the GL driver function table.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: 13f126498be00f4c34eb212dabc23f34d4864de3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13f126498be00f4c34eb212da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 6 14:10:04 2012 +0100 wined3d: Call wglSwapBuffers through the GL driver function table. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/swapchain.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8d75045..d9b86d4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5460,6 +5460,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) #define USE_GL_FUNC(f) gl_info->gl_ops.gl.p_##f = (void *)GetProcAddress(mod_gl, #f); ALL_WGL_FUNCS #undef USE_GL_FUNC + gl_info->gl_ops.wgl.p_wglSwapBuffers = (void *)GetProcAddress(mod_gl, "wglSwapBuffers"); } #else /* To bypass the opengl32 thunks retrieve functions from the WGL driver instead of opengl32 */ @@ -5468,6 +5469,7 @@ static BOOL InitAdapters(struct wined3d *wined3d) const struct opengl_funcs *wgl_driver = __wine_get_wgl_driver( hdc, WINE_WGL_DRIVER_VERSION ); ReleaseDC( 0, hdc ); if (!wgl_driver || wgl_driver == (void *)-1) goto nogl_adapter; + gl_info->gl_ops.wgl = wgl_driver->wgl; gl_info->gl_ops.gl = wgl_driver->gl; } #endif diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 83d2ab5..bd36ce1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -560,7 +560,9 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT if (swapchain->num_contexts > 1) gl_info->gl_ops.gl.p_glFinish(); - SwapBuffers(context->hdc); /* TODO: cycle through the swapchain buffers */ + + /* call wglSwapBuffers through the gl table to avoid confusing the Steam overlay */ + gl_info->gl_ops.wgl.p_wglSwapBuffers(context->hdc); /* TODO: cycle through the swapchain buffers */ TRACE("SwapBuffers called, Starting new frame\n"); /* FPS support */

1 0

Michael Stefaniuc : qmgr: Merge a helper function.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: 7183c6953107291e276cd9ee027d87385ed83d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7183c6953107291e276cd9ee0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 5 23:57:52 2012 +0100 qmgr: Merge a helper function. --- dlls/qmgr/enum_files.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/qmgr/enum_files.c b/dlls/qmgr/enum_files.c index 05659cf..aeb9d64 100644 --- a/dlls/qmgr/enum_files.c +++ b/dlls/qmgr/enum_files.c @@ -32,17 +32,6 @@ typedef struct ULONG indexFiles; } EnumBackgroundCopyFilesImpl; -static void EnumBackgroundCopyFilesDestructor(EnumBackgroundCopyFilesImpl *This) -{ - ULONG i; - - for(i = 0; i < This->numFiles; i++) - IBackgroundCopyFile_Release(This->files[i]); - - HeapFree(GetProcessHeap(), 0, This->files); - HeapFree(GetProcessHeap(), 0, This); -} - static inline EnumBackgroundCopyFilesImpl *impl_from_IEnumBackgroundCopyFiles(IEnumBackgroundCopyFiles *iface) { return CONTAINING_RECORD(iface, EnumBackgroundCopyFilesImpl, IEnumBackgroundCopyFiles_iface); @@ -77,9 +66,15 @@ static ULONG WINAPI BITS_IEnumBackgroundCopyFiles_Release(IEnumBackgroundCopyFil { EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); ULONG ref = InterlockedDecrement(&This->ref); + ULONG i; if (ref == 0) - EnumBackgroundCopyFilesDestructor(This); + { + for(i = 0; i < This->numFiles; i++) + IBackgroundCopyFile_Release(This->files[i]); + HeapFree(GetProcessHeap(), 0, This->files); + HeapFree(GetProcessHeap(), 0, This); + } return ref; }

1 0

Andrew Talbot : hhctrl.ocx: Remove unneeded address-of operators from array names.
by Alexandre Julliard Dec. 6, 2012

Dec. 6, 2012

Module: wine Branch: master Commit: 896cc71d24bad3f5063ec876fb72b965caab3ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=896cc71d24bad3f5063ec876f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Dec 5 22:42:37 2012 +0000 hhctrl.ocx: Remove unneeded address-of operators from array names. --- dlls/hhctrl.ocx/chm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index e3f2a44..641fe95 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -280,7 +280,7 @@ void MergeChmProperties(HH_WINTYPEW *src, HHInfo *info, BOOL override) if (merge & HHWIN_PARAM_TB_FLAGS) dst->fsToolBarFlags = src->fsToolBarFlags; if (merge & HHWIN_PARAM_EXPANSION) dst->fNotExpanded = src->fNotExpanded; if (merge & HHWIN_PARAM_TABPOS) dst->tabpos = src->tabpos; - if (merge & HHWIN_PARAM_TABORDER) memcpy(&dst->tabOrder, &src->tabOrder, sizeof(src->tabOrder)); + if (merge & HHWIN_PARAM_TABORDER) memcpy(dst->tabOrder, src->tabOrder, sizeof(src->tabOrder)); if (merge & HHWIN_PARAM_HISTORY_COUNT) dst->cHistory = src->cHistory; if (merge & HHWIN_PARAM_CUR_TAB) dst->curNavType = src->curNavType;

1 0