May 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : shell32/tests: Fix test crashes when running with wine.
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: 478d695ec8cb773f9e868dba01b9f707afe1f7e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478d695ec8cb773f9e868dba0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 4 13:00:37 2015 +0300 shell32/tests: Fix test crashes when running with wine. --- dlls/shell32/tests/shelldispatch.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index ba246f1..b7773ad 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -444,6 +444,9 @@ static void test_ShellWindows(void) hr = CoCreateInstance(&CLSID_ShellWindows, NULL, CLSCTX_LOCAL_SERVER, &IID_IShellWindows, (void**)&shellwindows); ok(hr == S_OK, "got 0x%08x\n", hr); + /* TODO: remove when explorer startup with clean prefix is fixed */ + if (hr != S_OK) + return; if (0) /* NULL out argument - currently crashes on Wine */ { hr = IShellWindows_Register(shellwindows, NULL, 0, SWC_EXPLORER, NULL);

1 0

Thomas Faller : jscript: Date.parse: long date with '/' or '-'.
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: fdd22f197ace226ceae8531c12651feb192b7619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd22f197ace226ceae8531c1… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Sun May 3 21:40:27 2015 +0200 jscript: Date.parse: long date with '/' or '-'. --- dlls/jscript/date.c | 9 ++++++++- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 5e5ef1c..6d98fcd 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2132,7 +2132,7 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { } } else if(parse[i]=='-' || parse[i]=='/') { - /* Short date */ + /* Short or long date */ if(set_day || set_month || set_year) break; set_day = TRUE; set_month = TRUE; @@ -2152,6 +2152,13 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { if(parse[i]<'0' || parse[i]>'9') break; year = atoiW(&parse[i]); while(parse[i]>='0' && parse[i]<='9') i++; + + if(tmp >= 70){ + /* long date */ + month = day - 1; + day = year; + year = tmp; + } } else if(tmp<0) break; else if(tmp<70) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e1f91c0..f4f42b0 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2013,6 +2013,8 @@ ok(Date.parse("February 31 UTC, 2000 12:31:17 PM") === 952000277000, "Date.parse(\"February 31 UTC, 2000 12:31:17 PM\") = " + Date.parse("February 31 UTC, 2000 12:31:17 PM")); ok(Date.parse("71 11:32AM Dec 12 UTC BC ") === -64346358480000, "Date.parse(\"71 11:32AM Dec 12 UTC BC \") = " + Date.parse("71 11:32AM Dec 12 UTC BC ")); ok(Date.parse("23/71/2000 11::32::UTC") === 1010662320000, "Date.parse(\"23/71/2000 11::32::UTC\") = " + Date.parse("23/71/2000 11::32::UTC")); +ok(Date.parse("1970/01/01") === Date.parse("01/01/1970"), "Date.parse(\"1970/01/01\") = " + Date.parse("1970/01/01")); +ok(Date.parse("71/12/14") === Date.parse("12/14/1971"), "Date.parse(\"71/12/14\") = " + Date.parse("71/12/14")); ok(typeof(Math.PI) === "number", "typeof(Math.PI) = " + typeof(Math.PI)); ok(Math.floor(Math.PI*100) === 314, "Math.PI = " + Math.PI);

1 0

Aaryaman Vasishta : d3drm: Fix IDirect3DRMDevice declaration.
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: ffbfd031a68b77beb17fd9d377f407ab1312fd27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbfd031a68b77beb17fd9d37… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon May 4 15:22:27 2015 +0530 d3drm: Fix IDirect3DRMDevice declaration. --- include/d3drmobj.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index f0ab369..942c69a 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -360,7 +360,7 @@ DECLARE_INTERFACE_(IDirect3DRMVisual,IDirect3DRMObject) #undef GetClassName #endif #define INTERFACE IDirect3DRMDevice -DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) +DECLARE_INTERFACE_(IDirect3DRMDevice,IDirect3DRMObject) { /*** IUnknown methods ***/ STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE;

1 0

Sebastian Lackner : kernel32: Do not omit mandatory argument for VirtualProtect.
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: 1119da47ee1c7f530da7d69609ebadbe4bf6450a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1119da47ee1c7f530da7d6960… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 2 18:42:09 2015 +0200 kernel32: Do not omit mandatory argument for VirtualProtect. --- dlls/kernel32/except.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index bd50e88..2a7dbaa 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -401,6 +401,7 @@ static BOOL start_debugger_atomic(PEXCEPTION_POINTERS epointers) */ static inline BOOL check_resource_write( void *addr ) { + DWORD old_prot; void *rsrc; DWORD size; MEMORY_BASIC_INFORMATION info; @@ -412,7 +413,7 @@ static inline BOOL check_resource_write( void *addr ) return FALSE; if (addr < rsrc || (char *)addr >= (char *)rsrc + size) return FALSE; TRACE( "Broken app is writing to the resource data, enabling work-around\n" ); - VirtualProtect( rsrc, size, PAGE_READWRITE, NULL ); + VirtualProtect( rsrc, size, PAGE_READWRITE, &old_prot ); return TRUE; }

1 0

Sebastian Lackner : kernel32/tests: Add tests for calling VirtualProtect with NULL as last argument.
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: 152b575eed7566cba9575891dad9c07706a3f353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=152b575eed7566cba9575891d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 2 18:37:26 2015 +0200 kernel32/tests: Add tests for calling VirtualProtect with NULL as last argument. --- dlls/kernel32/tests/virtual.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 75e91d5..2dea156 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -47,6 +47,7 @@ static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG, PVECTORED_EXCEPTION_HANDLER); static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID); static BOOL (WINAPI *pGetProcessDEPPolicy)(HANDLE, LPDWORD, PBOOL); +static NTSTATUS (WINAPI *pNtProtectVirtualMemory)(HANDLE, PVOID *, SIZE_T *, ULONG, ULONG *); /* ############################### */ @@ -2478,6 +2479,9 @@ static void test_VirtualProtect(void) DWORD ret, old_prot, rw_prot, exec_prot, i, j; MEMORY_BASIC_INFORMATION info; SYSTEM_INFO si; + void *addr; + SIZE_T size; + NTSTATUS status; GetSystemInfo(&si); trace("system page size %#x\n", si.dwPageSize); @@ -2486,6 +2490,31 @@ static void test_VirtualProtect(void) base = VirtualAlloc(0, si.dwPageSize, MEM_RESERVE | MEM_COMMIT, PAGE_NOACCESS); ok(base != NULL, "VirtualAlloc failed %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = VirtualProtect(base, si.dwPageSize, PAGE_READONLY, NULL); + todo_wine + ok(!ret, "VirtualProtect should fail\n"); + todo_wine + ok(GetLastError() == ERROR_NOACCESS, "expected ERROR_NOACCESS, got %d\n", GetLastError()); + old_prot = 0xdeadbeef; + ret = VirtualProtect(base, si.dwPageSize, PAGE_NOACCESS, &old_prot); + ok(ret, "VirtualProtect failed %d\n", GetLastError()); + todo_wine + ok(old_prot == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", old_prot); + + addr = base; + size = si.dwPageSize; + status = pNtProtectVirtualMemory(GetCurrentProcess(), &addr, &size, PAGE_READONLY, NULL); + todo_wine + ok(status == STATUS_ACCESS_VIOLATION, "NtProtectVirtualMemory should fail, got %08x\n", status); + addr = base; + size = si.dwPageSize; + old_prot = 0xdeadbeef; + status = pNtProtectVirtualMemory(GetCurrentProcess(), &addr, &size, PAGE_NOACCESS, &old_prot); + ok(status == STATUS_SUCCESS, "NtProtectVirtualMemory should succeed, got %08x\n", status); + todo_wine + ok(old_prot == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", old_prot); + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { SetLastError(0xdeadbeef); @@ -3477,6 +3506,7 @@ START_TEST(virtual) pNtCurrentTeb = (void *)GetProcAddress( hntdll, "NtCurrentTeb" ); pRtlAddVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlAddVectoredExceptionHandler" ); pRtlRemoveVectoredExceptionHandler = (void *)GetProcAddress( hntdll, "RtlRemoveVectoredExceptionHandler" ); + pNtProtectVirtualMemory = (void *)GetProcAddress( hntdll, "NtProtectVirtualMemory" ); test_shared_memory(FALSE); test_shared_memory_ro(FALSE, FILE_MAP_READ|FILE_MAP_WRITE);

1 0

Nikolay Sivov : explorer: Return IShellBrowser in response to SID_STopLevelBrowser.
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: eeabe96abb32bf8c33d85293b098afc391709783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeabe96abb32bf8c33d85293b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 30 13:07:45 2015 +0300 explorer: Return IShellBrowser in response to SID_STopLevelBrowser. --- dlls/shell32/tests/shelldispatch.c | 21 ++++- programs/explorer/desktop.c | 166 ++++++++++++++++++++++++++++++++++++- 2 files changed, 183 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 84d6246..ba246f1 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -575,12 +575,28 @@ if (hr == S_OK) { ok(hr == S_OK, "got 0x%08x\n", hr); hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IShellBrowser, (void**)&sb); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { + hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IShellBrowser, (void**)&sb2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(sb == sb2, "got %p, %p\n", sb, sb2); + + hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IOleWindow, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + IUnknown_Release(unk); + + hr = IServiceProvider_QueryService(sp, &SID_STopLevelBrowser, &IID_IExplorerBrowser, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IShellBrowser_QueryInterface(sb, &IID_IExplorerBrowser, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IShellBrowser_QueryInterface(sb, &IID_IWebBrowser2, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IShellBrowser_QueryInterface(sb, &IID_IDispatch, (void**)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + IShellBrowser_Release(sb2); IShellBrowser_Release(sb); @@ -596,7 +612,6 @@ if (hr == S_OK) { ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); IServiceProvider_Release(sp); -} IDispatch_Release(disp); } diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 4c7bcd4..03008f4 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -140,6 +140,7 @@ struct shellbrowserwindow { IWebBrowser2 IWebBrowser2_iface; IServiceProvider IServiceProvider_iface; + IShellBrowser IShellBrowser_iface; }; static struct shellwindows shellwindows; @@ -160,6 +161,11 @@ static inline struct shellbrowserwindow *impl_from_IServiceProvider(IServiceProv return CONTAINING_RECORD(iface, struct shellbrowserwindow, IServiceProvider_iface); } +static inline struct shellbrowserwindow *impl_from_IShellBrowser(IShellBrowser *iface) +{ + return CONTAINING_RECORD(iface, struct shellbrowserwindow, IShellBrowser_iface); +} + static void shellwindows_init(void); static void desktopshellbrowserwindow_init(void); @@ -1939,7 +1945,14 @@ static ULONG WINAPI serviceprovider_Release(IServiceProvider *iface) static HRESULT WINAPI serviceprovider_QueryService(IServiceProvider *iface, REFGUID service, REFIID riid, void **ppv) { - FIXME("%s %s %p\n", debugstr_guid(service), debugstr_guid(riid), ppv); + struct shellbrowserwindow *This = impl_from_IServiceProvider(iface); + + TRACE("%s %s %p\n", debugstr_guid(service), debugstr_guid(riid), ppv); + + if (IsEqualGUID(service, &SID_STopLevelBrowser)) + return IShellBrowser_QueryInterface(&This->IShellBrowser_iface, riid, ppv); + + WARN("unknown service id %s\n", debugstr_guid(service)); return E_NOTIMPL; } @@ -1951,10 +1964,161 @@ static const IServiceProviderVtbl serviceprovidervtbl = serviceprovider_QueryService }; +/* IShellBrowser */ +static HRESULT WINAPI shellbrowser_QueryInterface(IShellBrowser *iface, REFIID riid, void **ppv) +{ + TRACE("%s %p\n", debugstr_guid(riid), ppv); + + *ppv = NULL; + + if (IsEqualGUID(&IID_IShellBrowser, riid) || + IsEqualGUID(&IID_IOleWindow, riid) || + IsEqualGUID(&IID_IUnknown, riid)) + { + *ppv = iface; + } + + if (*ppv) + { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI shellbrowser_AddRef(IShellBrowser *iface) +{ + struct shellbrowserwindow *This = impl_from_IShellBrowser(iface); + return IWebBrowser2_AddRef(&This->IWebBrowser2_iface); +} + +static ULONG WINAPI shellbrowser_Release(IShellBrowser *iface) +{ + struct shellbrowserwindow *This = impl_from_IShellBrowser(iface); + return IWebBrowser2_Release(&This->IWebBrowser2_iface); +} + +static HRESULT WINAPI shellbrowser_GetWindow(IShellBrowser *iface, HWND *phwnd) +{ + FIXME("%p\n", phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_ContextSensitiveHelp(IShellBrowser *iface, BOOL mode) +{ + FIXME("%d\n", mode); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_InsertMenusSB(IShellBrowser *iface, HMENU hmenuShared, + OLEMENUGROUPWIDTHS *menuwidths) +{ + FIXME("%p %p\n", hmenuShared, menuwidths); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SetMenuSB(IShellBrowser *iface, HMENU hmenuShared, + HOLEMENU holemenuReserved, HWND hwndActiveObject) +{ + FIXME("%p %p %p\n", hmenuShared, holemenuReserved, hwndActiveObject); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_RemoveMenusSB(IShellBrowser *iface, HMENU hmenuShared) +{ + FIXME("%p\n", hmenuShared); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SetStatusTextSB(IShellBrowser *iface, LPCOLESTR text) +{ + FIXME("%s\n", debugstr_w(text)); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_EnableModelessSB(IShellBrowser *iface, BOOL enable) +{ + FIXME("%d\n", enable); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_TranslateAcceleratorSB(IShellBrowser *iface, MSG *pmsg, WORD wID) +{ + FIXME("%p 0x%x\n", pmsg, wID); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_BrowseObject(IShellBrowser *iface, LPCITEMIDLIST pidl, UINT flags) +{ + FIXME("%p %x\n", pidl, flags); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_GetViewStateStream(IShellBrowser *iface, DWORD mode, IStream **stream) +{ + FIXME("0x%x %p\n", mode, stream); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_GetControlWindow(IShellBrowser *iface, UINT id, HWND *phwnd) +{ + FIXME("%d %p\n", id, phwnd); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SendControlMsg(IShellBrowser *iface, UINT id, UINT uMsg, + WPARAM wParam, LPARAM lParam, LRESULT *pret) +{ + FIXME("%d %d %lx %lx %p\n", id, uMsg, wParam, lParam, pret); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_QueryActiveShellView(IShellBrowser *iface, IShellView **view) +{ + FIXME("%p\n", view); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_OnViewWindowActive(IShellBrowser *iface, IShellView *view) +{ + FIXME("%p\n", view); + return E_NOTIMPL; +} + +static HRESULT WINAPI shellbrowser_SetToolbarItems(IShellBrowser *iface, LPTBBUTTONSB buttons, + UINT count, UINT flags) +{ + FIXME("%p %d 0x%x\n", buttons, count, flags); + return E_NOTIMPL; +} + +static const IShellBrowserVtbl shellbrowservtbl = { + shellbrowser_QueryInterface, + shellbrowser_AddRef, + shellbrowser_Release, + shellbrowser_GetWindow, + shellbrowser_ContextSensitiveHelp, + shellbrowser_InsertMenusSB, + shellbrowser_SetMenuSB, + shellbrowser_RemoveMenusSB, + shellbrowser_SetStatusTextSB, + shellbrowser_EnableModelessSB, + shellbrowser_TranslateAcceleratorSB, + shellbrowser_BrowseObject, + shellbrowser_GetViewStateStream, + shellbrowser_GetControlWindow, + shellbrowser_SendControlMsg, + shellbrowser_QueryActiveShellView, + shellbrowser_OnViewWindowActive, + shellbrowser_SetToolbarItems +}; + static void desktopshellbrowserwindow_init(void) { desktopshellbrowserwindow.IWebBrowser2_iface.lpVtbl = &webbrowser2vtbl; desktopshellbrowserwindow.IServiceProvider_iface.lpVtbl = &serviceprovidervtbl; + desktopshellbrowserwindow.IShellBrowser_iface.lpVtbl = &shellbrowservtbl; } static void shellwindows_init(void)

1 0

Nikolay Sivov : explorer: Implement Application property.
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: 68c5fed5cc0b9e648f1a72074c13b15e0c87bed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c5fed5cc0b9e648f1a72074… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 30 09:19:38 2015 +0300 explorer: Implement Application property. --- dlls/shell32/tests/shelldispatch.c | 4 +--- programs/explorer/desktop.c | 9 +++++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 14e04c8..3d238f0 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -546,11 +546,9 @@ todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IWebBrowser2_get_Application(wb, &app); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(disp == app, "got %p, %p\n", app, disp); -} - if (hr == S_OK) IDispatch_Release(app); + IDispatch_Release(app); hr = IWebBrowser2_get_Document(wb, &doc); todo_wine diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index b83d772..62a07f4 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -1430,8 +1430,13 @@ static HRESULT WINAPI webbrowser_Stop(IWebBrowser2 *iface) static HRESULT WINAPI webbrowser_get_Application(IWebBrowser2 *iface, IDispatch **ppDisp) { struct shellbrowserwindow *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, ppDisp); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppDisp); + + *ppDisp = (IDispatch*)iface; + IDispatch_AddRef(*ppDisp); + + return S_OK; } static HRESULT WINAPI webbrowser_get_Parent(IWebBrowser2 *iface, IDispatch **ppDisp)

1 0

Francois Gouget : ole32: Fix some storage32 comments.
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: 58e47c612f54ee21b3c24c24e3575179c63a0c48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58e47c612f54ee21b3c24c24e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 2 23:51:22 2015 +0200 ole32: Fix some storage32 comments. --- dlls/ole32/storage32.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index e03bf31..f894582 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -363,9 +363,9 @@ void StorageBaseImpl_RemoveStream(StorageBaseImpl * stg, StgStreamImpl * strm) D #define BLOCKCHAIN_CACHE_SIZE 4 /**************************************************************************** - * Storage32Impl definitions. + * StorageImpl definitions. * - * This implementation of the IStorage32 interface represents a root + * This implementation of the IStorage interface represents a root * storage. Basically, a document file. */ struct StorageImpl

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless union.
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: cb16c706026a79ad65032923f67e3245313a1c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb16c706026a79ad65032923f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat May 2 13:06:28 2015 +0200 ddraw/tests: Fix compilation on systems that don't support nameless union. --- dlls/ddraw/tests/ddraw7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e151fb7..b8691b8 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3862,7 +3862,7 @@ static void test_specular_lighting(void) ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); memset(&material, 0, sizeof(material)); - U(U2(material).specular).r = 1.0f; + U1(U2(material).specular).r = 1.0f; U2(U2(material).specular).g = 1.0f; U3(U2(material).specular).b = 1.0f; U4(U2(material).specular).a = 1.0f;

1 0

Sebastian Lackner : winedevice: Do not omit mandatory argument for VirtualProtect.
by Alexandre Julliard May 4, 2015

May 4, 2015

Module: wine Branch: master Commit: c16f0644beab693f77a589053e1a92b4e0f7adb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c16f0644beab693f77a589053… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat May 2 18:43:34 2015 +0200 winedevice: Do not omit mandatory argument for VirtualProtect. --- programs/winedevice/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c index 9677a82..ef1e1ef 100644 --- a/programs/winedevice/device.c +++ b/programs/winedevice/device.c @@ -98,14 +98,14 @@ static HMODULE load_driver_module( const WCHAR *name ) VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta ); - if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, NULL ); + if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, &old ); if (!rel) goto error; } /* make sure we don't try again */ size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; VirtualProtect( nt, size, PAGE_READWRITE, &old ); nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = 0; - VirtualProtect( nt, size, old, NULL ); + VirtualProtect( nt, size, old, &old ); } }

1 0