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

Alistair Leslie-Hughes : oledb32: Support DBSTATUS_S_ISNULL when converting to VARIANT.
by Alexandre Julliard May 20, 2013

May 20, 2013

Module: wine Branch: master Commit: 89312f9d4925dd45b8346ce2999fe866e8119709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89312f9d4925dd45b8346ce29… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 20 15:33:22 2013 +1000 oledb32: Support DBSTATUS_S_ISNULL when converting to VARIANT. --- dlls/oledb32/convert.c | 7 +++++++ dlls/oledb32/tests/convert.c | 8 ++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 6ae9a06..fe7ba8c 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -789,6 +789,13 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, { VARIANT *v = dst; + if(src_status == DBSTATUS_S_ISNULL) + { + *dst_status = DBSTATUS_S_ISNULL; + *dst_len = 0; + return S_OK; + } + switch(src_type) { case DBTYPE_BOOL: diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 39f96d2..68df732 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2601,6 +2601,14 @@ static void test_converttovar(void) ok(dst_len == sizeof(dst), "got %ld\n", dst_len); ok(V_VT(&dst) == VT_DATE, "got %d\n", V_VT(&dst)); ok( (float)V_DATE(&dst) == 41409.0, "got %f\n", V_DATE(&dst)); + + /* src_status = DBSTATUS_S_ISNULL */ + i4 = 123; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_VARIANT, sizeof(i4), &dst_len, &i4, &dst, sizeof(dst), DBSTATUS_S_ISNULL, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); + ok(dst_len == 0, "got %ld\n", dst_len); + } static void test_converttotimestamp(void)

1 0

André Hentschel : difxapi: Add stub dll.
by Alexandre Julliard May 20, 2013

May 20, 2013

Module: wine Branch: master Commit: 124d5a879d24cdee9637b55e5ea32edc61509e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=124d5a879d24cdee9637b55e5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 20 01:55:43 2013 +0200 difxapi: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/difxapi/Makefile.in | 3 +++ dlls/difxapi/difxapi.spec | 10 ++++++++++ 4 files changed, 15 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 9110105..333594a 100755 --- a/configure +++ b/configure @@ -15806,6 +15806,7 @@ wine_fn_config_test dlls/ddrawex/tests ddrawex_test wine_fn_config_dll devenum enable_devenum po wine_fn_config_test dlls/devenum/tests devenum_test wine_fn_config_dll dhcpcsvc enable_dhcpcsvc +wine_fn_config_dll difxapi enable_difxapi wine_fn_config_dll dinput enable_dinput implib,po,staticimplib wine_fn_config_test dlls/dinput/tests dinput_test wine_fn_config_dll dinput8 enable_dinput8 implib diff --git a/configure.ac b/configure.ac index 98b51e3..4835bf3 100644 --- a/configure.ac +++ b/configure.ac @@ -2701,6 +2701,7 @@ WINE_CONFIG_TEST(dlls/ddrawex/tests) WINE_CONFIG_DLL(devenum,,[po]) WINE_CONFIG_TEST(dlls/devenum/tests) WINE_CONFIG_DLL(dhcpcsvc) +WINE_CONFIG_DLL(difxapi) WINE_CONFIG_DLL(dinput,,[implib,po,staticimplib]) WINE_CONFIG_TEST(dlls/dinput/tests) WINE_CONFIG_DLL(dinput8,,[implib]) diff --git a/dlls/difxapi/Makefile.in b/dlls/difxapi/Makefile.in new file mode 100644 index 0000000..17ddaa2 --- /dev/null +++ b/dlls/difxapi/Makefile.in @@ -0,0 +1,3 @@ +MODULE = difxapi.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/difxapi/difxapi.spec b/dlls/difxapi/difxapi.spec new file mode 100644 index 0000000..a7f6ade --- /dev/null +++ b/dlls/difxapi/difxapi.spec @@ -0,0 +1,10 @@ +@ stub DIFXAPISetLogCallbackA +@ stub DIFXAPISetLogCallbackW +@ stub DriverPackageGetPathA +@ stub DriverPackageGetPathW +@ stub DriverPackageInstallA +@ stub DriverPackageInstallW +@ stub DriverPackagePreinstallA +@ stub DriverPackagePreinstallW +@ stub DriverPackageUninstallA +@ stub DriverPackageUninstallW

1 0

Alexandre Julliard : setupapi: Don' t set the DLL flag when creating a fake dll that ends in .exe.
by Alexandre Julliard May 20, 2013

May 20, 2013

Module: wine Branch: master Commit: 361057501fd365ff42f985b2a6e676a2455452ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=361057501fd365ff42f985b2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 12:48:09 2013 +0200 setupapi: Don't set the DLL flag when creating a fake dll that ends in .exe. --- dlls/setupapi/fakedll.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 525f399..3528e79 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -245,11 +245,13 @@ done: } /* build a complete fake dll from scratch */ -static BOOL build_fake_dll( HANDLE file ) +static BOOL build_fake_dll( HANDLE file, const WCHAR *name ) { + static const WCHAR dotexeW[] = { '.','e','x','e',0 }; IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; struct dll_info info; + const WCHAR *ext; BYTE *buffer; BOOL ret = FALSE; DWORD lfanew = (sizeof(*dos) + sizeof(fakedll_signature) + 15) & ~15; @@ -279,7 +281,7 @@ static BOOL build_fake_dll( HANDLE file ) nt->FileHeader.Machine = IMAGE_FILE_MACHINE_I386; #endif nt->FileHeader.TimeDateStamp = 0; - nt->FileHeader.Characteristics = IMAGE_FILE_DLL; + nt->FileHeader.Characteristics = 0; nt->OptionalHeader.MajorLinkerVersion = 1; nt->OptionalHeader.MinorLinkerVersion = 0; nt->OptionalHeader.MajorOperatingSystemVersion = 1; @@ -312,6 +314,9 @@ static BOOL build_fake_dll( HANDLE file ) nt->OptionalHeader.AddressOfEntryPoint = info.mem_pos; nt->OptionalHeader.BaseOfCode = info.mem_pos; + ext = strrchrW( name, '.' ); + if (!ext || strcmpiW( ext, dotexeW )) nt->FileHeader.Characteristics |= IMAGE_FILE_DLL; + if (nt->FileHeader.Characteristics & IMAGE_FILE_DLL) { size = sizeof(dll_code_section); @@ -963,7 +968,7 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) else { WARN( "fake dll %s not found for %s\n", debugstr_w(source), debugstr_w(name) ); - ret = build_fake_dll( h ); + ret = build_fake_dll( h, name ); } CloseHandle( h );

1 0

Alexandre Julliard : msvcp90: Don't bother to clean up at process exit.
by Alexandre Julliard May 20, 2013

May 20, 2013

Module: wine Branch: master Commit: 418fbc677038b051091810d2163b4b9b8d58ea47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=418fbc677038b051091810d21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 12:29:07 2013 +0200 msvcp90: Don't bother to clean up at process exit. --- dlls/msvcp90/msvcp90_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 7a7aafe..496efa9 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -92,6 +92,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) init_io(hinstDLL); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; free_io(); free_locale(); free_lockit();

1 0

Alexandre Julliard : ntoskrnl.exe: Don' t bother to remove exception handler at process exit.
by Alexandre Julliard May 20, 2013

May 20, 2013

Module: wine Branch: master Commit: b30160f669aa7741d7ee6eba8f49fec91e5cd9b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30160f669aa7741d7ee6eba8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 12:28:08 2013 +0200 ntoskrnl.exe: Don't bother to remove exception handler at process exit. --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 654957a..2d8db4b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1861,6 +1861,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) KeQueryTickCount( &count ); /* initialize the global KeTickCount */ break; case DLL_PROCESS_DETACH: + if (reserved) break; RtlRemoveVectoredExceptionHandler( handler ); break; }

1 0

Alexandre Julliard : msvcrt: Don't bother to clean up at process exit.
by Alexandre Julliard May 20, 2013

May 20, 2013

Module: wine Branch: master Commit: 66a54686766b5762c8e8c1fcb01081b19bb92fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=66a54686766b5762c8e8c1fcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 12:28:38 2013 +0200 msvcrt: Don't bother to clean up at process exit. --- dlls/msvcrt/main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 6df9ccf..a62e62b 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -118,8 +118,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_THREAD_ATTACH: break; case DLL_PROCESS_DETACH: - msvcrt_free_popen_data(); msvcrt_free_io(); + if (lpvReserved) break; + msvcrt_free_popen_data(); msvcrt_free_mt_locks(); msvcrt_free_console(); msvcrt_free_args();

1 0

Alexandre Julliard : msvcp60: Don't bother to clean up at process exit.
by Alexandre Julliard May 20, 2013

May 20, 2013

Module: wine Branch: master Commit: 16d87fef68103b29ddea1a155b43c8a1e3b1b00b URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d87fef68103b29ddea1a155… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 12:28:48 2013 +0200 msvcp60: Don't bother to clean up at process exit. --- dlls/msvcp60/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index dd7a4ef..e9c6975 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -89,6 +89,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) init_io(hinstDLL); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; free_io(); free_locale(); free_lockit();

1 0

Alexandre Julliard : msvcp100: Don't bother to clean up at process exit.
by Alexandre Julliard May 20, 2013

May 20, 2013

Module: wine Branch: master Commit: b9271be3c0298ed84024e00332becd4f49f2e064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9271be3c0298ed84024e0033… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 12:29:13 2013 +0200 msvcp100: Don't bother to clean up at process exit. --- dlls/msvcp100/msvcp100.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp100/msvcp100.c b/dlls/msvcp100/msvcp100.c index c0f1ecd..244c5d2 100644 --- a/dlls/msvcp100/msvcp100.c +++ b/dlls/msvcp100/msvcp100.c @@ -96,6 +96,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) init_io(hinstDLL); break; case DLL_PROCESS_DETACH: + if (lpvReserved) break; free_io(); free_locale(); free_lockit();

1 0

Stefan Dösinger : d3d: d3d9ex does not do video memory accounting for D3DPOOL_DEFAULT resources.
by Alexandre Julliard May 20, 2013

May 20, 2013

Module: wine Branch: master Commit: 9287bb80dc974235d43d5ee4fadc86e1a11dbfeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9287bb80dc974235d43d5ee4f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 19 23:13:30 2013 +0200 d3d: d3d9ex does not do video memory accounting for D3DPOOL_DEFAULT resources. --- dlls/d3d8/directx.c | 4 +++- dlls/d3d9/directx.c | 3 ++- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/resource.c | 7 +++++-- include/wine/wined3d.h | 1 + 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 61d187d..4aac722 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -404,11 +404,13 @@ static const struct IDirect3D8Vtbl d3d8_vtbl = BOOL d3d8_init(struct d3d8 *d3d8) { + DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING; + d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl; d3d8->refcount = 1; wined3d_mutex_lock(); - d3d8->wined3d = wined3d_create(8, WINED3D_LEGACY_DEPTH_BIAS); + d3d8->wined3d = wined3d_create(8, flags); wined3d_mutex_unlock(); if (!d3d8->wined3d) return FALSE; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index a335375..537e6af 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -632,11 +632,12 @@ static const struct IDirect3D9ExVtbl d3d9_vtbl = BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) { + DWORD flags = extended ? 0 : WINED3D_VIDMEM_ACCOUNTING; d3d9->IDirect3D9Ex_iface.lpVtbl = &d3d9_vtbl; d3d9->refcount = 1; wined3d_mutex_lock(); - d3d9->wined3d = wined3d_create(9, 0); + d3d9->wined3d = wined3d_create(9, flags); wined3d_mutex_unlock(); if (!d3d9->wined3d) return FALSE; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index a459e5f..b2b637e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5234,7 +5234,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->numIfaces = 1; ddraw->ref7 = 1; - flags = WINED3D_LEGACY_DEPTH_BIAS; + flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING; if (DefaultSurfaceType != DDRAW_SURFACE_TYPE_OPENGL) flags |= WINED3D_NO3D; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index d784622..0e0678d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -84,6 +84,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) { + const struct wined3d *d3d = device->wined3d; + resource->ref = 1; resource->device = device; resource->type = type; @@ -124,7 +126,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); /* Check that we have enough video ram left */ - if (pool == WINED3D_POOL_DEFAULT) + if (pool == WINED3D_POOL_DEFAULT && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) { if (size > wined3d_device_get_available_texture_mem(device)) { @@ -142,13 +144,14 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * void resource_cleanup(struct wined3d_resource *resource) { + const struct wined3d *d3d = resource->device->wined3d; struct private_data *data; struct list *e1, *e2; HRESULT hr; TRACE("Cleaning up resource %p.\n", resource); - if (resource->pool == WINED3D_POOL_DEFAULT) + if (resource->pool == WINED3D_POOL_DEFAULT && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) { TRACE("Decrementing device memory pool by %u.\n", resource->size); adapter_adjust_memory(resource->device->adapter, 0 - resource->size); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 75cba55..27575bb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1216,6 +1216,7 @@ enum wined3d_display_rotation #define WINED3D_LEGACY_DEPTH_BIAS 0x00000001 #define WINED3D_NO3D 0x00000002 +#define WINED3D_VIDMEM_ACCOUNTING 0x00000004 #define WINED3D_RESZ_CODE 0x7fa05000

1 0

Ken Thomases : user32: Allow sent WM_CANCELMODE to end menu tracking in a window's menu bar.
by Alexandre Julliard May 20, 2013

May 20, 2013

Module: wine Branch: master Commit: effc28e16effc43e91633c0a051f949a6a195438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=effc28e16effc43e91633c0a0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri May 17 00:40:30 2013 -0500 user32: Allow sent WM_CANCELMODE to end menu tracking in a window's menu bar. --- dlls/user32/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 0a38440..ae5cb36 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2429,7 +2429,7 @@ void MENU_EndMenu( HWND hwnd ) { POPUPMENU *menu; menu = top_popup_hmenu ? MENU_GetMenu( top_popup_hmenu ) : NULL; - if (menu && hwnd == menu->hwndOwner) EndMenu(); + if (menu && (hwnd == menu->hWnd || hwnd == menu->hwndOwner)) EndMenu(); } /***********************************************************************

1 0