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

Tony Wasserka : d3dx9: Add tests for D3DXLoadSurfaceFromSurface.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 3db6a67160c63e9dcdef36bdbd17ec06892c58da URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db6a67160c63e9dcdef36bdb… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Thu Jun 25 20:14:43 2009 +0200 d3dx9: Add tests for D3DXLoadSurfaceFromSurface. --- dlls/d3dx9_36/tests/texture.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 3fc43e6..c2f47f2 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -209,7 +209,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) { HRESULT hr; BOOL testdummy_ok, testbitmap_ok; - IDirect3DSurface9 *surf; + IDirect3DSurface9 *surf, *newsurf; RECT rect; hr = create_file("testdummy.bmp", noimage, sizeof(noimage)); /* invalid image */ @@ -319,6 +319,23 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) ok(hr == E_FAIL, "D3DXLoadSurfaceFromMemory returned %#x, expected %#x\n", hr, E_FAIL); + /* D3DXLoadSurfaceFromSurface */ + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 256, 256, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &newsurf, NULL); + if(SUCCEEDED(hr)) { + todo_wine { + hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_DEFAULT, 0); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3D_OK); + } + + hr = D3DXLoadSurfaceFromSurface(NULL, NULL, NULL, surf, NULL, NULL, D3DX_DEFAULT, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, NULL, NULL, NULL, D3DX_DEFAULT, 0); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + } else skip("Failed to create a second surface\n"); + check_release((IUnknown*)newsurf, 0); + + /* cleanup */ check_release((IUnknown*)surf, 0);

1 0

Nikolay Sivov : comctl32/toolbar: Move initialization to WM_NCREATE handler .
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: e7dc4ed07f01274adb299768ba8c3cf995faf844 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7dc4ed07f01274adb299768b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jun 26 13:37:55 2009 +0400 comctl32/toolbar: Move initialization to WM_NCREATE handler. --- dlls/comctl32/toolbar.c | 66 ++++++++++++++++++++++++---------------------- 1 files changed, 34 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 9bbac21..cd279f9 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5237,38 +5237,7 @@ TOOLBAR_Create (HWND hwnd, LPARAM lParam) TRACE("hwnd = %p\n", hwnd); - /* initialize info structure */ - infoPtr->nButtonWidth = 23; - infoPtr->nButtonHeight = 22; - infoPtr->nBitmapHeight = 16; - infoPtr->nBitmapWidth = 16; - - infoPtr->nMaxTextRows = 1; - infoPtr->cxMin = -1; - infoPtr->cxMax = -1; - infoPtr->nNumBitmaps = 0; - infoPtr->nNumStrings = 0; - - infoPtr->bCaptured = FALSE; - infoPtr->nButtonDown = -1; - infoPtr->nButtonDrag = -1; - infoPtr->nOldHit = -1; - infoPtr->nHotItem = -1; - infoPtr->hwndNotify = ((LPCREATESTRUCTW)lParam)->hwndParent; - infoPtr->dwDTFlags = (dwStyle & TBSTYLE_LIST) ? DT_LEFT | DT_VCENTER | DT_SINGLELINE | DT_END_ELLIPSIS: DT_CENTER | DT_END_ELLIPSIS; - infoPtr->bAnchor = FALSE; /* no anchor highlighting */ - infoPtr->bDragOutSent = FALSE; - infoPtr->iVersion = 0; - infoPtr->hwndSelf = hwnd; - infoPtr->bDoRedraw = TRUE; - infoPtr->clrBtnHighlight = CLR_DEFAULT; - infoPtr->clrBtnShadow = CLR_DEFAULT; - infoPtr->szPadding.cx = DEFPAD_CX; - infoPtr->szPadding.cy = DEFPAD_CY; - infoPtr->iListGap = DEFLISTGAP; - infoPtr->iTopMargin = default_top_margin(infoPtr); infoPtr->dwStyle = dwStyle; - infoPtr->tbim.iButton = -1; GetClientRect(hwnd, &infoPtr->client_rect); infoPtr->bUnicode = infoPtr->hwndNotify && (NFR_UNICODE == SendMessageW(hwnd, WM_NOTIFYFORMAT, (WPARAM)hwnd, (LPARAM)NF_REQUERY)); @@ -6002,7 +5971,7 @@ static LRESULT TOOLBAR_NCCreate (HWND hwnd, WPARAM wParam, LPARAM lParam) { TOOLBAR_INFO *infoPtr; - LPCREATESTRUCTA cs = (LPCREATESTRUCTA)lParam; + LPCREATESTRUCTW cs = (LPCREATESTRUCTW)lParam; DWORD styleadd = 0; /* allocate memory for info structure */ @@ -6014,6 +5983,39 @@ TOOLBAR_NCCreate (HWND hwnd, WPARAM wParam, LPARAM lParam) infoPtr->nRows = 1; infoPtr->nWidth = 0; + /* initialize info structure */ + infoPtr->nButtonWidth = 23; + infoPtr->nButtonHeight = 22; + infoPtr->nBitmapHeight = 16; + infoPtr->nBitmapWidth = 16; + + infoPtr->nMaxTextRows = 1; + infoPtr->cxMin = -1; + infoPtr->cxMax = -1; + infoPtr->nNumBitmaps = 0; + infoPtr->nNumStrings = 0; + + infoPtr->bCaptured = FALSE; + infoPtr->nButtonDown = -1; + infoPtr->nButtonDrag = -1; + infoPtr->nOldHit = -1; + infoPtr->nHotItem = -1; + infoPtr->hwndNotify = cs->hwndParent; + infoPtr->dwDTFlags = (cs->style & TBSTYLE_LIST) ? DT_LEFT | DT_VCENTER | DT_SINGLELINE | DT_END_ELLIPSIS: DT_CENTER | DT_END_ELLIPSIS; + infoPtr->bAnchor = FALSE; /* no anchor highlighting */ + infoPtr->bDragOutSent = FALSE; + infoPtr->iVersion = 0; + infoPtr->hwndSelf = hwnd; + infoPtr->bDoRedraw = TRUE; + infoPtr->clrBtnHighlight = CLR_DEFAULT; + infoPtr->clrBtnShadow = CLR_DEFAULT; + infoPtr->szPadding.cx = DEFPAD_CX; + infoPtr->szPadding.cy = DEFPAD_CY; + infoPtr->iListGap = DEFLISTGAP; + infoPtr->iTopMargin = default_top_margin(infoPtr); + infoPtr->dwStyle = cs->style; + infoPtr->tbim.iButton = -1; + /* fix instance handle, if the toolbar was created by CreateToolbarEx() */ if (!GetWindowLongPtrW (hwnd, GWLP_HINSTANCE)) { HINSTANCE hInst = (HINSTANCE)GetWindowLongPtrW (GetParent (hwnd), GWLP_HINSTANCE);

1 0

Francois Gouget : gdi32/tests: Fix the trailing '\n' of a few ok() calls.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 4f0c6a31722ab8bd7c7a7ef4cba2f496cff6c41f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0c6a31722ab8bd7c7a7ef4c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 26 11:52:35 2009 +0200 gdi32/tests: Fix the trailing '\n' of a few ok() calls. --- dlls/gdi32/tests/font.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index b8b5084..d58b8be 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2936,7 +2936,7 @@ void test_GetTextMetrics2( const char *fontname) of = SelectObject( hdc, hf); ret = GetObjectA( hf, sizeof( lf), &lf); ret = GetTextMetricsA( hdc, &tm); - ok(ret, "GetTextMetricsA error %u, ", GetLastError()); + ok(ret, "GetTextMetricsA error %u\n", GetLastError()); avecharw[0] =tm.tmAveCharWidth; maxcharw[0] =tm.tmMaxCharWidth; SelectObject( hdc, of); @@ -2950,7 +2950,7 @@ void test_GetTextMetrics2( const char *fontname) of = SelectObject( hdc, hf); ret = GetObjectA( hf, sizeof( lf), &lf); ret = GetTextMetricsA( hdc, &tm); - ok(ret, "GetTextMetricsA error %u, ", GetLastError()); + ok(ret, "GetTextMetricsA error %u\n", GetLastError()); avecharw[1] =tm.tmAveCharWidth; maxcharw[1] =tm.tmMaxCharWidth; SelectObject( hdc, of); @@ -2964,7 +2964,7 @@ void test_GetTextMetrics2( const char *fontname) of = SelectObject( hdc, hf); ret = GetObjectA( hf, sizeof( lf), &lf); ret = GetTextMetricsA( hdc, &tm); - ok(ret, "GetTextMetricsA error %u, ", GetLastError()); + ok(ret, "GetTextMetricsA error %u\n", GetLastError()); avecharw[2] =tm.tmAveCharWidth; maxcharw[2] =tm.tmMaxCharWidth; SelectObject( hdc, of);

1 0

Francois Gouget : wined3d: Add a trailing '\n' to a FIXME() trace.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 5aac7fe783026b2dc8cb76aa1ded1ef11c3d573b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aac7fe783026b2dc8cb76aa1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 26 11:52:40 2009 +0200 wined3d: Add a trailing '\n' to a FIXME() trace. --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 07c1b22..b700763 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4101,7 +4101,7 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use if (entry->np2Fixup_info) { entry->np2Fixup_location = GL_EXTCALL(glGetUniformLocationARB(programId, "PsamplerNP2Fixup")); } else { - FIXME("NP2 texcoord fixup needed for this pixelshader, but no fixup uniform found."); + FIXME("NP2 texcoord fixup needed for this pixelshader, but no fixup uniform found.\n"); } } }

1 0

Tony Wasserka : d3dx9: Add tests for D3DXLoadSurfaceFromFileInMemory.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: a144e4ac48ce74a38c5e31f744b3aa2355eaad2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a144e4ac48ce74a38c5e31f74… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Thu Jun 25 20:09:35 2009 +0200 d3dx9: Add tests for D3DXLoadSurfaceFromFileInMemory. --- dlls/d3dx9_36/tests/texture.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 2be0997..27610b8 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -264,6 +264,31 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + /* D3DXLoadSurfaceFromFileInMemory */ + todo_wine { + hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp01, sizeof(bmp01), NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, noimage, sizeof(noimage), NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + } + + hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp01, 0, NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXLoadSurfaceFromFileInMemory(NULL, NULL, NULL, bmp01, sizeof(bmp01), NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, NULL, 8, NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, NULL, 0, NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXLoadSurfaceFromFileInMemory(NULL, NULL, NULL, NULL, 0, NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + /* cleanup */ check_release((IUnknown*)surf, 0);

1 0

Tony Wasserka : d3dx9: Add a stub for D3DXLoadSurfaceFromMemory.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: db29bfc3862b37936532fae8094d180a7c475713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db29bfc3862b37936532fae80… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Mon Jun 22 17:45:27 2009 +0200 d3dx9: Add a stub for D3DXLoadSurfaceFromMemory. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/surface.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 9b22ba0..63c2fb3 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -185,7 +185,7 @@ @ stdcall D3DXLoadSurfaceFromFileA(ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stdcall D3DXLoadSurfaceFromFileW(ptr ptr ptr wstr ptr long long ptr) -@ stub D3DXLoadSurfaceFromMemory +@ stdcall D3DXLoadSurfaceFromMemory(ptr ptr ptr ptr long long ptr ptr long long) @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) @ stub D3DXLoadSurfaceFromSurface diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index bd627ba..c1219fd 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -322,3 +322,51 @@ HRESULT WINAPI D3DXLoadSurfaceFromResourceW(LPDIRECT3DSURFACE9 pDestSurface, } return D3DXERR_INVALIDDATA; } + +/************************************************************ + * D3DXLoadSurfaceFromMemory + * + * Loads data from a given memory chunk into a surface, + * applying any of the specified filters. + * + * PARAMS + * pDestSurface [I] pointer to the surface + * pDestPalette [I] palette to use + * pDestRect [I] to be filled area of the surface + * pSrcMemory [I] pointer to the source data + * SrcFormat [I] format of the source pixel data + * SrcPitch [I] number of bytes in a row + * pSrcPalette [I] palette used in the source image + * pSrcRect [I] area of the source data to load + * dwFilter [I] filter to apply on stretching + * Colorkey [I] colorkey + * + * RETURNS + * Success: D3D_OK, if we successfully load the pixel data into our surface or + * if pSrcMemory is NULL but the other parameters are valid + * Failure: D3DERR_INVALIDCALL, if pDestSurface, SrcPitch or pSrcRect are NULL or + * if SrcFormat is an invalid format (other than D3DFMT_UNKNOWN) + * D3DXERR_INVALIDDATA, if we fail to lock pDestSurface + * E_FAIL, if SrcFormat is D3DFMT_UNKNOWN or the dimensions of pSrcRect are invalid + * + * NOTES + * pSrcRect specifies the dimensions of the source data + * + */ +HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, + CONST PALETTEENTRY *pDestPalette, + CONST RECT *pDestRect, + LPCVOID pSrcMemory, + D3DFORMAT SrcFormat, + UINT SrcPitch, + CONST PALETTEENTRY *pSrcPalette, + CONST RECT *pSrcRect, + DWORD dwFilter, + D3DCOLOR Colorkey) +{ + TRACE("stub\n"); + + if( !pDestSurface || !pSrcMemory || !pSrcRect ) return D3DERR_INVALIDCALL; + if(SrcFormat == D3DFMT_UNKNOWN || pSrcRect->left >= pSrcRect->right || pSrcRect->top >= pSrcRect->bottom) return E_FAIL; + return E_NOTIMPL; +}

1 0

Tony Wasserka : d3dx9: Implement D3DXLoadSurfaceFromSurface.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 9777bb1becdad9f2e29c52db05f937f3ae430e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9777bb1becdad9f2e29c52db0… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Mon Jun 22 17:57:20 2009 +0200 d3dx9: Implement D3DXLoadSurfaceFromSurface. --- dlls/d3dx9_36/Makefile.in | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/surface.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index f5fa278..1c6195b 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = d3dx9_36.dll IMPORTLIB = d3dx9 -IMPORTS = d3d9 d3dx8 gdi32 kernel32 +IMPORTS = d3d9 d3dx8 gdi32 user32 kernel32 C_SRCS = \ d3dx9_36_main.c \ diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 63c2fb3..8a7cdf7 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -188,7 +188,7 @@ @ stdcall D3DXLoadSurfaceFromMemory(ptr ptr ptr ptr long long ptr ptr long long) @ stdcall D3DXLoadSurfaceFromResourceA(ptr ptr ptr ptr str ptr long long ptr) @ stdcall D3DXLoadSurfaceFromResourceW(ptr ptr ptr ptr wstr ptr long long ptr) -@ stub D3DXLoadSurfaceFromSurface +@ stdcall D3DXLoadSurfaceFromSurface(ptr ptr ptr ptr ptr ptr long long) @ stub D3DXLoadVolumeFromFileA @ stub D3DXLoadVolumeFromFileInMemory @ stub D3DXLoadVolumeFromFileW diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index c1219fd..0bee7c8 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -370,3 +370,58 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, if(SrcFormat == D3DFMT_UNKNOWN || pSrcRect->left >= pSrcRect->right || pSrcRect->top >= pSrcRect->bottom) return E_FAIL; return E_NOTIMPL; } + +/************************************************************ + * D3DXLoadSurfaceFromSurface + * + * Copies the contents from one surface to another, performing any required + * format conversion, resizing or filtering. + * + * PARAMS + * pDestSurface [I] pointer to the destination surface + * pDestPalette [I] palette to use + * pDestRect [I] to be filled area of the surface + * pSrcSurface [I] pointer to the source surface + * pSrcPalette [I] palette used for the source surface + * pSrcRect [I] area of the source data to load + * dwFilter [I] filter to apply on resizing + * Colorkey [I] any ARGB value or 0 to disable color-keying + * + * RETURNS + * Success: D3D_OK + * Failure: D3DERR_INVALIDCALL, if pDestSurface or pSrcSurface are NULL + * D3DXERR_INVALIDDATA, if one of the surfaces is not lockable + * + */ +HRESULT WINAPI D3DXLoadSurfaceFromSurface(LPDIRECT3DSURFACE9 pDestSurface, + CONST PALETTEENTRY *pDestPalette, + CONST RECT *pDestRect, + LPDIRECT3DSURFACE9 pSrcSurface, + CONST PALETTEENTRY *pSrcPalette, + CONST RECT *pSrcRect, + DWORD dwFilter, + D3DCOLOR Colorkey) +{ + RECT rect; + D3DLOCKED_RECT lock; + D3DSURFACE_DESC SrcDesc; + HRESULT hr; + TRACE("(void): relay\n"); + + if( !pDestSurface || !pSrcSurface ) return D3DERR_INVALIDCALL; + + IDirect3DSurface9_GetDesc(pSrcSurface, &SrcDesc); + + if( !pSrcRect ) SetRect(&rect, 0, 0, SrcDesc.Width, SrcDesc.Height); + else rect = *pSrcRect; + + hr = IDirect3DSurface9_LockRect(pSrcSurface, &lock, NULL, D3DLOCK_READONLY); + if(FAILED(hr)) return D3DXERR_INVALIDDATA; + + hr = D3DXLoadSurfaceFromMemory(pDestSurface, pDestPalette, pDestRect, + lock.pBits, SrcDesc.Format, lock.Pitch, + pSrcPalette, &rect, dwFilter, Colorkey); + + IDirect3DSurface9_UnlockRect(pSrcSurface); + return hr; +}

1 0

Tony Wasserka : d3dx9: Add tests for D3DXLoadSurfaceFromFile.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 345fc8a96587a1eed1627e289f3ca8fce4105785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=345fc8a96587a1eed1627e289… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Thu Jun 25 20:04:53 2009 +0200 d3dx9: Add tests for D3DXLoadSurfaceFromFile. --- dlls/d3dx9_36/tests/texture.c | 105 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 105 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 4d7c9dc..be49390 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -18,10 +18,29 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include "wine/test.h" #include "d3dx9tex.h" #include "resources.h" +static inline int get_ref(IUnknown *obj) +{ + IUnknown_AddRef(obj); + return IUnknown_Release(obj); +} + +static inline void check_ref(IUnknown *obj, int exp) +{ + int ref = get_ref(obj); + ok (exp == ref, "Invalid refcount. Expected %d, got %d\n", exp, ref); +} + +static inline void check_release(IUnknown *obj, int exp) +{ + int ref = IUnknown_Release(obj); + ok (ref == exp, "Invalid refcount. Expected %d, got %d\n", exp, ref); +} + /* 1x1 bmp (1 bpp) */ static const unsigned char bmp01[66] = { 0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, @@ -181,7 +200,93 @@ static void test_D3DXGetImageInfo() if(testbitmap_ok) DeleteFileA("testbitmap.bmp"); } +static void test_D3DXLoadSurface(IDirect3DDevice9 *device) +{ + HRESULT hr; + BOOL testdummy_ok, testbitmap_ok; + IDirect3DSurface9 *surf; + + hr = create_file("testdummy.bmp", noimage, sizeof(noimage)); /* invalid image */ + testdummy_ok = SUCCEEDED(hr); + + hr = create_file("testbitmap.bmp", bmp01, sizeof(bmp01)); /* valid image */ + testbitmap_ok = SUCCEEDED(hr); + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 256, 256, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &surf, NULL); + if(FAILED(hr)) { + skip("Failed to create a surface (%#x)\n", hr); + if(testdummy_ok) DeleteFileA("testdummy.bmp"); + if(testbitmap_ok) DeleteFileA("testbitmap.bmp"); + return; + } + + /* D3DXLoadSurfaceFromFile */ + if(testbitmap_ok) { + todo_wine { + hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3D_OK); + } + + hr = D3DXLoadSurfaceFromFileA(NULL, NULL, NULL, "testbitmap.bmp", NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + } else skip("Couldn't create \"testbitmap.bmp\"\n"); + + if(testdummy_ok) { + todo_wine { + hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "testdummy.bmp", NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + } + } else skip("Couldn't create \"testdummy.bmp\"\n"); + + hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, NULL, NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXLoadSurfaceFromFileA(surf, NULL, NULL, "", NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + + /* cleanup */ + check_release((IUnknown*)surf, 0); + + if(testdummy_ok) DeleteFileA("testdummy.bmp"); + if(testbitmap_ok) DeleteFileA("testbitmap.bmp"); +} + START_TEST(texture) { + HWND wnd; + IDirect3D9 *d3d; + IDirect3DDevice9 *device; + D3DPRESENT_PARAMETERS d3dpp; + HRESULT hr; + + wnd = CreateWindow("static", "d3dx9_test", 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + if (!wnd) { + skip("Couldn't create application window\n"); + return; + } + if (!d3d) { + skip("Couldn't create IDirect3D9 object\n"); + DestroyWindow(wnd); + return; + } + + ZeroMemory(&d3dpp, sizeof(d3dpp)); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, wnd, D3DCREATE_MIXED_VERTEXPROCESSING, &d3dpp, &device); + if(FAILED(hr)) { + skip("Failed to create IDirect3DDevice9 object %#x\n", hr); + IDirect3D9_Release(d3d); + DestroyWindow(wnd); + return; + } + test_D3DXGetImageInfo(); + test_D3DXLoadSurface(device); + + check_release((IUnknown*)device, 0); + check_release((IUnknown*)d3d, 0); + if (wnd) DestroyWindow(wnd); }

1 0

Tony Wasserka : d3dx9: Add tests for D3DXLoadSurfaceFromResource.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: e8c7a474ed977807701fcd5ec453433903213d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8c7a474ed977807701fcd5ec… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Thu Jun 25 20:07:25 2009 +0200 d3dx9: Add tests for D3DXLoadSurfaceFromResource. --- dlls/d3dx9_36/tests/texture.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index be49390..2be0997 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -245,6 +245,25 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromFile returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + /* D3DXLoadSurfaceFromResource */ + todo_wine { + hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, MAKEINTRESOURCE(IDB_BITMAP_1x1), NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3D_OK); + + hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, MAKEINTRESOURCE(IDD_BITMAPDATA_1x1), NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3D_OK, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3D_OK); + } + + hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, NULL, NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + hr = D3DXLoadSurfaceFromResourceA(NULL, NULL, NULL, NULL, MAKEINTRESOURCE(IDB_BITMAP_1x1), NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + + hr = D3DXLoadSurfaceFromResourceA(surf, NULL, NULL, NULL, MAKEINTRESOURCE(IDS_STRING), NULL, D3DX_DEFAULT, 0, NULL); + ok(hr == D3DXERR_INVALIDDATA, "D3DXLoadSurfaceFromResource returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + /* cleanup */ check_release((IUnknown*)surf, 0);

1 0

Tony Wasserka : d3dx9: Add a stub for D3DXLoadSurfaceFromFileInMemory.
by Alexandre Julliard 26 Jun '09

26 Jun '09

Module: wine Branch: master Commit: 818223e75e3dd6582dcf37ca760eeaffe3f19548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=818223e75e3dd6582dcf37ca7… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Mon Jun 22 17:21:30 2009 +0200 d3dx9: Add a stub for D3DXLoadSurfaceFromFileInMemory. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/surface.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 9721fc4..dd9f74a 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -183,7 +183,7 @@ @ stub D3DXLoadPRTCompBufferFromFileW @ stub D3DXLoadSkinMeshFromXof @ stub D3DXLoadSurfaceFromFileA -@ stub D3DXLoadSurfaceFromFileInMemory +@ stdcall D3DXLoadSurfaceFromFileInMemory(ptr ptr ptr ptr long ptr long long ptr) @ stub D3DXLoadSurfaceFromFileW @ stub D3DXLoadSurfaceFromMemory @ stub D3DXLoadSurfaceFromResourceA diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 1614e44..a4a8910 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -159,3 +159,41 @@ HRESULT WINAPI D3DXGetImageInfoFromResourceW(HMODULE module, LPCWSTR resource, D } return D3DXERR_INVALIDDATA; } + +/************************************************************ + * D3DXLoadSurfaceFromFileInMemory + * + * Loads data from a given buffer into a surface and fills a given + * D3DXIMAGE_INFO structure with info about the source data. + * + * PARAMS + * pDestSurface [I] pointer to the surface + * pDestPalette [I] palette to use + * pDestRect [I] to be filled area of the surface + * pSrcData [I] pointer to the source data + * SrcDataSize [I] size of the source data in bytes + * pSrcRect [I] area of the source data to load + * dwFilter [I] filter to apply on stretching + * Colorkey [I] colorkey + * pSrcInfo [O] pointer to a D3DXIMAGE_INFO structure + * + * RETURNS + * Success: D3D_OK + * Failure: D3DERR_INVALIDCALL, if pDestSurface or pSrcData or SrcDataSize are NULL + * D3DXERR_INVALIDDATA, if pSrcData is no valid image file + * + */ +HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(LPDIRECT3DSURFACE9 pDestSurface, + CONST PALETTEENTRY *pDestPalette, + CONST RECT *pDestRect, + LPCVOID pSrcData, + UINT SrcDataSize, + CONST RECT *pSrcRect, + DWORD dwFilter, + D3DCOLOR Colorkey, + D3DXIMAGE_INFO *pSrcInfo) +{ + FIXME("stub\n"); + if( !pDestSurface || !pSrcData | !SrcDataSize ) return D3DERR_INVALIDCALL; + return E_NOTIMPL; +}

1 0