wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

nvapi-Stub_DLL: Add missing linebreaks to ok() messages.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-08-17 08:32:08 +02:00
parent b5534bc463
commit 9e203d3b8f
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/nvapi-Stub_DLL/0005-nvapi-Add-stubs-for-NvAPI_GPU_GetFullName.patch
View File

@ -126,7 +126,7 @@ index 3855635..e205662 100644
+ memset(str, 0, sizeof(str));
+ status = pNvAPI_GPU_GetFullName(gpuHandle[0], str);
+ ok(status == NVAPI_OK, "Expected status NVAPI_OK, got %d\n", status);
+ ok(str[0] != 0, "Expected non emptry string");
+ ok(str[0] != 0, "Expected non emptry string\n");
+ trace("GPU-0 name: %s\n", str);
+}

2
patches/nvapi-Stub_DLL/0007-nvapi-Add-stub-for-NvAPI_DISP_GetGDIPrimaryDisplayId.patch
View File

@ -97,7 +97,7 @@ index e205662..acdd10d 100644
+ disp = 0;
+ status = pNvAPI_DISP_GetGDIPrimaryDisplayId(&disp);
+ ok(status == NVAPI_OK, "Expected status NVAPI_OK, got %d\n", status);
+ ok(disp != 0, "Expected disp to be non null");
+ ok(disp != 0, "Expected disp to be non null\n");
+}
+
START_TEST( nvapi )

10
patches/nvapi-Stub_DLL/0008-nvapi-Add-stub-for-EnumNvidiaDisplayHandle.patch
View File

@ -73,7 +73,7 @@ index acdd10d..8d15382 100644
if (!pNvAPI_Initialize)
{
@@ -484,6 +487,45 @@ static void test_NvAPI_DISP_GetGDIPrimaryDisplayId(void)
ok(disp != 0, "Expected disp to be non null");
ok(disp != 0, "Expected disp to be non null\n");
}
+static void test_NvAPI_EnumNvidiaDisplayHandle(void)
@ -94,7 +94,7 @@ index acdd10d..8d15382 100644
+ disp = NULL;
+ status = pNvAPI_EnumNvidiaDisplayHandle(i, &disp);
+ ok(status == NVAPI_OK, "Expected status NVAPI_OK, got %d\n", status);
+ ok(disp != NULL, "Expected disp to be non null");
+ ok(disp != NULL, "Expected disp to be non null\n");
+
+ while (!pNvAPI_EnumNvidiaDisplayHandle(i, &disp))
+ i++;
@ -102,17 +102,17 @@ index acdd10d..8d15382 100644
+ disp = NULL;
+ status = pNvAPI_EnumNvidiaDisplayHandle(i, &disp);
+ ok(status == NVAPI_END_ENUMERATION, "Expected status NVAPI_END_ENUMERATION, got %d\n", status);
+ ok(disp == NULL, "Expected disp to be null");
+ ok(disp == NULL, "Expected disp to be null\n");
+
+ disp = NULL;
+ status = pNvAPI_EnumNvidiaDisplayHandle(NVAPI_MAX_DISPLAYS - 1, &disp);
+ ok(status == NVAPI_END_ENUMERATION, "Expected status NVAPI_END_ENUMERATION, got %d\n", status);
+ ok(disp == NULL, "Expected disp to be null");
+ ok(disp == NULL, "Expected disp to be null\n");
+
+ disp = NULL;
+ status = pNvAPI_EnumNvidiaDisplayHandle(NVAPI_MAX_DISPLAYS, &disp);
+ ok(status == NVAPI_INVALID_ARGUMENT, "Expected status NVAPI_INVALID_ARGUMENT, got %d\n", status);
+ ok(disp == NULL, "Expected disp to be null");
+ ok(disp == NULL, "Expected disp to be null\n");
+}
+
START_TEST( nvapi )

6
patches/nvapi-Stub_DLL/0009-nvapi-Add-stub-for-NvAPI_SYS_GetDriverAndBranchVersi.patch
View File

@ -73,7 +73,7 @@ index 8d15382..aeca45f 100644
if (!pNvAPI_Initialize)
{
@@ -526,6 +529,42 @@ static void test_NvAPI_EnumNvidiaDisplayHandle(void)
ok(disp == NULL, "Expected disp to be null");
ok(disp == NULL, "Expected disp to be null\n");
}
+static void test_NvAPI_SYS_GetDriverAndBranchVersion(void)
@ -104,8 +104,8 @@ index 8d15382..aeca45f 100644
+ memset(branch, 0, sizeof(branch));
+ status = pNvAPI_SYS_GetDriverAndBranchVersion(&version, branch);
+ ok(status == NVAPI_OK, "Expected status NVAPI_OK, got %d\n", status);
+ ok(version != 0, "Expected non null version");
+ ok(branch[0] != 0, "Expected non emptry branch string");
+ ok(version != 0, "Expected non null version\n");
+ ok(branch[0] != 0, "Expected non emptry branch string\n");
+
+ trace("Version: %d\n", version);
+ trace("Branch: %s\n", branch);

6
patches/nvapi-Stub_DLL/0014-nvapi-Add-stub-for-NvAPI_GetLogicalGPUFromDisplay.patch
View File

@ -91,7 +91,7 @@ index 4db576e..297a335 100644
+ disp = NULL;
+ status = pNvAPI_EnumNvidiaDisplayHandle(0, &disp);
+ ok(status == NVAPI_OK, "Expected status NVAPI_OK, got %d\n", status);
+ ok(disp != NULL, "Expected disp to be non null");
+ ok(disp != NULL, "Expected disp to be non null\n");
+
+ status = pNvAPI_GetLogicalGPUFromDisplay(NULL, NULL);
+ ok(status == NVAPI_INVALID_POINTER, "Expected status NVAPI_INVALID_POINTER, got %d\n", status);
@ -105,12 +105,12 @@ index 4db576e..297a335 100644
+ gpuHandle = NULL;
+ status = pNvAPI_GetLogicalGPUFromDisplay(NULL, &gpuHandle);
+ ok(status == NVAPI_OK, "Expected status NVAPI_OK, got %d\n", status);
+ ok(gpuHandle != NULL, "Expected gpuHandle to be non null");
+ ok(gpuHandle != NULL, "Expected gpuHandle to be non null\n");
+
+ gpuHandle = NULL;
+ status = pNvAPI_GetLogicalGPUFromDisplay(disp, &gpuHandle);
+ ok(status == NVAPI_OK, "Expected status NVAPI_OK, got %d\n", status);
+ ok(gpuHandle != NULL, "Expected gpuHandle to be non null");
+ ok(gpuHandle != NULL, "Expected gpuHandle to be non null\n");
+}
+
static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window)