October 2012 - Wine-Commits

Matteo Bruni : wined3d: Split GPU vendor and GL vendor handling in GPU recognition.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: fe81c61804fdf307e26722b0bad61d3eb4843142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe81c61804fdf307e26722b0b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 16 16:32:59 2012 +0200 wined3d: Split GPU vendor and GL vendor handling in GPU recognition. --- dlls/wined3d/directx.c | 190 +++++++++++++++++++++++++++-------------------- 1 files changed, 109 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe81c61804fdf307e2672…

1 0

Daniel Lehman : msvcp: Sync num_get<>::_Getifld.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 4c357de5d326c178de54d6084dd50ee01de6e153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c357de5d326c178de54d6084… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Oct 11 14:21:49 2012 -0700 msvcp: Sync num_get<>::_Getifld. --- dlls/msvcp100/locale.c | 152 +++++++++++++++++++++++++++------------------ dlls/msvcp100/msvcp.h | 2 + dlls/msvcp100/string.c | 53 ++++++++++++++++ dlls/msvcp60/locale.c | 158 ++++++++++++++++++++++++++++------------------- dlls/msvcp71/locale.c | 152 +++++++++++++++++++++++++++------------------ 5 files changed, 331 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c357de5d326c178de54d…

1 0

André Hentschel : vcomp: Sync spec files.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 2a0055af2954c5d3aa8fe62e795cb5e529de4185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0055af2954c5d3aa8fe62e7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 15 22:40:09 2012 +0200 vcomp: Sync spec files. --- dlls/vcomp100/vcomp100.spec | 16 ++++++++-------- dlls/vcomp90/vcomp90.spec | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index d888577..7f52a7a 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -90,22 +90,22 @@ @ stub _vcomp_single_end @ stub omp_destroy_lock @ stub omp_destroy_nest_lock -@ stub omp_get_dynamic -@ stub omp_get_max_threads -@ stub omp_get_nested +@ cdecl omp_get_dynamic() vcomp.omp_get_dynamic +@ cdecl omp_get_max_threads() vcomp.omp_get_max_threads +@ cdecl omp_get_nested() vcomp.omp_get_nested @ cdecl omp_get_num_procs() vcomp.omp_get_num_procs -@ stub omp_get_num_threads -@ stub omp_get_thread_num +@ cdecl omp_get_num_threads() vcomp.omp_get_num_threads +@ cdecl omp_get_thread_num() vcomp.omp_get_thread_num @ stub omp_get_wtick @ cdecl omp_get_wtime() vcomp.omp_get_wtime @ stub omp_in_parallel @ stub omp_init_lock @ stub omp_init_nest_lock -@ stub omp_set_dynamic +@ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ stub omp_set_lock @ stub omp_set_nest_lock -@ stub omp_set_nested -@ stub omp_set_num_threads +@ cdecl omp_set_nested(long) vcomp.omp_set_nested +@ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads @ stub omp_test_lock @ stub omp_test_nest_lock @ stub omp_unset_lock diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index d888577..7f52a7a 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -90,22 +90,22 @@ @ stub _vcomp_single_end @ stub omp_destroy_lock @ stub omp_destroy_nest_lock -@ stub omp_get_dynamic -@ stub omp_get_max_threads -@ stub omp_get_nested +@ cdecl omp_get_dynamic() vcomp.omp_get_dynamic +@ cdecl omp_get_max_threads() vcomp.omp_get_max_threads +@ cdecl omp_get_nested() vcomp.omp_get_nested @ cdecl omp_get_num_procs() vcomp.omp_get_num_procs -@ stub omp_get_num_threads -@ stub omp_get_thread_num +@ cdecl omp_get_num_threads() vcomp.omp_get_num_threads +@ cdecl omp_get_thread_num() vcomp.omp_get_thread_num @ stub omp_get_wtick @ cdecl omp_get_wtime() vcomp.omp_get_wtime @ stub omp_in_parallel @ stub omp_init_lock @ stub omp_init_nest_lock -@ stub omp_set_dynamic +@ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic @ stub omp_set_lock @ stub omp_set_nest_lock -@ stub omp_set_nested -@ stub omp_set_num_threads +@ cdecl omp_set_nested(long) vcomp.omp_set_nested +@ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads @ stub omp_test_lock @ stub omp_test_nest_lock @ stub omp_unset_lock

1 0

Jason Edmeades : cmd: %* expands to first non-whitespace delimiter of first arg.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: f45f75ca7dece7b7549d457c6215aa314016b4b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45f75ca7dece7b7549d457c6… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sat Oct 13 22:24:35 2012 +0100 cmd: %* expands to first non-whitespace delimiter of first arg. --- programs/cmd/tests/test_cmdline.cmd | 10 ++++++++++ programs/cmd/tests/test_cmdline.cmd.exp | 8 ++++++++ programs/cmd/wcmdmain.c | 8 +++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/test_cmdline.cmd b/programs/cmd/tests/test_cmdline.cmd index 7e08b29..0442a38 100644 --- a/programs/cmd/tests/test_cmdline.cmd +++ b/programs/cmd/tests/test_cmdline.cmd @@ -251,6 +251,16 @@ call tell;1;;2 if errorlevel 2 echo error %ErrorLevel% call tell "p "1 p" "2 call tell p"1 p";2 + +echo --------- Testing delimiters and parameter passing -------------- +echo @echo 0:%%0,1:%%1,2:%%2,All:'%%*'> tell.bat +call;tell 1 2 +call tell 1 2 +==call==tell==1==2 +call tell(1234) +call tell(12(34) +call tell(12;34) +echo --------- Finished -------------- del tell.bat say*.* exit :setError diff --git a/programs/cmd/tests/test_cmdline.cmd.exp b/programs/cmd/tests/test_cmdline.cmd.exp index 4ea4ce0..0317a99 100644 --- a/programs/cmd/tests/test_cmdline.cmd.exp +++ b/programs/cmd/tests/test_cmdline.cmd.exp @@ -122,3 +122,11 @@ THIS FAILS: cmd ignoreme/c say one 1:1,2:2(a)space@ 1:"p(a)space@"1,2:p"@space@"2(a)space@ 1:p"1(a)space@p",2:2(a)space@ +--------- Testing delimiters and parameter passing -------------- +0:tell,1:1,2:2,All:'1 2'@or_broken(a)0:tell,1:1,2:2,All:' 1 2' +0:tell,1:1,2:2,All:'1 2'@or_broken(a)0:tell,1:1,2:2,All:' 1 2' +0:tell,1:1,2:2,All:'==1==2' +(a)todo_wine@0:tell,1:(1234),2:,All:'(1234)' +(a)todo_wine@0:tell,1:(12(34),2:,All:'(12(34)' +(a)todo_wine@0:tell,1:(12,2:34),All:'(12;34)' +(a)todo_wine@--------- Finished -------------- diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index eb0897a..f60ba84 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -843,10 +843,12 @@ static void handleExpansion(WCHAR *cmd, BOOL justFors, /* Replace use of %* if in batch program*/ } else if (!justFors && context && *(p+1)=='*') { WCHAR *startOfParms = NULL; - WCMD_parameter(context -> command, 1, &startOfParms, NULL, TRUE); - if (startOfParms != NULL) + WCMD_parameter(context -> command, 0, NULL, &startOfParms, TRUE); + if (startOfParms != NULL) { + startOfParms++; /* Skip to first delimiter then skip whitespace */ + while (*startOfParms==' ' || *startOfParms == '\t') startOfParms++; WCMD_strsubstW(p, p+2, startOfParms, -1); - else + } else WCMD_strsubstW(p, p+2, NULL, 0); } else if (forVariable &&

1 0

Jason Edmeades : cmd: Identify the program name using more appropriate parsing.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 4236c2007df8267b4bbfdc00f5f26e86f71ddc99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4236c2007df8267b4bbfdc00f… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sat Oct 13 22:11:03 2012 +0100 cmd: Identify the program name using more appropriate parsing. --- programs/cmd/tests/test_cmdline.cmd.exp | 32 +++++++++++++++--------------- programs/cmd/wcmdmain.c | 23 +++++++++------------ 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/programs/cmd/tests/test_cmdline.cmd.exp b/programs/cmd/tests/test_cmdline.cmd.exp index 61deff6..4ea4ce0 100644 --- a/programs/cmd/tests/test_cmdline.cmd.exp +++ b/programs/cmd/tests/test_cmdline.cmd.exp @@ -48,37 +48,37 @@ var=33(a)space@ ------ Testing invocation of batch files ---------- 0(a)space@ 1(a)space@ -(a)todo_wine@1(a)space@ 1(a)space@ -(a)todo_wine@1(a)space@ +1(a)space@ +1(a)space@ 0(a)space@ -(a)todo_wine@1(a)space@ -(a)todo_wine@2(a)space@ +1(a)space@ +2(a)space@ 0(a)space@ 3(a)space@ -(a)todo_wine@3(a)space@ +3(a)space@ @todo_wine(a)4@space@ ------ Testing invocation with CMD /C ------------- 0(a)space@ 1(a)space@ -(a)todo_wine@0(a)space@ 0(a)space@ -(a)todo_wine@1(a)space@ 0(a)space@ -(a)todo_wine@1(a)space@ -(a)todo_wine@2(a)space@ +1(a)space@ +0(a)space@ +1(a)space@ +2(a)space@ 0(a)space@ -(a)todo_wine@3(a)space@ +3(a)space@ @todo_wine(a)4@space@ ---------- Testing CMD /C quoting ----------------- "hi" -(a)todo_wine@1(a)space@ +1(a)space@ "\"\\"\\\"\\\\"@space@"\"\\"\\\"\\\\" 1(a)space@ 0(a)space@ 1(a)space@ 0(a)space@ -(a)todo_wine@0(a)space@ +0(a)space@ 0(a)space@@or_broken(a)3@space@ 3(a)space@ 2(a)space@ @@ -100,7 +100,7 @@ THIS FAILS: cmd ignoreme/c say one {@space@ }@space@ 0(a)space@ -(a)todo_wine@0(a)space@ +0(a)space@ !@space@ @todo_wine(a)0@space@@or_broken@!@space@ @todo_wine(a)0@space@ @@ -117,8 +117,8 @@ THIS FAILS: cmd ignoreme/c say one @todo_wine(a)1:((1)),2:@space@ @todo_wine(a)1:(1)(2),2:@space@ @todo_wine(a)1:(1),2:(2)@space@ -(a)todo_wine@1:1,2:2(a)space@ -(a)todo_wine@1:1,2:2(a)space@ -(a)todo_wine@1:1,2:2(a)space@ +1:1,2:2(a)space@ +1:1,2:2(a)space@ +1:1,2:2(a)space@ 1:"p(a)space@"1,2:p"@space@"2(a)space@ 1:p"1(a)space@p",2:2(a)space@ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2aa116c..eb0897a 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1008,6 +1008,7 @@ void WCMD_run_program (WCHAR *command, BOOL called) MAX_PATH, including null character */ WCHAR *lastSlash; WCHAR pathext[MAXSTRING]; + WCHAR *firstParam; BOOL extensionsupplied = FALSE; BOOL launched = FALSE; BOOL status; @@ -1016,17 +1017,13 @@ void WCMD_run_program (WCHAR *command, BOOL called) static const WCHAR envPath[] = {'P','A','T','H','\0'}; static const WCHAR delims[] = {'/','\\',':','\0'}; - /* Quick way to get the filename - * (but handle leading / as part of program name, not qualifier) - */ - for (len = 0; command[len] == '/'; len++) param1[len] = '/'; - WCMD_parse (command + len, quals, param1 + len, param2); - - if (!(*param1) && !(*param2)) - return; + /* Quick way to get the filename is to extract the first argument. */ + WINE_TRACE("Running '%s' (%d)\n", wine_dbgstr_w(command), called); + firstParam = WCMD_parameter(command, 0, NULL, NULL, FALSE); + if (!firstParam) return; /* Calculate the search path and stem to search for */ - if (strpbrkW (param1, delims) == NULL) { /* No explicit path given, search path */ + if (strpbrkW (firstParam, delims) == NULL) { /* No explicit path given, search path */ static const WCHAR curDir[] = {'.',';','\0'}; strcpyW(pathtosearch, curDir); len = GetEnvironmentVariableW(envPath, &pathtosearch[2], (sizeof(pathtosearch)/sizeof(WCHAR))-2); @@ -1034,19 +1031,19 @@ void WCMD_run_program (WCHAR *command, BOOL called) static const WCHAR curDir[] = {'.','\0'}; strcpyW (pathtosearch, curDir); } - if (strchrW(param1, '.') != NULL) extensionsupplied = TRUE; - if (strlenW(param1) >= MAX_PATH) + if (strchrW(firstParam, '.') != NULL) extensionsupplied = TRUE; + if (strlenW(firstParam) >= MAX_PATH) { WCMD_output_asis_stderr(WCMD_LoadMessage(WCMD_LINETOOLONG)); return; } - strcpyW(stemofsearch, param1); + strcpyW(stemofsearch, firstParam); } else { /* Convert eg. ..\fred to include a directory by removing file part */ - GetFullPathNameW(param1, sizeof(pathtosearch)/sizeof(WCHAR), pathtosearch, NULL); + GetFullPathNameW(firstParam, sizeof(pathtosearch)/sizeof(WCHAR), pathtosearch, NULL); lastSlash = strrchrW(pathtosearch, '\\'); if (lastSlash && strchrW(lastSlash, '.') != NULL) extensionsupplied = TRUE; strcpyW(stemofsearch, lastSlash+1);

1 0

Jason Edmeades : cmd: cmd /c "pgmname" searches all extensions on PATHEXT.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 25cf0aa04665e4916c07f134b39c85c0bd4fa80d URL: http://source.winehq.org/git/wine.git/?a=commit;h=25cf0aa04665e4916c07f134b… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Sat Oct 13 21:50:22 2012 +0100 cmd: cmd /c "pgmname" searches all extensions on PATHEXT. --- programs/cmd/tests/test_cmdline.cmd.exp | 8 ++-- programs/cmd/wcmdmain.c | 81 ++++++++++++++++++++----------- 2 files changed, 57 insertions(+), 32 deletions(-) diff --git a/programs/cmd/tests/test_cmdline.cmd.exp b/programs/cmd/tests/test_cmdline.cmd.exp index 7e9ac32..61deff6 100644 --- a/programs/cmd/tests/test_cmdline.cmd.exp +++ b/programs/cmd/tests/test_cmdline.cmd.exp @@ -60,7 +60,7 @@ var=33(a)space@ @todo_wine(a)4@space@ ------ Testing invocation with CMD /C ------------- 0(a)space@ -(a)todo_wine@1(a)space@ +1(a)space@ @todo_wine(a)0@space@ 0(a)space@ @todo_wine(a)1@space@ @@ -74,7 +74,7 @@ var=33(a)space@ "hi" @todo_wine(a)1@space@ "\"\\"\\\"\\\\"@space@"\"\\"\\\"\\\\" -(a)todo_wine@1(a)space@ +1(a)space@ 0(a)space@ 1(a)space@ 0(a)space@ @@ -85,10 +85,10 @@ var=33(a)space@ 2(a)space@ 2(a)space@ 0(a)space@ -(a)todo_wine@5(a)space@ +5(a)space@ ------- Testing CMD /C qualifier treatment ------------ 0(a)space@ -(a)todo_wine@1(a)space@ +1(a)space@ THIS FAILS: cmd "/c"say one THIS FAILS: cmd ignoreme/c say one --------- Testing special characters -------------- diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 7cd6bda..2aa116c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -47,6 +47,11 @@ BOOL echo_mode = TRUE; WCHAR anykey[100], version_string[100]; const WCHAR newlineW[] = {'\r','\n','\0'}; const WCHAR spaceW[] = {' ','\0'}; +static const WCHAR envPathExt[] = {'P','A','T','H','E','X','T','\0'}; +static const WCHAR dfltPathExt[] = {'.','b','a','t',';', + '.','c','o','m',';', + '.','c','m','d',';', + '.','e','x','e','\0'}; static BOOL opt_c, opt_k, opt_s, unicodeOutput = FALSE; @@ -1009,7 +1014,6 @@ void WCMD_run_program (WCHAR *command, BOOL called) BOOL assumeInternal = FALSE; DWORD len; static const WCHAR envPath[] = {'P','A','T','H','\0'}; - static const WCHAR envPathExt[] = {'P','A','T','H','E','X','T','\0'}; static const WCHAR delims[] = {'/','\\',':','\0'}; /* Quick way to get the filename @@ -1055,10 +1059,6 @@ void WCMD_run_program (WCHAR *command, BOOL called) /* Now extract PATHEXT */ len = GetEnvironmentVariableW(envPathExt, pathext, sizeof(pathext)/sizeof(WCHAR)); if ((len == 0) || (len >= (sizeof(pathext)/sizeof(WCHAR)))) { - static const WCHAR dfltPathExt[] = {'.','b','a','t',';', - '.','c','o','m',';', - '.','c','m','d',';', - '.','e','x','e','\0'}; strcpyW (pathext, dfltPathExt); } @@ -2445,10 +2445,15 @@ int wmain (int argc, WCHAR *argvW[]) is a valid executable, ie must exist, otherwise drop back to old mode */ if (!opt_s) { WCHAR *thisArg = WCMD_parameter(cmd, 0, NULL, NULL, FALSE); - static const WCHAR extEXEW[] = {'.','e','x','e','\0'}; - static const WCHAR extCOMW[] = {'.','c','o','m','\0'}; + WCHAR pathext[MAXSTRING]; BOOL found = FALSE; + /* Now extract PATHEXT */ + len = GetEnvironmentVariableW(envPathExt, pathext, sizeof(pathext)/sizeof(WCHAR)); + if ((len == 0) || (len >= (sizeof(pathext)/sizeof(WCHAR)))) { + strcpyW (pathext, dfltPathExt); + } + /* If the supplied parameter has any directory information, look there */ WINE_TRACE("First parameter is '%s'\n", wine_dbgstr_w(thisArg)); if (strchrW(thisArg, '\\') != NULL) { @@ -2461,18 +2466,28 @@ int wmain (int argc, WCHAR *argvW[]) if (GetFileAttributesW(string) != INVALID_FILE_ATTRIBUTES) { WINE_TRACE("Found file as '%s'\n", wine_dbgstr_w(string)); found = TRUE; - } else strcpyW(p, extEXEW); - - /* Does file exist with .exe appended */ - if (!found && GetFileAttributesW(string) != INVALID_FILE_ATTRIBUTES) { - WINE_TRACE("Found file as '%s'\n", wine_dbgstr_w(string)); - found = TRUE; - } else strcpyW(p, extCOMW); + } else { + WCHAR *thisExt = pathext; + + /* No - try with each of the PATHEXT extensions */ + while (!found && thisExt) { + WCHAR *nextExt = strchrW(thisExt, ';'); + + if (nextExt) { + memcpy(p, thisExt, (nextExt-thisExt) * sizeof(WCHAR)); + p[(nextExt-thisExt)] = 0x00; + thisExt = nextExt+1; + } else { + strcpyW(p, thisExt); + thisExt = NULL; + } - /* Does file exist with .com appended */ - if (!found && GetFileAttributesW(string) != INVALID_FILE_ATTRIBUTES) { - WINE_TRACE("Found file as '%s'\n", wine_dbgstr_w(string)); - found = TRUE; + /* Does file exist with this extension appended? */ + if (GetFileAttributesW(string) != INVALID_FILE_ATTRIBUTES) { + WINE_TRACE("Found file as '%s'\n", wine_dbgstr_w(string)); + found = TRUE; + } + } } /* Otherwise we now need to look in the path to see if we can find it */ @@ -2483,18 +2498,28 @@ int wmain (int argc, WCHAR *argvW[]) if (SearchPathW(NULL, thisArg, NULL, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string)); found = TRUE; - } + } else { + WCHAR *thisExt = pathext; - /* Does file exist plus an extension of .exe? */ - if (SearchPathW(NULL, thisArg, extEXEW, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { - WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string)); - found = TRUE; - } + /* No - try with each of the PATHEXT extensions */ + while (!found && thisExt) { + WCHAR *nextExt = strchrW(thisExt, ';'); - /* Does file exist plus an extension of .com? */ - if (SearchPathW(NULL, thisArg, extCOMW, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { - WINE_TRACE("Found on path as '%s'\n", wine_dbgstr_w(string)); - found = TRUE; + if (nextExt) { + *nextExt = 0; + nextExt = nextExt+1; + } else { + nextExt = NULL; + } + + /* Does file exist with this extension? */ + if (SearchPathW(NULL, thisArg, thisExt, sizeof(string)/sizeof(WCHAR), string, NULL) != 0) { + WINE_TRACE("Found on path as '%s' with extension '%s'\n", wine_dbgstr_w(string), + wine_dbgstr_w(thisExt)); + found = TRUE; + } + thisExt = nextExt; + } } }

1 0

Henri Verbeet : ddraw: Just implement ddraw7_RestoreDisplayMode() on top of wined3d_set_adapter_display_mode().
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 1fab14af9e2ecdc26c9cf7b72b28c74b1f98ad6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fab14af9e2ecdc26c9cf7b72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 15 22:26:21 2012 +0200 ddraw: Just implement ddraw7_RestoreDisplayMode() on top of wined3d_set_adapter_display_mode(). --- dlls/ddraw/ddraw.c | 155 +++++++++++++++++++------------------------- dlls/ddraw/ddraw_private.h | 4 +- 2 files changed, 68 insertions(+), 91 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 1ef06d0..9d2a78a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1003,79 +1003,6 @@ static HRESULT WINAPI ddraw1_SetCooperativeLevel(IDirectDraw *iface, HWND window } /***************************************************************************** - * - * Helper function for SetDisplayMode and RestoreDisplayMode - * - * Implements DirectDraw's SetDisplayMode, but ignores the value of - * ForceRefreshRate, since it is already handled by - * ddraw7_SetDisplayMode. RestoreDisplayMode can use this function - * without worrying that ForceRefreshRate will override the refresh rate. For - * argument and return value documentation, see - * ddraw7_SetDisplayMode. - * - *****************************************************************************/ -static HRESULT ddraw_set_display_mode(struct ddraw *ddraw, DWORD Width, DWORD Height, - DWORD BPP, DWORD RefreshRate, DWORD Flags) -{ - struct wined3d_display_mode mode; - enum wined3d_format_id format; - HRESULT hr; - - TRACE("ddraw %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n", ddraw, Width, - Height, BPP, RefreshRate, Flags); - - wined3d_mutex_lock(); - if( !Width || !Height ) - { - ERR("Width %u, Height %u, what to do?\n", Width, Height); - /* It looks like Need for Speed Porsche Unleashed expects DD_OK here */ - wined3d_mutex_unlock(); - return DD_OK; - } - - switch(BPP) - { - case 8: format = WINED3DFMT_P8_UINT; break; - case 15: format = WINED3DFMT_B5G5R5X1_UNORM; break; - case 16: format = WINED3DFMT_B5G6R5_UNORM; break; - case 24: format = WINED3DFMT_B8G8R8_UNORM; break; - case 32: format = WINED3DFMT_B8G8R8X8_UNORM; break; - default: format = WINED3DFMT_UNKNOWN; break; - } - - /* Check the exclusive mode - if(!(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) - return DDERR_NOEXCLUSIVEMODE; - * This is WRONG. Don't know if the SDK is completely - * wrong and if there are any conditions when DDERR_NOEXCLUSIVE - * is returned, but Half-Life 1.1.1.1 (Steam version) - * depends on this - */ - - mode.width = Width; - mode.height = Height; - mode.refresh_rate = RefreshRate; - mode.format_id = format; - mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; - - /* TODO: The possible return values from msdn suggest that - * the screen mode can't be changed if a surface is locked - * or some drawing is in progress - */ - - /* TODO: Lose the primary surface */ - hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode); - - wined3d_mutex_unlock(); - - switch(hr) - { - case WINED3DERR_NOTAVAILABLE: return DDERR_UNSUPPORTED; - default: return hr; - } -} - -/***************************************************************************** * IDirectDraw7::SetDisplayMode * * Sets the display screen resolution, color depth and refresh frequency @@ -1097,22 +1024,67 @@ static HRESULT ddraw_set_display_mode(struct ddraw *ddraw, DWORD Width, DWORD He * DD_OK on success * *****************************************************************************/ -static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD Width, DWORD Height, - DWORD BPP, DWORD RefreshRate, DWORD Flags) +static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DWORD height, + DWORD bpp, DWORD refresh_rate, DWORD flags) { struct ddraw *ddraw = impl_from_IDirectDraw7(iface); + struct wined3d_display_mode mode; + enum wined3d_format_id format; + HRESULT hr; TRACE("iface %p, width %u, height %u, bpp %u, refresh_rate %u, flags %#x.\n", - iface, Width, Height, BPP, RefreshRate, Flags); + iface, width, height, bpp, refresh_rate, flags); if (force_refresh_rate != 0) { TRACE("ForceRefreshRate overriding passed-in refresh rate (%u Hz) to %u Hz\n", - RefreshRate, force_refresh_rate); - RefreshRate = force_refresh_rate; + refresh_rate, force_refresh_rate); + refresh_rate = force_refresh_rate; } - return ddraw_set_display_mode(ddraw, Width, Height, BPP, RefreshRate, Flags); + wined3d_mutex_lock(); + + if (!width || !height) + { + /* It looks like Need for Speed Porsche Unleashed expects DD_OK here. */ + wined3d_mutex_unlock(); + return DD_OK; + } + + switch (bpp) + { + case 8: format = WINED3DFMT_P8_UINT; break; + case 15: format = WINED3DFMT_B5G5R5X1_UNORM; break; + case 16: format = WINED3DFMT_B5G6R5_UNORM; break; + case 24: format = WINED3DFMT_B8G8R8_UNORM; break; + case 32: format = WINED3DFMT_B8G8R8X8_UNORM; break; + default: format = WINED3DFMT_UNKNOWN; break; + } + + /* Check the exclusive mode. + * if(!(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + * return DDERR_NOEXCLUSIVEMODE; + * This is WRONG. Don't know if the SDK is completely wrong and if there + * are any conditions when DDERR_NOEXCLUSIVE is returned, but Half-Life + * 1.1.1.1 (Steam version) depends on this. */ + mode.width = width; + mode.height = height; + mode.refresh_rate = refresh_rate; + mode.format_id = format; + mode.scanline_ordering = WINED3D_SCANLINE_ORDERING_UNKNOWN; + + /* TODO: The possible return values from msdn suggest that the screen mode + * can't be changed if a surface is locked or some drawing is in progress. */ + /* TODO: Lose the primary surface. */ + hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode); + + wined3d_mutex_unlock(); + + switch (hr) + { + case WINED3DERR_NOTAVAILABLE: return DDERR_UNSUPPORTED; + default: return hr; + } } static HRESULT WINAPI ddraw4_SetDisplayMode(IDirectDraw4 *iface, DWORD width, DWORD height, @@ -1170,10 +1142,17 @@ static HRESULT WINAPI ddraw1_SetDisplayMode(IDirectDraw *iface, DWORD width, DWO static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface) { struct ddraw *ddraw = impl_from_IDirectDraw7(iface); + HRESULT hr; TRACE("iface %p.\n", iface); - return ddraw_set_display_mode(ddraw, ddraw->orig_width, ddraw->orig_height, ddraw->orig_bpp, 0, 0); + wined3d_mutex_lock(); + + hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &ddraw->original_mode); + + wined3d_mutex_unlock(); + + return hr; } static HRESULT WINAPI ddraw4_RestoreDisplayMode(IDirectDraw4 *iface) @@ -5359,7 +5338,6 @@ static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops = HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) { HRESULT hr; - HDC hDC; ddraw->IDirectDraw7_iface.lpVtbl = &ddraw7_vtbl; ddraw->IDirectDraw_iface.lpVtbl = &ddraw1_vtbl; @@ -5373,13 +5351,6 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->numIfaces = 1; ddraw->ref7 = 1; - /* Get the current screen settings. */ - hDC = GetDC(0); - ddraw->orig_bpp = GetDeviceCaps(hDC, BITSPIXEL) * GetDeviceCaps(hDC, PLANES); - ReleaseDC(0, hDC); - ddraw->orig_width = GetSystemMetrics(SM_CXSCREEN); - ddraw->orig_height = GetSystemMetrics(SM_CYSCREEN); - ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS); if (!ddraw->wined3d) { @@ -5387,6 +5358,14 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) return E_OUTOFMEMORY; } + if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, + WINED3DADAPTER_DEFAULT, &ddraw->original_mode, NULL))) + { + ERR("Failed to get display mode, hr %#x.\n", hr); + wined3d_decref(ddraw->wined3d); + return hr; + } + hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, NULL, 0, 8, &ddraw->device_parent, &ddraw->wined3d_device); if (FAILED(hr)) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 563377f..0d15727 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -78,9 +78,7 @@ struct ddraw /* DirectDraw things, which are not handled by WineD3D */ DWORD cooperative_level; - - DWORD orig_width, orig_height; - DWORD orig_bpp; + struct wined3d_display_mode original_mode; /* D3D things */ HWND d3d_window;

1 0

Henri Verbeet : ddraw: Get rid of some fallback code in CreateSurface().
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 4a5ed44d7962b36401852e12dd2443f8b5b8dbc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5ed44d7962b36401852e12d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 15 22:26:20 2012 +0200 ddraw: Get rid of some fallback code in CreateSurface(). --- dlls/ddraw/ddraw.c | 27 +-------------------------- 1 files changed, 1 insertions(+), 26 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f34888d..1ef06d0 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2772,35 +2772,10 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, copy_to_surfacedesc2(&desc2, DDSD); desc2.u4.ddpfPixelFormat.dwSize=sizeof(DDPIXELFORMAT); /* Just to be sure */ - /* Get the video mode from WineD3D - we will need it */ if (FAILED(hr = wined3d_get_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); - - switch (ddraw->orig_bpp) - { - case 8: - mode.format_id = WINED3DFMT_P8_UINT; - break; - - case 15: - mode.format_id = WINED3DFMT_B5G5R5X1_UNORM; - break; - - case 16: - mode.format_id = WINED3DFMT_B5G6R5_UNORM; - break; - - case 24: - mode.format_id = WINED3DFMT_B8G8R8_UNORM; - break; - - case 32: - mode.format_id = WINED3DFMT_B8G8R8X8_UNORM; - break; - } - mode.width = ddraw->orig_width; - mode.height = ddraw->orig_height; + return hr; } /* No pixelformat given? Use the current screen format */

1 0

Detlef Riekenberg : dsound/tests: Handle broken E_FAIL in dsound8 for AC97.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 45c56bcc80e0e518f8be176fd987565351cfc419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c56bcc80e0e518f8be176fd… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 14 23:38:13 2012 +0200 dsound/tests: Handle broken E_FAIL in dsound8 for AC97. --- dlls/dsound/tests/dsound8.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index ae2f7a7..ba04d9f 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1021,7 +1021,7 @@ static void test_hw_buffers(void) trace("dwMaxHwMixingStreamingBuffers: %u\n", caps.dwMaxHwMixingStreamingBuffers); for(i = 0; i < caps.dwMaxHwMixingAllBuffers; ++i){ hr = IDirectSound8_CreateSoundBuffer(ds, &bufdesc, &secondaries[i], NULL); - ok(hr == S_OK || hr == E_NOTIMPL || broken(hr == DSERR_CONTROLUNAVAIL), + ok(hr == S_OK || hr == E_NOTIMPL || broken(hr == DSERR_CONTROLUNAVAIL) || broken(hr == E_FAIL), "CreateSoundBuffer(%u) failed: %08x\n", i, hr); if(hr != S_OK) break; @@ -1039,8 +1039,9 @@ static void test_hw_buffers(void) (caps.dwMaxHwMixingAllBuffers == 0 && hr == DSERR_INVALIDCALL) || /* no hw buffers at all */ hr == E_NOTIMPL || /* don't support hw buffers */ broken(hr == DSERR_CONTROLUNAVAIL) || /* vmware winxp, others? */ + broken(hr == E_FAIL) || /* broken AC97 driver */ broken(hr == S_OK) /* broken driver allows more hw bufs than dscaps claims */, - "CreateSoundBuffer gave wrong error: %08x\n", hr); + "CreateSoundBuffer(%u) gave wrong error: %08x\n", i, hr); if(hr == S_OK) IDirectSoundBuffer_Release(secondary);

1 0

Henri Verbeet : wined3d: Recognise the SM4 "primID" register type.
by Alexandre Julliard Oct. 16, 2012

Oct. 16, 2012

Module: wine Branch: master Commit: 59bdd6ae9715d143b84e669c59be7e5841bd36ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=59bdd6ae9715d143b84e669c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 15 22:26:19 2012 +0200 wined3d: Recognise the SM4 "primID" register type. --- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9c70f08..b735b77 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -992,6 +992,10 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, TRACE("cb"); break; + case WINED3DSPR_PRIMID: + TRACE("primID"); + break; + case WINED3DSPR_NULL: TRACE("null"); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b69ba82..1159d6e 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -131,6 +131,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_IMMCONST = 0x4, WINED3D_SM4_RT_SAMPLER = 0x6, WINED3D_SM4_RT_CONSTBUFFER = 0x8, + WINED3D_SM4_RT_PRIMID = 0xb, WINED3D_SM4_RT_NULL = 0xd, }; @@ -269,7 +270,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, /* UNKNOWN */ 0, /* UNKNOWN */ 0, - /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID, /* UNKNOWN */ 0, /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 56bdbad..06f75de 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -320,6 +320,7 @@ enum wined3d_shader_register_type WINED3DSPR_PREDICATE = 19, WINED3DSPR_IMMCONST, WINED3DSPR_CONSTBUFFER, + WINED3DSPR_PRIMID, WINED3DSPR_NULL, WINED3DSPR_RESOURCE, }; @@ -2678,6 +2679,7 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) case WINED3DSPR_CONSTBOOL: /* b# */ case WINED3DSPR_LOOP: /* aL */ case WINED3DSPR_PREDICATE: /* p0 */ + case WINED3DSPR_PRIMID: /* primID */ return TRUE; case WINED3DSPR_MISCTYPE:

1 0