wine-commits May 2010

wine-commits@winehq.org

3 participants
955 discussions

Robert Wilhelm : msvcrt: Support system(NULL).
by Alexandre Julliard 28 May '10

28 May '10

Module: wine Branch: master Commit: 620af69d888bc5d0fa2179f06423aa1fb290b11b URL: http://source.winehq.org/git/wine.git/?a=commit;h=620af69d888bc5d0fa2179f06… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Thu May 27 18:45:06 2010 +0200 msvcrt: Support system(NULL). --- dlls/msvcrt/process.c | 19 ++++++++++++++++++- dlls/msvcrt/tests/environ.c | 11 +++++++++++ 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index 564c100..b4c39c1 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1168,7 +1168,21 @@ int CDECL _wsystem(const MSVCRT_wchar_t* cmd) unsigned int len; static const MSVCRT_wchar_t flag[] = {' ','/','c',' ',0}; - if (!(comspec = msvcrt_get_comspec())) return -1; + comspec = msvcrt_get_comspec(); + + if (cmd == NULL) + { + if (comspec == NULL) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return 0; + } + return 1; + } + + if ( comspec == NULL) + return -1; + len = strlenW(comspec) + strlenW(flag) + strlenW(cmd) + 1; if (!(fullcmd = HeapAlloc(GetProcessHeap(), 0, len * sizeof(MSVCRT_wchar_t)))) @@ -1195,6 +1209,9 @@ int CDECL MSVCRT_system(const char* cmd) int res = -1; MSVCRT_wchar_t *cmdW; + if (cmd == NULL) + return _wsystem(NULL); + if ((cmdW = msvcrt_wstrdupa(cmd))) { res = _wsystem(cmdW); diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 6175e14..336238c 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -42,6 +42,15 @@ static const char *a_very_long_env_string = "/usr/lib/mingw32/3.4.2/;" "/usr/lib/"; +static void test_system(void) +{ + int ret = system(NULL); + ok(ret == 1, "Expected system to return 1, got %d\n", ret); + + ret = system("echo OK"); + ok(ret == 0, "Expected system to return 0, got %d\n", ret); +} + START_TEST(environ) { ok( _putenv("cat=") == 0, "_putenv failed on deletion of nonexistent environment variable\n" ); @@ -54,4 +63,6 @@ START_TEST(environ) ok( _putenv(a_very_long_env_string) == 0, "_putenv failed for long environment string\n"); ok( getenv("nonexistent") == NULL, "getenv should fail with nonexistent var name\n" ); + + test_system(); }

1 0

Alexandre Julliard : user32: Only skip redraws on MDI child unmaximize if the new child is maximized.
by Alexandre Julliard 28 May '10

28 May '10

Module: wine Branch: master Commit: d815e582cf327dca33cf84c3cc27701c2eef98ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d815e582cf327dca33cf84c3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 15:01:25 2010 +0200 user32: Only skip redraws on MDI child unmaximize if the new child is maximized. --- dlls/user32/win.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 74ea0b3..6800abd 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1148,9 +1148,14 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, if((cs->style & WS_VISIBLE) && IsZoomed(top_child)) { TRACE("Restoring current maximized child %p\n", top_child); - SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); - ShowWindow( top_child, SW_SHOWNORMAL ); - SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); + if (cs->style & WS_MAXIMIZE) + { + /* if the new window is maximized don't bother repainting */ + SendMessageW( top_child, WM_SETREDRAW, FALSE, 0 ); + ShowWindow( top_child, SW_SHOWNORMAL ); + SendMessageW( top_child, WM_SETREDRAW, TRUE, 0 ); + } + else ShowWindow( top_child, SW_SHOWNORMAL ); } } }

1 0

Alexandre Julliard : winex11: Only unmap windows when the window rect changes to unmapped the first time .
by Alexandre Julliard 28 May '10

28 May '10

Module: wine Branch: master Commit: 2db72e98597a4025873ded6d1e844ec5b37ad0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2db72e98597a4025873ded6d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 12:16:17 2010 +0200 winex11: Only unmap windows when the window rect changes to unmapped the first time. --- dlls/winex11.drv/window.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 8734315..3999054 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -214,7 +214,7 @@ static BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rec /*********************************************************************** - * X11DRV_is_window_rect_mapped + * is_window_rect_mapped * * Check if the X whole window should be mapped based on its rectangle */ @@ -2329,7 +2329,8 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (data->mapped) { if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || - (event_type != ConfigureNotify && !is_window_rect_mapped( rectWindow ))) + (event_type != ConfigureNotify && + !is_window_rect_mapped( rectWindow ) && is_window_rect_mapped( &old_window_rect ))) unmap_window( display, data ); }

1 0

Alexandre Julliard : winex11: Map zero-size windows and set an empty window region for them.
by Alexandre Julliard 28 May '10

28 May '10

Module: wine Branch: master Commit: 61e50e15ba45ad54655f98619f5ef33917033165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61e50e15ba45ad54655f98619… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 12:14:43 2010 +0200 winex11: Map zero-size windows and set an empty window region for them. --- dlls/winex11.drv/window.c | 34 +++++++++++++++------------------- 1 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b85aff0..8734315 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -220,9 +220,6 @@ static BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rec */ static BOOL is_window_rect_mapped( const RECT *rect ) { - /* don't map if rect is empty */ - if (IsRectEmpty( rect )) return FALSE; - /* don't map if rect is off-screen */ if (rect->left >= virtual_screen_rect.right || rect->top >= virtual_screen_rect.bottom || @@ -249,19 +246,6 @@ static inline BOOL is_window_resizable( struct x11drv_win_data *data, DWORD styl /*********************************************************************** - * get_window_owner - */ -static HWND get_window_owner( HWND hwnd ) -{ - RECT rect; - HWND owner = GetWindow( hwnd, GW_OWNER ); - /* ignore the zero-size owners used by Delphi apps */ - if (owner && GetWindowRect( owner, &rect ) && IsRectEmpty( &rect )) owner = 0; - return owner; -} - - -/*********************************************************************** * get_mwm_decorations */ static unsigned long get_mwm_decorations( struct x11drv_win_data *data, @@ -456,6 +440,16 @@ static void sync_window_region( Display *display, struct x11drv_win_data *data, if (!data->whole_window) return; data->shaped = FALSE; + if (IsRectEmpty( &data->window_rect )) /* set an empty shape */ + { + static XRectangle empty_rect; + wine_tsx11_lock(); + XShapeCombineRectangles( display, data->whole_window, ShapeBounding, 0, 0, + &empty_rect, 1, ShapeSet, YXBanded ); + wine_tsx11_unlock(); + return; + } + if (hrgn == (HRGN)1) /* hack: win_region == 1 means retrieve region from server */ { if (!(hrgn = CreateRectRgn( 0, 0, 0, 0 ))) return; @@ -1169,7 +1163,7 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) { style = GetWindowLongW( data->hwnd, GWL_STYLE ); ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); - owner = get_window_owner( data->hwnd ); + owner = GetWindow( data->hwnd, GW_OWNER ); if ((owner_win = get_owner_whole_window( owner, data->managed ))) group_leader = owner_win; } @@ -1260,7 +1254,7 @@ void update_net_wm_states( Display *display, struct x11drv_win_data *data ) new_state |= (1 << NET_WM_STATE_ABOVE); if (ex_style & WS_EX_TOOLWINDOW) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); - if (!(ex_style & WS_EX_APPWINDOW) && get_window_owner( data->hwnd )) + if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); if (!data->mapped) /* set the _NET_WM_STATE atom directly */ @@ -1503,6 +1497,8 @@ static void sync_window_position( Display *display, struct x11drv_win_data *data XReconfigureWMWindow( display, data->whole_window, DefaultScreen(display), mask, &changes ); #ifdef HAVE_LIBXSHAPE + if (IsRectEmpty( old_window_rect ) != IsRectEmpty( &data->window_rect )) + sync_window_region( display, data, (HRGN)1 ); if (data->shaped) { int old_x_offset = old_window_rect->left - old_whole_rect->left; @@ -1690,7 +1686,7 @@ static Window create_whole_window( Display *display, struct x11drv_win_data *dat sync_window_text( display, data->whole_window, text ); /* set the window region */ - if (win_rgn) sync_window_region( display, data, win_rgn ); + if (win_rgn || IsRectEmpty( &data->window_rect )) sync_window_region( display, data, win_rgn ); /* set the window opacity */ if (!GetLayeredWindowAttributes( data->hwnd, &key, &alpha, &layered_flags )) layered_flags = 0;

1 0

Alexandre Julliard : winex11: Set size hints to 1x1 for zero-sized windows.
by Alexandre Julliard 28 May '10

28 May '10

Module: wine Branch: master Commit: 81c4b4120d0b2f3af2b3bb2d1fc3071d458a7398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c4b4120d0b2f3af2b3bb2d1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 12:13:01 2010 +0200 winex11: Set size hints to 1x1 for zero-sized windows. --- dlls/winex11.drv/window.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f1f2803..b85aff0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1018,6 +1018,8 @@ static void set_size_hints( Display *display, struct x11drv_win_data *data, DWOR { size_hints->max_width = data->whole_rect.right - data->whole_rect.left; size_hints->max_height = data->whole_rect.bottom - data->whole_rect.top; + if (size_hints->max_width <= 0 ||size_hints->max_height <= 0) + size_hints->max_width = size_hints->max_height = 1; size_hints->min_width = size_hints->max_width; size_hints->min_height = size_hints->max_height; size_hints->flags |= PMinSize | PMaxSize;

1 0

Alexandre Julliard : winex11: Set window style to normal for windows with a minimize box.
by Alexandre Julliard 28 May '10

28 May '10

Module: wine Branch: master Commit: 8b84d64075a78c0de920ecd2052fe64506179099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b84d64075a78c0de920ecd20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 12:12:32 2010 +0200 winex11: Set window style to normal for windows with a minimize box. Some window managers don't allow minimizing dialog windows. --- dlls/winex11.drv/window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ef6c442..f1f2803 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1181,6 +1181,7 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) /* set the WM_WINDOW_TYPE */ if (style & WS_THICKFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); else if (ex_style & WS_EX_APPWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); + else if (style & WS_MINIMIZEBOX) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); else if (style & WS_DLGFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); else if (ex_style & WS_EX_DLGMODALFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); else if ((style & WS_POPUP) && owner) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG);

1 0

Kristofer Henriksson : winemp3.acm: Fix the Mac-specific code.
by Alexandre Julliard 28 May '10

28 May '10

Module: wine Branch: master Commit: c58eff621d9c0d3f02f32e8b87f9f539d63a6e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c58eff621d9c0d3f02f32e8b8… Author: Kristofer Henriksson <kthenriksson(a)gmail.com> Date: Mon May 24 15:04:42 2010 -0400 winemp3.acm: Fix the Mac-specific code. The previous code does not function on Snow Leopard, and does not conform to Apple's documentation. This fix should function on all versions of OS X later than 10.2. --- configure | 18 +--- configure.ac | 8 +- dlls/winemp3.acm/mpegl3.c | 326 ++++++++++++++++++++++++++++++++------------- include/config.h.in | 10 -- 4 files changed, 235 insertions(+), 127 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c58eff621d9c0d3f02f32…

1 0

Dmitry Timoshkov : winex11.drv: Simulate pressing Alt+F4 instead of clicking the caption Close button when handling the WM_DELETE_WINDOW event .
by Alexandre Julliard 28 May '10

28 May '10

Module: wine Branch: master Commit: 167514ce940447bf301faff4dd4b19978191c8bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=167514ce940447bf301faff4d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri May 28 15:06:14 2010 +0900 winex11.drv: Simulate pressing Alt+F4 instead of clicking the caption Close button when handling the WM_DELETE_WINDOW event. --- dlls/winex11.drv/event.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index da45fe2..5bb1ecf 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -522,7 +522,6 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (IsWindowEnabled(hwnd)) { HMENU hSysMenu; - POINT pt; if (GetClassLongW(hwnd, GCL_STYLE) & CS_NOCLOSE) return; hSysMenu = GetSystemMenu(hwnd, FALSE); @@ -553,10 +552,12 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) break; } } - /* Simulate clicking the caption Close button */ - GetCursorPos( &pt ); - PostMessageW( hwnd, WM_NCLBUTTONDOWN, HTCLOSE, MAKELPARAM( pt.x, pt.y ) ); - PostMessageW( hwnd, WM_LBUTTONUP, HTCLOSE, MAKELPARAM( pt.x, pt.y ) ); + + /* Simulate pressing Alt+F4 */ + keybd_event(VK_MENU, 0, 0, 0); + keybd_event(VK_F4, 0, 0, 0); + keybd_event(VK_F4, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_MENU, 0, KEYEVENTF_KEYUP, 0); } } else if (protocol == x11drv_atom(WM_TAKE_FOCUS))

1 0

Hans Leidekker : wuapi: Return success from automatic_updates_Pause.
by Alexandre Julliard 28 May '10

28 May '10

Module: wine Branch: master Commit: c9fd854e04819a06ee10e04fb090810b4e879f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9fd854e04819a06ee10e04fb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 28 08:47:04 2010 +0200 wuapi: Return success from automatic_updates_Pause. --- dlls/wuapi/updates.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wuapi/updates.c b/dlls/wuapi/updates.c index 1bf063b..0366ebc 100644 --- a/dlls/wuapi/updates.c +++ b/dlls/wuapi/updates.c @@ -144,7 +144,7 @@ static HRESULT WINAPI automatic_updates_Pause( IAutomaticUpdates *This ) { FIXME("\n"); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI automatic_updates_Resume(

1 0

Thomas Mullaly : urlmon/tests: Added tests for the IUri_Get* dword property functions.
by Alexandre Julliard 28 May '10

28 May '10

Module: wine Branch: master Commit: 67d642b54036bc63c4194951ad4f7e17f6f33785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d642b54036bc63c4194951a… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu May 27 19:39:28 2010 -0400 urlmon/tests: Added tests for the IUri_Get* dword property functions. --- dlls/urlmon/tests/uri.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 22 ++++++++- 2 files changed, 151 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 7e2496e..58f39b9 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -835,6 +835,133 @@ static void test_IUri_GetStrProperties(void) { } } +static void test_IUri_GetDwordProperties(void) { + IUri *uri = NULL; + HRESULT hr; + DWORD i; + + /* Make sure all the 'Get*' dword property functions handle invalid args correctly. */ + hr = pCreateUri(http_urlW, 0, 0, &uri); + ok(hr == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + if(SUCCEEDED(hr)) { + hr = IUri_GetHostType(uri, NULL); + ok(hr == E_INVALIDARG, "Error: GetHostType returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + + hr = IUri_GetPort(uri, NULL); + ok(hr == E_INVALIDARG, "Error: GetPort returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + + hr = IUri_GetScheme(uri, NULL); + ok(hr == E_INVALIDARG, "Error: GetScheme returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + + hr = IUri_GetZone(uri, NULL); + ok(hr == E_INVALIDARG, "Error: GetZone returned 0x%08x, expected 0x%08x.\n", hr, E_INVALIDARG); + } + if(uri) IUri_Release(uri); + + for(i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); ++i) { + uri_properties test = uri_tests[i]; + LPWSTR uriW; + uri = NULL; + + uriW = a2w(test.uri); + hr = pCreateUri(uriW, test.create_flags, 0, &uri); + if(test.create_todo) { + todo_wine { + ok(hr == test.create_expected, "Error: CreateUri returned 0x%08x, expected 0x%08x on uri_tests[%d].\n", + hr, test.create_expected, i); + } + } else { + ok(hr == test.create_expected, "Error: CreateUri returned 0x%08x, expected 0x%08x on uri_tests[%d].\n", + hr, test.create_expected, i); + } + + if(SUCCEEDED(hr)) { + uri_dword_property prop; + DWORD received; + + /* Assign an insane value so tests don't accidentally pass when + * they shouldn't! + */ + received = -9999999; + + /* GetHostType() tests. */ + prop = test.dword_props[Uri_PROPERTY_HOST_TYPE-Uri_PROPERTY_DWORD_START]; + hr = IUri_GetHostType(uri, &received); + if(prop.todo) { + todo_wine { + ok(hr == prop.expected, "Error: GetHostType returned 0x%08x, expected 0x%08x on uri_tests[%d].\n", + hr, prop.expected, i); + } + todo_wine { + ok(received == prop.value, "Error: Expected %d but got %d on uri_tests[%d].\n", prop.value, received, i); + } + } else { + ok(hr == prop.expected, "Error: GetHostType returned 0x%08x, expected 0x%08x on uri_tests[%d].\n", + hr, prop.expected, i); + ok(received == prop.value, "Error: Expected %d but got %d on uri_tests[%d].\n", prop.value, received, i); + } + received = -9999999; + + /* GetPort() tests. */ + prop = test.dword_props[Uri_PROPERTY_PORT-Uri_PROPERTY_DWORD_START]; + hr = IUri_GetPort(uri, &received); + if(prop.todo) { + todo_wine { + ok(hr == prop.expected, "Error: GetPort returned 0x%08x, expected 0x%08x on uri_tests[%d].\n", + hr, prop.expected, i); + } + todo_wine { + ok(received == prop.value, "Error: Expected %d but got %d on uri_tests[%d].\n", prop.value, received, i); + } + } else { + ok(hr == prop.expected, "Error: GetPort returned 0x%08x, expected 0x%08x on uri_tests[%d].\n", + hr, prop.expected, i); + ok(received == prop.value, "Error: Expected %d but got %d on uri_tests[%d].\n", prop.value, received, i); + } + received = -9999999; + + /* GetScheme() tests. */ + prop = test.dword_props[Uri_PROPERTY_SCHEME-Uri_PROPERTY_DWORD_START]; + hr = IUri_GetScheme(uri, &received); + if(prop.todo) { + todo_wine { + ok(hr == prop.expected, "Error: GetScheme returned 0x%08x, expected 0x%08x on uri_tests[%d].\n", + hr, prop.expected, i); + } + todo_wine { + ok(received == prop.value, "Error: Expected %d but got %d on uri_tests[%d].\n", prop.value, received, i); + } + } else { + ok(hr == prop.expected, "Error: GetScheme returned 0x%08x, expected 0x%08x on uri_tests[%d].\n", + hr, prop.expected, i); + ok(received == prop.value, "Error: Expected %d but got %d on uri_tests[%d].\n", prop.value, received, i); + } + received = -9999999; + + /* GetZone() tests. */ + prop = test.dword_props[Uri_PROPERTY_ZONE-Uri_PROPERTY_DWORD_START]; + hr = IUri_GetZone(uri, &received); + if(prop.todo) { + todo_wine { + ok(hr == prop.expected, "Error: GetZone returned 0x%08x, expected 0x%08x on uri_tests[%d].\n", + hr, prop.expected, i); + } + todo_wine { + ok(received == prop.value, "Error: Expected %d but got %d on uri_tests[%d].\n", prop.value, received, i); + } + } else { + ok(hr == prop.expected, "Error: GetZone returned 0x%08x, expected 0x%08x on uri_tests[%d].\n", + hr, prop.expected, i); + ok(received == prop.value, "Error: Expected %d but got %d on uri_tests[%d].\n", prop.value, received, i); + } + } + + if(uri) IUri_Release(uri); + + heap_free(uriW); + } +} + START_TEST(uri) { HMODULE hurlmon; @@ -860,4 +987,7 @@ START_TEST(uri) { trace("test IUri_GetStrProperties...\n"); test_IUri_GetStrProperties(); + + trace("test IUri_GetDwordProperties...\n"); + test_IUri_GetDwordProperties(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 8d8130e..27b0863 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -104,7 +104,7 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW /* Microsoft's implementation for the ZONE property of a URI seems to be lacking... * From what I can tell, instead of checking which URLZONE the URI belongs to it - * simply assigns URLZONE_INVALID and returns E_NOTIMPL. This also applies the GetZone + * simply assigns URLZONE_INVALID and returns E_NOTIMPL. This also applies to the GetZone * function. */ if(uriProp == Uri_PROPERTY_ZONE) { @@ -287,6 +287,10 @@ static HRESULT WINAPI Uri_GetHostType(IUri *iface, DWORD *pdwHostType) { Uri *This = URI_THIS(iface); FIXME("(%p)->(%p)\n", This, pdwHostType); + + if(!pdwHostType) + return E_INVALIDARG; + return E_NOTIMPL; } @@ -294,6 +298,10 @@ static HRESULT WINAPI Uri_GetPort(IUri *iface, DWORD *pdwPort) { Uri *This = URI_THIS(iface); FIXME("(%p)->(%p)\n", This, pdwPort); + + if(!pdwPort) + return E_INVALIDARG; + return E_NOTIMPL; } @@ -301,6 +309,10 @@ static HRESULT WINAPI Uri_GetScheme(IUri *iface, DWORD *pdwScheme) { Uri *This = URI_THIS(iface); FIXME("(%p)->(%p)\n", This, pdwScheme); + + if(!pdwScheme) + return E_INVALIDARG; + return E_NOTIMPL; } @@ -308,6 +320,14 @@ static HRESULT WINAPI Uri_GetZone(IUri *iface, DWORD *pdwZone) { Uri *This = URI_THIS(iface); FIXME("(%p)->(%p)\n", This, pdwZone); + + if(!pdwZone) + return E_INVALIDARG; + + /* Microsoft doesn't seem to have this implemented yet... See + * the comment in Uri_GetPropertyDWORD for more about this. + */ + *pdwZone = URLZONE_INVALID; return E_NOTIMPL; }

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
96
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 May 2010