March 2012 - Wine-commits - list.winehq.org

André Hentschel : winefile: Remove unused macros.
by Alexandre Julliard 26 Mar '12

26 Mar '12

1 0

André Hentschel : winefile: Resize controls for translations.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: b97b7082bfddde2aca8b4bf52c7644f27acb6e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b97b7082bfddde2aca8b4bf52… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 18 19:23:06 2012 +0100 winefile: Resize controls for translations. --- programs/winefile/winefile.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winefile/winefile.rc b/programs/winefile/winefile.rc index f2dbdd6..ce7390e 100644 --- a/programs/winefile/winefile.rc +++ b/programs/winefile/winefile.rc @@ -125,9 +125,9 @@ FONT 8, "MS Shell Dlg" CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 CONTROL "&Path:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Cancel", 2, 158, 23, 47, 14 - PUSHBUTTON "&Browse...", 254, 158, 43, 47, 14 + DEFPUSHBUTTON "OK", 1, 145, 6, 60, 14 + PUSHBUTTON "Cancel", 2, 145, 23, 60, 14 + PUSHBUTTON "&Browse...", 254, 145, 43, 60, 14 } IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 105

1 0

André Hentschel : winefile: Fully convert to unicode.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: a8e2b24006b711ff9ec0230d55dfcd025c352329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e2b24006b711ff9ec0230d5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 18 19:24:28 2012 +0100 winefile: Fully convert to unicode. --- programs/winefile/Makefile.in | 2 +- programs/winefile/winefile.c | 31 ++++++++----------------------- programs/winefile/winefile.h | 4 ---- 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/programs/winefile/Makefile.in b/programs/winefile/Makefile.in index da1818e..efd2bf3 100644 --- a/programs/winefile/Makefile.in +++ b/programs/winefile/Makefile.in @@ -1,6 +1,6 @@ EXTRADEFS = -D__WINE__ MODULE = winefile.exe -APPMODE = -mwindows +APPMODE = -mwindows -municode IMPORTS = uuid shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi32 C_SRCS = \ diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 6c300df..2537f62 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -1761,6 +1761,7 @@ static void CheckForFileInfo(struct PropertiesDialog* dlg, HWND hwnd, LPCWSTR st static WCHAR sTranslation[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n','\0'}; static WCHAR sStringFileInfo[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\', '%','0','4','x','%','0','4','x','\\','%','s','\0'}; + static WCHAR sFmt[] = {'%','d','.','%','d','.','%','d','.','%','d','\0'}; DWORD dwVersionDataLen = GetFileVersionInfoSizeW(strFilename, NULL); if (dwVersionDataLen) { @@ -1773,13 +1774,13 @@ static void CheckForFileInfo(struct PropertiesDialog* dlg, HWND hwnd, LPCWSTR st if (VerQueryValueW(dlg->pVersionData, sBackSlash, &pVal, &nValLen)) { if (nValLen == sizeof(VS_FIXEDFILEINFO)) { VS_FIXEDFILEINFO* pFixedFileInfo = (VS_FIXEDFILEINFO*)pVal; - char buffer[BUFFER_LEN]; + WCHAR buffer[BUFFER_LEN]; - sprintf(buffer, "%d.%d.%d.%d", - HIWORD(pFixedFileInfo->dwFileVersionMS), LOWORD(pFixedFileInfo->dwFileVersionMS), - HIWORD(pFixedFileInfo->dwFileVersionLS), LOWORD(pFixedFileInfo->dwFileVersionLS)); + sprintfW(buffer, sFmt, + HIWORD(pFixedFileInfo->dwFileVersionMS), LOWORD(pFixedFileInfo->dwFileVersionMS), + HIWORD(pFixedFileInfo->dwFileVersionLS), LOWORD(pFixedFileInfo->dwFileVersionLS)); - SetDlgItemTextA(hwnd, IDC_STATIC_PROP_VERSION, buffer); + SetDlgItemTextW(hwnd, IDC_STATIC_PROP_VERSION, buffer); } } @@ -4377,13 +4378,13 @@ static void ExitInstance(void) ImageList_Destroy(Globals.himl); } -static int winefile_main(HINSTANCE hinstance, int cmdshow, LPCWSTR path) +int APIENTRY wWinMain(HINSTANCE hinstance, HINSTANCE previnstance, LPWSTR cmdline, int cmdshow) { MSG msg; InitInstance(hinstance); - if( !show_frame(0, cmdshow, path) ) + if( !show_frame(0, cmdshow, cmdline) ) { ExitInstance(); return 1; @@ -4404,19 +4405,3 @@ static int winefile_main(HINSTANCE hinstance, int cmdshow, LPCWSTR path) return msg.wParam; } - - -#if defined(_MSC_VER) -int APIENTRY wWinMain(HINSTANCE hinstance, HINSTANCE previnstance, LPWSTR cmdline, int cmdshow) -#else -int APIENTRY WinMain(HINSTANCE hinstance, HINSTANCE previnstance, LPSTR cmdline, int cmdshow) -#endif -{ - { /* convert ANSI cmdline into WCS path string */ - WCHAR buffer[MAX_PATH]; - MultiByteToWideChar(CP_ACP, 0, cmdline, -1, buffer, MAX_PATH); - winefile_main(hinstance, cmdshow, buffer); - } - - return 0; -} diff --git a/programs/winefile/winefile.h b/programs/winefile/winefile.h index 04aeb57..60b4aa1 100644 --- a/programs/winefile/winefile.h +++ b/programs/winefile/winefile.h @@ -30,16 +30,12 @@ #define NONAMELESSUNION #include <windows.h> -#include <commctrl.h> #include <commdlg.h> #ifdef UNICODE #define _UNICODE #endif -#include <stdlib.h> -#include <stdio.h> -#include <ctype.h> #include <locale.h> #include <time.h>

1 0

André Hentschel : view: Show the filename in the window title.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: c275fd73fd5046f35709ee1f90f1baaff9a0095f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c275fd73fd5046f35709ee1f9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 18 19:31:15 2012 +0100 view: Show the filename in the window title. --- programs/view/view.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index c50a0ff..ebd48aa 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -25,7 +25,8 @@ static HINSTANCE hInst; static HWND hMainWnd; static WCHAR szAppName[5] = {'V','i','e','w',0}; -static WCHAR szTitle[80]; +static WCHAR szTitle[MAX_PATH]; +static WCHAR szFileTitle[MAX_PATH]; static HMETAFILE hmf; static HENHMETAFILE enhmf; @@ -204,6 +205,27 @@ static void DoOpenFile(LPCWSTR filename) InvalidateRect( hMainWnd, NULL, TRUE ); } +static void UpdateWindowCaption(void) +{ + WCHAR szCaption[MAX_PATH]; + WCHAR szView[MAX_PATH]; + static const WCHAR hyphenW[] = { ' ','-',' ',0 }; + + LoadStringW(hInst, IDS_DESCRIPTION, szView, sizeof(szView)/sizeof(WCHAR)); + + if (szFileTitle[0] != '\0') + { + lstrcpyW(szCaption, szFileTitle); + LoadStringW(hInst, IDS_DESCRIPTION, szView, sizeof(szView)/sizeof(WCHAR)); + lstrcatW(szCaption, hyphenW); + lstrcatW(szCaption, szView); + } + else + lstrcpyW(szCaption, szView); + + SetWindowTextW(hMainWnd, szCaption); +} + static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM lparam) { switch (uMessage) @@ -236,7 +258,12 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM { WCHAR filename[MAX_PATH]; if (FileOpen(hwnd, filename, sizeof(filename)/sizeof(WCHAR))) + { + szFileTitle[0] = 0; + GetFileTitleW(filename, szFileTitle, sizeof(szFileTitle)); DoOpenFile(filename); + UpdateWindowCaption(); + } } break;

1 0

André Hentschel : winemaker: Handle library search pragmas.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 37c702b534a49aa2039dba0758c204f6ccc3f55b URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c702b534a49aa2039dba075… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 19 21:02:07 2012 +0100 winemaker: Handle library search pragmas. --- tools/winemaker | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 91032f0..58d6bfe 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -3,7 +3,7 @@ use strict; # Copyright 2000-2004 Francois Gouget for CodeWeavers # Copyright 2004 Dimitrie O. Paun -# Copyright 2009-2011 André Hentschel +# Copyright 2009-2012 André Hentschel # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -20,7 +20,7 @@ use strict; # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # -my $version="0.8.2"; +my $version="0.8.3"; use Cwd; use File::Basename; @@ -2109,6 +2109,11 @@ sub fix_file($$$) print FILEO "$1$2$real_include_name$4$'"; $modified|=($real_include_name ne $3); + } elsif (/^(\s*)\#\s*pragma\s+comment\s*$\s*lib\s*,\s*\"(\w+)\.lib\"\s*$/) { + my $pragma_indent=$1; + my $pragma_lib=$2; + push @{@$target[$T_LIBRARIES]},$pragma_lib; + print FILEO "$pragma_indent/* winemaker: Added -l$pragma_lib to the libraries */\n"; } elsif (s/^(\s*)(\#\s*pragma\s+pack\s*\(\s*)//) { # Pragma pack handling # @@ -2658,7 +2663,7 @@ sub print_banner() print "Winemaker $version\n"; print "Copyright 2000-2004 Francois Gouget <fgouget\(a)codeweavers.com> for CodeWeavers\n"; print "Copyright 2004 Dimitrie O. Paun\n"; - print "Copyright 2009-2011 André Hentschel\n"; + print "Copyright 2009-2012 André Hentschel\n"; } sub usage()

1 0

Józef Kucia : d3dx9/tests: Test the DDS support in the D3DXGetImageInfo functions.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 3a210af1070818f901294b5db47265b9bbd022c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a210af1070818f901294b5db… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Mar 25 15:40:39 2012 +0200 d3dx9/tests: Test the DDS support in the D3DXGetImageInfo functions. --- dlls/d3dx9_36/tests/surface.c | 113 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 2e9da17..0082dbb 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -60,6 +60,66 @@ static const unsigned char noimage[4] = { 0x11,0x22,0x33,0x44 }; +/* 2x2 24-bit dds, 2 mipmaps */ +static const unsigned char dds_24bit[] = { +0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x0a,0x00,0x02,0x00,0x00,0x00, +0x02,0x00,0x00,0x00,0x0c,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, +0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0xff,0x00, +0x00,0xff,0x00,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x10,0x40,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff +}; + +/* 2x2 16-bit dds, no mipmaps */ +static const unsigned char dds_16bit[] = { +0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x08,0x00,0x02,0x00,0x00,0x00, +0x02,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, +0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x7c,0x00,0x00, +0xe0,0x03,0x00,0x00,0x1f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0xff,0x7f,0xff,0x7f,0xff,0x7f,0xff,0x7f +}; + +/* 4x4 cube map dds */ +static const unsigned char dds_cube_map[] = { +0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x08,0x00,0x04,0x00,0x00,0x00, +0x04,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, +0x04,0x00,0x00,0x00,0x44,0x58,0x54,0x35,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x10,0x00,0x00, +0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, +0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, +0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, +0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, +0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, +0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50 +}; + +/* 4x4x2 volume map dds, 2 mipmaps */ +static const unsigned char dds_volume_map[] = { +0x44,0x44,0x53,0x20,0x7c,0x00,0x00,0x00,0x07,0x10,0x8a,0x00,0x04,0x00,0x00,0x00, +0x04,0x00,0x00,0x00,0x10,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x03,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00, +0x04,0x00,0x00,0x00,0x44,0x58,0x54,0x33,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x10,0x40,0x00, +0x00,0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, +0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xef,0x87,0x0f,0x78,0x05,0x05,0x50,0x50, +0xff,0x00,0xff,0x00,0x00,0x00,0x00,0x00,0x2f,0x7e,0xcf,0x79,0x01,0x54,0x5c,0x5c, +0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x84,0xef,0x7b,0xaa,0xab,0xab,0xab +}; + static HRESULT create_file(const char *filename, const unsigned char *data, const unsigned int size) { DWORD received; @@ -199,6 +259,59 @@ static void test_D3DXGetImageInfo(void) hr = D3DXGetImageInfoFromFileInMemory(NULL, 0, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + /* test DDS support */ + todo_wine { + hr = D3DXGetImageInfoFromFileInMemory(dds_24bit, sizeof(dds_24bit), &info); + ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + if (hr == D3D_OK) { + ok(info.Width == 2, "Got width %u, expected 2\n", info.Width); + ok(info.Height == 2, "Got height %u, expected 2\n", info.Height); + ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); + ok(info.MipLevels == 2, "Got miplevels %u, expected 2\n", info.MipLevels); + ok(info.Format == D3DFMT_R8G8B8, "Got format is %#x, expected %#x\n", info.Format, D3DFMT_R8G8B8); + ok(info.ResourceType == D3DRTYPE_TEXTURE, "Got resource type %#x, expected %#x\n", info.ResourceType, D3DRTYPE_TEXTURE); + ok(info.ImageFileFormat == D3DXIFF_DDS, "Got image file format %#x, expected %#x\n", info.ImageFileFormat, D3DXIFF_DDS); + } else skip("Couldn't get image info from 24-bit DDS file in memory\n"); + + hr = D3DXGetImageInfoFromFileInMemory(dds_16bit, sizeof(dds_16bit), &info); + ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + if (hr == D3D_OK) { + ok(info.Width == 2, "Got width %u, expected 2\n", info.Width); + ok(info.Height == 2, "Got height %u, expected 2\n", info.Height); + ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); + ok(info.MipLevels == 1, "Got miplevels %u, expected 1\n", info.MipLevels); + ok(info.Format == D3DFMT_X1R5G5B5, "Got format is %#x, expected %#x\n", info.Format, D3DFMT_X1R5G5B5); + ok(info.ResourceType == D3DRTYPE_TEXTURE, "Got resource type %#x, expected %#x\n", info.ResourceType, D3DRTYPE_TEXTURE); + ok(info.ImageFileFormat == D3DXIFF_DDS, "Got image file format %#x, expected %#x\n", info.ImageFileFormat, D3DXIFF_DDS); + } else skip("Couldn't get image info from 16-bit DDS file in memory\n"); + + hr = D3DXGetImageInfoFromFileInMemory(dds_cube_map, sizeof(dds_cube_map), &info); + ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + if (hr == D3D_OK) { + ok(info.Width == 4, "Got width %u, expected 4\n", info.Width); + ok(info.Height == 4, "Got height %u, expected 4\n", info.Height); + ok(info.Depth == 1, "Got depth %u, expected 1\n", info.Depth); + ok(info.MipLevels == 1, "Got miplevels %u, expected 1\n", info.MipLevels); + ok(info.Format == D3DFMT_DXT5, "Got format is %#x, expected %#x\n", info.Format, D3DFMT_DXT5); + ok(info.ResourceType == D3DRTYPE_CUBETEXTURE, "Got resource type %#x, expected %#x\n", info.ResourceType, D3DRTYPE_CUBETEXTURE); + ok(info.ImageFileFormat == D3DXIFF_DDS, "Got image file format %#x, expected %#x\n", info.ImageFileFormat, D3DXIFF_DDS); + } else skip("Couldn't get image info from cube map in memory\n"); + + hr = D3DXGetImageInfoFromFileInMemory(dds_volume_map, sizeof(dds_volume_map), &info); + ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + if (hr == D3D_OK) { + ok(info.Width == 4, "Got width %u, expected 4\n", info.Width); + ok(info.Height == 4, "Got height %u, expected 4\n", info.Height); + ok(info.Depth == 2, "Got depth %u, expected 2\n", info.Depth); + ok(info.MipLevels == 3, "Got miplevels %u, expected 3\n", info.MipLevels); + ok(info.Format == D3DFMT_DXT3, "Got format is %#x, expected %#x\n", info.Format, D3DFMT_DXT3); + ok(info.ResourceType == D3DRTYPE_VOLUMETEXTURE, "Got resource type %#x, expected %#x\n", info.ResourceType, D3DRTYPE_VOLUMETEXTURE); + ok(info.ImageFileFormat == D3DXIFF_DDS, "Got image file format %#x, expected %#x\n", info.ImageFileFormat, D3DXIFF_DDS); + } else skip("Couldn't get image info from volume map in memory\n"); + } + + /* cleanup */ if(testdummy_ok) DeleteFileA("testdummy.bmp"); if(testbitmap_ok) DeleteFileA("testbitmap.bmp");

1 0

Józef Kucia : d3dx9: Forward D3DXCreateCubeTextureFromFileInMemory to D3DXCreateCubeTextureFromFileInMemoryEx .
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: dfd66e5fe0db3167ad67e4617bfe38480f90a76e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfd66e5fe0db3167ad67e4617… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Mar 25 15:40:40 2012 +0200 d3dx9: Forward D3DXCreateCubeTextureFromFileInMemory to D3DXCreateCubeTextureFromFileInMemoryEx. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/texture.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 70ff3d9..36eef20 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -38,7 +38,7 @@ @ stub D3DXCreateCubeTextureFromFileA(ptr ptr ptr) @ stub D3DXCreateCubeTextureFromFileExA(ptr ptr long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromFileExW(ptr ptr long long long long long long long long ptr ptr ptr) -@ stub D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) +@ stdcall D3DXCreateCubeTextureFromFileInMemory(ptr ptr long ptr) @ stdcall D3DXCreateCubeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateCubeTextureFromFileW(ptr ptr ptr) @ stub D3DXCreateCubeTextureFromResourceA(ptr long ptr ptr) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 4fc6eff..b54c44c 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -908,6 +908,17 @@ HRESULT WINAPI D3DXCreateCubeTexture(LPDIRECT3DDEVICE9 device, return IDirect3DDevice9_CreateCubeTexture(device, size, miplevels, usage, format, pool, texture, NULL); } +HRESULT WINAPI D3DXCreateCubeTextureFromFileInMemory(LPDIRECT3DDEVICE9 device, + LPCVOID data, + UINT datasize, + LPDIRECT3DCUBETEXTURE9 *texture) +{ + TRACE("(%p, %p, %u, %p)\n", device, data, datasize, texture); + + return D3DXCreateCubeTextureFromFileInMemoryEx(device, data, datasize, D3DX_DEFAULT, D3DX_DEFAULT, + 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, NULL, NULL, texture); +} + HRESULT WINAPI D3DXCreateVolumeTexture(LPDIRECT3DDEVICE9 device, UINT width, UINT height,

1 0

Józef Kucia : d3dx9: Add stubs for D3DXCreateVolumeTextureFromFileInMemory functions.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: e0f2d4cf915b343424f16b71b80fdc6a9cf1a578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0f2d4cf915b343424f16b71b… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Mar 25 15:40:41 2012 +0200 d3dx9: Add stubs for D3DXCreateVolumeTextureFromFileInMemory functions. --- dlls/d3dx9_36/d3dx9_36.spec | 4 ++-- dlls/d3dx9_36/texture.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 36eef20..b0f7988 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -110,8 +110,8 @@ @ stub D3DXCreateVolumeTextureFromFileA(ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromFileExA(ptr ptr long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromFileExW(ptr ptr long long long long long long long long long long ptr ptr ptr) -@ stub D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) -@ stub D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) +@ stdcall D3DXCreateVolumeTextureFromFileInMemory(ptr ptr long ptr) +@ stdcall D3DXCreateVolumeTextureFromFileInMemoryEx(ptr ptr long long long long long long long long long long long ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromFileW(ptr ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceA(ptr long ptr ptr) @ stub D3DXCreateVolumeTextureFromResourceExA(ptr long ptr long long long long long long long long long long ptr ptr ptr) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index b54c44c..1606c9a 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -950,6 +950,42 @@ HRESULT WINAPI D3DXCreateVolumeTexture(LPDIRECT3DDEVICE9 device, usage, format, pool, texture, NULL); } +HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemory(LPDIRECT3DDEVICE9 device, + LPCVOID data, + UINT datasize, + LPDIRECT3DVOLUMETEXTURE9 *texture) +{ + TRACE("(%p, %p, %u, %p)\n", device, data, datasize, texture); + + return D3DXCreateVolumeTextureFromFileInMemoryEx(device, data, datasize, D3DX_DEFAULT, D3DX_DEFAULT, + D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, + 0, NULL, NULL, texture); +} + +HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(LPDIRECT3DDEVICE9 device, + LPCVOID data, + UINT datasize, + UINT width, + UINT height, + UINT depth, + UINT miplevels, + DWORD usage, + D3DFORMAT format, + D3DPOOL pool, + DWORD filter, + DWORD mipfilter, + D3DCOLOR colorkey, + D3DXIMAGE_INFO *imageinfo, + PALETTEENTRY *palette, + LPDIRECT3DVOLUMETEXTURE9 *texture) +{ + FIXME("(%p, %p, %u, %u, %u, %u, %u, %#x, %#x, %#x, %#x, %#x, %#x, %p, %p, %p) : stub\n", + device, data, datasize, width, height, depth, miplevels, usage, format, pool, + filter, mipfilter, colorkey, imageinfo, palette, texture); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DXFillTexture(LPDIRECT3DTEXTURE9 texture, LPD3DXFILL2D function, LPVOID funcdata)

1 0

Józef Kucia : d3dx9/tests: Add tests for D3DXCreateCubeTextureFromFileInMemory.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 7f3f5dd1eb4e4a7516cb6cc1d581b78eece31c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3f5dd1eb4e4a7516cb6cc1d… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Mar 25 15:40:42 2012 +0200 d3dx9/tests: Add tests for D3DXCreateCubeTextureFromFileInMemory. --- dlls/d3dx9_36/tests/surface.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 0082dbb..1a39ed7 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -739,6 +739,46 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) if(testbitmap_ok) DeleteFileA("testbitmap.bmp"); } +static void test_D3DXCreateCubeTexture(IDirect3DDevice9 *device) +{ + HRESULT hr; + ULONG ref; + DWORD levelcount; + IDirect3DCubeTexture9 *cube_texture; + D3DSURFACE_DESC surface_desc; + + todo_wine { + hr = D3DXCreateCubeTextureFromFileInMemory(NULL, dds_cube_map, sizeof(dds_cube_map), &cube_texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateCubeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateCubeTextureFromFileInMemory(device, NULL, sizeof(dds_cube_map), &cube_texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateCubeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateCubeTextureFromFileInMemory(device, dds_cube_map, 0, &cube_texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateCubeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateCubeTextureFromFileInMemory(device, dds_cube_map, sizeof(dds_cube_map), NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateCubeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateCubeTextureFromFileInMemory(device, dds_cube_map, sizeof(dds_cube_map), &cube_texture); + if(SUCCEEDED(hr)) { + levelcount = IDirect3DCubeTexture9_GetLevelCount(cube_texture); + ok(levelcount == 3, "GetLevelCount returned %u, expected 3\n", levelcount); + + hr = IDirect3DCubeTexture9_GetLevelDesc(cube_texture, 0, &surface_desc); + ok(hr == D3D_OK, "GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); + ok(surface_desc.Width == 4, "Got width %u, expected 4\n", surface_desc.Width); + ok(surface_desc.Height == 4, "Got height %u, expected 4\n", surface_desc.Height); + + hr = IDirect3DCubeTexture9_GetLevelDesc(cube_texture, 3, &surface_desc); + ok(hr == D3DERR_INVALIDCALL, "GetLevelDesc returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + ref = IDirect3DCubeTexture9_Release(cube_texture); + ok(ref == 0, "Invalid reference count. Got %u, expected 0\n", ref); + } else skip("Couldn't create cube texture\n"); + } +} + START_TEST(surface) { HWND wnd; @@ -772,6 +812,7 @@ START_TEST(surface) test_D3DXGetImageInfo(); test_D3DXLoadSurface(device); + test_D3DXCreateCubeTexture(device); check_release((IUnknown*)device, 0); check_release((IUnknown*)d3d, 0);

1 0

Józef Kucia : d3dx9/tests: Add tests for D3DXCreateVolumeTextureFromFileInMemory.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: f8015cd235954eed0311e42d379d5310abb63407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8015cd235954eed0311e42d3… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Mar 25 15:40:43 2012 +0200 d3dx9/tests: Add tests for D3DXCreateVolumeTextureFromFileInMemory. --- dlls/d3dx9_36/tests/surface.c | 45 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 1a39ed7..87aa03e 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -779,6 +779,50 @@ static void test_D3DXCreateCubeTexture(IDirect3DDevice9 *device) } } +static void test_D3DXCreateVolumeTexture(IDirect3DDevice9 *device) +{ + HRESULT hr; + ULONG ref; + DWORD levelcount; + IDirect3DVolumeTexture9 *volume_texture; + D3DVOLUME_DESC volume_desc; + + todo_wine { + hr = D3DXCreateVolumeTextureFromFileInMemory(NULL, dds_volume_map, sizeof(dds_volume_map), &volume_texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateVolumeTextureFromFileInMemory(device, NULL, sizeof(dds_volume_map), &volume_texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateVolumeTextureFromFileInMemory(device, dds_volume_map, 0, &volume_texture); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateVolumeTextureFromFileInMemory(device, dds_volume_map, sizeof(dds_volume_map), NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXCreateVolumeTextureFromFileInMemory(device, dds_volume_map, sizeof(dds_volume_map), &volume_texture); + if(SUCCEEDED(hr)) { + levelcount = IDirect3DVolumeTexture9_GetLevelCount(volume_texture); + ok(levelcount == 3, "GetLevelCount returned %u, expected 3\n", levelcount); + + hr = IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 0, &volume_desc); + ok(hr == D3D_OK, "GetLevelDesc returend %#x, expected %#x\n", hr, D3D_OK); + ok(volume_desc.Width == 4, "Got width %u, expected 4\n", volume_desc.Width); + ok(volume_desc.Height == 4, "Got height %u, expected 4\n", volume_desc.Height); + ok(volume_desc.Depth == 2, "Got depth %u, expected 2\n", volume_desc.Depth); + + hr = IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 1, &volume_desc); + ok(hr == D3D_OK, "GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); + ok(volume_desc.Width == 2, "Got width %u, expected 2\n", volume_desc.Width); + ok(volume_desc.Height == 2, "Got height %u, expected 2\n", volume_desc.Height); + ok(volume_desc.Depth == 1, "Got depth %u, expected 1\n", volume_desc.Depth); + + ref = IDirect3DVolumeTexture9_Release(volume_texture); + ok(ref == 0, "Invalid reference count. Got %u, expected 0\n", ref); + } + } +} + START_TEST(surface) { HWND wnd; @@ -813,6 +857,7 @@ START_TEST(surface) test_D3DXGetImageInfo(); test_D3DXLoadSurface(device); test_D3DXCreateCubeTexture(device); + test_D3DXCreateVolumeTexture(device); check_release((IUnknown*)device, 0); check_release((IUnknown*)d3d, 0);

1 0