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

Vitaly Budovski : wined3d: Check for float texture formats correctly.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: f7b565e2cae77cc9e269f9ba84f082e84325fd6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b565e2cae77cc9e269f9ba8… Author: Vitaly Budovski <vbudovski(a)gmail.com> Date: Wed Mar 21 15:35:42 2007 +1100 wined3d: Check for float texture formats correctly. Move the checks for float texture formats into the correct location. This allows some Direct3D sample applications which check for any of the float formats together with D3DUSAGE_RENDERTARGET to start. --- dlls/wined3d/directx.c | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 90d3932..6a1b9e8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1662,6 +1662,21 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt case WINED3DFMT_P8: TRACE_(d3d_caps)("[OK]\n"); 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)) { + TRACE_(d3d_caps)("[FAILED]\n"); + return WINED3DERR_NOTAVAILABLE; + } + TRACE_(d3d_caps)("[OK]\n"); + return WINED3D_OK; default: TRACE_(d3d_caps)("[FAILED]\n"); return WINED3DERR_NOTAVAILABLE; @@ -1682,23 +1697,6 @@ static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapt } } - if (GL_SUPPORT(ARB_TEXTURE_FLOAT)) { - - BOOL half_pixel_support = GL_SUPPORT(ARB_HALF_FLOAT_PIXEL); - - switch (CheckFormat) { - case WINED3DFMT_R16F: - case WINED3DFMT_A16B16G16R16F: - if (!half_pixel_support) break; - case WINED3DFMT_R32F: - case WINED3DFMT_A32B32G32R32F: - TRACE_(d3d_caps)("[OK]\n"); - return WINED3D_OK; - default: - break; /* Avoid compiler warnings */ - } - } - /* This format is nothing special and it is supported perfectly. * However, ati and nvidia driver on windows do not mark this format as * supported (tested with the dxCapsViewer) and pretending to

1 0

Mikołaj Zalewski : comctl32: toolbar: We shouldn' t try to resize standard bitmaps.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 307f39c0d5160ddcc9fbe3a458fd0e15c02cd839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=307f39c0d5160ddcc9fbe3a45… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Mar 19 18:57:25 2007 +0100 comctl32: toolbar: We shouldn't try to resize standard bitmaps. --- dlls/comctl32/tests/toolbar.c | 24 +----------------------- dlls/comctl32/toolbar.c | 3 ++- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 43c93dd..d5b055e 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -190,28 +190,6 @@ static void rebuild_toolbar_with_buttons(HWND *hToolbar) } \ } -#define CHECK_IMAGELIST_TODO_COUNT(count, dx, dy) { \ - int cx, cy; \ - HIMAGELIST himl = (HIMAGELIST)SendMessageA(hToolbar, TB_GETIMAGELIST, 0, 0); \ - ok(himl != NULL, "No image list\n"); \ - if (himl != NULL) {\ - todo_wine ok(ImageList_GetImageCount(himl) == count, "Images count mismatch - %d vs %d\n", count, ImageList_GetImageCount(himl)); \ - ImageList_GetIconSize(himl, &cx, &cy); \ - ok(cx == dx && cy == dy, "Icon size mismatch - %dx%d vs %dx%d\n", dx, dy, cx, cy); \ - } \ -} - -#define CHECK_IMAGELIST_TODO_COUNT_SIZE(count, dx, dy) { \ - int cx, cy; \ - HIMAGELIST himl = (HIMAGELIST)SendMessageA(hToolbar, TB_GETIMAGELIST, 0, 0); \ - ok(himl != NULL, "No image list\n"); \ - if (himl != NULL) {\ - todo_wine ok(ImageList_GetImageCount(himl) == count, "Images count mismatch - %d vs %d\n", count, ImageList_GetImageCount(himl)); \ - ImageList_GetIconSize(himl, &cx, &cy); \ - todo_wine ok(cx == dx && cy == dy, "Icon size mismatch - %dx%d vs %dx%d\n", dx, dy, cx, cy); \ - } \ -} - static void test_add_bitmap(void) { HWND hToolbar = NULL; @@ -358,7 +336,7 @@ static void test_add_bitmap(void) ok(SendMessageA(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&stdsmall) == 1, "TB_SETBITMAPSIZE failed\n"); UpdateWindow(hToolbar); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), MAKELONG(23, 22), "%x"); - CHECK_IMAGELIST_TODO_COUNT(22, 20, 15); + CHECK_IMAGELIST(22, 20, 15); /* check standard bitmaps */ addbmp.hInst = HINST_COMMCTRL; diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c40ced0..c17e7b9 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2669,7 +2669,8 @@ TOOLBAR_AddBitmapToImageList(TOOLBAR_INFO *infoPtr, HIMAGELIST himlDef, const TB /* enlarge the bitmap if needed */ ImageList_GetIconSize(himlDef, &cxIcon, &cyIcon); - COMCTL32_EnsureBitmapSize(&hbmLoad, cxIcon*(INT)bitmap->nButtons, cyIcon, comctl32_color.clrBtnFace); + if (bitmap->hInst != COMCTL32_hModule) + COMCTL32_EnsureBitmapSize(&hbmLoad, cxIcon*(INT)bitmap->nButtons, cyIcon, comctl32_color.clrBtnFace); nIndex = ImageList_AddMasked(himlDef, hbmLoad, comctl32_color.clrBtnFace); DeleteObject(hbmLoad);

1 0

Andrew Talbot : comctl32: Constify some variables.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 62545611b216d204ee9be920070c8f959a509b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62545611b216d204ee9be9200… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Mar 19 21:31:25 2007 +0000 comctl32: Constify some variables. --- dlls/comctl32/animate.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 5089549..a0f390f 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c @@ -100,7 +100,7 @@ static void ANIMATE_Notify(ANIMATE_INFO *infoPtr, UINT notif) (LPARAM)infoPtr->hwndSelf); } -static BOOL ANIMATE_LoadResW(ANIMATE_INFO *infoPtr, HINSTANCE hInst, LPWSTR lpName) +static BOOL ANIMATE_LoadResW(ANIMATE_INFO *infoPtr, HINSTANCE hInst, LPCWSTR lpName) { static const WCHAR aviW[] = { 'A', 'V', 'I', 0 }; HRSRC hrsrc; @@ -217,7 +217,7 @@ static void ANIMATE_Free(ANIMATE_INFO *infoPtr) infoPtr->transparentColor = ANIMATE_COLOR_NONE; } -static void ANIMATE_TransparentBlt(ANIMATE_INFO *infoPtr, HDC hdcDest, HDC hdcSource) +static void ANIMATE_TransparentBlt(ANIMATE_INFO const *infoPtr, HDC hdcDest, HDC hdcSource) { HDC hdcMask; HBITMAP hbmMask; @@ -251,8 +251,8 @@ static void ANIMATE_TransparentBlt(ANIMATE_INFO *infoPtr, HDC hdcDest, HDC hdcSo static BOOL ANIMATE_PaintFrame(ANIMATE_INFO* infoPtr, HDC hDC) { - void *pBitmapData; - LPBITMAPINFO pBitmapInfo; + void const *pBitmapData; + BITMAPINFO const *pBitmapInfo; HDC hdcMem; HBITMAP hbmOld; int nOffsetX = 0; @@ -825,7 +825,7 @@ static LRESULT ANIMATE_Destroy(ANIMATE_INFO *infoPtr) } -static BOOL ANIMATE_EraseBackground(ANIMATE_INFO *infoPtr, HDC hdc) +static BOOL ANIMATE_EraseBackground(ANIMATE_INFO const *infoPtr, HDC hdc) { RECT rect; HBRUSH hBrush = 0;

1 0

Dmitry Timoshkov : ole32: Move the storage signatures to the appropriate file that uses them.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: dce12498d02bff5c24c2148d42c427d7d1032030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dce12498d02bff5c24c2148d4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 20 22:18:30 2007 +0800 ole32: Move the storage signatures to the appropriate file that uses them. --- dlls/ole32/storage32.c | 6 ++++++ dlls/ole32/storage32.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 408453a..97f53df 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -62,6 +62,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); #define OLESTREAM_ID 0x501 #define OLESTREAM_MAX_STR_LEN 255 +/* + * These are signatures to detect the type of Document file. + */ +static const BYTE STORAGE_magic[8] ={0xd0,0xcf,0x11,0xe0,0xa1,0xb1,0x1a,0xe1}; +static const BYTE STORAGE_oldmagic[8] ={0xd0,0xcf,0x11,0xe0,0x0e,0x11,0xfc,0x0d}; + static const char rootPropertyName[] = "Root Entry"; /**************************************************************************** diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 4c893a0..ffad550 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -112,12 +112,6 @@ static const ULONG PROPERTY_NULL = 0xFFFFFFFF; STGM_NOSNAPSHOT | STGM_DIRECT_SWMR | STGM_DELETEONRELEASE | STGM_SIMPLE) /* - * These are signatures to detect the type of Document file. - */ -static const BYTE STORAGE_magic[8] ={0xd0,0xcf,0x11,0xe0,0xa1,0xb1,0x1a,0xe1}; -static const BYTE STORAGE_oldmagic[8] ={0xd0,0xcf,0x11,0xe0,0x0e,0x11,0xfc,0x0d}; - -/* * Forward declarations of all the structures used by the storage * module. */

1 0

Chris Robinson : quartz: Fully disconnect the AsyncReader when released.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 3487da71cee4de6a8c3fbd406cea730e14fea59f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3487da71cee4de6a8c3fbd406… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Mar 19 13:28:32 2007 -0700 quartz: Fully disconnect the AsyncReader when released. --- dlls/quartz/filesource.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 22209f5..6e5db5e 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -378,7 +378,16 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) if (!refCount) { if (This->pOutputPin) + { + IPin *pConnectedTo; + if(SUCCEEDED(IPin_ConnectedTo(This->pOutputPin, &pConnectedTo))) + { + IPin_Disconnect(pConnectedTo); + IPin_Release(pConnectedTo); + } + IPin_Disconnect(This->pOutputPin); IPin_Release(This->pOutputPin); + } This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); This->lpVtbl = NULL;

1 0

Mikołaj Zalewski : comctl32: toolbar: The default button size is 16x16.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: d4a67c43824091ed9f782557c1f2ff9d8f37a293 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4a67c43824091ed9f782557c… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Mar 19 17:11:03 2007 +0100 comctl32: toolbar: The default button size is 16x16. --- dlls/comctl32/tests/toolbar.c | 53 +++++++++++++++++++++-------------------- dlls/comctl32/toolbar.c | 20 ++++----------- 2 files changed, 32 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4a67c43824091ed9f782…

1 0

Mikołaj Zalewski : comctl32: toolbar: Test standard buttons size.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: e3b7c3045a2df4b04611eb8db565b4c065870215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b7c3045a2df4b04611eb8db… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Mar 19 18:47:27 2007 +0100 comctl32: toolbar: Test standard buttons size. --- dlls/comctl32/tests/toolbar.c | 6 +++++- dlls/comctl32/toolbar.c | 14 ++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index e8def41..43c93dd 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -350,12 +350,14 @@ static void test_add_bitmap(void) CHECK_IMAGELIST(4, 20, 15); ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&bmp128) == 0, "TB_ADDBITMAP - unexpected return\n"); CHECK_IMAGELIST(10, 20, 15); - /* however TB_SETBITMAPSIZE/add std bitmap won't change the image size (the button size does change!) */ + /* however TB_SETBITMAPSIZE/add std bitmap won't change the image size (the button size does change) */ ok(SendMessageA(hToolbar, TB_SETBITMAPSIZE, 0, MAKELONG(8, 8)) == TRUE, "TB_SETBITMAPSIZE failed\n"); UpdateWindow(hToolbar); + compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), MAKELONG(15, 14), "%x"); CHECK_IMAGELIST(10, 20, 15); ok(SendMessageA(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&stdsmall) == 1, "TB_SETBITMAPSIZE failed\n"); UpdateWindow(hToolbar); + compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), MAKELONG(23, 22), "%x"); CHECK_IMAGELIST_TODO_COUNT(22, 20, 15); /* check standard bitmaps */ @@ -364,10 +366,12 @@ static void test_add_bitmap(void) rebuild_toolbar(&hToolbar); ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n"); CHECK_IMAGELIST(15, 16, 16); + compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), MAKELONG(23, 22), "%x"); addbmp.nID = IDB_STD_LARGE_COLOR; rebuild_toolbar(&hToolbar); ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n"); CHECK_IMAGELIST(15, 24, 24); + compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), MAKELONG(31, 30), "%x"); addbmp.nID = IDB_VIEW_SMALL_COLOR; rebuild_toolbar(&hToolbar); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index ba8ea80..c40ced0 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2775,19 +2775,13 @@ TOOLBAR_AddBitmap (HWND hwnd, WPARAM wParam, LPARAM lParam) /* Windows resize all the buttons to the size of a newly added standard image */ if (lpAddBmp->nID & 1) { - /* large icons */ - SendMessageW (hwnd, TB_SETBITMAPSIZE, 0, - MAKELPARAM((WORD)24, (WORD)24)); - SendMessageW (hwnd, TB_SETBUTTONSIZE, 0, - MAKELPARAM((WORD)31, (WORD)30)); + /* large icons: 24x24. Will make the button 31x30 */ + SendMessageW (hwnd, TB_SETBITMAPSIZE, 0, MAKELPARAM(24, 24)); } else { - /* small icons */ - SendMessageW (hwnd, TB_SETBITMAPSIZE, 0, - MAKELPARAM((WORD)16, (WORD)16)); - SendMessageW (hwnd, TB_SETBUTTONSIZE, 0, - MAKELPARAM((WORD)22, (WORD)22)); + /* small icons: 16x16. Will make the buttons 23x22 */ + SendMessageW (hwnd, TB_SETBITMAPSIZE, 0, MAKELPARAM(16, 16)); } TOOLBAR_CalcToolbar (hwnd);

1 0

Phil Costin : wined3d: Ensure all states affected by a change in render_offscreen are marked dirty in ActivateContext .
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 1f03896e0002708ec6092c6c2faf584f47a55fcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f03896e0002708ec6092c6c2… Author: Phil Costin <philcostin(a)hotmail.com> Date: Tue Mar 20 19:45:50 2007 +0000 wined3d: Ensure all states affected by a change in render_offscreen are marked dirty in ActivateContext. --- dlls/wined3d/context.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0849b3d..b89207e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -638,6 +638,9 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU if(oldRenderOffscreen) { Context_MarkStateDirty(context, WINED3DRS_CULLMODE); + Context_MarkStateDirty(context, WINED3DTS_PROJECTION); + Context_MarkStateDirty(context, STATE_VDECL); + Context_MarkStateDirty(context, STATE_VIEWPORT); } } else { TRACE("Rendering offscreen\n"); @@ -703,6 +706,9 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU if(!oldRenderOffscreen) { Context_MarkStateDirty(context, WINED3DRS_CULLMODE); + Context_MarkStateDirty(context, WINED3DTS_PROJECTION); + Context_MarkStateDirty(context, STATE_VDECL); + Context_MarkStateDirty(context, STATE_VIEWPORT); } } if (readTexture) {

1 0

Andrew Talbot : gdi32: Replace inline static with static inline.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 453cb25c1b8d6d24773bd618675ab67a1ca95b77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=453cb25c1b8d6d24773bd6186… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Mar 20 17:42:59 2007 +0000 gdi32: Replace inline static with static inline. --- dlls/gdi32/freetype.c | 6 +++--- dlls/gdi32/gdiobj.c | 6 +++--- dlls/gdi32/region.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1f90a87..31b3429 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1832,7 +1832,7 @@ static const struct nls_update_font_list } }; -inline static HKEY create_fonts_NT_registry_key(void) +static inline HKEY create_fonts_NT_registry_key(void) { HKEY hkey = 0; @@ -1841,7 +1841,7 @@ inline static HKEY create_fonts_NT_registry_key(void) return hkey; } -inline static HKEY create_fonts_9x_registry_key(void) +static inline HKEY create_fonts_9x_registry_key(void) { HKEY hkey = 0; @@ -1850,7 +1850,7 @@ inline static HKEY create_fonts_9x_registry_key(void) return hkey; } -inline static HKEY create_config_fonts_registry_key(void) +static inline HKEY create_config_fonts_registry_key(void) { HKEY hkey = 0; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 54b69b5..2440b2d 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -528,7 +528,7 @@ static DWORD get_dpi( void ) * * Increment the reference count of a GDI object. */ -inline static void inc_ref_count( HGDIOBJ handle ) +static inline void inc_ref_count( HGDIOBJ handle ) { GDIOBJHDR *header; @@ -545,7 +545,7 @@ inline static void inc_ref_count( HGDIOBJ handle ) * * Decrement the reference count of a GDI object. */ -inline static void dec_ref_count( HGDIOBJ handle ) +static inline void dec_ref_count( HGDIOBJ handle ) { GDIOBJHDR *header; @@ -638,7 +638,7 @@ static int next_large_handle; * * Allocate a GDI handle from the large heap. Helper for GDI_AllocObject */ -inline static GDIOBJHDR *alloc_large_heap( WORD size, HGDIOBJ *handle ) +static inline GDIOBJHDR *alloc_large_heap( WORD size, HGDIOBJ *handle ) { int i; GDIOBJHDR *obj; diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 2df7b74..ac92581 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -454,7 +454,7 @@ static void REGION_UnionRectWithRegion(const RECT *rect, WINEREGION *rgn); /*********************************************************************** * get_region_type */ -inline static INT get_region_type( const RGNOBJ *obj ) +static inline INT get_region_type( const RGNOBJ *obj ) { switch(obj->rgn->numRects) {

1 0

Paul Vriens : wininet/tests: Expose a problem with FtpGetFile.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: e3d72747270245f063f6d0009db1c025922bee66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3d72747270245f063f6d0009… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Mar 20 20:54:58 2007 +0100 wininet/tests: Expose a problem with FtpGetFile. --- dlls/wininet/tests/ftp.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 2eca664..11984da 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -831,6 +831,39 @@ static void test_renamefile(void) InternetCloseHandle(hInternet); } +static void test_multiple(void) +{ + BOOL bRet; + HINTERNET hInternet, hFtp, hOpenFile; + + hInternet = InternetOpen(NULL, 0, NULL, NULL, 0); + hFtp = InternetConnect(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, 0, 0); + if(!hFtp) + { + skip("No ftp connection could be made to ftp.winehq.org\n"); + InternetCloseHandle(hInternet); + return; + } + + /* A correct call */ + bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_non_existing_deadbeef", FALSE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0); + DeleteFileA("should_be_non_existing_deadbeef"); + + /* This call by itself succeeds in Wine for the test_openfile test */ + SetLastError(0xdeadbeef); + hOpenFile = FtpOpenFileA(hFtp, "welcome.msg", GENERIC_READ, FTP_TRANSFER_TYPE_ASCII, 0); + todo_wine + { + ok ( hOpenFile != NULL, "Expected FtpOpenFileA to succeed\n"); + ok ( GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_SUCCESS or ERROR_FILE_NOT_FOUND (win98), got %d\n", GetLastError()); + } + + InternetCloseHandle(hOpenFile); + InternetCloseHandle(hFtp); + InternetCloseHandle(hInternet); +} + START_TEST(ftp) { /* The first call should always be a proper InternetOpen, if not @@ -850,4 +883,11 @@ START_TEST(ftp) test_putfile(); test_removedir(); test_renamefile(); + + /* A test that does two particular calls in one connection, this currently fails on Wine. + * The problem lies in FtpGetFile but is exposed in FtpOpenFile. + * Once this is fixed we should change the total test to setup and clear the connections + * only once. (and get rid of test_multiple). + */ + test_multiple(); }

1 0