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

Alexandre Julliard : configure: Print a warning when prelink isn't found.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: b5d824bd33ebf21abc6a2f2236184738b3cd0846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5d824bd33ebf21abc6a2f223… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 13:42:10 2010 +0200 configure: Print a warning when prelink isn't found. --- configure | 93 ++++++++++++++++++++++++++++----------------------------- configure.ac | 11 +++---- 2 files changed, 51 insertions(+), 53 deletions(-) diff --git a/configure b/configure index 2ad9171..dac6570 100755 --- a/configure +++ b/configure @@ -648,6 +648,7 @@ LIBPTHREAD CROSSTARGET CROSSCC CROSSTEST_DISABLE +PRELINK CARBONLIB FRAMEWORK_OPENAL COREAUDIO @@ -670,7 +671,6 @@ DLLEXT CPP OPENGL_LIBS XLIB -PRELINK MAINTAINER_MODE ICOTOOL CONVERT @@ -5175,52 +5175,6 @@ $as_echo "yes ($icotool_version_major.$icotool_version_minor)" >&6; } fi -case $host_cpu in - *i[3456789]86*) - # Extract the first word of "prelink", so it can be a program name with args. -set dummy prelink; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PRELINK+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $PRELINK in - [\\/]* | ?:[\\/]*) - ac_cv_path_PRELINK="$PRELINK" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /sbin /usr/sbin $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PRELINK="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_PRELINK" && ac_cv_path_PRELINK="false" - ;; -esac -fi -PRELINK=$ac_cv_path_PRELINK -if test -n "$PRELINK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PRELINK" >&5 -$as_echo "$PRELINK" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for i386_set_ldt in -li386" >&5 $as_echo_n "checking for i386_set_ldt in -li386... " >&6; } @@ -6930,6 +6884,51 @@ $as_echo "$ac_cv_cflags__Wl___section_start__interp_0x7bf00400" >&6; } if test $ac_cv_cflags__Wl___section_start__interp_0x7bf00400 = yes; then : LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" fi + # Extract the first word of "prelink", so it can be a program name with args. +set dummy prelink; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PRELINK+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $PRELINK in + [\\/]* | ?:[\\/]*) + ac_cv_path_PRELINK="$PRELINK" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /sbin /usr/sbin $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PRELINK="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PRELINK" && ac_cv_path_PRELINK="false" + ;; +esac +fi +PRELINK=$ac_cv_path_PRELINK +if test -n "$PRELINK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PRELINK" >&5 +$as_echo "$PRELINK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "x$PRELINK" = xfalse + then + as_fn_append wine_warnings "|prelink not found, base address of core dlls won't be set correctly." + fi ;; esac diff --git a/configure.ac b/configure.ac index 9ef36b0..37628f6 100644 --- a/configure.ac +++ b/configure.ac @@ -350,12 +350,6 @@ else fi -case $host_cpu in - *i[[3456789]]86*) - AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) - ;; -esac - dnl **** Check for some libraries **** dnl Check for -li386 for NetBSD and OpenBSD @@ -796,6 +790,11 @@ case $host_os in *i[[3456789]]86* | x86_64) WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400], [LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400"]) + AC_PATH_PROG(PRELINK, prelink, false, [/sbin /usr/sbin $PATH]) + if test "x$PRELINK" = xfalse + then + WINE_WARNING([prelink not found, base address of core dlls won't be set correctly.]) + fi ;; esac

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 88cae5d4c783c5d2b6ce212b9f79308e208813d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88cae5d4c783c5d2b6ce212b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 09:53:35 2010 +0200 Assorted spelling fixes. --- dlls/mshtml/htmlelem.c | 2 +- dlls/oleaut32/tests/typelib.c | 2 +- dlls/shell32/tests/shlfolder.c | 2 +- dlls/urlmon/tests/uri.c | 4 ++-- dlls/urlmon/uri.c | 22 +++++++++++----------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 5bf2915..e5ca73d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1718,7 +1718,7 @@ HTMLElement *HTMLElement_Create(HTMLDocumentNode *doc, nsIDOMNode *nsnode, BOOL return ret; } -/* interaface IHTMLFiltersCollection */ +/* interface IHTMLFiltersCollection */ static HRESULT WINAPI HTMLFiltersCollection_QueryInterface(IHTMLFiltersCollection *iface, REFIID riid, void **ppv) { HTMLFiltersCollection *This = HTMLFILTERSCOLLECTION_THIS(iface); diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index e801160..fd98a15 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -294,7 +294,7 @@ static void test_TypeComp(void) ITypeInfo_ReleaseFuncDesc(pTypeInfo, bindptr.lpfuncdesc); ITypeInfo_Release(pTypeInfo); - /* tests non-existent members */ + /* tests nonexistent members */ desckind = 0xdeadbeef; bindptr.lptcomp = (ITypeComp*)0xdeadbeef; pTypeInfo = (ITypeInfo*)0xdeadbeef; diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index e731f07..3fae215 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3566,7 +3566,7 @@ static void test_GetUIObject(void) ZeroMemory(&cmi, sizeof(CMINVOKECOMMANDINFO)); cmi.cbSize = sizeof(CMINVOKECOMMANDINFO); - /* Attempt to execute non-existing command */ + /* Attempt to execute a nonexistent command */ cmi.lpVerb = MAKEINTRESOURCEA(9999); hr = IContextMenu_InvokeCommand(pcm, &cmi); ok(hr == E_INVALIDARG, "Got 0x%08x\n", hr); diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 84f89d1..ca6d362 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -662,7 +662,7 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, - /* Windows uses the first occurence of ':' to delimit the userinfo. */ + /* Windows uses the first occurrence of ':' to delimit the userinfo. */ { "ftp://user:pass:word(a)winehq.org/", 0, S_OK, FALSE, Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_DOMAIN| Uri_HAS_HOST|Uri_HAS_PASSWORD|Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI| @@ -1414,7 +1414,7 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, - /* Valid URI since the '[' and ']' don't appear at the begining and end + /* Valid URI since the '[' and ']' don't appear at the beginning and end * of the host name (respectively). */ { "ftp://www.[works].com/", 0, S_OK, FALSE, diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 4a13f33..1054785 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -463,7 +463,7 @@ static inline void pct_encode_val(WCHAR val, WCHAR *dest) { dest[2] = hexDigits[val & 0xf]; } -/* Scans the range of characters [str, end] and returns the last occurence +/* Scans the range of characters [str, end] and returns the last occurrence * of 'ch' or returns NULL. */ static const WCHAR *str_last_of(const WCHAR *str, const WCHAR *end, WCHAR ch) { @@ -533,7 +533,7 @@ static void find_domain_name(const WCHAR *host, DWORD host_len, return; } } else if(last_tld-host < 3) - /* Anything less then 3 characters is considered part + /* Anything less than 3 characters is considered part * of the TLD name. * Ex: ak.uk -> Has no domain name. */ @@ -542,7 +542,7 @@ static void find_domain_name(const WCHAR *host, DWORD host_len, /* Otherwise the domain name is the whole host name. */ *domain_start = 0; } else if(end+1-last_tld > 3) { - /* If the last_tld has more then 3 characters then it's automatically + /* If the last_tld has more than 3 characters, then it's automatically * considered the TLD of the domain name. * Ex: www.winehq.org.uk.test -> uk.test as the domain name. */ @@ -572,7 +572,7 @@ static void find_domain_name(const WCHAR *host, DWORD host_len, *domain_start = (sec_last_tld+1)-host; } else { - /* Since the sec_last_tld is less then 3 characters it's considered + /* Since the sec_last_tld is less than 3 characters it's considered * part of the TLD. * Ex: www.google.fo.uk -> google.fo.uk as the domain name. */ @@ -584,7 +584,7 @@ static void find_domain_name(const WCHAR *host, DWORD host_len, *domain_start = (domain+1) - host; } } else { - /* The second to last TLD has more then 3 characters making it + /* The second to last TLD has more than 3 characters making it * the domain name. * Ex: www.google.test.us -> test.us as the domain name. */ @@ -595,7 +595,7 @@ static void find_domain_name(const WCHAR *host, DWORD host_len, (host+host_len)-(host+*domain_start))); } -/* Removes the dot segments from a heirarchical URIs path component. This +/* Removes the dot segments from a hierarchical URIs path component. This * function performs the removal in place. * * This is a modified version of Qt's QUrl function "removeDotsFromPath". @@ -719,7 +719,7 @@ static void compute_elision_location(const ipv6_address *address, const USHORT v if(is_end || values[i] != 0) { /* We only consider it for an elision if it's - * more then 1 component long. + * more than 1 component long. */ if(cur_len > 1 && cur_len > max_len) { /* Found the new elision location. */ @@ -1190,7 +1190,7 @@ static BOOL parse_scheme(const WCHAR **ptr, parse_data *data, DWORD flags) { * * NOTES: * 1) If there is more than one ':' in the userinfo part of the URI Windows - * uses the first occurence of ':' to delimit the username and password + * uses the first occurrence of ':' to delimit the username and password * components. * * ex: @@ -1484,7 +1484,7 @@ static BOOL parse_ipv6address(const WCHAR **ptr, parse_data *data, DWORD flags) BOOL is_split = (**ptr == ':'); BOOL is_elision = (is_split && !is_end && *(*ptr+1) == ':'); - /* Check if we're at the end of of the a component, or + /* Check if we're at the end of a component, or * if we're at the end of the IPv6 address. */ if(is_split || is_end) { @@ -1509,7 +1509,7 @@ static BOOL parse_ipv6address(const WCHAR **ptr, parse_data *data, DWORD flags) if(!((*ptr == start && is_elision) || (is_end && (*ptr-2) == ip.elision))) { *ptr = start; - TRACE("(%p %p %x): IPv6 component can not have a length of 0.\n", + TRACE("(%p %p %x): IPv6 component cannot have a length of 0.\n", ptr, data, flags); return FALSE; } @@ -1621,7 +1621,7 @@ static BOOL parse_ipvfuture(const WCHAR **ptr, parse_data *data, DWORD flags) { if(**ptr != 'v' && **ptr != 'V') return FALSE; - /* Following the v their must be atleast 1 hexdigit. */ + /* Following the v there must be at least 1 hex digit. */ ++(*ptr); if(!is_hexdigit(**ptr)) { *ptr = start;

1 0

Francois Gouget : shdocvw: Remove WINAPI on static functions where not needed.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 18b036e2137707e2af9a7125c17273cec446d5cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=18b036e2137707e2af9a7125c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:00:24 2010 +0200 shdocvw: Remove WINAPI on static functions where not needed. --- dlls/shdocvw/iexplore.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index 59f9173..cbbcac5 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -557,7 +557,7 @@ static LRESULT iewnd_OnDestroy(InternetExplorer *This) return 0; } -static LRESULT CALLBACK iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +static LRESULT iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { switch(LOWORD(wparam)) { @@ -600,7 +600,7 @@ static LRESULT CALLBACK iewnd_OnCommand(InternetExplorer *This, HWND hwnd, UINT return 0; } -static LRESULT CALLBACK update_addrbar(InternetExplorer *This, LPARAM lparam) +static LRESULT update_addrbar(InternetExplorer *This, LPARAM lparam) { HWND hwndRebar = GetDlgItem(This->frame_hwnd, IDC_BROWSE_REBAR); HWND hwndAddress = GetDlgItem(hwndRebar, IDC_BROWSE_ADDRESSBAR);

1 0

Francois Gouget : msdaps: Make create_rowset_proxy() static.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 1aa51f56d70e5c34097510c736ed6124aeca3422 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa51f56d70e5c34097510c73… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:01:10 2010 +0200 msdaps: Make create_rowset_proxy() static. --- dlls/msdaps/row_server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 4fc41c4..bc0f652 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -1320,7 +1320,7 @@ static const IAccessorVtbl accessor_vtbl = accessor_ReleaseAccessor }; -HRESULT create_rowset_proxy(IWineRowServer *server, IUnknown **obj) +static HRESULT create_rowset_proxy(IWineRowServer *server, IUnknown **obj) { rowset_proxy *proxy;

1 0

Damjan Jovanovic : windowscodecs: Add a stubbed ICNS encoder.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: a4835dce4fd8cebd5c02ee62fc9c357efdbfa70f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4835dce4fd8cebd5c02ee62f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Aug 24 09:43:54 2010 +0200 windowscodecs: Add a stubbed ICNS encoder. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/icnsformat.c | 271 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 9 + dlls/windowscodecs/wincodecs_private.h | 3 + 5 files changed, 285 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4835dce4fd8cebd5c02e…

1 0

Damjan Jovanovic : windowscodecs: Stub out the ICNS frame encoder.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 51d741f8c8641c140f813f517656b9555a2c211b URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d741f8c8641c140f813f517… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Aug 24 09:44:46 2010 +0200 windowscodecs: Stub out the ICNS frame encoder. --- dlls/windowscodecs/icnsformat.c | 215 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 211 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index 0731bf9..3744065 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -79,9 +79,164 @@ typedef struct IcnsEncoder { const IWICBitmapEncoderVtbl *lpVtbl; LONG ref; IStream *stream; + icns_family_t *icns_family; + BOOL any_frame_committed; + int outstanding_commits; CRITICAL_SECTION lock; } IcnsEncoder; +typedef struct IcnsFrameEncode { + const IWICBitmapFrameEncodeVtbl *lpVtbl; + IcnsEncoder *encoder; + LONG ref; +} IcnsFrameEncode; + +static HRESULT WINAPI IcnsFrameEncode_QueryInterface(IWICBitmapFrameEncode *iface, REFIID iid, + void **ppv) +{ + IcnsFrameEncode *This = (IcnsFrameEncode*)iface; + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapFrameEncode, iid)) + { + *ppv = &This->lpVtbl; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI IcnsFrameEncode_AddRef(IWICBitmapFrameEncode *iface) +{ + IcnsFrameEncode *This = (IcnsFrameEncode*)iface; + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI IcnsFrameEncode_Release(IWICBitmapFrameEncode *iface) +{ + IcnsFrameEncode *This = (IcnsFrameEncode*)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + EnterCriticalSection(&This->encoder->lock); + This->encoder->outstanding_commits--; + LeaveCriticalSection(&This->encoder->lock); + + IUnknown_Release((IUnknown*)This->encoder); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI IcnsFrameEncode_Initialize(IWICBitmapFrameEncode *iface, + IPropertyBag2 *pIEncoderOptions) +{ + FIXME("(%p,%p): stub\n", iface, pIEncoderOptions); + return E_NOTIMPL; +} + +static HRESULT WINAPI IcnsFrameEncode_SetSize(IWICBitmapFrameEncode *iface, + UINT uiWidth, UINT uiHeight) +{ + FIXME("(%p,%u,%u): stub\n", iface, uiWidth, uiHeight); + return E_NOTIMPL; +} + +static HRESULT WINAPI IcnsFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, + double dpiX, double dpiY) +{ + FIXME("(%p,%0.2f,%0.2f): stub\n", iface, dpiX, dpiY); + return E_NOTIMPL; +} + +static HRESULT WINAPI IcnsFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, + WICPixelFormatGUID *pPixelFormat) +{ + TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IcnsFrameEncode_SetColorContexts(IWICBitmapFrameEncode *iface, + UINT cCount, IWICColorContext **ppIColorContext) +{ + FIXME("(%p,%u,%p): stub\n", iface, cCount, ppIColorContext); + return E_NOTIMPL; +} + +static HRESULT WINAPI IcnsFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI IcnsFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, + IWICBitmapSource *pIThumbnail) +{ + FIXME("(%p,%p): stub\n", iface, pIThumbnail); + return WINCODEC_ERR_UNSUPPORTEDOPERATION; +} + +static HRESULT WINAPI IcnsFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, + UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) +{ + FIXME("(%p,%u,%u,%u,%p): stub\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); + return E_NOTIMPL; +} + +static HRESULT WINAPI IcnsFrameEncode_WriteSource(IWICBitmapFrameEncode *iface, + IWICBitmapSource *pIBitmapSource, WICRect *prc) +{ + FIXME("(%p,%p,%p): stub\n", iface, pIBitmapSource, prc); + return E_NOTIMPL; +} + +static HRESULT WINAPI IcnsFrameEncode_Commit(IWICBitmapFrameEncode *iface) +{ + FIXME("(%p): stub\n", iface); + return E_NOTIMPL; +} + +static HRESULT WINAPI IcnsFrameEncode_GetMetadataQueryWriter(IWICBitmapFrameEncode *iface, + IWICMetadataQueryWriter **ppIMetadataQueryWriter) +{ + FIXME("(%p, %p): stub\n", iface, ppIMetadataQueryWriter); + return E_NOTIMPL; +} + +static const IWICBitmapFrameEncodeVtbl IcnsEncoder_FrameVtbl = { + IcnsFrameEncode_QueryInterface, + IcnsFrameEncode_AddRef, + IcnsFrameEncode_Release, + IcnsFrameEncode_Initialize, + IcnsFrameEncode_SetSize, + IcnsFrameEncode_SetResolution, + IcnsFrameEncode_SetPixelFormat, + IcnsFrameEncode_SetColorContexts, + IcnsFrameEncode_SetPalette, + IcnsFrameEncode_SetThumbnail, + IcnsFrameEncode_WritePixels, + IcnsFrameEncode_WriteSource, + IcnsFrameEncode_Commit, + IcnsFrameEncode_GetMetadataQueryWriter +}; + static HRESULT WINAPI IcnsEncoder_QueryInterface(IWICBitmapEncoder *iface, REFIID iid, void **ppv) { @@ -126,6 +281,8 @@ static ULONG WINAPI IcnsEncoder_Release(IWICBitmapEncoder *iface) { This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); + if (This->icns_family) + free(This->icns_family); if (This->stream) IStream_Release(This->stream); HeapFree(GetProcessHeap(), 0, This); @@ -138,17 +295,32 @@ static HRESULT WINAPI IcnsEncoder_Initialize(IWICBitmapEncoder *iface, IStream *pIStream, WICBitmapEncoderCacheOption cacheOption) { IcnsEncoder *This = (IcnsEncoder*)iface; + int ret; + HRESULT hr = S_OK; TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOption); EnterCriticalSection(&This->lock); + if (This->icns_family) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + ret = picns_create_family(&This->icns_family); + if (ret != ICNS_STATUS_OK) + { + WARN("error %d creating icns family\n", ret); + hr = E_FAIL; + goto end; + } IStream_AddRef(pIStream); This->stream = pIStream; +end: LeaveCriticalSection(&This->lock); - return S_OK; + return hr; } static HRESULT WINAPI IcnsEncoder_GetContainerFormat(IWICBitmapEncoder *iface, @@ -193,9 +365,41 @@ static HRESULT WINAPI IcnsEncoder_SetPreview(IWICBitmapEncoder *iface, IWICBitma static HRESULT WINAPI IcnsEncoder_CreateNewFrame(IWICBitmapEncoder *iface, IWICBitmapFrameEncode **ppIFrameEncode, IPropertyBag2 **ppIEncoderOptions) { - FIXME("(%p,%p,%p): stub\n", iface, ppIFrameEncode, ppIEncoderOptions); + IcnsEncoder *This = (IcnsEncoder*)iface; + HRESULT hr = S_OK; + IcnsFrameEncode *frameEncode = NULL; - return E_NOTIMPL; + TRACE("(%p,%p,%p)\n", iface, ppIFrameEncode, ppIEncoderOptions); + + EnterCriticalSection(&This->lock); + + if (!This->icns_family) + { + hr = WINCODEC_ERR_NOTINITIALIZED; + goto end; + } + + hr = CreatePropertyBag2(ppIEncoderOptions); + if (FAILED(hr)) + goto end; + + frameEncode = HeapAlloc(GetProcessHeap(), 0, sizeof(IcnsFrameEncode)); + if (frameEncode == NULL) + { + hr = E_OUTOFMEMORY; + goto end; + } + frameEncode->lpVtbl = &IcnsEncoder_FrameVtbl; + frameEncode->encoder = This; + frameEncode->ref = 1; + *ppIFrameEncode = (IWICBitmapFrameEncode*)frameEncode; + This->outstanding_commits++; + IUnknown_AddRef((IUnknown*)This); + +end: + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI IcnsEncoder_Commit(IWICBitmapEncoder *iface) @@ -251,6 +455,9 @@ HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->lpVtbl = &IcnsEncoder_Vtbl; This->ref = 1; This->stream = NULL; + This->icns_family = NULL; + This->any_frame_committed = FALSE; + This->outstanding_commits = 0; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IcnsEncoder.lock"); @@ -260,7 +467,7 @@ HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) return ret; } -#else /* !HAVE_ICNS_H */ +#else /* !defined(SONAME_LIBICNS) */ HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) {

1 0

Damjan Jovanovic : windowscodecs: Implement the ICNS frame encoder.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: bbf039fe458d9870a21c82ab2cbeeaffbacbf855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf039fe458d9870a21c82ab2… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Aug 24 09:45:48 2010 +0200 windowscodecs: Implement the ICNS frame encoder. --- dlls/windowscodecs/icnsformat.c | 316 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 300 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbf039fe458d9870a21c8…

1 0

Damjan Jovanovic : windowscodecs: Write ICNS files.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 129f229272fa1a3f18e73bf2e8b240f004d7ca05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129f229272fa1a3f18e73bf2e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Aug 24 09:46:40 2010 +0200 windowscodecs: Write ICNS files. --- dlls/windowscodecs/icnsformat.c | 41 +++++++++++++++++++++++++++++++++++++- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/icnsformat.c b/dlls/windowscodecs/icnsformat.c index f8f90f5..fb86e27 100644 --- a/dlls/windowscodecs/icnsformat.c +++ b/dlls/windowscodecs/icnsformat.c @@ -82,6 +82,7 @@ typedef struct IcnsEncoder { icns_family_t *icns_family; BOOL any_frame_committed; int outstanding_commits; + BOOL committed; CRITICAL_SECTION lock; } IcnsEncoder; @@ -688,9 +689,44 @@ end: static HRESULT WINAPI IcnsEncoder_Commit(IWICBitmapEncoder *iface) { - FIXME("(%p): stub\n", iface); + IcnsEncoder *This = (IcnsEncoder*)iface; + icns_byte_t *buffer = NULL; + icns_size_t buffer_size; + int ret; + HRESULT hr = S_OK; + ULONG byteswritten; - return E_NOTIMPL; + TRACE("(%p)\n", iface); + + EnterCriticalSection(&This->lock); + + if (!This->any_frame_committed || This->outstanding_commits > 0 || This->committed) + { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + ret = picns_export_family_data(This->icns_family, &buffer_size, &buffer); + if (ret != ICNS_STATUS_OK) + { + WARN("icns_export_family_data failed with error %d\n", ret); + hr = E_FAIL; + goto end; + } + hr = IStream_Write(This->stream, buffer, buffer_size, &byteswritten); + if (FAILED(hr) || byteswritten != buffer_size) + { + WARN("writing file failed, hr = 0x%08X\n", hr); + hr = E_FAIL; + goto end; + } + + This->committed = TRUE; + +end: + LeaveCriticalSection(&This->lock); + free(buffer); + return hr; } static HRESULT WINAPI IcnsEncoder_GetMetadataQueryWriter(IWICBitmapEncoder *iface, @@ -742,6 +778,7 @@ HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->icns_family = NULL; This->any_frame_committed = FALSE; This->outstanding_commits = 0; + This->committed = FALSE; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IcnsEncoder.lock");

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUriBuilder_HasBeenModified.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 47e93adc744daf5aa252e34e723f17ac213ad48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=47e93adc744daf5aa252e34e7… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Aug 20 18:29:43 2010 -0400 urlmon/tests: Added tests for IUriBuilder_HasBeenModified. --- dlls/urlmon/tests/uri.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 5 +++ 2 files changed, 78 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index cadc20a..bff36a3 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -6297,16 +6297,20 @@ static void test_IUriBuilder(void) { } if(SUCCEEDED(hr)) { DWORD j; + BOOL modified = FALSE, received = FALSE; /* Perform all the string property changes. */ for(j = 0; j < URI_BUILDER_STR_PROPERTY_COUNT; ++j) { uri_builder_property prop = test.properties[j]; - if(prop.change) + if(prop.change) { + modified = TRUE; change_property(builder, &prop, i); + } } if(test.port_prop.change) { hr = IUriBuilder_SetPort(builder, test.port_prop.set, test.port_prop.value); + modified = TRUE; if(test.port_prop.todo) { todo_wine { ok(hr == test.port_prop.expected, @@ -6320,6 +6324,20 @@ static void test_IUriBuilder(void) { } } + hr = IUriBuilder_HasBeenModified(builder, &received); + todo_wine { + ok(hr == S_OK, + "Error IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_OK, i); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(received == modified, + "Error: Expected received to be %d but was %d instead on uri_builder_tests[%d].\n", + modified, received, i); + } + } + /* Test the "Get*" functions. */ test_IUriBuilder_GetFragment(builder, &test, i); test_IUriBuilder_GetHost(builder, &test, i); @@ -6340,6 +6358,57 @@ static void test_IUriBuilder(void) { } } +static void test_IUriBuilder_HasBeenModified(void) { + HRESULT hr; + IUriBuilder *builder = NULL; + + hr = pCreateIUriBuilder(NULL, 0, 0, &builder); + ok(hr == S_OK, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + if(SUCCEEDED(hr)) { + static const WCHAR hostW[] = {'w','i','n','e','h','q','.','c','o','m',0}; + IUri *uri = NULL; + BOOL received; + + hr = IUriBuilder_HasBeenModified(builder, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + + hr = IUriBuilder_SetHost(builder, hostW); + todo_wine { + ok(hr == S_OK, "Error: IUriBuilder_SetHost returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); + } + + hr = IUriBuilder_HasBeenModified(builder, &received); + todo_wine { + ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); + } + if(SUCCEEDED(hr)) + todo_wine { ok(received == TRUE, "Error: Expected received to be TRUE.\n"); } + + 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 = IUriBuilder_SetIUri(builder, uri); + todo_wine { + ok(hr == S_OK, "Error: IUriBuilder_SetIUri returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); + } + + hr = IUriBuilder_HasBeenModified(builder, &received); + todo_wine { + ok(hr == S_OK, "Error: IUriBuilder_HasBeenModified returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); + } + if(SUCCEEDED(hr)) + todo_wine { ok(received == FALSE, "Error: Expected received to be FALSE.\n"); } + } + if(uri) IUri_Release(uri); + } + if(builder) IUriBuilder_Release(builder); +} + START_TEST(uri) { HMODULE hurlmon; @@ -6406,4 +6475,7 @@ START_TEST(uri) { trace("test IUriBuilder_GetInvalidArgs...\n"); test_IUriBuilder_GetInvalidArgs(); + + trace("test IUriBuilder_HasBeenModified...\n"); + test_IUriBuilder_HasBeenModified(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 3355a97..64a7ef1 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4418,6 +4418,11 @@ static HRESULT WINAPI UriBuilder_RemoveProperties(IUriBuilder *iface, DWORD dwPr static HRESULT WINAPI UriBuilder_HasBeenModified(IUriBuilder *iface, BOOL *pfModified) { UriBuilder *This = URIBUILDER_THIS(iface); + TRACE("(%p)->(%p)\n", This, pfModified); + + if(!pfModified) + return E_POINTER; + FIXME("(%p)->(%p)\n", This, pfModified); return E_NOTIMPL; }

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUriBuilder's IUri property.
by Alexandre Julliard 24 Aug '10

24 Aug '10

Module: wine Branch: master Commit: 3b383e2175f66a8b095dc3981633b604550cb6c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b383e2175f66a8b095dc3981… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Aug 22 15:26:31 2010 -0400 urlmon/tests: Added tests for IUriBuilder's IUri property. --- dlls/urlmon/tests/uri.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 5 +++++ 2 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index bff36a3..6bb05b7 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -6409,6 +6409,49 @@ static void test_IUriBuilder_HasBeenModified(void) { if(builder) IUriBuilder_Release(builder); } +/* Test IUriBuilder {Get,Set}IUri functions. */ +static void test_IUriBuilder_IUriProperty(void) { + IUriBuilder *builder = NULL; + HRESULT hr; + + hr = pCreateIUriBuilder(NULL, 0, 0, &builder); + ok(hr == S_OK, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + if(SUCCEEDED(hr)) { + IUri *uri = NULL; + + hr = IUriBuilder_GetIUri(builder, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + + hr = pCreateUri(http_urlW, 0, 0, &uri); + if(SUCCEEDED(hr)) { + ULONG cur_count, orig_count; + + /* IUriBuilder doesn't clone the IUri, it use the same IUri. */ + orig_count = get_refcnt(uri); + hr = IUriBuilder_SetIUri(builder, uri); + cur_count = get_refcnt(uri); + if(SUCCEEDED(hr)) { + todo_wine { + ok(cur_count == orig_count+1, "Error: Expected uri ref count to be %d, but was %d instead.\n", + orig_count+1, cur_count); + } + } + + hr = IUriBuilder_SetIUri(builder, NULL); + cur_count = get_refcnt(uri); + if(SUCCEEDED(hr)) { + todo_wine { + ok(cur_count == orig_count, "Error: Expected uri ref count to be %d, but was %d instead.\n", + orig_count, cur_count); + } + } + } + if(uri) IUri_Release(uri); + } + if(builder) IUriBuilder_Release(builder); +} + START_TEST(uri) { HMODULE hurlmon; @@ -6478,4 +6521,7 @@ START_TEST(uri) { trace("test IUriBuilder_HasBeenModified...\n"); test_IUriBuilder_HasBeenModified(); + + trace("test IUriBuilder_IUriProperty...\n"); + test_IUriBuilder_IUriProperty(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 64a7ef1..4a13f33 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4181,6 +4181,11 @@ static HRESULT WINAPI UriBuilder_CreateUriWithFlags(IUriBuilder *iface, static HRESULT WINAPI UriBuilder_GetIUri(IUriBuilder *iface, IUri **ppIUri) { UriBuilder *This = URIBUILDER_THIS(iface); + TRACE("(%p)->(%p)\n", This, ppIUri); + + if(!ppIUri) + return E_POINTER; + FIXME("(%p)->(%p)\n", This, ppIUri); return E_NOTIMPL; }

1 0