April 2012 - Wine-Commits - list.winehq.org

Hans Leidekker : msi: Remove an unneeded assignment.
by Alexandre Julliard April 20, 2012

April 20, 2012

Module: wine Branch: master Commit: a7137ef0357dba1611f7da11a3f4672ac0c1364f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7137ef0357dba1611f7da11a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 20 10:56:46 2012 +0200 msi: Remove an unneeded assignment. --- dlls/msi/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 31e7b4f..4143a79 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -2363,7 +2363,7 @@ static UINT fetch_user_product( const WCHAR *match, const WCHAR *usersid, DWORD } strcpyW( path, user ); strcatW( path, subkey ); - if ((r = RegOpenKeyExW( key_users, path, 0, access, &key_products ))) + if (RegOpenKeyExW( key_users, path, 0, access, &key_products )) { i++; len_user = sizeof(user)/sizeof(user[0]);

1 0

Hans Leidekker : msi/tests: Fix some leaks.
by Alexandre Julliard April 20, 2012

April 20, 2012

Module: wine Branch: master Commit: 2b9be70975729b402d608a5986f8756cf16d717a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9be70975729b402d608a598… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 20 10:56:27 2012 +0200 msi/tests: Fix some leaks. --- dlls/msi/tests/msi.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 67b7e52..c0ca658 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -11819,7 +11819,7 @@ static void test_MsiEnumProductsEx(void) char product0[39], product1[39], product2[39], product3[39], guid[39], sid[128]; char product_squashed1[33], product_squashed2[33], product_squashed3[33]; char keypath1[MAX_PATH], keypath2[MAX_PATH], keypath3[MAX_PATH]; - HKEY key1, key2, key3; + HKEY key1 = NULL, key2 = NULL, key3 = NULL; REGSAM access = KEY_ALL_ACCESS; char *usersid = get_user_sid(); @@ -11837,8 +11837,7 @@ static void test_MsiEnumProductsEx(void) if (r == ERROR_ACCESS_DENIED) { skip( "insufficient rights\n" ); - LocalFree( usersid ); - return; + goto done; } ok( r == ERROR_SUCCESS, "got %u\n", r ); @@ -11919,8 +11918,7 @@ static void test_MsiEnumProductsEx(void) if (r == ERROR_ACCESS_DENIED) { skip( "insufficient rights\n" ); - LocalFree( usersid ); - return; + goto done; } ok( r == ERROR_SUCCESS, "got %u\n", r ); ok( guid[0], "empty guid\n" ); @@ -11960,6 +11958,7 @@ static void test_MsiEnumProductsEx(void) len = sizeof(sid); } +done: delete_key( key1, "", access ); delete_key( key2, "", access ); delete_key( key3, "", access );

1 0

André Hentschel : winedbg: Add "load address" and new nops to the Thumb disassembler.
by Alexandre Julliard April 20, 2012

April 20, 2012

Module: wine Branch: master Commit: 474791fd89b5dff791d238958141d3e94e53e0f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=474791fd89b5dff791d238958… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 19 23:05:04 2012 +0200 winedbg: Add "load address" and new nops to the Thumb disassembler. --- programs/winedbg/be_arm.c | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index db7931d..92d4094 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -332,6 +332,12 @@ static WORD thumb_disasm_hireg(WORD inst, ADDRESS64 *addr) if (h1) dst += 8; if (h2) src += 8; + if (op == 2 && dst == src) /* mov rx, rx */ + { + dbg_printf("\n\tnop"); + return 0; + } + if (op == 3) dbg_printf("\n\tb%sx\t%s", h1?"l":"", tbl_regs[src]); else @@ -398,6 +404,15 @@ static WORD thumb_disasm_condbranch(WORD inst, ADDRESS64 *addr) return 0; } +static WORD thumb_disasm_loadadr(WORD inst, ADDRESS64 *addr) +{ + WORD src = (inst >> 11) & 0x01; + WORD offset = (inst & 0xff) << 2; + + dbg_printf("\n\tadd\t%s, %s, #%d", tbl_regs[(inst >> 8) & 0x07], src ? "sp" : "pc", offset); + return 0; +} + static WORD thumb_disasm_swi(WORD inst, ADDRESS64 *addr) { WORD comment = inst & 0x00ff; @@ -506,6 +521,7 @@ static const struct inst_thumb16 tbl_thumb16[] = { { 0xf600, 0xb400, thumb_disasm_blocktrans }, { 0xf800, 0xf000, thumb_disasm_longbl }, { 0xf000, 0xd000, thumb_disasm_condbranch }, + { 0xf000, 0xa000, thumb_disasm_loadadr }, { 0xf800, 0x4800, thumb_disasm_ldrpcrel }, { 0xf000, 0x9000, thumb_disasm_ldrsprel }, { 0xff00, 0xb000, thumb_disasm_addsprel }, @@ -514,7 +530,7 @@ static const struct inst_thumb16 tbl_thumb16[] = { { 0xf000, 0xd000, thumb_disasm_condbranch }, { 0xff00, 0xdf00, thumb_disasm_swi }, { 0xff00, 0xbf00, thumb_disasm_nop }, - { 0xfc00, 0x1c00, thumb_disasm_addsub }, + { 0xf800, 0x1800, thumb_disasm_addsub }, { 0xe000, 0x0000, thumb_disasm_movshift }, { 0x0000, 0x0000, NULL } }; @@ -538,7 +554,7 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) DWORD_PTR* pval; if (!memory_get_register(CV_ARM_CPSR, &pval, tmp, sizeof(tmp))) - dbg_printf("\n\tmemory_get_register failed: %s\n",tmp); + dbg_printf("\n\tmemory_get_register failed: %s", tmp); else db_disasm_thumb=(*pval & 0x20)?TRUE:FALSE; @@ -559,17 +575,14 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) } if (!matched) { - dbg_printf("\n\tUnknown Instruction: %08x\n", inst); + dbg_printf("\n\tUnknown Instruction: %08x", inst); addr->Offset += size; return; } else { if (!a_ptr->func(inst)) - { - dbg_printf("\n"); addr->Offset += size; - } return; } } @@ -585,17 +598,14 @@ void be_arm_disasm_one_insn(ADDRESS64 *addr, int display) } if (!matched) { - dbg_printf("\n\tUnknown Instruction: %08x\n", tinst); + dbg_printf("\n\tUnknown Instruction: %04x", tinst); addr->Offset += size; return; } else { if (!t_ptr->func(tinst, addr)) - { - dbg_printf("\n"); addr->Offset += size; - } } return; }

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DSwapChain8Impl_GetBackBuffer ().
by Alexandre Julliard April 20, 2012

April 20, 2012

Module: wine Branch: master Commit: 532d2246928d1fe17b55989a0e21eeea5e58aa84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=532d2246928d1fe17b55989a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 19 20:44:56 2012 +0200 d3d8: Properly retrieve an interface pointer in IDirect3DSwapChain8Impl_GetBackBuffer(). --- dlls/d3d8/swapchain.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 8979519..9d2da09 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -110,6 +110,7 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(IDirect3DSwapChain8 { IDirect3DSwapChain8Impl *This = impl_from_IDirect3DSwapChain8(iface); struct wined3d_surface *wined3d_surface = NULL; + IDirect3DSurface8Impl *surface_impl; HRESULT hr; TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", @@ -120,7 +121,8 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(IDirect3DSwapChain8 iBackBuffer, (enum wined3d_backbuffer_type)Type, &wined3d_surface); if (SUCCEEDED(hr) && wined3d_surface) { - *ppBackBuffer = wined3d_surface_get_parent(wined3d_surface); + surface_impl = wined3d_surface_get_parent(wined3d_surface); + *ppBackBuffer = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*ppBackBuffer); wined3d_surface_decref(wined3d_surface); }

1 0

Jacek Caban : jscript: Added regexp 'pre-parser' to support non-backslash-sequenced non-terminating '/' in characted classes.
by Alexandre Julliard April 20, 2012

April 20, 2012

Module: wine Branch: master Commit: 4733fd062391a2d975771df53cdda058141dbc80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4733fd062391a2d975771df53… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 20 11:08:08 2012 +0200 jscript: Added regexp 'pre-parser' to support non-backslash-sequenced non-terminating '/' in characted classes. --- dlls/jscript/lex.c | 26 +++++++++++++++++++++----- dlls/jscript/tests/regexp.js | 6 ++++++ 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 42e482f..6842b58 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -957,6 +957,7 @@ int parser_lex(void *lval, parser_ctx_t *ctx) literal_t *parse_regexp(parser_ctx_t *ctx) { const WCHAR *re, *flags_ptr; + BOOL in_class = FALSE; DWORD re_len, flags; literal_t *ret; HRESULT hres; @@ -965,14 +966,29 @@ literal_t *parse_regexp(parser_ctx_t *ctx) while(*--ctx->ptr != '/'); + /* Simple regexp pre-parser; '/' if used in char class does not terminate regexp literal */ re = ++ctx->ptr; - while(ctx->ptr < ctx->end && *ctx->ptr != '/') { - if(*ctx->ptr++ == '\\' && ctx->ptr < ctx->end) - ctx->ptr++; + while(ctx->ptr < ctx->end) { + if(*ctx->ptr == '\\') { + if(++ctx->ptr == ctx->end) + break; + }else if(in_class) { + if(*ctx->ptr == '\n') + break; + if(*ctx->ptr == ']') + in_class = FALSE; + }else { + if(*ctx->ptr == '/') + break; + + if(*ctx->ptr == '[') + in_class = TRUE; + } + ctx->ptr++; } - if(ctx->ptr == ctx->end) { - WARN("unexpected end of file\n"); + if(ctx->ptr == ctx->end || *ctx->ptr != '/') { + WARN("pre-parsing failed\n"); return NULL; } diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index d553bb6..7b363dd 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -592,4 +592,10 @@ ok(tmp === "xxx", '"xxx".replace(/^\s*|\s*$/g, "y") = ' + tmp); tmp = "xxx".replace(/^\s*|\s*$/g, "y"); ok(tmp === "yxxxy", '"xxx".replace(/^\s*|\s*$/g, "y") = ' + tmp); +tmp = "x/y".replace(/[/]/, "*"); +ok(tmp === "x*y", '"x/y".replace(/[/]/, "*") = ' + tmp); + +tmp = "x/y".replace(/[xy/]/g, "*"); +ok(tmp === "***", '"x/y".replace(/[xy/]/, "*") = ' + tmp); + reportSuccess();

1 0

Henri Verbeet : dxgi: COM cleanup for the surface IUnknown interface.
by Alexandre Julliard April 20, 2012

April 20, 2012

Module: wine Branch: master Commit: 5d358a2bac82229a7c9bafa3381b252d9506da7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d358a2bac82229a7c9bafa33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 19 20:44:59 2012 +0200 dxgi: COM cleanup for the surface IUnknown interface. --- dlls/dxgi/device.c | 2 +- dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/surface.c | 36 ++++++++++++++++++------------------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index bc01b16..3115032 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -284,7 +284,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa } TRACE("Created IDXGISurface %p\n", object); - *surface = outer ? (void *)&object->inner_unknown_vtbl : object; + *surface = outer ? &object->IUnknown_iface : (IUnknown *)&object->IDXGISurface_iface; return S_OK; } diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 533f1fa..4c426ba 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -136,7 +136,7 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device struct dxgi_surface { IDXGISurface IDXGISurface_iface; - const struct IUnknownVtbl *inner_unknown_vtbl; + IUnknown IUnknown_iface; IUnknown *outer_unknown; LONG refcount; IDXGIDevice *device; diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 374832b..f7fa931 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -26,54 +26,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); /* Inner IUnknown methods */ -static inline struct dxgi_surface *dxgi_surface_from_inner_unknown(IUnknown *iface) +static inline struct dxgi_surface *impl_from_IUnknown(IUnknown *iface) { - return (struct dxgi_surface *)((char*)iface - FIELD_OFFSET(struct dxgi_surface, inner_unknown_vtbl)); + return CONTAINING_RECORD(iface, struct dxgi_surface, IUnknown_iface); } -static HRESULT STDMETHODCALLTYPE dxgi_surface_inner_QueryInterface(IUnknown *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE dxgi_surface_inner_QueryInterface(IUnknown *iface, REFIID riid, void **out) { - struct dxgi_surface *This = dxgi_surface_from_inner_unknown(iface); + struct dxgi_surface *surface = impl_from_IUnknown(iface); - TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); if (IsEqualGUID(riid, &IID_IDXGISurface) || IsEqualGUID(riid, &IID_IDXGIDeviceSubObject) || IsEqualGUID(riid, &IID_IDXGIObject) || IsEqualGUID(riid, &IID_IUnknown)) { - IDXGISurface_AddRef(&This->IDXGISurface_iface); - *object = &This->IDXGISurface_iface; + IDXGISurface_AddRef(&surface->IDXGISurface_iface); + *out = &surface->IDXGISurface_iface; return S_OK; } WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); - *object = NULL; + *out = NULL; return E_NOINTERFACE; } static ULONG STDMETHODCALLTYPE dxgi_surface_inner_AddRef(IUnknown *iface) { - struct dxgi_surface *This = dxgi_surface_from_inner_unknown(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct dxgi_surface *surface = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&surface->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", surface, refcount); return refcount; } static ULONG STDMETHODCALLTYPE dxgi_surface_inner_Release(IUnknown *iface) { - struct dxgi_surface *This = dxgi_surface_from_inner_unknown(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct dxgi_surface *surface = impl_from_IUnknown(iface); + ULONG refcount = InterlockedDecrement(&surface->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", surface, refcount); if (!refcount) { - IDXGIDevice_Release(This->device); - HeapFree(GetProcessHeap(), 0, This); + IDXGIDevice_Release(surface->device); + HeapFree(GetProcessHeap(), 0, surface); } return refcount; @@ -206,9 +206,9 @@ static const struct IUnknownVtbl dxgi_surface_inner_unknown_vtbl = HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUnknown *outer) { surface->IDXGISurface_iface.lpVtbl = &dxgi_surface_vtbl; - surface->inner_unknown_vtbl = &dxgi_surface_inner_unknown_vtbl; + surface->IUnknown_iface.lpVtbl = &dxgi_surface_inner_unknown_vtbl; surface->refcount = 1; - surface->outer_unknown = outer ? outer : (IUnknown *)&surface->inner_unknown_vtbl; + surface->outer_unknown = outer ? outer : &surface->IUnknown_iface; surface->device = device; IDXGIDevice_AddRef(device);

1 0

Piotr Caban : jscript: Added Number.toPrecision implementation.
by Alexandre Julliard April 19, 2012

April 19, 2012

1 0

Dmitry Timoshkov : kernel32: Add more memory access checks.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: d4d39736ceab567ecc7e9bdb077efad46ce3e5c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d39736ceab567ecc7e9bdb0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 17 17:14:46 2012 +0900 kernel32: Add more memory access checks. --- dlls/kernel32/tests/virtual.c | 96 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 89 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index b537ce0..73a5206 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -792,8 +792,25 @@ static void test_MapViewOfFile(void) SetLastError(0xdeadbeef); map2 = OpenFileMappingA(FILE_MAP_READ, FALSE, name); ok( map2 != 0, "OpenFileMappingA failed with error %d\n", GetLastError() ); - CloseHandle(map2); - CloseHandle(mapping); + SetLastError(0xdeadbeef); + ret = CloseHandle(map2); + ok(ret, "CloseHandle error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CloseHandle(mapping); + ok(ret, "CloseHandle error %d\n", GetLastError()); + + ret = IsBadReadPtr(ptr, MAPPING_SIZE); + ok( !ret, "memory is not accessible\n" ); + + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "got %p != expected %p\n", info.BaseAddress, ptr); + ok(info.RegionSize == MAPPING_SIZE, "got %#lx != expected %#x\n", info.RegionSize, MAPPING_SIZE); + ok(info.Protect == PAGE_READWRITE, "got %#x != expected PAGE_READWRITE\n", info.Protect); + ok(info.AllocationBase == ptr, "%p != %p\n", info.AllocationBase, ptr); + ok(info.AllocationProtect == PAGE_READWRITE, "%#x != PAGE_READWRITE\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == MEM_MAPPED, "%#x != MEM_MAPPED\n", info.Type); SetLastError(0xdeadbeef); map2 = OpenFileMappingA(FILE_MAP_READ, FALSE, name); @@ -801,22 +818,46 @@ static void test_MapViewOfFile(void) ok( map2 == 0, "OpenFileMappingA succeeded\n" ); todo_wine ok( GetLastError() == ERROR_FILE_NOT_FOUND, "OpenFileMappingA set error %d\n", GetLastError() ); - CloseHandle(map2); + if (map2) CloseHandle(map2); /* FIXME: remove once Wine is fixed */ SetLastError(0xdeadbeef); mapping = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, MAPPING_SIZE, name); ok( mapping != 0, "CreateFileMappingA failed\n" ); todo_wine ok( GetLastError() == ERROR_SUCCESS, "CreateFileMappingA set error %d\n", GetLastError() ); - CloseHandle(mapping); + SetLastError(0xdeadbeef); + ret = CloseHandle(mapping); + ok(ret, "CloseHandle error %d\n", GetLastError()); ret = IsBadReadPtr(ptr, MAPPING_SIZE); ok( !ret, "memory is not accessible\n" ); + + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "got %p != expected %p\n", info.BaseAddress, ptr); + ok(info.RegionSize == MAPPING_SIZE, "got %#lx != expected %#x\n", info.RegionSize, MAPPING_SIZE); + ok(info.Protect == PAGE_READWRITE, "got %#x != expected PAGE_READWRITE\n", info.Protect); + ok(info.AllocationBase == ptr, "%p != %p\n", info.AllocationBase, ptr); + ok(info.AllocationProtect == PAGE_READWRITE, "%#x != PAGE_READWRITE\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == MEM_MAPPED, "%#x != MEM_MAPPED\n", info.Type); + SetLastError(0xdeadbeef); ret = UnmapViewOfFile(ptr); ok( ret, "UnmapViewOfFile failed with error %d\n", GetLastError() ); + ret = IsBadReadPtr(ptr, MAPPING_SIZE); ok( ret, "memory is accessible\n" ); + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "got %p != expected %p\n", info.BaseAddress, ptr); + ok(info.RegionSize != MAPPING_SIZE, "got size %#lx\n", info.RegionSize); + ok(info.Protect == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", info.Protect); + ok(info.AllocationBase == NULL, "%p != NULL\n", info.AllocationBase); + ok(info.AllocationProtect == 0, "%#x != 0\n", info.AllocationProtect); + ok(info.State == MEM_FREE, "%#x != MEM_FREE\n", info.State); + ok(info.Type == 0, "%#x != 0\n", info.Type); + SetLastError(0xdeadbeef); file = CreateFileA(testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); @@ -832,8 +873,25 @@ static void test_MapViewOfFile(void) SetLastError(0xdeadbeef); map2 = OpenFileMappingA(FILE_MAP_READ, FALSE, name); ok( map2 != 0, "OpenFileMappingA failed with error %d\n", GetLastError() ); - CloseHandle(map2); - CloseHandle(mapping); + SetLastError(0xdeadbeef); + ret = CloseHandle(map2); + ok(ret, "CloseHandle error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = CloseHandle(mapping); + ok(ret, "CloseHandle error %d\n", GetLastError()); + + ret = IsBadReadPtr(ptr, MAPPING_SIZE); + ok( !ret, "memory is not accessible\n" ); + + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "got %p != expected %p\n", info.BaseAddress, ptr); + ok(info.RegionSize == MAPPING_SIZE, "got %#lx != expected %#x\n", info.RegionSize, MAPPING_SIZE); + ok(info.Protect == PAGE_READWRITE, "got %#x != expected PAGE_READWRITE\n", info.Protect); + ok(info.AllocationBase == ptr, "%p != %p\n", info.AllocationBase, ptr); + ok(info.AllocationProtect == PAGE_READWRITE, "%#x != PAGE_READWRITE\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == MEM_MAPPED, "%#x != MEM_MAPPED\n", info.Type); SetLastError(0xdeadbeef); map2 = OpenFileMappingA(FILE_MAP_READ, FALSE, name); @@ -847,16 +905,40 @@ static void test_MapViewOfFile(void) ok( mapping != 0, "CreateFileMappingA failed\n" ); todo_wine ok( GetLastError() == ERROR_SUCCESS, "CreateFileMappingA set error %d\n", GetLastError() ); - CloseHandle(mapping); + SetLastError(0xdeadbeef); + ret = CloseHandle(mapping); + ok(ret, "CloseHandle error %d\n", GetLastError()); ret = IsBadReadPtr(ptr, MAPPING_SIZE); ok( !ret, "memory is not accessible\n" ); + + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "got %p != expected %p\n", info.BaseAddress, ptr); + ok(info.RegionSize == MAPPING_SIZE, "got %#lx != expected %#x\n", info.RegionSize, MAPPING_SIZE); + ok(info.Protect == PAGE_READWRITE, "got %#x != expected PAGE_READWRITE\n", info.Protect); + ok(info.AllocationBase == ptr, "%p != %p\n", info.AllocationBase, ptr); + ok(info.AllocationProtect == PAGE_READWRITE, "%#x != PAGE_READWRITE\n", info.AllocationProtect); + ok(info.State == MEM_COMMIT, "%#x != MEM_COMMIT\n", info.State); + ok(info.Type == MEM_MAPPED, "%#x != MEM_MAPPED\n", info.Type); + SetLastError(0xdeadbeef); ret = UnmapViewOfFile(ptr); ok( ret, "UnmapViewOfFile failed with error %d\n", GetLastError() ); + ret = IsBadReadPtr(ptr, MAPPING_SIZE); ok( ret, "memory is accessible\n" ); + ret = VirtualQuery(ptr, &info, sizeof(info)); + ok(ret, "VirtualQuery error %d\n", GetLastError()); + ok(info.BaseAddress == ptr, "got %p != expected %p\n", info.BaseAddress, ptr); + ok(info.RegionSize != MAPPING_SIZE, "got size %#lx\n", info.RegionSize); + ok(info.Protect == PAGE_NOACCESS, "got %#x != expected PAGE_NOACCESS\n", info.Protect); + ok(info.AllocationBase == NULL, "%p != NULL\n", info.AllocationBase); + ok(info.AllocationProtect == 0, "%#x != 0\n", info.AllocationProtect); + ok(info.State == MEM_FREE, "%#x != MEM_FREE\n", info.State); + ok(info.Type == 0, "%#x != 0\n", info.Type); + CloseHandle(file); DeleteFileA(testfile); }

1 0

Detlef Riekenberg : browseui/tests: Add tests for IProgressDialog.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 518e05cb337324b032cc0b6845f42d33ebc4613f URL: http://source.winehq.org/git/wine.git/?a=commit;h=518e05cb337324b032cc0b684… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 16 23:16:18 2012 +0200 browseui/tests: Add tests for IProgressDialog. --- dlls/browseui/tests/Makefile.in | 3 +- dlls/browseui/tests/progressdlg.c | 72 +++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletions(-) diff --git a/dlls/browseui/tests/Makefile.in b/dlls/browseui/tests/Makefile.in index 0cb3541..c3bc768 100644 --- a/dlls/browseui/tests/Makefile.in +++ b/dlls/browseui/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = browseui.dll IMPORTS = ole32 C_SRCS = \ - autocomplete.c + autocomplete.c \ + progressdlg.c @MAKE_TEST_RULES@ diff --git a/dlls/browseui/tests/progressdlg.c b/dlls/browseui/tests/progressdlg.c new file mode 100644 index 0000000..e4d0e2f --- /dev/null +++ b/dlls/browseui/tests/progressdlg.c @@ -0,0 +1,72 @@ +/* Unit tests for progressdialog object + * + * Copyright 2012 Detlef Riekenberg + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdarg.h> +#include <shlobj.h> + +#include "wine/test.h" + + +static void test_IProgressDialog_QueryInterface(void) +{ + IProgressDialog *dlg; + IProgressDialog *dlg2; + IOleWindow *olewindow; + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ProgressDialog, NULL, CLSCTX_INPROC_SERVER, &IID_IProgressDialog, (void*)&dlg); + if (FAILED(hr)) { + win_skip("CoCreateInstance for IProgressDialog returned 0x%x\n", hr); + return; + } + + hr = IUnknown_QueryInterface(dlg, &IID_IUnknown, NULL); + ok(hr == E_POINTER, "got 0x%x (expected E_POINTER)\n", hr); + + hr = IUnknown_QueryInterface(dlg, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface (IUnknown) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IUnknown_Release(unk); + } + + hr = IUnknown_QueryInterface(dlg, &IID_IOleWindow, (void**)&olewindow); + ok(hr == S_OK, "QueryInterface (IOleWindow) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + hr = IUnknown_QueryInterface(olewindow, &IID_IProgressDialog, (void**)&dlg2); + ok(hr == S_OK, "QueryInterface (IProgressDialog) returned 0x%x\n", hr); + if (SUCCEEDED(hr)) { + IProgressDialog_Release(dlg2); + } + IOleWindow_Release(olewindow); + } + IProgressDialog_Release(dlg); +} + + +START_TEST(progressdlg) +{ + CoInitialize(NULL); + + test_IProgressDialog_QueryInterface(); + + CoUninitialize(); +}

1 0

Detlef Riekenberg : browseui: Add IOleWindow to IProgressDialog.
by Alexandre Julliard April 19, 2012

April 19, 2012

Module: wine Branch: master Commit: 744acc1ddd8119560ff97e9c68ffda3e10ca2ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=744acc1ddd8119560ff97e9c6… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Apr 16 23:16:17 2012 +0200 browseui: Add IOleWindow to IProgressDialog. --- dlls/browseui/progressdlg.c | 66 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 9b970e2..5526854 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -60,6 +60,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui); typedef struct tagProgressDialog { IProgressDialog IProgressDialog_iface; + IOleWindow IOleWindow_iface; LONG refCount; CRITICAL_SECTION cs; HWND hwnd; @@ -79,6 +80,11 @@ static inline ProgressDialog *impl_from_IProgressDialog(IProgressDialog *iface) return CONTAINING_RECORD(iface, ProgressDialog, IProgressDialog_iface); } +static inline ProgressDialog *impl_from_IOleWindow(IOleWindow *iface) +{ + return CONTAINING_RECORD(iface, ProgressDialog, IOleWindow_iface); +} + static void set_buffer(LPWSTR *buffer, LPCWSTR string) { static const WCHAR empty_string[] = {0}; @@ -268,11 +274,19 @@ static void ProgressDialog_Destructor(ProgressDialog *This) static HRESULT WINAPI ProgressDialog_QueryInterface(IProgressDialog *iface, REFIID iid, LPVOID *ppvOut) { ProgressDialog *This = impl_from_IProgressDialog(iface); - *ppvOut = NULL; + TRACE("(%p, %s, %p)\n", iface, debugstr_guid(iid), ppvOut); + if (!ppvOut) + return E_POINTER; + + *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IProgressDialog)) { - *ppvOut = This; + *ppvOut = iface; + } + else if (IsEqualIID(iid, &IID_IOleWindow)) + { + *ppvOut = &This->IOleWindow_iface; } if (*ppvOut) @@ -495,6 +509,53 @@ static const IProgressDialogVtbl ProgressDialogVtbl = ProgressDialog_Timer }; +static HRESULT WINAPI OleWindow_QueryInterface(IOleWindow *iface, REFIID iid, LPVOID *ppvOut) +{ + ProgressDialog *This = impl_from_IOleWindow(iface); + return ProgressDialog_QueryInterface(&This->IProgressDialog_iface, iid, ppvOut); +} + +static ULONG WINAPI OleWindow_AddRef(IOleWindow *iface) +{ + ProgressDialog *This = impl_from_IOleWindow(iface); + return ProgressDialog_AddRef(&This->IProgressDialog_iface); +} + +static ULONG WINAPI OleWindow_Release(IOleWindow *iface) +{ + ProgressDialog *This = impl_from_IOleWindow(iface); + return ProgressDialog_Release(&This->IProgressDialog_iface); +} + +static HRESULT WINAPI OleWindow_GetWindow(IOleWindow* iface, HWND* phwnd) +{ + ProgressDialog *This = impl_from_IOleWindow(iface); + + TRACE("(%p, %p)\n", This, phwnd); + EnterCriticalSection(&This->cs); + *phwnd = This->hwnd; + LeaveCriticalSection(&This->cs); + return S_OK; +} + +static HRESULT WINAPI OleWindow_ContextSensitiveHelp(IOleWindow* iface, BOOL fEnterMode) +{ + ProgressDialog *This = impl_from_IOleWindow(iface); + + FIXME("(%p, %d): stub\n", This, fEnterMode); + return E_NOTIMPL; +} + +static const IOleWindowVtbl OleWindowVtbl = +{ + OleWindow_QueryInterface, + OleWindow_AddRef, + OleWindow_Release, + OleWindow_GetWindow, + OleWindow_ContextSensitiveHelp +}; + + HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ProgressDialog *This; @@ -506,6 +567,7 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) return E_OUTOFMEMORY; This->IProgressDialog_iface.lpVtbl = &ProgressDialogVtbl; + This->IOleWindow_iface.lpVtbl = &OleWindowVtbl; This->refCount = 1; InitializeCriticalSection(&This->cs); This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ProgressDialog.cs");

1 0