June 2016 - Wine-Commits - list.winehq.org

Hadrien Boizard : include: Add file notification flags.
by Alexandre Julliard June 7, 2016

June 7, 2016

Module: wine Branch: master Commit: 03840373efb66519f4ac0a50c83adba9a8a9979a URL: http://source.winehq.org/git/wine.git/?a=commit;h=03840373efb66519f4ac0a50c… Author: Hadrien Boizard <h.boizard(a)laposte.net> Date: Tue Jun 7 00:26:54 2016 +0200 include: Add file notification flags. Signed-off-by: Hadrien Boizard <h.boizard(a)laposte.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 4e2d818..1a767e7 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4831,6 +4831,7 @@ typedef struct _QUOTA_LIMITS_EX { /* File notification flags */ #define FILE_NOTIFY_CHANGE_FILE_NAME 0x00000001 #define FILE_NOTIFY_CHANGE_DIR_NAME 0x00000002 +#define FILE_NOTIFY_CHANGE_NAME 0x00000003 #define FILE_NOTIFY_CHANGE_ATTRIBUTES 0x00000004 #define FILE_NOTIFY_CHANGE_SIZE 0x00000008 #define FILE_NOTIFY_CHANGE_LAST_WRITE 0x00000010 @@ -4850,6 +4851,9 @@ typedef struct _QUOTA_LIMITS_EX { #define FILE_ACTION_ADDED_STREAM 0x00000006 #define FILE_ACTION_REMOVED_STREAM 0x00000007 #define FILE_ACTION_MODIFIED_STREAM 0x00000008 +#define FILE_ACTION_REMOVED_BY_DELETE 0x00000009 +#define FILE_ACTION_ID_NOT_TUNNELLED 0x0000000a +#define FILE_ACTION_TUNNELLED_ID_COLLISION 0x0000000b #define FILE_CASE_SENSITIVE_SEARCH 0x00000001 #define FILE_CASE_PRESERVED_NAMES 0x00000002 @@ -4859,11 +4863,21 @@ typedef struct _QUOTA_LIMITS_EX { #define FILE_VOLUME_QUOTAS 0x00000020 #define FILE_SUPPORTS_SPARSE_FILES 0x00000040 #define FILE_SUPPORTS_REPARSE_POINTS 0x00000080 +#define FILE_SUPPORTS_REMOTE_STORAGE 0x00000100 #define FILE_VOLUME_IS_COMPRESSED 0x00008000 #define FILE_SUPPORTS_OBJECT_IDS 0x00010000 #define FILE_SUPPORTS_ENCRYPTION 0x00020000 #define FILE_NAMED_STREAMS 0x00040000 #define FILE_READ_ONLY_VOLUME 0x00080000 +#define FILE_SEQUENTIAL_WRITE_ONCE 0x00100000 +#define FILE_SUPPORTS_TRANSACTIONS 0x00200000 +#define FILE_SUPPORTS_HARD_LINKS 0x00400000 +#define FILE_SUPPORTS_EXTENDED_ATTRIBUTES 0x00800000 +#define FILE_SUPPORTS_OPEN_BY_FILE_ID 0x01000000 +#define FILE_SUPPORTS_USN_JOURNAL 0x02000000 +#define FILE_SUPPORTS_INTEGRITY_STREAMS 0x04000000 +#define FILE_SUPPORTS_BLOCK_REFCOUNTING 0x08000000 +#define FILE_SUPPORTS_SPARSE_VDL 0x10000000 /* File alignments (NT) */ #define FILE_BYTE_ALIGNMENT 0x00000000

1 0

Andreas Maier : msi/tests: Test for error control flag handling.
by Alexandre Julliard June 7, 2016

June 7, 2016

Module: wine Branch: master Commit: b947ff3b0fb58686fe8a35e3024d17ee6bda1e54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b947ff3b0fb58686fe8a35e30… Author: Andreas Maier <andy1.m(a)gmx.de> Date: Mon Jun 6 23:35:54 2016 +0200 msi/tests: Test for error control flag handling. Signed-off-by: Andreas Maier <andy1.m(a)gmx.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index fe7f9a2..c281d3b 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -234,7 +234,7 @@ static const char service_install2_dat[] = "LoadOrderGroup\tDependencies\tStartName\tPassword\tArguments\tComponent_\tDescription\n" "s72\ts255\tL255\ti4\ti4\ti4\tS255\tS255\tS255\tS255\tS255\ts72\tL255\n" "ServiceInstall\tServiceInstall\n" - "TestService\tTestService\tTestService\t2\t3\t0\t\t\tTestService\t\t\tservice_comp\t\n" + "TestService\tTestService\tTestService\t2\t3\t32768\t\t\tTestService\t\t\tservice_comp\t\n" "TestService4\tTestService4\tTestService4\t2\t3\t0\t\t\tTestService4\t\t\tservice_comp3\t\n"; static const char service_control_dat[] = @@ -5560,6 +5560,19 @@ static void test_install_services(void) ok(service == NULL, "TestService4 installed\n"); CloseServiceHandle(manager); + res = RegOpenKeyA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services\\TestService", &hKey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + if (res == ERROR_SUCCESS) + { + err_control = 0xBEEF; + err_controltype = REG_DWORD; + err_controlsize = sizeof(err_control); + res = RegQueryValueExA(hKey, "ErrorControl", NULL, &err_controltype, (LPBYTE)&err_control, &err_controlsize); + ok(err_control == 0, "TestService.ErrorControl wrong, expected 0, got %u\n", err_control); + RegCloseKey(hKey); + } + r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);

1 0

Vincent Povirk : gdiplus/tests: Accept empty metafiles having 0 size on Windows.
by Alexandre Julliard June 7, 2016

June 7, 2016

Module: wine Branch: master Commit: f42ff6feab01b0019a684e7dd607ea90cffaf2c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f42ff6feab01b0019a684e7dd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 6 16:00:49 2016 -0500 gdiplus/tests: Accept empty metafiles having 0 size on Windows. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 550dc6b..741f752 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -888,8 +888,10 @@ static void test_nullframerect(void) { expect(UnitPixel, unit); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); - expectf(1.0, bounds.Width); - expectf(1.0, bounds.Height); + ok(bounds.Width == 1.0 || broken(bounds.Width == 0.0) /* xp sp1 */, + "expected 1.0, got %f\n", bounds.Width); + ok(bounds.Height == 1.0 || broken(bounds.Height == 0.0) /* xp sp1 */, + "expected 1.0, got %f\n", bounds.Height); stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); expect(Ok, stat); @@ -908,8 +910,10 @@ static void test_nullframerect(void) { expect(UnitPixel, unit); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); - expectf(1.0, bounds.Width); - expectf(1.0, bounds.Height); + ok(bounds.Width == 1.0 || broken(bounds.Width == 0.0) /* xp sp1 */, + "expected 1.0, got %f\n", bounds.Width); + ok(bounds.Height == 1.0 || broken(bounds.Height == 0.0) /* xp sp1 */, + "expected 1.0, got %f\n", bounds.Height); stat = GdipDeleteGraphics(graphics); expect(Ok, stat); @@ -1279,8 +1283,10 @@ static void test_frameunit(void) expect(UnitPixel, unit); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); - expectf(1.0, bounds.Width); - expectf(1.0, bounds.Height); + ok(bounds.Width == 1.0 || broken(bounds.Width == 0.0) /* xp sp1 */, + "expected 1.0, got %f\n", bounds.Width); + ok(bounds.Height == 1.0 || broken(bounds.Height == 0.0) /* xp sp1 */, + "expected 1.0, got %f\n", bounds.Height); stat = GdipGetImageGraphicsContext((GpImage*)metafile, &graphics); expect(Ok, stat); @@ -1290,8 +1296,10 @@ static void test_frameunit(void) expect(UnitPixel, unit); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); - expectf(1.0, bounds.Width); - expectf(1.0, bounds.Height); + ok(bounds.Width == 1.0 || broken(bounds.Width == 0.0) /* xp sp1 */, + "expected 1.0, got %f\n", bounds.Width); + ok(bounds.Height == 1.0 || broken(bounds.Height == 0.0) /* xp sp1 */, + "expected 1.0, got %f\n", bounds.Height); stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Andreas Maier : msi: Use special error control flag in CreateService.
by Alexandre Julliard June 7, 2016

June 7, 2016

Module: wine Branch: master Commit: ddc1baa43227c4496df950644d0dd324e5ebff00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc1baa43227c4496df950644… Author: Andreas Maier <andy1.m(a)gmx.de> Date: Mon Jun 6 23:34:10 2016 +0200 msi: Use special error control flag in CreateService. Signed-off-by: Andreas Maier <andy1.m(a)gmx.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 15 ++++++++++++++- include/msidefs.h | 5 +++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 370007c..a3b84af 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5811,6 +5811,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) LPWSTR name = NULL, disp = NULL, load_order = NULL, serv_name = NULL; LPWSTR depends = NULL, pass = NULL, args = NULL, image_path = NULL; DWORD serv_type, start_type, err_control; + BOOL is_vital; SERVICE_DESCRIPTIONW sd = {NULL}; UINT ret = ERROR_SUCCESS; @@ -5849,6 +5850,13 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) deformat_string(package, MSI_RecordGetString(rec, 11), &args); deformat_string(package, MSI_RecordGetString(rec, 13), &sd.lpDescription); + /* Should the complete install fail if CreateService fails? */ + is_vital = (err_control & msidbServiceInstallErrorControlVital); + + /* Remove the msidbServiceInstallErrorControlVital-flag from err_control. + CreateService (under Windows) would fail if not. */ + err_control &= ~msidbServiceInstallErrorControlVital; + /* fetch the service path */ row = MSI_QueryGetRecord(package->db, query, comp); if (!row) @@ -5890,7 +5898,12 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) if (!service) { if (GetLastError() != ERROR_SERVICE_EXISTS) - ERR("Failed to create service %s: %d\n", debugstr_w(name), GetLastError()); + { + WARN("Failed to create service %s: %d\n", debugstr_w(name), GetLastError()); + if (is_vital) + ret = ERROR_INSTALL_FAILURE; + + } } else if (sd.lpDescription) { diff --git a/include/msidefs.h b/include/msidefs.h index 640bfa1..c37e5b8 100644 --- a/include/msidefs.h +++ b/include/msidefs.h @@ -200,6 +200,11 @@ enum msidbServiceControlEvent msidbServiceControlEventUninstallDelete = 0x00000080, }; +enum msidbServiceInstallErrorControl +{ + msidbServiceInstallErrorControlVital = 0x00008000 +}; + enum msidbMoveFileOptions { msidbMoveFileOptionsMove = 0x00000001,

1 0

Vincent Povirk : explorer: Hide empty folders in the start menu.
by Alexandre Julliard June 7, 2016

June 7, 2016

Module: wine Branch: master Commit: 8006fd41f0fe495ccbec69d33f6e36d580dcb70c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8006fd41f0fe495ccbec69d33… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 6 13:53:38 2016 -0500 explorer: Hide empty folders in the start menu. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/startmenu.c | 61 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/programs/explorer/startmenu.c b/programs/explorer/startmenu.c index e9c651b..15bb7b5 100644 --- a/programs/explorer/startmenu.c +++ b/programs/explorer/startmenu.c @@ -131,6 +131,50 @@ static HRESULT pidl_to_shellfolder(LPITEMIDLIST pidl, LPWSTR *displayname, IShel return hr; } +static BOOL shell_folder_is_empty(IShellFolder* folder) +{ + IEnumIDList* enumidl; + LPITEMIDLIST pidl=NULL; + + if (IShellFolder_EnumObjects(folder, NULL, SHCONTF_NONFOLDERS, &enumidl) == S_OK) + { + if (IEnumIDList_Next(enumidl, 1, &pidl, NULL) == S_OK) + { + CoTaskMemFree(pidl); + IEnumIDList_Release(enumidl); + return FALSE; + } + + IEnumIDList_Release(enumidl); + } + + if (IShellFolder_EnumObjects(folder, NULL, SHCONTF_FOLDERS, &enumidl) == S_OK) + { + BOOL found = FALSE; + IShellFolder *child_folder; + + while (!found && IEnumIDList_Next(enumidl, 1, &pidl, NULL) == S_OK) + { + if (IShellFolder_BindToObject(folder, pidl, NULL, &IID_IShellFolder, (void *)&child_folder) == S_OK) + { + if (!shell_folder_is_empty(child_folder)) + found = TRUE; + + IShellFolder_Release(child_folder); + } + + CoTaskMemFree(pidl); + } + + IEnumIDList_Release(enumidl); + + if (found) + return FALSE; + } + + return TRUE; +} + /* add an individual file or folder to the menu, takes ownership of pidl */ static struct menu_item* add_shell_item(struct menu_item* parent, LPITEMIDLIST pidl) { @@ -161,6 +205,15 @@ static struct menu_item* add_shell_item(struct menu_item* parent, LPITEMIDLIST p IShellFolder_BindToObject(parent->folder, pidl, NULL, &IID_IShellFolder, (void *)&item->folder); } + if (item->folder && shell_folder_is_empty(item->folder)) + { + IShellFolder_Release(item->folder); + HeapFree(GetProcessHeap(), 0, item->displayname); + HeapFree(GetProcessHeap(), 0, item); + CoTaskMemFree(pidl); + return NULL; + } + parent_menu = parent->menuhandle; item->parent = parent; @@ -411,9 +464,13 @@ void do_startmenu(HWND hwnd) if (!public_startmenu.folder) pidl_to_shellfolder(public_startmenu.pidl, NULL, &public_startmenu.folder); - fill_menu(&user_startmenu); + if (!shell_folder_is_empty(user_startmenu.folder) || + !shell_folder_is_empty(public_startmenu.folder)) + { + fill_menu(&user_startmenu); - AppendMenuW(root_menu.menuhandle, MF_SEPARATOR, 0, NULL); + AppendMenuW(root_menu.menuhandle, MF_SEPARATOR, 0, NULL); + } if (SUCCEEDED(SHGetSpecialFolderLocation(NULL, CSIDL_CONTROLS, &pidl))) add_shell_item(&root_menu, pidl);

1 0

Józef Kucia : wined3d: Add more formats to WINED3DFMT_R24G8_TYPELESS class.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: 589b70df54369c8d43c53e245bf670eeee95212a URL: http://source.winehq.org/git/wine.git/?a=commit;h=589b70df54369c8d43c53e245… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 6 11:39:07 2016 +0200 wined3d: Add more formats to WINED3DFMT_R24G8_TYPELESS class. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 97c3e19..8b60ec5 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -181,6 +181,7 @@ enum wined3d_channel_type WINED3D_CHANNEL_TYPE_FLOAT, WINED3D_CHANNEL_TYPE_DEPTH, WINED3D_CHANNEL_TYPE_STENCIL, + WINED3D_CHANNEL_TYPE_UNUSED, }; struct wined3d_typed_format_info @@ -200,6 +201,7 @@ struct wined3d_typed_format_info * F - WINED3D_CHANNEL_TYPE_FLOAT * D - WINED3D_CHANNEL_TYPE_DEPTH * S - WINED3D_CHANNEL_TYPE_STENCIL + * X - WINED3D_CHANNEL_TYPE_UNUSED */ static const struct wined3d_typed_format_info typed_formats[] = { @@ -232,6 +234,8 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R32_UINT, WINED3DFMT_R32_TYPELESS, "U"}, {WINED3DFMT_R32_SINT, WINED3DFMT_R32_TYPELESS, "I"}, {WINED3DFMT_R32_FLOAT, WINED3DFMT_R32_TYPELESS, "F"}, + {WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_R24G8_TYPELESS, "DX"}, + {WINED3DFMT_X24_TYPELESS_G8_UINT, WINED3DFMT_R24G8_TYPELESS, "XS"}, {WINED3DFMT_D24_UNORM_S8_UINT, WINED3DFMT_R24G8_TYPELESS, "DS"}, {WINED3DFMT_R8G8_SNORM, WINED3DFMT_R8G8_TYPELESS, "ii"}, {WINED3DFMT_R8G8_UNORM, WINED3DFMT_R8G8_TYPELESS, "uu"}, @@ -250,8 +254,8 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_BC5_UNORM, WINED3DFMT_BC5_TYPELESS, ""}, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, WINED3DFMT_B8G8R8A8_TYPELESS, "uuuu"}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8A8_TYPELESS, "uuuu"}, - {WINED3DFMT_B8G8R8X8_UNORM_SRGB, WINED3DFMT_B8G8R8X8_TYPELESS, "uuu"}, - {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B8G8R8X8_TYPELESS, "uuu"}, + {WINED3DFMT_B8G8R8X8_UNORM_SRGB, WINED3DFMT_B8G8R8X8_TYPELESS, "uuuX"}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B8G8R8X8_TYPELESS, "uuuX"}, }; struct wined3d_format_ddi_info @@ -1574,6 +1578,8 @@ static enum wined3d_channel_type map_channel_type(char t) return WINED3D_CHANNEL_TYPE_DEPTH; case 'S': return WINED3D_CHANNEL_TYPE_STENCIL; + case 'X': + return WINED3D_CHANNEL_TYPE_UNUSED; default: ERR("Invalid channel type '%c'.\n", t); return WINED3D_CHANNEL_TYPE_NONE;

1 0

Józef Kucia : d3d11: Normalize more fields in SRV descriptions.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: 696cd4bdf15bd9ce2f949e8854a4a198fdd07e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=696cd4bdf15bd9ce2f949e885… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 6 11:39:03 2016 +0200 d3d11: Normalize more fields in SRV descriptions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- dlls/d3d11/view.c | 79 +++++++++++++++++++++++++++++-------------- 3 files changed, 56 insertions(+), 27 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 39febe5..2a20649 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1774,7 +1774,7 @@ static void test_create_shader_resource_view(void) "Got unexpected view dimension %#x.\n", srv_desc.ViewDimension); ok(U(srv_desc).Texture2D.MostDetailedMip == 0, "Got unexpected MostDetailedMip %u.\n", U(srv_desc).Texture2D.MostDetailedMip); - todo_wine ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", + ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); ID3D10ShaderResourceView_Release(srview); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5cd9c03..e72732f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2197,7 +2197,7 @@ static void test_create_shader_resource_view(void) "Got unexpected view dimension %#x.\n", srv_desc.ViewDimension); ok(U(srv_desc).Texture2D.MostDetailedMip == 0, "Got unexpected MostDetailedMip %u.\n", U(srv_desc).Texture2D.MostDetailedMip); - todo_wine ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", + ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); ID3D11ShaderResourceView_Release(srview); diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index ab14848..2b1be6a 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -467,53 +467,82 @@ static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, I static void normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Resource *resource) { + unsigned int miplevel_count, layer_count; D3D11_RESOURCE_DIMENSION dimension; - - if (desc->Format != DXGI_FORMAT_UNKNOWN) - return; + DXGI_FORMAT format; ID3D11Resource_GetType(resource, &dimension); switch (dimension) { - case D3D11_RESOURCE_DIMENSION_TEXTURE1D: + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: { - D3D11_TEXTURE1D_DESC texture_desc; - ID3D11Texture1D *texture; + const struct d3d_texture2d *texture; - if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture1D, (void **)&texture))) + if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) { - ERR("Resource of type TEXTURE1D doesn't implement ID3D11Texture1D.\n"); - break; + ERR("Cannot get implementation from ID3D11Texture2D.\n"); + return; } - ID3D11Texture1D_GetDesc(texture, &texture_desc); - ID3D11Texture1D_Release(texture); - - if (desc->Format == DXGI_FORMAT_UNKNOWN) - desc->Format = texture_desc.Format; + format = texture->desc.Format; + miplevel_count = texture->desc.MipLevels; + layer_count = texture->desc.ArraySize; break; } - case D3D11_RESOURCE_DIMENSION_TEXTURE2D: + case D3D11_RESOURCE_DIMENSION_TEXTURE3D: { - D3D11_TEXTURE2D_DESC texture_desc; - ID3D11Texture2D *texture; + const struct d3d_texture3d *texture; - if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture2D, (void **)&texture))) + if (!(texture = unsafe_impl_from_ID3D11Texture3D((ID3D11Texture3D *)resource))) { - ERR("Resource of type TEXTURE2D doesn't implement ID3D11Texture2D.\n"); - break; + ERR("Cannot get implementation from ID3D11Texture3D.\n"); + return; } - ID3D11Texture2D_GetDesc(texture, &texture_desc); - ID3D11Texture2D_Release(texture); - - if (desc->Format == DXGI_FORMAT_UNKNOWN) - desc->Format = texture_desc.Format; + format = texture->desc.Format; + miplevel_count = texture->desc.MipLevels; + layer_count = 1; break; } default: + return; + } + + if (desc->Format == DXGI_FORMAT_UNKNOWN) + desc->Format = format; + + switch (desc->ViewDimension) + { + case D3D11_SRV_DIMENSION_TEXTURE1D: + if (desc->u.Texture1D.MipLevels == -1 && desc->u.Texture1D.MostDetailedMip < miplevel_count) + desc->u.Texture1D.MipLevels = miplevel_count - desc->u.Texture1D.MostDetailedMip; + break; + + case D3D11_SRV_DIMENSION_TEXTURE2D: + if (desc->u.Texture2D.MipLevels == -1 && desc->u.Texture2D.MostDetailedMip < miplevel_count) + desc->u.Texture2D.MipLevels = miplevel_count - desc->u.Texture2D.MostDetailedMip; + break; + + case D3D11_SRV_DIMENSION_TEXTURE2DARRAY: + if (desc->u.Texture2DArray.MipLevels == -1 && desc->u.Texture2DArray.MostDetailedMip < miplevel_count) + desc->u.Texture2DArray.MipLevels = miplevel_count - desc->u.Texture2DArray.MostDetailedMip; + if (desc->u.Texture2DArray.ArraySize == -1 && desc->u.Texture2DArray.FirstArraySlice < layer_count) + desc->u.Texture2DArray.ArraySize = layer_count - desc->u.Texture2DArray.FirstArraySlice; + break; + + case D3D11_SRV_DIMENSION_TEXTURE3D: + if (desc->u.Texture3D.MipLevels == -1 && desc->u.Texture3D.MostDetailedMip < miplevel_count) + desc->u.Texture3D.MipLevels = miplevel_count - desc->u.Texture3D.MostDetailedMip; + break; + + case D3D11_SRV_DIMENSION_TEXTURECUBE: + if (desc->u.TextureCube.MipLevels == -1 && desc->u.TextureCube.MostDetailedMip < miplevel_count) + desc->u.TextureCube.MipLevels = miplevel_count - desc->u.TextureCube.MostDetailedMip; + break; + + default: break; } }

1 0

Aaryaman Vasishta : d3drm: Fix declaration of IDirect3DRMViewport*::Init.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: 66fcc9bd41cddf03207a177f7edef8807411a77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=66fcc9bd41cddf03207a177f7… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Mon Jun 6 00:16:36 2016 +0530 d3drm: Fix declaration of IDirect3DRMViewport*::Init. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3drmobj.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 28340fb..dc1ba08 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -855,7 +855,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport,IDirect3DRMObject) #define IDirect3DRMViewport_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b) #define IDirect3DRMViewport_GetClassName(p,a,b) (p)->lpVtbl->GetClassName(p,a,b) /*** IDirect3DRMViewport methods ***/ -#define IDirect3DRMViewport_Init(p,a,b,c,d) (p)->lpVtbl->Init(p,a,b,c,d) +#define IDirect3DRMViewport_Init(p,a,b,c,d,e,f) (p)->lpVtbl->Init(p,a,b,c,d,e,f) #define IDirect3DRMViewport_Clear(p) (p)->lpVtbl->Clear(p) #define IDirect3DRMViewport_Render(p,a) (p)->lpVtbl->Render(p,a) #define IDirect3DRMViewport_SetFront(p,a) (p)->lpVtbl->SetFront(p,a) @@ -898,7 +898,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport,IDirect3DRMObject) #define IDirect3DRMViewport_GetName(p,a,b) (p)->GetName(a,b) #define IDirect3DRMViewport_GetClassName(p,a,b) (p)->GetClassName(a,b) /*** IDirect3DRMViewport methods ***/ -#define IDirect3DRMViewport_Init(p,a,b,c,d) (p)->Init(a,b,c,d) +#define IDirect3DRMViewport_Init(p,a,b,c,d,e,f) (p)->Init(a,b,c,d,e,f) #define IDirect3DRMViewport_Clear(p) (p)->Clear() #define IDirect3DRMViewport_Render(p,a) (p)->Render(a) #define IDirect3DRMViewport_SetFront(p,a) (p)->SetFront(a) @@ -1044,7 +1044,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) #define IDirect3DRMViewport2_GetName(p,a,b) (p)->GetName(a,b) #define IDirect3DRMViewport2_GetClassName(p,a,b) (p)->GetClassName(a,b) /*** IDirect3DRMViewport2 methods ***/ -#define IDirect3DRMViewport2_Init(p,a,b,c,d) (p)->Init(a,b,c,d) +#define IDirect3DRMViewport2_Init(p,a,b,c,d,e,f) (p)->Init(a,b,c,d,e,f) #define IDirect3DRMViewport2_Clear(p) (p)->Clear() #define IDirect3DRMViewport2_Render(p,a) (p)->Render(a) #define IDirect3DRMViewport2_SetFront(p,a) (p)->SetFront(a)

1 0

Józef Kucia : wined3d: Do not try to attach WINED3FMT_NULL surfaces to FBO.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: 9cc95e5a1d930d72892949a3ddf8fa00d471af88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cc95e5a1d930d72892949a3d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 6 12:19:32 2016 +0200 wined3d: Do not try to attach WINED3FMT_NULL surfaces to FBO. This fixes a regression introduced by commit b76fcbe0da45329ff784b027457b4c14c691e215. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 845ca1d..389ae98 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -378,7 +378,7 @@ static inline void context_set_fbo_key_for_surface(const struct wined3d_context struct wined3d_fbo_entry_key *key, UINT idx, struct wined3d_surface *surface, DWORD location) { - if (!surface) + if (!surface || surface->container->resource.format->id == WINED3DFMT_NULL) { key->objects[idx].object = 0; key->objects[idx].target = 0;

1 0

Józef Kucia : wined3d: Add wined3d_shader_resource_view_desc.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: 9bbf3ca0fa7deff55c9c179e58fcf41f57e73963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bbf3ca0fa7deff55c9c179e5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 6 11:39:02 2016 +0200 wined3d: Add wined3d_shader_resource_view_desc. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 107 +++++++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/view.c | 8 ++-- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 39 ++++++++++++++++- 4 files changed, 149 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9bbf3ca0fa7deff55c9c1…

1 0