September 2010 - Wine-commits

Thomas Mullaly : urlmon: Implemented support for determining what port value to use in IUriBuilder.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: cbea4e2a855a1cd442853888772fadd3376af537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbea4e2a855a1cd4428538887… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Sep 21 22:25:24 2010 -0400 urlmon: Implemented support for determining what port value to use in IUriBuilder. --- dlls/urlmon/uri.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 070ec70..44e37b1 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -160,9 +160,10 @@ typedef struct { BOOL has_ipv6; ipv6_address ipv6_address; + BOOL has_port; const WCHAR *port; DWORD port_len; - USHORT port_value; + DWORD port_value; const WCHAR *path; DWORD path_len; @@ -1435,6 +1436,7 @@ static BOOL parse_port(const WCHAR **ptr, parse_data *data, DWORD flags) { ++(*ptr); } + data->has_port = TRUE; data->port_value = port; data->port_len = *ptr - data->port; @@ -3696,6 +3698,21 @@ static HRESULT validate_host(const UriBuilder *builder, parse_data *data, DWORD return S_OK; } +static void setup_port(const UriBuilder *builder, parse_data *data, DWORD flags) { + if(builder->modified_props & Uri_HAS_PORT) { + if(builder->has_port) { + data->has_port = TRUE; + data->port_value = builder->port; + } + } else if(builder->uri && builder->uri->has_port) { + data->has_port = TRUE; + data->port_value = builder->uri->port; + } + + if(data->has_port) + TRACE("(%p %p %x): Using %u as port for IUri.\n", builder, data, flags, data->port_value); +} + static HRESULT validate_components(const UriBuilder *builder, parse_data *data, DWORD flags) { HRESULT hr; @@ -3728,6 +3745,8 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, /* The URI is opaque if it doesn't have an authority component. */ data->is_opaque = !data->username && !data->password && !data->host; + setup_port(builder, data, flags); + return E_NOTIMPL; }

1 0

Thomas Mullaly : urlmon: Can't set the host of a IUriBuilder to NULL.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 7e292893bd02a4f127b041053e68fbe25784e677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e292893bd02a4f127b041053… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Sep 22 17:32:46 2010 -0400 urlmon: Can't set the host of a IUriBuilder to NULL. --- dlls/urlmon/tests/uri.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 19 +++++++++--- 2 files changed, 85 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index a32f889..16bb75f 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5295,6 +5295,72 @@ static const uri_builder_test uri_builder_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + /* Can't set the host name to NULL. */ + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,NULL,"google.com",Uri_PROPERTY_HOST,E_INVALIDARG,FALSE} + }, + {FALSE}, + 0,S_OK,FALSE, + 0,S_OK,FALSE, + 0,0,0,S_OK,FALSE, + { + {"http://google.com/",S_OK}, + {"google.com",S_OK}, + {"http://google.com/",S_OK}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://google.com/",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + /* Can set the host name to an empty string. */ + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"",NULL,Uri_PROPERTY_HOST,S_OK,FALSE} + }, + {FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"http:///",S_OK}, + {"",S_OK}, + {"http:///",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_OK}, + {"",S_FALSE}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http:///",S_OK}, + {"http",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; @@ -8025,10 +8091,14 @@ static void test_IUriBuilder(void) { uri_builder_property prop = test.properties[j]; if(prop.change) { change_property(builder, &prop, i); - if(prop.property != Uri_PROPERTY_SCHEME_NAME) + if(prop.property != Uri_PROPERTY_SCHEME_NAME && + prop.property != Uri_PROPERTY_HOST) modified = TRUE; else if(prop.value && *prop.value) modified = TRUE; + else if(prop.value && !*prop.value && prop.property == Uri_PROPERTY_HOST) + /* Host name property can't be NULL, but it can be empty. */ + modified = TRUE; } } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 44e37b1..9e20f2e 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5082,6 +5082,11 @@ static HRESULT WINAPI UriBuilder_SetHost(IUriBuilder *iface, LPCWSTR pwzNewValue { UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); + + /* Host name can't be set to NULL. */ + if(!pwzNewValue) + return E_INVALIDARG; + return set_builder_component(&This->host, &This->host_len, pwzNewValue, 0, &This->modified_props, Uri_HAS_HOST); } @@ -5127,11 +5132,11 @@ static HRESULT WINAPI UriBuilder_SetSchemeName(IUriBuilder *iface, LPCWSTR pwzNe TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); /* Only set the scheme name if it's not NULL or empty. */ - if(pwzNewValue && *pwzNewValue) - return set_builder_component(&This->scheme, &This->scheme_len, pwzNewValue, 0, - &This->modified_props, Uri_HAS_SCHEME_NAME); - else + if(!pwzNewValue || !*pwzNewValue) return E_INVALIDARG; + + return set_builder_component(&This->scheme, &This->scheme_len, pwzNewValue, 0, + &This->modified_props, Uri_HAS_SCHEME_NAME); } static HRESULT WINAPI UriBuilder_SetUserName(IUriBuilder *iface, LPCWSTR pwzNewValue) @@ -5157,8 +5162,12 @@ static HRESULT WINAPI UriBuilder_RemoveProperties(IUriBuilder *iface, DWORD dwPr if(dwPropertyMask & Uri_HAS_FRAGMENT) UriBuilder_SetFragment(iface, NULL); + /* Even though you can't set the host name to NULL or an + * empty string, you can still remove it... for some reason. + */ if(dwPropertyMask & Uri_HAS_HOST) - UriBuilder_SetHost(iface, NULL); + set_builder_component(&This->host, &This->host_len, NULL, 0, + &This->modified_props, Uri_HAS_HOST); if(dwPropertyMask & Uri_HAS_PASSWORD) UriBuilder_SetPassword(iface, NULL);

1 0

Thomas Mullaly : urlmon: Finished validation for the remaining components of a IUriBuilder.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 70843e4f34fe39a275e0da6acf7b25141ffe89ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=70843e4f34fe39a275e0da6ac… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Sep 22 19:23:37 2010 -0400 urlmon: Finished validation for the remaining components of a IUriBuilder. --- dlls/urlmon/tests/uri.c | 27 +++++++++++ dlls/urlmon/uri.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 143 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 16bb75f..3e6f5a8 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5361,6 +5361,33 @@ static const uri_builder_test uri_builder_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"/path?query",NULL,Uri_PROPERTY_PATH,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"/path#test",NULL,Uri_PROPERTY_PATH,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,"?path#test",NULL,Uri_PROPERTY_QUERY,S_OK,FALSE} + }, + {FALSE}, + 0,INET_E_INVALID_URL,FALSE, + 0,INET_E_INVALID_URL,FALSE, + 0,0,0,INET_E_INVALID_URL,FALSE } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 9e20f2e..ef66186 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3713,6 +3713,106 @@ static void setup_port(const UriBuilder *builder, parse_data *data, DWORD flags) TRACE("(%p %p %x): Using %u as port for IUri.\n", builder, data, flags, data->port_value); } +static HRESULT validate_path(const UriBuilder *builder, parse_data *data, DWORD flags) { + const WCHAR *ptr = NULL; + const WCHAR **pptr; + DWORD expected_len; + + if(builder->path) { + ptr = builder->path; + expected_len = builder->path_len; + } else if(!(builder->modified_props & Uri_HAS_PATH) && + builder->uri && builder->uri->path_start > -1) { + ptr = builder->uri->canon_uri+builder->uri->path_start; + expected_len = builder->uri->path_len; + } + + if(ptr) { + BOOL valid = FALSE; + const WCHAR *component = ptr; + pptr = &ptr; + + /* How the path is validated depends on what type of + * URI it is. + */ + valid = data->is_opaque ? + parse_path_opaque(pptr, data, flags) : parse_path_hierarchical(pptr, data, flags); + + if(!valid || expected_len != data->path_len) { + TRACE("(%p %p %x): Invalid path componet %s.\n", builder, data, flags, + debugstr_wn(component, expected_len)); + return INET_E_INVALID_URL; + } + + TRACE("(%p %p %x): Valid path component %s len=%d.\n", builder, data, flags, + debugstr_wn(data->path, data->path_len), data->path_len); + } + + return S_OK; +} + +static HRESULT validate_query(const UriBuilder *builder, parse_data *data, DWORD flags) { + const WCHAR *ptr = NULL; + const WCHAR **pptr; + DWORD expected_len; + + if(builder->query) { + ptr = builder->query; + expected_len = builder->query_len; + } else if(!(builder->modified_props & Uri_HAS_QUERY) && builder->uri && + builder->uri->query_start > -1) { + ptr = builder->uri->canon_uri+builder->uri->query_start; + expected_len = builder->uri->query_len; + } + + if(ptr) { + const WCHAR *component = ptr; + pptr = &ptr; + + if(parse_query(pptr, data, flags) && expected_len == data->query_len) + TRACE("(%p %p %x): Valid query component %s len=%d.\n", builder, data, flags, + debugstr_wn(data->query, data->query_len), data->query_len); + else { + TRACE("(%p %p %x): Invalid query component %s.\n", builder, data, flags, + debugstr_wn(component, expected_len)); + return INET_E_INVALID_URL; + } + } + + return S_OK; +} + +static HRESULT validate_fragment(const UriBuilder *builder, parse_data *data, DWORD flags) { + const WCHAR *ptr = NULL; + const WCHAR **pptr; + DWORD expected_len; + + if(builder->fragment) { + ptr = builder->fragment; + expected_len = builder->fragment_len; + } else if(!(builder->modified_props & Uri_HAS_FRAGMENT) && builder->uri && + builder->uri->fragment_start > -1) { + ptr = builder->uri->canon_uri+builder->uri->fragment_start; + expected_len = builder->uri->fragment_len; + } + + if(ptr) { + const WCHAR *component = ptr; + pptr = &ptr; + + if(parse_query(pptr, data, flags) && expected_len == data->fragment_len) + TRACE("(%p %p %x): Valid fragment component %s len=%d.\n", builder, data, flags, + debugstr_wn(data->fragment, data->fragment_len), data->fragment_len); + else { + TRACE("(%p %p %x): Invalid fragment component %s.\n", builder, data, flags, + debugstr_wn(component, expected_len)); + return INET_E_INVALID_URL; + } + } + + return S_OK; +} + static HRESULT validate_components(const UriBuilder *builder, parse_data *data, DWORD flags) { HRESULT hr; @@ -3747,7 +3847,21 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data, setup_port(builder, data, flags); - return E_NOTIMPL; + hr = validate_path(builder, data, flags); + if(FAILED(hr)) + return hr; + + hr = validate_query(builder, data, flags); + if(FAILED(hr)) + return hr; + + hr = validate_fragment(builder, data, flags); + if(FAILED(hr)) + return hr; + + TRACE("(%p %p %x): Finished validating builder components.\n", builder, data, flags); + + return S_OK; } static HRESULT build_uri(const UriBuilder *builder, IUri **uri, DWORD create_flags, @@ -3790,7 +3904,7 @@ static HRESULT build_uri(const UriBuilder *builder, IUri **uri, DWORD create_fla return hr; } - return S_OK; + return E_NOTIMPL; } #define URI_THIS(iface) DEFINE_THIS(Uri, IUri, iface)

1 0

Alexandre Julliard : gdi32: Implement MirrorRgn.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 97611dca8b2690a4e0cc4df73a481ee899e2e99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=97611dca8b2690a4e0cc4df73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 20:45:56 2010 +0200 gdi32: Implement MirrorRgn. --- dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/region.c | 21 +++++++++++++++++++++ dlls/user32/tests/win.c | 20 ++++++++++++++++++-- include/wingdi.h | 1 + 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 2855206..4901e13 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -363,7 +363,7 @@ @ stub LoadImageColorMatcherA @ stub LoadImageColorMatcherW @ stdcall MaskBlt(long long long long long long long long long long long long) -# @ stub MirrorRgn +@ stdcall MirrorRgn(long long) @ stdcall ModifyWorldTransform(long ptr long) @ stdcall MoveToEx(long long long ptr) @ stdcall NamedEscape(long wstr long long ptr long ptr) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 1f281c4..b37211f 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1516,6 +1516,27 @@ INT mirror_region( HRGN dst, HRGN src, INT width ) } /*********************************************************************** + * MirrorRgn (GDI32.@) + */ +BOOL WINAPI MirrorRgn( HWND hwnd, HRGN hrgn ) +{ + static const WCHAR user32W[] = {'u','s','e','r','3','2','.','d','l','l',0}; + static BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect ); + RECT rect; + + /* yes, a HWND in gdi32, don't ask */ + if (!pGetWindowRect) + { + HMODULE user32 = GetModuleHandleW(user32W); + if (!user32) return FALSE; + if (!(pGetWindowRect = (void *)GetProcAddress( user32, "GetWindowRect" ))) return FALSE; + } + pGetWindowRect( hwnd, &rect ); + return mirror_region( hrgn, hrgn, rect.right - rect.left ) != ERROR; +} + + +/*********************************************************************** * REGION_Coalesce * * Attempt to merge the rects in the current band with those in the diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f34025f..f1f590c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -58,6 +58,7 @@ static BOOL (WINAPI *pGetProcessDefaultLayout)( DWORD *layout ); static BOOL (WINAPI *pSetProcessDefaultLayout)( DWORD layout ); static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); static DWORD (WINAPI *pGetLayout)(HDC hdc); +static BOOL (WINAPI *pMirrorRgn)(HWND hwnd, HRGN hrgn); static BOOL test_lbuttondown_flag; static HWND hwndMessage; @@ -6126,7 +6127,7 @@ static void test_winregion(void) { HWND hwnd; RECT r; - int ret; + int ret, width; HRGN hrgn; if (!pGetWindowRgnBox) @@ -6159,7 +6160,21 @@ static void test_winregion(void) ok( r.left == 2 && r.top == 3 && r.right == 10 && r.bottom == 15, "Expected (2,3,10,15), got (%d,%d,%d,%d)\n", r.left, r.top, r.right, r.bottom); - DeleteObject(hrgn); + if (pMirrorRgn) + { + hrgn = CreateRectRgn(2, 3, 10, 15); + ret = pMirrorRgn( hwnd, hrgn ); + ok( ret == TRUE, "MirrorRgn failed %u\n", ret ); + r.left = r.top = r.right = r.bottom = 0; + GetWindowRect( hwnd, &r ); + width = r.right - r.left; + r.left = r.top = r.right = r.bottom = 0; + ret = GetRgnBox( hrgn, &r ); + ok( ret == SIMPLEREGION, "GetRgnBox failed %u\n", ret ); + ok( r.left == width - 10 && r.top == 3 && r.right == width - 2 && r.bottom == 15, + "Wrong rectangle (%d,%d,%d,%d) for width %d\n", r.left, r.top, r.right, r.bottom, width ); + } + else win_skip( "MirrorRgn not supported\n" ); } DestroyWindow(hwnd); } @@ -6220,6 +6235,7 @@ START_TEST(win) pSetProcessDefaultLayout = (void *)GetProcAddress( user32, "SetProcessDefaultLayout" ); pGetLayout = (void *)GetProcAddress( gdi32, "GetLayout" ); pSetLayout = (void *)GetProcAddress( gdi32, "SetLayout" ); + pMirrorRgn = (void *)GetProcAddress( gdi32, "MirrorRgn" ); if (!RegisterWindowClasses()) assert(0); diff --git a/include/wingdi.h b/include/wingdi.h index fa68c23..e10bbe9 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3601,6 +3601,7 @@ WINGDIAPI BOOL WINAPI LineDDA(INT,INT,INT,INT,LINEDDAPROC,LPARAM); WINGDIAPI BOOL WINAPI LineTo(HDC,INT,INT); WINGDIAPI BOOL WINAPI LPtoDP(HDC,LPPOINT,INT); WINGDIAPI BOOL WINAPI MaskBlt(HDC,INT,INT,INT,INT,HDC,INT,INT,HBITMAP,INT,INT,DWORD); +WINGDIAPI BOOL WINAPI MirrorRgn(HWND,HRGN); WINGDIAPI BOOL WINAPI ModifyWorldTransform(HDC,const XFORM *, DWORD); WINGDIAPI BOOL WINAPI MoveToEx(HDC,INT,INT,LPPOINT); WINGDIAPI INT WINAPI OffsetClipRgn(HDC,INT,INT);

1 0

Alexandre Julliard : winex11: Mirror the window region for RTL windows.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 5594c4eba8c3027a7ba485820e9d7b694e888011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5594c4eba8c3027a7ba485820… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 21:06:38 2010 +0200 winex11: Mirror the window region for RTL windows. --- dlls/winex11.drv/window.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index ec9bec2..68084d0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -474,8 +474,10 @@ static void sync_window_region( Display *display, struct x11drv_win_data *data, } else { - RGNDATA *pRegionData = X11DRV_GetRegionData( hrgn, 0 ); - if (pRegionData) + RGNDATA *pRegionData; + + if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) MirrorRgn( data->hwnd, hrgn ); + if ((pRegionData = X11DRV_GetRegionData( hrgn, 0 ))) { wine_tsx11_lock(); XShapeCombineRectangles( display, data->whole_window, ShapeBounding,

1 0

Alexandre Julliard : user32: Free the window region once it has been set.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 2f6d41de46e077f991ac5bc12cec440edf8f6625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f6d41de46e077f991ac5bc12… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 21:06:43 2010 +0200 user32: Free the window region once it has been set. --- dlls/user32/winpos.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 17730f2..ca3b8e0 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -221,6 +221,7 @@ int WINAPI SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL bRedraw ) if (!bRedraw) swp_flags |= SWP_NOREDRAW; SetWindowPos( hwnd, 0, 0, 0, 0, 0, swp_flags ); invalidate_dce( hwnd, NULL ); + if (hrgn) DeleteObject( hrgn ); } return ret; }

1 0

Alexandre Julliard : server: Mirror the window region for RTL windows in get/ set_window_region and redraw_window.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: d56ac06260daaa82cfcf7a15d3fe10de574be6d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56ac06260daaa82cfcf7a15d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 20:46:41 2010 +0200 server: Mirror the window region for RTL windows in get/set_window_region and redraw_window. --- server/protocol.def | 6 +++--- server/region.c | 23 +++++++++++++++++++++++ server/user.h | 10 ++++++++++ server/window.c | 31 ++++++++++++++++++------------- 4 files changed, 54 insertions(+), 16 deletions(-) diff --git a/server/protocol.def b/server/protocol.def index 687fe6c..ccc87fe 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2405,7 +2405,7 @@ enum coords_relative user_handle_t window; /* handle to the window */ @REPLY data_size_t total_size; /* total size of the resulting region */ - VARARG(region,rectangles); /* list of rectangles for the region */ + VARARG(region,rectangles); /* list of rectangles for the region (in window coords) */ @END @@ -2413,7 +2413,7 @@ enum coords_relative @REQ(set_window_region) user_handle_t window; /* handle to the window */ int redraw; /* redraw the window? */ - VARARG(region,rectangles); /* list of rectangles for the region */ + VARARG(region,rectangles); /* list of rectangles for the region (in window coords) */ @END @@ -2449,7 +2449,7 @@ enum coords_relative @REQ(redraw_window) user_handle_t window; /* handle to the window */ unsigned int flags; /* RDW_* flags */ - VARARG(region,rectangles); /* list of rectangles for the region */ + VARARG(region,rectangles); /* list of rectangles for the region (in window coords) */ @END diff --git a/server/region.c b/server/region.c index 2efbd30..8b85c34 100644 --- a/server/region.c +++ b/server/region.c @@ -711,6 +711,29 @@ void offset_region( struct region *region, int x, int y ) region->extents.bottom += y; } +/* mirror a region relative to a window client rect */ +void mirror_region( const rectangle_t *client_rect, struct region *region ) +{ + int start, end, i, j; + + for (start = 0; start < region->num_rects; start = end + 1) + { + for (end = start; end < region->num_rects - 1; end++) + if (region->rects[end + 1].top != region->rects[end].top) break; + for (i = start, j = end; i < j; i++, j--) + { + rectangle_t rect = region->rects[j]; + region->rects[i] = region->rects[j]; + region->rects[j] = rect; + mirror_rect( client_rect, &region->rects[j] ); + mirror_rect( client_rect, &region->rects[i] ); + } + if (i == j) mirror_rect( client_rect, &region->rects[i] ); + } + mirror_rect( client_rect, &region->extents ); +} + + /* make a copy of a region; returns dst or NULL on error */ struct region *copy_region( struct region *dst, const struct region *src ) { diff --git a/server/user.h b/server/user.h index 1f0d909..6ac0398 100644 --- a/server/user.h +++ b/server/user.h @@ -114,6 +114,7 @@ extern rectangle_t *get_region_data_and_free( struct region *region, data_size_t extern int is_region_empty( const struct region *region ); extern void get_region_extents( const struct region *region, rectangle_t *rect ); extern void offset_region( struct region *region, int x, int y ); +extern void mirror_region( const rectangle_t *client_rect, struct region *region ); extern struct region *copy_region( struct region *dst, const struct region *src ); extern struct region *intersect_region( struct region *dst, const struct region *src1, const struct region *src2 ); @@ -164,4 +165,13 @@ extern void set_process_default_desktop( struct process *process, struct desktop extern void close_process_desktop( struct process *process ); extern void close_thread_desktop( struct thread *thread ); +/* mirror a rectangle respective to the window client area */ +static inline void mirror_rect( const rectangle_t *client_rect, rectangle_t *rect ) +{ + int width = client_rect->right - client_rect->left; + int tmp = rect->left; + rect->left = width - rect->right; + rect->right = width - tmp; +} + #endif /* __WINE_SERVER_USER_H */ diff --git a/server/window.c b/server/window.c index bb66a39..e3dc47a 100644 --- a/server/window.c +++ b/server/window.c @@ -905,16 +905,6 @@ static inline void offset_rect( rectangle_t *rect, int offset_x, int offset_y ) } -/* mirror a rectangle respective to the window client area */ -static inline void mirror_rect( const rectangle_t *window_rect, rectangle_t *rect ) -{ - int width = window_rect->right - window_rect->left; - int tmp = rect->left; - rect->left = width - rect->right; - rect->right = width - tmp; -} - - /* set the region to the client rect clipped by the window rect, in parent-relative coordinates */ static void set_region_client_rect( struct region *region, struct window *win ) { @@ -2314,15 +2304,28 @@ DECL_HANDLER(get_visible_region) /* get the window region */ DECL_HANDLER(get_window_region) { + rectangle_t *data; struct window *win = get_window( req->window ); if (!win) return; + if (!win->win_region) return; - if (win->win_region) + if (win->ex_style & WS_EX_LAYOUTRTL) { - rectangle_t *data = get_region_data( win->win_region, get_reply_max_size(), &reply->total_size ); - if (data) set_reply_data_ptr( data, reply->total_size ); + struct region *region = create_empty_region(); + + if (!region) return; + if (!copy_region( region, win->win_region )) + { + free_region( region ); + return; + } + mirror_region( &win->window_rect, region ); + data = get_region_data_and_free( region, get_reply_max_size(), &reply->total_size ); } + else data = get_region_data( win->win_region, get_reply_max_size(), &reply->total_size ); + + if (data) set_reply_data_ptr( data, reply->total_size ); } @@ -2338,6 +2341,7 @@ DECL_HANDLER(set_window_region) { if (!(region = create_region_from_req_data( get_req_data(), get_req_data_size() ))) return; + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_region( &win->window_rect, region ); } set_window_region( win, region, req->redraw ); } @@ -2458,6 +2462,7 @@ DECL_HANDLER(redraw_window) { if (!(region = create_region_from_req_data( get_req_data(), get_req_data_size() ))) return; + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_region( &win->client_rect, region ); } }

1 0

Alexandre Julliard : server: Pass the rectangle in client coordinates for update_window_zorder.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 6ee4521886822178366c0278c5321022d21f5672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ee4521886822178366c0278c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 27 21:12:49 2010 +0200 server: Pass the rectangle in client coordinates for update_window_zorder. --- dlls/winex11.drv/event.c | 17 ++++++----------- dlls/winex11.drv/mouse.c | 45 +++++++++++++++------------------------------ server/protocol.def | 2 +- server/window.c | 8 +++++--- 4 files changed, 27 insertions(+), 45 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 8fc955a..a1e0d7f 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -731,19 +731,16 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) if (!(data = X11DRV_get_win_data( hwnd ))) return; + rect.left = event->x; + rect.top = event->y; + rect.right = event->x + event->width; + rect.bottom = event->y + event->height; if (event->window == data->whole_window) { - rect.left = data->whole_rect.left + event->x; - rect.top = data->whole_rect.top + event->y; + OffsetRect( &rect, data->whole_rect.left - data->client_rect.left, + data->whole_rect.top - data->client_rect.top ); flags |= RDW_FRAME; } - else - { - rect.left = data->client_rect.left + event->x; - rect.top = data->client_rect.top + event->y; - } - rect.right = rect.left + event->width; - rect.bottom = rect.top + event->height; if (event->window != root_window) { @@ -758,8 +755,6 @@ static void X11DRV_Expose( HWND hwnd, XEvent *xev ) } SERVER_END_REQ; - /* make position relative to client area instead of parent */ - OffsetRect( &rect, -data->client_rect.left, -data->client_rect.top ); flags |= RDW_ALLCHILDREN; } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 922df65..b725823 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -120,29 +120,6 @@ void X11DRV_Xcursor_Init(void) /*********************************************************************** - * get_coords - * - * get the coordinates of a mouse event - */ -static inline void get_coords( HWND hwnd, Window window, int x, int y, POINT *pt ) -{ - struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); - - if (!data) return; - - if (window == data->client_window) - { - pt->x = x + data->client_rect.left; - pt->y = y + data->client_rect.top; - } - else - { - pt->x = x + data->whole_rect.left; - pt->y = y + data->whole_rect.top; - } -} - -/*********************************************************************** * clip_point_to_rect * * Clip point to the provided rectangle @@ -241,25 +218,33 @@ void set_window_cursor( HWND hwnd, HCURSOR handle ) */ static void update_mouse_state( HWND hwnd, Window window, int x, int y, unsigned int state, POINT *pt ) { - struct x11drv_thread_data *data = x11drv_thread_data(); + struct x11drv_win_data *data = X11DRV_get_win_data( hwnd ); + + if (!data) return; - get_coords( hwnd, window, x, y, pt ); + if (window == data->whole_window) + { + x += data->whole_rect.left - data->client_rect.left; + y += data->whole_rect.top - data->client_rect.top; + } + pt->x = x + data->client_rect.left; + pt->y = y + data->client_rect.top; cursor_window = hwnd; /* update the wine server Z-order */ - if (window != data->grab_window && + if (window != x11drv_thread_data()->grab_window && /* ignore event if a button is pressed, since the mouse is then grabbed too */ !(state & (Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask|Button6Mask|Button7Mask))) { SERVER_START_REQ( update_window_zorder ) { req->window = wine_server_user_handle( hwnd ); - req->rect.left = pt->x; - req->rect.top = pt->y; - req->rect.right = pt->x + 1; - req->rect.bottom = pt->y + 1; + req->rect.left = x; + req->rect.top = y; + req->rect.right = x + 1; + req->rect.bottom = y + 1; wine_server_call( req ); } SERVER_END_REQ; diff --git a/server/protocol.def b/server/protocol.def index ccc87fe..21cae9c 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2441,7 +2441,7 @@ enum coords_relative /* Update the z order of a window so that a given rectangle is fully visible */ @REQ(update_window_zorder) user_handle_t window; /* handle to the window */ - rectangle_t rect; /* rectangle that must be visible */ + rectangle_t rect; /* rectangle that must be visible (in client coords) */ @END diff --git a/server/window.c b/server/window.c index e3dc47a..8900751 100644 --- a/server/window.c +++ b/server/window.c @@ -2423,18 +2423,20 @@ DECL_HANDLER(get_update_region) /* update the z order of a window so that a given rectangle is fully visible */ DECL_HANDLER(update_window_zorder) { - rectangle_t tmp; + rectangle_t tmp, rect = req->rect; struct window *ptr, *win = get_window( req->window ); if (!win || !win->parent || !is_visible( win )) return; /* nothing to do */ + if (win->ex_style & WS_EX_LAYOUTRTL) mirror_rect( &win->client_rect, &rect ); + offset_rect( &rect, win->client_rect.left, win->client_rect.top ); LIST_FOR_EACH_ENTRY( ptr, &win->parent->children, struct window, entry ) { if (ptr == win) break; if (!(ptr->style & WS_VISIBLE)) continue; if (ptr->ex_style & WS_EX_TRANSPARENT) continue; - if (!intersect_rect( &tmp, &ptr->visible_rect, &req->rect )) continue; - if (ptr->win_region && !rect_in_region( ptr->win_region, &req->rect )) continue; + if (!intersect_rect( &tmp, &ptr->visible_rect, &rect )) continue; + if (ptr->win_region && !rect_in_region( ptr->win_region, &rect )) continue; /* found a window obscuring the rectangle, now move win above this one */ /* making sure to not violate the topmost rule */ if (!(ptr->ex_style & WS_EX_TOPMOST) || (win->ex_style & WS_EX_TOPMOST))

1 0

Mariusz Pluciński : gameux: Add implementation of IGameStatisticsMgr::RemoveGameStatistics.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: 5cac9d2cb2c020802a56a5b1b28348316f1087ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cac9d2cb2c020802a56a5b1b… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Sun Sep 26 15:04:04 2010 +0200 gameux: Add implementation of IGameStatisticsMgr::RemoveGameStatistics. --- dlls/gameux/gamestatistics.c | 114 +++++++++++++++++++++++------------- dlls/gameux/tests/gamestatistics.c | 4 +- 2 files changed, 76 insertions(+), 42 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 83ee5cd..a82f03a 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -183,6 +183,64 @@ static HRESULT GAMEUX_buildStatisticsFilePath( return hr; } +/******************************************************************************* + * GAMEUX_getAppIdFromGDFPath + * + * Loads application identifier associated with given GDF binary. + * Routine reads identifier from registry, so will fail if game + * is not registered. + * + * Parameters: + * GDFBinaryPath [I] path to gdf binary + * lpApplicationId [O] place to store application id. + * must be at least 49 characters + * to store guid and termination 0 + */ +static HRESULT GAMEUX_getAppIdFromGDFPath( + LPCWSTR GDFBinaryPath, + LPWSTR lpApplicationId) +{ + static const WCHAR sApplicationId[] = + {'A','p','p','l','i','c','a','t','i','o','n','I','d',0}; + + HRESULT hr; + GAME_INSTALL_SCOPE installScope; + GUID instanceId; + LPWSTR lpRegistryPath; + DWORD dwLength = 49*sizeof(WCHAR);/* place for GUID */ + + TRACE("(%s, %p)\n", debugstr_w(GDFBinaryPath), lpApplicationId); + + if(!GDFBinaryPath) + return E_INVALIDARG; + + installScope = GIS_CURRENT_USER; + hr = GAMEUX_FindGameInstanceId(GDFBinaryPath, installScope, &instanceId); + + if(hr == S_FALSE) + { + installScope = GIS_ALL_USERS; + hr = GAMEUX_FindGameInstanceId(GDFBinaryPath, installScope, &instanceId); + } + + if(hr == S_FALSE) + /* game not registered, so statistics cannot be used */ + hr = E_FAIL; + + if(SUCCEEDED(hr)) + /* game is registered, let's read it's application id from registry */ + hr = GAMEUX_buildGameRegistryPath(installScope, &instanceId, &lpRegistryPath); + + if(SUCCEEDED(hr)) + hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, + lpRegistryPath, sApplicationId, RRF_RT_REG_SZ, + NULL, lpApplicationId, &dwLength)); + + HeapFree(GetProcessHeap(), 0, lpRegistryPath); + + TRACE("found app id: %s, return: %#x\n", debugstr_w(lpApplicationId), hr); + return hr; +} /******************************************************************* * IGameStatistics implementation */ @@ -560,51 +618,16 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_GetGameStatistics( GAMESTATS_OPEN_RESULT *pOpenResult, IGameStatistics **ppiStats) { - static const WCHAR sApplicationId[] = - {'A','p','p','l','i','c','a','t','i','o','n','I','d',0}; - HRESULT hr; - GUID instanceId; - LPWSTR lpRegistryPath = NULL; WCHAR lpApplicationId[49]; - DWORD dwLength = sizeof(lpApplicationId); - GAME_INSTALL_SCOPE installScope; GameStatisticsImpl *statisticsImpl; TRACE("(%p, %s, 0x%x, %p, %p)\n", iface, debugstr_w(GDFBinaryPath), openType, pOpenResult, ppiStats); - if(!GDFBinaryPath) - return E_INVALIDARG; - - installScope = GIS_CURRENT_USER; - hr = GAMEUX_FindGameInstanceId(GDFBinaryPath, installScope, &instanceId); - - if(hr == S_FALSE) - { - installScope = GIS_ALL_USERS; - hr = GAMEUX_FindGameInstanceId(GDFBinaryPath, installScope, &instanceId); - } - - if(hr == S_FALSE) - /* game not registered, so statistics cannot be used */ - hr = E_FAIL; + hr = GAMEUX_getAppIdFromGDFPath(GDFBinaryPath, lpApplicationId); if(SUCCEEDED(hr)) - /* game is registered, let's read it's application id from registry */ - hr = GAMEUX_buildGameRegistryPath(installScope, &instanceId, &lpRegistryPath); - - if(SUCCEEDED(hr)) - { - hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, - lpRegistryPath, sApplicationId, RRF_RT_REG_SZ, - NULL, lpApplicationId, &dwLength)); - } - - if(SUCCEEDED(hr)) - { - TRACE("found app id: %s\n", debugstr_w(lpApplicationId)); hr = create_IGameStatistics(&statisticsImpl); - } if(SUCCEEDED(hr)) { @@ -618,8 +641,6 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_GetGameStatistics( hr = E_NOTIMPL; } - HeapFree(GetProcessHeap(), 0, lpRegistryPath); - return hr; } @@ -627,8 +648,21 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_RemoveGameStatistics( IGameStatisticsMgr* iface, LPCWSTR GDFBinaryPath) { - FIXME("stub (%p, %s)\n", iface, debugstr_w(GDFBinaryPath)); - return E_NOTIMPL; + HRESULT hr; + WCHAR lpApplicationId[49]; + WCHAR sStatsFile[MAX_PATH]; + + TRACE("(%p, %s)\n", iface, debugstr_w(GDFBinaryPath)); + + hr = GAMEUX_getAppIdFromGDFPath(GDFBinaryPath, lpApplicationId); + + if(SUCCEEDED(hr)) + hr = GAMEUX_buildStatisticsFilePath(lpApplicationId, sStatsFile); + + if(SUCCEEDED(hr)) + hr = (DeleteFileW(sStatsFile)==TRUE ? S_OK : HRESULT_FROM_WIN32(GetLastError())); + + return hr; } static const struct IGameStatisticsMgrVtbl GameStatisticsMgrImplVtbl = diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 759f6d5..29bfcf3 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -414,8 +414,8 @@ static void test_gamestatisticsmgr( void ) /* test of removing game statistics from underlying storage */ ok(_isFileExists(lpStatisticsFile) == TRUE, "statistics file %s does not exists\n", wine_dbgstr_w(lpStatisticsFile)); hr = IGameStatisticsMgr_RemoveGameStatistics(gsm, sExeName); - todo_wine ok(SUCCEEDED(hr), "cannot remove game statistics, error: 0x%x\n", hr); - todo_wine ok(_isFileExists(lpStatisticsFile) == FALSE, "statistics file %s still exists\n", wine_dbgstr_w(lpStatisticsFile)); + ok(SUCCEEDED(hr), "cannot remove game statistics, error: 0x%x\n", hr); + ok(_isFileExists(lpStatisticsFile) == FALSE, "statistics file %s still exists\n", wine_dbgstr_w(lpStatisticsFile)); } hr = IGameStatisticsMgr_Release(gsm);

1 0

Mariusz Pluciński : gameux: Finished implementation of saving game statistics.
by Alexandre Julliard 27 Sep '10

27 Sep '10

Module: wine Branch: master Commit: d87a7613449fc4172fc2db792ad984527dcf2722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d87a7613449fc4172fc2db792… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Sun Sep 26 15:04:58 2010 +0200 gameux: Finished implementation of saving game statistics. --- dlls/gameux/gamestatistics.c | 168 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 163 insertions(+), 5 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index a82f03a..0cce059 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -104,12 +104,20 @@ static HRESULT GAMEUX_createStatsDirectory(LPCWSTR lpFilePath) static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) { static const WCHAR sStatistics[] = {'S','t','a','t','i','s','t','i','c','s',0}; + static const WCHAR sCategory[] = {'C','a','t','e','g','o','r','y',0}; + static const WCHAR sIndex[] = {'I','n','d','e','x',0}; + static const WCHAR sStatistic[] = {'S','t','a','t','i','s','t','i','c',0}; + static const WCHAR sName[] = {'N','a','m','e',0}; + static const WCHAR sValue[] = {'V','a','l','u','e',0}; HRESULT hr = S_OK; IXMLDOMDocument *document; - IXMLDOMElement *root; - VARIANT vStatsFilePath; - BSTR bstrStatistics = NULL; + IXMLDOMElement *root, *categoryElement, *statisticsElement; + IXMLDOMNode *categoryNode, *statisticsNode; + VARIANT vStatsFilePath, vValue; + BSTR bstrStatistics = NULL, bstrCategory = NULL, bstrIndex = NULL, + bstrStatistic = NULL, bstrName = NULL, bstrValue = NULL; + int i, j; TRACE("(%p)\n", stats); @@ -132,7 +140,150 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) hr = IXMLDOMDocument_createElement(document, bstrStatistics, &root); - FIXME("writing statistics not fully implemented\n"); + if(SUCCEEDED(hr)) + { + bstrCategory = SysAllocString(sCategory); + if(!bstrCategory) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + { + bstrIndex = SysAllocString(sIndex); + if(!bstrIndex) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + { + bstrStatistic = SysAllocString(sStatistic); + if(!bstrStatistic) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + { + bstrName = SysAllocString(sName); + if(!bstrName) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + { + bstrValue = SysAllocString(sValue); + if(!bstrValue) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + + if(SUCCEEDED(hr)) + for(i=0; i<MAX_CATEGORIES; ++i) + { + if(lstrlenW(stats->categories[i].sName)==0) + continue; + + V_VT(&vValue) = VT_INT; + V_INT(&vValue) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(document, vValue, bstrCategory, NULL, &categoryNode); + + if(SUCCEEDED(hr)) + hr = IXMLDOMNode_QueryInterface(categoryNode, &IID_IXMLDOMElement, (LPVOID*)&categoryElement); + + V_INT(&vValue) = i; + if(SUCCEEDED(hr)) + hr = IXMLDOMElement_setAttribute(categoryElement, bstrIndex, vValue); + + if(SUCCEEDED(hr)) + { + V_VT(&vValue) = VT_BSTR; + V_BSTR(&vValue) = SysAllocString(stats->categories[i].sName); + if(!V_BSTR(&vValue)) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + { + TRACE("storing category %d: %s\n", i, debugstr_w(V_BSTR(&vValue))); + hr = IXMLDOMElement_setAttribute(categoryElement, bstrName, vValue); + } + + SysFreeString(V_BSTR(&vValue)); + + if(SUCCEEDED(hr)) + { + for(j=0; j<MAX_STATS_PER_CATEGORY; ++j) + { + if(lstrlenW(stats->categories[i].stats[j].sName)==0) + continue; + + V_VT(&vValue) = VT_INT; + V_INT(&vValue) = NODE_ELEMENT; + + hr = IXMLDOMDocument_createNode(document, vValue, bstrStatistic, NULL, &statisticsNode); + + if(SUCCEEDED(hr)) + hr = IXMLDOMNode_QueryInterface(statisticsNode, &IID_IXMLDOMElement, (LPVOID*)&statisticsElement); + + V_INT(&vValue) = j; + if(SUCCEEDED(hr)) + hr = IXMLDOMElement_setAttribute(statisticsElement, bstrIndex, vValue); + + if(SUCCEEDED(hr)) + { + V_VT(&vValue) = VT_BSTR; + V_BSTR(&vValue) = SysAllocString(stats->categories[i].stats[j].sName); + if(!V_BSTR(&vValue)) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + { + TRACE(" storing statistic %d: name: %s\n", j, debugstr_w(V_BSTR(&vValue))); + hr = IXMLDOMElement_setAttribute(statisticsElement, bstrName, vValue); + } + + SysFreeString(V_BSTR(&vValue)); + + if(SUCCEEDED(hr)) + { + V_VT(&vValue) = VT_BSTR; + V_BSTR(&vValue) = SysAllocString(stats->categories[i].stats[j].sValue); + if(!V_BSTR(&vValue)) + hr = E_OUTOFMEMORY; + } + + if(SUCCEEDED(hr)) + { + TRACE(" storing statistic %d: name: %s\n", j, debugstr_w(V_BSTR(&vValue))); + hr = IXMLDOMElement_setAttribute(statisticsElement, bstrValue, vValue); + } + + SysFreeString(V_BSTR(&vValue)); + + if(SUCCEEDED(hr)) + hr = IXMLDOMElement_appendChild(categoryNode, statisticsNode, &statisticsNode); + + IXMLDOMElement_Release(statisticsElement); + IXMLDOMNode_Release(statisticsNode); + } + } + + if(SUCCEEDED(hr)) + hr = IXMLDOMElement_appendChild(root, categoryNode, &categoryNode); + + IXMLDOMElement_Release(categoryElement); + IXMLDOMNode_Release(categoryNode); + + if(FAILED(hr)) + break; + } + + if(SUCCEEDED(hr)) + hr = IXMLDOMDocument_putref_documentElement(document, root); + + IXMLDOMElement_Release(root); TRACE("saving game statistics in %s file\n", debugstr_w(stats->sStatsFile)); if(SUCCEEDED(hr)) @@ -141,8 +292,15 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) if(SUCCEEDED(hr)) hr = IXMLDOMDocument_save(document, vStatsFilePath); - SysFreeString(V_BSTR(&vStatsFilePath)); + IXMLDOMDocument_Release(document); + + SysFreeString(bstrValue); + SysFreeString(bstrName); + SysFreeString(bstrStatistic); + SysFreeString(bstrIndex); + SysFreeString(bstrCategory); SysFreeString(bstrStatistics); + SysFreeString(V_BSTR(&vStatsFilePath)); TRACE("ret=0x%x\n", hr); return hr; }

1 0