September 2010 - Wine-commits

Juan Lang : iphlpapi: Fix inverted logic in mask comparison.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: f6081f935251a927ae9214cf71a3d92250f3553d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6081f935251a927ae9214cf7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Sep 24 18:38:29 2010 -0700 iphlpapi: Fix inverted logic in mask comparison. --- dlls/iphlpapi/iphlpapi_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 079ebff..081de0e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1065,7 +1065,7 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO DWORD numShifts, mask; for (numShifts = 0, mask = table->table[ndx].dwForwardMask; - mask && !(mask & 1); mask >>= 1, numShifts++) + mask && mask & 1; mask >>= 1, numShifts++) ; if (numShifts > matchedBits) { matchedBits = numShifts;

1 0

Erich Hoover : user32: Prepare for multi-frame storing of icons and cursors .
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: ca7163e4386f576d8fd3b3f0c53b43522da4c437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca7163e4386f576d8fd3b3f0c… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat Sep 25 21:37:23 2010 -0600 user32: Prepare for multi-frame storing of icons and cursors. --- dlls/user32/cursoricon.c | 65 ++++++++++++++++++++++++--------------------- 1 files changed, 35 insertions(+), 30 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index acae302..043f067 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -110,17 +110,22 @@ static CRITICAL_SECTION IconCrst = { &critsect_debug, -1, 0, 0, 0, 0 }; * User objects management */ -struct cursoricon_object +struct cursoricon_frame { - struct user_object obj; /* object header */ - ULONG_PTR param; /* opaque param used by 16-bit code */ HBITMAP color; /* color bitmap */ HBITMAP alpha; /* pre-multiplied alpha bitmap for 32-bpp icons */ HBITMAP mask; /* mask bitmap (followed by color for 1-bpp icons) */ - BOOL is_icon; /* whether icon or cursor */ - UINT width; - UINT height; - POINT hotspot; +}; + +struct cursoricon_object +{ + struct user_object obj; /* object header */ + ULONG_PTR param; /* opaque param used by 16-bit code */ + BOOL is_icon; /* whether icon or cursor */ + UINT width; + UINT height; + POINT hotspot; + struct cursoricon_frame frame; /* icon frame information */ }; static HICON alloc_icon_handle(void) @@ -128,9 +133,9 @@ static HICON alloc_icon_handle(void) struct cursoricon_object *obj = HeapAlloc( GetProcessHeap(), 0, sizeof(*obj) ); if (!obj) return 0; obj->param = 0; - obj->color = 0; - obj->alpha = 0; - obj->mask = 0; + obj->frame.color = 0; + obj->frame.mask = 0; + obj->frame.alpha = 0; return alloc_user_handle( &obj->obj, USER_ICON ); } @@ -158,9 +163,9 @@ static BOOL free_icon_handle( HICON handle ) else if (obj) { ULONG_PTR param = obj->param; - if (obj->color) DeleteObject( obj->color ); - if (obj->alpha) DeleteObject( obj->alpha ); - DeleteObject( obj->mask ); + if (obj->frame.alpha) DeleteObject( obj->frame.alpha ); + if (obj->frame.color) DeleteObject( obj->frame.color ); + DeleteObject( obj->frame.mask ); HeapFree( GetProcessHeap(), 0, obj ); if (wow_handlers.free_icon_param && param) wow_handlers.free_icon_param( param ); USER_Driver->pDestroyCursorIcon( handle ); @@ -921,13 +926,13 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, { struct cursoricon_object *info = get_icon_ptr( hObj ); - info->color = color; - info->mask = mask; - info->alpha = alpha; info->is_icon = bIcon; info->hotspot = hotspot; info->width = width; info->height = height; + info->frame.color = color; + info->frame.mask = mask; + info->frame.alpha = alpha; release_icon_ptr( hObj, info ); USER_Driver->pCreateCursorIcon( hObj ); } @@ -1532,13 +1537,13 @@ HICON WINAPI CopyIcon( HICON hIcon ) if ((hNew = alloc_icon_handle())) { ptrNew = get_icon_ptr( hNew ); - ptrNew->color = copy_bitmap( ptrOld->color ); - ptrNew->alpha = copy_bitmap( ptrOld->alpha ); - ptrNew->mask = copy_bitmap( ptrOld->mask ); ptrNew->is_icon = ptrOld->is_icon; ptrNew->width = ptrOld->width; ptrNew->height = ptrOld->height; ptrNew->hotspot = ptrOld->hotspot; + ptrNew->frame.mask = copy_bitmap( ptrOld->frame.mask ); + ptrNew->frame.color = copy_bitmap( ptrOld->frame.color ); + ptrNew->frame.alpha = copy_bitmap( ptrOld->frame.alpha ); release_icon_ptr( hNew, ptrNew ); } release_icon_ptr( hIcon, ptrOld ); @@ -1824,8 +1829,8 @@ BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo) iconinfo->fIcon = ptr->is_icon; iconinfo->xHotspot = ptr->hotspot.x; iconinfo->yHotspot = ptr->hotspot.y; - iconinfo->hbmColor = copy_bitmap( ptr->color ); - iconinfo->hbmMask = copy_bitmap( ptr->mask ); + iconinfo->hbmColor = copy_bitmap( ptr->frame.color ); + iconinfo->hbmMask = copy_bitmap( ptr->frame.mask ); release_icon_ptr( hIcon, ptr ); return TRUE; @@ -1935,12 +1940,12 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) { struct cursoricon_object *info = get_icon_ptr( hObj ); - info->color = color; - info->mask = mask; - info->alpha = create_alpha_bitmap( iconinfo->hbmColor, mask, NULL, NULL ); info->is_icon = iconinfo->fIcon; info->width = width; info->height = height; + info->frame.color = color; + info->frame.mask = mask; + info->frame.alpha = create_alpha_bitmap( iconinfo->hbmColor, mask, NULL, NULL ); if (info->is_icon) { info->hotspot.x = width / 2; @@ -2053,7 +2058,7 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, oldFg = SetTextColor( hdc, RGB(0,0,0) ); oldBg = SetBkColor( hdc, RGB(255,255,255) ); - if (ptr->alpha && (flags & DI_IMAGE)) + if (ptr->frame.alpha && (flags & DI_IMAGE)) { BOOL is_mono = FALSE; @@ -2066,7 +2071,7 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (!is_mono) { BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; - SelectObject( hMemDC, ptr->alpha ); + SelectObject( hMemDC, ptr->frame.alpha ); if (GdiAlphaBlend( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, 0, 0, ptr->width, ptr->height, pixelblend )) goto done; } @@ -2074,24 +2079,24 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (flags & DI_MASK) { - SelectObject( hMemDC, ptr->mask ); + SelectObject( hMemDC, ptr->frame.mask ); StretchBlt( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, 0, 0, ptr->width, ptr->height, SRCAND ); } if (flags & DI_IMAGE) { - if (ptr->color) + if (ptr->frame.color) { DWORD rop = (flags & DI_MASK) ? SRCINVERT : SRCCOPY; - SelectObject( hMemDC, ptr->color ); + SelectObject( hMemDC, ptr->frame.color ); StretchBlt( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, 0, 0, ptr->width, ptr->height, rop ); } else { DWORD rop = (flags & DI_MASK) ? SRCINVERT : SRCCOPY; - SelectObject( hMemDC, ptr->mask ); + SelectObject( hMemDC, ptr->frame.mask ); StretchBlt( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, 0, ptr->height, ptr->width, ptr->height, rop ); }

1 0

Erich Hoover : user32: Add support for multiple frames in cursor format.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 7bba6234e30dbb8e7bccab2b076d5174d0f72bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bba6234e30dbb8e7bccab2b0… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Sep 26 12:26:23 2010 -0600 user32: Add support for multiple frames in cursor format. --- dlls/user32/cursoricon.c | 173 +++++++++++++++++++++++++++++----------------- 1 files changed, 110 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7bba6234e30dbb8e7bcca…

1 0

Andrew Eikum : ole32: Create a FORMATETC if one is not given in OleCreate.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 91d91afb7d0f1806b1e79f2d45d9fa62df186048 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91d91afb7d0f1806b1e79f2d4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 24 10:53:32 2010 -0500 ole32: Create a FORMATETC if one is not given in OleCreate. --- dlls/ole32/ole2.c | 14 +++++++++++++- dlls/ole32/tests/ole2.c | 25 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 84bf174..2b301e4 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2530,7 +2530,19 @@ HRESULT WINAPI OleCreate( if (SUCCEEDED(hres2)) { DWORD dwConnection; - hres = IOleCache_Cache(pOleCache, pFormatEtc, ADVF_PRIMEFIRST, &dwConnection); + FORMATETC *pfe; + if (renderopt == OLERENDER_DRAW && !pFormatEtc) { + pfe = HeapAlloc(GetProcessHeap(), 0, sizeof(FORMATETC)); + pfe->cfFormat = 0; + pfe->ptd = NULL; + pfe->dwAspect = DVASPECT_CONTENT; + pfe->lindex = -1; + pfe->tymed = TYMED_NULL; + }else + pfe = pFormatEtc; + hres = IOleCache_Cache(pOleCache, pfe, ADVF_PRIMEFIRST, &dwConnection); + if (!pFormatEtc && pfe) + HeapFree(GetProcessHeap(), 0, pfe); IOleCache_Release(pOleCache); } } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 48584a1..3db2cb5 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -53,6 +53,7 @@ struct expected_method }; static const struct expected_method *expected_method_list; +static FORMATETC *g_expected_fetc = NULL; BOOL g_showRunnable = TRUE; BOOL g_isRunning = TRUE; @@ -496,6 +497,22 @@ static HRESULT WINAPI OleObjectCache_Cache ) { CHECK_EXPECTED_METHOD("OleObjectCache_Cache"); + if (g_expected_fetc) { + ok(pformatetc != NULL, "pformatetc should not be NULL\n"); + if (pformatetc) { + ok(pformatetc->cfFormat == g_expected_fetc->cfFormat, + "cfFormat: %x\n", pformatetc->cfFormat); + ok((pformatetc->ptd != NULL) == (g_expected_fetc->ptd != NULL), + "ptd: %p\n", pformatetc->ptd); + ok(pformatetc->dwAspect == g_expected_fetc->dwAspect, + "dwAspect: %x\n", pformatetc->dwAspect); + ok(pformatetc->lindex == g_expected_fetc->lindex, + "lindex: %x\n", pformatetc->lindex); + ok(pformatetc->tymed == g_expected_fetc->tymed, + "tymed: %x\n", pformatetc->tymed); + } + } else + ok(pformatetc == NULL, "pformatetc should be NULL\n"); return S_OK; } @@ -796,6 +813,12 @@ static void test_OleCreate(IStorage *pStorage) { NULL, 0 } }; + g_expected_fetc = &formatetc; + formatetc.cfFormat = 0; + formatetc.ptd = NULL; + formatetc.dwAspect = DVASPECT_CONTENT; + formatetc.lindex = -1; + formatetc.tymed = TYMED_NULL; runnable = &OleObjectRunnable; cache = &OleObjectCache; expected_method_list = methods_olerender_none; @@ -836,6 +859,8 @@ static void test_OleCreate(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + formatetc.cfFormat = 0; + formatetc.tymed = TYMED_NULL; runnable = NULL; expected_method_list = methods_olerender_draw_no_runnable; trace("OleCreate with OLERENDER_DRAW (no IRunnableObject):\n");

1 0

Jacek Caban : mshtml: Renamed uri to nsuri.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 725aab4fa92cd5c8ef4e6f77777f569dc75d9ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=725aab4fa92cd5c8ef4e6f777… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 28 13:24:57 2010 +0200 mshtml: Renamed uri to nsuri. --- dlls/mshtml/nsio.c | 122 ++++++++++++++++++++++++++-------------------------- 1 files changed, 61 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=725aab4fa92cd5c8ef4e6…

1 0

Jacek Caban : mshtml: Added nsIURI:: GetHost implementation based on IUri API.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 3a00f739b1a5b7c8591ad2a57f98019f0ecabf92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a00f739b1a5b7c8591ad2a57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 28 13:25:24 2010 +0200 mshtml: Added nsIURI::GetHost implementation based on IUri API. --- dlls/mshtml/nsio.c | 124 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 107 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 4b9af43..019c612 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -64,6 +64,7 @@ struct nsWineURI { windowref_t *window_ref; nsChannelBSC *channel_bsc; LPWSTR wine_url; + IUri *uri; BOOL is_doc_uri; BOOL use_wine_url; }; @@ -1538,6 +1539,55 @@ static const nsIHttpChannelInternalVtbl nsHttpChannelInternalVtbl = { nsHttpChannelInternal_GetCanceled }; +static BOOL ensure_uri(nsWineURI *This) +{ + if(!This->uri) { + HRESULT hres; + + hres = CreateUri(This->wine_url, 0, 0, &This->uri); + if(FAILED(hres)) { + WARN("CreateUri failed: %08x\n", hres); + return FALSE; + } + } + + return TRUE; +} + +static nsresult get_uri_string(nsWineURI *This, Uri_PROPERTY prop, nsACString *ret) +{ + char *vala; + BSTR val; + HRESULT hres; + + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + hres = IUri_GetPropertyBSTR(This->uri, prop, &val, 0); + if(FAILED(hres)) { + WARN("GetPropertyBSTR failed: %08x\n", hres); + return NS_ERROR_UNEXPECTED; + } + + vala = heap_strdupWtoA(val); + SysFreeString(val); + if(!vala) + return NS_ERROR_OUT_OF_MEMORY; + + TRACE("ret %s\n", debugstr_a(vala)); + nsACString_SetData(ret, vala); + heap_free(vala); + return NS_OK; +} + +static void invalidate_uri(nsWineURI *This) +{ + if(This->uri) { + IUri_Release(This->uri); + This->uri = NULL; + } +} + #define NSURI_THIS(iface) DEFINE_THIS(nsWineURI, IURL, iface) static nsresult NSAPI nsURI_QueryInterface(nsIURL *iface, nsIIDRef riid, void **result) @@ -1595,6 +1645,8 @@ static nsrefcnt NSAPI nsURI_Release(nsIURL *iface) nsIURL_Release(This->nsurl); if(This->nsuri) nsIURI_Release(This->nsuri); + if(This->uri) + IUri_Release(This->uri); heap_free(This->wine_url); heap_free(This); } @@ -1630,8 +1682,10 @@ static nsresult NSAPI nsURI_SetSpec(nsIURL *iface, const nsACString *aSpec) TRACE("(%p)->(%p)\n", This, debugstr_nsacstr(aSpec)); - if(This->nsuri) + if(This->nsuri) { + invalidate_uri(This); return nsIURI_SetSpec(This->nsuri, aSpec); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -1687,8 +1741,10 @@ static nsresult NSAPI nsURI_SetScheme(nsIURL *iface, const nsACString *aScheme) TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aScheme)); - if(This->nsuri) + if(This->nsuri) { + invalidate_uri(This); return nsIURI_SetScheme(This->nsuri, aScheme); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -1713,8 +1769,10 @@ static nsresult NSAPI nsURI_SetUserPass(nsIURL *iface, const nsACString *aUserPa TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aUserPass)); - if(This->nsuri) + if(This->nsuri) { + invalidate_uri(This); return nsIURI_SetUserPass(This->nsuri, aUserPass); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -1739,8 +1797,10 @@ static nsresult NSAPI nsURI_SetUsername(nsIURL *iface, const nsACString *aUserna TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aUsername)); - if(This->nsuri) + if(This->nsuri) { + invalidate_uri(This); return nsIURI_SetUsername(This->nsuri, aUsername); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -1765,8 +1825,10 @@ static nsresult NSAPI nsURI_SetPassword(nsIURL *iface, const nsACString *aPasswo TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aPassword)); - if(This->nsuri) + if(This->nsuri) { + invalidate_uri(This); return nsIURI_SetPassword(This->nsuri, aPassword); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -1791,8 +1853,10 @@ static nsresult NSAPI nsURI_SetHostPort(nsIURL *iface, const nsACString *aHostPo TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aHostPort)); - if(This->nsuri) + if(This->nsuri) { + invalidate_uri(This); return nsIURI_SetHostPort(This->nsuri, aHostPort); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -1807,8 +1871,7 @@ static nsresult NSAPI nsURI_GetHost(nsIURL *iface, nsACString *aHost) if(This->nsuri) return nsIURI_GetHost(This->nsuri, aHost); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + return get_uri_string(This, Uri_PROPERTY_HOST, aHost); } static nsresult NSAPI nsURI_SetHost(nsIURL *iface, const nsACString *aHost) @@ -1817,8 +1880,10 @@ static nsresult NSAPI nsURI_SetHost(nsIURL *iface, const nsACString *aHost) TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aHost)); - if(This->nsuri) + if(This->nsuri) { + invalidate_uri(This); return nsIURI_SetHost(This->nsuri, aHost); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -1843,8 +1908,10 @@ static nsresult NSAPI nsURI_SetPort(nsIURL *iface, PRInt32 aPort) TRACE("(%p)->(%d)\n", This, aPort); - if(This->nsuri) + if(This->nsuri) { + invalidate_uri(This); return nsIURI_SetPort(This->nsuri, aPort); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -1870,6 +1937,8 @@ static nsresult NSAPI nsURI_SetPath(nsIURL *iface, const nsACString *aPath) TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aPath)); + invalidate_uri(This); + nsACString_GetData(aPath, &path); if(This->wine_url) { WCHAR new_url[INTERNET_MAX_URL_LENGTH]; @@ -1964,6 +2033,11 @@ static nsresult NSAPI nsURI_Clone(nsIURL *iface, nsIURI **_retval) set_wine_url(wine_uri, This->wine_url); + if(This->uri) { + IUri_AddRef(This->uri); + wine_uri->uri = This->uri; + } + *_retval = NSURI(wine_uri); return NS_OK; } @@ -2069,8 +2143,10 @@ static nsresult NSAPI nsURL_SetFilePath(nsIURL *iface, const nsACString *aFilePa TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFilePath)); - if(This->nsurl) + if(This->nsurl) { + invalidate_uri(This); return nsIURL_SetFilePath(This->nsurl, aFilePath); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -2095,8 +2171,10 @@ static nsresult NSAPI nsURL_SetParam(nsIURL *iface, const nsACString *aParam) TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aParam)); - if(This->nsurl) + if(This->nsurl) { + invalidate_uri(This); return nsIURL_SetParam(This->nsurl, aParam); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -2154,6 +2232,8 @@ static nsresult NSAPI nsURL_SetQuery(nsIURL *iface, const nsACString *aQuery) TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aQuery)); + invalidate_uri(This); + if(This->nsurl) nsIURL_SetQuery(This->nsurl, aQuery); @@ -2217,8 +2297,10 @@ static nsresult NSAPI nsURL_SetRef(nsIURL *iface, const nsACString *aRef) TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aRef)); - if(This->nsurl) + if(This->nsurl) { + invalidate_uri(This); return nsIURL_SetRef(This->nsurl, aRef); + } nsACString_GetData(aRef, &refa); if(!*refa) @@ -2247,8 +2329,10 @@ static nsresult NSAPI nsURL_SetDirectory(nsIURL *iface, const nsACString *aDirec TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aDirectory)); - if(This->nsurl) + if(This->nsurl) { + invalidate_uri(This); return nsIURL_SetDirectory(This->nsurl, aDirectory); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -2273,8 +2357,10 @@ static nsresult NSAPI nsURL_SetFileName(nsIURL *iface, const nsACString *aFileNa TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileName)); - if(This->nsurl) + if(This->nsurl) { + invalidate_uri(This); return nsIURL_SetFileName(This->nsurl, aFileName); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -2299,8 +2385,10 @@ static nsresult NSAPI nsURL_SetFileBaseName(nsIURL *iface, const nsACString *aFi TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileBaseName)); - if(This->nsurl) + if(This->nsurl) { + invalidate_uri(This); return nsIURL_SetFileBaseName(This->nsurl, aFileBaseName); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED; @@ -2325,8 +2413,10 @@ static nsresult NSAPI nsURL_SetFileExtension(nsIURL *iface, const nsACString *aF TRACE("(%p)->(%s)\n", This, debugstr_nsacstr(aFileExtension)); - if(This->nsurl) + if(This->nsurl) { + invalidate_uri(This); return nsIURL_SetFileExtension(This->nsurl, aFileExtension); + } FIXME("default action not implemented\n"); return NS_ERROR_NOT_IMPLEMENTED;

1 0

Jacek Caban : mshtml: Added nsIURI::GetPort implementation.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: cb85bad7a931e10e035653df57234e99b2cd27b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb85bad7a931e10e035653df5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 28 13:25:40 2010 +0200 mshtml: Added nsIURI::GetPort implementation. --- dlls/mshtml/nsio.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 019c612..bc377cf 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1892,14 +1892,25 @@ static nsresult NSAPI nsURI_SetHost(nsIURL *iface, const nsACString *aHost) static nsresult NSAPI nsURI_GetPort(nsIURL *iface, PRInt32 *aPort) { nsWineURI *This = NSURI_THIS(iface); + DWORD port; + HRESULT hres; TRACE("(%p)->(%p)\n", This, aPort); if(This->nsuri) return nsIURI_GetPort(This->nsuri, aPort); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + hres = IUri_GetPort(This->uri, &port); + if(FAILED(hres)) { + WARN("GetPort failed: %08x\n", hres); + return NS_ERROR_UNEXPECTED; + } + + *aPort = port ? port : -1; + return NS_OK; } static nsresult NSAPI nsURI_SetPort(nsIURL *iface, PRInt32 aPort)

1 0

Jacek Caban : mshtml: Added nsIURI::GetHostPort implementation.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 9bb0ecceb5af6144fc7ef8195ca8e9f8ef303b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb0ecceb5af6144fc7ef8195… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 28 13:26:01 2010 +0200 mshtml: Added nsIURI::GetHostPort implementation. --- dlls/mshtml/nsio.c | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index bc377cf..64c5696 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1837,14 +1837,38 @@ static nsresult NSAPI nsURI_SetPassword(nsIURL *iface, const nsACString *aPasswo static nsresult NSAPI nsURI_GetHostPort(nsIURL *iface, nsACString *aHostPort) { nsWineURI *This = NSURI_THIS(iface); + const WCHAR *ptr; + char *vala; + BSTR val; + HRESULT hres; TRACE("(%p)->(%p)\n", This, aHostPort); if(This->nsuri) return nsIURI_GetHostPort(This->nsuri, aHostPort); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; + + hres = IUri_GetAuthority(This->uri, &val); + if(FAILED(hres)) { + WARN("GetAuthority failed: %08x\n", hres); + return NS_ERROR_UNEXPECTED; + } + + ptr = strchrW(val, '@'); + if(!ptr) + ptr = val; + + vala = heap_strdupWtoA(ptr); + SysFreeString(val); + if(!vala) + return NS_ERROR_OUT_OF_MEMORY; + + TRACE("ret %s\n", debugstr_a(vala)); + nsACString_SetData(aHostPort, vala); + heap_free(vala); + return NS_OK; } static nsresult NSAPI nsURI_SetHostPort(nsIURL *iface, const nsACString *aHostPort)

1 0

Jacek Caban : mshtml: Added nsIURI::GetUserPass implementation.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 008c0597c8f5e430f35130480fa021496b927e63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=008c0597c8f5e430f35130480… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 28 13:26:21 2010 +0200 mshtml: Added nsIURI::GetUserPass implementation. --- dlls/mshtml/nsio.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 64c5696..df8f148 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1759,8 +1759,7 @@ static nsresult NSAPI nsURI_GetUserPass(nsIURL *iface, nsACString *aUserPass) if(This->nsuri) return nsIURI_GetUserPass(This->nsuri, aUserPass); - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + return get_uri_string(This, Uri_PROPERTY_USER_INFO, aUserPass); } static nsresult NSAPI nsURI_SetUserPass(nsIURL *iface, const nsACString *aUserPass)

1 0

Hwang YunSong : ipconfig: Update Korean resource.
by Alexandre Julliard 28 Sep '10

28 Sep '10

Module: wine Branch: master Commit: 9a83c075993317dd55e5ee049b67b22159a2a874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a83c075993317dd55e5ee049… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Sep 28 16:35:24 2010 +0900 ipconfig: Update Korean resource. --- programs/ipconfig/Ko.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Ko.rc b/programs/ipconfig/Ko.rc index dae65d4..2997ce5 100644 --- a/programs/ipconfig/Ko.rc +++ b/programs/ipconfig/Ko.rc @@ -47,4 +47,5 @@ STRINGTABLE STRING_DHCP_ENABLED, "DHCP 가능" STRING_YES, "예" STRING_NO, "아니오" + STRING_DEFAULT_GATEWAY, "기본 게이트웨이" }

1 0