June 2009 - Wine-commits - list.winehq.org

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

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

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

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

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

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

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

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

Austin English : wine.desktop: Allow start to execute lnk files.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: ea09e4afe8aa602b7f8e76a3d32e841a509c2144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea09e4afe8aa602b7f8e76a3d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jun 11 01:20:09 2009 -0500 wine.desktop: Allow start to execute lnk files. --- tools/wine.desktop | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index 52f91c6..db4254d 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -16,6 +16,6 @@ Name[da]=Wine, Programstarter til Windows-programmer Name[nb]=Wine Programlaster for Windowsapplikasjoner Name[nn]=Wine Programlaster for Windowsapplikasjoner Exec=wine start /unix %f -MimeType=application/x-ms-dos-executable;application/x-msi; +MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk; NoDisplay=true StartupNotify=true

1 0

Henri Verbeet : wined3d: Remove some redundant s3tc extension checks.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: b052c6e8aa96823451624c99333b5eb8f867b137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b052c6e8aa96823451624c993… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 11 10:24:30 2009 +0200 wined3d: Remove some redundant s3tc extension checks. If the extension isn't available to surface shouldn't have been created. We don't do extension checks for all the other formats either. --- dlls/wined3d/device.c | 32 ++++++++------- dlls/wined3d/surface.c | 99 +++++++++++++++++++++++++---------------------- 2 files changed, 70 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fe084ca..e6b4681 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5987,22 +5987,24 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, WINED3DFMT_DXT3 == destFormat || WINED3DFMT_DXT4 == destFormat || WINED3DFMT_DXT5 == destFormat) { - if (GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { - if (destSurfaceHeight != srcHeight || destSurfaceWidth != srcWidth) { - /* FIXME: The easy way to do this is to lock the destination, and copy the bits across */ - FIXME("Updating part of a compressed texture is not supported at the moment\n"); - } if (destFormat != srcFormat) { - FIXME("Updating mixed format compressed texture is not curretly support\n"); - } else { - GL_EXTCALL(glCompressedTexImage2DARB(glDescription->target, glDescription->level, - dst_format_desc->glInternal, srcWidth, srcHeight, 0, destSize, data)); - } - } else { - FIXME("Attempting to update a DXT compressed texture without hardware support\n"); - } - - } else { + if (destSurfaceHeight != srcHeight || destSurfaceWidth != srcWidth) + { + /* FIXME: The easy way to do this is to lock the destination, and copy the bits across. */ + FIXME("Updating part of a compressed texture is not supported.\n"); + } + if (destFormat != srcFormat) + { + FIXME("Updating mixed format compressed textures is not supported.\n"); + } + else + { + GL_EXTCALL(glCompressedTexImage2DARB(glDescription->target, glDescription->level, + dst_format_desc->glInternal, srcWidth, srcHeight, 0, destSize, data)); + } + } + else + { glTexSubImage2D(glDescription->target, glDescription->level, destLeft, destTop, srcWidth, srcHeight, dst_format_desc->glFormat, dst_format_desc->glType, data); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a20ecd2..c81dab3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -150,25 +150,26 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { || format_desc->format == WINED3DFMT_DXT3 || format_desc->format == WINED3DFMT_DXT4 || format_desc->format == WINED3DFMT_DXT5 || format_desc->format == WINED3DFMT_ATI2N) { - if (!GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { /* We can assume this as the texture would not have been created otherwise */ - FIXME("(%p) : Attempting to lock a compressed texture when texture compression isn't supported by opengl\n", This); - } else { - TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, format %#x, type %#x, data %p\n", - This, This->glDescription.level, format_desc->glFormat, format_desc->glType, - This->resource.allocatedMemory); - - if(This->Flags & SFLAG_PBO) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, This->pbo)); - checkGLcall("glBindBufferARB"); - GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, This->glDescription.level, NULL)); - checkGLcall("glGetCompressedTexImageARB()"); - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); - } else { - GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, This->glDescription.level, This->resource.allocatedMemory)); - checkGLcall("glGetCompressedTexImageARB()"); - } + TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, format %#x, type %#x, data %p.\n", + This, This->glDescription.level, format_desc->glFormat, format_desc->glType, + This->resource.allocatedMemory); + + if (This->Flags & SFLAG_PBO) + { + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, This->pbo)); + checkGLcall("glBindBufferARB"); + GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, This->glDescription.level, NULL)); + checkGLcall("glGetCompressedTexImageARB()"); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); } + else + { + GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, + This->glDescription.level, This->resource.allocatedMemory)); + checkGLcall("glGetCompressedTexImageARB()"); + } + LEAVE_GL(); } else { void *mem; @@ -297,35 +298,41 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, GLenum internal, GLsi || format_desc->format == WINED3DFMT_DXT3 || format_desc->format == WINED3DFMT_DXT4 || format_desc->format == WINED3DFMT_DXT5 || format_desc->format == WINED3DFMT_ATI2N) { - if (!GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { - FIXME("Using DXT1/3/5 without advertized support\n"); - } else { - /* glCompressedTexSubImage2D for uploading and glTexImage2D for allocating does not work well on some drivers(r200 dri, MacOS ATI driver) - * glCompressedTexImage2D does not accept NULL pointers. So for compressed textures surface_allocate_surface does nothing, and this - * function uses glCompressedTexImage2D instead of the SubImage call - */ - TRACE("(%p) : Calling glCompressedTexSubImage2D w %d, h %d, data %p\n", This, width, height, data); - ENTER_GL(); + /* glCompressedTexSubImage2D() for uploading and glTexImage2D() for + * allocating does not work well on some drivers (r200 dri, MacOS ATI + * driver). glCompressedTexImage2D() does not accept NULL pointers. So + * for compressed textures surface_allocate_surface() does nothing, + * and this function uses glCompressedTexImage2D() instead of + * glCompressedTexSubImage2D(). */ + TRACE("(%p) : Calling glCompressedTexImage2DARB w %u, h %u, data %p.\n", This, width, height, data); + + ENTER_GL(); - if(This->Flags & SFLAG_PBO) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); - checkGLcall("glBindBufferARB"); - TRACE("(%p) pbo: %#x, data: %p\n", This, This->pbo, data); + if (This->Flags & SFLAG_PBO) + { + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); + checkGLcall("glBindBufferARB"); - GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, internal, - width, height, 0 /* border */, This->resource.size, NULL)); - checkGLcall("glCompressedTexSubImage2D"); + TRACE("(%p) pbo: %#x, data: %p.\n", This, This->pbo, data); - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); - } else { - GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, internal, - width, height, 0 /* border */, This->resource.size, data)); - checkGLcall("glCompressedTexSubImage2D"); - } - LEAVE_GL(); + GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, + internal, width, height, 0 /* border */, This->resource.size, NULL)); + checkGLcall("glCompressedTexImage2DARB"); + + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); } - } else { + else + { + GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, + internal, width, height, 0 /* border */, This->resource.size, data)); + checkGLcall("glCompressedTexSubImage2D"); + } + + LEAVE_GL(); + } + else + { TRACE("(%p) : Calling glTexSubImage2D w %d, h %d, data, %p\n", This, width, height, data); ENTER_GL();

1 0