October 2009 - Wine-commits

Stefan Dösinger : shell32: Make some functions hookable.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 29d72a53abcc95860a04b5ff733f7895fa560d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d72a53abcc95860a04b5ff7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:13:47 2009 +0200 shell32: Make some functions hookable. --- dlls/shell32/shlexec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index 1a12e51..20e2888 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1875,7 +1875,7 @@ HINSTANCE WINAPI ShellExecuteA(HWND hWnd, LPCSTR lpOperation,LPCSTR lpFile, * ShellExecuteExA [SHELL32.292] * */ -BOOL WINAPI ShellExecuteExA (LPSHELLEXECUTEINFOA sei) +BOOL WINAPI DECLSPEC_HOTPATCH ShellExecuteExA (LPSHELLEXECUTEINFOA sei) { SHELLEXECUTEINFOW seiW; BOOL ret; @@ -1922,7 +1922,7 @@ BOOL WINAPI ShellExecuteExA (LPSHELLEXECUTEINFOA sei) * ShellExecuteExW [SHELL32.293] * */ -BOOL WINAPI ShellExecuteExW (LPSHELLEXECUTEINFOW sei) +BOOL WINAPI DECLSPEC_HOTPATCH ShellExecuteExW (LPSHELLEXECUTEINFOW sei) { return SHELL_execute( sei, SHELL_ExecuteW ); }

1 0

Stefan Dösinger : d3d8: Make Direct3DCreate8 hookable.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: f54d6c366d1e84255b5948d67ed14c063e2543bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f54d6c366d1e84255b5948d67… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 12 14:13:58 2009 +0200 d3d8: Make Direct3DCreate8 hookable. --- dlls/d3d8/d3d8_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 6300371..e5f44e7 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -35,7 +35,7 @@ void WINAPI DebugSetMute(void) { /* nothing to do */ } -IDirect3D8* WINAPI Direct3DCreate8(UINT SDKVersion) { +IDirect3D8* WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT SDKVersion) { IDirect3D8Impl* object; TRACE("SDKVersion = %x\n", SDKVersion);

1 0

Piotr Caban : jscript: Fixed Global functions lengths.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 662a8525f4bae53789608a6f532605b9cd9e638c URL: http://source.winehq.org/git/wine.git/?a=commit;h=662a8525f4bae53789608a6f5… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Oct 13 22:08:43 2009 +0200 jscript: Fixed Global functions lengths. --- dlls/jscript/activex.c | 3 +- dlls/jscript/array.c | 2 +- dlls/jscript/bool.c | 3 +- dlls/jscript/date.c | 3 +- dlls/jscript/error.c | 2 +- dlls/jscript/function.c | 2 +- dlls/jscript/global.c | 56 ++++++++++++++++++++++---------------------- dlls/jscript/number.c | 3 +- dlls/jscript/regexp.c | 3 +- dlls/jscript/string.c | 2 +- dlls/jscript/tests/api.js | 39 +++++++++++++++++++++++++++++++ 11 files changed, 81 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=662a8525f4bae53789608…

1 0

Piotr Caban : jscript: Added Global.encodeURIComponent implementation.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: daf4da06461ebc6e323a207b123f9ee94b5dd688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf4da06461ebc6e323a207b1… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Oct 13 22:39:20 2009 +0200 jscript: Added Global.encodeURIComponent implementation. --- dlls/jscript/global.c | 90 ++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 21 ++++++++++ 2 files changed, 106 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 4282d06..9670949 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -334,8 +334,10 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D } ret = SysAllocStringLen(NULL, len); - if(!ret) + if(!ret) { + SysFreeString(str); return E_OUTOFMEMORY; + } len = 0; for(ptr=str; *ptr; ptr++) { @@ -357,6 +359,8 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D } } + SysFreeString(str); + if(retv) { V_VT(retv) = VT_BSTR; V_BSTR(retv) = ret; @@ -690,8 +694,10 @@ static HRESULT JSGlobal_unescape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } ret = SysAllocStringLen(NULL, len); - if(!ret) + if(!ret) { + SysFreeString(str); return E_OUTOFMEMORY; + } len = 0; for(ptr=str; *ptr; ptr++) { @@ -715,6 +721,8 @@ static HRESULT JSGlobal_unescape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, len++; } + SysFreeString(str); + if(retv) { V_VT(retv) = VT_BSTR; V_BSTR(retv) = ret; @@ -802,6 +810,7 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags }else { i = WideCharToMultiByte(CP_UTF8, 0, ptr, 1, NULL, 0, NULL, NULL)*3; if(!i) { + SysFreeString(str); FIXME("throw URIError\n"); return E_FAIL; } @@ -811,8 +820,10 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } rptr = ret = SysAllocStringLen(NULL, len); - if(!ret) + if(!ret) { + SysFreeString(str); return E_OUTOFMEMORY; + } for(ptr = str; *ptr; ptr++) { if(is_uri_unescaped(*ptr) || is_uri_reserved(*ptr) || *ptr == '#') { @@ -827,6 +838,8 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags } } + SysFreeString(str); + TRACE("%s -> %s\n", debugstr_w(str), debugstr_w(ret)); if(retv) { V_VT(retv) = VT_BSTR; @@ -847,8 +860,75 @@ static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, ret; + char buf[4]; + const WCHAR *ptr; + DWORD len = 0, size, i; + HRESULT hres; + + TRACE("\n"); + + if(!arg_cnt(dp)) { + if(retv) { + ret = SysAllocString(undefinedW); + if(!ret) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + + return S_OK; + } + + hres = to_string(ctx, get_arg(dp, 0), ei, &str); + if(FAILED(hres)) + return hres; + + for(ptr=str; *ptr; ptr++) { + if(is_uri_unescaped(*ptr)) + len++; + else { + size = WideCharToMultiByte(CP_UTF8, 0, ptr, 1, NULL, 0, NULL, NULL); + if(!size) { + SysFreeString(str); + FIXME("throw Error\n"); + return E_FAIL; + } + len += size*3; + } + } + + ret = SysAllocStringLen(NULL, len); + if(!ret) { + SysFreeString(str); + return E_OUTOFMEMORY; + } + + len = 0; + for(ptr=str; *ptr; ptr++) { + if(is_uri_unescaped(*ptr)) + ret[len++] = *ptr; + else { + size = WideCharToMultiByte(CP_UTF8, 0, ptr, 1, buf, sizeof(buf), NULL, NULL); + for(i=0; i<size; i++) { + ret[len++] = '%'; + ret[len++] = int_to_char((BYTE)buf[i] >> 4); + ret[len++] = int_to_char(buf[i] & 0x0f); + } + } + } + + SysFreeString(str); + + if(retv) { + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } else { + SysFreeString(ret); + } + + return S_OK; } static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7963016..d7626f1 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -58,6 +58,27 @@ ok(tmp === "undefined", "encodeURI() = " + tmp); tmp = encodeURI("abc", "test"); ok(tmp === "abc", "encodeURI('abc') = " + tmp); +tmp = encodeURIComponent("abc"); +ok(tmp === "abc", "encodeURIComponent('abc') = " + tmp); +tmp = encodeURIComponent("{abc}"); +ok(tmp === "%7Babc%7D", "encodeURIComponent('{abc}') = " + tmp); +tmp = encodeURIComponent(""); +ok(tmp === "", "encodeURIComponent('') = " + tmp); +tmp = encodeURIComponent("\01\02\03\04"); +ok(tmp === "%01%02%03%04", "encodeURIComponent('\\01\\02\\03\\04') = " + tmp); +tmp = encodeURIComponent("{#@}"); +ok(tmp === "%7B%23%40%7D", "encodeURIComponent('{#@}') = " + tmp); +tmp = encodeURIComponent("\xa1 "); +ok(tmp === "%C2%A1%20", "encodeURIComponent(\\xa1 ) = " + tmp); +tmp = encodeURIComponent("\xffff"); +ok(tmp.length === 8, "encodeURIComponent('\\xffff').length = " + tmp.length); +tmp = encodeURIComponent("abcABC123;/?:@&=+$,-_.!~*'()"); +ok(tmp === "abcABC123%3B%2F%3F%3A%40%26%3D%2B%24%2C-_.!~*'()", "encodeURIComponent('abcABC123;/?:@&=+$,-_.!~*'()') = " + tmp); +tmp = encodeURIComponent(); +ok(tmp === "undefined", "encodeURIComponent() = " + tmp); +tmp = encodeURIComponent("abc", "test"); +ok(tmp === "abc", "encodeURIComponent('abc') = " + tmp); + tmp = escape("abc"); ok(tmp === "abc", "escape('abc') = " + tmp); tmp = escape("");

1 0

Maarten Lankhorst : winealsa.drv: Remove call to snd_pcm_drain.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: d7a9e2d275fbc044eced7f705dcb1d879b4336af URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7a9e2d275fbc044eced7f705… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Oct 13 20:04:22 2009 +0200 winealsa.drv: Remove call to snd_pcm_drain. snd_pcm_drain can cause a deadlock if in the wrong state, and snd_pcm_drop below does the same thing. --- dlls/winealsa.drv/waveout.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 24207ec..25a1618 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -322,9 +322,6 @@ static void wodPlayer_Reset(WINE_WAVEDEV* wwo, BOOL reset) int err; TRACE("(%p)\n", wwo); - /* flush all possible output */ - snd_pcm_drain(wwo->pcm); - wodUpdatePlayedTotal(wwo, NULL); /* updates current notify list */ wodPlayer_NotifyCompletions(wwo, FALSE);

1 0

Nikolay Sivov : comctl32/comboex: Handle NULL item text case to avoid crash .
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: e1de222e4ebbf183089928d12352c059a511f3a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1de222e4ebbf183089928d12… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 13 20:59:39 2009 +0400 comctl32/comboex: Handle NULL item text case to avoid crash. --- dlls/comctl32/comboex.c | 11 +++++++++++ dlls/comctl32/tests/comboex.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index d67b918..a2361fd 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -510,6 +510,17 @@ static UINT COMBOEX_GetListboxText(const COMBOEX_INFO *infoPtr, INT_PTR n, LPWST return 0; str = COMBOEX_GetText(infoPtr, item); + if (!str) + { + if (buf) + { + if (infoPtr->unicode) + buf[0] = 0; + else + *((LPSTR)buf) = 0; + } + return 0; + } if (infoPtr->unicode) { diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index 1e74192..8a1e253 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -288,6 +288,41 @@ static void test_WM_LBUTTONDOWN(void) DestroyWindow(hComboEx); } +static void test_CB_GETLBTEXT(void) +{ + HWND hCombo; + CHAR buff[1]; + COMBOBOXEXITEMA item; + LRESULT ret; + + hCombo = createComboEx(WS_BORDER | WS_VISIBLE | WS_CHILD | CBS_DROPDOWN); + + /* set text to null */ + addItem(hCombo, 0, NULL); + + buff[0] = 'a'; + item.mask = CBEIF_TEXT; + item.iItem = 0; + item.pszText = buff; + item.cchTextMax = 1; + ret = SendMessage(hCombo, CBEM_GETITEMA, 0, (LPARAM)&item); + ok(ret != 0, "CBEM_GETITEM failed\n"); + ok(buff[0] == 0, "\n"); + + ret = SendMessage(hCombo, CB_GETLBTEXTLEN, 0, 0); + ok(ret == 0, "Expected zero length\n"); + + ret = SendMessage(hCombo, CB_GETLBTEXTLEN, 0, 0); + ok(ret == 0, "Expected zero length\n"); + + buff[0] = 'a'; + ret = SendMessage(hCombo, CB_GETLBTEXT, 0, (LPARAM)buff); + ok(ret == 0, "Expected zero length\n"); + ok(buff[0] == 0, "Expected null terminator as a string, got %s\n", buff); + + DestroyWindow(hCombo); +} + static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) { @@ -362,6 +397,7 @@ START_TEST(comboex) test_comboboxex(); test_WM_LBUTTONDOWN(); + test_CB_GETLBTEXT(); cleanup(); }

1 0

Nikolay Sivov : comctl32/monthcal: Fix painting selected day, remove unneeded operations.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: ca579f7c6101474c6166a451f52baf03a3d158b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca579f7c6101474c6166a451f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 13 22:06:48 2009 +0400 comctl32/monthcal: Fix painting selected day, remove unneeded operations. --- dlls/comctl32/monthcal.c | 30 +++++++++--------------------- 1 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 67a0363..ed0f6fe 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -650,10 +650,11 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM static const WCHAR fmtW[] = { '%','d',0 }; WCHAR buf[10]; RECT r, r_temp; - static BOOL haveBoldFont, haveSelectedDay = FALSE; + static BOOL bold_selected; + BOOL selected_day = FALSE; HBRUSH hbr; COLORREF oldCol = 0; - COLORREF oldBk = 0; + COLORREF oldBk = 0; /* No need to check styles: when selection is not valid, it is set to zero. * 1<day<31, so everything is OK. @@ -664,7 +665,6 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM if ((MONTHCAL_CompareDate(st, &infoPtr->minSel) >= 0) && (MONTHCAL_CompareDate(st, &infoPtr->maxSel) <= 0)) { - RECT r2; TRACE("%d %d %d\n", st->wDay, infoPtr->minSel.wDay, infoPtr->maxSel.wDay); TRACE("%s\n", wine_dbgstr_rect(&r)); @@ -673,34 +673,23 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM hbr = GetSysColorBrush(COLOR_HIGHLIGHT); FillRect(hdc, &r, hbr); - /* FIXME: this may need to be changed now b/c of the other - drawing changes 11/3/99 CMM */ - r2.left = r.left - 0.25 * infoPtr->textWidth; - r2.top = r.top; - r2.right = r.left + 0.5 * infoPtr->textWidth; - r2.bottom = r.bottom; - if(haveSelectedDay) FillRect(hdc, &r2, hbr); - haveSelectedDay = TRUE; - } else { - haveSelectedDay = FALSE; + selected_day = TRUE; } - /* need to add some code for multiple selections */ - - if((bold) &&(!haveBoldFont)) { + if(bold && !bold_selected) { SelectObject(hdc, infoPtr->hBoldFont); - haveBoldFont = TRUE; + bold_selected = TRUE; } - if((!bold) &&(haveBoldFont)) { + if(!bold && bold_selected) { SelectObject(hdc, infoPtr->hFont); - haveBoldFont = FALSE; + bold_selected = FALSE; } SetBkMode(hdc,TRANSPARENT); wsprintfW(buf, fmtW, st->wDay); DrawTextW(hdc, buf, -1, &r, DT_CENTER | DT_VCENTER | DT_SINGLELINE ); - if(haveSelectedDay) { + if(selected_day) { SetTextColor(hdc, oldCol); SetBkColor(hdc, oldBk); } @@ -1374,7 +1363,6 @@ MONTHCAL_GetCurSel(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) return TRUE; } -/* FIXME: if the specified date is not visible, make it visible */ static LRESULT MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) {

1 0

Nikolay Sivov : comctl32/monthcal: Reduce update rectangle after updating current selection.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 2cc98ef94abd6ece5fd02d0b915aa14dd7269ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc98ef94abd6ece5fd02d0b9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 13 23:35:19 2009 +0400 comctl32/monthcal: Reduce update rectangle after updating current selection. --- dlls/comctl32/monthcal.c | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ed0f6fe..ee7dc4e 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -174,7 +174,7 @@ static inline void MONTHCAL_NotifySelect(const MONTHCAL_INFO *infoPtr) /* january is 1, december is 12 */ int MONTHCAL_MonthLength(int month, int year) { - const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0}; + const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; /* Wrap around, this eases handling. Getting length only we shouldn't care about year change here cause January and December have the same day quantity */ @@ -813,7 +813,8 @@ static void MONTHCAL_PaintWeeknumbers(MONTHCAL_INFO *infoPtr, HDC hdc, const PAI WARN("Unknown LOCALE_IFIRSTWEEKOFYEAR value %d, defaulting to 0\n", weeknum); mindays = 0; } - if (infoPtr->curSel.wMonth < 2) + + if (infoPtr->curSel.wMonth == 1) { /* calculate all those exceptions for january */ st.wDay = st.wMonth = 1; @@ -1366,6 +1367,8 @@ MONTHCAL_GetCurSel(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) static LRESULT MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) { + SYSTEMTIME prev = infoPtr->curSel; + TRACE("%p\n", curSel); if(!curSel) return FALSE; if(infoPtr->dwStyle & MCS_MULTISELECT) return FALSE; @@ -1379,10 +1382,23 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) infoPtr->minSel = *curSel; infoPtr->maxSel = *curSel; - infoPtr->curSel = *curSel; + /* if selection is still in current month, reduce rectangle */ + prev.wDay = curSel->wDay; + if (MONTHCAL_IsDateEqual(&prev, curSel)) + { + RECT r_prev, r_new; - /* FIXME: it's possible to reduce rectangle here */ - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + /* note that infoPtr->curSel isn't updated yet */ + MONTHCAL_CalcPosFromDay(infoPtr, &infoPtr->curSel, &r_prev); + MONTHCAL_CalcPosFromDay(infoPtr, curSel, &r_new); + + InvalidateRect(infoPtr->hwndSelf, &r_prev, FALSE); + InvalidateRect(infoPtr->hwndSelf, &r_new, FALSE); + } + else + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + + infoPtr->curSel = *curSel; return TRUE; }

1 0

Henri Verbeet : wined3d: Get rid of stateblock_copy_values().
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 580cd8c5bb6c23ce6eac541fe93001d43584fc2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=580cd8c5bb6c23ce6eac541fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 14 10:55:15 2009 +0200 wined3d: Get rid of stateblock_copy_values(). Use IWineD3DStateBlockImpl_Capture() for the initial stateblock capture instead. --- dlls/wined3d/stateblock.c | 195 +++++++++------------------------------------ 1 files changed, 37 insertions(+), 158 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6e6dac7..64ae8bb 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -322,70 +322,6 @@ static void stateblock_savedstates_set_vertex(SAVEDSTATES *states, const struct memset(states->vertexShaderConstantsF, TRUE, sizeof(BOOL) * gl_info->max_vshader_constantsF); } -static void stateblock_copy_values(IWineD3DStateBlockImpl *dst, const IWineD3DStateBlockImpl *src, - const struct wined3d_gl_info *gl_info) -{ - unsigned int l; - - /* Single items */ - dst->gl_primitive_type = src->gl_primitive_type; - dst->vertexDecl = src->vertexDecl; - dst->vertexShader = src->vertexShader; - dst->streamIsUP = src->streamIsUP; - dst->pIndexData = src->pIndexData; - dst->IndexFmt = src->IndexFmt; - dst->baseVertexIndex = src->baseVertexIndex; - dst->clip_status = src->clip_status; - dst->viewport = src->viewport; - dst->material = src->material; - dst->pixelShader = src->pixelShader; - dst->scissorRect = src->scissorRect; - - /* Lights */ - memset(dst->activeLights, 0, sizeof(dst->activeLights)); - for (l = 0; l < LIGHTMAP_SIZE; ++l) - { - struct list *e1, *e2; - LIST_FOR_EACH_SAFE(e1, e2, &dst->lightMap[l]) - { - PLIGHTINFOEL *light = LIST_ENTRY(e1, PLIGHTINFOEL, entry); - list_remove(&light->entry); - HeapFree(GetProcessHeap(), 0, light); - } - - LIST_FOR_EACH(e1, &src->lightMap[l]) - { - PLIGHTINFOEL *light = LIST_ENTRY(e1, PLIGHTINFOEL, entry), *light2; - light2 = HeapAlloc(GetProcessHeap(), 0, sizeof(*light)); - *light2 = *light; - list_add_tail(&dst->lightMap[l], &light2->entry); - if (light2->glIndex != -1) dst->activeLights[light2->glIndex] = light2; - } - } - - /* Fixed size arrays */ - memcpy(dst->vertexShaderConstantB, src->vertexShaderConstantB, sizeof(dst->vertexShaderConstantB)); - memcpy(dst->vertexShaderConstantI, src->vertexShaderConstantI, sizeof(dst->vertexShaderConstantI)); - memcpy(dst->pixelShaderConstantB, src->pixelShaderConstantB, sizeof(dst->pixelShaderConstantB)); - memcpy(dst->pixelShaderConstantI, src->pixelShaderConstantI, sizeof(dst->pixelShaderConstantI)); - - memcpy(dst->streamStride, src->streamStride, sizeof(dst->streamStride)); - memcpy(dst->streamOffset, src->streamOffset, sizeof(dst->streamOffset)); - memcpy(dst->streamSource, src->streamSource, sizeof(dst->streamSource)); - memcpy(dst->streamFreq, src->streamFreq, sizeof(dst->streamFreq)); - memcpy(dst->streamFlags, src->streamFlags, sizeof(dst->streamFlags)); - memcpy(dst->transforms, src->transforms, sizeof(dst->transforms)); - memcpy(dst->clipplane, src->clipplane, sizeof(dst->clipplane)); - memcpy(dst->renderState, src->renderState, sizeof(dst->renderState)); - memcpy(dst->textures, src->textures, sizeof(dst->textures)); - memcpy(dst->textureState, src->textureState, sizeof(dst->textureState)); - memcpy(dst->samplerState, src->samplerState, sizeof(dst->samplerState)); - - /* Dynamically sized arrays */ - memcpy(dst->vertexShaderConstantF, src->vertexShaderConstantF, sizeof(float) * gl_info->max_vshader_constantsF * 4); - memcpy(dst->pixelShaderConstantF, src->pixelShaderConstantF, sizeof(float) * gl_info->max_pshader_constantsF * 4); -} - void stateblock_init_contained_states(IWineD3DStateBlockImpl *stateblock) { const struct wined3d_gl_info *gl_info = &stateblock->wineD3DDevice->adapter->gl_info; @@ -498,6 +434,26 @@ void stateblock_init_contained_states(IWineD3DStateBlockImpl *stateblock) } } +static void stateblock_init_lights(IWineD3DStateBlockImpl *stateblock, struct list *light_map) +{ + unsigned int i; + + for (i = 0; i < LIGHTMAP_SIZE; ++i) + { + const PLIGHTINFOEL *src_light; + + LIST_FOR_EACH_ENTRY(src_light, &light_map[i], PLIGHTINFOEL, entry) + { + PLIGHTINFOEL *dst_light = HeapAlloc(GetProcessHeap(), 0, sizeof(*dst_light)); + + *dst_light = *src_light; + dst_light->changed = TRUE; + dst_light->enabledChanged = TRUE; + list_add_tail(&stateblock->lightMap[i], &dst_light->entry); + } + } +} + /********************************************************** * IWineD3DStateBlockImpl IUnknown parts follows **********************************************************/ @@ -1658,108 +1614,31 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * * state block. */ if (type == WINED3DSBT_INIT || type == WINED3DSBT_RECORDED) return WINED3D_OK; - stateblock_copy_values(stateblock, device->stateBlock, gl_info); - TRACE("Updating changed flags appropriate for type %#x.\n", type); - if (type == WINED3DSBT_ALL) + switch (type) { - TRACE("ALL => Pretend everything has changed.\n"); - - stateblock_savedstates_set_all(&stateblock->changed, gl_info); - stateblock_init_contained_states(stateblock); - - /* Lights are not part of the changed / set structure. */ - for (i = 0; i < LIGHTMAP_SIZE; ++i) - { - struct list *e; - LIST_FOR_EACH(e, &stateblock->lightMap[i]) - { - PLIGHTINFOEL *light = LIST_ENTRY(e, PLIGHTINFOEL, entry); - light->changed = TRUE; - light->enabledChanged = TRUE; - } - } - - for (i = 0; i < MAX_STREAMS; ++i) - { - if (stateblock->streamSource[i]) IWineD3DBuffer_AddRef(stateblock->streamSource[i]); - } - - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) - { - if (stateblock->textures[i]) IWineD3DBaseTexture_AddRef(stateblock->textures[i]); - } - - if (stateblock->vertexDecl) IWineD3DVertexDeclaration_AddRef(stateblock->vertexDecl); - if (stateblock->pIndexData) IWineD3DBuffer_AddRef(stateblock->pIndexData); - if (stateblock->vertexShader) IWineD3DVertexShader_AddRef(stateblock->vertexShader); - if (stateblock->pixelShader) IWineD3DPixelShader_AddRef(stateblock->pixelShader); - } - else if (type == WINED3DSBT_PIXELSTATE) - { - TRACE("PIXELSTATE => Pretend all pixel states have changed.\n"); - - stateblock_savedstates_set_pixel(&stateblock->changed, gl_info); - stateblock_init_contained_states(stateblock); - - if (stateblock->pixelShader) IWineD3DPixelShader_AddRef(stateblock->pixelShader); + case WINED3DSBT_ALL: + stateblock_init_lights(stateblock, device->stateBlock->lightMap); + stateblock_savedstates_set_all(&stateblock->changed, gl_info); + break; - /* Pixel state blocks do not contain vertex buffers. Set them to NULL - * to avoid wrong refcounting on them. This makes releasing the buffer - * easier. */ - for (i = 0; i < MAX_STREAMS; ++i) - { - stateblock->streamSource[i] = NULL; - } + case WINED3DSBT_PIXELSTATE: + stateblock_savedstates_set_pixel(&stateblock->changed, gl_info); + break; - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) - { - stateblock->textures[i] = NULL; - } + case WINED3DSBT_VERTEXSTATE: + stateblock_init_lights(stateblock, device->stateBlock->lightMap); + stateblock_savedstates_set_vertex(&stateblock->changed, gl_info); + break; - stateblock->vertexDecl = NULL; - stateblock->pIndexData = NULL; - stateblock->vertexShader = NULL; + default: + FIXME("Unrecognized state block type %#x.\n", type); + break; } - else if (type == WINED3DSBT_VERTEXSTATE) - { - TRACE("VERTEXSTATE => Pretend all vertex shates have changed.\n"); - stateblock_savedstates_set_vertex(&stateblock->changed, gl_info); - stateblock_init_contained_states(stateblock); - - for (i = 0; i < LIGHTMAP_SIZE; ++i) - { - struct list *e; - LIST_FOR_EACH(e, &stateblock->lightMap[i]) - { - PLIGHTINFOEL *light = LIST_ENTRY(e, PLIGHTINFOEL, entry); - light->changed = TRUE; - light->enabledChanged = TRUE; - } - } - - for (i = 0; i < MAX_STREAMS; ++i) - { - if (stateblock->streamSource[i]) IWineD3DBuffer_AddRef(stateblock->streamSource[i]); - } - - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) - { - stateblock->textures[i] = NULL; - } - - if (stateblock->vertexShader) IWineD3DVertexShader_AddRef(stateblock->vertexShader); - - if (stateblock->vertexDecl) IWineD3DVertexDeclaration_AddRef(stateblock->vertexDecl); - stateblock->pIndexData = NULL; - stateblock->pixelShader = NULL; - } - else - { - FIXME("Unrecognized state block type %#x.\n", type); - } + stateblock_init_contained_states(stateblock); + IWineD3DStateBlockImpl_Capture((IWineD3DStateBlock *)stateblock); return WINED3D_OK; }

1 0

Henri Verbeet : wined3d: Rename PLIGHTINFOEL to something less awful.
by Alexandre Julliard 14 Oct '09

14 Oct '09

Module: wine Branch: master Commit: 3bc9d1894d56bb3a320731a1a566e07c7ebfeb2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc9d1894d56bb3a320731a1a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 14 10:55:16 2009 +0200 wined3d: Rename PLIGHTINFOEL to something less awful. --- dlls/wined3d/device.c | 43 +++++++++++++++++++++++---------------- dlls/wined3d/state.c | 5 +-- dlls/wined3d/stateblock.c | 20 ++++++++++-------- dlls/wined3d/wined3d_private.h | 6 ++-- 4 files changed, 41 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bc9d1894d56bb3a32073…

1 0