June 2014 - Wine-commits - list.winehq.org

André Hentschel : krnl386: Fix typo in a comment.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: 8cad71cd5e15a77f6f2e4006167b17086269dd44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cad71cd5e15a77f6f2e40061… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jun 19 13:04:06 2014 +0200 krnl386: Fix typo in a comment. --- dlls/krnl386.exe16/wowthunk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index feb882b..1f352bd 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -561,7 +561,7 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags, __wine_push_frame( &frame ); __wine_enter_vm86( context ); __wine_pop_frame( &frame ); - if (errno != 0) /* enter_vm86 will fall with ENOSYS on x64 kernels */ + if (errno != 0) /* enter_vm86 will fail with ENOSYS on x64 kernels */ { WARN("__wine_enter_vm86 failed (errno=%d)\n", errno); if (errno == ENOSYS)

1 0

Jacek Caban : wininet: Don't change hostPort in HTTP_HttpOpenRequestW.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: 7ab99b5c4810a81ac08fa80b0750b27ecd115a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ab99b5c4810a81ac08fa80b0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 19 15:14:34 2014 +0200 wininet: Don't change hostPort in HTTP_HttpOpenRequestW. --- dlls/wininet/http.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d2b3de9..8e1a81d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3368,9 +3368,6 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, HTTP_ProcessHeader(request, hostW, request->server->canon_host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDHDR_FLAG_REQ); - if (session->hostPort == INTERNET_INVALID_PORT_NUMBER) - session->hostPort = INTERNET_DEFAULT_HTTP_PORT; - if (hIC->proxy && hIC->proxy[0] && !HTTP_ShouldBypassProxy(hIC, session->hostName)) HTTP_DealWithProxy( hIC, session, request );

1 0

Andrew Eikum : packager: Implement IOleObject::SetClientSite.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: 07e9d33f39730ff50646bda53ca2d510140e118d URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e9d33f39730ff50646bda53… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 18 14:57:13 2014 -0500 packager: Implement IOleObject::SetClientSite. --- dlls/packager/packager_main.c | 18 ++++++++-- dlls/packager/tests/oleobj.c | 78 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 4735383..942ae72 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -44,6 +44,8 @@ struct Package { LONG ref; WCHAR filename[MAX_PATH]; + + IOleClientSite *clientsite; }; static inline struct Package *impl_from_IOleObject(IOleObject *iface) @@ -95,6 +97,9 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) TRACE("(%p) ref=%d\n", This, ref); if(!ref){ + if(This->clientsite) + IOleClientSite_Release(This->clientsite); + if(*This->filename) DeleteFileW(This->filename); @@ -107,8 +112,17 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, IOleClientSite *pClientSite) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p)\n", This, pClientSite); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pClientSite); + + if(This->clientsite) + IOleClientSite_Release(This->clientsite); + + This->clientsite = pClientSite; + if(pClientSite) + IOleClientSite_AddRef(pClientSite); + + return S_OK; } static HRESULT WINAPI OleObject_GetClientSite(IOleObject *iface, IOleClientSite **ppClientSite) diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 5ff536a..912dda9 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -334,6 +334,78 @@ static IStorage stg = { &stg_vtbl }; +static HRESULT WINAPI clientsite_QueryInterface(IOleClientSite* This, + REFIID riid, void **ppvObject) +{ + ok(0, "query interface\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI clientsite_AddRef(IOleClientSite* This) +{ + return 2; +} + +static ULONG WINAPI clientsite_Release(IOleClientSite* This) +{ + return 1; +} + +static HRESULT WINAPI clientsite_SaveObject(IOleClientSite* This) +{ + ok(0, "saveobject\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI clientsite_GetMoniker(IOleClientSite* This, + DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk) +{ + ok(0, "getmoniker\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI clientsite_GetContainer(IOleClientSite* This, + IOleContainer **ppContainer) +{ + ok(0, "getcontainer\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI clientsite_ShowObject(IOleClientSite* This) +{ + ok(0, "showobject\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI clientsite_OnShowWindow(IOleClientSite* This, + BOOL fShow) +{ + ok(0, "onshowwindow\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI clientsite_RequestNewObjectLayout(IOleClientSite* This) +{ + ok(0, "requestnewobjectlayout\n"); + return E_NOTIMPL; +} + +static IOleClientSiteVtbl clientsite_vtbl = { + clientsite_QueryInterface, + clientsite_AddRef, + clientsite_Release, + clientsite_SaveObject, + clientsite_GetMoniker, + clientsite_GetContainer, + clientsite_ShowObject, + clientsite_OnShowWindow, + clientsite_RequestNewObjectLayout +}; + +static IOleClientSite clientsite = { + &clientsite_vtbl +}; + static void test_packager(void) { IOleObject *oleobj; @@ -363,6 +435,12 @@ static void test_packager(void) &IID_IOleObject, (void**)&oleobj); ok(hr == S_OK, "CoCreateInstance(CLSID_Package_Alt) failed: %08x\n", hr); + hr = IOleObject_SetClientSite(oleobj, NULL); + ok(hr == S_OK, "SetClientSite failed: %08x\n", hr); + + hr = IOleObject_SetClientSite(oleobj, &clientsite); + ok(hr == S_OK, "SetClientSite failed: %08x\n", hr); + hr = IOleObject_QueryInterface(oleobj, &IID_IPersistStorage, (void**)&persist); ok(hr == S_OK, "QueryInterface(IPersistStorage) failed: %08x\n", hr);

1 0

Andrew Eikum : packager: Implement IOleObject::GetMiscStatus.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: 04b6fc9d5ee2c44cdd94c1aaa6adb0c94b124a3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=04b6fc9d5ee2c44cdd94c1aaa… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 18 14:57:45 2014 -0500 packager: Implement IOleObject::GetMiscStatus. --- dlls/packager/packager_main.c | 11 +++++++++-- dlls/packager/tests/oleobj.c | 11 ++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 942ae72..02e691c 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -256,8 +256,15 @@ static HRESULT WINAPI OleObject_EnumAdvise(IOleObject *iface, IEnumSTATDATA **pp static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, DWORD *pdwStatus) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d, %p)\n", This, dwAspect, pdwStatus); - return E_NOTIMPL; + + TRACE("(%p)->(%d, %p)\n", This, dwAspect, pdwStatus); + + if(!pdwStatus) + return E_INVALIDARG; + + *pdwStatus = OLEMISC_ONLYICONIC; + + return S_OK; } static HRESULT WINAPI OleObject_SetColorScheme(IOleObject *iface, LOGPALETTE *pLogpal) diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 912dda9..6170e67 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -410,7 +410,7 @@ static void test_packager(void) { IOleObject *oleobj; IPersistStorage *persist; - DWORD len, bytes_read; + DWORD len, bytes_read, status; HRESULT hr; HANDLE file; WCHAR filename[MAX_PATH]; @@ -441,6 +441,15 @@ static void test_packager(void) hr = IOleObject_SetClientSite(oleobj, &clientsite); ok(hr == S_OK, "SetClientSite failed: %08x\n", hr); + hr = IOleObject_GetMiscStatus(oleobj, DVASPECT_CONTENT, NULL); + ok(hr == E_INVALIDARG, "GetMiscStatus failed: %08x\n", hr); + + hr = IOleObject_GetMiscStatus(oleobj, DVASPECT_CONTENT, &status); + ok(hr == S_OK, "GetMiscStatus failed: %08x\n", hr); + ok(status == OLEMISC_ONLYICONIC || + status == OLEMISC_CANTLINKINSIDE /* winxp */, + "Got wrong DVASPECT_CONTENT status: 0x%x\n", status); + hr = IOleObject_QueryInterface(oleobj, &IID_IPersistStorage, (void**)&persist); ok(hr == S_OK, "QueryInterface(IPersistStorage) failed: %08x\n", hr);

1 0

Andrew Eikum : packager: Implement Activate verb for OleObject::DoVerb.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: 7c6899ba7be84dea1ccf5dea095d6a5b7be60eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c6899ba7be84dea1ccf5dea0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 18 14:58:26 2014 -0500 packager: Implement Activate verb for OleObject::DoVerb. --- dlls/packager/packager_main.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 02e691c..0575fcf 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -175,12 +175,26 @@ static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD dwRese return E_NOTIMPL; } +static HRESULT do_activate_object(struct Package *This, HWND parent) +{ + static const WCHAR openW[] = {'o','p','e','n',0}; + ShellExecuteW(parent, openW, This->filename, NULL, NULL, SW_SHOW); + return S_OK; +} + static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpmsg, IOleClientSite *pActiveSite, LONG lindex, HWND hwndParent, LPCRECT lprcPosRect) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d)\n", This, iVerb); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, iVerb); + + switch(iVerb){ + case 0: + return do_activate_object(This, hwndParent); + } + + return E_INVALIDARG; } static HRESULT WINAPI OleObject_EnumVerbs(IOleObject *iface, IEnumOLEVERB **ppEnumOleVerb)

1 0

Andrew Eikum : packager: Implement IOleObject::Close.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: fae22c7c412c11c22b965b9d47d2a8ca9090bb65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fae22c7c412c11c22b965b9d4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 18 14:58:50 2014 -0500 packager: Implement IOleObject::Close. --- dlls/packager/packager_main.c | 10 ++++++++-- dlls/packager/tests/oleobj.c | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 0575fcf..3f05f88 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -142,8 +142,14 @@ static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, LPCOLESTR szCont static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(0x%x)\n", This, dwSaveOption); - return E_NOTIMPL; + + TRACE("(%p)->(0x%x)\n", This, dwSaveOption); + + if(dwSaveOption == OLECLOSE_SAVEIFDIRTY || + dwSaveOption == OLECLOSE_PROMPTSAVE) + WARN("Saving unsupported\n"); + + return S_OK; } static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD dwWhichMoniker, IMoniker *pmk) diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 6170e67..f81dc22 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -473,8 +473,24 @@ static void test_packager(void) CloseHandle(file); } + hr = IOleObject_Close(oleobj, OLECLOSE_NOSAVE); + ok(hr == S_OK, "Close failed: %08x\n", hr); + + if(extended){ + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file != INVALID_HANDLE_VALUE, "Temporary file shouldn't be deleted\n"); + CloseHandle(file); + } + IPersistStorage_Release(persist); IOleObject_Release(oleobj); + + if(extended){ + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(file == INVALID_HANDLE_VALUE, "Temporary file should be deleted\n"); + } } START_TEST(oleobj)

1 0

Jacek Caban : wininet: Update hostPort in HTTP_HandleRedirect.
by Alexandre Julliard 19 Jun '14

19 Jun '14

Module: wine Branch: master Commit: a33ae13f7f4ecc3cbadb78db5a899b248d0b1e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33ae13f7f4ecc3cbadb78db5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 19 15:14:40 2014 +0200 wininet: Update hostPort in HTTP_HandleRedirect. --- dlls/wininet/http.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8e1a81d..bea7308 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4100,6 +4100,7 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) } else session->hostName = heap_strdupW(hostName); + session->hostPort = urlComponents.nPort; HTTP_ProcessHeader(request, hostW, session->hostName, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ);

1 0

Vincent Povirk : shell32: Set tm_isdst before calling mktime.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: fa8d59c30b250ac1d4814268e2b7956a11d8f8b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa8d59c30b250ac1d4814268e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 28 10:20:42 2014 -0500 shell32: Set tm_isdst before calling mktime. --- dlls/shell32/trash.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 043ae5b..3ca6e4e 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -515,6 +515,7 @@ static HRESULT TRASH_GetDetails(const TRASH_BUCKET *bucket, LPCSTR filename, WIN &del_time.tm_hour, &del_time.tm_min, &del_time.tm_sec); del_time.tm_year -= 1900; del_time.tm_mon--; + del_time.tm_isdst = -1; del_secs = mktime(&del_time); RtlSecondsSince1970ToTime(del_secs, (LARGE_INTEGER *)&data->ftLastAccessTime);

1 0

Vincent Povirk : advapi32/tests: Account for limited users in registry test.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: 8340636c55cdbcf4f3415ac25dc01377fb8e6fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8340636c55cdbcf4f3415ac25… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 29 14:10:05 2014 -0500 advapi32/tests: Account for limited users in registry test. --- dlls/advapi32/tests/registry.c | 151 +++++++++++++++++++++++++++------------- 1 file changed, 102 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8340636c55cdbcf4f3415…

1 0

Vincent Povirk : windowscodecs: Fix memory leak in ComponentFactory_CreateBitmapFromSource.
by Alexandre Julliard 18 Jun '14

18 Jun '14

Module: wine Branch: master Commit: 831b7371bc70525413bf9554f74922620ab9bf34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=831b7371bc70525413bf9554f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 6 15:28:09 2014 -0500 windowscodecs: Fix memory leak in ComponentFactory_CreateBitmapFromSource. --- dlls/windowscodecs/imgfactory.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index b969313..e7095dd 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -547,20 +547,22 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromSource(IWICComponentFacto IWICBitmapLock_Release(lock); } - if (SUCCEEDED(hr)) - hr = PaletteImpl_Create(&palette); - if (SUCCEEDED(hr) && (format_type == WICPixelFormatNumericRepresentationUnspecified || format_type == WICPixelFormatNumericRepresentationIndexed)) { - hr = IWICBitmapSource_CopyPalette(piBitmapSource, palette); + hr = PaletteImpl_Create(&palette); if (SUCCEEDED(hr)) - hr = IWICBitmap_SetPalette(result, palette); - else - hr = S_OK; + { + hr = IWICBitmapSource_CopyPalette(piBitmapSource, palette); + + if (SUCCEEDED(hr)) + hr = IWICBitmap_SetPalette(result, palette); + else + hr = S_OK; - IWICPalette_Release(palette); + IWICPalette_Release(palette); + } } if (SUCCEEDED(hr))

1 0