May 2010 - Wine-commits - list.winehq.org

Hans Leidekker : msi: Add more patch registration tests.
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: 715a506fac175741bda05a6bb65820c9137e3649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=715a506fac175741bda05a6bb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 11 15:23:39 2010 +0200 msi: Add more patch registration tests. --- dlls/msi/tests/patch.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c index ad581d1..8a762c7 100644 --- a/dlls/msi/tests/patch.c +++ b/dlls/msi/tests/patch.c @@ -33,6 +33,8 @@ static UINT (WINAPI *pMsiApplyPatchA)( LPCSTR, LPCSTR, INSTALLTYPE, LPCSTR ); static UINT (WINAPI *pMsiGetPatchInfoExA)( LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPCSTR, LPSTR, DWORD * ); +static UINT (WINAPI *pMsiEnumPatchesExA)( LPCSTR, LPCSTR, DWORD, DWORD, DWORD, LPSTR, + LPSTR, MSIINSTALLCONTEXT *, LPSTR, LPDWORD ); static const char *msifile = "winetest-patch.msi"; static const char *mspfile = "winetest-patch.msp"; @@ -143,6 +145,7 @@ static void init_function_pointers( void ) GET_PROC( hmsi, MsiApplyPatchA ); GET_PROC( hmsi, MsiGetPatchInfoExA ); + GET_PROC( hmsi, MsiEnumPatchesExA ); #undef GET_PROC } @@ -988,9 +991,9 @@ static void test_system_tables( void ) static void test_patch_registration( void ) { UINT r, size; - char buffer[MAX_PATH]; + char buffer[MAX_PATH], patch_code[39]; - if (!pMsiApplyPatchA || !pMsiGetPatchInfoExA) + if (!pMsiApplyPatchA || !pMsiGetPatchInfoExA || !pMsiEnumPatchesExA) { win_skip("required functions not available\n"); return; @@ -1043,6 +1046,22 @@ static void test_patch_registration( void ) ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); ok( !buffer[0], "got %s\n", buffer ); + r = pMsiEnumPatchesExA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", + NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSIPATCHSTATE_APPLIED, + 0, patch_code, NULL, NULL, NULL, NULL ); + ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r ); + ok( !strcmp( patch_code, "{0F96CDC0-4CDF-4304-B283-7B9264889EF7}" ), "wrong patch code\n" ); + + r = pMsiEnumPatchesExA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", + NULL, MSIINSTALLCONTEXT_MACHINE, MSIPATCHSTATE_APPLIED, + 0, patch_code, NULL, NULL, NULL, NULL ); + ok( r == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %u\n", r ); + + r = pMsiEnumPatchesExA( "{913B8D18-FBB6-4CAC-A239-C74C11E3FA74}", + NULL, MSIINSTALLCONTEXT_USERMANAGED, MSIPATCHSTATE_APPLIED, + 0, patch_code, NULL, NULL, NULL, NULL ); + ok( r == ERROR_NO_MORE_ITEMS, "expected ERROR_NO_MORE_ITEMS, got %u\n", r ); + r = MsiInstallProductA( msifile, "REMOVE=ALL" ); ok( r == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %u\n", r );

1 0

André Hentschel : winemaker: Check for more project files.
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: bb8f2c4b17eb10d42106a548708bf54293c4637d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8f2c4b17eb10d42106a5487… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 19:58:12 2010 +0200 winemaker: Check for more project files. --- tools/winemaker | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 60fe31f..d07c97f 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1231,7 +1231,7 @@ sub source_scan_directory($$$$) # If we don't find any executable/library then we might make up targets # from the list of .dsp/.mak files we find since they usually have the # same name as their target. - my @dsp_files=(); + my @prj_files=(); my @mak_files=(); if (defined $opt_single_target or $dirname eq "") { @@ -1291,8 +1291,8 @@ sub source_scan_directory($$$$) if ($dentry =~ /^stdafx.h$/i && !(@$project_settings[$T_FLAGS] & $TF_NOMFC)) { @$project_settings[$T_FLAGS]|=$TF_MFC; } - } elsif ($dentry =~ /\.dsp$/i) { - push @dsp_files,"$dentry"; + } elsif ($dentry =~ /\.(dsp|vcproj)$/i) { + push @prj_files,"$dentry"; $has_win_project=1; } elsif ($dentry =~ /\.mak$/i) { push @mak_files,"$dentry"; @@ -1353,13 +1353,14 @@ sub source_scan_directory($$$$) if ($target_count == 0) { # Try to come up with a target list based on .dsp/.mak files my $prj_list; - if (@dsp_files > 0) { - $prj_list=\@dsp_files; + if (@prj_files > 0) { + print "Projectfile found! You might want to try using it directly."; + $prj_list=\@prj_files; } else { - $prj_list=\@mak_files; + $prj_list=\@mak_files; } foreach my $filename (@$prj_list) { - $filename =~ s/\.(dsp|mak)$//i; + $filename =~ s/\.(dsp|vcproj|mak)$//i; if ($opt_target_type == $TT_DLL) { $filename = "$filename.dll"; }

1 0

André Hentschel : winemaker: Clean up target type handling.
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: ebde80574d6249550151802edbc6c920d86e8c84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebde80574d6249550151802ed… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 10 19:59:01 2010 +0200 winemaker: Clean up target type handling. --- tools/winemaker | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index d07c97f..4bd42a4 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -543,7 +543,7 @@ sub source_scan_project_file($$$) my $prj_name; my $found_cfg=0; my $prj_cfg; - my $prj_target_type=1; + my $prj_target_type=$TT_GUIEXE; my @prj_target_options; if (!($path=~/\/$/)) { @@ -591,16 +591,16 @@ sub source_scan_project_file($$$) next; } elsif (/^# TARGTYPE/) { if (/[[:space:]]0x0101$/) { - # Win32 (x86) Application - $prj_target_type=1; + # Application + $prj_target_type=$TT_GUIEXE; }elsif (/[[:space:]]0x0102$/) { - # Win32 (x86) Dynamic-Link Library - $prj_target_type=3; + # Dynamic-Link Library + $prj_target_type=$TT_DLL; }elsif (/[[:space:]]0x0103$/) { - # Win32 (x86) Console Application - $prj_target_type=2; + # Console Application + $prj_target_type=$TT_CUIEXE; }elsif (/[[:space:]]0x0104$/) { - # Win32 (x86) Static Library + # Static Library } next; } elsif (/^# ADD CPP(.*)/ && $found_cfg==1) { @@ -743,7 +743,7 @@ sub source_scan_project_file($$$) # Generate Debug Info } elsif (/^dll$/) { # Build a DLL - $prj_target_type=3; + $prj_target_type=$TT_DLL; } elsif (/^incremental:[[:alpha:]]+$/) { # Link Incrmentally } elsif (/^implib:/) { @@ -898,9 +898,9 @@ sub source_scan_project_file($$$) foreach my $vc_configuration_attr ($vc_configuration->attributes) { if ($vc_configuration_attr->getName eq "ConfigurationType") { if ($vc_configuration_attr->getValue==1) { - $prj_target_type=1; # Win32 (x86) Application + $prj_target_type=$TT_GUIEXE; # Application } elsif ($vc_configuration_attr->getValue==2) { - $prj_target_type=3; # Win32 (x86) Dynamic-Link Library + $prj_target_type=$TT_DLL; # Dynamic-Link Library } } } @@ -994,7 +994,7 @@ sub source_scan_project_file($$$) my $target=[]; target_init($target); - if ($prj_target_type!=3) { + if ($prj_target_type!=$TT_DLL) { $prj_name=lc($prj_name.".exe"); @$target[$T_TYPE]=$opt_target_type; push @exe_list,$target;

1 0

Michael Stefaniuc : comctl32: Update some ImageList comments.
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: a712a292016e979d3ec8803107564e5009e7ed7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a712a292016e979d3ec880310… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 10 23:36:12 2010 +0200 comctl32: Update some ImageList comments. --- dlls/comctl32/imagelist.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a4dc2a9..cf6fe97 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -33,7 +33,7 @@ * * TODO: * - Add support for ILD_PRESERVEALPHA, ILD_SCALE, ILD_DPISCALE - * - Add support for ILS_GLOW, ILS_SHADOW, ILS_SATURATE, ILS_ALPHA + * - Add support for ILS_GLOW, ILS_SHADOW, ILS_SATURATE * - Thread-safe locking */ @@ -835,9 +835,6 @@ ImageList_InternalDragDraw (HDC hdc, INT x, INT y) * NOTES * The position of the drag image is relative to the window, not * the client area. - * - * BUGS - * The drag image should be drawn semitransparent. */ BOOL WINAPI @@ -921,9 +918,6 @@ ImageList_DragMove (INT x, INT y) * RETURNS * Success: TRUE * Failure: FALSE - * - * BUGS - * The drag image should be drawn semitransparent. */ BOOL WINAPI @@ -1192,7 +1186,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) /* * To obtain a transparent look, background color should be set - * to white and foreground color to black when blting the + * to white and foreground color to black when blitting the * monochrome mask. */ oldImageFg = SetTextColor( hImageDC, RGB( 0, 0, 0 ) );

1 0

Michael Stefaniuc : qedit: Avoid using long.
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: 98fbcc4de2c86f770a9d2dace2fafebed724e97d URL: http://source.winehq.org/git/wine.git/?a=commit;h=98fbcc4de2c86f770a9d2dace… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 11 10:34:43 2010 +0200 qedit: Avoid using long. --- dlls/qedit/mediadet.c | 6 +++--- dlls/qedit/samplegrabber.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 3a13f71..9aeb9c0 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -38,8 +38,8 @@ typedef struct MediaDetImpl { IGraphBuilder *graph; IBaseFilter *source; IBaseFilter *splitter; - long num_streams; - long cur_stream; + LONG num_streams; + LONG cur_stream; IPin *cur_pin; } MediaDetImpl; @@ -168,7 +168,7 @@ static HRESULT WINAPI MediaDet_get_CurrentStream(IMediaDet* iface, LONG *pVal) return S_OK; } -static HRESULT SetCurPin(MediaDetImpl *This, long strm) +static HRESULT SetCurPin(MediaDetImpl *This, LONG strm) { IEnumPins *pins; IPin *pin; diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 78a7306..78979fe 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -489,7 +489,7 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample) REFERENCE_TIME tStart, tEnd; if (This->bufferLen >= 0) { BYTE *data = 0; - long size = IMediaSample_GetActualDataLength(sample); + LONG size = IMediaSample_GetActualDataLength(sample); if (size >= 0 && SUCCEEDED(IMediaSample_GetPointer(sample, &data))) { if (!data) size = 0; @@ -527,7 +527,7 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample) case 1: { BYTE *data = 0; - long size = IMediaSample_GetActualDataLength(sample); + LONG size = IMediaSample_GetActualDataLength(sample); if (size && SUCCEEDED(IMediaSample_GetPointer(sample, &data)) && data) ISampleGrabberCB_BufferCB(This->grabberIface, time, data, size); } @@ -535,7 +535,7 @@ static void SampleGrabber_callback(SG_Impl *This, IMediaSample *sample) case -1: break; default: - FIXME("unsupported method %ld\n", (long int)This->grabberMethod); + FIXME("unsupported method %d\n", This->grabberMethod); /* do not bother us again */ This->grabberMethod = -1; }

1 0

Sven Baars : uninstaller: Fix Dutch translation.
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: ac9c0b2169e2762af2f25ca261e96011e318ca74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac9c0b2169e2762af2f25ca26… Author: Sven Baars <sven.wine(a)gmail.com> Date: Tue May 11 00:28:15 2010 +0200 uninstaller: Fix Dutch translation. --- programs/uninstaller/Nl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/uninstaller/Nl.rc b/programs/uninstaller/Nl.rc index 97d2184..c2cceea 100644 --- a/programs/uninstaller/Nl.rc +++ b/programs/uninstaller/Nl.rc @@ -24,5 +24,5 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { IDS_APPNAME, "Programma verwijderen" - IDS_UNINSTALLFAILED, "Het uitvoeren van de verwijderopdracht '%s' is mislukt, wellicht vanwege een ontbrekend bestand.\r\nWilt u de verwijdersleutel verwijderen uit de registry?" + IDS_UNINSTALLFAILED, "Het uitvoeren van de verwijderopdracht '%s' is mislukt, wellicht vanwege een ontbrekend bestand.\r\nWilt u de verwijdersleutel verwijderen uit het register?" }

1 0

Gerald Pfeifer : comctl32: Remove unused parameter fwKeys from LISTVIEW_MouseHover.
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: 0453154d99e31bc5381aea452590b6cfe9d010b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0453154d99e31bc5381aea452… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 9 15:05:51 2010 +0200 comctl32: Remove unused parameter fwKeys from LISTVIEW_MouseHover. --- dlls/comctl32/listview.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4c24a67..9acf930 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3669,7 +3669,7 @@ static inline BOOL LISTVIEW_IsHotTracking(const LISTVIEW_INFO *infoPtr) * over the item for a certain period of time. * */ -static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, INT y) +static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, INT x, INT y) { NMHDR hdr; @@ -11438,7 +11438,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_MouseMove (infoPtr, (WORD)wParam, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); case WM_MOUSEHOVER: - return LISTVIEW_MouseHover(infoPtr, (WORD)wParam, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); + return LISTVIEW_MouseHover(infoPtr, (SHORT)LOWORD(lParam), (SHORT)HIWORD(lParam)); case WM_NCDESTROY: return LISTVIEW_NCDestroy(infoPtr); @@ -11644,6 +11644,3 @@ static LRESULT LISTVIEW_Command(LISTVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lP return 0; } - - -

1 0

Gerald Pfeifer : comctl32: Remove unused parameter bEnable from LISTVIEW_Enable.
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: 1bca01cbc1ac74f07ad80eeae4e5fcf23d379732 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bca01cbc1ac74f07ad80eeae… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 9 15:06:02 2010 +0200 comctl32: Remove unused parameter bEnable from LISTVIEW_Enable. --- dlls/comctl32/listview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9acf930..d9fb17f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9373,7 +9373,7 @@ static LRESULT LISTVIEW_Destroy(LISTVIEW_INFO *infoPtr) * SUCCESS : TRUE * FAILURE : FALSE */ -static BOOL LISTVIEW_Enable(const LISTVIEW_INFO *infoPtr, BOOL bEnable) +static BOOL LISTVIEW_Enable(const LISTVIEW_INFO *infoPtr) { if (infoPtr->dwStyle & LVS_OWNERDRAWFIXED) InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); @@ -11405,7 +11405,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return LISTVIEW_Destroy(infoPtr); case WM_ENABLE: - return LISTVIEW_Enable(infoPtr, (BOOL)wParam); + return LISTVIEW_Enable(infoPtr); case WM_ERASEBKGND: return LISTVIEW_EraseBkgnd(infoPtr, (HDC)wParam);

1 0

Katayama Hirofumi MZ : wordpad: Add units (in/inch/pt).
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: c92691e1f5c03a33d25c3f42c565a0a9333ad32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c92691e1f5c03a33d25c3f42c… Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> Date: Sat May 8 10:23:06 2010 +0900 wordpad: Add units (in/inch/pt). --- programs/wordpad/En.rc | 3 + programs/wordpad/wordpad.c | 106 ++++++++++++++++++++++++++++++++------------ programs/wordpad/wordpad.h | 3 + 3 files changed, 83 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c92691e1f5c03a33d25c3…

1 0

Thomas Mullaly : urlmon/tests: Added a new test file for testing the IUri interface.
by Alexandre Julliard 11 May '10

11 May '10

Module: wine Branch: master Commit: 4f0a267dc81ee48c35b3e7f85e07e6e80ce5a5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0a267dc81ee48c35b3e7f85… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun May 9 21:23:34 2010 -0400 urlmon/tests: Added a new test file for testing the IUri interface. --- dlls/urlmon/tests/Makefile.in | 1 + dlls/urlmon/tests/uri.c | 99 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/Makefile.in b/dlls/urlmon/tests/Makefile.in index 3f621d6..10b26e5 100644 --- a/dlls/urlmon/tests/Makefile.in +++ b/dlls/urlmon/tests/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ protocol.c \ sec_mgr.c \ stream.c \ + uri.c \ url.c @MAKE_TEST_RULES@ diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c new file mode 100644 index 0000000..1a7effb --- /dev/null +++ b/dlls/urlmon/tests/uri.c @@ -0,0 +1,99 @@ +/* + * UrlMon IUri tests + * + * Copyright 2010 Thomas Mullaly + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* + * IUri testing framework goals: + * - Test invalid flags + * - Test parsing for components when no canonicalization occurs + * - Test parsing for components when canonicalization occurs. + * - More tests... + */ + +#include <wine/test.h> +#include <stdarg.h> +#include <stddef.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "urlmon.h" + +/** TODO: Work on this! +typedef struct _uri_component_test_str { + const char* uri; + DWORD create_flags; + HRESULT create_hres; + DWORD property; + DWORD property_flags; + HRESULT property_hres; + const char* expected; +} uri_component_test_str; + +static const uri_component_test_str URI_STR_PARSE_ONLY_TESTS[] = { + {"http://www.winehq.org", Uri_CREATE_NO_CANONICALIZE, S_OK, Uri_PROPERTY_SCHEME_NAME, 0, S_OK, "http"}, + {"file://c:/test/test.mp3", Uri_CREATE_NO_CANONICALIZE, S_OK, Uri_PROPERTY_SCHEME_NAME, 0, S_OK, "file"} +}; +*/ + + +typedef struct _uri_create_flag_test { + DWORD flags; + HRESULT expected; +} uri_create_flag_test; + +static const uri_create_flag_test URI_INVALID_CREATE_FLAGS[] = { + /* Set of invalid flag combinations to test for. */ + {Uri_CREATE_DECODE_EXTRA_INFO | Uri_CREATE_NO_DECODE_EXTRA_INFO, E_INVALIDARG}, + {Uri_CREATE_CANONICALIZE | Uri_CREATE_NO_CANONICALIZE, E_INVALIDARG}, + {Uri_CREATE_CRACK_UNKNOWN_SCHEMES | Uri_CREATE_NO_CRACK_UNKNOWN_SCHEMES, E_INVALIDARG}, + {Uri_CREATE_PRE_PROCESS_HTML_URI | Uri_CREATE_NO_PRE_PROCESS_HTML_URI, E_INVALIDARG}, + {Uri_CREATE_IE_SETTINGS | Uri_CREATE_NO_IE_SETTINGS, E_INVALIDARG} +}; + +static void test_create_flags(LPCWSTR uriW, uri_create_flag_test test) { + HRESULT hr; + IUri *uri = NULL; + + hr = CreateUri(uriW, test.flags, 0, &uri); + ok(hr == test.expected, "Error: CreateUri returned 0x%08x, expected 0x%08x", hr, test.expected); + + if(uri) { IUri_Release(uri); } +} + +/* + * Simple tests to make sure the CreateUri function handles invalid flag combinations + * correctly. + */ +static void test_CreateUri_InvalidFlags(void) { + static const WCHAR INVALID_URL[] = {'I','N','V','A','L','I','D',0}; + DWORD i; + + for(i = 0; i < sizeof(URI_INVALID_CREATE_FLAGS)/sizeof(URI_INVALID_CREATE_FLAGS[0]); ++i) { + test_create_flags(INVALID_URL, URI_INVALID_CREATE_FLAGS[i]); + } +} + +START_TEST(uri) { + todo_wine { + trace("test CreateUri invalid flags...\n"); + test_CreateUri_InvalidFlags(); + } +}

1 0