- wine-devel - winehq.org

[PATCH 1/2] kernel32: Add stub for GetDynamicTimeZoneInformationEffectiveYears().
by Guillaume Charifi 07 Aug '18

07 Aug '18

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/time.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index de6f007999..3060896daa 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -657,6 +657,7 @@ # @ stub GetDurationFormat # @ stub GetDurationFormatEx @ stdcall GetDynamicTimeZoneInformation(ptr) +@ stdcall GetDynamicTimeZoneInformationEffectiveYears(ptr ptr ptr) @ stdcall -ret64 -arch=i386,x86_64 GetEnabledXStateFeatures() @ stdcall GetEnvironmentStrings() GetEnvironmentStringsA @ stdcall GetEnvironmentStringsA() diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 91b2c006c7..57ad10d234 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1447,6 +1447,15 @@ DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo return TIME_ZoneID( (TIME_ZONE_INFORMATION*)tzinfo ); } +/*********************************************************************** + * GetDynamicTimeZoneInformationEffectiveYears (KERNEL32.@) + */ +DWORD WINAPI GetDynamicTimeZoneInformationEffectiveYears(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo, DWORD *first_year, DWORD *last_year) +{ + FIXME("(%p, %p, %p): stub!\n", tzinfo, first_year, last_year); + return ERROR_FILE_NOT_FOUND; +} + /*********************************************************************** * QueryProcessCycleTime (KERNEL32.@) */ -- Guillaume Charifi <guillaume.charifi(a)sfr.fr>

1 1

[PATCH 2/2] wbemprox: Add support for Win32_PnPEntity table
by Andrew Eikum 07 Aug '18

07 Aug '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/builtin.c | 59 +++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 51 ++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index f411898dcd..a86893a45c 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 +IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 setupapi C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 73f4192779..2c472edeec 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -58,6 +58,7 @@ #include "sddl.h" #include "ntsecapi.h" #include "winspool.h" +#include "setupapi.h" #include "wine/debug.h" #include "wbemprox_private.h" @@ -103,6 +104,8 @@ static const WCHAR class_physicalmediaW[] = {'W','i','n','3','2','_','P','h','y','s','i','c','a','l','M','e','d','i','a',0}; static const WCHAR class_physicalmemoryW[] = {'W','i','n','3','2','_','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; +static const WCHAR class_pnpentityW[] = + {'W','i','n','3','2','_','P','n','P','E','n','t','i','t','y',0}; static const WCHAR class_printerW[] = {'W','i','n','3','2','_','P','r','i','n','t','e','r',0}; static const WCHAR class_process_getowner_outW[] = @@ -605,6 +608,10 @@ static const struct column col_physicalmemory[] = { prop_capacityW, CIM_UINT64 }, { prop_memorytypeW, CIM_UINT16, VT_I4 } }; +static const struct column col_pnpentity[] = +{ + { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC }, +}; static const struct column col_printer[] = { { prop_attributesW, CIM_UINT32 }, @@ -1022,6 +1029,10 @@ struct record_physicalmemory UINT64 capacity; UINT16 memorytype; }; +struct record_pnpentity +{ + const WCHAR *device_id; +}; struct record_printer { UINT32 attributes; @@ -2513,6 +2524,53 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e return status; } +static enum fill_status fill_pnpentity( struct table *table, const struct expr *cond ) +{ + struct record_pnpentity *rec; + enum fill_status status = FILL_STATUS_UNFILTERED; + HDEVINFO device_info_set; + SP_DEVINFO_DATA devinfo = {0}; + DWORD idx; + + device_info_set = SetupDiGetClassDevsW( NULL, NULL, NULL, DIGCF_ALLCLASSES|DIGCF_PRESENT ); + + devinfo.cbSize = sizeof(devinfo); + + idx = 0; + while (SetupDiEnumDeviceInfo( device_info_set, idx++, &devinfo )) + { + /* noop */ + } + + resize_table( table, idx, sizeof(*rec) ); + table->num_rows = 0; + rec = (struct record_pnpentity *)table->data; + + idx = 0; + while (SetupDiEnumDeviceInfo( device_info_set, idx++, &devinfo )) + { + WCHAR device_id[MAX_PATH]; + if (SetupDiGetDeviceInstanceIdW( device_info_set, &devinfo, device_id, + ARRAY_SIZE(device_id), NULL )) + { + rec->device_id = heap_strdupW( device_id ); + + table->num_rows++; + if (!match_row( table, table->num_rows - 1, cond, &status )) + { + free_row_values( table, table->num_rows - 1 ); + table->num_rows--; + } + else + rec++; + } + } + + SetupDiDestroyDeviceInfoList( device_info_set ); + + return status; +} + static enum fill_status fill_printer( struct table *table, const struct expr *cond ) { static const WCHAR fmtW[] = {'P','r','i','n','t','e','r','%','d',0}; @@ -3382,6 +3440,7 @@ static struct table builtin_classes[] = { class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), 0, (BYTE *)data_param }, { class_physicalmediaW, SIZEOF(col_physicalmedia), col_physicalmedia, SIZEOF(data_physicalmedia), 0, (BYTE *)data_physicalmedia }, { class_physicalmemoryW, SIZEOF(col_physicalmemory), col_physicalmemory, 0, 0, NULL, fill_physicalmemory }, + { class_pnpentityW, SIZEOF(col_pnpentity), col_pnpentity, 0, 0, NULL, fill_pnpentity }, { class_printerW, SIZEOF(col_printer), col_printer, 0, 0, NULL, fill_printer }, { class_processW, SIZEOF(col_process), col_process, 0, 0, NULL, fill_process }, { class_processorW, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 87b42daeca..39b6ba9c95 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1709,6 +1709,56 @@ static void test_Win32_Printer( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_PnPEntity( IWbemServices *services ) +{ + HRESULT hr; + IEnumWbemClassObject *enm; + IWbemClassObject *obj; + VARIANT val; + CIMTYPE type; + ULONG count, i; + BSTR bstr; + + static WCHAR win32_pnpentityW[] = {'W','i','n','3','2','_','P','n','P','E','n','t','i','t','y',0}; + static const WCHAR deviceidW[] = {'D','e','v','i','c','e','I','d',0}; + + bstr = SysAllocString( win32_pnpentityW ); + + hr = IWbemServices_CreateInstanceEnum( services, bstr, 0, NULL, &enm ); + ok( hr == S_OK, "got %08x\n", hr ); + + SysFreeString( bstr ); + bstr = SysAllocString( deviceidW ); + + while (1) + { + hr = IEnumWbemClassObject_Next( enm, 1000, 1, &obj, &count ); + ok( (count == 1 && (hr == WBEM_S_FALSE || hr == WBEM_S_NO_ERROR)) || + (count == 0 && (hr == WBEM_S_FALSE || hr == WBEM_S_TIMEDOUT)), + "got %08x with %u objects returned\n", hr, count ); + + if (count == 0) + break; + + for (i = 0; i < count; ++i) + { + hr = IWbemClassObject_Get( obj, bstr, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + if (SUCCEEDED( hr )) + { + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + VariantClear( &val ); + } + } + } + + SysFreeString( bstr ); + + IEnumWbemClassObject_Release( enm ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -1753,6 +1803,7 @@ START_TEST(query) test_Win32_Processor( services ); test_Win32_VideoController( services ); test_Win32_Printer( services ); + test_Win32_PnPEntity( services ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.18.0

2 1

[PATCH 1/2] wbemprox/tests: Don't crash on VirtualBox
by Andrew Eikum 07 Aug '18

07 Aug '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/wbemprox/tests/query.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index cb911d7927..87b42daeca 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1368,25 +1368,28 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); ok( hr == S_OK, "got %08x\n", hr ); - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, capacityW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get capacity %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT64, "unexpected type 0x%x\n", type ); - trace( "capacity %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); + if (count > 0) + { + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, capacityW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get capacity %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT64, "unexpected type 0x%x\n", type ); + trace( "capacity %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, memorytypeW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get memory type %08x\n", hr ); - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); - trace( "memorytype %u\n", V_I4( &val ) ); - VariantClear( &val ); + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, memorytypeW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get memory type %08x\n", hr ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); + trace( "memorytype %u\n", V_I4( &val ) ); + VariantClear( &val ); - IWbemClassObject_Release( obj ); + IWbemClassObject_Release( obj ); + } IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); -- 2.18.0

2 1

[PATCH 2/2] wbemprox: Add Win32_NetworkAdapterConfiguration::IPSubnet property.
by Piotr Caban 07 Aug '18

07 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+)

2 1

[PATCH 1/2] wbemprox: Add Win32_NetworkAdapterConfiguration::IPAddress property.
by Piotr Caban 07 Aug '18

07 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)

2 1

[PATCH] msi: Avoid an ARRAY_SIZE-like macro
by Michael Stefaniuc 07 Aug '18

07 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/dialog.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 1e78aa9e39..b96c44be44 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3472,8 +3472,6 @@ static const struct control_handler msi_dialog_handler[] = { szHyperLink, msi_dialog_hyperlink } }; -#define NUM_CONTROL_TYPES (sizeof msi_dialog_handler/sizeof msi_dialog_handler[0]) - static UINT msi_dialog_create_controls( MSIRECORD *rec, LPVOID param ) { msi_dialog *dialog = param; @@ -3482,10 +3480,10 @@ static UINT msi_dialog_create_controls( MSIRECORD *rec, LPVOID param ) /* find and call the function that can create this type of control */ control_type = MSI_RecordGetString( rec, 3 ); - for( i=0; i<NUM_CONTROL_TYPES; i++ ) + for( i = 0; i < ARRAY_SIZE( msi_dialog_handler ); i++ ) if (!strcmpiW( msi_dialog_handler[i].control_type, control_type )) break; - if( i != NUM_CONTROL_TYPES ) + if( i != ARRAY_SIZE( msi_dialog_handler )) msi_dialog_handler[i].func( dialog, rec ); else ERR("no handler for element type %s\n", debugstr_w(control_type)); -- 2.14.4

2 1

[PATCH] msi: Generate unique names for 32- and 64-bit custom action server pipes.
by Zebediah Figura 07 Aug '18

07 Aug '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Observed with the Microsoft Office 2010 installer. Probably also fixes bugs 45483, 45509, and 45537. dlls/msi/custom.c | 6 ++++-- programs/msiexec/msiexec.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 1a8a982..51755f2 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -590,7 +590,7 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) { - static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x',0}; + static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x','_','%','d',0}; static const WCHAR msiexecW[] = {'\\','m','s','i','e','x','e','c','.','e','x','e',0}; static const WCHAR argsW[] = {'%','s',' ','-','E','m','b','e','d','d','i','n','g',' ','%','d',0}; @@ -606,9 +606,11 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) (arch == SCS_64BIT_BINARY && package->custom_server_64_process)) return ERROR_SUCCESS; - sprintfW(buffer, pipe_name, GetCurrentProcessId()); + sprintfW(buffer, pipe_name, GetCurrentProcessId(), arch == SCS_32BIT_BINARY ? 32 : 64); pipe = CreateNamedPipeW(buffer, PIPE_ACCESS_DUPLEX, 0, 1, sizeof(DWORD64), sizeof(GUID), 0, NULL); + if (pipe == INVALID_HANDLE_VALUE) + ERR("Failed to create custom action client pipe: %u\n", GetLastError()); if (sizeof(void *) == 8 && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 5a471a2..c5f9979 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -406,7 +406,7 @@ static DWORD CALLBACK custom_action_thread(void *arg) static int custom_action_server(const WCHAR *arg) { - static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x',0}; + static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x','_','%','d',0}; DWORD client_pid = atoiW(arg); DWORD64 thread64; WCHAR buffer[24]; @@ -423,7 +423,7 @@ static int custom_action_server(const WCHAR *arg) return 1; } - sprintfW(buffer, pipe_name, client_pid); + sprintfW(buffer, pipe_name, client_pid, sizeof(void *) * 8); pipe = CreateFileW(buffer, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); if (pipe == INVALID_HANDLE_VALUE) { -- 2.7.4

2 1

[PATCH resend] msi: Implement deferral for standard and custom actions.
by Zebediah Figura 07 Aug '18

07 Aug '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Resent now that bug 45317 is fixed. dlls/msi/action.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msi/assembly.c | 6 ++++ dlls/msi/classes.c | 24 +++++++++++++ dlls/msi/custom.c | 1 + dlls/msi/files.c | 18 ++++++++++ dlls/msi/font.c | 6 ++++ dlls/msi/msipriv.h | 1 + dlls/msi/tests/custom.c | 70 +------------------------------------ dlls/msi/tests/install.c | 1 - 9 files changed, 143 insertions(+), 73 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 15f1876..bc18982 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -105,8 +105,6 @@ static const WCHAR szIsolateComponents[] = {'I','s','o','l','a','t','e','C','o','m','p','o','n','e','n','t','s',0}; static const WCHAR szMigrateFeatureStates[] = {'M','i','g','r','a','t','e','F','e','a','t','u','r','e','S','t','a','t','e','s',0}; -static const WCHAR szMsiUnpublishAssemblies[] = - {'M','s','i','U','n','p','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0}; static const WCHAR szInstallODBC[] = {'I','n','s','t','a','l','l','O','D','B','C',0}; static const WCHAR szInstallServices[] = @@ -858,6 +856,9 @@ static UINT ACTION_CreateFolders(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szCreateFolders); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -937,6 +938,9 @@ static UINT ACTION_RemoveFolders( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveFolders); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -3011,6 +3015,9 @@ static UINT ACTION_WriteRegistryValues(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szWriteRegistryValues); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -3245,6 +3252,9 @@ static UINT ACTION_RemoveRegistryValues( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveRegistryValues); + rc = MSI_DatabaseOpenViewW( package->db, registry_query, &view ); if (rc == ERROR_SUCCESS) { @@ -3563,9 +3573,13 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) TRACE("\n"); - squash_guid( package->ProductCode, squashed_pc ); msi_set_sourcedir_props(package, FALSE); + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szProcessComponents); + + squash_guid( package->ProductCode, squashed_pc ); + LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { MSIRECORD *uirow; @@ -3839,6 +3853,9 @@ static UINT ACTION_RegisterTypeLibraries(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterTypeLibraries); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -3900,6 +3917,9 @@ static UINT ACTION_UnregisterTypeLibraries( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterTypeLibraries); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4084,6 +4104,9 @@ static UINT ACTION_CreateShortcuts(MSIPACKAGE *package) HRESULT res; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szCreateShortcuts); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4137,6 +4160,9 @@ static UINT ACTION_RemoveShortcuts( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveShortcuts); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4509,6 +4535,9 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) MSIRECORD *uirow; BOOL republish = FALSE; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szPublishProduct); + if (!list_empty(&package->patches)) { rc = msi_publish_patches(package); @@ -4706,6 +4735,9 @@ static UINT ACTION_WriteIniValues(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szWriteIniValues); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4849,6 +4881,9 @@ static UINT ACTION_RemoveIniValues( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveIniValues); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc == ERROR_SUCCESS) { @@ -4934,6 +4969,9 @@ static UINT ACTION_SelfRegModules(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szSelfRegModules); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4984,6 +5022,9 @@ static UINT ACTION_SelfUnregModules( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szSelfUnregModules); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4999,6 +5040,9 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) UINT rc; HKEY hkey = NULL, userdata = NULL; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szPublishFeatures); + if (!msi_check_publish(package)) return ERROR_SUCCESS; @@ -5139,6 +5183,9 @@ static UINT ACTION_UnpublishFeatures(MSIPACKAGE *package) { MSIFEATURE *feature; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnpublishFeatures); + if (!msi_check_unpublish(package)) return ERROR_SUCCESS; @@ -5291,6 +5338,9 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) HKEY hkey, props, upgrade_key; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterProduct); + /* FIXME: also need to publish if the product is in advertise mode */ if (!msi_get_property_int( package->db, szProductToBeRegistered, 0 ) && !msi_check_publish(package)) @@ -5609,6 +5659,9 @@ static UINT ACTION_RegisterUser(MSIPACKAGE *package) {0}, }; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterUser); + if (msi_check_unpublish(package)) { MSIREG_DeleteUserDataProductKey(package->ProductCode, package->Context); @@ -5931,6 +5984,9 @@ static UINT ACTION_PublishComponents(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szPublishComponents); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6003,6 +6059,9 @@ static UINT ACTION_UnpublishComponents( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnpublishComponents); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6151,6 +6210,9 @@ static UINT ACTION_InstallServices( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szInstallServices); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6322,6 +6384,9 @@ static UINT ACTION_StartServices( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szStartServices); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6485,6 +6550,9 @@ static UINT ACTION_StopServices( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szStopServices); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6568,6 +6636,9 @@ static UINT ACTION_DeleteServices( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szDeleteServices); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6838,6 +6909,9 @@ static UINT ACTION_InstallODBC( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szInstallODBC); + rc = MSI_DatabaseOpenViewW(package->db, driver_query, &view); if (rc == ERROR_SUCCESS) { @@ -7016,6 +7090,9 @@ static UINT ACTION_RemoveODBC( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveODBC); + rc = MSI_DatabaseOpenViewW( package->db, driver_query, &view ); if (rc == ERROR_SUCCESS) { @@ -7362,6 +7439,9 @@ static UINT ACTION_WriteEnvironmentStrings( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szWriteEnvironmentStrings); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -7504,6 +7584,9 @@ static UINT ACTION_RemoveEnvironmentStrings( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveEnvironmentStrings); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index bccd114..59fd332 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -652,6 +652,9 @@ UINT ACTION_MsiPublishAssemblies( MSIPACKAGE *package ) { MSICOMPONENT *comp; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szMsiPublishAssemblies); + LIST_FOR_EACH_ENTRY(comp, &package->components, MSICOMPONENT, entry) { LONG res; @@ -717,6 +720,9 @@ UINT ACTION_MsiUnpublishAssemblies( MSIPACKAGE *package ) { MSICOMPONENT *comp; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szMsiUnpublishAssemblies); + LIST_FOR_EACH_ENTRY(comp, &package->components, MSICOMPONENT, entry) { LONG res; diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 60cc3c1..293aa10 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -753,6 +753,9 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) MSICLASS *cls; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterClassInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -918,6 +921,9 @@ UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) HKEY hkey, hkey2; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterClassInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1083,6 +1089,9 @@ UINT ACTION_RegisterProgIdInfo(MSIPACKAGE *package) MSIRECORD *uirow; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterProgIdInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1143,6 +1152,9 @@ UINT ACTION_UnregisterProgIdInfo( MSIPACKAGE *package ) LONG res; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterProgIdInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1255,6 +1267,9 @@ UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package) LONG res; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterExtensionInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1363,6 +1378,9 @@ UINT ACTION_UnregisterExtensionInfo( MSIPACKAGE *package ) LONG res; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterExtensionInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1446,6 +1464,9 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) MSIMIME *mt; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterMIMEInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1500,6 +1521,9 @@ UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) MSIMIME *mime; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterMIMEInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 1a8a982..66f9dca 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1246,6 +1246,7 @@ static BOOL action_type_matches_script( UINT type, UINT script ) switch (script) { case SCRIPT_NONE: + return FALSE; case SCRIPT_INSTALL: return !(type & msidbCustomActionTypeCommit) && !(type & msidbCustomActionTypeRollback); case SCRIPT_COMMIT: diff --git a/dlls/msi/files.c b/dlls/msi/files.c index f6cf3e7..5a88c14 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -359,6 +359,9 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) msi_set_sourcedir_props(package, FALSE); + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szInstallFiles); + schedule_install_files(package); mi = msi_alloc_zero( sizeof(MSIMEDIAINFO) ); @@ -584,6 +587,9 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) TRACE("%p\n", package); + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szPatchFiles); + mi = msi_alloc_zero( sizeof(MSIMEDIAINFO) ); TRACE("extracting files\n"); @@ -1002,6 +1008,9 @@ UINT ACTION_MoveFiles( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szMoveFiles); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -1134,6 +1143,9 @@ UINT ACTION_DuplicateFiles(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szDuplicateFiles); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -1210,6 +1222,9 @@ UINT ACTION_RemoveDuplicateFiles( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveDuplicateFiles); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -1350,6 +1365,9 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) MSIFILE *file; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveFiles); + r = MSI_DatabaseOpenViewW(package->db, query, &view); if (r == ERROR_SUCCESS) { diff --git a/dlls/msi/font.c b/dlls/msi/font.c index 5c1e59d..fc05006 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -294,6 +294,9 @@ UINT ACTION_RegisterFonts(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterFonts); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -374,6 +377,9 @@ UINT ACTION_UnregisterFonts( MSIPACKAGE *package ) MSIQUERY *view; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterFonts); + r = MSI_DatabaseOpenViewW( package->db, query, &view ); if (r != ERROR_SUCCESS) return ERROR_SUCCESS; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 7a65e1a..34bc490 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1190,6 +1190,7 @@ static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o',' static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0}; static const WCHAR szMsiPublishAssemblies[] = {'M','s','i','P','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0}; +static const WCHAR szMsiUnpublishAssemblies[] = {'M','s','i','U','n','p','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0}; static const WCHAR szCostingComplete[] = {'C','o','s','t','i','n','g','C','o','m','p','l','e','t','e',0}; static const WCHAR szTempFolder[] = {'T','e','m','p','F','o','l','d','e','r',0}; static const WCHAR szDatabase[] = {'D','A','T','A','B','A','S','E',0}; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 59a69ee..3989ca8 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1182,52 +1182,42 @@ static BOOL pf_exists(const char *file) UINT WINAPI cf_present(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, pf_exists("msitest\\first"), "folder absent\n"); ok(hinst, pf_exists("msitest\\second"), "folder absent\n"); ok(hinst, pf_exists("msitest\\third"), "folder absent\n"); -} return ERROR_SUCCESS; } UINT WINAPI cf_absent(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, !pf_exists("msitest\\first"), "folder present\n"); ok(hinst, !pf_exists("msitest\\second"), "folder present\n"); ok(hinst, !pf_exists("msitest\\third"), "folder present\n"); -} return ERROR_SUCCESS; } UINT WINAPI file_present(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, pf_exists("msitest\\first\\one.txt"), "file absent\n"); ok(hinst, pf_exists("msitest\\second\\two.txt"), "file absent\n"); -} return ERROR_SUCCESS; } UINT WINAPI file_absent(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, !pf_exists("msitest\\first\\one.txt"), "file present\n"); ok(hinst, !pf_exists("msitest\\second\\two.txt"), "file present\n"); -} return ERROR_SUCCESS; } UINT WINAPI crs_present(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, pf_exists("msitest\\shortcut.lnk"), "shortcut absent\n"); return ERROR_SUCCESS; } UINT WINAPI crs_absent(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, !pf_exists("msitest\\shortcut.lnk"), "shortcut present\n"); return ERROR_SUCCESS; } @@ -1237,7 +1227,6 @@ UINT WINAPI sds_present(MSIHANDLE hinst) SC_HANDLE manager, service; manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); service = OpenServiceA(manager, "TestService3", GENERIC_ALL); -todo_wine ok(hinst, !!service, "service absent: %u\n", GetLastError()); CloseServiceHandle(service); CloseServiceHandle(manager); @@ -1271,7 +1260,6 @@ UINT WINAPI sis_absent(MSIHANDLE hinst) SC_HANDLE manager, service; manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); service = OpenServiceA(manager, "TestService", GENERIC_ALL); -todo_wine ok(hinst, !service, "service present\n"); if (service) CloseServiceHandle(service); CloseServiceHandle(manager); @@ -1288,7 +1276,6 @@ UINT WINAPI sss_started(MSIHANDLE hinst) service = OpenServiceA(manager, "Spooler", SC_MANAGER_ALL_ACCESS); ret = QueryServiceStatus(service, &status); ok(hinst, ret, "QueryServiceStatus failed: %u\n", GetLastError()); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, status.dwCurrentState == SERVICE_RUNNING, "got %u\n", status.dwCurrentState); CloseServiceHandle(service); @@ -1315,10 +1302,8 @@ UINT WINAPI sss_stopped(MSIHANDLE hinst) UINT WINAPI rd_present(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, pf_exists("msitest\\original2.txt"), "file absent\n"); ok(hinst, pf_exists("msitest\\duplicate.txt"), "file absent\n"); -} ok(hinst, !pf_exists("msitest\\original3.txt"), "file present\n"); ok(hinst, !pf_exists("msitest\\duplicate2.txt"), "file present\n"); return ERROR_SUCCESS; @@ -1326,10 +1311,8 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { UINT WINAPI rd_absent(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, !pf_exists("msitest\\original2.txt"), "file present\n"); ok(hinst, !pf_exists("msitest\\duplicate.txt"), "file present\n"); -} ok(hinst, !pf_exists("msitest\\original3.txt"), "file present\n"); ok(hinst, !pf_exists("msitest\\duplicate2.txt"), "file present\n"); return ERROR_SUCCESS; @@ -1352,10 +1335,8 @@ UINT WINAPI odbc_present(MSIHANDLE hinst) if (!strcmp(p, "ODBC test driver2")) gotdriver2 = 1; } -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, gotdriver, "driver absent\n"); ok(hinst, gotdriver2, "driver 2 absent\n"); -} return ERROR_SUCCESS; } @@ -1376,10 +1357,8 @@ UINT WINAPI odbc_absent(MSIHANDLE hinst) if (!strcmp(p, "ODBC test driver2")) gotdriver2 = 1; } -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, !gotdriver, "driver present\n"); ok(hinst, !gotdriver2, "driver 2 present\n"); -} return ERROR_SUCCESS; } @@ -1392,10 +1371,8 @@ UINT WINAPI mov_present(MSIHANDLE hinst) UINT WINAPI mov_absent(MSIHANDLE hinst) { -todo_wine { ok(hinst, !pf_exists("msitest\\canada"), "file present\n"); ok(hinst, !pf_exists("msitest\\dominica"), "file present\n"); -} return ERROR_SUCCESS; } @@ -1429,9 +1406,7 @@ UINT WINAPI pa_present(MSIHANDLE hinst) res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &key); ok(hinst, !res, "got %d\n", res); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, name_dotnet, "rcHQPHq?CA@Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]"); -} RegCloseKey(key); return ERROR_SUCCESS; @@ -1446,9 +1421,7 @@ UINT WINAPI pa_absent(MSIHANDLE hinst) ok(hinst, !res || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (!res) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, name_dotnet, NULL); -} RegCloseKey(key); } return ERROR_SUCCESS; @@ -1481,7 +1454,6 @@ UINT WINAPI ppc_absent(MSIHANDLE hinst) UINT r; r = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ppc_key, 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &key); -todo_wine ok(hinst, r == ERROR_FILE_NOT_FOUND, "got %u\n", r); return ERROR_SUCCESS; } @@ -1493,12 +1465,10 @@ UINT WINAPI pub_present(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CURRENT_USER, pub_key, &key); ok(hinst, !res, "got %u\n", res); res = RegQueryValueExA(key, "english.txt", NULL, NULL, NULL, NULL); ok(hinst, !res, "got %u\n", res); -} RegCloseKey(key); return ERROR_SUCCESS; } @@ -1509,7 +1479,6 @@ UINT WINAPI pub_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyA(HKEY_CURRENT_USER, pub_key, &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; } @@ -1523,7 +1492,6 @@ UINT WINAPI pf_present(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyExA(HKEY_CLASSES_ROOT, pf_classkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); ok(hinst, !res, "got %u\n", res); check_reg_str(hinst, key, "feature", ""); @@ -1535,7 +1503,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, "feature", "VGtfp^p+,?82@JU1j_KE"); check_reg_str(hinst, key, "montecristo", "VGtfp^p+,?82@JU1j_KE"); RegCloseKey(key); -} return ERROR_SUCCESS; } @@ -1546,11 +1513,9 @@ UINT WINAPI pf_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, pf_classkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, pf_userkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1579,7 +1544,6 @@ UINT WINAPI pp_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, pp_prodkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); -todo_wine ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1590,7 +1554,6 @@ UINT WINAPI rci_present(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", 0, KEY_READ | KEY_WOW64_32KEY, &key); ok(hinst, !res, "got %u\n", res); @@ -1603,7 +1566,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, "AppID\\{CFCC3B38-E683-497D-9AB4-CB40AAFE307F}", &key); ok(hinst, !res, "got %u\n", res); RegCloseKey(key); -} return ERROR_SUCCESS; } @@ -1613,7 +1575,6 @@ UINT WINAPI rci_absent(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", 0, KEY_READ | KEY_WOW64_32KEY, &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); @@ -1623,7 +1584,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, "AppID\\{CFCC3B38-E683-497D-9AB4-CB40AAFE307F}", &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); -} return ERROR_SUCCESS; } @@ -1633,7 +1593,6 @@ UINT WINAPI rei_present(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, ".extension", &key); ok(hinst, !res, "got %u\n", res); RegCloseKey(key); @@ -1641,7 +1600,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Prog.Id.1\\shell\\Open\\command", &key); ok(hinst, !res, "got %u\n", res); RegCloseKey(key); -} return ERROR_SUCCESS; } @@ -1651,13 +1609,11 @@ UINT WINAPI rei_absent(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, ".extension", &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Prog.Id.1\\shell\\Open\\command", &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); -} return ERROR_SUCCESS; } @@ -1672,7 +1628,6 @@ UINT WINAPI font_present(MSIHANDLE hinst) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, font_key, 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &key); ok(hinst, !res, "got %u\n", res); res = RegQueryValueExA(key, "msi test font", NULL, NULL, NULL, NULL); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, !res, "got %u\n", res); RegCloseKey(key); @@ -1686,9 +1641,7 @@ UINT WINAPI font_absent(MSIHANDLE hinst) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, font_key, 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &key); ok(hinst, !res, "got %u\n", res); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, "msi test font", NULL); -} RegCloseKey(key); return ERROR_SUCCESS; @@ -1700,7 +1653,6 @@ UINT WINAPI rmi_present(MSIHANDLE hinst) LONG res; res = RegOpenKeyA(HKEY_CLASSES_ROOT, "MIME\\Database\\Content Type\\mime/type", &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, !res, "got %u\n", res); return ERROR_SUCCESS; @@ -1712,7 +1664,6 @@ UINT WINAPI rmi_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyA(HKEY_CLASSES_ROOT, "MIME\\Database\\Content Type\\mime/type", &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1740,7 +1691,6 @@ UINT WINAPI rp_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, rp_key, 0, KEY_READ | KEY_WOW64_32KEY, &key); -todo_wine ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1751,7 +1701,6 @@ UINT WINAPI rpi_present(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", 0, KEY_READ | KEY_WOW64_32KEY, &key); ok(hinst, !res, "got %u\n", res); @@ -1768,7 +1717,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class.2", &key); ok(hinst, !res, "got %u\n", res); RegCloseKey(key); -} return ERROR_SUCCESS; } @@ -1778,7 +1726,6 @@ UINT WINAPI rpi_absent(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", 0, KEY_READ | KEY_WOW64_32KEY, &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); @@ -1791,7 +1738,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class.2", &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); -} return ERROR_SUCCESS; } @@ -1818,7 +1764,6 @@ UINT WINAPI ru_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ru_key, 0, KEY_READ | KEY_WOW64_64KEY, &key); -todo_wine ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1833,10 +1778,8 @@ UINT WINAPI tl_present(MSIHANDLE hinst) HRESULT hr; hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, hr == S_OK, "got %#x\n", hr); - if (tlb) - ITypeLib_Release(tlb); + ITypeLib_Release(tlb); return ERROR_SUCCESS; } @@ -1847,7 +1790,6 @@ UINT WINAPI tl_absent(MSIHANDLE hinst) HRESULT hr; hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, hr == TYPE_E_LIBNOTREGISTERED, "got %#x\n", hr); return ERROR_SUCCESS; @@ -1859,7 +1801,6 @@ UINT WINAPI sr_present(MSIHANDLE hinst) LONG res; res = RegOpenKeyA(HKEY_CLASSES_ROOT, "selfreg_test", &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, !res, "got %u\n", res); RegCloseKey(key); @@ -1872,7 +1813,6 @@ UINT WINAPI sr_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyA(HKEY_CLASSES_ROOT, "selfreg_test", &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1885,10 +1825,8 @@ UINT WINAPI env_present(MSIHANDLE hinst) res = RegOpenKeyA(HKEY_CURRENT_USER, "Environment", &key); ok(hinst, !res, "got %u\n", res); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, "MSITESTVAR3", "1"); check_reg_str(hinst, key, "MSITESTVAR4", "1"); -} RegCloseKey(key); return ERROR_SUCCESS; @@ -1901,10 +1839,8 @@ UINT WINAPI env_absent(MSIHANDLE hinst) res = RegOpenKeyA(HKEY_CURRENT_USER, "Environment", &key); ok(hinst, !res, "got %u\n", res); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, "MSITESTVAR3", NULL); check_reg_str(hinst, key, "MSITESTVAR4", NULL); -} RegCloseKey(key); return ERROR_SUCCESS; @@ -1920,7 +1856,6 @@ UINT WINAPI ini_present(MSIHANDLE hinst) strcat(path, "\\msitest\\test.ini"); len = GetPrivateProfileStringA("section1", "key1", NULL, buf, sizeof(buf), path); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, len == 6, "got %u\n", len); return ERROR_SUCCESS; @@ -1936,7 +1871,6 @@ UINT WINAPI ini_absent(MSIHANDLE hinst) strcat(path, "\\msitest\\test.ini"); len = GetPrivateProfileStringA("section1", "key1", NULL, buf, sizeof(buf), path); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, !len, "got %u\n", len); return ERROR_SUCCESS; @@ -1949,7 +1883,6 @@ UINT WINAPI wrv_present(MSIHANDLE hinst) res = RegOpenKeyA(HKEY_CURRENT_USER, "msitest", &key); ok(hinst, !res, "got %u\n", res); - todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) check_reg_str(hinst, key, "sz", "string"); RegCloseKey(key); @@ -1963,7 +1896,6 @@ UINT WINAPI wrv_absent(MSIHANDLE hinst) res = RegOpenKeyA(HKEY_CURRENT_USER, "msitest", &key); ok(hinst, !res, "got %u\n", res); - todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) check_reg_str(hinst, key, "sz", NULL); RegCloseKey(key); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 80137c1..e147df6 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6086,7 +6086,6 @@ static void test_deferred_action(void) } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); -todo_wine check_file_matches(file, "onetwo"); ok(DeleteFileA(file), "Directory not created\n"); -- 2.7.4

3 2

[PATCH] msiexec: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 07 Aug '18

07 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/msiexec/msiexec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 5a471a2184..47cef7e0fa 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -71,11 +71,11 @@ static void ShowUsage(int ExitCode) /* MsiGetFileVersion need the full path */ *filename = 0; - res = GetModuleFileNameW(hmsi, filename, sizeof(filename) / sizeof(filename[0])); + res = GetModuleFileNameW(hmsi, filename, ARRAY_SIZE(filename)); if (!res) WINE_ERR("GetModuleFileName failed: %d\n", GetLastError()); - len = sizeof(msiexec_version) / sizeof(msiexec_version[0]); + len = ARRAY_SIZE(msiexec_version); *msiexec_version = 0; res = MsiGetFileVersionW(filename, msiexec_version, &len, NULL, NULL); if (res) -- 2.14.4

2 1

[PATCH] msi: do not free hPackage twice or uninitialized (Coverity)
by Marcus Meissner 07 Aug '18

07 Aug '18

1438056 Uninitialized scalar variable Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/msi/custom.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 1a8a982e48..0d683d5a80 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -581,7 +581,6 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) FreeLibrary(hModule); - MsiCloseHandle(hPackage); midl_user_free(dll); midl_user_free(proc); -- 2.18.0

2 1

[PATCH] winex11: Remove redeclaration of VkXlibSurfaceCreateFlagsKHR.
by Józef Kucia 07 Aug '18

07 Aug '18

VkXlibSurfaceCreateFlagsKHR is also declared in wine/vulkan.h. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45554 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winex11.drv/vulkan.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index f9eea74d1bde..5de855715f36 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -55,7 +55,6 @@ static CRITICAL_SECTION context_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static XContext vulkan_hwnd_context; -typedef VkFlags VkXlibSurfaceCreateFlagsKHR; #define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000 struct wine_vk_surface -- 2.16.4

1 0

[PATCH 2/2] ntdll: Don't allow blocking on a critical section during process termination.
by Dmitry Timoshkov 07 Aug '18

07 Aug '18

As a result HeapLock() no longer blocks process termination since underlying implementation uses a critical section. However this should be considered as a minor side effect because applications shouldn't depend on this behaviour. This patch should fix the deadlocks observered during various .net setups, and it appears that this is what Windows does as well. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/loader.c | 4 +++- dlls/ntdll/critsection.c | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 46c09d41cb..e4d6741b6f 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2169,6 +2169,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) * doesn't call the DLL entry point on process detach either. */ HeapLock(GetProcessHeap()); +todo_wine ok(0, "dll_entry_point: process should already deadlock\n"); break; } @@ -3023,6 +3024,7 @@ static void test_ExitProcess(void) ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); ret = WaitForSingleObject(pi.hProcess, 5000); +todo_wine ok(ret == WAIT_TIMEOUT || broken(ret == WAIT_OBJECT_0) /* XP */, "child process should fail to terminate\n"); if (ret != WAIT_OBJECT_0) { @@ -3032,6 +3034,7 @@ static void test_ExitProcess(void) ret = WaitForSingleObject(pi.hProcess, 1000); ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); +todo_wine ok(ret == 201 || broken(ret == 1) /* XP */, "expected exit code 201, got %u\n", ret); if (*child_failures) { @@ -3047,7 +3050,6 @@ static void test_ExitProcess(void) ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); ret = WaitForSingleObject(pi.hProcess, 5000); -todo_wine ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); if (ret != WAIT_OBJECT_0) { diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index e405b08a5a..42e432c8f6 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -436,6 +436,15 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) { LONGLONG timeout = NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart / -10000000; + + /* Don't allow blocking on a critical section during process termination */ + if (RtlDllShutdownInProgress()) + { + WARN( "process %s is shutting down, returning STATUS_SUCCESS\n", + debugstr_w(NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer) ); + return STATUS_SUCCESS; + } + for (;;) { EXCEPTION_RECORD rec; -- 2.17.1

2 1

[PATCH 1/2] kernel32/tests: Add a test for holding a critical section during process termination.
by Dmitry Timoshkov 07 Aug '18

07 Aug '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/loader.c | 67 +++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 38ae3685dc..46c09d41cb 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2006,13 +2006,15 @@ static void test_import_resolution(void) #define MAX_COUNT 10 static HANDLE attached_thread[MAX_COUNT]; static DWORD attached_thread_count; -HANDLE stop_event, event, mutex, semaphore, loader_lock_event, peb_lock_event, heap_lock_event, ack_event; -static int test_dll_phase, inside_loader_lock, inside_peb_lock, inside_heap_lock; +static HANDLE event, mutex, semaphore; +static HANDLE stop_event, loader_lock_event, peb_lock_event, heap_lock_event, cs_lock_event, ack_event; +static CRITICAL_SECTION cs_lock; +static int test_dll_phase, inside_loader_lock, inside_peb_lock, inside_heap_lock, inside_cs_lock; static LONG fls_callback_count; static DWORD WINAPI mutex_thread_proc(void *param) { - HANDLE wait_list[4]; + HANDLE wait_list[5]; DWORD ret; ret = WaitForSingleObject(mutex, 0); @@ -2024,6 +2026,7 @@ static DWORD WINAPI mutex_thread_proc(void *param) wait_list[1] = loader_lock_event; wait_list[2] = peb_lock_event; wait_list[3] = heap_lock_event; + wait_list[4] = cs_lock_event; trace("%04x: mutex_thread_proc: starting\n", GetCurrentThreadId()); while (1) @@ -2053,6 +2056,13 @@ static DWORD WINAPI mutex_thread_proc(void *param) inside_heap_lock++; SetEvent(ack_event); } + else if (ret == WAIT_OBJECT_0 + 4) + { + trace("%04x: mutex_thread_proc: Entering CS lock\n", GetCurrentThreadId()); + EnterCriticalSection(&cs_lock); + inside_cs_lock++; + SetEvent(ack_event); + } } trace("%04x: mutex_thread_proc: exiting\n", GetCurrentThreadId()); @@ -2162,14 +2172,19 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ok(0, "dll_entry_point: process should already deadlock\n"); break; } + else if (test_dll_phase == 7) + { + EnterCriticalSection(&cs_lock); + } - if (test_dll_phase == 0 || test_dll_phase == 1 || test_dll_phase == 3) + if (test_dll_phase == 0 || test_dll_phase == 1 || test_dll_phase == 3 || test_dll_phase == 7) ok(param != NULL, "dll: param %p\n", param); else ok(!param, "dll: param %p\n", param); if (test_dll_phase == 0 || test_dll_phase == 1) expected_code = 195; else if (test_dll_phase == 3) expected_code = 196; + else if (test_dll_phase == 7) expected_code = 199; else expected_code = STILL_ACTIVE; if (test_dll_phase == 3) @@ -2487,6 +2502,11 @@ static void child_process(const char *dll_name, DWORD target_offset) heap_lock_event = CreateEventW(NULL, FALSE, FALSE, NULL); ok(heap_lock_event != 0, "CreateEvent error %d\n", GetLastError()); + InitializeCriticalSection(&cs_lock); + SetLastError(0xdeadbeef); + cs_lock_event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(cs_lock_event != 0, "CreateEvent error %d\n", GetLastError()); + SetLastError(0xdeadbeef); ack_event = CreateEventW(NULL, FALSE, FALSE, NULL); ok(ack_event != 0, "CreateEvent error %d\n", GetLastError()); @@ -2703,6 +2723,20 @@ static void child_process(const char *dll_name, DWORD target_offset) ok(0, "ExitProcess should not return\n"); break; + case 7: + trace("setting cs_lock_event\n"); + SetEvent(cs_lock_event); + WaitForSingleObject(ack_event, 1000); + ok(inside_cs_lock != 0, "inside_cs_lock is not set\n"); + + *child_failures = winetest_get_failures(); + + /* calling ExitProcess should not cause a deadlock */ + trace("call ExitProcess(199)\n"); + ExitProcess(199); + ok(0, "ExitProcess should not return\n"); + break; + default: assert(0); break; @@ -3007,6 +3041,31 @@ static void test_ExitProcess(void) CloseHandle(pi.hThread); CloseHandle(pi.hProcess); + /* phase 7 */ + *child_failures = -1; + sprintf(cmdline, "\"%s\" loader %s %u 7", argv[0], dll_name, target_offset); + ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); + ret = WaitForSingleObject(pi.hProcess, 5000); +todo_wine + ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); + if (ret != WAIT_OBJECT_0) + { + trace("terminating child process\n"); + TerminateProcess(pi.hProcess, 199); + } + ret = WaitForSingleObject(pi.hProcess, 1000); + ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); + GetExitCodeProcess(pi.hProcess, &ret); + ok(ret == 199, "expected exit code 199, got %u\n", ret); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + /* test remote process termination */ SetLastError(0xdeadbeef); ret = CreateProcessA(argv[0], NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi); -- 2.17.1

1 0

[PATCH v2 1/2] winex11.drv: optimise ChangeDisplaySettingsEx mode tests
by Rob Walker 06 Aug '18

06 Aug '18

Add pre-tests for the requested mode bpp and frequency. Fields: DM_PELSWIDTH , DM_PELSHEIGHT are re-tested in the testing loop multiple times. These fields must both be set and have already been tested before the loop. Signed-off-by: Rob Walker <bob.mt.wya(a)gmail.com> --- dlls/winex11.drv/settings.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index afa26cf543..b0164d5806 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -344,7 +344,7 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, { DWORD i, dwBpp = 0; DEVMODEW dm; - BOOL def_mode = TRUE; + BOOL def_mode = TRUE, test_bpp, test_frequency; TRACE("(%s,%p,%p,0x%08x,%p)\n",debugstr_w(devname),devmode,hwnd,flags,lpvoid); TRACE("flags=%s\n",_CDS_flags(flags)); @@ -387,29 +387,24 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, return DISP_CHANGE_BADMODE; } + test_bpp = devmode->dmFields & DM_BITSPERPEL; + test_frequency = (devmode->dmFields & DM_DISPLAYFREQUENCY) && + (devmode->dmDisplayFrequency != 0); for (i = 0; i < dd_mode_count; i++) { - if (devmode->dmFields & DM_BITSPERPEL) + if (devmode->dmPelsWidth != dd_modes[i].width) continue; + if (devmode->dmPelsHeight != dd_modes[i].height) continue; + if (test_bpp) { if (dwBpp != dd_modes[i].bpp) continue; } - if (devmode->dmFields & DM_PELSWIDTH) - { - if (devmode->dmPelsWidth != dd_modes[i].width) - continue; - } - if (devmode->dmFields & DM_PELSHEIGHT) - { - if (devmode->dmPelsHeight != dd_modes[i].height) - continue; - } - if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (dd_modes[i].refresh_rate != 0) && - devmode->dmDisplayFrequency != 0) + if (test_frequency && (dd_modes[i].refresh_rate != 0)) { if (devmode->dmDisplayFrequency != dd_modes[i].refresh_rate) continue; } + /* we have a valid mode */ TRACE("Requested display settings match mode %d (%s)\n", i, handler_name); -- 2.18.0

2 2

[PATCH 1/2] winex11.drv: optimise mode tests in X11DRV_ChangeDisplaySettingsEx Fields: DM_PELSWIDTH , DM_PELSHEIGHT are re-tested in the mode testing loop multiple times. However these fields have already been tested before the loop. Add pre-tests for the requested mode bpp and frequency.
by Rob Walker 06 Aug '18

06 Aug '18

--- dlls/winex11.drv/settings.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index afa26cf543..b0164d5806 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -344,7 +344,7 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, { DWORD i, dwBpp = 0; DEVMODEW dm; - BOOL def_mode = TRUE; + BOOL def_mode = TRUE, test_bpp, test_frequency; TRACE("(%s,%p,%p,0x%08x,%p)\n",debugstr_w(devname),devmode,hwnd,flags,lpvoid); TRACE("flags=%s\n",_CDS_flags(flags)); @@ -387,29 +387,24 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, return DISP_CHANGE_BADMODE; } + test_bpp = devmode->dmFields & DM_BITSPERPEL; + test_frequency = (devmode->dmFields & DM_DISPLAYFREQUENCY) && + (devmode->dmDisplayFrequency != 0); for (i = 0; i < dd_mode_count; i++) { - if (devmode->dmFields & DM_BITSPERPEL) + if (devmode->dmPelsWidth != dd_modes[i].width) continue; + if (devmode->dmPelsHeight != dd_modes[i].height) continue; + if (test_bpp) { if (dwBpp != dd_modes[i].bpp) continue; } - if (devmode->dmFields & DM_PELSWIDTH) - { - if (devmode->dmPelsWidth != dd_modes[i].width) - continue; - } - if (devmode->dmFields & DM_PELSHEIGHT) - { - if (devmode->dmPelsHeight != dd_modes[i].height) - continue; - } - if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (dd_modes[i].refresh_rate != 0) && - devmode->dmDisplayFrequency != 0) + if (test_frequency && (dd_modes[i].refresh_rate != 0)) { if (devmode->dmDisplayFrequency != dd_modes[i].refresh_rate) continue; } + /* we have a valid mode */ TRACE("Requested display settings match mode %d (%s)\n", i, handler_name); -- 2.18.0

3 3

[PATCH] dinput: Use vid/pid for first chunk of product guid on OSX, too
by Andrew Eikum 06 Aug '18

06 Aug '18

This is already done on the linux backends. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/dinput/joystick_osx.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index b0dcdd99d5..282b6c2790 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -932,18 +932,31 @@ static INT find_joystick_devices(void) return joystick_devices_count; } +static DWORD make_vid_pid(IOHIDDeviceRef device) +{ + long vendID, prodID; + + vendID = get_device_property_long(device, CFSTR(kIOHIDVendorIDKey)); + prodID = get_device_property_long(device, CFSTR(kIOHIDProductIDKey)); + + return MAKELONG(vendID, prodID); +} + static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { + IOHIDDeviceRef device; + TRACE("dwDevType %u dwFlags 0x%08x version 0x%04x id %d\n", dwDevType, dwFlags, version, id); if (id >= find_joystick_devices()) return E_FAIL; + device = get_device_ref(id); + if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { if (dwFlags & DIEDFL_FORCEFEEDBACK) { - IOHIDDeviceRef device = get_device_ref(id); if(!device) return S_FALSE; if(get_ff(device, NULL) != S_OK) @@ -953,6 +966,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS lpddi->guidInstance = DInput_Wine_OsX_Joystick_GUID; lpddi->guidInstance.Data3 = id; lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; + lpddi->guidProduct.Data1 = make_vid_pid(device); /* we only support traditional joysticks for now */ if (version >= 0x0800) lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); @@ -993,6 +1007,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS lpddi->guidInstance = DInput_Wine_OsX_Joystick_GUID; lpddi->guidInstance.Data3 = id; lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; + lpddi->guidProduct.Data1 = make_vid_pid(device); /* we only support traditional joysticks for now */ if (version >= 0x0800) lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); @@ -1060,9 +1075,12 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, newDevice->id = index; + device = get_device_ref(index); + newDevice->generic.guidInstance = DInput_Wine_OsX_Joystick_GUID; newDevice->generic.guidInstance.Data3 = index; newDevice->generic.guidProduct = DInput_Wine_OsX_Joystick_GUID; + newDevice->generic.guidProduct.Data1 = make_vid_pid(device); newDevice->generic.joy_polldev = poll_osx_device_state; /* get the device name */ @@ -1074,7 +1092,6 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, strcpy(newDevice->generic.name, name); list_init(&newDevice->effects); - device = get_device_ref(index); if(get_ff(device, &newDevice->ff) == S_OK){ newDevice->generic.devcaps.dwFlags |= DIDC_FORCEFEEDBACK; -- 2.18.0

1 0

[PATCH] mscat.h: Add missing declarations.
by Jacek Caban 06 Aug '18

06 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mscat.h | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH v2] hidclass.sys: Unload all devices before unloading a minidriver
by Aric Stewart 06 Aug '18

06 Aug '18

v2: recomendations from Zhiyi Zhang Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/hid.h | 8 ++++++++ dlls/hidclass.sys/main.c | 8 ++++++++ dlls/hidclass.sys/pnp.c | 35 +++++++++++++++++++++++++++++++---- 3 files changed, 47 insertions(+), 4 deletions(-)

1 0

[PATCH v7 1/2] riched20: Initialize style_list before ME_MakeFirstParagraph().
by Jactry Zeng 06 Aug '18

06 Aug '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8020117fd2..12f1fa67c1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3047,6 +3047,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->pBuffer = ME_MakeText(); ed->nZoomNumerator = ed->nZoomDenominator = 0; ed->nAvailWidth = 0; /* wrap to client area */ + list_init( &ed->style_list ); ME_MakeFirstParagraph(ed); /* The four cursors are for: * 0 - The position where the caret is shown @@ -3146,7 +3147,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->wheel_remain = 0; - list_init( &ed->style_list ); list_init( &ed->reobj_list ); OleInitialize(NULL); -- 2.18.0

1 0

[PATCH 1/5] [programs/cmd] Fix shortpath handling in for loops
by Jason Edmeades 05 Aug '18

05 Aug '18

Fixes todo in tests When 's' is used as a modifier, the paths that are presented to the other modifiers needs to be a short path. Given the 'filename' part of the path may not exist, we cannot use GetShortPathName directly without first removing the filename part to just leave the directory bit. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> --- programs/cmd/batch.c | 17 +++++++++++++---- programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++------ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 1a78b55557..e10baf852c 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -399,6 +399,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) WCHAR finaloutput[MAX_PATH]; WCHAR fullfilename[MAX_PATH]; WCHAR thisoutput[MAX_PATH]; + WCHAR *filepart = NULL; WCHAR *pos = *start+1; WCHAR *firstModifier = pos; WCHAR *lastModifier = NULL; @@ -522,7 +523,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* After this, we need full information on the file, which is valid not to exist. */ if (!skipFileParsing) { - if (GetFullPathNameW(outputparam, MAX_PATH, fullfilename, NULL) == 0) { + if (GetFullPathNameW(outputparam, MAX_PATH, fullfilename, &filepart) == 0) { exists = FALSE; fullfilename[0] = 0x00; } else { @@ -598,8 +599,16 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* 4. Handle 's' : Use short paths (File doesn't have to exist) */ if (memchrW(firstModifier, 's', modifierLen) != NULL) { if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); - /* Don't flag as doneModifier - %~s on its own is processed later */ - GetShortPathNameW(outputparam, outputparam, sizeof(outputparam)/sizeof(outputparam[0])); + + /* Convert fullfilename's path to a short path - Save filename away as + only path is valid, name may not exist which causes GetShortPathName + to fail if it is provided */ + if (filepart) { + strcpyW(thisoutput, filepart); + *filepart = 0x00; + GetShortPathNameW(fullfilename, fullfilename, sizeof(fullfilename)/sizeof(fullfilename[0])); + strcatW(fullfilename, thisoutput); + } } /* 5. Handle 'f' : Fully qualified path (File doesn't have to exist) */ @@ -673,7 +682,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) memchrW(firstModifier, 's', modifierLen) != NULL) { doneModifier = TRUE; if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); - strcatW(finaloutput, outputparam); + strcatW(finaloutput, fullfilename); } } } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 3118359265..b96d38ff0a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -527,9 +527,9 @@ N '.OOL' '.TABC' '' -@todo_wine@'@drive@@shortpath@R S'@or_broken@'' -@todo_wine@'@drive@@shortpath@T'@or_broken@'' -@todo_wine@'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' +'@drive@@shortpath@R S'@or_broken@'' +'@drive@@shortpath@T'@or_broken@'' +'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' ''@or_broken@'%~ai' ''@or_broken@'%~ai' '--a------'@or_broken@'--a--------'@or_broken@'--a--c---'@or_broken@'%~ai' @@ -563,9 +563,9 @@ N '.OOL' '.TABC' '' -@todo_wine@'@drive@@shortpath@R S'@or_broken@'' -@todo_wine@'@drive@@shortpath@T'@or_broken@'' -@todo_wine@'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' +'@drive@@shortpath@R S'@or_broken@'' +'@drive@@shortpath@T'@or_broken@'' +'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' @drive@@path@ @drive@@path@ @drive@ -- 2.17.1

1 4

[PATCH] wininet: Always copy the password even if blank
by Alistair Leslie-Hughes 05 Aug '18

05 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c699c5b..5aaff9a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5809,7 +5809,7 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, session->hostName = heap_strdupW(lpszServerName); if (lpszUserName && lpszUserName[0]) session->userName = heap_strdupW(lpszUserName); - if (lpszPassword && lpszPassword[0]) + if (lpszPassword) session->password = heap_strdupW(lpszPassword); session->hostPort = serverPort; session->connect_timeout = hIC->connect_timeout; -- 1.9.1

1 0

[PATCH] hidclass.sys: Unload all devices before unloading a minidriver
by Aric Stewart 05 Aug '18

05 Aug '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/hid.h | 8 ++++++++ dlls/hidclass.sys/main.c | 8 ++++++++ dlls/hidclass.sys/pnp.c | 35 +++++++++++++++++++++++++++++++---- 3 files changed, 47 insertions(+), 4 deletions(-)

2 1

[PATCH v2 3/3] iphlpapi: Improve parameter checking for IcmpSendEcho().
by Zhiyi Zhang 05 Aug '18

05 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/iphlpapi/icmp.c | 9 +++++++-- dlls/iphlpapi/tests/iphlpapi.c | 8 -------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 159b7bef18..3e53bfd409 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -290,11 +290,16 @@ DWORD WINAPI IcmpSendEcho( if (IcmpHandle==INVALID_HANDLE_VALUE) { /* FIXME: in fact win98 seems to ignore the handle value !!! */ - SetLastError(ERROR_INVALID_HANDLE); + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (!ReplyBuffer||!ReplySize) { + SetLastError(ERROR_INVALID_PARAMETER); return 0; } - if (ReplySize<sizeof(ICMP_ECHO_REPLY)+ICMP_MINLEN) { + if (ReplySize<sizeof(ICMP_ECHO_REPLY)) { SetLastError(IP_BUF_TOO_SMALL); return 0; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index f964878d68..ff381c5e29 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -966,7 +966,6 @@ static void testIcmpSendEcho(void) ret = pIcmpSendEcho(INVALID_HANDLE_VALUE, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == ERROR_INVALID_PARAMETER || broken(error == ERROR_INVALID_HANDLE) /* <= 2003 */, "expected 87, got %d\n", error); @@ -1009,20 +1008,16 @@ todo_wine error = GetLastError(); ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); - if (0) /* crashes in wine, remove IF when fixed */ - { SetLastError(0xdeadbeef); ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); - } SetLastError(0xdeadbeef); ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, 0, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == ERROR_INVALID_PARAMETER || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, "expected 87, got %d\n", error); @@ -1031,7 +1026,6 @@ todo_wine ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, 0, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == ERROR_INVALID_PARAMETER || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, "expected 87, got %d\n", error); @@ -1049,7 +1043,6 @@ todo_wine replysz = sizeof(ICMP_ECHO_REPLY); ret = pIcmpSendEcho(icmp, address, senddata, 0, NULL, replydata, replysz, 1000); error = GetLastError(); -todo_wine ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); SetLastError(0xdeadbeef); @@ -1071,7 +1064,6 @@ todo_wine ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz - 1, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == IP_GENERAL_FAILURE || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, "expected 11050, got %d\n", error); -- 2.17.1

1 0

[PATCH v2 2/3] iphlpapi: Report NO_ERROR when succeeded.
by Zhiyi Zhang 05 Aug '18

05 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/iphlpapi/icmp.c | 3 +++ dlls/iphlpapi/tests/iphlpapi.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index b965874a53..159b7bef18 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -434,7 +434,10 @@ DWORD WINAPI IcmpSendEcho( TRACE("received an ICMP packet of type,code=%d,%d\n",icmp_header->icmp_type,icmp_header->icmp_code); if (icmp_header->icmp_type==ICMP_ECHOREPLY) { if ((icmp_header->icmp_id==id) && (icmp_header->icmp_seq==seq)) + { ier->Status=IP_SUCCESS; + SetLastError(NO_ERROR); + } } else { switch (icmp_header->icmp_type) { case ICMP_UNREACH: diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 87c3ebfac6..f964878d68 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1118,7 +1118,7 @@ todo_wine error = GetLastError(); reply = (ICMP_ECHO_REPLY *)replydata; ok(ret, "IcmpSendEcho failed unexpectedly\n"); - todo_wine ok(error == NO_ERROR, "Expect last error:0x%08x, got:0x%08x\n", NO_ERROR, error); + ok(error == NO_ERROR, "Expect last error:0x%08x, got:0x%08x\n", NO_ERROR, error); ok(INADDR_LOOPBACK == ntohl(reply->Address), "Address mismatch, expect:%s, got: %s\n", ntoa(INADDR_LOOPBACK), ntoa(reply->Address)); ok(reply->Status == IP_SUCCESS, "Expect status:0x%08x, got:0x%08x\n", IP_SUCCESS, reply->Status); -- 2.17.1

1 0

[PATCH v2 1/3] iphlpapi: Use a standalone buffer in IcmpSendEcho().
by Zhiyi Zhang 05 Aug '18

05 Aug '18

The old implementation uses user provided buffer to receive packet data, which is always not enough, causing data corruptions or incorrectly timeout. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43252 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/iphlpapi/icmp.c | 36 ++++++++++++++++++++++++++-------- dlls/iphlpapi/tests/iphlpapi.c | 21 ++++++++++++++++---- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index ebc2f2b65c..b965874a53 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -113,6 +113,9 @@ typedef struct { #define IP_OPTS_DEFAULT 1 #define IP_OPTS_CUSTOM 2 +#define MAXIPLEN 60 +#define MAXICMPLEN 76 + /* The sequence number is unique process wide, so that all threads * have a distinct sequence number. */ @@ -270,13 +273,14 @@ DWORD WINAPI IcmpSendEcho( icmp_t* icp=(icmp_t*)IcmpHandle; unsigned char* reqbuf; int reqsize; + unsigned char* repbuf; + int repsize; struct icmp_echo_reply* ier; struct ip* ip_header; struct icmp* icmp_header; char* endbuf; int ip_header_len; - int maxlen; struct pollfd fdr; DWORD send_time,recv_time; struct sockaddr_in addr; @@ -312,6 +316,16 @@ DWORD WINAPI IcmpSendEcho( return 0; } + /* max ip header + max icmp header and error data + reply size(max 65535 on Windows) */ + /* FIXME: request size of 65535 is not supported yet because max buffer size of raw socket on linux is 32767 */ + repsize=MAXIPLEN+MAXICMPLEN+(ReplySize&0xFFFF); + repbuf=HeapAlloc(GetProcessHeap(), 0, repsize); + if (repbuf==NULL) { + HeapFree(GetProcessHeap(), 0, repbuf); + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + icmp_header=(struct icmp*)reqbuf; icmp_header->icmp_type=ICMP_ECHO; icmp_header->icmp_code=0; @@ -367,9 +381,7 @@ DWORD WINAPI IcmpSendEcho( fdr.events = POLLIN; addrlen=sizeof(addr); ier=ReplyBuffer; - ip_header=(struct ip *) ((char *) ReplyBuffer+sizeof(ICMP_ECHO_REPLY)); endbuf=(char *) ReplyBuffer+ReplySize; - maxlen=ReplySize-sizeof(ICMP_ECHO_REPLY); /* Send the packet */ TRACE("Sending %d bytes (RequestSize=%d) to %s\n", reqsize, RequestSize, inet_ntoa(addr.sin_addr)); @@ -407,10 +419,11 @@ DWORD WINAPI IcmpSendEcho( } /* Get the reply */ + ip_header=(struct ip*)repbuf; ip_header_len=0; /* because gcc was complaining */ while (poll(&fdr,1,Timeout)>0) { recv_time = GetTickCount(); - res=recvfrom(icp->sid, (char*)ip_header, maxlen, 0, (struct sockaddr*)&addr,&addrlen); + res=recvfrom(icp->sid, (char*)repbuf, repsize, 0, (struct sockaddr*)&addr, &addrlen); TRACE("received %d bytes from %s\n",res, inet_ntoa(addr.sin_addr)); ier->Status=IP_REQ_TIMED_OUT; @@ -508,6 +521,12 @@ DWORD WINAPI IcmpSendEcho( else Timeout = 0; continue; } else { + /* Check free space, should be large enough for an ICMP_ECHO_REPLY and remainning icmp data */ + if (endbuf-(char *)ier < sizeof(struct icmp_echo_reply)+(res-ip_header_len-ICMP_MINLEN)) { + res=ier-(ICMP_ECHO_REPLY *)ReplyBuffer; + SetLastError(IP_GENERAL_FAILURE); + goto done; + } /* This is a reply to our packet */ memcpy(&ier->Address,&ip_header->ip_src,sizeof(IPAddr)); /* Status is already set */ @@ -515,7 +534,7 @@ DWORD WINAPI IcmpSendEcho( ier->DataSize=res-ip_header_len-ICMP_MINLEN; ier->Reserved=0; ier->Data=endbuf-ier->DataSize; - memmove(ier->Data,((char*)ip_header)+ip_header_len+ICMP_MINLEN,ier->DataSize); + memcpy(ier->Data, ((char *)ip_header)+ip_header_len+ICMP_MINLEN, ier->DataSize); ier->Options.Ttl=ip_header->ip_ttl; ier->Options.Tos=ip_header->ip_tos; ier->Options.Flags=ip_header->ip_off >> 13; @@ -523,7 +542,7 @@ DWORD WINAPI IcmpSendEcho( if (ier->Options.OptionsSize!=0) { ier->Options.OptionsData=(unsigned char *) ier->Data-ier->Options.OptionsSize; /* FIXME: We are supposed to rearrange the option's 'source route' data */ - memmove(ier->Options.OptionsData,((char*)ip_header)+ip_header_len,ier->Options.OptionsSize); + memcpy(ier->Options.OptionsData, ((char *)ip_header)+ip_header_len, ier->Options.OptionsSize); endbuf=(char*)ier->Options.OptionsData; } else { ier->Options.OptionsData=NULL; @@ -531,9 +550,8 @@ DWORD WINAPI IcmpSendEcho( } /* Prepare for the next packet */ + endbuf-=ier->DataSize; ier++; - ip_header=(struct ip*)(((char*)ip_header)+sizeof(ICMP_ECHO_REPLY)); - maxlen=endbuf-(char*)ip_header; /* Check out whether there is more but don't wait this time */ Timeout=0; @@ -542,6 +560,8 @@ DWORD WINAPI IcmpSendEcho( res=ier-(ICMP_ECHO_REPLY*)ReplyBuffer; if (res==0) SetLastError(IP_REQ_TIMED_OUT); +done: + HeapFree(GetProcessHeap(), 0, repbuf); TRACE("received %d replies\n",res); return res; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d5613d7b4b..87c3ebfac6 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -951,6 +951,8 @@ static void testIcmpSendEcho(void) char senddata[32], replydata[sizeof(senddata) + sizeof(ICMP_ECHO_REPLY)]; DWORD ret, error, replysz = sizeof(replydata); IPAddr address; + ICMP_ECHO_REPLY *reply; + INT i; if (!pIcmpSendEcho || !pIcmpCreateFile) { @@ -1038,12 +1040,10 @@ todo_wine replysz = sizeof(replydata) - 1; ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); - todo_wine { ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == IP_GENERAL_FAILURE || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, "expected 11050, got %d\n", error); - } SetLastError(0xdeadbeef); replysz = sizeof(ICMP_ECHO_REPLY); @@ -1056,7 +1056,6 @@ todo_wine replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN; ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz, 1000); error = GetLastError(); -todo_wine ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); SetLastError(0xdeadbeef); @@ -1064,7 +1063,6 @@ todo_wine ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN + 1, NULL, replydata, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == IP_GENERAL_FAILURE || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, "expected 11050, got %d\n", error); @@ -1111,6 +1109,21 @@ todo_wine { skip ("Failed to ping with error %d, is lo interface down?.\n", error); } + + /* check reply data */ + SetLastError(0xdeadbeef); + address = htonl(INADDR_LOOPBACK); + for (i = 0; i < ARRAY_SIZE(senddata); i++) senddata[i] = i & 0xff; + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + reply = (ICMP_ECHO_REPLY *)replydata; + ok(ret, "IcmpSendEcho failed unexpectedly\n"); + todo_wine ok(error == NO_ERROR, "Expect last error:0x%08x, got:0x%08x\n", NO_ERROR, error); + ok(INADDR_LOOPBACK == ntohl(reply->Address), "Address mismatch, expect:%s, got: %s\n", ntoa(INADDR_LOOPBACK), + ntoa(reply->Address)); + ok(reply->Status == IP_SUCCESS, "Expect status:0x%08x, got:0x%08x\n", IP_SUCCESS, reply->Status); + ok(reply->DataSize == sizeof(senddata), "Expect data size:%d, got:%d\n", sizeof(senddata), reply->DataSize); + ok(!memcmp(senddata, reply->Data, min(sizeof(senddata), reply->DataSize)), "Data mismatch\n"); } /* -- 2.17.1

1 0

Wine staging 3.13.1 release
by Alistair Leslie-Hughes 05 Aug '18

05 Aug '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * This is an out of bounds release to correct a regression in Star Craft 2 and to allow some patches to get some tested before the next official wine release. * Appended is a list of patches pulled from the mailing list. Updated patchsets * Corrected regression with sound not playing in Star Craft 2 Added * [41573] Stop a crash in Battle.Net. * [45524] Speed Improvements in Tital Fall 2. * dinput8 to share code with dinput (part of League of Legends support) * [45327] Improvements to support for League of Legends. * [45535] Stop an out of bounds access in Rekordbox League of Legends currently doesn't work with this release, we are still working through the remaining issues. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair. --- Andrew Eikum (1): dsound: Correctly calculate angle between vectors with equal and opposite directions Andrey Gusev (1): api-ms-win-devices-config-l1-1-0: Add dll. Aric Stewart (1): hidclass.sys: Unload all devices before unloading a minidriver Charles Davis (1): libwine: Use getsegmentdata(3) on Mac OS to find the end of the __TEXT segment. Daniel Lehman (1): odbc32: Rename functions to avoid conflicts with native drivers. Dmitry Timoshkov (5): programs: Allow to disable MIME-type associations. kernel32: Set environment variable %PUBLIC% on the process start-up. kernel32: Add support for MOVEFILE_WRITE_THROUGH to MoveFile. server: Add support for FILE_WRITE_THROUGH to create_file() request. kernel32: Add support for FILE_FLAG_WRITE_THROUGH to CreateFile. Fabian Maurer (4): wnet: Make WNetGetUniversalNameW return required size when buffer is too small and add test ntoskrnl: Emulate sti/cli instructions on x86_64 winmm: Don't crash in waveOutOpen when nSamplesPerSec is 0 and add tests cmd: Handle quotes when parsing the folders in the PATH environment variable Gijs Vermeulen (1): wine.inf: Add "Sources" key. Jacek Caban (2): winevulkan: Expose driver vkGetInstanceProcAddr via winevulkan exports. winevulkan: Mark ICD and thunking functions as private. Kai Krakow (1): winebus.sys: Do not report HID report read errors unconditionally Matteo Bruni (1): d3dcompiler: Make types array static const. Michael Stefaniuc (55): windowscodecs: Use the ARRAY_SIZE() macro localspl: Use the ARRAY_SIZE() macro mmdevapi: Use the ARRAY_SIZE() macro mapi32: Use the ARRAY_SIZE() macro krnl386.exe16: Use the ARRAY_SIZE() macro inetcpl.cpl: Use the ARRAY_SIZE() macro hhctrl.ocx: Use the ARRAY_SIZE() macro dpnet: Use the ARRAY_SIZE() macro dx8vb: Use the ARRAY_SIZE() macro fusion: Use the ARRAY_SIZE() macro evr: Use the ARRAY_SIZE() macro d3d10: Use the ARRAY_SIZE() macro d3d8: Use the ARRAY_SIZE() macro d3dcompiler: Use the ARRAY_SIZE() macro d3dxof: Use the ARRAY_SIZE() macro dnsapi: Use the ARRAY_SIZE() macro amstream: Use the ARRAY_SIZE() macro browseui: Use the ARRAY_SIZE() macro gameux: Use the ARRAY_SIZE() macro inetcomm: Use the ARRAY_SIZE() macro iphlpapi: Use the ARRAY_SIZE() macro itss: Remove a superfluous variable initialization itss: Use the ARRAY_SIZE() macro attrib: Use the ARRAY_SIZE() macro clock: Use the ARRAY_SIZE() macro hostname: Use the ARRAY_SIZE() macro icinfo: Use the ARRAY_SIZE() macro net: Use the ARRAY_SIZE() macro taskkill: Use the ARRAY_SIZE() macro ipconfig: Use the ARRAY_SIZE() macro msiexec: Use the ARRAY_SIZE() macro taskmgr: Use the ARRAY_SIZE() macro uninstaller: Use the ARRAY_SIZE() macro wineboot: Use the ARRAY_SIZE() macro wordpad: Use the ARRAY_SIZE() macro winetest: Use the ARRAY_SIZE() macro mountmgr.sys: Use the ARRAY_SIZE() macro mpr: Use the ARRAY_SIZE() macro msacm32: Use the ARRAY_SIZE() macro msrle32: Use the ARRAY_SIZE() macro msvcrt: Use the ARRAY_SIZE() macro scrobj: Use the ARRAY_SIZE() macro storage.dll16: Use the ARRAY_SIZE() macro urlmon: Use the ARRAY_SIZE() macro msvideo.dll16: Use the ARRAY_SIZE() macro mscoree: Use the ARRAY_SIZE() macro dxdiagn: Use the ARRAY_SIZE() macro localui: Use the ARRAY_SIZE() macro inetmib1: Use the ARRAY_SIZE() macro kernel32: Use the ARRAY_SIZE() macro mciwave: Use the ARRAY_SIZE() macro midimap: Use the ARRAY_SIZE() macro mscms: Use the ARRAY_SIZE() macro msctf: Use the ARRAY_SIZE() macro msscript.ocx: Use the ARRAY_SIZE() macro Nikolay Sivov (1): wmp: Make it possible to query IUnknown from IWMPControls. Piotr Caban (3): msvcp90: Fix EOF delimiter handling in basic_istream<char>::ignore. wbemprox: Add Win32_NetworkAdapterConfiguration::IPAddress property. wbemprox: Add Win32_NetworkAdapterConfiguration::IPSubnet property. Stefan Dösinger (4): wined3d: Fix WINED3D_MCS_COLOR2. d3d9/tests: Add a test for D3DMCS_COLOR{1/2}. d3d8/tests: Add a test for D3DMCS_COLOR{1/2}. ddraw/tests: Add a test for D3DMCS_COLOR{1/2}. Zebediah Figura (1): msi: Generate unique names for 32- and 64-bit custom action server pipes.

1 0

[PATCH 08/12] ddraw/tests: Rewrite DeviceLoadTest().
by Henri Verbeet 04 Aug '18

04 Aug '18

Based on a patch by Alex Henrie. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/d3d.c | 1058 --------------------------------------------- dlls/ddraw/tests/ddraw7.c | 482 +++++++++++++++++++++ 2 files changed, 482 insertions(+), 1058 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 77836fd627e..ec0f8d715ca 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1404,1063 +1404,6 @@ out: IDirect3DVertexBuffer7_Release(lpVBufSrc); } -#define IS_VALUE_NEAR(a, b) ( ((a) == (b)) || ((a) == (b) - 1) || ((a) == (b) + 1) ) -#define MIN(a, b) ((a) < (b) ? (a) : (b)) - -static void DeviceLoadTest(void) -{ - DDSURFACEDESC2 ddsd; - IDirectDrawSurface7 *texture_levels[2][8]; - IDirectDrawSurface7 *cube_face_levels[2][6][8]; - DWORD flags; - HRESULT hr; - DDBLTFX ddbltfx; - RECT loadrect; - POINT loadpoint; - int i, i1, i2; - unsigned diff_count = 0, diff_count2 = 0; - unsigned x, y; - BOOL load_mip_subset_broken = FALSE; - IDirectDrawPalette *palettes[5]; - PALETTEENTRY table1[256]; - DDCOLORKEY ddckey; - D3DDEVICEDESC7 d3dcaps; - - /* Test loading of texture subrectangle with a mipmap surface. */ - memset(texture_levels, 0, sizeof(texture_levels)); - memset(cube_face_levels, 0, sizeof(cube_face_levels)); - memset(palettes, 0, sizeof(palettes)); - - for (i = 0; i < 2; i++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; - ddsd.dwWidth = 128; - ddsd.dwHeight = 128; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; - U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00FF0000; - U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000FF00; - U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000FF; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &texture_levels[i][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - /* Check the number of created mipmaps */ - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_GetSurfaceDesc(texture_levels[i][0], &ddsd); - ok(hr==DD_OK,"IDirectDrawSurface7_GetSurfaceDesc returned: %x\n",hr); - ok(U2(ddsd).dwMipMapCount == 8, "unexpected mip count %u\n", U2(ddsd).dwMipMapCount); - if (U2(ddsd).dwMipMapCount != 8) goto out; - - for (i1 = 1; i1 < 8; i1++) - { - hr = IDirectDrawSurface7_GetAttachedSurface(texture_levels[i][i1 - 1], &ddsd.ddsCaps, &texture_levels[i][i1]); - ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); - if (FAILED(hr)) goto out; - } - } - - for (i1 = 0; i1 < 8; i1++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(texture_levels[0][i1], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - /* x stored in green component, y in blue. */ - DWORD color = 0xff0000 | (x << 8) | y; - *textureRow++ = color; - } - } - - hr = IDirectDrawSurface7_Unlock(texture_levels[0][i1], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - } - - for (i1 = 0; i1 < 8; i1++) - { - memset(&ddbltfx, 0, sizeof(ddbltfx)); - ddbltfx.dwSize = sizeof(ddbltfx); - U5(ddbltfx).dwFillColor = 0; - hr = IDirectDrawSurface7_Blt(texture_levels[1][i1], NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); - ok(hr == DD_OK, "IDirectDrawSurface7_Blt failed with %08x\n", hr); - } - - /* First test some broken coordinates. */ - loadpoint.x = loadpoint.y = 0; - SetRectEmpty(&loadrect); - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], &loadpoint, texture_levels[0][0], &loadrect, 0); - ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr); - - loadpoint.x = loadpoint.y = 50; - loadrect.left = 0; - loadrect.top = 0; - loadrect.right = 100; - loadrect.bottom = 100; - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], &loadpoint, texture_levels[0][0], &loadrect, 0); - ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr); - - /* Test actual loading. */ - loadpoint.x = loadpoint.y = 31; - loadrect.left = 30; - loadrect.top = 20; - loadrect.right = 93; - loadrect.bottom = 52; - - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], &loadpoint, texture_levels[0][0], &loadrect, 0); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - for (i1 = 0; i1 < 8; i1++) - { - diff_count = 0; - diff_count2 = 0; - - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(texture_levels[1][i1], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - DWORD color = *textureRow++; - - if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || - y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top) - { - if (color & 0xffffff) diff_count++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - - if (r != 0xff || g != x + loadrect.left - loadpoint.x || b != y + loadrect.top - loadpoint.y) diff_count++; - } - - /* This codepath is for software RGB device. It has what looks like some weird off by one errors, but may - technically be correct as it's not precisely defined by docs. */ - if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || - y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top + 1) - { - if (color & 0xffffff) diff_count2++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - - if (r != 0xff || !IS_VALUE_NEAR(g, x + loadrect.left - loadpoint.x) || - !IS_VALUE_NEAR(b, y + loadrect.top - loadpoint.y)) diff_count2++; - } - } - } - - hr = IDirectDrawSurface7_Unlock(texture_levels[1][i1], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - - ok(diff_count == 0 || diff_count2 == 0, "Unexpected destination texture level pixels; %u differences at %d level\n", - MIN(diff_count, diff_count2), i1); - - loadpoint.x /= 2; - loadpoint.y /= 2; - loadrect.top /= 2; - loadrect.left /= 2; - loadrect.right = (loadrect.right + 1) / 2; - loadrect.bottom = (loadrect.bottom + 1) / 2; - } - - /* This crashes on native (tested on real windows XP / directx9 / nvidia and - * qemu Win98 / directx7 / RGB software rasterizer): - * passing non toplevel surfaces (sublevels) to Load (DX7 docs tell not to do this) - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][1], NULL, texture_levels[0][1], NULL, 0); - */ - - /* Freed in reverse order as native seems to dislike and crash on freeing top level surface first. */ - for (i = 0; i < 2; i++) - { - for (i1 = 7; i1 >= 0; i1--) - { - if (texture_levels[i][i1]) IDirectDrawSurface7_Release(texture_levels[i][i1]); - } - } - memset(texture_levels, 0, sizeof(texture_levels)); - - /* Test texture size mismatch. */ - for (i = 0; i < 2; i++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; - ddsd.dwWidth = i ? 256 : 128; - ddsd.dwHeight = 128; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &texture_levels[i][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - } - - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], NULL, texture_levels[0][0], NULL, 0); - ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr); - - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[0][0], NULL, texture_levels[1][0], NULL, 0); - ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr); - - IDirectDrawSurface7_Release(texture_levels[0][0]); - IDirectDrawSurface7_Release(texture_levels[1][0]); - memset(texture_levels, 0, sizeof(texture_levels)); - - memset(&d3dcaps, 0, sizeof(d3dcaps)); - hr = IDirect3DDevice7_GetCaps(lpD3DDevice, &d3dcaps); - ok(hr == D3D_OK, "IDirect3DDevice7_GetCaps returned %08x\n", hr); - - if (!(d3dcaps.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_CUBEMAP)) - { - skip("No cubemap support\n"); - } - else - { - /* Test loading mipmapped cubemap texture subrectangle from another similar texture. */ - for (i = 0; i < 2; i++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; - ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES; - ddsd.dwWidth = 128; - ddsd.dwHeight = 128; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; - U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00FF0000; - U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000FF00; - U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000FF; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &cube_face_levels[i][0][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - flags = DDSCAPS2_CUBEMAP_NEGATIVEX; - for (i1 = 1; i1 < 6; i1++, flags <<= 1) - { - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; - ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | flags; - hr = IDirectDrawSurface7_GetAttachedSurface(cube_face_levels[i][0][0], &ddsd.ddsCaps, &cube_face_levels[i][i1][0]); - ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); - if (FAILED(hr)) goto out; - } - - for (i1 = 0; i1 < 6; i1++) - { - /* Check the number of created mipmaps */ - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_GetSurfaceDesc(cube_face_levels[i][i1][0], &ddsd); - ok(hr==DD_OK,"IDirectDrawSurface7_GetSurfaceDesc returned: %x\n",hr); - ok(U2(ddsd).dwMipMapCount == 8, "unexpected mip count %u\n", U2(ddsd).dwMipMapCount); - if (U2(ddsd).dwMipMapCount != 8) goto out; - - for (i2 = 1; i2 < 8; i2++) - { - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_MIPMAP; - ddsd.ddsCaps.dwCaps2 = DDSCAPS2_MIPMAPSUBLEVEL; - hr = IDirectDrawSurface7_GetAttachedSurface(cube_face_levels[i][i1][i2 - 1], &ddsd.ddsCaps, &cube_face_levels[i][i1][i2]); - ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); - if (FAILED(hr)) goto out; - } - } - } - - for (i = 0; i < 6; i++) - for (i1 = 0; i1 < 8; i1++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(cube_face_levels[0][i][i1], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - /* face number in low 4 bits of red, x stored in green component, y in blue. */ - DWORD color = 0xf00000 | (i << 16) | (x << 8) | y; - *textureRow++ = color; - } - } - - hr = IDirectDrawSurface7_Unlock(cube_face_levels[0][i][i1], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - } - - for (i = 0; i < 6; i++) - for (i1 = 0; i1 < 8; i1++) - { - memset(&ddbltfx, 0, sizeof(ddbltfx)); - ddbltfx.dwSize = sizeof(ddbltfx); - U5(ddbltfx).dwFillColor = 0; - hr = IDirectDrawSurface7_Blt(cube_face_levels[1][i][i1], NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); - ok(hr == DD_OK, "IDirectDrawSurface7_Blt failed with %08x\n", hr); - } - - loadpoint.x = loadpoint.y = 10; - loadrect.left = 30; - loadrect.top = 20; - loadrect.right = 93; - loadrect.bottom = 52; - - hr = IDirect3DDevice7_Load(lpD3DDevice, cube_face_levels[1][0][0], &loadpoint, cube_face_levels[0][0][0], &loadrect, - DDSCAPS2_CUBEMAP_ALLFACES); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - for (i = 0; i < 6; i++) - { - loadpoint.x = loadpoint.y = 10; - loadrect.left = 30; - loadrect.top = 20; - loadrect.right = 93; - loadrect.bottom = 52; - - for (i1 = 0; i1 < 8; i1++) - { - diff_count = 0; - diff_count2 = 0; - - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(cube_face_levels[1][i][i1], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - DWORD color = *textureRow++; - - if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || - y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top) - { - if (color & 0xffffff) diff_count++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - - if (r != (0xf0 | i) || g != x + loadrect.left - loadpoint.x || - b != y + loadrect.top - loadpoint.y) diff_count++; - } - - /* This codepath is for software RGB device. It has what looks like some weird off by one errors, but may - technically be correct as it's not precisely defined by docs. */ - if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || - y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top + 1) - { - if (color & 0xffffff) diff_count2++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - - if (r != (0xf0 | i) || !IS_VALUE_NEAR(g, x + loadrect.left - loadpoint.x) || - !IS_VALUE_NEAR(b, y + loadrect.top - loadpoint.y)) diff_count2++; - } - } - } - - hr = IDirectDrawSurface7_Unlock(cube_face_levels[1][i][i1], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - - ok(diff_count == 0 || diff_count2 == 0, - "Unexpected destination texture level pixels; %u differences at face %x level %d\n", - MIN(diff_count, diff_count2), i, i1); - - loadpoint.x /= 2; - loadpoint.y /= 2; - loadrect.top /= 2; - loadrect.left /= 2; - loadrect.right = (loadrect.right + 1) / 2; - loadrect.bottom = (loadrect.bottom + 1) / 2; - } - } - - for (i = 0; i < 2; i++) - for (i1 = 5; i1 >= 0; i1--) - for (i2 = 7; i2 >= 0; i2--) - { - if (cube_face_levels[i][i1][i2]) IDirectDrawSurface7_Release(cube_face_levels[i][i1][i2]); - } - memset(cube_face_levels, 0, sizeof(cube_face_levels)); - - /* Test cubemap loading from regular texture. */ - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX; - ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES; - ddsd.dwWidth = 128; - ddsd.dwHeight = 128; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &cube_face_levels[0][0][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; - ddsd.dwWidth = 128; - ddsd.dwHeight = 128; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &texture_levels[0][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - hr = IDirect3DDevice7_Load(lpD3DDevice, cube_face_levels[0][0][0], NULL, texture_levels[0][0], NULL, - DDSCAPS2_CUBEMAP_ALLFACES); - ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr); - - IDirectDrawSurface7_Release(cube_face_levels[0][0][0]); - memset(cube_face_levels, 0, sizeof(cube_face_levels)); - IDirectDrawSurface7_Release(texture_levels[0][0]); - memset(texture_levels, 0, sizeof(texture_levels)); - - /* Partial cube maps(e.g. created with an explicitly set DDSCAPS2_CUBEMAP_POSITIVEX flag) - * BSOD some Windows machines when an app tries to create them(Radeon X1600, Windows XP, - * Catalyst 10.2 driver, 6.14.10.6925) - */ - } - - /* Test texture loading with different mip level count (larger levels match, smaller levels missing in destination. */ - for (i = 0; i < 2; i++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_MIPMAPCOUNT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; - ddsd.dwWidth = 128; - ddsd.dwHeight = 128; - U2(ddsd).dwMipMapCount = i ? 4 : 8; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; - U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00FF0000; - U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000FF00; - U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000FF; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &texture_levels[i][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - /* Check the number of created mipmaps */ - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_GetSurfaceDesc(texture_levels[i][0], &ddsd); - ok(hr==DD_OK,"IDirectDrawSurface7_GetSurfaceDesc returned: %x\n",hr); - ok(U2(ddsd).dwMipMapCount == (i ? 4 : 8), "unexpected mip count %u\n", U2(ddsd).dwMipMapCount); - if (U2(ddsd).dwMipMapCount != (i ? 4 : 8)) goto out; - - for (i1 = 1; i1 < (i ? 4 : 8); i1++) - { - hr = IDirectDrawSurface7_GetAttachedSurface(texture_levels[i][i1 - 1], &ddsd.ddsCaps, &texture_levels[i][i1]); - ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); - if (FAILED(hr)) goto out; - } - } - - for (i1 = 0; i1 < 8; i1++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(texture_levels[0][i1], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - /* x stored in green component, y in blue. */ - DWORD color = 0xf00000 | (i1 << 16) | (x << 8) | y; - *textureRow++ = color; - } - } - - hr = IDirectDrawSurface7_Unlock(texture_levels[0][i1], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - } - - for (i1 = 0; i1 < 4; i1++) - { - memset(&ddbltfx, 0, sizeof(ddbltfx)); - ddbltfx.dwSize = sizeof(ddbltfx); - U5(ddbltfx).dwFillColor = 0; - hr = IDirectDrawSurface7_Blt(texture_levels[1][i1], NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); - ok(hr == DD_OK, "IDirectDrawSurface7_Blt failed with %08x\n", hr); - } - - loadpoint.x = loadpoint.y = 31; - loadrect.left = 30; - loadrect.top = 20; - loadrect.right = 93; - loadrect.bottom = 52; - - /* Destination mip levels are a subset of source mip levels. */ - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], &loadpoint, texture_levels[0][0], &loadrect, 0); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - for (i1 = 0; i1 < 4; i1++) - { - diff_count = 0; - diff_count2 = 0; - - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(texture_levels[1][i1], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - DWORD color = *textureRow++; - - if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || - y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top) - { - if (color & 0xffffff) diff_count++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - - if (r != (0xf0 | i1) || g != x + loadrect.left - loadpoint.x || - b != y + loadrect.top - loadpoint.y) diff_count++; - } - - /* This codepath is for software RGB device. It has what looks like some weird off by one errors, but may - technically be correct as it's not precisely defined by docs. */ - if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || - y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top + 1) - { - if (color & 0xffffff) diff_count2++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - - if (r != (0xf0 | i1) || !IS_VALUE_NEAR(g, x + loadrect.left - loadpoint.x) || - !IS_VALUE_NEAR(b, y + loadrect.top - loadpoint.y)) diff_count2++; - } - } - } - - hr = IDirectDrawSurface7_Unlock(texture_levels[1][i1], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - - ok(diff_count == 0 || diff_count2 == 0, "Unexpected destination texture level pixels; %u differences at %d level\n", - MIN(diff_count, diff_count2), i1); - - loadpoint.x /= 2; - loadpoint.y /= 2; - loadrect.top /= 2; - loadrect.left /= 2; - loadrect.right = (loadrect.right + 1) / 2; - loadrect.bottom = (loadrect.bottom + 1) / 2; - } - - /* Destination mip levels are a superset of source mip levels (should fail). */ - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[0][0], &loadpoint, texture_levels[1][0], &loadrect, 0); - ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr); - - for (i = 0; i < 2; i++) - { - for (i1 = 7; i1 >= 0; i1--) - { - if (texture_levels[i][i1]) IDirectDrawSurface7_Release(texture_levels[i][i1]); - } - } - memset(texture_levels, 0, sizeof(texture_levels)); - - /* Test loading from mipmap texture to a regular texture that matches one sublevel in size. */ - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; - ddsd.dwWidth = 128; - ddsd.dwHeight = 128; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; - U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00FF0000; - U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000FF00; - U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000FF; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &texture_levels[0][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; - ddsd.dwWidth = 32; - ddsd.dwHeight = 32; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; - U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00FF0000; - U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000FF00; - U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000FF; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &texture_levels[1][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (i1 = 1; i1 < 8; i1++) - { - hr = IDirectDrawSurface7_GetAttachedSurface(texture_levels[0][i1 - 1], &ddsd.ddsCaps, &texture_levels[0][i1]); - ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); - if (FAILED(hr)) goto out; - } - - for (i1 = 0; i1 < 8; i1++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(texture_levels[0][i1], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - /* x stored in green component, y in blue. */ - DWORD color = 0xf00000 | (i1 << 16) | (x << 8) | y; - *textureRow++ = color; - } - } - - hr = IDirectDrawSurface7_Unlock(texture_levels[0][i1], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - } - - memset(&ddbltfx, 0, sizeof(ddbltfx)); - ddbltfx.dwSize = sizeof(ddbltfx); - U5(ddbltfx).dwFillColor = 0; - hr = IDirectDrawSurface7_Blt(texture_levels[1][0], NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); - ok(hr == DD_OK, "IDirectDrawSurface7_Blt failed with %08x\n", hr); - - loadpoint.x = loadpoint.y = 32; - loadrect.left = 32; - loadrect.top = 32; - loadrect.right = 96; - loadrect.bottom = 96; - - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], &loadpoint, texture_levels[0][0], &loadrect, 0); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - loadpoint.x /= 4; - loadpoint.y /= 4; - loadrect.top /= 4; - loadrect.left /= 4; - loadrect.right = (loadrect.right + 3) / 4; - loadrect.bottom = (loadrect.bottom + 3) / 4; - - /* NOTE: something in either nvidia driver or directx9 on WinXP appears to be broken: - * this kind of Load calls (to subset with smaller surface(s)) produces wrong results with - * copied subrectangles divided more than needed, without apparent logic. But it works - * as expected on qemu / Win98 / directx7 / RGB device. Some things are broken on XP, e.g. - * some games don't work that worked in Win98, so it is assumed here XP results are wrong. - * The following code attempts to detect broken results, actual tests will then be skipped - */ - load_mip_subset_broken = TRUE; - diff_count = 0; - - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(texture_levels[1][0], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - DWORD color = *textureRow++; - - if (x < 2 || x >= 2 + 4 || - y < 2 || y >= 2 + 4) - { - if (color & 0xffffff) diff_count++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - - if ((r & (0xf0)) != 0xf0) diff_count++; - } - } - } - - if (diff_count) load_mip_subset_broken = FALSE; - - if (load_mip_subset_broken) { - skip("IDirect3DDevice7_Load is broken (happens on some modern Windows installations like XP). Skipping affected tests.\n"); - } else { - diff_count = 0; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - DWORD color = *textureRow++; - - if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || - y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top) - { - if (color & 0xffffff) diff_count++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - - if (r != (0xf0 | 2) || g != x + loadrect.left - loadpoint.x || - b != y + loadrect.top - loadpoint.y) diff_count++; - } - } - } - } - - hr = IDirectDrawSurface7_Unlock(texture_levels[1][0], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - - ok(diff_count == 0, "Unexpected destination texture level pixels; %u differences\n", diff_count); - - for (i = 0; i < 2; i++) - { - for (i1 = 7; i1 >= 0; i1--) - { - if (texture_levels[i][i1]) IDirectDrawSurface7_Release(texture_levels[i][i1]); - } - } - memset(texture_levels, 0, sizeof(texture_levels)); - - if (!load_mip_subset_broken) - { - /* Test loading when destination mip levels are a subset of source mip levels and start from smaller - * surface (than first source mip level) - */ - for (i = 0; i < 2; i++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; - if (i) ddsd.dwFlags |= DDSD_MIPMAPCOUNT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; - ddsd.dwWidth = i ? 32 : 128; - ddsd.dwHeight = i ? 32 : 128; - if (i) U2(ddsd).dwMipMapCount = 4; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; - U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00FF0000; - U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000FF00; - U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000FF; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &texture_levels[i][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - /* Check the number of created mipmaps */ - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_GetSurfaceDesc(texture_levels[i][0], &ddsd); - ok(hr==DD_OK,"IDirectDrawSurface7_GetSurfaceDesc returned: %x\n",hr); - ok(U2(ddsd).dwMipMapCount == (i ? 4 : 8), "unexpected mip count %u\n", U2(ddsd).dwMipMapCount); - if (U2(ddsd).dwMipMapCount != (i ? 4 : 8)) goto out; - - for (i1 = 1; i1 < (i ? 4 : 8); i1++) - { - hr = IDirectDrawSurface7_GetAttachedSurface(texture_levels[i][i1 - 1], &ddsd.ddsCaps, &texture_levels[i][i1]); - ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); - if (FAILED(hr)) goto out; - } - } - - for (i1 = 0; i1 < 8; i1++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(texture_levels[0][i1], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - /* x stored in green component, y in blue. */ - DWORD color = 0xf00000 | (i1 << 16) | (x << 8) | y; - *textureRow++ = color; - } - } - - hr = IDirectDrawSurface7_Unlock(texture_levels[0][i1], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - } - - for (i1 = 0; i1 < 4; i1++) - { - memset(&ddbltfx, 0, sizeof(ddbltfx)); - ddbltfx.dwSize = sizeof(ddbltfx); - U5(ddbltfx).dwFillColor = 0; - hr = IDirectDrawSurface7_Blt(texture_levels[1][i1], NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); - ok(hr == DD_OK, "IDirectDrawSurface7_Blt failed with %08x\n", hr); - } - - loadpoint.x = loadpoint.y = 0; - loadrect.left = 0; - loadrect.top = 0; - loadrect.right = 64; - loadrect.bottom = 64; - - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], &loadpoint, texture_levels[0][0], &loadrect, 0); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - i = 0; - for (i1 = 0; i1 < 8 && i < 4; i1++) - { - DDSURFACEDESC2 ddsd2; - - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_GetSurfaceDesc(texture_levels[0][i1], &ddsd); - ok(SUCCEEDED(hr), "IDirectDrawSurface7_GetSurfaceDesc returned %#x.\n", hr); - - memset(&ddsd2, 0, sizeof(DDSURFACEDESC2)); - ddsd2.dwSize = sizeof(ddsd2); - hr = IDirectDrawSurface7_GetSurfaceDesc(texture_levels[1][i], &ddsd2); - ok(SUCCEEDED(hr), "IDirectDrawSurface7_GetSurfaceDesc returned %#x.\n", hr); - - if (ddsd.dwWidth == ddsd2.dwWidth && ddsd.dwHeight == ddsd2.dwHeight) - { - diff_count = 0; - - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(texture_levels[1][i], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - DWORD color = *textureRow++; - - if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || - y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top) - { - if (color & 0xffffff) diff_count++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - - if (r != (0xf0 | i1) || g != x + loadrect.left - loadpoint.x || - b != y + loadrect.top - loadpoint.y) diff_count++; - } - } - } - - hr = IDirectDrawSurface7_Unlock(texture_levels[1][i], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - - ok(diff_count == 0, "Unexpected destination texture level pixels; %u differences at %d level\n", diff_count, i1); - - i++; - } - - loadpoint.x /= 2; - loadpoint.y /= 2; - loadrect.top /= 2; - loadrect.left /= 2; - loadrect.right = (loadrect.right + 1) / 2; - loadrect.bottom = (loadrect.bottom + 1) / 2; - } - - for (i = 0; i < 2; i++) - { - for (i1 = 7; i1 >= 0; i1--) - { - if (texture_levels[i][i1]) IDirectDrawSurface7_Release(texture_levels[i][i1]); - } - } - memset(texture_levels, 0, sizeof(texture_levels)); - } - - /* Test palette copying. */ - for (i = 0; i < 2; i++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; - ddsd.dwWidth = 128; - ddsd.dwHeight = 128; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 8; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &texture_levels[i][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - /* Check the number of created mipmaps */ - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_GetSurfaceDesc(texture_levels[i][0], &ddsd); - ok(hr==DD_OK,"IDirectDrawSurface7_GetSurfaceDesc returned: %x\n",hr); - ok(U2(ddsd).dwMipMapCount == 8, "unexpected mip count %u\n", U2(ddsd).dwMipMapCount); - if (U2(ddsd).dwMipMapCount != 8) goto out; - - for (i1 = 1; i1 < 8; i1++) - { - hr = IDirectDrawSurface7_GetAttachedSurface(texture_levels[i][i1 - 1], &ddsd.ddsCaps, &texture_levels[i][i1]); - ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); - if (FAILED(hr)) goto out; - } - } - - memset(table1, 0, sizeof(table1)); - for (i = 0; i < 3; i++) - { - table1[0].peBlue = i + 1; - hr = IDirectDraw7_CreatePalette(lpDD, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, table1, &palettes[i], NULL); - ok(hr == DD_OK, "CreatePalette returned %08x\n", hr); - if (FAILED(hr)) - { - skip("IDirectDraw7_CreatePalette failed; skipping further tests\n"); - goto out; - } - } - - hr = IDirectDrawSurface7_SetPalette(texture_levels[0][0], palettes[0]); - ok(hr==DD_OK, "IDirectDrawSurface7_SetPalette returned: %x\n", hr); - - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], NULL, texture_levels[0][0], NULL, 0); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - hr = IDirectDrawSurface7_GetPalette(texture_levels[0][1], &palettes[4]); - ok(hr==DDERR_NOPALETTEATTACHED, "IDirectDrawSurface7_GetPalette returned: %x\n", hr); - - hr = IDirectDrawSurface7_GetPalette(texture_levels[1][0], &palettes[4]); - ok(hr==DDERR_NOPALETTEATTACHED, "IDirectDrawSurface7_GetPalette returned: %x\n", hr); - - hr = IDirectDrawSurface7_SetPalette(texture_levels[0][1], palettes[1]); - ok(hr==DDERR_NOTONMIPMAPSUBLEVEL, "IDirectDrawSurface7_SetPalette returned: %x\n", hr); - hr = IDirectDrawSurface7_SetPalette(texture_levels[1][0], palettes[2]); - ok(hr==DD_OK, "IDirectDrawSurface7_SetPalette returned: %x\n", hr); - - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], NULL, texture_levels[0][0], NULL, 0); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - memset(table1, 0, sizeof(table1)); - hr = IDirectDrawSurface7_GetPalette(texture_levels[1][0], &palettes[4]); - ok(hr==DD_OK, "IDirectDrawSurface7_GetPalette returned: %x\n", hr); - if (SUCCEEDED(hr)) - { - hr = IDirectDrawPalette_GetEntries(palettes[4], 0, 0, 256, table1); - ok(hr == DD_OK, "IDirectDrawPalette_GetEntries returned %08x\n", hr); - ok(table1[0].peBlue == 1, "Unexpected palette color after load: %u\n", (unsigned)table1[0].peBlue); - } - - /* Test colorkey copying. */ - ddckey.dwColorSpaceLowValue = ddckey.dwColorSpaceHighValue = 64; - hr = IDirectDrawSurface7_SetColorKey(texture_levels[0][0], DDCKEY_SRCBLT, &ddckey); - ok(hr==DD_OK, "IDirectDrawSurface7_SetColorKey returned: %x\n", hr); - hr = IDirectDrawSurface7_SetColorKey(texture_levels[0][1], DDCKEY_SRCBLT, &ddckey); - ok(hr == DDERR_NOTONMIPMAPSUBLEVEL, "Got unexpected hr %#x.\n", hr); - - hr = IDirectDrawSurface7_GetColorKey(texture_levels[1][0], DDCKEY_SRCBLT, &ddckey); - ok(hr==DDERR_NOCOLORKEY, "IDirectDrawSurface7_GetColorKey returned: %x\n", hr); - - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], NULL, texture_levels[0][0], NULL, 0); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - hr = IDirectDrawSurface7_GetColorKey(texture_levels[1][0], DDCKEY_SRCBLT, &ddckey); - ok(hr==DD_OK, "IDirectDrawSurface7_GetColorKey returned: %x\n", hr); - ok(ddckey.dwColorSpaceLowValue == ddckey.dwColorSpaceHighValue && ddckey.dwColorSpaceLowValue == 64, - "Unexpected color key values: %u - %u\n", ddckey.dwColorSpaceLowValue, ddckey.dwColorSpaceHighValue); - - out: - - for (i = 0; i < 5; i++) - { - if (palettes[i]) IDirectDrawPalette_Release(palettes[i]); - } - - for (i = 0; i < 2; i++) - { - for (i1 = 7; i1 >= 0; i1--) - { - if (texture_levels[i][i1]) IDirectDrawSurface7_Release(texture_levels[i][i1]); - } - } - - for (i = 0; i < 2; i++) - for (i1 = 5; i1 >= 0; i1--) - for (i2 = 7; i2 >= 0; i2--) - { - if (cube_face_levels[i][i1][i2]) IDirectDrawSurface7_Release(cube_face_levels[i][i1][i2]); - } -} - static void SetMaterialTest(void) { HRESULT rc; @@ -3422,7 +2365,6 @@ START_TEST(d3d) SetMaterialTest(); CapsTest(); VertexBufferDescTest(); - DeviceLoadTest(); SetRenderTargetTest(); VertexBufferLockRest(); z_format_test(); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 35a45c03456..4b9d367a748 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -14267,6 +14267,487 @@ static void test_viewport(void) DestroyWindow(window); } +static unsigned int validate_loaded_surface(IDirectDrawSurface7 *surface, unsigned int face, + unsigned int level, const RECT *src_rect, const POINT *dst_point) +{ + DDSURFACEDESC2 surface_desc; + unsigned int diff, x, y; + HRESULT hr; + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface7_Lock(surface, NULL, &surface_desc, DDLOCK_WAIT, NULL); + ok(SUCCEEDED(hr), "Failed to map surface, hr %#x.\n", hr); + + for (y = 0, diff = 0; y < surface_desc.dwHeight; ++y) + { + DWORD *texture_row = (DWORD *)((char *)surface_desc.lpSurface + y * U1(surface_desc).lPitch); + + for (x = 0; x < surface_desc.dwWidth; ++x) + { + DWORD colour = texture_row[x]; + DWORD r = (colour & 0xff0000) >> 16; + DWORD g = (colour & 0xff00) >> 8; + DWORD b = (colour & 0xff); + + if (x < dst_point->x || x >= dst_point->x + src_rect->right - src_rect->left + || y < dst_point->y || y >= dst_point->y + src_rect->bottom - src_rect->top) + { + if (colour & 0xffffff) + ++diff; + } + else + { + if (r != ((face << 4) | level) + || g != x + src_rect->left - dst_point->x + || b != y + src_rect->top - dst_point->y) + ++diff; + } + } + } + + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Failed to unmap surface, hr %#x.\n", hr); + + return diff; +} + +static void test_device_load(void) +{ + IDirectDrawSurface7 *src_surface, *dst_surface, *surface, *tmp; + DDSCAPS2 mip_caps = {0, DDSCAPS2_MIPMAPSUBLEVEL, 0, {0}}; + IDirectDrawPalette *src_palette, *dst_palette, *palette; + unsigned int i, j, k, l, x, y; + DDSURFACEDESC2 surface_desc; + IDirect3DDevice7 *device; + PALETTEENTRY table1[256]; + D3DDEVICEDESC7 d3d_caps; + DDCOLORKEY colour_key; + IDirectDraw7 *ddraw; + BOOL cube_support; + IDirect3D7 *d3d; + ULONG refcount; + HWND window; + DDBLTFX fx; + HRESULT hr; + +#define TEX_MIP 0x01 +#define TEX_CUBE 0x02 +#define NULL_COORDS 0x04 + + /* Creating partial cube maps (e.g. created with just + * DDSCAPS2_CUBEMAP_POSITIVEX) BSODs some Windows machines. (Radeon X1600, + * Windows XP, Catalyst 10.2 driver, 6.14.10.6925) + * + * Passing non-toplevel surfaces to IDirect3DDevice7_Load() crashes on + * native. (Windows XP / NVIDIA, Windows 98 / RGB software rasteriser) */ + static const struct + { + unsigned int src_w, src_h, src_mip_count; + RECT src_rect; + DWORD src_flags; + unsigned int dst_w, dst_h, dst_mip_count; + POINT dst_point; + DWORD dst_flags; + HRESULT hr; + } + tests[] = + { + {128, 128, 0, { 0, 0, 0, 0}, TEX_MIP, 128, 128, 0, { 0, 0}, TEX_MIP, DDERR_INVALIDPARAMS}, + {128, 128, 0, { 0, 0, 100, 100}, TEX_MIP, 128, 128, 0, {50, 50}, TEX_MIP, DDERR_INVALIDPARAMS}, + {128, 128, 0, {30, 20, 93, 52}, TEX_MIP, 128, 128, 0, {31, 31}, TEX_MIP, D3D_OK}, + {128, 128, 0, { 0, 0, 0, 0}, NULL_COORDS, 128, 128, 0, { 0, 0}, NULL_COORDS, D3D_OK}, + {128, 128, 0, { 0, 0, 0, 0}, NULL_COORDS, 256, 128, 0, { 0, 0}, NULL_COORDS, DDERR_INVALIDPARAMS}, + {256, 128, 0, { 0, 0, 0, 0}, NULL_COORDS, 128, 128, 0, { 0, 0}, NULL_COORDS, DDERR_INVALIDPARAMS}, + {128, 128, 0, {30, 20, 93, 52}, TEX_MIP | TEX_CUBE, 128, 128, 0, {10, 10}, TEX_MIP | TEX_CUBE, D3D_OK}, + {128, 128, 0, { 0, 0, 0, 0}, NULL_COORDS, 128, 128, 0, { 0, 0}, TEX_CUBE | NULL_COORDS, DDERR_INVALIDPARAMS}, + {128, 128, 0, {30, 20, 93, 52}, TEX_MIP, 128, 128, 4, {31, 31}, TEX_MIP, D3D_OK}, + {128, 128, 4, {30, 20, 93, 52}, TEX_MIP, 128, 128, 0, {31, 31}, TEX_MIP, DDERR_INVALIDPARAMS}, + {128, 128, 0, {32, 32, 96, 96}, TEX_MIP, 32, 32, 0, {32, 32}, 0, D3D_OK}, + {128, 128, 0, { 0, 0, 64, 64}, TEX_MIP, 32, 32, 4, { 0, 0}, TEX_MIP, D3D_OK}, + }; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get ddraw interface, hr %#x.\n", hr); + IDirect3D7_Release(d3d); + + memset(&d3d_caps, 0, sizeof(d3d_caps)); + hr = IDirect3DDevice7_GetCaps(device, &d3d_caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + cube_support = d3d_caps.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_CUBEMAP; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + unsigned int src_count, dst_count; + POINT dst_point, dst_point_broken; + RECT src_rect, src_rect_broken; + + if ((tests[i].src_flags | tests[i].dst_flags) & TEX_CUBE && !cube_support) + { + skip("No cubemap support, skipping test %u.\n", i); + continue; + } + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + if (tests[i].src_mip_count) + surface_desc.dwFlags |= DDSD_MIPMAPCOUNT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + if (tests[i].src_flags & (TEX_MIP | TEX_CUBE)) + surface_desc.ddsCaps.dwCaps |= DDSCAPS_COMPLEX; + if (tests[i].src_flags & TEX_MIP) + surface_desc.ddsCaps.dwCaps |= DDSCAPS_MIPMAP; + if (tests[i].src_flags & TEX_CUBE) + surface_desc.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES; + surface_desc.dwWidth = tests[i].src_w; + surface_desc.dwHeight = tests[i].src_h; + U2(surface_desc).dwMipMapCount = tests[i].src_mip_count; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &src_surface, NULL); + ok(SUCCEEDED(hr), "Test %u: Failed to create source surface, hr %#x.\n", i, hr); + + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + if (tests[i].dst_mip_count) + surface_desc.dwFlags |= DDSD_MIPMAPCOUNT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + if (tests[i].dst_flags & (TEX_MIP | TEX_CUBE)) + surface_desc.ddsCaps.dwCaps |= DDSCAPS_COMPLEX; + if (tests[i].dst_flags & TEX_MIP) + surface_desc.ddsCaps.dwCaps |= DDSCAPS_MIPMAP; + surface_desc.ddsCaps.dwCaps2 = 0; + if (tests[i].dst_flags & TEX_CUBE) + surface_desc.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES; + surface_desc.dwWidth = tests[i].dst_w; + surface_desc.dwHeight = tests[i].dst_h; + U2(surface_desc).dwMipMapCount = tests[i].dst_mip_count; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &dst_surface, NULL); + ok(SUCCEEDED(hr), "Test %u: Failed to create destination surface, hr %#x.\n", i, hr); + + src_count = dst_count = 1; + if (tests[i].src_flags & TEX_MIP) + src_count = tests[i].src_mip_count ? tests[i].src_mip_count : 8; + if (tests[i].dst_flags & TEX_MIP) + dst_count = tests[i].dst_mip_count ? tests[i].dst_mip_count : 8; + + surface = src_surface; + IDirectDrawSurface7_AddRef(surface); + for (j = 0;;) + { + DDSCAPS2 face_caps = {0, 0, 0, {0}}; + + /* Check the number of created mipmaps. */ + if (tests[i].src_flags & TEX_MIP) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Test %u: Failed to get surface description, hr %#x.\n", i, hr); + ok(U2(surface_desc).dwMipMapCount == src_count, + "Test %u: Got unexpected mip count %u, expected %u.\n", + i, U2(surface_desc).dwMipMapCount, src_count); + } + + for (k = 0; ; ++k) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface7_Lock(surface, NULL, &surface_desc, DDLOCK_WAIT, NULL); + ok(SUCCEEDED(hr), "Test %u: Failed to map surface, hr %#x.\n", i, hr); + + for (y = 0; y < surface_desc.dwHeight; ++y) + { + DWORD *texture_row = (DWORD *)((BYTE *)surface_desc.lpSurface + y * U1(surface_desc).lPitch); + + for (x = 0; x < surface_desc.dwWidth; ++x) + { + /* The face number is stored in the high 4 bits of the + * red component, the mip-level in the low 4 bits. The + * x-coordinate is stored in the green component, and + * the y-coordinate in the blue component. */ + texture_row[x] = (j << 20) | (k << 16) | (x << 8) | y; + } + } + + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Test %u: Failed to unmap surface, hr %#x.\n", i, hr); + + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &mip_caps, &tmp); + IDirectDrawSurface7_Release(surface); + if (FAILED(hr)) + break; + surface = tmp; + } + + if (!(tests[i].src_flags & TEX_CUBE) || ++j >= 6) + break; + + face_caps.dwCaps2 = DDSCAPS2_CUBEMAP | (DDSCAPS2_CUBEMAP_POSITIVEX << j); + hr = IDirectDrawSurface7_GetAttachedSurface(src_surface, &face_caps, &surface); + ok(SUCCEEDED(hr), "Test %u: Failed to get face %u.\n", i, j); + } + + surface = dst_surface; + IDirectDrawSurface7_AddRef(surface); + for (j = 0;;) + { + DDSCAPS2 face_caps = {0, 0, 0, {0}}; + + /* Check the number of created mipmaps. */ + if (tests[i].dst_flags & TEX_MIP) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Test %u: Failed to get surface description, hr %#x.\n", i, hr); + ok(U2(surface_desc).dwMipMapCount == dst_count, + "Test %u: Got unexpected mip count %u, expected %u.\n", + i, U2(surface_desc).dwMipMapCount, dst_count); + } + + for (;;) + { + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + U5(fx).dwFillColor = 0x00000000; + hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Test %u: Failed to clear surface, hr %#x.\n", i, hr); + + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &mip_caps, &tmp); + IDirectDrawSurface7_Release(surface); + if (FAILED(hr)) + break; + surface = tmp; + } + + if (!(tests[i].dst_flags & TEX_CUBE) || ++j >= 6) + break; + + face_caps.dwCaps2 = DDSCAPS2_CUBEMAP | (DDSCAPS2_CUBEMAP_POSITIVEX << j); + hr = IDirectDrawSurface7_GetAttachedSurface(dst_surface, &face_caps, &surface); + ok(SUCCEEDED(hr), "Test %u: Failed to get face %u.\n", i, j); + } + + src_rect = tests[i].src_rect; + dst_point = tests[i].dst_point; + hr = IDirect3DDevice7_Load(device, + dst_surface, tests[i].dst_flags & NULL_COORDS ? NULL : &dst_point, + src_surface, tests[i].src_flags & NULL_COORDS ? NULL : &src_rect, + tests[i].dst_flags & TEX_CUBE ? DDSCAPS2_CUBEMAP_ALLFACES : 0); + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + + if (SUCCEEDED(hr)) + { + unsigned int level_offset, level_offset_broken; + + for (level_offset = 0, k = tests[i].src_w; k > tests[i].dst_w; ++level_offset, k /= 2); + level_offset_broken = src_count - dst_count; + + surface = dst_surface; + IDirectDrawSurface7_AddRef(surface); + for (j = 0;;) + { + DDSCAPS2 face_caps = {0, 0, 0, {0}}; + + if (tests[i].src_flags & NULL_COORDS) + SetRect(&src_rect, 0, 0, tests[i].src_w, tests[i].src_h); + else + src_rect = tests[i].src_rect; + + if (tests[i].dst_flags & NULL_COORDS) + dst_point.x = dst_point.y = 0; + else + dst_point = tests[i].dst_point; + + for (k = 0; k < level_offset; ++k) + { + dst_point.x /= 2; + dst_point.y /= 2; + src_rect.top /= 2; + src_rect.left /= 2; + src_rect.right = (src_rect.right + 1) / 2; + src_rect.bottom = (src_rect.bottom + 1) / 2; + } + + for (k = 0; ; ++k) + { + unsigned int diff, diff2, diff3; + + diff = validate_loaded_surface(surface, j, k + level_offset, &src_rect, &dst_point); + + /* On some newer (XP+) versions of Windows, it appears the + * source/destination coordinates are divided too often. + * This works correctly on Windows 98 with the RGB + * software rasteriser. */ + src_rect_broken = src_rect; + dst_point_broken = dst_point; + for (l = 0; l < level_offset; ++l) + { + dst_point_broken.x /= 2; + dst_point_broken.y /= 2; + src_rect_broken.top /= 2; + src_rect_broken.left /= 2; + src_rect_broken.right = (src_rect_broken.right + 1) / 2; + src_rect_broken.bottom = (src_rect_broken.bottom + 1) / 2; + } + diff2 = validate_loaded_surface(surface, j, k + level_offset, + &src_rect_broken, &dst_point_broken); + + /* On Windows 8+ things are slightly worse still. Instead + * of applying the correct level offset twice, like on + * XP+, an incorrect offset is applied in addition to the + * correct one. Additionally, on Windows 8+, this offset + * also affects the selected source mip-level, as opposed + * to Windows XP+ where it only affects the + * source/destination coordinates. */ + src_rect_broken = src_rect; + dst_point_broken = dst_point; + for (l = 0; l < level_offset_broken; ++l) + { + dst_point_broken.x /= 2; + dst_point_broken.y /= 2; + src_rect_broken.top /= 2; + src_rect_broken.left /= 2; + src_rect_broken.right = (src_rect_broken.right + 1) / 2; + src_rect_broken.bottom = (src_rect_broken.bottom + 1) / 2; + } + diff3 = validate_loaded_surface(surface, j, k + level_offset_broken, + &src_rect_broken, &dst_point_broken); + + ok(!diff || broken(!diff2 || !diff3), "Test %u, face %u, level %u: " + "Unexpected destination texture level pixels; %u/%u/%u differences.\n", + i, j, k, diff, diff2, diff3); + + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &mip_caps, &tmp); + IDirectDrawSurface7_Release(surface); + if (FAILED(hr)) + break; + surface = tmp; + + dst_point.x /= 2; + dst_point.y /= 2; + src_rect.top /= 2; + src_rect.left /= 2; + src_rect.right = (src_rect.right + 1) / 2; + src_rect.bottom = (src_rect.bottom + 1) / 2; + } + + if (!(tests[i].dst_flags & TEX_CUBE) || ++j >= 6) + break; + + face_caps.dwCaps2 = DDSCAPS2_CUBEMAP | (DDSCAPS2_CUBEMAP_POSITIVEX << j); + hr = IDirectDrawSurface7_GetAttachedSurface(dst_surface, &face_caps, &surface); + ok(SUCCEEDED(hr), "Test %u: Failed to get face %u.\n", i, j); + } + } + + IDirectDrawSurface7_Release(dst_surface); + IDirectDrawSurface7_Release(src_surface); + } +#undef TEX_MIP +#undef TEX_CUBE +#undef NULL_COORDS + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 8; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &src_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create source surface, hr %#x.\n", hr); + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &dst_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create destination surface, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(src_surface, &mip_caps, &surface); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + + /* Test palette copying. */ + memset(table1, 0, sizeof(table1)); + table1[0].peBlue = 1; + hr = IDirectDraw7_CreatePalette(ddraw, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, table1, &src_palette, NULL); + ok(SUCCEEDED(hr), "Failed to create source palette, hr %#x.\n", hr); + table1[0].peBlue = 3; + hr = IDirectDraw7_CreatePalette(ddraw, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, table1, &dst_palette, NULL); + ok(SUCCEEDED(hr), "Failed to create destination palette, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_SetPalette(src_surface, src_palette); + ok(SUCCEEDED(hr), "Failed to set palette, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Load(device, dst_surface, NULL, src_surface, NULL, 0); + ok(SUCCEEDED(hr), "Failed to load texture, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_GetPalette(surface, &palette); + ok(hr == DDERR_NOPALETTEATTACHED, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetPalette(dst_surface, &palette); + ok(hr == DDERR_NOPALETTEATTACHED, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface7_SetPalette(surface, src_palette); + ok(hr == DDERR_NOTONMIPMAPSUBLEVEL, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_SetPalette(dst_surface, dst_palette); + ok(SUCCEEDED(hr), "Failed to set palette, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Load(device, dst_surface, NULL, src_surface, NULL, 0); + ok(SUCCEEDED(hr), "Failed to load texture, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_GetPalette(dst_surface, &palette); + ok(SUCCEEDED(hr), "Failed to get palette, hr %#x.\n", hr); + ok(palette == dst_palette, "Got unexpected palette %p, expected %p.\n", palette, dst_palette); + memset(table1, 0, sizeof(table1)); + hr = IDirectDrawPalette_GetEntries(palette, 0, 0, 256, table1); + ok(SUCCEEDED(hr), "Failed to retrieve palette entries, hr %#x.\n", hr); + ok(table1[0].peBlue == 1, "Got unexpected palette colour %#x.\n", (unsigned int)table1[0].peBlue); + IDirectDrawPalette_Release(palette); + + IDirectDrawPalette_Release(dst_palette); + IDirectDrawPalette_Release(src_palette); + + /* Test colour-key copying. */ + colour_key.dwColorSpaceLowValue = 32; + colour_key.dwColorSpaceHighValue = 64; + hr = IDirectDrawSurface7_SetColorKey(src_surface, DDCKEY_SRCBLT, &colour_key); + ok(SUCCEEDED(hr), "Failed to set colour-key, hr %#x.\n", hr); + hr = IDirectDrawSurface7_SetColorKey(surface, DDCKEY_SRCBLT, &colour_key); + ok(hr == DDERR_NOTONMIPMAPSUBLEVEL, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface7_GetColorKey(dst_surface, DDCKEY_SRCBLT, &colour_key); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_Load(device, dst_surface, NULL, src_surface, NULL, 0); + ok(SUCCEEDED(hr), "Failed to load texture, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_GetColorKey(dst_surface, DDCKEY_SRCBLT, &colour_key); + ok(SUCCEEDED(hr), "Failed to get colour-key, hr %#x.\n", hr); + ok(colour_key.dwColorSpaceLowValue == 32, "Got unexpected value %u.\n", colour_key.dwColorSpaceLowValue); + ok(colour_key.dwColorSpaceHighValue == 32, "Got unexpected value %u.\n", colour_key.dwColorSpaceHighValue); + + IDirectDrawSurface7_Release(surface); + IDirectDrawSurface7_Release(dst_surface); + IDirectDrawSurface7_Release(src_surface); + + IDirectDraw7_Release(ddraw); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -14402,4 +14883,5 @@ START_TEST(ddraw7) test_clear(); test_enum_surfaces(); test_viewport(); + test_device_load(); } -- 2.11.0

2 1

[PATCH 12/12] ddraw/tests: Add a test for D3DMCS_COLOR{1/2}.
by Henri Verbeet 04 Aug '18

04 Aug '18

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- A ddraw4 version is on my TODO list. ddraw1 and ddraw2 cannot use lighting and per-vertex colour at the same time due to the predefined D3D*VERTEX structs. ddraw4 can, and it has D3DLIGHTSTATE_COLORVERTEX, but the material source states are missing. I assume that one or more of the material properties then track the vertex colour, but I have to find out which. --- dlls/ddraw/tests/ddraw7.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 4b9d367a748..cc1662293c0 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -14748,6 +14748,139 @@ static void test_device_load(void) DestroyWindow(window); } +static void test_color_vertex(void) +{ + IDirect3DDevice7 *device; + IDirectDrawSurface7 *rt; + D3DMATERIAL7 material; + D3DCOLOR colour; + unsigned int i; + ULONG refcount; + HWND window; + HRESULT hr; + + static struct + { + struct vec3 position; + DWORD diffuse; + DWORD specular; + } + quad_2c[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{-1.0f, 1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + }; + static struct + { + struct vec3 position; + DWORD colour; + } + quad_1c[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xffff0000}, + {{ 1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.0f}, 0xffff0000}, + }; + static struct + { + struct vec3 position; + } + quad_0c[] = + { + {{-1.0f, -1.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}}, + }; + + /* The idea here is to set up ambient light parameters in a way that the + * ambient colour from the material is just passed through. The emissive + * colour is just passed through anyway. The sum of ambient + emissive + * should allow deduction of where the material colour came from. */ + static const struct + { + DWORD fvf, color_vertex, ambient, emissive, result; + void *vtx; + } + tests[] = + { + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, FALSE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x000000c0, quad_2c}, + + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ffff00, quad_2c}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_MATERIAL, D3DMCS_COLOR2, 0x0000ff80, quad_2c}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x00ff0040, quad_2c}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR1, 0x00ff0000, quad_2c}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR2, D3DMCS_COLOR2, 0x0000ff00, quad_2c}, + + {D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ff0080, quad_1c}, + {D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x000000c0, quad_1c}, + {D3DFVF_SPECULAR, TRUE, D3DMCS_MATERIAL, D3DMCS_COLOR2, 0x00ff0080, quad_1c}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ff0040, quad_1c}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x00ff0040, quad_1c}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR2, D3DMCS_MATERIAL, 0x000000c0, quad_1c}, + + {0, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x000000c0, quad_0c}, + }; + + window = CreateWindowA("static", "d3d7_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, TRUE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_AMBIENT, 0xffffffff); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + memset(&material, 0, sizeof(material)); + U3(U1(material).ambient).b = 0.5f; + U3(U3(material).emissive).b = 0.25f; + hr = IDirect3DDevice7_SetMaterial(device, &material); + ok(SUCCEEDED(hr), "Failed to set material, hr %#x\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_COLORVERTEX, tests[i].color_vertex); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_AMBIENTMATERIALSOURCE, tests[i].ambient); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_EMISSIVEMATERIALSOURCE, tests[i].emissive); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear depth/stencil, hr %#x.\n", hr); + + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | tests[i].fvf, tests[i].vtx, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + colour = get_surface_color(rt, 320, 240); + ok(compare_color(colour, tests[i].result, 1), + "Expected colour 0x%08x for test %u, got 0x%08x.\n", + tests[i].result, i, colour); + } + + IDirectDrawSurface7_Release(rt); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -14884,4 +15017,5 @@ START_TEST(ddraw7) test_enum_surfaces(); test_viewport(); test_device_load(); + test_color_vertex(); } -- 2.11.0

1 0

[PATCH 11/12] d3d8/tests: Add a test for D3DMCS_COLOR{1/2}.
by Henri Verbeet 04 Aug '18

04 Aug '18

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 3379f072cc4..24481bd0533 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10335,6 +10335,118 @@ done: DestroyWindow(window); } +static void test_color_vertex(void) +{ + IDirect3DDevice8 *device; + D3DMATERIAL8 material; + IDirect3D8 *d3d; + D3DCOLOR colour; + unsigned int i; + ULONG refcount; + HWND window; + HRESULT hr; + + /* The idea here is to set up ambient light parameters in a way that the + * ambient colour from the material is just passed through. The emissive + * colour is just passed through anyway. The sum of ambient + emissive + * should allow deduction of where the material colour came from. + * + * Note that in cases without a D3DFVF_DIFFUSE flag the first colour value + * in the struct will be fed into the specular vertex colour slot. */ + static const struct + { + DWORD fvf, color_vertex, ambient, emissive, result; + } + tests[] = + { + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, FALSE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x000000c0}, + + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ffff00}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_MATERIAL, D3DMCS_COLOR2, 0x0000ff80}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x00ff0040}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR1, 0x00ff0000}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR2, D3DMCS_COLOR2, 0x0000ff00}, + + {D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ff0080}, + {D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x000000c0}, + {D3DFVF_SPECULAR, TRUE, D3DMCS_MATERIAL, D3DMCS_COLOR2, 0x00ff0080}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ff0040}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x00ff0040}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR2, D3DMCS_MATERIAL, 0x000000c0}, + + {0, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x000000c0}, + }; + static const struct + { + struct vec3 position; + DWORD diffuse; + DWORD specular; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{-1.0f, 1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, TRUE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_AMBIENT, 0xffffffff); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + memset(&material, 0, sizeof(material)); + material.Ambient.b = 0.5f; + material.Emissive.b = 0.25f; + hr = IDirect3DDevice8_SetMaterial(device, &material); + ok(SUCCEEDED(hr), "Failed to set material, hr %#x\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_COLORVERTEX, tests[i].color_vertex); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_AMBIENTMATERIALSOURCE, tests[i].ambient); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_EMISSIVEMATERIALSOURCE, tests[i].emissive); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | tests[i].fvf); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear depth/stencil, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].result, 1), + "Expected colour 0x%08x for test %u, got 0x%08x.\n", + tests[i].result, i, colour); + } + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -10408,4 +10520,5 @@ START_TEST(visual) test_drawindexedprimitiveup(); test_map_synchronisation(); test_viewport(); + test_color_vertex(); } -- 2.11.0

1 0

[PATCH 10/12] d3d9/tests: Add a test for D3DMCS_COLOR{1/2}.
by Henri Verbeet 04 Aug '18

04 Aug '18

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5567e72cef8..9c3e83d3005 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -24085,6 +24085,119 @@ done: DestroyWindow(window); } +static void test_color_vertex(void) +{ + IDirect3DDevice9 *device; + D3DMATERIAL9 material; + IDirect3D9 *d3d; + D3DCOLOR colour; + unsigned int i; + ULONG refcount; + HWND window; + HRESULT hr; + + /* The idea here is to set up ambient light parameters in a way that the + * ambient colour from the material is just passed through. The emissive + * colour is just passed through anyway. The sum of ambient + emissive + * should allow deduction of where the material colour came from. + * + * Note that in cases without a D3DFVF_DIFFUSE flag the first colour value + * in the struct will be fed into the specular vertex colour slot. */ + static const struct + { + DWORD fvf, color_vertex, ambient, emissive, result; + } + tests[] = + { + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, FALSE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x000000c0}, + + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ffff00}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_MATERIAL, D3DMCS_COLOR2, 0x0000ff80}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x00ff0040}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR1, 0x00ff0000}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR2, D3DMCS_COLOR2, 0x0000ff00}, + + {D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ff0080}, + {D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x000000c0}, + {D3DFVF_SPECULAR, TRUE, D3DMCS_MATERIAL, D3DMCS_COLOR2, 0x00ff0080}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ff0040}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x00ff0040}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR2, D3DMCS_MATERIAL, 0x000000c0}, + + {0, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x000000c0}, + }; + + static const struct + { + struct vec3 position; + DWORD diffuse; + DWORD specular; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{-1.0f, 1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, TRUE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_AMBIENT, 0xffffffff); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + memset(&material, 0, sizeof(material)); + material.Ambient.b = 0.5f; + material.Emissive.b = 0.25f; + hr = IDirect3DDevice9_SetMaterial(device, &material); + ok(SUCCEEDED(hr), "Failed to set material, hr %#x\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_COLORVERTEX, tests[i].color_vertex); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_AMBIENTMATERIALSOURCE, tests[i].ambient); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_EMISSIVEMATERIALSOURCE, tests[i].emissive); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | tests[i].fvf); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear depth/stencil, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].result, 1), + "Expected colour 0x%08x for test %u, got 0x%08x.\n", + tests[i].result, i, colour); + } + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -24222,4 +24335,5 @@ START_TEST(visual) test_mvp_software_vertex_shaders(); test_null_format(); test_map_synchronisation(); + test_color_vertex(); } -- 2.11.0

1 0

[PATCH 06/12] d3d8/tests: Test DXT1 and DXT3 as well in volume_dxt5_test().
by Henri Verbeet 04 Aug '18

04 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 160 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 108 insertions(+), 52 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index bed70d8a17c..3379f072cc4 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4952,26 +4952,74 @@ done: DestroyWindow(window); } -static void volume_dxt5_test(void) +static void volume_dxtn_test(void) { IDirect3DVolumeTexture8 *texture; + struct surface_readback rb; IDirect3DDevice8 *device; + IDirect3DSurface8 *rt; D3DLOCKED_BOX box; + unsigned int i, j; IDirect3D8 *d3d; - unsigned int i; - D3DCOLOR color; ULONG refcount; + DWORD colour; HWND window; HRESULT hr; - static const char texture_data[] = + static const BYTE dxt1_data[] = { - /* A 8x4x2 texture consisting of 4 4x4 blocks. The colors of the blocks are red, green, blue and white. */ - 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xf8, 0x00, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, + 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, + 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 + }; + static const BYTE dxt3_data[] = + { + 0xff, 0xee, 0xff, 0xee, 0xff, 0xee, 0xff, 0xee, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xdd, 0xff, 0xdd, 0xff, 0xdd, 0xff, 0xdd, 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xcc, 0xff, 0xcc, 0xff, 0xcc, 0xff, 0xcc, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xbb, 0xff, 0xbb, 0xff, 0xbb, 0xff, 0xbb, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 + }; + static const BYTE dxt5_data[] = + { + /* A 8x4x2 texture consisting of 4 4x4 blocks. The colours of the + * blocks are red, green, blue and white. */ + 0xff, 0xff, 0x80, 0x0d, 0xd8, 0x80, 0x0d, 0xd8, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }; + static const DWORD dxt1_expected_colours[] = + { + 0xffff0000, 0x00000000, 0xff00ff00, 0xff00ff00, + 0xff0000ff, 0xff0000ff, 0xffffffff, 0xffffffff, + }; + static const DWORD dxt3_expected_colours[] = + { + 0xffff0000, 0xeeff0000, 0xff00ff00, 0xdd00ff00, + 0xff0000ff, 0xcc0000ff, 0xffffffff, 0xbbffffff, + }; + static const DWORD dxt5_expected_colours[] = + { + 0xffff0000, 0x00ff0000, 0xff00ff00, 0xff00ff00, + 0xff0000ff, 0xff0000ff, 0xffffffff, 0xffffffff + }; + + static const struct + { + const char *name; + D3DFORMAT format; + const BYTE *data; + DWORD data_size; + const DWORD *expected_colours; + } + tests[] = + { + {"DXT1", D3DFMT_DXT1, dxt1_data, sizeof(dxt1_data), dxt1_expected_colours}, + {"DXT3", D3DFMT_DXT3, dxt3_data, sizeof(dxt3_data), dxt3_expected_colours}, + {"DXT5", D3DFMT_DXT5, dxt5_data, sizeof(dxt5_data), dxt5_expected_colours}, + }; + static const struct { struct vec3 position; @@ -4989,69 +5037,77 @@ static void volume_dxt5_test(void) {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, }; - static const DWORD expected_colors[] = {0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff}; window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; } - if (FAILED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5))) + hr = IDirect3DDevice8_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) { - skip("Volume DXT5 textures are not supported, skipping test.\n"); - IDirect3DDevice8_Release(device); - goto done; - } + if (FAILED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, tests[i].format))) + { + skip("%s volume textures are not supported, skipping test.\n", tests[i].name); + continue; + } + hr = IDirect3DDevice8_CreateVolumeTexture(device, 8, 4, 2, 1, 0, + tests[i].format, D3DPOOL_MANAGED, &texture); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); - hr = IDirect3DDevice8_CreateVolumeTexture(device, 8, 4, 2, 1, 0, D3DFMT_DXT5, - D3DPOOL_MANAGED, &texture); - ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + hr = IDirect3DVolumeTexture8_LockBox(texture, 0, &box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + memcpy(box.pBits, tests[i].data, tests[i].data_size); + hr = IDirect3DVolumeTexture8_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); - hr = IDirect3DVolumeTexture8_LockBox(texture, 0, &box, NULL, 0); - ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); - memcpy(box.pBits, texture_data, sizeof(texture_data)); - hr = IDirect3DVolumeTexture8_UnlockBox(texture, 0); - ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set colour op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(SUCCEEDED(hr), "Failed to set colour arg, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "Failed to set colour op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAGFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); - ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)texture); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); - ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); - ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAGFILTER, D3DTEXF_POINT); - ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - hr = IDirect3DDevice8_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads)); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads)); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice8_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + get_rt_readback(rt, &rb); + for (j = 0; j < ARRAY_SIZE(dxt1_expected_colours); ++j) + { + colour = get_readback_color(&rb, 40 + 80 * j, 240); + ok(color_match(colour, tests[i].expected_colours[j], 1), + "Expected colour 0x%08x, got 0x%08x, case %u.\n", tests[i].expected_colours[j], colour, j); + } + release_surface_readback(&rb); - for (i = 0; i < 4; i++) - { - color = getPixelColor(device, 80 + 160 * i, 240); - ok (color_match(color, expected_colors[i], 1), - "Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + IDirect3DVolumeTexture8_Release(texture); } - hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); - IDirect3DVolumeTexture8_Release(texture); + IDirect3DSurface8_Release(rt); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done: @@ -10326,7 +10382,7 @@ START_TEST(visual) zenable_test(); resz_test(); fog_special_test(); - volume_dxt5_test(); + volume_dxtn_test(); volume_v16u16_test(); add_dirty_rect_test(); test_3dc_formats(); -- 2.11.0

1 0

[PATCH 05/12] d3d9/tests: Test DXT1 and DXT3 as well in volume_dxt5_test().
by Henri Verbeet 04 Aug '18

04 Aug '18

From: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 162 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 110 insertions(+), 52 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b36c1890392..5567e72cef8 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17741,26 +17741,74 @@ done: DestroyWindow(window); } -static void volume_dxt5_test(void) +static void volume_dxtn_test(void) { IDirect3DVolumeTexture9 *texture; + struct surface_readback rb; IDirect3DDevice9 *device; + IDirect3DSurface9 *rt; D3DLOCKED_BOX box; + unsigned int i, j; IDirect3D9 *d3d; - unsigned int i; ULONG refcount; - DWORD color; + DWORD colour; HWND window; HRESULT hr; - static const char texture_data[] = + static const BYTE dxt1_data[] = + { + 0x00, 0xf8, 0x00, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, + 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, + 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 + }; + static const BYTE dxt3_data[] = + { + 0xff, 0xee, 0xff, 0xee, 0xff, 0xee, 0xff, 0xee, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xdd, 0xff, 0xdd, 0xff, 0xdd, 0xff, 0xdd, 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xcc, 0xff, 0xcc, 0xff, 0xcc, 0xff, 0xcc, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xbb, 0xff, 0xbb, 0xff, 0xbb, 0xff, 0xbb, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 + }; + static const BYTE dxt5_data[] = { - /* A 8x4x2 texture consisting of 4 4x4 blocks. The colors of the blocks are red, green, blue and white. */ - 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, + /* A 8x4x2 texture consisting of 4 4x4 blocks. The colours of the + * blocks are red, green, blue and white. */ + 0xff, 0xff, 0x80, 0x0d, 0xd8, 0x80, 0x0d, 0xd8, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }; + static const DWORD dxt1_expected_colours[] = + { + 0xffff0000, 0x00000000, 0xff00ff00, 0xff00ff00, + 0xff0000ff, 0xff0000ff, 0xffffffff, 0xffffffff, + }; + static const DWORD dxt3_expected_colours[] = + { + 0xffff0000, 0xeeff0000, 0xff00ff00, 0xdd00ff00, + 0xff0000ff, 0xcc0000ff, 0xffffffff, 0xbbffffff, + }; + static const DWORD dxt5_expected_colours[] = + { + 0xffff0000, 0x00ff0000, 0xff00ff00, 0xff00ff00, + 0xff0000ff, 0xff0000ff, 0xffffffff, 0xffffffff + }; + + static const struct + { + const char *name; + D3DFORMAT format; + const BYTE *data; + DWORD data_size; + const DWORD *expected_colours; + } + tests[] = + { + {"DXT1", D3DFMT_DXT1, dxt1_data, sizeof(dxt1_data), dxt1_expected_colours}, + {"DXT3", D3DFMT_DXT3, dxt3_data, sizeof(dxt3_data), dxt3_expected_colours}, + {"DXT5", D3DFMT_DXT5, dxt5_data, sizeof(dxt5_data), dxt5_expected_colours}, + }; + static const struct { struct vec3 position; @@ -17778,67 +17826,77 @@ static void volume_dxt5_test(void) {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, }; - static const DWORD expected_colors[] = {0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff}; window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5))) - { - skip("DXT5 volume textures are not supported, skipping test.\n"); - goto done; - } + if (!(device = create_device(d3d, window, window, TRUE))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; } - hr = IDirect3DDevice9_CreateVolumeTexture(device, 8, 4, 2, 1, 0, D3DFMT_DXT5, - D3DPOOL_MANAGED, &texture, NULL); - ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); - hr = IDirect3DVolumeTexture9_LockBox(texture, 0, &box, NULL, 0); - ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); - memcpy(box.pBits, texture_data, sizeof(texture_data)); - hr = IDirect3DVolumeTexture9_UnlockBox(texture, 0); - ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, tests[i].format))) + { + skip("%s volume textures are not supported, skipping test.\n", tests[i].name); + continue; + } + hr = IDirect3DDevice9_CreateVolumeTexture(device, 8, 4, 2, 1, 0, + tests[i].format, D3DPOOL_MANAGED, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); - ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); - ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); - ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); - ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr); + hr = IDirect3DVolumeTexture9_LockBox(texture, 0, &box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + memcpy(box.pBits, tests[i].data, tests[i].data_size); + hr = IDirect3DVolumeTexture9_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads)); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads)); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set colour op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(SUCCEEDED(hr), "Failed to set colour arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "Failed to set colour op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr); - for (i = 0; i < 4; i++) - { - color = getPixelColor(device, 80 + 160 * i, 240); - ok (color_match(color, expected_colors[i], 1), - "Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + get_rt_readback(rt, &rb); + for (j = 0; j < ARRAY_SIZE(dxt1_expected_colours); ++j) + { + colour = get_readback_color(&rb, 40 + 80 * j, 240); + ok(color_match(colour, tests[i].expected_colours[j], 1), + "Expected colour 0x%08x, got 0x%08x, case %u.\n", tests[i].expected_colours[j], colour, j); + } + release_surface_readback(&rb); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + IDirect3DVolumeTexture9_Release(texture); } - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); - IDirect3DVolumeTexture9_Release(texture); + IDirect3DSurface9_Release(rt); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done: @@ -24131,7 +24189,7 @@ START_TEST(visual) zenable_test(); fog_special_test(); volume_srgb_test(); - volume_dxt5_test(); + volume_dxtn_test(); add_dirty_rect_test(); multisampled_depth_buffer_test(); resz_test(); -- 2.11.0

1 0

[PATCH 04/12] wined3d: Decompress DXTn 3D textures on upload.
by Henri Verbeet 04 Aug '18

04 Aug '18

From: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 9 ++ dlls/wined3d/texture.c | 40 ++++-- dlls/wined3d/utils.c | 286 +++++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 6 + 4 files changed, 304 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index b5dcdf012db..bf54245276a 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -477,3 +477,12 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB; } } + +const struct wined3d_format *wined3d_resource_get_decompress_format(struct wined3d_resource *resource, + const struct wined3d_context *context) +{ + if (resource->format_flags & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE) + && !(context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL)) + return wined3d_get_format(context->gl_info, WINED3DFMT_B8G8R8A8_UNORM_SRGB, resource->usage); + return wined3d_get_format(context->gl_info, WINED3DFMT_B8G8R8A8_UNORM, resource->usage); +} diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c316906a957..ebdacfa2ee0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1727,7 +1727,13 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win if (texture->flags & alloc_flag) return; - if (format->conv_byte_count) + if (texture->resource.format_flags & WINED3DFMT_FLAG_DECOMPRESS) + { + TRACE("WINED3DFMT_FLAG_DECOMPRESS set.\n"); + texture->flags |= WINED3D_TEXTURE_CONVERTED; + format = wined3d_resource_get_decompress_format(&texture->resource, context); + } + else if (format->conv_byte_count) { texture->flags |= WINED3D_TEXTURE_CONVERTED; } @@ -1897,6 +1903,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s void *converted_mem = NULL; struct wined3d_format f; unsigned int level; + BOOL decompress; GLenum target; TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " @@ -1948,20 +1955,31 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s bo.addr += src_box->left * format->byte_count; } - if (format->upload) + decompress = texture->resource.format_flags & WINED3DFMT_FLAG_DECOMPRESS; + if (format->upload || decompress) { + const struct wined3d_format *compressed_format = format; unsigned int dst_row_pitch, dst_slice_pitch; void *src_mem; - if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) - ERR("Converting a block-based format.\n"); + if (decompress) + { + format = wined3d_resource_get_decompress_format(&texture->resource, context); + } + else + { + if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + ERR("Converting a block-based format.\n"); - f = *format; - f.byte_count = format->conv_byte_count; - format = &f; + f = *format; + f.byte_count = format->conv_byte_count; + format = &f; + } wined3d_format_calculate_pitch(format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); + /* Note that uploading 3D textures may require quite some address + * space; it may make sense to upload them per-slice instead. */ if (!(converted_mem = heap_calloc(update_d, dst_slice_pitch))) { ERR("Failed to allocate upload buffer.\n"); @@ -1970,8 +1988,12 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s src_mem = context_map_bo_address(context, &bo, src_slice_pitch, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); - format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, - dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); + if (decompress) + compressed_format->decompress(src_mem, converted_mem, src_row_pitch, src_slice_pitch, + dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); + else + format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, + dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); context_unmap_bo_address(context, &bo, GL_PIXEL_UNPACK_BUFFER); bo.buffer_object = 0; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 937c1bc0df6..bac52022510 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -339,6 +339,230 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_RESZ, WINED3DFMT_FLAG_EXTENSION}, }; +static void rgb888_from_rgb565(WORD rgb565, BYTE *r, BYTE *g, BYTE *b) +{ + BYTE c; + + /* (2⁸ - 1) / (2⁵ - 1) ≈ 2⁸ / (2⁵ + 2¹⁰) + * (2⁸ - 1) / (2⁶ - 1) ≈ 2⁸ / (2⁶ + 2¹²) */ + c = rgb565 >> 11; + *r = (c << 3) + (c >> 2); + c = (rgb565 >> 5) & 0x3f; + *g = (c << 2) + (c >> 4); + c = rgb565 & 0x1f; + *b = (c << 3) + (c >> 2); +} + +static void build_dxtn_colour_table(WORD colour0, WORD colour1, + DWORD colour_table[4], enum wined3d_format_id format_id) +{ + unsigned int i; + struct + { + BYTE r, g, b; + } c[4]; + + rgb888_from_rgb565(colour0, &c[0].r, &c[0].g, &c[0].b); + rgb888_from_rgb565(colour1, &c[1].r, &c[1].g, &c[1].b); + + if (format_id == WINED3DFMT_BC1_UNORM && colour0 <= colour1) + { + c[2].r = (c[0].r + c[1].r) / 2; + c[2].g = (c[0].g + c[1].g) / 2; + c[2].b = (c[0].b + c[1].b) / 2; + + c[3].r = 0; + c[3].g = 0; + c[3].b = 0; + } + else + { + for (i = 0; i < 2; ++i) + { + c[i + 2].r = (2 * c[i].r + c[1 - i].r) / 3; + c[i + 2].g = (2 * c[i].g + c[1 - i].g) / 3; + c[i + 2].b = (2 * c[i].b + c[1 - i].b) / 3; + } + } + + for (i = 0; i < 4; ++i) + { + colour_table[i] = (c[i].r << 16) | (c[i].g << 8) | c[i].b; + } +} + +static void build_dxtn_alpha_table(BYTE alpha0, BYTE alpha1, BYTE alpha_table[8]) +{ + unsigned int i; + + alpha_table[0] = alpha0; + alpha_table[1] = alpha1; + + if (alpha0 > alpha1) + { + for (i = 0; i < 6; ++i) + { + alpha_table[2 + i] = ((6 - i) * alpha0 + (i + 1) * alpha1) / 7; + } + return; + } + else + { + for (i = 0; i < 4; ++i) + { + alpha_table[2 + i] = ((4 - i) * alpha0 + (i + 1) * alpha1) / 5; + } + alpha_table[6] = 0x00; + alpha_table[7] = 0xff; + } +} + +static void decompress_dxtn_block(const BYTE *src, BYTE *dst, unsigned int width, + unsigned int height, unsigned int dst_row_pitch, enum wined3d_format_id format_id) +{ + const UINT64 *s = (const UINT64 *)src; + BOOL bc1_alpha = FALSE; + DWORD colour_table[4]; + BYTE alpha_table[8]; + UINT64 alpha_bits; + DWORD colour_bits; + unsigned int x, y; + BYTE colour_idx; + DWORD *dst_row; + BYTE alpha; + + if (format_id == WINED3DFMT_BC1_UNORM) + { + WORD colour0, colour1; + + alpha_bits = 0; + + colour0 = s[0] & 0xffff; + colour1 = (s[0] >> 16) & 0xffff; + colour_bits = (s[0] >> 32) & 0xffffffff; + build_dxtn_colour_table(colour0, colour1, colour_table, format_id); + if (colour0 <= colour1) + bc1_alpha = TRUE; + } + else + { + alpha_bits = s[0]; + if (format_id == WINED3DFMT_BC3_UNORM) + { + build_dxtn_alpha_table(alpha_bits & 0xff, (alpha_bits >> 8) & 0xff, alpha_table); + alpha_bits >>= 16; + } + + colour_bits = (s[1] >> 32) & 0xffffffff; + build_dxtn_colour_table(s[1] & 0xffff, (s[1] >> 16) & 0xffff, colour_table, format_id); + } + + for (y = 0; y < height; ++y) + { + dst_row = (DWORD *)&dst[y * dst_row_pitch]; + for (x = 0; x < width; ++x) + { + colour_idx = (colour_bits >> (y * 8 + x * 2)) & 0x3; + switch (format_id) + { + case WINED3DFMT_BC1_UNORM: + alpha = bc1_alpha && colour_idx == 3 ? 0x00 : 0xff; + break; + + case WINED3DFMT_BC2_UNORM: + alpha = (alpha_bits >> (y * 16 + x * 4)) & 0xf; + /* (2⁸ - 1) / (2⁴ - 1) ≈ 2⁸ / (2⁴ + 2⁸) */ + alpha |= alpha << 4; + break; + + case WINED3DFMT_BC3_UNORM: + alpha = alpha_table[(alpha_bits >> (y * 12 + x * 3)) & 0x7]; + break; + + default: + alpha = 0xff; + break; + } + dst_row[x] = (alpha << 24) | colour_table[colour_idx]; + } + } +} + +static void decompress_dxtn(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth, enum wined3d_format_id format_id) +{ + unsigned int block_byte_count, block_w, block_h; + const BYTE *src_row, *src_slice = src; + BYTE *dst_row, *dst_slice = dst; + unsigned int x, y, z; + + block_byte_count = format_id == WINED3DFMT_BC1_UNORM ? 8 : 16; + + for (z = 0; z < depth; ++z) + { + src_row = src_slice; + dst_row = dst_slice; + for (y = 0; y < height; y += 4) + { + for (x = 0; x < width; x += 4) + { + block_w = min(width - x, 4); + block_h = min(height - y, 4); + decompress_dxtn_block(&src_row[x * (block_byte_count / 4)], + &dst_row[x * 4], block_w, block_h, dst_row_pitch, format_id); + } + src_row += src_row_pitch; + dst_row += dst_row_pitch * 4; + } + src_slice += src_slice_pitch; + dst_slice += dst_slice_pitch; + } +} + +static void decompress_bc3(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) +{ + decompress_dxtn(src, dst, src_row_pitch, src_slice_pitch, dst_row_pitch, + dst_slice_pitch, width, height, depth, WINED3DFMT_BC3_UNORM); +} + +static void decompress_bc2(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) +{ + decompress_dxtn(src, dst, src_row_pitch, src_slice_pitch, dst_row_pitch, + dst_slice_pitch, width, height, depth, WINED3DFMT_BC2_UNORM); +} + +static void decompress_bc1(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) +{ + decompress_dxtn(src, dst, src_row_pitch, src_slice_pitch, dst_row_pitch, + dst_slice_pitch, width, height, depth, WINED3DFMT_BC1_UNORM); +} + +static const struct wined3d_format_decompress_info +{ + enum wined3d_format_id id; + void (*decompress)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); +} +format_decompress_info[] = +{ + {WINED3DFMT_DXT1, decompress_bc1}, + {WINED3DFMT_DXT2, decompress_bc2}, + {WINED3DFMT_DXT3, decompress_bc2}, + {WINED3DFMT_DXT4, decompress_bc3}, + {WINED3DFMT_DXT5, decompress_bc3}, + {WINED3DFMT_BC1_UNORM, decompress_bc1}, + {WINED3DFMT_BC2_UNORM, decompress_bc2}, + {WINED3DFMT_BC3_UNORM, decompress_bc3}, +}; + struct wined3d_format_block_info { enum wined3d_format_id id; @@ -437,6 +661,9 @@ struct wined3d_format_texture_info void (*download)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, unsigned int width, unsigned int height, unsigned int depth); + void (*decompress)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); }; static void convert_l4a4_unorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, @@ -1897,6 +2124,34 @@ static BOOL init_format_block_info(struct wined3d_gl_info *gl_info) return TRUE; } +/* Most compressed formats are not supported for 3D textures by OpenGL. + * + * In the case of the S3TC/DXTn formats, NV_texture_compression_vtc provides + * these formats for 3D textures, but unfortunately the block layout is + * different from the one used by Direct3D. + * + * Since applications either don't check format availability at all before + * using these, or refuse to run without them, we decompress them on upload. + * + * Affected applications include "Heroes VI", "From Dust", "Halo Online" and + * "Eldorado". */ +static BOOL init_format_decompress_info(struct wined3d_gl_info *gl_info) +{ + struct wined3d_format *format; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(format_decompress_info); ++i) + { + if (!(format = get_format_internal(gl_info, format_decompress_info[i].id))) + return FALSE; + + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= WINED3DFMT_FLAG_DECOMPRESS; + format->decompress = format_decompress_info[i].decompress; + } + + return TRUE; +} + static GLenum wined3d_gl_type_to_enum(enum wined3d_gl_resource_type type) { switch (type) @@ -3390,34 +3645,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ } } - /* GL_EXT_texture_compression_s3tc does not support 3D textures. Some Windows drivers - * for dx9 GPUs support it, some do not, so not supporting DXTn volumes is OK for d3d9. - * - * Note that GL_NV_texture_compression_vtc adds this functionality to OpenGL, but the - * block layout is not compatible with the one used by d3d. See volume_dxt5_test. */ - idx = get_format_idx(WINED3DFMT_DXT1); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_DXT2); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_DXT3); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_DXT4); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_DXT5); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC1_UNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC1_UNORM_SRGB); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC2_UNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC2_UNORM_SRGB); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC3_UNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC3_UNORM_SRGB); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - /* Similarly with ATI1N / ATI2N and GL_ARB_texture_compression_rgtc. */ + /* These formats are not supported for 3D textures. See also + * WINED3DFMT_FLAG_DECOMPRESS. */ idx = get_format_idx(WINED3DFMT_ATI1N); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_ATI2N); @@ -3742,6 +3971,7 @@ BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wi if (!init_format_base_info(gl_info)) return FALSE; if (!init_format_block_info(gl_info)) goto fail; + if (!init_format_decompress_info(gl_info)) goto fail; if (!ctx) /* WINED3D_NO3D */ return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ece41ebd06c..25f7cb2416e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3081,6 +3081,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +const struct wined3d_format *wined3d_resource_get_decompress_format(struct wined3d_resource *resource, + const struct wined3d_context *context) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -4231,6 +4233,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_EXTENSION 0x00000020 #define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x00000040 #define WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB 0x00000080 +#define WINED3DFMT_FLAG_DECOMPRESS 0x00000100 #define WINED3DFMT_FLAG_FLOAT 0x00000200 #define WINED3DFMT_FLAG_BUMPMAP 0x00000400 #define WINED3DFMT_FLAG_SRGB_READ 0x00000800 @@ -4304,6 +4307,9 @@ struct wined3d_format void (*download)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned dst_slice_pitch, unsigned int width, unsigned int height, unsigned int depth); + void (*decompress)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); enum wined3d_format_id typeless_id; GLenum gl_view_class; -- 2.11.0

1 0

[PATCH 02/12] d3d11: Handle D3D_DRIVER_TYPE_WARP in D3D11CreateDevice().
by Henri Verbeet 04 Aug '18

04 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/d3d11_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 154a376b784..5d085edf2fe 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -202,6 +202,8 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t switch(driver_type) { + case D3D_DRIVER_TYPE_WARP: + FIXME("WARP driver not implemented, falling back to hardware.\n"); case D3D_DRIVER_TYPE_HARDWARE: { hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); -- 2.11.0

1 0

[PATCH 01/12] d3d10: Handle D3D10_DRIVER_TYPE_WARP in D3D10CreateDevice().
by Henri Verbeet 04 Aug '18

04 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/d3d10_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 7c8bee7534d..4d3ed1244ed 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -63,6 +63,8 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver switch (driver_type) { + case D3D10_DRIVER_TYPE_WARP: + FIXME("WARP driver not implemented, falling back to hardware.\n"); case D3D10_DRIVER_TYPE_HARDWARE: { hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); -- 2.11.0

1 0

[PATCH] msi: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 04 Aug '18

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/action.c | 12 ++++++------ dlls/msi/appsearch.c | 3 +-- dlls/msi/assembly.c | 2 +- dlls/msi/automation.c | 2 +- dlls/msi/custom.c | 8 ++++---- dlls/msi/database.c | 2 +- dlls/msi/dialog.c | 2 +- dlls/msi/msi.c | 4 ++-- dlls/msi/package.c | 2 +- dlls/msi/patch.c | 2 +- dlls/msi/registry.c | 38 +++++++++++++++++++------------------- dlls/msi/source.c | 2 +- dlls/msi/upgrade.c | 2 +- 13 files changed, 40 insertions(+), 41 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 29c6827b3f..68d479f8c8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2148,7 +2148,7 @@ static WCHAR *create_temp_dir( MSIDATABASE *db ) if (!db->tempfolder) { WCHAR tmp[MAX_PATH]; - UINT len = sizeof(tmp)/sizeof(tmp[0]); + UINT len = ARRAY_SIZE( tmp ); if (msi_get_property( db, szTempFolder, tmp, &len ) || GetFileAttributesW( tmp ) != FILE_ATTRIBUTE_DIRECTORY) @@ -5496,9 +5496,9 @@ UINT ACTION_ForceReboot(MSIPACKAGE *package) squash_guid( package->ProductCode, squashed_pc ); - GetSystemDirectoryW(sysdir, sizeof(sysdir)/sizeof(sysdir[0])); + GetSystemDirectoryW(sysdir, ARRAY_SIZE(sysdir)); RegCreateKeyW(HKEY_LOCAL_MACHINE,RunOnce,&hkey); - snprintfW( buffer, sizeof(buffer)/sizeof(buffer[0]), msiexec_fmt, sysdir, squashed_pc ); + snprintfW(buffer, ARRAY_SIZE(buffer), msiexec_fmt, sysdir, squashed_pc); msi_reg_set_val_str( hkey, squashed_pc, buffer ); RegCloseKey(hkey); @@ -6152,7 +6152,7 @@ static LPCWSTR *msi_service_args_to_vector(LPWSTR args, DWORD *numargs) static const WCHAR separator[] = {'[','~',']',0}; *numargs = 0; - sep_len = sizeof(separator) / sizeof(WCHAR) - 1; + sep_len = ARRAY_SIZE(separator) - 1; if (!args) return NULL; @@ -7603,7 +7603,7 @@ static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) MSIPACKAGE *package = param; const WCHAR *property = MSI_RecordGetString( rec, 7 ); int attrs = MSI_RecordGetInteger( rec, 5 ); - UINT len = sizeof(fmtW)/sizeof(fmtW[0]); + UINT len = ARRAY_SIZE( fmtW ); WCHAR *product, *features, *cmd; STARTUPINFOW si; PROCESS_INFORMATION info; @@ -7618,7 +7618,7 @@ static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) if (features) len += strlenW( features ); else - len += sizeof(szAll) / sizeof(szAll[0]); + len += ARRAY_SIZE( szAll ); if (!(cmd = msi_alloc( len * sizeof(WCHAR) ))) { diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 693da18355..fbed073bd4 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -949,8 +949,7 @@ static UINT ACTION_SearchDirectory(MSIPACKAGE *package, MSISIGNATURE *sig, if (GetDriveTypeW(pathWithDrive) != DRIVE_FIXED) continue; - lstrcpynW(pathWithDrive + 3, path, - sizeof(pathWithDrive) / sizeof(pathWithDrive[0]) - 3); + lstrcpynW(pathWithDrive + 3, path, ARRAY_SIZE(pathWithDrive) - 3); if (sig->File) rc = ACTION_RecurseSearchDirectory(package, &val, sig, diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index bccd114b49..7b720b6062 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -344,7 +344,7 @@ static const WCHAR *clr_version[] = static const WCHAR *get_clr_version_str( enum clr_version version ) { - if (version >= sizeof(clr_version)/sizeof(clr_version[0])) return clr_version_unknown; + if (version >= ARRAY_SIZE( clr_version )) return clr_version_unknown; return clr_version[version]; } diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 06ad2f90a4..80254e6df4 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -130,7 +130,7 @@ void release_typelib(void) { unsigned i; - for (i = 0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) if (typeinfos[i]) ITypeInfo_Release(typeinfos[i]); diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 1a8a982e48..cea164c303 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -213,7 +213,7 @@ WCHAR *msi_create_temp_file( MSIDATABASE *db ) if (!db->tempfolder) { WCHAR tmp[MAX_PATH]; - UINT len = sizeof(tmp)/sizeof(tmp[0]); + UINT len = ARRAY_SIZE( tmp ); if (msi_get_property( db, szTempFolder, tmp, &len ) || GetFileAttributesW( tmp ) != FILE_ATTRIBUTE_DIRECTORY) @@ -611,9 +611,9 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) sizeof(GUID), 0, NULL); if (sizeof(void *) == 8 && arch == SCS_32BIT_BINARY) - GetSystemWow64DirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); + GetSystemWow64DirectoryW(path, MAX_PATH - ARRAY_SIZE(msiexecW)); else - GetSystemDirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); + GetSystemDirectoryW(path, MAX_PATH - ARRAY_SIZE(msiexecW)); strcatW(path, msiexecW); sprintfW(cmdline, argsW, path, GetCurrentProcessId()); @@ -946,7 +946,7 @@ static UINT HANDLE_CustomType23( MSIPACKAGE *package, const WCHAR *source, const static const WCHAR msiexecW[] = {'m','s','i','e','x','e','c',0}; static const WCHAR paramsW[] = {'/','q','b',' ','/','i',' '}; WCHAR *dir, *arg, *p; - UINT len_src, len_dir, len_tgt, len = sizeof(paramsW)/sizeof(paramsW[0]); + UINT len_src, len_dir, len_tgt, len = ARRAY_SIZE( paramsW ); HANDLE handle; if (!(dir = msi_dup_property( package->db, szOriginalDatabase ))) return ERROR_OUTOFMEMORY; diff --git a/dlls/msi/database.c b/dlls/msi/database.c index ef0221d2b8..c1fb37b583 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -451,7 +451,7 @@ static LPWSTR msi_build_createsql_prelude(LPWSTR table) static const WCHAR create_fmt[] = {'C','R','E','A','T','E',' ','T','A','B','L','E',' ','`','%','s','`',' ','(',' ',0}; - size = sizeof(create_fmt)/sizeof(create_fmt[0]) + lstrlenW(table) - 2; + size = ARRAY_SIZE(create_fmt) + lstrlenW(table) - 2; prelude = msi_alloc(size * sizeof(WCHAR)); if (!prelude) return NULL; diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index b96c44be44..68e8ab2258 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3377,7 +3377,7 @@ static UINT msi_dialog_hyperlink_handler( msi_dialog *dialog, msi_control *contr { static const WCHAR hrefW[] = {'h','r','e','f'}; static const WCHAR openW[] = {'o','p','e','n',0}; - int len, len_href = sizeof(hrefW) / sizeof(hrefW[0]); + int len, len_href = ARRAY_SIZE( hrefW ); const WCHAR *p, *q; WCHAR quote = 0; LITEM item; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7d805afeda..ae146e626f 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1028,7 +1028,7 @@ UINT WINAPI MsiGetProductCodeW(LPCWSTR szComponent, LPWSTR szBuffer) UINT rc, index; HKEY compkey, prodkey; WCHAR squashed_comp[SQUASHED_GUID_SIZE], squashed_prod[SQUASHED_GUID_SIZE]; - DWORD sz = sizeof(squashed_prod)/sizeof(squashed_prod[0]); + DWORD sz = ARRAY_SIZE(squashed_prod); TRACE("%s %p\n", debugstr_w(szComponent), szBuffer); @@ -3482,7 +3482,7 @@ static UINT MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, return ERROR_FILE_NOT_FOUND; } msi_free( components ); - StringFromGUID2( &guid, comp, sizeof(comp)/sizeof(comp[0]) ); + StringFromGUID2( &guid, comp, ARRAY_SIZE( comp )); } state = MSI_GetComponentPath( szProduct, comp, szAllSid, MSIINSTALLCONTEXT_ALL, lpPathBuf, pcchPathBuf ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 0d937d609d..273ca71418 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -559,7 +559,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!RegCreateKeyExW(netsetup, v4client, 0, NULL, 0, KEY_QUERY_VALUE, NULL, &hkey, NULL)) { - size = sizeof(path)/sizeof(path[0]); + size = ARRAY_SIZE(path); if (!RegQueryValueExW(hkey, installpath, NULL, &type, (BYTE *)path, &size)) { len = strlenW(path) + strlenW(fusion) + 2; diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index f6ed3c1f1a..bd9b7b87df 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -1037,7 +1037,7 @@ UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) TRACE("%p, %s\n", package, debugstr_w(patch_code)); - len = sizeof(patch_file) / sizeof(WCHAR); + len = ARRAY_SIZE( patch_file ); r = MsiGetPatchInfoExW( patch_code, package->ProductCode, NULL, package->Context, INSTALLPROPERTY_LOCALPACKAGEW, patch_file, &len ); if (r != ERROR_SUCCESS) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index cbc8d8d6f0..efc72725ce 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1297,12 +1297,12 @@ static UINT fetch_machine_component( DWORD ctx, DWORD index, DWORD *idx, WCHAR g if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, componentsW, 0, access, &key_components )) return ERROR_NO_MORE_ITEMS; - len_component = sizeof(component)/sizeof(component[0]); + len_component = ARRAY_SIZE( component ); while (!RegEnumKeyExW( key_components, i, component, &len_component, NULL, NULL, NULL, NULL )) { if (*idx == index) goto found; (*idx)++; - len_component = sizeof(component)/sizeof(component[0]); + len_component = ARRAY_SIZE( component ); i++; } RegCloseKey( key_components ); @@ -1349,14 +1349,14 @@ static UINT fetch_user_component( const WCHAR *usersid, DWORD ctx, DWORD index, if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, userdataW, 0, access, &key_users )) return ERROR_NO_MORE_ITEMS; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); while (!RegEnumKeyExW( key_users, i, user, &len_user, NULL, NULL, NULL, NULL )) { if ((strcmpW( usersid, szAllSid ) && strcmpW( usersid, user )) || !strcmpW( szLocalSid, user )) { i++; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); continue; } strcpyW( path, user ); @@ -1364,19 +1364,19 @@ static UINT fetch_user_component( const WCHAR *usersid, DWORD ctx, DWORD index, if (RegOpenKeyExW( key_users, path, 0, access, &key_components )) { i++; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); continue; } - len_component = sizeof(component)/sizeof(component[0]); + len_component = ARRAY_SIZE( component ); while (!RegEnumKeyExW( key_components, j, component, &len_component, NULL, NULL, NULL, NULL )) { if (*idx == index) goto found; (*idx)++; - len_component = sizeof(component)/sizeof(component[0]); + len_component = ARRAY_SIZE( component ); j++; } RegCloseKey( key_components ); - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); i++; } RegCloseKey( key_users ); @@ -1709,7 +1709,7 @@ UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR szUpgradeCode, DWORD dwReserved, UINT r; HKEY hkey; WCHAR szKeyName[SQUASHED_GUID_SIZE]; - DWORD dwSize = sizeof(szKeyName)/sizeof(szKeyName[0]); + DWORD dwSize = ARRAY_SIZE(szKeyName); TRACE("%s %u %u %p\n", debugstr_w(szUpgradeCode), dwReserved, iProductIndex, lpProductBuf); @@ -2324,18 +2324,18 @@ static UINT fetch_machine_product( const WCHAR *match, DWORD index, DWORD *idx, if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, productsW, 0, access, &key )) return ERROR_NO_MORE_ITEMS; - len = sizeof(product)/sizeof(product[0]); + len = ARRAY_SIZE( product ); while (!RegEnumKeyExW( key, i, product, &len, NULL, NULL, NULL, NULL )) { if (match && strcmpW( match, product )) { i++; - len = sizeof(product)/sizeof(product[0]); + len = ARRAY_SIZE( product ); continue; } if (*idx == index) goto found; (*idx)++; - len = sizeof(product)/sizeof(product[0]); + len = ARRAY_SIZE( product ); i++; } RegCloseKey( key ); @@ -2396,13 +2396,13 @@ static UINT fetch_user_product( const WCHAR *match, const WCHAR *usersid, DWORD } else return ERROR_INVALID_PARAMETER; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); while (!RegEnumKeyExW( key_users, i, user, &len_user, NULL, NULL, NULL, NULL )) { if (strcmpW( usersid, user ) && strcmpW( usersid, szAllSid )) { i++; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); continue; } strcpyW( path, user ); @@ -2410,25 +2410,25 @@ static UINT fetch_user_product( const WCHAR *match, const WCHAR *usersid, DWORD if (RegOpenKeyExW( key_users, path, 0, access, &key_products )) { i++; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); continue; } - len_product = sizeof(product)/sizeof(product[0]); + len_product = ARRAY_SIZE( product ); while (!RegEnumKeyExW( key_products, j, product, &len_product, NULL, NULL, NULL, NULL )) { if (match && strcmpW( match, product )) { j++; - len_product = sizeof(product)/sizeof(product[0]); + len_product = ARRAY_SIZE( product ); continue; } if (*idx == index) goto found; (*idx)++; - len_product = sizeof(product)/sizeof(product[0]); + len_product = ARRAY_SIZE( product ); j++; } RegCloseKey( key_products ); - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); i++; } RegCloseKey( key_users ); diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 68bf9d0a22..904589e947 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -1006,7 +1006,7 @@ static UINT fill_source_list(struct list *sourcelist, HKEY sourcekey, DWORD *cou while (r == ERROR_SUCCESS) { - size = sizeof(name) / sizeof(name[0]); + size = ARRAY_SIZE(name); r = RegEnumValueW(sourcekey, index, name, &size, NULL, NULL, NULL, &val_size); if (r != ERROR_SUCCESS) return r; diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index ac58d909e0..bbc7df6eec 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -103,7 +103,7 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) { MSIPACKAGE *package = param; WCHAR product[SQUASHED_GUID_SIZE]; - DWORD index = 0, attributes = 0, sz = sizeof(product)/sizeof(product[0]); + DWORD index = 0, attributes = 0, sz = ARRAY_SIZE(product); LPCWSTR upgrade_code; HKEY hkey = 0; UINT rc = ERROR_SUCCESS; -- 2.14.4

1 0

[PATCH] msinfo32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 04 Aug '18

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/msinfo32/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/msinfo32/main.c b/programs/msinfo32/main.c index f64d266d43..17515275fc 100644 --- a/programs/msinfo32/main.c +++ b/programs/msinfo32/main.c @@ -34,8 +34,7 @@ int wmain(int argc, WCHAR *argv[]) WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); WINE_FIXME("\n"); - LoadStringW(GetModuleHandleW(NULL), STRING_SYSTEM_INFO, - system_info, sizeof(system_info)/sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), STRING_SYSTEM_INFO, system_info, ARRAY_SIZE(system_info)); ShellAboutW(NULL, system_info, NULL, NULL); return 0; -- 2.14.4

1 0

[PATCH] msdmo: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 04 Aug '18

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msdmo/dmoreg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index e4766d76b5..864cb859e6 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -316,7 +316,7 @@ HRESULT WINAPI DMOUnregister(REFCLSID dmo, REFGUID category) /* remove from all categories */ if (IsEqualGUID(category, &GUID_NULL)) { - DWORD index = 0, len = sizeof(catW)/sizeof(WCHAR); + DWORD index = 0, len = ARRAY_SIZE(catW); while (!RegEnumKeyExW(categorieskey, index++, catW, &len, NULL, NULL, NULL, NULL)) hr = unregister_dmo_from_category(dmoW, catW, categorieskey); -- 2.14.4

1 0

[PATCH] imm32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 04 Aug '18

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imm32/imm.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 685eb018c4..f235e228ad 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -308,7 +308,7 @@ static HMODULE load_graphics_driver(void) HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; - WCHAR key[(sizeof(key_pathW) + sizeof(displayW)) / sizeof(WCHAR) + 40]; + WCHAR key[ARRAY_SIZE( key_pathW ) + ARRAY_SIZE( displayW ) + 40]; UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); if (!guid_atom) return 0; @@ -769,7 +769,7 @@ HIMC WINAPI ImmCreateContext(void) gl->dwSize = sizeof(GUIDELINE); ImmUnlockIMCC(new_context->IMC.hGuideLine); - for (i = 0; i < sizeof(new_context->IMC.cfCandForm) / sizeof(CANDIDATEFORM); i++) + for (i = 0; i < ARRAY_SIZE(new_context->IMC.cfCandForm); i++) new_context->IMC.cfCandForm[i].dwIndex = ~0u; /* Initialize the IME Private */ @@ -1013,8 +1013,7 @@ DWORD WINAPI ImmGetCandidateListA( return 0; candinfo = ImmLockIMCC(data->IMC.hCandInfo); - if ( dwIndex >= candinfo->dwCount || - dwIndex >= (sizeof(candinfo->dwOffset) / sizeof(DWORD)) ) + if (dwIndex >= candinfo->dwCount || dwIndex >= ARRAY_SIZE(candinfo->dwOffset)) goto done; candlist = (LPCANDIDATELIST)((LPBYTE)candinfo + candinfo->dwOffset[dwIndex]); @@ -1117,8 +1116,7 @@ DWORD WINAPI ImmGetCandidateListW( return 0; candinfo = ImmLockIMCC(data->IMC.hCandInfo); - if ( dwIndex >= candinfo->dwCount || - dwIndex >= (sizeof(candinfo->dwOffset) / sizeof(DWORD)) ) + if (dwIndex >= candinfo->dwCount || dwIndex >= ARRAY_SIZE(candinfo->dwOffset)) goto done; candlist = (LPCANDIDATELIST)((LPBYTE)candinfo + candinfo->dwOffset[dwIndex]); @@ -1152,7 +1150,7 @@ BOOL WINAPI ImmGetCandidateWindow( if (!data || !lpCandidate) return FALSE; - if ( dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) + if (dwIndex >= ARRAY_SIZE(data->IMC.cfCandForm)) return FALSE; if (data->IMC.cfCandForm[dwIndex].dwIndex != dwIndex) @@ -1624,8 +1622,7 @@ static BOOL needs_ime_window(HWND hwnd) { WCHAR classW[8]; - if (GetClassNameW(hwnd, classW, sizeof(classW)/sizeof(classW[0])) && - !strcmpW(classW, szwIME)) + if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !strcmpW(classW, szwIME)) return FALSE; if (GetClassLongPtrW(hwnd, GCL_STYLE) & CS_IME) return FALSE; @@ -1844,7 +1841,7 @@ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) HKEY hkey; DWORD length; DWORD rc; - WCHAR regKey[sizeof(szImeRegFmt)/sizeof(WCHAR)+8]; + WCHAR regKey[ARRAY_SIZE(szImeRegFmt)+8]; wsprintfW( regKey, szImeRegFmt, (ULONG_PTR)hKL ); rc = RegOpenKeyW( HKEY_LOCAL_MACHINE, regKey, &hkey); @@ -2062,7 +2059,7 @@ HKL WINAPI ImmInstallIMEW( HKL hkl; DWORD rc; HKEY hkey; - WCHAR regKey[sizeof(szImeRegFmt)/sizeof(WCHAR)+8]; + WCHAR regKey[ARRAY_SIZE(szImeRegFmt)+8]; TRACE ("(%s, %s):\n", debugstr_w(lpszIMEFileName), debugstr_w(lpszLayoutText)); @@ -2314,7 +2311,7 @@ BOOL WINAPI ImmSetCandidateWindow( wine_dbgstr_point(&lpCandidate->ptCurrentPos), wine_dbgstr_rect(&lpCandidate->rcArea)); - if ( lpCandidate->dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) + if (lpCandidate->dwIndex >= ARRAY_SIZE(data->IMC.cfCandForm)) return FALSE; data->IMC.cfCandForm[lpCandidate->dwIndex] = *lpCandidate; -- 2.14.4

1 0

[PATCH] hnetcfg: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 04 Aug '18

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hnetcfg/apps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index 21e1007da9..e671e8ca8d 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -157,7 +157,7 @@ void release_typelib(void) { unsigned i; - for (i = 0; i < sizeof(typeinfo)/sizeof(*typeinfo); i++) + for (i = 0; i < ARRAY_SIZE(typeinfo); i++) if (typeinfo[i]) ITypeInfo_Release(typeinfo[i]); -- 2.14.4

1 0

[PATCH] devenum: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 04 Aug '18

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/devenum/createdevenum.c | 17 ++++++++--------- dlls/devenum/mediacatenum.c | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 4b2feca650..8fbf323971 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -155,7 +155,7 @@ static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS2 *rgPin) { HKEY hkeyMajorType = NULL; WCHAR wszMajorTypeName[64]; - DWORD cName = sizeof(wszMajorTypeName) / sizeof(WCHAR); + DWORD cName = ARRAY_SIZE(wszMajorTypeName); DWORD dwMinorTypes, i1; if (RegEnumKeyExW(hkeyTypes, i, wszMajorTypeName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue; @@ -175,7 +175,7 @@ static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS2 *rgPin) CLSID *clsMajorType = NULL, *clsMinorType = NULL; HRESULT hr; - cName = sizeof(wszMinorTypeName) / sizeof(WCHAR); + cName = ARRAY_SIZE(wszMinorTypeName); if (RegEnumKeyExW(hkeyMajorType, i1, wszMinorTypeName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue; clsMinorType = CoTaskMemAlloc(sizeof(CLSID)); @@ -261,7 +261,7 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2) { HKEY hkeyPinKey = NULL; WCHAR wszPinName[MAX_PATH]; - DWORD cName = sizeof(wszPinName) / sizeof(WCHAR); + DWORD cName = ARRAY_SIZE(wszPinName); REGFILTERPINS2 *rgPin = &rgPins[rgf2->u.s2.cPins2]; DWORD value, size, Type; LONG lRet; @@ -408,7 +408,7 @@ static void register_legacy_filters(void) for (i = 0; i < dwFilterSubkeys; i++) { WCHAR wszFilterSubkeyName[64]; - DWORD cName = sizeof(wszFilterSubkeyName) / sizeof(WCHAR); + DWORD cName = ARRAY_SIZE(wszFilterSubkeyName); IPropertyBag *prop_bag = NULL; WCHAR wszRegKey[MAX_PATH]; HKEY classkey = NULL; @@ -944,7 +944,7 @@ static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory) strcpyW(wszRegKey, wszActiveMovieKey); - if (!StringFromGUID2(clsidCategory, wszRegKey + strlenW(wszRegKey), sizeof(wszRegKey)/sizeof(wszRegKey[0]) - strlenW(wszRegKey))) + if (!StringFromGUID2(clsidCategory, wszRegKey + strlenW(wszRegKey), ARRAY_SIZE(wszRegKey) - strlenW(wszRegKey))) res = E_INVALIDARG; if (SUCCEEDED(res)) @@ -1016,13 +1016,12 @@ static HRESULT register_codecs(void) { WCHAR szDeviceName[32], szDeviceVersion[32], szDevicePath[10]; - if (capGetDriverDescriptionW ((WORD) i, - szDeviceName, sizeof(szDeviceName)/sizeof(WCHAR), - szDeviceVersion, sizeof(szDeviceVersion)/sizeof(WCHAR))) + if (capGetDriverDescriptionW (i, szDeviceName, ARRAY_SIZE(szDeviceName), + szDeviceVersion, ARRAY_SIZE(szDeviceVersion))) { IMoniker * pMoniker = NULL; WCHAR dprintf[] = { 'v','i','d','e','o','%','d',0 }; - snprintfW(szDevicePath, sizeof(szDevicePath)/sizeof(WCHAR), dprintf, i); + snprintfW(szDevicePath, ARRAY_SIZE(szDevicePath), dprintf, i); /* The above code prevents 1 device with a different ID overwriting another */ rfp2.nMediaTypes = 1; diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 660e81c145..5fa2f008dc 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -889,7 +889,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, StringFromGUID2(&This->class, buffer + CHARS_IN_GUID - 1, CHARS_IN_GUID); } /* try DirectShow filters */ - else if (!(res = RegEnumKeyW(This->sw_key, This->sw_index, buffer, sizeof(buffer)/sizeof(WCHAR)))) + else if (!(res = RegEnumKeyW(This->sw_key, This->sw_index, buffer, ARRAY_SIZE(buffer)))) { This->sw_index++; if ((res = RegOpenKeyExW(This->sw_key, buffer, 0, KEY_QUERY_VALUE, &hkey))) @@ -908,7 +908,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, strcpyW(pMoniker->name, buffer); } /* then try codecs */ - else if (!(res = RegEnumKeyW(This->cm_key, This->cm_index, buffer, sizeof(buffer)/sizeof(WCHAR)))) + else if (!(res = RegEnumKeyW(This->cm_key, This->cm_index, buffer, ARRAY_SIZE(buffer)))) { This->cm_index++; -- 2.14.4

1 0

[PATCH] gdi.exe16: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 04 Aug '18

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi.exe16/gdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index f0c354bb1c..006dd83947 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -3048,7 +3048,7 @@ BOOL16 WINAPI IsGDIObject16( HGDIOBJ16 handle16 ) UINT type = GetObjectType( HGDIOBJ_32( handle16 )); - if (type >= sizeof(type_map)/sizeof(type_map[0])) return FALSE; + if (type >= ARRAY_SIZE(type_map)) return FALSE; return type_map[type]; } -- 2.14.4

1 0

[PATCH] devenum: Remove an unused impl_from_ helper
by Michael Stefaniuc 04 Aug '18

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/devenum/createdevenum.c | 17 ++++++++--------- dlls/devenum/mediacatenum.c | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 4b2feca650..8fbf323971 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -155,7 +155,7 @@ static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS2 *rgPin) { HKEY hkeyMajorType = NULL; WCHAR wszMajorTypeName[64]; - DWORD cName = sizeof(wszMajorTypeName) / sizeof(WCHAR); + DWORD cName = ARRAY_SIZE(wszMajorTypeName); DWORD dwMinorTypes, i1; if (RegEnumKeyExW(hkeyTypes, i, wszMajorTypeName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue; @@ -175,7 +175,7 @@ static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS2 *rgPin) CLSID *clsMajorType = NULL, *clsMinorType = NULL; HRESULT hr; - cName = sizeof(wszMinorTypeName) / sizeof(WCHAR); + cName = ARRAY_SIZE(wszMinorTypeName); if (RegEnumKeyExW(hkeyMajorType, i1, wszMinorTypeName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue; clsMinorType = CoTaskMemAlloc(sizeof(CLSID)); @@ -261,7 +261,7 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2) { HKEY hkeyPinKey = NULL; WCHAR wszPinName[MAX_PATH]; - DWORD cName = sizeof(wszPinName) / sizeof(WCHAR); + DWORD cName = ARRAY_SIZE(wszPinName); REGFILTERPINS2 *rgPin = &rgPins[rgf2->u.s2.cPins2]; DWORD value, size, Type; LONG lRet; @@ -408,7 +408,7 @@ static void register_legacy_filters(void) for (i = 0; i < dwFilterSubkeys; i++) { WCHAR wszFilterSubkeyName[64]; - DWORD cName = sizeof(wszFilterSubkeyName) / sizeof(WCHAR); + DWORD cName = ARRAY_SIZE(wszFilterSubkeyName); IPropertyBag *prop_bag = NULL; WCHAR wszRegKey[MAX_PATH]; HKEY classkey = NULL; @@ -944,7 +944,7 @@ static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory) strcpyW(wszRegKey, wszActiveMovieKey); - if (!StringFromGUID2(clsidCategory, wszRegKey + strlenW(wszRegKey), sizeof(wszRegKey)/sizeof(wszRegKey[0]) - strlenW(wszRegKey))) + if (!StringFromGUID2(clsidCategory, wszRegKey + strlenW(wszRegKey), ARRAY_SIZE(wszRegKey) - strlenW(wszRegKey))) res = E_INVALIDARG; if (SUCCEEDED(res)) @@ -1016,13 +1016,12 @@ static HRESULT register_codecs(void) { WCHAR szDeviceName[32], szDeviceVersion[32], szDevicePath[10]; - if (capGetDriverDescriptionW ((WORD) i, - szDeviceName, sizeof(szDeviceName)/sizeof(WCHAR), - szDeviceVersion, sizeof(szDeviceVersion)/sizeof(WCHAR))) + if (capGetDriverDescriptionW (i, szDeviceName, ARRAY_SIZE(szDeviceName), + szDeviceVersion, ARRAY_SIZE(szDeviceVersion))) { IMoniker * pMoniker = NULL; WCHAR dprintf[] = { 'v','i','d','e','o','%','d',0 }; - snprintfW(szDevicePath, sizeof(szDevicePath)/sizeof(WCHAR), dprintf, i); + snprintfW(szDevicePath, ARRAY_SIZE(szDevicePath), dprintf, i); /* The above code prevents 1 device with a different ID overwriting another */ rfp2.nMediaTypes = 1; diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 660e81c145..5fa2f008dc 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -889,7 +889,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, StringFromGUID2(&This->class, buffer + CHARS_IN_GUID - 1, CHARS_IN_GUID); } /* try DirectShow filters */ - else if (!(res = RegEnumKeyW(This->sw_key, This->sw_index, buffer, sizeof(buffer)/sizeof(WCHAR)))) + else if (!(res = RegEnumKeyW(This->sw_key, This->sw_index, buffer, ARRAY_SIZE(buffer)))) { This->sw_index++; if ((res = RegOpenKeyExW(This->sw_key, buffer, 0, KEY_QUERY_VALUE, &hkey))) @@ -908,7 +908,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, strcpyW(pMoniker->name, buffer); } /* then try codecs */ - else if (!(res = RegEnumKeyW(This->cm_key, This->cm_index, buffer, sizeof(buffer)/sizeof(WCHAR)))) + else if (!(res = RegEnumKeyW(This->cm_key, This->cm_index, buffer, ARRAY_SIZE(buffer)))) { This->cm_index++; -- 2.14.4

2 1

[PATCH] gdi.exe16: Remove an unused impl_from_ helper
by Michael Stefaniuc 04 Aug '18

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi.exe16/gdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index f0c354bb1c..006dd83947 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -3048,7 +3048,7 @@ BOOL16 WINAPI IsGDIObject16( HGDIOBJ16 handle16 ) UINT type = GetObjectType( HGDIOBJ_32( handle16 )); - if (type >= sizeof(type_map)/sizeof(type_map[0])) return FALSE; + if (type >= ARRAY_SIZE(type_map)) return FALSE; return type_map[type]; } -- 2.14.4

2 1

Re: [PATCH 04/13 v3] msvcp90: Add implementation of _Concurrent_vector_Internal_reserve.
by Piotr Caban 04 Aug '18

04 Aug '18