January 2010 - Wine-Commits

Jörg Höhle : winmm: Fix MIDI resource leaks.
by Alexandre Julliard Jan. 28, 2010

Jan. 28, 2010

Module: wine Branch: master Commit: 9fac9d8ffdc2d935d69bc11fc36ec714e8befa94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fac9d8ffdc2d935d69bc11fc… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 27 18:16:55 2010 +0100 winmm: Fix MIDI resource leaks. --- dlls/winmm/winmm.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index b2caa48..1a1fdad 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1772,6 +1772,10 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, /* FIXME: the correct value is not allocated yet for MAPPER */ mosm.wDeviceID = *lpuDeviceID; lpwm = MIDI_OutAlloc(&hMidiOut, &dwCallback, &dwInstance, &fdwOpen, 1, &mosm); + if (!lpwm) { + HeapFree(GetProcessHeap(), 0, lpMidiStrm); + return MMSYSERR_NOMEM; + } lpMidiStrm->hDevice = hMidiOut; if (lphMidiStrm) *lphMidiStrm = (HMIDISTRM)hMidiOut; @@ -1779,6 +1783,12 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, lpwm->mld.uDeviceID = *lpuDeviceID; ret = MMDRV_Open(&lpwm->mld, MODM_OPEN, (DWORD_PTR)&lpwm->mod, fdwOpen); + if (ret != MMSYSERR_NOERROR) { + MMDRV_Free(hMidiOut, &lpwm->mld); + HeapFree(GetProcessHeap(), 0, lpMidiStrm); + return ret; + } + lpMidiStrm->hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); lpMidiStrm->wFlags = HIWORD(fdwOpen);

1 0

Erich Hoover : hhctrl.ocx: Separate the HTML Help stream reader code from the Contents tab.
by Alexandre Julliard Jan. 28, 2010

Jan. 28, 2010

Module: wine Branch: master Commit: 5912b0c92fc40ed748e41964d0dc32755b65abbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5912b0c92fc40ed748e41964d… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Jan 27 19:12:21 2010 -0700 hhctrl.ocx: Separate the HTML Help stream reader code from the Contents tab. --- dlls/hhctrl.ocx/Makefile.in | 1 + dlls/hhctrl.ocx/content.c | 159 +---------------------------------------- dlls/hhctrl.ocx/stream.c | 167 +++++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/stream.h | 47 ++++++++++++ 4 files changed, 216 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5912b0c92fc40ed748e41…

1 0

Juan Lang : wintrust: Return error directly from SOFTPUB_GetSIP.
by Alexandre Julliard Jan. 28, 2010

Jan. 28, 2010

Module: wine Branch: master Commit: 2c12de4b7e4536460aab1baeea1dda78da132fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c12de4b7e4536460aab1baee… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 10:31:26 2010 -0800 wintrust: Return error directly from SOFTPUB_GetSIP. --- dlls/wintrust/softpub.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 356d8fe..a6edfe2 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -127,20 +127,20 @@ static DWORD SOFTPUB_GetFileSubject(CRYPT_PROVIDER_DATA *data) /* Assumes data->u.pPDSip exists, and its gSubject member set. * Allocates data->u.pPDSip->pSip and loads it, if possible. */ -static BOOL SOFTPUB_GetSIP(CRYPT_PROVIDER_DATA *data) +static DWORD SOFTPUB_GetSIP(CRYPT_PROVIDER_DATA *data) { - BOOL ret; + DWORD err = ERROR_SUCCESS; data->u.pPDSip->pSip = data->psPfns->pfnAlloc(sizeof(SIP_DISPATCH_INFO)); if (data->u.pPDSip->pSip) - ret = CryptSIPLoad(&data->u.pPDSip->gSubject, 0, data->u.pPDSip->pSip); - else { - SetLastError(ERROR_OUTOFMEMORY); - ret = FALSE; + if (!CryptSIPLoad(&data->u.pPDSip->gSubject, 0, data->u.pPDSip->pSip)) + err = GetLastError(); } - TRACE("returning %d\n", ret); - return ret; + else + err = ERROR_OUTOFMEMORY; + TRACE("returning %d\n", err); + return err; } /* Assumes data->u.pPDSip has been loaded, and data->u.pPDSip->pSip allocated. @@ -336,11 +336,9 @@ static DWORD SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) err = SOFTPUB_GetFileSubject(data); if (err) goto error; - if (!SOFTPUB_GetSIP(data)) - { - err = GetLastError(); + err = SOFTPUB_GetSIP(data); + if (err) goto error; - } if (!SOFTPUB_GetMessageFromFile(data, data->pWintrustData->u.pFile->hFile, data->pWintrustData->u.pFile->pcwszFilePath)) { @@ -380,11 +378,9 @@ static DWORD SOFTPUB_LoadCatalogMessage(CRYPT_PROVIDER_DATA *data) err = GetLastError(); goto error; } - if (!SOFTPUB_GetSIP(data)) - { - err = GetLastError(); + err = SOFTPUB_GetSIP(data); + if (err) goto error; - } if (!SOFTPUB_GetMessageFromFile(data, catalog, data->pWintrustData->u.pCatalog->pcwszCatalogFilePath)) {

1 0

Juan Lang : wintrust: Return error directly from SOFTPUB_LoadFileMessage.
by Alexandre Julliard Jan. 28, 2010

Jan. 28, 2010

Module: wine Branch: master Commit: 9e8e14ed127fd5a017777cc7ac91087cdc59c72e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e8e14ed127fd5a017777cc7a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 10:25:48 2010 -0800 wintrust: Return error directly from SOFTPUB_LoadFileMessage. --- dlls/wintrust/softpub.c | 54 ++++++++++++++++++++++++++++++---------------- 1 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 47b76b2..9d13b4a 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -323,35 +323,45 @@ static BOOL SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data) return ret; } -static BOOL SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) +static DWORD SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) { - BOOL ret; + DWORD err = ERROR_SUCCESS; if (!data->pWintrustData->u.pFile) { - SetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; + err = ERROR_INVALID_PARAMETER; goto error; } - ret = SOFTPUB_OpenFile(data); - if (!ret) + if (!SOFTPUB_OpenFile(data)) + { + err = GetLastError(); goto error; - ret = SOFTPUB_GetFileSubject(data); - if (!ret) + } + if (!SOFTPUB_GetFileSubject(data)) + { + err = GetLastError(); goto error; - ret = SOFTPUB_GetSIP(data); - if (!ret) + } + if (!SOFTPUB_GetSIP(data)) + { + err = GetLastError(); goto error; - ret = SOFTPUB_GetMessageFromFile(data, data->pWintrustData->u.pFile->hFile, - data->pWintrustData->u.pFile->pcwszFilePath); - if (!ret) + } + if (!SOFTPUB_GetMessageFromFile(data, data->pWintrustData->u.pFile->hFile, + data->pWintrustData->u.pFile->pcwszFilePath)) + { + err = GetLastError(); goto error; - ret = SOFTPUB_CreateStoreFromMessage(data); - if (!ret) + } + if (!SOFTPUB_CreateStoreFromMessage(data)) + { + err = GetLastError(); goto error; - ret = SOFTPUB_DecodeInnerContent(data); + } + if (!SOFTPUB_DecodeInnerContent(data)) + err = GetLastError(); error: - return ret; + return err; } static BOOL SOFTPUB_LoadCatalogMessage(CRYPT_PROVIDER_DATA *data) @@ -393,7 +403,8 @@ error: HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) { - BOOL ret; + BOOL ret = TRUE; + DWORD err = ERROR_SUCCESS; TRACE("(%p)\n", data); @@ -406,7 +417,7 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) ret = SOFTPUB_LoadCertMessage(data); break; case WTD_CHOICE_FILE: - ret = SOFTPUB_LoadFileMessage(data); + err = SOFTPUB_LoadFileMessage(data); break; case WTD_CHOICE_CATALOG: ret = SOFTPUB_LoadCatalogMessage(data); @@ -420,6 +431,11 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data) if (!ret) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] = GetLastError(); + else if (err) + { + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] = err; + ret = FALSE; + } TRACE("returning %d (%08x)\n", ret ? S_OK : S_FALSE, data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV]); return ret ? S_OK : S_FALSE;

1 0

Matijn Woudt : winhttp/tests: Add tests for WinHttpSetTimeouts.
by Alexandre Julliard Jan. 28, 2010

Jan. 28, 2010

Module: wine Branch: master Commit: 5a712037aff785e943bc29f15fb065bb3cb48c3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a712037aff785e943bc29f15… Author: Matijn Woudt <tijnema(a)gmail.com> Date: Wed Jan 27 23:01:29 2010 +0100 winhttp/tests: Add tests for WinHttpSetTimeouts. --- dlls/winhttp/tests/winhttp.c | 108 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index f0b46b6..bddf871 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1031,6 +1031,113 @@ static void test_set_default_proxy_config(void) GetLastError()); } +static void test_Timeouts (void) +{ + BOOL ret; + HINTERNET ses, req, con; + static const WCHAR codeweavers[] = {'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0}; + + + ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(ses, -2, 0, 0, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(ses, 0, -2, 0, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(ses, 0, 0, -2, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(ses, 0, 0, 0, -2); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(ses, -1, -1, -1, -1); + todo_wine ok(ret, "%u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(ses, 0, 0, 0, 0); + todo_wine ok(ret, "%u\n", GetLastError()); + + con = WinHttpConnect(ses, codeweavers, 0, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(con, -2, 0, 0, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(con, 0, -2, 0, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(con, 0, 0, -2, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(con, 0, 0, 0, -2); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(con, -1, -1, -1, -1); + ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, + "expected ERROR_WINHTTP_INVALID_TYPE, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(con, 0, 0, 0, 0); + ok(!ret && GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_TYPE, + "expected ERROR_WINHTTP_INVALID_TYPE, got %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(req, -2, 0, 0, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(req, 0, -2, 0, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(req, 0, 0, -2, 0); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(req, 0, 0, 0, -2); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(req, -1, -1, -1, -1); + ok(ret, "%u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetTimeouts(req, 0, 0, 0, 0); + ok(ret, "%u\n", GetLastError()); + + WinHttpCloseHandle(req); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); +} + START_TEST (winhttp) { test_OpenRequest(); @@ -1043,4 +1150,5 @@ START_TEST (winhttp) test_QueryOption(); test_set_default_proxy_config(); test_empty_headers_param(); + test_Timeouts(); }

1 0

Jacek Caban : mshtml: Added script element IDispatchEx support.
by Alexandre Julliard Jan. 28, 2010

Jan. 28, 2010

Module: wine Branch: master Commit: 7bf41fac63332a916a46440983bfb68df85607be URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf41fac63332a916a4644098… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 28 02:10:24 2010 +0100 mshtml: Added script element IDispatchEx support. --- dlls/mshtml/dispex.c | 2 ++ dlls/mshtml/htmlscript.c | 15 ++++++++++++++- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/dom.c | 2 +- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index ca09313..d7220d7 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -100,6 +100,7 @@ static REFIID tid_ids[] = { &DIID_DispHTMLNavigator, &DIID_DispHTMLOptionElement, &DIID_DispHTMLScreen, + &DIID_DispHTMLScriptElement, &DIID_DispHTMLSelectElement, &DIID_DispHTMLStyle, &DIID_DispHTMLTable, @@ -142,6 +143,7 @@ static REFIID tid_ids[] = { &IID_IHTMLLocation, &IID_IHTMLOptionElement, &IID_IHTMLScreen, + &IID_IHTMLScriptElement, &IID_IHTMLSelectElement, &IID_IHTMLStyle, &IID_IHTMLStyle2, diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index d86f398..2427309 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -319,6 +319,19 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { HTMLScriptElement_get_readystate }; +static const tid_t HTMLScriptElement_iface_tids[] = { + HTMLELEMENT_TIDS, + IHTMLScriptElement_tid, + 0 +}; + +static dispex_static_data_t HTMLScriptElement_dispex = { + NULL, + DispHTMLScriptElement_tid, + NULL, + HTMLScriptElement_iface_tids +}; + HTMLElement *HTMLScriptElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) { HTMLScriptElement *ret = heap_alloc_zero(sizeof(HTMLScriptElement)); @@ -327,7 +340,7 @@ HTMLElement *HTMLScriptElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement * ret->lpHTMLScriptElementVtbl = &HTMLScriptElementVtbl; ret->element.node.vtbl = &HTMLScriptElementImplVtbl; - HTMLElement_Init(&ret->element, doc, nselem, NULL); + HTMLElement_Init(&ret->element, doc, nselem, &HTMLScriptElement_dispex); nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLScriptElement, (void**)&ret->nsscript); if(NS_FAILED(nsres)) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 30b47e8..8a1ff01 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -76,6 +76,7 @@ typedef enum { DispHTMLNavigator_tid, DispHTMLOptionElement_tid, DispHTMLScreen_tid, + DispHTMLScriptElement_tid, DispHTMLSelectElement_tid, DispHTMLStyle_tid, DispHTMLTable_tid, @@ -118,6 +119,7 @@ typedef enum { IHTMLLocation_tid, IHTMLOptionElement_tid, IHTMLScreen_tid, + IHTMLScriptElement_tid, IHTMLSelectElement_tid, IHTMLStyle_tid, IHTMLStyle2_tid, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c818a1d..581d9d4 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -412,7 +412,7 @@ static const elem_type_info_t elem_type_infos[] = { {"BR", elem_iids, NULL}, {"TABLE", table_iids, &DIID_DispHTMLTable}, {"TBODY", elem_iids, NULL}, - {"SCRIPT", script_iids, NULL}, + {"SCRIPT", script_iids, &DIID_DispHTMLScriptElement}, {"TEST", elem_iids, &DIID_DispHTMLUnknownElement}, {"TEST", generic_iids, &DIID_DispHTMLGenericElement}, {"!", comment_iids, &DIID_DispHTMLCommentElement},

1 0

Henri Verbeet : wined3d: Use correct texture stage limits in a couple of places.
by Alexandre Julliard Jan. 28, 2010

Jan. 28, 2010

Module: wine Branch: master Commit: a3e1a6f2ee61a48e685bed4d784bcdcb5b6d035e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3e1a6f2ee61a48e685bed4d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 20:19:42 2010 +0100 wined3d: Use correct texture stage limits in a couple of places. --- dlls/wined3d/device.c | 16 +++++++++++----- dlls/wined3d/state.c | 6 +++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8e85e4d..0cc27c9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3024,6 +3024,7 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { static void device_map_psamplers(IWineD3DDeviceImpl *This) { const WINED3DSAMPLER_TEXTURE_TYPE *sampler_type = ((IWineD3DPixelShaderImpl *)This->stateBlock->pixelShader)->baseShader.reg_maps.sampler_type; + const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; unsigned int i; for (i = 0; i < MAX_FRAGMENT_SAMPLERS; ++i) { @@ -3031,7 +3032,8 @@ static void device_map_psamplers(IWineD3DDeviceImpl *This) { { device_map_stage(This, i, i); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_SAMPLER(i)); - if (i < MAX_TEXTURES) { + if (i < gl_info->limits.texture_stages) + { markTextureStagesDirty(This, i); } } @@ -3735,11 +3737,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *iface, DWORD Stage, WINED3DTEXTURESTAGESTATETYPE Type, DWORD Value) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; DWORD oldValue = This->updateStateBlock->textureState[Stage][Type]; + const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; TRACE("(%p) : Stage=%d, Type=%s(%d), Value=%d\n", This, Stage, debug_d3dtexturestate(Type), Type, Value); - if (Stage >= MAX_TEXTURES) { - WARN("Attempting to set stage %u which is higher than the max stage %u, ignoring\n", Stage, MAX_TEXTURES - 1); + if (Stage >= gl_info->limits.texture_stages) + { + WARN("Attempting to set stage %u which is higher than the max stage %u, ignoring.\n", + Stage, gl_info->limits.texture_stages - 1); return WINED3D_OK; } @@ -3820,6 +3825,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD stage, IWineD3DBaseTexture *texture) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; IWineD3DBaseTexture *prev; TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); @@ -3878,7 +3884,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADER); } - if (!prev && stage < MAX_TEXTURES) + if (!prev && stage < gl_info->limits.texture_stages) { /* The source arguments for color and alpha ops have different * meanings when a NULL texture is bound, so the COLOROP and @@ -3897,7 +3903,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, IWineD3DBaseTexture_Release(prev); - if (!texture && stage < MAX_TEXTURES) + if (!texture && stage < gl_info->limits.texture_stages) { IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(stage, WINED3DTSS_COLOROP)); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(stage, WINED3DTSS_ALPHAOP)); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 247710c..35482ee 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3601,9 +3601,9 @@ void apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, struct w } } else { /* Disabled the pixel shader - color ops weren't applied - * while it was enabled, so re-apply them. - */ - for(i=0; i < MAX_TEXTURES; i++) { + * while it was enabled, so re-apply them. */ + for (i = 0; i < context->gl_info->limits.texture_stages; ++i) + { if(!isStateDirty(context, STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP))) { device->StateTable[STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP)].apply (STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP), stateblock, context);

1 0

Henri Verbeet : wined3d: Make sure all contexts are finished drawing before calling SwapBuffers().
by Alexandre Julliard Jan. 28, 2010

Jan. 28, 2010

Module: wine Branch: master Commit: daf0aeb34a0e34f1a9519bdacff121cd85dced30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf0aeb34a0e34f1a9519bdac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 20:19:41 2010 +0100 wined3d: Make sure all contexts are finished drawing before calling SwapBuffers(). This causes a small performance hit when multiple GL contexts are used. As an optimization we could use ARB_sync to only wait for the last draw call instead of all GL commands. --- dlls/wined3d/swapchain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 434eb3f..6b44cd5 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -343,6 +343,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO swapchain_blit(This, context, &src_rect, &dst_rect); } + if (This->num_contexts > 1) wglFinish(); SwapBuffers(This->context[0]->hdc); /* TODO: cycle through the swapchain buffers */ TRACE("SwapBuffers called, Starting new frame\n");

1 0

Henri Verbeet : wined3d: Ensure draw ordering across contexts.
by Alexandre Julliard Jan. 28, 2010

Jan. 28, 2010

Module: wine Branch: master Commit: ce42470138a4805dce509a1fa806c8880530f324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce42470138a4805dce509a1fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 20:19:40 2010 +0100 wined3d: Ensure draw ordering across contexts. --- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/drawprim.c | 3 +++ dlls/wined3d/surface.c | 30 +++++++++++++++++++----------- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d66b46e..8e85e4d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4135,7 +4135,6 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa const WINED3DVIEWPORT *vp = &This->stateBlock->viewport; UINT drawable_width, drawable_height; IWineD3DSurfaceImpl *depth_stencil = (IWineD3DSurfaceImpl *) This->stencilBufferTarget; - IWineD3DSwapChainImpl *swapchain = NULL; struct wined3d_context *context; /* When we're clearing parts of the drawable, make sure that the target surface is well up to date in the @@ -4305,12 +4304,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa LEAVE_GL(); - if (SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface *)target, &IID_IWineD3DSwapChain, (void **)&swapchain))) { - if (target == (IWineD3DSurfaceImpl*) swapchain->frontBuffer) { - wglFlush(); - } - IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); - } + wglFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); @@ -5315,6 +5309,9 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, checkGLcall("glClear"); LEAVE_GL(); + + wglFlush(); /* Flush to ensure ordering across contexts. */ + context_release(context); } @@ -5768,6 +5765,9 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED } LEAVE_GL(); + + wglFlush(); /* Flush to ensure ordering across contexts. */ + context_release(context); IWineD3DSurface_ModifyLocation(dst_surface, SFLAG_INDRAWABLE, TRUE); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 8250e79..b29d012 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -690,6 +690,9 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT /* Finished updating the screen, restore lock */ LEAVE_GL(); + + wglFlush(); /* Flush to ensure ordering across contexts. */ + context_release(context); TRACE("Done all gl drawing\n"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8dcc691..233f079 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3447,6 +3447,9 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine } LEAVE_GL(); + + wglFlush(); /* Flush to ensure ordering across contexts. */ + context_release(context); /* The texture is now most up to date - If the surface is a render target and has a drawable, this @@ -3921,9 +3924,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const /* Leave the opengl state valid for blitting */ myDevice->blitter->unset_shader((IWineD3DDevice *) myDevice); - /* Flush in case the drawable is used by multiple GL contexts */ - if(dstSwapchain && (This == (IWineD3DSurfaceImpl *) dstSwapchain->frontBuffer || dstSwapchain->num_contexts >= 2)) - wglFlush(); + wglFlush(); /* Flush to ensure ordering across contexts. */ context_release(context); @@ -4552,7 +4553,11 @@ void surface_load_ds_location(IWineD3DSurface *iface, struct wined3d_context *co else context_bind_fbo(context, GL_FRAMEBUFFER, NULL); LEAVE_GL(); - } else { + + wglFlush(); /* Flush to ensure ordering across contexts. */ + } + else + { FIXME("No up to date depth stencil location\n"); } } else if (location == SFLAG_DS_ONSCREEN) { @@ -4569,7 +4574,11 @@ void surface_load_ds_location(IWineD3DSurface *iface, struct wined3d_context *co if (context->current_fbo) context_bind_fbo(context, GL_FRAMEBUFFER, &context->current_fbo->id); LEAVE_GL(); - } else { + + wglFlush(); /* Flush to ensure ordering across contexts. */ + } + else + { FIXME("No up to date depth stencil location\n"); } } else { @@ -4802,15 +4811,14 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT LEAVE_GL(); + wglFlush(); /* Flush to ensure ordering across contexts. */ + if(SUCCEEDED(IWineD3DSurface_GetContainer((IWineD3DSurface*)This, &IID_IWineD3DSwapChain, (void **) &swapchain))) { - /* Make sure to flush the buffers. This is needed in apps like Red Alert II and Tiberian SUN that use multiple WGL contexts. */ - if(((IWineD3DSwapChainImpl*)swapchain)->frontBuffer == (IWineD3DSurface*)This || - ((IWineD3DSwapChainImpl*)swapchain)->num_contexts >= 2) - wglFlush(); - IWineD3DSwapChain_Release(swapchain); - } else { + } + else + { /* We changed the filtering settings on the texture. Inform the container about this to get the filters * reset properly next draw */

1 0

André Hentschel : oleaut32/tests: Add a test for DosTime.
by Alexandre Julliard Jan. 28, 2010

Jan. 28, 2010

Module: wine Branch: master Commit: 2e48ecd924ad0ca8be223d07370ded2b5c2c3631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e48ecd924ad0ca8be223d073… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 27 20:02:43 2010 +0100 oleaut32/tests: Add a test for DosTime. --- dlls/oleaut32/tests/vartest.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 05f4be3..16c08be 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1759,7 +1759,8 @@ static void test_DosDateTimeToVariantTime(void) DOS2DT(1,1,1980,0,0,29,1,29221.00032407407); /* 1/1/1980 12:00:28 AM */ DOS2DT(1,1,1980,0,0,31,1,29221.00034722222); /* 1/1/1980 12:00:30 AM */ DOS2DT(1,1,1980,0,59,0,1,29221.04097222222); /* 1/1/1980 12:59:00 AM */ - DOS2DT(1,1,1980,0,60,0,0,0.0); /* Invalid seconds */ + DOS2DT(1,1,1980,0,60,0,0,0.0); /* Invalid minutes */ + DOS2DT(1,1,1980,0,0,60,0,0.0); /* Invalid seconds */ DOS2DT(1,1,1980,23,0,0,1,29221.95833333333); /* 1/1/1980 11:00:00 PM */ DOS2DT(1,1,1980,24,0,0,0,0.0); /* Invalid hours */ }

1 0