wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Alexandre Julliard : gdi32: Allow the visible region to be zero since this is the case for metafiles.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: e2f888a617f6344d9676694603edcfd173fbb9c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f888a617f6344d967669460… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 20:41:30 2009 +0200 gdi32: Allow the visible region to be zero since this is the case for metafiles. --- dlls/gdi32/clipping.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 8e80207..4e294b6 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -51,12 +51,6 @@ void CLIPPING_UpdateGCRegion( DC * dc ) { HRGN clip_rgn; - if (!dc->hVisRgn) - { - ERR("hVisRgn is zero. Please report this.\n" ); - exit(1); - } - /* update the intersection of meta and clip regions */ if (dc->hMetaRgn && dc->hClipRgn) {

1 0

Alexandre Julliard : gdi32: Completely implement SaveDC in the driver, having it call save_dc_state if necessary.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: bbb1626bf8629e20778b514c2aed26a7a341f553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb1626bf8629e20778b514c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 20:32:58 2009 +0200 gdi32: Completely implement SaveDC in the driver, having it call save_dc_state if necessary. --- dlls/gdi32/dc.c | 12 +++--------- dlls/gdi32/enhmfdrv/dc.c | 13 ++++++++++--- dlls/gdi32/tests/metafile.c | 26 ++++++++++++++++++++------ 3 files changed, 33 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index ae58479..4694c3e 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -578,19 +578,13 @@ INT WINAPI SaveDC( HDC hdc ) DC * dc; INT ret; - dc = get_dc_ptr( hdc ); - if (!dc) return 0; + if (!(dc = get_dc_ptr( hdc ))) return 0; if(dc->funcs->pSaveDC) - { ret = dc->funcs->pSaveDC( dc->physDev ); - if(ret) - ret = ++dc->saveLevel; - release_dc_ptr( dc ); - return ret; - } + else + ret = save_dc_state( hdc ); - ret = save_dc_state( hdc ); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index f08b17d..bd5dbd5 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -25,10 +25,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile); INT CDECL EMFDRV_SaveDC( PHYSDEV dev ) { + EMFDRV_PDEVICE* physDev = (EMFDRV_PDEVICE*)dev; + INT ret = save_dc_state( physDev->hdc ); EMRSAVEDC emr; - emr.emr.iType = EMR_SAVEDC; - emr.emr.nSize = sizeof(emr); - return EMFDRV_WriteRecord( dev, &emr.emr ); + + if (ret) + { + emr.emr.iType = EMR_SAVEDC; + emr.emr.nSize = sizeof(emr); + EMFDRV_WriteRecord( dev, &emr.emr ); + } + return ret; } BOOL CDECL EMFDRV_RestoreDC( PHYSDEV dev, INT level ) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 63c2cc4..2524af1 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -643,6 +643,11 @@ static void test_SaveDC(void) todo_wine ok(hFontOld == hFontCheck && hFontCheck != hFont && hFontCheck != hFont2, "Font not reverted with DC Restore\n"); + ret = RestoreDC(hdcMetafile, -20); + ok(!ret, "ret = %d\n", ret); + ret = RestoreDC(hdcMetafile, 20); + ok(!ret, "ret = %d\n", ret); + hMetafile = CloseEnhMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError()); @@ -702,7 +707,7 @@ static void test_mf_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = SaveDC(hdcMetafile); - todo_wine ok(ret == 1, "ret = %d\n", ret); + ok(ret == 1, "ret = %d\n", ret); SetWindowOrgEx(hdcMetafile, -2, -2, NULL); SetViewportOrgEx(hdcMetafile, 20, 20, NULL); @@ -715,7 +720,7 @@ static void test_mf_SaveDC(void) SetBkColor( hdcMetafile, 0 ); ret = SaveDC(hdcMetafile); - todo_wine ok(ret == 1, "ret = %d\n", ret); + ok(ret == 1, "ret = %d\n", ret); SetWindowOrgEx(hdcMetafile, -3, -3, NULL); SetViewportOrgEx(hdcMetafile, 30, 30, NULL); @@ -731,10 +736,10 @@ static void test_mf_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = RestoreDC(hdcMetafile, -1); - ok(ret, "ret = %d\n", ret); + todo_wine ok(ret, "ret = %d\n", ret); ret = SaveDC(hdcMetafile); - todo_wine ok(ret == 1, "ret = %d\n", ret); + ok(ret == 1, "ret = %d\n", ret); ret = RestoreDC(hdcMetafile, 1); todo_wine ok(ret, "ret = %d\n", ret); @@ -748,10 +753,10 @@ static void test_mf_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = SaveDC(hdcMetafile); - todo_wine ok(ret == 1, "ret = %d\n", ret); + ok(ret == 1, "ret = %d\n", ret); ret = SaveDC(hdcMetafile); - todo_wine ok(ret == 1, "ret = %d\n", ret); + ok(ret == 1, "ret = %d\n", ret); memset(&orig_lf, 0, sizeof(orig_lf)); orig_lf.lfCharSet = ANSI_CHARSET; @@ -774,10 +779,19 @@ static void test_mf_SaveDC(void) SetPixelV(hdcMetafile, 50, 50, 0); ret = RestoreDC(hdcMetafile, 1); + todo_wine ok(ret, "ret = %d\n", ret); hFontCheck = SelectObject(hdcMetafile, hFontOld); ok(hFontOld != hFontCheck && hFontCheck == hFont2, "Font incorrectly reverted with DC Restore\n"); + /* restore level is ignored */ + ret = RestoreDC(hdcMetafile, -20); + todo_wine ok(ret, "ret = %d\n", ret); + ret = RestoreDC(hdcMetafile, 20); + todo_wine ok(ret, "ret = %d\n", ret); + ret = RestoreDC(hdcMetafile, 0); + todo_wine ok(ret, "ret = %d\n", ret); + hMetafile = CloseMetaFile(hdcMetafile); ok(hMetafile != 0, "CloseEnhMetaFile error %d\n", GetLastError());

1 0

Alexandre Julliard : gdi32: Move the whole DC restoring functionality into set_dc_state, and rename it to restore_dc_state.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: d4c54be2722d9717e9c12ce38f837ede2e08133f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c54be2722d9717e9c12ce38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 20:28:08 2009 +0200 gdi32: Move the whole DC restoring functionality into set_dc_state, and rename it to restore_dc_state. --- dlls/gdi32/dc.c | 82 ++++++++++++++++++++++++++------------------- dlls/gdi32/gdi_private.h | 2 +- 2 files changed, 48 insertions(+), 36 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 9f0c9f6..ae58479 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -443,27 +443,45 @@ INT save_dc_state( HDC hdc ) /*********************************************************************** - * set_dc_state (Not a Windows API) + * restore_dc_state */ -void set_dc_state( HDC hdc, HDC hdcs ) +BOOL restore_dc_state( HDC hdc, INT level ) { + HDC hdcs, first_dcs; DC *dc, *dcs; + INT save_level; + + if (!(dc = get_dc_ptr( hdc ))) return FALSE; + + /* find the state level to restore */ + + if (level < 0) level = dc->saveLevel + level + 1; + first_dcs = dc->saved_dc; + for (hdcs = first_dcs, save_level = dc->saveLevel; save_level > level; save_level--) + { + if (!(dcs = get_dc_ptr( hdcs ))) + { + release_dc_ptr( dc ); + return FALSE; + } + hdcs = dcs->saved_dc; + release_dc_ptr( dcs ); + } + + /* restore the state */ - if (!(dc = get_dc_ptr( hdc ))) return; if (!(dcs = get_dc_ptr( hdcs ))) { release_dc_ptr( dc ); - return; + return FALSE; } - if (!(dcs->flags & DC_SAVED)) + if (!PATH_AssignGdiPath( &dc->path, &dcs->path )) { - release_dc_ptr( dc ); release_dc_ptr( dcs ); - return; + release_dc_ptr( dc ); + return FALSE; } - TRACE("%p %p\n", hdc, hdcs ); - update_dc( dc ); dc->flags = dcs->flags & ~DC_SAVED; dc->layout = dcs->layout; dc->hDevice = dcs->hDevice; @@ -531,8 +549,24 @@ void set_dc_state( HDC hdc, HDC hdcs ) SetBkColor( hdc, dcs->backgroundColor); SetTextColor( hdc, dcs->textColor); GDISelectPalette( hdc, dcs->hPalette, FALSE ); - release_dc_ptr( dc ); + + dc->saved_dc = dcs->saved_dc; + dcs->saved_dc = 0; + dc->saveLevel = save_level - 1; + release_dc_ptr( dcs ); + + /* now destroy all the saved DCs */ + + while (first_dcs) + { + if (!(dcs = get_dc_ptr( first_dcs ))) break; + hdcs = dcs->saved_dc; + free_dc_ptr( dcs ); + first_dcs = hdcs; + } + release_dc_ptr( dc ); + return TRUE; } @@ -567,11 +601,12 @@ INT WINAPI SaveDC( HDC hdc ) */ BOOL WINAPI RestoreDC( HDC hdc, INT level ) { - DC * dc, * dcs; + DC *dc; BOOL success; TRACE("%p %d\n", hdc, level ); if (!(dc = get_dc_ptr( hdc ))) return FALSE; + update_dc( dc ); if(abs(level) > dc->saveLevel || level == 0) { @@ -579,8 +614,6 @@ BOOL WINAPI RestoreDC( HDC hdc, INT level ) return FALSE; } - update_dc( dc ); - if(dc->funcs->pRestoreDC) { success = dc->funcs->pRestoreDC( dc->physDev, level ); @@ -591,28 +624,7 @@ BOOL WINAPI RestoreDC( HDC hdc, INT level ) return success; } - if (level < 0) level = dc->saveLevel + level + 1; - success=TRUE; - while (dc->saveLevel >= level) - { - HDC hdcs = dc->saved_dc; - if (!(dcs = get_dc_ptr( hdcs ))) - { - success = FALSE; - break; - } - dc->saved_dc = dcs->saved_dc; - dcs->saved_dc = 0; - if (--dc->saveLevel < level) - { - set_dc_state( hdc, hdcs ); - if (!PATH_AssignGdiPath( &dc->path, &dcs->path )) - /* FIXME: This might not be quite right, since we're - * returning FALSE but still destroying the saved DC state */ - success=FALSE; - } - free_dc_ptr( dcs ); - } + success = restore_dc_state( hdc, level ); release_dc_ptr( dc ); return success; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c585eaf..da66ade 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -384,7 +384,7 @@ extern void update_dc( DC *dc ) DECLSPEC_HIDDEN; extern void DC_InitDC( DC * dc ) DECLSPEC_HIDDEN; extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; extern INT save_dc_state( HDC hdc ) DECLSPEC_HIDDEN; -extern void set_dc_state( HDC hdc, HDC hdcs ) DECLSPEC_HIDDEN; +extern BOOL restore_dc_state( HDC hdc, INT level ) DECLSPEC_HIDDEN; /* dib.c */ extern int DIB_GetDIBWidthBytes( int width, int depth ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Move the whole DC saving functionality into get_dc_state, and rename it to save_dc_state.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: a23725785e12f920b35a43b915cba70bccc45176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a23725785e12f920b35a43b91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 20:18:58 2009 +0200 gdi32: Move the whole DC saving functionality into get_dc_state, and rename it to save_dc_state. --- dlls/gdi32/dc.c | 50 ++++++++++++++------------------------------- dlls/gdi32/gdi_private.h | 2 +- 2 files changed, 17 insertions(+), 35 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 8bcd2fa..9f0c9f6 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -332,12 +332,12 @@ void DC_UpdateXforms( DC *dc ) /*********************************************************************** - * get_dc_state (Not a Windows API) + * save_dc_state */ -HDC get_dc_state( HDC hdc ) +INT save_dc_state( HDC hdc ) { DC * newdc, * dc; - HGDIOBJ handle; + INT ret; if (!(dc = get_dc_ptr( hdc ))) return 0; if (!(newdc = HeapAlloc( GetProcessHeap(), 0, sizeof(*newdc )))) @@ -407,8 +407,6 @@ HDC get_dc_state( HDC hdc ) release_dc_ptr( dc ); return 0; } - handle = newdc->hSelf; - TRACE("(%p): returning %p\n", hdc, handle ); /* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */ @@ -428,9 +426,19 @@ HDC get_dc_state( HDC hdc ) } /* don't bother recomputing hMetaClipRgn, we'll do that in SetDCState */ + if (!PATH_AssignGdiPath( &newdc->path, &dc->path )) + { + release_dc_ptr( dc ); + free_dc_ptr( newdc ); + return 0; + } + + newdc->saved_dc = dc->saved_dc; + dc->saved_dc = newdc->hSelf; + ret = ++dc->saveLevel; release_dc_ptr( newdc ); release_dc_ptr( dc ); - return handle; + return ret; } @@ -533,8 +541,7 @@ void set_dc_state( HDC hdc, HDC hdcs ) */ INT WINAPI SaveDC( HDC hdc ) { - HDC hdcs; - DC * dc, * dcs; + DC * dc; INT ret; dc = get_dc_ptr( hdc ); @@ -549,32 +556,7 @@ INT WINAPI SaveDC( HDC hdc ) return ret; } - if (!(hdcs = get_dc_state( hdc ))) - { - release_dc_ptr( dc ); - return 0; - } - dcs = get_dc_ptr( hdcs ); - - /* Copy path. The reason why path saving / restoring is in SaveDC/ - * RestoreDC and not in GetDCState/SetDCState is that the ...DCState - * functions are only in Win16 (which doesn't have paths) and that - * SetDCState doesn't allow us to signal an error (which can happen - * when copying paths). - */ - if (!PATH_AssignGdiPath( &dcs->path, &dc->path )) - { - release_dc_ptr( dc ); - release_dc_ptr( dcs ); - DeleteDC( hdcs ); - return 0; - } - - dcs->saved_dc = dc->saved_dc; - dc->saved_dc = hdcs; - TRACE("(%p): returning %d\n", hdc, dc->saveLevel+1 ); - ret = ++dc->saveLevel; - release_dc_ptr( dcs ); + ret = save_dc_state( hdc ); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a21fc76..c585eaf 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -383,7 +383,7 @@ extern void release_dc_ptr( DC *dc ) DECLSPEC_HIDDEN; extern void update_dc( DC *dc ) DECLSPEC_HIDDEN; extern void DC_InitDC( DC * dc ) DECLSPEC_HIDDEN; extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; -extern HDC get_dc_state( HDC hdc ) DECLSPEC_HIDDEN; +extern INT save_dc_state( HDC hdc ) DECLSPEC_HIDDEN; extern void set_dc_state( HDC hdc, HDC hdcs ) DECLSPEC_HIDDEN; /* dib.c */

1 0

Alexandre Julliard : gdi32: Remove Get/SetDCState16 implementation, it should not be used by apps.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: 1380f0ac4046f7f5495e83fb9d90bb588925905f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1380f0ac4046f7f5495e83fb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 20:13:45 2009 +0200 gdi32: Remove Get/SetDCState16 implementation, it should not be used by apps. --- dlls/gdi32/gdi16.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdi16.c b/dlls/gdi32/gdi16.c index 643f682..2f49948 100644 --- a/dlls/gdi32/gdi16.c +++ b/dlls/gdi32/gdi16.c @@ -3388,7 +3388,8 @@ BOOL16 WINAPI LPtoDP16( HDC16 hdc, LPPOINT16 points, INT16 count ) */ HDC16 WINAPI GetDCState16( HDC16 hdc ) { - return HDC_16( get_dc_state( HDC_32(hdc) )); + ERR( "no longer supported\n" ); + return 0; } @@ -3397,7 +3398,7 @@ HDC16 WINAPI GetDCState16( HDC16 hdc ) */ void WINAPI SetDCState16( HDC16 hdc, HDC16 hdcs ) { - set_dc_state( HDC_32(hdc), HDC_32(hdcs) ); + ERR( "no longer supported\n" ); } /***********************************************************************

1 0

Alexandre Julliard : gdi32: Move freeing of the DC path and regions into free_dc_ptr.
by Alexandre Julliard 08 Apr '09

08 Apr '09

Module: wine Branch: master Commit: 88e01969c2fa354e99a5056a2c985d2b3a336dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=88e01969c2fa354e99a5056a2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 20:13:08 2009 +0200 gdi32: Move freeing of the DC path and regions into free_dc_ptr. --- dlls/gdi32/dc.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index fd28663..8bcd2fa 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -165,6 +165,11 @@ BOOL free_dc_ptr( DC *dc ) { assert( dc->refcount == 1 ); if (free_gdi_handle( dc->hSelf ) != dc) return FALSE; /* shouldn't happen */ + if (dc->hClipRgn) DeleteObject( dc->hClipRgn ); + if (dc->hMetaRgn) DeleteObject( dc->hMetaRgn ); + if (dc->hMetaClipRgn) DeleteObject( dc->hMetaClipRgn ); + if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); + PATH_DestroyGdiPath( &dc->path ); return HeapFree( GetProcessHeap(), 0, dc ); } @@ -624,8 +629,7 @@ BOOL WINAPI RestoreDC( HDC hdc, INT level ) * returning FALSE but still destroying the saved DC state */ success=FALSE; } - release_dc_ptr( dcs ); - DeleteDC( hdcs ); + free_dc_ptr( dcs ); } release_dc_ptr( dc ); return success; @@ -684,7 +688,6 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, return hdc; error: - if (dc && dc->hVisRgn) DeleteObject( dc->hVisRgn ); if (dc) free_dc_ptr( dc ); DRIVER_release_driver( funcs ); return 0; @@ -801,7 +804,6 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) return ret; error: - if (dc && dc->hVisRgn) DeleteObject( dc->hVisRgn ); if (dc) free_dc_ptr( dc ); DRIVER_release_driver( funcs ); return 0; @@ -842,11 +844,6 @@ BOOL WINAPI DeleteDC( HDC hdc ) if (!(dcs = get_dc_ptr( hdcs ))) break; dc->saved_dc = dcs->saved_dc; dc->saveLevel--; - if (dcs->hClipRgn) DeleteObject( dcs->hClipRgn ); - if (dcs->hMetaRgn) DeleteObject( dcs->hMetaRgn ); - if (dcs->hMetaClipRgn) DeleteObject( dcs->hMetaClipRgn ); - if (dcs->hVisRgn) DeleteObject( dcs->hVisRgn ); - PATH_DestroyGdiPath(&dcs->path); free_dc_ptr( dcs ); } @@ -868,11 +865,6 @@ BOOL WINAPI DeleteDC( HDC hdc ) HeapFree( GetProcessHeap(), 0, dc->saved_visrgn ); dc->saved_visrgn = next; } - if (dc->hClipRgn) DeleteObject( dc->hClipRgn ); - if (dc->hMetaRgn) DeleteObject( dc->hMetaRgn ); - if (dc->hMetaClipRgn) DeleteObject( dc->hMetaClipRgn ); - if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); - PATH_DestroyGdiPath(&dc->path); free_dc_ptr( dc ); if (funcs) DRIVER_release_driver( funcs ); /* do that after releasing the GDI lock */

1 0

Nicolas Le Cam : shell32/tests: Fix wrong comment and update test accordingly.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: 4ea0b382657192c2f72a2101cc0f53cadd1258a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ea0b382657192c2f72a2101c… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon Apr 6 19:56:45 2009 +0200 shell32/tests: Fix wrong comment and update test accordingly. --- dlls/shell32/tests/shlfolder.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index de28267..5492b84 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -769,10 +769,6 @@ static void test_GetAttributesOf(void) /* Windows sets the SFGAO_CANLINK flag, when MyComputer is queried via the Desktop * folder object. It doesn't do this, if MyComputer is queried directly (see below). - * SFGAO_CANLINK is the same as DROPEFFECT_LINK, which MSDN says means: "Drag source - * should create a link to the original data". You can't create links on MyComputer on - * Windows, so this flag shouldn't be set. Seems like a bug in Windows. As long as nobody - * depends on this bug, we probably shouldn't imitate it. */ dwFlags = 0xffffffff; hr = IShellFolder_GetAttributesOf(psfDesktop, 1, (LPCITEMIDLIST*)&pidlMyComputer, &dwFlags); @@ -780,9 +776,10 @@ static void test_GetAttributesOf(void) for (i = 0, foundFlagsMatch = FALSE; !foundFlagsMatch && i < sizeof(myComputerFlags) / sizeof(myComputerFlags[0]); i++) { - if (myComputerFlags[i] == (dwFlags & ~(DWORD)SFGAO_CANLINK)) + if ((myComputerFlags[i] | SFGAO_CANLINK) == dwFlags) foundFlagsMatch = TRUE; } + todo_wine ok (foundFlagsMatch, "Wrong MyComputer attributes: %08x\n", dwFlags); hr = IShellFolder_BindToObject(psfDesktop, pidlMyComputer, NULL, &IID_IShellFolder, (LPVOID*)&psfMyComputer);

1 0

Nicolas Le Cam : shell32/tests: Fix a test on WinNT and some Win95.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: a295308c3f4a2fe3d6bb233e1bd0f66b68dc80d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a295308c3f4a2fe3d6bb233e1… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon Apr 6 19:27:06 2009 +0200 shell32/tests: Fix a test on WinNT and some Win95. --- dlls/shell32/tests/shlfolder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 8c5f1dc..de28267 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -717,7 +717,7 @@ static void test_GetAttributesOf(void) SFGAO_CANRENAME | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_HASSUBFOLDER, /* Win95, WinNT when queried directly */ - SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | + SFGAO_CANLINK | SFGAO_HASPROPSHEET | SFGAO_DROPTARGET | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER }; WCHAR wszMyComputer[] = {

1 0

Alexandre Julliard : gdi32/tests: Add some metafile tests. Fix typos.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: 1f1d15723743cbbe9057b610c22743a9cd63db45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1d15723743cbbe9057b610c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 7 15:20:13 2009 +0200 gdi32/tests: Add some metafile tests. Fix typos. --- dlls/gdi32/tests/metafile.c | 83 ++++++++++++++++++++++++++++++------------- 1 files changed, 58 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f1d15723743cbbe9057b…

1 0

Ge van Geldorp : urlmon/tests: Handle certificate verification error.
by Alexandre Julliard 07 Apr '09

07 Apr '09

Module: wine Branch: master Commit: f4795d5997d78f7b1f85340ca0a09168a2716aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4795d5997d78f7b1f85340ca… Author: Ge van Geldorp <ge(a)gse.nl> Date: Tue Apr 7 12:22:14 2009 +0200 urlmon/tests: Handle certificate verification error. --- dlls/urlmon/tests/protocol.c | 100 +++++++++++++++++++++++++++++++++++++----- 1 files changed, 88 insertions(+), 12 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index cc9d41a..ea19c77 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -84,6 +84,7 @@ DEFINE_EXPECT(GetBindString_USER_AGENT); DEFINE_EXPECT(GetBindString_POST_COOKIE); DEFINE_EXPECT(QueryService_HttpNegotiate); DEFINE_EXPECT(QueryService_InternetProtocol); +DEFINE_EXPECT(QueryService_HttpSecurity); DEFINE_EXPECT(BeginningTransaction); DEFINE_EXPECT(GetRootSecurityId); DEFINE_EXPECT(OnResponse); @@ -123,6 +124,7 @@ static HANDLE event_complete, event_complete2; static BOOL binding_test; static PROTOCOLDATA protocoldata, *pdata; static DWORD prot_read; +static BOOL security_problem = FALSE; static enum { FILE_TEST, @@ -182,6 +184,60 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpW(strw, buf); } +static HRESULT WINAPI HttpSecurity_QueryInterface(IHttpSecurity *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) + || IsEqualGUID(&IID_IHttpSecurity, riid)) { + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI HttpSecurity_AddRef(IHttpSecurity *iface) +{ + return 2; +} + +static ULONG WINAPI HttpSecurity_Release(IHttpSecurity *iface) +{ + return 1; +} + +static HRESULT WINAPI HttpSecurity_GetWindow(IHttpSecurity* iface, REFGUID rguidReason, HWND *phwnd) +{ + trace("HttpSecurity_GetWindow\n"); + + return S_FALSE; +} + +static HRESULT WINAPI HttpSecurity_OnSecurityProblem(IHttpSecurity *iface, DWORD dwProblem) +{ + trace("Security problem: %u\n", dwProblem); + ok(dwProblem == ERROR_INTERNET_SEC_CERT_REV_FAILED, "Expected ERROR_INTERNET_SEC_CERT_REV_FAILED got %u\n", dwProblem); + + /* Only retry once */ + if (security_problem) + return E_ABORT; + + security_problem = TRUE; + SET_EXPECT(BeginningTransaction); + + return RPC_E_RETRY; +} + +static IHttpSecurityVtbl HttpSecurityVtbl = { + HttpSecurity_QueryInterface, + HttpSecurity_AddRef, + HttpSecurity_Release, + HttpSecurity_GetWindow, + HttpSecurity_OnSecurityProblem +}; + +static IHttpSecurity http_security = { &HttpSecurityVtbl }; + static HRESULT WINAPI HttpNegotiate_QueryInterface(IHttpNegotiate2 *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) @@ -320,6 +376,12 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return E_NOINTERFACE; } + if(IsEqualGUID(&IID_IHttpSecurity, guidService)) { + ok(IsEqualGUID(&IID_IHttpSecurity, riid), "unexpected riid\n"); + CHECK_EXPECT(QueryService_HttpSecurity); + return IHttpSecurity_QueryInterface(&http_security, riid, ppv); + } + ok(0, "unexpected service %s\n", debugstr_guid(guidService)); return E_FAIL; } @@ -380,7 +442,7 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL } if(tested_protocol == FTP_TEST) todo_wine CHECK_CALLED(ReportProgress_SENDINGREQUEST); - else + else if (tested_protocol != HTTPS_TEST) CHECK_CALLED(ReportProgress_SENDINGREQUEST); if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { SET_EXPECT(OnResponse); @@ -397,18 +459,26 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL ok(hres == S_OK, "Continue failed: %08x\n", hres); if(tested_protocol == FTP_TEST) CLEAR_CALLED(ReportData); - else + else if (! security_problem) CHECK_CALLED(ReportData); if (!state) { - state = 1; - if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { - CHECK_CALLED(OnResponse); - if(tested_protocol == HTTPS_TEST) - CHECK_CALLED(ReportProgress_ACCEPTRANGES); - CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); - if(bindf & BINDF_NEEDFILE) - CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE); + if (! security_problem) + { + state = 1; + if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { + CHECK_CALLED(OnResponse); + if(tested_protocol == HTTPS_TEST) + CHECK_CALLED(ReportProgress_ACCEPTRANGES); + CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); + if(bindf & BINDF_NEEDFILE) + CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE); + } + } + else + { + security_problem = FALSE; + SET_EXPECT(ReportProgress_CONNECTING); } } @@ -466,11 +536,11 @@ static HRESULT WINAPI ProtocolSink_ReportProgress(IInternetProtocolSink *iface, } break; case BINDSTATUS_FINDINGRESOURCE: - CHECK_EXPECT(ReportProgress_FINDINGRESOURCE); + CHECK_EXPECT2(ReportProgress_FINDINGRESOURCE); ok(szStatusText != NULL, "szStatusText == NULL\n"); break; case BINDSTATUS_CONNECTING: - CHECK_EXPECT(ReportProgress_CONNECTING); + CHECK_EXPECT2(ReportProgress_CONNECTING); ok(szStatusText != NULL, "szStatusText == NULL\n"); break; case BINDSTATUS_SENDINGREQUEST: @@ -1672,6 +1742,8 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) SET_EXPECT(ReportProgress_PROXYDETECTING); if(! is_https) SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); + else + SET_EXPECT(QueryService_HttpSecurity); if(!(bindf & BINDF_FROMURLMON)) { SET_EXPECT(OnResponse); SET_EXPECT(ReportProgress_RAWMIMETYPE); @@ -1695,6 +1767,8 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) CHECK_CALLED(Switch); else CHECK_CALLED(ReportData); + if (is_https) + CLEAR_CALLED(QueryService_HttpSecurity); while(1) { if(bindf & BINDF_FROMURLMON) @@ -1721,6 +1795,8 @@ static void test_http_protocol_url(LPCWSTR url, BOOL is_https, BOOL is_first) } ok(hres == S_FALSE, "Read failed: %08x\n", hres); CHECK_CALLED(ReportResult); + if (is_https) + CLEAR_CALLED(ReportProgress_SENDINGREQUEST); test_protocol_terminate(async_protocol); ref = IInternetProtocol_Release(async_protocol);

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
67
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 2009