October 2012 - Wine-commits

Jacek Caban : mshtml: Properly handle OOM errors in omnavigator.c (coverity ).
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: wine Branch: master Commit: 3a4a4acd1a083ef8a839ac8786b49d9f864698b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a4a4acd1a083ef8a839ac878… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 19 11:57:47 2012 +0200 mshtml: Properly handle OOM errors in omnavigator.c (coverity). --- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/omnavigator.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index dede0a7..0fad7aa 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -803,7 +803,7 @@ static HRESULT WINAPI HTMLWindow2_get_navigator(IHTMLWindow2 *iface, IOmNavigato TRACE("(%p)->(%p)\n", This, p); *p = OmNavigator_Create(); - return S_OK; + return *p ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI HTMLWindow2_put_name(IHTMLWindow2 *iface, BSTR v) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 6d7ec15..51421d3 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -941,6 +941,9 @@ IOmNavigator *OmNavigator_Create(void) OmNavigator *ret; ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return NULL; + ret->IOmNavigator_iface.lpVtbl = &OmNavigatorVtbl; ret->ref = 1;

1 0

Jacek Caban : mshtml: Properly handle OOM errors in nsio.c (coverity).
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: wine Branch: master Commit: 421368b8758e1f700743a8c5fafb650f332bf28f URL: http://source.winehq.org/git/wine.git/?a=commit;h=421368b8758e1f700743a8c5f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 19 11:58:01 2012 +0200 mshtml: Properly handle OOM errors in nsio.c (coverity). --- dlls/mshtml/nsio.c | 39 ++++++++++++++++++++++++--------------- 1 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 6e63244..7fc2a3a 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1005,11 +1005,17 @@ static nsresult async_open(nsChannel *This, HTMLOuterWindow *window, BOOL is_doc hres = create_pending_window(window, bscallback); if(SUCCEEDED(hres)) async_start_doc_binding(window, window->pending_window); - IUnknown_Release((IUnknown*)bscallback); + IBindStatusCallback_Release(&bscallback->bsc.IBindStatusCallback_iface); if(FAILED(hres)) return NS_ERROR_UNEXPECTED; }else { - start_binding_task_t *task = heap_alloc(sizeof(start_binding_task_t)); + start_binding_task_t *task; + + task = heap_alloc(sizeof(start_binding_task_t)); + if(!task) { + IBindStatusCallback_Release(&bscallback->bsc.IBindStatusCallback_iface); + return NS_ERROR_OUT_OF_MEMORY; + } task->window = window->base.inner_window; task->bscallback = bscallback; @@ -2846,9 +2852,13 @@ static const nsIStandardURLVtbl nsStandardURLVtbl = { static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *container, nsWineURI **_retval) { - nsWineURI *ret = heap_alloc_zero(sizeof(nsWineURI)); + nsWineURI *ret; HRESULT hres; + ret = heap_alloc_zero(sizeof(nsWineURI)); + if(!ret) + return NS_ERROR_OUT_OF_MEMORY; + ret->nsIFileURL_iface.lpVtbl = &nsFileURLVtbl; ret->nsIStandardURL_iface.lpVtbl = &nsStandardURLVtbl; ret->ref = 1; @@ -3121,17 +3131,6 @@ static const nsIProtocolHandlerVtbl nsProtocolHandlerVtbl = { nsProtocolHandler_AllowPort }; -static nsIProtocolHandler *create_protocol_handler(nsIProtocolHandler *nshandler) -{ - nsProtocolHandler *ret = heap_alloc(sizeof(nsProtocolHandler)); - - ret->nsIProtocolHandler_iface.lpVtbl = &nsProtocolHandlerVtbl; - ret->ref = 1; - ret->nshandler = nshandler; - - return &ret->nsIProtocolHandler_iface; -} - static nsresult NSAPI nsIOService_QueryInterface(nsIIOService*,nsIIDRef,void**); static nsrefcnt NSAPI nsIOService_AddRef(nsIIOService *iface) @@ -3149,6 +3148,7 @@ static nsresult NSAPI nsIOService_GetProtocolHandler(nsIIOService *iface, const { nsIExternalProtocolHandler *nsexthandler; nsIProtocolHandler *nshandler; + nsProtocolHandler *ret; nsresult nsres; TRACE("(%s %p)\n", debugstr_a(aScheme), _retval); @@ -3167,7 +3167,16 @@ static nsresult NSAPI nsIOService_GetProtocolHandler(nsIIOService *iface, const } nsIExternalProtocolHandler_Release(nsexthandler); - *_retval = create_protocol_handler(nshandler); + + ret = heap_alloc(sizeof(nsProtocolHandler)); + if(!ret) + return NS_ERROR_OUT_OF_MEMORY; + + ret->nsIProtocolHandler_iface.lpVtbl = &nsProtocolHandlerVtbl; + ret->ref = 1; + ret->nshandler = nshandler; + *_retval = &ret->nsIProtocolHandler_iface; + TRACE("return %p\n", *_retval); return NS_OK; }

1 0

Jacek Caban : mshtml: Properly handle OOM errors in navigate.c (coverity).
by Alexandre Julliard 19 Oct '12

19 Oct '12

Module: wine Branch: master Commit: b6227fc4e89cfa20c23782f7e42c8dccdad36398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6227fc4e89cfa20c23782f7e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 19 11:58:15 2012 +0200 mshtml: Properly handle OOM errors in navigate.c (coverity). --- dlls/mshtml/navigate.c | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index f1f0f98..06d1207 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -215,7 +215,11 @@ static const nsIInputStreamVtbl nsInputStreamVtbl = { static nsProtocolStream *create_nsprotocol_stream(void) { - nsProtocolStream *ret = heap_alloc(sizeof(nsProtocolStream)); + nsProtocolStream *ret; + + ret = heap_alloc(sizeof(nsProtocolStream)); + if(!ret) + return NULL; ret->nsIInputStream_iface.lpVtbl = &nsInputStreamVtbl; ret->ref = 1; @@ -877,8 +881,10 @@ static HRESULT BufferBSC_read_data(BSCallback *bsc, IStream *stream) HRESULT hres; if(!This->buf) { + This->buf = heap_alloc(128); + if(!This->buf) + return E_OUTOFMEMORY; This->size = 128; - This->buf = heap_alloc(This->size); } do { @@ -921,23 +927,20 @@ static const BSCallbackVtbl BufferBSCVtbl = { }; -static BufferBSC *create_bufferbsc(IMoniker *mon) -{ - BufferBSC *ret = heap_alloc_zero(sizeof(*ret)); - - init_bscallback(&ret->bsc, &BufferBSCVtbl, mon, 0); - ret->hres = E_FAIL; - - return ret; -} - HRESULT bind_mon_to_wstr(HTMLInnerWindow *window, IMoniker *mon, WCHAR **ret) { - BufferBSC *bsc = create_bufferbsc(mon); + BufferBSC *bsc; int cp = CP_ACP; WCHAR *text; HRESULT hres; + bsc = heap_alloc_zero(sizeof(*bsc)); + if(!bsc) + return E_OUTOFMEMORY; + + init_bscallback(&bsc->bsc, &BufferBSCVtbl, mon, 0); + bsc->hres = E_FAIL; + hres = start_binding(window, &bsc->bsc, NULL); if(SUCCEEDED(hres)) hres = bsc->hres; @@ -1164,8 +1167,11 @@ static HRESULT read_stream_data(nsChannelBSC *This, IStream *stream) return S_OK; } - if(!This->nsstream) + if(!This->nsstream) { This->nsstream = create_nsprotocol_stream(); + if(!This->nsstream) + return E_OUTOFMEMORY; + } do { BOOL first_read = !This->bsc.readed;

1 0

Huw Davies : fonts: 10-pixel strikes for Tahoma.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 679385fd1cd2c405ac0d3745863d827293a3b445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=679385fd1cd2c405ac0d37458… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 18 15:40:25 2012 +0100 fonts: 10-pixel strikes for Tahoma. --- fonts/tahoma.sfd | 902 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ fonts/tahoma.ttf | Bin 94740 -> 101036 bytes 2 files changed, 902 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=679385fd1cd2c405ac0d3…

1 0

Maarten Lankhorst : ntdll: Set SO_PASSCRED before connecting to eliminate a race condition in obtaining server_pid .
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 7457f37e4a69ce7c778c41559e0d39246b12d812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7457f37e4a69ce7c778c41559… Author: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> Date: Tue Oct 16 14:11:45 2012 +0200 ntdll: Set SO_PASSCRED before connecting to eliminate a race condition in obtaining server_pid. --- dlls/kernel32/process.c | 7 +++++++ dlls/ntdll/server.c | 18 +++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1b10f9e..3a88aaa 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1919,6 +1919,13 @@ static BOOL create_process( HANDLE hFile, LPCWSTR filename, LPWSTR cmd_line, LPW SetLastError( ERROR_TOO_MANY_OPEN_FILES ); return FALSE; } +#ifdef SO_PASSCRED + else + { + int enable = 1; + setsockopt( socketfd[0], SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable) ); + } +#endif if (exec_only) /* things are much simpler in this case */ { diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 218c6eb..2fe7877 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -881,6 +881,13 @@ static int server_connect(void) addr.sun_len = slen; #endif if ((s = socket( AF_UNIX, SOCK_STREAM, 0 )) == -1) fatal_perror( "socket" ); +#ifdef SO_PASSCRED + else + { + int enable = 1; + setsockopt( s, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable) ); + } +#endif if (connect( s, (struct sockaddr *)&addr, slen ) != -1) { /* switch back to the starting directory */ @@ -1004,18 +1011,15 @@ void server_init_process(void) pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); /* receive the first thread request fd on the main socket */ + ntdll_get_thread_data()->request_fd = receive_fd( &version ); + #ifdef SO_PASSCRED - if (server_pid == -1) + /* now that we hopefully received the server_pid, disable SO_PASSCRED */ { - int enable = 1; - setsockopt( fd_socket, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable) ); - ntdll_get_thread_data()->request_fd = receive_fd( &version ); - enable = 0; + int enable = 0; setsockopt( fd_socket, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable) ); } - else #endif - ntdll_get_thread_data()->request_fd = receive_fd( &version ); if (version != SERVER_PROTOCOL_VERSION) server_protocol_error( "version mismatch %d/%d.\n"

1 0

Maarten Lankhorst : mmdevapi: Fix a broken test.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: d814eca3ba9a294a74b77b9423067775150f8af7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d814eca3ba9a294a74b77b942… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Oct 16 14:08:27 2012 +0200 mmdevapi: Fix a broken test. --- dlls/mmdevapi/tests/render.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 940d111..9d9478a 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -2094,6 +2094,8 @@ static void test_worst_case(void) hr = IAudioRenderClient_ReleaseBuffer(arc, fragment, AUDCLNT_BUFFERFLAGS_SILENT); ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + if(hr == S_OK) + sum += fragment; } hr = IAudioClient_Start(ac);

1 0

Rico Schüller : d3dx9: Fix calculation when in and out overlap in D3DXSHRotateZ().
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: e74a99b71a357d4afa25f342751e05644aa7857b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e74a99b71a357d4afa25f3427… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Oct 18 11:33:29 2012 +0200 d3dx9: Fix calculation when in and out overlap in D3DXSHRotateZ(). --- dlls/d3dx9_36/math.c | 88 +++++++++++++++++++------------------------------- 1 files changed, 33 insertions(+), 55 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 73bca45..5342bc9 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -2811,70 +2811,48 @@ FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, CONST D3DXMATRIX *matrix, CON return out; } -FLOAT * WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, CONST FLOAT *in) +FLOAT * WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, const FLOAT *in) { - FLOAT c1a, c2a, c3a, c4a, c5a, s1a, s2a, s3a, s4a, s5a; + UINT i, sum = 0; + FLOAT c[5], s[5]; TRACE("out %p, order %u, angle %f, in %p\n", out, order, angle, in); - c1a = cosf(angle); - s1a = sinf(angle); + order = min(max(order, D3DXSH_MINORDER), D3DXSH_MAXORDER); + out[0] = in[0]; - out[1] = c1a * in[1] + s1a * in[3]; - out[2] = in[2]; - out[3] = c1a * in[3] - s1a * in[1]; - if (order <= D3DXSH_MINORDER) - return out; - c2a = cosf(2.0f * angle); - s2a = sinf(2.0f * angle); - out[4] = c2a * in[4] + s2a * in[8]; - out[5] = c1a * in[5] + s1a * in[7]; - out[6] = in[6]; - out[7] = c1a * in[7] - s1a * in[5]; - out[8] = c2a * in[8] - s2a * in[4]; - if (order == 3) - return out; + for (i = 1; i < order; i++) + { + UINT j; - c3a = cosf(3.0f * angle); - s3a = sinf(3.0f * angle); - out[9] = c3a * in[9] + s3a * in[15]; - out[10] = c2a * in[10] + s2a * in[14]; - out[11] = c1a * in[11] + s1a * in[13]; - out[12] = in[12]; - out[13] = c1a * in[13] - s1a * in[11]; - out[14] = c2a * in[14] - s2a * in[10]; - out[15] = c3a * in[15] - s3a * in[9]; - if (order == 4) - return out; + c[i - 1] = cosf(i * angle); + s[i - 1] = sinf(i * angle); + sum += i * 2; - c4a = cosf(4.0f * angle); - s4a = sinf(4.0f * angle); - out[16] = c4a * in[16] + s4a * in[24]; - out[17] = c3a * in[17] + s3a * in[23]; - out[18] = c2a * in[18] + s2a * in[22]; - out[19] = c1a * in[19] + s1a * in[21]; - out[20] = in[20]; - out[21] = c1a * in[21] - s1a * in[19]; - out[22] = c2a * in[22] - s2a * in[18]; - out[23] = c3a * in[23] - s3a * in[17]; - out[24] = c4a * in[24] - s4a * in[16]; - if (order == 5) - return out; + out[sum - i] = c[i - 1] * in[sum - i]; + out[sum - i] += s[i - 1] * in[sum + i]; + for (j = i - 1; j > 0; j--) + { + out[sum - j] = 0.0f; + out[sum - j] = c[j - 1] * in[sum - j]; + out[sum - j] += s[j - 1] * in[sum + j]; + } + + if (in == out) + out[sum] = 0.0f; + else + out[sum] = in[sum]; - c5a = cosf(5.0f * angle); - s5a = sinf(5.0f * angle); - out[25] = c5a * in[25] + s5a * in[35]; - out[26] = c4a * in[26] + s4a * in[34]; - out[27] = c3a * in[27] + s3a * in[33]; - out[28] = c2a * in[28] + s2a * in[32]; - out[29] = c1a * in[29] + s1a * in[31]; - out[30] = in[30]; - out[31] = c1a * in[31] - s1a * in[29]; - out[32] = c2a * in[32] - s2a * in[28]; - out[33] = c3a * in[33] - s3a * in[27]; - out[34] = c4a * in[34] - s4a * in[26]; - out[35] = c5a * in[35] - s5a * in[25]; + for (j = 1; j < i; j++) + { + out[sum + j] = 0.0f; + out[sum + j] = -s[j - 1] * in[sum - j]; + out[sum + j] += c[j - 1] * in[sum + j]; + } + out[sum + i] = -s[i - 1] * in[sum - i]; + out[sum + i] += c[i - 1] * in[sum + i]; + } return out; }

1 0

Daniel Lehman : msvcp: Free facet and _Locimp in Locimp dtor.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 415d3a2425a037b1ec458106cff1efd3f2e2c857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=415d3a2425a037b1ec458106c… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Oct 17 12:52:50 2012 -0700 msvcp: Free facet and _Locimp in Locimp dtor. --- dlls/msvcp100/locale.c | 22 ++++++++++++---------- dlls/msvcp60/locale.c | 22 ++++++++++++---------- dlls/msvcp71/locale.c | 22 ++++++++++++---------- dlls/msvcp90/locale.c | 23 +++++++++++++---------- 4 files changed, 49 insertions(+), 40 deletions(-) diff --git a/dlls/msvcp100/locale.c b/dlls/msvcp100/locale.c index 1d03964..5c2d05c 100644 --- a/dlls/msvcp100/locale.c +++ b/dlls/msvcp100/locale.c @@ -7230,17 +7230,17 @@ locale__Locimp* __cdecl locale__Locimp__Locimp_ctor(locale__Locimp *this, const DEFINE_THISCALL_WRAPPER(locale__Locimp_dtor, 4) void __thiscall locale__Locimp_dtor(locale__Locimp *this) { + MSVCP_size_t i; + TRACE("(%p)\n", this); - if(locale_facet__Decref(&this->facet)) { - MSVCP_size_t i; - for(i=0; i<this->facet_cnt; i++) - if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) - call_locale_facet_vector_dtor(this->facetvec[i], 0); + locale_facet_dtor(&this->facet); + for(i=0; i<this->facet_cnt; i++) + if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) + call_locale_facet_vector_dtor(this->facetvec[i], 1); - MSVCRT_operator_delete(this->facetvec); - _Yarn_char_dtor(&this->name); - } + MSVCRT_operator_delete(this->facetvec); + _Yarn_char_dtor(&this->name); } /* ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPAV123@@Z */ @@ -7302,7 +7302,7 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet } if(locimp->facetvec[id] && locale_facet__Decref(locimp->facetvec[id])) - call_locale_facet_vector_dtor(locimp->facetvec[id], 0); + call_locale_facet_vector_dtor(locimp->facetvec[id], 1); locimp->facetvec[id] = facet; if(facet) @@ -7678,8 +7678,10 @@ locale* locale_ctor(locale *this) void locale_dtor(locale *this) { TRACE("(%p)\n", this); - if(this->ptr) + if(this->ptr && locale_facet__Decref(&this->ptr->facet)) { locale__Locimp_dtor(this->ptr); + MSVCRT_operator_delete(this->ptr); + } } /* ??4locale(a)std@@QAEAAV01(a)ABV01@@Z */ diff --git a/dlls/msvcp60/locale.c b/dlls/msvcp60/locale.c index 54e717c..2fc9bd0 100644 --- a/dlls/msvcp60/locale.c +++ b/dlls/msvcp60/locale.c @@ -7240,17 +7240,17 @@ static locale__Locimp* locale__Locimp_copy_ctor(locale__Locimp *this, const loca /* ??1_Locimp(a)locale@std@@MEAA(a)XZ */ static void locale__Locimp_dtor(locale__Locimp *this) { + MSVCP_size_t i; + TRACE("(%p)\n", this); - if(locale_facet__Decref(&this->facet)) { - MSVCP_size_t i; - for(i=0; i<this->facet_cnt; i++) - if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) - call_locale_facet_vector_dtor(this->facetvec[i], 0); + locale_facet_dtor(&this->facet); + for(i=0; i<this->facet_cnt; i++) + if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) + call_locale_facet_vector_dtor(this->facetvec[i], 1); - MSVCRT_operator_delete(this->facetvec); - basic_string_char_dtor(&this->name); - } + MSVCRT_operator_delete(this->facetvec); + basic_string_char_dtor(&this->name); } DEFINE_THISCALL_WRAPPER(locale__Locimp_vector_dtor, 8) @@ -7305,7 +7305,7 @@ static void locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet * } if(locimp->facetvec[id] && locale_facet__Decref(locimp->facetvec[id])) - call_locale_facet_vector_dtor(locimp->facetvec[id], 0); + call_locale_facet_vector_dtor(locimp->facetvec[id], 1); locimp->facetvec[id] = facet; if(facet) @@ -7758,8 +7758,10 @@ DEFINE_THISCALL_WRAPPER(locale_dtor, 4) void __thiscall locale_dtor(locale *this) { TRACE("(%p)\n", this); - if(this->ptr) + if(this->ptr && locale_facet__Decref(&this->ptr->facet)) { locale__Locimp_dtor(this->ptr); + MSVCRT_operator_delete(this); + } } /* ??4locale(a)std@@QAEAAV01(a)ABV01@@Z */ diff --git a/dlls/msvcp71/locale.c b/dlls/msvcp71/locale.c index 75570c8..658cdb8 100644 --- a/dlls/msvcp71/locale.c +++ b/dlls/msvcp71/locale.c @@ -7614,17 +7614,17 @@ locale__Locimp* __thiscall locale__Locimp_copy_ctor(locale__Locimp *this, const /* ??1_Locimp(a)locale@std@@MEAA(a)XZ */ static void locale__Locimp_dtor(locale__Locimp *this) { + MSVCP_size_t i; + TRACE("(%p)\n", this); - if(locale_facet__Decref(&this->facet)) { - MSVCP_size_t i; - for(i=0; i<this->facet_cnt; i++) - if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) - call_locale_facet_vector_dtor(this->facetvec[i], 0); + locale_facet_dtor(&this->facet); + for(i=0; i<this->facet_cnt; i++) + if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) + call_locale_facet_vector_dtor(this->facetvec[i], 1); - MSVCRT_operator_delete(this->facetvec); - MSVCP_basic_string_char_dtor(&this->name); - } + MSVCRT_operator_delete(this->facetvec); + MSVCP_basic_string_char_dtor(&this->name); } DEFINE_THISCALL_WRAPPER(locale__Locimp_vector_dtor, 8) @@ -7679,7 +7679,7 @@ static void locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet * } if(locimp->facetvec[id] && locale_facet__Decref(locimp->facetvec[id])) - call_locale_facet_vector_dtor(locimp->facetvec[id], 0); + call_locale_facet_vector_dtor(locimp->facetvec[id], 1); locimp->facetvec[id] = facet; if(facet) @@ -8133,8 +8133,10 @@ DEFINE_THISCALL_WRAPPER(locale_dtor, 4) void __thiscall locale_dtor(locale *this) { TRACE("(%p)\n", this); - if(this->ptr) + if(this->ptr && locale_facet__Decref(&this->ptr->facet)) { locale__Locimp_dtor(this->ptr); + MSVCRT_operator_delete(this); + } } /* ??4locale(a)std@@QAEAAV01(a)ABV01@@Z */ diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 1725900..c581d9c 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -7846,17 +7846,17 @@ locale__Locimp* __cdecl locale__Locimp__Locimp_ctor(locale__Locimp *this, const DEFINE_THISCALL_WRAPPER(locale__Locimp_dtor, 4) void __thiscall locale__Locimp_dtor(locale__Locimp *this) { + MSVCP_size_t i; + TRACE("(%p)\n", this); - if(locale_facet__Decref(&this->facet)) { - MSVCP_size_t i; - for(i=0; i<this->facet_cnt; i++) - if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) - call_locale_facet_vector_dtor(this->facetvec[i], 0); + locale_facet_dtor(&this->facet); + for(i=0; i<this->facet_cnt; i++) + if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) + call_locale_facet_vector_dtor(this->facetvec[i], 1); - MSVCRT_operator_delete(this->facetvec); - MSVCP_basic_string_char_dtor(&this->name); - } + MSVCRT_operator_delete(this->facetvec); + MSVCP_basic_string_char_dtor(&this->name); } /* ?_Locimp_dtor(a)_Locimp@locale(a)std@@CAXPAV123@@Z */ @@ -7918,7 +7918,7 @@ void __cdecl locale__Locimp__Locimp_Addfac(locale__Locimp *locimp, locale_facet } if(locimp->facetvec[id] && locale_facet__Decref(locimp->facetvec[id])) - call_locale_facet_vector_dtor(locimp->facetvec[id], 0); + call_locale_facet_vector_dtor(locimp->facetvec[id], 1); locimp->facetvec[id] = facet; if(facet) @@ -8380,8 +8380,11 @@ DEFINE_THISCALL_WRAPPER(locale_dtor, 4) void __thiscall locale_dtor(locale *this) { TRACE("(%p)\n", this); - if(this->ptr) + if(this->ptr && locale_facet__Decref(&this->ptr->facet)) + { locale__Locimp_dtor(this->ptr); + MSVCRT_operator_delete(this->ptr); + } } /* ??4locale(a)std@@QAEAAV01(a)ABV01@@Z */

1 0

Henri Verbeet : wined3d: Explcitly check the shader type in shader_glsl_get_sample_function().
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: cc0b1bb03f526ed06c27745fb8eb4704685246fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc0b1bb03f526ed06c27745fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 17 23:08:00 2012 +0200 wined3d: Explcitly check the shader type in shader_glsl_get_sample_function(). --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a585b1d..b8218ae 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1793,7 +1793,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context { enum wined3d_sampler_texture_type sampler_type = ctx->reg_maps->sampler_type[sampler_idx]; const struct wined3d_gl_info *gl_info = ctx->gl_info; - BOOL shadow = shader_is_pshader_version(ctx->reg_maps->shader_version.type) + BOOL shadow = ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL && (((const struct shader_glsl_ctx_priv *)ctx->backend_data)->cur_ps_args->shadow & (1 << sampler_idx)); BOOL projected = flags & WINED3D_GLSL_SAMPLE_PROJECTED; BOOL texrect = flags & WINED3D_GLSL_SAMPLE_RECT;

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_UDIV in the GLSL shader backend.
by Alexandre Julliard 18 Oct '12

18 Oct '12

Module: wine Branch: master Commit: 5ca5409b8165e6d8a0914bce969d5044e51ed8de URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca5409b8165e6d8a0914bce9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 17 23:08:01 2012 +0200 wined3d: Implement WINED3DSIH_UDIV in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 46 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b8218ae..7269212 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2305,6 +2305,50 @@ static void shader_glsl_imul(const struct wined3d_shader_instruction *ins) } } +static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param src0_param, src1_param; + DWORD write_mask; + + if (ins->dst[0].reg.type != WINED3DSPR_NULL) + { + + if (ins->dst[1].reg.type != WINED3DSPR_NULL) + { + char dst_mask[6]; + + write_mask = shader_glsl_get_write_mask(&ins->dst[0], dst_mask); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); + shader_addline(buffer, "tmp0%s = %s / %s;\n", + dst_mask, src0_param.param_str, src1_param.param_str); + + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); + shader_addline(buffer, "%s %% %s));\n", src0_param.param_str, src1_param.param_str); + + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + shader_addline(buffer, "tmp0%s);\n", dst_mask); + } + else + { + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0]); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); + shader_addline(buffer, "%s / %s);\n", src0_param.param_str, src1_param.param_str); + } + } + else if (ins->dst[1].reg.type != WINED3DSPR_NULL) + { + write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1]); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); + shader_addline(buffer, "%s %% %s);\n", src0_param.param_str, src1_param.param_str); + } +} + /* Process the WINED3DSIO_MOV opcode using GLSL (dst = src) */ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) { @@ -5421,7 +5465,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2AR */ shader_glsl_texreg2ar, /* WINED3DSIH_TEXREG2GB */ shader_glsl_texreg2gb, /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, - /* WINED3DSIH_UDIV */ NULL, + /* WINED3DSIH_UDIV */ shader_glsl_udiv, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ shader_glsl_to_float, /* WINED3DSIH_XOR */ shader_glsl_binop,

1 0