wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

André Hentschel : winedbg: Add "load address" and new nops to the Thumb disassembler.
by Alexandre Julliard 20 Apr '12

20 Apr '12

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 : ddraw/tests: Add a helper function to set the viewport background material.
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: e744bf78c85d083771f2f42269c7069d756f5280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e744bf78c85d083771f2f4226… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 19 20:45:00 2012 +0200 ddraw/tests: Add a helper function to set the viewport background material. --- dlls/ddraw/tests/ddraw1.c | 40 +++++++++++++++----------------------- dlls/ddraw/tests/ddraw2.c | 47 ++++++++++++++++---------------------------- 2 files changed, 33 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e744bf78c85d083771f2f…

1 0

Henri Verbeet : dxgi: COM cleanup for the surface IUnknown interface.
by Alexandre Julliard 20 Apr '12

20 Apr '12

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

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DDevice8Impl_GetBackBuffer ().
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 230c5fc7f9c94fd31d4aab2e79e83457ceefcd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=230c5fc7f9c94fd31d4aab2e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 19 20:44:58 2012 +0200 d3d8: Properly retrieve an interface pointer in IDirect3DDevice8Impl_GetBackBuffer(). --- dlls/d3d8/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 36296d2..0a0e35d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -619,6 +619,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetBackBuffer(IDirect3DDevice8 *iface { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); struct wined3d_surface *wined3d_surface = NULL; + IDirect3DSurface8Impl *surface_impl; HRESULT hr; TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", @@ -629,7 +630,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetBackBuffer(IDirect3DDevice8 *iface BackBuffer, (enum wined3d_backbuffer_type)Type, &wined3d_surface); if (SUCCEEDED(hr) && wined3d_surface && ppBackBuffer) { - *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

Henri Verbeet : d3d8: Use the surface implementation pointer in reset_enum_callback().
by Alexandre Julliard 20 Apr '12

20 Apr '12

Module: wine Branch: master Commit: 5cc7d0645b71cb6cb1656ad8df70946674a50b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc7d0645b71cb6cb1656ad8d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 19 20:44:57 2012 +0200 d3d8: Use the surface implementation pointer in reset_enum_callback(). --- dlls/d3d8/device.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ea2ce17..36296d2 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -535,7 +535,7 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) wined3d_resource_get_desc(resource, &desc); if (desc.pool == WINED3D_POOL_DEFAULT) { - IDirect3DSurface8 *surface; + IDirect3DSurface8Impl *surface; if (desc.resource_type != WINED3D_RTYPE_SURFACE) { @@ -544,9 +544,7 @@ static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource) } surface = wined3d_resource_get_parent(resource); - - IDirect3DSurface8_AddRef(surface); - if (IDirect3DSurface8_Release(surface)) + if (surface->ref) { WARN("Surface %p (resource %p) in pool D3DPOOL_DEFAULT blocks the Reset call.\n", surface, resource); return D3DERR_DEVICELOST;

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in IDirect3DSwapChain8Impl_GetBackBuffer ().
by Alexandre Julliard 20 Apr '12

20 Apr '12

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

Huw Davies : winspool: Simplify the code that checks for deleted printers and have it not call OpenPrinter unless it finds a printer that needs deletion .
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: bd3a941b2059364b0e495f427c37dba1ced4e626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3a941b2059364b0e495f427… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 19 13:43:25 2012 +0100 winspool: Simplify the code that checks for deleted printers and have it not call OpenPrinter unless it finds a printer that needs deletion. --- dlls/winspool.drv/info.c | 105 ++++++++++++++++++++++------------------------ 1 files changed, 50 insertions(+), 55 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 1e5aabc..a2e3f8b 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1022,10 +1022,56 @@ static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey) return open_printer_reg_key( name, phkey ); } +static void old_printer_check( BOOL delete_phase ) +{ + PRINTER_INFO_5W* pi; + DWORD needed, type, num, delete, i, size; + const DWORD one = 1; + HKEY key; + HANDLE hprn; + + EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num ); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return; + + pi = HeapAlloc( GetProcessHeap(), 0, needed ); + EnumPrintersW( PRINTER_ENUM_LOCAL, NULL, 5, (LPBYTE)pi, needed, &needed, &num ); + for (i = 0; i < num; i++) + { + if (strncmpW( pi[i].pPortName, CUPS_Port, strlenW(CUPS_Port) ) && + strncmpW( pi[i].pPortName, LPR_Port, strlenW(LPR_Port) )) + continue; + + if (open_printer_reg_key( pi[i].pPrinterName, &key )) continue; + + if (!delete_phase) + { + RegSetValueExW( key, May_Delete_Value, 0, REG_DWORD, (LPBYTE)&one, sizeof(one) ); + RegCloseKey( key ); + } + else + { + delete = 0; + size = sizeof( delete ); + RegQueryValueExW( key, May_Delete_Value, NULL, &type, (LPBYTE)&delete, &size ); + RegCloseKey( key ); + if (delete) + { + TRACE( "Deleting old printer %s\n", debugstr_w(pi[i].pPrinterName) ); + if (OpenPrinterW( pi[i].pPrinterName, &hprn, NULL )) + { + DeletePrinter( hprn ); + ClosePrinter( hprn ); + } + DeletePrinterDriverExW( NULL, NULL, pi[i].pPrinterName, 0, 0 ); + } + } + } + HeapFree(GetProcessHeap(), 0, pi); +} + void WINSPOOL_LoadSystemPrinters(void) { HKEY hkey, hkeyPrinters; - HANDLE hprn; DWORD needed, num, i; WCHAR PrinterName[256]; BOOL done = FALSE; @@ -1034,7 +1080,7 @@ void WINSPOOL_LoadSystemPrinters(void) problems later if they don't. If one is found to be missed we create one and set it equal to the name of the key */ if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) == ERROR_SUCCESS) { - if(RegQueryInfoKeyA(hkeyPrinters, NULL, NULL, NULL, &num, NULL, NULL, + if(RegQueryInfoKeyW(hkeyPrinters, NULL, NULL, NULL, &num, NULL, NULL, NULL, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { for(i = 0; i < num; i++) { if(RegEnumKeyW(hkeyPrinters, i, PrinterName, sizeof(PrinterName)/sizeof(PrinterName[0])) == ERROR_SUCCESS) { @@ -1050,31 +1096,7 @@ void WINSPOOL_LoadSystemPrinters(void) RegCloseKey(hkeyPrinters); } - /* We want to avoid calling AddPrinter on printers as much as - possible, because on cups printers this will (eventually) lead - to a call to cupsGetPPD which takes forever, even with non-cups - printers AddPrinter takes a while. So we'll tag all printers that - were automatically added last time around, if they still exist - we'll leave them be otherwise we'll delete them. */ - if (EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num) && needed) { - PRINTER_INFO_5A* pi = HeapAlloc(GetProcessHeap(), 0, needed); - if(EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, (LPBYTE)pi, needed, &needed, &num)) { - for(i = 0; i < num; i++) { - if(pi[i].pPortName == NULL || !strncmp(pi[i].pPortName,"CUPS:", 5) || !strncmp(pi[i].pPortName, "LPR:", 4)) { - if(OpenPrinterA(pi[i].pPrinterName, &hprn, NULL)) { - if(WINSPOOL_GetOpenedPrinterRegKey(hprn, &hkey) == ERROR_SUCCESS) { - DWORD dw = 1; - RegSetValueExW(hkey, May_Delete_Value, 0, REG_DWORD, (LPBYTE)&dw, sizeof(dw)); - RegCloseKey(hkey); - } - ClosePrinter(hprn); - } - } - } - } - HeapFree(GetProcessHeap(), 0, pi); - } - + old_printer_check( FALSE ); #ifdef SONAME_LIBCUPS done = CUPS_LoadPrinters(); @@ -1083,36 +1105,9 @@ void WINSPOOL_LoadSystemPrinters(void) if(!done) /* If we have any CUPS based printers, skip looking for printcap printers */ PRINTCAP_LoadPrinters(); - /* Now enumerate the list again and delete any printers that are still tagged */ - EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, NULL, 0, &needed, &num); - if(needed) { - PRINTER_INFO_5A* pi = HeapAlloc(GetProcessHeap(), 0, needed); - if(EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, (LPBYTE)pi, needed, &needed, &num)) { - for(i = 0; i < num; i++) { - if(pi[i].pPortName == NULL || !strncmp(pi[i].pPortName,"CUPS:", 5) || !strncmp(pi[i].pPortName, "LPR:", 4)) { - if(OpenPrinterA(pi[i].pPrinterName, &hprn, NULL)) { - BOOL delete_driver = FALSE; - if(WINSPOOL_GetOpenedPrinterRegKey(hprn, &hkey) == ERROR_SUCCESS) { - DWORD dw, type, size = sizeof(dw); - if(RegQueryValueExW(hkey, May_Delete_Value, NULL, &type, (LPBYTE)&dw, &size) == ERROR_SUCCESS) { - TRACE("Deleting old printer %s\n", pi[i].pPrinterName); - DeletePrinter(hprn); - delete_driver = TRUE; - } - RegCloseKey(hkey); - } - ClosePrinter(hprn); - if(delete_driver) - DeletePrinterDriverExA(NULL, NULL, pi[i].pPrinterName, 0, 0); - } - } - } - } - HeapFree(GetProcessHeap(), 0, pi); - } + old_printer_check( TRUE ); return; - } /******************************************************************

1 0

Huw Davies : winspool: Add a helper to open a printer's registry key.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: b9bc9a0cf2badb7ec4cd41dd0eb7fdd8c49f32d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9bc9a0cf2badb7ec4cd41dd0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 19 13:43:24 2012 +0100 winspool: Add a helper to open a printer's registry key. --- dlls/winspool.drv/info.c | 79 +++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 49 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9b3c335..1e5aabc 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -995,6 +995,21 @@ static LPCWSTR get_opened_printer_name(HANDLE hprn) return printer->name; } +static DWORD open_printer_reg_key( const WCHAR *name, HKEY *key ) +{ + HKEY printers; + DWORD err; + + *key = NULL; + err = RegCreateKeyW( HKEY_LOCAL_MACHINE, PrintersW, &printers ); + if (err) return err; + + err = RegOpenKeyW( printers, name, key ); + if (err) err = ERROR_INVALID_PRINTER_NAME; + RegCloseKey( printers ); + return err; +} + /****************************************************************** * WINSPOOL_GetOpenedPrinterRegKey * @@ -1002,24 +1017,9 @@ static LPCWSTR get_opened_printer_name(HANDLE hprn) static DWORD WINSPOOL_GetOpenedPrinterRegKey(HANDLE hPrinter, HKEY *phkey) { LPCWSTR name = get_opened_printer_name(hPrinter); - DWORD ret; - HKEY hkeyPrinters; if(!name) return ERROR_INVALID_HANDLE; - - if((ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters)) != - ERROR_SUCCESS) - return ret; - - if(RegOpenKeyW(hkeyPrinters, name, phkey) != ERROR_SUCCESS) - { - ERR("Can't find opened printer %s in registry\n", - debugstr_w(name)); - RegCloseKey(hkeyPrinters); - return ERROR_INVALID_PRINTER_NAME; /* ? */ - } - RegCloseKey(hkeyPrinters); - return ERROR_SUCCESS; + return open_printer_reg_key( name, phkey ); } void WINSPOOL_LoadSystemPrinters(void) @@ -3872,30 +3872,18 @@ static BOOL WINSPOOL_GetPrinter_9(HKEY hkeyPrinter, PRINTER_INFO_9W *pi9, LPBYTE BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, DWORD cbBuf, LPDWORD pcbNeeded) { - LPCWSTR name; - DWORD size, needed = 0; + DWORD size, needed = 0, err; LPBYTE ptr = NULL; - HKEY hkeyPrinter, hkeyPrinters; + HKEY hkeyPrinter; BOOL ret; TRACE("(%p,%d,%p,%d,%p)\n",hPrinter,Level,pPrinter,cbBuf, pcbNeeded); - if (!(name = get_opened_printer_name(hPrinter))) { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != - ERROR_SUCCESS) { - ERR("Can't create Printers key\n"); - return FALSE; - } - if(RegOpenKeyW(hkeyPrinters, name, &hkeyPrinter) != ERROR_SUCCESS) + err = WINSPOOL_GetOpenedPrinterRegKey( hPrinter, &hkeyPrinter ); + if (err) { - ERR("Can't find opened printer %s in registry\n", debugstr_w(name)); - RegCloseKey(hkeyPrinters); - SetLastError(ERROR_INVALID_PRINTER_NAME); /* ? */ - return FALSE; + SetLastError( err ); + return FALSE; } switch(Level) { @@ -4016,13 +4004,11 @@ BOOL WINAPI GetPrinterW(HANDLE hPrinter, DWORD Level, LPBYTE pPrinter, default: FIXME("Unimplemented level %d\n", Level); SetLastError(ERROR_INVALID_LEVEL); - RegCloseKey(hkeyPrinters); RegCloseKey(hkeyPrinter); return FALSE; } RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); TRACE("returning %d needed = %d\n", ret, needed); if(pcbNeeded) *pcbNeeded = needed; @@ -4559,7 +4545,7 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, WCHAR DriverName[100]; DWORD ret, type, size, needed = 0; LPBYTE ptr = NULL; - HKEY hkeyPrinter, hkeyPrinters, hkeyDrivers; + HKEY hkeyPrinter, hkeyDrivers; const printenv_t * env; TRACE("(%p,%s,%d,%p,%d,%p)\n",hPrinter,debugstr_w(pEnvironment), @@ -4581,24 +4567,19 @@ BOOL WINAPI GetPrinterDriverW(HANDLE hPrinter, LPWSTR pEnvironment, env = validate_envW(pEnvironment); if (!env) return FALSE; /* SetLastError() is in validate_envW */ - if(RegCreateKeyW(HKEY_LOCAL_MACHINE, PrintersW, &hkeyPrinters) != - ERROR_SUCCESS) { - ERR("Can't create Printers key\n"); - return FALSE; - } - if(RegOpenKeyW(hkeyPrinters, name, &hkeyPrinter) - != ERROR_SUCCESS) { - ERR("Can't find opened printer %s in registry\n", debugstr_w(name)); - RegCloseKey(hkeyPrinters); - SetLastError(ERROR_INVALID_PRINTER_NAME); /* ? */ - return FALSE; + ret = open_printer_reg_key( name, &hkeyPrinter ); + if (ret) + { + ERR( "Can't find opened printer %s in registry\n", debugstr_w(name) ); + SetLastError( ret ); + return FALSE; } + size = sizeof(DriverName); DriverName[0] = 0; ret = RegQueryValueExW(hkeyPrinter, Printer_DriverW, 0, &type, (LPBYTE)DriverName, &size); RegCloseKey(hkeyPrinter); - RegCloseKey(hkeyPrinters); if(ret != ERROR_SUCCESS) { ERR("Can't get DriverName for printer %s\n", debugstr_w(name)); return FALSE;

1 0

Carlo Bramini : shlwapi: Add NULL checks to StrCpyW and StrCatW.
by Alexandre Julliard 19 Apr '12

19 Apr '12

Module: wine Branch: master Commit: f6524a9f77cfad6b2d6c7745cdc8598e50e4bdf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6524a9f77cfad6b2d6c7745c… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Wed Apr 18 21:51:05 2012 +0200 shlwapi: Add NULL checks to StrCpyW and StrCatW. --- dlls/shlwapi/string.c | 6 ++++-- dlls/shlwapi/tests/string.c | 18 +++++++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index c65d576..e2f1cba 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -477,7 +477,8 @@ LPWSTR WINAPI StrCatW(LPWSTR lpszStr, LPCWSTR lpszSrc) { TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSrc)); - strcatW(lpszStr, lpszSrc); + if (lpszStr && lpszSrc) + strcatW(lpszStr, lpszSrc); return lpszStr; } @@ -497,7 +498,8 @@ LPWSTR WINAPI StrCpyW(LPWSTR lpszStr, LPCWSTR lpszSrc) { TRACE("(%p,%s)\n", lpszStr, debugstr_w(lpszSrc)); - strcpyW(lpszStr, lpszSrc); + if (lpszStr && lpszSrc) + strcpyW(lpszStr, lpszSrc); return lpszStr; } diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index c918bcc..aac79f8 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -407,16 +407,28 @@ static void test_StrCpyW(void) WCHAR szSrc[256]; WCHAR szBuff[256]; const StrFormatSizeResult* result = StrFormatSize_results; - + LPWSTR lpRes; while(result->value) { MultiByteToWideChar(0,0,result->byte_size_64,-1,szSrc,sizeof(szSrc)/sizeof(WCHAR)); - StrCpyW(szBuff, szSrc); - ok(!StrCmpW(szSrc, szBuff), "Copied string %s wrong\n", result->byte_size_64); + lpRes = StrCpyW(szBuff, szSrc); + ok(!StrCmpW(szSrc, szBuff) && lpRes == szBuff, "Copied string %s wrong\n", result->byte_size_64); result++; } + + /* this test crashes on win2k SP4 */ + /*lpRes = StrCpyW(szBuff, NULL);*/ + /*ok(lpRes == szBuff, "Wrong return value: got %p expected %p\n", lpRes, szBuff);*/ + + /* this test crashes on win2k SP4 */ + /*lpRes = StrCpyW(NULL, szSrc);*/ + /*ok(lpRes == NULL, "Wrong return value: got %p expected NULL\n", lpRes);*/ + + /* this test crashes on win2k SP4 */ + /*lpRes = StrCpyW(NULL, NULL);*/ + /*ok(lpRes == NULL, "Wrong return value: got %p expected NULL\n", lpRes);*/ } static void test_StrChrNW(void)

1 0

Dmitry Timoshkov : kernel32: Add more memory access checks.
by Alexandre Julliard 19 Apr '12

19 Apr '12

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

← Newer
1
...
20
21
22
23
24
25
26
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2012