[PATCH] dlls/windows.media.speech/tests: enable compilation with long types

[Eric Pouech]

Signed-off-by: Eric Pouech <eric.pouech at gmail.com>

---
 dlls/windows.media.speech/tests/Makefile.in |    1 
 dlls/windows.media.speech/tests/speech.c    |   60 ++++++++++++++-------------
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/dlls/windows.media.speech/tests/Makefile.in b/dlls/windows.media.speech/tests/Makefile.in
index e1616991573..2ee10d3db21 100644
--- a/dlls/windows.media.speech/tests/Makefile.in
+++ b/dlls/windows.media.speech/tests/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 TESTDLL = windows.media.speech.dll
 IMPORTS = combase uuid
 
diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c
index 38fd5c90dd0..df00f407bc7 100644
--- a/dlls/windows.media.speech/tests/speech.c
+++ b/dlls/windows.media.speech/tests/speech.c
@@ -56,10 +56,10 @@ static void test_SpeechSynthesizer(void)
     ULONG ref;
 
     hr = RoInitialize(RO_INIT_MULTITHREADED);
-    ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr);
+    ok(hr == S_OK, "RoInitialize failed, hr %#lx\n", hr);
 
     hr = WindowsCreateString(speech_synthesizer_name, wcslen(speech_synthesizer_name), &str);
-    ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr);
+    ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr);
 
     hdll = LoadLibraryW(L"windows.media.speech.dll");
     if (hdll)
@@ -68,31 +68,31 @@ static void test_SpeechSynthesizer(void)
         ok(!!pDllGetActivationFactory, "DllGetActivationFactory not found.\n");
 
         hr = WindowsCreateString(unknown_class_name, wcslen(unknown_class_name), &str2);
-        ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr);
+        ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr);
 
         hr = pDllGetActivationFactory(str2, &factory);
-        ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#x.\n", hr);
+        ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#lx.\n", hr);
 
         WindowsDeleteString(str2);
 
         hr = WindowsCreateString(speech_synthesizer_name2, wcslen(speech_synthesizer_name2), &str2);
-        ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr);
+        ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr);
 
         hr = pDllGetActivationFactory(str2, &factory2);
-        ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#x.\n", hr);
+        ok(hr == CLASS_E_CLASSNOTAVAILABLE, "Got unexpected hr %#lx.\n", hr);
 
         WindowsDeleteString(str2);
 
         hr = pDllGetActivationFactory(str, &factory2);
-        ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+        ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
     }
     else
     {
-        win_skip("Failed to load library, err %u.\n", GetLastError());
+        win_skip("Failed to load library, err %lu.\n", GetLastError());
     }
 
     hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory);
-    ok(hr == S_OK, "RoGetActivationFactory failed, hr %#x\n", hr);
+    ok(hr == S_OK, "RoGetActivationFactory failed, hr %#lx\n", hr);
 
     if (hdll)
     {
@@ -102,47 +102,47 @@ static void test_SpeechSynthesizer(void)
     }
 
     hr = IActivationFactory_QueryInterface(factory, &IID_IInspectable, (void **)&inspectable);
-    ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#x\n", hr);
+    ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInspectable failed, hr %#lx\n", hr);
 
     hr = IActivationFactory_QueryInterface(factory, &IID_IAgileObject, (void **)&agile_object);
-    ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#x\n", hr);
+    ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr);
 
     hr = IActivationFactory_QueryInterface(factory, &IID_IInstalledVoicesStatic, (void **)&voices_static);
-    ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInstalledVoicesStatic failed, hr %#x\n", hr);
+    ok(hr == S_OK, "IActivationFactory_QueryInterface IID_IInstalledVoicesStatic failed, hr %#lx\n", hr);
 
     hr = IInstalledVoicesStatic_QueryInterface(voices_static, &IID_IInspectable, (void **)&tmp_inspectable);
-    ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IInspectable failed, hr %#x\n", hr);
+    ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IInspectable failed, hr %#lx\n", hr);
     ok(tmp_inspectable == inspectable, "IInstalledVoicesStatic_QueryInterface IID_IInspectable returned %p, expected %p\n", tmp_inspectable, inspectable);
     IInspectable_Release(tmp_inspectable);
 
     hr = IInstalledVoicesStatic_QueryInterface(voices_static, &IID_IAgileObject, (void **)&tmp_agile_object);
-    ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject failed, hr %#x\n", hr);
+    ok(hr == S_OK, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject failed, hr %#lx\n", hr);
     ok(tmp_agile_object == agile_object, "IInstalledVoicesStatic_QueryInterface IID_IAgileObject returned %p, expected %p\n", tmp_agile_object, agile_object);
     IAgileObject_Release(tmp_agile_object);
 
     hr = IInstalledVoicesStatic_get_AllVoices(voices_static, &voices);
-    ok(hr == S_OK, "IInstalledVoicesStatic_get_AllVoices failed, hr %#x\n", hr);
+    ok(hr == S_OK, "IInstalledVoicesStatic_get_AllVoices failed, hr %#lx\n", hr);
 
     hr = IVectorView_VoiceInformation_QueryInterface(voices, &IID_IInspectable, (void **)&tmp_inspectable);
-    ok(hr == S_OK, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr);
+    ok(hr == S_OK, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#lx\n", hr);
     ok(tmp_inspectable != inspectable, "IVectorView_VoiceInformation_QueryInterface voices returned %p, expected %p\n", tmp_inspectable, inspectable);
     IInspectable_Release(tmp_inspectable);
 
     hr = IVectorView_VoiceInformation_QueryInterface(voices, &IID_IAgileObject, (void **)&tmp_agile_object);
-    ok(hr == E_NOINTERFACE, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#x\n", hr);
+    ok(hr == E_NOINTERFACE, "IVectorView_VoiceInformation_QueryInterface voices failed, hr %#lx\n", hr);
 
     size = 0xdeadbeef;
     hr = IVectorView_VoiceInformation_get_Size(voices, &size);
-    ok(hr == S_OK, "IVectorView_VoiceInformation_get_Size voices failed, hr %#x\n", hr);
+    ok(hr == S_OK, "IVectorView_VoiceInformation_get_Size voices failed, hr %#lx\n", hr);
     todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_VoiceInformation_get_Size returned %u\n", size);
 
     voice = (IVoiceInformation *)0xdeadbeef;
     hr = IVectorView_VoiceInformation_GetAt(voices, size, &voice);
-    ok(hr == E_BOUNDS, "IVectorView_VoiceInformation_GetAt failed, hr %#x\n", hr);
+    ok(hr == E_BOUNDS, "IVectorView_VoiceInformation_GetAt failed, hr %#lx\n", hr);
     ok(voice == NULL, "IVectorView_VoiceInformation_GetAt returned %p\n", voice);
 
     hr = IVectorView_VoiceInformation_GetMany(voices, size, 1, &voice, &size);
-    ok(hr == S_OK, "IVectorView_VoiceInformation_GetMany failed, hr %#x\n", hr);
+    ok(hr == S_OK, "IVectorView_VoiceInformation_GetMany failed, hr %#lx\n", hr);
     ok(size == 0, "IVectorView_VoiceInformation_GetMany returned count %u\n", size);
 
     IVectorView_VoiceInformation_Release(voices);
@@ -153,25 +153,25 @@ static void test_SpeechSynthesizer(void)
     IInspectable_Release(inspectable);
 
     hr = IActivationFactory_QueryInterface(factory, &IID_ISpeechSynthesizer, (void **)&synthesizer);
-    ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr);
+    ok(hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr);
 
     hr = RoActivateInstance(str, &inspectable);
-    ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
 
     hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechSynthesizer, (void **)&synthesizer);
-    ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
 
     hr = IInspectable_QueryInterface(inspectable, &IID_IClosable, (void **)&closable);
-    ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
+    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
 
     ref = IClosable_Release(closable);
-    ok(ref == 2, "Got unexpected ref %u.\n", ref);
+    ok(ref == 2, "Got unexpected ref %lu.\n", ref);
 
     ref = ISpeechSynthesizer_Release(synthesizer);
-    ok(ref == 1, "Got unexpected ref %u.\n", ref);
+    ok(ref == 1, "Got unexpected ref %lu.\n", ref);
 
     ref = IInspectable_Release(inspectable);
-    ok(!ref, "Got unexpected ref %u.\n", ref);
+    ok(!ref, "Got unexpected ref %lu.\n", ref);
 
     IActivationFactory_Release(factory);
     WindowsDeleteString(str);
@@ -188,13 +188,13 @@ static void test_VoiceInformation(void)
     HRESULT hr;
 
     hr = RoInitialize(RO_INIT_MULTITHREADED);
-    ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr);
+    ok(hr == S_OK, "RoInitialize failed, hr %#lx\n", hr);
 
     hr = WindowsCreateString(voice_information_name, wcslen(voice_information_name), &str);
-    ok(hr == S_OK, "WindowsCreateString failed, hr %#x\n", hr);
+    ok(hr == S_OK, "WindowsCreateString failed, hr %#lx\n", hr);
 
     hr = RoGetActivationFactory(str, &IID_IActivationFactory, (void **)&factory);
-    ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned unexpected hr %#x\n", hr);
+    ok(hr == REGDB_E_CLASSNOTREG, "RoGetActivationFactory returned unexpected hr %#lx\n", hr);
 
     WindowsDeleteString(str);