October 2012 - Wine-commits

Jason Edmeades : cmd: Change command line parsing away from argv/argc.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: f252e9dfc85303d645ec545f238fd8ee11ff2497 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f252e9dfc85303d645ec545f2… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Wed Oct 3 00:50:13 2012 +0100 cmd: Change command line parsing away from argv/argc. --- programs/cmd/tests/test_builtins.cmd | 7 +- programs/cmd/tests/test_builtins.cmd.exp | 22 ++-- programs/cmd/wcmdmain.c | 185 +++++++++--------------------- 3 files changed, 76 insertions(+), 138 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 3e064b9..bdd6cd0 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1861,7 +1861,12 @@ cmd.exe /c " echo passed2 " echo --- Test 14 cmd.exe /c "dir /ad ..\fooba* /b" echo --- Test 15 - +cmd.exe /cecho No whitespace +echo --- Test 16 +cmd.exe /c +echo --- Test 17 +cmd.exe /c(a)space@ +echo --- Test 18 rem Ensure no interactive prompting when cmd.exe /c or /k echo file2 > file2 cmd.exe /c copy file1 file2 >nul diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 6483f1e..1d004b7 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -910,23 +910,23 @@ value1 ------------ cmd.exe command lines ------------ --- Test 1 Line1 -(a)todo_wine@"Line2" +"Line2" --- Test 2 -(a)todo_wine@Test quotes "&" work +Test quotes "&" work --- Test 3 -(a)todo_wine@"&" +"&" --- Test 4 -(a)todo_wine@"<" +"<" --- Test 5 -(a)todo_wine@">" +">" --- Test 6 -(a)todo_wine@"\" +"\" --- Test 7 -(a)todo_wine@"|" +"|" --- Test 8 -(a)todo_wine@"`" +"`" --- Test 9 -(a)todo_wine@""" +""" --- Test 10 --- Test 11 --- Test 12 @@ -936,6 +936,10 @@ passed2(a)space@ --- Test 14 foobar --- Test 15 +No whitespace +--- Test 16 +--- Test 17 +--- Test 18 No prompts or I would not get here1 No prompts or I would not get here2 %hello1% diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 675256b..3c18356 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2300,7 +2300,9 @@ void WCMD_free_commands(CMD_LIST *cmds) { int wmain (int argc, WCHAR *argvW[]) { int args; - WCHAR *cmd; + WCHAR *cmdLine = NULL; + WCHAR *cmd = NULL; + WCHAR *argPos = NULL; WCHAR string[1024]; WCHAR envvar[4]; BOOL opt_q; @@ -2318,19 +2320,26 @@ int wmain (int argc, WCHAR *argvW[]) LocalFree(cmd); cmd = NULL; - args = argc; + /* Can't use argc/argv as it will have stripped quotes from parameters + * meaning cmd.exe /C echo "quoted string" is impossible + */ + cmdLine = GetCommandLineW(); + WINE_TRACE("Full commandline '%s'\n", wine_dbgstr_w(cmdLine)); + args = 1; /* start at first arg, skipping cmd.exe itself */ + opt_c = opt_k = opt_q = opt_s = FALSE; - while (args > 0) + WCMD_parameter(cmdLine, args, &argPos, NULL, TRUE); + while (argPos && argPos[0] != 0x00) { WCHAR c; - WINE_TRACE("Command line parm: '%s'\n", wine_dbgstr_w(*argvW)); - if ((*argvW)[0]!='/' || (*argvW)[1]=='\0') { - argvW++; - args--; + WINE_TRACE("Command line parm: '%s'\n", wine_dbgstr_w(argPos)); + if (argPos[0]!='/' || argPos[1]=='\0') { + args++; + WCMD_parameter(cmdLine, args, &argPos, NULL, TRUE); continue; } - c=(*argvW)[1]; + c=argPos[1]; if (tolowerW(c)=='c') { opt_c = TRUE; } else if (tolowerW(c)=='q') { @@ -2343,19 +2352,20 @@ int wmain (int argc, WCHAR *argvW[]) unicodeOutput = FALSE; } else if (tolowerW(c)=='u') { unicodeOutput = TRUE; - } else if (tolowerW(c)=='t' && (*argvW)[2]==':') { - opt_t=strtoulW(&(*argvW)[3], NULL, 16); + } else if (tolowerW(c)=='t' && argPos[2]==':') { + opt_t=strtoulW(&argPos[3], NULL, 16); } else if (tolowerW(c)=='x' || tolowerW(c)=='y') { /* Ignored for compatibility with Windows */ } - if ((*argvW)[2]==0) { - argvW++; - args--; + if (argPos[2]==0 || argPos[2]==' ' || argPos[2]=='\t') { + args++; + WCMD_parameter(cmdLine, args, &argPos, NULL, TRUE); } else /* handle `cmd /cnotepad.exe` and `cmd /x/c ...` */ { - *argvW+=2; + /* Do not step to next paramater, instead carry on parsing this one */ + argPos+=2; } if (opt_c || opt_k) /* break out of parsing immediately after c or k */ @@ -2371,64 +2381,50 @@ int wmain (int argc, WCHAR *argvW[]) interactive = FALSE; if (opt_c || opt_k) { - int len,qcount; - WCHAR** arg; - int argsLeft; - WCHAR* p; + int len; + WCHAR *q1 = NULL,*q2 = NULL,*p; + + /* Handle very edge case error scenarion, "cmd.exe /c" ie when there are no + * parameters after the /C or /K by pretending there was a single space */ + if (argPos == NULL) argPos = (WCHAR *)spaceW; + + /* Build the command to execute - It is what is left in argPos */ + len = strlenW(argPos); + + /* Take a copy */ + cmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!cmd) + exit(1); + strcpyW(cmd, argPos); /* opt_s left unflagged if the command starts with and contains exactly * one quoted string (exactly two quote characters). The quoted string * must be an executable name that has whitespace and must not have the * following characters: &<>()@^| */ - /* Build the command to execute */ - len = 0; - qcount = 0; - argsLeft = args; - for (arg = argvW; argsLeft>0; arg++,argsLeft--) - { - BOOL has_space = FALSE; - int bcount; - WCHAR* a; - - bcount=0; - a=*arg; - if( !*a ) has_space = TRUE; - while (*a!='\0') { - if (*a=='\\') { - bcount++; - } else { - if (*a==' ' || *a=='\t') { - has_space = TRUE; - } else if (*a=='"') { - /* doubling of '\' preceding a '"', - * plus escaping of said '"' - */ - len+=2*bcount+1; - qcount++; - } - bcount=0; - } - a++; - } - len+=(a-*arg) + 1; /* for the separating space */ - if (has_space) - { - len+=2; /* for the quotes */ - qcount+=2; - } + if (!opt_s) { + /* 1. Confirm there is at least one quote */ + q1 = strchrW(argPos, '"'); + if (!q1) opt_s=1; } - /* If there is not exactly 2 quote characters, then /S (old behaviour) is enabled */ - if (qcount!=2) - opt_s = TRUE; + if (!opt_s) { + /* 2. Confirm there is a second quote */ + q2 = strchrW(q1+1, '"'); + if (!q2) opt_s=1; + } - /* check argvW[0] for a space and invalid characters. There must not be any invalid - * characters, but there must be one or more whitespace */ + if (!opt_s) { + /* 3. Ensure there are no more quotes */ + if (strchrW(q2+1, '"')) opt_s=1; + } + + /* check first parameter for a space and invalid characters. There must not be any + * invalid characters, but there must be one or more whitespace */ if (!opt_s) { opt_s = TRUE; - p=*argvW; - while (*p!='\0') { + p=q1; + while (p!=q2) { if (*p=='&' || *p=='<' || *p=='>' || *p=='(' || *p==')' || *p=='@' || *p=='^' || *p=='|') { opt_s = TRUE; @@ -2440,73 +2436,6 @@ int wmain (int argc, WCHAR *argvW[]) } } - cmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!cmd) - exit(1); - - p = cmd; - argsLeft = args; - for (arg = argvW; argsLeft>0; arg++,argsLeft--) - { - BOOL has_space = FALSE, has_quote = FALSE; - WCHAR* a; - - /* Check for quotes and spaces in this argument */ - a=*arg; - if( !*a ) has_space = TRUE; - while (*a!='\0') { - if (*a==' ' || *a=='\t') { - has_space = TRUE; - if (has_quote) - break; - } else if (*a=='"') { - has_quote = TRUE; - if (has_space) - break; - } - a++; - } - - /* Now transfer it to the command line */ - if (has_space) - *p++='"'; - if (has_quote) { - int bcount; - WCHAR* a; - - bcount=0; - a=*arg; - while (*a!='\0') { - if (*a=='\\') { - *p++=*a; - bcount++; - } else { - if (*a=='"') { - int i; - - /* Double all the '\\' preceding this '"', plus one */ - for (i=0;i<=bcount;i++) - *p++='\\'; - *p++='"'; - } else { - *p++=*a; - } - bcount=0; - } - a++; - } - } else { - strcpyW(p,*arg); - p+=strlenW(*arg); - } - if (has_space) - *p++='"'; - *p++=' '; - } - if (p > cmd) - p--; /* remove last space */ - *p = '\0'; - WINE_TRACE("/c command line: '%s'\n", wine_dbgstr_w(cmd)); /* Finally, we only stay in new mode IF the first parameter is quoted and

1 0

Bruno Jesus : ws2_32: Fix some style issues.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: af8dc8090a13eb85d0cf1068b43639414455450a URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8dc8090a13eb85d0cf1068b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Oct 2 21:17:43 2012 -0300 ws2_32: Fix some style issues. --- dlls/ws2_32/socket.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 8efa1e6..f978350 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2511,7 +2511,7 @@ int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen) int fd; int res; - TRACE("socket: %04lx, ptr %p, len %08x\n", s, name, namelen?*namelen:0); + TRACE("socket: %04lx, ptr %p, len %08x\n", s, name, namelen ? *namelen : 0); fd = get_sock_fd( s, 0, NULL ); res = SOCKET_ERROR; @@ -2546,7 +2546,7 @@ int WINAPI WS_getsockname(SOCKET s, struct WS_sockaddr *name, int *namelen) int fd; int res; - TRACE("socket: %04lx, ptr %p, len %08x\n", s, name, namelen?*namelen:0); + TRACE("socket: %04lx, ptr %p, len %08x\n", s, name, namelen ? *namelen : 0); /* Check if what we've received is valid. Should we use IsBadReadPtr? */ if( (name == NULL) || (namelen == NULL) ) @@ -4194,7 +4194,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, SetLastError(WSAEFAULT); return SOCKET_ERROR; } - linger.l_onoff = *((const int*)optval) ? 0: 1; + linger.l_onoff = *(const int*)optval == 0; linger.l_linger = 0; level = SOL_SOCKET; optname = SO_LINGER; @@ -6077,7 +6077,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct WS_sockaddr *addr, LPINT addrlen, { case CF_ACCEPT: if (addr && addrlen) - memcpy(addr, &src_addr, (*addrlen > size) ? size : *addrlen ); + memcpy(addr, &src_addr, (*addrlen > size) ? size : *addrlen ); return cs; case CF_DEFER: SERVER_START_REQ( set_socket_deferred )

1 0

Piotr Caban : cryptnet: Fixed cache functions usage in CRYPT_CacheURL function.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 5e6e26e1dfac3ba613f7ed9a1139959c060fa218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6e26e1dfac3ba613f7ed9a1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 3 11:17:07 2012 +0200 cryptnet: Fixed cache functions usage in CRYPT_CacheURL function. --- dlls/cryptnet/cryptnet_main.c | 80 ++++++++++++++++++----------------------- 1 files changed, 35 insertions(+), 45 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 3143604..652c812 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -731,21 +731,24 @@ static void CRYPT_CacheURL(LPCWSTR pszURL, const CRYPT_BLOB_ARRAY *pObject, DWORD dwRetrievalFlags, FILETIME expires) { WCHAR cacheFileName[MAX_PATH]; - DWORD size = 0; - BOOL ret, create = FALSE; + HANDLE hCacheFile; + DWORD size = 0, entryType; + FILETIME ft; GetUrlCacheEntryInfoW(pszURL, NULL, &size); if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) { INTERNET_CACHE_ENTRY_INFOW *info = CryptMemAlloc(size); - if (info) + if (!info) { - FILETIME ft; + ERR("out of memory\n"); + return; + } - ret = GetUrlCacheEntryInfoW(pszURL, info, &size); - if (ret) - lstrcpyW(cacheFileName, info->lpszLocalFileName); + if (GetUrlCacheEntryInfoW(pszURL, info, &size)) + { + lstrcpyW(cacheFileName, info->lpszLocalFileName); /* Check if the existing cache entry is up to date. If it isn't, * remove the existing cache entry, and create a new one with the * new value. @@ -753,51 +756,38 @@ static void CRYPT_CacheURL(LPCWSTR pszURL, const CRYPT_BLOB_ARRAY *pObject, GetSystemTimeAsFileTime(&ft); if (CompareFileTime(&info->ExpireTime, &ft) < 0) { - create = TRUE; DeleteUrlCacheEntryW(pszURL); + CryptMemFree(info); + } + else + { + info->ExpireTime = expires; + SetUrlCacheEntryInfoW(pszURL, info, CACHE_ENTRY_EXPTIME_FC); + CryptMemFree(info); + return; } - CryptMemFree(info); } - else - ret = FALSE; } - else - { - ret = CreateUrlCacheEntryW(pszURL, pObject->rgBlob[0].cbData, NULL, - cacheFileName, 0); - create = TRUE; - } - if (ret) - { - DWORD entryType; - FILETIME ft = { 0 }; - if (create) - { - HANDLE hCacheFile = CreateFileW(cacheFileName, GENERIC_WRITE, 0, - NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (!CreateUrlCacheEntryW(pszURL, pObject->rgBlob[0].cbData, NULL, cacheFileName, 0)) + return; - if (hCacheFile != INVALID_HANDLE_VALUE) - { - DWORD bytesWritten; + hCacheFile = CreateFileW(cacheFileName, GENERIC_WRITE, 0, + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if(hCacheFile == INVALID_HANDLE_VALUE) + return; - WriteFile(hCacheFile, pObject->rgBlob[0].pbData, - pObject->rgBlob[0].cbData, &bytesWritten, NULL); - CloseHandle(hCacheFile); - } - else - ret = FALSE; - } - if (ret) - { - if (!(dwRetrievalFlags & CRYPT_STICKY_CACHE_RETRIEVAL)) - entryType = NORMAL_CACHE_ENTRY; - else - entryType = STICKY_CACHE_ENTRY; - CommitUrlCacheEntryW(pszURL, cacheFileName, expires, ft, entryType, - NULL, 0, NULL, NULL); - } - } + WriteFile(hCacheFile, pObject->rgBlob[0].pbData, + pObject->rgBlob[0].cbData, &size, NULL); + CloseHandle(hCacheFile); + + if (!(dwRetrievalFlags & CRYPT_STICKY_CACHE_RETRIEVAL)) + entryType = NORMAL_CACHE_ENTRY; + else + entryType = STICKY_CACHE_ENTRY; + memset(&ft, 0, sizeof(ft)); + CommitUrlCacheEntryW(pszURL, cacheFileName, expires, ft, entryType, + NULL, 0, NULL, NULL); } static void CALLBACK CRYPT_InetStatusCallback(HINTERNET hInt,

1 0

Piotr Caban : wininet: Correctly set headers size in CommitUrlCacheEntryW function.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: a3a909f2b9ea846d78d1c790d5c94f99dd96b206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3a909f2b9ea846d78d1c790d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 3 11:24:37 2012 +0200 wininet: Correctly set headers size in CommitUrlCacheEntryW function. --- dlls/wininet/urlcache.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 24bf48b..004c6be 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3419,6 +3419,8 @@ BOOL WINAPI CommitUrlCacheEntryW( if (!lpHeaderInfo || (header_info = heap_strdupWtoA(lpHeaderInfo))) { + if(header_info) + len = strlen(header_info); if (CommitUrlCacheEntryInternal(lpszUrlName, lpszLocalFileName, ExpireTime, LastModifiedTime, CacheEntryType, (LPBYTE)header_info, len, lpszFileExtension, lpszOriginalUrl)) {

1 0

Christian Costa : ntoskrnl.exe: Add stub for ExCreateCallback.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: ea943293c6185842b1350cc55c39df543fc64cf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea943293c6185842b1350cc55… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Oct 3 08:55:06 2012 +0200 ntoskrnl.exe: Add stub for ExCreateCallback. --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 9 +++++++++ 3 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 632cea5..06993ee 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1105,6 +1105,18 @@ PVOID WINAPI ExAllocatePoolWithQuotaTag( POOL_TYPE type, SIZE_T size, ULONG tag /*********************************************************************** + * ExCreateCallback (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ExCreateCallback(PCALLBACK_OBJECT *obj, POBJECT_ATTRIBUTES attr, + BOOLEAN create, BOOLEAN allow_multiple) +{ + FIXME("(%p, %p, %u, %u): stub\n", obj, attr, create, allow_multiple); + + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * ExFreePool (NTOSKRNL.EXE.@) */ void WINAPI ExFreePool( void *ptr ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index b169815..4bce7ec 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -122,7 +122,7 @@ @ stdcall ExAllocatePoolWithTag(long long long) @ stub ExAllocatePoolWithTagPriority @ stub ExConvertExclusiveToSharedLite -@ stub ExCreateCallback +@ stdcall ExCreateCallback(ptr ptr long long) @ stub ExDeleteNPagedLookasideList @ stub ExDeletePagedLookasideList @ stub ExDeleteResourceLite diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 183c950..bf9c15e 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1106,6 +1106,15 @@ typedef enum { IoModifyAccess } LOCK_OPERATION; +typedef struct _CALLBACK_OBJECT +{ + ULONG Signature; + KSPIN_LOCK Lock; + LIST_ENTRY RegisteredCallbacks; + BOOLEAN AllowMultipleCallbacks; + UCHAR reserved[3]; +} CALLBACK_OBJECT, *PCALLBACK_OBJECT; + NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); #ifdef NONAMELESSUNION

1 0

Christian Costa : ntoskrnl.exe: Don' t try to copy back data in buffered mode when we don' t expect any in process_ioctl.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 6643f07d2bf8df70490fe6692de1bdf356b4db1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6643f07d2bf8df70490fe6692… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Oct 3 08:55:14 2012 +0200 ntoskrnl.exe: Don't try to copy back data in buffered mode when we don't expect any in process_ioctl. --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 06993ee..03e932c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -197,7 +197,7 @@ static NTSTATUS process_ioctl( DEVICE_OBJECT *device, ULONG code, void *in_buff, *out_size = (irp.IoStatus.u.Status >= 0) ? irp.IoStatus.Information : 0; if ((code & 3) == METHOD_BUFFERED) { - memcpy( out_buff, irp.AssociatedIrp.SystemBuffer, *out_size ); + if (out_buff) memcpy( out_buff, irp.AssociatedIrp.SystemBuffer, *out_size ); HeapFree( GetProcessHeap(), 0, irp.AssociatedIrp.SystemBuffer ); } return irp.IoStatus.u.Status;

1 0

Nozomi Kodama : d3dx9_36: Implement D3DXSHMultiply4.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: b8cfe42326f19c87af7cd944a5918521e4c70d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8cfe42326f19c87af7cd944a… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Tue Oct 2 14:10:17 2012 +0800 d3dx9_36: Implement D3DXSHMultiply4. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/math.c | 288 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/math.c | 50 ++++++++ include/d3dx9math.h | 1 + 4 files changed, 340 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8cfe42326f19c87af7cd…

1 0

Nozomi Kodama : d3dx9_36/tests: Speed up some tests.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 584c24050e7af550e9f77145770fcf744203ad12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=584c24050e7af550e9f771457… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Tue Oct 2 14:11:10 2012 +0800 d3dx9_36/tests: Speed up some tests. --- dlls/d3dx9_36/tests/math.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 1d7b7d5..d56e38d 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2406,7 +2406,7 @@ static void test_D3DXSHAdd(void) * All values will work, test from 0-7 [D3DXSH_MINORDER = 2, D3DXSH_MAXORDER = 6] * Exceptions will show up when out, in1 or in2 are NULL */ - for (k = 0; k < 8; ++k) + for (k = 0; k <= D3DXSH_MAXORDER + 1; k++) { UINT count = k * k; @@ -2425,18 +2425,18 @@ static void test_D3DXSHAdd(void) static void test_D3DXSHDot(void) { unsigned int i; - FLOAT a[64], b[64], got; + FLOAT a[49], b[49], got; CONST FLOAT expected[] = - { 0.5f, 0.5f, 25.0f, 262.5f, 1428.0f, 5362.0f, 15873.0f, 39812.0f, 88400.0f, }; + { 0.5f, 0.5f, 25.0f, 262.5f, 1428.0f, 5362.0f, 15873.0f, 39812.0f, }; - for (i = 0; i < 64; i++) + for (i = 0; i < 49; i++) { a[i] = (FLOAT)i + 1.0f; b[i] = (FLOAT)i + 0.5f; } /* D3DXSHDot computes by using order * order elements */ - for (i = 0; i < 9; i++) + for (i = 0; i <= D3DXSH_MAXORDER + 1; i++) { got = D3DXSHDot(i, a, b); ok(relative_error(got, expected[i]) < admitted_error, "order %d: expected %f, received %f\n", i, expected[i], got); @@ -2449,7 +2449,7 @@ static void test_D3DXSHEvalDirection(void) { unsigned int i, order; D3DXVECTOR3 d; - FLOAT a[100], expected[100], *received_ptr; + FLOAT a[49], expected[49], *received_ptr; CONST FLOAT table[36] = { 0.282095f, -0.977205f, 1.465808f, -0.488603f, 2.185097f, -6.555291f, 8.200181f, -3.277646f, -1.638823f, 1.180087f, 17.343668f, -40.220032f, @@ -2460,15 +2460,15 @@ static void test_D3DXSHEvalDirection(void) d.x = 1.0; d.y = 2.0f; d.z = 3.0f; - for(order = 0; order < 10; order++) + for (order = 0; order <= D3DXSH_MAXORDER + 1; order++) { - for(i = 0; i < 100; i++) + for (i = 0; i < 49; i++) a[i] = 1.5f + i; received_ptr = D3DXSHEvalDirection(a, order, &d); ok(received_ptr == a, "Expected %p, received %p\n", a, received_ptr); - for(i = 0; i < 100; i++) + for (i = 0; i < 49; i++) { /* if the order is < D3DXSH_MINORDER or order > D3DXSH_MAXORDER or the index of the element is greater than order * order - 1, D3DXSHEvalDirection does not modify the output */ if ( (order < D3DXSH_MINORDER) || (order > D3DXSH_MAXORDER) || (i >= order * order) ) @@ -2781,7 +2781,7 @@ static void test_D3DXSHRotate(void) static void test_D3DXSHRotateZ(void) { unsigned int i, j, order, square; - FLOAT angle[] = { D3DX_PI / 3.0f, -D3DX_PI / 3.0f, 4.0f * D3DX_PI / 3.0f, }, expected, in[100], out[100], *received_ptr, table[] = + FLOAT angle[] = { D3DX_PI / 3.0f, -D3DX_PI / 3.0f, 4.0f * D3DX_PI / 3.0f, }, expected, in[49], out[49], *received_ptr, table[] = { /* Angle = D3DX_PI / 3.0f */ 1.01f, 4.477762f, 3.010000f, 0.264289f, 5.297888f, 9.941864f, 7.010000f, -1.199813f, -8.843789f, -10.010002f, 7.494040f, 18.138016f, 13.010000, -3.395966f, -17.039942f, @@ -2801,20 +2801,20 @@ static void test_D3DXSHRotateZ(void) -27.968143f, 24.009993f, 2.226105f, 18.180552f, -43.824543f, 28.010008f, 14.082489f, -42.726471f, 31.010000f, 9.984427f, -41.628399f, 34.009987f, 5.886366f, -40.530327, }; - for (i = 0; i < 100; i++) + for (i = 0; i < 49; i++) in[i] = i + 1.01f; for (j = 0; j < 3; j++) { - for (order = 0; order < 10; order++) + for (order = 0; order <= D3DXSH_MAXORDER + 1; order++) { - for (i = 0; i < 100; i++) + for (i = 0; i < 49; i++) out[i] = ( i + 1.0f ) * ( i + 1.0f ); received_ptr = D3DXSHRotateZ(out, order, angle[j], in); ok(received_ptr == out, "angle %f, order %u, Expected %p, received %p\n", angle[j], order, out, received_ptr); - for (i = 0; i < 100; i++) + for (i = 0; i < 49; i++) { /* order = 0 or order = 1 behaves like order = D3DXSH_MINORDER */ square = ( order <= D3DXSH_MINORDER ) ? D3DXSH_MINORDER * D3DXSH_MINORDER : order * order; @@ -2831,20 +2831,20 @@ static void test_D3DXSHRotateZ(void) static void test_D3DXSHScale(void) { unsigned int i, order; - FLOAT a[100], b[100], expected, *received_array; + FLOAT a[49], b[49], expected, *received_array; - for (i = 0; i < 100; i++) + for (i = 0; i < 49; i++) { a[i] = i; b[i] = i; } - for (order = 0; order < 10; order++) + for (order = 0; order <= D3DXSH_MAXORDER + 1; order++) { received_array = D3DXSHScale(b, order, a, 5.0f); ok(received_array == b, "Expected %p, received %p\n", b, received_array); - for (i = 0; i < 100; i++) + for (i = 0; i < 49; i++) { if (i < order * order) expected = 5.0f * a[i];

1 0

Nozomi Kodama : d3dx9_36/tests: Avoid a potential out of bound access.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 9c823d04b6cd159b1d7251c7c654245f1177ddf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c823d04b6cd159b1d7251c7c… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Tue Oct 2 14:12:27 2012 +0800 d3dx9_36/tests: Avoid a potential out of bound access. --- dlls/d3dx9_36/tests/math.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index d56e38d..761b832 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2818,10 +2818,10 @@ static void test_D3DXSHRotateZ(void) { /* order = 0 or order = 1 behaves like order = D3DXSH_MINORDER */ square = ( order <= D3DXSH_MINORDER ) ? D3DXSH_MINORDER * D3DXSH_MINORDER : order * order; - expected = table[36 * j + i]; if ( i >= square || ( (order >= D3DXSH_MAXORDER) && ( i >= D3DXSH_MAXORDER * D3DXSH_MAXORDER ) ) ) expected = ( i + 1.0f ) * ( i + 1.0f ); - + else + expected = table[36 * j + i]; ok(relative_error(out[i], expected) < admitted_error, "angle %f, order %u index %u, Expected %f, received %f\n", angle[j], order, i, expected, out[i]); } }

1 0

Nozomi Kodama : d3dx9_36/tests: Relax an equality between floats.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 3d5c61cdcd0431f381b412a3bf8963f9bde88a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d5c61cdcd0431f381b412a3b… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Tue Oct 2 14:13:11 2012 +0800 d3dx9_36/tests: Relax an equality between floats. --- dlls/d3dx9_36/tests/math.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 761b832..8ab0391 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2418,7 +2418,7 @@ static void test_D3DXSHAdd(void) ok(relative_error(in1[i] + in2[i], out[i]) < admitted_error, "%u-%u: D3DXSHAdd() failed, got %f, expected %f\n", k, i, out[i], in1[i] + in2[i]); } - ok(out[count] == 0.0f, "%u-%u: D3DXSHAdd() failed, got %f, expected 0.0\n", k, k * k, out[count]); + ok(relative_error(out[count], 0.0f) < admitted_error, "%u-%u: D3DXSHAdd() failed, got %f, expected 0.0\n", k, k * k, out[count]); } }

1 0