wine-commits April 2007

wine-commits@winehq.org

4 participants
687 discussions

Hans Leidekker : setupapi: Implement SetupDecompressOrCopyFile{A, W}.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: c1950e2dccb0d16398997a228c3716a332d827d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1950e2dccb0d16398997a228… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Apr 8 13:19:13 2007 +0200 setupapi: Implement SetupDecompressOrCopyFile{A, W}. --- dlls/setupapi/misc.c | 136 +++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 4 +- include/setupapi.h | 3 + 3 files changed, 141 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index f760f11..dcc76bf 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1210,3 +1210,139 @@ BOOL WINAPI SetupGetFileCompressionInfoExW( PCWSTR source, PWSTR name, DWORD len } return ret; } + +static DWORD decompress_file_lz( LPCWSTR source, LPCWSTR target ) +{ + DWORD ret; + LONG error; + INT src, dst; + OFSTRUCT sof, dof; + + if ((src = LZOpenFileW( (LPWSTR)source, &sof, OF_READ )) < 0) + { + ERR("cannot open source file for reading\n"); + return ERROR_FILE_NOT_FOUND; + } + if ((dst = LZOpenFileW( (LPWSTR)target, &dof, OF_CREATE )) < 0) + { + ERR("cannot open target file for writing\n"); + LZClose( src ); + return ERROR_FILE_NOT_FOUND; + } + if ((error = LZCopy( src, dst )) >= 0) ret = ERROR_SUCCESS; + else + { + WARN("failed to decompress file %d\n", error); + ret = ERROR_INVALID_DATA; + } + + LZClose( src ); + LZClose( dst ); + return ret; +} + +static UINT CALLBACK decompress_or_copy_callback( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 ) +{ + FILE_IN_CABINET_INFO_W *info = (FILE_IN_CABINET_INFO_W *)param1; + + switch (notification) + { + case SPFILENOTIFY_FILEINCABINET: + { + LPCWSTR filename, targetname = context; + WCHAR *p; + + if ((p = strrchrW( targetname, '\\' ))) filename = p + 1; + else filename = targetname; + + if (!lstrcmpiW( filename, info->NameInCabinet )) + { + strcpyW( info->FullTargetName, targetname ); + return FILEOP_DOIT; + } + return FILEOP_SKIP; + } + default: return NO_ERROR; + } +} + +static DWORD decompress_file_cab( LPCWSTR source, LPCWSTR target ) +{ + BOOL ret; + + ret = SetupIterateCabinetW( source, 0, decompress_or_copy_callback, (PVOID)target ); + + if (ret) return ERROR_SUCCESS; + else return GetLastError(); +} + +/*********************************************************************** + * SetupDecompressOrCopyFileA (SETUPAPI.@) + * + * See SetupDecompressOrCopyFileW. + */ +DWORD WINAPI SetupDecompressOrCopyFileA( PCSTR source, PCSTR target, PUINT type ) +{ + DWORD ret = FALSE; + WCHAR *sourceW = NULL, *targetW = NULL; + + if (source && !(sourceW = MultiByteToUnicode( source, CP_ACP ))) return FALSE; + if (target && !(targetW = MultiByteToUnicode( target, CP_ACP ))) + { + MyFree( sourceW ); + return ERROR_NOT_ENOUGH_MEMORY; + } + + ret = SetupDecompressOrCopyFileW( sourceW, targetW, type ); + + MyFree( sourceW ); + MyFree( targetW ); + + return ret; +} + +/*********************************************************************** + * SetupDecompressOrCopyFileW (SETUPAPI.@) + * + * Copy a file and decompress it if needed. + * + * PARAMS + * source [I] File to copy. + * target [I] Filename of the copy. + * type [I] Compression type. + * + * RETURNS + * Success: ERROR_SUCCESS + * Failure: Win32 error code. + */ +DWORD WINAPI SetupDecompressOrCopyFileW( PCWSTR source, PCWSTR target, PUINT type ) +{ + UINT comp; + DWORD ret = ERROR_INVALID_PARAMETER; + + if (!source || !target) return ERROR_INVALID_PARAMETER; + + if (!type) comp = detect_compression_type( source ); + else comp = *type; + + switch (comp) + { + case FILE_COMPRESSION_NONE: + if (CopyFileW( source, target, FALSE )) ret = ERROR_SUCCESS; + else ret = GetLastError(); + break; + case FILE_COMPRESSION_WINLZA: + ret = decompress_file_lz( source, target ); + break; + case FILE_COMPRESSION_NTCAB: + case FILE_COMPRESSION_MSZIP: + ret = decompress_file_cab( source, target ); + break; + default: + WARN("unknown compression type %d\n", comp); + break; + } + + TRACE("%s -> %s %d\n", debugstr_w(source), debugstr_w(target), comp); + return ret; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index ef92bc0..1669cc4 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -257,8 +257,8 @@ @ stdcall SetupCopyOEMInfW(wstr wstr long long ptr long ptr ptr) @ stdcall SetupCreateDiskSpaceListA(ptr long long) @ stdcall SetupCreateDiskSpaceListW(ptr long long) -@ stub SetupDecompressOrCopyFileA -@ stub SetupDecompressOrCopyFileW +@ stdcall SetupDecompressOrCopyFileA(str str ptr) +@ stdcall SetupDecompressOrCopyFileW(wstr wstr ptr) @ stub SetupDefaultQueueCallback @ stdcall SetupDefaultQueueCallbackA(ptr long long long) @ stdcall SetupDefaultQueueCallbackW(ptr long long long) diff --git a/include/setupapi.h b/include/setupapi.h index b6d57b2..dd20435 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -736,6 +736,9 @@ UINT WINAPI SetupCopyErrorW( HWND, PCWSTR, PCWSTR, PCWSTR, PCWSTR, PCWSTR, U BOOL WINAPI SetupCopyOEMInfA( PCSTR, PCSTR, DWORD, DWORD, PSTR, DWORD, PDWORD, PSTR * ); BOOL WINAPI SetupCopyOEMInfW( PCWSTR, PCWSTR, DWORD, DWORD, PWSTR, DWORD, PDWORD, PWSTR * ); #define SetupCopyOEMInf WINELIB_NAME_AW(SetupCopyOEMInf) +DWORD WINAPI SetupDecompressOrCopyFileA( PCSTR, PCSTR, PUINT ); +DWORD WINAPI SetupDecompressOrCopyFileW( PCWSTR, PCWSTR, PUINT ); +#define SetupDecompressOrCopyFile WINELIB_NAME_AW(SetupDecompressOrCopyFile) UINT WINAPI SetupDefaultQueueCallbackA( PVOID, UINT, UINT_PTR, UINT_PTR ); UINT WINAPI SetupDefaultQueueCallbackW( PVOID, UINT, UINT_PTR, UINT_PTR ); #define SetupDefaultQueueCallback WINELIB_NAME_AW(SetupDefaultQueueCallback)

1 0

Hans Leidekker : setupapi: Add tests for SetupGetFileCompressionInfoEx.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: c1a856e64989c9981d1bc2a55b14c4606f6d51dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1a856e64989c9981d1bc2a55… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Apr 8 13:19:01 2007 +0200 setupapi: Add tests for SetupGetFileCompressionInfoEx. --- dlls/setupapi/tests/misc.c | 114 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 114 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 2efaa64..2c5c0f3 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -2,6 +2,7 @@ * Miscellaneous tests * * Copyright 2007 James Hawkins + * Copyright 2007 Hans Leidekker * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -247,9 +248,122 @@ static void test_SetupCopyOEMInf(void) ok(!file_exists(path), "Expected source inf to not exist\n"); } +static void create_source_file(LPSTR filename, const BYTE *data, DWORD size) +{ + HANDLE handle; + DWORD written; + + handle = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + WriteFile(handle, data, size, &written, NULL); + CloseHandle(handle); +} + +static const BYTE uncompressed[] = { + 'u','n','c','o','m','p','r','e','s','s','e','d','\r','\n' +}; +static const BYTE comp_lzx[] = { + 0x53, 0x5a, 0x44, 0x44, 0x88, 0xf0, 0x27, 0x33, 0x41, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xff, 0x00, + 0x00, 0x75, 0x6e, 0x63, 0x6f, 0x6d, 0x70, 0x3f, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64 +}; +static const BYTE comp_zip[] = { + 0x50, 0x4b, 0x03, 0x04, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbd, 0xae, 0x81, 0x36, 0x75, 0x11, + 0x2c, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x04, 0x00, 0x15, 0x00, 0x77, 0x69, + 0x6e, 0x65, 0x55, 0x54, 0x09, 0x00, 0x03, 0xd6, 0x0d, 0x10, 0x46, 0xfd, 0x0d, 0x10, 0x46, 0x55, + 0x78, 0x04, 0x00, 0xe8, 0x03, 0xe8, 0x03, 0x00, 0x00, 0x75, 0x6e, 0x63, 0x6f, 0x6d, 0x70, 0x72, + 0x65, 0x73, 0x73, 0x65, 0x64, 0x50, 0x4b, 0x01, 0x02, 0x17, 0x03, 0x0a, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xbd, 0xae, 0x81, 0x36, 0x75, 0x11, 0x2c, 0x1b, 0x0e, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, + 0x00, 0x04, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa4, 0x81, 0x00, + 0x00, 0x00, 0x00, 0x77, 0x69, 0x6e, 0x65, 0x55, 0x54, 0x05, 0x00, 0x03, 0xd6, 0x0d, 0x10, 0x46, + 0x55, 0x78, 0x00, 0x00, 0x50, 0x4b, 0x05, 0x06, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, + 0x3f, 0x00, 0x00, 0x00, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00 +}; +static const BYTE comp_cab_lzx[] = { + 0x4d, 0x53, 0x43, 0x46, 0x00, 0x00, 0x00, 0x00, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x0f, 0x0e, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x36, 0x86, 0x72, 0x20, 0x00, 0x77, 0x69, 0x6e, 0x65, + 0x00, 0x19, 0xd0, 0x1a, 0xe3, 0x22, 0x00, 0x0e, 0x00, 0x5b, 0x80, 0x80, 0x8d, 0x00, 0x30, 0xe0, + 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x75, 0x6e, 0x63, + 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x65, 0x64, 0x0d, 0x0a +}; +static const BYTE comp_cab_zip[] = { + 0x4d, 0x53, 0x43, 0x46, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x41, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0x36, 0x2f, 0xa5, 0x20, 0x00, 0x77, 0x69, 0x6e, 0x65, + 0x00, 0x7c, 0x80, 0x26, 0x2b, 0x12, 0x00, 0x0e, 0x00, 0x43, 0x4b, 0x2b, 0xcd, 0x4b, 0xce, 0xcf, + 0x2d, 0x28, 0x4a, 0x2d, 0x2e, 0x4e, 0x4d, 0xe1, 0xe5, 0x02, 0x00 +}; + +static void test_SetupGetFileCompressionInfoEx(void) +{ + BOOL ret; + DWORD required_len, source_size, target_size; + char source[MAX_PATH], temp[MAX_PATH], name[MAX_PATH]; + UINT type; + + GetTempPathA(sizeof(temp), temp); + GetTempFileNameA(temp, "doc", 0, source); + + ret = SetupGetFileCompressionInfoExA(NULL, NULL, 0, NULL, NULL, NULL, NULL); + ok(!ret, "SetupGetFileCompressionInfoEx succeeded unexpectedly\n"); + + ret = SetupGetFileCompressionInfoExA(source, NULL, 0, NULL, NULL, NULL, NULL); + ok(!ret, "SetupGetFileCompressionInfoEx succeeded unexpectedly\n"); + + ret = SetupGetFileCompressionInfoExA(source, NULL, 0, &required_len, NULL, NULL, NULL); + ok(!ret, "SetupGetFileCompressionInfoEx succeeded unexpectedly\n"); + ok(required_len == lstrlenA(source) + 1, "got %d, expected %d\n", required_len, lstrlenA(source) + 1); + + create_source_file(source, comp_lzx, sizeof(comp_lzx)); + + ret = SetupGetFileCompressionInfoExA(source, name, sizeof(name), &required_len, &source_size, &target_size, &type); + ok(ret, "SetupGetFileCompressionInfoEx failed unexpectedly: %d\n", ret); + ok(!lstrcmpA(name, source), "got %s, expected %s\n", name, source); + ok(required_len == lstrlenA(source) + 1, "got %d, expected %d\n", required_len, lstrlenA(source) + 1); + ok(source_size == sizeof(comp_lzx), "got %d, expected %d\n", source_size, sizeof(comp_lzx)); + ok(target_size == sizeof(uncompressed), "got %d, expected %d\n", target_size, sizeof(uncompressed)); + ok(type == FILE_COMPRESSION_WINLZA, "got %d, expected FILE_COMPRESSION_WINLZA\n", type); + DeleteFileA(source); + + create_source_file(source, comp_zip, sizeof(comp_zip)); + + ret = SetupGetFileCompressionInfoExA(source, name, sizeof(name), &required_len, &source_size, &target_size, &type); + ok(ret, "SetupGetFileCompressionInfoEx failed unexpectedly: %d\n", ret); + ok(!lstrcmpA(name, source), "got %s, expected %s\n", name, source); + ok(required_len == lstrlenA(source) + 1, "got %d, expected %d\n", required_len, lstrlenA(source) + 1); + ok(source_size == sizeof(comp_zip), "got %d, expected %d\n", source_size, sizeof(comp_zip)); + ok(target_size == sizeof(comp_zip), "got %d, expected %d\n", target_size, sizeof(comp_zip)); + ok(type == FILE_COMPRESSION_NONE, "got %d, expected FILE_COMPRESSION_NONE\n", type); + DeleteFileA(source); + + create_source_file(source, comp_cab_lzx, sizeof(comp_cab_lzx)); + + ret = SetupGetFileCompressionInfoExA(source, name, sizeof(name), &required_len, &source_size, &target_size, &type); + ok(ret, "SetupGetFileCompressionInfoEx failed unexpectedly: %d\n", ret); + ok(!lstrcmpA(name, source), "got %s, expected %s\n", name, source); + ok(required_len == lstrlenA(source) + 1, "got %d, expected %d\n", required_len, lstrlenA(source) + 1); + ok(source_size == sizeof(comp_cab_lzx), "got %d, expected %d\n", source_size, sizeof(comp_cab_lzx)); + ok(target_size == sizeof(uncompressed), "got %d, expected %d\n", target_size, sizeof(uncompressed)); + ok(type == FILE_COMPRESSION_MSZIP, "got %d, expected FILE_COMPRESSION_MSZIP\n", type); + DeleteFileA(source); + + create_source_file(source, comp_cab_zip, sizeof(comp_cab_zip)); + + ret = SetupGetFileCompressionInfoExA(source, name, sizeof(name), &required_len, &source_size, &target_size, &type); + ok(ret, "SetupGetFileCompressionInfoEx failed unexpectedly: %d\n", ret); + ok(!lstrcmpA(name, source), "got %s, expected %s\n", name, source); + ok(required_len == lstrlenA(source) + 1, "got %d, expected %d\n", required_len, lstrlenA(source) + 1); + ok(source_size == sizeof(comp_cab_zip), "got %d, expected %d\n", source_size, sizeof(comp_cab_zip)); + ok(target_size == sizeof(uncompressed), "got %d, expected %d\n", target_size, sizeof(uncompressed)); + ok(type == FILE_COMPRESSION_MSZIP, "got %d, expected FILE_COMPRESSION_MSZIP\n", type); + DeleteFileA(source); +} + START_TEST(misc) { GetCurrentDirectoryA(MAX_PATH, CURR_DIR); test_SetupCopyOEMInf(); + test_SetupGetFileCompressionInfoEx(); }

1 0

Hans Leidekker : setupapi: Implement SetupGetFileCompressionInfoEx{A, W}.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: 8ccc19c74c43d81965ecffdaf9bce9d965a25f1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ccc19c74c43d81965ecffdaf… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Apr 8 13:18:54 2007 +0200 setupapi: Implement SetupGetFileCompressionInfoEx{A, W}. --- dlls/setupapi/misc.c | 216 +++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 2 + include/setupapi.h | 8 ++ 3 files changed, 226 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 04941a5..f760f11 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -2,6 +2,7 @@ * Setupapi miscellaneous functions * * Copyright 2005 Eric Kohl + * Copyright 2007 Hans Leidekker * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,6 +27,7 @@ #include "winuser.h" #include "winreg.h" #include "setupapi.h" +#include "lzexpand.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -994,3 +996,217 @@ DWORD WINAPI InstallCatalog( LPCSTR catalog, LPCSTR basename, LPSTR fullname ) FIXME("%s, %s, %p\n", debugstr_a(catalog), debugstr_a(basename), fullname); return 0; } + +static UINT detect_compression_type( LPCWSTR file ) +{ + DWORD size; + HANDLE handle; + UINT type = FILE_COMPRESSION_NONE; + static const BYTE LZ_MAGIC[] = { 0x53, 0x5a, 0x44, 0x44, 0x88, 0xf0, 0x27, 0x33 }; + static const BYTE MSZIP_MAGIC[] = { 0x4b, 0x57, 0x41, 0x4a }; + static const BYTE NTCAB_MAGIC[] = { 0x4d, 0x53, 0x43, 0x46 }; + BYTE buffer[8]; + + handle = CreateFileW( file, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL ); + if (handle == INVALID_HANDLE_VALUE) + { + ERR("cannot open file %s\n", debugstr_w(file)); + return FILE_COMPRESSION_NONE; + } + if (!ReadFile( handle, buffer, sizeof(buffer), &size, NULL ) || size != sizeof(buffer)) + { + CloseHandle( handle ); + return FILE_COMPRESSION_NONE; + } + if (!memcmp( buffer, LZ_MAGIC, sizeof(LZ_MAGIC) )) type = FILE_COMPRESSION_WINLZA; + else if (!memcmp( buffer, MSZIP_MAGIC, sizeof(MSZIP_MAGIC) )) type = FILE_COMPRESSION_MSZIP; + else if (!memcmp( buffer, NTCAB_MAGIC, sizeof(NTCAB_MAGIC) )) type = FILE_COMPRESSION_MSZIP; /* not a typo */ + + CloseHandle( handle ); + return type; +} + +static BOOL get_file_size( LPCWSTR file, DWORD *size ) +{ + HANDLE handle; + + handle = CreateFileW( file, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL ); + if (handle == INVALID_HANDLE_VALUE) + { + ERR("cannot open file %s\n", debugstr_w(file)); + return FALSE; + } + *size = GetFileSize( handle, NULL ); + CloseHandle( handle ); + return TRUE; +} + +static BOOL get_file_sizes_none( LPCWSTR source, DWORD *source_size, DWORD *target_size ) +{ + DWORD size; + + if (!get_file_size( source, &size )) return FALSE; + if (source_size) *source_size = size; + if (target_size) *target_size = size; + return TRUE; +} + +static BOOL get_file_sizes_lz( LPCWSTR source, DWORD *source_size, DWORD *target_size ) +{ + DWORD size; + BOOL ret = TRUE; + + if (source_size) + { + if (!get_file_size( source, &size )) ret = FALSE; + else *source_size = size; + } + if (target_size) + { + INT file; + OFSTRUCT of; + + if ((file = LZOpenFileW( (LPWSTR)source, &of, OF_READ )) < 0) + { + ERR("cannot open source file for reading\n"); + return FALSE; + } + *target_size = LZSeek( file, 0, 2 ); + LZClose( file ); + } + return ret; +} + +static UINT CALLBACK file_compression_info_callback( PVOID context, UINT notification, UINT_PTR param1, UINT_PTR param2 ) +{ + DWORD *size = context; + FILE_IN_CABINET_INFO_W *info = (FILE_IN_CABINET_INFO_W *)param1; + + switch (notification) + { + case SPFILENOTIFY_FILEINCABINET: + { + *size = info->FileSize; + return FILEOP_SKIP; + } + default: return NO_ERROR; + } +} + +static BOOL get_file_sizes_cab( LPCWSTR source, DWORD *source_size, DWORD *target_size ) +{ + DWORD size; + BOOL ret = TRUE; + + if (source_size) + { + if (!get_file_size( source, &size )) ret = FALSE; + else *source_size = size; + } + if (target_size) + { + ret = SetupIterateCabinetW( source, 0, file_compression_info_callback, target_size ); + } + return ret; +} + +/*********************************************************************** + * SetupGetFileCompressionInfoExA (SETUPAPI.@) + * + * See SetupGetFileCompressionInfoExW. + */ +BOOL WINAPI SetupGetFileCompressionInfoExA( PCSTR source, PSTR name, DWORD len, PDWORD required, + PDWORD source_size, PDWORD target_size, PUINT type ) +{ + BOOL ret; + WCHAR *nameW = NULL, *sourceW = NULL; + DWORD nb_chars = 0; + LPSTR nameA; + + TRACE("%s, %p, %d, %p, %p, %p, %p\n", debugstr_a(source), name, len, required, + source_size, target_size, type); + + if (!source || !(sourceW = MultiByteToUnicode( source, CP_ACP ))) return FALSE; + + if (name) + { + ret = SetupGetFileCompressionInfoExW( sourceW, NULL, 0, &nb_chars, NULL, NULL, NULL ); + if (!(nameW = HeapAlloc( GetProcessHeap(), 0, nb_chars * sizeof(WCHAR) ))) + { + MyFree( sourceW ); + return FALSE; + } + } + ret = SetupGetFileCompressionInfoExW( sourceW, nameW, nb_chars, &nb_chars, source_size, target_size, type ); + if (ret) + { + if ((nameA = UnicodeToMultiByte( nameW, CP_ACP ))) + { + if (name && len >= nb_chars) lstrcpyA( name, nameA ); + else + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + ret = FALSE; + } + MyFree( nameA ); + } + } + if (required) *required = nb_chars; + HeapFree( GetProcessHeap(), 0, nameW ); + MyFree( sourceW ); + + return ret; +} + +/*********************************************************************** + * SetupGetFileCompressionInfoExW (SETUPAPI.@) + * + * Get compression type and compressed/uncompressed sizes of a given file. + * + * PARAMS + * source [I] File to examine. + * name [O] Actual filename used. + * len [I] Length in characters of 'name' buffer. + * required [O] Number of characters written to 'name'. + * source_size [O] Size of compressed file. + * target_size [O] Size of uncompressed file. + * type [O] Compression type. + * + * RETURNS + * Success: TRUE + * Failure: FALSE + */ +BOOL WINAPI SetupGetFileCompressionInfoExW( PCWSTR source, PWSTR name, DWORD len, PDWORD required, + PDWORD source_size, PDWORD target_size, PUINT type ) +{ + UINT comp; + BOOL ret = FALSE; + DWORD source_len; + + TRACE("%s, %p, %d, %p, %p, %p, %p\n", debugstr_w(source), name, len, required, + source_size, target_size, type); + + if (!source) return FALSE; + + source_len = lstrlenW( source ) + 1; + if (required) *required = source_len; + if (name && len >= source_len) + { + lstrcpyW( name, source ); + ret = TRUE; + } + else return FALSE; + + comp = detect_compression_type( source ); + if (type) *type = comp; + + switch (comp) + { + case FILE_COMPRESSION_MSZIP: + case FILE_COMPRESSION_NTCAB: ret = get_file_sizes_cab( source, source_size, target_size ); break; + case FILE_COMPRESSION_NONE: ret = get_file_sizes_none( source, source_size, target_size ); break; + case FILE_COMPRESSION_WINLZA: ret = get_file_sizes_lz( source, source_size, target_size ); break; + default: break; + } + return ret; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index c44d1d0..ef92bc0 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -396,6 +396,8 @@ @ stdcall SetupGetBinaryField(ptr long ptr long ptr) @ stdcall SetupGetFieldCount(ptr) @ stub SetupGetFileCompressionInfoA +@ stdcall SetupGetFileCompressionInfoExA(str ptr long ptr ptr ptr ptr) +@ stdcall SetupGetFileCompressionInfoExW(wstr ptr long ptr ptr ptr ptr) @ stub SetupGetFileCompressionInfoW @ stdcall SetupGetFileQueueCount(long long ptr) @ stdcall SetupGetFileQueueFlags(long ptr) diff --git a/include/setupapi.h b/include/setupapi.h index 81d97e0..b6d57b2 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -701,6 +701,11 @@ DECL_WINELIB_SETUPAPI_TYPE_AW(PFILEPATHS) #define SRCINFO_TAGFILE 2 #define SRCINFO_DESCRIPTION 3 +#define FILE_COMPRESSION_NONE 0 +#define FILE_COMPRESSION_WINLZA 1 +#define FILE_COMPRESSION_MSZIP 2 +#define FILE_COMPRESSION_NTCAB 3 + LONG WINAPI AddTagToGroupOrderList(PCWSTR lpGroupName, DWORD dwUnknown2, DWORD dwUnknown3); DWORD WINAPI CaptureAndConvertAnsiArg(PCSTR lpSrc, PWSTR *lpDst); DWORD WINAPI CaptureStringArg(PCWSTR lpSrc, PWSTR *lpDst); @@ -811,6 +816,9 @@ BOOL WINAPI SetupFindNextMatchLineW( PINFCONTEXT context_in, PCWSTR key, PIN #define SetupFindNextMatchLine WINELIB_NAME_AW(SetupFindNextMatchLine) BOOL WINAPI SetupGetBinaryField( PINFCONTEXT context, DWORD index, BYTE *buffer, DWORD size, LPDWORD required ); DWORD WINAPI SetupGetFieldCount( PINFCONTEXT context ); +BOOL WINAPI SetupGetFileCompressionInfoExA(PCSTR, PSTR, DWORD, PDWORD, PDWORD, PDWORD, PUINT); +BOOL WINAPI SetupGetFileCompressionInfoExW(PCWSTR, PWSTR, DWORD, PDWORD, PDWORD, PDWORD, PUINT); +#define SetupGetFileCompressionInfoEx WINELIB_NAME_AW(SetupGetFileCompressionInfoEx) BOOL WINAPI SetupGetFileQueueCount( HSPFILEQ, UINT, PUINT ); BOOL WINAPI SetupGetFileQueueFlags( HSPFILEQ, PDWORD ); BOOL WINAPI SetupGetInfInformationA( LPCVOID, DWORD, PSP_INF_INFORMATION, DWORD, PDWORD);

1 0

H. Verbeet : wined3d: Set the stream offset to 0 in DrawPrimitiveUP/ DrawIndexedPrimitiveUP.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: c9f82b9817178a06af91694e43c440721a16f32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f82b9817178a06af91694e4… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 9 01:55:27 2007 +0200 wined3d: Set the stream offset to 0 in DrawPrimitiveUP/DrawIndexedPrimitiveUP. --- dlls/wined3d/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a463b1a..459a0d7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4407,6 +4407,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitiveUP(IWineD3DDevice *iface, /* Note in the following, it's not this type, but that's the purpose of streamIsUP */ This->stateBlock->streamSource[0] = (IWineD3DVertexBuffer *)pVertexStreamZeroData; + This->stateBlock->streamOffset[0] = 0; This->stateBlock->streamStride[0] = VertexStreamZeroStride; This->stateBlock->streamIsUP = TRUE; This->stateBlock->loadBaseVertexIndex = 0; @@ -4449,6 +4450,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitiveUP(IWineD3DDevice * /* Note in the following, it's not this type, but that's the purpose of streamIsUP */ This->stateBlock->streamSource[0] = (IWineD3DVertexBuffer *)pVertexStreamZeroData; This->stateBlock->streamIsUP = TRUE; + This->stateBlock->streamOffset[0] = 0; This->stateBlock->streamStride[0] = VertexStreamZeroStride; /* Set to 0 as per msdn. Do it now due to the stream source loading during drawPrimitive */

1 0

H. Verbeet : wined3d: Display the stream offset in GetStreamSource/ SetStreamSource traces.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: 38082f2964f8359cab45e7ed37cb5a954b961e69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38082f2964f8359cab45e7ed3… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 9 01:55:16 2007 +0200 wined3d: Display the stream offset in GetStreamSource/SetStreamSource traces. --- dlls/wined3d/device.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 580fcd0..a463b1a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2009,7 +2009,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetStreamSource(IWineD3DDevice *iface, } oldSrc = This->stateBlock->streamSource[StreamNumber]; - TRACE("(%p) : StreamNo: %d, OldStream (%p), NewStream (%p), NewStride %d\n", This, StreamNumber, oldSrc, pStreamData, Stride); + TRACE("(%p) : StreamNo: %u, OldStream (%p), NewStream (%p), OffsetInBytes %u, NewStride %u\n", This, StreamNumber, oldSrc, pStreamData, OffsetInBytes, Stride); This->updateStateBlock->changed.streamSource[StreamNumber] = TRUE; This->updateStateBlock->set.streamSource[StreamNumber] = TRUE; @@ -2053,8 +2053,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetStreamSource(IWineD3DDevice *iface, static HRESULT WINAPI IWineD3DDeviceImpl_GetStreamSource(IWineD3DDevice *iface, UINT StreamNumber,IWineD3DVertexBuffer** pStream, UINT *pOffset, UINT* pStride) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - TRACE("(%p) : StreamNo: %d, Stream (%p), Stride %d\n", This, StreamNumber, - This->stateBlock->streamSource[StreamNumber], This->stateBlock->streamStride[StreamNumber]); + TRACE("(%p) : StreamNo: %u, Stream (%p), Offset %u, Stride %u\n", This, StreamNumber, + This->stateBlock->streamSource[StreamNumber], + This->stateBlock->streamOffset[StreamNumber], + This->stateBlock->streamStride[StreamNumber]); if (StreamNumber >= MAX_STREAMS) { WARN("Stream out of range %d\n", StreamNumber);

1 0

H. Verbeet : wined3d: Don't report render target formats we don' t support as supported.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: 6fd820206a68212217466b24a50af1b6175960e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd820206a68212217466b24a… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 9 01:54:57 2007 +0200 wined3d: Don't report render target formats we don't support as supported. --- dlls/wined3d/directx.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 460385e..e90e2ce 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1672,14 +1672,7 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt return WINED3D_OK; case WINED3DFMT_R16F: case WINED3DFMT_A16B16G16R16F: - if (!GL_SUPPORT(ARB_HALF_FLOAT_PIXEL)) { - TRACE_(d3d_caps)("[FAILED]\n"); - return WINED3DERR_NOTAVAILABLE; - } - /* Fall through, support not fully determined yet. */ - case WINED3DFMT_R32F: - case WINED3DFMT_A32B32G32R32F: - if (!GL_SUPPORT(ARB_TEXTURE_FLOAT)) { + if (!GL_SUPPORT(ARB_HALF_FLOAT_PIXEL) || !GL_SUPPORT(ARB_TEXTURE_FLOAT)) { TRACE_(d3d_caps)("[FAILED]\n"); return WINED3DERR_NOTAVAILABLE; }

1 0

H. Verbeet : wined3d: Add some StretchRectFilterCaps.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: 31663b9eca3f44ddd0d65cc8cdeed5cb851d8c2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31663b9eca3f44ddd0d65cc8c… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 9 01:54:20 2007 +0200 wined3d: Add some StretchRectFilterCaps. --- dlls/wined3d/directx.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f36c654..460385e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2332,7 +2332,10 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, *pCaps->NumSimultaneousRTs = GL_LIMITS(buffers); - *pCaps->StretchRectFilterCaps = 0; + *pCaps->StretchRectFilterCaps = WINED3DPTFILTERCAPS_MINFPOINT | + WINED3DPTFILTERCAPS_MAGFPOINT | + WINED3DPTFILTERCAPS_MINFLINEAR | + WINED3DPTFILTERCAPS_MAGFLINEAR; *pCaps->VertexTextureFilterCaps = 0; if(*pCaps->VertexShaderVersion == WINED3DVS_VERSION(3,0)) {

1 0

H. Verbeet : wined3d: Use the framebuffer blit extension to implement StretchRect.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: 75e91fa4098c80fa390e3c3f8231e2ef69a659d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75e91fa4098c80fa390e3c3f8… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 9 01:54:07 2007 +0200 wined3d: Use the framebuffer blit extension to implement StretchRect. --- dlls/wined3d/device.c | 77 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 12 ++++-- dlls/wined3d/wined3d_private.h | 5 +++ 3 files changed, 90 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 506b61c..580fcd0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -181,6 +181,12 @@ static ULONG WINAPI IWineD3DDeviceImpl_Release(IWineD3DDevice *iface) { if (This->fbo) { GL_EXTCALL(glDeleteFramebuffersEXT(1, &This->fbo)); } + if (This->src_fbo) { + GL_EXTCALL(glDeleteFramebuffersEXT(1, &This->src_fbo)); + } + if (This->dst_fbo) { + GL_EXTCALL(glDeleteFramebuffersEXT(1, &This->dst_fbo)); + } HeapFree(GetProcessHeap(), 0, This->render_targets); HeapFree(GetProcessHeap(), 0, This->fbo_color_attachments); @@ -5242,6 +5248,77 @@ void apply_fbo_state(IWineD3DDevice *iface) { check_fbo_status(iface); } +static BOOL is_onscreen(IWineD3DSurface *target) { + HRESULT hr; + void *tmp; + + hr = IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, &tmp); + if (SUCCEEDED(hr)) { + IWineD3DSwapChain_Release((IUnknown *)tmp); + return TRUE; + } + + return FALSE; +} + +void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const WINED3DRECT *src_rect, + IWineD3DSurface *dst_surface, const WINED3DRECT *dst_rect, const WINED3DTEXTUREFILTERTYPE filter, BOOL flip) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + GLbitfield mask = GL_COLOR_BUFFER_BIT; /* TODO: Support blitting depth/stencil surfaces */ + GLenum gl_filter; + + TRACE("(%p) : src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %s (0x%08x)\n", + This, src_surface, src_rect, dst_surface, dst_rect, debug_d3dtexturefiltertype(filter), filter); + + switch (filter) { + case WINED3DTEXF_LINEAR: + gl_filter = GL_LINEAR; + break; + + default: + FIXME("Unsupported filter mode %s (0x%08x)\n", debug_d3dtexturefiltertype(filter), filter); + case WINED3DTEXF_NONE: + case WINED3DTEXF_POINT: + gl_filter = GL_NEAREST; + break; + } + + /* Attach src surface to src fbo */ + if (is_onscreen(src_surface)) { + GL_EXTCALL(glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0)); + flip = !flip; + } else { + IWineD3DSurface_PreLoad(src_surface); + bind_fbo(iface, GL_READ_FRAMEBUFFER_EXT, &This->src_fbo); + attach_surface_fbo(This, GL_READ_FRAMEBUFFER_EXT, 0, src_surface); + } + + /* Attach dst surface to dst fbo */ + if (is_onscreen(dst_surface)) { + GL_EXTCALL(glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0)); + flip = !flip; + } else { + IWineD3DSurface_PreLoad(dst_surface); + bind_fbo(iface, GL_DRAW_FRAMEBUFFER_EXT, &This->dst_fbo); + attach_surface_fbo(This, GL_DRAW_FRAMEBUFFER_EXT, 0, dst_surface); + } + + if (flip) { + GL_EXTCALL(glBlitFramebufferEXT(src_rect->x1, src_rect->y1, src_rect->x2, src_rect->y2, + dst_rect->x1, dst_rect->y2, dst_rect->x2, dst_rect->y1, mask, gl_filter)); + } else { + GL_EXTCALL(glBlitFramebufferEXT(src_rect->x1, src_rect->y1, src_rect->x2, src_rect->y2, + dst_rect->x1, dst_rect->y1, dst_rect->x2, dst_rect->y2, mask, gl_filter)); + } + + if (This->render_offscreen) { + bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->fbo); + } else { + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); + checkGLcall("glBindFramebuffer()"); + } +} + static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, DWORD RenderTargetIndex, IWineD3DSurface *pRenderTarget) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; WINED3DVIEWPORT viewport; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 34b8e5b..e846b18 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2759,8 +2759,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * } /* Blt is a pretty powerful call, while glCopyTexSubImage2D is not. glCopyTexSubImage cannot - * flip the image nor scale it. If GL_EXT_framebuffer_blit is available it can be used(hopefully, - * not implemented by now). Otherwise: + * flip the image nor scale it. * * -> If the app asks for a unscaled, upside down copy, just perform one glCopyTexSubImage2D call * -> If the app wants a image width an unscaled width, copy it line per line @@ -2769,9 +2768,14 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * * back buffer. This is slower than reading line per line, thus not used for flipping * -> If the app wants a scaled image with a dest rect that is bigger than the fb, it has to be copied * pixel by pixel + * + * If EXT_framebuffer_blit is supported that can be used instead. Note that EXT_framebuffer_blit implies + * FBO support, so it doesn't really make sense to try and make it work with different offscreen rendering + * backends. */ - if(FALSE /* GL_SUPPORT(EXT_FRAMEBUFFER_BLIT) */) { - TRACE("Using GL_EXT_framebuffer_blit for copying\n"); + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && GL_SUPPORT(EXT_FRAMEBUFFER_BLIT)) { + stretch_rect_fbo((IWineD3DDevice *)myDevice, SrcSurface, &srect, + (IWineD3DSurface *)This, &rect, Filter, upsideDown); } else if((!stretchx) || rect.x2 - rect.x1 > Src->currentDesc.Width || rect.y2 - rect.y1 > Src->currentDesc.Height) { TRACE("No stretching in x direction, using direct framebuffer -> texture copy\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 65cd345..d0da532 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -674,6 +674,8 @@ struct IWineD3DDeviceImpl BOOL render_offscreen; WINED3D_DEPTHCOPYSTATE depth_copy_state; GLuint fbo; + GLuint src_fbo; + GLuint dst_fbo; GLenum *draw_buffers; /* Cursor management */ @@ -1969,4 +1971,7 @@ static inline BOOL use_ps(IWineD3DDeviceImpl *device) { && ((IWineD3DPixelShaderImpl *)device->stateBlock->pixelShader)->baseShader.function); } +void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, const WINED3DRECT *src_rect, + IWineD3DSurface *dst_surface, const WINED3DRECT *dst_rect, WINED3DTEXTUREFILTERTYPE filter, BOOL flip); + #endif

1 0

H. Verbeet : wined3d: Separate attaching a surface to an FBO from set_render_target_fbo.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: 70dd7ced99a1ae72f460b3fec97c1714a119dc82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70dd7ced99a1ae72f460b3fec… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 9 01:53:58 2007 +0200 wined3d: Separate attaching a surface to an FBO from set_render_target_fbo. --- dlls/wined3d/device.c | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 99f0690..506b61c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5139,29 +5139,34 @@ static void set_depth_stencil_fbo(IWineD3DDevice *iface, IWineD3DSurface *depth_ } } -static void set_render_target_fbo(IWineD3DDevice *iface, DWORD idx, IWineD3DSurface *render_target) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DSurfaceImpl *rtimpl = (IWineD3DSurfaceImpl *)render_target; +static void attach_surface_fbo(IWineD3DDeviceImpl *This, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface) { + const IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; + GLenum texttarget, target; + GLint old_binding; - TRACE("Set render target %u to %p\n", idx, render_target); + texttarget = surface_impl->glDescription.target; + target = texttarget == GL_TEXTURE_2D ? GL_TEXTURE_2D : GL_TEXTURE_CUBE_MAP_ARB; + glGetIntegerv(texttarget == GL_TEXTURE_2D ? GL_TEXTURE_BINDING_2D : GL_TEXTURE_BINDING_CUBE_MAP_ARB, &old_binding); - if (rtimpl) { - GLenum texttarget, target; - GLint old_binding = 0; + IWineD3DSurface_PreLoad(surface); - texttarget = rtimpl->glDescription.target; - target = texttarget == GL_TEXTURE_2D ? GL_TEXTURE_2D : GL_TEXTURE_CUBE_MAP_ARB; - glGetIntegerv(texttarget == GL_TEXTURE_2D ? GL_TEXTURE_BINDING_2D : GL_TEXTURE_BINDING_CUBE_MAP_ARB, &old_binding); + glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glBindTexture(target, old_binding); - IWineD3DSurface_PreLoad(render_target); + GL_EXTCALL(glFramebufferTexture2DEXT(fbo_target, GL_COLOR_ATTACHMENT0_EXT + idx, texttarget, surface_impl->glDescription.textureName, 0)); - glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glBindTexture(target, old_binding); + checkGLcall("attach_surface_fbo"); +} - GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT + idx, texttarget, rtimpl->glDescription.textureName, 0)); - checkGLcall("glFramebufferTexture2DEXT()"); +static void set_render_target_fbo(IWineD3DDevice *iface, DWORD idx, IWineD3DSurface *render_target) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + IWineD3DSurfaceImpl *rtimpl = (IWineD3DSurfaceImpl *)render_target; + TRACE("Set render target %u to %p\n", idx, render_target); + + if (rtimpl) { + attach_surface_fbo(This, GL_FRAMEBUFFER_EXT, idx, render_target); This->draw_buffers[idx] = GL_COLOR_ATTACHMENT0_EXT + idx; } else { GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT + idx, GL_TEXTURE_2D, 0, 0));

1 0

H. Verbeet : wined3d: Make bind_fbo a bit more generic.
by Alexandre Julliard 09 Apr '07

09 Apr '07

Module: wine Branch: master Commit: 2e1e3d48f21e261376280cee2695393711308e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e1e3d48f21e261376280cee2… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Apr 9 01:53:47 2007 +0200 wined3d: Make bind_fbo a bit more generic. --- dlls/wined3d/device.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2b5a168..99f0690 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5093,14 +5093,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice return WINED3D_OK; } -static void bind_fbo(IWineD3DDevice *iface) { +static void bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - if (!This->fbo) { - GL_EXTCALL(glGenFramebuffersEXT(1, &This->fbo)); + if (!*fbo) { + GL_EXTCALL(glGenFramebuffersEXT(1, fbo)); checkGLcall("glGenFramebuffersEXT()"); } - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, This->fbo)); + GL_EXTCALL(glBindFramebufferEXT(target, *fbo)); checkGLcall("glBindFramebuffer()"); } @@ -5203,7 +5203,7 @@ void apply_fbo_state(IWineD3DDevice *iface) { unsigned int i; if (This->render_offscreen) { - bind_fbo(iface); + bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->fbo); /* Apply render targets */ for (i = 0; i < GL_LIMITS(buffers); ++i) { @@ -5787,13 +5787,13 @@ static void WINAPI IWineD3DDeviceImpl_ResourceReleased(IWineD3DDevice *iface, IW /* Cleanup any FBO attachments */ for (i = 0; i < GL_LIMITS(buffers); ++i) { if (This->fbo_color_attachments[i] == (IWineD3DSurface *)resource) { - bind_fbo(iface); + bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->fbo); set_render_target_fbo(iface, i, NULL); This->fbo_color_attachments[i] = NULL; } } if (This->fbo_depth_attachment == (IWineD3DSurface *)resource) { - bind_fbo(iface); + bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->fbo); set_depth_stencil_fbo(iface, NULL); This->fbo_depth_attachment = NULL; }

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
69
Older →

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 April 2007