December 2017 - Wine-commits

Hugh McMaster : reg: Validate the system key before commencing the export operation.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 40643a43a453eee4cd73dfb82ddb07e58f8d5b53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40643a43a453eee4cd73dfb82… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sun Dec 3 06:50:11 2017 +0000 reg: Validate the system key before commencing the export operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 6 ++++++ programs/reg/reg.c | 2 +- programs/reg/reg.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 530d11b..720b9ef 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -38,9 +38,15 @@ static BOOL is_overwrite_switch(const WCHAR *s) int reg_export(int argc, WCHAR *argv[]) { + HKEY root; + WCHAR *path, *long_key; + if (argc == 3 || argc > 5) goto error; + if (!parse_registry_key(argv[2], &root, &path, &long_key)) + return 1; + if (argc == 5 && !is_overwrite_switch(argv[4])) goto error; diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 7affdd2..a65bfc8 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -873,7 +873,7 @@ static WCHAR *get_long_key(HKEY root, WCHAR *path) return long_key; } -static BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key) +BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key) { if (!sane_path(key)) return FALSE; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index b4751e4..3b5ab86 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -29,6 +29,7 @@ void *heap_xrealloc(void *buf, size_t size); BOOL heap_free(void *buf); void WINAPIV output_message(unsigned int id, ...); HKEY path_get_rootkey(const WCHAR *path); +BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key); /* import.c */ int reg_import(const WCHAR *filename);

1 0

Zebediah Figura : shell32: Implement the ReplaceItem() command for Progman DDE.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 57a94970f532cf457787895268b5b59628885314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a94970f532cf45778789526… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 1 20:52:49 2017 -0600 shell32: Implement the ReplaceItem() command for Progman DDE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dde.c | 3 ++- dlls/shell32/tests/progman_dde.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 7505c2c..8ac6f9c 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -127,6 +127,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) static const WCHAR show_groupW[] = {'S','h','o','w','G','r','o','u','p',0}; static const WCHAR add_itemW[] = {'A','d','d','I','t','e','m',0}; static const WCHAR delete_itemW[] = {'D','e','l','e','t','e','I','t','e','m',0}; + static const WCHAR replace_itemW[] = {'R','e','p','l','a','c','e','I','t','e','m',0}; static const WCHAR dotexeW[] = {'.','e','x','e',0}; static const WCHAR dotlnkW[] = {'.','l','n','k',0}; @@ -255,7 +256,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (FAILED(hres)) return DDE_FNOTPROCESSED; } - else if (!strcmpiW(command, delete_itemW)) + else if (!strcmpiW(command, delete_itemW) || !strcmpiW(command, replace_itemW)) { WCHAR *name; BOOL ret; diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 478b3e6..dd9b777 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -325,6 +325,18 @@ static void test_progman_dde(DWORD instance, HCONV hConv) ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(!check_exists("Group1/test1.lnk"), "link should not exist\n"); + error = dde_execute(instance, hConv, "[AddItem(notepad,test1)]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group1/test1.lnk"), "link not created\n"); + + error = dde_execute(instance, hConv, "[ReplaceItem(test1)]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(!check_exists("Group1/test1.lnk"), "link should not exist\n"); + + error = dde_execute(instance, hConv, "[AddItem(regedit)]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group1/regedit.lnk"), "link not created\n"); + /* test ShowGroup() and test which group an item gets added to */ error = dde_execute(instance, hConv, "[ShowGroup(Group1)]"); ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %u\n", error);

1 0

Zebediah Figura : shell32: Implement the ExitProgman() command for Progman DDE.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 7ddd41e3268419726b2097f964b07485685b1165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ddd41e3268419726b2097f96… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 1 20:52:50 2017 -0600 shell32: Implement the ExitProgman() command for Progman DDE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dde.c | 5 +++++ dlls/shell32/tests/progman_dde.c | 13 +++++++++++++ 2 files changed, 18 insertions(+) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 8ac6f9c..cfe5a05 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -128,6 +128,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) static const WCHAR add_itemW[] = {'A','d','d','I','t','e','m',0}; static const WCHAR delete_itemW[] = {'D','e','l','e','t','e','I','t','e','m',0}; static const WCHAR replace_itemW[] = {'R','e','p','l','a','c','e','I','t','e','m',0}; + static const WCHAR exit_progmanW[] = {'E','x','i','t','P','r','o','g','m','a','n',0}; static const WCHAR dotexeW[] = {'.','e','x','e',0}; static const WCHAR dotlnkW[] = {'.','l','n','k',0}; @@ -275,6 +276,10 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (!ret) return DDE_FNOTPROCESSED; } + else if (!strcmpiW(command, exit_progmanW)) + { + /* do nothing */ + } else { FIXME("unhandled command %s\n", debugstr_w(command)); diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index dd9b777..b66c862 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -270,6 +270,12 @@ static void test_parser(DWORD instance, HCONV hConv) error = dde_execute(instance, hConv, "[DeleteGroup(test)]"); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(!check_exists("test"), "directory should not exist\n"); + + error = dde_execute(instance, hConv, "[ExitProgman()]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + + error = dde_execute(instance, hConv, "[ExitProgman]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); } /* 1st set of tests */ @@ -372,6 +378,13 @@ static void test_progman_dde(DWORD instance, HCONV hConv) error = dde_execute(instance, hConv, "[ShowGroup(Group2, 0)]"); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(check_window_exists("Group2"), "window not created\n"); + + error = dde_execute(instance, hConv, "[ExitProgman(1)]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + + error = dde_execute(instance, hConv, "[AddItem(notepad,test4)]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group2/test4.lnk"), "link not created\n"); } /* 2nd set of tests - 2nd connection */

1 0

Zebediah Figura : shell32: Implement the Groups request for Progman DDE.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 35d203622b7964ffbce9840067954980fa2ce9f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d203622b7964ffbce984006… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Dec 1 20:52:51 2017 -0600 shell32: Implement the Groups request for Progman DDE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dde.c | 81 +++++++++++++++++++++++++++++----------- dlls/shell32/tests/progman_dde.c | 53 ++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 22 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index cfe5a05..365ce1c 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -79,29 +79,8 @@ static inline BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) return FALSE; } -static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, - HSZ hszItem) -{ - if (hszTopic == hszProgmanTopic && hszItem == hszGroups && uFmt == CF_TEXT) - { - static BYTE groups_data[] = "Accessories\r\nStartup\r\n"; - FIXME( "returning fake program groups list\n" ); - return DdeCreateDataHandle( dwDDEInst, groups_data, sizeof(groups_data), 0, hszGroups, uFmt, 0 ); - } - else if (hszTopic == hszProgmanTopic && hszItem == hszProgmanService && uFmt == CF_TEXT) - { - static BYTE groups_data[] = "\r\n"; - FIXME( "returning empty groups list\n" ); - /* This is a workaround for an application which expects some data - * and cannot handle NULL. */ - return DdeCreateDataHandle( dwDDEInst, groups_data, sizeof(groups_data), 0, hszProgmanService, uFmt, 0 ); - } - FIXME( "%u %p %s %s: stub\n", uFmt, hconv, debugstr_hsz(hszTopic), debugstr_hsz(hszItem) ); - return NULL; -} - /* Returned string must be freed by caller */ -static WCHAR *get_programs_path(WCHAR *name) +static WCHAR *get_programs_path(const WCHAR *name) { static const WCHAR slashW[] = {'/',0}; WCHAR *programs, *path; @@ -120,6 +99,64 @@ static WCHAR *get_programs_path(WCHAR *name) return path; } +static inline HDDEDATA Dde_OnRequest(UINT uFmt, HCONV hconv, HSZ hszTopic, + HSZ hszItem) +{ + if (hszTopic == hszProgmanTopic && hszItem == hszGroups && uFmt == CF_TEXT) + { + static const WCHAR asteriskW[] = {'*',0}; + static const WCHAR newlineW[] = {'\r','\n',0}; + static const WCHAR dotW[] = {'.',0}; + static const WCHAR dotdotW[] = {'.','.',0}; + WCHAR *programs; + WIN32_FIND_DATAW finddata; + HANDLE hfind; + int len = 1; + WCHAR *groups_data = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)); + char *groups_dataA; + HDDEDATA ret; + + groups_data[0] = 0; + programs = get_programs_path(asteriskW); + hfind = FindFirstFileW(programs, &finddata); + if (hfind) + { + do + { + if ((finddata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && + lstrcmpW(finddata.cFileName, dotW) && lstrcmpW(finddata.cFileName, dotdotW)) + { + len += lstrlenW(finddata.cFileName) + 2; + groups_data = HeapReAlloc(GetProcessHeap(), 0, groups_data, len * sizeof(WCHAR)); + lstrcatW(groups_data, finddata.cFileName); + lstrcatW(groups_data, newlineW); + } + } while (FindNextFileW(hfind, &finddata)); + FindClose(hfind); + } + + len = WideCharToMultiByte(CP_ACP, 0, groups_data, -1, NULL, 0, NULL, NULL); + groups_dataA = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + WideCharToMultiByte(CP_ACP, 0, groups_data, -1, groups_dataA, len, NULL, NULL); + ret = DdeCreateDataHandle(dwDDEInst, (BYTE *)groups_dataA, len, 0, hszGroups, uFmt, 0); + + HeapFree(GetProcessHeap(), 0, groups_dataA); + HeapFree(GetProcessHeap(), 0, groups_data); + HeapFree(GetProcessHeap(), 0, programs); + return ret; + } + else if (hszTopic == hszProgmanTopic && hszItem == hszProgmanService && uFmt == CF_TEXT) + { + static BYTE groups_data[] = "\r\n"; + FIXME( "returning empty groups list\n" ); + /* This is a workaround for an application which expects some data + * and cannot handle NULL. */ + return DdeCreateDataHandle( dwDDEInst, groups_data, sizeof(groups_data), 0, hszProgmanService, uFmt, 0 ); + } + FIXME( "%u %p %s %s: stub\n", uFmt, hconv, debugstr_hsz(hszTopic), debugstr_hsz(hszItem) ); + return NULL; +} + static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) { static const WCHAR create_groupW[] = {'C','r','e','a','t','e','G','r','o','u','p',0}; diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index b66c862..bfa9f65 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -171,6 +171,24 @@ static UINT dde_execute(DWORD instance, HCONV hconv, const char *command_str) return ret; } +static char *dde_request(DWORD instance, HCONV hconv, const char *request_str) +{ + static char data[2000]; + HDDEDATA hdata; + HSZ item; + DWORD result; + + item = DdeCreateStringHandleA(instance, request_str, CP_WINANSI); + ok(item != NULL, "DdeCreateStringHandle() failed: %u\n", DdeGetLastError(instance)); + + hdata = DdeClientTransaction(NULL, -1, hconv, item, CF_TEXT, XTYP_REQUEST, 2000, &result); + if (hdata == NULL) return NULL; + + DdeGetData(hdata, (BYTE *)data, 2000, 0); + + return data; +} + static BOOL check_window_exists(const char *name) { char title[MAX_PATH]; @@ -402,6 +420,40 @@ static void test_progman_dde2(DWORD instance, HCONV hConv) ok(!check_exists("Group2"), "directory should not exist\n"); } +static BOOL check_in_programs_list(const char *list, const char *group) +{ + while (1) + { + if (!strncmp(list, group, strlen(group)) && list[strlen(group)] == '\r') + return TRUE; + if (!(list = strchr(list, '\r'))) break; + list += 2; + } + return FALSE; +} + +static void test_request_groups(DWORD instance, HCONV hconv) +{ + char *list; + char programs[MAX_PATH]; + WIN32_FIND_DATAA finddata; + HANDLE hfind; + + list = dde_request(instance, hconv, "Groups"); + ok(list != NULL, "request failed: %u\n", DdeGetLastError(instance)); + strcpy(programs, ProgramsDir); + strcat(programs, "/*"); + hfind = FindFirstFileA(programs, &finddata); + do + { + if ((finddata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) && finddata.cFileName[0] != '.') + { + ok(check_in_programs_list(list, finddata.cFileName), + "directory '%s' missing from group list\n", finddata.cFileName); + } + } while (FindNextFileA(hfind, &finddata)); +} + START_TEST(progman_dde) { DWORD instance = 0; @@ -430,6 +482,7 @@ START_TEST(progman_dde) test_parser(instance, hConv); test_progman_dde(instance, hConv); + test_request_groups(instance, hConv); /* Cleanup & Exit */ ok(DdeDisconnect(hConv), "DdeDisonnect() failed: %u\n", DdeGetLastError(instance));

1 0

Józef Kucia : ddraw: Cleanup ddraw_get_d3dcaps().
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: d1f518975914e41ad03d717a88aff42f10a70cfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f518975914e41ad03d717a8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Dec 2 10:24:34 2017 +0100 ddraw: Cleanup ddraw_get_d3dcaps(). 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/ddraw/ddraw.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5f90a75..d3e491c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1420,23 +1420,10 @@ HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps) caps->dwMinTextureHeight = 1; /* Convert DWORDs safely to WORDs */ - if (wined3d_caps.MaxTextureBlendStages > 0xffff) - caps->wMaxTextureBlendStages = 0xffff; - else - caps->wMaxTextureBlendStages = (WORD)wined3d_caps.MaxTextureBlendStages; - if (wined3d_caps.MaxSimultaneousTextures > 0xffff) - caps->wMaxSimultaneousTextures = 0xffff; - else - caps->wMaxSimultaneousTextures = (WORD)wined3d_caps.MaxSimultaneousTextures; - - if (wined3d_caps.MaxUserClipPlanes > 0xffff) - caps->wMaxUserClipPlanes = 0xffff; - else - caps->wMaxUserClipPlanes = (WORD)wined3d_caps.MaxUserClipPlanes; - if (wined3d_caps.MaxVertexBlendMatrices > 0xffff) - caps->wMaxVertexBlendMatrices = 0xffff; - else - caps->wMaxVertexBlendMatrices = (WORD)wined3d_caps.MaxVertexBlendMatrices; + caps->wMaxTextureBlendStages = min(wined3d_caps.MaxTextureBlendStages, 0xffff); + caps->wMaxSimultaneousTextures = min(wined3d_caps.MaxSimultaneousTextures, 0xffff); + caps->wMaxUserClipPlanes = min(wined3d_caps.MaxUserClipPlanes, D3DMAXUSERCLIPPLANES); + caps->wMaxVertexBlendMatrices = min(wined3d_caps.MaxVertexBlendMatrices, 0xffff); caps->deviceGUID = IID_IDirect3DTnLHalDevice;

1 0

Józef Kucia : d3d9/tests: Add test for clip planes limits.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 3e61833807f96b9fb1a8e9fc775af3bbabd93f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e61833807f96b9fb1a8e9fc7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Dec 2 10:24:35 2017 +0100 d3d9/tests: Add test for clip planes limits. 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/d3d9/tests/device.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 388cda1..bcdfd0e 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11985,6 +11985,98 @@ todo_wine DestroyWindow(window); } +static void test_clip_planes_limits(void) +{ + static const DWORD device_flags[] = {0, CREATE_DEVICE_SWVP_ONLY}; + IDirect3DDevice9 *device; + struct device_desc desc; + unsigned int i, j; + IDirect3D9 *d3d; + ULONG refcount; + float plane[4]; + D3DCAPS9 caps; + DWORD state; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + for (i = 0; i < ARRAY_SIZE(device_flags); ++i) + { + desc.device_window = window; + desc.width = 640; + desc.height = 480; + desc.flags = device_flags[i]; + if (!(device = create_device(d3d, window, &desc))) + { + skip("Failed to create D3D device, flags %#x.\n", desc.flags); + continue; + } + + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get caps, hr %#x.\n", hr); + + trace("Max user clip planes: %u.\n", caps.MaxUserClipPlanes); + + for (j = 0; j < 2 * D3DMAXUSERCLIPPLANES; ++j) + { + memset(plane, 0xff, sizeof(plane)); + hr = IDirect3DDevice9_GetClipPlane(device, j, plane); + todo_wine_if(j >= caps.MaxUserClipPlanes) + { + ok(hr == D3D_OK, "Failed to get clip plane %u, hr %#x.\n", j, hr); + ok(!plane[0] && !plane[1] && !plane[2] && !plane[3], + "Got unexpected plane %u: %.8e, %.8e, %.8e, %.8e.\n", + j, plane[0], plane[1], plane[2], plane[3]); + } + } + + plane[0] = 2.0f; + plane[1] = 8.0f; + plane[2] = 5.0f; + for (j = 0; j < 2 * D3DMAXUSERCLIPPLANES; ++j) + { + plane[3] = j; + hr = IDirect3DDevice9_SetClipPlane(device, j, plane); + todo_wine_if(j >= caps.MaxUserClipPlanes) + ok(hr == D3D_OK, "Failed to set clip plane %u, hr %#x.\n", j, hr); + } + for (j = 0; j < 2 * D3DMAXUSERCLIPPLANES; ++j) + { + float expected_d = j >= caps.MaxUserClipPlanes - 1 ? 2 * D3DMAXUSERCLIPPLANES - 1 : j; + memset(plane, 0xff, sizeof(plane)); + hr = IDirect3DDevice9_GetClipPlane(device, j, plane); + todo_wine_if(j >= caps.MaxUserClipPlanes) + ok(hr == D3D_OK, "Failed to get clip plane %u, hr %#x.\n", j, hr); + todo_wine_if(j >= caps.MaxUserClipPlanes - 1) + ok(plane[0] == 2.0f && plane[1] == 8.0f && plane[2] == 5.0f && plane[3] == expected_d, + "Got unexpected plane %u: %.8e, %.8e, %.8e, %.8e.\n", + j, plane[0], plane[1], plane[2], plane[3]); + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPLANEENABLE, 0xffffffff); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_CLIPPLANEENABLE, &state); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(state == 0xffffffff, "Got unexpected state %#x.\n", state); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPLANEENABLE, 0x80000000); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderState(device, D3DRS_CLIPPLANEENABLE, &state); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(state == 0x80000000, "Got unexpected state %#x.\n", state); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -12105,6 +12197,7 @@ START_TEST(device) test_format_unknown(); test_destroyed_window(); test_lockable_backbuffer(); + test_clip_planes_limits(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Józef Kucia : d3d8/tests: Add test for clip planes limits.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 45ded87cf49d1438cb1b7ea591f457b79c07c01d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45ded87cf49d1438cb1b7ea59… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Dec 2 10:24:36 2017 +0100 d3d8/tests: Add test for clip planes limits. 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/d3d8/tests/device.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 94b3e2e..915ab8b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -28,6 +28,8 @@ #include <d3d8.h> #include "wine/test.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + struct vec3 { float x, y, z; @@ -8401,6 +8403,91 @@ static void test_destroyed_window(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_clip_planes_limits(void) +{ + static const DWORD device_flags[] = {0, CREATE_DEVICE_SWVP_ONLY}; + IDirect3DDevice8 *device; + struct device_desc desc; + unsigned int i, j; + IDirect3D8 *d3d; + ULONG refcount; + float plane[4]; + D3DCAPS8 caps; + DWORD state; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + for (i = 0; i < ARRAY_SIZE(device_flags); ++i) + { + desc.device_window = window; + desc.width = 640; + desc.height = 480; + desc.flags = device_flags[i]; + if (!(device = create_device(d3d, window, &desc))) + { + skip("Failed to create D3D device, flags %#x.\n", desc.flags); + continue; + } + + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "Failed to get caps, hr %#x.\n", hr); + + trace("Max user clip planes: %u.\n", caps.MaxUserClipPlanes); + + for (j = 0; j < caps.MaxUserClipPlanes; ++j) + { + memset(plane, 0xff, sizeof(plane)); + hr = IDirect3DDevice8_GetClipPlane(device, j, plane); + ok(hr == D3D_OK, "Failed to get clip plane %u, hr %#x.\n", j, hr); + ok(!plane[0] && !plane[1] && !plane[2] && !plane[3], + "Got unexpected plane %u: %.8e, %.8e, %.8e, %.8e.\n", + j, plane[0], plane[1], plane[2], plane[3]); + } + + plane[0] = 2.0f; + plane[1] = 8.0f; + plane[2] = 5.0f; + for (j = 0; j < caps.MaxUserClipPlanes; ++j) + { + plane[3] = j; + hr = IDirect3DDevice8_SetClipPlane(device, j, plane); + ok(hr == D3D_OK, "Failed to set clip plane %u, hr %#x.\n", j, hr); + } + for (j = 0; j < caps.MaxUserClipPlanes; ++j) + { + memset(plane, 0xff, sizeof(plane)); + hr = IDirect3DDevice8_GetClipPlane(device, j, plane); + ok(hr == D3D_OK, "Failed to get clip plane %u, hr %#x.\n", j, hr); + ok(plane[0] == 2.0f && plane[1] == 8.0f && plane[2] == 5.0f && plane[3] == j, + "Got unexpected plane %u: %.8e, %.8e, %.8e, %.8e.\n", + j, plane[0], plane[1], plane[2], plane[3]); + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPLANEENABLE, 0xffffffff); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderState(device, D3DRS_CLIPPLANEENABLE, &state); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(state == 0xffffffff, "Got unexpected state %#x.\n", state); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPLANEENABLE, 0x80000000); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetRenderState(device, D3DRS_CLIPPLANEENABLE, &state); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(state == 0x80000000, "Got unexpected state %#x.\n", state); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -8508,6 +8595,7 @@ START_TEST(device) test_render_target_device_mismatch(); test_format_unknown(); test_destroyed_window(); + test_clip_planes_limits(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Józef Kucia : ddraw/tests: Add test for clip planes limits.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 462bbf4d20b7c80e5595e15e426f90b6e4cac4db URL: http://source.winehq.org/git/wine.git/?a=commit;h=462bbf4d20b7c80e5595e15e4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Dec 2 10:24:37 2017 +0100 ddraw/tests: Add test for clip planes limits. 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/ddraw/tests/ddraw7.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 00c7919..17abdf4 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13297,6 +13297,82 @@ static void test_compute_sphere_visibility(void) DestroyWindow(window); } +static void test_clip_planes_limits(void) +{ + IDirect3DDevice7 *device; + D3DDEVICEDESC7 caps; + unsigned int i; + ULONG refcount; + float plane[4]; + HWND window; + DWORD state; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + DestroyWindow(window); + return; + } + + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice7_GetCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + trace("Max user clip planes: %u.\n", caps.wMaxUserClipPlanes); + + for (i = 0; i < D3DMAXUSERCLIPPLANES; ++i) + { + memset(plane, 0xff, sizeof(plane)); + hr = IDirect3DDevice7_GetClipPlane(device, i, plane); + todo_wine_if(i >= caps.wMaxUserClipPlanes) + { + ok(hr == D3D_OK, "Failed to get clip plane %u, hr %#x.\n", i, hr); + ok(!plane[0] && !plane[1] && !plane[2] && !plane[3], + "Got unexpected plane %u: %.8e, %.8e, %.8e, %.8e.\n", + i, plane[0], plane[1], plane[2], plane[3]); + } + } + + plane[0] = 2.0f; + plane[1] = 8.0f; + plane[2] = 5.0f; + for (i = 0; i < D3DMAXUSERCLIPPLANES; ++i) + { + plane[3] = i; + hr = IDirect3DDevice7_SetClipPlane(device, i, plane); + todo_wine_if(i >= caps.wMaxUserClipPlanes) + ok(hr == D3D_OK, "Failed to set clip plane %u, hr %#x.\n", i, hr); + } + for (i = 0; i < D3DMAXUSERCLIPPLANES; ++i) + { + memset(plane, 0xff, sizeof(plane)); + hr = IDirect3DDevice7_GetClipPlane(device, i, plane); + todo_wine_if(i >= caps.wMaxUserClipPlanes) + ok(hr == D3D_OK, "Failed to get clip plane %u, hr %#x.\n", i, hr); + todo_wine_if(i >= caps.wMaxUserClipPlanes) + ok(plane[0] == 2.0f && plane[1] == 8.0f && plane[2] == 5.0f && plane[3] == i, + "Got unexpected plane %u: %.8e, %.8e, %.8e, %.8e.\n", + i, plane[0], plane[1], plane[2], plane[3]); + } + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPLANEENABLE, 0xffffffff); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_CLIPPLANEENABLE, &state); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(state == 0xffffffff, "Got unexpected state %#x.\n", state); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_CLIPPLANEENABLE, 0x80000000); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice7_GetRenderState(device, D3DRENDERSTATE_CLIPPLANEENABLE, &state); + ok(SUCCEEDED(hr), "Failed to get render state, hr %#x.\n", hr); + ok(state == 0x80000000, "Got unexpected state %#x.\n", state); + + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -13414,4 +13490,5 @@ START_TEST(ddraw7) test_ck_operation(); test_vb_refcount(); test_compute_sphere_visibility(); + test_clip_planes_limits(); }

1 0

Józef Kucia : d3d9: Clamp clip plane index to valid range.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 93d45c04c4a47845acc1de4369d37f951fe2e885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93d45c04c4a47845acc1de436… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Dec 2 10:24:38 2017 +0100 d3d9: Clamp clip plane index to valid range. 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/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/device.c | 19 ++++++++++--------- dlls/d3d9/tests/device.c | 6 ------ 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index c7b67e5..7cbb540 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -97,6 +97,8 @@ struct d3d9_device BOOL in_scene; BOOL has_vertex_declaration; + unsigned int max_user_clip_planes; + UINT implicit_swapchain_count; struct d3d9_swapchain **implicit_swapchains; }; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f6086bf..655318e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2030,6 +2030,8 @@ static HRESULT WINAPI d3d9_device_SetClipPlane(IDirect3DDevice9Ex *iface, DWORD TRACE("iface %p, index %u, plane %p.\n", iface, index, plane); + index = min(index, device->max_user_clip_planes - 1); + wined3d_mutex_lock(); hr = wined3d_device_set_clip_plane(device->wined3d_device, index, (const struct wined3d_vec4 *)plane); wined3d_mutex_unlock(); @@ -2044,6 +2046,8 @@ static HRESULT WINAPI d3d9_device_GetClipPlane(IDirect3DDevice9Ex *iface, DWORD TRACE("iface %p, index %u, plane %p.\n", iface, index, plane); + index = min(index, device->max_user_clip_planes - 1); + wined3d_mutex_lock(); hr = wined3d_device_get_clip_plane(device->wined3d_device, index, (struct wined3d_vec4 *)plane); wined3d_mutex_unlock(); @@ -4012,7 +4016,8 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode) { struct wined3d_swapchain_desc *swapchain_desc; - UINT i, count = 1; + unsigned i, count = 1; + WINED3DCAPS caps; HRESULT hr; if (mode) @@ -4025,22 +4030,18 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine if (!(flags & D3DCREATE_FPU_PRESERVE)) setup_fpu(); wined3d_mutex_lock(); - hr = wined3d_device_create(wined3d, adapter, device_type, focus_window, flags, 4, - &device->device_parent, &device->wined3d_device); - if (FAILED(hr)) + if (FAILED(hr = wined3d_device_create(wined3d, adapter, device_type, focus_window, flags, 4, + &device->device_parent, &device->wined3d_device))) { WARN("Failed to create wined3d device, hr %#x.\n", hr); wined3d_mutex_unlock(); return hr; } + wined3d_get_device_caps(wined3d, adapter, device_type, &caps); + device->max_user_clip_planes = caps.MaxUserClipPlanes; if (flags & D3DCREATE_ADAPTERGROUP_DEVICE) - { - WINED3DCAPS caps; - - wined3d_get_device_caps(wined3d, adapter, device_type, &caps); count = caps.NumberOfAdaptersInGroup; - } if (flags & D3DCREATE_MULTITHREADED) wined3d_device_set_multithreaded(device->wined3d_device); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index bcdfd0e..866f435 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12026,13 +12026,10 @@ static void test_clip_planes_limits(void) { memset(plane, 0xff, sizeof(plane)); hr = IDirect3DDevice9_GetClipPlane(device, j, plane); - todo_wine_if(j >= caps.MaxUserClipPlanes) - { ok(hr == D3D_OK, "Failed to get clip plane %u, hr %#x.\n", j, hr); ok(!plane[0] && !plane[1] && !plane[2] && !plane[3], "Got unexpected plane %u: %.8e, %.8e, %.8e, %.8e.\n", j, plane[0], plane[1], plane[2], plane[3]); - } } plane[0] = 2.0f; @@ -12042,7 +12039,6 @@ static void test_clip_planes_limits(void) { plane[3] = j; hr = IDirect3DDevice9_SetClipPlane(device, j, plane); - todo_wine_if(j >= caps.MaxUserClipPlanes) ok(hr == D3D_OK, "Failed to set clip plane %u, hr %#x.\n", j, hr); } for (j = 0; j < 2 * D3DMAXUSERCLIPPLANES; ++j) @@ -12050,9 +12046,7 @@ static void test_clip_planes_limits(void) float expected_d = j >= caps.MaxUserClipPlanes - 1 ? 2 * D3DMAXUSERCLIPPLANES - 1 : j; memset(plane, 0xff, sizeof(plane)); hr = IDirect3DDevice9_GetClipPlane(device, j, plane); - todo_wine_if(j >= caps.MaxUserClipPlanes) ok(hr == D3D_OK, "Failed to get clip plane %u, hr %#x.\n", j, hr); - todo_wine_if(j >= caps.MaxUserClipPlanes - 1) ok(plane[0] == 2.0f && plane[1] == 8.0f && plane[2] == 5.0f && plane[3] == expected_d, "Got unexpected plane %u: %.8e, %.8e, %.8e, %.8e.\n", j, plane[0], plane[1], plane[2], plane[3]);

1 0

Józef Kucia : wined3d: Allow setting all 32 user clip planes.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 98e63e469e72faa6ff36391fa765ef0fb5d36078 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98e63e469e72faa6ff36391fa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Dec 2 10:24:39 2017 +0100 wined3d: Allow setting all 32 user clip planes. 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/ddraw/tests/ddraw7.c | 6 ------ dlls/wined3d/device.c | 12 ++++++++---- dlls/wined3d/wined3d_private.h | 6 ++++-- include/wine/wined3d.h | 1 - 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 17abdf4..5e176c7 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13326,13 +13326,10 @@ static void test_clip_planes_limits(void) { memset(plane, 0xff, sizeof(plane)); hr = IDirect3DDevice7_GetClipPlane(device, i, plane); - todo_wine_if(i >= caps.wMaxUserClipPlanes) - { ok(hr == D3D_OK, "Failed to get clip plane %u, hr %#x.\n", i, hr); ok(!plane[0] && !plane[1] && !plane[2] && !plane[3], "Got unexpected plane %u: %.8e, %.8e, %.8e, %.8e.\n", i, plane[0], plane[1], plane[2], plane[3]); - } } plane[0] = 2.0f; @@ -13342,16 +13339,13 @@ static void test_clip_planes_limits(void) { plane[3] = i; hr = IDirect3DDevice7_SetClipPlane(device, i, plane); - todo_wine_if(i >= caps.wMaxUserClipPlanes) ok(hr == D3D_OK, "Failed to set clip plane %u, hr %#x.\n", i, hr); } for (i = 0; i < D3DMAXUSERCLIPPLANES; ++i) { memset(plane, 0xff, sizeof(plane)); hr = IDirect3DDevice7_GetClipPlane(device, i, plane); - todo_wine_if(i >= caps.wMaxUserClipPlanes) ok(hr == D3D_OK, "Failed to get clip plane %u, hr %#x.\n", i, hr); - todo_wine_if(i >= caps.wMaxUserClipPlanes) ok(plane[0] == 2.0f && plane[1] == 8.0f && plane[2] == 5.0f && plane[3] == i, "Got unexpected plane %u: %.8e, %.8e, %.8e, %.8e.\n", i, plane[0], plane[1], plane[2], plane[3]); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index de6f1c5..7340488 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1757,8 +1757,7 @@ HRESULT CDECL wined3d_device_set_clip_plane(struct wined3d_device *device, { TRACE("device %p, plane_idx %u, plane %p.\n", device, plane_idx, plane); - /* Validate plane_idx. */ - if (plane_idx >= device->adapter->gl_info.limits.user_clip_distances) + if (plane_idx >= WINED3D_MAX_USER_CLIP_PLANES) { TRACE("Application has requested clipplane this device doesn't support.\n"); return WINED3DERR_INVALIDCALL; @@ -1775,6 +1774,12 @@ HRESULT CDECL wined3d_device_set_clip_plane(struct wined3d_device *device, device->update_state->clip_planes[plane_idx] = *plane; + if (plane_idx >= device->adapter->gl_info.limits.user_clip_distances) + { + WARN("Clip plane %u is not supported.\n", plane_idx); + return WINED3D_OK; + } + if (!device->recording) wined3d_cs_emit_set_clip_plane(device->cs, plane_idx, plane); @@ -1786,8 +1791,7 @@ HRESULT CDECL wined3d_device_get_clip_plane(const struct wined3d_device *device, { TRACE("device %p, plane_idx %u, plane %p.\n", device, plane_idx, plane); - /* Validate plane_idx. */ - if (plane_idx >= device->adapter->gl_info.limits.user_clip_distances) + if (plane_idx >= WINED3D_MAX_USER_CLIP_PLANES) { TRACE("Application has requested clipplane this device doesn't support.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0daa861..bb5ed78 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -259,6 +259,8 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup return complex_fixup; } +#define WINED3D_MAX_USER_CLIP_PLANES 32 + /* Device caps */ #define MAX_STREAMS 16 #define MAX_TEXTURES 8 @@ -266,7 +268,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define MAX_VERTEX_SAMPLERS 4 #define MAX_COMBINED_SAMPLERS (MAX_FRAGMENT_SAMPLERS + MAX_VERTEX_SAMPLERS) #define MAX_ACTIVE_LIGHTS 8 -#define MAX_CLIP_DISTANCES WINED3DMAXUSERCLIPPLANES +#define MAX_CLIP_DISTANCES WINED3D_MAX_USER_CLIP_PLANES #define MAX_CONSTANT_BUFFERS 15 #define MAX_SAMPLER_OBJECTS 16 #define MAX_SHADER_RESOURCE_VIEWS 128 @@ -3352,7 +3354,7 @@ struct wined3d_saved_states DWORD renderState[(WINEHIGHEST_RENDER_STATE >> 5) + 1]; DWORD textureState[MAX_TEXTURES]; /* WINED3D_HIGHEST_TEXTURE_STATE + 1, 18 */ WORD samplerState[MAX_COMBINED_SAMPLERS]; /* WINED3D_HIGHEST_SAMPLER_STATE + 1, 14 */ - DWORD clipplane; /* WINED3DMAXUSERCLIPPLANES, 32 */ + DWORD clipplane; /* WINED3D_MAX_USER_CLIP_PLANES, 32 */ WORD pixelShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ WORD pixelShaderConstantsI; /* WINED3D_MAX_CONSTS_I, 16 */ BOOL ps_consts_f[WINED3D_MAX_PS_CONSTS_F]; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a0ac7ba..ad9fd13 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -928,7 +928,6 @@ enum wined3d_shader_byte_code_format #define WINED3DPRESENT_INTERVAL_FOUR 0x00000008 #define WINED3DPRESENT_INTERVAL_IMMEDIATE 0x80000000 -#define WINED3DMAXUSERCLIPPLANES 32 #define WINED3DCLIPPLANE0 (1u << 0) #define WINED3DCLIPPLANE1 (1u << 1) #define WINED3DCLIPPLANE2 (1u << 2)

1 0