August 2011 - Wine-commits - list.winehq.org

Frédéric Delanoy : cmd/tests: Add REM tests.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: d147df418c0414a422bf00eeb2c7cc2be14bdb50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d147df418c0414a422bf00eeb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 25 00:48:20 2011 +0200 cmd/tests: Add REM tests. --- programs/cmd/tests/test_builtins.cmd | 14 ++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 11 +++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 0d2f983..7c3353f 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -52,6 +52,20 @@ echo @tab(a)word echo @tab(a)word echo(a)tab@@tab(a)word +echo ------------ Testing rem -------------- +rem Hello +rem Hello +rem Hello || foo +rem echo lol +rem echo foo & echo bar +(a)echo on +rem Hello +rem Hello +rem Hello || foo +rem echo lol +rem echo foo & echo bar +(a)echo off + echo ------------ Testing redirection operators -------------- mkdir foobar & cd foobar echo ...stdout redirection diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 4846cf3..7435c72 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -95,6 +95,17 @@ word @tab(a)word @space@@tab(a)word @tab(a)word +------------ Testing rem -------------- + +(a)pwd@>rem Hello(a)space@ + +(a)pwd@>rem Hello(a)space@ + +(a)pwd@>rem Hello || foo(a)space@ + +(a)pwd@>rem echo lol(a)space@ + +(a)pwd@>rem echo foo & echo bar(a)space@ ------------ Testing redirection operators -------------- ...stdout redirection foo

1 0

Frédéric Delanoy : cmd: Fix REM tab handling.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 6d3fd3abcdcd67142c43e0f4a3357b1c32a15563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d3fd3abcdcd67142c43e0f4a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 25 00:48:21 2011 +0200 cmd: Fix REM tab handling. --- programs/cmd/tests/test_builtins.cmd | 6 ++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 ++++++ programs/cmd/wcmdmain.c | 7 +++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 7c3353f..cd46dbd 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -58,12 +58,18 @@ rem Hello rem Hello || foo rem echo lol rem echo foo & echo bar +rem @tab@ Hello +rem(a)tab@ Hello +rem(a)tab@echo foo & echo bar @echo on rem Hello rem Hello rem Hello || foo rem echo lol rem echo foo & echo bar +rem @tab@ Hello +rem(a)tab@ Hello +rem(a)tab@echo foo & echo bar @echo off echo ------------ Testing redirection operators -------------- diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7435c72..dafb6a3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -106,6 +106,12 @@ word @pwd@>rem echo lol(a)space@ @pwd@>rem echo foo & echo bar(a)space@ + +(a)pwd@>rem @tab@ Hello(a)space@ + +(a)pwd@>rem(a)tab@ Hello(a)space@ + +(a)pwd@>rem(a)tab@echo foo & echo bar(a)space@ ------------ Testing redirection operators -------------- ...stdout redirection foo diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 47af612..3efabfa 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1753,7 +1753,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE CMD_LIST *lastEntry = NULL; CMD_DELIMITERS prevDelim = CMD_NONE; static WCHAR *extraSpace = NULL; /* Deliberately never freed */ - const WCHAR remCmd[] = {'r','e','m',' ','\0'}; + const WCHAR remCmd[] = {'r','e','m'}; const WCHAR forCmd[] = {'f','o','r'}; const WCHAR ifCmd[] = {'i','f',' ','\0'}; const WCHAR ifElse[] = {'e','l','s','e',' ','\0'}; @@ -1840,9 +1840,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE if (curStringLen == 0 && curCopyTo == curString) { const WCHAR forDO[] = {'d','o'}; - /* If command starts with 'rem', ignore any &&, ( etc */ - if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 4, remCmd, -1) == CSTR_EQUAL) { + /* If command starts with 'rem ', ignore any &&, ( etc. */ + if (WCMD_keyword_ws_found(remCmd, sizeof(remCmd)/sizeof(remCmd[0]), curPos)) { inRem = TRUE; } else if (WCMD_keyword_ws_found(forCmd, sizeof(forCmd)/sizeof(forCmd[0]), curPos)) {

1 0

Frédéric Delanoy : cmd: Fix if/else tab handling.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: eda33f22ff86486e0d22eb47fa941e156506627c URL: http://source.winehq.org/git/wine.git/?a=commit;h=eda33f22ff86486e0d22eb47f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 25 00:48:22 2011 +0200 cmd: Fix if/else tab handling. --- programs/cmd/builtins.c | 11 ++++++----- programs/cmd/tests/test_builtins.cmd | 7 +++++++ programs/cmd/tests/test_builtins.cmd.exp | 7 +++++++ programs/cmd/wcmdmain.c | 19 +++++++++---------- 4 files changed, 29 insertions(+), 15 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7cc6520..5e405d5 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1250,7 +1250,7 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, if (isIF) processThese = conditionTRUE; while (*cmdList) { - const WCHAR ifElse[] = {'e','l','s','e',' ','\0'}; + const WCHAR ifElse[] = {'e','l','s','e'}; /* execute all appropriate commands */ curPosition = *cmdList; @@ -1280,16 +1280,17 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, /* End of the command - does 'ELSE ' follow as the next command? */ } else { - if (isIF && CompareStringW(LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - (*cmdList)->command, 5, ifElse, -1) == CSTR_EQUAL) { + if (isIF + && WCMD_keyword_ws_found(ifElse, sizeof(ifElse)/sizeof(ifElse[0]), + (*cmdList)->command)) { /* Swap between if and else processing */ processThese = !processThese; /* Process the ELSE part */ if (processThese) { - WCHAR *cmd = ((*cmdList)->command) + strlenW(ifElse); + const int keyw_len = sizeof(ifElse)/sizeof(ifElse[0]) + 1; + WCHAR *cmd = ((*cmdList)->command) + keyw_len; /* Skip leading whitespace between condition and the command */ while (*cmd && (*cmd==' ' || *cmd=='\t')) cmd++; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index cd46dbd..cc083d2 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -391,6 +391,13 @@ if /i foo==FOO echo if /i seems to work if /i not foo==FOO echo if /i seems to be broken if /I foo==FOO echo if /I seems to work if /I not foo==FOO echo if /I seems to be broken +if(a)tab@1==1 echo doom +if @tab(a)1==1 echo doom +if 1==1 (echo doom) else(a)tab@echo quake +if(a)tab@not @tab(a)1==@tab(a)0 @tab(a)echo lol +if 1==0(a)tab@(echo doom) else echo quake +if 1==0 (echo doom)@tab(a)else echo quake +if 1==0 (echo doom) else(a)tab@echo quake echo -----------Testing for ----------- echo ...plain FOR diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index dafb6a3..535ef44 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -271,6 +271,13 @@ Testing case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work if /I seems to work +doom +doom +doom +lol +quake +quake +quake -----------Testing for ----------- ...plain FOR A diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 3efabfa..63e8c16 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1755,8 +1755,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE static WCHAR *extraSpace = NULL; /* Deliberately never freed */ const WCHAR remCmd[] = {'r','e','m'}; const WCHAR forCmd[] = {'f','o','r'}; - const WCHAR ifCmd[] = {'i','f',' ','\0'}; - const WCHAR ifElse[] = {'e','l','s','e',' ','\0'}; + const WCHAR ifCmd[] = {'i','f'}; + const WCHAR ifElse[] = {'e','l','s','e'}; BOOL inRem = FALSE; BOOL inFor = FALSE; BOOL inIn = FALSE; @@ -1847,24 +1847,23 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE } else if (WCMD_keyword_ws_found(forCmd, sizeof(forCmd)/sizeof(forCmd[0]), curPos)) { inFor = TRUE; - /* If command starts with 'if' or 'else', handle ('s mid line. We should ensure this + /* If command starts with 'if ' or 'else ', handle ('s mid line. We should ensure this is only true in the command portion of the IF statement, but this should suffice for now FIXME: Silly syntax like "if 1(==1( ( echo they equal )" will be parsed wrong */ - } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 3, ifCmd, -1) == CSTR_EQUAL) { + } else if (WCMD_keyword_ws_found(ifCmd, sizeof(ifCmd)/sizeof(ifCmd[0]), curPos)) { inIf = TRUE; - } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 5, ifElse, -1) == CSTR_EQUAL) { + } else if (WCMD_keyword_ws_found(ifElse, sizeof(ifElse)/sizeof(ifElse[0]), curPos)) { + const int keyw_len = sizeof(ifElse)/sizeof(ifElse[0]) + 1; inElse = TRUE; lastWasElse = TRUE; onlyWhiteSpace = TRUE; - memcpy(&curCopyTo[*curLen], curPos, 5*sizeof(WCHAR)); - (*curLen)+=5; - curPos+=5; + memcpy(&curCopyTo[*curLen], curPos, keyw_len*sizeof(WCHAR)); + (*curLen)+=keyw_len; + curPos+=keyw_len; continue; /* In a for loop, the DO command will follow a close bracket followed by

1 0

Michał Ziętek : wscript: Implemented Arguments2_get_length.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 4252bd8653424b3ad84e7651c1300cc9dbc19b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4252bd8653424b3ad84e7651c… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Tue Aug 23 15:16:03 2011 +0200 wscript: Implemented Arguments2_get_length. --- programs/wscript/arguments.c | 6 ++++-- programs/wscript/tests/run.js | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/wscript/arguments.c b/programs/wscript/arguments.c index b50ed94..7961948 100644 --- a/programs/wscript/arguments.c +++ b/programs/wscript/arguments.c @@ -118,8 +118,10 @@ static HRESULT WINAPI Arguments2_Count(IArguments2 *iface, LONG *out_Count) static HRESULT WINAPI Arguments2_get_length(IArguments2 *iface, LONG *out_Count) { - WINE_FIXME("(%p)\n", out_Count); - return E_NOTIMPL; + WINE_TRACE("(%p)\n", out_Count); + + *out_Count = numOfArgs; + return S_OK; } static const IArguments2Vtbl Arguments2Vtbl = { diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index dde3caf..430dfb6 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -41,5 +41,6 @@ try { ok(false, "expected exception"); }catch(e) {} ok(WScript.Arguments.Count() === 3, "WScript.Arguments.Count() = " + WScript.Arguments.Count()); +ok(WScript.Arguments.length === 3, "WScript.Arguments.length = " + WScript.Arguments.length); winetest.reportSuccess();

1 0

Michał Ziętek : wscript: Implemented Host_get_Interactive.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 280dbcf84a314ff111306f85432df60bd65effff URL: http://source.winehq.org/git/wine.git/?a=commit;h=280dbcf84a314ff111306f854… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Tue Aug 23 15:16:08 2011 +0200 wscript: Implemented Host_get_Interactive. --- programs/wscript/host.c | 7 +++++-- programs/wscript/main.c | 25 ++++++++++++++++++++++++- programs/wscript/tests/run.js | 1 + programs/wscript/wscript.h | 2 ++ 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 02a9291..0ce7e58 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -34,6 +34,7 @@ static const WCHAR wshNameW[] = {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; static const WCHAR wshVersionW[] = {'5','.','8'}; +VARIANT_BOOL wshInteractive = VARIANT_TRUE; WINE_DEFAULT_DEBUG_CHANNEL(wscript); @@ -145,8 +146,10 @@ static HRESULT WINAPI Host_get_Path(IHost *iface, BSTR *out_Path) static HRESULT WINAPI Host_get_Interactive(IHost *iface, VARIANT_BOOL *out_Interactive) { - WINE_FIXME("(%p)\n", out_Interactive); - return E_NOTIMPL; + WINE_TRACE("(%p)\n", out_Interactive); + + *out_Interactive = wshInteractive; + return S_OK; } static HRESULT WINAPI Host_put_Interactive(IHost *iface, VARIANT_BOOL v) diff --git a/programs/wscript/main.c b/programs/wscript/main.c index 3073445..9d79415 100644 --- a/programs/wscript/main.c +++ b/programs/wscript/main.c @@ -322,6 +322,28 @@ static void run_script(const WCHAR *filename, IActiveScript *script, IActiveScri WINE_FIXME("SetScriptState failed: %08x\n", hres); } +static BOOL set_host_properties(const WCHAR *prop) +{ + static const WCHAR iactive[] = {'i',0}; + static const WCHAR batch[] = {'b',0}; + + if(*prop == '/') { + ++prop; + if(*prop == '/') + ++prop; + } + else + ++prop; + + if(strcmpiW(prop, iactive) == 0) + wshInteractive = VARIANT_TRUE; + else if(strcmpiW(prop, batch) == 0) + wshInteractive = VARIANT_FALSE; + else + return FALSE; + return TRUE; +} + int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) { const WCHAR *ext, *filename = NULL; @@ -340,7 +362,8 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm for(i=0; i<argc; i++) { if(*argv[i] == '/' || *argv[i] == '-') { - WINE_FIXME("Unsupported argument %s\n", wine_dbgstr_w(argv[i])); + if(!set_host_properties(argv[i])) + return 1; }else { filename = argv[i]; argums = argv+i+1; diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 430dfb6..6773df5 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -42,5 +42,6 @@ try { }catch(e) {} ok(WScript.Arguments.Count() === 3, "WScript.Arguments.Count() = " + WScript.Arguments.Count()); ok(WScript.Arguments.length === 3, "WScript.Arguments.length = " + WScript.Arguments.length); +ok(WScript.Interactive === true, "WScript.Interactive = " + WScript.Interactive); winetest.reportSuccess(); diff --git a/programs/wscript/wscript.h b/programs/wscript/wscript.h index 3c9191f..d624a2d 100644 --- a/programs/wscript/wscript.h +++ b/programs/wscript/wscript.h @@ -31,3 +31,5 @@ extern WCHAR scriptFullName[]; extern WCHAR **argums; extern int numOfArgs; + +extern VARIANT_BOOL wshInteractive;

1 0

Michał Ziętek : wscript: Implemented Host_put_Interactive.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 154578d75cad1a7948ffda54c513850f189704cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=154578d75cad1a7948ffda54c… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Tue Aug 23 15:16:15 2011 +0200 wscript: Implemented Host_put_Interactive. --- programs/wscript/host.c | 6 ++++-- programs/wscript/tests/run.js | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 0ce7e58..82209ea 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -154,8 +154,10 @@ static HRESULT WINAPI Host_get_Interactive(IHost *iface, VARIANT_BOOL *out_Inter static HRESULT WINAPI Host_put_Interactive(IHost *iface, VARIANT_BOOL v) { - WINE_FIXME("(%x)\n", v); - return E_NOTIMPL; + WINE_TRACE("(%x)\n", v); + + wshInteractive = v; + return S_OK; } static HRESULT WINAPI Host_Quit(IHost *iface, int ExitCode) diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 6773df5..d487166 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -43,5 +43,9 @@ try { ok(WScript.Arguments.Count() === 3, "WScript.Arguments.Count() = " + WScript.Arguments.Count()); ok(WScript.Arguments.length === 3, "WScript.Arguments.length = " + WScript.Arguments.length); ok(WScript.Interactive === true, "WScript.Interactive = " + WScript.Interactive); +WScript.Interactive = false; +ok(WScript.Interactive === false, "WScript.Interactive = " + WScript.Interactive); +WScript.Interactive = true; +ok(WScript.Interactive === true, "WScript.Interactive = " + WScript.Interactive); winetest.reportSuccess();

1 0

Michał Ziętek : wscript: Implemented Host_get_Application.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 559547f21e01b19fa784739074f8b9db1823167f URL: http://source.winehq.org/git/wine.git/?a=commit;h=559547f21e01b19fa78473907… Author: Michał Ziętek <smierc.w.wenecji(a)gmail.com> Date: Tue Aug 23 15:16:19 2011 +0200 wscript: Implemented Host_get_Application. --- programs/wscript/host.c | 6 ++++-- programs/wscript/tests/run.js | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index 82209ea..b7b94a2 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -110,8 +110,10 @@ static HRESULT WINAPI Host_get_Name(IHost *iface, BSTR *out_Name) static HRESULT WINAPI Host_get_Application(IHost *iface, IDispatch **out_Dispatch) { - WINE_FIXME("(%p)\n", out_Dispatch); - return E_NOTIMPL; + WINE_TRACE("(%p)\n", out_Dispatch); + + *out_Dispatch = (IDispatch*)&host_obj; + return S_OK; } static HRESULT WINAPI Host_get_FullName(IHost *iface, BSTR *out_Path) diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index d487166..8c75d0a 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -47,5 +47,6 @@ WScript.Interactive = false; ok(WScript.Interactive === false, "WScript.Interactive = " + WScript.Interactive); WScript.Interactive = true; ok(WScript.Interactive === true, "WScript.Interactive = " + WScript.Interactive); +ok(WScript.Application === WScript, "WScript.Application = " + WScript.Application); winetest.reportSuccess();

1 0

Matteo Bruni : wined3d: Store currently active texture in the wined3d context.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: f47f9f7c74458936d33b1e368a517051be3e1837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f47f9f7c74458936d33b1e368… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Aug 3 01:34:15 2011 +0200 wined3d: Store currently active texture in the wined3d context. --- dlls/wined3d/arb_program_shader.c | 6 +++--- dlls/wined3d/ati_fragment_shader.c | 3 +-- dlls/wined3d/context.c | 18 ++++++++++++------ dlls/wined3d/device.c | 15 ++++++--------- dlls/wined3d/nvidia_texture_shader.c | 12 ++++-------- dlls/wined3d/state.c | 18 ++++++------------ dlls/wined3d/surface.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +++ 8 files changed, 36 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f47f9f7c74458936d33b1…

1 0

Matteo Bruni : wined3d: Fetch currently active texture unit from the wined3d_context.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: d485e04576f023083147c5e3a2475f2e3019f43f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d485e04576f023083147c5e3a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jul 26 23:01:26 2011 +0200 wined3d: Fetch currently active texture unit from the wined3d_context. --- dlls/wined3d/surface.c | 12 ++---------- dlls/wined3d/volume.c | 16 ++-------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5db7ed8..75e39fc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -594,7 +594,6 @@ static void surface_bind_and_dirtify(struct wined3d_surface *surface, { struct wined3d_device *device = surface->resource.device; DWORD active_sampler; - GLint active_texture; /* We don't need a specific texture unit, but after binding the texture * the current unit is dirty. Read the unit back instead of switching to @@ -604,15 +603,8 @@ static void surface_bind_and_dirtify(struct wined3d_surface *surface, * To be more specific, this is tricky because we can implicitly be * called from sampler() in state.c. This means we can't touch anything * other than whatever happens to be the currently active texture, or we - * would risk marking already applied sampler states dirty again. - * - * TODO: Track the current active texture per GL context instead of using - * glGet(). */ - - ENTER_GL(); - glGetIntegerv(GL_ACTIVE_TEXTURE, &active_texture); - LEAVE_GL(); - active_sampler = device->rev_tex_unit_map[active_texture - GL_TEXTURE0_ARB]; + * would risk marking already applied sampler states dirty again. */ + active_sampler = device->rev_tex_unit_map[context->active_texture]; if (active_sampler != WINED3D_UNMAPPED_STAGE) device_invalidate_state(device, STATE_SAMPLER(active_sampler)); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index be1c1b1..d36d6c3 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -37,20 +37,8 @@ static void volume_bind_and_dirtify(const struct wined3d_volume *volume, struct * To be more specific, this is tricky because we can implicitly be called * from sampler() in state.c. This means we can't touch anything other than * whatever happens to be the currently active texture, or we would risk - * marking already applied sampler states dirty again. - * - * TODO: Track the current active texture per GL context instead of using glGet - */ - if (context->gl_info->supported[ARB_MULTITEXTURE]) - { - GLint active_texture; - ENTER_GL(); - glGetIntegerv(GL_ACTIVE_TEXTURE, &active_texture); - LEAVE_GL(); - active_sampler = volume->resource.device->rev_tex_unit_map[active_texture - GL_TEXTURE0_ARB]; - } else { - active_sampler = 0; - } + * marking already applied sampler states dirty again. */ + active_sampler = volume->resource.device->rev_tex_unit_map[context->active_texture]; if (active_sampler != WINED3D_UNMAPPED_STAGE) device_invalidate_state(volume->resource.device, STATE_SAMPLER(active_sampler));

1 0

Matteo Bruni : wined3d: Don't change active texture to 0.
by Alexandre Julliard 25 Aug '11

25 Aug '11

Module: wine Branch: master Commit: 36a22dfa3356accbaa5599483f57dc8aeb57561f URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a22dfa3356accbaa5599483… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun Jul 24 00:11:07 2011 +0200 wined3d: Don't change active texture to 0. --- dlls/wined3d/device.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e8e2785..1c57840 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4730,6 +4730,13 @@ float CDECL wined3d_device_get_npatch_mode(struct wined3d_device *device) return 0.0f; } +static inline void invalidate_active_texture(struct wined3d_device *device, struct wined3d_context *context) +{ + DWORD sampler = device->rev_tex_unit_map[context->active_texture]; + if (sampler != WINED3D_UNMAPPED_STAGE) + context_invalidate_state(context, STATE_SAMPLER(sampler)); +} + HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, struct wined3d_surface *src_surface, const RECT *src_rect, struct wined3d_surface *dst_surface, const POINT *dst_point) @@ -4744,7 +4751,6 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, CONVERT_TYPES convert; UINT dst_w, dst_h; UINT src_w, src_h; - DWORD sampler; POINT p; RECT r; @@ -4831,10 +4837,6 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, context = context_acquire(device, NULL); gl_info = context->gl_info; - ENTER_GL(); - context_active_texture(context, gl_info, 0); - LEAVE_GL(); - /* Only load the surface for partial updates. For newly allocated texture * the texture wouldn't be the current location, and we'd upload zeroes * just to overwrite them again. */ @@ -4852,13 +4854,11 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, surface_upload_data(dst_surface, gl_info, src_format, src_rect, src_w, dst_point, FALSE, &data); + invalidate_active_texture(device, context); + context_release(context); surface_modify_location(dst_surface, SFLAG_INTEXTURE, TRUE); - sampler = device->rev_tex_unit_map[0]; - if (sampler != WINED3D_UNMAPPED_STAGE) - device_invalidate_state(device, STATE_SAMPLER(sampler)); - return WINED3D_OK; } @@ -5258,7 +5258,6 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device INT height = device->cursorHeight; INT width = device->cursorWidth; INT bpp = format->byte_count; - DWORD sampler; INT i; /* Reformat the texture memory (pitch and width can be @@ -5278,11 +5277,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); } - /* Make sure that a proper texture unit is selected */ - context_active_texture(context, gl_info, 0); - sampler = device->rev_tex_unit_map[0]; - if (sampler != WINED3D_UNMAPPED_STAGE) - context_invalidate_state(context, STATE_SAMPLER(sampler)); + invalidate_active_texture(device, context); /* Create a new cursor texture */ glGenTextures(1, &device->cursorTexture); checkGLcall("glGenTextures");

1 0