September 2012 - Wine-commits

Piotr Caban : wininet: Added support for cache containers without subdirectories.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: d07d3cbe9144ced802430c610d7f58090f666c4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d07d3cbe9144ced802430c610… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 24 14:57:55 2012 +0200 wininet: Added support for cache containers without subdirectories. --- dlls/wininet/urlcache.c | 81 +++++++++++++++++++++++++++++++--------------- 1 files changed, 54 insertions(+), 27 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index cbfa04f..fa0c96f 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -81,6 +81,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wininet); #define HASHTABLE_FLAG_BITS 6 #define PENDING_DELETE_CACHE_ENTRY 0x00400000 +#define CACHE_CONTAINER_NO_SUBDIR 0xFE #define CACHE_HEADER_DATA_ROOT_LEAK_OFFSET 0x16 @@ -340,7 +341,7 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer, DWORD b /* 127MB - taken from default for Windows 2000 */ pHeader->CacheLimit.QuadPart = 0x07ff5400; /* Copied from a Windows 2000 cache index */ - pHeader->DirectoryCount = 4; + pHeader->DirectoryCount = pContainer->default_entry_type==NORMAL_CACHE_ENTRY ? 4 : 0; /* If the registry has a cache size set, use the registry value */ if (RegOpenKeyA(HKEY_CURRENT_USER, szCacheContent, &key) == ERROR_SUCCESS) @@ -901,21 +902,31 @@ static BOOL URLCache_LocalFileNameToPathW( LONG nRequired; int path_len = strlenW(pContainer->path); int file_name_len = MultiByteToWideChar(CP_ACP, 0, szLocalFileName, -1, NULL, 0); - if (Directory >= pHeader->DirectoryCount) + if (Directory!=CACHE_CONTAINER_NO_SUBDIR && Directory>=pHeader->DirectoryCount) { *lpBufferSize = 0; return FALSE; } - nRequired = (path_len + DIR_LENGTH + file_name_len + 1) * sizeof(WCHAR); + nRequired = (path_len + file_name_len) * sizeof(WCHAR); + if(Directory != CACHE_CONTAINER_NO_SUBDIR) + nRequired += (DIR_LENGTH + 1) * sizeof(WCHAR); if (nRequired <= *lpBufferSize) { int dir_len; memcpy(wszPath, pContainer->path, path_len * sizeof(WCHAR)); - dir_len = MultiByteToWideChar(CP_ACP, 0, pHeader->directory_data[Directory].filename, DIR_LENGTH, wszPath + path_len, DIR_LENGTH); - wszPath[dir_len + path_len] = '\\'; - MultiByteToWideChar(CP_ACP, 0, szLocalFileName, -1, wszPath + dir_len + path_len + 1, file_name_len); + if (Directory != CACHE_CONTAINER_NO_SUBDIR) + { + dir_len = MultiByteToWideChar(CP_ACP, 0, pHeader->directory_data[Directory].filename, DIR_LENGTH, wszPath + path_len, DIR_LENGTH); + wszPath[dir_len + path_len] = '\\'; + dir_len++; + } + else + { + dir_len = 0; + } + MultiByteToWideChar(CP_ACP, 0, szLocalFileName, -1, wszPath + dir_len + path_len, file_name_len); *lpBufferSize = nRequired; return TRUE; } @@ -946,7 +957,7 @@ static BOOL URLCache_LocalFileNameToPathA( LONG nRequired; int path_len, file_name_len, dir_len; - if (Directory >= pHeader->DirectoryCount) + if (Directory!=CACHE_CONTAINER_NO_SUBDIR && Directory>=pHeader->DirectoryCount) { *lpBufferSize = 0; return FALSE; @@ -954,15 +965,20 @@ static BOOL URLCache_LocalFileNameToPathA( path_len = WideCharToMultiByte(CP_ACP, 0, pContainer->path, -1, NULL, 0, NULL, NULL) - 1; file_name_len = strlen(szLocalFileName) + 1 /* for nul-terminator */; - dir_len = DIR_LENGTH; + if (Directory!=CACHE_CONTAINER_NO_SUBDIR) + dir_len = DIR_LENGTH+1; + else + dir_len = 0; - nRequired = (path_len + dir_len + 1 + file_name_len) * sizeof(char); + nRequired = (path_len + dir_len + file_name_len) * sizeof(char); if (nRequired < *lpBufferSize) { WideCharToMultiByte(CP_ACP, 0, pContainer->path, -1, szPath, path_len, NULL, NULL); - memcpy(szPath+path_len, pHeader->directory_data[Directory].filename, dir_len); - szPath[path_len + dir_len] = '\\'; - memcpy(szPath + path_len + dir_len + 1, szLocalFileName, file_name_len); + if(dir_len) { + memcpy(szPath+path_len, pHeader->directory_data[Directory].filename, dir_len-1); + szPath[path_len + dir_len-1] = '\\'; + } + memcpy(szPath + path_len + dir_len, szLocalFileName, file_name_len); *lpBufferSize = nRequired; return TRUE; } @@ -2885,7 +2901,10 @@ BOOL WINAPI CreateUrlCacheEntryW( if (!(pHeader = URLCacheContainer_LockIndex(pContainer))) return FALSE; - CacheDir = (BYTE)(rand() % pHeader->DirectoryCount); + if(pHeader->DirectoryCount) + CacheDir = (BYTE)(rand() % pHeader->DirectoryCount); + else + CacheDir = CACHE_CONTAINER_NO_SUBDIR; lBufferSize = MAX_PATH * sizeof(WCHAR); if (!URLCache_LocalFileNameToPathW(pContainer, pHeader, szFile, CacheDir, lpszFileName, &lBufferSize)) @@ -3001,7 +3020,7 @@ static BOOL CommitUrlCacheEntryInternal( DWORD dwOffsetFileExtension = 0; WIN32_FILE_ATTRIBUTE_DATA file_attr; LARGE_INTEGER file_size; - BYTE cDirectory = 0; + BYTE cDirectory; char achFile[MAX_PATH]; LPSTR lpszUrlNameA = NULL; LPSTR lpszFileExtensionA = NULL; @@ -3081,6 +3100,11 @@ static BOOL CommitUrlCacheEntryInternal( DeleteUrlCacheEntryInternal(pContainer, pHeader, pHashEntry); } + if (pHeader->DirectoryCount) + cDirectory = 0; + else + cDirectory = CACHE_CONTAINER_NO_SUBDIR; + if (lpszLocalFileName) { BOOL bFound = FALSE; @@ -3098,24 +3122,27 @@ static BOOL CommitUrlCacheEntryInternal( WideCharToMultiByte(CP_ACP, 0, lpszLocalFileName, -1, achFile, MAX_PATH, NULL, NULL); pchLocalFileName = achFile; - for (cDirectory = 0; cDirectory < pHeader->DirectoryCount; cDirectory++) + if(pHeader->DirectoryCount) { - if (!strncmp(pHeader->directory_data[cDirectory].filename, pchLocalFileName, DIR_LENGTH)) + for (cDirectory = 0; cDirectory < pHeader->DirectoryCount; cDirectory++) { - bFound = TRUE; - break; + if (!strncmp(pHeader->directory_data[cDirectory].filename, pchLocalFileName, DIR_LENGTH)) + { + bFound = TRUE; + break; + } } - } - if (!bFound) - { - ERR("cache directory not found in path %s\n", debugstr_w(lpszLocalFileName)); - error = ERROR_INVALID_PARAMETER; - goto cleanup; - } + if (!bFound) + { + ERR("cache directory not found in path %s\n", debugstr_w(lpszLocalFileName)); + error = ERROR_INVALID_PARAMETER; + goto cleanup; + } - lpszLocalFileName += DIR_LENGTH + 1; - pchLocalFileName += DIR_LENGTH + 1; + lpszLocalFileName += DIR_LENGTH + 1; + pchLocalFileName += DIR_LENGTH + 1; + } } dwBytesNeeded = DWORD_ALIGN(dwBytesNeeded + strlen(lpszUrlNameA) + 1);

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 5f55a71b705c760441c19f47041d0ad00ed0fe35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f55a71b705c760441c19f470… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 16:30:19 2012 +0200 Assorted spelling fixes. --- dlls/gdi32/freetype.c | 2 +- dlls/iphlpapi/ipstats.c | 8 ++++---- dlls/kernel32/tests/sync.c | 2 +- dlls/shell32/shlexec.c | 2 +- dlls/shlwapi/tests/url.c | 6 +++--- dlls/wininet/urlcache.c | 2 +- programs/cmd/tests/test_builtins.cmd | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3a90036..b02fb69 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6563,7 +6563,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) style_nameW = get_face_name( ft_face, TT_NAME_ID_FONT_SUBFAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES ); if (!style_nameW) { - FIXME("failed to read sytle_nameW for font %s!\n", wine_dbgstr_w(font->name)); + FIXME("failed to read style_nameW for font %s!\n", wine_dbgstr_w(font->name)); lensty = MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, NULL, 0) * sizeof(WCHAR); style_nameW = HeapAlloc(GetProcessHeap(), 0, lensty); MultiByteToWideChar(CP_ACP, 0, ft_face->style_name, -1, style_nameW, lensty/sizeof(WCHAR)); diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index a56e753..a78424b 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -558,7 +558,7 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) * * PARAMS * stats [Out] buffer for ICMP statistics - * family [In] specifies wether IPv4 or IPv6 statistics are returned + * family [In] specifies whether IPv4 or IPv6 statistics are returned * * RETURNS * Success: NO_ERROR @@ -731,7 +731,7 @@ DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX stats, DWORD family) * * PARAMS * stats [Out] buffer for IP statistics - * family [In] specifies wether IPv4 or IPv6 statistics are returned + * family [In] specifies whether IPv4 or IPv6 statistics are returned * * RETURNS * Success: NO_ERROR @@ -981,7 +981,7 @@ DWORD WINAPI GetIpStatistics(PMIB_IPSTATS stats) * * PARAMS * stats [Out] buffer for TCP statistics - * family [In] specifies wether IPv4 or IPv6 statistics are returned + * family [In] specifies whether IPv4 or IPv6 statistics are returned * * RETURNS * Success: NO_ERROR @@ -1143,7 +1143,7 @@ DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS stats) * * PARAMS * stats [Out] buffer for UDP statistics - * family [In] specifies wether IPv4 or IPv6 statistics are returned + * family [In] specifies whether IPv4 or IPv6 statistics are returned * * RETURNS * Success: NO_ERROR diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 02c023a..7fdb633 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1338,7 +1338,7 @@ static void test_condvars(void) ok(totalconsumed == totalproduced, "consumed %d != produced %d\n", totalconsumed, totalproduced); - ok (!condvar_sleeperr, "error occured during SleepConditionVariableCS\n"); + ok (!condvar_sleeperr, "error occurred during SleepConditionVariableCS\n"); /* Checking cnt1 - cnt2 for non-0 would be not good, the case where * one consumer does not get anything to do is possible. */ diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index a1599e4..de6c0f9 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -1911,7 +1911,7 @@ static BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc ) /* Check if file specified is in the form www.??????.*** */ else if (!strncmpiW(lpFile, wWww, 3)) { - /* if so, append lpFile http:// and call ShellExecute */ + /* if so, prefix lpFile with http:// and call ShellExecute */ WCHAR lpstrTmpFile[256]; strcpyW(lpstrTmpFile, wHttp); strcatW(lpstrTmpFile, lpFile); diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 02dcb1c..ee3adf6 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1288,7 +1288,7 @@ static void test_UrlUnescape(void) ok(strcmp(szReturnUrl,TEST_URL_UNESCAPE[i].expect)==0, "Expected \"%s\", but got \"%s\" from \"%s\"\n", TEST_URL_UNESCAPE[i].expect, szReturnUrl, TEST_URL_UNESCAPE[i].url); ZeroMemory(szReturnUrl, sizeof(szReturnUrl)); - /* if we set the bufferpointer to NULL here UrlUnescape fails and string gets not converted */ + /* if we set the buffer pointer to NULL here, UrlUnescape fails and the string is not converted */ res = pUrlUnescapeA(TEST_URL_UNESCAPE[i].url, szReturnUrl, NULL, 0); ok(res == E_INVALIDARG, "UrlUnescapeA returned 0x%x (expected E_INVALIDARG) for \"%s\"\n", @@ -1319,7 +1319,7 @@ static void test_UrlUnescape(void) ok(!strcmp(inplace, expected), "got %s expected %s\n", inplace, expected); ok(dwEscaped == 27, "got %d expected 27\n", dwEscaped); - /* if we set the bufferpointer to NULL, the string apparently still gets converted (Google Lively does this)) */ + /* if we set the buffer pointer to NULL, the string apparently still gets converted (Google Lively does this) */ res = pUrlUnescapeA(another_inplace, NULL, NULL, URL_UNESCAPE_INPLACE); ok(res == S_OK, "UrlUnescapeA returned 0x%x (expected S_OK)\n", res); ok(!strcmp(another_inplace, expected), "got %s expected %s\n", another_inplace, expected); @@ -1330,7 +1330,7 @@ static void test_UrlUnescape(void) ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res); ok(dwEscaped == 50, "got %d expected 50\n", dwEscaped); - /* if we set the bufferpointer to NULL, the string apparently still gets converted (Google Lively does this)) */ + /* if we set the buffer pointer to NULL, the string apparently still gets converted (Google Lively does this) */ res = pUrlUnescapeW(another_inplaceW, NULL, NULL, URL_UNESCAPE_INPLACE); ok(res == S_OK, "UrlUnescapeW returned 0x%x (expected S_OK)\n", res); diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index fa0c96f..45f447f 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2384,7 +2384,7 @@ static DWORD urlcache_rate_entry(URL_CACHEFILE_ENTRY *url_entry, FILETIME *cur_t time.u.LowPart = cur_time->dwLowDateTime; time.u.HighPart = cur_time->dwHighDateTime; - /* Don't touch entries that were added less then 10 minutes ago */ + /* Don't touch entries that were added less than 10 minutes ago */ if(time.QuadPart < access_time.QuadPart + (ULONGLONG)10*60*FILETIME_SECOND) return -1; diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 77086ed..42507ce 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -644,7 +644,7 @@ echo --- basic wildcards for %%i in (ba*) do echo %%i echo --- for /d for /d %%i in (baz foo bar) do echo %%i 2>&1 -rem Confirm we dont match files: +rem Confirm we don't match files: for /d %%i in (bazb*) do echo %%i 2>&1 for /d %%i in (bazb2*) do echo %%i 2>&1 rem Show we pass through non wildcards

1 0

Francois Gouget : include: Add more string types.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: e2f30dc115deecf36b8b9bdd186e4b75afaea03e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f30dc115deecf36b8b9bdd1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 16:33:08 2012 +0200 include: Add more string types. --- include/winnt.h | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 38 insertions(+), 8 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 5106701..9cb57cf 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -446,6 +446,11 @@ typedef wchar_t WCHAR, *PWCHAR; typedef unsigned short WCHAR, *PWCHAR; #endif +typedef ULONG UCSCHAR; +#define MIN_UCSCHAR (0) +#define MAX_UCSCHAR (0x0010ffff) +#define UCSCHAR_INVALID_CHARACTER (0xffffffff) + /* 'Extended/Wide' numerical types */ #ifndef _ULONGLONG_ # define _ULONGLONG_ @@ -468,20 +473,25 @@ typedef ULONGLONG DECLSPEC_ALIGN(8) DWORDLONG, *PDWORDLONG; #endif /* ANSI string types */ -typedef CHAR *PCH, *LPCH; -typedef const CHAR *PCCH, *LPCCH; +typedef CHAR *PCH, *LPCH, *PNZCH; +typedef const CHAR *PCCH, *LPCCH, *PCNZCH; typedef CHAR *PSTR, *LPSTR, *NPSTR; typedef const CHAR *PCSTR, *LPCSTR; typedef CHAR *PZZSTR; typedef const CHAR *PCZZSTR; /* Unicode string types */ +typedef const WCHAR *PCWCHAR, *LPCUWCHAR, *PCUWCHAR; typedef WCHAR *PWCH, *LPWCH; typedef const WCHAR *PCWCH, *LPCWCH; +typedef WCHAR *PNZWCH, *PUNZWCH; +typedef const WCHAR *PCNZWCH, *PCUNZWCH; typedef WCHAR *PWSTR, *LPWSTR, *NWPSTR; typedef const WCHAR *PCWSTR, *LPCWSTR; -typedef WCHAR *PZZWSTR; -typedef const WCHAR *PCZZWSTR; +typedef WCHAR *PZZWSTR, *PUZZWSTR; +typedef const WCHAR *PCZZWSTR, *PCUZZWSTR; +typedef PWSTR *PZPWSTR; +typedef PCWSTR *PZPCWSTR; /* Neutral character and string types */ /* These are only defined for Winelib, i.e. _not_ defined for @@ -494,22 +504,42 @@ typedef const WCHAR *PCZZWSTR; typedef WCHAR TCHAR, *PTCHAR; # define _TCHAR_DEFINED #endif +typedef LPWCH PTCH, LPTCH; +typedef LPCWCH PCTCH, LPCTCH; typedef LPWSTR PTSTR, LPTSTR; typedef LPCWSTR PCTSTR, LPCTSTR; -typedef PZZSTR PZZTSTR; -typedef PCZZSTR PCZZTSTR; +typedef LPWSTR PUTSTR, LPUTSTR; +typedef LPCWSTR PCUTSTR, LPCUTSTR; +typedef PNZWCH PNZTCH; +typedef PUNZWCH PUNZTCH; +typedef PCNZWCH PCNZTCH; +typedef PCUNZWCH PCUNZTCH; +typedef PZZWSTR PZZTSTR; +typedef PCZZWSTR PCZZTSTR; +typedef PUZZWSTR PUZZTSTR; +typedef PUCZZWSTR PCUZZTSTR; # else /* UNICODE */ # ifndef _TCHAR_DEFINED typedef CHAR TCHAR, *PTCHAR; # define _TCHAR_DEFINED # endif +typedef LPCH PTCH, LPTCH; +typedef LPCCH PCTCH, LPCTCH; typedef LPSTR PTSTR, LPTSTR; typedef LPCSTR PCTSTR, LPCTSTR; -typedef PZZWSTR PZZTSTR; -typedef PCZZWSTR PCZZTSTR; +typedef PNZCH PNZTCH, PUNZTCH; +typedef PCNZCH PCNZTCH, PCUNZTCH; +typedef PZZSTR PZZTSTR, PUZZTSTR; +typedef PCZZSTR PCZZTSTR, PCUZZTSTR; # endif /* UNICODE */ #endif /* WINE_NO_UNICODE_MACROS */ +/* UCS string types */ +typedef UCSCHAR *PUCSCHAR, *PUUCSCHAR; +typedef const UCSCHAR *PCUCSCHAR, *PCUUCSCHAR; +typedef UCSCHAR *PUCSSTR, *PUUCSSTR; +typedef const UCSCHAR *PCUCSSTR, *PCUUCSSTR; + /* Misc common WIN32 types */ typedef char CCHAR; typedef DWORD LCID, *PLCID;

1 0

Francois Gouget : shell32: Add some more function prototypes and fix the IsNetDrive() one.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 79ea850eab4b47bee5c60b7bd44cb16b9e91c218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ea850eab4b47bee5c60b7bd… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 24 16:33:41 2012 +0200 shell32: Add some more function prototypes and fix the IsNetDrive() one. --- dlls/shell32/shlfileop.c | 4 ++-- include/shlobj.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 5fa79a9..d07c588 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -1708,7 +1708,7 @@ DWORD WINAPI SheChangeDirW(LPWSTR path) /************************************************************************* * IsNetDrive [SHELL32.66] */ -BOOL WINAPI IsNetDrive(DWORD drive) +int WINAPI IsNetDrive(int drive) { char root[4]; strcpy(root, "A:\\"); @@ -1720,7 +1720,7 @@ BOOL WINAPI IsNetDrive(DWORD drive) /************************************************************************* * RealDriveType [SHELL32.524] */ -INT WINAPI RealDriveType(INT drive, BOOL bQueryNet) +int WINAPI RealDriveType(int drive, BOOL bQueryNet) { char root[] = "A:\\"; root[0] += (char)drive; diff --git a/include/shlobj.h b/include/shlobj.h index 103a1cf..4502187 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -83,6 +83,8 @@ VOID WINAPI SHUpdateImageW(LPCWSTR,INT,UINT,INT); int WINAPI RestartDialog(HWND,LPCWSTR,DWORD); int WINAPI RestartDialogEx(HWND,LPCWSTR,DWORD,DWORD); int WINAPI DriveType(int); +int WINAPI RealDriveType(int, BOOL); +int WINAPI IsNetDrive(int); BOOL WINAPI IsUserAnAdmin(void); UINT WINAPI Shell_MergeMenus(HMENU,HMENU,UINT,UINT,UINT,ULONG); BOOL WINAPI Shell_GetImageLists(HIMAGELIST*,HIMAGELIST*); @@ -1636,10 +1638,13 @@ BOOL WINAPI WriteCabinetState(CABINETSTATE *); #define PRF_TRYPROGRAMEXTENSIONS 0x03 #define PRF_FIRSTDIRDEF 0x04 #define PRF_DONTFINDLINK 0x08 +#define PRF_REQUIREABSOLUTE 0x10 VOID WINAPI PathGetShortPath(LPWSTR pszPath); LONG WINAPI PathProcessCommand(LPCWSTR, LPWSTR, int, DWORD); +int WINAPI PathResolve(LPWSTR, PZPCWSTR, UINT); BOOL WINAPI PathYetAnotherMakeUniqueName(LPWSTR, LPCWSTR, LPCWSTR, LPCWSTR); +BOOL WINAPI Win32DeleteFile(LPCWSTR); /**************************************************************************** * Drag And Drop Routines

1 0

Jacek Caban : jscript: Added support for limit argument in String.split.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 77c3dc544b1b946caf4949375c0e508f5334a2b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c3dc544b1b946caf4949375… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 24 15:41:34 2012 +0200 jscript: Added support for limit argument in String.split. --- dlls/jscript/string.c | 19 +++++++++++++++---- dlls/jscript/tests/api.js | 17 +++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 5d50b85..e7216df 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -25,6 +25,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); +#define UINT32_MAX 0xffffffff + typedef struct { jsdisp_t dispex; @@ -1082,6 +1084,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi match_result_t *match_result = NULL; DWORD length, match_cnt, i, match_len = 0; const WCHAR *str, *ptr, *ptr2; + unsigned limit = UINT32_MAX; BOOL use_regexp = FALSE; jsdisp_t *array; BSTR val_str, match_str = NULL, tmp_str; @@ -1089,8 +1092,8 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi TRACE("\n"); - if(argc != 1) { - FIXME("unsupported args\n"); + if(argc != 1 && argc != 2) { + FIXME("unsupported argc %u\n", argc); return E_NOTIMPL; } @@ -1098,6 +1101,14 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi if(FAILED(hres)) return hres; + if(argc > 1 && !is_undefined(argv[1])) { + hres = to_uint32(ctx, argv[1], &limit); + if(FAILED(hres)) { + SysFreeString(val_str); + return hres; + } + } + if(is_object_instance(argv[0])) { jsdisp_t *regexp; @@ -1133,7 +1144,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi if(SUCCEEDED(hres)) { ptr = str; - for(i=0;; i++) { + for(i=0; i<limit; i++) { if(use_regexp) { if(i == match_cnt) break; @@ -1168,7 +1179,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi } } - if(SUCCEEDED(hres) && (match_str || use_regexp)) { + if(SUCCEEDED(hres) && (match_str || use_regexp) && i<limit) { DWORD len = (str+length) - ptr; if(len || match_str) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c998fa6..03d1a71 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -512,6 +512,23 @@ ok(r[0] === "1", "r[0] = " + r[0]); ok(r[1] === "2", "r[1] = " + r[1]); ok(r[2] === "", "r[2] = " + r[2]); +r = "1,2,3".split(",", 2); +ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); +ok(r.length === 2, "r.length = " + r.length); +ok(r[0] === "1", "r[0] = " + r[0]); +ok(r[1] === "2", "r[1] = " + r[1]); + +r = "1,2,3".split(",", 0); +ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); +ok(r.length === 0, "r.length = " + r.length); + +r = "1,2,3".split(",", -1); +ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); +ok(r.length === 3, "r.length = " + r.length); +ok(r[0] === "1", "r[0] = " + r[0]); +ok(r[1] === "2", "r[1] = " + r[1]); +ok(r[2] === "3", "r[1] = " + r[1]); + tmp = "abcd".indexOf("bc",0); ok(tmp === 1, "indexOf = " + tmp); tmp = "abcd".indexOf("bc",1);

1 0

Jacek Caban : jscript: Properly invoke regexp matching in String.split.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: fa0dfd0bb648c590a7cb24958ef837245b6955d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa0dfd0bb648c590a7cb24958… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 24 15:41:53 2012 +0200 jscript: Properly invoke regexp matching in String.split. --- dlls/jscript/string.c | 42 ++++++++++++++++++------------------------ dlls/jscript/tests/regexp.js | 22 ++++++++++++++++++++++ 2 files changed, 40 insertions(+), 24 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index e7216df..6387896 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1081,12 +1081,11 @@ static HRESULT String_small(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - match_result_t *match_result = NULL; - DWORD length, match_cnt, i, match_len = 0; - const WCHAR *str, *ptr, *ptr2; + match_result_t match_result; + DWORD length, i, match_len = 0; + const WCHAR *str, *ptr, *ptr2, *cp; unsigned limit = UINT32_MAX; - BOOL use_regexp = FALSE; - jsdisp_t *array; + jsdisp_t *array, *regexp = NULL; BSTR val_str, match_str = NULL, tmp_str; HRESULT hres; @@ -1110,23 +1109,16 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi } if(is_object_instance(argv[0])) { - jsdisp_t *regexp; - regexp = iface_to_jsdisp((IUnknown*)get_object(argv[0])); if(regexp) { - if(is_class(regexp, JSCLASS_REGEXP)) { - use_regexp = TRUE; - hres = regexp_match(ctx, regexp, str, length, TRUE, &match_result, &match_cnt); - } - jsdisp_release(regexp); - if(FAILED(hres)) { - SysFreeString(val_str); - return hres; + if(!is_class(regexp, JSCLASS_REGEXP)) { + jsdisp_release(regexp); + regexp = NULL; } } } - if(!use_regexp) { + if(!regexp) { hres = to_string(ctx, argv[0], &match_str); if(FAILED(hres)) { SysFreeString(val_str); @@ -1143,12 +1135,13 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi hres = create_array(ctx, 0, &array); if(SUCCEEDED(hres)) { - ptr = str; + ptr = cp = str; for(i=0; i<limit; i++) { - if(use_regexp) { - if(i == match_cnt) + if(regexp) { + hres = regexp_match_next(ctx, regexp, 0, str, length, &cp, NULL, NULL, NULL, &match_result); + if(hres != S_OK) break; - ptr2 = match_result[i].str; + ptr2 = match_result.str; }else if(match_str) { ptr2 = strstrW(ptr, match_str); if(!ptr2) @@ -1170,8 +1163,8 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi if(FAILED(hres)) break; - if(use_regexp) - ptr = match_result[i].str + match_result[i].len; + if(regexp) + ptr = cp; else if(match_str) ptr = ptr2 + match_len; else @@ -1179,7 +1172,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi } } - if(SUCCEEDED(hres) && (match_str || use_regexp) && i<limit) { + if(SUCCEEDED(hres) && (match_str || regexp) && i<limit) { DWORD len = (str+length) - ptr; if(len || match_str) { @@ -1194,9 +1187,10 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi } } + if(regexp) + jsdisp_release(regexp); SysFreeString(match_str); SysFreeString(val_str); - heap_free(match_result); if(SUCCEEDED(hres) && r) *r = jsval_obj(array); diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 38d5377..6274f93 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -378,6 +378,19 @@ ok(r[2] === "3", "r[2] = " + r[2]); ok(RegExp.leftContext === "1,,2", "RegExp.leftContext = " + RegExp.leftContext); ok(RegExp.rightContext === "3", "RegExp.rightContext = " + RegExp.rightContext); +r = "1,,2,3".split(/,+/g, 2); +ok(r.length === 2, "r.length = " + r.length); +ok(r[0] === "1", "r[0] = " + r[0]); +ok(r[1] === "2", "r[1] = " + r[1]); +ok(RegExp.leftContext === "1,,2", "RegExp.leftContext = " + RegExp.leftContext); +ok(RegExp.rightContext === "3", "RegExp.rightContext = " + RegExp.rightContext); + +r = "1,,2,3".split(/,+/g, 1); +ok(r.length === 1, "r.length = " + r.length); +ok(r[0] === "1", "r[0] = " + r[0]); +ok(RegExp.leftContext === "1", "RegExp.leftContext = " + RegExp.leftContext); +ok(RegExp.rightContext === "2,3", "RegExp.rightContext = " + RegExp.rightContext); + r = "1,,2,3".split(/,+/); ok(r.length === 3, "r.length = " + r.length); ok(r[0] === "1", "r[0] = " + r[0]); @@ -411,6 +424,15 @@ r = "123".split(re = /\s+/).join(";"); ok(r === "123", "r = " + r); ok(re.lastIndex === 0, "re.lastIndex = " + re.lastIndex); +r = "1ab2aab3".split(/(a+)b/); +ok(r.length === 3, "r.length = " + r.length); +ok(r[0] === "1", "r[0] = " + r[0]); +ok(r[1] === "2", "r[1] = " + r[1]); +ok(r[2] === "3", "r[2] = " + r[2]); + +r = "A<B>bold</B>and<CODE>coded</CODE>".split(/<(\/)?([^<>]+)>/) ; +ok(r.length === 4, "r.length = " + r.length); + /* another standard violation */ r = "1 12 \t3".split(re = /(\s)+/g).join(";"); ok(r === "1;12;3", "r = " + r);

1 0

Józef Kucia : d3dx9: Introduce a function for calculating the expected size of a DDS file.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 00ea54f64f0bc90d38fc49ea803c8d8459db2bc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ea54f64f0bc90d38fc49ea8… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Sep 24 13:46:36 2012 +0200 d3dx9: Introduce a function for calculating the expected size of a DDS file. --- dlls/d3dx9_36/surface.c | 61 ++++++++++++++++++++++++---------------------- 1 files changed, 32 insertions(+), 29 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index f0b1c72..4b9b056 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -275,10 +275,10 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi return D3DFMT_UNKNOWN; } -static HRESULT calculate_dds_surface_size(const D3DXIMAGE_INFO *img_info, - UINT width, UINT height, UINT *pitch, UINT *size) +static HRESULT calculate_dds_surface_size(D3DFORMAT format, UINT width, UINT height, + UINT *pitch, UINT *size) { - const struct pixel_format_desc *format_desc = get_format_info(img_info->Format); + const struct pixel_format_desc *format_desc = get_format_info(format); if (format_desc->format == D3DFMT_UNKNOWN) return E_NOTIMPL; @@ -298,6 +298,27 @@ static HRESULT calculate_dds_surface_size(const D3DXIMAGE_INFO *img_info, return D3D_OK; } +static UINT calculate_dds_file_size(D3DFORMAT format, UINT width, UINT height, UINT depth, + UINT miplevels, UINT faces) +{ + UINT i, file_size = 0; + + for (i = 0; i < miplevels; i++) + { + UINT pitch, size = 0; + calculate_dds_surface_size(format, width, height, &pitch, &size); + size *= depth; + file_size += size; + width = max(1, width / 2); + height = max(1, height / 2); + depth = max(1, depth / 2); + } + + file_size *= faces; + file_size += sizeof(struct dds_header); + return file_size; +} + /************************************************************ * get_image_info_from_dds * @@ -316,11 +337,9 @@ static HRESULT calculate_dds_surface_size(const D3DXIMAGE_INFO *img_info, */ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAGE_INFO *info) { - UINT i; UINT faces = 1; - UINT width, height, depth; + UINT expected_length; const struct dds_header *header = buffer; - UINT expected_length = 0; if (length < sizeof(*header) || !info) return D3DXERR_INVALIDDATA; @@ -360,23 +379,8 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG info->ResourceType = D3DRTYPE_TEXTURE; } - /* calculate the expected length */ - width = info->Width; - height = info->Height; - depth = info->Depth; - for (i = 0; i < info->MipLevels; i++) - { - UINT pitch, size = 0; - calculate_dds_surface_size(info, width, height, &pitch, &size); - size *= depth; - expected_length += size; - width = max(1, width / 2); - height = max(1, height / 2); - depth = max(1, depth / 2); - } - - expected_length *= faces; - expected_length += sizeof(*header); + expected_length = calculate_dds_file_size(info->Format, info->Width, info->Height, info->Depth, + info->MipLevels, faces); if (length < expected_length) { WARN("File is too short %u, expected at least %u bytes\n", length, expected_length); @@ -384,7 +388,6 @@ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAG } info->ImageFileFormat = D3DXIFF_DDS; - return D3D_OK; } @@ -400,7 +403,7 @@ static HRESULT load_surface_from_dds(IDirect3DSurface9 *dst_surface, const PALET if (src_info->ResourceType != D3DRTYPE_TEXTURE) return D3DXERR_INVALIDDATA; - if (FAILED(calculate_dds_surface_size(src_info, src_info->Width, src_info->Height, &src_pitch, &size))) + if (FAILED(calculate_dds_surface_size(src_info->Format, src_info->Width, src_info->Height, &src_pitch, &size))) return E_NOTIMPL; return D3DXLoadSurfaceFromMemory(dst_surface, dst_palette, dst_rect, pixels, src_info->Format, @@ -418,7 +421,7 @@ HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *d if (src_info->ResourceType != D3DRTYPE_VOLUMETEXTURE) return D3DXERR_INVALIDDATA; - if (FAILED(calculate_dds_surface_size(src_info, src_info->Width, src_info->Height, &row_pitch, &slice_pitch))) + if (FAILED(calculate_dds_surface_size(src_info->Format, src_info->Width, src_info->Height, &row_pitch, &slice_pitch))) return E_NOTIMPL; return D3DXLoadVolumeFromMemory(dst_volume, dst_palette, dst_box, pixels, src_info->Format, @@ -448,7 +451,7 @@ HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, mip_levels = min(src_info->MipLevels, IDirect3DTexture9_GetLevelCount(texture)); for (mip_level = 0; mip_level < mip_levels; mip_level++) { - hr = calculate_dds_surface_size(src_info, width, height, &src_pitch, &mip_level_size); + hr = calculate_dds_surface_size(src_info->Format, width, height, &src_pitch, &mip_level_size); if (FAILED(hr)) return hr; SetRect(&src_rect, 0, 0, width, height); @@ -497,7 +500,7 @@ HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const vo size = src_info->Width; for (mip_level = 0; mip_level < src_info->MipLevels; mip_level++) { - hr = calculate_dds_surface_size(src_info, size, size, &src_pitch, &mip_level_size); + hr = calculate_dds_surface_size(src_info->Format, size, size, &src_pitch, &mip_level_size); if (FAILED(hr)) return hr; /* if texture has fewer mip levels than DDS file, skip excessive mip levels */ @@ -544,7 +547,7 @@ HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, co for (mip_level = 0; mip_level < mip_levels; mip_level++) { - hr = calculate_dds_surface_size(src_info, width, height, &src_row_pitch, &src_slice_pitch); + hr = calculate_dds_surface_size(src_info->Format, width, height, &src_row_pitch, &src_slice_pitch); if (FAILED(hr)) return hr; hr = IDirect3DVolumeTexture9_GetVolumeLevel(volume_texture, mip_level, &volume);

1 0

Józef Kucia : d3dx9: Use 4 spaces per indent level in get_image_info_from_dds().
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 8f00a63161f17ea6205b491205c6dcc26d4d3e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f00a63161f17ea6205b49120… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Sep 24 13:46:37 2012 +0200 d3dx9: Use 4 spaces per indent level in get_image_info_from_dds(). --- dlls/d3dx9_36/surface.c | 102 +++++++++++++++++++++++----------------------- 1 files changed, 51 insertions(+), 51 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 4b9b056..3bf8cb1 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -337,58 +337,58 @@ static UINT calculate_dds_file_size(D3DFORMAT format, UINT width, UINT height, U */ static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAGE_INFO *info) { - UINT faces = 1; - UINT expected_length; - const struct dds_header *header = buffer; - - if (length < sizeof(*header) || !info) - return D3DXERR_INVALIDDATA; - - if (header->pixel_format.size != sizeof(header->pixel_format)) - return D3DXERR_INVALIDDATA; - - info->Width = header->width; - info->Height = header->height; - info->Depth = 1; - info->MipLevels = (header->flags & DDS_MIPMAPCOUNT) ? header->miplevels : 1; - - info->Format = dds_pixel_format_to_d3dformat(&header->pixel_format); - if (info->Format == D3DFMT_UNKNOWN) - return D3DXERR_INVALIDDATA; - - TRACE("Pixel format is %#x\n", info->Format); - - if (header->caps2 & DDS_CAPS2_VOLUME) - { - info->Depth = header->depth; - info->ResourceType = D3DRTYPE_VOLUMETEXTURE; - } - else if (header->caps2 & DDS_CAPS2_CUBEMAP) - { - DWORD face; - faces = 0; - for (face = DDS_CAPS2_CUBEMAP_POSITIVEX; face <= DDS_CAPS2_CUBEMAP_NEGATIVEZ; face <<= 1) - { - if (header->caps2 & face) - faces++; - } - info->ResourceType = D3DRTYPE_CUBETEXTURE; - } - else - { - info->ResourceType = D3DRTYPE_TEXTURE; - } - - expected_length = calculate_dds_file_size(info->Format, info->Width, info->Height, info->Depth, + UINT faces = 1; + UINT expected_length; + const struct dds_header *header = buffer; + + if (length < sizeof(*header) || !info) + return D3DXERR_INVALIDDATA; + + if (header->pixel_format.size != sizeof(header->pixel_format)) + return D3DXERR_INVALIDDATA; + + info->Width = header->width; + info->Height = header->height; + info->Depth = 1; + info->MipLevels = (header->flags & DDS_MIPMAPCOUNT) ? header->miplevels : 1; + + info->Format = dds_pixel_format_to_d3dformat(&header->pixel_format); + if (info->Format == D3DFMT_UNKNOWN) + return D3DXERR_INVALIDDATA; + + TRACE("Pixel format is %#x\n", info->Format); + + if (header->caps2 & DDS_CAPS2_VOLUME) + { + info->Depth = header->depth; + info->ResourceType = D3DRTYPE_VOLUMETEXTURE; + } + else if (header->caps2 & DDS_CAPS2_CUBEMAP) + { + DWORD face; + faces = 0; + for (face = DDS_CAPS2_CUBEMAP_POSITIVEX; face <= DDS_CAPS2_CUBEMAP_NEGATIVEZ; face <<= 1) + { + if (header->caps2 & face) + faces++; + } + info->ResourceType = D3DRTYPE_CUBETEXTURE; + } + else + { + info->ResourceType = D3DRTYPE_TEXTURE; + } + + expected_length = calculate_dds_file_size(info->Format, info->Width, info->Height, info->Depth, info->MipLevels, faces); - if (length < expected_length) - { - WARN("File is too short %u, expected at least %u bytes\n", length, expected_length); - return D3DXERR_INVALIDDATA; - } - - info->ImageFileFormat = D3DXIFF_DDS; - return D3D_OK; + if (length < expected_length) + { + WARN("File is too short %u, expected at least %u bytes\n", length, expected_length); + return D3DXERR_INVALIDDATA; + } + + info->ImageFileFormat = D3DXIFF_DDS; + return D3D_OK; } static HRESULT load_surface_from_dds(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette,

1 0

Józef Kucia : d3dx9: Implement the support for saving a surface to a DDS file.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: bf4201ea58efb099f0d9f4fe8669d68d74f2a633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4201ea58efb099f0d9f4fe8… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Sep 24 13:46:38 2012 +0200 d3dx9: Implement the support for saving a surface to a DDS file. --- dlls/d3dx9_36/surface.c | 93 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/surface.c | 3 +- 2 files changed, 95 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 3bf8cb1..770a2e5 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -275,6 +275,27 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi return D3DFMT_UNKNOWN; } +static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_format, D3DFORMAT d3dformat) +{ + memset(pixel_format, 0, sizeof(*pixel_format)); + + pixel_format->size = sizeof(*pixel_format); + + if (d3dformat == D3DFMT_R8G8B8) + { + pixel_format->flags = DDS_PF_RGB; + pixel_format->bpp = 24; + pixel_format->rmask = 0xff0000; + pixel_format->gmask = 0x00ff00; + pixel_format->bmask = 0x0000ff; + pixel_format->amask = 0x000000; + return D3D_OK; + } + + WARN("Unknown pixel format %#x\n", d3dformat); + return E_NOTIMPL; +} + static HRESULT calculate_dds_surface_size(D3DFORMAT format, UINT width, UINT height, UINT *pitch, UINT *size) { @@ -410,6 +431,77 @@ static HRESULT load_surface_from_dds(IDirect3DSurface9 *dst_surface, const PALET src_pitch, NULL, src_rect, filter, color_key); } +static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSurface9 *src_surface, const RECT *src_rect) +{ + HRESULT hr; + UINT dst_pitch, surface_size, file_size; + D3DSURFACE_DESC src_desc; + D3DLOCKED_RECT locked_rect; + ID3DXBuffer *buffer; + struct dds_header *header; + BYTE *pixels; + struct volume volume; + const struct pixel_format_desc *pixel_format; + + if (src_rect) + { + FIXME("Saving a part of a surface to a DDS file is not implemented yet\n"); + return E_NOTIMPL; + } + + hr = IDirect3DSurface9_GetDesc(src_surface, &src_desc); + if (FAILED(hr)) return hr; + + pixel_format = get_format_info(src_desc.Format); + if (pixel_format->type == FORMAT_UNKNOWN) return E_NOTIMPL; + + file_size = calculate_dds_file_size(src_desc.Format, src_desc.Width, src_desc.Height, 1, 1, 1); + + hr = calculate_dds_surface_size(src_desc.Format, src_desc.Width, src_desc.Height, &dst_pitch, &surface_size); + if (FAILED(hr)) return hr; + + hr = D3DXCreateBuffer(file_size, &buffer); + if (FAILED(hr)) return hr; + + header = ID3DXBuffer_GetBufferPointer(buffer); + pixels = (BYTE *)(header + 1); + + memset(header, 0, sizeof(header)); + header->signature = MAKEFOURCC('D','D','S',' '); + header->size = sizeof(*header); + header->flags = DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PITCH | DDS_PIXELFORMAT | DDS_MIPMAPCOUNT; + header->height = src_desc.Height; + header->width = src_desc.Width; + header->pitch_or_linear_size = dst_pitch; + header->depth = 1; + header->miplevels = 1; + header->caps = DDS_CAPS_TEXTURE; + hr = d3dformat_to_dds_pixel_format(&header->pixel_format, src_desc.Format); + if (FAILED(hr)) + { + ID3DXBuffer_Release(buffer); + return hr; + } + + hr = IDirect3DSurface9_LockRect(src_surface, &locked_rect, NULL, D3DLOCK_READONLY); + if (FAILED(hr)) + { + ID3DXBuffer_Release(buffer); + return hr; + } + + volume.width = src_desc.Width; + volume.height = src_desc.Height; + volume.depth = 1; + copy_simple_data(locked_rect.pBits, locked_rect.Pitch, 0, &volume, pixel_format, + pixels, dst_pitch, 0, &volume, pixel_format, 0); + + IDirect3DSurface9_UnlockRect(src_surface); + + *dst_buffer = buffer; + return D3D_OK; +} + HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette, const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) @@ -1761,6 +1853,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE encoder_clsid = &CLSID_WICJpegEncoder; break; case D3DXIFF_DDS: + return save_dds_surface_to_memory(dst_buffer, src_surface, src_rect); case D3DXIFF_DIB: case D3DXIFF_HDR: case D3DXIFF_PFM: diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 5a01200..50ed2b2 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1156,9 +1156,10 @@ next_tests: ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); hr = D3DXSaveSurfaceToFileA("saved_surface.tga", D3DXIFF_TGA, surface, NULL, NULL); ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + } + hr = D3DXSaveSurfaceToFileA("saved_surface.dds", D3DXIFF_DDS, surface, NULL, NULL); ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); - } hr = D3DXSaveSurfaceToFileA("saved_surface", D3DXIFF_PFM + 1, surface, NULL, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);

1 0

Józef Kucia : d3dx9/tests: Add a more detailed test for saving a surface to a DDS file.
by Alexandre Julliard 24 Sep '12

24 Sep '12

Module: wine Branch: master Commit: 94ab09a226883c96e5658c9f0b95710af356f890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94ab09a226883c96e5658c9f0… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Mon Sep 24 13:46:39 2012 +0200 d3dx9/tests: Add a more detailed test for saving a surface to a DDS file. --- dlls/d3dx9_36/tests/surface.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 50ed2b2..84a70cf 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -1160,6 +1160,24 @@ next_tests: hr = D3DXSaveSurfaceToFileA("saved_surface.dds", D3DXIFF_DDS, surface, NULL, NULL); ok(hr == D3D_OK, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3D_OK); + if (SUCCEEDED(hr)) { + hr = D3DXLoadSurfaceFromFileA(surface, NULL, NULL, "saved_surface.dds", NULL, D3DX_FILTER_NONE, 0, &image_info); + ok(hr == D3D_OK, "Couldn't load saved surface %#x\n", hr); + + if (SUCCEEDED(hr)) { + ok(image_info.Width == 2, "Wrong width %u\n", image_info.Width); + ok(image_info.Format == D3DFMT_R8G8B8, "Wrong format %#x\n", image_info.Format); + ok(image_info.ImageFileFormat == D3DXIFF_DDS, "Wrong file format %u\n", image_info.ImageFileFormat); + + hr = IDirect3DSurface9_LockRect(surface, &lock_rect, NULL, D3DLOCK_READONLY); + ok(hr == D3D_OK, "Couldn't lock surface %#x\n", hr); + if (SUCCEEDED(hr)) { + ok(!memcmp(lock_rect.pBits, pixels, pitch), "Pixel data mismatch in first row\n"); + ok(!memcmp((BYTE *)lock_rect.pBits + lock_rect.Pitch, pixels + pitch, pitch), "Pixel data mismatch in second row\n"); + IDirect3DSurface9_UnlockRect(surface); + } + } + } else skip("Couldn't save surface\n"); hr = D3DXSaveSurfaceToFileA("saved_surface", D3DXIFF_PFM + 1, surface, NULL, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXSaveSurfaceToFileA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);

1 0