February 2018 - Wine-devel - list.winehq.org

[PATCH] spoolss: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 05 Feb '18

05 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/spoolss/router.c | 1 + dlls/spoolss/spoolss.h | 17 ----------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c index 3d239b4afb..764721b202 100644 --- a/dlls/spoolss/router.c +++ b/dlls/spoolss/router.c @@ -31,6 +31,7 @@ #include "spoolss.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(spoolss); diff --git a/dlls/spoolss/spoolss.h b/dlls/spoolss/spoolss.h index 67b3891e46..b4a8853305 100644 --- a/dlls/spoolss/spoolss.h +++ b/dlls/spoolss/spoolss.h @@ -23,20 +23,3 @@ BOOL backend_load_all(void) DECLSPEC_HIDDEN; void backend_unload_all(void) DECLSPEC_HIDDEN; - -/* ## Memory allocation functions ## */ - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), 0, len ); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); -} - -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} -- 2.14.3

2 1

[PATCH] oledb32: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 05 Feb '18

05 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oledb32/convert.c | 1 + dlls/oledb32/datainit.c | 1 + dlls/oledb32/dslocator.c | 1 + dlls/oledb32/errorinfo.c | 1 + dlls/oledb32/oledb_private.h | 20 -------------------- dlls/oledb32/rowpos.c | 1 + 6 files changed, 5 insertions(+), 20 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 22609aed88..5bad105582 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -31,6 +31,7 @@ #include "oledb_private.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 650c220741..7d78e9fca2 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -29,6 +29,7 @@ #include "oledb_private.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index f530d2e09a..d397e47aa5 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -33,6 +33,7 @@ #include "oledb_private.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index e1c3204dd4..f1c9cd17ef 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -32,6 +32,7 @@ #include "oledb_private.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/debug.h" diff --git a/dlls/oledb32/oledb_private.h b/dlls/oledb32/oledb_private.h index 6f2bf76206..4e285b5460 100644 --- a/dlls/oledb32/oledb_private.h +++ b/dlls/oledb32/oledb_private.h @@ -26,27 +26,7 @@ HRESULT create_dslocator(IUnknown *outer, void **obj) DECLSPEC_HIDDEN; HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID riid, IUnknown **datasource) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); } - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index c1cee127e8..46904d3da5 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -28,6 +28,7 @@ #include "oledb_private.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(oledb); -- 2.14.3

2 1

[PATCH] sapi: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 05 Feb '18

05 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/sapi/sapi_private.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index 5f78d12667..b069222c7d 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -18,22 +18,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/heap.h" #include "wine/unicode.h" HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL; -- 2.14.3

2 1

[PATCH] testbot: Better handle the database connections in case of a fork().
by Francois Gouget 05 Feb '18

05 Feb '18

Make sure AutoInactiveDestroy is set. This will prevent a mere stray fork()+exit() from breaking the parent's DBI connection. Also stop using DBI::disconnect() as this bypasses the InactiveDestroy setting, such that calling it in a child process will break the parent's DBI connection. DBI connections are automatically closed in the appropriate way their destructor when they get out of scope. These two changes allow us to close the DBI connections in the child process (which don't need them anyway), rather than breaking the connections before the fork() and thus forcing the parent to reconnect. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 6 +++--- testbot/lib/ObjectModel/DBIBackEnd.pm | 21 ++++++++++----------- testbot/lib/WineTestBot/VMs.pm | 7 ++++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index d6375647..7e278ba9 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -309,9 +309,6 @@ sub HandleJobStatusChange($$$) if ($OldStatus eq "running" && $NewStatus ne "running") { - # Make sure the child process does not inherit the database connections - CloseAllDBBackEnds(); - my $Pid = fork; if (!defined $Pid) { @@ -319,7 +316,10 @@ sub HandleJobStatusChange($$$) } elsif (!$Pid) { + # Clean up the child environment + CloseAllDBBackEnds(); WineTestBot::Log::SetupRedirects(); + exec("$BinDir/${ProjectName}SendLog.pl $JobKey") or LogMsg "Unable to exec ${ProjectName}SendLog.pl: $!\n"; exit(1); diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 5567203b..60e68d8f 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -45,14 +45,11 @@ sub GetDb($) { my ($self) = @_; - if (defined $self->{Db} && !$self->{Db}->ping()) + if (!$self->{Db} or !$self->{Db}->ping()) { - # This connection no longer works, probably due to the database idle timeout - $self->{Db}->disconnect(); + # We don't have a connection yet, or it no longer works (probably due to + # the database idle timeout). $self->{Db} = undef; - } - if (!defined $self->{Db}) - { while (1) { # Protect this call so we can retry in case RaiseError is set @@ -597,11 +594,9 @@ sub Close($) { my ($self) = @_; - if (defined($self->{Db})) - { - $self->{Db}->disconnect(); - $self->{Db} = undef; - } + # The connection will be automatically closed. In a child process this + # will automatically do the right thing thanks to AutoInactiveDestroy. + $self->{Db} = undef; } sub UseDBIBackEnd($$$$$$) @@ -610,9 +605,13 @@ sub UseDBIBackEnd($$$$$$) # The implementation assumes AutoCommit is on. $DbArgs->{AutoCommit} = 1; + # Make sure AutoInactiveDestroy is set so the database connection is not + # broken if we fork() (including if it's behind our back). + $DbArgs->{AutoInactiveDestroy} = 1; my $BackEnd = $class->new(); $BackEnd->{ConnectArgs} = [$DbSource, $DbUser, $DbPassword, $DbArgs]; AddDBBackEnd($DbSelector, $BackEnd); } + 1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index bb9a8328..d893e496 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -344,9 +344,6 @@ sub Run($$$$$) # So set ChildPid in the parent and synchronize with the child so it only # starts once this is done. - # Make sure the child process will use its own database connections - CloseAllDBBackEnds(); - use Fcntl; my ($fd_read, $fd_write); pipe($fd_read, $fd_write); # For synchronization @@ -378,6 +375,9 @@ sub Run($$$$$) return undef; } + # Close the database connections + CloseAllDBBackEnds(); + # Wait for the parent to set $VM->ChildPid close($fd_write); sysread($fd_read, $fd_write, 1); @@ -389,6 +389,7 @@ sub Run($$$$$) require WineTestBot::VMs; my $VM = WineTestBot::VMs::CreateVMs()->GetItem($self->GetKey()); exit 1 if (($VM->ChildPid || 0) != $$); + # Close the database connection we just opened $self->GetBackEnd()->Close(); require WineTestBot::Log; -- 2.15.1

1 0

[PATCH 1/2] comctl32/edit: Fix class style mask
by Nikolay Sivov 04 Feb '18

04 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/edit.c | 2 +- dlls/comctl32/tests/misc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index a01b75bbe2..9f065f6983 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -5007,7 +5007,7 @@ void EDIT_Register(void) WNDCLASSW wndClass; memset(&wndClass, 0, sizeof(wndClass)); - wndClass.style = CS_GLOBALCLASS | CS_DBLCLKS; + wndClass.style = CS_PARENTDC | CS_GLOBALCLASS | CS_DBLCLKS; wndClass.lpfnWndProc = EDIT_WindowProc; wndClass.cbClsExtra = 0; #ifdef __i386__ diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 46bb431037..bef92b88dc 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -345,7 +345,7 @@ static void check_class( const char *name, int must_exist, UINT style, UINT igno if (GetClassInfoA( 0, name, &wc )) { -todo_wine +todo_wine_if(strcmp(name, "Edit")) ok( !(~wc.style & style & ~ignore), "System class %s is missing bits %x (%08x/%08x)\n", name, ~wc.style & style, wc.style, style ); ok( !(wc.style & ~style), "System class %s has extra bits %x (%08x/%08x)\n", -- 2.15.1

1 1

[PATCH] user32: Fix names returned with GetClassName()
by Nikolay Sivov 04 Feb '18

04 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/class.c | 39 +++++++++++++++++++++++++++------------ dlls/user32/tests/class.c | 2 -- dlls/user32/user_private.h | 2 +- dlls/user32/win.c | 2 +- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index fd9af7f6ea..8fba5bf115 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -61,6 +61,7 @@ typedef struct tagCLASS HBRUSH hbrBackground; /* Default background */ ATOM atomName; /* Name of the class */ WCHAR name[MAX_ATOM_LEN + 1]; + WCHAR *basename; /* Base name for redirected classes, pointer within 'name'. */ } CLASS; static struct list class_list = LIST_INIT( class_list ); @@ -324,7 +325,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -const WCHAR *CLASS_GetVersionedName( const WCHAR *name ) +const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data @@ -337,6 +338,9 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name ) ULONG module_offset; } *wndclass; + if (basename_offset) + *basename_offset = 0; + if (IS_INTRESOURCE( name )) return name; @@ -348,6 +352,9 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name ) return name; wndclass = (struct wndclass_redirect_data *)data.lpData; + if (basename_offset) + *basename_offset = wndclass->name_len / sizeof(WCHAR) - strlenW(name); + return (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset); } @@ -366,7 +373,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) if (!name) return NULL; - name = CLASS_GetVersionedName( name ); + name = CLASS_GetVersionedName( name, NULL ); for (;;) { @@ -408,7 +415,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) * * The real RegisterClass() functionality. */ -static CLASS *CLASS_RegisterClass( LPCWSTR name, HINSTANCE hInstance, BOOL local, +static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE hInstance, BOOL local, DWORD style, INT classExtra, INT winExtra ) { CLASS *classPtr; @@ -428,7 +435,12 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, HINSTANCE hInstance, BOOL local if (!classPtr) return NULL; classPtr->atomName = get_int_atom_value( name ); - if (!classPtr->atomName && name) strcpyW( classPtr->name, name ); + classPtr->basename = classPtr->name; + if (!classPtr->atomName && name) + { + strcpyW( classPtr->name, name ); + classPtr->basename += basename_offset; + } else GlobalGetAtomNameW( classPtr->atomName, classPtr->name, sizeof(classPtr->name)/sizeof(WCHAR) ); SERVER_START_REQ( create_class ) @@ -476,7 +488,7 @@ static void register_builtin( const struct builtin_class_descr *descr ) { CLASS *classPtr; - if (!(classPtr = CLASS_RegisterClass( descr->name, user32_module, FALSE, + if (!(classPtr = CLASS_RegisterClass( descr->name, 0, user32_module, FALSE, descr->style, 0, descr->extra ))) return; if (descr->cursor) classPtr->hCursor = LoadCursorA( 0, (LPSTR)descr->cursor ); @@ -632,14 +644,15 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) if (!IS_INTRESOURCE(wc->lpszClassName)) { + UINT basename_offset; if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; - classname = CLASS_GetVersionedName( name ); - classPtr = CLASS_RegisterClass( classname, instance, !(wc->style & CS_GLOBALCLASS), + classname = CLASS_GetVersionedName( name, &basename_offset ); + classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } else { - classPtr = CLASS_RegisterClass( (LPCWSTR)wc->lpszClassName, instance, + classPtr = CLASS_RegisterClass( (LPCWSTR)wc->lpszClassName, 0, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } @@ -672,6 +685,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { const WCHAR *classname; + UINT basename_offset; ATOM atom; CLASS *classPtr; HINSTANCE instance; @@ -686,8 +700,8 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); - classname = CLASS_GetVersionedName( wc->lpszClassName ); - if (!(classPtr = CLASS_RegisterClass( classname, instance, !(wc->style & CS_GLOBALCLASS), + classname = CLASS_GetVersionedName( wc->lpszClassName, &basename_offset ); + if (!(classPtr = CLASS_RegisterClass( classname, basename_offset, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; @@ -739,7 +753,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ - className = CLASS_GetVersionedName( className ); + className = CLASS_GetVersionedName( className, NULL ); SERVER_START_REQ( destroy_class ) { req->instance = wine_server_client_ptr( hInstance ); @@ -1155,7 +1169,8 @@ INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count ) } else { - lstrcpynW( buffer, class->name, count ); + /* Return original name class was registered with. */ + lstrcpynW( buffer, class->basename, count ); release_class_ptr( class ); ret = strlenW( buffer ); } diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 13d7b9d477..9ae306e090 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1250,7 +1250,6 @@ static void test_actctx_classes(void) ret = GetClassNameA(hwnd, buff, sizeof(buff)); ok(ret, "Failed to get class name.\n"); -todo_wine ok(!strcmp(buff, testclass), "Unexpected class name.\n"); ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc); @@ -1270,7 +1269,6 @@ todo_wine ret = GetClassNameA(hwnd, buff, sizeof(buff)); ok(ret, "Failed to get class name.\n"); -todo_wine ok(!strcmp(buff, testclass), "Unexpected class name.\n"); DestroyWindow(hwnd); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index bf0e3c7626..f1cc0a8791 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -269,7 +269,7 @@ extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM w extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; -extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname) DECLSPEC_HIDDEN; +extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset) DECLSPEC_HIDDEN; /* message spy definitions */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index c3360f9f86..b13032bd6e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1338,7 +1338,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - className = CLASS_GetVersionedName(className); + className = CLASS_GetVersionedName(className, NULL); TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName), -- 2.15.1

1 0

[PATCH 2/2] ws2_32/tests: Test with less socket pairs
by André Hentschel 04 Feb '18

04 Feb '18

about 400 lines less in output Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3bc3d66..17b59a4 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1181,7 +1181,7 @@ static void test_WithWSAStartup(void) struct { SOCKET src, dst, dup_src, dup_dst; - } pairs[128]; + } pairs[32]; DWORD error; res = WSAStartup( version, &data ); -- 2.7.4

2 2

[PATCH v3] comctl32/tests: Add test for v6 combobox dropdown size
by Fabian Maurer 04 Feb '18

04 Feb '18

v2: Shorten test and fix style issues v3: More accurate way to calculate expected list size, style issues Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/tests/combo.c | 114 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index 895d9429b4..ee1a100719 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -1151,6 +1151,118 @@ static void test_combo_WS_VSCROLL(void) DestroyWindow(hCombo); } + +static void test_combo_dropdown_size(DWORD style) +{ + HWND hCombo, hList; + COMBOBOXINFO cbInfo; + int i, test; + const char wine_test[] = "Wine Test"; + LRESULT ret; + + static const struct list_size_info + { + int num_items; + int height_combo; + int limit; + } info_height[] = { + {33, 50, -1}, + {35, 50, 40}, + {15, 50, 3}, + }; + + for (test = 0; test < sizeof(info_height) / sizeof(info_height[0]); test++) + { + const struct list_size_info *info_test = &info_height[test]; + int height_item; /* Height of a list item */ + int height_list; /* Height of the list we got */ + int expected_height_list; + RECT rect_list_client; + int min_visible_expected; + + hCombo = CreateWindowA(WC_COMBOBOXA, "Combo", CBS_DROPDOWN | WS_VISIBLE | WS_CHILD | style, 5, 5, 100, + info_test->height_combo, hMainWnd, (HMENU)COMBO_ID, NULL, 0); + + min_visible_expected = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0); + todo_wine + ok(min_visible_expected == 30, "Unexpected number of items: got %d, expected 30\n", min_visible_expected); + + cbInfo.cbSize = sizeof(COMBOBOXINFO); + SetLastError(0xdeadbeef); + ret = SendMessageA(hCombo, CB_GETCOMBOBOXINFO, 0, (LPARAM)&cbInfo); + ok(ret, "Failed to get COMBOBOXINFO structure; LastError: %x\n", GetLastError()); + + hList = cbInfo.hwndList; + for (i = 0; i < info_test->num_items; i++) + { + ret = SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM) wine_test); + ok(ret >= 0, "Failed to add string %d, returned %x\n", i, (int)ret); + } + + if (info_test->limit != -1) + { + int min_visible_actual; + min_visible_expected = info_test->limit; + + SetLastError(0xdeadbeef); + ret = SendMessageA(hCombo, CB_SETMINVISIBLE, min_visible_expected, 0); + todo_wine + ok(ret, "SendMessageA failed for CB_SETMINVISIBLE\n"); + min_visible_actual = SendMessageA(hCombo, CB_GETMINVISIBLE, 0, 0); + todo_wine + ok(min_visible_expected == min_visible_actual, "Unexpected number of items: got %d, expected %d\n", + min_visible_actual, min_visible_expected); + } + + ret = SendMessageA(hCombo, CB_SHOWDROPDOWN, TRUE,0); + ok(ret, "SendMessage for CB_SHOWDROPDOWN failed\n"); + ret = SendMessageA(hCombo, CB_GETDROPPEDSTATE, 0, 0); + ok(ret, "The dropdown list should have appeared.\n"); + + GetClientRect(hList, &rect_list_client); + height_list = rect_list_client.bottom - rect_list_client.top; + height_item = (int)SendMessageA(hList, LB_GETITEMHEIGHT, 0, 0); + + if (style & CBS_NOINTEGRALHEIGHT) + { + RECT rect_list_complete; + int list_height_nonclient; + int list_height_calculated; + int edit_padding_size = cbInfo.rcItem.top; /* edit client rect top is the padding it has to its parent + We assume it's the same on the bottom */ + + GetWindowRect(hList, &rect_list_complete); + + list_height_nonclient = (rect_list_complete.bottom - rect_list_complete.top) + - (rect_list_client.bottom - rect_list_client.top); + + /* Calculate the expected client size of the listbox popup from the size of the combobox. */ + list_height_calculated = info_test->height_combo /* Take height we created combobox with */ + - (cbInfo.rcItem.bottom - cbInfo.rcItem.top) /* Subtract size of edit control */ + - list_height_nonclient /* Subtract list nonclient area */ + - edit_padding_size * 2; /* subtract space around the edit control */ + + expected_height_list = min(list_height_calculated, height_item * info_test->num_items); + if (expected_height_list < 0) + expected_height_list = 0; + + todo_wine + ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n", + test, expected_height_list, height_list); + } + else + { + expected_height_list = min(info_test->num_items, min_visible_expected) * height_item; + + todo_wine + ok(expected_height_list == height_list, "Test %d, expected list height to be %d, got %d\n", + test, expected_height_list, height_list); + } + + DestroyWindow(hCombo); + } +} + START_TEST(combo) { ULONG_PTR ctx_cookie; @@ -1192,6 +1304,8 @@ START_TEST(combo) test_combo_listbox_styles(CBS_SIMPLE); test_combo_listbox_styles(CBS_DROPDOWN); test_combo_listbox_styles(CBS_DROPDOWNLIST); + test_combo_dropdown_size(0); + test_combo_dropdown_size(CBS_NOINTEGRALHEIGHT); cleanup(); unload_v6_module(ctx_cookie, hCtx); -- 2.16.1

1 0

[PATCH 5/5] d3d11: Use the global memory allocation helpers.
by Henri Verbeet 04 Feb '18

04 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/async.c | 6 +++--- dlls/d3d11/buffer.c | 6 +++--- dlls/d3d11/d3d11_private.h | 8 +------ dlls/d3d11/device.c | 6 +++--- dlls/d3d11/inputlayout.c | 11 +++++----- dlls/d3d11/shader.c | 52 +++++++++++++++++++++++----------------------- dlls/d3d11/state.c | 28 ++++++++++++------------- dlls/d3d11/texture.c | 12 +++++------ dlls/d3d11/view.c | 24 ++++++++++----------- 9 files changed, 73 insertions(+), 80 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index d37cbde..41238ac 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -189,7 +189,7 @@ static void STDMETHODCALLTYPE d3d_query_wined3d_object_destroyed(void *parent) struct d3d_query *query = parent; wined3d_private_store_cleanup(&query->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d_query_wined3d_parent_ops = @@ -502,13 +502,13 @@ HRESULT d3d_query_create(struct d3d_device *device, const D3D11_QUERY_DESC *desc if (is_predicate_type) predicate = TRUE; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d3d_query_init(object, device, desc, predicate))) { WARN("Failed to initialize predicate, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 544e5a8..ba49d6d 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -379,7 +379,7 @@ static void STDMETHODCALLTYPE d3d_buffer_wined3d_object_released(void *parent) struct d3d_buffer *buffer = parent; wined3d_private_store_cleanup(&buffer->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d_buffer_wined3d_parent_ops = @@ -484,13 +484,13 @@ HRESULT d3d_buffer_create(struct d3d_device *device, const D3D11_BUFFER_DESC *de struct d3d_buffer *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d3d_buffer_init(object, device, desc, data))) { WARN("Failed to initialize buffer, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 6702248..1030b96 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -20,6 +20,7 @@ #define __WINE_D3D11_PRIVATE_H #include "wine/debug.h" +#include "wine/heap.h" #include <assert.h> @@ -94,13 +95,6 @@ HRESULT d3d_set_private_data(struct wined3d_private_store *store, HRESULT d3d_set_private_data_interface(struct wined3d_private_store *store, REFGUID guid, const IUnknown *object) DECLSPEC_HIDDEN; -static inline void *d3d11_calloc(SIZE_T count, SIZE_T size) -{ - if (count > ~(SIZE_T)0 / size) - return NULL; - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, count * size); -} - static inline void read_dword(const char **ptr, DWORD *d) { memcpy(d, *ptr, sizeof(*d)); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index cde5b3c..b14c386 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5198,7 +5198,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp } if (output_stream_decl_count - && !(so_entries = d3d11_calloc(output_stream_decl_count, sizeof(*so_entries)))) + && !(so_entries = heap_calloc(output_stream_decl_count, sizeof(*so_entries)))) { ERR("Failed to allocate D3D11 SO declaration array memory.\n"); *shader = NULL; @@ -5220,7 +5220,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp if (output_stream_stride) { WARN("Stride must be 0 when multiple output slots are used.\n"); - HeapFree(GetProcessHeap(), 0, so_entries); + heap_free(so_entries); *shader = NULL; return E_INVALIDARG; } @@ -5229,7 +5229,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp hr = d3d_geometry_shader_create(device, byte_code, byte_code_length, so_entries, output_stream_decl_count, &output_stream_stride, stride_count, 0, &object); - HeapFree(GetProcessHeap(), 0, so_entries); + heap_free(so_entries); if (FAILED(hr)) { *shader = NULL; diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 784779c..ef1d2e6 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -54,7 +54,7 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME return E_FAIL; } - if (!(*wined3d_elements = d3d11_calloc(element_count, sizeof(**wined3d_elements)))) + if (!(*wined3d_elements = heap_calloc(element_count, sizeof(**wined3d_elements)))) { ERR("Failed to allocate wined3d vertex element array memory.\n"); shader_free_signature(&is); @@ -315,7 +315,7 @@ static void STDMETHODCALLTYPE d3d_input_layout_wined3d_object_destroyed(void *pa struct d3d_input_layout *layout = parent; wined3d_private_store_cleanup(&layout->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d_input_layout_wined3d_parent_ops = @@ -347,7 +347,7 @@ static HRESULT d3d_input_layout_init(struct d3d_input_layout *layout, struct d3d hr = wined3d_vertex_declaration_create(device->wined3d_device, wined3d_elements, element_count, layout, &d3d_input_layout_wined3d_parent_ops, &layout->wined3d_decl); - HeapFree(GetProcessHeap(), 0, wined3d_elements); + heap_free(wined3d_elements); if (FAILED(hr)) { WARN("Failed to create wined3d vertex declaration, hr %#x.\n", hr); @@ -370,15 +370,14 @@ HRESULT d3d_input_layout_create(struct d3d_device *device, struct d3d_input_layout *object; HRESULT hr; - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d3d_input_layout_init(object, device, element_descs, element_count, shader_byte_code, shader_byte_code_length))) { WARN("Failed to initialize input layout, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index bd9eb66..9c0059f 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -220,7 +220,7 @@ HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_size, return E_INVALIDARG; } - if (!(e = d3d11_calloc(count, sizeof(*e)))) + if (!(e = heap_calloc(count, sizeof(*e)))) { ERR("Failed to allocate input signature memory.\n"); return E_OUTOFMEMORY; @@ -238,7 +238,7 @@ HRESULT shader_parse_signature(DWORD tag, const char *data, DWORD data_size, if (!(e[i].semantic_name = shader_get_string(data, data_size, name_offset))) { WARN("Invalid name offset %#x (data size %#x).\n", name_offset, data_size); - HeapFree(GetProcessHeap(), 0, e); + heap_free(e); return E_INVALIDARG; } read_dword(&ptr, &e[i].semantic_idx); @@ -277,7 +277,7 @@ struct wined3d_shader_signature_element *shader_find_signature_element(const str void shader_free_signature(struct wined3d_shader_signature *s) { - HeapFree(GetProcessHeap(), 0, s->elements); + heap_free(s->elements); } /* ID3D11VertexShader methods */ @@ -509,7 +509,7 @@ static void STDMETHODCALLTYPE d3d_vertex_shader_wined3d_object_destroyed(void *p struct d3d_vertex_shader *shader = parent; wined3d_private_store_cleanup(&shader->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d_vertex_shader_wined3d_parent_ops = @@ -583,13 +583,13 @@ HRESULT d3d_vertex_shader_create(struct d3d_device *device, const void *byte_cod struct d3d_vertex_shader *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d3d_vertex_shader_init(object, device, byte_code, byte_code_length))) { WARN("Failed to initialize vertex shader, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -744,7 +744,7 @@ static void STDMETHODCALLTYPE d3d11_hull_shader_wined3d_object_destroyed(void *p struct d3d11_hull_shader *shader = parent; wined3d_private_store_cleanup(&shader->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d11_hull_shader_wined3d_parent_ops = @@ -796,12 +796,12 @@ HRESULT d3d11_hull_shader_create(struct d3d_device *device, const void *byte_cod struct d3d11_hull_shader *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d3d11_hull_shader_init(object, device, byte_code, byte_code_length))) { - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -947,7 +947,7 @@ static void STDMETHODCALLTYPE d3d11_domain_shader_wined3d_object_destroyed(void struct d3d11_domain_shader *shader = parent; wined3d_private_store_cleanup(&shader->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d11_domain_shader_wined3d_parent_ops = @@ -999,12 +999,12 @@ HRESULT d3d11_domain_shader_create(struct d3d_device *device, const void *byte_c struct d3d11_domain_shader *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d3d11_domain_shader_init(object, device, byte_code, byte_code_length))) { - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -1253,7 +1253,7 @@ static void STDMETHODCALLTYPE d3d_geometry_shader_wined3d_object_destroyed(void struct d3d_geometry_shader *shader = parent; wined3d_private_store_cleanup(&shader->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d_geometry_shader_wined3d_parent_ops = @@ -1491,7 +1491,7 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, so_desc.buffer_stride_count = buffer_stride_count; so_desc.rasterizer_stream_idx = rasterizer_stream; - if (!(so_desc.elements = d3d11_calloc(so_entry_count, sizeof(*so_desc.elements)))) + if (!(so_desc.elements = heap_calloc(so_entry_count, sizeof(*so_desc.elements)))) { ERR("Failed to allocate wined3d stream output element array memory.\n"); free_shader_desc(&desc); @@ -1501,7 +1501,7 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, so_entries, so_entry_count, buffer_strides, buffer_stride_count, &desc.output_signature, device->feature_level))) { - HeapFree(GetProcessHeap(), 0, so_desc.elements); + heap_free(so_desc.elements); free_shader_desc(&desc); return hr; } @@ -1515,7 +1515,7 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, hr = wined3d_shader_create_gs(device->wined3d_device, &desc, so_entries ? &so_desc : NULL, shader, &d3d_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader); - HeapFree(GetProcessHeap(), 0, so_desc.elements); + heap_free(so_desc.elements); free_shader_desc(&desc); if (FAILED(hr)) { @@ -1540,14 +1540,14 @@ HRESULT d3d_geometry_shader_create(struct d3d_device *device, const void *byte_c struct d3d_geometry_shader *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d3d_geometry_shader_init(object, device, byte_code, byte_code_length, so_entries, so_entry_count, buffer_strides, buffer_stride_count, rasterizer_stream))) { WARN("Failed to initialize geometry shader, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -1804,7 +1804,7 @@ static void STDMETHODCALLTYPE d3d_pixel_shader_wined3d_object_destroyed(void *pa struct d3d_pixel_shader *shader = parent; wined3d_private_store_cleanup(&shader->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d_pixel_shader_wined3d_parent_ops = @@ -1857,13 +1857,13 @@ HRESULT d3d_pixel_shader_create(struct d3d_device *device, const void *byte_code struct d3d_pixel_shader *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d3d_pixel_shader_init(object, device, byte_code, byte_code_length))) { WARN("Failed to initialize pixel shader, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -2016,7 +2016,7 @@ static void STDMETHODCALLTYPE d3d11_compute_shader_wined3d_object_destroyed(void struct d3d11_compute_shader *shader = parent; wined3d_private_store_cleanup(&shader->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d11_compute_shader_wined3d_parent_ops = @@ -2067,12 +2067,12 @@ HRESULT d3d11_compute_shader_create(struct d3d_device *device, const void *byte_ struct d3d11_compute_shader *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d3d11_compute_shader_init(object, device, byte_code, byte_code_length))) { - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -2139,7 +2139,7 @@ static ULONG STDMETHODCALLTYPE d3d11_class_linkage_Release(ID3D11ClassLinkage *i ID3D11Device *device = class_linkage->device; wined3d_private_store_cleanup(&class_linkage->private_store); - HeapFree(GetProcessHeap(), 0, class_linkage); + heap_free(class_linkage); ID3D11Device_Release(device); } @@ -2228,7 +2228,7 @@ HRESULT d3d11_class_linkage_create(struct d3d_device *device, struct d3d11_class { struct d3d11_class_linkage *object; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->ID3D11ClassLinkage_iface.lpVtbl = &d3d11_class_linkage_vtbl; diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index b7c9264..47058a0 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -87,7 +87,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface wine_rb_remove(&device->blend_states, &state->entry); d3d_blend_state_cleanup(state); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, state); + heap_free(state); } return refcount; @@ -357,7 +357,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC return S_OK; } - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) { wined3d_mutex_unlock(); return E_OUTOFMEMORY; @@ -366,7 +366,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC if (FAILED(hr = d3d_blend_state_init(object, device, &tmp_desc))) { WARN("Failed to initialize blend state, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); wined3d_mutex_unlock(); return hr; } @@ -375,7 +375,7 @@ HRESULT d3d_blend_state_create(struct d3d_device *device, const D3D11_BLEND_DESC { ERR("Failed to insert blend state entry.\n"); d3d_blend_state_cleanup(object); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); wined3d_mutex_unlock(); return E_FAIL; } @@ -467,7 +467,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStenc wine_rb_remove(&device->depthstencil_states, &state->entry); d3d_depthstencil_state_cleanup(state); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, state); + heap_free(state); } return refcount; @@ -721,7 +721,7 @@ HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEP return S_OK; } - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) { wined3d_mutex_unlock(); return E_OUTOFMEMORY; @@ -730,7 +730,7 @@ HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEP if (FAILED(hr = d3d_depthstencil_state_init(object, device, &tmp_desc))) { WARN("Failed to initialize depthstencil state, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); wined3d_mutex_unlock(); return hr; } @@ -739,7 +739,7 @@ HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEP { ERR("Failed to insert depthstencil state entry.\n"); d3d_depthstencil_state_cleanup(object); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); wined3d_mutex_unlock(); return E_FAIL; } @@ -1025,7 +1025,7 @@ static void STDMETHODCALLTYPE d3d_rasterizer_state_wined3d_object_destroyed(void wine_rb_remove(&device->rasterizer_states, &state->entry); wined3d_private_store_cleanup(&state->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d_rasterizer_state_wined3d_parent_ops = @@ -1093,7 +1093,7 @@ HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTE return S_OK; } - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) { wined3d_mutex_unlock(); return E_OUTOFMEMORY; @@ -1104,7 +1104,7 @@ HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTE if (FAILED(hr)) { WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -1388,7 +1388,7 @@ static void STDMETHODCALLTYPE d3d_sampler_wined3d_object_destroyed(void *parent) wine_rb_remove(&device->sampler_states, &state->entry); wined3d_private_store_cleanup(&state->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d_sampler_wined3d_parent_ops = @@ -1518,7 +1518,7 @@ HRESULT d3d_sampler_state_create(struct d3d_device *device, const D3D11_SAMPLER_ return S_OK; } - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) { wined3d_mutex_unlock(); return E_OUTOFMEMORY; @@ -1529,7 +1529,7 @@ HRESULT d3d_sampler_state_create(struct d3d_device *device, const D3D11_SAMPLER_ if (FAILED(hr)) { WARN("Failed to initialize sampler state, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 0192c6d..4d500c9 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -275,7 +275,7 @@ static void STDMETHODCALLTYPE d3d_texture2d_wined3d_object_released(void *parent if (texture->dxgi_surface) IUnknown_Release(texture->dxgi_surface); wined3d_private_store_cleanup(&texture->private_store); - HeapFree(GetProcessHeap(), 0, texture); + heap_free(texture); } static ULONG STDMETHODCALLTYPE d3d10_texture2d_Release(ID3D10Texture2D *iface) @@ -502,7 +502,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE return E_INVALIDARG; } - if (!(texture = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*texture)))) + if (!(texture = heap_alloc_zero(sizeof(*texture)))) return E_OUTOFMEMORY; texture->ID3D11Texture2D_iface.lpVtbl = &d3d11_texture2d_vtbl; @@ -539,7 +539,7 @@ HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DE { WARN("Failed to create wined3d texture, hr %#x.\n", hr); wined3d_private_store_cleanup(&texture->private_store); - HeapFree(GetProcessHeap(), 0, texture); + heap_free(texture); wined3d_mutex_unlock(); if (hr == WINED3DERR_NOTAVAILABLE || hr == WINED3DERR_INVALIDCALL) hr = E_INVALIDARG; @@ -642,7 +642,7 @@ static void STDMETHODCALLTYPE d3d_texture3d_wined3d_object_released(void *parent struct d3d_texture3d *texture = parent; wined3d_private_store_cleanup(&texture->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static ULONG STDMETHODCALLTYPE d3d11_texture3d_Release(ID3D11Texture3D *iface) @@ -1016,13 +1016,13 @@ HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DE struct d3d_texture3d *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d3d_texture3d_init(object, device, desc, data))) { WARN("Failed to initialize texture, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 034a494..2787c08 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1244,7 +1244,7 @@ static void STDMETHODCALLTYPE d3d_depth_stencil_view_wined3d_object_destroyed(vo struct d3d_depthstencil_view *view = parent; wined3d_private_store_cleanup(&view->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d_depth_stencil_view_wined3d_parent_ops = @@ -1367,13 +1367,13 @@ HRESULT d3d_depthstencil_view_create(struct d3d_device *device, ID3D11Resource * struct d3d_depthstencil_view *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d3d_depthstencil_view_init(object, device, resource, desc))) { WARN("Failed to initialize depthstencil view, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -1684,7 +1684,7 @@ static void STDMETHODCALLTYPE d3d_render_target_view_wined3d_object_destroyed(vo struct d3d_rendertarget_view *view = parent; wined3d_private_store_cleanup(&view->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d_render_target_view_wined3d_parent_ops = @@ -1815,13 +1815,13 @@ HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource * struct d3d_rendertarget_view *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d3d_rendertarget_view_init(object, device, resource, desc))) { WARN("Failed to initialize rendertarget view, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -2146,7 +2146,7 @@ static void STDMETHODCALLTYPE d3d_shader_resource_view_wined3d_object_destroyed( struct d3d_shader_resource_view *view = parent; wined3d_private_store_cleanup(&view->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d_shader_resource_view_wined3d_parent_ops = @@ -2316,13 +2316,13 @@ HRESULT d3d_shader_resource_view_create(struct d3d_device *device, ID3D11Resourc struct d3d_shader_resource_view *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d3d_shader_resource_view_init(object, device, resource, desc))) { WARN("Failed to initialize shader resource view, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -2496,7 +2496,7 @@ static void STDMETHODCALLTYPE d3d11_unordered_access_view_wined3d_object_destroy struct d3d11_unordered_access_view *view = parent; wined3d_private_store_cleanup(&view->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops d3d11_unordered_access_view_wined3d_parent_ops = @@ -2625,13 +2625,13 @@ HRESULT d3d11_unordered_access_view_create(struct d3d_device *device, ID3D11Reso struct d3d11_unordered_access_view *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d3d11_unordered_access_view_init(object, device, resource, desc))) { WARN("Failed to initialize unordered access view, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } -- 2.1.4

1 0

[PATCH 4/5] ddraw: Use wined3d_buffer_create() in d3d_device_prepare_index_buffer().
by Henri Verbeet 04 Feb '18

04 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/device.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 28bb2fb..75fd6c4 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3650,15 +3650,22 @@ static HRESULT d3d_device_prepare_index_buffer(struct d3d_device *device, UINT m if (device->index_buffer_size < min_size || !device->index_buffer) { UINT size = max(device->index_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing index buffer to %u bytes\n", size); - hr = wined3d_buffer_create_ib(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &ddraw_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &ddraw_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x\n", device, hr); + ERR("Failed to create index buffer, hr %#x.\n", hr); return hr; } -- 2.1.4

1 0