wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Dmitry Timoshkov : wine.inf: Add kernel32.48/kernel32.49 (ReleaseThunkLock/ RestoreThunkLock) to the RelayExclude list.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 10ccf1d4a6f2df3f23a5b1a23f3acf29c694218e URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ccf1d4a6f2df3f23a5b1a23… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Jun 11 21:48:50 2009 +0900 wine.inf: Add kernel32.48/kernel32.49 (ReleaseThunkLock/RestoreThunkLock) to the RelayExclude list. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index ccae9b9..5464213 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -415,7 +415,7 @@ HKLM,%CurrentVersionNT%\Q246009,"Installed",,"1" [Debugger] HKLM,%CurrentVersionNT%\AeDebug,"Debugger",2,"winedbg --auto %ld %ld" HKLM,%CurrentVersionNT%\AeDebug,"Auto",2,"1" -HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.94;kernel32.95;kernel32.96;kernel32.97;kernel32.98" +HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.48;kernel32.49;kernel32.94;kernel32.95;kernel32.96;kernel32.97;kernel32.98" HKCU,Software\Wine\Debug,"RelayFromExclude",2,"winex11.drv;user32;gdi32;advapi32;kernel32" [Desktop]

1 0

Alexandre Julliard : configure: Detect the appropriate form for the __ASM_GLOBAL_FUNC macro.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 857f1e0924f23865038a608ee6834ef524371f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=857f1e0924f23865038a608ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 11 16:32:42 2009 +0200 configure: Detect the appropriate form for the __ASM_GLOBAL_FUNC macro. --- configure | 172 +++++++++++++++++++++++++++++++++++++++++++++----- configure.ac | 58 +++++++++++++---- include/config.h.in | 3 + include/wine/port.h | 23 ------- 4 files changed, 201 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=857f1e0924f23865038a6…

1 0

Detlef Riekenberg : mlang/tests: Store the expected results for GetRfc1766Info as Unicode.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 79d981b676939708472a1e2c6a6519e88be01b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79d981b676939708472a1e2c6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jun 11 10:32:51 2009 +0200 mlang/tests: Store the expected results for GetRfc1766Info as Unicode. --- dlls/mlang/tests/mlang.c | 174 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 135 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79d981b676939708472a1…

1 0

Vincent Povirk : include: Add definitions needed for image decoding to wincodec.idl.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: beb00ca0c5e710978f7e0ff19975a91ec3c47a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb00ca0c5e710978f7e0ff19… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 5 16:21:54 2009 -0500 include: Add definitions needed for image decoding to wincodec.idl. --- include/wincodec.idl | 117 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 114 insertions(+), 3 deletions(-) diff --git a/include/wincodec.idl b/include/wincodec.idl index 1296467..abb4d08 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -46,8 +46,13 @@ typedef enum WICBitmapAlphaChannelOption { typedef GUID WICPixelFormatGUID; typedef REFGUID REFWICPixelFormatGUID; -interface IWICBitmapSource; -interface IWICBitmapDecoder; +typedef struct WICRect { + INT X; + INT Y; + INT Width; + INT Height; +} WICRect; + interface IWICBitmap; interface IWICComponentInfo; interface IWICBitmapEncoder; @@ -59,10 +64,100 @@ interface IWICBitmapFlipRotator; interface IWICStream; interface IWICColorContext; interface IWICColorTransform; -interface IWICBitmapFrameDecode; interface IWICFastMetadataEncoder; interface IWICMetadataQueryReader; interface IWICMetadataQueryWriter; +interface IWICBitmapDecoderInfo; + +[ + object, + uuid(00000120-a8f2-4877-ba0a-fd2b6645fb94) +] +interface IWICBitmapSource : IUnknown +{ + HRESULT GetSize( + [out] UINT *puiWidth, + [out] UINT *puiHeight); + + HRESULT GetPixelFormat( + [out] WICPixelFormatGUID *pPixelFormat); + + HRESULT GetResolution( + [out] double *pDpiX, + [out] double *pDpiY); + + HRESULT CopyPalette( + [in] IWICPalette *pIPalette); + + HRESULT CopyPixels( + [in] const WICRect *prc, + [in] UINT cbStride, + [in] UINT cbBufferSize, + [out, size_is(cbBufferSize)] BYTE *pbBuffer); +} + +[ + object, + uuid(3b16811b-6a43-4ec9-a813-3d930c13b940) +] +interface IWICBitmapFrameDecode : IWICBitmapSource +{ + HRESULT GetMetadataQueryReader( + [out] IWICMetadataQueryReader **ppIMetadataQueryReader); + + HRESULT GetColorContexts( + [in] UINT cCount, + [in, out, unique, size_is(cCount)] IWICColorContext **ppIColorContexts, + [out] UINT *pcActualCount); + + HRESULT GetThumbnail( + [out] IWICBitmapSource **ppIThumbnail); +} + +[ + object, + uuid(9edde9e7-8dee-47ea-99df-e6faf2ed44bf) +] +interface IWICBitmapDecoder : IUnknown +{ + HRESULT QueryCapability( + [in] IStream *pIStream, + [out] DWORD *pdwCapability); + + HRESULT Initialize( + [in] IStream *pIStream, + [in] WICDecodeOptions cacheOptions); + + HRESULT GetContainerFormat( + [out] GUID *pguidContainerFormat); + + HRESULT GetDecoderInfo( + [out] IWICBitmapDecoderInfo **ppIDecoderInfo); + + HRESULT CopyPalette( + [in] IWICPalette *pIPalette); + + HRESULT GetMetadataQueryReader( + [out] IWICMetadataQueryReader **ppIMetadataQueryReader); + + HRESULT GetPreview( + [out] IWICBitmapSource **ppIBitmapSource); + + HRESULT GetColorContexts( + [in] UINT cCount, + [in, out, unique, size_is(cCount)] IWICColorContext **ppIColorContexts, + [out] UINT *pcActualCount); + + HRESULT GetThumbnail( + [out] IWICBitmapSource **ppIThumbnail); + + HRESULT GetFrameCount( + [out] UINT *pCount); + + HRESULT GetFrame( + [in] UINT index, + [out] IWICBitmapFrameDecode **ppIBitmapFrame); +} cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") @@ -191,3 +286,19 @@ interface IWICImagingFactory : IUnknown [in, unique] const GUID *pguidVendor, [out] IWICMetadataQueryWriter **ppIQueryWriter); } + +cpp_quote("DEFINE_GUID(CLSID_WICBmpDecoder, 0x6b462062,0x7cbf,0x400d,0x9f,0xdb,0x81,0x3d,0xd1,0x0f,0x27,0x78);") +cpp_quote("DEFINE_GUID(CLSID_WICPngDecoder, 0x389ea17b,0x5078,0x4cde,0xb6,0xef,0x25,0xc1,0x51,0x75,0xc7,0x51);") +cpp_quote("DEFINE_GUID(CLSID_WICIcoDecoder, 0xc61bfcdf,0x2e0f,0x4aad,0xa8,0xd7,0xe0,0x6b,0xaf,0xeb,0xcd,0xfe);") +cpp_quote("DEFINE_GUID(CLSID_WICJpegDecoder, 0x9456a480,0xe88b,0x43ea,0x9e,0x73,0x0b,0x2d,0x9b,0x71,0xb1,0xca);") +cpp_quote("DEFINE_GUID(CLSID_WICGifDecoder, 0x381dda3c,0x9ce9,0x4834,0xa2,0x3e,0x1f,0x98,0xf8,0xfc,0x52,0xbe);") +cpp_quote("DEFINE_GUID(CLSID_WICTiffDecoder, 0xb54e85d9,0xfe23,0x499f,0x8b,0x88,0x6a,0xce,0xa7,0x13,0x75,0x2b);") +cpp_quote("DEFINE_GUID(CLSID_WICWmpDecoder, 0xa26cec36,0x234c,0x4950,0xae,0x16,0xe3,0x4a,0xac,0xe7,0x1d,0x0d);") + +cpp_quote("DEFINE_GUID(GUID_ContainerFormatBmp, 0x0af1d87e,0xfcfe,0x4188,0xbd,0xeb,0xa7,0x90,0x64,0x71,0xcb,0xe3);") +cpp_quote("DEFINE_GUID(GUID_ContainerFormatPng, 0x1b7cfaf4,0x713f,0x473c,0xbb,0xcd,0x61,0x37,0x42,0x5f,0xae,0xaf);") +cpp_quote("DEFINE_GUID(GUID_ContainerFormatIco, 0xa3a860c4,0x338f,0x4c17,0x91,0x9a,0xfb,0xa4,0xb5,0x62,0x8f,0x21);") +cpp_quote("DEFINE_GUID(GUID_ContainerFormatJpeg, 0x19e4a5aa,0x5662,0x4fc5,0xa0,0xc0,0x17,0x58,0x02,0x8e,0x10,0x57);") +cpp_quote("DEFINE_GUID(GUID_ContainerFormatTiff, 0x163bcc30,0xe2e9,0x4f0b,0x96,0x1d,0xa3,0xe9,0xfd,0xb7,0x88,0xa3);") +cpp_quote("DEFINE_GUID(GUID_ContainerFormatGif, 0x1f8a5601,0x7d4d,0x4cbd,0x9c,0x82,0x1b,0xc8,0xd4,0xee,0xb9,0xa5);") +cpp_quote("DEFINE_GUID(GUID_ContainerFormatWmp, 0x57a37caa,0x367a,0x4540,0x91,0x6b,0xf1,0x83,0xc5,0x09,0x3a,0x4b);")

1 0

Stefan Leichter : kernel32: Implement QueryFullProcessImageNameA.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 57f923674177789b9edf9b5405d88f9b02e33f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57f923674177789b9edf9b540… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Wed Jun 10 20:39:42 2009 +0200 kernel32: Implement QueryFullProcessImageNameA. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 21 +++++++++++++++ dlls/kernel32/tests/process.c | 56 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1734460..5182e71 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -865,7 +865,7 @@ @ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList @ stdcall QueryDosDeviceA(str ptr long) @ stdcall QueryDosDeviceW(wstr ptr long) -@ stub QueryFullProcessImageNameA +@ stdcall QueryFullProcessImageNameA(ptr long ptr ptr) @ stdcall QueryFullProcessImageNameW(ptr long ptr ptr) @ stdcall QueryInformationJobObject(long long ptr long ptr) # @ stub QueryMemoryResourceNotification diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index f00d972..31faf73 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3134,6 +3134,27 @@ BOOL WINAPI GetProcessHandleCount(HANDLE hProcess, DWORD *cnt) } /****************************************************************** + * QueryFullProcessImageNameA (KERNEL32.@) + */ +BOOL WINAPI QueryFullProcessImageNameA(HANDLE hProcess, DWORD dwFlags, LPSTR lpExeName, PDWORD pdwSize) +{ + BOOL retval; + DWORD pdwSizeW = *pdwSize; + LPWSTR lpExeNameW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *pdwSize * sizeof(WCHAR)); + + retval = QueryFullProcessImageNameW(hProcess, dwFlags, lpExeNameW, &pdwSizeW); + + if(retval) + retval = (0 != WideCharToMultiByte(CP_ACP, 0, lpExeNameW, -1, + lpExeName, *pdwSize, NULL, NULL)); + if(retval) + *pdwSize = strlen(lpExeName); + + HeapFree(GetProcessHeap(), 0, lpExeNameW); + return retval; +} + +/****************************************************************** * QueryFullProcessImageNameW (KERNEL32.@) */ BOOL WINAPI QueryFullProcessImageNameW(HANDLE hProcess, DWORD dwFlags, LPWSTR lpExeName, PDWORD pdwSize) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 05fab17..d8087a6 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -41,6 +41,12 @@ ok((expected) == value, "Expected " #actual " to be %d (" #expected ") is %d\n", \ (expected), value); \ } while (0) +#define expect_eq_s(expected, actual) \ + do { \ + LPCSTR value = (actual); \ + ok(lstrcmpA((expected), value) == 0, "Expected " #actual " to be L\"%s\" (" #expected ") is L\"%s\"\n", \ + expected, value); \ + } while (0) #define expect_eq_ws_i(expected, actual) \ do { \ LPCWSTR value = (actual); \ @@ -68,6 +74,7 @@ static const char *wine_dbgstr_w(LPCWSTR wstr) static HINSTANCE hkernel32; static LPVOID (WINAPI *pVirtualAllocEx)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD); static BOOL (WINAPI *pVirtualFreeEx)(HANDLE, LPVOID, SIZE_T, DWORD); +static BOOL (WINAPI *pQueryFullProcessImageNameA)(HANDLE hProcess, DWORD dwFlags, LPSTR lpExeName, PDWORD lpdwSize); static BOOL (WINAPI *pQueryFullProcessImageNameW)(HANDLE hProcess, DWORD dwFlags, LPWSTR lpExeName, PDWORD lpdwSize); /* ############################### */ @@ -206,6 +213,7 @@ static int init(void) hkernel32 = GetModuleHandleA("kernel32"); pVirtualAllocEx = (void *) GetProcAddress(hkernel32, "VirtualAllocEx"); pVirtualFreeEx = (void *) GetProcAddress(hkernel32, "VirtualFreeEx"); + pQueryFullProcessImageNameA = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameA"); pQueryFullProcessImageNameW = (void *) GetProcAddress(hkernel32, "QueryFullProcessImageNameW"); return 1; } @@ -1618,6 +1626,53 @@ static void test_GetProcessVersion(void) CloseHandle(pi.hThread); } +static void test_ProcessNameA(void) +{ +#define INIT_STR "Just some words" + DWORD length, size; + CHAR buf[1024]; + + if (!pQueryFullProcessImageNameA) + { + win_skip("QueryFullProcessImageNameA unavailable (added in Windows Vista)\n"); + return; + } + /* get the buffer length without \0 terminator */ + length = 1024; + expect_eq_d(TRUE, pQueryFullProcessImageNameA(GetCurrentProcess(), 0, buf, &length)); + expect_eq_d(length, lstrlenA(buf)); + + /* when the buffer is too small + * - function fail with error ERROR_INSUFFICIENT_BUFFER + * - the size variable is not modified + * tested with the biggest too small size + */ + size = length; + sprintf(buf,INIT_STR); + expect_eq_d(FALSE, pQueryFullProcessImageNameA(GetCurrentProcess(), 0, buf, &size)); + expect_eq_d(ERROR_INSUFFICIENT_BUFFER, GetLastError()); + expect_eq_d(length, size); + expect_eq_s(INIT_STR, buf); + + /* retest with smaller buffer size + */ + size = 4; + sprintf(buf,INIT_STR); + expect_eq_d(FALSE, pQueryFullProcessImageNameA(GetCurrentProcess(), 0, buf, &size)); + expect_eq_d(ERROR_INSUFFICIENT_BUFFER, GetLastError()); + expect_eq_d(4, size); + expect_eq_s(INIT_STR, buf); + + /* this is a difference between the ascii and the unicode version + * the unicode version crashes when the size is big enough to hold the result + * ascii version throughs an error + */ + size = 1024; + expect_eq_d(FALSE, pQueryFullProcessImageNameA(GetCurrentProcess(), 0, NULL, &size)); + expect_eq_d(1024, size); + expect_eq_d(ERROR_INVALID_PARAMETER, GetLastError()); +} + static void test_ProcessName(void) { HANDLE hSelf; @@ -1741,6 +1796,7 @@ START_TEST(process) test_ExitCode(); test_OpenProcess(); test_GetProcessVersion(); + test_ProcessNameA(); test_ProcessName(); test_Handles(); /* things that can be tested:

1 0

Rico Schüller : wined3d: Don' t allow a negative lock_count in buffer_Unmap.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 3ea66d6026a208f5fc551cd9a5bb421d2adfa4e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea66d6026a208f5fc551cd9a… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jun 10 21:54:07 2009 +0200 wined3d: Don't allow a negative lock_count in buffer_Unmap. --- dlls/wined3d/buffer.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 666de8e..e9f3ff6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -985,6 +985,16 @@ static HRESULT STDMETHODCALLTYPE buffer_Unmap(IWineD3DBuffer *iface) TRACE("(%p)\n", This); + /* In the case that the number of Unmap calls > the + * number of Map calls, d3d returns always D3D_OK. + * This is also needed to prevent Map from returning garbage on + * the next call (this will happen if the lock_count is < 0). */ + if(This->lock_count == 0) + { + TRACE("Unmap called without a previous Map call!\n"); + return WINED3D_OK; + } + if (InterlockedDecrement(&This->lock_count)) { /* Delay loading the buffer until everything is unlocked */

1 0

Mike Kaplinskiy : msi: Add a test to insert a null primary key temporary row and check its order.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 9e5d07bb5348ccd9ee7fcd30700270e0c2c2b015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e5d07bb5348ccd9ee7fcd307… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sun Jun 7 01:12:53 2009 -0400 msi: Add a test to insert a null primary key temporary row and check its order. --- dlls/msi/tests/db.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 95f2170..2d296b5 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -7391,6 +7391,43 @@ static void test_insertorder(void) MsiViewClose(view); MsiCloseHandle(view); + + query = "DELETE FROM `T` WHERE `A` IS NULL"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `T` ( `B`, `C` ) VALUES ( 12, 13 ) TEMPORARY"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT * FROM `T`"; + r = MsiDatabaseOpenView(hdb, query, &view); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(view, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + for (i = 0; i < 6; i++) + { + r = MsiViewFetch(view, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(rec, 1); + ok(r == ordervals[i][0], "Expected %d, got %d\n", ordervals[i][0], r); + + r = MsiRecordGetInteger(rec, 2); + ok(r == ordervals[i][1], "Expected %d, got %d\n", ordervals[i][1], r); + + r = MsiRecordGetInteger(rec, 3); + ok(r == ordervals[i][2], "Expected %d, got %d\n", ordervals[i][2], r); + + MsiCloseHandle(rec); + } + + r = MsiViewFetch(view, &rec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + MsiViewClose(view); + MsiCloseHandle(view); MsiCloseHandle(hdb); DeleteFileA(msifile); }

1 0

Mike Kaplinskiy : msi: Store temporary rows in the same place as persistent rows, just with a flag.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 2cc9a710b102c6345e33c33307ef834bcc6ef6c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc9a710b102c6345e33c3330… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sun Jun 7 01:11:40 2009 -0400 msi: Store temporary rows in the same place as persistent rows, just with a flag. --- dlls/msi/table.c | 146 +++++++++++++++++++++--------------------------------- 1 files changed, 57 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cc9a710b102c6345e33c…

1 0

Guy Albertelli : kernel32/tests: Fix tests to pass on Win9x and WinME.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 7c4939cbaaa945ee497ec63cb5970baeb9a936ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c4939cbaaa945ee497ec63cb… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Sat Jun 6 20:56:01 2009 -0400 kernel32/tests: Fix tests to pass on Win9x and WinME. --- dlls/kernel32/tests/file.c | 72 ++++++++++++++++++++++++++----------------- 1 files changed, 43 insertions(+), 29 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 4cdeade..e2ad49d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -55,10 +55,11 @@ static const char sillytext[] = "sdlkfjasdlkfj a dslkj adsklf \n \nasdklf askldfa sdlkf \nsadklf asdklf asdf "; struct test_list { - const char *file; - const DWORD err; - const DWORD options; - const BOOL todo_flag; + const char *file; /* file string to test */ + const DWORD err; /* Win NT and further error code */ + const LONG err2; /* Win 9x & ME error code or -1 */ + const DWORD options; /* option flag to use for open */ + const BOOL todo_flag; /* todo_wine indicator */ } ; static void InitFunctionPointers(void) @@ -717,19 +718,19 @@ static void test_CreateFileA(void) static const char nt_drive[] = "\\\\?\\A:"; DWORD i, ret, len; struct test_list p[] = { - {"", ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, TRUE }, /* dir as file w \ */ - {"", ERROR_SUCCESS, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* dir as dir w \ */ - {"a", ERROR_FILE_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, FALSE }, /* non-exist file */ - {"a\\", ERROR_FILE_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, FALSE }, /* non-exist dir */ - {"removeme", ERROR_ACCESS_DENIED, FILE_ATTRIBUTE_NORMAL, FALSE }, /* exist dir w/o \ */ - {"removeme\\", ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, TRUE }, /* exst dir w \ */ - {"c:", ERROR_ACCESS_DENIED, FILE_ATTRIBUTE_NORMAL, FALSE }, /* device in file namespace */ - {"c:", ERROR_SUCCESS, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* device in file namespace as dir */ - {"c:\\", ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, TRUE }, /* root dir w \ */ - {"c:\\", ERROR_SUCCESS, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* root dir w \ as dir */ - {"\\\\?\\c:", ERROR_SUCCESS, FILE_ATTRIBUTE_NORMAL,FALSE }, /* dev namespace drive */ - {"\\\\?\\c:\\", ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, TRUE }, /* dev namespace drive w \ */ - {NULL, 0, 0, FALSE} + {"", ERROR_PATH_NOT_FOUND, -1, FILE_ATTRIBUTE_NORMAL, TRUE }, /* dir as file w \ */ + {"", ERROR_SUCCESS, ERROR_PATH_NOT_FOUND, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* dir as dir w \ */ + {"a", ERROR_FILE_NOT_FOUND, -1, FILE_ATTRIBUTE_NORMAL, FALSE }, /* non-exist file */ + {"a\\", ERROR_FILE_NOT_FOUND, ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, FALSE }, /* non-exist dir */ + {"removeme", ERROR_ACCESS_DENIED, -1, FILE_ATTRIBUTE_NORMAL, FALSE }, /* exist dir w/o \ */ + {"removeme\\", ERROR_PATH_NOT_FOUND, -1, FILE_ATTRIBUTE_NORMAL, TRUE }, /* exst dir w \ */ + {"c:", ERROR_ACCESS_DENIED, ERROR_PATH_NOT_FOUND, FILE_ATTRIBUTE_NORMAL, FALSE }, /* device in file namespace */ + {"c:", ERROR_SUCCESS, ERROR_PATH_NOT_FOUND, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* device in file namespace as dir */ + {"c:\\", ERROR_PATH_NOT_FOUND, ERROR_ACCESS_DENIED, FILE_ATTRIBUTE_NORMAL, TRUE }, /* root dir w \ */ + {"c:\\", ERROR_SUCCESS, ERROR_ACCESS_DENIED, FILE_FLAG_BACKUP_SEMANTICS, FALSE }, /* root dir w \ as dir */ + {"\\\\?\\c:", ERROR_SUCCESS, ERROR_BAD_NETPATH, FILE_ATTRIBUTE_NORMAL,FALSE }, /* dev namespace drive */ + {"\\\\?\\c:\\", ERROR_PATH_NOT_FOUND, ERROR_BAD_NETPATH, FILE_ATTRIBUTE_NORMAL, TRUE }, /* dev namespace drive w \ */ + {NULL, 0, -1, 0, FALSE} }; BY_HANDLE_FILE_INFORMATION Finfo; @@ -829,13 +830,17 @@ static void test_CreateFileA(void) } /* otherwise validate results with expectations */ else if (p[i].todo_flag) - todo_wine ok((hFile == INVALID_HANDLE_VALUE && p[i].err == GetLastError()) || + todo_wine ok( + (hFile == INVALID_HANDLE_VALUE && + (p[i].err == GetLastError() || p[i].err2 == GetLastError())) || (hFile != INVALID_HANDLE_VALUE && p[i].err == ERROR_SUCCESS), "CreateFileA failed on %s, hFile %p, err=%u, should be %u\n", filename, hFile, GetLastError(), p[i].err); else - ok((hFile == INVALID_HANDLE_VALUE && p[i].err == GetLastError()) || - (hFile != INVALID_HANDLE_VALUE && p[i].err == ERROR_SUCCESS), + ok( + (hFile == INVALID_HANDLE_VALUE && + (p[i].err == GetLastError() || p[i].err2 == GetLastError())) || + (hFile != INVALID_HANDLE_VALUE && p[i].err == ERROR_SUCCESS), "CreateFileA failed on %s, hFile %p, err=%u, should be %u\n", filename, hFile, GetLastError(), p[i].err); if (hFile != INVALID_HANDLE_VALUE) @@ -852,21 +857,26 @@ static void test_CreateFileA(void) NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL ); - ok(hFile != INVALID_HANDLE_VALUE && GetLastError() == ERROR_SUCCESS, + if (hFile != INVALID_HANDLE_VALUE && GetLastError() != ERROR_PATH_NOT_FOUND) + { + ok(hFile != INVALID_HANDLE_VALUE && GetLastError() == ERROR_SUCCESS, "CreateFileA did not work, last error %u on volume <%s>\n", GetLastError(), temp_path ); - if (hFile != INVALID_HANDLE_VALUE) - { - ret = GetFileInformationByHandle( hFile, &Finfo ); - if (ret) + if (hFile != INVALID_HANDLE_VALUE) { - ok(Finfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY, - "CreateFileA probably did not open temp directory %s correctly\n file information does not include FILE_ATTRIBUTE_DIRECTORY, actual=0x%08x\n", + ret = GetFileInformationByHandle( hFile, &Finfo ); + if (ret) + { + ok(Finfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY, + "CreateFileA probably did not open temp directory %s correctly\n file information does not include FILE_ATTRIBUTE_DIRECTORY, actual=0x%08x\n", temp_path, Finfo.dwFileAttributes); + } + CloseHandle( hFile ); } - CloseHandle( hFile ); } + else + skip("Probable Win9x, got ERROR_PATH_NOT_FOUND w/ FILE_FLAG_BACKUP_SEMANTICS or %s\n", temp_path); /* *** Test opening volumes/devices using drive letter *** */ @@ -879,7 +889,8 @@ static void test_CreateFileA(void) FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_NO_BUFFERING, NULL ); - if (hFile != INVALID_HANDLE_VALUE || GetLastError() != ERROR_ACCESS_DENIED) + if (hFile != INVALID_HANDLE_VALUE || + (GetLastError() != ERROR_ACCESS_DENIED && GetLastError() != ERROR_BAD_NETPATH)) { /* if we have adm rights to volume, then try rest of tests */ ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA did not open %s, last error=%u\n", @@ -946,6 +957,9 @@ static void test_CreateFileA(void) if (hFile != INVALID_HANDLE_VALUE) CloseHandle( hFile ); } + /* If we see ERROR_BAD_NETPATH then on Win9x or WinME, so skip */ + else if (GetLastError() == ERROR_BAD_NETPATH) + skip("Probable Win9x, got ERROR_BAD_NETPATH (53)\n"); else skip("Do not have authority to access volumes. Tests skipped\n");

1 0

Henri Verbeet : wined3d: Use the format info to calculate compressed surface pitch in IWineD3DBaseSurfaceImpl_GetPitch ().
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 5fbf895da683c21a89ad6a5e1433279c241b564f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fbf895da683c21a89ad6a5e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 11 10:24:30 2009 +0200 wined3d: Use the format info to calculate compressed surface pitch in IWineD3DBaseSurfaceImpl_GetPitch(). --- dlls/wined3d/surface_base.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index f0acb87..2120d19 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -332,19 +332,19 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetPalette(IWineD3DSurface *iface, IWineD DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPitch(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; - WINED3DFORMAT format = This->resource.format_desc->format; + const struct GlPixelFormatDesc *format_desc = This->resource.format_desc; DWORD ret; TRACE("(%p)\n", This); - /* DXTn formats don't have exact pitches as they are to the new row of blocks, - where each block is 4x4 pixels, 8 bytes (dxt1) and 16 bytes (dxt2/3/4/5) - ie pitch = (width/4) * bytes per block */ - if (format == WINED3DFMT_DXT1) /* DXT1 is 8 bytes per block */ - ret = ((This->currentDesc.Width + 3) >> 2) << 3; - else if (format == WINED3DFMT_DXT2 || format == WINED3DFMT_DXT3 || - format == WINED3DFMT_DXT4 || format == WINED3DFMT_DXT5) /* DXT2/3/4/5 is 16 bytes per block */ - ret = ((This->currentDesc.Width + 3) >> 2) << 4; - else { + if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) + { + /* Since compressed formats are block based, pitch means the amount of + * bytes to the next row of block rather than the next row of pixels. */ + UINT row_block_count = (This->currentDesc.Width + format_desc->block_width - 1) / format_desc->block_width; + ret = row_block_count * format_desc->block_byte_count; + } + else + { unsigned char alignment = This->resource.wineD3DDevice->surface_alignment; ret = This->resource.format_desc->byte_count * This->currentDesc.Width; /* Bytes / row */ ret = (ret + alignment - 1) & ~(alignment - 1);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009